Support “soft” dependencies

[Shushe] / lib / expandmetadata.xslt

diff --git a/lib/expandmetadata.xslt b/lib/expandmetadata.xslt
index 3d46c82873b05e0aff27da0076c3dc5e6d673008..727d58a084bc4d9cb7f06969bd4db0dcb50189f0 100644 (file)
--- a/lib/expandmetadata.xslt
+++ b/lib/expandmetadata.xslt
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!--
 <?xml version="1.0"?>
 <!--

-SPDX-FileCopyrightText: 2023, 2024 Lady <https://www.ladys.computer/about/#lady>
+SPDX-FileCopyrightText: 2023, 2024, 2025 Lady <https://www.ladys.computer/about/#lady>

 SPDX-License-Identifier: MPL-2.0
 -->
 <!--
 ⁌ ⛩📰 书社 ∷ lib/expandmetadata.xslt
 
 SPDX-License-Identifier: MPL-2.0
 -->
 <!--
 ⁌ ⛩📰 书社 ∷ lib/expandmetadata.xslt
 

-© 2023–2024 Lady [@ Ladys Computer].
+© 2023–2025 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/>.


@@ -14,143 +14,226 @@ 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"
        xmlns:exsl="http://exslt.org/common"
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
        xmlns:exsl="http://exslt.org/common"

+       xmlns:exslstr="http://exslt.org/strings"

        xmlns:nie="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#"
        xmlns:nfo="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        xmlns:书社vocab="urn:fdc:ladys.computer:20231231:Shu1She4:vocab:"
        xmlns:nie="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#"
        xmlns:nfo="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
        xmlns:xlink="http://www.w3.org/1999/xlink"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        xmlns:书社vocab="urn:fdc:ladys.computer:20231231:Shu1She4:vocab:"

-       extension-element-prefixes="exsl"
+       extension-element-prefixes="exsl exslstr"

        version="1.0"
 >
        <variable name="builddir" select="//书社vocab:BuildDirectory/@nfo:fileUrl"/>
        <variable name="files" select="//书社vocab:SourceFile|//书社vocab:IncludeFile"/>
        version="1.0"
 >
        <variable name="builddir" select="//书社vocab:BuildDirectory/@nfo:fileUrl"/>
        <variable name="files" select="//书社vocab:SourceFile|//书社vocab:IncludeFile"/>

-       <template name="书社:process-dependencies">
-               <param name="processed"/>
-               <param name="unprocessed"/>
-               <variable name="queue">
-                       <copy-of select="exsl:node-set($unprocessed)/书社:dependency-root"/>
-                       <for-each select="exsl:node-set($unprocessed)/书社:dependency">
-                               <if test="not((exsl:node-set($processed)/书社:*|preceding-sibling::书社:*|following-sibling::书社:recursive-dependency)[string()=string(current())])">
-                                       <copy-of select="."/>
-                               </if>
-                       </for-each>
-               </variable>
-               <variable name="old">
-                       <copy-of select="exsl:node-set($processed)/书社:dependency-root"/>
-                       <copy-of select="exsl:node-set($processed)/书社:recursive-dependency"/>
-                       <for-each select="exsl:node-set($unprocessed)/书社:recursive-dependency">
-                               <if test="not((exsl:node-set($processed)/书社:recursive-dependency|preceding-sibling::书社:recursive-dependency)[string()=string(current())])">
-                                       <copy-of select="."/>
-                               </if>
-                       </for-each>
-                       <for-each select="exsl:node-set($processed)/书社:dependency">
-                               <if test="not(exsl:node-set($unprocessed)/书社:recursive-dependency[string()=string(current())])">
-                                       <copy-of select="."/>
-                               </if>
-                       </for-each>
-                       <copy-of select="$queue"/>
-               </variable>
-               <variable name="new">
-                       <for-each select="exsl:node-set($queue)/书社:*">
-                               <for-each select="$files[@rdf:about=string(current()) and nie:interpretedAs/nfo:PlainTextDocument]">
-                                       <variable name="parent" select="@rdf:about"/>
-                                       <variable name="subdir">
+       <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>
                                                <choose>

-                                                       <when test="starts-with($parent, 'about:shushe?include=')">
-                                                               <text>/includes/</text>
+                                                       <when test="@xlink:show">
+                                                               <text> </text>
+                                                               <value-of select="@xlink:show"/>
+                                                               <text> </text>

                                                        </when>
                                                        </when>

