httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r1669925 - in /httpd/httpd/branches/2.0.x/docs/manual/style: lang/de.xml lang/en.xml lang/es.xml lang/fr.xml lang/ja.xml lang/ko.xml lang/ru.xml lang/tr.xml latex/synopsis.xsl xsl/synopsis.xsl
Date Sun, 29 Mar 2015 15:24:17 GMT
Author: nd
Date: Sun Mar 29 15:24:17 2015
New Revision: 1669925

URL: http://svn.apache.org/r1669925
Log:
backport "directive" placement option

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

Modified:
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/fr.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/lang/tr.xml
    httpd/httpd/branches/2.0.x/docs/manual/style/latex/synopsis.xsl
    httpd/httpd/branches/2.0.x/docs/manual/style/xsl/synopsis.xsl

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml Sun Mar 29 15:24:17 2015
@@ -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>
 

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml Sun Mar 29 15:24:17 2015
@@ -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>
 

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml Sun Mar 29 15:24:17 2015
@@ -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>

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/fr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/fr.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/fr.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/fr.xml Sun Mar 29 15:24:17 2015
@@ -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 -->

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml [utf-8] Sun Mar 29 15:24:17 2015
@@ -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>
 

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml [euc-kr] (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml [euc-kr] Sun Mar 29 15:24:17
2015
@@ -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>
 

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml [koi8-r] (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml [koi8-r] Sun Mar 29 15:24:17
2015
@@ -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>
 

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/tr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/lang/tr.xml?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/tr.xml [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/tr.xml [utf-8] Sun Mar 29 15:24:17 2015
@@ -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>
 

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/latex/synopsis.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/latex/synopsis.xsl?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/latex/synopsis.xsl (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/latex/synopsis.xsl Sun Mar 29 15:24:17 2015
@@ -173,7 +173,26 @@
 
 <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:when>
+  <xsl:otherwise>
+    <xsl:text> </xsl:text>
+  </xsl:otherwise>
+  </xsl:choose>
+
+  <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"/>
@@ -183,7 +202,10 @@
   </xsl:otherwise>
   </xsl:choose>
 
-<xsl:value-of select="$message[@id='directive']" />
+  <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>

Modified: httpd/httpd/branches/2.0.x/docs/manual/style/xsl/synopsis.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/style/xsl/synopsis.xsl?rev=1669925&r1=1669924&r2=1669925&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/xsl/synopsis.xsl (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/xsl/synopsis.xsl Sun Mar 29 15:24:17 2015
@@ -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 -->



Mime
View raw message