Fix to avoid redeclaring the same XSLT variable twice, which cause

runtime errror. Thanks to Reece Dunn for solving this.


[SVN r22518]

xsl/docbook-layout.xsl

@@ -167,7 +167,17 @@
      </table>
   </xsl:template>
 
-  <!-- table of contents -->
+  <!-- table of contents 
+       
+    The standard Docbook template selects, amoung others,
+    the 'refentry' element for inclusion in TOC. In some
+    cases, this creates empty TOC. The most possible reason
+    is that there's 'refentry' element without 'refentrytitle',
+    but it's a mistery why it occurs. Even if we fix that
+    problem, we'll get non-empty TOC where no TOC is desired
+    (e.g. for section corresponding to each header file in
+    library doc). So, don't bother for now.
+  -->
 
   <xsl:template name="section.toc">
      <xsl:param name="toc-context" select="."/>

xsl/type.xsl

@@ -1075,13 +1075,13 @@ Unknown type element "<xsl:value-of select="local-name(.)"/>" in type.display.na
               select="$value/default/*|$value/default/text()"/>
           </xsl:if>
 
-          <xsl:variable name="end" select="$indentation 
+          <xsl:variable name="end2" select="$indentation 
                                            + string-length($result) 
                                            - string-length($prefix)"/>
 
           <xsl:call-template name="type.enum.list.compact">
             <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="column" select="$end"/>
+            <xsl:with-param name="column" select="$end2"/>
             <xsl:with-param name="values" select="$rest"/>
             <xsl:with-param name="prefix" select="', '"/>
           </xsl:call-template>