From e6c55529c9724ddb15db60fea72aa376fbcd5d7a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 12 Aug 2003 18:22:39 +0000
Subject: More fixes (This used to be commit
 ec02b2cfa4d913c91dd78bc1b2bdb02d7d560c59)

---
 docs/docbook/xslt/db2latex/VERSION.xml             |  14 +-
 docs/docbook/xslt/db2latex/abstract.mod.xsl        |   5 +-
 docs/docbook/xslt/db2latex/admonition.mod.xsl      | 107 ++++-------
 docs/docbook/xslt/db2latex/authorgroup.mod.xsl     |   3 +
 docs/docbook/xslt/db2latex/biblio.mod.xsl          |  43 +----
 docs/docbook/xslt/db2latex/block.mod.xsl           |   3 +
 docs/docbook/xslt/db2latex/book-article.mod.xsl    | 166 +++++-----------
 docs/docbook/xslt/db2latex/bridgehead.mod.xsl      |   3 +
 docs/docbook/xslt/db2latex/callout.mod.xsl         |   3 +
 docs/docbook/xslt/db2latex/citation.mod.xsl        |   9 +-
 docs/docbook/xslt/db2latex/common/common.xsl       |   2 +
 docs/docbook/xslt/db2latex/common/de.xml           |   3 -
 docs/docbook/xslt/db2latex/common/l10n.xsl         |   1 +
 docs/docbook/xslt/db2latex/component.mod.xsl       |   3 +
 docs/docbook/xslt/db2latex/dingbat.mod.xsl         |   3 +
 docs/docbook/xslt/db2latex/docbook.xsl             |   8 +-
 docs/docbook/xslt/db2latex/email.mod.xsl           |   3 +
 docs/docbook/xslt/db2latex/errors.mod.xsl          |   2 +
 docs/docbook/xslt/db2latex/example.mod.xsl         |   3 +
 docs/docbook/xslt/db2latex/figure.mod.xsl          |   3 +
 docs/docbook/xslt/db2latex/font.mod.xsl            |   3 +
 docs/docbook/xslt/db2latex/footnote.mod.xsl        |   3 +
 docs/docbook/xslt/db2latex/formal.mod.xsl          |  46 ++---
 docs/docbook/xslt/db2latex/glossary.mod.xsl        |   3 +
 docs/docbook/xslt/db2latex/graphic.mod.xsl         |   3 +
 docs/docbook/xslt/db2latex/html.mod.xsl            |   2 +
 docs/docbook/xslt/db2latex/index.mod.xsl           | 196 ++++++-------------
 docs/docbook/xslt/db2latex/info.mod.xsl            |   3 +
 docs/docbook/xslt/db2latex/inline.mod.xsl          |  15 +-
 docs/docbook/xslt/db2latex/keywords.mod.xsl        |   3 +
 docs/docbook/xslt/db2latex/labelid.mod.xsl         |   3 +
 docs/docbook/xslt/db2latex/latex.mapping.xsl       |   3 +
 docs/docbook/xslt/db2latex/lists.mod.xsl           |  38 ++--
 docs/docbook/xslt/db2latex/mathelem.mod.xsl        |   3 +
 .../mathml/mathml.content.constsymb.mod.xsl        |   2 +
 .../mathml/mathml.content.functions.mod.xsl        |   2 +
 .../xslt/db2latex/mathml/mathml.content.mod.xsl    |   2 +
 .../db2latex/mathml/mathml.content.token.mod.xsl   |   2 +
 docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl   |   2 +
 .../db2latex/mathml/mathml.presentation.mod.xsl    | 123 ++----------
 docs/docbook/xslt/db2latex/mediaobject.mod.xsl     |  45 ++---
 docs/docbook/xslt/db2latex/msgset.mod.xsl          |   2 +
 docs/docbook/xslt/db2latex/normalize-scape.mod.xsl | 214 +++------------------
 docs/docbook/xslt/db2latex/para.mod.xsl            |   5 +
 docs/docbook/xslt/db2latex/part-chap-app.mod.xsl   |   7 +
 docs/docbook/xslt/db2latex/pi.mod.xsl              |   3 +
 docs/docbook/xslt/db2latex/preamble.mod.xsl        | 166 ++++++----------
 docs/docbook/xslt/db2latex/procedure.mod.xsl       |  29 ++-
 docs/docbook/xslt/db2latex/qandaset.mod.xsl        |  45 +++--
 docs/docbook/xslt/db2latex/refentry.mod.xsl        |   3 +
 docs/docbook/xslt/db2latex/revision.mod.xsl        |   7 +-
 docs/docbook/xslt/db2latex/sections.mod.xsl        |   3 +
 docs/docbook/xslt/db2latex/set.mod.xsl             |   3 +
 docs/docbook/xslt/db2latex/sgmltag.mod.xsl         |  27 +--
 docs/docbook/xslt/db2latex/synop-oop.mod.xsl       |   2 +
 docs/docbook/xslt/db2latex/synop-struct.mod.xsl    |   2 +
 docs/docbook/xslt/db2latex/table.mod.xsl           | 148 +++-----------
 docs/docbook/xslt/db2latex/texmath.mod.xsl         |  33 ++--
 docs/docbook/xslt/db2latex/vars.mod.xsl            | 127 ++++--------
 docs/docbook/xslt/db2latex/verbatim.mod.xsl        |  73 ++++---
 docs/docbook/xslt/db2latex/xref.mod.xsl            | 123 +++++-------
 docs/docbook/xslt/latex.xsl                        |   2 +-
 62 files changed, 650 insertions(+), 1263 deletions(-)

(limited to 'docs/docbook')

diff --git a/docs/docbook/xslt/db2latex/VERSION.xml b/docs/docbook/xslt/db2latex/VERSION.xml
index 70bbf95e88..a76a06a5a5 100644
--- a/docs/docbook/xslt/db2latex/VERSION.xml
+++ b/docs/docbook/xslt/db2latex/VERSION.xml
@@ -1,20 +1,16 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+ |	$Id: VERSION.xml,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
  |- #############################################################################
+ |	$Author: jelmer $
  |														
  |   PURPOSE:
  + ############################################################################## -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:variable name="VERSION">0.7.1</xsl:variable>
-<xsl:variable name="LASTRELEASE">0.7</xsl:variable>
-<xsl:variable name="TAG">
-  <xsl:variable name="RCSTAG" select="substring-before(substring-after('$Name:  $',concat('$','Name: ')),'$')"/>
-  <xsl:choose>
-    <xsl:when test="normalize-space($RCSTAG)=''">HEAD</xsl:when>
-    <xsl:otherwise><xsl:value-of select="$RCSTAG" /></xsl:otherwise>
-  </xsl:choose>
-</xsl:variable>
+<xsl:variable name="VERSION">0.7pre5</xsl:variable>
+<xsl:variable name="TAG">APRIL2003</xsl:variable>
+<xsl:variable name="CVSVERSION">$Id: VERSION.xml,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $</xsl:variable>
 
 
 </xsl:stylesheet>
diff --git a/docs/docbook/xslt/db2latex/abstract.mod.xsl b/docs/docbook/xslt/db2latex/abstract.mod.xsl
index a9bc2e02ce..b2e82c2de3 100644
--- a/docs/docbook/xslt/db2latex/abstract.mod.xsl
+++ b/docs/docbook/xslt/db2latex/abstract.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: abstract.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="abstract" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: abstract.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    	<author><firstname>Ramon</firstname> <surname>Casellas</surname></author>
@@ -59,7 +62,7 @@
 		% --------------------------------------------
 		\begin{abstract}
 	    </screen>
-	    <para> Calls "apply-templates" for all the children, and calls template
+	    <para> Calls "apply-templates" for all the children, and call template
 		<xref linkend="map.end"/>(<literal>map.end</literal>) to output the closing
 		command.</para>
 	    <formalpara><title>Remarks and Bugs</title>
diff --git a/docs/docbook/xslt/db2latex/admonition.mod.xsl b/docs/docbook/xslt/db2latex/admonition.mod.xsl
index 56042a610e..62f37ccd3a 100644
--- a/docs/docbook/xslt/db2latex/admonition.mod.xsl
+++ b/docs/docbook/xslt/db2latex/admonition.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: admonition.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
 |- #############################################################################
+|	$Author: jelmer $
 |
 |   PURPOSE: Admonition templates. 
 + ############################################################################## -->
@@ -15,6 +17,7 @@
     <doc:reference name="admonition" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: admonition.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 		<authorgroup>
 		<author><firstname>Ramon</firstname> <surname>Casellas</surname></author>
@@ -74,72 +77,46 @@
 		</example>
 	</refdescription>
     </doc:param>
+    <!--############################################################################# -->
 
