Minor updates to comments

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index fe160872ee39699e76db49ccd0da4df5803a8fe4..2c555e32c189c0ade8b54990a7ed439910f40b46 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -4,9 +4,9 @@ SPDX-FileCopyrightText: 2023, 2024 Lady <https://www.ladys.computer/about/#lady>
 SPDX-License-Identifier: MPL-2.0
 -->
 <!--
 SPDX-License-Identifier: MPL-2.0
 -->
 <!--

-⁌ ⛩️📰 书社 ∷ lib/catalog2transform.xslt
+⁌ ⛩📰 书社 ∷ lib/catalog2transform.xslt

 
 

-© 2023–2024 Lady [@ Lady’s Computer].
+© 2023–2024 Lady [@ Ladys Computer].

 
 This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.
 
 This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.


@@ -17,7 +17,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 ]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
 ]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"

-       xmlns:dct="http://purl.org/dc/terms/"

        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"


@@ -29,22 +28,39 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"

+       xmlns:书社vocab="urn:fdc:ladys.computer:20231231:Shu1She4:vocab:"

        exclude-result-prefixes="catalog"
        version="1.0"
 >
        <include href="literally.xslt"/>
        <namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
        <param name="METADATA" select="'about:blank'"/>
        exclude-result-prefixes="catalog"
        version="1.0"
 >
        <include href="literally.xslt"/>
        <namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
        <param name="METADATA" select="'about:blank'"/>

+       <variable name="builddir" select="document($METADATA)//书社vocab:BuildDirectory/@nfo:fileUrl"/>

        <template match="/">
        <template match="/">

+               <variable name="ids">
+                       <for-each select="//catalog:uri[@name]">
+                               <书社:id>
+                                       <value-of select="@name"/>
+                               </书社:id>
+                       </for-each>
+               </variable>
+               <variable name="unique-ids">
+                       <for-each select="exsl:node-set($ids)/*">
+                               <if test="not(preceding-sibling::*[string(.)=string(current())])">
+                                       <copy-of select="."/>
+                               </if>
+                       </for-each>
+               </variable>

                <xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="exsl exslstr" version="1.0">
                        <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
                        <xslt:param name="IDENTIFIER" select="false()"/>
                <xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="exsl exslstr" version="1.0">
                        <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
                        <xslt:param name="IDENTIFIER" select="false()"/>

-                       <xslt:param name="PATH" select="'/unknown'"/>

                        <xslt:param name="SRCREV" select="false()"/>
                        <xslt:param name="THISREV" select="false()"/>
                        <xslt:variable name="书社:source" select="/"/>
                        <xslt:variable name="书社:about-fragment">
                        <xslt:param name="SRCREV" select="false()"/>
                        <xslt:param name="THISREV" select="false()"/>
                        <xslt:variable name="书社:source" select="/"/>
                        <xslt:variable name="书社:about-fragment">

-                               <apply-templates select="document($METADATA)" mode="书社:literally"/>
+                               <apply-templates select="document($METADATA)" mode="书社:literally">
+                                       <with-param name="extension-element-namespaces" select="'http://exslt.org/common http://exslt.org/strings'"/>
+                               </apply-templates>

                        </xslt:variable>
                        <xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
                        <xslt:variable name="书社:expansion-fragment">
                        </xslt:variable>
                        <xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
                        <xslt:variable name="书社:expansion-fragment">


@@ -55,26 +71,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <xslt:apply-templates select="$书社:expansion/node()"/>
                        </xslt:variable>
                        <xslt:variable name="书社:result" select="exsl:node-set($书社:result-fragment)"/>
                                <xslt:apply-templates select="$书社:expansion/node()"/>
                        </xslt:variable>
                        <xslt:variable name="书社:result" select="exsl:node-set($书社:result-fragment)"/>

