Fixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 718bdb6981537e7c2723e1f027eaec86a786f92d..3bbc3655003c417e471cdcda0de4f84257c708b7 100644 (file)
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -82,9 +82,7 @@
           <xsl:choose>
             <xsl:when test="$glossary.sort != 0">
               <xsl:apply-templates select="$entries" mode="glossary.as.list">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
+                                 <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
               </xsl:apply-templates>
             </xsl:when>
             <xsl:otherwise>
@@ -99,9 +97,7 @@
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
+                         <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
           </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
@@ -114,9 +110,7 @@
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
           </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
@@ -135,9 +129,7 @@
           <xsl:choose>
             <xsl:when test="$glossary.sort != 0">
               <xsl:apply-templates select="$entries" mode="glossary.as.list">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
+                                       <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
               </xsl:apply-templates>
             </xsl:when>
             <xsl:otherwise>
@@ -259,9 +251,7 @@
         <xsl:choose>
           <xsl:when test="$glossary.sort != 0">
             <xsl:apply-templates select="glossentry" mode="glossary.as.list">
-              <xsl:sort lang="{$language}"
-                        select="translate(glossterm, $lowercase, 
-                                          $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
             </xsl:apply-templates>
           </xsl:when>
           <xsl:otherwise>
@@ -274,9 +264,7 @@
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:apply-templates select="glossentry" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
           </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
@@ -288,9 +276,7 @@
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:apply-templates select="glossentry" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
           </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
@@ -305,9 +291,7 @@
         <xsl:choose>
           <xsl:when test="$glossary.sort != 0">
             <xsl:apply-templates select="glossentry" mode="glossary.as.list">
-              <xsl:sort lang="{$language}"
-                        select="translate(glossterm, $lowercase, 
-                                          $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
             </xsl:apply-templates>
           </xsl:when>
           <xsl:otherwise>
@@ -441,9 +425,7 @@
             <xsl:choose>
               <xsl:when test="$glossary.sort != 0">
                 <xsl:for-each select="$collection//glossentry">
-                  <xsl:sort lang="{$language}"
-                            select="translate(glossterm, $lowercase, 
-                                              $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
                   <xsl:variable name="cterm" select="glossterm"/>
                   <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
                     <xsl:apply-templates select="." 
@@ -468,9 +450,7 @@
           <xsl:choose>
             <xsl:when test="$glossary.sort != 0">
               <xsl:for-each select="$collection//glossentry">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
+                                       <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
                 <xsl:variable name="cterm" select="glossterm"/>
                 <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
                   <xsl:apply-templates select="." 
@@ -496,9 +476,8 @@
             <xsl:choose>
               <xsl:when test="$glossary.sort != 0">
                 <xsl:for-each select="$collection//glossentry">
-                  <xsl:sort lang="{$language}"
-                            select="translate(glossterm, $lowercase, 
-                                              $uppercase)"/>
+
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
                   <xsl:variable name="cterm" select="glossterm"/>
                   <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
                     <xsl:apply-templates select="." 
@@ -617,8 +596,7 @@
     <xsl:choose>
       <xsl:when test="$glossary.sort != 0">
         <xsl:for-each select="glossentry">
-          <xsl:sort lang="{$language}"
-                    select="translate(glossterm, $lowercase, $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
           <xsl:variable name="cterm" select="glossterm"/>
           <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
             <xsl:apply-templates select="." mode="auto-glossary-as-list"/>
@@ -658,8 +636,7 @@
   <xsl:choose>
     <xsl:when test="$glossary.sort != 0">
       <xsl:for-each select="glossentry">
-        <xsl:sort lang="{$language}"
-                  select="translate(glossterm, $lowercase, $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
         <xsl:variable name="cterm" select="glossterm"/>
         <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
           <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/>
@@ -707,9 +684,7 @@
     <xsl:choose>
       <xsl:when test="$glossary.sort != 0">
         <xsl:apply-templates select="$entries" mode="glossary.as.list">
-          <xsl:sort lang="{$language}"
-                    select="translate(glossterm, $lowercase, 
-                                      $uppercase)"/>
+                               <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
         </xsl:apply-templates>
       </xsl:when>
       <xsl:otherwise>
@@ -932,9 +907,7 @@ GlossEntry ::=
   <xsl:choose>
     <xsl:when test="$glossary.sort != 0">
       <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-        <xsl:sort lang="{$language}"
-                  select="translate(glossterm, $lowercase, 
-                                    $uppercase)"/>
+                 <xsl:sort lang="{$language}" select="translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;)"/>
       </xsl:apply-templates>
     </xsl:when>
     <xsl:otherwise>