backport "directive" placement option

(I know, 2.0 is not maintained anymore, but what the heck)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1669925 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index d7f7477d4b547f951bf6add715648328cfb1a840..195592d2e60bdf92aa17bd3f6abe78f6890400c3 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -95,6 +95,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive" replace-space-with="-">Direktive</message>
         <message id="nodirectives">Dieses Modul enth&#228;lt keine Direktiven.</message>
 

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 480fbe4c965ad600b900d08ef773510545bed3b3..47f14f215b42e03d2e06a8a0ffd0364afe439105 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -99,6 +99,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Directive</message>
         <message id="nodirectives">This module provides no directives.</message>
 

diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml
index 3ee0922e733d4c7acb431fa9eae7d5a580a0caf9..9cbb196b1919e1b965e9f08d2f3ec552a5c0f850 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -96,6 +96,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Directiva</message>
         <message id="nodirectives">Este m&#243;dulo no suministra ninguna
             directiva.</message>

diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml
index e3c6d619f8f0273ccf7f027c1496be2442d70afe..2a89ace09d9c7248eddc433717a7076d67dfd905 100644 (file)
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -101,7 +101,10 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
-        <message id="directive">Directive</message>
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
+        <message id="directive" before-name="yes">Directive</message>
         <message id="nodirectives">Ce module ne fournit aucune directive.</message>
 
         <!-- Used in summaries -->

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index 4589084ec3829c66d0d6c2522ac8bdddb1c0946c..8538bb2249ef7aa4ef36299091140c3d1b8f83c6 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -94,6 +94,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">ディレクティブ</message>
         <message id="nodirectives">このモジュールにディレクティブはありません。</message>
 

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 385d30f29cad8bea6f7f9c8e0c34efaf56301539..4fdfd35da16085c749af1a1aa9f1b33942009884 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -100,6 +100,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Áö½Ã¾î</message>
         <message id="nodirectives">ÀÌ ¸ðµâ¿¡´Â Áö½Ã¾î°¡ ¾ø½À´Ï´Ù.</message>
 

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index d7caa919f5836bf20becb1c74302516552f80f81..7f066ebf622bb3867bd45f3fdcccd5638399a6de 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -92,6 +92,13 @@
  
         <!-- Used for directive lists -->
         <message id="directives">äÉÒÅËÔÉ×Ù</message>
