Better wrapper support for plural result trees

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 22e71c88b7962baa8d7e37986bbd9b509d8cbdd0..1d36bb1ed9afa8b72facdd8885fcc3a73014b77b 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:copy-of select="html:html/html:head/node()"/>
+                                       <xslt:copy-of select="html:html/html:head/node()|html:head/node()"/>
                                        <xslt:apply-templates select="." mode="书社:metadata"/>
                                        <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
                                </xslt:variable>
@@ -132,15 +132,25 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                        <xslt:value-of select="$VERSION"/>
                                                </xslt:attribute>
                                        </xslt:if>
-                                       <xslt:copy-of select="html:html/@*|*/@xml:lang|html:*/@lang|svg:*/@lang"/>
+                                       <xslt:copy-of select="html:html/@*"/>
+                                       <xslt:if test="not(html:html/@lang) and (html:*/@lang|svg:*/@lang|*/@xml:lang)">
+                                               <xslt:attribute name="lang">
+                                                       <xslt:value-of select="html:*/@lang|svg:*/@lang|*/@xml:lang"/>
+                                               </xslt:attribute>
+                                       </xslt:if>
+                                       <xslt:if test="not(html:html/@xml:lang) and (html:*/@lang|svg:*/@lang|*/@xml:lang)">
+                                               <xslt:attribute name="xml:lang">
+                                                       <xslt:value-of select="html:*/@lang|svg:*/@lang|*/@xml:lang"/>
+                                               </xslt:attribute>
+                                       </xslt:if>
                                        <html:head>
-                                               <xslt:copy-of select="html:html/html:head/@*"/>
+                                               <xslt:copy-of select="html:html/html:head/@*|html:head/@*"/>
                                                <html:title>
                                                        <xslt:for-each select="exsl:node-set($metadata)/html:title">
                                                                <xslt:value-of select="."/>
                                                        </xslt:for-each>
                                                </html:title>
-                                               <xslt:copy-of select="exsl:node-set($metadata)/node()[self::comment() or self::* and not(self::html:title)]"/>
+                                               <xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::*) or not(self::html:title)]"/>
                                                <xslt:if test="not(exsl:node-set($metadata)/html:meta[@name='generator'])">
                                                        <html:meta name="generator">
                                                                <xslt:attribute name="content">
@@ -158,7 +168,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="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:copy-of select="node()[not(self::html:html or self::html:head 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>