backport from 2.1:

* add the two new elements <glossary> and <phonetic>
* add transformation for <glossary> and <phonetic>
* add style for pronounciations
* add title for glossary links

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

diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd
index d8b4aabf9255a12a5c482bb1ab815b3542bccf4d..07d29dc3f21d2977b348af000a02233af9e3538e 100644 (file)
--- a/docs/manual/style/common.dtd
+++ b/docs/manual/style/common.dtd
@@ -35,8 +35,8 @@
 
 <!-- Generic tag entities -->
 
-<!ENTITY % inlinetags "em | strong | code | a | br | directive | module | img
-| cite | q | dfn | var | transnote">
+<!ENTITY % inlinetags "em | strong | code | a | br | directive | module |
+img | cite | q | dfn | var | transnote | glossary | phonetic">
 
 <!ENTITY % blocktags "p | example | note | table | ul | ol | dl | pre
 | blockquote">
@@ -169,3 +169,13 @@
 <!-- The path and title of the parent document -->
 <!ELEMENT parentdocument (#PCDATA)>
 <!ATTLIST parentdocument href CDATA #REQUIRED >
+
+<!-- The glossary element defines a special case of link. The referenced
+     target is the name of an anchor within the glossary -->
+<!ELEMENT glossary %Inline;>
+<!ATTLIST glossary ref CDATA #REQUIRED>
+
+<!-- The phonetic element should be used only within the glossary. It
+     describes a pronounciation -->
+<!ELEMENT phonetic (#PCDATA)>
+

diff --git a/docs/manual/style/css/manual-print.css b/docs/manual/style/css/manual-print.css
index 1fef6fb6f7ac244517526a8653b0cb7ca103dfcf..d8e9ac1002e6a26b77f7b14bd8d49e8dd4ac3c78 100644 (file)
--- a/docs/manual/style/css/manual-print.css
+++ b/docs/manual/style/css/manual-print.css
@@ -45,7 +45,8 @@ q, em, var {
     font-style: italic;
 }
 
-span.transnote {
+span.transnote, span.phonetic {
+    font-weight: normal;
     background-color: inherit;
     color: #888;
 }

diff --git a/docs/manual/style/css/manual.css b/docs/manual/style/css/manual.css
index 484688f19ccfe9610c8bf31848c25f43c8e16dab..024d58c115e2846ae1d2b37fc433a1b504cd58ed 100644 (file)
--- a/docs/manual/style/css/manual.css
+++ b/docs/manual/style/css/manual.css
@@ -45,7 +45,8 @@ q, em, var {
     font-style: italic;
 }
 
-span.transnote {
+span.transnote, span.phonetic {
+    font-weight: normal;
     background-color: inherit;
     color: #888;
 }

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index ad92b61f594d4b9945b6b44566a2ceb1265b9af0..76ea3a8c4ac03202dbb071ed0032d34660f47a20 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE messages [ <!ENTITY nbsp "&#160;"> ]>
-<!-- English revision: 1.6.2.4 -->
+<!-- English revision: 106090 -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -91,6 +91,9 @@
 
         <!-- Used for translation notes -->
         <message id="transnote">Anm.d.&#220;.:</message>
+        
+        <!-- Used for glossary link titles -->
+        <message id="glossarylink">siehe Glossar</message>
 
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 5195a51cfb6cbf1f2f43f5d3c2389d34e0abf094..8b5fe4c0330253fc1bd84aa8285d293fce773a40 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -93,6 +93,9 @@
         <!-- Used in summaries -->
         <message id="summary">Summary</message>
 
+        <!-- Used for glossary link titles -->
+        <message id="glossarylink">see glossary</message>
+
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP Server</message>
         <message id="apachehttpserver">Apache HTTP Server Version 2.0</message>

diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml
index c0347700f72e3b9ea00738ba6323578075af4d1e..202ccf3ef1f0f00ad7c6584241f67f1bc222765b 100644 (file)
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -91,6 +91,10 @@
         <!-- Used in summaries -->
         <message id="summary">Resumen de contenidos</message>
 
+        <!-- Used for glossary link titles -->
+        <message id="glossarylink">see glossary</message>
+
+
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Servidor HTTP Apache</message>
         <message id="apachehttpserver">Versi&#243;n 2.0 del Servidor HTTP

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index 640f8cca3dffe5abf08336b495975e419c25e3ae..99536dd4a6eb73b18468bd429835c3c28f08b433 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -82,6 +82,9 @@
         <!-- Used in summaries -->
         <message id="summary">\e$B35MW\e(B</message>
 
+        <!-- Used for glossary link titles -->
+        <message id="glossarylink">see glossary</message>
+
         <!-- Used in headers and footers -->
         <message id="apachetitle">- Apache HTTP \e$B%5!<%P\e(B</message>
         <message id="apachehttpserver">Apache HTTP \e$B%5!<%P\e(B \e$B%P!<%8%g%s\e(B 2.0</message>

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 8addc386914851b3dce5426aa7f4930997b62bba..65f4b14f446af9b9dea7ebc02539ca65f8c688d3 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -94,6 +94,9 @@
         <!-- Used in summaries -->
         <message id="summary">¿ä¾à</message>
 
+        <!-- Used for glossary link titles -->
+        <message id="glossarylink">see glossary</message>
+
         <!-- Used for translation notes -->
         <message id="transnote">¿ªÁÖ;</message>
 

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 4e1b1440a491e0f3de4d5062b2e6bdbb9add9fc7..16dcaa7b8fb60b0dada44b25aa53c7948ab888c6 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -86,6 +86,9 @@
         <!-- Used in summaries -->
         <message id="summary">òÅÚÀÍÅ</message>
 
+        <!-- Used for glossary link titles -->
+        <message id="glossarylink">see glossary</message>
+
         <!-- Used in headers and footers -->
         <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
         <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ×ÅÒÓÉÉ 2.0</message>

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index e07850ce8d42958c7817746d862ed4b0011675e8..2f96201697a970b5806bd99a4b44bd2b93837adc 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -922,6 +922,37 @@
 </xsl:template>
 <!-- /transnote -->
 
+<!-- ==================================================================== -->
+<!-- <phonetic>                                                           -->
+<!-- phonetics are enclosed in  square brackets and displayed in a        -->
+<!-- different color                                                      -->
+<!-- ==================================================================== -->
+<xsl:template match="phonetic">
+<span class="phonetic">
+    <xsl:text>[</xsl:text>
+    <xsl:apply-templates />
+    <xsl:text>]</xsl:text>
+</span>
+</xsl:template>
+<!-- /phonetic -->
+
+
+<!-- ==================================================================== -->
+<!-- <glossary>                                                           -->
+<!-- link to a glossary anchor                                            -->
+<!-- ==================================================================== -->
+<xsl:template match="glossary">
+<span>
+    <xsl:attribute name="title">
+        <xsl:value-of select="$message[@id='glossarylink']" />
+    </xsl:attribute>
+    <xsl:text>&#x2192;</xsl:text>
+</span>&nbsp;
+<a href="{$path}/glossary.html#{@ref}">
+    <xsl:apply-templates />
+</a>
+</xsl:template>
+<!-- /glossary -->
 
 <!-- ==================================================================== -->
 <!-- Filter &#160; in text() nodes.                                       -->