-<!--############################################################################# -->
-<xsl:variable name="latex.admonition.environment">
-<xsl:text>% ---------------------------------------------- &#10;</xsl:text>
-<xsl:text>% Define a new LaTeX environment (adminipage)    &#10;</xsl:text>
-<xsl:text>% ---------------------------------------------- &#10;</xsl:text>
-<xsl:text>\newenvironment{admminipage}%&#10;</xsl:text>
-<xsl:text>{ % this code corresponds to the \begin{adminipage} command&#10;</xsl:text>
-<xsl:text> \begin{Sbox}%&#10;</xsl:text>
-<xsl:text> \begin{minipage}%&#10;</xsl:text>
-<xsl:text>} %done&#10;</xsl:text>
-<xsl:text>{ % this code corresponds to the \end{adminipage} command&#10;</xsl:text>
-<xsl:text> \end{minipage}&#10;</xsl:text>
-<xsl:text> \end{Sbox}&#10;</xsl:text>
-<xsl:text> \fbox{\TheSbox}&#10;</xsl:text>
-<xsl:text>} %done&#10;</xsl:text>
-<xsl:text>% ---------------------------------------------- &#10;</xsl:text>
-<xsl:text>% Define a new LaTeX length (admlength)          &#10;</xsl:text>
-<xsl:text>% ---------------------------------------------- &#10;</xsl:text>
-<xsl:text>\newlength{\admlength}&#10;</xsl:text>
-<xsl:text>% ---------------------------------------------- &#10;</xsl:text>
-<xsl:text>% Define a new LaTeX environment (admonition)    &#10;</xsl:text>
-<xsl:text>% With 2 parameters:                             &#10;</xsl:text>
-<xsl:text>% #1 The file (e.g. note.pdf)                    &#10;</xsl:text>
-<xsl:text>% #2 The caption                                 &#10;</xsl:text>
-<xsl:text>% ---------------------------------------------- &#10;</xsl:text>
-<xsl:text>\newenvironment{admonition}[2] &#10;</xsl:text>
-<xsl:text>{ % this code corresponds to the \begin{admonition} command&#10;</xsl:text>
-<xsl:text> \hspace{0mm}\newline\hspace*\fill\newline&#10;</xsl:text>
-<xsl:text> \noindent&#10;</xsl:text>
-<xsl:text> \setlength{\fboxsep}{5pt}&#10;</xsl:text>
-<xsl:text> \setlength{\admlength}{\linewidth}&#10;</xsl:text>
-<xsl:text> \addtolength{\admlength}{-10\fboxsep}&#10;</xsl:text>
-<xsl:text> \addtolength{\admlength}{-10\fboxrule}&#10;</xsl:text>
-<xsl:text> \admminipage{\admlength}&#10;</xsl:text>
-<xsl:text> {\bfseries \sc\large{#2}}</xsl:text>
-<xsl:text> \newline&#10;</xsl:text>
-<xsl:text> \\[1mm]&#10;</xsl:text>
-<xsl:text> \sffamily&#10;</xsl:text>
-<!--
-If we cannot find the latex.admonition.path;
-Comment out the next line (\includegraphics).
-This tactic is to avoid deleting the \includegraphics
-altogether, as that could confuse a person trying to
-find the use of parameter #1 in the environment.
--->
-<xsl:if test="$latex.admonition.path=''">
-	<xsl:text>%</xsl:text>
-</xsl:if>
-<xsl:text> \includegraphics[</xsl:text> <xsl:value-of select="$latex.admonition.imagesize" /> <xsl:text>]{#1}&#10;</xsl:text>
-<xsl:text> \addtolength{\admlength}{-1cm}&#10;</xsl:text>
-<xsl:text> \addtolength{\admlength}{-20pt}&#10;</xsl:text>
-<xsl:text> \begin{minipage}[lt]{\admlength}&#10;</xsl:text>
-<xsl:text> \parskip=0.5\baselineskip \advance\parskip by 0pt plus 2pt&#10;</xsl:text>
-<xsl:text>} %done&#10;</xsl:text>
-<xsl:text>{ % this code corresponds to the \end{admonition} command&#10;</xsl:text>
-<xsl:text> \vspace{5mm} &#10;</xsl:text>
-<xsl:text> \end{minipage}&#10;</xsl:text>
-<xsl:text> \endadmminipage&#10;</xsl:text>
-<xsl:text> \vspace{.5em}&#10;</xsl:text>
-<xsl:text> \par&#10;</xsl:text>
-<xsl:text>}&#10;</xsl:text>
-</xsl:variable>
-
-
-
+    <xsl:variable name="latex.admonition.environment">
+	<xsl:text>\newenvironment{admminipage}{\begin{Sbox}\begin{minipage}}{\end{minipage}\end{Sbox}\fbox{\TheSbox}}&#10;</xsl:text>
+	<xsl:text>\newlength{\admlength}&#10;</xsl:text>
+	<xsl:text>\newenvironment{admonition}[2] {&#10;</xsl:text>
+	<xsl:text> \hspace{0mm}\newline\hspace*\fill\newline&#10;</xsl:text>
+	<xsl:text> \noindent&#10;</xsl:text>
+	<xsl:text> \setlength{\fboxsep}{5pt}&#10;</xsl:text>
+	<xsl:text> \setlength{\admlength}{\linewidth}&#10;</xsl:text>
+	<xsl:text> \addtolength{\admlength}{-10\fboxsep}&#10;</xsl:text>
+	<xsl:text> \addtolength{\admlength}{-10\fboxrule}&#10;</xsl:text>
+	<xsl:text> \admminipage{\admlength}&#10;</xsl:text>
+	<xsl:text> {\bfseries \sc\large{#2}} \newline&#10;</xsl:text>
+	<xsl:text> \\[1mm]&#10;</xsl:text>
+	<xsl:text> \sffamily&#10;</xsl:text>
+	<xsl:if test="$latex.admonition.path=''">
+		<xsl:text>%</xsl:text>
+		<!--
+			Comment out the next line (\includegraphics).
+			This tactic is to avoid deleting the \includegraphics
+			altogether, as that could confuse a person trying to
+			find the use of parameter #1 in the environment.
+		-->
+	</xsl:if>
+	<xsl:text> \includegraphics[</xsl:text>
+	<xsl:value-of select="$latex.admonition.imagesize" />
+	<xsl:text>]{#1}&#10;</xsl:text>
+	<xsl:text> \addtolength{\admlength}{-1cm}&#10;</xsl:text>
+	<xsl:text> \addtolength{\admlength}{-20pt}&#10;</xsl:text>
+	<xsl:text> \begin{minipage}[lt]{\admlength}&#10;</xsl:text>
+	<xsl:text> \parskip=0.5\baselineskip \advance\parskip by 0pt plus 2pt&#10;</xsl:text>
+	<xsl:text>}{&#10;</xsl:text>
+	<xsl:text> \vspace{5mm} &#10;</xsl:text>
+	<xsl:text> \end{minipage}&#10;</xsl:text>
+	<xsl:text> \endadmminipage&#10;</xsl:text>
+	<xsl:text> \vspace{.5em}&#10;</xsl:text>
+	<xsl:text> \par&#10;</xsl:text>
+	<xsl:text>}&#10;</xsl:text>
+    </xsl:variable>
 
     <!--############################################################################# -->
     <!-- DOCUMENTATION                                                                -->
diff --git a/docs/docbook/xslt/db2latex/authorgroup.mod.xsl b/docs/docbook/xslt/db2latex/authorgroup.mod.xsl
index 6ec7460def..fd40f3cb4c 100644
--- a/docs/docbook/xslt/db2latex/authorgroup.mod.xsl
+++ b/docs/docbook/xslt/db2latex/authorgroup.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: authorgroup.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: Manage Authorgroups 
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="authorgroup" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: authorgroup.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 		<authorgroup>
 	    	<author><firstname>Ramon</firstname> <surname>Casellas</surname></author>
diff --git a/docs/docbook/xslt/db2latex/biblio.mod.xsl b/docs/docbook/xslt/db2latex/biblio.mod.xsl
index 9524015b1e..3d3e9f70f0 100644
--- a/docs/docbook/xslt/db2latex/biblio.mod.xsl
+++ b/docs/docbook/xslt/db2latex/biblio.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: biblio.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: Manage Bibliography.
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="biblio" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: biblio.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -223,7 +226,7 @@
     </xsl:template>
 
     <xsl:template name="biblioentry.output">
-	<xsl:variable name="biblioentry.label">
+	<xsl:variable name="biblioentry.tag">
 	    <xsl:choose>
 		<xsl:when test="@xreflabel">
 		    <xsl:value-of select="normalize-space(@xreflabel)"/> 
@@ -235,49 +238,23 @@
 		    <xsl:value-of select="normalize-space(@id)"/> 
 		</xsl:when>
 		<xsl:otherwise>
-		</xsl:otherwise>
-	    </xsl:choose>
-	</xsl:variable>
-	<xsl:variable name="biblioentry.id">
-	    <xsl:choose>
-		<xsl:when test="abbrev">
-		    <xsl:apply-templates select="abbrev" mode="bibliography.mode"/> 
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:call-template name="generate.label.id"/>
+		    <xsl:text>UNKNOWN</xsl:text>
 		</xsl:otherwise>
 	    </xsl:choose>
 	</xsl:variable>
 	<xsl:text>&#10;</xsl:text>
 	<xsl:text>% -------------- biblioentry &#10;</xsl:text>
-	<xsl:choose>
-		<xsl:when test="$biblioentry.label=''">
-			<xsl:text>\bibitem</xsl:text> 
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:text>\bibitem[</xsl:text>
-			<xsl:call-template name="normalize-scape">
-				<xsl:with-param name="string" select="$biblioentry.label"/>
-			</xsl:call-template>
-			<xsl:text>]</xsl:text> 
-		</xsl:otherwise>
-	</xsl:choose>
-	<xsl:text>{</xsl:text>
-	<xsl:value-of select="$biblioentry.id"/>
-	<xsl:text>}\docbooktolatexbibaux{</xsl:text> 
-	<xsl:call-template name="generate.label.id"/> 
-	<xsl:text>}{</xsl:text> 
-	<xsl:value-of select="$biblioentry.id"/>
-	<xsl:text>}&#10;\hypertarget{</xsl:text> 
-	<xsl:call-template name="generate.label.id"/> 
-	<xsl:text>}{\emph{</xsl:text> <xsl:apply-templates select="title" mode="bibliography.mode"/> <xsl:text>}}</xsl:text>
+	<xsl:text>\bibitem[</xsl:text><xsl:value-of select="$biblioentry.tag"/><xsl:text>]</xsl:text> 
+	<xsl:text>{</xsl:text><xsl:value-of select="$biblioentry.tag"/><xsl:text>}&#10;</xsl:text> 
+	<xsl:text>\emph{</xsl:text> <xsl:apply-templates select="title" mode="bibliography.mode"/><xsl:text>} </xsl:text>
 	<xsl:value-of select="$biblioentry.item.separator"/>
 	<xsl:apply-templates select="author|authorgroup" mode="bibliography.mode"/>
 	<xsl:for-each select="child::copyright|child::publisher|child::pubdate|child::pagenums|child::isbn|child::editor|child::releaseinfo">
 	    <xsl:value-of select="$biblioentry.item.separator"/>
 	    <xsl:apply-templates select="." mode="bibliography.mode"/> 
 	</xsl:for-each>
-	<xsl:text>.</xsl:text>
+	<xsl:text>. </xsl:text>
+	<xsl:call-template name="label.id"/> 
 	<xsl:text>&#10;&#10;</xsl:text>
     </xsl:template>
 
diff --git a/docs/docbook/xslt/db2latex/block.mod.xsl b/docs/docbook/xslt/db2latex/block.mod.xsl
index 49aba64ca2..ac270a3561 100644
--- a/docs/docbook/xslt/db2latex/block.mod.xsl
+++ b/docs/docbook/xslt/db2latex/block.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: block.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="block" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: block.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 		<author><firstname>Ramon</firstname> <surname>Casellas</surname></author>
diff --git a/docs/docbook/xslt/db2latex/book-article.mod.xsl b/docs/docbook/xslt/db2latex/book-article.mod.xsl
index 042ec556aa..b9a230554c 100644
--- a/docs/docbook/xslt/db2latex/book-article.mod.xsl
+++ b/docs/docbook/xslt/db2latex/book-article.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: book-article.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE:
 |	This template matches a book / article
@@ -18,6 +20,7 @@
     <doc:reference id="book-article" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: book-article.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -111,12 +114,7 @@
 			<xsl:apply-templates select="bookinfo/authorgroup"/>
 	    </xsl:when>
 	    <xsl:otherwise>
-		        <xsl:for-each select="bookinfo/author">
-            			<xsl:apply-templates select="."/>
-            			<xsl:if test="not(position()=last())">
-                			<xsl:text> \and </xsl:text>
-            			</xsl:if>
-        		</xsl:for-each>
+			<xsl:apply-templates select="bookinfo/author"/>
 	    </xsl:otherwise>
 	</xsl:choose>
 	<xsl:text>}&#10;</xsl:text>
@@ -136,11 +134,14 @@
 			<xsl:text>}}</xsl:text>
 	</xsl:if>
 
-	<!-- book:7b: maketitle and set up pagestyle -->
-	<xsl:value-of select="$latex.maketitle"/>
-	<!-- book:8: - APPLY TEMPLATES -->
+	<!-- book:7b: maketitle -->
+	<xsl:text>{\pagestyle{empty}\maketitle</xsl:text>
+	<!-- book:8: page Style ? fancyheaders or plain ? -->
+	<xsl:call-template name="generate.latex.pagestyle"/>
+	<xsl:text>}&#10;</xsl:text>
+	<!-- book:9: - APPLY TEMPLATES -->
 	<xsl:apply-templates/>
-	<!-- book:9:  call map.end -->
+	<!-- book:10:  call map.end -->
 	<xsl:call-template name="map.end"/>
     </xsl:template>
 
@@ -185,7 +186,7 @@
 	    <formalpara><title>Tasks</title>
 		<itemizedlist>
 		    <listitem><para>Calls <literal>generate.latex.article.preamble</literal>.</para></listitem>
-		    <listitem><para>Outputs \title, \author, \date, getting the information from its children.</para></listitem>
+		    <listitem><para>Outputs \title, \author, getting the information from its children.</para></listitem>
 		    <listitem><para>Calls <literal>latex.article.begindocument</literal>.</para></listitem>
 		    <listitem><para>Calls <literal>latex.article.maketitle.</literal></para></listitem>
 		    <listitem><para>Applies templates.</para></listitem>
@@ -224,31 +225,26 @@
 	<xsl:variable name="article.title">
 	    <xsl:choose>
 			<xsl:when test="./title"> 
-				<xsl:apply-templates select="./title"/>
+				<xsl:value-of select="./title"/>
 			</xsl:when>
 			<xsl:when test="./articleinfo/title">
-				<xsl:apply-templates select="./articleinfo/title"/>
+				<xsl:value-of select="./articleinfo/title"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:apply-templates select="./artheader/title"/>
+				<xsl:value-of select="./artheader/title"/>
 			</xsl:otherwise>
 	    </xsl:choose>
 	</xsl:variable>
-	<xsl:text>\begin{center}{</xsl:text>
-	<xsl:value-of select="$latex.book.article.title.style"/>
-	<xsl:text>{</xsl:text>
-	<xsl:value-of select="$article.title"/>
+	<xsl:text>\begin{center}\textsf{\textbf{\Large </xsl:text>
+	<xsl:call-template name="normalize-scape"> 
+	    <xsl:with-param name="string" select="$article.title"/>
+	</xsl:call-template>
 	<xsl:text>}}\par&#10;</xsl:text>
 	<!-- Display author information --> 
 	<xsl:choose>
 	    <xsl:when test="artheader/author">		
 			<xsl:text>\textsf{</xsl:text>
-			<xsl:for-each select="artheader/author">
-				<xsl:apply-templates select="."/>
-				<xsl:if test="not(position()=last())">
-					<xsl:text> \and </xsl:text>
-				</xsl:if>
-			</xsl:for-each>
+			<xsl:apply-templates select="artheader/author"/>	
 			<xsl:text>}\par&#10;</xsl:text>
 		</xsl:when>
 	    <xsl:when test="artheader/authorgroup">
@@ -258,12 +254,7 @@
 		</xsl:when>
 	    <xsl:when test="articleinfo/author">
 			<xsl:text>\textsf{</xsl:text>
-			<xsl:for-each select="articleinfo/author">
-				<xsl:apply-templates select="."/>
-				<xsl:if test="not(position()=last())">
-					<xsl:text> \and </xsl:text>
-				</xsl:if>
-			</xsl:for-each>
+			<xsl:apply-templates select="articleinfo/author"/>
 			<xsl:text>}\par&#10;</xsl:text>
 		</xsl:when>
 	    <xsl:when test="articleinfo/authorgroup">
@@ -273,21 +264,16 @@
 		</xsl:when>
 	    <xsl:when test="author">
 			<xsl:text>\textsf{</xsl:text>
-			<xsl:for-each select="author">
-				<xsl:apply-templates select="."/>
-				<xsl:if test="not(position()=last())">
-					<xsl:text> \and </xsl:text>
-				</xsl:if>
-			</xsl:for-each>
+			<xsl:apply-templates select="author"/>
 			<xsl:text>}\par&#10;</xsl:text>
 		</xsl:when>
 	</xsl:choose>
-	<xsl:apply-templates select="artheader|articleinfo" mode="article.within.book"/>
+	<xsl:apply-templates select="artheader" mode="article.within.book"/>
 	<xsl:text>\end{center}&#10;</xsl:text>
-	<xsl:apply-templates select="*[not(self::title)]"/>
+	<xsl:apply-templates/>
 	</xsl:template>
 
-	<xsl:template match="artheader|articleinfo" mode="article.within.book">
+	<xsl:template match="artheader" mode="article.within.book">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
@@ -301,82 +287,54 @@
 	<xsl:variable name="article.title">
 	    <xsl:choose>
 			<xsl:when test="./title"> 
-				<xsl:apply-templates select="./title"/>
+				<xsl:value-of select="./title"/>
 			</xsl:when>
 			<xsl:when test="./articleinfo/title">
-				<xsl:apply-templates select="./articleinfo/title"/>
+				<xsl:value-of select="./articleinfo/title"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:apply-templates select="./artheader/title"/>
+				<xsl:value-of select="./artheader/title"/>
 			</xsl:otherwise>
 	    </xsl:choose>
 	</xsl:variable>
 	<xsl:text>\title{</xsl:text>
-	<xsl:value-of select="$latex.article.title.style"/>
-	<xsl:text>{</xsl:text>
-	<xsl:value-of select="$article.title"/>
-	<xsl:text>}}&#10;</xsl:text>
-	<!-- Display date and author information --> 
-	<xsl:variable name="article.date">
-		<xsl:apply-templates select="./artheader/date|./articleinfo/date"/>
-	</xsl:variable>
-	<xsl:if test="$article.date!=''">
-		<xsl:text>\date{</xsl:text>
-		<xsl:value-of select="$article.date"/>
-		<xsl:text>}&#10;</xsl:text>
-	</xsl:if>
+	<xsl:call-template name="normalize-scape"> 
+	    <xsl:with-param name="string" select="$article.title"/>
+	</xsl:call-template>
+	<xsl:text>}&#10;</xsl:text>
+	<!-- Display author information --> 
 	<xsl:text>\author{</xsl:text>
 	<xsl:choose>
+	    <xsl:when test="artheader/author">		
+			<xsl:apply-templates select="artheader/author"/>	
+		</xsl:when>
 	    <xsl:when test="artheader/authorgroup">
 			<xsl:apply-templates select="artheader/authorgroup"/>
 		</xsl:when>
+	    <xsl:when test="articleinfo/author">
+			<xsl:apply-templates select="articleinfo/author"/>
+		</xsl:when>
 	    <xsl:when test="articleinfo/authorgroup">
 			<xsl:apply-templates select="articleinfo/authorgroup"/>
 		</xsl:when>
-	    <xsl:when test="artheader/author">		
-		<xsl:for-each select="artheader/author">
-			<xsl:apply-templates select="."/>
-			<xsl:if test="not(position()=last())">
-				<xsl:text> \and </xsl:text>
-			</xsl:if>
-		</xsl:for-each>
-		</xsl:when>
-	    <xsl:when test="articleinfo/author">
-		<xsl:for-each select="articleinfo/author">
-			<xsl:apply-templates select="."/>
-			<xsl:if test="not(position()=last())">
-				<xsl:text> \and </xsl:text>
-			</xsl:if>
-		</xsl:for-each>
-		</xsl:when>
-	    <xsl:otherwise>
-		<xsl:for-each select="author">
-			<xsl:apply-templates select="."/>
-			<xsl:if test="not(position()=last())">
-				<xsl:text> \and </xsl:text>
-			</xsl:if>
-		</xsl:for-each>
-	    </xsl:otherwise>
+	    <xsl:otherwise><xsl:apply-templates select="author"/></xsl:otherwise>
 	</xsl:choose>
 	<xsl:text>}&#10;</xsl:text>
 	<!-- Display  begindocument command -->
 	<xsl:value-of select="$latex.article.begindocument"/>
-	<xsl:value-of select="$latex.maketitle"/>
-	<xsl:apply-templates select="*[not(self::title)]"/>
+	<xsl:value-of select="$latex.article.maketitle"/>
+	<xsl:apply-templates/>
 	<xsl:value-of select="$latex.article.end"/>
     </xsl:template>
 
 
-    <xsl:template match="article/title|articleinfo/title|articleinfo/date|artheader/date">
-	<xsl:apply-templates/>
-    </xsl:template>
 
     <xsl:template match="article/artheader|article/articleinfo">
-	<xsl:apply-templates select="legalnotice" />
 	<xsl:apply-templates select="abstract"/>
     </xsl:template>
 
     <!-- EMPTY TEMPLATES -->
+    <xsl:template match="article/title"/>
     <xsl:template match="article/subtitle"/>
 
 
@@ -439,7 +397,7 @@
     <!--############################################################################# 
     |   Template: legalnotice 
     |-  ############################################################################# -->
-<xsl:template match="legalnotice">
+	<xsl:template match="legalnotice">
  	<!-- Support for legalnotice. -->
     <xsl:text>\vspace{-.3em}&#10;</xsl:text>
     <xsl:text>\if@twocolumn&#10;</xsl:text>
@@ -454,7 +412,7 @@
 	<xsl:apply-templates select="*[not(self::title)]"/>
     <xsl:text>\vspace{0.6em}\par\if@twocolumn\else\endquotation\fi&#10;</xsl:text>
     <xsl:text>\normalsize\rmfamily&#10;</xsl:text>
-</xsl:template>
+	</xsl:template>
 
 
 	<xsl:template match="legalnotice/title">
@@ -464,7 +422,9 @@
 
 
     <!--############################################################################# 
+    |	$Id: book-article.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE: Table of Contents, Figures, ...
     + ############################################################################## -->
@@ -504,37 +464,5 @@
     <xsl:template match="lotentry"/>
     <xsl:template match="tocpart|tocchap|tocfront|tocback|tocentry"/>
     <xsl:template match="toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-
-    <doc:template name="generate.latex.pagestyle" xmlns="">
-	<refpurpose> Choose the preferred page style for document body </refpurpose>
-	<refdescription>
-		<para>
-			If no page style is preferred by the user, the defaults will be
-			"empty" for articles, "plain" for books, or "fancy" (if the
-			fancyhdr packages is permitted).
-		</para>
-		<formalpara><title>Pertinent Variables</title>
-		<itemizedlist>
-			<listitem><simpara><xref linkend="param.pagestyle"/></simpara></listitem>
-			<listitem><simpara><xref linkend="param.use.fancyhdr"/></simpara></listitem>
-		</itemizedlist>
-		</formalpara>
-	</refdescription>
-    </doc:template>
-	<xsl:template name="generate.latex.pagestyle">
-		<xsl:text>\pagestyle{</xsl:text>
-		<xsl:choose>
-			<xsl:when test="$latex.pagestyle!=''"><xsl:value-of select="$latex.pagestyle"/></xsl:when>
-			<xsl:when test="count(//book)&gt;0">
-				<xsl:choose>
-					<xsl:when test="$latex.use.fancyhdr=1"><xsl:text>fancy</xsl:text></xsl:when>
-					<xsl:otherwise><xsl:text>plain</xsl:text></xsl:otherwise>
-				</xsl:choose>
-			</xsl:when>
-			<xsl:otherwise><xsl:text>empty</xsl:text></xsl:otherwise>
-		</xsl:choose>
-		<xsl:text>}</xsl:text>
-	</xsl:template>
-	
 </xsl:stylesheet>
 
diff --git a/docs/docbook/xslt/db2latex/bridgehead.mod.xsl b/docs/docbook/xslt/db2latex/bridgehead.mod.xsl
index a09ca15dda..609633e04e 100644
--- a/docs/docbook/xslt/db2latex/bridgehead.mod.xsl
+++ b/docs/docbook/xslt/db2latex/bridgehead.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: bridgehead.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -15,6 +17,7 @@
     <doc:reference id="bridgehead" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: bridgehead.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 		<authorgroup>
 		<author><firstname>Ramon</firstname> <surname>Casellas</surname></author>
diff --git a/docs/docbook/xslt/db2latex/callout.mod.xsl b/docs/docbook/xslt/db2latex/callout.mod.xsl
index ab67cf8e23..3eea0cf1bb 100644
--- a/docs/docbook/xslt/db2latex/callout.mod.xsl
+++ b/docs/docbook/xslt/db2latex/callout.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: callout.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -15,6 +17,7 @@
     <doc:reference id="callout" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: callout.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/citation.mod.xsl b/docs/docbook/xslt/db2latex/citation.mod.xsl
index 46c69af0eb..4ab82411a8 100644
--- a/docs/docbook/xslt/db2latex/citation.mod.xsl
+++ b/docs/docbook/xslt/db2latex/citation.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: citation.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="citation" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: citation.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -53,9 +56,9 @@
 
     <xsl:template match="citation">
 	<!-- todo: biblio-citation-check -->
-	<xsl:text>\docbooktolatexcite{</xsl:text>
-		<xsl:value-of select="."/>
-	<xsl:text>}{}</xsl:text>
+	<xsl:text>\cite{</xsl:text>
+		<xsl:apply-templates/>
+	<xsl:text>}</xsl:text>
     </xsl:template>
 
 </xsl:stylesheet>
diff --git a/docs/docbook/xslt/db2latex/common/common.xsl b/docs/docbook/xslt/db2latex/common/common.xsl
index 2506bd71ed..67cee9d94d 100644
--- a/docs/docbook/xslt/db2latex/common/common.xsl
+++ b/docs/docbook/xslt/db2latex/common/common.xsl
@@ -5,6 +5,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
+     $Id: common.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
      ********************************************************************
 
      Derived from the official DocBook XSL Stylesheets 
@@ -16,6 +17,7 @@
 
 <doc:reference xmlns="">
 <referenceinfo>
+<releaseinfo role="meta"> $Id: common.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ </releaseinfo>
 <author>
 	<surname>Ramon</surname>
 	<firstname>Casellas</firstname>
diff --git a/docs/docbook/xslt/db2latex/common/de.xml b/docs/docbook/xslt/db2latex/common/de.xml
index 8c458b0f5e..33d3e819b4 100644
--- a/docs/docbook/xslt/db2latex/common/de.xml
+++ b/docs/docbook/xslt/db2latex/common/de.xml
@@ -21,9 +21,6 @@
 <gentext key="glossary"                 text="Glossar"/>
 <gentext key="important"                text="WICHTIG"/>
 <gentext key="isbn"                     text="ISBN"/>
-<gentext key="keyword"                  text="Stichwort"/>
-<gentext key="keywords"    		text="Stichw&#x00F6;rter"/>
-<gentext key="keywordset"  		text="Stichw&#x00F6;rter"/>
 <gentext key="important"                text="Wichtig"/>
 <gentext key="index"                    text="Stichwortverzeichnis"/>
 <gentext key="legalnotice"              text="Rechtlicher Hinweis"/>
diff --git a/docs/docbook/xslt/db2latex/common/l10n.xsl b/docs/docbook/xslt/db2latex/common/l10n.xsl
index a8b526fc60..f2f2e5ee34 100644
--- a/docs/docbook/xslt/db2latex/common/l10n.xsl
+++ b/docs/docbook/xslt/db2latex/common/l10n.xsl
@@ -3,6 +3,7 @@
                 version='1.0'>
 
 <!-- ********************************************************************
+     $Id: l10n.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
      ********************************************************************
 
      Derived from the official XSL DocBook Stylesheet distribution.
diff --git a/docs/docbook/xslt/db2latex/component.mod.xsl b/docs/docbook/xslt/db2latex/component.mod.xsl
index aedcadb550..bdca568f63 100644
--- a/docs/docbook/xslt/db2latex/component.mod.xsl
+++ b/docs/docbook/xslt/db2latex/component.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: component.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="component" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: component.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/dingbat.mod.xsl b/docs/docbook/xslt/db2latex/dingbat.mod.xsl
index 84b579515a..53d970647f 100644
--- a/docs/docbook/xslt/db2latex/dingbat.mod.xsl
+++ b/docs/docbook/xslt/db2latex/dingbat.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: dingbat.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 |   
@@ -18,6 +20,7 @@
     <doc:reference id="dingbat" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: dingbat.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/docbook.xsl b/docs/docbook/xslt/db2latex/docbook.xsl
index 56e000cd02..f1ce7ccf9e 100644
--- a/docs/docbook/xslt/db2latex/docbook.xsl
+++ b/docs/docbook/xslt/db2latex/docbook.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: docbook.xsl,v 1.1.2.4 2003/08/12 18:22:39 jelmer Exp $		
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: 
 | 	This is the "parent" stylesheet. The used "modules" are included here.
@@ -26,8 +28,7 @@
 
     <xsl:include href="book-article.mod.xsl"/>
 
-    <xsl:include href="dedication.mod.xsl"/>
-    <xsl:include href="preface.mod.xsl"/>
+    <xsl:include href="ded-pref.mod.xsl"/>
 
     <xsl:include href="part-chap-app.mod.xsl"/>
 
@@ -101,6 +102,9 @@
 	<xsl:message> XSLT stylesheets DocBook - LaTeX 2e                                            </xsl:message>
 	<xsl:message> Reqs: LaTeX 2e installation common packages                                    </xsl:message>
 	<xsl:message>################################################################################</xsl:message>
+	<xsl:message> RELEASE : <xsl:value-of select="$VERSION"/>                                    </xsl:message>
+	<xsl:message> VERSION : <xsl:value-of select="$CVSVERSION"/>                                 </xsl:message>
+	<xsl:message>     TAG : <xsl:value-of select="$TAG"/>                                        </xsl:message>
 	<xsl:message>     WWW : http://db2latex.sourceforge.net                                      </xsl:message>
 	<xsl:message> SUMMARY : http://www.sourceforge.net/projects/db2latex                         </xsl:message>
 	<xsl:message>  AUTHOR : Ramon Casellas   casellas@infres.enst.fr                             </xsl:message>
diff --git a/docs/docbook/xslt/db2latex/email.mod.xsl b/docs/docbook/xslt/db2latex/email.mod.xsl
index 6461334ac8..8f2bcaa146 100644
--- a/docs/docbook/xslt/db2latex/email.mod.xsl
+++ b/docs/docbook/xslt/db2latex/email.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: email.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="email" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: email.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/errors.mod.xsl b/docs/docbook/xslt/db2latex/errors.mod.xsl
index 37b273c01d..a697d1ff1e 100644
--- a/docs/docbook/xslt/db2latex/errors.mod.xsl
+++ b/docs/docbook/xslt/db2latex/errors.mod.xsl
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
     <!--############################################################################# 
+    |	$Id: errors.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE:
     + ############################################################################## -->
diff --git a/docs/docbook/xslt/db2latex/example.mod.xsl b/docs/docbook/xslt/db2latex/example.mod.xsl
index fb973a27e7..599f1c0ace 100644
--- a/docs/docbook/xslt/db2latex/example.mod.xsl
+++ b/docs/docbook/xslt/db2latex/example.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: example.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="example" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: example.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/figure.mod.xsl b/docs/docbook/xslt/db2latex/figure.mod.xsl
index 823877aa17..3269bb5cfa 100644
--- a/docs/docbook/xslt/db2latex/figure.mod.xsl
+++ b/docs/docbook/xslt/db2latex/figure.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: figure.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: Template for figure tag.
 + ############################################################################## -->
@@ -15,6 +17,7 @@
     <doc:reference id="figure" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: figure.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/font.mod.xsl b/docs/docbook/xslt/db2latex/font.mod.xsl
index 20e2814520..40b4550c4f 100644
--- a/docs/docbook/xslt/db2latex/font.mod.xsl
+++ b/docs/docbook/xslt/db2latex/font.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: font.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="font" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: font.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/footnote.mod.xsl b/docs/docbook/xslt/db2latex/footnote.mod.xsl
index 6e7d39a36a..2d6a6aa861 100644
--- a/docs/docbook/xslt/db2latex/footnote.mod.xsl
+++ b/docs/docbook/xslt/db2latex/footnote.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: footnote.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="footnote" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: footnote.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/formal.mod.xsl b/docs/docbook/xslt/db2latex/formal.mod.xsl
index 6908119225..9857186589 100644
--- a/docs/docbook/xslt/db2latex/formal.mod.xsl
+++ b/docs/docbook/xslt/db2latex/formal.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: formal.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="formal" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: formal.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -86,6 +89,8 @@
 <!-- 2003/07/04 Applied patches from J.Pavlovic -->
 <!-- ========================================  -->
 <xsl:template match="equation">
+<!-- Get LaTeX content if available -->
+<xsl:variable name="tex" select=" mediaobject/textobject[@role='tex' or @role='latex'] | mediaobject/textobject/phrase[@role='tex' or @role='latex']"/>
 <!-- Equation title placement -->
 <xsl:variable name="placement">
 	<xsl:call-template name="generate.formal.title.placement">
@@ -105,28 +110,11 @@
 	<xsl:text>\captionswapskip{}</xsl:text>
 </xsl:if>
 <xsl:choose>
-	<xsl:when test="informalequation">
-		<xsl:apply-templates select="informalequation"/>
+	<xsl:when test="$tex">
+		<xsl:apply-templates select="$tex"/>
 	</xsl:when>
 	<xsl:otherwise>
-		<xsl:variable name="tex" select="alt[@role='tex' or @role='latex']|mediaobject/textobject[@role='tex' or @role='latex']|mediaobject/textobject/phrase[@role='tex' or @role='latex']"/>
-		<xsl:choose>
-			<xsl:when test="$tex">
-				<xsl:apply-templates select="$tex"/>
-			</xsl:when>
-			<xsl:when test="alt and $latex.alt.is.preferred='1'">
-				<xsl:apply-templates select="alt"/>
-			</xsl:when>
-			<xsl:when test="mediaobject">
-				<xsl:apply-templates select="mediaobject"/>
-			</xsl:when>
-			<xsl:when test="alt">
-				<xsl:apply-templates select="alt"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates select="graphic"/>
-			</xsl:otherwise>
-		</xsl:choose>
+		<xsl:apply-templates/>
 	</xsl:otherwise>
 </xsl:choose>
 <xsl:if test="$placement!='before'"><xsl:value-of select="$caption" /></xsl:if>
@@ -141,26 +129,16 @@
 
 
 <xsl:template match="informalequation">
-<xsl:variable name="tex" select="alt[@role='tex' or @role='latex']|mediaobject/textobject[@role='tex' or @role='latex']|mediaobject/textobject/phrase[@role='tex' or @role='latex']"/>
-<xsl:text>&#10;</xsl:text>
+<xsl:variable name="tex" select=" mediaobject/textobject[@role='tex'] | mediaobject/textobject[@role='latex']"/>
+<xsl:call-template name="informal.object"/>
 <xsl:choose>
 	<xsl:when test="$tex">
-		<xsl:apply-templates select="$tex"/>
-	</xsl:when>
-	<xsl:when test="alt and $latex.alt.is.preferred='1'">
-		<xsl:apply-templates select="alt"/>
-	</xsl:when>
-	<xsl:when test="mediaobject">
-		<xsl:apply-templates select="mediaobject"/>
-	</xsl:when>
-	<xsl:when test="alt">
-		<xsl:apply-templates select="alt"/>
+		<xsl:text>$</xsl:text><xsl:value-of select="mediaobject/textobject/phrase"/><xsl:text>$&#10;</xsl:text>
 	</xsl:when>
 	<xsl:otherwise>
-		<xsl:apply-templates select="graphic"/>
+		<xsl:apply-templates/>
 	</xsl:otherwise>
 </xsl:choose>
-<xsl:text>&#10;&#10;</xsl:text>
 </xsl:template>
 
 
diff --git a/docs/docbook/xslt/db2latex/glossary.mod.xsl b/docs/docbook/xslt/db2latex/glossary.mod.xsl
index f429187aee..45153cc98c 100644
--- a/docs/docbook/xslt/db2latex/glossary.mod.xsl
+++ b/docs/docbook/xslt/db2latex/glossary.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: glossary.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="glossary" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: glossary.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/graphic.mod.xsl b/docs/docbook/xslt/db2latex/graphic.mod.xsl
index 1c9845c93e..a3861d5c29 100644
--- a/docs/docbook/xslt/db2latex/graphic.mod.xsl
+++ b/docs/docbook/xslt/db2latex/graphic.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: graphic.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="graphic" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: graphic.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/html.mod.xsl b/docs/docbook/xslt/db2latex/html.mod.xsl
index a94ac3c80f..e4ad775d18 100644
--- a/docs/docbook/xslt/db2latex/html.mod.xsl
+++ b/docs/docbook/xslt/db2latex/html.mod.xsl
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
     <!--############################################################################# 
+    |	$Id: html.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE:
     |   
diff --git a/docs/docbook/xslt/db2latex/index.mod.xsl b/docs/docbook/xslt/db2latex/index.mod.xsl
index 0ca975bd50..5a33c49f44 100644
--- a/docs/docbook/xslt/db2latex/index.mod.xsl
+++ b/docs/docbook/xslt/db2latex/index.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: index.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="index" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: index.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -36,46 +39,33 @@
     </doc:reference>
 
 
-<!-- This parameter is for enabeling or disabling of indexterms -->
-<xsl:param name="latex.generate.indexterm">1</xsl:param>
 
-<!-- Our key for ranges -->
-<xsl:key name="indexterm-range" match="indexterm[@class='startofrange']" use="@id"/>
 
-
-
-
-<!-- ############################################################### -->
-<!-- Index                                                           -->
-<!--                                                                 -->
-<!-- ############################################################### -->
-<xsl:template match="index|setindex">
+    <xsl:template match="index|setindex">
 	<xsl:call-template name="label.id"/>
 	<xsl:text>\printindex&#10;</xsl:text>
-</xsl:template>
+    </xsl:template>
 
-<xsl:template match="index/title"></xsl:template>
-<xsl:template match="index/subtitle"></xsl:template>
-<xsl:template match="index/titleabbrev"></xsl:template>
+    <xsl:template match="index/title"></xsl:template>
+    <xsl:template match="index/subtitle"></xsl:template>
+    <xsl:template match="index/titleabbrev"></xsl:template>
 
-<xsl:template match="index/title" mode="component.title.mode">
+    <xsl:template match="index/title" mode="component.title.mode">
 	<xsl:call-template name="label.id"> <xsl:with-param name="object" select=".."/> </xsl:call-template>
-</xsl:template>
+    </xsl:template>
+
+    <xsl:template match="index/subtitle" mode="component.title.mode"/>
+
 
-<xsl:template match="index/subtitle" mode="component.title.mode"/>
 
 
-<!-- ############################################################### -->
-<!-- IndexDiv                                                        -->
-<!--                                                                 -->
-<!-- ############################################################### -->
-<xsl:template match="indexdiv">
+    <xsl:template match="indexdiv">
 	<xsl:apply-templates/>
-</xsl:template>
+    </xsl:template>
 
-<xsl:template match="indexdiv/title">
+    <xsl:template match="indexdiv/title">
 	<xsl:call-template name="label.id"> <xsl:with-param name="object" select=".."/> </xsl:call-template>
-</xsl:template>
+    </xsl:template>
 
 
 <!-- INDEX TERM CONTENT MODEL
@@ -87,127 +77,49 @@ IndexTerm ::=
 See|SeeAlso+)?)|
 See|SeeAlso+)?)
 -->
