Add curly braces around ⟨ in xsl:sort lang attribute to make it an AVT.

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index 0be533a702feb8c111a1efc9a452216907f22cca..7d9ea80e3e14a69e14df6324a20c1f3278b8da0d 100644 (file)
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -312,7 +312,7 @@
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>
-          <xsl:sort lang="&lang;"
+          <xsl:sort lang="{&lang;}"
               select="k:getIndexGroupSortKey(&lang;,
                       k:getIndexGroupKey(&lang;, &primary;))"/>
         </xsl:apply-templates>
@@ -324,7 +324,7 @@
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
       <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="&lang;"
+      <xsl:sort lang="{&lang;}"
              select="k:getIndexGroupSortKey(&lang;,
                      k:getIndexGroupKey(&lang;, &primary;))"/>
     </xsl:apply-templates>
@@ -453,7 +453,7 @@
                             [count(.|key('primary', &primary;)[&scope;]
                             [1])=1]"
                              mode="index-primary">
-          <xsl:sort select="&primary;" lang="&lang;"/>
+          <xsl:sort select="&primary;" lang="{&lang;}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>

diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index c738a2536244d056a3db54beee6dd05b7d30f212..90b044476a853769a3d94a4c0ce4b61ad538e67f 100644 (file)
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -113,7 +113,7 @@
 
 <!-- The following key is used in the kimber indexing method.
      To use this method, either copy this key to a
-     customization layer, or xsl:import common/autoidx.xsl. -->
+     customization layer, or xsl:import common/autoidx-ng.xsl. -->
 <!--
 <xsl:key name="k-group"
          match="indexterm"
@@ -340,7 +340,7 @@
             <xsl:with-param name="scope" select="$scope"/>
             <xsl:with-param name="role" select="$role"/>
             <xsl:with-param name="type" select="$type"/>
-            <xsl:sort lang="&lang;"
+            <xsl:sort lang="{&lang;}"
                 select="k:getIndexGroupSortKey(&lang;,
                         k:getIndexGroupKey(&lang;, &primary;))"/>
           </xsl:apply-templates>
@@ -353,7 +353,7 @@
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
       <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="&lang;"
+      <xsl:sort lang="{&lang;}"
              select="k:getIndexGroupSortKey(&lang;,
                      k:getIndexGroupKey(&lang;, &primary;))"/>
     </xsl:apply-templates>
@@ -467,7 +467,7 @@
                             [count(.|key('primary', &primary;)[&scope;]
                             [1])=1]"
                              mode="index-primary">
-          <xsl:sort select="&primary;" lang="&lang;"/>
+          <xsl:sort select="&primary;" lang="{&lang;}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>