X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/1ba6bb315cf3e1c7120acff6c34149acf65f0120..e7981ed48521a287a0351fb9912cf00a7602dc72:/lib/expandmetadata.xslt?ds=sidebyside

diff --git a/lib/expandmetadata.xslt b/lib/expandmetadata.xslt
index 423924a..727d58a 100644
--- a/lib/expandmetadata.xslt
+++ b/lib/expandmetadata.xslt
@@ -26,53 +26,126 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 >
 	<variable name="builddir" select="//书社vocab:BuildDirectory/@nfo:fileUrl"/>
 	<variable name="files" select="//书社vocab:SourceFile|//书社vocab:IncludeFile"/>
-	<template name="书社:collect-dependency-paths">
-		<param name="path" select="/.."/>
-		<variable name="parent" select="string($path/*[last()])"/>
-		<variable name="children-fragment">
-			<for-each select="$files[@rdf:about=$parent and nie:interpretedAs/nfo:PlainTextDocument]">
-				<variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
-				<for-each select="document($uri)//书社:link[@xlink:show='embed']">
-					<variable name="identifier" select="string(@xlink:href)"/>
-					<variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
-					<for-each select="$files/@rdf:about[string(.)=$identifier or $is-dir and starts-with(., $identifier)]">
-						<sort select="." data-type="text" lang="zxx" case-order="upper-first"/>
+	<variable name="stated-dependencies-fragment">
+		<for-each select="$files[nie:interpretedAs/nfo:PlainTextDocument]">
+			<variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
+			<书社:Dependencies for="{@rdf:about}">
+				<for-each select="document($uri)//书社:link">
+					<variable name="spaced-show">
 						<choose>
-							<when test="$path/*[string(.)=string(current())]">
-								<书社:recursive-dependency>
-									<value-of select="."/>
-								</书社:recursive-dependency>
+							<when test="@xlink:show">
+								<text> </text>
+								<value-of select="@xlink:show"/>
+								<text> </text>
 							</when>
 							<otherwise>
-								<书社:dependency>
-									<value-of select="."/>
-								</书社:dependency>
+								<text> none </text>
 							</otherwise>
 						</choose>
-					</for-each>
+					</variable>
+					<variable name="actuate">
+						<choose>
+							<when test="@xlink:actuate">
+								<value-of select="@xlink:actuate"/>
+							</when>
+							<otherwise>
+								<text>none</text><!-- not the true default in all cases, but in the ones that matter -->
+							</otherwise>
+						</choose>
+					</variable>
+					<variable name="name" select="string(@name)"/>
+					<if test="contains(' embed other none ', $spaced-show) and $actuate='none'">
+						<variable name="identifier" select="string(@xlink:href)"/>
+						<variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
+						<for-each select="$files/@rdf:about[string(.)=$identifier or $is-dir and starts-with(., $identifier)]">
+							<sort select="." data-type="text" lang="zxx" case-order="upper-first"/>
+							<choose>
+								<when test="$spaced-show=' embed '">
+									<书社:dependency name="{$name}">
+										<value-of select="."/>
+									</书社:dependency>
+								</when>
+								<when test="$spaced-show=' other '">
+									<书社:transitive-soft-dependency name="{$name}">
+										<value-of select="."/>
+									</书社:transitive-soft-dependency>
+								</when>
+								<otherwise>
+									<书社:soft-dependency name="{$name}">
+										<value-of select="."/>
+									</书社:soft-dependency>
+								</otherwise>
+							</choose>
+						</for-each>
+					</if>
 				</for-each>