-<!-- ############################################################### -->
-<!-- IndexDiv                                                        -->
-<!--                                                                 -->
-<!-- ############################################################### -->
 <xsl:template match="indexterm">
-<xsl:if test="$latex.generate.indexterm != 0">
-<!--
-		<xsl:text>\index{</xsl:text>
-		<xsl:call-template name="normalize-scape">
-			<xsl:with-param name="string" select="normalize-space(./primary)"/>
-		</xsl:call-template>
-		<xsl:if test="./secondary">
-			<xsl:text>!</xsl:text>
-			<xsl:call-template name="normalize-scape">
-				<xsl:with-param name="string" select="normalize-space(./secondary)"/>
-			</xsl:call-template>
-		</xsl:if>
-		<xsl:if test="./tertiary">
-			<xsl:text>!</xsl:text>
-			<xsl:call-template name="normalize-scape">
-				<xsl:with-param name="string" select="normalize-space(./tertiary)"/>
-			</xsl:call-template>
-		</xsl:if>
-		<xsl:if test="./see">
-			<xsl:text>|see{</xsl:text>
-			<xsl:call-template name="normalize-scape">
-				<xsl:with-param name="string" select="normalize-space(./see)"/>
-			</xsl:call-template>
-			<xsl:text>}</xsl:text>
-		</xsl:if>
-		<xsl:if test="./seealso">
-			<xsl:text>|see{</xsl:text>
-			<xsl:call-template name="normalize-scape">
-				<xsl:with-param name="string" select="normalize-space(./seealso)"/>
-			</xsl:call-template>
-			<xsl:text>}</xsl:text>
-		</xsl:if>
-		<xsl:text>}</xsl:text>
--->
-	<xsl:variable name="idxterm">
-		<xsl:apply-templates mode="indexterm"/>
-	</xsl:variable>
-
-	<xsl:if test="@class and @zone">
-		<xsl:message terminate="yes">Error: Only one attribut (@class or @zone) is in indexterm possible!</xsl:message>
-	</xsl:if>
-
-	<xsl:choose>
-		<xsl:when test="@class='startofrange'">
-			<xsl:text>\index{</xsl:text>
-				<xsl:value-of select="normalize-space($idxterm)"/>
-			<xsl:text>|(}</xsl:text>
-		</xsl:when>
-		<xsl:when test="@class='endofrange'">
-			<xsl:choose>
-				<xsl:when test="count(key('indexterm-range',@startref)) = 0">
-					<xsl:message terminate="yes"><xsl:text>Error: No indexterm with </xsl:text>
-					<xsl:text>id='</xsl:text><xsl:value-of select="@startref"/>
-					<xsl:text>' found!</xsl:text>
-					<xsl:text>  Check your attributs id/startref in your indexterms!</xsl:text>
-					</xsl:message>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:variable name="thekey" select="key('indexterm-range',@startref)"/>
-					<xsl:text>\index{</xsl:text>
-					<xsl:apply-templates select="$thekey/*"  mode="indexterm"/>
-					<xsl:text>|)}</xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:text>\index{</xsl:text>
-			<xsl:message terminate="no"><xsl:text>Simple case:</xsl:text></xsl:message>
-				<xsl:value-of select="normalize-space($idxterm)"/>
-			<xsl:text>}</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
+<xsl:text>\index{</xsl:text>
+<!-- output primary -->
+<xsl:call-template name="normalize-scape">
+	<xsl:with-param name="string" select="normalize-space(./primary)"/>
+</xsl:call-template>
+<!-- output secondary if it exists -->
+<xsl:if test="./secondary">
+	<xsl:text>!</xsl:text>
+	<xsl:call-template name="normalize-scape">
+		<xsl:with-param name="string" select="normalize-space(./secondary)"/>
+	</xsl:call-template>
 </xsl:if>
+<!-- output tertiary if it exists -->
+<xsl:if test="./tertiary">
+	<xsl:text>!</xsl:text>
+	<xsl:call-template name="normalize-scape">
+		<xsl:with-param name="string" select="normalize-space(./tertiary)"/>
+	</xsl:call-template>
+</xsl:if>
+<!-- idem with see/seealso -->
+<xsl:if test="./see">
+	<xsl:text>|see{</xsl:text>
+	<xsl:call-template name="normalize-scape">
+		<xsl:with-param name="string" select="normalize-space(./see)"/>
+	</xsl:call-template>
+	<xsl:text>}</xsl:text>
+</xsl:if>
+<xsl:if test="./seealso">
+	<xsl:text>|see{</xsl:text>
+	<xsl:call-template name="normalize-scape">
+		<xsl:with-param name="string" select="normalize-space(./seealso)"/>
+	</xsl:call-template>
+	<xsl:text>}</xsl:text>
+</xsl:if>
+<xsl:text>}</xsl:text>
 </xsl:template>
 
 
-<!-- ================================================ -->
-<xsl:template match="*" mode="indexterm">
-    <xsl:message>WARNING: Element '<xsl:value-of select="local-name()"/>' in indexterm not supported!</xsl:message>
-</xsl:template>
-
-
-
-<!-- ================================================ -->
-<xsl:template match="primary" mode="indexterm">
-<xsl:apply-templates mode="indexterm"/>
-</xsl:template>
-
-<xsl:template match="secondary" mode="indexterm">
-<xsl:text>!</xsl:text>
-<xsl:apply-templates mode="indexterm"/>
-</xsl:template>
-
-<xsl:template match="tertiary" mode="indexterm">
-<xsl:text>!</xsl:text>
-<xsl:apply-templates mode="indexterm"/>
-</xsl:template>
-
-<xsl:template match="see|seealso" mode="indexterm">
-<xsl:text>|see{</xsl:text>
-<xsl:apply-templates mode="indexterm"/>
-<xsl:text>} </xsl:text>
-</xsl:template>
-
-
-<!-- ================================================ -->
-<!-- A simple example of what can be in an primary,   -->
-<!-- secondary or tertiary.                           -->
-<!-- ================================================ -->
-<xsl:template match="acronym" mode="indexterm">
-<xsl:apply-templates mode="indexterm"/>
-</xsl:template>
 
 
-<xsl:template match="primary|secondary|tertiary|see|seealso"/>
-<xsl:template match="indexentry"/>
-<xsl:template match="primaryie|secondaryie|tertiaryie|seeie|seealsoie"/>
+    <xsl:template match="primary|secondary|tertiary|see|seealso"/>
+    <xsl:template match="indexentry"/>
+    <xsl:template match="primaryie|secondaryie|tertiaryie|seeie|seealsoie"/>
 
 </xsl:stylesheet>
diff --git a/docs/docbook/xslt/db2latex/info.mod.xsl b/docs/docbook/xslt/db2latex/info.mod.xsl
index a2a35d4629..86fdc19ef1 100644
--- a/docs/docbook/xslt/db2latex/info.mod.xsl
+++ b/docs/docbook/xslt/db2latex/info.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: info.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="info" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: info.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/inline.mod.xsl b/docs/docbook/xslt/db2latex/inline.mod.xsl
index 5a6d8cc214..864834f7c2 100644
--- a/docs/docbook/xslt/db2latex/inline.mod.xsl
+++ b/docs/docbook/xslt/db2latex/inline.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: inline.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -15,6 +17,7 @@
     <doc:reference id="inline" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: inline.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -49,11 +52,11 @@
 	<xsl:param name="content">
 	    <xsl:apply-templates/>
 	</xsl:param>
-	<xsl:text>{\texttt{</xsl:text>
+	<xsl:text>{\texttt</xsl:text>
 	<xsl:if test="$latex.hyphenation.tttricks='1'"><xsl:value-of select="$hyphenation" /></xsl:if>
 	<xsl:text>{</xsl:text>
 	<xsl:copy-of select="$content"/>
-	<xsl:text>}}}</xsl:text>
+	<xsl:text>}}</xsl:text>
     </xsl:template>
 
     <xsl:template name="inline.boldseq">
@@ -79,11 +82,11 @@
 	<xsl:param name="content">
 	    <xsl:apply-templates/>
 	</xsl:param>
-	<xsl:text>{\texttt\bfseries{</xsl:text>
+	<xsl:text>{\texttt\bfseries</xsl:text>
 	<xsl:if test="$latex.hyphenation.tttricks='1'"><xsl:value-of select="$hyphenation" /></xsl:if>
 	<xsl:text>{</xsl:text>
 	<xsl:copy-of select="$content"/>
-	<xsl:text>}}}</xsl:text>
+	<xsl:text>}}</xsl:text>
     </xsl:template>
 
     <xsl:template name="inline.italicmonoseq">
@@ -91,11 +94,11 @@
 	<xsl:param name="content">
 	    <xsl:apply-templates/>
 	</xsl:param>
-	<xsl:text>{\texttt\itshape{</xsl:text>
+	<xsl:text>{\texttt\itshape</xsl:text>
 	<xsl:if test="$latex.hyphenation.tttricks='1'"><xsl:value-of select="$hyphenation" /></xsl:if>
 	<xsl:text>{</xsl:text>
 	<xsl:copy-of select="$content"/>
-	<xsl:text>}}}</xsl:text>
+	<xsl:text>}}</xsl:text>
     </xsl:template>
 
     <xsl:template name="inline.superscriptseq">
diff --git a/docs/docbook/xslt/db2latex/keywords.mod.xsl b/docs/docbook/xslt/db2latex/keywords.mod.xsl
index 80d5457199..c975406ba7 100644
--- a/docs/docbook/xslt/db2latex/keywords.mod.xsl
+++ b/docs/docbook/xslt/db2latex/keywords.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: keywords.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="keywords" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: keywords.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/labelid.mod.xsl b/docs/docbook/xslt/db2latex/labelid.mod.xsl
index 5305e07c5a..ee8faf0000 100644
--- a/docs/docbook/xslt/db2latex/labelid.mod.xsl
+++ b/docs/docbook/xslt/db2latex/labelid.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: labelid.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE: When this template is called, it marks the object with a label
 | and an hypertarget.
@@ -18,6 +20,7 @@
     <doc:reference id="labelid" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: labelid.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/latex.mapping.xsl b/docs/docbook/xslt/db2latex/latex.mapping.xsl
index 2ab53de9bf..8cdcde4312 100644
--- a/docs/docbook/xslt/db2latex/latex.mapping.xsl
+++ b/docs/docbook/xslt/db2latex/latex.mapping.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--#############################################################################
+|      $Id: latex.mapping.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|      $Author: jelmer $
 |
 |   PURPOSE:
 + ############################################################################## -->
@@ -18,6 +20,7 @@
     <doc:reference id="glossary" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: latex.mapping.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <author>
 		<firstname>Ramon</firstname><surname>Casellas</surname>
diff --git a/docs/docbook/xslt/db2latex/lists.mod.xsl b/docs/docbook/xslt/db2latex/lists.mod.xsl
index cdd093b3d0..351542d1e8 100644
--- a/docs/docbook/xslt/db2latex/lists.mod.xsl
+++ b/docs/docbook/xslt/db2latex/lists.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: lists.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="lists" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: lists.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -47,14 +50,15 @@
 
     <xsl:template match="itemizedlist">
 	<xsl:if test="title"> <xsl:apply-templates select="title"/></xsl:if>
-	<xsl:text>&#10;\begin{itemize}&#10;</xsl:text>
+	<xsl:text>\begin{itemize}&#10;</xsl:text>
 	<xsl:apply-templates select="listitem"/>
-	<xsl:text>&#10;\end{itemize}&#10;</xsl:text>
+	<xsl:text>\end{itemize}&#10;</xsl:text>
     </xsl:template>
 
 
     <xsl:template match="orderedlist">
