Changeset 92084 in vbox for trunk

Timestamp:

Oct 26, 2021 2:22:05 PM (3 years ago)

Author:

vboxsync

Message:

doc/manual: Fixed dangling links in refentries to other refentries, causing xmllint to barf and VBoxManage build to fail.

Location:

trunk/doc/manual

Files:

• Config.kmk (modified) (1 diff)
• docbook-refentry-link-replacement-xsl-gen.xsl (modified) (4 diffs)

trunk/doc/manual/Config.kmk

@@ -349 +349 @@
                 '</catalog>'
         $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -E "XML_CATALOG_FILES=$(VBOX_XML_XREF_TO_TEXT).cat") \
-                --output "$@" "$<" $(filter %UserManual.xml,$^)
+                --stringparam 'g_sMode' 'first' --output "$@" "$<" $(filter %UserManual.xml,$^)
+        $(foreach x, $(VBOX_MANUAL_XML_REFENTRY_FILES)\
+                ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -ato "$@") --stringparam 'g_sMode' 'append' \
+                        "$<" "$(VBOX_PATH_MANUAL_SRC)/en_US/$(x)")
+        $(QUIET)$(APPEND) -n "$@" '' '</xsl:stylesheet>'
 
 #

trunk/doc/manual/docbook-refentry-link-replacement-xsl-gen.xsl

@@ -24 +24 @@
   <xsl:strip-space elements="*"/>
 
+<xsl:param name="g_sMode" select="not-specified"/>
 
 <!-- Default operation is to supress output -->
@@ -38 +39 @@
 -->
 <xsl:template match="/">
-  <xsl:text>&lt;?xml version="1.0"?&gt;
+  <xsl:if test="$g_sMode = 'first'">
+    <xsl:text>&lt;?xml version="1.0"?&gt;
 &lt;xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" &gt;
 &lt;xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes" /&gt;
@@ -48 +50 @@
 
 </xsl:text>
+  </xsl:if>
   <xsl:apply-templates/>
-  <xsl:text>
+  <xsl:if test="$g_sMode = 'last'">
+    <xsl:text>
 &lt;/xsl:stylesheet&gt;
 </xsl:text>
+  </xsl:if>
 </xsl:template>
 
@@ -122 +127 @@
 </xsl:template>
 
+<xsl:template match="refentry[@id]/refentryinfo/title">
+  <xsl:text>&lt;xsl:template match="xref[@linkend='</xsl:text>
+  <xsl:value-of select="../../@id"/><xsl:text>']"&gt;
+  &lt;xsl:text&gt; &quot;</xsl:text>
+  <xsl:value-of select="normalize-space()"/><xsl:text>&quot;&lt;/xsl:text&gt;
+&lt;/xsl:template&gt;
+</xsl:text>
+  <xsl:apply-templates/>
+</xsl:template>
+
+
 <!--
   Debug/Diagnostics: Return the path to the specified node (by default the current).