Changeset 1df87ee

Timestamp:

01/15/2024 08:47:56 AM (3 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, ken/TL2024, lazarus, plabs/newcss, rahul/power-profiles-daemon, trunk, xry111/llvm18

Children:

12dc86b

Parents:

ce402041

Message:

Output the book in utf-8 encoding

Also fix doctype being removed by tidy in longindex by removing a wrong
attribute (xmlns:xlink) in a div element in the index.

Files:

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

Makefile

@@ -109 +109 @@
                 stylesheets/blfs-chunked.xsl               \
                 $(RENDERTMP)/$(BLFSHTML)
+        $(Q)sed -i 's/xmlns:xlink.*xlink"//' $(BASEDIR)/longindex.html
 
         @echo "Copying CSS code and images..."
@@ -142 +143 @@
                 stylesheets/blfs-nochunks.xsl          \
                 $(RENDERTMP)/$(BLFSHTML)
+        $(Q)sed -i 's/xmlns:xlink.*xlink"//' $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
         @echo "Running Tidy and obfuscate.sh on non-chunked XHTML..."

stylesheets/lfs-xsl/chunk-slave.xsl

@@ -10 +10 @@
     <!-- Upstream XHTML presentation templates -->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-
-    <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
 
     <!-- Including our customized elements templates -->

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" />
 
    <!-- Including our others customized templates -->

tidy.conf

@@ -5 +5 @@
 wrap: 78
 tab-size: 8
-input-encoding: latin1
-output-encoding: latin1
 newline: LF
 write-back: yes