-	<xsl:variable name="numeration">
+	<!-- PARAM numeration : -->
+	<xsl:param name="numeration">
 	    <xsl:choose>
 		<xsl:when test="@numeration">
 		    <xsl:value-of select="@numeration"/>
@@ -63,9 +67,9 @@
 		    <xsl:value-of select="arabic"/>
 		</xsl:otherwise>
 	    </xsl:choose>
-	</xsl:variable>
+	</xsl:param>
 	<xsl:if test="title"> <xsl:apply-templates select="title"/></xsl:if>
-	<xsl:text>&#10;\begin{enumerate}</xsl:text>
+	<xsl:text>\begin{enumerate}</xsl:text>
 	<xsl:if test="@numeration">
 	    <xsl:choose>
 		<xsl:when test="@numeration='arabic'"> 	<xsl:text>[1]</xsl:text>&#10;</xsl:when>
@@ -82,33 +86,25 @@
 
 
     <xsl:template match="variablelist">
-	<xsl:if test="title"> 
-		<xsl:apply-templates select="title"/>
-	</xsl:if>
+	<xsl:if test="title"> <xsl:apply-templates select="title"/></xsl:if>
 	<xsl:text>&#10;\noindent&#10;</xsl:text> 
-	<xsl:text>&#10;\begin{description}&#10;</xsl:text> 
+	\begin{description}
 	<xsl:apply-templates select="varlistentry"/>
-	<xsl:text>&#10;\end{description}&#10;</xsl:text> 
+	\end{description}
     </xsl:template>
 
 
     <xsl:template match="listitem">
-	<xsl:text>&#10;%--- Item&#10;</xsl:text>
-	<xsl:text>\item </xsl:text>
-	<xsl:apply-templates/>
-	<xsl:text>&#10;</xsl:text>
+	\item <xsl:apply-templates/><xsl:text>&#10;</xsl:text>
     </xsl:template>
 
 
     <xsl:template match="varlistentry">
-	<xsl:variable name="id"> 
-		<xsl:call-template name="label.id"/>
-	</xsl:variable>
-	<xsl:text>\item[</xsl:text><xsl:apply-templates select="term"/><xsl:text>]\mbox{} % mbox is a trick to induce different typesetting decisions</xsl:text>
+	<xsl:variable name="id"> <xsl:call-template name="label.id"/> </xsl:variable>
+	<xsl:text>\item[</xsl:text><xsl:apply-templates select="term"/><xsl:text>] </xsl:text>
 	<xsl:apply-templates select="listitem"/>
     </xsl:template>
 
-
     <xsl:template match="varlistentry/term">
 	<xsl:apply-templates/><xsl:text>, </xsl:text>
     </xsl:template>
@@ -210,7 +206,7 @@
 		    <xsl:apply-templates select="$members[position()=$cell]"/>
 		    <xsl:text> </xsl:text> 
 		    <xsl:if test="$curcol &lt; $cols">
-			<xsl:call-template name="generate.latex.cell.separator"/>
+			<xsl:text>&amp; </xsl:text> 
 		    </xsl:if>
 		</xsl:when>
 	    </xsl:choose>
@@ -296,7 +292,7 @@
 		    <xsl:apply-templates select="$members[position()=$cell]"/>
 		    <xsl:text> </xsl:text> 
 		    <xsl:if test="$curcol &lt; $cols">
-			<xsl:call-template name="generate.latex.cell.separator"/>
+			<xsl:text>&amp; </xsl:text> 
 		    </xsl:if>
 		</xsl:when>
 		<xsl:otherwise>
diff --git a/docs/docbook/xslt/db2latex/mathelem.mod.xsl b/docs/docbook/xslt/db2latex/mathelem.mod.xsl
index 2b085aa98d..f32d2631a5 100644
--- a/docs/docbook/xslt/db2latex/mathelem.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathelem.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: mathelem.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: Math Elements as theorems, lemmas, propositions, etc.
 |	Note: these elements are not part of the DocBook DTD. I have extended
@@ -20,6 +22,7 @@
     <doc:reference id="mathelems" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: mathelem.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl
index 585c744109..d9079b50da 100644
--- a/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.constsymb.mod.xsl
@@ -5,7 +5,9 @@
  <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent">  %mmlextra;
 ]>
 <!--############################################################################# 
+ |	$Id: mathml.content.constsymb.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
  |- #############################################################################
+ |	$Author: jelmer $												
  |														
  |   PURPOSE: MathML content markup, constants and symbols, 4.4.12.
  |	MathML namespace used -> mml
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl
index f197ca1924..2ae5cc7ccb 100644
--- a/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.functions.mod.xsl
@@ -5,7 +5,9 @@
  <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent">  %mmlextra;
 ]>
 <!--############################################################################# 
+ |	$Id: mathml.content.functions.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
  |- #############################################################################
+ |	$Author: jelmer $												
  |														
  |   PURPOSE: MathML content markup.
  |	Note: these elements are not part of the DocBook DTD. I have extended
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl
index d93ea22393..acdf329e71 100644
--- a/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.mod.xsl
@@ -5,7 +5,9 @@
  <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent">  %mmlextra;
 ]>
 <!--############################################################################# 
+ |	$Id: mathml.content.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
  |- #############################################################################
+ |	$Author: jelmer $												
  |														
  |   PURPOSE: MathML content markup.
  |	Note: these elements are not part of the DocBook DTD. I have extended
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl
index 1f3f566763..fd9dfdeaa6 100644
--- a/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathml/mathml.content.token.mod.xsl
@@ -5,7 +5,9 @@
  <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent">  %mmlextra;
 ]>
 <!--############################################################################# 
+ |	$Id: mathml.content.token.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
  |- #############################################################################
+ |	$Author: jelmer $												
  |	
  |	PURPOSE: MathML Content Markup, tokens (ci, cn, csymbol)
  |	MathML namespace used -> mml
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl
index f37edfb4ed..37619eb499 100644
--- a/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathml/mathml.mod.xsl
@@ -5,7 +5,9 @@
  <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent">  %mmlextra;
 ]>
 <!--############################################################################# 
+ |	$Id: mathml.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
  |- #############################################################################
+ |	$Author: jelmer $
  |														
  |   PURPOSE: MathML presentation and content markup.
  |	Note: these elements are not part of the DocBook DTD. I have extended
diff --git a/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl b/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl
index ce3c7c9a4d..62f317d344 100644
--- a/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mathml/mathml.presentation.mod.xsl
@@ -5,7 +5,9 @@
  <!ENTITY % mmlextra PUBLIC "MathML extra" "ent/mmlextra.ent">  %mmlextra;
 ]>
 <!--############################################################################# 
+ |	$Id: mathml.presentation.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
  |- #############################################################################
+ |	$Author: jelmer $												
  |														
  |   PURPOSE: MathML presentation markup.
  |	Note: these elements are not part of the DocBook DTD. I have extended
@@ -23,19 +25,12 @@
 	<xsl:text>{</xsl:text> <xsl:apply-templates/> <xsl:text>}</xsl:text>
 </xsl:template>
 
-<xsl:variable name="latex.entities.xml" select="document('latex.entities.xml')"/>
-
 
 <!-- TOKENS -->
 <!-- Math Identifier -->
 <xsl:template match="mml:mi">
 	<xsl:variable name="fontstyle" select="@fontstyle"/>
 	<xsl:variable name="identifier" select="normalize-space(.)"/>
-	<xsl:variable name="equivalent">
-		<xsl:if test="string-length($identifier)=1">
-			<xsl:value-of select="$latex.entities.xml/latex/character[@entity=$identifier]"/>
-		</xsl:if>
-	</xsl:variable>
 	<xsl:choose>
 		<xsl:when test="$identifier='&ExponentialE;'">
 			<xsl:text>\textrm{e}</xsl:text>
@@ -46,19 +41,8 @@
 		<xsl:when test="$identifier='&#x0221E;'"><!--/infty infinity -->
 			<xsl:text>\infty</xsl:text>
 		</xsl:when>
-		<!-- currently tries to map single-character identifiers only -->
-		<xsl:when test="$equivalent!=''">
-			<xsl:text>{</xsl:text>
-			<xsl:copy-of select="$equivalent"/>
-			<xsl:text>}</xsl:text>
-		</xsl:when>
 		<xsl:otherwise>
-			<xsl:if test="$fontstyle='normal' or string-length($identifier)&gt;1">
-				<xsl:text>\textrm</xsl:text>
-			</xsl:if>
-			<xsl:text>{</xsl:text>
-			<xsl:copy-of select="$identifier"/>
-			<xsl:text>}</xsl:text>
+			<xsl:text>\textrm{</xsl:text> <xsl:copy-of select="$identifier"/> <xsl:text>}</xsl:text>
 		</xsl:otherwise>
 	</xsl:choose>
 </xsl:template>
@@ -73,30 +57,9 @@
 	<xsl:apply-templates/>
 </xsl:template>
 
-<!-- Empty unless $character is a single character -->
-<xsl:template name="generate.equivalent">
-	<xsl:param name="arguments" select="0"/>
-	<xsl:param name="character"/>
-	<xsl:if test="string-length($character)=1">
-		<xsl:choose>
-			<xsl:when test="$arguments&gt;0">
-				<xsl:value-of select="$latex.entities.xml/latex/character[@entity=$character and @arguments=$arguments]"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="$latex.entities.xml/latex/character[@entity=$character and @arguments='']"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:if>
-</xsl:template>
-
 <!-- Math Operator -->
 <xsl:template match="mml:mo">
 	<xsl:variable name="operator" select="normalize-space(.)"/>
-	<xsl:variable name="equivalent">
-		<xsl:call-template name="generate.equivalent">
-			<xsl:with-param name="character" select="$operator"/>
-		</xsl:call-template>
-	</xsl:variable>
 	<xsl:choose>
 		<xsl:when test="$operator='&ApplyFunction;'">
 			<xsl:text></xsl:text>
@@ -158,9 +121,6 @@
 		<xsl:when test="$operator='+' or $operator='-' or $operator='/' or $operator='*'">
 			<xsl:value-of select="$operator"/>
 		</xsl:when>
-		<xsl:when test="$equivalent">
-			<xsl:value-of select="$equivalent"/>
-		</xsl:when>
 		<xsl:otherwise>
 			<xsl:text>\operatorname{</xsl:text>
 			<xsl:value-of select="$operator" />
@@ -186,14 +146,6 @@
 
 <!-- Math Space -->
 <xsl:template match="mml:mspace">
-	<xsl:if test="@width!='' and not(contains(@width,'%'))">
-		<xsl:text>\textrm{\hspace{</xsl:text><!-- kludge! -->
-		<xsl:value-of select="@width"/>
-		<xsl:text>}}</xsl:text>
-	</xsl:if>
-	<xsl:if test="@height!='' or @depth!=''">
-		<xsl:message>Warning: mspace support does not include height or depth.</xsl:message>
-	</xsl:if>
 </xsl:template>
 
 
@@ -233,8 +185,8 @@
 <xsl:template match="mml:mmultiscripts">
 </xsl:template>
 
-<xsl:template match="mml:munder">
 <!--
+<xsl:template match="mml:munder">
 <xsl:choose>
 	<xsl:when test="*[2] = &#818;">
 		<xsl:text>\underline{</xsl:text><xsl:apply-templates select="*[1]"/><xsl:text>}</xsl:text>
@@ -251,17 +203,10 @@
 	<xsl:text>}{</xsl:text>
 		<xsl:apply-templates select="*[1]"/>
 	<xsl:text>}</xsl:text>
--->
-	<xsl:text>{</xsl:text>
-	<xsl:apply-templates select="*[1]"/>
-	<xsl:text>_{</xsl:text>
-	<xsl:apply-templates select="*[2]"/>
-	<xsl:text>}}</xsl:text>
-<!--
 	</xsl:otherwise>
 </xsl:choose>
--->
 </xsl:template>
+-->
 <xsl:template match="mml:mover">
 <!--<xsl:choose>
 	<xsl:when test="normalize-space(*[2]) = &#175;">
@@ -276,57 +221,20 @@
 	<xsl:when test="normalize-space(*[2]) = &#9140;">
 		<xsl:text>\widehat{</xsl:text><xsl:apply-templates select="*[1]"/><xsl:text>}</xsl:text>
 	</xsl:when>
-	<xsl:otherwise>
-	</xsl:otherwise>
+	<xsl:otherwise>-->
+	<xsl:text>\overset{</xsl:text>
+		<xsl:apply-templates select="*[2]"/>
+	<xsl:text>}{</xsl:text>
+		<xsl:apply-templates select="*[1]"/>
+	<xsl:text>}</xsl:text>
+<!--	</xsl:otherwise>
 </xsl:choose>-->
-	<xsl:choose>
-		<xsl:when test="@accent='true' or ( local-name(*[2])='mo' and not(@accent='false'))">
-			<xsl:variable name="equivalent">
-				<xsl:call-template name="generate.equivalent">
-					<xsl:with-param name="arguments" select="1"/>
-					<xsl:with-param name="character" select="normalize-space(*[2])"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:choose>
-				<xsl:when test="$equivalent!=''">
-					<xsl:text>{</xsl:text>
-					<xsl:value-of select="$equivalent"/>
-					<xsl:text>{</xsl:text>
-					<xsl:apply-templates select="*[1]"/>
-					<xsl:text>}}</xsl:text>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text>{</xsl:text>
-					<xsl:apply-templates select="*[1]"/>
-					<xsl:text>^{</xsl:text>
-					<xsl:apply-templates select="*[2]"/>
-					<xsl:text>}}</xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:text>{</xsl:text>
-			<xsl:apply-templates select="*[1]"/>
-			<xsl:text>^{</xsl:text>
-			<xsl:apply-templates select="*[2]"/>
-			<xsl:text>}}</xsl:text>
-		</xsl:otherwise>
-	</xsl:choose>
 </xsl:template>
 
 
 
 <!-- Math UnderOver -->
 <xsl:template match="mml:munderover">
-	<xsl:text>{</xsl:text>
-	<xsl:apply-templates select="*[1]"/>
-	<xsl:text>_{</xsl:text>
-	<xsl:apply-templates select="*[2]"/>
-	<xsl:text>}</xsl:text>
-	<xsl:text>^{</xsl:text>
-	<xsl:apply-templates select="*[3]"/>
-	<xsl:text>}}</xsl:text>
-	<!--
 	<xsl:text>\overset{</xsl:text>
 			<xsl:apply-templates select="*[3]"/>
 		<xsl:text>}{\underset{</xsl:text>
@@ -334,7 +242,6 @@
 					<xsl:text>}{</xsl:text>
 				<xsl:apply-templates select="*[1]"/>
 	<xsl:text>}}</xsl:text>
-	-->
 </xsl:template>
 
 
@@ -350,7 +257,7 @@
 			<xsl:text> {\left\{ </xsl:text>
 		</xsl:when>
 		<xsl:when test="@open='['">
-			<xsl:text> {\left[\, </xsl:text>
+			<xsl:text> {\left[ </xsl:text>
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:text> {\left( </xsl:text>
@@ -365,7 +272,7 @@
 			<xsl:text> \right\}} </xsl:text>
 		</xsl:when>
 		<xsl:when test="@close=']'">
-			<xsl:text> \,\right]} </xsl:text>
+			<xsl:text> \right]} </xsl:text>
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:text> \right)} </xsl:text>
@@ -448,7 +355,7 @@
 <xsl:call-template name="mtable.format.tabular"><xsl:with-param name="cols" select="count($rows)"/></xsl:call-template>
 <xsl:text>}\hline&#10;</xsl:text>
 	<xsl:apply-templates/>
-<xsl:text>\end{array} </xsl:text>
+\end{array}&#10;
 </xsl:template>
 
 <xsl:template match="mml:mtr">
diff --git a/docs/docbook/xslt/db2latex/mediaobject.mod.xsl b/docs/docbook/xslt/db2latex/mediaobject.mod.xsl
index bfdd2c8c87..5c996c2d9b 100644
--- a/docs/docbook/xslt/db2latex/mediaobject.mod.xsl
+++ b/docs/docbook/xslt/db2latex/mediaobject.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: mediaobject.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: Manage Imageobject related tags.
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="mediaobject" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: mediaobject.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -50,31 +53,22 @@
     </xsl:template>
 
 
-    <xsl:template match="mediaobject">
-		<xsl:if test="local-name(preceding-sibling::*[1])!='mediaobject'">
-			<xsl:text>&#10;</xsl:text>
-		</xsl:if>
-		<xsl:call-template name="mediacontent"/>
+    <xsl:template match="mediaobject|inlinemediaobject">
+	<xsl:if test="local-name(.)='mediaobject' and position()=1">
 		<xsl:text>&#10;</xsl:text>
-	</xsl:template>
-
-    <xsl:template match="inlinemediaobject">
-		<xsl:call-template name="mediacontent"/>
-	</xsl:template>
-
-    <xsl:template name="mediacontent">
+	</xsl:if>
 	<xsl:choose>
 		<xsl:when test="count(imageobject)&lt;1">
 			<xsl:apply-templates select="textobject[1]"/>
 		</xsl:when>
-		<xsl:when test="$use.role.for.mediaobject='1' and $preferred.mediaobject.role!='' and count(imageobject[@role='$preferred.mediaobject.role'])!=0">
-			<xsl:apply-templates select="imageobject[@role=$preferred.mediaobject.role]"/>
+		<xsl:when test="$use.role.for.mediaobject='1' and $preferred.mediaobject.role!='' and count(imageobject/imagedata[@role='latex'])!=0">
+			<xsl:apply-templates select="imageobject/imagedata[@role=$preferred.mediaobject.role]"/>
 		</xsl:when>
-		<xsl:when test="$use.role.for.mediaobject='1' and count(imageobject[@role='latex'])!=0">
-			<xsl:apply-templates select="imageobject[@role='latex']"/>
+		<xsl:when test="$use.role.for.mediaobject='1' and count(imageobject/imagedata[@role='latex'])!=0">
+			<xsl:apply-templates select="imageobject/imagedata[@role='latex']"/>
 		</xsl:when>
-		<xsl:when test="$use.role.for.mediaobject='1' and count(imageobject[@role='tex'])!=0">
-			<xsl:apply-templates select="imageobject[@role='tex']"/>
+		<xsl:when test="$use.role.for.mediaobject='1' and count(imageobject/imagedata[@role='tex'])!=0">
+			<xsl:apply-templates select="imageobject/imagedata[@role='tex']"/>
 		</xsl:when>
 		<xsl:when test="$latex.graphics.formats!='' and count(imageobject/imagedata[@format!=''])!=0">
 			<!-- this is not really the right method: formats to the left of $latex.graphics.formats
@@ -168,16 +162,12 @@
 	</xsl:if>
 	<xsl:text>{\includegraphics[</xsl:text>
 	<xsl:choose>
-	    <xsl:when test="@scale"> 
-		<xsl:text>scale=</xsl:text>
-		<xsl:value-of select="number(@scale) div 100"/>
-	    </xsl:when>
-		<xsl:when test="$width!='' and @scalefit='1'">
+		<xsl:when test="$width!='' and (@scalefit='1' or count(@scale)&lt;1)">
 		<xsl:text>width=</xsl:text><xsl:value-of select="normalize-space($width)"/>
 		</xsl:when>
-		<xsl:when test="@depth!='' and @scalefit='1'">
-		<xsl:text>height=</xsl:text><xsl:value-of select="normalize-space(@depth)"/>
-		</xsl:when>
+	    <xsl:when test="@scale"> 
+		<xsl:text>scale=.</xsl:text><xsl:value-of select="normalize-space(@scale)"/>
+	    </xsl:when>
 	</xsl:choose>
 	<xsl:choose>
 	    <xsl:when test="@format = 'PRN'"><xsl:text>,angle=270</xsl:text></xsl:when>
@@ -191,7 +181,8 @@
 		<xsl:value-of select="$filename"/>
 	    </xsl:otherwise>
 	</xsl:choose>
-	<xsl:text>}}}</xsl:text>
+	<xsl:text>}}}&#10;</xsl:text>
+	<!-- xsl:text>}}}\quad&#10;</xsl:text -->
     </xsl:template>
 
 
diff --git a/docs/docbook/xslt/db2latex/msgset.mod.xsl b/docs/docbook/xslt/db2latex/msgset.mod.xsl
index 52ad63a87c..a72074e9f5 100644
--- a/docs/docbook/xslt/db2latex/msgset.mod.xsl
+++ b/docs/docbook/xslt/db2latex/msgset.mod.xsl
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
     <!--############################################################################# 
