Added options for controlling indentation in lists and in *blurb

output in the AUTHORS section. Controlled through the
man.indentation.lists.adjust, man.indentation.lists.value,
man.indentation.authors.adjust, and man.indentation.authors.value
parameters. Default is 3 characters (instead of the roff default
of 8 characters). Closes #1449369.

Also, removed the indent that was being set on informalexample
outuput. I will instead add an option for indenting verbatims,
which I think is what the informalexample indent was intended for
originally.

diff --git a/xsl/manpages/block.xsl b/xsl/manpages/block.xsl
index ac554bae883313bec24fbee01be2c569319dabb9..2ca5a955022cab605da5da70f035b6abb4d7e470 100644 (file)
--- a/xsl/manpages/block.xsl
+++ b/xsl/manpages/block.xsl
@@ -54,6 +54,8 @@
   <xsl:text>.sp&#10;</xsl:text>
 </xsl:template>
 
+<!-- ==================================================================== -->
+
 <xsl:template match="literallayout|programlisting|screen|
                      address|synopsis|funcsynopsisinfo">
   <!-- * Yes, address, synopsis, and funcsynopsisinfo are verbatim environments. -->
@@ -118,12 +120,12 @@
   </xsl:if>
 </xsl:template>
 
+<!-- ==================================================================== -->
+
 <xsl:template match="informalexample">
-  <xsl:text>.IP&#10;</xsl:text>
   <xsl:apply-templates/>
 </xsl:template>
 
-
 <!-- ==================================================================== -->
 
 <xsl:template match="figure">

diff --git a/xsl/manpages/docbook.xsl b/xsl/manpages/docbook.xsl
index 9c4b42e98b9c6433d379dfd7194b943c2b4d775d..40f0fd0ecac7beafe45e661473e40f5ebfede450 100644 (file)
--- a/xsl/manpages/docbook.xsl
+++ b/xsl/manpages/docbook.xsl
@@ -37,11 +37,15 @@
   <xsl:include href="links.xsl"/>
   <xsl:include href="table.xsl"/>
 
-  <xsl:param name="man.manifest.enabled">0</xsl:param>
+  <xsl:param name="man.manifest.enabled" select="0"/>
   <xsl:param name="man.manifest.filename">MAN.MANIFEST</xsl:param>
-  <xsl:param name="man.segtitle.suppress">0</xsl:param>
-  <xsl:param name="man.indentation.default.adjust">0</xsl:param>
+  <xsl:param name="man.segtitle.suppress" select="0"/>
+  <xsl:param name="man.indentation.default.adjust" select="0"/>
   <xsl:param name="man.indentation.default.value">3n</xsl:param>
+  <xsl:param name="man.indentation.lists.adjust" select="1"/>
+  <xsl:param name="man.indentation.lists.value">3n</xsl:param>
+  <xsl:param name="man.indentation.authors.adjust" select="1"/>
+  <xsl:param name="man.indentation.authors.value">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>

diff --git a/xsl/manpages/info.xsl b/xsl/manpages/info.xsl
index 6bfcaa7214467a832aa3b643a6d37aea3bceec61..3e63b96a6cf46f495f3874758f07e2a6d489b036 100644 (file)
--- a/xsl/manpages/info.xsl
+++ b/xsl/manpages/info.xsl
@@ -15,6 +15,23 @@
 
      ******************************************************************** -->
 