-                                                       <when test="starts-with($parent, 'about:shushe?source=')">
-                                                               <text>/sources/</text>
+                                                       <otherwise>
+                                                               <text> none </text>
+                                                       </otherwise>
+                                               </choose>
+                                       </variable>
+                                       <variable name="actuate">
+                                               <choose>
+                                                       <when test="@xlink:actuate">
+                                                               <value-of select="@xlink:actuate"/>

                                                        </when>
                                                        </when>

+                                                       <otherwise>
+                                                               <text>none</text><!-- not the true default in all cases, but in the ones that matter -->
+                                                       </otherwise>

                                                </choose>
                                        </variable>
                                                </choose>
                                        </variable>

-                                       <for-each select="document(concat($builddir, $subdir, @书社vocab:path), .)//书社:link[@xlink:show='embed']">
-                                               <if test="exsl:node-set($old)/书社:dependency-root[string()=string(current()/@xlink:href)]">
-                                                       <书社:recursive-dependency>
-                                                               <value-of select="$parent"/>
+                                       <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>
                                                        </书社:recursive-dependency>
                                                </if>

-                                               <if test="$files/@rdf:about[string()=string(current()/@xlink:href)]">
-                                                       <书社:dependency>
-                                                               <value-of select="@xlink:href"/>
-                                                       </书社:dependency>
-                                               </if>
-                                       </for-each>
-                               </for-each>
+                                       </when>
+                                       <otherwise>
+                                               <copy-of select="."/>
+                                       </otherwise>
+                               </choose>
+                       </for-each>
+               </variable>
+               <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>
                        </for-each>
                </variable>

+               <variable name="child-paths" select="exsl:node-set($child-paths-fragment)/*"/>

                <choose>
                <choose>

-                       <when test="exsl:node-set($new)/书社:dependency">
-                               <call-template name="书社:process-dependencies">
-                                       <with-param name="processed">
-                                               <copy-of select="$old"/>
-                                       </with-param>
-                                       <with-param name="unprocessed">
-                                               <copy-of select="$new"/>
-                                       </with-param>
-                               </call-template>
+                       <when test="$child-paths">
+                               <copy-of select="$child-paths"/>

                        </when>
                        </when>

-                       <otherwise>
-                               <copy-of select="$old"/>
+                       <otherwise><!-- fallback result is just the input path -->
+                               <书社:dependency-path>
+                                       <copy-of select="$path"/>
+                               </书社:dependency-path>

                        </otherwise>
                </choose>
        </template>
                        </otherwise>
                </choose>
        </template>

+       <template match="nie:interpretedAs/*" priority="1">
+               <copy>
+                       <apply-templates select="@*|node()"/>
+                       <for-each select="../../书社vocab:hasParsedFileWithMetadata">
+                               <copy-of select="document(@nfo:fileUrl)/书社:parsed/书社:metadata/rdf:RDF/rdf:Description/node()"/>
+                       </for-each>
+               </copy>
+       </template>

        <template match="//书社vocab:SourceFile[not(nie:interpretedAs/nfo:PlainTextDocument)]" priority="1">
                <copy>
                        <apply-templates select="@*"/>
        <template match="//书社vocab:SourceFile[not(nie:interpretedAs/nfo:PlainTextDocument)]" priority="1">
                <copy>
                        <apply-templates select="@*"/>

-                       <attribute name="书社vocab:destination">
-                               <value-of select="@书社vocab:path"/>
-                       </attribute>

                        <apply-templates select="node()"/>
                        <apply-templates select="node()"/>

+                       <element name="书社vocab:destination">
+                               <value-of select="@书社vocab:path"/>
+                       </element>

                </copy>
        </template>
        <template match="//书社vocab:SourceFile[nie:interpretedAs/nfo:PlainTextDocument]" priority="1">
                </copy>
        </template>
        <template match="//书社vocab:SourceFile[nie:interpretedAs/nfo:PlainTextDocument]" priority="1">

-               <variable name="parsed" select="document(concat($builddir, '/sources/', @书社vocab:path), .)"/>
-               <variable name="destination-delim" select="concat('/', $parsed/*/@书社:destination, '/')"/>
-               <variable name="destination">
-                       <choose>
-                               <when test="not(contains($destination-delim, '//') or contains($destination-delim, '/./') or contains($destination-delim, '/../'))">
-                                       <value-of select="$parsed/*/@书社:destination"/>
-                               </when>
-                               <otherwise>
-                                       <value-of select="@书社vocab:path"/>
-                               </otherwise>
-                       </choose>
+               <variable name="parsed" select="document(书社vocab:hasParsedFile/@nfo:fileUrl)"/>
+               <variable name="provided-destinations" select="normalize-space($parsed/*/@书社:destination)"/>
+               <variable name="destinations-fragment">
+                       <if test="$provided-destinations!=''">
+                               <for-each select="exslstr:tokenize($provided-destinations)">
+                                       <element name="书社vocab:destination">
+                                               <value-of select="."/>
+                                       </element>
+                               </for-each>
+                       </if>

                </variable>
                </variable>

