From: David Cramer <david@thingbag.net>
Date: Mon, 3 Dec 2007 03:22:06 +0000 (+0000)
Subject: Use sortas attributes (if they exist) when sorting indexterms
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8da7a4ae7267863e69e6920c6f524811294a5dfc;p=docbook-dsssl

Use sortas attributes (if they exist) when sorting indexterms
---

diff --git a/xsl/eclipse/eclipse.xsl b/xsl/eclipse/eclipse.xsl
index 3f3290717..97d6ea4e7 100644
--- a/xsl/eclipse/eclipse.xsl
+++ b/xsl/eclipse/eclipse.xsl
@@ -249,16 +249,16 @@
 	  <xsl:choose>
 		<xsl:when test="$rootid != ''">
 		  <xsl:apply-templates select="key('id',$rootid)//indexterm" mode="idx">
-			<xsl:sort select="primary"/>
-			<xsl:sort select="secondary"/>
-			<xsl:sort select="tertiary"/>
+			<xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = '']))"/>
+			<xsl:sort select="normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = '']))"/>
+			<xsl:sort select="normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = '']))"/>
 		  </xsl:apply-templates>
 		</xsl:when>
 		<xsl:otherwise>
 		  <xsl:apply-templates select="//indexterm" mode="idx">
-			<xsl:sort select="primary"/>
-			<xsl:sort select="secondary"/>
-			<xsl:sort select="tertiary"/>
+			<xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = '']))"/>
+			<xsl:sort select="normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = '']))"/>
+			<xsl:sort select="normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = '']))"/>
 		  </xsl:apply-templates>
 		</xsl:otherwise>
 	  </xsl:choose>