Changeset 0432a3a

Timestamp:

01/14/2024 09:36:12 PM (4 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

b8194e0

Parents:

855d0c9

Message:

Generate utf-8 for lfs-nochunks too

This involves:

• removing the <xsl:output ...> element from nochunks.xsl
• adding a sed for rmoving the invalid xmlns:xlink attribute
• removing the sed for "&copy;"

Files:

• Makefile (modified) (2 diffs)
• stylesheets/lfs-xsl/nochunks.xsl (modified) (1 diff)

Makefile

@@ -102 +102 @@
 #                $(RENDERTMP)/lfs-html2.xml
 
+        $(Q)sed 's/xmlns:xlink.*xlink"//' -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
         @echo "Running Tidy..."
         $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@@ -110 +111 @@
         $(Q)sed -i -e "s@../wget-list@wget-list@"            $(BASEDIR)/$(NOCHUNKS_OUTPUT)
         $(Q)sed -i -e "s@../md5sums@md5sums@"                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-        $(Q)sed -i -e "s@\xa9@\©@"                      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
         @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"

stylesheets/lfs-xsl/nochunks.xsl

@@ -10 +10 @@
   <!-- Upstream XHTML templates -->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-
-  <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
-  <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
 
   <!-- Include our customized templates -->