Removed unnecessary generate-index-from-terms template in

favor of generate-index with scope parameter.

diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index 41803d2c6f6b76c7b2fd76dbcfe8fc5a196b41ee..eaf8ab690db16063332dd605be9a602e2a6ad7ff 100644 (file)
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -34,6 +34,7 @@
 
 <!ENTITY section.id 'generate-id(&section;)'>
 <!ENTITY sep '" "'>
+<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
@@ -85,54 +86,19 @@
 
 <xsl:key name="sections" match="*[@id]" use="@id"/>
 
-<!-- The obvious way to implement generate-index, generate-setindex, and
-     generate-index-from-terms would be to pass the root node for term
-     selection as a parameter. But if you do that, Saxon says:
-
-     java.lang.UnsupportedOperationException: Cannot create intensional
-       node-set with context dependencies: class com.icl.saxon.expr.PathExpression:128
-       at com.icl.saxon.expr.NodeSetIntent.<init>(NodeSetIntent.java:26)
-       ...
-
-     I can't decide if that's a Saxon bug or an XSLT limitation. But I want
-     to avoid it in either event. -->
-
 <xsl:template name="generate-index">
-  <xsl:variable name="scope" select="(ancestor::book|/)[last()]"/>
-  <xsl:variable name="terms"
-                select="(ancestor::book|/)[last()]//indexterm[count(.|key('letter',
-                                                translate(substring(&primary;, 1, 1),
-                                                          &lowercase;,
-                                                          &uppercase;))[1]) = 1
-                                    and not(@class = 'endofrange')]"/>
-  <xsl:call-template name="generate-index-from-terms">
-    <xsl:with-param name="terms" select="$terms"/>
-    <xsl:with-param name="scope" select="$scope"/>
-  </xsl:call-template>
-</xsl:template>
+  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
 
-<xsl:template name="generate-setindex">
-  <xsl:variable name="scope" select="/"/>
   <xsl:variable name="terms"
                 select="//indexterm[count(.|key('letter',
                                                 translate(substring(&primary;, 1, 1),
                                                           &lowercase;,
-                                                          &uppercase;))[1]) = 1
+                                                          &uppercase;))[&scope;][1]) = 1
                                     and not(@class = 'endofrange')]"/>
-  <xsl:call-template name="generate-index-from-terms">
-    <xsl:with-param name="terms" select="$terms"/>
-    <xsl:with-param name="scope" select="$scope"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="generate-index-from-terms">
-  <xsl:param name="terms"/>
-  <xsl:param name="scope"/>
 
   <xsl:variable name="alphabetical"
                 select="$terms[contains(concat(&lowercase;, &uppercase;),
                                         substring(&primary;, 1, 1))]"/>
-
   <xsl:variable name="others" select="$terms[not(contains(concat(&lowercase;,
                                                  &uppercase;),
                                              substring(&primary;, 1, 1)))]"/>
@@ -146,7 +112,7 @@
         </h3>
         <dl>
           <xsl:apply-templates select="$others[count(.|key('primary',
-                                       &primary;)[ancestor::* = $scope][1]) = 1]"
+                                       &primary;)[&scope;][1]) = 1]"
                                mode="index-symbol-div">
             <xsl:with-param name="scope" select="$scope"/>
             <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
@@ -155,7 +121,7 @@
       </div>
     </xsl:if>
     <xsl:apply-templates select="$alphabetical[count(.|key('letter',
-                                 translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[ancestor::* = $scope][1]) = 1]"
+                                 translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[&scope;][1]) = 1]"
                          mode="index-div">
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
@@ -167,14 +133,15 @@
   <xsl:param name="scope" select="."/>
 
   <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-  <xsl:variable name="terms" select="key('letter', $key)[ancestor::* = $scope][count(.|key('primary', &primary;)[1]) = 1]"/>
 
   <div class="indexdiv">
-    <h3>
-      <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
-    </h3>
+    <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
+      <h3>
+        <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
+      </h3>
+    </xsl:if>
     <dl>
-      <xsl:apply-templates select="$terms"
+      <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
                            mode="index-primary">
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
@@ -184,10 +151,10 @@
 </xsl:template>
 
 <xsl:template match="indexterm" mode="index-symbol-div">
-  <xsl:param name="scope" select="."/>
-
+  <xsl:param name="scope" select="/"/>
+  
   <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-  <xsl:apply-templates select="key('letter', $key)[count(.|key('primary', &primary;)[ancestor::* = $scope][1]) = 1]"
+  <xsl:apply-templates select="key('letter', $key)[count(.|key('primary', &primary;)[&scope;][1]) = 1]"
                        mode="index-primary">
     <xsl:with-param name="scope" select="$scope"/>
     <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
@@ -198,37 +165,34 @@
   <xsl:param name="scope" select="."/>
 
   <xsl:variable name="key" select="&primary;"/>
-  <xsl:variable name="refs" select="key('primary', $key)[ancestor::* = $scope]"/>
-
+  <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
   <dt>
     <xsl:value-of select="primary"/>
-
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[ancestor::* = $scope][1])]">
+    <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
       <xsl:apply-templates select="." mode="reference">
         <xsl:with-param name="scope" select="$scope"/>
       </xsl:apply-templates>
     </xsl:for-each>
 
     <xsl:if test="$refs[not(secondary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[ancestor::* = $scope][1])]"
