Added man.font.funcsynopsisinfo and man.font.funcprototype

params, for specifying the roff font (for example, BI, B, I) for
funcsynopsisinfo and funcprototype output.

diff --git a/xsl/manpages/block.xsl b/xsl/manpages/block.xsl
index 14ca6fb8ec7c6f5c062c4cb87530193a4eb92b11..1e51484fbb9d4f088acbb1f9cf0d435a020a7581 100644 (file)
--- a/xsl/manpages/block.xsl
+++ b/xsl/manpages/block.xsl
@@ -109,13 +109,13 @@
       <!-- * this "bold everything in function synopsis" rule. -->
       <!-- * -->
       <!-- * Users who don't want the bold output can choose to adjust the -->
-      <!-- * man.funcsynopsisinfo.font parameter on their own. So even if you -->
+      <!-- * man.font.funcsynopsisinfo parameter on their own. So even if you -->
       <!-- * don't personally like the way it looks, please don't change the -->
       <!-- * default to be non-bold - because it's a convention that's -->
       <!-- * followed is the vast majority of existing man pages that document -->
       <!-- * functions, and we need to follow it by default, like it or no. -->
       <xsl:text>.ft </xsl:text>
-      <xsl:value-of select="$man.funcsynopsisinfo.font"/>
+      <xsl:value-of select="$man.font.funcsynopsisinfo"/>
       <xsl:text>&#10;</xsl:text>
       <xsl:text>.nf&#10;</xsl:text>
       <xsl:apply-templates/>

diff --git a/xsl/manpages/docbook.xsl b/xsl/manpages/docbook.xsl
index b8d934fa6a8a75ab7431c5abdd98840e942fa06c..cebbb58c080bb74209cf64ad4bf3f40d233a10a5 100644 (file)
--- a/xsl/manpages/docbook.xsl
+++ b/xsl/manpages/docbook.xsl
@@ -42,15 +42,14 @@
   <xsl:param name="man.indent.lists" select="1"/>
   <xsl:param name="man.indent.verbatims" select="1"/>
   <xsl:param name="man.indent.width">3n</xsl:param>
-  <xsl:param name="man.funcprototype.font">BI</xsl:param>
-  <xsl:param name="man.funcsynopsisinfo.font">B</xsl:param>
-  <xsl:param name="man.table.headings.font">B</xsl:param>
-  <xsl:param name="man.table.title.font">B</xsl:param>
   <xsl:param name="man.table.footnotes.separator.line">----</xsl:param>
   <xsl:param name="man.output.in.separate.dir" select="0"/>
   <xsl:param name="man.output.base.dir">man/</xsl:param>
   <xsl:param name="man.output.subdirs.enabled" select="1"/>
 
+  <xsl:param name="tbl.font.headings" select="man.font.table.headings">B</xsl:param>
+  <xsl:param name="tbl.font.title" select="man.font.table.title">B</xsl:param>
+
   <!-- ==================================================================== -->
 
   <xsl:template match="/">

diff --git a/xsl/manpages/param.ent b/xsl/manpages/param.ent
index b7a274b4d023bdd2a168829f8b3ca606892d345b..69abdc87b142eb0f1136d19a59aca30aca6a9885 100644 (file)
--- a/xsl/manpages/param.ent
+++ b/xsl/manpages/param.ent
@@ -41,3 +41,5 @@
 <!ENTITY man.subheading.divider SYSTEM "../params/man.subheading.divider.xml">
 <!ENTITY man.subheading.divider.enabled SYSTEM "../params/man.subheading.divider.enabled.xml">
 <!ENTITY man.segtitle.suppress SYSTEM "../params/man.segtitle.suppress.xml">
+<!ENTITY man.font.funcprototype SYSTEM "../params/man.font.funcprototype.xml">
+<!ENTITY man.font.funcsynopsisinfo SYSTEM "../params/man.font.funcsynopsisinfo.xml">

diff --git a/xsl/manpages/param.xweb b/xsl/manpages/param.xweb
index bbd5f88519a68f132aceae1f788c95c0d5249292..259092a934e819ee7ed7a45b93684534d6a53eca 100644 (file)
--- a/xsl/manpages/param.xweb
+++ b/xsl/manpages/param.xweb
@@ -36,6 +36,11 @@
 &man.hyphenate.computer.inlines;
 &man.justify;
 &man.break.after.slash;
+  </reference>
+  <reference id="fonts">
+  <title>Fonts</title>
+&man.font.funcprototype;
+&man.font.funcsynopsisinfo;
   </reference>
   <reference id="links">
   <title>Link handling</title>
@@ -124,6 +129,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.font.funcprototype.frag"/>
+<src:fragref linkend="man.font.funcsynopsisinfo.frag"/>
 <src:fragref linkend="man.output.manifest.enabled.frag"/>
 <src:fragref linkend="man.output.manifest.filename.frag"/>
 <src:fragref linkend="man.output.quietly.frag"/>

