From: Jirka Kosek <jirka@kosek.cz>
Date: Tue, 20 Jul 2010 21:46:07 +0000 (+0000)
Subject: Hopefully this way code will work in Xalan and without speed penalty.
X-Git-Tag: release/1.79.1~6^2~871
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76530fb2bbca3fb17290d708acb3ae88ab7bd529;p=docbook-dsssl

Hopefully this way code will work in Xalan and without speed penalty.
---

diff --git a/xsl/common/autoidx-kosek.xsl b/xsl/common/autoidx-kosek.xsl
index f662d886f..d08f7a8e0 100644
--- a/xsl/common/autoidx-kosek.xsl
+++ b/xsl/common/autoidx-kosek.xsl
@@ -48,34 +48,36 @@
     <xsl:variable name="local.l10n.letters"
       select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:letters)[1]"/>
     
-    <xsl:variable name="l10n.letters"
-      select="document(concat('../common/', $lang, '.xml'))/l:l10n/l:letters[1]"/>
-    
-    <xsl:choose>
-      <xsl:when test="count($local.l10n.letters) &gt; 0">
-        <xsl:copy-of select="$local.l10n.letters"/>
-      </xsl:when>
-      <xsl:when test="count($l10n.letters) &gt; 0">
-        <xsl:copy-of select="$l10n.letters"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>No "</xsl:text>
-          <xsl:value-of select="$lang"/>
-          <xsl:text>" localization of index grouping letters exists</xsl:text>
-          <xsl:choose>
-            <xsl:when test="$lang = 'en'">
-              <xsl:text>.</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>; using "en".</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:message>
-        
-        <xsl:copy-of select="document('../common/en.xml')/l:l10n/l:letters[1]"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:for-each select="$l10n.xml">
+      <xsl:variable name="l10n.letters"
+	select="document(key('l10n-lang', $lang)/@href)/l:l10n/l:letters[1]"/>
+
+      <xsl:choose>
+	<xsl:when test="count($local.l10n.letters) &gt; 0">
+	  <xsl:copy-of select="$local.l10n.letters"/>
+	</xsl:when>
+	<xsl:when test="count($l10n.letters) &gt; 0">
+	  <xsl:copy-of select="$l10n.letters"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:message>
+	    <xsl:text>No "</xsl:text>
+	    <xsl:value-of select="$lang"/>
+	    <xsl:text>" localization of index grouping letters exists</xsl:text>
+	    <xsl:choose>
+	      <xsl:when test="$lang = 'en'">
+		<xsl:text>.</xsl:text>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:text>; using "en".</xsl:text>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:message>
+
+	  <xsl:copy-of select="document(key('l10n-lang', 'en'))/l:l10n/l:letters[1]"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:variable>
   
   <xsl:variable name="letters" select="exslt:node-set($letters-rtf)/*"/>
@@ -108,34 +110,36 @@
     <xsl:variable name="local.l10n.letters"
       select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:letters)[1]"/>
     
-    <xsl:variable name="l10n.letters"
-      select="document(concat('../common/', $lang, '.xml'))/l:l10n/l:letters[1]"/>
-    
-    <xsl:choose>
-      <xsl:when test="count($local.l10n.letters) &gt; 0">
-        <xsl:copy-of select="$local.l10n.letters"/>
-      </xsl:when>
-      <xsl:when test="count($l10n.letters) &gt; 0">
-        <xsl:copy-of select="$l10n.letters"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>No "</xsl:text>
-          <xsl:value-of select="$lang"/>
-          <xsl:text>" localization of index grouping letters exists</xsl:text>
-          <xsl:choose>
-            <xsl:when test="$lang = 'en'">
-              <xsl:text>.</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>; using "en".</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:message>
-        
-        <xsl:copy-of select="document('../common/en.xml')/l:l10n/l:letters[1]"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:for-each select="$l10n.xml">
+      <xsl:variable name="l10n.letters"
+	select="document(key('l10n-lang', $lang)/@href)/l:l10n/l:letters[1]"/>
+
+      <xsl:choose>
+	<xsl:when test="count($local.l10n.letters) &gt; 0">
+	  <xsl:copy-of select="$local.l10n.letters"/>
+	</xsl:when>
+	<xsl:when test="count($l10n.letters) &gt; 0">
+	  <xsl:copy-of select="$l10n.letters"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:message>
+	    <xsl:text>No "</xsl:text>
+	    <xsl:value-of select="$lang"/>
+	    <xsl:text>" localization of index grouping letters exists</xsl:text>
+	    <xsl:choose>
+	      <xsl:when test="$lang = 'en'">
+		<xsl:text>.</xsl:text>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:text>; using "en".</xsl:text>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:message>
+
+	  <xsl:copy-of select="document(key('l10n-lang', 'en')/@href)/l:l10n/l:letters[1]"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:variable>
   
   <xsl:variable name="letters" select="exslt:node-set($letters-rtf)/*"/>
