You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2014/01/27 22:56:03 UTC
svn commit: r1561869 - in /httpd/httpd/trunk/docs/manual/style/latex:
directiveindex.xsl latex.xsl quickreference.xsl
Author: nd
Date: Mon Jan 27 21:56:03 2014
New Revision: 1561869
URL: http://svn.apache.org/r1561869
Log:
- fix a few missing references in latex output by adding module and directive
index and dict pages. The simple directive list (/mod/directives.html) won't
be included. The link points to the quick reference instead.
- use &lf; for newline output along the way.
Modified:
httpd/httpd/trunk/docs/manual/style/latex/directiveindex.xsl
httpd/httpd/trunk/docs/manual/style/latex/latex.xsl
httpd/httpd/trunk/docs/manual/style/latex/quickreference.xsl
Modified: httpd/httpd/trunk/docs/manual/style/latex/directiveindex.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/latex/directiveindex.xsl?rev=1561869&r1=1561868&r2=1561869&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/latex/directiveindex.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/latex/directiveindex.xsl Mon Jan 27 21:56:03 2014
@@ -23,39 +23,10 @@
<!-- ==================================================================== -->
<!-- <directiveindex> -->
-<!-- Builds the directive index page -->
+<!-- (Ignored) -->
<!-- ==================================================================== -->
-<xsl:template match="directiveindex">
+<xsl:template match="directiveindex" />
- <xsl:variable name="directives"
- select="document(document($allmodules)/modulefilelist/modulefile)
- /modulesynopsis[status!='Obsolete']
- /directivesynopsis[not(@location)]" />
-
-
- <xsl:call-template name="section-title"/>
-
- <xsl:apply-templates select="summary" />
-
- <xsl:call-template name="seealso"/>
-
- <xsl:text>\begin{itemize}
-</xsl:text>
- <xsl:for-each select="$directives">
- <xsl:sort select="name" />
-
- <xsl:text>
-\item </xsl:text>
- <xsl:apply-templates select="name" mode="simple"/>
- <xsl:text> (p.\ \pageref{/mod/</xsl:text>
- <xsl:value-of select="../name"/><xsl:text>:</xsl:text>
- <xsl:value-of select="translate(name, $uppercase, $lowercase)"/>
- <xsl:text>})</xsl:text>
-</xsl:for-each>
-
- <xsl:text>\end{itemize}</xsl:text>
-
-</xsl:template>
<!-- /directiveindex -->
</xsl:stylesheet>
Modified: httpd/httpd/trunk/docs/manual/style/latex/latex.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/latex/latex.xsl?rev=1561869&r1=1561868&r2=1561869&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/latex/latex.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/latex/latex.xsl Mon Jan 27 21:56:03 2014
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE xsl:stylesheet [
+ <!ENTITY lf SYSTEM "../xsl/util/lf.xml">
<!ENTITY % HTTPD-VERSION SYSTEM "../version.ent">
%HTTPD-VERSION;
]>
@@ -144,7 +145,11 @@ Server Documentation Project. More info
</xsl:text>
<xsl:apply-templates/>
<xsl:if test="@id = 'modules'">
+ <xsl:text>\include{mod/index}</xsl:text>&lf;
<xsl:apply-templates select="document($allmodules)/modulefilelist" />
+ <xsl:text>\include{mod/module-dict}</xsl:text>&lf;
+ <xsl:text>\include{mod/directive-dict}</xsl:text>&lf;
+ <xsl:text>\include{mod/quickreference}</xsl:text>&lf;
</xsl:if>
</xsl:for-each>
@@ -162,8 +167,7 @@ Server Documentation Project. More info
<xsl:value-of select="concat(@href,'index')"/>
</xsl:otherwise>
</xsl:choose>
- <xsl:text>}
- </xsl:text>
+ <xsl:text>}</xsl:text>&lf;
</xsl:if>
</xsl:template>
@@ -180,8 +184,7 @@ Server Documentation Project. More info
<xsl:template match="modulefile">
<xsl:text>\include{mod/</xsl:text>
<xsl:value-of select="substring-before(.,'.')"/>
-<xsl:text>}
-</xsl:text>
+<xsl:text>}</xsl:text>&lf;
</xsl:template>
<xsl:template match="summary">
Modified: httpd/httpd/trunk/docs/manual/style/latex/quickreference.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/latex/quickreference.xsl?rev=1561869&r1=1561868&r2=1561869&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/latex/quickreference.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/latex/quickreference.xsl Mon Jan 27 21:56:03 2014
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE xsl:stylesheet [
+ <!ENTITY lf SYSTEM "../xsl/util/lf.xml">
+]>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +31,7 @@
<xsl:template match="quickreference">
<xsl:call-template name="section-title"/>
+ <xsl:text>\label{/mod/directives}</xsl:text>&lf;
<xsl:apply-templates select="summary"/>
@@ -39,11 +43,10 @@
select="document(document($allmodules)/modulefilelist/modulefile)
/modulesynopsis/directivesynopsis[not(@location)]" />
- <xsl:text>\footnotesize
-</xsl:text>
+ <xsl:text>\footnotesize</xsl:text>&lf;
- <xsl:text>\begin{longtable}{p{.60\textwidth}p{.25\textwidth}ll}\hline
-</xsl:text>
+ <xsl:text>\begin{longtable}{p{.60\textwidth}p{.25\textwidth}ll}\hline/</xsl:text>
+ &lf;
<xsl:for-each
select="$directives[translate(substring(normalize-space(name), 1,1),
@@ -106,8 +109,7 @@
<xsl:variable name="status" select="translate(
../status, $uppercase, $lowercase)"/>
<xsl:value-of select="$message[@id=$status]/@letter"/>
- <xsl:text>\\*
-</xsl:text>
+ <xsl:text>\\*</xsl:text>&lf;
<xsl:text>\multicolumn{4}{l}{\begin{minipage}[t]{.95\textwidth}</xsl:text>
<xsl:choose>
@@ -125,13 +127,12 @@
<xsl:text>}</xsl:text>
- <xsl:text>\end{minipage}} \\ \hline
-</xsl:text>
+ <xsl:text>\end{minipage}} \\ \hline</xsl:text>&lf;
</xsl:for-each> <!-- /directives -->
- <xsl:text>\end{longtable}
-\normalsize</xsl:text>
+ <xsl:text>\end{longtable}</xsl:text>&lf;
+ <xsl:text>\normalsize</xsl:text>
</xsl:template>