Changed names of all boolean indentation params to man.indent.*

Also discarded individual man.indent.*.value params and switched
to just using a common man.indent.width param (3n by default).

diff --git a/xsl/manpages/docbook.xsl b/xsl/manpages/docbook.xsl
index ac43df38b55cd1a833f82488fb555c072a39406d..6f0f392063feb344a00c30894f2ee43614db5715 100644 (file)
--- a/xsl/manpages/docbook.xsl
+++ b/xsl/manpages/docbook.xsl
@@ -40,14 +40,11 @@
   <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.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.indentation.verbatims.adjust" select="1"/>
-  <xsl:param name="man.indentation.verbatims.value">3n</xsl:param>
+  <xsl:param name="man.indent.authors.section" select="1"/>
+  <xsl:param name="man.indent.headings" select="0"/>
+  <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>

diff --git a/xsl/manpages/info.xsl b/xsl/manpages/info.xsl
index 3e63b96a6cf46f495f3874758f07e2a6d489b036..9e66ac9c99841b83a393be75fa4caa577f665d80 100644 (file)
--- a/xsl/manpages/info.xsl
+++ b/xsl/manpages/info.xsl
@@ -17,13 +17,13 @@
 
   <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 test="not($man.indent.authors.section = 0)">
+        <xsl:value-of select="$man.indent.width"/>
       </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; -->
+      <xsl:when test="not($man.indent.headings = 0)">
+        <!-- * "zq" is the name of a register we set for -->
+        <!-- * preserving the original default indent value -->
+        <!-- * when $man.indent.headings is non-zero; -->
         <!-- * "u" is a roff unit specifier -->
         <xsl:text>\n(zqu</xsl:text>
       </xsl:when>

diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index 7895b24a9305ee2e540bb807d0c6a757b4a25534..4b94783ed385803de832448cfead9a2a1b18bdd1 100644 (file)
--- a/xsl/manpages/lists.xsl
+++ b/xsl/manpages/lists.xsl
@@ -14,13 +14,13 @@
 
 <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 test="not($man.indent.lists = 0)">
+      <xsl:value-of select="$man.indent.width"/>
     </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; -->
+    <xsl:when test="not($man.indent.headings = 0)">
+      <!-- * "zq" is the name of a register we set for -->
+      <!-- * preserving the original default indent value -->
+      <!-- * when $man.indent.headings is non-zero; -->
       <!-- * "u" is a roff unit specifier -->
       <xsl:text>\n(zqu</xsl:text>
     </xsl:when>

diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 927993bf192896cf32d0dd95c1c3266a6c090a59..28d0d40a4a626f3b6ff8351c5d5e9223d937c562 100644 (file)
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -296,12 +296,12 @@ db:manvolnum
       <xsl:text> (adjust text to left margin only)&#10;</xsl:text>
       <xsl:text>.ad l&#10;</xsl:text>
     </xsl:if>
-    <xsl:if test="$man.indentation.default.adjust != 0">
+    <xsl:if test="not($man.indent.headings = 0)">
       <xsl:text>.\" store initial "default indentation value"&#10;</xsl:text>
       <xsl:text>.nr zq \n(IN&#10;</xsl:text>
       <xsl:text>.\" adjust default indentation&#10;</xsl:text>
       <xsl:text>.nr IN </xsl:text>
-      <xsl:value-of select="$man.indentation.default.value"/>
+      <xsl:value-of select="$man.indent.width"/>
       <xsl:text>&#10;</xsl:text>
       <xsl:text>.\" adjust indentation of SS headings&#10;</xsl:text>
       <xsl:text>.nr SN \n(IN&#10;</xsl:text>

diff --git a/xsl/manpages/refentry.xsl b/xsl/manpages/refentry.xsl
index a9dbde6bbfa2f193029e75e86d3e92fcba656c47..1c8dc5cc507f2eaccc566fb3d6cedc5220697b2b 100644 (file)
--- a/xsl/manpages/refentry.xsl
+++ b/xsl/manpages/refentry.xsl
@@ -94,7 +94,7 @@
     <xsl:choose>
       <!-- * If default-indentation adjustment is on, then indent the -->
       <!-- * child content of this Refsect2 -->
-      <xsl:when test="$man.indentation.default.adjust != 0">
+      <xsl:when test="not($man.indent.headings = 0)">
         <xsl:text>.RS&#10;</xsl:text>
         <xsl:apply-templates/>
         <xsl:text>.RE&#10;</xsl:text>
@@ -125,7 +125,7 @@
     <xsl:choose>
       <!-- * If default-indentation adjustment is on, then indent the -->
       <!-- * child content of this Refsect3 or Refsection. -->
-      <xsl:when test="$man.indentation.default.adjust != 0">
+      <xsl:when test="not($man.indent.headings != 0)">
         <xsl:call-template name="nested-section-title"/>
         <xsl:text>.RS&#10;</xsl:text>
         <xsl:apply-templates/>
@@ -161,7 +161,7 @@
                             |title)[1]"/>
     </xsl:variable>
     <xsl:variable name="indent-width">
-      <xsl:if test="$man.indentation.default.adjust != 0">
+      <xsl:if test="not($man.indent.headings = 0)">
         <!-- * If default-indentation adjustment is on, then indent the -->
         <!-- * child content of this Refsect3 or Refsection. -->
         <xsl:text>(\n(SNu)&#10;</xsl:text>