From: André Malo <nd@apache.org>
Date: Mon, 27 Jan 2014 21:56:03 +0000 (+0000)
Subject: - fix a few missing references in latex output by adding module and directive
X-Git-Tag: 2.5.0-alpha~4579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4081d25a30aa9152d767e52ca5cb8a39407129b;p=apache

- 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561869 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/style/latex/directiveindex.xsl b/docs/manual/style/latex/directiveindex.xsl
index b97c346a43..e0981ceb19 100644
--- a/docs/manual/style/latex/directiveindex.xsl
+++ b/docs/manual/style/latex/directiveindex.xsl
@@ -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>
diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl
index b59c27d757..89ed4f3bc0 100644
--- a/docs/manual/style/latex/latex.xsl
+++ b/docs/manual/style/latex/latex.xsl
@@ -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 information is available at
 </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 information is available at
     <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 information is available at
 <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">
diff --git a/docs/manual/style/latex/quickreference.xsl b/docs/manual/style/latex/quickreference.xsl
index c201b5bd70..50b03a2f48 100644
--- a/docs/manual/style/latex/quickreference.xsl
+++ b/docs/manual/style/latex/quickreference.xsl
@@ -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>