From: Lady <redacted>
Date: Sat, 25 Jan 2025 03:00:06 +0000 (-0500)
Subject: Reduce @书社:archived-as noise
X-Git-Tag: 1.0.0
X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/refs/tags/1.0.0

Reduce @书社:archived-as noise

This commit causes `@书社:archived-as` to be dropped in the following
cases :—

- In the components of archives, during extraction.
- In wrapped nodes, where it is raised to the wrapping `<html:html>`
  element.

It also makes `lib/archive2extractor.xslt` a prerequisite for the
finalization step and `lib/catalog2transform.xslt` a prerequisite for
results, to ensure that files are appropriately updated when these
change.
---

diff --git a/GNUmakefile b/GNUmakefile
index c1b34fc..ca6bfcd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -649,13 +649,13 @@ $(BUILDDIR)/transform.xslt : $(BUILDDIR)/transform.catalog $(BUILDDIR)/metadata
 # • When the metadata of ⹐source files they depend on⹑ change.
 #
 # This is to reduce the number of needless regenerations of files with no substantial change.
-$(call compiled,$(compilablefiles)) : $(BUILDDIR)/results/% : $$(call parsed,$$(call uncompiled,$$@)) $$(call parsed,$$(call dependencies,$$(call uncompiled,$$@))) $(BUILDDIR)/transform.catalog $(TRANSFORMLIBS) $$(call metadata,$$(call dependencies,$$(call uncompiled,$$@)))
+$(call compiled,$(compilablefiles)) : $(BUILDDIR)/results/% : $$(call parsed,$$(call uncompiled,$$@)) $$(call parsed,$$(call dependencies,$$(call uncompiled,$$@))) $(BUILDDIR)/transform.catalog $(THISDIR)/lib/catalog2transform.xslt $(TRANSFORMLIBS) $$(call metadata,$$(call dependencies,$$(call uncompiled,$$@)))
 	$(call inform,$(PRINTF) '%s\n' $(call quote,Compiling </$*>…) >&2)
 	$(silent)$(call ensuredirectory,$(dir $@))
 	$(silent)$(XSLTPROC) --nonet --novalid --nomkdir --nowrite --stringparam METADATA 'metadata' --stringparam BUILDTIME $$($(DATE) -u '+%Y-%m-%dT%H:%M:%SZ') --stringparam IDENTIFIER $(call quote,$(call localuri,$(call uncompiled,$@)))$(if $(THISREV), --stringparam THISREV $(call quote,$(THISREV)),)$(if $(SRCREV), --stringparam SRCREV $(call quote,$(SRCREV)),) $(call quote,$(BUILDDIR)/transform.xslt) $(call quote,$<) >|$(call quote,$@)
 
 # Create the final files from the compiled results (or error in the case of recursive ones).
-$(call built,$(compilablefiles)) : $(BUILDDIR)/public/% : $(BUILDDIR)/results/%
+$(call built,$(compilablefiles)) : $(BUILDDIR)/public/% : $(BUILDDIR)/results/% $(THISDIR)/lib/archive2extractor.xslt
 	$(call inform,$(PRINTF) '%s\n' $(call quote,Building </$*>…) >&2)
 	$(silent)$(call ensuredirectory,$(dir $@))
 	$(silent)$(RM) -f -R $(call quote,$@)
diff --git a/lib/archive2extractor.xslt b/lib/archive2extractor.xslt
index b07b734..f9c8bdf 100644
--- a/lib/archive2extractor.xslt
+++ b/lib/archive2extractor.xslt
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!--
-SPDX-FileCopyrightText: 2024 Lady <https://www.ladys.computer/about/#lady>
+SPDX-FileCopyrightText: 2024, 2025 Lady <https://www.ladys.computer/about/#lady>
 SPDX-License-Identifier: MPL-2.0
 -->
 <!--
 ⁌ ⛩📰 书社 ∷ lib/archive2extractor.xslt
 
-© 2024 Lady [@ Ladys Computer].
+© 2024–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/>.
@@ -38,7 +38,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 						<xslt:variable name="href">
 							<value-of select="@书社:archived-as"/>
 						</xslt:variable>
-						<xslt:copy-of select="书社:archive/*[@书社:archived-as=$href][1]"/>
+						<xslt:for-each select="书社:archive/*[@书社:archived-as=$href][1]">
+							<xslt:copy>
+								<xslt:copy-of select="@*[not(namespace-uri()='urn:fdc:ladys.computer:20231231:Shu1She4' and local-name()='archived-as')]|node()"/>
+							</xslt:copy>
+						</xslt:for-each>
 					</exsl:document>
 					<xslt:text>
 						<value-of select="$href"/>
diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index b93aa37..ce94067 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -1,12 +1,12 @@
 <?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/catalog2transform.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/>.
@@ -280,9 +280,13 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 						</xslt:element>
 					</xslt:element>
 					<xslt:element name="body" namespace="&xhtml;">
-						<xslt:copy-of select="$nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*"/>
+						<xslt:copy-of select="($nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*)[not(namespace-uri()='&书社;' and local-name()='archived-as')]"/>
 						<xslt:apply-templates select="$modalinput/node()" mode="书社:header"/>
-						<xslt:copy-of select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()"/>
+						<xslt:for-each select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()">
+							<xslt:copy>
+								<xslt:copy-of select="@*[not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
+							</xslt:copy>
+						</xslt:for-each>
 						<xslt:apply-templates select="$modalinput/node()" mode="书社:footer"/>
 					</xslt:element>
 				</xslt:element>