Added new param man.output.lang.in.name.enabled, which

controls whether $LANG value is included in manpages
filenames and pathnames. It works like this:

If the value of man.output.lang.in.name.enabled is non-zero,
man-page files are output with the $lang value included in
their filenames or pathnames as follows;

- if man.output.subdirs.enabled is non-zero, each file is
  output to, e.g., a /$lang/man8/foo.8 pathname

- if man.output.subdirs.enabled is zero, each file is output
  with a foo.$lang.8 filename

diff --git a/xsl/manpages/docbook.xsl b/xsl/manpages/docbook.xsl
index 5eb925c28554d8b7f5d5ac8416d2cd27b5350d71..0c15bd6867ad31aae61d34e56f84d73c68d3a441 100644 (file)
--- a/xsl/manpages/docbook.xsl
+++ b/xsl/manpages/docbook.xsl
@@ -135,7 +135,9 @@
   <!-- ============================================================== -->
 
   <xsl:template match="refentry">
-
+    <xsl:param name="lang">
+      <xsl:call-template name="l10n.language"/>
+    </xsl:param>
     <!-- * Just use the first refname found as the "name" of the man -->
     <!-- * page (which may different from the "title"...) -->
     <xsl:variable name="first.refname" select="refnamediv[1]/refname[1]"/>
@@ -255,6 +257,7 @@
     <xsl:call-template name="write.man.file">
       <xsl:with-param name="name" select="$first.refname"/>
       <xsl:with-param name="section" select="$refentry.metadata/section"/>
+      <xsl:with-param name="lang" select="$lang"/>
       <xsl:with-param name="content" select="$manpage.contents.prepared"/>
     </xsl:call-template>
 
@@ -262,6 +265,7 @@
     <xsl:call-template name="write.stubs">
       <xsl:with-param name="first.refname" select="$first.refname"/>
       <xsl:with-param name="section" select="$refentry.metadata/section"/>
+      <xsl:with-param name="lang" select="$lang"/>
     </xsl:call-template>
 
   </xsl:template>

diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 88394aa56e5e4b2dd898280ea92d784cc94f7f1f..44906e8c6fdc5262f6c0fd61fdd2f3e14301a53a 100644 (file)
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -433,11 +433,13 @@ db:manvolnum
   <xsl:template name="write.man.file">
     <xsl:param name="name"/>
     <xsl:param name="section"/>
+    <xsl:param name="lang"/>
     <xsl:param name="content"/>
     <xsl:param name="filename">
       <xsl:call-template name="make.adjusted.man.filename">
         <xsl:with-param name="name" select="$name"/>
         <xsl:with-param name="section" select="$section"/>
+        <xsl:with-param name="lang" select="$lang"/>
       </xsl:call-template>
     </xsl:param>
     <xsl:call-template name="write.text.chunk">
@@ -470,6 +472,7 @@ db:manvolnum
   <xsl:template name="write.stubs">
     <xsl:param name="first.refname"/>
     <xsl:param name="section"/>
+    <xsl:param name="lang"/>
     <xsl:for-each select="refnamediv/refname">
       <xsl:if test=". != $first.refname">
         <xsl:call-template name="write.text.chunk">
@@ -479,6 +482,7 @@ db:manvolnum
                 <xsl:apply-templates/>
               </xsl:with-param>
               <xsl:with-param name="section" select="$section"/>
+              <xsl:with-param name="lang" select="$lang"/>
             </xsl:call-template>
           </xsl:with-param>
           <xsl:with-param name="quiet" select="$man.output.quietly"/>
@@ -515,10 +519,14 @@ db:manvolnum
             <xsl:with-param name="quiet" select="1"/>
           </xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="lang">
+          <xsl:call-template name="l10n.language"/>
+        </xsl:variable>
         <xsl:for-each select="refnamediv/refname">
           <xsl:call-template name="make.adjusted.man.filename">
             <xsl:with-param name="name" select="."/>
             <xsl:with-param name="section" select="$section"/>
+            <xsl:with-param name="lang" select="$lang"/>
           </xsl:call-template>
           <xsl:text>&#10;</xsl:text>
         </xsl:for-each>

diff --git a/xsl/manpages/utility.xsl b/xsl/manpages/utility.xsl
index 8d0df76a6576738d96b9acf08bc16f1fecfb97fe..beaaceba5455bcfdc192cb4f3ccba8c627a16156 100644 (file)
--- a/xsl/manpages/utility.xsl
+++ b/xsl/manpages/utility.xsl
@@ -360,13 +360,42 @@
 
   <xsl:template name="make.adjusted.man.filename">
     <xsl:param name="name"/>
+    <xsl:param name="lang"/>
+    <xsl:param name="name.with.lang">
+      <xsl:choose>
+        <xsl:when test="not($man.output.lang.in.name.enabled = 0)
+                        and ($man.output.subdirs.enabled = 0)">
+          <!-- * user has specified man.output.lang.in.name.enabled -->
+          <!-- * AND doesn't want output going into separate manN dirs, -->
+          <!-- * so we include the $lang value in the filename; e.g., -->
+          <!-- * foo.ja.1 -->
+          <xsl:value-of select="concat($name, '.', $lang)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- * user either has man.output.lang.in.name.enabled unset -->
+          <!-- * or has set it but also has man.output.subdirs.enabled -->
+          <!-- * set (in which case the $lang value is used to add a -->
+          <!-- * $lang subdir in the pathname); in either case, we don't -->
+          <!-- * want to include the $lang in the filename -->
+          <xsl:value-of select="$name"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:param>
     <xsl:param name="section"/>
     <xsl:param name="dirname">
       <xsl:if test="not($man.output.in.separate.dir = 0)">
         <xsl:choose>
           <xsl:when test="not($man.output.subdirs.enabled = 0)">
+            <xsl:variable name="lang.subdir">
+              <xsl:if test="not($man.output.lang.in.name.enabled = 0)">
+                <!-- * user has man.output.lang.in.name.enabled set, so -->
+                <!-- * we need add a $lang subdir -->
+                <xsl:value-of select="concat($lang, '/')"/>
+              </xsl:if>
+            </xsl:variable>
             <xsl:value-of
-                select="concat($man.output.base.dir, 'man', normalize-space($section), '/')"/>
+                select="concat($man.output.base.dir, $lang.subdir,
+                        'man', normalize-space($section), '/')"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="$man.output.base.dir"/>
@@ -379,7 +408,7 @@
       <!-- * a dot plus a section number to create the man filename -->
       <xsl:with-param name="string"
                       select="concat($dirname,
-                              normalize-space($name),
+                              normalize-space($name.with.lang),
                               '.', normalize-space($section))"/>
       <xsl:with-param name="target" select="' '"/>
       <xsl:with-param name="replacement" select="'_'"/>