diff --git a/xsl/common/l10n.xsl b/xsl/common/l10n.xsl
index fc4275438..82557c4f8 100644
--- a/xsl/common/l10n.xsl
+++ b/xsl/common/l10n.xsl
@@ -120,8 +120,10 @@
     <xsl:call-template name="l10n.language"/>
   </xsl:param>
 
-  <xsl:value-of
-    select="document(concat('../common/', $lang, '.xml'))/l:l10n/@english-language-name"/>
+  <xsl:for-each select="$l10n.xml">
+    <xsl:value-of
+	select="document(key('l10n-lang', $lang)/@href)/l:l10n/@english-language-name"/>
+  </xsl:for-each>
 </xsl:template>
 
 <xsl:template name="language.attribute">
@@ -224,42 +226,46 @@
     <xsl:call-template name="l10n.language"/>
   </xsl:param>
 
-  <xsl:for-each select="document(concat('../common/', $lang, '.xml'))">  <!-- We need to switch context in order to make key() work -->
-    <xsl:variable name="local.l10n.gentext"
-                  select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:gentext[@key=$key])[1]"/>
-
-    <xsl:variable name="l10n.gentext"
-                  select="key('l10n-gentext', $key)[1]"/>
+  <xsl:for-each select="$l10n.xml">  <!-- We need to switch context in order to make key() work -->
+    <xsl:for-each select="document(key('l10n-lang', $lang)/@href)">
+      <xsl:variable name="local.l10n.gentext"
+		    select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:gentext[@key=$key])[1]"/>
 
-    <xsl:choose>
-      <xsl:when test="$local.l10n.gentext">
-        <xsl:value-of select="$local.l10n.gentext/@text"/>
-      </xsl:when>
-      <xsl:when test="$l10n.gentext">
-        <xsl:value-of select="$l10n.gentext/@text"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>No "</xsl:text>
-          <xsl:value-of select="$lang"/>
-          <xsl:text>" localization of "</xsl:text>
-          <xsl:value-of select="$key"/>
-          <xsl:text>" exists</xsl:text>
-          <xsl:choose>
-            <xsl:when test="$lang = 'en'">
-               <xsl:text>.</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:text>; using "en".</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:message>
+      <xsl:variable name="l10n.gentext"
+		    select="key('l10n-gentext', $key)[1]"/>
 
-	<xsl:for-each select="document('../common/en.xml')">  <!-- We need to switch context in order to make key() work -->
-	  <xsl:value-of select="key('l10n-gentext', $key)[1]/@text"/>
-	</xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
+      <xsl:choose>
+	<xsl:when test="$local.l10n.gentext">
+	  <xsl:value-of select="$local.l10n.gentext/@text"/>
+	</xsl:when>
+	<xsl:when test="$l10n.gentext">
+	  <xsl:value-of select="$l10n.gentext/@text"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:message>
+	    <xsl:text>No "</xsl:text>
+	    <xsl:value-of select="$lang"/>
+	    <xsl:text>" localization of "</xsl:text>
+	    <xsl:value-of select="$key"/>
+	    <xsl:text>" exists</xsl:text>
+	    <xsl:choose>
+	      <xsl:when test="$lang = 'en'">
+		 <xsl:text>.</xsl:text>
+	      </xsl:when>
+	      <xsl:otherwise>
+		 <xsl:text>; using "en".</xsl:text>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:message>
+	  
+	  <xsl:for-each select="$l10n.xml">  <!-- We need to switch context in order to make key() work -->
+	    <xsl:for-each select="document(key('l10n-lang', 'en')/@href)">
+	      <xsl:value-of select="key('l10n-gentext', $key)[1]/@text"/>
+	    </xsl:for-each>
+	  </xsl:for-each>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:for-each>
 </xsl:template>
 
@@ -297,34 +303,38 @@
     <xsl:call-template name="l10n.language"/>
   </xsl:param>
 
-  <xsl:for-each select="document(concat('../common/', $lang, '.xml'))">  <!-- We need to switch context in order to make key() work -->
-    <xsl:variable name="local.l10n.dingbat"
-                  select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:dingbat[@key=$dingbat])[1]"/>
+  <xsl:for-each select="$l10n.xml">  <!-- We need to switch context in order to make key() work -->
+    <xsl:for-each select="document(key('l10n-lang', $lang)/@href)">
+      <xsl:variable name="local.l10n.dingbat"
+		    select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:dingbat[@key=$dingbat])[1]"/>
 
