git subrepo pull utils/build-utils

subrepo: subdir: "utils/build-utils" merged: "6ad14de89f" upstream: origin: "[email protected]:daisy/pipeline-build-utils.git" branch: "master" commit: "1a94a0e431" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
daisy · Oct 17, 2023 · 148fead · 148fead
1 parent 7209f2e
commit 148fead
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/utils/build-utils/.gitrepo b/utils/build-utils/.gitrepo
@@ -7,5 +7,5 @@
 	remote = [email protected]:daisy/pipeline-build-utils.git
 	branch = master
 	commit = 1a94a0e4313ffa28292b66a78d19aa0f817c75d3
-	parent = 215163678ec2e2d13abcecb7d0a9342143400098
+	parent = cb705a340b12641693b3c383f20b19f08a6f8f5b
 	cmdver = 0.3.1
diff --git a/utils/build-utils/modules-build-helper/pom.xml b/utils/build-utils/modules-build-helper/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.daisy.pipeline.build</groupId>
   <artifactId>modules-build-helper</artifactId>
-  <version>2.7.1-SNAPSHOT</version>
+  <version>2.7.2-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>DAISY Pipeline 2 :: Modules Build Helper</name>

diff --git a/...s/build-utils/modules-build-helper/src/main/resources/htmlize-sources/htmlize-catalog.xsl b/...s/build-utils/modules-build-helper/src/main/resources/htmlize-sources/htmlize-catalog.xsl
@@ -2,6 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:pf="http://www.daisy.org/ns/pipeline/functions"
                 xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:px="http://www.daisy.org/ns/pipeline"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 exclude-result-prefixes="#all"
@@ -77,6 +78,10 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template mode="serialize" match="a:documentation[not(@xml:space='preserve')]/text()">
+		<xsl:value-of select="normalize-space(.)"/>
+	</xsl:template>
+
 	<xsl:template mode="attribute-value" match="cat:uri/@name">
 		<a href="../{parent::*/@uri}" class="apidoc">
 			<span rel="alias" resource="{.}">

diff --git a/utils/build-utils/modules-build-helper/src/main/resources/htmlize-sources/htmlize-xproc.xsl b/utils/build-utils/modules-build-helper/src/main/resources/htmlize-sources/htmlize-xproc.xsl
@@ -5,6 +5,7 @@
                 xmlns:px="http://www.daisy.org/ns/pipeline"
                 xmlns:pxd="http://www.daisy.org/ns/pipeline/xproc"
                 xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 exclude-result-prefixes="#all"
                 version="2.0">
 
@@ -95,6 +96,11 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template mode="serialize"
+	              match="/*/p:option/p:pipeinfo/pxd:type//a:documentation[not(@xml:space='preserve')]/text()">
+		<xsl:value-of select="normalize-space(.)"/>
+	</xsl:template>
+
 	<xsl:template name="set-rel">
 		<xsl:param name="rel" required="yes"/>
 		<span rel="{$rel}">

diff --git a/utils/build-utils/modules-test-helper/pom.xml b/utils/build-utils/modules-test-helper/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.daisy.pipeline.build</groupId>
   <artifactId>modules-test-helper</artifactId>
-  <version>2.2.3</version>
+  <version>2.2.4-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>DAISY Pipeline 2 :: Modules Test Helper</name>
@@ -134,8 +134,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <scm>
-    <tag>modules-test-helper-2.2.3</tag>
-  </scm>
 </project>