From: Jirka Kosek <jirka@kosek.cz>
Date: Thu, 15 Jul 2010 08:08:04 +0000 (+0000)
Subject: Upgraded to use common entities. Fixed bug when some code used @sortas and some not... 
X-Git-Tag: release/1.79.1~6^2~883
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=767f2b2fa0cff13c063951fd4e3d8f1c02c589de;p=docbook-dsssl

Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms.
---

diff --git a/xsl/common/autoidx-kosek.xsl b/xsl/common/autoidx-kosek.xsl
index cabcbdf41..41290c433 100644
--- a/xsl/common/autoidx-kosek.xsl
+++ b/xsl/common/autoidx-kosek.xsl
@@ -1,7 +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;
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0"
diff --git a/xsl/common/entities.ent b/xsl/common/entities.ent
index e7d0f50eb..f9aaa4b97 100644
--- a/xsl/common/entities.ent
+++ b/xsl/common/entities.ent
@@ -23,11 +23,11 @@
      with the same @sortas.
      If @sortas is not present, the first item is empty, and the added space
      is removed when normalize-space is applied, leaving just the entry -->
+
 <!ENTITY primary   'normalize-space(concat(primary/@sortas, " ", primary))'>
 <!ENTITY secondary 'normalize-space(concat(secondary/@sortas, " ", secondary))'>
 <!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, " ", tertiary))'>
 
-
 <!ENTITY section   '(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]'>
 
 <!ENTITY section.id 'generate-id(&section;)'>
diff --git a/xsl/fo/autoidx-kosek.xsl b/xsl/fo/autoidx-kosek.xsl
index bbd826a5a..03a163024 100644
--- a/xsl/fo/autoidx-kosek.xsl
+++ b/xsl/fo/autoidx-kosek.xsl
@@ -1,17 +1,7 @@
 <?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 sep '" "'>
-<!-- Documents using the kimber index method must have a lang attribute -->
-<!-- Only one of these should be present in the entity -->
-
-<!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))'>
+<!ENTITY % common.entities SYSTEM "../common/entities.ent">
+%common.entities;
 ]>
 <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-kosek.xsl b/xsl/html/autoidx-kosek.xsl
index a81b10548..515798f1b 100644
--- a/xsl/html/autoidx-kosek.xsl
+++ b/xsl/html/autoidx-kosek.xsl
@@ -1,11 +1,7 @@
 <?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 scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
+<!ENTITY % common.entities SYSTEM "../common/entities.ent">
+%common.entities;
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:i="urn:cz-kosek:functions:index"