Explicitly declare UTF-8 output for all transforms

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 65f5f0f1487ce7b77618a78e35058f38ea85f3d0..3339062968fce1faf72cc637f903f6bbdeb2c1c5 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -16,6 +16,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"
+       xmlns:svg="http://www.w3.org/2000/svg"
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
@@ -114,19 +115,14 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <xslt:template match="text()" mode="书社:metadata"/>
                        <xslt:template match="/" mode="书社:wrap">
                                <xslt:variable name="metadata">
-                                       <xslt:copy-of select="html/head/*"/>
+                                       <xslt:copy-of select="html:html/html:head/*"/>
                                        <xslt:apply-templates select="." mode="书社:metadata"/>
                                        <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
                                </xslt:variable>
                                <html:html>
-                                       <xslt:copy-of select="html:html/@*"/>
+                                       <xslt:copy-of select="html:html/@*|*/@xml:lang|html:*/@lang|svg:*/@lang"/>
                                        <html:head>
                                                <xslt:copy-of select="html:html/html:head/@*"/>
-                                               <html:script type="text/plain">
-                                                       <xslt:text>buildtime=</xslt:text><xslt:value-of select="$buildtime"/><xslt:text>&#xA;</xslt:text>
-                                                       <xslt:text>srctime=</xslt:text><xslt:value-of select="$srctime"/><xslt:text>&#xA;</xslt:text>
-                                                       <xslt:text>path=</xslt:text><xslt:value-of select="$path"/><xslt:text>&#xA;</xslt:text>
-                                               </html:script>
                                                <html:title>
                                                        <xslt:for-each select="exsl:node-set($metadata)/html:title">
                                                                <xslt:value-of select="."/>
@@ -138,6 +134,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </xslt:if>
                                        </html:head>
                                        <html:body>
+                                               <xslt:copy-of select="html:html/html:body/@*|html:body/@*"/>
                                                <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:header"/>
                                                <xslt:apply-templates select="." mode="书社:header"/>
                                                <xslt:copy-of select="*[not(self::html:html or self::html:body)]|html:html/*[not(self::html:head or self::html:body)]|html:html/html:body/*|html:body/*"/>
@@ -149,4 +146,5 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea"/>
                </xslt:transform>
        </template>
+       <output method="xml" encoding="UTF-8"/>
 </transform>