From bf3b7cf3ad1e1890e4176e1407216cd5c366526c Mon Sep 17 00:00:00 2001
From: Poltern <2363951+Poltern@users.noreply.github.com>
Date: Thu, 1 Feb 2024 22:22:41 +0500
Subject: [PATCH] Rendering: some utf-8 fixes

---
 Makefile                            |  2 +-
 stylesheets/dump-commands.xsl       | 11 +++++------
 stylesheets/lfs-xsl/chunk-slave.xsl | 11 ++++++++---
 stylesheets/lfs-xsl/nochunks.xsl    |  7 +++++++
 stylesheets/lfs-xsl/pdf.xsl         |  4 ++--
 stylesheets/lfs-xsl/profile.xsl     |  1 +
 stylesheets/md5sum.xsl              |  5 ++---
 stylesheets/wget-list.xsl           |  5 ++---
 8 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 6de06f4..08effcd 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ nochunks: validate profile-html
                 $(RENDERTMP)/lfs-html.xml
 
 	@echo "Running Tidy..."
-	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || test $$? -le 1
 
 	@echo "Running obfuscate.sh..."
 	$(Q)bash obfuscate.sh                                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
diff --git a/stylesheets/dump-commands.xsl b/stylesheets/dump-commands.xsl
index 48af34c..83e24df 100644
--- a/stylesheets/dump-commands.xsl
+++ b/stylesheets/dump-commands.xsl
@@ -1,14 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:exsl="http://exslt.org/common"
-    extension-element-prefixes="exsl"
-    version="1.0">
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="exsl"
+                version="1.0">
 
 <!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
 
   <xsl:variable name="newline">
-    <xsl:text>
-</xsl:text>
+    <xsl:text>&#xA;</xsl:text>
   </xsl:variable>
 
   <xsl:template match="/">
diff --git a/stylesheets/lfs-xsl/chunk-slave.xsl b/stylesheets/lfs-xsl/chunk-slave.xsl
index f5bc8a9..45d33e0 100644
--- a/stylesheets/lfs-xsl/chunk-slave.xsl
+++ b/stylesheets/lfs-xsl/chunk-slave.xsl
@@ -10,6 +10,14 @@
   <!-- Upstream XHTML presentation templates -->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
 
+  <xsl:param name="chunker.output.method" select="'xml'"/>
+  <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
+  <xsl:param name="chunker.output.media-type" select="'application/xhtml+xml'"/>
+  <xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Strict//EN'"/>
+  <xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'"/>
+  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
+  <xsl:param name="chunker.output.indent" select="'no'"/>
+
   <!-- Including our customized elements templates -->
   <xsl:include href="common.xsl"/>
   <xsl:include href="xhtml/lfs-admon.xsl"/>
@@ -31,9 +39,6 @@
   <xsl:param name="ulink.target" select="''"/>
   <xsl:param name="css.decoration" select="0"/>
 
-  <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
-
   <!-- Control generation of ToCs and LoTs -->
   <xsl:param name="generate.toc">
     book      toc,title
diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl
index 5a5ad36..896449d 100644
--- a/stylesheets/lfs-xsl/nochunks.xsl
+++ b/stylesheets/lfs-xsl/nochunks.xsl
@@ -10,6 +10,13 @@
   <!-- Upstream XHTML templates -->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
 
+  <xsl:output method="xml"
+              encoding="UTF-8"
+              media-type="application/xhtml+xml"
+              doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+              omit-xml-declaration="yes"
+              indent="no" />
   <!-- Include our customized templates -->
   <xsl:include href="common.xsl"/>
   <xsl:include href="xhtml/lfs-index.xsl"/>
diff --git a/stylesheets/lfs-xsl/pdf.xsl b/stylesheets/lfs-xsl/pdf.xsl
index b675fde..3548688 100644
--- a/stylesheets/lfs-xsl/pdf.xsl
+++ b/stylesheets/lfs-xsl/pdf.xsl
@@ -53,8 +53,8 @@
        We have expanded the support to several inline tags.
        See pdf/lfs-mixed.xsl.
        Note: the argument in select= is a zero-width space
-       (unicode 200b, encoded in utf-8)-->
-  <xsl:param name="ulink.hyphenate" select="'?'"/>
+       (unicode 200b)-->
+  <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
 
   <!-- List of characters to allow ulink URLs, and supported inline tags,
        to be automatically hyphenated on.
diff --git a/stylesheets/lfs-xsl/profile.xsl b/stylesheets/lfs-xsl/profile.xsl
index a19d924..80c9b01 100644
--- a/stylesheets/lfs-xsl/profile.xsl
+++ b/stylesheets/lfs-xsl/profile.xsl
@@ -18,6 +18,7 @@
 
   <!-- Generate DocBook instance with correct DOCTYPE -->
   <xsl:output method="xml"
+              encoding="UTF-8"
               doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
               doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
 
diff --git a/stylesheets/md5sum.xsl b/stylesheets/md5sum.xsl
index bb72682..57723df 100644
--- a/stylesheets/md5sum.xsl
+++ b/stylesheets/md5sum.xsl
@@ -3,7 +3,7 @@
 <!-- Create a md5 list for packages and patches used. -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
+                version="1.0">
 
   <xsl:output method="text"/>
 
@@ -31,8 +31,7 @@
       </xsl:call-template>
 
       <!-- Add a newline -->
-      <xsl:text>
-</xsl:text>
+      <xsl:text>&#xA;</xsl:text>
 
     </xsl:if>
   </xsl:template>
diff --git a/stylesheets/wget-list.xsl b/stylesheets/wget-list.xsl
index aa8d263..eca53a4 100644
--- a/stylesheets/wget-list.xsl
+++ b/stylesheets/wget-list.xsl
@@ -4,7 +4,7 @@
      with wget. -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
+                version="1.0">
 
   <xsl:output method="text"/>
 
@@ -28,8 +28,7 @@
           <xsl:value-of select="@url"/>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:text>
-</xsl:text>
+      <xsl:text>&#xA;</xsl:text>
     </xsl:if>
   </xsl:template>