From 6664a23ac70e81fdc27d210914297cd62894e34e Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Tue, 25 Apr 2006 06:31:24 +0000
Subject: [PATCH] Added man.output.manifest.enabled and
 man.output.manifest.filename params.

If man.output.manifest.enabled is non-zero, a list of filenames
for man pages generated by the stylesheet transformation is
written to the file named by man.output.manifest.filename
---
 xsl/manpages/docbook.xsl                    | 21 +++++++++--------
 xsl/manpages/other.xsl                      |  7 +++---
 xsl/manpages/param.ent                      |  2 ++
 xsl/manpages/param.xweb                     | 11 +++++++--
 xsl/params/man.output.manifest.enabled.xml  | 23 +++++++++++++++++++
 xsl/params/man.output.manifest.filename.xml | 25 +++++++++++++++++++++
 xsl/tools/make/Makefile.DocBook             |  4 ++--
 7 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 xsl/params/man.output.manifest.enabled.xml
 create mode 100644 xsl/params/man.output.manifest.filename.xml

diff --git a/xsl/manpages/docbook.xsl b/xsl/manpages/docbook.xsl
index 6f0f39206..8826c1326 100644
--- a/xsl/manpages/docbook.xsl
+++ b/xsl/manpages/docbook.xsl
@@ -37,8 +37,6 @@
   <xsl:include href="links.xsl"/>
   <xsl:include href="table.xsl"/>
 
-  <xsl:param name="man.manifest.enabled" select="0"/>
-  <xsl:param name="man.manifest.filename">MAN.MANIFEST</xsl:param>
   <xsl:param name="man.segtitle.suppress" select="0"/>
   <xsl:param name="man.indent.authors.section" select="1"/>
   <xsl:param name="man.indent.headings" select="0"/>
@@ -78,23 +76,24 @@
             <!-- * Check to see if we have any refentry children in this -->
             <!-- * document; if so, process them. -->
             <xsl:apply-templates select="//refentry"/>
-            <!-- * if $man.manifest.enabled is non-zero, generate a manifest file -->
-            <xsl:if test="not($man.manifest.enabled = 0)">
+            <!-- * if $man.output.manifest.enabled is non-zero, -->
+            <!-- * generate a manifest file -->
+            <xsl:if test="not($man.output.manifest.enabled = 0)">
               <xsl:call-template name="generate.manifest">
                 <xsl:with-param name="filename">
                   <xsl:choose>
-                    <xsl:when test="not($man.manifest.filename = '')">
+                    <xsl:when test="not($man.output.manifest.filename = '')">
                       <!-- * If a name for the manifest file is specified, -->
                       <!-- * use that name. -->
-                      <xsl:value-of select="$man.manifest.filename"/>
+                      <xsl:value-of select="$man.output.manifest.filename"/>
                     </xsl:when>
                     <xsl:otherwise>
                       <!-- * Otherwise, if user has unset -->
-                      <!-- * $man.manifest.filename, default to using -->
-                      <!-- * "MAN.MANIFEST" as the filename. Because -->
-                      <!-- * $man.manifest.enabled is non-zero and so we -->
-                      <!-- * must have a filename in order to generate -->
-                      <!-- * the manifest. -->
+                      <!-- * $man.output.manifest.filename, default to -->
+                      <!-- * using "MAN.MANIFEST" as the filename. Because -->
+                      <!-- * $man.output.manifest.enabled is non-zero and -->
+                      <!-- * so we must have a filename in order to -->
+                      <!-- * generate the manifest. -->
                       <xsl:text>MAN.MANIFEST</xsl:text>
                     </xsl:otherwise>
                   </xsl:choose>
diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 28d0d40a4..d2c22153e 100644
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -431,7 +431,6 @@ db:manvolnum
   <!-- *  file, we need to include in it a filename for each man-page -->
   <!-- *  generated, including any "stub" pages. -->
   <xsl:template name="generate.manifest">
-    <xsl:param name="filename">MAN.MANIFEST</xsl:param>
     <xsl:variable name="filelist">
       <xsl:for-each select="//refentry">
         <!-- * all refname instances in a Refentry inherit their section -->
@@ -456,7 +455,7 @@ db:manvolnum
     <!-- * Refentry -->
     <xsl:call-template name="write.text.chunk">
       <xsl:with-param name="filename">
-        <xsl:value-of select="$man.manifest.filename"/>
+        <xsl:value-of select="$man.output.manifest.filename"/>
       </xsl:with-param>
       <xsl:with-param name="quiet" select="1"/>
       <xsl:with-param name="message-prolog">Note: </xsl:with-param>
@@ -465,7 +464,9 @@ db:manvolnum
         <xsl:value-of select="$filelist"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:message><xsl:text>&#10;</xsl:text></xsl:message>
+    <xsl:if test="$man.output.quietly = 0">
+      <xsl:message><xsl:text>&#10;</xsl:text></xsl:message>
+    </xsl:if>
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/xsl/manpages/param.ent b/xsl/manpages/param.ent
index cdf535c94..2f81b9ca7 100644
--- a/xsl/manpages/param.ent
+++ b/xsl/manpages/param.ent
@@ -35,6 +35,8 @@
 <!ENTITY man.th.extra2.suppress SYSTEM "../params/man.th.extra2.suppress.xml">
 <!ENTITY man.th.extra3.suppress SYSTEM "../params/man.th.extra3.suppress.xml">
 <!ENTITY man.output.quietly SYSTEM "../params/man.output.quietly.xml">