+        <!-- the optional attribute replace-space-with takes a string.
+             if present, the space between <directive name> and 'Directive'
+             in directivesynopsis headings will be replaced by the given string.
+             (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">äÉÒÅËÔÉ×Á</message>
         <message id="nodirectives">üÔÏÔ ÍÏÄÕÌØ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÎÉËÁËÉÈ ÄÉÒÅËÔÉ×.</message>
 

diff --git a/docs/manual/style/lang/tr.xml b/docs/manual/style/lang/tr.xml
index 2309e321758fe08138955564adcc86853b117feb..627cb28dea5c2a247bdd303ef645e779f90113cd 100644 (file)
--- a/docs/manual/style/lang/tr.xml
+++ b/docs/manual/style/lang/tr.xml
@@ -101,6 +101,9 @@
              if present, the space between <directive name> and 'Directive'
              in directivesynopsis headings will be replaced by the given string.
              (see de.xml for an example) -->
+        <!-- the optional attribute before-name takes a string.
+             if "yes", the 'Directive' word is place before the name instead of
+             being placed behind. See fr.xml for an example. -->
         <message id="directive">Yönergesi</message>
         <message id="nodirectives">Bu modül yönerge içermez.</message>
 

diff --git a/docs/manual/style/latex/synopsis.xsl b/docs/manual/style/latex/synopsis.xsl
index 5498a282318ba6abb3fd0399fe8dcaaaea1a3ff5..5ba989bdc2585fa9af7467671cbdd65679ec2d4a 100644 (file)
--- a/docs/manual/style/latex/synopsis.xsl
+++ b/docs/manual/style/latex/synopsis.xsl
@@ -173,7 +173,11 @@
 
 <xsl:template match="directivesynopsis/name">
 <xsl:text>\subsection*{</xsl:text>
-<xsl:call-template name="simpledirname"/>
+
+<xsl:choose>
+<xsl:when test="$message [@id='directive']/@before-name = 'yes'">
+  <xsl:value-of select="$message[@id='directive']" />
+
   <xsl:choose>
   <xsl:when test="$message[@id='directive']/@replace-space-with">
     <xsl:value-of select="$message[@id='directive']/@replace-space-with"/>
@@ -183,7 +187,25 @@
   </xsl:otherwise>
   </xsl:choose>
 
-<xsl:value-of select="$message[@id='directive']" />
+  <xsl:call-template name="simpledirname"/>
+</xsl:when>
+
+<xsl:otherwise>
+  <xsl:call-template name="simpledirname"/>
+
+  <xsl:choose>
+  <xsl:when test="$message[@id='directive']/@replace-space-with">
+    <xsl:value-of select="$message[@id='directive']/@replace-space-with"/>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:text> </xsl:text>
+  </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:value-of select="$message[@id='directive']" />
+</xsl:otherwise>
+</xsl:choose>
+
 <xsl:text>}\label{</xsl:text>
 <xsl:value-of select="concat('/mod/', //modulesynopsis/name, ':', translate(., $uppercase, $lowercase))"/>
 <xsl:text>}\hypertarget{</xsl:text>

diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index 495d5e596b67c248e787dc1bc5944a71e29e38ae..e9da6c3213772cbbf75dc53495835724eaeb7b96 100644 (file)
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -306,26 +306,54 @@
         <!-- Directive heading gets both mixed case and lowercase      -->
         <!-- anchors, and includes lt/gt only for "section" directives -->
         <h2>
-            <a id="{name}" name="{name}">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="name" />
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-            </a>
-
             <xsl:choose>
             <xsl:when test="$message
-                            [@id='directive']/@replace-space-with">
-                <xsl:value-of select="$message
-                                      [@id='directive']/@replace-space-with"/>
+                            [@id='directive']/@before-name = 'yes'">
+                <a id="{$lowername}" name="{$lowername}">
+                    <xsl:value-of select="$message[@id='directive']" />
+                </a>
+
+                <xsl:choose>
+                <xsl:when test="$message
+                                [@id='directive']/@replace-space-with">
+                    <xsl:value-of select="$message
+                                         [@id='directive']/@replace-space-with"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:text> </xsl:text>
+                </xsl:otherwise>
+                </xsl:choose>
+
+                <a id="{name}" name="{name}">
+                    <xsl:if test="@type='section'">&lt;</xsl:if>
+                    <xsl:value-of select="name" />
+                    <xsl:if test="@type='section'">&gt;</xsl:if>
+                </a>
             </xsl:when>
+
             <xsl:otherwise>
-                <xsl:text> </xsl:text>
+                <a id="{name}" name="{name}">
+                    <xsl:if test="@type='section'">&lt;</xsl:if>
+                    <xsl:value-of select="name" />
+                    <xsl:if test="@type='section'">&gt;</xsl:if>
+                </a>
+
+                <xsl:choose>
+                <xsl:when test="$message
+                                [@id='directive']/@replace-space-with">
+                    <xsl:value-of select="$message
+                                         [@id='directive']/@replace-space-with"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:text> </xsl:text>
+                </xsl:otherwise>
+                </xsl:choose>
+
+                <a id="{$lowername}" name="{$lowername}">
+                    <xsl:value-of select="$message[@id='directive']" />
+                </a>
             </xsl:otherwise>
             </xsl:choose>
-
-            <a id="{$lowername}" name="{$lowername}">
-                <xsl:value-of select="$message[@id='directive']" />
-            </a>
         </h2>&lf;
 
         <!-- Directive header -->