-                       <xslt:variable name="书社:destination">
-                               <xslt:choose>
-                                       <xslt:when test="string($书社:source/@书社:destination)!=''">
-                                               <xslt:value-of select="$书社:source/@书社:destination"/>
-                                       </xslt:when>
-                                       <xslt:when test="starts-with($PATH, '/')">
-                                               <xslt:value-of select="substring-after($PATH, '/')"/>
-                                       </xslt:when>
-                                       <xslt:otherwise>
-                                               <xslt:value-of select="$PATH"/>
-                                       </xslt:otherwise>
-                               </xslt:choose>
-                       </xslt:variable>
+                       <xslt:variable name="书社:destination" select="string($书社:about//*[@rdf:about=$IDENTIFIER]/@书社vocab:destination)"/>

                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">
                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">

-                                       <if test="contains(@name, ':')">
-                                               <attribute name="书社:id">
-                                                       <value-of select="@name"/>
-                                               </attribute>
-                                       </if>
+                                       <attribute name="书社:id">
+                                               <value-of select="@name"/>
+                                       </attribute>

                                </xslt:include>
                        </for-each>
                        <xslt:template name="书社:apply-attributes">
                                </xslt:include>
                        </for-each>
                        <xslt:template name="书社:apply-attributes">


@@ -141,7 +143,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                        <xslt:choose>
                                                                                <xslt:when test="@namespace-uri='&xml;'"/>
                                                                                <xslt:when test="$context[self::html:* or self::svg:*] and @namespace-uri='' and @local-name='lang'"/>
                                                                        <xslt:choose>
                                                                                <xslt:when test="@namespace-uri='&xml;'"/>
                                                                                <xslt:when test="$context[self::html:* or self::svg:*] and @namespace-uri='' and @local-name='lang'"/>

-                                                                               <xslt:when test="@namespace-uri='&书社;' and @local-name='archived-as' and not($context-nodes/ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)][1][self::书社:archive])"/>
+                                                                               <xslt:when test="@namespace-uri='&书社;' and @local-name='archived-as' and $context-nodes/ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)][position()=1 and not(self::书社:archive)]"/>

                                                                                <xslt:when test="@namespace-uri='&书社;' and (@local-name='destination' or @local-name='disable-output-wrapping' or @local-name='version')"/>
                                                                                <xslt:when test="preceding-sibling::*[@local-name=current()/@local-name and @namespace-uri=current()/@namespace-uri]"/>
                                                                                <xslt:otherwise>
                                                                                <xslt:when test="@namespace-uri='&书社;' and (@local-name='destination' or @local-name='disable-output-wrapping' or @local-name='version')"/>
                                                                                <xslt:when test="preceding-sibling::*[@local-name=current()/@local-name and @namespace-uri=current()/@namespace-uri]"/>
                                                                                <xslt:otherwise>


@@ -190,7 +192,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <xslt:param name="nodes" select="/.."/>
                                <xslt:variable name="modalinput-fragment">
                                        <xslt:copy-of select="$nodes"/>
                                <xslt:param name="nodes" select="/.."/>
                                <xslt:variable name="modalinput-fragment">
                                        <xslt:copy-of select="$nodes"/>

-                                       <xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
+                                       <apply-templates select="exsl:node-set($unique-ids)" mode="书社:literally"/>

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


@@ -237,7 +239,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                        </xslt:text>
                                                                </xslt:for-each>
                                                                <xslt:text>
                                                                        </xslt:text>
                                                                </xslt:for-each>
                                                                <xslt:text>

-                                                                       <text>⛩️📰 书社</text>
+                                                                       <text>⛩📰 书社</text>

                                                                </xslt:text>
                                                                <xslt:if test="$THISREV">
                                                                        <xslt:text>
                                                                </xslt:text>
                                                                <xslt:if test="$THISREV">
                                                                        <xslt:text>


@@ -260,10 +262,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </html:html>
                        </xslt:template>
                        <xslt:template match="/" priority="1">
                                </html:html>
                        </xslt:template>
                        <xslt:template match="/" priority="1">

