Bug #574841: trim leading and trailing whitespace from primary/secondary/tertiary...

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index b4a9ad228defa83b809023e04cfb72bdc8a8f2bb..4441f33dbc488f00a8555a1eab5f223eb15d2d74 100644 (file)
--- 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 1b1ad70f053c3ad8d74f649244297e119bdf0cb2..076451a5631d4432bd031ec979567b98934ce0b4 100644 (file)
--- 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