aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pierre.labastie@neuf.fr>2024-01-14 22:36:12 +0100
committerPierre Labastie <pierre.labastie@neuf.fr>2024-01-14 22:36:12 +0100
commit0432a3a1a8cb9090408e0359ec16d1222bda6d7a (patch)
tree3c578cfe52d5944393ef0e9cecf9186440c7b784
parent855d0c957459a7015fbfcecdcc006e2fa251e104 (diff)
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;"
-rw-r--r--Makefile2
-rw-r--r--stylesheets/lfs-xsl/nochunks.xsl3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 00eeb2748..433bb86da 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ nochunks: validate profile-html
$(RENDERTMP)/lfs-html.xml
# $(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
@@ -109,7 +110,6 @@ nochunks: validate profile-html
$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(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@\&copy;@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl
index 3ff0ebc72..351c6dbb3 100644
--- a/stylesheets/lfs-xsl/nochunks.xsl
+++ b/stylesheets/lfs-xsl/nochunks.xsl
@@ -10,9 +10,6 @@
<!-- 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 -->
<xsl:include href="common.xsl"/>
<xsl:include href="xhtml/lfs-index.xsl"/>