Use dblatex param instead of LaTeX editing to set charset encoding to UTF-8.

diff --git a/Makefile b/Makefile
index 8b9926ceaf6dd2bcdfd9e3c83f35a6e58fe4a7e4..a36377c9ee30968951f7510762c5f1efd213a782 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,7 @@ epub: $(SOURCE).epub
 # handled by LaTeX/dblatex, see <URL: https://bugs.debian.org/889603 >.
 %.tex: %.xml
        dblatex -T simple -t tex -b xetex -p extra/pdf.xsl $^
 # handled by LaTeX/dblatex, see <URL: https://bugs.debian.org/889603 >.
 %.tex: %.xml
        dblatex -T simple -t tex -b xetex -p extra/pdf.xsl $^

-       perl -p -i -e 's/\[latin1\]\{inputenc\}/[utf8]{inputenc}/; \
-               s/\\caption\\end/\\caption{} \\end/; \
+       perl -p -i -e 's/\\caption\\end/\\caption{} \\end/; \

                s/ / /g; \
                s/\\chapter\{(Colophon|Dedication)\}/\\chapter*{}/; \
                s/\\chapter\{(Foreword|Prefacio|Forord|Introduction|Introducción|Introduksjon)\}/\\chapter*{$$1} \\addcontentsline{toc}{chapter}{$$1}/; \
                s/ / /g; \
                s/\\chapter\{(Colophon|Dedication)\}/\\chapter*{}/; \
                s/\\chapter\{(Foreword|Prefacio|Forord|Introduction|Introducción|Introduksjon)\}/\\chapter*{$$1} \\addcontentsline{toc}{chapter}{$$1}/; \

diff --git a/extra/pdf.xsl b/extra/pdf.xsl
index 5703ef26fd2eeb8d88d082a15ee882041e07c9bf..1192e51b9d183449922bc01a70825751db19f00f 100644 (file)
--- a/extra/pdf.xsl
+++ b/extra/pdf.xsl
@@ -15,6 +15,8 @@
   <xsl:param name="double.sided">1</xsl:param>
   <xsl:param name="latex.class.options">openright,twoside</xsl:param>
 
   <xsl:param name="double.sided">1</xsl:param>
   <xsl:param name="latex.class.options">openright,twoside</xsl:param>
 

+  <xsl:param name="latex.encoding">utf8</xsl:param>
+

   <!-- do not list figures -->
   <xsl:param name="doc.lot.show">example</xsl:param>
 
   <!-- do not list figures -->
   <xsl:param name="doc.lot.show">example</xsl:param>