]> granicus.if.org Git - apache/commitdiff
allow placing the 'directive' word before the directive name in the module synopsis.
authorAndré Malo <nd@apache.org>
Sat, 14 Feb 2015 20:07:46 +0000 (20:07 +0000)
committerAndré Malo <nd@apache.org>
Sat, 14 Feb 2015 20:07:46 +0000 (20:07 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659855 13f79535-47bb-0310-9956-ffa450edef68

13 files changed:
docs/manual/style/lang/da.xml
docs/manual/style/lang/de.xml
docs/manual/style/lang/en.xml
docs/manual/style/lang/es.xml
docs/manual/style/lang/fr.xml
docs/manual/style/lang/ja.xml
docs/manual/style/lang/ko.xml
docs/manual/style/lang/pt-br.xml
docs/manual/style/lang/ru.xml
docs/manual/style/lang/tr.xml
docs/manual/style/lang/zh-cn.xml
docs/manual/style/latex/synopsis.xsl
docs/manual/style/xsl/synopsis.xsl

index 2b210db5d75c6840c82f7c65acc6021a864c499e..337623d3e95ed3d2ca1cb29affa5bc17e2d03d82 100644 (file)
              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">Direktiv</message>
         <message id="nodirectives">Dette modul har ingen direktiver.</message>
 
index 3a9f2254a622bb72652596773cdca8a22c876fca..1f98debf5617899e316384a1203367ae74610baf 100644 (file)
@@ -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" replace-space-with="-">Direktive</message>
         <message id="nodirectives">Dieses Modul enth&#228;lt keine
             Direktiven.</message>
index 2ef85dfec8f212803ff6807bbc72634fbc15a8a0..0ad828cafb4405e496d61edfd621b7e43c4b55c9 100644 (file)
              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>
index a928aeb929a2656a8ae5c6208d6bcc834538b986..80f26a138e79d3c2d3270f90b3c1353834305515 100644 (file)
@@ -98,6 +98,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>
index dd5e2ce39438b593d5dbadc61f3c938f6b09a09e..f3a6719bb9052ab8b83087da7de9b74fd62e5b49 100644 (file)
              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="no">Directive</message>
         <message id="nodirectives">Ce module ne fournit aucune directive.</message>
 
         <!-- Used in summaries -->
index e251db5074e0f7adfa316e99aa08b64d6ac43883..744fb0f4884f96e8b5de1d06f96e00b7671c7bc1 100644 (file)
@@ -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">ディレクティブ</message>
         <message id="nodirectives">このモジュールにディレクティブはありません。</message>
 
index bedc49ca671fbe248a54f9c5c68db455e7aa5b64..e8d02b113e3f85f5844fd14ce4e73d444388ec7b 100644 (file)
              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>
 
index 918b3a2581bc1cc5d37e03aec5b11498b0995c79..c25b729b6121485e3f1b987ab6ef3d87904f5552 100644 (file)
@@ -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">Diretrizes</message>
         <message id="nodirectives">Esse m&#243;dulo n&#227;o fornece nenhuma diretriz.</message>
 
index 9fa2351f6935e6b6ecb2615266eee87825b2c472..531324d05d5448a90b7a6e1980c610128e3ac5f1 100644 (file)
 
         <!-- 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>
index 6ab670c37ccedce18aa78d314f01779e6170e870..2e1f723d8aad8b2bec27f3f49851bbf3c24ba789 100644 (file)
              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>
 
index 234da3f7b2b8cedbb4875a1ba56291d670003cdc..c4093567c6da591e137c85f929461396c5d12679 100644 (file)
@@ -97,6 +97,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>
 
index 5498a282318ba6abb3fd0399fe8dcaaaea1a3ff5..5ba989bdc2585fa9af7467671cbdd65679ec2d4a 100644 (file)
 
 <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"/>
   </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>
index 577c1c3b8f3086a4873067b14fecb881a408b880..7a23051f9de4851ce0d2a3fc967d0be7c4abb42c 100644 (file)
         <!-- 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 -->