LaTeX:

- Another attempt to fix the # URL issue.

- Table changes:
  - Use \small font inside tables.
  - Use bold for table headers.

- Another hack to deal with <br>: use a small-skip rather
  than a line-break after an <indent>.

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

diff --git a/docs/manual/style/latex/common.xsl b/docs/manual/style/latex/common.xsl
index 58c09705742fb3c656d54c9b96213ddbe35b9324..135b0ae2dd0d1bed97dc265a158ee2040f8ba79d 100644 (file)
--- a/docs/manual/style/latex/common.xsl
+++ b/docs/manual/style/latex/common.xsl
@@ -85,8 +85,7 @@ select="$metafile/basename"/>
 <xsl:text>\begin{list}{}{\topsep 0pt\rightmargin 0pt\leftmargin 2em}
 \item[] </xsl:text>
 <xsl:apply-templates/>
-<xsl:text>\end{list}
-</xsl:text>
+<xsl:text>\end{list}</xsl:text>
 </xsl:template>
 
 <!-- ==================================================================== -->

diff --git a/docs/manual/style/latex/html.xsl b/docs/manual/style/latex/html.xsl
index 1f1240044ff15890dabc04a7036aa9d9a58c6975..060a33127bb97ed209935dcbbdccf9028ce97984 100644 (file)
--- a/docs/manual/style/latex/html.xsl
+++ b/docs/manual/style/latex/html.xsl
@@ -53,10 +53,10 @@
      one line break followed by smallskips. -->
 <xsl:template match="br">
 <xsl:choose>
-<xsl:when test="name(preceding-sibling::node()[1])='br'">
+<xsl:when test="name(preceding-sibling::node()[1])='br' or name(preceding-sibling::node()[1])='indent'">
 <xsl:text>\smallskip </xsl:text>
 </xsl:when>
-<xsl:when test="name(preceding-sibling::node()[2])='br'">
+<xsl:when test="name(preceding-sibling::node()[2])='br' or name(preceding-sibling::node()[2])='indent'">
   <xsl:choose>
   <xsl:when test="normalize-space(preceding-sibling::node()[1])=''">
     <xsl:text>\smallskip </xsl:text>
@@ -159,7 +159,7 @@ interpreted in pre -->
 </xsl:text>
 </xsl:template>
 
-<xsl:template match="td|th">
+<xsl:template match="td">
     <xsl:variable name="pos" select="position()"/>
     <xsl:text>\begin{minipage}[t]{</xsl:text>
     <xsl:choose>
@@ -167,10 +167,29 @@ interpreted in pre -->
       <xsl:value-of select="../../columnspec/column[$pos]/@width"/>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:value-of select="1 div last()"/>
+      <xsl:value-of select=".95 div last()"/>
     </xsl:otherwise>
     </xsl:choose>
-    <xsl:text>\linewidth}</xsl:text>
+    <xsl:text>\linewidth}\small </xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>\end{minipage}</xsl:text>
+    <xsl:if test="not(position()=last())">
+      <xsl:text> &amp; </xsl:text>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template match="th">
+    <xsl:variable name="pos" select="position()"/>
+    <xsl:text>\begin{minipage}[t]{</xsl:text>
+    <xsl:choose>
+    <xsl:when test="../../columnspec">
+      <xsl:value-of select="../../columnspec/column[$pos]/@width"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select=".95 div last()"/>
+    </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>\linewidth}\bfseries </xsl:text>
     <xsl:apply-templates/>
     <xsl:text>\end{minipage}</xsl:text>
     <xsl:if test="not(position()=last())">
@@ -217,7 +236,11 @@ interpreted in pre -->
   <xsl:if test="not(.=@href)">
     <xsl:text>\footnote{</xsl:text>
       <xsl:text>\href{</xsl:text>
-      <xsl:value-of select="@href"/>
+      <xsl:call-template name="replace-string">
+        <xsl:with-param name="text" select="@href"/>
+        <xsl:with-param name="replace" select="'#'"/>
+        <xsl:with-param name="with" select="'\#'"/>
+      </xsl:call-template>
       <xsl:text>}{</xsl:text>
     <xsl:call-template name="ltescape">
       <xsl:with-param name="string" select="@href"/>