From 7be2e3f79d83fd7b633927722cbfed50c0b13e66 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 6 Sep 2006 08:52:48 +0000
Subject: [PATCH] More carefully select language substring for sorting.

---
 xsl/fo/autoidx-kimber.xsl   | 14 +++++++++++++-
 xsl/html/autoidx-kimber.xsl | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/xsl/fo/autoidx-kimber.xsl b/xsl/fo/autoidx-kimber.xsl
index 65fe6ce51..97dfd8b2d 100644
--- a/xsl/fo/autoidx-kimber.xsl
+++ b/xsl/fo/autoidx-kimber.xsl
@@ -39,7 +39,19 @@
 <xsl:include href="../common/autoidx-kimber.xsl"/>
 
 <!-- Java sort apparently works only on lang part, not country -->
-<xsl:param name="sort.lang" select="substring(&lang;, 1, 2)"/>
+<xsl:param name="sort.lang">
+  <xsl:choose>
+    <xsl:when test="contains(&lang;, '-')">
+      <xsl:value-of select="substring-before(&lang;, '-')"/>
+    </xsl:when>
+    <xsl:when test="contains(&lang;, '_')">
+      <xsl:value-of select="substring-before(&lang;, '_')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="&lang;"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
 
 <xsl:template name="generate-kimber-index">
   <xsl:param name="scope" select="NOTANODE"/>
diff --git a/xsl/html/autoidx-kimber.xsl b/xsl/html/autoidx-kimber.xsl
index 7cf9ae04d..39d262d92 100644
--- a/xsl/html/autoidx-kimber.xsl
+++ b/xsl/html/autoidx-kimber.xsl
@@ -38,7 +38,19 @@
 <xsl:include href="../common/autoidx-kimber.xsl"/>
 
 <!-- Java sort apparently works only on lang part, not country -->
-<xsl:param name="sort.lang" select="substring(&lang;, 1, 2)"/>
+<xsl:param name="sort.lang">
+  <xsl:choose>
+    <xsl:when test="contains(&lang;, '-')">
+      <xsl:value-of select="substring-before(&lang;, '-')"/>
+    </xsl:when>
+    <xsl:when test="contains(&lang;, '_')">
+      <xsl:value-of select="substring-before(&lang;, '_')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="&lang;"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
 
 <xsl:template name="generate-kimber-index">
   <xsl:param name="scope" select="NOTANODE"/>
-- 
2.40.0