Changeset 4a9c50a

Timestamp:

01/18/2024 09:47:51 AM (4 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

6c100fb

Parents:

0632116 (diff), 270b173 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• Makefile (modified) (3 diffs)
• stylesheets/lfs-xsl/xhtml/lfs-index.xsl (modified) (1 diff)

Makefile

@@ -49 +49 @@
 endif
 
-# https://github.com/docbook/xslt10-stylesheets/issues/239
-SED_XMLNS_XLINK = sed -i 's/xmlns:xlink.*xlink"//'
-
 book: validate profile-html
         @echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
@@ -65 +62 @@
         $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
         $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
-        $(Q)$(SED_XMLNS_XLINK) $(BASEDIR)/longindex.html
 
         $(Q)mkdir -p $(BASEDIR)/images
@@ -118 +114 @@
 #                $(RENDERTMP)/lfs-html2.xml
 
-        $(Q)$(SED_XMLNS_XLINK) $(BASEDIR)/$(NOCHUNKS_OUTPUT)
         @echo "Running Tidy..."
         $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true

stylesheets/lfs-xsl/xhtml/lfs-index.xsl

@@ -23 +23 @@
   <xsl:template match="index" mode="recursive-chunk-filename">
     <xsl:text>longindex.html</xsl:text>
+  </xsl:template>
+
+  <!-- The original template in {docbook-xsl}/xhtml/autoidx.xsl has
+  a bug (https://github.com/docbook/xslt10-stylesheets/issues/239)
+  that generates a <div> with a wrong xmlns:xlink attribute. So copy it
+  here where the bug does not occur, (and simplify it a lot).-->
+
+  <xsl:template name="generate-basic-index">
+    <xsl:param name="scope" select="NOTANODE"/>
+
+    <xsl:variable name="terms" select="//indexterm
+      [count(.|key('letter',
+                   translate(substring(&primary;, 1, 1),
+                             &lowercase;,
+                             &uppercase;
+                            )
+                  ) [&scope;][1]) = 1]"/>
+    <div class="index">
+      <xsl:apply-templates select="$terms" mode="index-div-basic">
+        <xsl:with-param name="position" select="position()"/>
+        <xsl:with-param name="scope" select="$scope"/>
+        <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
+      </xsl:apply-templates>
+    </div>
   </xsl:template>