-    <xsl:variable name="l10n.dingbat"
-                  select="key('l10n-dingbat', $dingbat)[1]"/>
+      <xsl:variable name="l10n.dingbat"
+		    select="key('l10n-dingbat', $dingbat)[1]"/>
 
-    <xsl:choose>
-      <xsl:when test="$local.l10n.dingbat">
-        <xsl:value-of select="$local.l10n.dingbat/@text"/>
-      </xsl:when>
-      <xsl:when test="$l10n.dingbat">
-        <xsl:value-of select="$l10n.dingbat/@text"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>No "</xsl:text>
-          <xsl:value-of select="$lang"/>
-          <xsl:text>" localization of dingbat </xsl:text>
-          <xsl:value-of select="$dingbat"/>
-          <xsl:text> exists; using "en".</xsl:text>
-        </xsl:message>
-	
-	<xsl:for-each select="document('../common/en.xml')">  <!-- We need to switch context in order to make key() work -->
-	  <xsl:value-of select="key('l10n-dingbat', $dingbat)[1]/@text"/>
-	</xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
+      <xsl:choose>
+	<xsl:when test="$local.l10n.dingbat">
+	  <xsl:value-of select="$local.l10n.dingbat/@text"/>
+	</xsl:when>
+	<xsl:when test="$l10n.dingbat">
+	  <xsl:value-of select="$l10n.dingbat/@text"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:message>
+	    <xsl:text>No "</xsl:text>
+	    <xsl:value-of select="$lang"/>
+	    <xsl:text>" localization of dingbat </xsl:text>
+	    <xsl:value-of select="$dingbat"/>
+	    <xsl:text> exists; using "en".</xsl:text>
+	  </xsl:message>
+
+	  <xsl:for-each select="$l10n.xml">  <!-- We need to switch context in order to make key() work -->
+	    <xsl:for-each select="document(key('l10n-lang', 'en')/@href)">  
+	      <xsl:value-of select="key('l10n-dingbat', $dingbat)[1]/@text"/>
+	    </xsl:for-each>
+	  </xsl:for-each>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:for-each>
 </xsl:template>
 
@@ -390,92 +400,94 @@
   </xsl:param>
   <xsl:param name="verbose" select="1"/>
 