+			</书社:Dependencies>
+		</for-each>
+	</variable>
+	<variable name="stated-dependencies" select="exsl:node-set($stated-dependencies-fragment)/*"/>
+	<template name="书社:collect-dependency-paths">
+		<param name="path" select="/.."/>
+		<variable name="parent" select="$path/*[last()]"/>
+		<variable name="children-fragment">
+			<for-each select="$stated-dependencies[@for=string($parent)]/*">
+				<choose>
+					<when test="$path/*[string()=current()]">
+						<if test="self::书社:dependency">
+							<书社:recursive-dependency name="{@name}">
+								<value-of select="."/>
+							</书社:recursive-dependency>
+						</if>
+					</when>
+					<otherwise>
+						<copy-of select="."/>
+					</otherwise>
+				</choose>
 			</for-each>
 		</variable>
-		<variable name="children" select="exsl:node-set($children-fragment)"/>
+		<variable name="children" select="exsl:node-set($children-fragment)/*"/>
+		<variable name="child-paths-fragment">
+			<for-each select="$children">
+				<choose>
+					<when test="self::书社:recursive-dependency">
+						<书社:dependency-path>
+							<copy-of select="$path/*[string()=current()][1]/preceding-sibling::*"/>
+							<copy-of select="."/><!-- replace first instance with recursive dependency -->
+						</书社:dependency-path>
+					</when>
+					<when test="$parent/self::书社:transitive-soft-dependency and string(@name)!=string($parent/@name)"/>
+					<when test="self::书社:soft-dependency">
+						<书社:dependency-path>
+							<copy-of select="$path"/>
+							<copy-of select="."/>
+						</书社:dependency-path>
+					</when>
+					<otherwise>
+						<variable name="path-fragment">
+							<copy-of select="$path"/>
+							<choose>
+								<when test="self::书社:dependency and $path/书社:transitive-soft-dependency">
+									<书社:transitive-soft-dependency name="{@name}">
+										<value-of select="."/>
+									</书社:transitive-soft-dependency>
+								</when>
+								<otherwise>
+									<copy-of select="."/>
+								</otherwise>
+							</choose>
+						</variable>
+						<call-template name="书社:collect-dependency-paths">
+							<with-param name="path" select="exsl:node-set($path-fragment)"/>
+						</call-template><!-- a little inefficient in the case of reflexive dependencies, as the path will be traversed once in each direction, but improving on this is a hard problem in X·S·L·T -->
+					</otherwise>
+				</choose>
+			</for-each>
+		</variable>
+		<variable name="child-paths" select="exsl:node-set($child-paths-fragment)/*"/>
 		<choose>
-			<when test="$children/*">
-				<for-each select="$children/书社:recursive-dependency">
-					<书社:dependency-path>
-						<copy-of select="$path[string(.)=string(current())]/preceding-sibling::*"/>
-						<copy-of select="."/>
-					</书社:dependency-path>
-				</for-each>
-				<for-each select="$children/书社:dependency">
-					<variable name="path-fragment">
-						<copy-of select="$path"/>
-						<copy-of select="."/>
-					</variable>
-					<call-template name="书社:collect-dependency-paths">
-						<with-param name="path" select="exsl:node-set($path-fragment)"/>
-					</call-template>
-				</for-each>
+			<when test="$child-paths">
+				<copy-of select="$child-paths"/>
 			</when>
-			<otherwise>
+			<otherwise><!-- fallback result is just the input path -->
 				<书社:dependency-path>
 					<copy-of select="$path"/>
 				</书社:dependency-path>
@@ -108,10 +181,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				</for-each>
 			</if>
 		</variable>
-		<variable name="dependencies-fragment">
-			<apply-templates select="." mode="书社:dependencies"/>
-		</variable>
-		<variable name="dependencies" select="exsl:node-set($dependencies-fragment)"/>
 		<variable name="destinations" select="exsl:node-set($destinations-fragment)/node()"/>
 		<variable name="bad-destinations-fragment">
 			<for-each select="$destinations">
@@ -125,12 +194,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 		<copy>
 			<apply-templates select="@*"/>
 			<apply-templates select="node()"/>
