Change entities to use common/entities.ent.

diff --git a/xsl/common/autoidx-kimber.xsl b/xsl/common/autoidx-kimber.xsl
index 291880e7231ad78777c2c1f83b045473719d62d6..0daa3ef0148b05568636702158e9b68ecaf98e9f 100644 (file)
--- a/xsl/common/autoidx-kimber.xsl
+++ b/xsl/common/autoidx-kimber.xsl
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet [
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
+<!ENTITY % common.entities SYSTEM "entities.ent">
+%common.entities;
 <!-- Documents using the kimber index method must have a lang attribute -->
 <!-- Only one of these should be present in the entity -->
 

diff --git a/xsl/fo/autoidx-kimber.xsl b/xsl/fo/autoidx-kimber.xsl
index 0b01823fe5e63f82cdaa73ef92dc4fadfd38ec4b..5c735f966ec7f73e9778a8651a0d368714164179 100644 (file)
--- a/xsl/fo/autoidx-kimber.xsl
+++ b/xsl/fo/autoidx-kimber.xsl
@@ -1,18 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet [
+<!ENTITY % common.entities SYSTEM "../common/entities.ent">
+%common.entities;
 
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-<!ENTITY sep '" "'>
 <!-- Documents using the kimber index method must have a lang attribute -->
 <!-- Only one of these should be present in the entity -->
 <!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"

diff --git a/xsl/html/autoidx-kimber.xsl b/xsl/html/autoidx-kimber.xsl
index a105d862a75c8a9f51e40bfef569249a7f55592c..c396d3a4b97aeb43517cdba418d45550f423dd88 100644 (file)
--- a/xsl/html/autoidx-kimber.xsl
+++ b/xsl/html/autoidx-kimber.xsl
@@ -1,15 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
+<!ENTITY % common.entities SYSTEM "../common/entities.ent">
+%common.entities;
 
 <!-- Documents using the kimber index method must have a lang attribute -->
 <!-- Only one of these should be present in the entity -->
 <!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService"