Implemented FR #1230233 (sorted index in javahelp).

diff --git a/xsl/javahelp/javahelp.xsl b/xsl/javahelp/javahelp.xsl
index 74ebbc26b004711a44143e1bd9806212a6dc2cce..d3986624904270125cdee8e91cf356224895618a 100644 (file)
--- a/xsl/javahelp/javahelp.xsl
+++ b/xsl/javahelp/javahelp.xsl
@@ -509,10 +509,18 @@ references. In that case you can select appropriate encoding here.</para>
   <index version="1.0">
     <xsl:choose>
       <xsl:when test="$rootid != ''">
-        <xsl:apply-templates select="key('id',$rootid)//indexterm" mode="idx"/>
+        <xsl:apply-templates select="key('id',$rootid)//indexterm" mode="idx">
+         <xsl:sort select="primary"/>
+         <xsl:sort select="secondary"/>
+         <xsl:sort select="tertiary"/>
+       </xsl:apply-templates>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:apply-templates select="//indexterm" mode="idx"/>
+        <xsl:apply-templates select="//indexterm" mode="idx">
+          <xsl:sort select="primary"/>
+         <xsl:sort select="secondary"/>
+         <xsl:sort select="tertiary"/>
+        </xsl:apply-templates>
       </xsl:otherwise>
     </xsl:choose>
   </index>