+    |	$Id: msgset.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE:
     + ############################################################################## -->
diff --git a/docs/docbook/xslt/db2latex/normalize-scape.mod.xsl b/docs/docbook/xslt/db2latex/normalize-scape.mod.xsl
index 058695d71d..0ad0f76865 100644
--- a/docs/docbook/xslt/db2latex/normalize-scape.mod.xsl
+++ b/docs/docbook/xslt/db2latex/normalize-scape.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: normalize-scape.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 |	Escape LaTeX and normalize-space templates.
@@ -18,6 +20,7 @@
     <doc:reference id="normalize-scape" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: normalize-scape.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -46,88 +49,35 @@
     <!--############################################################################# -->
 
     <xsl:template match="text()">
-		<xsl:call-template name="trim-outer">
-			<xsl:with-param name="string">
-				<xsl:choose>
-					<xsl:when test="ancestor::literal|ancestor::email|ancestor::sgmltag">
-						<xsl:call-template name="scape-verbatim">
-							<xsl:with-param name="string" select="."/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:call-template name="scape">
-							<xsl:with-param name="string" select="."/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:with-param>
-		</xsl:call-template>
+	<xsl:call-template name="scape">
+	    <xsl:with-param name="string" select="."/>
+	</xsl:call-template>
     </xsl:template>
 
     <xsl:template match="text()" mode="xref.text">
-		<xsl:call-template name="trim-outer">
-			<xsl:with-param name="string">
-				<xsl:call-template name="scape">
-					<xsl:with-param name="string" select="."/>
-				</xsl:call-template>
-			</xsl:with-param>
-		</xsl:call-template>
+	<xsl:call-template name="scape">
+	    <xsl:with-param name="string" select="."/>
+	</xsl:call-template>
     </xsl:template>
 
     <xsl:template match="text()" mode="xref-to">
-		<xsl:call-template name="trim-outer">
-			<xsl:with-param name="string">
-				<xsl:call-template name="scape">
-					<xsl:with-param name="string" select="."/>
-				</xsl:call-template>
-			</xsl:with-param>
-		</xsl:call-template>
+	<xsl:call-template name="scape">
+	    <xsl:with-param name="string" select="."/>
+	</xsl:call-template>
     </xsl:template>
 
     <xsl:template match="text()" mode="latex.verbatim">
-		<!--
-		<xsl:call-template name="trim-outer">
-			<xsl:with-param name="string">
-			-->
-				<xsl:value-of select="."/> 
-			<!--
-			</xsl:with-param>
-		</xsl:call-template>
-		-->
+	<xsl:value-of select="."/> 
     </xsl:template>
 
 	<!-- this template is noly used by xref.mod.xsl and only when
 	     $latex.hyphenation.tttricks != 1. -->
     <xsl:template match="text()" mode="slash.hyphen">
-		<xsl:call-template name="trim-outer">
-			<xsl:with-param name="string">
-				<xsl:call-template name="scape.slash.hyphen">
-					<xsl:with-param name="string" select="." />
-				</xsl:call-template>
-			</xsl:with-param>
+		<xsl:call-template name="scape.slash.hyphen">
+			<xsl:with-param name="string" select="." />
 		</xsl:call-template>
 	</xsl:template>
 
-	<xsl:template name="trim-outer">
-		<xsl:param name="string"/>
-		<xsl:variable name="trimleft" select="position()=1"/>
-		<xsl:variable name="trimright" select="position()=last()"/>
-		<xsl:choose>
-			<xsl:when test="$trimleft and not($trimright)">
-				<xsl:value-of select="substring-before(normalize-space(concat($string,'$$')),'$$')"/>
-			</xsl:when>
-			<xsl:when test="$trimright and not($trimleft)">
-				<xsl:value-of select="substring-after(normalize-space(concat('$$',$string)),'$$')"/>
-			</xsl:when>
-			<xsl:when test="$trimleft and $trimright">
-				<xsl:value-of select="normalize-space($string)"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="$string"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<xsl:template name="scape.slash.hyphen">
 	<xsl:param name="string" />
 	<xsl:choose>
@@ -176,12 +126,12 @@
 			    <xsl:with-param name="from">&gt;</xsl:with-param>
 			    <xsl:with-param name="string">
 				<xsl:call-template name="string-replace">
-					<xsl:with-param name="to">\textasciitilde{}</xsl:with-param>
-					<xsl:with-param name="from">~</xsl:with-param>
+				    <xsl:with-param name="to">\{</xsl:with-param>
+				    <xsl:with-param name="from">{</xsl:with-param>
 				    <xsl:with-param name="string">
 					<xsl:call-template name="string-replace">
-						<xsl:with-param name="to">\^{}</xsl:with-param>
-						<xsl:with-param name="from">^</xsl:with-param>
+					    <xsl:with-param name="to">\}</xsl:with-param>
+					    <xsl:with-param name="from">}</xsl:with-param>
 					    <xsl:with-param name="string">
 						<xsl:call-template name="string-replace">
 						    <xsl:with-param name="to">\&amp;</xsl:with-param>
@@ -204,24 +154,19 @@
 										    <xsl:with-param name="from">%</xsl:with-param>
 										    <xsl:with-param name="string">
 											<xsl:call-template name="string-replace">
-												<xsl:with-param name="to">\{</xsl:with-param>
-												<xsl:with-param name="from">{</xsl:with-param>
+												<xsl:with-param name="to">\^</xsl:with-param>
+												<xsl:with-param name="from">^</xsl:with-param>
 												<xsl:with-param name="string">
 												<xsl:call-template name="string-replace">
-													<xsl:with-param name="to">\}</xsl:with-param>
-													<xsl:with-param name="from">}</xsl:with-param>
+													<xsl:with-param name="to">\textasciitilde{}</xsl:with-param>
+													<xsl:with-param name="from">~</xsl:with-param>
 													<xsl:with-param name="string">
 													<xsl:call-template name="string-replace">
-														<xsl:with-param name="to">\textbackslash \ </xsl:with-param>
-														<xsl:with-param name="from">\textbackslash  </xsl:with-param>
-														<xsl:with-param name="string">
-														<xsl:call-template name="string-replace">
-															<xsl:with-param name="to">\textbackslash </xsl:with-param>
-															<xsl:with-param name="from">\</xsl:with-param>
-															<xsl:with-param name="string" select="$string"></xsl:with-param>
-														</xsl:call-template>
-													</xsl:with-param>
-												</xsl:call-template></xsl:with-param>
+														<xsl:with-param name="to">\textbackslash{}</xsl:with-param>
+														<xsl:with-param name="from">\</xsl:with-param>
+														<xsl:with-param name="string" select="$string"></xsl:with-param>
+													</xsl:call-template>
+												</xsl:with-param>
 											</xsl:call-template></xsl:with-param>
 										</xsl:call-template></xsl:with-param>
 								    </xsl:call-template></xsl:with-param>
@@ -235,109 +180,6 @@
 	</xsl:call-template>
     </xsl:template>
 
