Upgraded to use common entities. Fixed bug when some code used @sortas and some not...

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index df3b9fb225021717913bf8c166b0caaf9c889d22..ef9f40721071cd2abd08eb9352064587cf856c4e 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -1,8 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE xsl:stylesheet [
-<!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 % 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"