diff --git a/xsl/manpages/synop.xsl b/xsl/manpages/synop.xsl
index 717f6c6b06187e82d3206cc20a9fe885edd48026..eebaa50658a5afbcded835a83f07452d192eed6f 100644 (file)
--- a/xsl/manpages/synop.xsl
+++ b/xsl/manpages/synop.xsl
@@ -220,7 +220,7 @@
 <!-- * this "bold everything in function synopsis" rule. -->
 <!-- * -->
 <!-- * Users who don't want the bold output can choose to adjust the -->
-<!-- * man.funcprototype.font parameter on their own. So even if you -->
+<!-- * man.font.funcprototype parameter on their own. So even if you -->
 <!-- * don't personally like the way it looks, please don't change the -->
 <!-- * default to be non-bold - because it's a convention that's -->
 <!-- * followed is the vast majority of existing man pages that document -->
@@ -238,7 +238,7 @@
   <xsl:value-of select="string-length (normalize-space ($funcprototype.string.value)) + 1"/>
   <xsl:text>&#10;</xsl:text>
   <xsl:text>.</xsl:text>
-  <xsl:value-of select="$man.funcprototype.font"/>
+  <xsl:value-of select="$man.font.funcprototype"/>
   <xsl:text> </xsl:text>
   <!-- * The following quotation mark (and the one further below) are -->
   <!-- * needed to properly delimit the parts of the Funcprototype that -->

diff --git a/xsl/manpages/table.xsl b/xsl/manpages/table.xsl
index c4603709f0467f63da3fc9a7bc29ac68351e8b21..2e8ad2085c8ae15d5e6fa1fff30f5dd4bbfe23d1 100644 (file)
--- a/xsl/manpages/table.xsl
+++ b/xsl/manpages/table.xsl
@@ -15,11 +15,11 @@
        ******************************************************************** -->
   <!--
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+  <xsl:param name="tbl.font.title">B</xsl:param>
+  <xsl:param name="tbl.font.headings">B</xsl:param>
   -->
   <xsl:param name="tbl.running.header.from.thead" select="0"/>
   <xsl:param name="tbl.column.separator.char">:</xsl:param>
-  <xsl:param name="tbl.title.font">B</xsl:param>
-  <xsl:param name="tbl.headings.font">B</xsl:param>
 
   <!-- ==================================================================== -->
 
@@ -127,7 +127,7 @@
       <xsl:if test="$title != '' or parent::td">
         <xsl:text>.PP&#10;</xsl:text>
         <xsl:text>.</xsl:text>
-        <xsl:value-of select="$tbl.title.font"/>
+        <xsl:value-of select="$tbl.font.title"/>
         <xsl:text> </xsl:text>
         <xsl:if test="parent::td">
           <xsl:text>*[nested&#160;table]</xsl:text>
@@ -510,8 +510,8 @@
     </xsl:if>
     <xsl:if test="@class = 'th'">
       <!-- * If this is a heading row, generate a font indicator (B or I), -->
-      <!-- * or if the value of $man.table.headings.font is empty, nothing. -->
-      <xsl:value-of select="$tbl.headings.font"/>
+      <!-- * or if the value of $tbl.font.headings is empty, nothing. -->
+      <xsl:value-of select="$tbl.font.headings"/>
     </xsl:if>
     <!-- * We only need to deal with colspans whose value is greater -->
     <!-- * than one (a colspan="1" is the same as having no colspan -->

diff --git a/xsl/params/man.font.funcprototype.xml b/xsl/params/man.font.funcprototype.xml
new file mode 100644 (file)
index 0000000..a769b4c
--- /dev/null
+++ b/xsl/params/man.font.funcprototype.xml
@@ -0,0 +1,25 @@
+<refentry id="man.font.funcprototype">
+<refmeta>
+<refentrytitle>man.font.funcprototype</refentrytitle>
+
+</refmeta>
+<refnamediv>
+<refname>man.font.funcprototype</refname>
+<refpurpose>Specifies font for funcprototype output</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='man.font.funcprototype.frag'>
+  <xsl:param name="man.font.funcprototype">BI</xsl:param>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>The <parameter>man.font.funcprototype</parameter> parameter
+specifies the font for <sgmltag>funcprototype</sgmltag> output. It
+should be a valid roff font name, such as <literal>BI</literal> or
+<literal>B</literal>.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/man.font.funcsynopsisinfo.xml b/xsl/params/man.font.funcsynopsisinfo.xml
new file mode 100644 (file)
index 0000000..4071bf4
--- /dev/null
+++ b/xsl/params/man.font.funcsynopsisinfo.xml
@@ -0,0 +1,25 @@
+<refentry id="man.font.funcsynopsisinfo">
+<refmeta>
+<refentrytitle>man.font.funcsynopsisinfo</refentrytitle>
+
+</refmeta>
+<refnamediv>
+<refname>man.font.funcsynopsisinfo</refname>
+<refpurpose>Specifies font for funcsynopsisinfo output</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='man.font.funcsynopsisinfo.frag'>
+  <xsl:param name="man.font.funcsynopsisinfo">B</xsl:param>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>The <parameter>man.font.funcsynopsisinfo</parameter> parameter
+specifies the font for <sgmltag>funcsynopsisinfo</sgmltag> output. It
+should be a valid roff font name, such as <literal>B</literal> or
+<literal>I</literal>.</para>
+
+</refsect1>
+</refentry>