-	<xsl:template name="scape-verbatim" >
-	<xsl:param name="string"/>
-		<xsl:call-template name="string-replace">
-			<xsl:with-param name="to">\textasciitilde{}</xsl:with-param>
-			<xsl:with-param name="from">~</xsl:with-param>
-			<xsl:with-param name="string">
-			<xsl:call-template name="string-replace">
-				<xsl:with-param name="to">\^{}</xsl:with-param>
-				<xsl:with-param name="from">^</xsl:with-param>
-				<xsl:with-param name="string">
-				<xsl:call-template name="string-replace">
-					<xsl:with-param name="to">\&amp;</xsl:with-param>
-					<xsl:with-param name="from">&amp;</xsl:with-param>
-					<xsl:with-param name="string">
-					<xsl:call-template name="string-replace">
-						<xsl:with-param name="to">\#</xsl:with-param>
-						<xsl:with-param name="from">#</xsl:with-param>
-						<xsl:with-param name="string">
-						<xsl:call-template name="string-replace">
-							<xsl:with-param name="to">\_</xsl:with-param>
-							<xsl:with-param name="from">_</xsl:with-param>
-							<xsl:with-param name="string">
-							<xsl:call-template name="string-replace">
-								<xsl:with-param name="to">\$</xsl:with-param>
-								<xsl:with-param name="from">$</xsl:with-param>
-								<xsl:with-param name="string">
-								<xsl:call-template name="string-replace">
-									<xsl:with-param name="to">\%</xsl:with-param>
-									<xsl:with-param name="from">%</xsl:with-param>
-									<xsl:with-param name="string">
-									<xsl:call-template name="string-replace">
-										<xsl:with-param name="to">\docbooktolatexgobble\string\{</xsl:with-param>
-										<xsl:with-param name="from">{</xsl:with-param>
-										<xsl:with-param name="string">
-										<xsl:call-template name="string-replace">
-											<xsl:with-param name="to">\docbooktolatexgobble\string\}</xsl:with-param>
-											<xsl:with-param name="from">}</xsl:with-param>
-											<xsl:with-param name="string">
-											<xsl:call-template name="string-replace">
-												<xsl:with-param name="to">\docbooktolatexgobble\string\\</xsl:with-param>
-												<xsl:with-param name="from">\</xsl:with-param>
-												<xsl:with-param name="string" select="$string"/>
-											</xsl:call-template>
-										</xsl:with-param>
-									</xsl:call-template></xsl:with-param>
-								</xsl:call-template></xsl:with-param>
-							</xsl:call-template></xsl:with-param>
-						</xsl:call-template></xsl:with-param>
-					</xsl:call-template></xsl:with-param>
-				</xsl:call-template></xsl:with-param>
-			</xsl:call-template></xsl:with-param>
-		</xsl:call-template></xsl:with-param>
-	</xsl:call-template>
-    </xsl:template>
-
-	<xsl:template name="scape-href" >
-	<xsl:param name="string"/>
-	<!-- maybe we should warn when there are invalid characters -->
-	<xsl:call-template name="string-replace">
-		<xsl:with-param name="to">\&amp;</xsl:with-param>
-		<xsl:with-param name="from">&amp;</xsl:with-param>
-		<xsl:with-param name="string">
-			<xsl:call-template name="string-replace">
-				<xsl:with-param name="to">\%</xsl:with-param>
-				<xsl:with-param name="from">%</xsl:with-param>
-				<xsl:with-param name="string">
-					<xsl:call-template name="string-replace">
-						<xsl:with-param name="to">\{</xsl:with-param>
-						<xsl:with-param name="from">{</xsl:with-param>
-						<xsl:with-param name="string">
-							<xsl:call-template name="string-replace">
-								<xsl:with-param name="to">\{</xsl:with-param>
-								<xsl:with-param name="from">{</xsl:with-param>
-								<xsl:with-param name="string">
-									<xsl:call-template name="string-replace">
-										<xsl:with-param name="to">\docbooktolatexgobble\string\\</xsl:with-param>
-										<xsl:with-param name="from">\</xsl:with-param>
-										<xsl:with-param name="string" select="$string"/>
-									</xsl:call-template>
-								</xsl:with-param>
-							</xsl:call-template>
-						</xsl:with-param>
-					</xsl:call-template>
-				</xsl:with-param>
-			</xsl:call-template>
-		</xsl:with-param>
-	</xsl:call-template>
-    </xsl:template>
-
-    <doc:template name="scape-optionalarg" xmlns="">
-	<refpurpose> Escape the ] character in LaTeX optional arguments (experimental)  </refpurpose>
-	<refdescription>
-	</refdescription>
-    </doc:template>
-	<xsl:template name="scape-optionalarg" >
-	<xsl:param name="string"/>
-	<xsl:call-template name="string-replace">
-		<xsl:with-param name="to">{\rbrack}</xsl:with-param>
-		<xsl:with-param name="from">]</xsl:with-param>
-		<xsl:with-param name="string" select="$string"/>
-	</xsl:call-template>
-    </xsl:template>
-
 
 
 
diff --git a/docs/docbook/xslt/db2latex/para.mod.xsl b/docs/docbook/xslt/db2latex/para.mod.xsl
index 9f39916bda..8a02fa5eb3 100644
--- a/docs/docbook/xslt/db2latex/para.mod.xsl
+++ b/docs/docbook/xslt/db2latex/para.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: para.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -15,6 +17,7 @@
     <doc:reference id="para" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: para.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -67,5 +70,7 @@
     <xsl:template match="step/para"> <xsl:apply-templates/> </xsl:template>
     <xsl:template match="entry/para"> <xsl:apply-templates/> </xsl:template>
     <xsl:template match="question/para"> <xsl:apply-templates/> </xsl:template>
+    <xsl:template match="answer/para"> <xsl:apply-templates/> </xsl:template>
+
 
 </xsl:stylesheet>
diff --git a/docs/docbook/xslt/db2latex/part-chap-app.mod.xsl b/docs/docbook/xslt/db2latex/part-chap-app.mod.xsl
index 38c15e9331..a0994226b9 100644
--- a/docs/docbook/xslt/db2latex/part-chap-app.mod.xsl
+++ b/docs/docbook/xslt/db2latex/part-chap-app.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: part-chap-app.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE: Part
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="part-chap-app" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: part-chap-app.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -53,7 +56,9 @@
 
 
     <!--############################################################################# 
+    |	$Id: part-chap-app.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE: Chapter
     + ############################################################################## -->
@@ -98,7 +103,9 @@
 
 
     <!--############################################################################# 
+    |	$Id: part-chap-app.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE:
     + ############################################################################## -->
diff --git a/docs/docbook/xslt/db2latex/pi.mod.xsl b/docs/docbook/xslt/db2latex/pi.mod.xsl
index a4409583c8..4ebf58b786 100644
--- a/docs/docbook/xslt/db2latex/pi.mod.xsl
+++ b/docs/docbook/xslt/db2latex/pi.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: pi.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -18,6 +20,7 @@
     <doc:reference id="abstract" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: pi.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/preamble.mod.xsl b/docs/docbook/xslt/db2latex/preamble.mod.xsl
index ec9e5a8afc..140f929471 100644
--- a/docs/docbook/xslt/db2latex/preamble.mod.xsl
+++ b/docs/docbook/xslt/db2latex/preamble.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: preamble.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
 |- #############################################################################
+|	$Author: jelmer $
 |
 |   PURPOSE: Variables and templates to manage LaTeX preamble. 
 + ############################################################################## -->
@@ -13,6 +15,7 @@
     <doc:reference id="preamble" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: preamble.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -79,12 +82,10 @@
 		<xsl:value-of select="$latex.article.preamble.pre"/>
 		<xsl:call-template name="label.id"/>
 		<xsl:call-template name="generate.latex.common.preamble"/>
-		<xsl:call-template name="generate.latex.essential.preamble"/>
 		<xsl:value-of select="$latex.article.preamble.post"/>
 	    </xsl:when>
 	    <xsl:otherwise>
 		<xsl:value-of select="$latex.override"/>
-		<xsl:call-template name="generate.latex.essential.preamble"/>
 	    </xsl:otherwise>
 	</xsl:choose>
     </xsl:template>
@@ -115,12 +116,10 @@
 		<xsl:value-of select="$latex.book.preamble.pre"/>
 		<xsl:call-template name="label.id"/>
 		<xsl:call-template name="generate.latex.common.preamble"/>
-		<xsl:call-template name="generate.latex.essential.preamble"/>
 		<xsl:value-of select="$latex.book.preamble.post"/>
 	    </xsl:when>
 	    <xsl:otherwise>
 		<xsl:value-of select="$latex.override"/>
-		<xsl:call-template name="generate.latex.essential.preamble"/>
 	    </xsl:otherwise>
 	</xsl:choose>
     </xsl:template>
@@ -293,7 +292,6 @@
 	<xsl:text>\usepackage{latexsym}         &#10;</xsl:text>
 	<xsl:text>\usepackage{enumerate}         &#10;</xsl:text>
 	<xsl:if test="$latex.use.fancybox=1">
-		<!-- must be before \usepackage{fancyvrb} -->
 		<xsl:text>\usepackage{fancybox}      &#10;</xsl:text>
 	</xsl:if>
 	<xsl:text>\usepackage{float}       &#10;</xsl:text>
@@ -302,7 +300,6 @@
 		<xsl:text>\usepackage[</xsl:text><xsl:value-of select="$latex.babel.language" /><xsl:text>]{babel} &#10;</xsl:text>
 	</xsl:if>
 	<xsl:if test="$latex.use.fancyvrb=1">
-		<!-- must be after \usepackage{fancybox} -->
 		<xsl:text>\usepackage{fancyvrb}         &#10;</xsl:text>
 		<xsl:text>\makeatletter\@namedef{FV@fontfamily@default}{\def\FV@FontScanPrep{}\def\FV@FontFamily{}}\makeatother&#10;</xsl:text>
 		<xsl:if test="$latex.fancyvrb.tabsize!=''">
@@ -345,12 +342,46 @@
 	<xsl:text> \normalsize\rmfamily}&#10;</xsl:text>
 
 	<xsl:if test="$latex.math.support=1"><xsl:value-of select="$latex.math.preamble"/></xsl:if>
-	<xsl:if test="$latex.use.hyperref=1">
-		<xsl:call-template name="latex.hyperref.preamble"/>
-	</xsl:if>
+	<xsl:choose>
+		<xsl:when test="$latex.use.hyperref=1">
+			<xsl:call-template name="latex.hyperref.preamble"/>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:text>\newcommand{\href}[1]{{}}&#10;</xsl:text>
+			<xsl:text>\newcommand{\hyperlink}[1]{{}}&#10;</xsl:text>
+			<xsl:text>\newcommand{\hypertarget}[2]{#2}&#10;</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
 	<xsl:value-of select="$latex.admonition.environment"/>
 	<xsl:call-template name="latex.float.preamble"/>
 	<xsl:call-template name="latex.graphicext"/>
+	<xsl:text>% --------------------------------------------&#10;</xsl:text>
+	<xsl:text>% A way to honour &lt;footnoteref&gt;s&#10;</xsl:text>
+	<xsl:text>% Blame j-devenish (at) users.sourceforge.net&#10;</xsl:text>
+	<xsl:text><![CDATA[% In any other LaTeX context, this would probably go into a style file.
+\makeatletter
+\newcommand{\docbooktolatexusefootnoteref}[1]{\@ifundefined{@fn@label@#1}%
+  {\hbox{\@textsuperscript{\normalfont ?}}%
+    \@latex@warning{Footnote label `#1' was not defined}}%
+  {\@nameuse{@fn@label@#1}}}
+\newcommand{\docbooktolatexmakefootnoteref}[1]{%
+  \protected@write\@auxout{}%
+    {\global\string\@namedef{@fn@label@#1}{\@makefnmark}}%
+  \@namedef{@fn@label@#1}{\hbox{\@textsuperscript{\normalfont ?}}}%
+  }
+\makeatother]]></xsl:text>
+	<xsl:text>% --------------------------------------------&#10;</xsl:text>
+	<xsl:text>% Hacks for honouring row/entry/@align&#10;</xsl:text>
+	<xsl:text>% (\hspace not effective when in paragraph mode)&#10;</xsl:text>
+	<xsl:text>% Naming convention for these macros is:&#10;</xsl:text>
+	<xsl:text>% 'docbooktolatex' 'align' {alignment-type} {position-within-entry}&#10;</xsl:text>
+	<xsl:text>% where r = right, l = left, c = centre&#10;</xsl:text>
+	<xsl:text>\newcommand{\docbooktolatexalignrl}{\protect\ifvmode\raggedleft\else\hfill\fi}&#10;</xsl:text>
+	<xsl:text>\newcommand{\docbooktolatexalignrr}{\protect}&#10;</xsl:text>
+	<xsl:text>\newcommand{\docbooktolatexalignll}{\protect\ifvmode\raggedright\else\fi}&#10;</xsl:text>
+	<xsl:text>\newcommand{\docbooktolatexalignlr}{\protect\ifvmode\else\hspace*\fill\fi}&#10;</xsl:text>
+	<xsl:text>\newcommand{\docbooktolatexaligncl}{\protect\ifvmode\centering\else\hfill\fi}&#10;</xsl:text>
+	<xsl:text>\newcommand{\docbooktolatexaligncr}{\protect\ifvmode\else\hspace*\fill\fi}&#10;</xsl:text>
 	<xsl:choose>
 		<xsl:when test='$latex.caption.swapskip=1'>
 			<xsl:text>% --------------------------------------------&#10;</xsl:text>
@@ -373,99 +404,6 @@
 	</xsl:if>
     </xsl:template>
 
-    <doc:variable name="generate.latex.essential.preamble" xmlns="">
-	<refpurpose> Unavoidable LaTeX preamble shared by articles and books </refpurpose>
-	<refdescription>
-	    <para>Contains custom commands <emphasis>that you just can't get rid of!</emphasis></para>
-	</refdescription>
-    </doc:variable>
-	<xsl:template name="generate.latex.essential.preamble">
-	<xsl:text>% --------------------------------------------&#10;</xsl:text>
-	<xsl:text>\makeatletter&#10;</xsl:text>
-	<xsl:if test="$latex.use.hyperref!='1'">
-		<xsl:text>\newcommand{\href}[1]{{}}&#10;</xsl:text>
-		<xsl:text>\newcommand{\hyperlink}[1]{{}}&#10;</xsl:text>
-		<xsl:text>\newcommand{\hypertarget}[2]{#2}&#10;</xsl:text>
-	</xsl:if>
-	<xsl:if test="$latex.use.ucs='1'">
-		<xsl:text>\usepackage[</xsl:text>
-		<xsl:value-of select="$latex.ucs.options"/>
-		<xsl:text>]{ucs}&#10;</xsl:text>
-	</xsl:if>
-	<xsl:if test="$latex.entities='catcode'">
-		<xsl:text>\catcode`\&amp;=\active\def&amp;{\@ifnextchar##{\@docbooktolatexunicode\@gobble}{\&amp;}}&#10;</xsl:text>
-		<xsl:if test="$latex.use.ucs!='1'">
-			<xsl:text><![CDATA[
-% A few example Unicode characters.
-% For full support, use the unicode pacakge from Dominique Unruh/CTAN.
-\newcommand{\unichar}[1]{%
-	\ifnum#1=8212---%
-	\else\&\##1;\fi%
-}
-]]></xsl:text>
-		</xsl:if>
-		<xsl:text>\def\@docbooktolatexunicode#1;{\edef\@dbtemp{#1}\unichar{\@dbtemp}}&#10;</xsl:text>
-	</xsl:if>
-	<xsl:if test="$latex.entities='unicode'">
-      <xsl:text>\usepackage[utf8]{inputenc}&#10;</xsl:text>
-	</xsl:if>
-	<xsl:text><![CDATA[
-\def\docbooktolatexgobble{\expandafter\@gobble}
-% Facilitate use of \cite with \label
-\newcommand{\docbooktolatexbibaux}[2]{%
-  \protected@write\@auxout{}{\string\global\string\@namedef{docbooktolatexcite@#1}{#2}}
-}
-\newcommand{\docbooktolatexcite}[2]{%
-  \@ifundefined{docbooktolatexcite@#1}%
-  {\cite{#1}}%
-  {\def\@docbooktolatextemp{#2}\ifx\@docbooktolatextemp\@empty%
-   \cite{\@nameuse{docbooktolatexcite@#1}}%
-   \else\cite[#2]{\@nameuse{docbooktolatexcite@#1}}%
-   \fi%
-  }%
-}
-\newcommand{\docbooktolatexbackcite}[1]{%
-  \ifx\Hy@backout\@undefined\else%
-    \@ifundefined{docbooktolatexcite@#1}{%
-      % emit warning?
-    }{%
-      \ifBR@verbose%
-        \PackageInfo{backref}{back cite \string`#1\string' as \string`\@nameuse{docbooktolatexcite@#1}\string'}%
-      \fi%
-      \Hy@backout{\@nameuse{docbooktolatexcite@#1}}%
-    }%
-  \fi%
-}
-% --------------------------------------------
-% A way to honour <footnoteref>s
-% Blame j-devenish (at) users.sourceforge.net
-% In any other LaTeX context, this would probably go into a style file.
-\newcommand{\docbooktolatexusefootnoteref}[1]{\@ifundefined{@fn@label@#1}%
-  {\hbox{\@textsuperscript{\normalfont ?}}%
-    \@latex@warning{Footnote label `#1' was not defined}}%
-  {\@nameuse{@fn@label@#1}}}
-\newcommand{\docbooktolatexmakefootnoteref}[1]{%
-  \protected@write\@auxout{}%
-    {\global\string\@namedef{@fn@label@#1}{\@makefnmark}}%
-  \@namedef{@fn@label@#1}{\hbox{\@textsuperscript{\normalfont ?}}}%
-  }
-% --------------------------------------------
-% Hacks for honouring row/entry/@align
-% (\hspace not effective when in paragraph mode)
-% Naming convention for these macros is:
-% 'docbooktolatex' 'align' {alignment-type} {position-within-entry}
-% where r = right, l = left, c = centre
-\newcommand{\docbooktolatexalignrl}{\protect\ifvmode\raggedleft\else\hfill\fi}
-\newcommand{\docbooktolatexalignrr}{\protect}
-\newcommand{\docbooktolatexalignll}{\protect\ifvmode\raggedright\else\fi}
-\newcommand{\docbooktolatexalignlr}{\protect\ifvmode\else\hspace*\fill\fi}
-\newcommand{\docbooktolatexaligncl}{\protect\ifvmode\centering\else\hfill\fi}
-\newcommand{\docbooktolatexaligncr}{\protect\ifvmode\else\hspace*\fill\fi}
-\ifx\captionswapskip\@undefined\newcommand{\captionswapskip}{}\fi
-\makeatother
-]]></xsl:text>
-	</xsl:template>
-
 
 
     <!--#############################################################################
@@ -796,15 +734,25 @@ Otherwise, declares .pdf, .png, .jpg if using pdflatex and .eps if using latex.
 </xsl:choose>
 </xsl:template>
 
-	<xsl:template name="generate.latex.cell.separator">
+    <doc:template name="generate.latex.pagestyle" xmlns="">
+	<refpurpose> Choose the preferred page style for document body </refpurpose>
+	<refdescription>
+		<formalpara><title>Pertinent Variables</title>
+		<itemizedlist>
+			<listitem><simpara><xref linkend="param.pagestyle"/></simpara></listitem>
+			<listitem><simpara><xref linkend="param.use.fancyhdr"/></simpara></listitem>
+		</itemizedlist>
+		</formalpara>
+	</refdescription>
+    </doc:template>
+	<xsl:template name="generate.latex.pagestyle">
+		<xsl:text>\pagestyle{</xsl:text>
 		<xsl:choose>
-			<xsl:when test="$latex.entities='catcode'">
-				<xsl:text> \catcode`\&amp;=4 &amp;\catcode`\&amp;=\active </xsl:text>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:text> &amp; </xsl:text>
-			</xsl:otherwise>
+			<xsl:when test="$latex.pagestyle!=''"><xsl:value-of select="$latex.pagestyle"/></xsl:when>
+			<xsl:when test="$latex.use.fancyhdr=1"><xsl:text>fancy</xsl:text></xsl:when>
+			<xsl:otherwise><xsl:text>plain</xsl:text></xsl:otherwise>
 		</xsl:choose>
+		<xsl:text>}</xsl:text>
 	</xsl:template>
 </xsl:stylesheet>
 
diff --git a/docs/docbook/xslt/db2latex/procedure.mod.xsl b/docs/docbook/xslt/db2latex/procedure.mod.xsl
index c53cf39c68..e151f7c85c 100644
--- a/docs/docbook/xslt/db2latex/procedure.mod.xsl
+++ b/docs/docbook/xslt/db2latex/procedure.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: procedure.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="procedure" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: procedure.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -41,7 +44,7 @@
 
 
 <!--############################################################################# -->
-<doc:template match="procedure" xmlns="">
+<doc:template match="step" xmlns="">
 <refpurpose>Procedure XSL Template.</refpurpose>
 <refdescription>
 <para></para>
@@ -78,7 +81,7 @@
 </xsl:template>
 
 <xsl:template match="procedure/title" mode="procedure.title">
-	<xsl:text>&#10;&#10;{</xsl:text>
+	<xsl:text>{</xsl:text>
 	<xsl:value-of select="$latex.procedure.title.style"/>
 	<xsl:text>{</xsl:text>
 	<xsl:choose>
@@ -109,24 +112,20 @@
     <xsl:template match="step">
 	<xsl:choose>
 	    <xsl:when test="title">
-			<xsl:text>&#10;\item{{</xsl:text>
-			<xsl:value-of select="$latex.step.title.style"/> <!-- by default \sc -->
-			<xsl:text>{</xsl:text>
-			<xsl:apply-templates select="title"/>
-			<xsl:text>}}&#10;</xsl:text>
+		<xsl:text>\item{{</xsl:text>
+		<xsl:value-of select="$latex.step.title.style"/>
+		<xsl:text>{</xsl:text>
+		<xsl:apply-templates select="title"/><xsl:text>} &#10;</xsl:text>
 	    </xsl:when>
 	    <xsl:otherwise>
-			<xsl:text>&#10;\item{</xsl:text>
+		<xsl:text>\item{{</xsl:text>
 	    </xsl:otherwise>
 	</xsl:choose>
-	 <xsl:apply-templates select="*[not(self::title)]"/>
-	<xsl:text>}&#10;</xsl:text>
+	<xsl:apply-templates/>
+	<xsl:text>}}&#10;</xsl:text>
     </xsl:template>
-
-<!-- step/title, just apply templates ########################################### -->
-    <xsl:template match="step/title"> 
-		<xsl:apply-templates/>
-	</xsl:template>
+<!-- Empty step/title ########################################################## -->
+    <xsl:template match="step/title"> </xsl:template>
 
 
 
diff --git a/docs/docbook/xslt/db2latex/qandaset.mod.xsl b/docs/docbook/xslt/db2latex/qandaset.mod.xsl
index c93d56e6b3..b4cdc80b69 100644
--- a/docs/docbook/xslt/db2latex/qandaset.mod.xsl
+++ b/docs/docbook/xslt/db2latex/qandaset.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <!--############################################################################# 
+|	$Id: qandaset.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 |   Portions (c) Norman Walsh, official DocBook XSL stylesheets.
@@ -17,6 +19,7 @@
 <!-- DOCUMENTATION                                                                -->
   <doc:reference xmlns="" id="qandaset">
     <referenceinfo>
+      <releaseinfo role="meta"> $Id: qandaset.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $ </releaseinfo>
 	<authorgroup>
       	<author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
       	<author> <firstname>James</firstname> <surname>Devenish</surname> </author>
@@ -125,8 +128,6 @@
 		<xsl:text>% -----------&#10;</xsl:text>
 		<xsl:text>% QandADiv   &#10;</xsl:text>
 		<xsl:text>% -----------&#10;</xsl:text>
-		<xsl:text>\noindent\begin{minipage}{\linewidth}&#10;</xsl:text>
-		<xsl:text>\vspace{0.25em}\hrule\vspace{0.25em}&#10;</xsl:text>
 		<xsl:choose>
       		<xsl:when test="ancestor::sect2">
 	    		<xsl:text>\paragraph*{</xsl:text>
@@ -149,11 +150,9 @@
 				<xsl:text>F.A.Q. Part</xsl:text>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:text>}</xsl:text>
+		<xsl:text>}&#10;</xsl:text>
 		<xsl:call-template name="label.id"/>
 		<xsl:text>&#10;</xsl:text>
-		<xsl:text>\hrule\vspace{0.25em}&#10;</xsl:text>
-		<xsl:text>\end{minipage}&#10;</xsl:text>
 
 <!--
   <xsl:variable name="toc.params">
@@ -176,7 +175,18 @@
 -->
 
 <!-- pseudo table of contents -->
-	<!--
+	<xsl:text>\floatstyle{ruled}&#10;</xsl:text>
+	<xsl:text>\newfloat{qandadivtoc}{H}{qdtoc}&#10;</xsl:text>
+	<!-- Either this one : -->
+	<xsl:text>\floatname{qandadivtoc}{</xsl:text>
+	<xsl:call-template name="gentext">
+		<xsl:with-param name="key">TableofContents</xsl:with-param>
+	</xsl:call-template>
+	<xsl:text>}&#10;</xsl:text>
+	<!-- or this one : 
+	<xsl:text>\floatname{qandadivtoc}{}&#10;</xsl:text>
+	-->
+	<xsl:text>\begin{qandadivtoc}&#10;</xsl:text>
 	<xsl:choose>
 		<xsl:when test="title">
 			<xsl:text>\caption{</xsl:text>
@@ -189,28 +199,23 @@
 			<xsl:text>}&#10;</xsl:text>
 		</xsl:otherwise>
 	</xsl:choose>
-	-->
 	<xsl:for-each select="qandaentry">
-	<xsl:text>\noindent{}</xsl:text>
+	<xsl:text>\noindent</xsl:text>
 	<xsl:value-of select="position()"/>
 	<xsl:text>.~</xsl:text>
 	<xsl:apply-templates select="question"/>
-	<xsl:if test="position()!=last()"><xsl:text>\newline&#10;</xsl:text></xsl:if>
 	</xsl:for-each>
-	<xsl:text>\vspace{0.25em}\hrule&#10;</xsl:text>
+	<xsl:text>\end{qandadivtoc}&#10;</xsl:text>
+	<xsl:text>\vspace{0.25cm}&#10;</xsl:text>
 
 	<xsl:for-each select="qandaentry">
-	<xsl:text>\vspace{1em}&#10;</xsl:text>
-	<xsl:text>\noindent{}</xsl:text>
+	<xsl:text>\noindent</xsl:text>
 	<xsl:value-of select="position()"/>
 	<xsl:text>.~</xsl:text>
-	<xsl:apply-templates select="question"/>
-	<xsl:text>\newline&#10;</xsl:text>
-	<xsl:apply-templates select="answer"/>
+	<xsl:apply-templates select="question|answer"/>
 	</xsl:for-each>
 <!--  <xsl:apply-templates select="qandadiv|qandaentry"/> -->
 <!--  <xsl:apply-templates/> -->
-	<xsl:text>\vspace{1em}&#10;</xsl:text>
 </xsl:template>
 
 
@@ -263,9 +268,9 @@
 	</xsl:otherwise>
 </xsl:choose>
 -->
-<xsl:text>\textbf{Q:}~\textit{</xsl:text>
+<xsl:text>{\textbf {Q : }}{\em </xsl:text>
 <xsl:apply-templates/>
-<xsl:text>}&#10;</xsl:text>
+<xsl:text>} \newline&#10;</xsl:text>
 </xsl:template>
 
 
@@ -282,8 +287,10 @@
 +   ############################################################################# -->
 
 <xsl:template match="answer">
-<xsl:text>\noindent\textbf{A:}~</xsl:text>
+<xsl:text>\noindent{\textbf{A :}}</xsl:text>
 <xsl:apply-templates/>
+<xsl:text>\newline&#10;</xsl:text>
+<xsl:text>\vspace{0.25cm}&#10;</xsl:text>
 <xsl:text>&#10;&#10;</xsl:text>
 </xsl:template>
 
diff --git a/docs/docbook/xslt/db2latex/refentry.mod.xsl b/docs/docbook/xslt/db2latex/refentry.mod.xsl
index 52d2b297d5..b8e1251513 100644
--- a/docs/docbook/xslt/db2latex/refentry.mod.xsl
+++ b/docs/docbook/xslt/db2latex/refentry.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: refentry.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="refentry" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: refentry.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authogroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/revision.mod.xsl b/docs/docbook/xslt/db2latex/revision.mod.xsl
index a041aed5c3..40a7400a5a 100644
--- a/docs/docbook/xslt/db2latex/revision.mod.xsl
+++ b/docs/docbook/xslt/db2latex/revision.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: revision.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="revision" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: revision.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -88,7 +91,7 @@
 	<xsl:variable name="revnumber" select=".//revnumber"/>
 	<xsl:variable name="revdate"   select=".//date"/>
 	<xsl:variable name="revauthor" select=".//authorinitials"/>
-	<xsl:variable name="revremark" select=".//revremark|.//revdescription"/>
+	<xsl:variable name="revremark" select=".//revremark|../revdescription"/>
 	<!-- Row starts here -->
 	<xsl:if test="$revnumber">
 	    <xsl:call-template name="gentext.element.name"/>
@@ -112,7 +115,7 @@
 	<xsl:text> \\ \hline&#10;</xsl:text>
 	<!-- Add Remark Row if exists-->
 	<xsl:if test="$revremark"> 
-	    <xsl:text>\multicolumn{3}{|l|}{</xsl:text>
+	    <xsl:text>\multicolumn{3}{l}{</xsl:text>
 	    <xsl:apply-templates select="$revremark"/> 
 	    <!-- End Row here -->
 	    <xsl:text>} \\ \hline&#10;</xsl:text>
diff --git a/docs/docbook/xslt/db2latex/sections.mod.xsl b/docs/docbook/xslt/db2latex/sections.mod.xsl
index 2e74ce3890..db2bd5c6f9 100644
--- a/docs/docbook/xslt/db2latex/sections.mod.xsl
+++ b/docs/docbook/xslt/db2latex/sections.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: sections.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $												
 |														
 |   PURPOSE: sections.
 |   PENDING:
@@ -20,6 +22,7 @@
     <doc:reference id="sections" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: sections.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authogroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/set.mod.xsl b/docs/docbook/xslt/db2latex/set.mod.xsl
index 8f87fb1071..6729bf4aef 100644
--- a/docs/docbook/xslt/db2latex/set.mod.xsl
+++ b/docs/docbook/xslt/db2latex/set.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: set.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="set" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: set.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
diff --git a/docs/docbook/xslt/db2latex/sgmltag.mod.xsl b/docs/docbook/xslt/db2latex/sgmltag.mod.xsl
index 893a2b6d4d..9af9878497 100644
--- a/docs/docbook/xslt/db2latex/sgmltag.mod.xsl
+++ b/docs/docbook/xslt/db2latex/sgmltag.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: sgmltag.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -17,6 +19,7 @@
     <doc:reference id="sgmltag" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: sgmltag.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authogroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -66,9 +69,9 @@
 	    <xsl:when test="$class='endtag'">
 		<xsl:call-template name="inline.monoseq">
 		    <xsl:with-param name="content">
-			<xsl:text>&lt;/</xsl:text>
+			<xsl:text>\textless{}/</xsl:text>
 			<xsl:apply-templates/>
-			<xsl:text>&gt;</xsl:text>
+			<xsl:text>\textgreater{}</xsl:text>
 		    </xsl:with-param>
 		</xsl:call-template>
 	    </xsl:when>
@@ -102,45 +105,45 @@
 	    <xsl:when test="$class='pi'">
 		<xsl:call-template name="inline.monoseq">
 		    <xsl:with-param name="content">
-			<xsl:text>&lt;?</xsl:text>
+			<xsl:text>\textless{}?</xsl:text>
 			<xsl:apply-templates/>
-			<xsl:text>?&gt;</xsl:text>
+			<xsl:text>?\textgreater{}</xsl:text>
 		    </xsl:with-param>
 		</xsl:call-template>
 	    </xsl:when>
 	    <xsl:when test="$class='xmlpi'">
 		<xsl:call-template name="inline.monoseq">
 		    <xsl:with-param name="content">
-			<xsl:text>&lt;?</xsl:text>
+			<xsl:text>\textless{}?</xsl:text>
 			<xsl:apply-templates/>
-			<xsl:text>?&gt;</xsl:text>
+			<xsl:text>?\textgreater{}</xsl:text>
 		    </xsl:with-param>
 		</xsl:call-template>
 	    </xsl:when>
 	    <xsl:when test="$class='starttag'">
 		<xsl:call-template name="inline.monoseq">
 		    <xsl:with-param name="content">
-			<xsl:text>&lt;</xsl:text>
+			<xsl:text>\textless{}</xsl:text>
 			<xsl:apply-templates/>
-			<xsl:text>&gt;</xsl:text>
+			<xsl:text>\textgreater{}</xsl:text>
 		    </xsl:with-param>
 		</xsl:call-template>
 	    </xsl:when>
 	    <xsl:when test="$class='emptytag'">
 		<xsl:call-template name="inline.monoseq">
 		    <xsl:with-param name="content">
-			<xsl:text>&lt;</xsl:text>
+			<xsl:text>\textless{}</xsl:text>
 			<xsl:apply-templates/>
-			<xsl:text>/&gt;</xsl:text>
+			<xsl:text>/\textgreater{}</xsl:text>
 		    </xsl:with-param>
 		</xsl:call-template>
 	    </xsl:when>
 	    <xsl:when test="$class='sgmlcomment'">
 		<xsl:call-template name="inline.monoseq">
 		    <xsl:with-param name="content">
-			<xsl:text>&lt;!--</xsl:text>
+			<xsl:text>$&lt;$!$--$</xsl:text>
 			<xsl:apply-templates/>
-			<xsl:text>--&gt;</xsl:text>
+			<xsl:text>$--&gt;$</xsl:text>
 		    </xsl:with-param>
 		</xsl:call-template>
 	    </xsl:when>
diff --git a/docs/docbook/xslt/db2latex/synop-oop.mod.xsl b/docs/docbook/xslt/db2latex/synop-oop.mod.xsl
index 93b29c1229..936ba78115 100644
--- a/docs/docbook/xslt/db2latex/synop-oop.mod.xsl
+++ b/docs/docbook/xslt/db2latex/synop-oop.mod.xsl
@@ -2,7 +2,9 @@
 <!DOCTYPE xsl:stylesheet [ <!ENTITY RE "&#10;"> ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
     <!--############################################################################# 
+    |	$Id: synop-oop.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
     |- #############################################################################
+    |	$Author: jelmer $
     |														
     |   PURPOSE:
     + ############################################################################## -->
diff --git a/docs/docbook/xslt/db2latex/synop-struct.mod.xsl b/docs/docbook/xslt/db2latex/synop-struct.mod.xsl
index 1ffe2fc463..52516118bd 100644
--- a/docs/docbook/xslt/db2latex/synop-struct.mod.xsl
+++ b/docs/docbook/xslt/db2latex/synop-struct.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: synop-struct.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
diff --git a/docs/docbook/xslt/db2latex/table.mod.xsl b/docs/docbook/xslt/db2latex/table.mod.xsl
index 0edb4ad2cc..f1ef85b85c 100644
--- a/docs/docbook/xslt/db2latex/table.mod.xsl
+++ b/docs/docbook/xslt/db2latex/table.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: table.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="table" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: table.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 		<firstname>Ramon</firstname> <surname>Casellas</surname>
@@ -98,22 +101,7 @@
 	    <xsl:when test="$i > $cols"></xsl:when>
 	    <!-- There are still columns to count -->
 	    <xsl:otherwise>
-		<xsl:variable name="width">
-			<xsl:variable name="userchoice" select="colspec[@colnum=$i]/@colwidth"/>
-			<xsl:variable name="cells" select="thead/row/entry[$i]|tbody/row/entry[$i]"/>
-			<xsl:choose>
-				<xsl:when test="string-length($userchoice)=0 and count($cells//itemizedlist|$cells//orderedlist|$cells//variablelist)&gt;0">
-					<!-- In these specific circumstances, we MUST use a line-wrapped column
-					     and yet the user hasn't specified one. -->
-					<xsl:value-of select="'1*'"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- In the general case, we just do what the user wants (may even
-					     have no pre-specified width). -->
-					<xsl:value-of select="$userchoice"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
+		<xsl:variable name="width" select="colspec[@colnum=$i]/@colwidth"/>
 		<!-- Try to take heed of colspecs -->
 		<xsl:choose>
 			<xsl:when test="$width!=''">
@@ -226,56 +214,25 @@
 	     the hsizes for each column are (1/(1+3)*2) and (3/(1+3)*2).
 		 The ratio of these to the star values (star values being 1 and 3)
 		 is 2/(1+3).
-		 BUT it is now very complicated because it takes into account columns
-		 where the user has not specified a width but LaTeX requires a
-		 fixed-width column (i.e. specialcols may vary).
-		 Relies on there being (a) colspecs for every column or (b) no
-		 colspecs.
 	 -->
 	<xsl:template name="generate.starfactor">
 		<xsl:param name="i" select="1"/>
-		<xsl:param name="cols" select="count(colspec)"/>
 		<xsl:param name="sum" select="0"/>
-		<xsl:param name="specialcols" select="count(colspec[contains(@colwidth,'*')])"/>
+		<xsl:param name="nodes" select="colspec[contains(@colwidth,'*')]"/>
 		<xsl:choose>
-			<xsl:when test="$i&lt;=$cols and colspec[position()=$i and contains(@colwidth,'*')]">
-				<!-- a * column -->
+			<xsl:when test="$i&lt;=count($nodes)">
 				<xsl:call-template name="generate.starfactor">
 					<xsl:with-param name="i" select="$i+1"/>
-					<xsl:with-param name="cols" select="$cols"/>
-					<xsl:with-param name="sum" select="$sum+substring-before(colspec[$i]/@colwidth,'*')"/>
-					<xsl:with-param name="specialcols" select="$specialcols"/>
+					<xsl:with-param name="sum" select="$sum+substring-before($nodes[$i]/@colwidth,'*')"/>
+					<xsl:with-param name="nodes" select="$nodes"/>
 				</xsl:call-template>
 			</xsl:when>
-			<xsl:when test="$i&lt;=$cols">
-				<!-- not a * column, but we are going to pretend that it is -->
-				<xsl:variable name="cells" select="thead/row/entry[$i]|tbody/row/entry[$i]"/>
-				<xsl:variable name="problems" select="count($cells//itemizedlist|$cells//orderedlist|$cells//variablelist)"/>
-				<xsl:choose>
-					<xsl:when test="$problems &gt; 0">
-						<xsl:call-template name="generate.starfactor">
-							<xsl:with-param name="i" select="$i+1"/>
-							<xsl:with-param name="cols" select="$cols"/>
-							<xsl:with-param name="sum" select="$sum+1"/>
-							<xsl:with-param name="specialcols" select="$specialcols+1"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:call-template name="generate.starfactor">
-							<xsl:with-param name="i" select="$i+1"/>
-							<xsl:with-param name="cols" select="$cols"/>
-							<xsl:with-param name="sum" select="$sum"/>
-							<xsl:with-param name="specialcols" select="$specialcols"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="$specialcols div $sum"/>
+				<xsl:value-of select="count($nodes) div $sum"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
-	
+
 
     <xsl:template match="tgroup">
 	<xsl:variable name="align" select="@align"/>
@@ -290,10 +247,6 @@
 	<xsl:variable name="colspecs" select="./colspec"/>
 	<xsl:variable name="usex">
 		<xsl:choose>
-			<!-- if there are lists within cells, we need tabularx -->
-			<xsl:when test="$latex.use.tabularx=1 and (descendant::itemizedlist|descendant::orderedlist|descendant::variablelist)">
-				<xsl:text>1</xsl:text>
-			</xsl:when>
 			<!-- if there are instances of 1*-style colwidths, we need tabularx -->
 			<xsl:when test="$latex.use.tabularx=1 and contains(colspec/@colwidth,'*')">
 				<xsl:text>1</xsl:text>
@@ -315,7 +268,7 @@
 	</xsl:variable>
 	<xsl:choose>
 		<xsl:when test="$usex='1'">
-			<xsl:text>\begin{tabularx}{\linewidth}{</xsl:text>
+			<xsl:text>\begin{tabularx}{\columnwidth}{</xsl:text>
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:if test="$useminipage='1'"><xsl:text>\begin{minipage}{\linewidth}&#10;</xsl:text></xsl:if>
@@ -329,11 +282,7 @@
 		<xsl:when test="$usex=1">
 			<xsl:call-template name="table.format.tabularx">
 				<xsl:with-param name="cols" select="@cols"/>
-				<xsl:with-param name="starfactor">
-					<xsl:call-template name="generate.starfactor">
-						<xsl:with-param name="cols" select="@cols"/>
-					</xsl:call-template>
-				</xsl:with-param>
+				<xsl:with-param name="starfactor"><xsl:call-template name="generate.starfactor"/></xsl:with-param>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:otherwise>
@@ -410,7 +359,7 @@
 	<xsl:call-template name="latex.entry.postalign"/>
 	<xsl:choose>
 		<xsl:when test="position()=last()"><xsl:text> \tabularnewline&#10;</xsl:text></xsl:when>
-		<xsl:otherwise><xsl:call-template name="generate.latex.cell.separator"/></xsl:otherwise>
+		<xsl:otherwise><xsl:text> &amp; </xsl:text></xsl:otherwise>
 	</xsl:choose> 
     </xsl:template>
 
@@ -442,69 +391,32 @@
 	<xsl:call-template name="latex.entry.postalign"/>
 	<xsl:choose>
 		<xsl:when test="position()=last()"><xsl:text> \tabularnewline&#10;</xsl:text></xsl:when>
-		<xsl:otherwise><xsl:call-template name="generate.latex.cell.separator"/></xsl:otherwise>
+		<xsl:otherwise><xsl:text> &amp; </xsl:text></xsl:otherwise>
 	</xsl:choose> 
     </xsl:template>
 
 
 	<xsl:template name="latex.entry.prealign">
-	<xsl:variable name="span">
-		<xsl:choose>
-			<xsl:when test="@spanname!=''">
-				<xsl:call-template name="calculate.colspan">
-					<xsl:with-param name="namest" select="../../../spanspec[@spanname=@spanname]/@namest"/>
-					<xsl:with-param name="nameend" select="../../../spanspec[@spanname=@spanname]/@nameend"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:when test="@namest!=''">
-				<xsl:call-template name="calculate.colspan"/>
-			</xsl:when>
-			<xsl:otherwise>-1</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:if test="$span &gt; 1">
-		<xsl:text>\multicolumn{</xsl:text>
-		<xsl:value-of select="$span"/>
-		<xsl:text>|}{</xsl:text><!-- TODO take heed of @colsep -->
-		<xsl:choose>
-			<xsl:when test="@align='left'"><xsl:text>l</xsl:text></xsl:when>
-			<xsl:when test="@align='right'"><xsl:text>r</xsl:text></xsl:when>
-			<xsl:when test="@align='center'"><xsl:text>c</xsl:text></xsl:when>
-			<xsl:when test="@align='char'">c<xsl:message>Table entry char alignment is not supported.</xsl:message></xsl:when>
-			<xsl:otherwise>c</xsl:otherwise>
-		</xsl:choose>
-	<!-- use this as a hook for some general warnings -->
-		<xsl:text>}</xsl:text>
-	</xsl:if>
 	<!-- this is used when the entry's align spec wants to override the column default -->
-	<xsl:if test="$span &lt; 1">
-		<xsl:choose>
-			<xsl:when test="@align='left'"><xsl:text>\docbooktolatexalignll </xsl:text></xsl:when>
-			<xsl:when test="@align='right'"><xsl:text>\docbooktolatexalignrl </xsl:text></xsl:when>
-			<xsl:when test="@align='center'"><xsl:text>\docbooktolatexaligncl </xsl:text></xsl:when>
-			<xsl:when test="@align='char'"><xsl:message>Table entry char alignment is not supported.</xsl:message></xsl:when>
-		</xsl:choose>
-	</xsl:if>
-	<xsl:text>{</xsl:text>
-	<xsl:if test="@rotate='1'">
-		<xsl:text>\rotatebox{90}</xsl:text>
-		<xsl:if test="@align!=''"><xsl:message>entry[@rotate='1' and @align!=''] probably doesn't work.</xsl:message></xsl:if>
-	</xsl:if>
-	<xsl:text>{</xsl:text>
+	<xsl:choose>
+		<xsl:when test="@align='left'"><xsl:text>\docbooktolatexalignll </xsl:text></xsl:when>
+		<xsl:when test="@align='right'"><xsl:text>\docbooktolatexalignrl </xsl:text></xsl:when>
+		<xsl:when test="@align='center'"><xsl:text>\docbooktolatexaligncl </xsl:text></xsl:when>
+		<xsl:when test="@align='char'"><xsl:message>Table entry char alignment is not supported.</xsl:message></xsl:when>
+	</xsl:choose>
 	<!-- use this as a hook for some general warnings -->
 	<xsl:if test="@morerows!=''"><xsl:message>The morerows attribute is not supported.</xsl:message></xsl:if>
+	<xsl:if test="@spanname!=''"><xsl:message>The spanname attribute is not supported.</xsl:message></xsl:if>
+	<xsl:if test="@namest!=''"><xsl:message>The namest and nameend attributes are not supported.</xsl:message></xsl:if>
 	</xsl:template>
 
 	<xsl:template name="latex.entry.postalign">
-	<xsl:text>}}</xsl:text>
 	<!-- this is used when the entry's align spec wants to override the column default -->
-	<xsl:if test="@namest='' and @spanspec=''"><!-- TODO improve -->
-		<xsl:choose>
-			<xsl:when test="@align='left'"><xsl:text>\docbooktolatexalignlr </xsl:text></xsl:when>
-			<xsl:when test="@align='right'"><xsl:text>\docbooktolatexalignrr </xsl:text></xsl:when>
-			<xsl:when test="@align='center'"><xsl:text>\docbooktolatexaligncr </xsl:text></xsl:when>
-		</xsl:choose>
-	</xsl:if>
+	<xsl:choose>
+		<xsl:when test="@align='left'"><xsl:text>\docbooktolatexalignlr </xsl:text></xsl:when>
+		<xsl:when test="@align='right'"><xsl:text>\docbooktolatexalignrr </xsl:text></xsl:when>
+		<xsl:when test="@align='center'"><xsl:text>\docbooktolatexaligncr </xsl:text></xsl:when>
+	</xsl:choose>
 	</xsl:template>
 
 
@@ -725,16 +637,14 @@
     </xsl:template>
 
     <xsl:template name="calculate.colspan">
-	<xsl:param name="namest" select="@namest"/>
-	<xsl:param name="nameend" select="@nameend"/>
 	<xsl:variable name="scol">
 	    <xsl:call-template name="colspec.colnum">
-		<xsl:with-param name="colname" select="$namest"/>
+		<xsl:with-param name="colname" select="@namest"/>
 	    </xsl:call-template>
 	</xsl:variable>
 	<xsl:variable name="ecol">
 	    <xsl:call-template name="colspec.colnum">
-		<xsl:with-param name="colname" select="$nameend"/>
+		<xsl:with-param name="colname" select="@nameend"/>
 	    </xsl:call-template>
 	</xsl:variable>
 	<xsl:value-of select="$ecol - $scol + 1"/>
diff --git a/docs/docbook/xslt/db2latex/texmath.mod.xsl b/docs/docbook/xslt/db2latex/texmath.mod.xsl
index 47036c56ac..e3020664c3 100644
--- a/docs/docbook/xslt/db2latex/texmath.mod.xsl
+++ b/docs/docbook/xslt/db2latex/texmath.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: texmath.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -18,6 +20,7 @@
     <doc:reference id="texmath" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: texmath.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -37,28 +40,23 @@
 	</partintro>
     </doc:reference>
 
-    <xsl:template match="alt">
+
+    <xsl:template match="alt[@role='tex' or @role='latex']">
 	<xsl:choose>
-		<xsl:when test="ancestor::inlineequation and (@role='tex' or @role='latex' or $latex.alt.is.latex='1')">
+		<xsl:when test="ancestor::inlineequation|ancestor::equation|ancestor::informalequation">
 			<xsl:text>\ensuremath{</xsl:text>
 			<xsl:value-of select="."/>
 			<xsl:text>}</xsl:text>
 		</xsl:when>
-		<xsl:when test="ancestor::equation|ancestor::informalequation and (@role='tex' or @role='latex' or $latex.alt.is.latex='1')">
-			<xsl:text>\begin{displaymath}</xsl:text>
-			<xsl:call-template name="label.id"/>
-			<xsl:value-of select="."/>
-			<xsl:text>\end{displaymath}&#10;</xsl:text>
-		</xsl:when>
-		<xsl:when test="$latex.alt.is.latex='1'">
-			<xsl:value-of select="."/>
-		</xsl:when>
 		<xsl:otherwise>
-			<xsl:apply-templates/>
+			<xsl:value-of select="."/>
 		</xsl:otherwise>
 	</xsl:choose>
     </xsl:template>
 
+    <xsl:template match="alt">
+    </xsl:template>
+
     <xsl:template match="latex|tex">
 	<xsl:value-of select="."/>
     </xsl:template>
@@ -95,17 +93,8 @@
 		<xsl:when test="$tex">
 			<xsl:apply-templates select="$tex"/>
 		</xsl:when>
-		<xsl:when test="alt and $latex.alt.is.preferred='1'">
-			<xsl:apply-templates select="alt"/>
-		</xsl:when>
-		<xsl:when test="inlinemediaobject">
-			<xsl:apply-templates select="inlinemediaobject"/>
-		</xsl:when>
-		<xsl:when test="alt">
-			<xsl:apply-templates select="alt"/>
-		</xsl:when>
 		<xsl:otherwise>
-			<xsl:apply-templates select="graphic"/>
+			<xsl:apply-templates select="*[not(self::graphic)]"/>
 		</xsl:otherwise>
 	</xsl:choose>
 	</xsl:template>
diff --git a/docs/docbook/xslt/db2latex/vars.mod.xsl b/docs/docbook/xslt/db2latex/vars.mod.xsl
index e20fb59ce2..3e7f3a8acf 100644
--- a/docs/docbook/xslt/db2latex/vars.mod.xsl
+++ b/docs/docbook/xslt/db2latex/vars.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: vars.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $		
 |- #############################################################################
+|	$Author: jelmer $
 |
 |   PURPOSE: User and stylesheets XSL variables 
 + ############################################################################## -->
@@ -13,6 +15,7 @@
     <doc:reference id="vars" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: vars.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	    <authorgroup>
 		<author><surname>Casellas</surname><firstname>Ramon</firstname></author>
@@ -40,6 +43,7 @@
     <!--############################################################################# 
     |  COMMON VARIABLES
     |- #############################################################################
+    |	$Author: jelmer $
     |
     + ############################################################################## -->
     <xsl:variable name="default-classsynopsis-language">java</xsl:variable>
@@ -176,6 +180,7 @@
     <!--############################################################################# 
     | 	LaTeX VARIABLES
     |- #############################################################################
+    |	$Author: jelmer $
     |
     |   PURPOSE: User and stylesheets XSL variables 
     + ############################################################################## -->
@@ -193,52 +198,6 @@
 	</doc:param>
 	<xsl:param name="latex.override"></xsl:param>
 
-	<doc:param name="latex.entities" xmlns="">
-	<refpurpose> Control Unicode character handling. </refpurpose>
-	<refdescription>
-		<para>
-		Normally, XSLT processors will convert SGML character entities into
-		Unicode characters and DB2LaTeX doesn't have much chance to do anything
-		toward converting them to LaTeX equivalents. We do not yet know how we
-		can solve this problem best.
-		</para>
-		<para>
-		Proposed values: 'catcode', 'unicode', 'extension'.
-		Currently only 'catcode' is supported. All other values will
-		cause no special handling except for certain mappings in MathML.
-		In future, perhaps the 'unicode' LaTeX package could be of assistance.
-		'Extension' could be an XSLT extension that handles the characters
-		using a mapping table.
-		</para>
-	</refdescription>
-	</doc:param>
-	<xsl:param name="latex.entities"></xsl:param>
-
-	<doc:param name="latex.alt.is.latex" xmlns="">
-	<refpurpose> Control the escaping of <sgmltag class="element">alt</sgmltag> text </refpurpose>
-	<refdescription>
-		<para>
-		Text within <sgmltag class="element">alt</sgmltag> elements is assumed to
-		be valid LaTeX and is passed through unescaped by default. If this is not
-		appropriate for your document, set this variable to something other than
-		'1'.
-		</para>
-	</refdescription>
-	</doc:param>
-	<xsl:param name="latex.alt.is.latex">1</xsl:param>
-
-	<doc:param name="latex.alt.is.preferred" xmlns="">
-	<refpurpose> Control the use of <sgmltag class="element">alt</sgmltag> text </refpurpose>
-	<refdescription>
-		<para>
-		By default, DB2LaTeX assumes that <sgmltag class="element">alt</sgmltag>
-		text should be typeset in preference to any 
-		<sgmltag class="element">mediaobject</sgmltag>s.
-		</para>
-	</refdescription>
-	</doc:param>
-	<xsl:param name="latex.alt.is.preferred">1</xsl:param>
-
 	<!--
 	<doc:variable name="latex.figure.position" xmlns="">
 	<refpurpose> How to place floats. </refpurpose>
@@ -437,9 +396,6 @@
 	<refpurpose> LaTeX location for admonition graphics </refpurpose>
 	<refdescription>
 		<para>The file path that will be passed to LaTeX in order to find admonition graphics.</para>
-		<para>An empty value suppresses the use of admonition graphics.</para>
-		<para>If your figures are in <quote>the current directory</quote> then use a value of
-		<quote>.</quote> (i.e. the full stop or period on its own) to signify this.</para>
 	</refdescription>
 	</doc:param>
 	<xsl:param name="latex.admonition.path">figures</xsl:param>
@@ -514,18 +470,6 @@
 	<xsl:variable name="latex.dont.hypertarget">0</xsl:variable>
 	-->
 
-	<doc:param name="latex.use.ucs" xmlns="">
-		<refpurpose> Choose whether to use the <productname>unicode</productname> LaTeX package</refpurpose>
-		<refdescription><para>See the <productname>unicode</productname> documentation for details.</para></refdescription>
-	</doc:param>
-	<xsl:param name="latex.use.ucs">0</xsl:param>
-
-	<doc:param name="latex.ucs.options" xmlns="">
-		<refpurpose>Select the optional parameter(s) for the <productname>unicode</productname> LaTeX package</refpurpose>
-		<refdescription><para>See the <productname>unicode</productname> documentation for details.</para></refdescription>
-	</doc:param>
-	<xsl:param name="latex.ucs.options"></xsl:param>
-
 	<doc:param name="latex.babel.language" xmlns="">
 		<refpurpose>Select the optional parameter for the <productname>babel</productname> LaTeX package</refpurpose>
 		<refdescription><para>See the <productname>babel</productname> documentation for details.</para></refdescription>
@@ -649,7 +593,7 @@
 		</para>
 	</refdescription>
 	</doc:param>
-	<xsl:variable name="latex.hyperref.param.pdftex">pdfstartview=FitH</xsl:variable>
+	<xsl:variable name="latex.hyperref.param.pdftex"></xsl:variable>
 
 	<doc:param name="latex.hyperref.param.dvips" xmlns="">
 	<refpurpose> DB2LaTeX hyperref options for dvips output</refpurpose>
@@ -676,21 +620,7 @@
 		that command will precede the title and it will be typeset accordingly.</para>
 	</refdescription>
     </doc:param>
-    <xsl:variable name="latex.step.title.style">\bf</xsl:variable>
-
-    <doc:param name="latex.book.article.title.style" xmlns="">
-	<refpurpose> Control the style of article titles within books </refpurpose>
-	<refdescription>
-	</refdescription>
-    </doc:param>
-    <xsl:variable name="latex.book.article.title.style">\Large\textbf</xsl:variable>
-
-    <doc:param name="latex.article.title.style" xmlns="">
-	<refpurpose> Control the style of article titles </refpurpose>
-	<refdescription>
-	</refdescription>
-    </doc:param>
-    <xsl:variable name="latex.article.title.style">\textbf</xsl:variable>
+    <xsl:variable name="latex.step.title.style">\sc</xsl:variable>
 
     <doc:param name="latex.pagestyle" xmlns="">
 	<refpurpose> Override DB2LaTeX's choice of LaTeX page numbering style </refpurpose>
@@ -854,6 +784,7 @@
     <!--############################################################################# 
     | 	XSL VARIABLES FOR ARTICLES	
     |- #############################################################################
+    |	$Author: jelmer $
     |
     + ############################################################################## -->
 
@@ -880,16 +811,29 @@
 
 
     <doc:param name="latex.article.varsets" xmlns="">
-	<refpurpose> Controls what is output after the LaTeX preamble. </refpurpose>
+	<refpurpose> Controls what is output after the LaTeX preamble. Basically the <literal>\maketitle</literal>
+	</refpurpose>
 	<refdescription>
-	    <para>Default values decrease edge margins and allow a large quantity of figures to be set on each page. </para>
+	    <para>Default Values</para>
+	    <screen><![CDATA[
+		\setlength{\textwidth}{16.5cm}
+		\setlength{\textheight}{22.2cm}
+		\setlength{\hoffset}{-2cm}
+		\setlength{\voffset}{-.9in}
+		\renewcommand\floatpagefraction{.9}
+		\renewcommand\topfraction{.9}
+		\renewcommand\bottomfraction{.9}
+		\renewcommand\textfraction{.1}
+		]]></screen>
 	</refdescription>
     </doc:param>
 
     <xsl:variable name="latex.article.varsets">
 	<xsl:text>
-		\usepackage{anysize}
-		\marginsize{2cm}{2cm}{2cm}{2cm}
+	    \setlength{\textwidth}{16.5cm}
+	    \setlength{\textheight}{22.2cm}
+	    \setlength{\hoffset}{-2cm}
+	    \setlength{\voffset}{-.9in}
 	    \renewcommand\floatpagefraction{.9}
 	    \renewcommand\topfraction{.9}
 	    \renewcommand\bottomfraction{.9}
@@ -900,20 +844,19 @@
 
 
 
-    <doc:param name="latex.maketitle" xmlns="">
-	<refpurpose> The <literal>\maketitle</literal> for books and articles. </refpurpose>
+    <doc:param name="latex.article.maketitle" xmlns="">
+	<refpurpose> Controls what is output after the LaTeX preamble. Basically the <literal>\maketitle</literal>
+	</refpurpose>
 	<refdescription>
-		<para>Some users may wish to override or eliminate <literal>\maketitle</literal>.</para>
-		<note><para>Does not apply to <sgmltag class="element">article</sgmltag>s within <sgmltag class="element">book</sgmltag>s.</para></note>
-		<para>By default, uses LaTeX <literal>\maketitle</literal> with the 'empty' pagestyle
-		for the first page. The page style of subsequent pages is determined by
-		<xref linkend="template.generate.latex.pagestyle"/>.</para>
+	    <para>Default Values</para>
+	    <screen><![CDATA[
+		\maketitle
+		]]></screen>
 	</refdescription>
     </doc:param>
-    <xsl:variable name="latex.maketitle">
-	<xsl:text>{\maketitle</xsl:text>
-	<xsl:call-template name="generate.latex.pagestyle"/>
-	<xsl:text>\thispagestyle{empty}}&#10;</xsl:text>
+    <xsl:variable name="latex.article.maketitle">
+	<xsl:text>&#10;</xsl:text>
+	<xsl:text>\maketitle&#10;</xsl:text>
     </xsl:variable>
 
 
diff --git a/docs/docbook/xslt/db2latex/verbatim.mod.xsl b/docs/docbook/xslt/db2latex/verbatim.mod.xsl
index 549883869b..06f48b04ba 100644
--- a/docs/docbook/xslt/db2latex/verbatim.mod.xsl
+++ b/docs/docbook/xslt/db2latex/verbatim.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: verbatim.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE:
 + ############################################################################## -->
@@ -16,6 +18,7 @@
     <doc:reference id="verbatim" xmlns="">
 	<referenceinfo>
 	    <releaseinfo role="meta">
+		$Id: verbatim.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 	    </releaseinfo>
 	<authorgroup>
 	    <author> <firstname>Ramon</firstname> <surname>Casellas</surname> </author>
@@ -59,63 +62,57 @@
     <!--############################################################################# -->
     <!-- DOCUMENTATION                                                                -->
     <doc:template name="verbatim.apply.templates" xmlns="">
-	<refpurpose> Auxiliary template to output verbatim LaTeX code in verbatim mode </refpurpose>
+	<refpurpose> Auxiliary template to output verbatim LaTeX code (in verbatim mode)
+	that takes into account whether the user is using fancyverb or not. It allows
+	veratim line numbering and other fancy stuff. </refpurpose>
 	<refdescription>
-	<para> Takes into account whether the user is using fancyvrb or not. It allows
-	veratim line numbering and other fancy stuff. </para>
-	<para> In order to use a small or large font, you may also wanto to use 
-	the <literal>role</literal> attribute : </para>
-	<screen><![CDATA[
-	<programlisting role="small">
-	</programlisting>
-	<programlisting role="large">
-	</programlisting>
-	]]></screen>
+	<programlisting><![CDATA[
+	<xsl:template name="verbatim.apply.templates">
+	<xsl:choose>
+		<xsl:when test="$latex.use.fancyvrb='1'">
+			<xsl:text>&#10;\begin{Verbatim}[</xsl:text>
+			<xsl:if test="@linenumbering='numbered'">
+				<xsl:text>,numbers=left</xsl:text>
+			</xsl:if>
+			<xsl:if test="local-name(.)='literallayout' and @format!='monospaced'">
+				<xsl:text>,fontfamily=default</xsl:text>
+			</xsl:if>
+			<xsl:text>]&#10;</xsl:text>
+			<xsl:apply-templates mode="latex.verbatim"/>
+			<xsl:text>&#10;\end{Verbatim}&#10;</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:text>&#10;\begin{verbatim}&#10;</xsl:text>
+			<!-- RCAS: Experimental code 
+			<xsl:apply-templates/>-->
+			<xsl:apply-templates mode="latex.verbatim"/>
+			<xsl:text>&#10;\end{verbatim}&#10;</xsl:text>
+		</xsl:otherwise>
+	</xsl:choose>
+	</xsl:template>
+	]]></programlisting>
 	</refdescription>
     </doc:template>
     <!--############################################################################# -->
 
 	<xsl:template name="verbatim.apply.templates">
 	<xsl:choose>
-		<xsl:when test="ancestor::entry">
-			<xsl:message>Problem with <xsl:value-of select="local-name(.)"/> inside table entries.</xsl:message>
-			<xsl:text>\texttt{</xsl:text>
-			<xsl:apply-templates mode="latex.verbatim"/>
-			<xsl:text>}</xsl:text>
-		</xsl:when>
 		<xsl:when test="$latex.use.fancyvrb='1'">
-			<xsl:variable name="not_monospaced" select="local-name(.)='literallayout' and @format!='monospaced'"/>
 			<xsl:text>&#10;\begin{Verbatim}[</xsl:text>
 			<xsl:if test="@linenumbering='numbered'">
 				<xsl:text>,numbers=left</xsl:text>
 			</xsl:if>
-			<xsl:if test="$not_monospaced">
+			<xsl:if test="local-name(.)='literallayout' and @format!='monospaced'">
 				<xsl:text>,fontfamily=default</xsl:text>
 			</xsl:if>
-			<xsl:if test="@role">
-				<xsl:choose>
-					<xsl:when test="@role='small'">
-						<xsl:text>,fontsize=\small</xsl:text>
-					</xsl:when>
-					<xsl:when test="@role='large'">
-						<xsl:text>,fontsize=\large</xsl:text>
-					</xsl:when>
-				</xsl:choose>
-			</xsl:if>
 			<xsl:text>]&#10;</xsl:text>
-			<xsl:choose>
-				<xsl:when test="$not_monospaced">
-					<!-- Needs to be changed to cope with regular characterset! -->
-					<xsl:apply-templates mode="latex.verbatim"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates mode="latex.verbatim"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:apply-templates mode="latex.verbatim"/>
 			<xsl:text>&#10;\end{Verbatim}&#10;</xsl:text>
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:text>&#10;\begin{verbatim}&#10;</xsl:text>
+			<!-- RCAS: Experimental code 
+			<xsl:apply-templates/>-->
 			<xsl:apply-templates mode="latex.verbatim"/>
 			<xsl:text>&#10;\end{verbatim}&#10;</xsl:text>
 		</xsl:otherwise>
diff --git a/docs/docbook/xslt/db2latex/xref.mod.xsl b/docs/docbook/xslt/db2latex/xref.mod.xsl
index 82289b19df..6a7d3204a7 100644
--- a/docs/docbook/xslt/db2latex/xref.mod.xsl
+++ b/docs/docbook/xslt/db2latex/xref.mod.xsl
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!--############################################################################# 
+|	$Id: xref.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 |- #############################################################################
+|	$Author: jelmer $
 |														
 |   PURPOSE: Manage XREFs
 + ############################################################################## -->
@@ -17,6 +19,7 @@
 <doc:reference id="xref" xmlns="">
 <referenceinfo> 
 <releaseinfo role="meta">
+$Id: xref.mod.xsl,v 1.1.2.3 2003/08/12 18:22:39 jelmer Exp $
 </releaseinfo>
 <authorgroup>
 <author> <surname>Casellas</surname><firstname>Ramon</firstname> </author>
@@ -137,12 +140,31 @@
 
 	    <!-- This is a link with content ... -->
 		<xsl:when test="local-name(.)='link' and .!=''">
-		<xsl:call-template name="generate.hyperlink">
-			<xsl:with-param name="target" select="$target"/>
-			<xsl:with-param name="text"><xsl:apply-templates/></xsl:with-param>
-		</xsl:call-template>
+		<xsl:choose>
+		<xsl:when test="$latex.use.hyperref=1">
+			<xsl:text>\hyperlink{</xsl:text><xsl:value-of select="$target/@id"/><xsl:text>}{</xsl:text>
+			<xsl:apply-templates/>
+			<xsl:text>}</xsl:text>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:apply-templates/>
+		</xsl:otherwise>
+		</xsl:choose>
 		</xsl:when>
 		
+	    <!-- If an xreflabel has been specified for the target ... -->
+	    <xsl:when test="local-name(.)='xref' and $target/@xreflabel">
+		<xsl:if test="$latex.use.hyperref=1">
+		    <xsl:text>\hyperlink{</xsl:text><xsl:value-of select="$target/@id"/><xsl:text>}</xsl:text>
+		</xsl:if>
+		<xsl:text>{[</xsl:text>
+		<xsl:call-template name="xref.xreflabel">
+		    <xsl:with-param name="target" select="$target"/>
+		</xsl:call-template>
+		<xsl:text>]}</xsl:text>
+	    </xsl:when>
+
+	    <!-- If an xreflabel has not been specified for the target ... -->
 	    <xsl:otherwise>
 		<xsl:choose>
 		    <xsl:when test="@endterm">
@@ -158,31 +180,29 @@
 				<xsl:text>[NONEXISTENT ID]</xsl:text>
 			    </xsl:when>
 			    <xsl:otherwise>
-				<xsl:call-template name="generate.hyperlink">
-					<xsl:with-param name="target" select="$target"/>
-					<xsl:with-param name="text"><xsl:apply-templates select="$etarget" mode="xref.text"/></xsl:with-param>
-				</xsl:call-template>
+				<xsl:choose>
+				<xsl:when test="$latex.use.hyperref=1">
+				    <xsl:text>\hyperlink{</xsl:text><xsl:value-of select="$target/@id"/><xsl:text>}</xsl:text>
+				    <xsl:text>{</xsl:text> <xsl:apply-templates select="$etarget" mode="xref.text"/><xsl:text>}</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+				    <xsl:apply-templates select="$etarget" mode="xref.text"/>
+				</xsl:otherwise>
+				</xsl:choose>
 			    </xsl:otherwise>
 			</xsl:choose>
 		    </xsl:when>
-			<!-- If an xreflabel has been specified for the target ... -->
-			<xsl:when test="local-name(.)='xref' and $target/@xreflabel">
-			<xsl:call-template name="generate.hyperlink">
-				<xsl:with-param name="target" select="$target"/>
-				<xsl:with-param name="text">
-					<xsl:text>{[</xsl:text>
-					<xsl:call-template name="xref.xreflabel">
-						<xsl:with-param name="target" select="$target"/>
-					</xsl:call-template>
-					<xsl:text>]}</xsl:text>
-				</xsl:with-param>
-			</xsl:call-template>
-			</xsl:when>
 		    <xsl:otherwise>
-				<xsl:call-template name="generate.hyperlink">
-					<xsl:with-param name="target" select="$target"/>
-					<xsl:with-param name="text"><xsl:apply-templates select="$target" mode="xref-to"/></xsl:with-param>
-				</xsl:call-template>
+			<xsl:choose>
+			<xsl:when test="$latex.use.hyperref=1">
+			    <xsl:text>\hyperlink{</xsl:text><xsl:value-of select="$target/@id"/><xsl:text>}{</xsl:text>
+			    <xsl:apply-templates select="$target" mode="xref-to"/>
+				<xsl:text>}</xsl:text>
+			</xsl:when>
+			<xsl:otherwise>
+			    <xsl:apply-templates select="$target" mode="xref-to"/>
+			</xsl:otherwise>
+			</xsl:choose>
 		    </xsl:otherwise>
 		</xsl:choose>
 	    </xsl:otherwise>
@@ -200,50 +220,6 @@
 	</xsl:if>
     </xsl:template>
 
-	<doc:template name="generate.hyperlink" xmlns="">
-	<refpurpose> Choose hyperlink syntax </refpurpose>
-	<refdescription>
-		<para>Will use hyperref, if it is available. Otherwise, just outputs
-		unlinked text. If the destination is a citation, a backreference is
-		emitted (even though it is technically a hyperlink, not a citation).
-		If the 'text' arises from an @endterm, then the 'optional argument'
-		syntax of <literal>\cite</literal> is used.</para>
-	</refdescription>
-	</doc:template>
-	<xsl:template name="generate.hyperlink">
-		<xsl:param name="target"/>
-		<xsl:param name="text"/>
-		<xsl:variable name="element" select="local-name($target)"/>
-		<xsl:variable name="citation" select="$element='biblioentry' or $element='bibliomixed'"/>
-		<xsl:choose>
-			<xsl:when test="$citation and @endterm!=''">
-				<xsl:text>\docbooktolatexcite</xsl:text>
-				<xsl:text>{</xsl:text>
-				<xsl:value-of select="$target/@id"/>
-				<xsl:text>}{</xsl:text>
-				<xsl:call-template name="scape-optionalarg">
-					<xsl:with-param name="string" select="$text"/>
-				</xsl:call-template>
-				<xsl:text>}</xsl:text>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:if test="$latex.use.hyperref=1">
-					<xsl:text>\hyperlink{</xsl:text>
-					<xsl:value-of select="$target/@id"/>
-					<xsl:text>}</xsl:text>
-				</xsl:if>
-				<xsl:text>{</xsl:text>
-				<xsl:if test="$citation">
-					<xsl:text>\docbooktolatexbackcite{</xsl:text>
-					<xsl:value-of select="$target/@id"/>
-					<xsl:text>}</xsl:text>
-				</xsl:if>
-				<xsl:value-of select="$text"/>
-				<xsl:text>}</xsl:text>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<doc:template name="xref.p.subst" xmlns="">
 		<refpurpose>Insert page number into xrefs</refpurpose>
 		<refdescription><para></para></refdescription>
@@ -528,9 +504,8 @@
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:text>\href{</xsl:text>
-				<xsl:call-template name="scape-href">
-					<xsl:with-param name="string" select="$url"/>
-				</xsl:call-template>
+				<!-- Unparsed URL. No char is escaped. -->
+				<xsl:value-of select="$url"/>
 			<xsl:text>}</xsl:text>
 			<xsl:text>{</xsl:text>
 				<xsl:apply-templates/>
@@ -611,9 +586,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:text>\href{</xsl:text>
-				<xsl:call-template name="scape-href">
-					<xsl:with-param name="string" select="$url"/>
-				</xsl:call-template>
+				<xsl:value-of select="$url"/>
 				<xsl:text>}{\texttt{</xsl:text>
 				<xsl:call-template name="generate.string.url">
 					<xsl:with-param name="hyphenation" select="$hyphenation"/>
diff --git a/docs/docbook/xslt/latex.xsl b/docs/docbook/xslt/latex.xsl
index b4c942ceff..5b2c40e6a5 100644
--- a/docs/docbook/xslt/latex.xsl
+++ b/docs/docbook/xslt/latex.xsl
@@ -3,7 +3,7 @@
 <xsl:import href="db2latex/docbook.xsl"/>
 
 <xsl:output method="text" encoding="ISO-8859-1" indent="yes"/>
-<xsl:variable name="l10n.gentext.default.language">en</xsl:variable>
+<xsl:param name="l10n.gentext.default.language">en</xsl:param>
 <xsl:variable name="latex.documentclass">sambadoc</xsl:variable>
 <xsl:variable name="latex.documentclass.common">english,final,titlepage,parskip,<xsl:value-of select="$papersize"/>,<xsl:value-of select="$fontsize"/>pt</xsl:variable>
 <xsl:variable name="latex.documentclass.book"></xsl:variable>
-- 
cgit