-               <variable name="dependencies-fragment">
-                       <apply-templates select="." mode="书社:dependencies"/>
+               <variable name="destinations" select="exsl:node-set($destinations-fragment)/node()"/>
+               <variable name="bad-destinations-fragment">
+                       <for-each select="$destinations">
+                               <variable name="destination-delim" select="concat('/', ., '/')"/>
+                               <if test="contains($destination-delim, '//') or contains($destination-delim, '/./') or contains($destination-delim, '/../')">
+                                       <copy-of select="."/>
+                               </if>
+                       </for-each>

                </variable>
                </variable>

-               <variable name="dependencies" select="exsl:node-set($dependencies-fragment)"/>
+               <variable name="bad-destinations" select="exsl:node-set($bad-destinations-fragment)/node()"/>

                <copy>
                        <apply-templates select="@*"/>
                <copy>
                        <apply-templates select="@*"/>

-                       <attribute name="书社vocab:destination">
-                               <value-of select="$destination"/>
-                       </attribute>

                        <apply-templates select="node()"/>
                        <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">
+                                               <value-of select="@书社vocab:path"/>
+                                       </element>
+                               </when>
+                               <when test="$bad-destinations">
+                                       <message terminate="no">
+                                               <text>Bad destinations: </text>
+                                               <for-each select="$bad-destinations">
+                                                       <if test="position()>1">
+                                                               <text> </text>
+                                                       </if>
+                                                       <text>&lt;</text>
+                                                       <value-of select="."/>
+                                                       <text>></text>
+                                               </for-each>
+                                       </message>
+                                       <element name="书社vocab:destination">
+                                               <value-of select="@书社vocab:path"/>
+                                       </element>
+                               </when>
+                               <otherwise>
+                                       <for-each select="$destinations">
+                                               <element name="书社vocab:destination">
+                                                       <value-of select="."/>
+                                               </element>
+                                       </for-each>
+                               </otherwise>
+                       </choose>

                </copy>
        </template>
        <template match="//书社vocab:IncludeFile[nie:interpretedAs/nfo:PlainTextDocument]" priority="1">
                </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()"/>
                <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>
                </copy>
        </template>

+       <template match="书社vocab:hasParsedFileWithMetadata" priority="1"/>

        <template match="/">
                <variable name="result-fragment">
                        <apply-templates/>
        <template match="/">
                <variable name="result-fragment">
                        <apply-templates/>


@@ -162,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">
                                <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>
                                        <value-of select="."/>
                                        <text>&#xA;</text>
                                </for-each>


@@ -178,7 +265,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <for-each select="$result//书社vocab:SourceFile">
                                <value-of select="@rdf:about"/>
                                <text>|</text>
                        <for-each select="$result//书社vocab:SourceFile">
                                <value-of select="@rdf:about"/>
                                <text>|</text>

-                               <value-of select="@书社vocab:destination"/>
+                               <for-each select="书社vocab:destination">
+                                       <if test="position()>1">
+                                               <text>;</text>
+                                       </if>
+                                       <value-of select="."/>
+                               </for-each>

                                <text>&#xA;</text>
                        </for-each>
                </exsl:document>
                                <text>&#xA;</text>
                        </for-each>
                </exsl:document>


@@ -190,13 +282,44 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        </template>
        <template match="书社vocab:SourceFile|书社vocab:IncludeFile" mode="书社:dependencies">
                <if test="nie:interpretedAs/nfo:PlainTextDocument">
        </template>
        <template match="书社vocab:SourceFile|书社vocab:IncludeFile" mode="书社:dependencies">
                <if test="nie:interpretedAs/nfo:PlainTextDocument">

-                       <call-template name="书社:process-dependencies">
-                               <with-param name="unprocessed">
-                                       <书社:dependency-root>
-                                               <value-of select="@rdf:about"/>
-                                       </书社:dependency-root>
-                               </with-param>
-                       </call-template>
+                       <variable name="path-fragment">
+                               <element name="书社:dependency-root">
+                                       <value-of select="@rdf:about"/>
+                               </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>
+                       <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>
        </template>
        <output method="xml" encoding="UTF-8"/>
                </if>
        </template>
        <output method="xml" encoding="UTF-8"/>