-                               <xslt:variable name="result-nodes" select="$书社:result/node()[not(self::书社:apply-attributes-to-root)]|$书社:result/书社:apply-attributes-to-root/descendant::node()[not(self::书社:apply-attributes-to-root) and not(ancestor::*[not(self::书社:apply-attributes-to-root)])]"/>
+                               <xslt:variable name="result-nodes" select="$书社:result/node()[not(self::书社:apply-attributes-to-root)]|$书社:result/书社:apply-attributes-to-root//node()[not(self::书社:apply-attributes-to-root) and not(ancestor::*[not(self::书社:apply-attributes-to-root)])]"/>
+                               <xslt:variable name="significant-nodes" select="$result-nodes/descendant-or-self::*[not(self::书社:apply-attributes) and not(ancestor::*[not(self::书社:apply-attributes)])]"/>

                                <xslt:variable name="root-with-attributes">
                                        <xslt:choose>
                                <xslt:variable name="root-with-attributes">
                                        <xslt:choose>

-                                               <xslt:when test="$result-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive']|$result-nodes/@书社:disable-output-wrapping|$书社:result//书社:apply-attributes-to-root/@书社:disable-output-wrapping">
+                                               <xslt:when test="not($significant-nodes/self::html:*) or $significant-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive'] or $significant-nodes/@书社:disable-output-wrapping or $书社:result//书社:apply-attributes-to-root/@书社:disable-output-wrapping">

                                                        <xslt:call-template name="书社:apply-attributes">
                                                                <xslt:with-param name="and-version" select="true()"/>
                                                                <xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>
                                                        <xslt:call-template name="书社:apply-attributes">
                                                                <xslt:with-param name="and-version" select="true()"/>
                                                                <xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>


@@ -291,11 +294,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:apply-templates select="@*|node()"/>
                                </xslt:copy>
                        </xslt:template>
                                        <xslt:apply-templates select="@*|node()"/>
                                </xslt:copy>
                        </xslt:template>

-                       <xslt:template match="@*|node()" mode="书社:apply">
-                               <xslt:copy>
-                                       <xslt:apply-templates select="@*|node()" mode="书社:apply"/>
-                               </xslt:copy>
-                       </xslt:template>

                        <xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:apply" priority="1"/>
                        <xslt:template match="书社:archive" mode="书社:apply" priority="1">
                                <xslt:copy>
                        <xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:apply" priority="1"/>
                        <xslt:template match="书社:archive" mode="书社:apply" priority="1">
                                <xslt:copy>


@@ -310,19 +308,57 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:for-each select="node()">
                                                <xslt:choose>
                                                        <xslt:when test="self::*">
                                        <xslt:for-each select="node()">
                                                <xslt:choose>
                                                        <xslt:when test="self::*">

