Copy all nodes, not just elements, in transform

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 953a68352239f7ad0d76ea24f6f5a3a0a89d28d2..22e71c88b7962baa8d7e37986bbd9b509d8cbdd0 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -122,7 +122,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:html/html:head/*"/>
+                                       <xslt:copy-of select="html:html/html:head/node()"/>

                                        <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>


@@ -158,7 +158,7 @@ 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:body/@*|html:body/@*"/>
                                                <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:header"/>
                                                <xslt:apply-templates select="." mode="书社:header"/>
                                                <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:copy-of select="node()[not(self::html:html or self::html:body)]|html:html/node()[not(self::html:head or self::html:body)]|html:html/html:body/node()|html:body/node()"/>

                                                <xslt:apply-templates select="." mode="书社:footer"/>
                                                <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:footer"/>
                                        </html:body>
                                                <xslt:apply-templates select="." mode="书社:footer"/>
                                                <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:footer"/>
                                        </html:body>