From: Norman Walsh <ndw@nwalsh.com>
Date: Mon, 8 Jul 2002 12:03:32 +0000 (+0000)
Subject: Bug #574841: trim leading and trailing whitespace from primary/secondary/tertiary... 
X-Git-Tag: release/1.79.1~6^2~5449
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dca6d5797e7f9003cb09dbda9820f18a50d15319;p=docbook-dsssl

Bug #574841: trim leading and trailing whitespace from primary/secondary/tertiary index terms
---

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index b4a9ad228..4441f33db 100644
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -4,9 +4,9 @@
 <!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
 <!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
 
-<!ENTITY primary   'concat(primary/@sortas, primary[not(@sortas)])'>
-<!ENTITY secondary 'concat(secondary/@sortas, secondary[not(@sortas)])'>
-<!ENTITY tertiary  'concat(tertiary/@sortas, tertiary[not(@sortas)])'>
+<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
+<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas)]))'>
+<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas)]))'>
 
 <!ENTITY section   '(ancestor-or-self::set
                      |ancestor-or-self::book
diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index 1b1ad70f0..076451a56 100644
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -4,9 +4,9 @@
 <!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
 <!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
 
-<!ENTITY primary   'concat(primary/@sortas, primary[not(@sortas)])'>
-<!ENTITY secondary 'concat(secondary/@sortas, secondary[not(@sortas)])'>
-<!ENTITY tertiary  'concat(tertiary/@sortas, tertiary[not(@sortas)])'>
+<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
+<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas)]))'>
+<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas)]))'>
 
 <!ENTITY section   '(ancestor-or-self::set
                      |ancestor-or-self::book