You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2003/06/05 17:16:28 UTC
cvs commit: httpd-2.0/docs/manual/style/latex TODO common.xsl html.xsl latex.xsl manualpage.xsl synopsis.xsl
slive 2003/06/05 08:16:27
Modified: docs/manual/style/latex TODO common.xsl html.xsl latex.xsl
manualpage.xsl synopsis.xsl
Log:
A little bit of progress:
1. Fix transformation of absolute <a href>s to footnotes,
and include hyperref links. This is a result of fixing
a bug in the latex escaping template.
2. Turn off the ugly box around the links, and make them
colored instead.
3. Slightly shrink the inter-paragraph spacing, and the spacing
around <notes> and <examples>.
4. Change to favour standard pdf fonts where possible. This
may or may not be a good move in the long run.
A new version is online at
http://www.apache.org/~slive/manual/
Revision Changes Path
1.2 +0 -7 httpd-2.0/docs/manual/style/latex/TODO
Index: TODO
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/latex/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- TODO 4 Jun 2003 19:38:19 -0000 1.1
+++ TODO 5 Jun 2003 15:16:27 -0000 1.2
@@ -13,13 +13,6 @@
<table><columnlist><column width="20%"/><column width="80%"/></columnlist>
<tr><td>...
-- href
-
- External hrefs should be transformed to \footnote{}s, but it's not
- working at the moment. It is easy enough just to <value-of> the @href,
- but this won't work because the result needs to be run through the
- escaping routines or LaTeX will barf.
-
- Images
A quick search makes me believe that pdftex will not handle gifs.
1.2 +5 -5 httpd-2.0/docs/manual/style/latex/common.xsl
Index: common.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/latex/common.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- common.xsl 4 Jun 2003 19:38:19 -0000 1.1
+++ common.xsl 5 Jun 2003 15:16:27 -0000 1.2
@@ -59,7 +59,7 @@
<!-- ==================================================================== -->
<xsl:template match="example">
-<xsl:text>\par\medskip\begin{center}</xsl:text>
+<xsl:text>\par\smallskip\begin{center}</xsl:text>
<xsl:if test="not(pre)"><xsl:text>\fbox{</xsl:text></xsl:if>
<xsl:text>\begin{minipage}{.8\textwidth}\begin{flushleft}</xsl:text>
<xsl:apply-templates select="title" mode="print" />
@@ -68,7 +68,7 @@
<xsl:if test="not(pre)"><xsl:text>}</xsl:text></xsl:if>
<xsl:text>\end{flushleft}\end{minipage}</xsl:text>
<xsl:if test="not(pre)"><xsl:text>}</xsl:text></xsl:if>
-<xsl:text>\end{center}\par\medskip</xsl:text>
+<xsl:text>\end{center}\par\smallskip</xsl:text>
</xsl:template>
<xsl:template match="example/title" mode="print">
@@ -91,12 +91,12 @@
<!-- <note> -->
<!-- ==================================================================== -->
<xsl:template match="note">
-<xsl:text>\par\medskip
+<xsl:text>\par\smallskip
{\Huge $\Longrightarrow$}\begin{minipage}[t]{.8\textwidth}
\noindent </xsl:text>
<xsl:apply-templates select="title" mode="print" />
<xsl:apply-templates/>
-<xsl:text>\end{minipage}\par\medskip</xsl:text>
+<xsl:text>\end{minipage}\par\smallskip</xsl:text>
</xsl:template>
<xsl:template match="note/title" mode="print">
@@ -165,7 +165,7 @@
<xsl:text>
\end{minipage}
\end{tabular}}
-\medskip
+\smallskip
</xsl:text>
</xsl:template>
1.2 +24 -5 httpd-2.0/docs/manual/style/latex/html.xsl
Index: html.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/latex/html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- html.xsl 4 Jun 2003 19:38:19 -0000 1.1
+++ html.xsl 5 Jun 2003 15:16:27 -0000 1.2
@@ -133,6 +133,25 @@
</xsl:text>
</xsl:template>
+
+<!--
+ This is a horrible hack, but it seems to mostly work. It does a
+ few things:
+
+ 1. Transforms references starting in http:// to footnotes with the
+ appropriate hyperref macro to make them clickable. (This needs
+ to be expanded to deal with news: and needs to be adjusted to
+ deal with "#", which is creating bad links at the moment.)
+
+ 2. For intra-document references, constructs the appropriate absolute
+ reference using a latex \pageref.
+ This involves applying a simplified version of the
+ general URL resolution rules to deal with ../. It only works for
+ one level of subdirectory.
+
+ 3. It is also necessary to deal with the fact that index pages
+ get references as "/".
+-->
<xsl:template match="a">
<xsl:apply-templates/>
<xsl:if test="@href">
@@ -151,13 +170,13 @@
<xsl:choose>
<xsl:when test="starts-with(@href, 'http:')">
<xsl:if test="not(.=@href)">
- <xsl:text>\footnote{</xsl:text>
+ <xsl:text>\footnote{\href{</xsl:text>
+ <xsl:value-of select="@href"/>
+ <xsl:text>}{</xsl:text>
<xsl:call-template name="ltescape">
- <xsl:with-param name="string">
- <xsl:value-of select="string(@href)"/>
- </xsl:with-param>
+ <xsl:with-param name="string" select="@href"/>
</xsl:call-template>
- <xsl:text>}</xsl:text>
+ <xsl:text>}}</xsl:text>
</xsl:if>
</xsl:when>
<xsl:when test="starts-with(@href, '#')">
1.2 +5 -3 httpd-2.0/docs/manual/style/latex/latex.xsl
Index: latex.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/latex/latex.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- latex.xsl 4 Jun 2003 19:38:19 -0000 1.1
+++ latex.xsl 5 Jun 2003 15:16:27 -0000 1.2
@@ -20,8 +20,10 @@
<xsl:template match="sitemap">
<xsl:text>
\documentclass[11pt]{book}
-\usepackage{fullpage,hyperref}
+\usepackage{times}
+\usepackage{fullpage}
\usepackage{style/latex/atbeginend}
+\usepackage[colorlinks=true,letterpaper=true]{hyperref}
% Let LaTeX be lenient about very-bad line wrapping.
\tolerance=9999
@@ -30,7 +32,7 @@
% Keep paragraphs flush left (rather than the default of indenting
% the first line) and put a space between paragraphs.
\setlength{\parindent}{0ex}
-\addtolength{\parskip}{1.5ex}
+\addtolength{\parskip}{1.2ex}
% Shrink the inter-item spaces
\AfterBegin{itemize}{\addtolength{\itemsep}{-.8\baselineskip}}
@@ -145,7 +147,7 @@
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="."/>
+ <xsl:value-of select="$string"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
1.2 +1 -1 httpd-2.0/docs/manual/style/latex/manualpage.xsl
Index: manualpage.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/latex/manualpage.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- manualpage.xsl 4 Jun 2003 19:38:19 -0000 1.1
+++ manualpage.xsl 5 Jun 2003 15:16:27 -0000 1.2
@@ -17,7 +17,7 @@
<xsl:if test="seealso">
- <xsl:text>\bigskip\noindent\textbf{</xsl:text>
+ <xsl:text>\medskip\noindent\textbf{</xsl:text>
<xsl:value-of select="$messages/message[@name='seealso']" />
<xsl:text>}
\begin{itemize}</xsl:text>
1.2 +1 -1 httpd-2.0/docs/manual/style/latex/synopsis.xsl
Index: synopsis.xsl
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/style/latex/synopsis.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- synopsis.xsl 4 Jun 2003 19:38:19 -0000 1.1
+++ synopsis.xsl 5 Jun 2003 15:16:27 -0000 1.2
@@ -86,7 +86,7 @@
</xsl:if>
<xsl:text>
-\medskip\textbf{</xsl:text>
+\smallskip\textbf{</xsl:text>
<xsl:value-of select="$messages/message [@name='directives']" />
<xsl:text>}
</xsl:text>