Copy over existing <html:body> attributes

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 65f5f0f1487ce7b77618a78e35058f38ea85f3d0..ba3cd50c8cf97fabc73c2da73d1881057cbfc198 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -114,7 +114,7 @@ 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: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>
                                        <xslt:apply-templates select="." mode="书社:metadata"/>
                                        <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
                                </xslt:variable>


@@ -122,11 +122,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:copy-of select="html:html/@*"/>
                                        <html:head>
                                                <xslt:copy-of select="html:html/html:head/@*"/>
                                        <xslt:copy-of select="html:html/@*"/>
                                        <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="."/>
                                                <html:title>
                                                        <xslt:for-each select="exsl:node-set($metadata)/html:title">
                                                                <xslt:value-of select="."/>


@@ -138,6 +133,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: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/*"/>
                                                <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/*"/>