Large number of small fixes to the layout and the build system.

(This used to be commit 73fac0653c774a8ed8654b064fd63d4e486f6b0f)

4 files changed, 61 insertions, 106 deletions

diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index f74d14c66b..12ea497101 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -27,17 +27,6 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="translator">
-		<xsl:element name="othercredit">
-			<xsl:element name="author">
-				<xsl:apply-templates/>
-				<xsl:element name="contrib">
-					<xsl:text>Translation to </xsl:text><xsl:value-of select="@lang"/>
-				</xsl:element>
-			</xsl:element>
-		</xsl:element>
-	</xsl:template>
-
 	<xsl:template match="reference/refentry">
 		<xsl:element name="section">
 			<xsl:attribute name="id">
@@ -45,9 +34,6 @@
 			</xsl:attribute>
 			<xsl:element name="title">
 				<xsl:value-of select="refmeta/refentrytitle"/>
-				<!--			<xsl:text> (</xsl:text>
-				<xsl:value-of select="refnamediv/refpurpose"/>
-				<xsl:text>)</xsl:text>-->
 			</xsl:element>
 			<xsl:apply-templates/>
 		</xsl:element>
@@ -157,13 +143,6 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<!-- FIXME: Needs extension sometime -->
-	<xsl:template match="ntgroup|ntuser">
-		<xsl:element name="emphasis">
-			<xsl:apply-templates/>
-		</xsl:element>
-	</xsl:template>
-
 	<xsl:template match="smbconfexample">
 		<xsl:choose>
 			<xsl:when test="title = ''">
@@ -466,35 +445,6 @@
 		</xsl:element>
 	</xsl:template>
 
-	<xsl:template match="ulink">
-		<xsl:element name="ulink">
-			<xsl:attribute name="url">
-				<xsl:value-of select="@url"/>
-			</xsl:attribute>
-
-			<xsl:apply-templates/>
-			<xsl:if test="contains(@url,'http://') or contains(@url,'ftp://')">
-				<xsl:if test="$duplicate_ulinks='brackets'">
-					<xsl:text> (</xsl:text>
-					<xsl:value-of select="@url"/>
-					<xsl:text>)</xsl:text>
-				</xsl:if>
-				<xsl:if test="$duplicate_ulinks='footnote'">
-					<xsl:element name="footnote">
-						<xsl:element name="para">
-							<xsl:value-of select="@url"/>
-						</xsl:element>
-					</xsl:element>
-				</xsl:if>
-			</xsl:if>
-		</xsl:element>
-	</xsl:template>
-
-	<!-- Just ignore these -->
-	<xsl:template match="smbfile">
-		<xsl:apply-templates/>
-	</xsl:template>
-
 	<xsl:template match="quote">
 		<xsl:element name="quote">
 			<xsl:element name="emphasis">
diff --git a/docs/xslt/latex.overrides.xml b/docs/xslt/latex.overrides.xml
new file mode 100644
index 0000000000..73967c6487
--- /dev/null
+++ b/docs/xslt/latex.overrides.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE latexbindings SYSTEM "http://db2latex.sourceforge.net/xsl/latex.mapping.dtd">
+<latexbindings>
+	<latexmapping role="begin">
+	</latexmapping>
+	<latexmapping role="end">
+		<mapping key="glossary" text=""/>
+	</latexmapping>
+</latexbindings>
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index cb0ecd6874..56db80e7cc 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -1,9 +1,31 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 <xsl:import href="../settings.xsl"/>
-<!--<xsl:import href="docbook.xsl"/>-->
 <xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/>
 
+<xsl:param name="latex.mapping.xml" select="document('latex.overrides.xml')"/>
+
+<xsl:param name="generate.toc">
+	/appendix toc,title
+	article/appendix  nop
+	/article  toc,title
+	book      toc,title,figure,table,example,equation
+	/chapter  toc,title,lop
+	part      toc,title
+	/preface  toc,title
+	qandadiv  toc
+	qandaset  toc
+	procedure lop
+	reference toc,title
+	/sect1    toc
+	/sect2    toc
+	/sect3    toc
+	/sect4    toc
+	/sect5    toc
+	/section  toc
+	set       toc,title
+</xsl:param>
+
 <xsl:template name="link">
 	<xsl:element name="link">
 		<xsl:copy-of select="@*"/>
@@ -13,11 +35,7 @@
 <xsl:output method="text" encoding="ISO-8859-1" indent="yes"/>
 <xsl:param name="l10n.gentext.default.language" select="'en'"/>
 <xsl:param name="latex.example.caption.style"></xsl:param>