+  <xsl:variable name="authors-indent">
+    <xsl:choose>
+      <xsl:when test="not($man.indentation.authors.adjust = 0)">
+        <xsl:value-of select="$man.indentation.authors.value"/>
+      </xsl:when>
+      <xsl:when test="not($man.indentation.default.adjust = 0)">
+        <!-- * "zq" is the name of a register we set for preserving the -->
+        <!-- * original default indent value when -->
+        <!-- * $man.indentation.default.adjust is non-zero; -->
+        <!-- * "u" is a roff unit specifier -->
+        <xsl:text>\n(zqu</xsl:text>
+      </xsl:when>
+      <xsl:otherwise/> <!-- * otherwise, just leave it empty -->
+    </xsl:choose>
+  </xsl:variable>
+
+  <!-- ================================================================== -->
   <!-- * About the $info param used in this stylesheet -->
   <!-- * -->
   <!-- * The $info param is a "master info" node set that contains -->
@@ -250,7 +267,12 @@
 
   <xsl:template name="publisher.attribution">
     <xsl:text>&#10;.sp -1n&#10;</xsl:text>
-    <xsl:text>.IP&#10;</xsl:text>
+    <xsl:text>.IP ""</xsl:text> 
+    <xsl:if test="not($authors-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$authors-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
     <xsl:call-template name="gentext">
       <xsl:with-param name="key" select="'Publisher'"/>
     </xsl:call-template>
@@ -339,7 +361,12 @@
       <!-- * Editor, then render the corresponding localized gentext -->
       <xsl:when test="self::author">
         <xsl:text>&#10;.sp -1n&#10;</xsl:text>
-        <xsl:text>.IP&#10;</xsl:text>
+        <xsl:text>.IP ""</xsl:text> 
+        <xsl:if test="not($authors-indent = '')">
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="$authors-indent"/>
+        </xsl:if>
+        <xsl:text>&#10;</xsl:text>
         <xsl:call-template name="gentext">
           <xsl:with-param name="key" select="'Author'"/>
         </xsl:call-template>
@@ -347,7 +374,12 @@
       </xsl:when>
       <xsl:when test="self::editor">
         <xsl:text>&#10;.sp -1n&#10;</xsl:text>
-        <xsl:text>.IP&#10;</xsl:text>
+        <xsl:text>.IP ""</xsl:text> 
+        <xsl:if test="not($authors-indent = '')">
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="$authors-indent"/>
+        </xsl:if>
+        <xsl:text>&#10;</xsl:text>
         <xsl:call-template name="gentext">
           <xsl:with-param name="key" select="'Editor'"/>
         </xsl:call-template>
@@ -359,7 +391,12 @@
         <xsl:choose>
           <xsl:when test="@class and @class != 'other'">
             <xsl:text>&#10;.sp -1n&#10;</xsl:text>
-            <xsl:text>.IP&#10;</xsl:text>
+            <xsl:text>.IP ""</xsl:text> 
+            <xsl:if test="not($authors-indent = '')">
+              <xsl:text> </xsl:text>
+              <xsl:value-of select="$authors-indent"/>
+            </xsl:if>
+            <xsl:text>&#10;</xsl:text>
             <xsl:call-template name="gentext">
               <xsl:with-param name="key" select="@class"/>
             </xsl:call-template>
@@ -380,7 +417,12 @@
 
   <xsl:template match="personblurb|authorblurb" mode="authorsect">
     <xsl:text>&#10;.sp -1n&#10;</xsl:text>
-    <xsl:text>.IP&#10;</xsl:text>
+    <xsl:text>.IP ""</xsl:text> 
+    <xsl:if test="not($authors-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$authors-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
     <!-- * yeah, it's possible for a *blurb to have a "title" -->
     <xsl:apply-templates select="title"/>
     <xsl:for-each select="*[name() != 'title']">
@@ -403,7 +445,12 @@
     <!-- * We treat Contrib the same as Personblurb/Authorblurb -->
     <!-- * except that we don't need to check for a title. -->
     <xsl:text>&#10;.sp -1n&#10;</xsl:text>
-    <xsl:text>&#10;.IP&#10;</xsl:text>
+    <xsl:text>&#10;.IP ""</xsl:text>
+    <xsl:if test="not($authors-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$authors-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 

diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index e58e47bd476d988bf0975c1a0b1278dbcbab32e4..7895b24a9305ee2e540bb807d0c6a757b4a25534 100644 (file)
--- a/xsl/manpages/lists.xsl
+++ b/xsl/manpages/lists.xsl
@@ -11,6 +11,25 @@
      copyright and other information.
 
      ******************************************************************** -->
+
+<xsl:variable name="list-indent">
+  <xsl:choose>
+    <xsl:when test="not($man.indentation.lists.adjust = 0)">
+      <xsl:value-of select="$man.indentation.lists.value"/>
+    </xsl:when>
+    <xsl:when test="not($man.indentation.default.adjust = 0)">
+      <!-- * "zq" is the name of a register we set for preserving the -->
+      <!-- * original default indent value when -->
+      <!-- * $man.indentation.default.adjust is non-zero; -->
+      <!-- * "u" is a roff unit specifier -->
+      <xsl:text>\n(zqu</xsl:text>
+    </xsl:when>
+    <xsl:otherwise/> <!-- * otherwise, just leave it empty -->
+  </xsl:choose>
+</xsl:variable>
+
+<!-- ================================================================== -->
+
 <xsl:template match="para[ancestor::listitem or ancestor::step or ancestor::glossdef]|
                     simpara[ancestor::listitem or ancestor::step or ancestor::glossdef]|
                     remark[ancestor::listitem or ancestor::step or ancestor::glossdef]">
@@ -45,7 +64,12 @@
       <xsl:text>.PP&#10;</xsl:text> 
     </xsl:when>
     <xsl:otherwise> <!-- * we only have one term, so use .TP -->
-      <xsl:text>.TP&#10;</xsl:text> 
+      <xsl:text>.TP</xsl:text> 
+      <xsl:if test="not($list-indent = '')">
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="$list-indent"/>
+      </xsl:if>
+      <xsl:text>&#10;</xsl:text> 
     </xsl:otherwise>
   </xsl:choose>
   <xsl:for-each select="term|glossterm">
@@ -77,7 +101,12 @@
     <!-- * if we have multiple terms in the same varlistentry, we need to-->
     <!-- *  manually indent the listitem using .RS and .RE -->
     <xsl:when test="count(term) > 1">
-      <xsl:text>.RS&#10;</xsl:text>
+      <xsl:text>.RS</xsl:text> 
+      <xsl:if test="not($list-indent = '')">
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="$list-indent"/>
+      </xsl:if>
+      <xsl:text>&#10;</xsl:text>
       <xsl:apply-templates/>
       <xsl:text>.RE&#10;</xsl:text>
     </xsl:when>
@@ -91,15 +120,25 @@
 <xsl:template match="glossentry/glossterm"/>
 
 <xsl:template match="variablelist[ancestor::listitem or ancestor::step or ancestor::glossdef]|
-                    glosslist[ancestor::listitem or ancestor::step or ancestor::glossdef]">
-  <xsl:text>.RS&#10;</xsl:text>
+                     glosslist[ancestor::listitem or ancestor::step or ancestor::glossdef]">
+  <xsl:text>.RS</xsl:text> 
+  <xsl:if test="not($list-indent = '')">
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="$list-indent"/>
+  </xsl:if>
+  <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:text>.RE&#10;</xsl:text>
   <xsl:if test="following-sibling::node() or
                 parent::para[following-sibling::node()] or
                 parent::simpara[following-sibling::node()] or
                 parent::remark[following-sibling::node()]">
-    <xsl:text>.IP&#10;</xsl:text>
+    <xsl:text>.IP ""</xsl:text> 
+    <xsl:if test="not($list-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$list-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
@@ -115,7 +154,12 @@
   <xsl:text>&#x2022;&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:if test="following-sibling::listitem">
-    <xsl:text>.TP&#10;</xsl:text>
+    <xsl:text>.TP</xsl:text> 
+    <xsl:if test="not($list-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$list-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
@@ -124,7 +168,12 @@
   <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:if test="position()!=last()">
-    <xsl:text>.TP&#10;</xsl:text>
+    <xsl:text>.TP</xsl:text> 
+    <xsl:if test="not($list-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$list-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
@@ -134,31 +183,51 @@
     <xsl:apply-templates mode="bold" select="title"/>
     <xsl:text>&#10;</xsl:text>
   </xsl:if>
-  <xsl:text>.TP 3&#10;</xsl:text>
+  <xsl:text>.TP</xsl:text> 
+  <xsl:if test="not($list-indent = '')">
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="$list-indent"/>
+  </xsl:if>
+  <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:if test="following-sibling::node()">
-  <xsl:text>.sp&#10;</xsl:text>
-  <xsl:text>.RE&#10;</xsl:text>
+    <xsl:text>.sp&#10;</xsl:text>
+    <xsl:text>.RE&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="itemizedlist[ancestor::listitem or ancestor::step  or ancestor::glossdef]|
                     orderedlist[ancestor::listitem or ancestor::step or ancestor::glossdef]|
-                    procedure[ancestor::listitem or ancestor::step or ancestor::glossdef]">
-  <xsl:text>.RS&#10;</xsl:text>
+                     procedure[ancestor::listitem or ancestor::step or ancestor::glossdef]">
+  <xsl:text>.RS</xsl:text> 
+  <xsl:if test="not($list-indent = '')">
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="$list-indent"/>
+  </xsl:if>
+  <xsl:text>&#10;</xsl:text>
   <xsl:if test="title">
     <xsl:text>.PP&#10;</xsl:text>
     <xsl:apply-templates mode="bold" select="title"/>
     <xsl:text>&#10;</xsl:text>
   </xsl:if>
-  <xsl:text>.TP 3&#10;</xsl:text>
+  <xsl:text>.TP</xsl:text> 
+  <xsl:if test="not($list-indent = '')">
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="$list-indent"/>
+  </xsl:if>
+  <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:text>.RE&#10;</xsl:text>
   <xsl:if test="following-sibling::node() or
                 parent::para[following-sibling::node()] or
                 parent::simpara[following-sibling::node()] or
                 parent::remark[following-sibling::node()]">
-    <xsl:text>.IP&#10;</xsl:text>
+    <xsl:text>.IP ""</xsl:text> 
+    <xsl:if test="not($list-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$list-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
   </xsl:if>
 </xsl:template>
 
@@ -203,7 +272,12 @@
 <!-- * list (ignoring the values of the type and columns attributes) -->
 <xsl:template match="simplelist">
   <xsl:for-each select="member">
-    <xsl:text>.IP&#10;</xsl:text>
+    <xsl:text>.IP ""</xsl:text> 
+    <xsl:if test="not($list-indent = '')">
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="$list-indent"/>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
     <xsl:text>&#10;</xsl:text>
   </xsl:for-each>