+<!ENTITY man.output.manifest.enabled SYSTEM "../params/man.output.manifest.enabled.xml">
+<!ENTITY man.output.manifest.filename SYSTEM "../params/man.output.manifest.filename.xml">
 <!ENTITY man.output.encoding SYSTEM "../params/man.output.encoding.xml">
 <!ENTITY man.subheading.divider SYSTEM "../params/man.subheading.divider.xml">
 <!ENTITY man.subheading.divider.enabled SYSTEM "../params/man.subheading.divider.enabled.xml">
diff --git a/xsl/manpages/param.xweb b/xsl/manpages/param.xweb
index c8a9e7b28..982dd17bd 100644
--- a/xsl/manpages/param.xweb
+++ b/xsl/manpages/param.xweb
@@ -82,10 +82,15 @@
 &man.th.extra2.max.length;
 &man.th.extra3.max.length;
   </reference>
-  <reference id="other">
-  <title>Other</title>
+  <reference id="output">
+  <title>Output</title>
+&man.output.manifest.enabled;
+&man.output.manifest.filename;
 &man.output.quietly;
 &man.output.encoding;
+  </reference>
+  <reference id="other">
+  <title>Other</title>
 &man.subheading.divider.enabled;
 &man.subheading.divider;
   </reference>
@@ -118,6 +123,8 @@
 <src:fragref linkend="man.hyphenate.filenames.frag"/>
 <src:fragref linkend="man.hyphenate.computer.inlines.frag"/>
 <src:fragref linkend="man.justify.frag"/>
+<src:fragref linkend="man.output.manifest.enabled.frag"/>
+<src:fragref linkend="man.output.manifest.filename.frag"/>
 <src:fragref linkend="man.output.quietly.frag"/>
 <src:fragref linkend="man.output.encoding.frag"/>
 <src:fragref linkend="man.string.subst.map.frag"/>
diff --git a/xsl/params/man.output.manifest.enabled.xml b/xsl/params/man.output.manifest.enabled.xml
new file mode 100644
index 000000000..108804e1c
--- /dev/null
+++ b/xsl/params/man.output.manifest.enabled.xml
@@ -0,0 +1,23 @@
+<refentry id="man.output.manifest.enabled">
+  <refmeta>
+    <refentrytitle>man.output.manifest.enabled</refentrytitle>
+    <refmiscinfo role="type">boolean</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>man.output.manifest.enabled</refname>
+    <refpurpose>Generate a manifest file?</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <src:fragment id='man.output.manifest.enabled.frag'
+      ><xsl:param name="man.output.manifest.enabled" select="0"/></src:fragment>
+  </refsynopsisdiv>
+
+  <refsect1><title>Description</title>
+
+    <para>If non-zero, a list of filenames for man pages generated by
+    the stylesheet transformation is written to the file named by the
+    <parameter>man.output.manifest.filename</parameter> parameter.</para>
+
+  </refsect1>
+</refentry>
diff --git a/xsl/params/man.output.manifest.filename.xml b/xsl/params/man.output.manifest.filename.xml
new file mode 100644
index 000000000..30811578b
--- /dev/null
+++ b/xsl/params/man.output.manifest.filename.xml
@@ -0,0 +1,25 @@
+<refentry id="man.output.manifest.filename">
+  <refmeta>
+    <refentrytitle>man.output.manifest.filename</refentrytitle>
+    <refmiscinfo role="type">string</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>man.output.manifest.filename</refname>
+    <refpurpose>Name of manifest file</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <src:fragment id='man.output.manifest.filename.frag'
+      ><xsl:param name="man.output.manifest.filename">MAN.MANIFEST</xsl:param></src:fragment>
+  </refsynopsisdiv>
+
+  <refsect1><title>Description</title>
+
+    <para>The <parameter>man.output.manifest.filename</parameter> parameter
+    specifies the name of the file to which the manpages manifest file
+    is written (if the value of the
+    <parameter>man.output.manifest.enabled</parameter> parameter is
+    non-zero).</para>
+
+  </refsect1>
+</refentry>
diff --git a/xsl/tools/make/Makefile.DocBook b/xsl/tools/make/Makefile.DocBook
index a2fad75e2..49b43e30a 100644
--- a/xsl/tools/make/Makefile.DocBook
+++ b/xsl/tools/make/Makefile.DocBook
@@ -340,7 +340,7 @@ CHNK_CUSTOM := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 MAN_CUSTOM := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \
                 version="1.0"> \
   <xsl:import href="$(DOCBOOK_XSL)/manpages/docbook.xsl"/> \
-  <xsl:param name="man.manifest.enabled" select="1"/> \
+  <xsl:param name="man.output.manifest.enabled" select="1"/> \
   <xsl:param name="man.output.in.separate.dir" select="1"/> \
   <xsl:param name="man.output.base.dir">man/</xsl:param> \
   <xsl:param name="man.output.subdirs.enabled" select="1"/> \
@@ -480,7 +480,7 @@ endif
 	else \
 	  echo '$(MAN_CUSTOM)' \
 	  | $(XSLT) $(XSLT_FLAGS) $(MAN_PARAMS) \
-	    --stringparam man.manifest.filename $@ \
+	    --stringparam man.output.manifest.filename $@ \
 	    - $<; \
 	fi
 
-- 
2.40.0