-                                                               <xslt:variable name="component">
-                                                                       <xslt:choose>
-                                                                               <xslt:when test="self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive']|@书社:disable-output-wrapping">
-                                                                                       <xslt:copy-of select="."/>
-                                                                               </xslt:when>
-                                                                               <xslt:otherwise>
-                                                                                       <xslt:call-template name="书社:wrap">
-                                                                                               <xslt:with-param name="nodes" select="."/>
-                                                                                       </xslt:call-template>
-                                                                               </xslt:otherwise>
-                                                                       </xslt:choose>
+                                                               <xslt:variable name="component-fragment">
+                                                                       <xslt:copy>
+                                                                               <xslt:choose>
+                                                                                       <xslt:when test="self::html:*">
+                                                                                               <xslt:variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>
+                                                                                               <xslt:attribute name="itemscope">itemscope</xslt:attribute>
+                                                                                               <xslt:attribute name="itemtype">
+                                                                                                       <xslt:for-each select="$existing-types/token">
+                                                                                                               <xslt:if test="position()!=1">
+                                                                                                                       <xslt:text>
+                                                                                                                               <text> </text>
+                                                                                                                       </xslt:text>
+                                                                                                               </xslt:if>
+                                                                                                               <xslt:value-of select="."/>
+                                                                                                       </xslt:for-each>
+                                                                                                       <xslt:if test="not($existing-types/token[string()='&书社;:embed' or string()='&书社;:document'])">
+                                                                                                               <xslt:if test="$existing-types/token">
+                                                                                                                       <xslt:text>
+                                                                                                                               <text> </text>
+                                                                                                                       </xslt:text>
+                                                                                                               </xslt:if>
+                                                                                                               <xslt:text>
+                                                                                                                       <text>&书社;:document</text>
+                                                                                                               </xslt:text>
+                                                                                                       </xslt:if>
+                                                                                               </xslt:attribute>
+                                                                                               <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
+                                                                                       </xslt:when>
+                                                                                       <xslt:otherwise>
+                                                                                               <xslt:copy-of select="@*|node()"/>
+                                                                                       </xslt:otherwise>
+                                                                               </xslt:choose>
+                                                                       </xslt:copy>
+                                                               </xslt:variable>
+                                                               <xslt:variable name="wrapped-component-fragment">
+                                                                       <xslt:for-each select="exsl:node-set($component-fragment)/*">
+                                                                               <xslt:variable name="result-nodes" select="self::*[not(self::书社:apply-attributes-to-root)]|self::书社:apply-attributes-to-root//node()[not(self::书社:apply-attributes-to-root) and not(ancestor::*[not(self::书社:apply-attributes-to-root)])]"/>
+                                                                               <xslt:variable name="significant-nodes" select="$result-nodes/descendant-or-self::*[not(self::书社:apply-attributes) and not(ancestor::*[not(self::书社:apply-attributes)])]"/>
+                                                                               <xslt:choose>
+                                                                                       <xslt:when test="not($significant-nodes/self::html:*) or $significant-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive'] or $significant-nodes/@书社:disable-output-wrapping">
+                                                                                               <xslt:copy-of select="."/>
+                                                                                       </xslt:when>
+                                                                                       <xslt:otherwise>
+                                                                                               <xslt:call-template name="书社:wrap">
+                                                                                                       <xslt:with-param name="nodes" select="$result-nodes"/>
+                                                                                               </xslt:call-template>
+                                                                                       </xslt:otherwise>
+                                                                               </xslt:choose>
+                                                                       </xslt:for-each>

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

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

                                                        </xslt:when>
                                                        <xslt:otherwise>
                                                                <xslt:apply-templates select="." mode="书社:apply"/>
                                                        </xslt:when>
                                                        <xslt:otherwise>
                                                                <xslt:apply-templates select="." mode="书社:apply"/>


@@ -343,39 +379,76 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <xslt:template match="书社:apply-attributes-to-root" mode="书社:apply" priority="1">
                                <xslt:apply-templates mode="书社:apply"/>
                        </xslt:template>
                        <xslt:template match="书社:apply-attributes-to-root" mode="书社:apply" priority="1">
                                <xslt:apply-templates mode="书社:apply"/>
                        </xslt:template>

-                       <xslt:template match="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
+                       <xslt:template match="@*|node()" mode="书社:apply" priority="-1">
+                               <xslt:copy>
+                                       <xslt:apply-templates select="@*|node()" mode="书社:apply"/>
+                               </xslt:copy>
+                       </xslt:template>
+                       <xslt:template match="书社:link[@xlink:show='embed' and (not(@xlink:actuate) or @xlink:actuate='none')]" mode="书社:expand" priority="1">
+                               <xslt:variable name="link" select="."/>

                                <xslt:variable name="identifier" select="string(@xlink:href)"/>
                                <xslt:variable name="identifier" select="string(@xlink:href)"/>