-  <xsl:for-each select="document(concat('../common/', $lang, '.xml'))">  <!-- We need to switch context in order to make key() work -->
-
-    <xsl:variable name="local.localization.node"
-                  select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/>
-
-    <xsl:variable name="localization.node"
-                  select="key('l10n-lang', $lang)[1]"/>
-
-    <xsl:if test="count($localization.node) = 0
-                  and count($local.localization.node) = 0
-                  and $verbose != 0">
-      <xsl:message>
-        <xsl:text>No "</xsl:text>
-        <xsl:value-of select="$lang"/>
-        <xsl:text>" localization exists.</xsl:text>
-      </xsl:message>
-    </xsl:if>
-
-    <xsl:variable name="local.context.node"
-                  select="$local.localization.node/l:context[@name=$context]"/>
-
-    <xsl:variable name="context.node"
-                  select="key('l10n-context', $context)[1]"/>
-
-    <xsl:if test="count($context.node) = 0
-                  and count($local.context.node) = 0
-                  and $verbose != 0">
-      <xsl:message>
-        <xsl:text>No context named "</xsl:text>
-        <xsl:value-of select="$context"/>
-        <xsl:text>" exists in the "</xsl:text>
-        <xsl:value-of select="$lang"/>
-        <xsl:text>" localization.</xsl:text>
-      </xsl:message>
-    </xsl:if>
-
-    <xsl:variable name="local.template.node"
-                  select="($local.context.node/l:template[@name=$name
-                                                          and @style
-                                                          and @style=$xrefstyle]
-                          |$local.context.node/l:template[@name=$name
-                                                          and not(@style)])[1]"/>
-
-    <xsl:for-each select="$context.node">
-      <xsl:variable name="template.node"
-		    select="(key('l10n-template-style', concat($name, '#', $xrefstyle))
-	                     |key('l10n-template', $name))[1]"/>
-
-      <xsl:choose>
-	<xsl:when test="$local.template.node/@text">
-	  <xsl:value-of select="$local.template.node/@text"/>
-	</xsl:when>
-	<xsl:when test="$template.node/@text">
-	  <xsl:value-of select="$template.node/@text"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:choose>
-	    <xsl:when test="contains($name, '/')">
-	      <xsl:call-template name="gentext.template">
-		<xsl:with-param name="context" select="$context"/>
-		<xsl:with-param name="name" select="substring-after($name, '/')"/>
-		<xsl:with-param name="origname" select="$origname"/>
-		<xsl:with-param name="purpose" select="$purpose"/>
-		<xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-		<xsl:with-param name="referrer" select="$referrer"/>
-		<xsl:with-param name="lang" select="$lang"/>
-		<xsl:with-param name="verbose" select="$verbose"/>
-	      </xsl:call-template>
-	    </xsl:when>
-	    <xsl:when test="$verbose = 0">
-	      <!-- silence -->
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:message>
-		<xsl:text>No template for "</xsl:text>
-		<xsl:value-of select="$origname"/>
-		<xsl:text>" (or any of its leaves) exists in the context named "</xsl:text>
-		<xsl:value-of select="$context"/>
-		<xsl:text>" in the "</xsl:text>
-		<xsl:value-of select="$lang"/>
-		<xsl:text>" localization.</xsl:text>
-	      </xsl:message>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:otherwise>
-      </xsl:choose>
+  <xsl:for-each select="$l10n.xml">  <!-- We need to switch context in order to make key() work -->
+    <xsl:for-each select="document(key('l10n-lang', $lang)/@href)">
+
+      <xsl:variable name="local.localization.node"
+		    select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/>
+
+      <xsl:variable name="localization.node"
+		    select="key('l10n-lang', $lang)[1]"/>
+
+      <xsl:if test="count($localization.node) = 0
+		    and count($local.localization.node) = 0
+		    and $verbose != 0">
+	<xsl:message>
+	  <xsl:text>No "</xsl:text>
+	  <xsl:value-of select="$lang"/>
+	  <xsl:text>" localization exists.</xsl:text>
+	</xsl:message>
+      </xsl:if>
+
+      <xsl:variable name="local.context.node"
+		    select="$local.localization.node/l:context[@name=$context]"/>
+
+      <xsl:variable name="context.node"
+		    select="key('l10n-context', $context)[1]"/>
+
+      <xsl:if test="count($context.node) = 0
+		    and count($local.context.node) = 0
+		    and $verbose != 0">
+	<xsl:message>
+	  <xsl:text>No context named "</xsl:text>
+	  <xsl:value-of select="$context"/>
+	  <xsl:text>" exists in the "</xsl:text>
+	  <xsl:value-of select="$lang"/>
+	  <xsl:text>" localization.</xsl:text>
+	</xsl:message>
+      </xsl:if>
+
+      <xsl:variable name="local.template.node"
+		    select="($local.context.node/l:template[@name=$name
+							    and @style
+							    and @style=$xrefstyle]
+			    |$local.context.node/l:template[@name=$name
+							    and not(@style)])[1]"/>
+
+      <xsl:for-each select="$context.node">
+	<xsl:variable name="template.node"
+		      select="(key('l10n-template-style', concat($name, '#', $xrefstyle))
+			       |key('l10n-template', $name))[1]"/>
+
+	<xsl:choose>
+	  <xsl:when test="$local.template.node/@text">
+	    <xsl:value-of select="$local.template.node/@text"/>
+	  </xsl:when>
+	  <xsl:when test="$template.node/@text">
+	    <xsl:value-of select="$template.node/@text"/>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:choose>
+	      <xsl:when test="contains($name, '/')">
+		<xsl:call-template name="gentext.template">
+		  <xsl:with-param name="context" select="$context"/>
+		  <xsl:with-param name="name" select="substring-after($name, '/')"/>
+		  <xsl:with-param name="origname" select="$origname"/>
+		  <xsl:with-param name="purpose" select="$purpose"/>
+		  <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+		  <xsl:with-param name="referrer" select="$referrer"/>
+		  <xsl:with-param name="lang" select="$lang"/>
+		  <xsl:with-param name="verbose" select="$verbose"/>
+		</xsl:call-template>
+	      </xsl:when>
+	      <xsl:when test="$verbose = 0">
+		<!-- silence -->
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:message>
+		  <xsl:text>No template for "</xsl:text>
+		  <xsl:value-of select="$origname"/>
+		  <xsl:text>" (or any of its leaves) exists in the context named "</xsl:text>
+		  <xsl:value-of select="$context"/>
+		  <xsl:text>" in the "</xsl:text>
+		  <xsl:value-of select="$lang"/>
+		  <xsl:text>" localization.</xsl:text>
+		</xsl:message>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:for-each>
     </xsl:for-each>
   </xsl:for-each>
 </xsl:template>
@@ -512,5 +524,4 @@
   </xsl:choose>
 </xsl:template>
 
-</xsl:stylesheet>
-
+</xsl:stylesheet>
\ No newline at end of file