+      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[&scope;][1])]"
                            mode="index-see">
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
       </xsl:apply-templates>
     </xsl:if>
   </dt>
-
   <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::seealso]">
     <dd>
       <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[ancestor::* = $scope][1])]"
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[&scope;][1])]"
                              mode="index-seealso">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
         </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[ancestor::* = $scope][1]) = 1]" 
+        <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]" 
                              mode="index-secondary">
-         <xsl:with-param name="scope" select="$scope"/>
+          <xsl:with-param name="scope" select="$scope"/>
           <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
         </xsl:apply-templates>
       </dl>
@@ -240,34 +204,32 @@
   <xsl:param name="scope" select="."/>
 
   <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-  <xsl:variable name="refs" select="key('secondary', $key)"/>
-
+  <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
   <dt>
     <xsl:value-of select="secondary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[ancestor::* = $scope][1])]">
+    <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
       <xsl:apply-templates select="." mode="reference">
         <xsl:with-param name="scope" select="$scope"/>
       </xsl:apply-templates>
     </xsl:for-each>
 
     <xsl:if test="$refs[not(tertiary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[ancestor::* = $scope][1])]"
+      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[&scope;][1])]"
                            mode="index-see">
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
       </xsl:apply-templates>
     </xsl:if>
   </dt>
-
   <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::seealso]">
     <dd>
       <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[ancestor::* = $scope][1])]"
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[&scope;][1])]"
                              mode="index-seealso">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
         </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[ancestor::* = $scope][1]) = 1]"
+        <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]" 
                              mode="index-tertiary">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
@@ -281,34 +243,32 @@
   <xsl:param name="scope" select="."/>
 
   <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)"/>
-
+  <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/>
   <dt>
     <xsl:value-of select="tertiary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[ancestor::* = $scope][1])]">
+    <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
       <xsl:apply-templates select="." mode="reference">
         <xsl:with-param name="scope" select="$scope"/>
       </xsl:apply-templates>
     </xsl:for-each>
 
     <xsl:if test="$refs/see">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[ancestor::* = $scope][1])]"
+      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[&scope;][1])]"
                            mode="index-see">
         <xsl:with-param name="scope" select="$scope"/>
         <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
       </xsl:apply-templates>
     </xsl:if>
   </dt>
-
   <xsl:if test="$refs/seealso">
     <dd>
       <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[ancestor::* = $scope][1])]"
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[&scope;][1])]"
                              mode="index-see">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
         </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[ancestor::* = $scope][1])]"
+        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[&scope;][1])]"
                              mode="index-seealso">
           <xsl:with-param name="scope" select="$scope"/>
          <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
@@ -327,7 +287,7 @@
     <xsl:when test="@zone and string(@zone)">
       <xsl:call-template name="reference">
         <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="scope" select="$scope"/>
+          <xsl:with-param name="scope" select="$scope"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
@@ -345,8 +305,8 @@
         <xsl:value-of select="$title"/> <!-- text only -->
       </a>
 
-      <xsl:if test="key('endofrange', @id)">
-        <xsl:apply-templates select="key('endofrange', @id)[ancestor::* = $scope][last()]"
+      <xsl:if test="key('endofrange', @id)[&scope;]">
+        <xsl:apply-templates select="key('endofrange', @id)[&scope;][last()]"
                              mode="reference">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="separator" select="'-'"/>
@@ -363,7 +323,7 @@
   <xsl:choose>
     <xsl:when test="contains($zones, ' ')">
       <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('sections', $zone)[ancestor::* = $scope]"/>
+      <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
 
       <a>
         <xsl:attribute name="href">
@@ -381,7 +341,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('sections', $zone)[ancestor::* = $scope]"/>
+      <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
 
       <a>
         <xsl:attribute name="href">
@@ -411,13 +371,13 @@
   <xsl:param name="scope" select="."/>
 
   <dt>
-    <xsl:text>(</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'seealso'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="seealso"/>
-    <xsl:text>)</xsl:text>
+  <xsl:text>(</xsl:text>
+  <xsl:call-template name="gentext">
+    <xsl:with-param name="key" select="'seealso'"/>
+  </xsl:call-template>
+  <xsl:text> </xsl:text>
+  <xsl:value-of select="seealso"/>
+  <xsl:text>)</xsl:text>
   </dt>
 </xsl:template>
 

diff --git a/xsl/html/index.xsl b/xsl/html/index.xsl
index 97162994927a58f16ff245dc33880fdea4aa992e..d54a5a56836362dc4dda277e03921d90dd7eb635 100644 (file)
--- a/xsl/html/index.xsl
+++ b/xsl/html/index.xsl
@@ -33,7 +33,9 @@
       <xsl:apply-templates/>
 
       <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index"/>
+        <xsl:call-template name="generate-index">
+          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
+        </xsl:call-template>
       </xsl:if>
 
       <xsl:if test="not(parent::article)">
@@ -62,7 +64,9 @@
       <xsl:apply-templates/>
 
       <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-setindex"/>
+        <xsl:call-template name="generate-index">
+          <xsl:with-param name="scope" select="/"/>
+        </xsl:call-template>
       </xsl:if>
 
       <xsl:if test="not(parent::article)">