Fix generator metadata

Formerly, existing generator metadata was preserved and also duplicated
in the tag added by ⛩📰 书社. It only makes sense to do one or the
other.

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 67ddb882cb1526ea98a76922eec3babb6074ef55..c0e989b60e4ecd48d1253d53a2c44c9c2e8aee15 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -178,14 +178,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </xslt:template>
                        <xslt:template name="书社:wrap">
                                <xslt:param name="nodes" select="/.."/>
                        </xslt:template>
                        <xslt:template name="书社:wrap">
                                <xslt:param name="nodes" select="/.."/>

-                               <xslt:variable name="modalinput">
+                               <xslt:variable name="modalinput-fragment">

                                        <xslt:copy-of select="$nodes"/>
                                        <xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
                                </xslt:variable>
                                        <xslt:copy-of select="$nodes"/>
                                        <xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
                                </xslt:variable>

-                               <xslt:variable name="metadata">
+                               <xslt:variable name="modalinput" select="exsl:node-set($modalinput-fragment)"/>
+                               <xslt:variable name="metadata-fragment">

                                        <xslt:copy-of select="$nodes[self::html:html]/html:head/node()|$nodes[self::html:head]/node()"/>
                                        <xslt:copy-of select="$nodes[self::html:html]/html:head/node()|$nodes[self::html:head]/node()"/>

-                                       <xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:metadata"/>
+                                       <xslt:apply-templates select="$modalinput/node()" mode="书社:metadata"/>

                                </xslt:variable>
                                </xslt:variable>

+                               <xslt:variable name="metadata" select="exsl:node-set($metadata-fragment)"/>

                                <html:html>
                                        <xslt:copy-of select="$nodes[self::html:html]/@*"/>
                                        <xslt:if test="not($nodes[self::html:html]/@书社:archived-as) and $nodes/@书社:archived-as">
                                <html:html>
                                        <xslt:copy-of select="$nodes[self::html:html]/@*"/>
                                        <xslt:if test="not($nodes[self::html:html]/@书社:archived-as) and $nodes/@书社:archived-as">


@@ -206,7 +208,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <html:head>
                                                <xslt:copy-of select="$nodes[self::html:html]/html:head/@*|$nodes[self::html:head]/@*"/>
                                                <html:title>
                                        <html:head>
                                                <xslt:copy-of select="$nodes[self::html:html]/html:head/@*|$nodes[self::html:head]/@*"/>
                                                <html:title>

-                                                       <xslt:for-each select="exsl:node-set($metadata)/html:title">
+                                                       <xslt:for-each select="$metadata/html:title">

                                                                <xslt:value-of select="."/>
                                                                <xslt:if test="position()!=last()">
                                                                        <xslt:text>
                                                                <xslt:value-of select="."/>
                                                                <xslt:if test="position()!=last()">
                                                                        <xslt:text>


@@ -215,10 +217,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </xslt:if>
                                                        </xslt:for-each>
                                                </html:title>
                                                                </xslt:if>
                                                        </xslt:for-each>
                                                </html:title>

-                                               <xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::html:title)]"/>
+                                               <xslt:copy-of select="$metadata/node()[not(self::html:title or self::html:meta and @name='generator')]"/>

                                                <html:meta name="generator">
                                                        <xslt:attribute name="content">
                                                <html:meta name="generator">
                                                        <xslt:attribute name="content">

-                                                               <xslt:for-each select="exsl:node-set($metadata)/html:meta[@name='generator']">
+                                                               <xslt:for-each select="$metadata/html:meta[@name='generator']">

                                                                        <xslt:value-of select="@content"/>
                                                                        <xslt:text>
                                                                                <text>, </text>
                                                                        <xslt:value-of select="@content"/>
                                                                        <xslt:text>
                                                                                <text>, </text>


@@ -241,9 +243,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </html:head>
                                        <html:body>
                                                <xslt:copy-of select="$nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*"/>
                                        </html:head>
                                        <html:body>
                                                <xslt:copy-of select="$nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*"/>

-                                               <xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:header"/>
+                                               <xslt:apply-templates select="$modalinput/node()" mode="书社:header"/>

                                                <xslt:copy-of select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()"/>
                                                <xslt:copy-of select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()"/>

-                                               <xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:footer"/>
+                                               <xslt:apply-templates select="$modalinput/node()" mode="书社:footer"/>

                                        </html:body>
                                </html:html>
                        </xslt:template>
                                        </html:body>
                                </html:html>
                        </xslt:template>