You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ke...@apache.org on 2004/11/28 18:33:45 UTC
svn commit: r106820 - in httpd/httpd/branches/2.0.x/docs/manual/style: . css lang xsl
Author: kess
Date: Sun Nov 28 09:33:43 2004
New Revision: 106820
URL: http://svn.apache.org/viewcvs?view=rev&rev=106820
Log:
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
Modified:
httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd
httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css
httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css
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/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/xsl/common.xsl
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/common.dtd Sun Nov 28 09:33:43 2004
@@ -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)>
+
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/css/manual-print.css Sun Nov 28 09:33:43 2004
@@ -45,7 +45,8 @@
font-style: italic;
}
-span.transnote {
+span.transnote, span.phonetic {
+ font-weight: normal;
background-color: inherit;
color: #888;
}
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/css/manual.css Sun Nov 28 09:33:43 2004
@@ -45,7 +45,8 @@
font-style: italic;
}
-span.transnote {
+span.transnote, span.phonetic {
+ font-weight: normal;
background-color: inherit;
color: #888;
}
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/lang/de.xml&r2=106820
==============================================================================
--- 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 Nov 28 09:33:43 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE messages [ <!ENTITY nbsp " "> ]>
-<!-- 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.Ü.:</message>
+
+ <!-- Used for glossary link titles -->
+ <message id="glossarylink">siehe Glossar</message>
<!-- Used in headers and footers -->
<message id="apachetitle">- Apache HTTP Server</message>
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/lang/en.xml&r2=106820
==============================================================================
--- 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 Nov 28 09:33:43 2004
@@ -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>
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/lang/es.xml&r2=106820
==============================================================================
--- 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 Nov 28 09:33:43 2004
@@ -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ón 2.0 del Servidor HTTP
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/ja.xml Sun Nov 28 09:33:43 2004
@@ -82,6 +82,9 @@
<!-- Used in summaries -->
<message id="summary">$B35MW(B</message>
+ <!-- Used for glossary link titles -->
+ <message id="glossarylink">see glossary</message>
+
<!-- Used in headers and footers -->
<message id="apachetitle">- Apache HTTP $B%5!<%P(B</message>
<message id="apachehttpserver">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</message>
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/ko.xml Sun Nov 28 09:33:43 2004
@@ -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>
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/lang/ru.xml Sun Nov 28 09:33:43 2004
@@ -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>
Modified: httpd/httpd/branches/2.0.x/docs/manual/style/xsl/common.xsl
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/style/xsl/common.xsl?view=diff&rev=106820&p1=httpd/httpd/branches/2.0.x/docs/manual/style/xsl/common.xsl&r1=106819&p2=httpd/httpd/branches/2.0.x/docs/manual/style/xsl/common.xsl&r2=106820
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/style/xsl/common.xsl (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/style/xsl/common.xsl Sun Nov 28 09:33:43 2004
@@ -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>→</xsl:text>
+</span>
+<a href="{$path}/glossary.html#{@ref}">
+ <xsl:apply-templates />
+</a>
+</xsl:template>
+<!-- /glossary -->
<!-- ==================================================================== -->
<!-- Filter   in text() nodes. -->