From: Lady <redacted>
Date: Wed, 17 Jan 2024 06:36:01 +0000 (-0500)
Subject: Remember types in parser
X-Git-Tag: 0.4.0~4
X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/1c02c25ab49b46225f48d51ccc52648c20c82eaf?ds=sidebyside

Remember types in parser

Rather than derive the types from the parser via a separate transform,
collect them when building the parser and remember them in a
`<html:dl>` which can be queried with X·Path.

This is a prerequisite to accessing this information at parse time,
but also a useful optimization in its own right.
---

diff --git a/GNUmakefile b/GNUmakefile
index 2de20b2..e09da91 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -236,7 +236,7 @@ endif
 
 # Get the list of supported plaintext file types from the parser.
 ifneq ($(wildcard $(BUILDDIR)/parser.xslt),)
-override plaintexttypes := $(filter-out $(XMLTYPES),$(shell $(XSLTPROC) $(call quote,$(THISDIR)/lib/parser2types.xslt) $(call quote,$(BUILDDIR)/parser.xslt)))
+override plaintexttypes := $(filter-out $(XMLTYPES),$(shell $(XMLLINT) --xpath '/*/*[@name="书社:parsers"]//*[namespace-uri()="http://www.w3.org/1999/xhtml" and local-name()="dd"]/text()' $(call quote,$(BUILDDIR)/parser.xslt)))
 endif
 
 # (callable) Get all of the files (source and includes) which have the
@@ -416,7 +416,7 @@ ifeq ($(wildcard $(BUILDDIR)/.update-types),)
 #
 # This recipe sleeps for one second to ensure that files built after
 # the restart have a more current time·stamp.
-$(THISDIR)/GNUmakefile:: $(BUILDDIR)/magic.mgc $(BUILDDIR)/parser.xslt $(THISDIR)/lib/parser2types.xslt
+$(THISDIR)/GNUmakefile:: $(BUILDDIR)/magic.mgc $(BUILDDIR)/parser.xslt
 	$(silent)$(TOUCH) $(THISDIR)/GNUmakefile
 	$(silent)$(RM) -f $(call quote,$(BUILDDIR)/dependencies)
 	@$(PRINTF) '%b\n' '\0033[1mMagic file or parsers have updated. Restarting…\0033[22m'
diff --git a/lib/catalog2parser.xslt b/lib/catalog2parser.xslt
index f35fbc1..ead56da 100644
--- a/lib/catalog2parser.xslt
+++ b/lib/catalog2parser.xslt
@@ -10,14 +10,63 @@ 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:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+	xmlns:exslstr="http://exslt.org/strings"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
 	xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
-	exclude-result-prefixes="catalog"
+	exclude-result-prefixes="catalog exslstr"
 	version="1.0"
 >
 	<namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
 	<template match="/">
 		<xslt:transform version="1.0">
+			<xslt:variable name="书社:parsers">
+				<html:dl>
+					<for-each select="//catalog:uri">
+						<variable name="parser" select="document(@uri, .)"/>
+						<html:div>
+							<html:dt>
+								<value-of select="@name"/>
+							</html:dt>
+							<choose>
+								<when test="$parser/*/@书社:supported-media-types">
+									<for-each select="exslstr:tokenize($parser/*/@书社:supported-media-types)">
+										<if test="not(translate(., '0123456789abcdefghijklmnopqrstuvwxyz!#$&#x26;-^_.+/', ''))">
+											<html:dd>
+												<value-of select="."/>
+											</html:dd>
+										</if>
+									</for-each>
+								</when>
+								<otherwise>
+									<for-each select="$parser//xsl:template[not(@name) and not(@mode)]">
+										<variable name="match" select="@match"/>
+										<for-each select="namespace::*[local-name() and string()='http://www.w3.org/1999/xhtml']">
+											<variable name="matchstart">
+												<value-of select="local-name()"/>
+												<text>:</text>
+												<text>script[@type=</text>
+											</variable>
+											<if test="starts-with($match, $matchstart) and substring($match, string-length($match))=']' and contains($match, '/')">
+												<variable name="inner" select="substring-before(substring-after($match, $matchstart), ']')"/>
+												<if test="starts-with($inner, '&#x22;') and substring($inner, string-length($inner))='&#x22;' or starts-with($inner, &#x22;'&#x22;) and substring($inner, string-length($inner))=&#x22;'&#x22;">
+													<variable name="type" select="substring($inner, 2, string-length($inner)-2)"/>
+													<if test="not(translate($type, '0123456789abcdefghijklmnopqrstuvwxyz!#$&#x26;-^_.+/', ''))">
+														<html:dd>
+															<value-of select="$type"/>
+														</html:dd>
+													</if>
+												</if>
+											</if>
+										</for-each>
+									</for-each>
+								</otherwise>
+							</choose>
+						</html:div>
+					</for-each>
+				</html:dl>
+			</xslt:variable>
 			<for-each select="//catalog:uri">
 				<xslt:include href="{@uri}">
 					<if test="contains(@name, ':')">
diff --git a/lib/parser2types.xslt b/lib/parser2types.xslt
deleted file mode 100644
index 1dfa90c..0000000
--- a/lib/parser2types.xslt
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!--
-⁌ ⛩️📰 书社 ∷ lib/parser2types.xslt
-
-© 2023–2024 Lady [@ Lady’s 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/>.
--->
-<transform
-	xmlns="http://www.w3.org/1999/XSL/Transform"
-	xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-	xmlns:exslstr="http://exslt.org/strings"
-	xmlns:xslt="http://www.w3.org/1999/XSL/Transform"
-	xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
-	version="1.0"
->
-	<template match="/">
-		<for-each select="//xslt:include">
-			<variable name="included" select="document(@href, .)"/>
-			<choose>
-				<when test="$included/*/@书社:supported-media-types">
-					<for-each select="exslstr:tokenize($included/*/@书社:supported-media-types)">
-						<if test="not(translate(., '0123456789abcdefghijklmnopqrstuvwxyz!#$&#x26;-^_.+/', ''))">
-							<value-of select="."/>
-							<text>&#xA;</text>
-						</if>
-					</for-each>
-				</when>
-				<otherwise>
-					<for-each select="$included//xslt:template[not(@name) and not(@mode)]">
-						<variable name="match" select="@match"/>
-						<for-each select="namespace::*[local-name() and string()='http://www.w3.org/1999/xhtml']">
-							<variable name="matchstart">
-								<value-of select="local-name()"/>
-								<text>:</text>
-								<text>script[@type=</text>
-							</variable>
-							<if test="starts-with($match, $matchstart) and substring($match, string-length($match))=']' and contains($match, '/')">
-								<variable name="inner" select="substring-before(substring-after($match, $matchstart), ']')"/>
-								<if test="starts-with($inner, '&#x22;') and substring($inner, string-length($inner))='&#x22;' or starts-with($inner, &#x22;'&#x22;) and substring($inner, string-length($inner))=&#x22;'&#x22;">
-									<variable name="type" select="substring($inner, 2, string-length($inner)-2)"/>
-									<if test="not(translate($type, '0123456789abcdefghijklmnopqrstuvwxyz!#$&#x26;-^_.+/', ''))">
-										<value-of select="$type"/>
-										<text>&#xA;</text>
-									</if>
-								</if>
-							</if>
-						</for-each>
-					</for-each>
-				</otherwise>
-			</choose>
-		</for-each>
-	</template>
-	<output method="text" encoding="UTF-8"/>
-</transform>