-                               <xslt:variable name="uri" select="document($METADATA)//*[@rdf:about=$identifier]/dct:hasFormat/*[nie:interpretedAs/*[@nie:mimeType='application/xml']]/@nfo:fileUrl[1]"/>
+                               <xslt:variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
+                               <xslt:variable name="included" select="$书社:about//*[@rdf:about=$identifier or $is-dir and starts-with(@rdf:about, $identifier)]"/>

                                <xslt:choose>
                                <xslt:choose>

-                                       <xslt:when test="$uri">
-                                               <xslt:variable name="expanded">
-                                                       <xslt:apply-templates select="document($uri)" mode="书社:expand">
-                                                               <xslt:with-param name="identifier" select="$identifier"/>
-                                                       </xslt:apply-templates>
-                                               </xslt:variable>
-                                               <xslt:for-each select="exsl:node-set($expanded)/node()">
-                                                       <xslt:copy>
-                                                               <xslt:choose>
-                                                                       <xslt:when test="self::html:*">
-                                                                               <xslt:attribute name="itemscope">itemscope</xslt:attribute>
-                                                                               <xslt:attribute name="itemtype">
-                                                                                       <xslt:text>
-                                                                                               <text>&书社;:embed</text>
-                                                                                       </xslt:text>
-                                                                                       <xslt:for-each select="exslstr:tokenize(@itemtype)/token[string()!='&书社;:document']">
-                                                                                               <xslt:text>
-                                                                                                       <text> </text>
-                                                                                               </xslt:text>
-                                                                                               <xslt:value-of select="."/>
-                                                                                       </xslt:for-each>
-                                                                               </xslt:attribute>
-                                                                               <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
-                                                                       </xslt:when>
-                                                                       <xslt:otherwise>
-                                                                               <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
-                                                                       </xslt:otherwise>
-                                                               </xslt:choose>
-                                                       </xslt:copy>
+                                       <xslt:when test="$included">
+                                               <xslt:for-each select="$included">
+                                                       <xslt:sort select="@rdf:about" data-type="text" lang="zxx" case-order="upper-first"/>
+                                                       <xslt:variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
+                                                       <xslt:variable name="expanded">
+                                                               <xslt:apply-templates select="document($uri)" mode="书社:expand">
+                                                                       <xslt:with-param name="identifier" select="string(@rdf:about)"/>
+                                                               </xslt:apply-templates>
+                                                       </xslt:variable>
+                                                       <xslt:for-each select="exsl:node-set($expanded)/node()">
+                                                               <xslt:copy>
+                                                                       <xslt:choose>
+                                                                               <xslt:when test="self::html:*">
+                                                                                       <xslt:variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>
+                                                                                       <xslt:attribute name="itemscope">itemscope</xslt:attribute>
+                                                                                       <xslt:attribute name="itemtype">
+                                                                                               <xslt:for-each select="$existing-types/token[string()!='&书社;:document']">
+                                                                                                       <xslt:if test="position()!=1">
+                                                                                                               <xslt:text>
+                                                                                                                       <text> </text>
+                                                                                                               </xslt:text>
+                                                                                                       </xslt:if>
+                                                                                                       <xslt:value-of select="."/>
+                                                                                               </xslt:for-each>
+                                                                                               <xslt:if test="not($existing-types/token[string()='&书社;:embed'])">
+                                                                                                       <xslt:if test="$existing-types/token[string()!='&书社;:document']">
+                                                                                                               <xslt:text>
+                                                                                                                       <text> </text>
+                                                                                                               </xslt:text>
+                                                                                                       </xslt:if>
+                                                                                                       <xslt:text>
+                                                                                                               <text>&书社;:embed</text>
+                                                                                                       </xslt:text>
+                                                                                               </xslt:if>
+                                                                                       </xslt:attribute>
+                                                                                       <xslt:choose>
+                                                                                               <xslt:when test="$link/@书社:archived-as">
+                                                                                                       <xslt:copy-of select="$link/@书社:archived-as"/>
+                                                                                               </xslt:when>
+                                                                                               <xslt:when test="@书社:archived-as">
+                                                                                                       <xslt:copy-of select="@书社:archived-as"/>
+                                                                                               </xslt:when>
+                                                                                       </xslt:choose>
+                                                                                       <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype')) and not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
+                                                                               </xslt:when>
+                                                                               <xslt:otherwise>
+                                                                                       <xslt:choose>
+                                                                                               <xslt:when test="self::* and $link/@书社:archived-as">
+                                                                                                       <xslt:copy-of select="$link/@书社:archived-as"/>
+                                                                                               </xslt:when>
+                                                                                               <xslt:when test="@书社:archived-as">
+                                                                                                       <xslt:copy-of select="@书社:archived-as"/>
+                                                                                               </xslt:when>
+                                                                                       </xslt:choose>
+                                                                                       <xslt:copy-of select="@*[not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
+                                                                               </xslt:otherwise>
+                                                                       </xslt:choose>
+                                                               </xslt:copy>
+                                                       </xslt:for-each>

                                                </xslt:for-each>
                                        </xslt:when>
                                        <xslt:otherwise>
                                                </xslt:for-each>
                                        </xslt:when>
                                        <xslt:otherwise>