-<xsl:variable name="latex.documentclass">sambadoc</xsl:variable>
-<xsl:variable name="latex.documentclass.common">twoside,11pt,letterpaper</xsl:variable>
-<xsl:variable name="latex.documentclass.book"></xsl:variable>
 <xsl:variable name="latex.hyperref.param.pdftex">hyperfigures,hyperindex,citecolor=black,urlcolor=black,filecolor=black,linkcolor=black,menucolor=red,pagecolor=black</xsl:variable>
-<xsl:variable name="latex.document.font">default</xsl:variable>
 <xsl:variable name="admon.graphics.path">xslt/figures</xsl:variable>
 <xsl:variable name="latex.use.tabularx">1</xsl:variable>
 <xsl:variable name="latex.fancyhdr.lh"></xsl:variable>
@@ -41,63 +59,14 @@
 <xsl:variable name="latex.book.preamblestart">
 \documentclass[twoside,openright,<xsl:value-of select="$fontsize"/>pt]{xslt/latex/sambadoc}
 
-\usepackage[twoside,dvips]{geometry}
-
-%\usepackage[section]{placeins}
-
-\geometry{%
-paperwidth=7in,
-paperheight=9.25in,
-lmargin=.75in,
-rmargin=.75in,
-bmargin=.625in,
-tmargin=.625in,
-width=5.5in,
-height=7.525in, %7.3
-marginparwidth=0.35in,
-headheight=0.2in,
-headsep=.25in,
-footskip=.025in}
-
-\setlength{\headwidth}{\textwidth}
-
-<xsl:if test="$docrop != '0'">
-\usepackage[letter,center,dvips]{crop}
-</xsl:if>
 \usepackage{amsmath}%
 \usepackage{amsfonts}%
 \usepackage{amssymb}
 
-<xsl:if test="$docrop != '0'">
-\special{papersize=11in,8.5in}
-
-%\crop[frame]
-\crop
-</xsl:if>
-
 \makeindex           
 
-%% Preamble:
-
-% New commands and/or command redefinitions
-%
-% Added for the samba book
-%----------------------- paragraph ----------------------------------
-\cleardoublepage
-\pagenumbering{roman}
-
-\setcounter{page}{2}
-\setcounter{totalnumber}{8}
-\setcounter{bottomnumber}{3}
-\setcounter{topnumber}{3}
-\renewcommand{\textfraction}{0.1}
-\renewcommand{\topfraction}{1.0}
-\renewcommand{\bottomfraction}{1.0}
-
-%% Document Parts
 </xsl:variable>
 <xsl:param name="latex.babel.language">english</xsl:param>
-<xsl:param name="ulink.url">1</xsl:param>
 
 <xsl:template match="//title/filename|//title/command|//title/parameter|//title/constant">
   <xsl:variable name="content">
@@ -108,6 +77,4 @@ footskip=.025in}
   </xsl:if>
 </xsl:template>
 
-
 </xsl:stylesheet>
-
diff --git a/docs/xslt/latex/sambadoc.cls b/docs/xslt/latex/sambadoc.cls
index c55bc970a5..c80f143caf 100644
--- a/docs/xslt/latex/sambadoc.cls
+++ b/docs/xslt/latex/sambadoc.cls
@@ -464,3 +464,32 @@ page \thepage \space undefined}}%
 \renewcommand\listfigurename{\uppercase{List Of Figures}}
 \renewcommand\listtablename{\uppercase{List Of Tables}}
 
+\setlength{\emergencystretch}{0cm}
+\cleardoublepage
+\pagenumbering{roman}
+
+\setcounter{page}{2}
+\setcounter{totalnumber}{8}
+\setcounter{bottomnumber}{3}
+\setcounter{topnumber}{3}
+\renewcommand{\textfraction}{0.1}
+\renewcommand{\topfraction}{1.0}
+\renewcommand{\bottomfraction}{1.0}
+
+\usepackage[twoside,dvips]{geometry}
+
+\geometry{%
+paperwidth=7in,
+paperheight=9.25in,
+lmargin=.75in,
+rmargin=.75in,
+bmargin=.625in,
+tmargin=.625in,
+width=5.5in,
+height=7.525in, %7.3
+marginparwidth=0.35in,
+headheight=0.2in,
+headsep=.25in,
+footskip=.025in}
+
+\setlength{\headwidth}{\textwidth}