-			<for-each select="$dependencies/书社:dependency">
-				<书社vocab:hasDependencyOn rdf:resource="{.}"/>
-			</for-each>
-			<for-each select="$dependencies/书社:recursive-dependency">
-				<书社vocab:hasRecursiveDependencyOn rdf:resource="{.}"/>
-			</for-each>
+			<apply-templates select="." mode="书社:dependencies"/>
 			<choose>
 				<when test="not($destinations)">
 					<element name="书社vocab:destination">
@@ -164,18 +228,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 		</copy>
 	</template>
 	<template match="//书社vocab:IncludeFile[nie:interpretedAs/nfo:PlainTextDocument]" priority="1">
-		<variable name="dependencies-fragment">
-			<apply-templates select="." mode="书社:dependencies"/>
-		</variable>
-		<variable name="dependencies" select="exsl:node-set($dependencies-fragment)"/>
 		<copy>
 			<apply-templates select="@*|node()"/>
-			<for-each select="$dependencies/书社:dependency">
-				<书社vocab:hasDependencyOn rdf:resource="{.}"/>
-			</for-each>
-			<for-each select="$dependencies/书社:recursive-dependency">
-				<书社vocab:hasRecursiveDependencyOn rdf:resource="{.}"/>
-			</for-each>
+			<apply-templates select="." mode="书社:dependencies"/>
 		</copy>
 	</template>
 	<template match="书社vocab:hasParsedFileWithMetadata" priority="1"/>
@@ -190,8 +245,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				<value-of select="@rdf:about"/>
 				<text>&#xA;</text>
 				<for-each select="书社vocab:hasRecursiveDependencyOn/@rdf:resource">
-					<text>&#x9;</text>
-					<text>-</text>
+					<text>&#x9;-</text>
+					<value-of select="."/>
+					<text>&#xA;</text>
+				</for-each>
+				<for-each select="书社vocab:hasSoftDependencyOn/@rdf:resource">
+					<text>&#x9;?</text>
 					<value-of select="."/>
 					<text>&#xA;</text>
 				</for-each>
@@ -224,18 +283,41 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 	<template match="书社vocab:SourceFile|书社vocab:IncludeFile" mode="书社:dependencies">
 		<if test="nie:interpretedAs/nfo:PlainTextDocument">
 			<variable name="path-fragment">
-				<书社:dependency-root>
+				<element name="书社:dependency-root">
 					<value-of select="@rdf:about"/>
-				</书社:dependency-root>
+				</element>
 			</variable>
 			<variable name="paths-fragment">
 				<call-template name="书社:collect-dependency-paths">
 					<with-param name="path" select="exsl:node-set($path-fragment)"/>
 				</call-template>
 			</variable>
-			<for-each select="exsl:node-set($paths-fragment)/*/*[not(self::书社:dependency-root)]">
-				<if test="not(preceding::*[string(.)=string(current())])">
-					<copy-of select="."/>
+			<variable name="paths-document" select="exsl:node-set($paths-fragment)"/>
+			<for-each select="$paths-document//书社:recursive-dependency">
+				<if test="not(preceding::*[string()=string(current())])">
+					<element name="书社vocab:hasRecursiveDependencyOn">
+						<attribute name="rdf:resource">
+							<value-of select="."/>
+						</attribute>
+					</element>
+				</if>
+			</for-each>
+			<for-each select="$paths-document//书社:dependency">
+				<if test="not((preceding::*|//书社:recursive-dependency)[string()=string(current())])">
+					<element name="书社vocab:hasDependencyOn">
+						<attribute name="rdf:resource">
+							<value-of select="."/>
+						</attribute>
+					</element>
+				</if>
+			</for-each>
+			<for-each select="$paths-document//*[self::书社:soft-dependency or self::书社:transitive-soft-dependency]">
+				<if test="not((preceding::*|//书社:recursive-dependency|//书社:dependency)[string()=string(current())])">
+					<element name="书社vocab:hasSoftDependencyOn">
+						<attribute name="rdf:resource">
+							<value-of select="."/>
+						</attribute>
+					</element>
 				</if>
 			</for-each>
 		</if>