@@ -401,17 +474,27 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </xslt:if>
                                        <xslt:choose>
                                                <xslt:when test="self::html:*">
                                        </xslt:if>
                                        <xslt:choose>
                                                <xslt:when test="self::html:*">

+                                                       <xslt:variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>

                                                        <xslt:attribute name="itemscope">itemscope</xslt:attribute>
                                                        <xslt:attribute name="itemtype">
                                                        <xslt:attribute name="itemscope">itemscope</xslt:attribute>
                                                        <xslt:attribute name="itemtype">

-                                                               <xslt:text>
-                                                                       <text>&书社;:document</text>
-                                                               </xslt:text>
-                                                               <xslt:for-each select="exslstr:tokenize(@itemtype)/token">
-                                                                       <xslt:text>
-                                                                               <text> </text>
-                                                                       </xslt:text>
+                                                               <xslt:for-each select="$existing-types/token">
+                                                                       <xslt:if test="position()!=1">
+                                                                               <xslt:text>
+                                                                                       <text> </text>
+                                                                               </xslt:text>
+                                                                       </xslt:if>

                                                                        <xslt:value-of select="."/>
                                                                </xslt:for-each>
                                                                        <xslt:value-of select="."/>
                                                                </xslt:for-each>

+                                                               <xslt:if test="not($existing-types/token[string()='&书社;:embed' or string()='&书社;:document'])">
+                                                                       <xslt:if test="$existing-types/token">
+                                                                               <xslt:text>
+                                                                                       <text> </text>
+                                                                               </xslt:text>
+                                                                       </xslt:if>
+                                                                       <xslt:text>
+                                                                               <text>&书社;:document</text>
+                                                                       </xslt:text>
+                                                               </xslt:if>

                                                        </xslt:attribute>
                                                        <xslt:apply-templates select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype') or namespace-uri()='&书社;' and (local-name()='cksum' or local-name()='identifier' or local-name()='mtime'))]|node()" mode="书社:expand"/>
                                                </xslt:when>
                                                        </xslt:attribute>
                                                        <xslt:apply-templates select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype') or namespace-uri()='&书社;' and (local-name()='cksum' or local-name()='identifier' or local-name()='mtime'))]|node()" mode="书社:expand"/>
                                                </xslt:when>


@@ -421,7 +504,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </xslt:choose>
                                </xslt:copy>
                        </xslt:template>
                                        </xslt:choose>
                                </xslt:copy>
                        </xslt:template>

-                       <xslt:template match="@*|node()[not(self::书社:link) or not(@xlink:show='embed')]" mode="书社:expand" priority="-1">
+                       <xslt:template match="@*|node()" mode="书社:expand" priority="-1">

                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
                                </xslt:copy>
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
                                </xslt:copy>