X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/12c64c8b59e7e572988aa4fa39964043bdf67bfe..82fd95b5f6748674ec5929b9b1a6caf30172b544:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 1cc6bad..05ca7d5 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -307,19 +307,55 @@ 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: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: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:for-each>
 								</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"/>
@@ -347,38 +383,52 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</xslt:template>
 			<xslt:template match="书社:link[@xlink:show='embed' and (not(@xlink:actuate) or @xlink:actuate='none')]" mode="书社:expand" priority="1">
 				<xslt:variable name="identifier" select="string(@xlink:href)"/>
-				<xslt:variable name="included" select="$书社:about//*[@rdf:about=$identifier]"/>
+				<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:when test="$included">
-						<xslt:variable name="uri" select="$included/书社vocab:hasParsedFile/@nfo:fileUrl"/>
-						<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: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: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:for-each>
 						</xslt:for-each>
 					</xslt:when>
 					<xslt:otherwise>
@@ -404,17 +454,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:variable name="existing-types" select="exslstr:tokenize(@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: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>