Index: Makefile
===================================================================
--- Makefile	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ Makefile	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -34,7 +34,11 @@
 	fi;
 	cp images/*.png $(BASEDIR)/images
-	cd $(BASEDIR); sed -i -e "s@../stylesheets@stylesheets@g" index.html legalnotice.html
-	cd $(BASEDIR); sed -i -e "s@../images@images@g" index.html legalnotice.html
+	cd $(BASEDIR); sed -i -e "s@../stylesheets@stylesheets@g" *.html
+	cd $(BASEDIR); sed -i -e "s@../images@images@g" *.html
 	sh goTidy $(BASEDIR)/  
+
+nochunks:
+	@echo "Generating nochunks version of BLFS..."
+
 
 pdf:
Index: general.ent
===================================================================
--- general.ent	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ general.ent	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -130,5 +130,5 @@
                                      
 <!-- Chapter 12 -->                  
-<!ENTITY python-version               "2.4">
+<!ENTITY Python-version               "2.4">
 <!ENTITY LFS-Perl-version             "5.8.5">
 <!ENTITY Module-Info-version          "0.26">
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ general/prog/python.xml	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -5,6 +5,6 @@
   %general-entities;
 
-<!ENTITY python-download-http "http://www.python.org/ftp/python/&python-version;/python-&python-version;.tar.bz2">
-<!ENTITY python-download-ftp "ftp://ftp.python.org/pub/python/&python-version;/python-&python-version;.tar.bz2">
+<!ENTITY python-download-http "http://www.python.org/ftp/python/&Python-version;/python-&Python-version;.tar.bz2">
+<!ENTITY python-download-ftp "ftp://ftp.python.org/pub/python/&Python-version;/python-&Python-version;.tar.bz2">
 <!ENTITY python-size "7.5 MB">
 <!ENTITY python-buildsize "133 MB">
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="python" xreflabel="Python-&python-version;">
+<sect1 id="python" xreflabel="Python-&Python-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 </sect1info>
 <?dbhtml filename="Python.html" ?>
-<title>Python-&python-version;</title>
+<title>Python-&Python-version;</title>
 
 <sect2>
@@ -40,5 +40,5 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required patch: <ulink
-url="&patch-root;/Python-&python-version;-gdbm-1.patch"/></para></listitem>
+url="&patch-root;/Python-&Python-version;-gdbm-1.patch"/></para></listitem>
 </itemizedlist>
 </sect3>
@@ -61,5 +61,5 @@
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../Python-&python-version;-gdbm-1.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../Python-&Python-version;-gdbm-1.patch &amp;&amp;
 ./configure --prefix=/usr --enable-shared &amp;&amp;
 make &amp;&amp;
Index: stylesheets/blfs-chunked.xsl
===================================================================
--- stylesheets/blfs-chunked.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/blfs-chunked.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,6 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org>
-Based on the original lfs-chunked.xsl created by Matthew Burgess -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -8,35 +5,57 @@
                 version="1.0">
 
-  	<!-- We use XHTML -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.65.1/xhtml/chunk.xsl"/>
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
+  <xsl:import href="blfs-chunked1.xsl"/>
+
+    <!-- Handle name and date in info section as a footnote -->
+
+  <xsl:template name="process.footnotes">
+    <xsl:variable name="footnotes" select=".//footnote"/>
+    <xsl:variable name="fcount">
+      <xsl:call-template name="count.footnotes.in.this.chunk">
+        <xsl:with-param name="node" select="."/>
+        <xsl:with-param name="footnotes" select="$footnotes"/>
+      </xsl:call-template>
+    </xsl:variable>
+   
+    <!-- Only bother to do this if there's at least one non-table footnote -->
+    <xsl:if test="$fcount &gt; 0">
+      <div class="footnotes">
+        <br/>
+        <hr width="100" align="left"/>
+        <xsl:call-template name="process.footnotes.in.this.chunk">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="footnotes" select="$footnotes"/>
+        </xsl:call-template>
+      </div>
+    </xsl:if>
   
-  	<!-- Including our others customized templates -->
-  <xsl:include href="xhtml/lfs-admon.xsl"/>
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/> 
-  <xsl:include href="xhtml/lfs-navigational.xsl"/>
-  <xsl:include href="xhtml/lfs-titles.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
+    <!-- Add this to the footnotes -->
+    <xsl:apply-templates select='prefaceinfo|chapterinfo|sect1info' mode='attribution'/>
+  </xsl:template>
 
-  	<!-- The CSS Stylesheet -->
-  <xsl:param name="html.stylesheet" select="'../stylesheets/blfs.css'"/>
+  <xsl:template match='prefaceinfo|chapterinfo|sect1info' mode='attribution'>
+    <p class='updated'> Last updated <!-- by 
+      <xsl:apply-templates select="othername" mode='attribution'/> -->
+      on 
+      <xsl:apply-templates select="date" mode='attribution'/> 
+    </p>
+  </xsl:template>
 
-  	<!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"></xsl:param>
-  <xsl:param name="css.decoration" select="0"></xsl:param>
-  
-    <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
-  
-    <!-- Insert a stylesheet for printing -->
-  <xsl:template name='user.head.content'>
-     <link rel='stylesheet' href="../stylesheets/blfs-print.css" type="text/css" media='print'/>
+  <xsl:template match='othername' mode='attribution'> 
+     <xsl:variable name='author'>
+          <xsl:value-of select='.'/>
+     </xsl:variable>
+     <xsl:variable name='nameonly'>
+          <xsl:value-of select='substring($author,16)'/>
+     </xsl:variable>
+     <xsl:value-of select="substring-before($nameonly,'$')" />
   </xsl:template> 
 
-<xsl:template match="userinput">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
+  <xsl:template match='date' mode='attribution'> 
+      <xsl:variable name='date'>
+         <xsl:value-of select='.'/>
+      </xsl:variable>
+      <xsl:value-of select="substring($date,7,26)" />
+  </xsl:template> 
 
 </xsl:stylesheet>
Index: stylesheets/blfs-chunked1.xsl
===================================================================
--- stylesheets/blfs-chunked1.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/blfs-chunked1.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+  <xsl:import href="blfs-chunked2.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/chunk-common.xsl"/>
+  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/manifest.xsl"/>
+
+    <!--  From the original chunk.xsl file:
+
+    Why is chunk-code now xsl:included?
+
+    Suppose you want to customize *both* the chunking algorithm used *and* the
+    presentation of some elements that may be chunks. In order to do that, you
+    must get the order of imports "just right". The answer is to make your own
+    copy of this file, where you replace the initial import of "docbook.xsl"
+    with an import of your own base.xsl (that does its own import of docbook.xsl).
+
+    Put the templates for changing the presentation of elements in your base.xsl.
+
+    Put the templates that control chunking after the include of chunk-code.xsl.
+
+    Voila! (Man I hope we can do this better in XSLT 2.0)  -->
+
+  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/chunk-code.xsl"/>
+
+    <!-- Including our others customized chunks templates -->
+  <xsl:include href="xhtml/lfs-index.xsl"/>
+  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
+  <xsl:include href="xhtml/lfs-navigational.xsl"/>
+
+</xsl:stylesheet>
Index: stylesheets/blfs-chunked2.xsl
===================================================================
--- stylesheets/blfs-chunked2.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/blfs-chunked2.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+  	<!-- We use XHTML -->
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/docbook.xsl"/>
+  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
+  
+  	<!-- Including our others customized elements templates -->
+  <xsl:include href="xhtml/lfs-admon.xsl"/>
+  <xsl:include href="xhtml/lfs-mixed.xsl"/> 
+  <xsl:include href="xhtml/lfs-sections.xsl"/>
+  <xsl:include href="xhtml/lfs-titles.xsl"/>
+  <xsl:include href="xhtml/lfs-toc.xsl"/>
+  <xsl:include href="xhtml/lfs-xref.xsl"/>
+
+    <!-- This file contains our localization strings (for internationalization) -->
+  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
+
+  	<!-- The CSS Stylesheets -->
+  <xsl:param name="html.stylesheet" select="'../stylesheets/blfs.css'"/>
+  <xsl:template name='user.head.content'>
+     <link rel='stylesheet' href="../stylesheets/blfs-print.css" type="text/css" media='print'/>
+  </xsl:template> 
+
+  	<!-- Dropping some unwanted style attributes -->
+  <xsl:param name="ulink.target" select="''"></xsl:param>
+  <xsl:param name="css.decoration" select="0"></xsl:param>
+  
+    <!-- No XML declaration -->
+  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
+
+</xsl:stylesheet>
Index: stylesheets/blfs-nochunks.xsl
===================================================================
--- stylesheets/blfs-nochunks.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/blfs-nochunks.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,658 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+    <!-- We use XHTML -->
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/docbook.xsl"/>
+
+  <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
+  <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
+  
+   <!-- Including our others customized templates -->
+  <xsl:include href="xhtml/lfs-admon.xsl"/>
+  <xsl:include href="xhtml/lfs-index.xsl"/>
+  <xsl:include href="xhtml/lfs-mixed.xsl"/>
+  <xsl:include href="xhtml/lfs-sections.xsl"/>
+  <xsl:include href="xhtml/lfs-toc.xsl"/>
+  <xsl:include href="xhtml/lfs-xref.xsl"/>
+
+    <!-- This file contains our localization strings (for internationalization) -->
+  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
+
+    <!-- Dropping some unwanted style attributes -->
+  <xsl:param name="ulink.target" select="''"></xsl:param>
+  <xsl:param name="css.decoration" select="0"></xsl:param>
+
+    <!-- To drop the remainig dot when title is empty (from lfs-titles.xsl)-->
+  <xsl:template name="sect2.titlepage">
+    <xsl:choose>
+      <xsl:when test="string-length(title) = 0"/>
+      <xsl:otherwise>
+        <div class="titlepage">
+          <xsl:if test="@id">
+            <a id="{@id}" name="{@id}"/>
+          </xsl:if>
+          <h3 class="{name(.)}">
+            <xsl:apply-templates select="." mode="label.markup"/>
+            <xsl:text>. </xsl:text>
+            <xsl:value-of select="title"/>
+          </h3>
+        </div>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- Added the role param for proper punctuation in xref calls
+            (from lfs-titles.xsl). -->
+  <xsl:template match="*" mode="insert.title.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="title"/>
+    <xsl:param name="role"/>
+    <xsl:choose>
+      <xsl:when test="$purpose = 'xref' and titleabbrev">
+        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$title"/>
+        <xsl:value-of select="$role"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- The CSS Stylesheet -->
+  <xsl:template name='user.head.content'>
+    <style type="text/css">
+      <xsl:text>
+/* Global settings */
+body {
+  font-family: verdana, tahoma, helvetica, arial, sans-serif;
+  text-align: left;
+  background: #fff;
+  color: #333;
+  margin: 1em;
+  padding: 0;
+  font-size: 1em;
+  line-height: 1.2em
+}
+
+a:link { color: #22b; }
+a:visited { color: #7e4988; }
+a:hover, a:focus { color: #d30e08; }
+a:active { color: #6b77b1;}
+
+/* Headers */
+h1, h2, b, strong {
+  color: #000;
+  font-weight: bold;
+}
+
+h3, h4, h5, h6 {
+  color: #222;
+}
+
+h1 { font-size: 173%; text-align: center; }
+h2 { font-size: 144%; }
+h2.subtitle { text-align: center; }
+h3 { font-size: 120%; padding-top: 0.2em; margin-top: 0.3em; }
+h4 { font-size: 110%;}
+h5, h6 { font-size: 110%; font-style: italic; }
+
+/* TOC and Index*/
+
+div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
+  list-style: none;
+}
+
+div.toc, div.dedication {
+  padding-left: 1em;
+}
+
+li.preface {
+  margin-left: 1em;
+}
+
+div.toc ul li h3, div.toc ul li h4 {
+  margin: .4em;
+}
+
+.item {
+    width: 15em;
+    float: left;
+}
+
+.secitem {
+    font-weight: normal;
+    width: 14em;
+    float: left;
+}
+
+/* Admonitions */
+div.note, div.tip {
+  background-color: #fffff6;
+  border: 2px solid #dbddec;
+  width: 90%;
+  margin: .5em auto;
+}
+
+div.important, div.warning, div.caution {
+  background-color: #fffff6;
+  border: medium solid #400;
+  width: 90%;
+  margin: 1.5em auto;
+  color: #600;
+  font-size: larger;
+}
+
+div.important h3, div.warning h3, div.caution h3 {
+  color: #900;
+}
+
+div.admonhead img {
+  display: none;
+}
+
+h3.admontitle {
+  padding-left: 2.5em;
+  padding-top: 1em;
+}
+
+div.admonbody {
+  margin: .5em;
+}
+
+div.important em, div.warning em, div.caution em {
+  color: #000;
+  font-weight: bold;
+}
+
+div.important tt, div.warning tt, div.caution tt {
+  font-weight: bold;
+}
+
+/* variablelist and segmentedlist */
+dl {
+  margin: 0;
+  padding: 0;
+}
+
+dt {
+  display: list-item;
+  font-weight: bold;
+  margin: .33em 0 0 1em;
+  padding: 0;
+}
+
+div.content dt {
+  list-style: none;
+}
+
+dd  {
+  margin: 0 0 1em 3em;
+  padding: 0;
+}
+
+div.variablelist dd {
+  margin-bottom: 1em;
+}
+
+div.variablelist dd p {
+  margin-top: 0px;
+}
+
+dl.materials dd {
+  margin-left: 0px;
+}
+
+div.segmentedlist {
+  margin-top: 1em;
+}
+
+div.segmentedlist p {
+  margin: 0px auto;
+}
+
+/* itemizedlist */
+
+div.itemizedlist {
+  margin-left: 1em;
+}
+
+div.sect3 li p {
+  padding: 0.3em;
+  margin: 0em;
+  background-color: #f0fff0;
+}
+
+/* Indented blocks */
+p, ul, dl, code, blockquote {
+  padding-left: 1em;
+}
+
+/* Monospaced elements */
+tt, code, kbd, pre, .command {
+  font-family: monospace;
+}
+
+pre.userinput {
+  color: #101310;
+  background-color: #e5e5e5;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+  font-weight: bold;
+}
+
+pre.screen {
+  background-color: #e9e9e9;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+}
+
+/* Sections */
+div.package {
+  background: #f5f6f7;
+  border-bottom: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 0.3em 0.5em;
+  margin: 0px auto;
+}
+
+div.installation {
+  padding: 0 0.5em 0.3em 0.5em;
+  margin: 0.5em 0 0.5em 0;
+}
+
+div.configuration {
+  background:   #fefefe;
+  border-top: 0.2em solid #dbddec;
+  padding: 0.5em;
+  margin: 0.5em 0 .5em 0;
+}
+
+div.content {
+  background: #f5f6f7;
+  border-top: 0.2em solid #dbddec;
+  border-bottom: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 1em 0.5em;
+  margin: 0.5em 0 .5em 0;
+}
+
+div.installation h3.title, div.content h3.title {
+  padding-top: 0.3em;
+  margin: 0;
+}
+
+div.book, div.preface, div.part, div.chapter, div.sect1, div.appendix, div.index {
+  padding-bottom: 0.5em;
+}
+
+div.preface h2, div.part h1, div.chapter h2.title, div.sect1 h2.title, div.appendix h1, div.index h1 {
+  background: #f5f6f7;
+  border-bottom: .2em solid #dbddec;
+  border-top: .2em solid #dbddec;
+  margin-top 1em;
+  padding: .5em;
+  text-align: center;
+}
+
+div.book h1 {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding: 0.5em;
+}
+
+div.book h2.subtitle {
+  background: #dbddec;
+  margin: 0px auto;
+  padding: 0.2em;
+}
+div.authorgroup, div p.copyright, div.abstract div p.pubdate, div.revhistory {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding:  1em 0.5em;
+}
+
+hr {
+  background: #dbddec;
+  height: .3em;
+  border: 0px;
+  margin: 0px auto;
+  padding: 0;
+}
+      </xsl:text>
+    </style>
+  </xsl:template>
+
+</xsl:stylesheet>
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+    <!-- We use XHTML -->
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/docbook.xsl"/>
+
+  <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
+  <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
+  
+   <!-- Including our others customized templates -->
+  <xsl:include href="xhtml/lfs-admon.xsl"/>
+  <xsl:include href="xhtml/lfs-index.xsl"/>
+  <xsl:include href="xhtml/lfs-mixed.xsl"/>
+  <xsl:include href="xhtml/lfs-sections.xsl"/>
+  <xsl:include href="xhtml/lfs-toc.xsl"/>
+  <xsl:include href="xhtml/lfs-xref.xsl"/>
+
+    <!-- This file contains our localization strings (for internationalization) -->
+  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
+
+    <!-- Dropping some unwanted style attributes -->
+  <xsl:param name="ulink.target" select="''"></xsl:param>
+  <xsl:param name="css.decoration" select="0"></xsl:param>
+
+    <!-- To drop the remainig dot when title is empty (from lfs-titles.xsl)-->
+  <xsl:template name="sect2.titlepage">
+    <xsl:choose>
+      <xsl:when test="string-length(title) = 0"/>
+      <xsl:otherwise>
+        <div class="titlepage">
+          <xsl:if test="@id">
+            <a id="{@id}" name="{@id}"/>
+          </xsl:if>
+          <h3 class="{name(.)}">
+            <xsl:apply-templates select="." mode="label.markup"/>
+            <xsl:text>. </xsl:text>
+            <xsl:value-of select="title"/>
+          </h3>
+        </div>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- Added the role param for proper punctuation in xref calls
+            (from lfs-titles.xsl). -->
+  <xsl:template match="*" mode="insert.title.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="title"/>
+    <xsl:param name="role"/>
+    <xsl:choose>
+      <xsl:when test="$purpose = 'xref' and titleabbrev">
+        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$title"/>
+        <xsl:value-of select="$role"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- The CSS Stylesheet -->
+  <xsl:template name='user.head.content'>
+    <style type="text/css">
+      <xsl:text>
+/* Global settings */
+body {
+  font-family: verdana, tahoma, helvetica, arial, sans-serif;
+  text-align: left;
+  background: #fff;
+  color: #333;
+  margin: 1em;
+  padding: 0;
+  font-size: 1em;
+  line-height: 1.2em
+}
+
+a:link { color: #22b; }
+a:visited { color: #7e4988; }
+a:hover, a:focus { color: #d30e08; }
+a:active { color: #6b77b1;}
+
+/* Headers */
+h1, h2, b, strong {
+  color: #000;
+  font-weight: bold;
+}
+
+h3, h4, h5, h6 {
+  color: #222;
+}
+
+h1 { font-size: 173%; text-align: center; }
+h2 { font-size: 144%; }
+h2.subtitle { text-align: center; }
+h3 { font-size: 120%; padding-top: 0.2em; margin-top: 0.3em; }
+h4 { font-size: 110%;}
+h5, h6 { font-size: 110%; font-style: italic; }
+
+/* TOC and Index*/
+
+div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
+  list-style: none;
+}
+
+div.toc, div.dedication {
+  padding-left: 1em;
+}
+
+li.preface {
+  margin-left: 1em;
+}
+
+div.toc ul li h3, div.toc ul li h4 {
+  margin: .4em;
+}
+
+.item {
+    width: 15em;
+    float: left;
+}
+
+.secitem {
+    font-weight: normal;
+    width: 14em;
+    float: left;
+}
+
+/* Admonitions */
+div.note, div.tip {
+  background-color: #fffff6;
+  border: 2px solid #dbddec;
+  width: 90%;
+  margin: .5em auto;
+}
+
+div.important, div.warning, div.caution {
+  background-color: #fffff6;
+  border: medium solid #400;
+  width: 90%;
+  margin: 1.5em auto;
+  color: #600;
+  font-size: larger;
+}
+
+div.important h3, div.warning h3, div.caution h3 {
+  color: #900;
+}
+
+div.admonhead img {
+  display: none;
+}
+
+h3.admontitle {
+  padding-left: 2.5em;
+  padding-top: 1em;
+}
+
+div.admonbody {
+  margin: .5em;
+}
+
+div.important em, div.warning em, div.caution em {
+  color: #000;
+  font-weight: bold;
+}
+
+div.important tt, div.warning tt, div.caution tt {
+  font-weight: bold;
+}
+
+/* variablelist and segmentedlist */
+dl {
+  margin: 0;
+  padding: 0;
+}
+
+dt {
+  display: list-item;
+  font-weight: bold;
+  margin: .33em 0 0 1em;
+  padding: 0;
+}
+
+div.content dt {
+  list-style: none;
+}
+
+dd  {
+  margin: 0 0 1em 3em;
+  padding: 0;
+}
+
+div.variablelist dd {
+  margin-bottom: 1em;
+}
+
+div.variablelist dd p {
+  margin-top: 0px;
+}
+
+dl.materials dd {
+  margin-left: 0px;
+}
+
+div.segmentedlist {
+  margin-top: 1em;
+}
+
+div.segmentedlist p {
+  margin: 0px auto;
+}
+
+/* itemizedlist */
+
+div.itemizedlist {
+  margin-left: 1em;
+}
+
+div.sect3 li p {
+  padding: 0.3em;
+  margin: 0em;
+  background-color: #f0fff0;
+}
+
+/* Indented blocks */
+p, ul, dl, code, blockquote {
+  padding-left: 1em;
+}
+
+/* Monospaced elements */
+tt, code, kbd, pre, .command {
+  font-family: monospace;
+}
+
+pre.userinput {
+  color: #101310;
+  background-color: #e5e5e5;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+  font-weight: bold;
+}
+
+pre.screen {
+  background-color: #e9e9e9;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+}
+
+/* Sections */
+div.package {
+  background: #f5f6f7;
+  border-bottom: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 0.3em 0.5em;
+  margin: 0px auto;
+}
+
+div.installation {
+  padding: 0 0.5em 0.3em 0.5em;
+  margin: 0.5em 0 0.5em 0;
+}
+
+div.configuration {
+  background:   #fefefe;
+  border-top: 0.2em solid #dbddec;
+  padding: 0.5em;
+  margin: 0.5em 0 .5em 0;
+}
+
+div.content {
+  background: #f5f6f7;
+  border-top: 0.2em solid #dbddec;
+  border-bottom: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 1em 0.5em;
+  margin: 0.5em 0 .5em 0;
+}
+
+div.installation h3.title, div.content h3.title {
+  padding-top: 0.3em;
+  margin: 0;
+}
+
+div.book, div.preface, div.part, div.chapter, div.sect1, div.appendix, div.index {
+  padding-bottom: 0.5em;
+}
+
+div.preface h2, div.part h1, div.chapter h2.title, div.sect1 h2.title, div.appendix h1, div.index h1 {
+  background: #f5f6f7;
+  border-bottom: .2em solid #dbddec;
+  border-top: .2em solid #dbddec;
+  margin-top 1em;
+  padding: .5em;
+  text-align: center;
+}
+
+div.book h1 {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding: 0.5em;
+}
+
+div.book h2.subtitle {
+  background: #dbddec;
+  margin: 0px auto;
+  padding: 0.2em;
+}
+div.authorgroup, div p.copyright, div.abstract div p.pubdate, div.revhistory {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding:  1em 0.5em;
+}
+
+hr {
+  background: #dbddec;
+  height: .3em;
+  border: 0px;
+  margin: 0px auto;
+  padding: 0;
+}
+      </xsl:text>
+    </style>
+  </xsl:template>
+
+</xsl:stylesheet>
Index: stylesheets/blfs-print.xsl
===================================================================
--- stylesheets/blfs-print.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/blfs-print.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,57 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org>
-Based on the original lfs-pdf.xsl created by Matthew Burgess -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  	<!-- We use FO and FOP as the processor -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.65.1/fo/docbook.xsl"/>
-  <xsl:param name="fop.extensions" select="1"/>
-  <xsl:param name="draft.mode" select="'no'"/>
-
-  	<!-- Including our others customized templates -->
-  <xsl:include href="print/lfs-index.xsl"/>
-  <xsl:include href="print/lfs-pagesetup.xsl"/>
-
-  	<!-- Probably want to make the paper size configurable -->
-  <xsl:param name="paper.type" select="'letter'"/>
-
-  	<!-- Printing Style -->
-  <xsl:param name="double.sided" select="1"/>
-  <xsl:param name="hyphenate">true</xsl:param>
-  <xsl:param name="alignment">justify</xsl:param>
-  
-  	<!-- Hyphenate links -->
-  <xsl:param name="ulink.hyphenate" select="' '"></xsl:param>
-
-  	<!-- Font size -->
-  <xsl:param name="body.font.master">8</xsl:param>
-  <xsl:param name="body.font.size">10pt</xsl:param>
-
-  	<!-- TOC stuff -->
-  <xsl:param name="generate.toc">
-    book      toc
-    part      nop
-  </xsl:param>
-  <xsl:param name="toc.section.depth">1</xsl:param>
-  <xsl:param name="generate.section.toc.level" select="-1"></xsl:param>
-  <xsl:param name="toc.indent.width" select="18"></xsl:param>
-
-  	<!-- Page number in Xref-->
-  <xsl:param name="insert.xref.page.number">yes</xsl:param>
-	<xsl:template match="*" mode="page.citation">
-  	<xsl:param name="id" select="'???'"/>
-  	<fo:inline keep-together.within-line="always">
-  		<xsl:text>[p</xsl:text>
-      <fo:page-number-citation ref-id="{$id}"/>
-  		<xsl:text>]</xsl:text>
-  	</fo:inline>
-	</xsl:template>
-
-  	<!-- Prevent duplicate e-mails in the Acknowledgments pages-->
-  <xsl:param name="ulink.show" select="0"/>
-
-</xsl:stylesheet>
Index: stylesheets/blfs.css
===================================================================
--- stylesheets/blfs.css	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/blfs.css	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,33 +1,226 @@
+/* Global settings */
 body {
-  font-weight: normal;
-  font-size: medium;
   font-family: verdana, tahoma, helvetica, arial, sans-serif;
   text-align: left;
-}
-
-.toc ul, .index ul {
-	list-style: none;
-}
-
-.navheader {
-  font-size: smaller;
+  background: #fff;
+  color: #333;
+  margin: 1em;
+  padding: 0;
+  font-size: 1em;
+  line-height: 1.2em
+}
+
+a:link { color: #22b; }
+a:visited { color: #7e4988; }
+a:hover, a:focus { color: #d30e08; }
+a:active { color: #6b77b1;}
+
+/* Headers */
+h1, h2, b, strong {
+  color: #000;
+  font-weight: bold;
+}
+
+h3, h4, h5, h6 {
+  color: #222;
+}
+
+strong {
+  color: #55f;  /* Light Blue */
+}
+
+h1 { font-size: 173%; text-align: center; }
+h2 { font-size: 144%; padding-top: 0.2em; margin-top: 0.3em; }
+h2.subtitle { text-align: center; }
+h3 { font-size: 120%; }
+h4 { font-size: 110%;}
+h5, h6 { font-size: 110%; font-style: italic; }
+
+/* Navigation */
+div.headertitles h4 {
+  margin-bottom: 2px;
   text-align: center;
-  padding-bottom: 0.5em;
-  border-bottom: solid 2px #080;
-}
-
-.navheader p {
-  margin: 1em 0em;
-}
-
-.navfooter {
-  font-size: smaller;
+}
+
+div.headertitles h3 {
+  margin-top: 2px;
   text-align: center;
-  padding-top: 0.5em;
-  border-top: solid 2px #080;
-}
-
-div.sect3 li {
-  /* padding: 0em; */
+}
+
+div.navheader, div.navfooter {
+  background: #ecedef;
+  padding: 0.1em 1em;
+  border-bottom: 1px solid #dbddec;
+}
+
+div.navfooter {
+  border-bottom: 0;
+  border-top: 1px solid #dbddec;
+}
+
+div.navheader ul, div.navfooter ul {
+  padding: .2em .5em .5em 0;
+  margin-left: 0px;
+  margin-right: 2px;
+  position: relative;
+  background: #dbddec;
+}
+
+div.navheader ul li, div.navfooter ul li {
+  display: inline;
+  width: 40%;
+}
+
+div.navheader ul li.prev, div.navfooter ul li.prev {
+  position: absolute;
+  display: block;
+  left: 0;
+  text-align: left;
+  padding: 0.2em 1em;
+  margin-left: 6px;
+}
+
+div.navheader ul li.next, div.navfooter ul li.next {
+  position: absolute;
+  display: block;
+  text-align: right;
+  right: 5px;
+  padding: 0.2em 0.5em;
+  margin-right: 7px;
+}
+
+div.navheader ul li.prev p, div.navfooter ul li.prev p,
+div.navheader ul li.next p, div.navfooter ul li.next p {
+  padding: 0;
+  margin: 1px 0px;
+}
+
+div.navheader ul li.home, div.navheader ul li.up,
+div.navfooter ul li.home, div.navfooter ul li.up {
+  text-align: center;
+  padding: 0;
+  margin: 0px auto;
+  display: block;
+  color: #dbddec;
+}
+
+/* TOC & Index*/
+
+div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
+  list-style: none;
+}
+
+div.toc, div.dedication {
+  padding-left: 1em;
+}
+
+li.preface {
+  margin-left: 1em;
+}
+
+div.toc ul li h3, div.toc ul li h4 {
+  margin: .4em;
+}
+
+.item {
+    width: 17em;
+    float: left;
+}
+
+.secitem {
+    font-weight: normal;
+    width: 16em;
+    float: left;
+}
+
+/* Admonitions */
+div.note, div.tip {
+  background-color: #fffff6;
+  border: 2px solid #dbddec;
+  width: 90%;
+  margin: .5em auto;
+}
+
+div.important, div.warning, div.caution {
+  background-color: #fffff6;
+  border: medium solid #400;
+  width: 90%;
+  margin: 1.5em auto;
+  color: #600;
+  font-size: larger;
+}
+
+div.important h3, div.warning h3, div.caution h3 {
+  color: #900;
+}
+
+div.admonhead img {
+  padding: .3em;
+}
+
+div.admonhead h3 {
+  display: inline;
+  margin-left: 1.5em;
+}
+
+div.admonbody {
+  margin: .5em;
+}
+
+div.important em, div.warning em, div.caution em {
+  color: #000;
+  font-weight: bold;
+}
+
+div.important tt, div.warning tt, div.caution tt {
+  font-weight: bold;
+}
+
+/* variablelist & segmentedlist */
+dl {
+  margin: 0;
+  padding: 0;
+}
+
+dt {
+  display: list-item;
+  font-weight: bold;
+  margin: .33em 0 0 1em;
+  padding: 0;
+}
+
+div.content dt {
+  list-style: none;
+}
+
+dd  {
+  margin: 0 0 1em 3em;
+  padding: 0;
+}
+
+div.variablelist dd {
+  margin-bottom: 1em;
+}
+
+div.variablelist dd p {
+  margin-top: 0px;
+}
+
+dl.materials dd {
+  margin-left: 0px;
+}
+
+div.segmentedlist {
+  margin-top: 1em;
+}
+
+div.segmentedlist p {
+  margin: 0px auto;
+}
+
+/* itemizedlist */
+
+div.itemizedlist {
+  margin-left: 1em;
 }
 
@@ -38,126 +231,119 @@
 }
 
-.prev {
-  width: 40%;
-  float: left;
-  text-align: left;
+/* Indented blocks */
+p, ul, dl, code, blockquote {
   padding-left: 1em;
 }
 
-.next {
-  width: 40%;
-  float: right;
-  text-align: right;
-  padding-right: 1em;
-}
-
-p, h1, h2, h3, h4, h5, h6 {
-  margin: 0.5em 0em;
-}
-
-h4 {
-  font-size: 90%;
-  padding-left: 0em;
-}
-
-
-div.navheader ul li, div.navfooter ul li {
-	display: inline;
-  padding: 4em;
-}
-
-li.preface {
-	margin-left: 2.5em;
-}
-
-div.book div.titlepage h1.title {
-    font-weight: bold;
-    font-size: xx-large;
-    text-align: center;
-}
-
-div.book div.titlepage h2.subtitle {
-    font-weight: bold;
-    font-size: x-large;
-    text-align: center;
-}
-
-div.book div.titlepage h3.author {
-    font-size: large;
-}
-
-div.book div.dedication div.titlepage h2.title {
-    font-weight: normal;
-    font-size: x-large;
-}
-
-div.chapter div.titlepage h2.title {
-    font-weight: bold;
-    font-size: x-large;
-    text-align: left;
-}
-
-div.sect1 div.titlepage h2.title {
-    font-weight: bold;
-    font-size: x-large;
-    text-align: left;
-}
-
-div.appendix  p.title {
-    font-weight: bold;
-    font-size: large;
-    text-align: center;
-}
-
-
-tt {
-    font-family: courier, monospace;
-    font-size: 110%;
+/* Monospaced elements */
+tt, code, kbd, pre, .command {
+  font-family: monospace;
+}
+
+pre.userinput {
+  color: #101310;
+  background-color: #e5e5e5;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+}
+
+.literal {
+  font-weight: normal;
 }
 
 pre.screen {
-    color: black;
-    background-color: #dddddd;
-    font-family: Courier, monospace;
-        font-size: 13px; 
-}
-
-pre.screen {
-  padding: 0.5em 1.5em;
-  line-height: 110%;
-}
-
-pre.synopsis {
-    color: black;
-    background-color: #dddddd;
-}
-
-div.admonition {
-  border: medium solid;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.admonhead h3 {
-	display: inline;
-	margin-left: 1.5em;
-}
-
-div.admonbody {
-	margin: .5em;
-}
-
-b.command {
-    font-family: courier, monospace;
-}
-
-.item {
-    width: 15em;
-    float: left;
-}
-
-.secitem {
-    font-weight: normal;
-    width: 12.5em;
-    float: left;
-}
+  color: #000;
+  background-color: #e9e9e9;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+}
+
+/* Sections */
+div.wrap h1, div.glossary h2 {
+  background: #f5f6f7;
+  padding: 1em 0 0.5em 0;
+  margin: 0px auto;
+}
+
+div.glossary h2 {
+  text-align: center;
+   font-size: 173%;
+   padding-top: 0.4em;
+   border-bottom: .1em solid #dbddec;
+}
+
+div.package {
+  background: #f5f6f7;
+  border-bottom: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 0.3em 0.5em;
+  margin: 0px auto;
+}
+
+div.installation {
+  padding: 0 0.5em 0.3em 0.5em;
+  margin: 0.5em 0 0.5em 0;
+}
+
+div.configuration {
+  background:   #fefefe;
+  border-top: 0.2em solid #dbddec;
+  padding: 0.5em;
+  margin: 0.5em 0 .5em 0;
+}
+
+div.content {
+  background: #f5f6f7;
+  border-top: 0.2em solid #dbddec;
+  padding: 0.5em 0.5em 1em 0.5em;
+  margin: 0.5em 0 .5em 0;
+}
+
+div.installation h2, div.content h2 {
+  padding-top: 0.3em;
+  margin: 0;
+}
+
+div.book, div.preface, div.part, div.chapter, div.sect1, div.appendix, div.index {
+  padding-bottom: 0.5em;
+}
+
+div.preface h1, div.part h1, div.chapter h1, div.sect1 h1, div.appendix h1, div.index h1 {
+  background: #f5f6f7;
+  border-bottom: .1em solid #dbddec;
+  margin: 0px auto;
+  padding: .5em;
+}
+
+div.book h1 {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding: 0.5em;
+}
+
+div.book h2.subtitle {
+  background: #dbddec;
+  margin: 0px auto;
+  padding: 0.2em;
+}
+div.authorgroup, div p.copyright, div.abstract, div p.pubdate, div.revhistory {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding:  1em 0.5em;
+}
+
+hr {
+  background: #dbddec;
+  height: .3em;
+  border: 0px;
+  margin: 0px auto;
+  padding: 0;
+}
+
+/* Last edited info */
+p.updated {
+  font-size: small;
+  font-weight: bold;
+  font-style: italic;
+}
Index: stylesheets/lfs-l10n.xml
===================================================================
--- stylesheets/lfs-l10n.xml	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/lfs-l10n.xml	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='US-ASCII'?>
+
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+
+    <!-- Template to add more languages -->
+  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
+          language="xx" english-language-name="xxxxx">
+
+    <l:gentext key="description" text=""/>
+    <l:gentext key="Bootscripts" text=""/>
+    <l:gentext key="Configuration Files" text=""/>
+    <l:gentext key="Libraries" text=""/>
+    <l:gentext key="Others" text=""/>
+    <l:gentext key="Packages" text=""/>
+    <l:gentext key="Programs" text=""/>
+    <l:gentext key="Scripts" text=""/>
+
+  </l:l10n>
+
+    <!-- English -->
+  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
+          language="en" english-language-name="English">
+
+    <l:gentext key="description" text="description"/>
+    <l:gentext key="Bootscripts" text="Bootscripts"/>
+    <l:gentext key="Configuration Files" text="Configuration Files"/>
+    <l:gentext key="Libraries" text="Libraries"/>
+    <l:gentext key="Others" text="Others"/>
+    <l:gentext key="Packages" text="Packages"/>
+    <l:gentext key="Programs" text="Programs"/>
+    <l:gentext key="Scripts" text="Scripts"/>
+
+  </l:l10n>
+
+    <!-- Spanish -->
+  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
+          language="es" english-language-name="Spanish">
+
+    <l:gentext key="description" text="descripci&#243;n"/>
+    <l:gentext key="Bootscripts" text="Guiones de arranque"/>
+    <l:gentext key="Configuration Files" text="Ficheros de configuraci&#243;n"/>
+    <l:gentext key="Libraries" text="Librer&#237;as"/>
+    <l:gentext key="Others" text="Otros"/>
+    <l:gentext key="Packages" text="Paquetes"/>
+    <l:gentext key="Programs" text="Programas"/>
+    <l:gentext key="Scripts" text="Guiones"/>
+
+  </l:l10n>
+
+</l:i18n>
Index: stylesheets/pdf/lfs-admon.xsl
===================================================================
--- stylesheets/pdf/lfs-admon.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/pdf/lfs-admon.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+
+    <!-- Graphics in admonitions -->
+  <xsl:param name="admon.graphics" select="1"/>
+  <xsl:param name="admon.graphics.path" select="'images/'"/>
+
+    <!-- Admonition block properties -->
+  <xsl:template match="important|warning|caution">
+    <xsl:choose>
+      <xsl:when test="$admon.graphics != 0">
+        <fo:block space-before.minimum="0.4em" space-before.optimum="0.6em"
+              space-before.maximum="0.8em" border-style="solid" border-width="1pt"
+              border-color="#500" background-color="#FFFFE6">
+        <xsl:call-template name="graphical.admonition"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="nongraphical.admonition"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="note|tip">
+    <xsl:choose>
+      <xsl:when test="$admon.graphics != 0">
+        <fo:block space-before.minimum="0.4em" space-before.optimum="0.6em"
+              space-before.maximum="0.8em" border-style="solid" border-width="1pt"
+              border-color="#E0E0E0" background-color="#FFFFE6">
+        <xsl:call-template name="graphical.admonition"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="nongraphical.admonition"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- Admonitions text properties -->
+  <xsl:attribute-set name="admonition.properties">
+    <xsl:attribute name="margin-right">6pt</xsl:attribute>
+  </xsl:attribute-set>
+
+    <!-- Adding left space to the graphics and color to the titles -->
+  <xsl:template name="graphical.admonition">
+    <xsl:variable name="id">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="graphic.width">
+     <xsl:apply-templates select="." mode="admon.graphic.width"/>
+    </xsl:variable>
+    <fo:block id="{$id}">
+      <fo:list-block provisional-distance-between-starts="{$graphic.width} + 18pt"
+              provisional-label-separation="18pt" xsl:use-attribute-sets="list.block.spacing">
+        <fo:list-item>
+            <fo:list-item-label end-indent="label-end()">
+              <fo:block margin-left="4pt">
+                <fo:external-graphic width="auto" height="auto"
+                        content-width="{$graphic.width}" >
+                  <xsl:attribute name="src">
+                    <xsl:call-template name="admon.graphic"/>
+                  </xsl:attribute>
+                </fo:external-graphic>
+              </fo:block>
+            </fo:list-item-label>
+            <fo:list-item-body start-indent="body-start()">
+              <xsl:if test="$admon.textlabel != 0 or title">
+                <fo:block xsl:use-attribute-sets="admonition.title.properties">
+                  <xsl:if test="ancestor-or-self::important">
+                    <xsl:attribute name="color">#500</xsl:attribute>
+                  </xsl:if>
+                  <xsl:if test="ancestor-or-self::warning">
+                    <xsl:attribute name="color">#500</xsl:attribute>
+                  </xsl:if>
+                  <xsl:if test="ancestor-or-self::caution">
+                    <xsl:attribute name="color">#500</xsl:attribute>
+                  </xsl:if>
+                  <xsl:apply-templates select="." mode="object.title.markup"/>
+                </fo:block>
+              </xsl:if>
+              <fo:block xsl:use-attribute-sets="admonition.properties">
+                <xsl:apply-templates/>
+              </fo:block>
+            </fo:list-item-body>
+        </fo:list-item>
+      </fo:list-block>
+    </fo:block>
+  </xsl:template>
+
+</xsl:stylesheet>
Index: stylesheets/pdf/lfs-index.xsl
===================================================================
--- stylesheets/pdf/lfs-index.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/pdf/lfs-index.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -49,4 +49,10 @@
                 </xsl:when>
                 <xsl:when test="$divtitle = 'E'">
+                    <xsl:text>Configuration Files</xsl:text>
+                </xsl:when>
+                <xsl:when test="$divtitle = 'F'">
+                  <xsl:text>Bootscripts</xsl:text>
+                </xsl:when>
+                <xsl:when test="$divtitle = 'G'">
                     <xsl:text>Others</xsl:text>
                 </xsl:when>
Index: stylesheets/pdf/lfs-mixed.xsl
===================================================================
--- stylesheets/pdf/lfs-mixed.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/pdf/lfs-mixed.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,247 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+
+    <!-- This is a hack and isn't correct semantically. Theoretically, the beginpage 
+      tags should be placed in the XML source only to render the PDF output and 
+      should be removed after it. But there is no a better way and we need this.-->
+  <xsl:template match="beginpage">
+    <fo:block break-after="page"/>
+  </xsl:template>
+  
+    <!-- Allow forced line breaks inside paragraphs emulating literallayout. -->
+ <xsl:template match="para">
+    <xsl:choose>
+      <xsl:when test="./@remap='verbatim'">
+        <fo:block wrap-option="no-wrap"
+                    white-space-collapse="false"
+                    white-space-treatment="preserve"
+                    text-align="start"
+                    linefeed-treatment="preserve">
+          <xsl:call-template name="anchor"/>
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-imports/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- Show URLs in italic font -->
+  <xsl:template match="ulink" name="ulink">
+    <fo:inline font-style="italic">
+      <fo:basic-link xsl:use-attribute-sets="xref.properties">
+        <xsl:attribute name="external-destination">
+          <xsl:call-template name="fo-external-image">
+            <xsl:with-param name="filename" select="@url"/>
+          </xsl:call-template>
+        </xsl:attribute>
+        <xsl:choose>
+          <xsl:when test="count(child::node())=0">
+            <xsl:call-template name="hyphenate-url">
+              <xsl:with-param name="url" select="@url"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </fo:basic-link>
+    </fo:inline>
+    <xsl:if test="count(child::node()) != 0
+                  and string(.) != @url
+                  and $ulink.show != 0">
+      <!-- yes, show the URI -->
+      <xsl:choose>
+        <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)">
+          <xsl:text>&#xA0;</xsl:text>
+          <fo:footnote>
+            <xsl:call-template name="ulink.footnote.number"/>
+            <fo:footnote-body font-family="{$body.fontset}"
+                              font-size="{$footnote.font.size}">
+              <fo:block>
+                <xsl:call-template name="ulink.footnote.number"/>
+                <xsl:text> </xsl:text>
+                <fo:inline>
+                  <xsl:value-of select="@url"/>
+                </fo:inline>
+              </fo:block>
+            </fo:footnote-body>
+          </fo:footnote>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:inline hyphenate="false">
+            <xsl:text> [</xsl:text>
+            <xsl:call-template name="hyphenate-url">
+              <xsl:with-param name="url" select="@url"/>
+            </xsl:call-template>
+            <xsl:text>]</xsl:text>
+          </fo:inline>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:template>
+
+    <!-- Split URLs (obsolete, keeped as reference) -->
+  <!--<xsl:template name="hyphenate-url">
+    <xsl:param name="url" select="''"/>
+    <xsl:choose>
+      <xsl:when test="ancestor::varlistentry">
+        <xsl:choose>
+          <xsl:when test="string-length($url) > 90">
+            <xsl:value-of select="substring($url, 1, 50)"/>
+            <xsl:param name="rest" select="substring($url, 51)"/>
+            <xsl:value-of select="substring-before($rest, '/')"/>
+            <xsl:text> /</xsl:text>
+            <xsl:value-of select="substring-after($rest, '/')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$url"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$url"/>-->
+      <!--  <xsl:value-of select="substring-before($url, '//')"/>
+        <xsl:text>// </xsl:text>
+        <xsl:call-template name="split-url">
+          <xsl:with-param name="url2" select="substring-after($url, '//')"/>
+        </xsl:call-template>-->
+     <!-- </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>-->
+
+  <!--<xsl:template name="split-url">
+    <xsl:choose>
+      <xsl:when test="contains($url2, '/')">
+      <xsl:param name="url2" select="''"/>
+      <xsl:value-of select="substring-before($url2, '/')"/>
+      <xsl:text> /</xsl:text>
+      <xsl:call-template name="split-url">
+        <xsl:with-param name="url2" select="substring-after($url2, '/')"/>
+      </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$url2"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>-->
+
+    <!-- Shade screen -->
+  <xsl:param name="shade.verbatim" select="1"/>
+
+    <!-- How is rendered by default a variablelist -->
+  <xsl:param name="variablelist.as.blocks" select="1"/>
+  <xsl:param name="variablelist.max.termlength">32</xsl:param>
+
+    <!-- Adding space before segmentedlist -->
+  <xsl:template match="segmentedlist">
+    <!--<xsl:variable name="presentation">
+      <xsl:call-template name="pi-attribute">
+        <xsl:with-param name="pis"
+                        select="processing-instruction('dbfo')"/>
+        <xsl:with-param name="attribute" select="'list-presentation'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$presentation = 'table'">
+        <xsl:apply-templates select="." mode="seglist-table"/>
+      </xsl:when>
+      <xsl:when test="$presentation = 'list'">
+        <fo:block space-before.minimum="0.4em" space-before.optimum="0.6em"
+                space-before.maximum="0.8em">
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$segmentedlist.as.table != 0">
+        <xsl:apply-templates select="." mode="seglist-table"/>
+      </xsl:when>
+      <xsl:otherwise>-->
+        <fo:block space-before.minimum="0.4em" space-before.optimum="0.6em"
+                space-before.maximum="0.8em">
+          <xsl:apply-templates/>
+        </fo:block>
+      <!--</xsl:otherwise>
+    </xsl:choose>-->
+  </xsl:template>
+
+    <!-- Presentation of literal tag -->
+  <xsl:template match="literal">
+    <fo:inline  font-weight="normal">
+      <xsl:call-template name="inline.monoseq"/>
+    </fo:inline>
+  </xsl:template>
+
+    <!-- Left alingnament for itemizedlist -->
+  <xsl:template match="itemizedlist">
+    <xsl:variable name="id">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+    <xsl:variable name="label-width">
+      <xsl:call-template name="dbfo-attribute">
+        <xsl:with-param name="pis"
+                        select="processing-instruction('dbfo')"/>
+        <xsl:with-param name="attribute" select="'label-width'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:if test="title">
+      <xsl:apply-templates select="title" mode="list.title.mode"/>
+    </xsl:if>
+    <!-- Preserve order of PIs and comments -->
+    <xsl:apply-templates
+        select="*[not(self::listitem
+                  or self::title
+                  or self::titleabbrev)]
+                |comment()[not(preceding-sibling::listitem)]
+                |processing-instruction()[not(preceding-sibling::listitem)]"/>
+    <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing"
+                  provisional-label-separation="0.2em" text-align="left">
+      <xsl:attribute name="provisional-distance-between-starts">
+        <xsl:choose>
+          <xsl:when test="$label-width != ''">
+            <xsl:value-of select="$label-width"/>
+          </xsl:when>
+          <xsl:otherwise>1.5em</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:apply-templates
+            select="listitem
+                    |comment()[preceding-sibling::listitem]
+                    |processing-instruction()[preceding-sibling::listitem]"/>
+    </fo:list-block>
+  </xsl:template>
+
+    <!-- Addibg a bullet, and left alignament, for packages and paches list. -->
+
+<xsl:template match="varlistentry" mode="vl.as.blocks">
+  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+  <xsl:choose>
+    <xsl:when test="ancestor::variablelist/@role = 'materials'">
+      <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
+          keep-together.within-column="always"
+          keep-with-next.within-column="always" text-align="left">
+        <xsl:text>&#x2022;   </xsl:text>
+        <xsl:apply-templates select="term"/>
+      </fo:block>
+      <fo:block margin-left="0.1in" text-align="left">
+        <xsl:apply-templates select="listitem"/>
+      </fo:block>
+    </xsl:when>
+    <xsl:otherwise>
+      <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
+          keep-together.within-column="always"
+          keep-with-next.within-column="always">
+        <xsl:apply-templates select="term"/>
+      </fo:block>
+      <fo:block margin-left="0.25in">
+        <xsl:apply-templates select="listitem"/>
+      </fo:block>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
Index: stylesheets/pdf/lfs-pagesetup.xsl
===================================================================
--- stylesheets/pdf/lfs-pagesetup.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/pdf/lfs-pagesetup.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,5 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -7,43 +5,34 @@
                 version="1.0">
 
-  	<!-- Force section1's onto a new page -->
-  <xsl:attribute-set name="section.level1.properties">
-  	<xsl:attribute name="break-after">
-    	<xsl:choose>
-  			<xsl:when test="not(position()=last())">
-      		<xsl:text>page</xsl:text>
-    		</xsl:when>
-        <xsl:otherwise>
-      		<xsl:text>auto</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-		<!-- Header -->
-  <xsl:attribute-set name="header.content.properties">
-    <xsl:attribute name="font-family">
-      <xsl:value-of select="$body.fontset"/>
-    </xsl:attribute>
-    <xsl:attribute name="text-align">right</xsl:attribute>
-  </xsl:attribute-set>
-
+    <!-- Header -->
   <xsl:template name="header.content">
-    <xsl:value-of select="/book/bookinfo/title"/>
-    <xsl:text> - </xsl:text>
-    <xsl:value-of select="/book/bookinfo/subtitle"/>
+    <xsl:param name="sequence" select="''"/>
+    <fo:block>
+      <xsl:attribute name="text-align">
+        <xsl:choose>
+          <xsl:when test="$sequence = 'first' or $sequence = 'odd'">right</xsl:when>
+          <xsl:otherwise>left</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:value-of select="/book/bookinfo/title"/>
+      <xsl:text> - </xsl:text>
+      <xsl:value-of select="/book/bookinfo/subtitle"/>
+    </fo:block>
   </xsl:template>
 
   <xsl:template name="header.table">
+    <xsl:param name="sequence" select="''"/>
     <xsl:param name="gentext-key" select="''"/>
     <xsl:choose>
-      <xsl:when test="$gentext-key = 'book'"/>
+      <xsl:when test="$gentext-key = 'book' or $sequence = 'blank'"/>
       <xsl:otherwise>
-      	<xsl:call-template name="header.content"/>
+        <xsl:call-template name="header.content">
+          <xsl:with-param name="sequence" select="$sequence"/>
+        </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-		<!-- Centered titles for book and part -->
+    <!-- Centered titles for book and part -->
   <xsl:template name="book.titlepage">
     <fo:block space-before="2in">
@@ -61,5 +50,5 @@
 
   <xsl:template name="part.titlepage">
-    <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    <fo:block>
       <fo:block space-before="2.5in">
         <xsl:call-template name="part.titlepage.before.recto"/>
@@ -74,20 +63,31 @@
   </xsl:template>
 
-  	<!-- Margins -->
-  <xsl:param name="page.margin.inner">0.75in</xsl:param>
-  <xsl:param name="page.margin.outer">0.75in</xsl:param>
-  <xsl:param name="title.margin.left">-1pc</xsl:param>
+    <!-- Font size for chapter title. -->
+  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+    <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" 
+            xsl:use-attribute-sets="chapter.titlepage.recto.style" 
+            font-size="21pt" font-weight="bold" text-align="left">
+      <xsl:call-template name="component.title">
+        <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
+      </xsl:call-template>
+    </fo:block>
+  </xsl:template>
+
+    <!-- Margins -->
+  <xsl:param name="page.margin.inner">0.5in</xsl:param>
+  <xsl:param name="page.margin.outer">0.375in</xsl:param>
+  <xsl:param name="title.margin.left">-0.7pc</xsl:param>
   <xsl:attribute-set name="normal.para.spacing">
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
   </xsl:attribute-set>
   <xsl:attribute-set name="list.block.spacing">
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
   </xsl:attribute-set>
   <xsl:attribute-set name="list.item.spacing">
@@ -97,19 +97,20 @@
   </xsl:attribute-set>
   <xsl:attribute-set name="verbatim.properties">
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
   </xsl:attribute-set>
 
-  	<!-- Others-->
+    <!-- Others-->
   <xsl:param name="header.rule" select="0"></xsl:param>
   <xsl:param name="footer.rule" select="0"></xsl:param>
-	<xsl:param name="marker.section.level" select="-1"></xsl:param>
+  <xsl:param name="marker.section.level" select="-1"></xsl:param>
 
-  	<!-- Dropping a blank page -->
-	<xsl:template name="book.titlepage.separator"/>
+    <!-- Dropping a blank page -->
+  <xsl:template name="book.titlepage.separator"/>
+
 
 </xsl:stylesheet>
Index: stylesheets/pdf/lfs-sections.xsl
===================================================================
--- stylesheets/pdf/lfs-sections.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/pdf/lfs-sections.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,100 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+     <!-- Force section1's onto a new page -->
+  <xsl:attribute-set name="section.level1.properties">
+    <xsl:attribute name="break-after">
+      <xsl:choose>
+        <xsl:when test="not(position()=last())">
+          <xsl:text>page</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>auto</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:attribute>
+  </xsl:attribute-set>
+
+    <!-- Sections numbering -->
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+
+    <!-- Skip numeraration for sections with empty title -->
+  <xsl:template match="sect2|sect3|sect4|sect5" mode="label.markup">
+    <xsl:if test="string-length(title) > 0">
+      <!-- label the parent -->
+      <xsl:variable name="parent.label">
+        <xsl:apply-templates select=".." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="$parent.label != ''">
+        <xsl:apply-templates select=".." mode="label.markup"/>
+      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="@label">
+          <xsl:value-of select="@label"/>
+        </xsl:when>
+        <xsl:when test="$section.autolabel != 0">
+          <xsl:choose>
+            <xsl:when test="local-name(.) = 'sect2'">
+              <xsl:choose>
+                <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
+                <xsl:when test="string-length(../sect2[1]/title) = 0">
+                  <xsl:variable name="totalsect2">
+                    <xsl:number count="sect2"/>
+                  </xsl:variable>
+                  <xsl:number value="$totalsect2 - 1"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:number count="sect2"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:when>
+            <xsl:when test="local-name(.) = 'sect3'">
+              <xsl:number count="sect3"/>
+            </xsl:when>
+            <xsl:when test="local-name(.) = 'sect4'">
+              <xsl:number count="sect4"/>
+            </xsl:when>
+            <xsl:when test="local-name(.) = 'sect5'">
+              <xsl:number count="sect5"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:message>label.markup: this can't happen!</xsl:message>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Drop the trailing punctuation if title is empty -->
+  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect
+                      |bridgehead"
+                mode="object.title.template">
+    <xsl:choose>
+      <xsl:when test="$section.autolabel != 0">
+        <xsl:if test="string-length(title) > 0">
+          <xsl:call-template name="gentext.template">
+            <xsl:with-param name="context" select="'title-numbered'"/>
+            <xsl:with-param name="name">
+              <xsl:call-template name="xpath.location"/>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="gentext.template">
+          <xsl:with-param name="context" select="'title-unnumbered'"/>
+          <xsl:with-param name="name">
+            <xsl:call-template name="xpath.location"/>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
Index: stylesheets/pdf/lfs-xref.xsl
===================================================================
--- stylesheets/pdf/lfs-xref.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/pdf/lfs-xref.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,283 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+     <!-- Making a proper punctuation in xref (only for English language).-->
+  <xsl:template match="xref" name="xref">
+    <xsl:variable name="targets" select="key('id',@linkend)"/>
+    <xsl:variable name="target" select="$targets[1]"/>
+    <xsl:variable name="refelem" select="local-name($target)"/>
+    <xsl:variable name="role" select="@role"/>
+    <xsl:call-template name="check.id.unique">
+      <xsl:with-param name="linkend" select="@linkend"/>
+    </xsl:call-template>
+    <xsl:choose>
+      <xsl:when test="$refelem=''">
+        <xsl:message>
+          <xsl:text>XRef to nonexistent id: </xsl:text>
+          <xsl:value-of select="@linkend"/>
+        </xsl:message>
+        <xsl:text>???</xsl:text>
+      </xsl:when>
+      <xsl:when test="$target/@xreflabel">
+        <fo:basic-link internal-destination="{@linkend}"
+                      xsl:use-attribute-sets="xref.properties">
+          <xsl:call-template name="xref.xreflabel">
+            <xsl:with-param name="target" select="$target"/>
+          </xsl:call-template>
+        </fo:basic-link>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:basic-link internal-destination="{@linkend}"
+                      xsl:use-attribute-sets="xref.properties">
+          <xsl:apply-templates select="$target" mode="xref-to">
+            <xsl:with-param name="referrer" select="."/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="xrefstyle">
+              <xsl:value-of select="@xrefstyle"/>
+            </xsl:with-param>
+          </xsl:apply-templates>
+        </fo:basic-link>
+      </xsl:otherwise>
+    </xsl:choose>
+    <!-- Add standard page reference? -->
+    <xsl:if test="not(starts-with(normalize-space(@xrefstyle), 'select:') != ''
+                  and (contains(@xrefstyle, 'page')
+                      or contains(@xrefstyle, 'Page')))
+                  and ( $insert.xref.page.number = 'yes'
+        or $insert.xref.page.number = '1')
+                  or local-name($target) = 'para'">
+      <fo:basic-link internal-destination="{@linkend}"
+                    xsl:use-attribute-sets="xref.properties">
+        <xsl:apply-templates select="$target" mode="page.citation">
+          <xsl:with-param name="id" select="@linkend"/>
+        </xsl:apply-templates>
+      </fo:basic-link>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5
+                      |refsect1|refsect2|refsect3|refsection" mode="xref-to">
+    <xsl:param name="referrer"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="role"/>
+    <xsl:apply-templates select="." mode="object.xref.markup">
+      <xsl:with-param name="purpose" select="'xref'"/>
+      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+      <xsl:with-param name="role" select="$role"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <xsl:template match="*" mode="object.xref.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="referrer"/>
+    <xsl:param name="role"/>
+    <xsl:variable name="template">
+      <xsl:choose>
+        <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
+          <xsl:call-template name="make.gentext.template">
+            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+            <xsl:with-param name="purpose" select="$purpose"/>
+            <xsl:with-param name="referrer" select="$referrer"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
+          <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="." mode="object.xref.template">
+            <xsl:with-param name="purpose" select="$purpose"/>
+            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+            <xsl:with-param name="referrer" select="$referrer"/>
+          </xsl:apply-templates>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="$template = ''">
+      <xsl:message>
+        <xsl:text>object.xref.markup: empty xref template</xsl:text>
+        <xsl:text> for linkend="</xsl:text>
+        <xsl:value-of select="@id"/>
+        <xsl:text>" and @xrefstyle="</xsl:text>
+        <xsl:value-of select="$xrefstyle"/>
+        <xsl:text>"</xsl:text>
+      </xsl:message>
+    </xsl:if>
+    <xsl:call-template name="substitute-markup">
+      <xsl:with-param name="purpose" select="$purpose"/>
+      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+      <xsl:with-param name="template" select="$template"/>
+      <xsl:with-param name="role" select="$role"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="substitute-markup">
+    <xsl:param name="template" select="''"/>
+    <xsl:param name="allow-anchors" select="'0'"/>
+    <xsl:param name="title" select="''"/>
+    <xsl:param name="subtitle" select="''"/>
+    <xsl:param name="label" select="''"/>
+    <xsl:param name="pagenumber" select="''"/>
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="referrer"/>
+    <xsl:param name="role"/>
+    <xsl:choose>
+      <xsl:when test="contains($template, '%')">
+        <xsl:value-of select="substring-before($template, '%')"/>
+        <xsl:variable name="candidate"
+              select="substring(substring-after($template, '%'), 1, 1)"/>
+        <xsl:choose>
+          <xsl:when test="$candidate = 't'">
+            <xsl:apply-templates select="." mode="insert.title.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="role" select="$role"/>
+              <xsl:with-param name="title">
+                <xsl:choose>
+                  <xsl:when test="$title != ''">
+                    <xsl:copy-of select="$title"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="title.markup">
+                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+                    </xsl:apply-templates>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 's'">
+            <xsl:apply-templates select="." mode="insert.subtitle.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="subtitle">
+                <xsl:choose>
+                  <xsl:when test="$subtitle != ''">
+                    <xsl:copy-of select="$subtitle"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="subtitle.markup">
+                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+                    </xsl:apply-templates>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 'n'">
+            <xsl:apply-templates select="." mode="insert.label.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="label">
+                <xsl:choose>
+                  <xsl:when test="$label != ''">
+                    <xsl:copy-of select="$label"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="label.markup"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 'p'">
+            <xsl:apply-templates select="." mode="insert.pagenumber.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="pagenumber">
+                <xsl:choose>
+                  <xsl:when test="$pagenumber != ''">
+                    <xsl:copy-of select="$pagenumber"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="pagenumber.markup"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 'd'">
+            <xsl:apply-templates select="." mode="insert.direction.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="direction">
+                <xsl:choose>
+                  <xsl:when test="$referrer">
+                    <xsl:variable name="referent-is-below">
+                      <xsl:for-each select="preceding::xref">
+                        <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
+                      </xsl:for-each>
+                    </xsl:variable>
+                    <xsl:choose>
+                      <xsl:when test="$referent-is-below = ''">
+                        <xsl:call-template name="gentext">
+                          <xsl:with-param name="key" select="'above'"/>
+                        </xsl:call-template>
+                      </xsl:when>
+                      <xsl:otherwise>
+                        <xsl:call-template name="gentext">
+                          <xsl:with-param name="key" select="'below'"/>
+                        </xsl:call-template>
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = '%' ">
+            <xsl:text>%</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        <!-- recurse with the rest of the template string -->
+        <xsl:variable name="rest"
+              select="substring($template,
+              string-length(substring-before($template, '%'))+3)"/>
+        <xsl:call-template name="substitute-markup">
+          <xsl:with-param name="template" select="$rest"/>
+          <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+          <xsl:with-param name="title" select="$title"/>
+          <xsl:with-param name="subtitle" select="$subtitle"/>
+          <xsl:with-param name="label" select="$label"/>
+          <xsl:with-param name="pagenumber" select="$pagenumber"/>
+          <xsl:with-param name="purpose" select="$purpose"/>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+          <xsl:with-param name="referrer" select="$referrer"/>
+          <xsl:with-param name="role" select="$role"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$template"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="*" mode="insert.title.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="title"/>
+    <xsl:param name="role"/>
+    <xsl:choose>
+      <xsl:when test="$purpose = 'xref' and titleabbrev">
+        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$title"/>
+        <xsl:value-of select="$role"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
Index: stylesheets/print/lfs-index.xsl
===================================================================
--- stylesheets/print/lfs-index.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/print/lfs-index.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,127 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
-<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())'>
-]> 
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-    <!--Title-->
-  <xsl:template match="index" mode="title.markup">
-  	<xsl:param name="allow-anchors" select="0"/>
-    <xsl:text>Index of packages and important installed files</xsl:text>
-	</xsl:template>
-
-  	<!-- Divisions-->
-  <xsl:template match="indexterm" mode="index-div">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key"
-                  select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-    <xsl:if test="key('letter', $key)[&scope;]
-                  [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <fo:block>
-        <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-          <xsl:call-template name="indexdiv.title">
-            <xsl:with-param name="titlecontent">
-              <xsl:choose>
-                <xsl:when test="$divtitle = 'A'">
-                  <xsl:text>Packages</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'B'">
-                  <xsl:text>Programs</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'C'">
-                  <xsl:text>Libraries</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'D'">
-                  <xsl:text>Scripts</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'E'">
-                  <xsl:text>Others</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$divtitle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:block>
-          <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                      [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                              mode="index-primary">
-            <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </fo:block>
-      </fo:block>
-    </xsl:if>
-  </xsl:template>
-
-  	<!-- The separator -->
-  <xsl:template match="indexterm" mode="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:text>:   </xsl:text>
-    	<xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-  </xsl:template>
-  
-  	<!--Bookmarks-->
-  <xsl:template name="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="zones"/>
-    <xsl:choose>
-      <xsl:when test="contains($zones, ' ')">
-        <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-        <xsl:variable name="zone2" select="substring-after($zones, ' ')"/>
-        <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-        <xsl:variable name="target2" select="key('id', $zone2)[&scope;]"/>
-        <xsl:variable name="id">
-          <xsl:call-template name="object.id">
-            <xsl:with-param name="object" select="$target[1]"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="id2">
-          <xsl:call-template name="object.id">
-            <xsl:with-param name="object" select="$target2[1]"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <fo:basic-link internal-destination="{$id}">
-          <xsl:apply-templates select="$target" mode="page.citation">
-          	<xsl:with-param name="id" select="$id"/>
-          </xsl:apply-templates>
-        </fo:basic-link>
-          <xsl:text> ,  </xsl:text>
-        <fo:basic-link internal-destination="{$id2}">
-          <xsl:apply-templates select="$target2" mode="page.citation">
-          	<xsl:with-param name="id" select="$id2"/>
-          </xsl:apply-templates>
-        </fo:basic-link>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="zone" select="$zones"/>
-        <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-        <xsl:variable name="id">
-          <xsl:call-template name="object.id">
-            <xsl:with-param name="object" select="$target[1]"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <fo:basic-link internal-destination="{$id}">
-          <xsl:apply-templates select="$target" mode="page.citation">
-          	<xsl:with-param name="id" select="$id"/>
-          </xsl:apply-templates>
-        </fo:basic-link>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: stylesheets/print/lfs-pagesetup.xsl
===================================================================
--- stylesheets/print/lfs-pagesetup.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/print/lfs-pagesetup.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,120 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  	<!-- Force section1's onto a new page -->
-  <xsl:attribute-set name="section.level1.properties">
-  	<xsl:attribute name="break-after">
-    	<xsl:choose>
-  			<xsl:when test="not(position()=last())">
-      		<xsl:text>page</xsl:text>
-    		</xsl:when>
-        <xsl:otherwise>
-      		<xsl:text>auto</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-		<!-- Header -->
-  <xsl:template name="header.content">
-  	<xsl:param name="sequence" select="''"/>
-		<fo:block>
-      <xsl:attribute name="text-align">
-        <xsl:choose>
-          <xsl:when test="$sequence = 'first' or $sequence = 'odd'">right</xsl:when>
-          <xsl:otherwise>left</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:value-of select="/book/bookinfo/title"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="/book/bookinfo/subtitle"/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template name="header.table">
-  	<xsl:param name="sequence" select="''"/>
-    <xsl:param name="gentext-key" select="''"/>
-    <xsl:choose>
-      <xsl:when test="$gentext-key = 'book' or $sequence = 'blank'"/>
-      <xsl:otherwise>
-      	<xsl:call-template name="header.content">
-					<xsl:with-param name="sequence" select="$sequence"/>
-				</xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-		<!-- Centered titles for book and part -->
-  <xsl:template name="book.titlepage">
-    <fo:block space-before="2in">
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.recto"/>
-        <xsl:call-template name="book.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.verso"/>
-        <xsl:call-template name="book.titlepage.verso"/>
-      </fo:block>
-      <xsl:call-template name="book.titlepage.separator"/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template name="part.titlepage">
-    <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-      <fo:block space-before="2.5in">
-        <xsl:call-template name="part.titlepage.before.recto"/>
-        <xsl:call-template name="part.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="part.titlepage.before.verso"/>
-        <xsl:call-template name="part.titlepage.verso"/>
-      </fo:block>
-      <xsl:call-template name="part.titlepage.separator"/>
-    </fo:block>
-  </xsl:template>
-
-  	<!-- Margins -->
-  <xsl:param name="page.margin.inner">1in</xsl:param>
-  <xsl:param name="page.margin.outer">0.5in</xsl:param>
-  <xsl:param name="title.margin.left">-1pc</xsl:param>
-  <xsl:attribute-set name="normal.para.spacing">
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-  </xsl:attribute-set>
-  <xsl:attribute-set name="list.block.spacing">
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
-  </xsl:attribute-set>
-  <xsl:attribute-set name="list.item.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-  </xsl:attribute-set>
-  <xsl:attribute-set name="verbatim.properties">
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
-  </xsl:attribute-set>
-
-  	<!-- Others-->
-  <xsl:param name="header.rule" select="0"></xsl:param>
-  <xsl:param name="footer.rule" select="0"></xsl:param>
-	<xsl:param name="marker.section.level" select="-1"></xsl:param>
-
-  	<!-- Dropping a blank page -->
-	<xsl:template name="book.titlepage.separator"/>
-
-</xsl:stylesheet>
Index: stylesheets/xhtml/lfs-admon.xsl
===================================================================
--- stylesheets/xhtml/lfs-admon.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/xhtml/lfs-admon.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,5 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -7,10 +5,10 @@
                 version="1.0">
 
-  	<!-- Use graphics in admonitions -->
+    <!-- Use graphics in admonitions -->
   <xsl:param name="admon.graphics" select="1"/>
   <xsl:param name="admon.graphics.path">../images/</xsl:param>
   <xsl:param name="admon.graphics.extension" select="'.png'"/>
 
-  	<!-- Changing the output tagging -->
+    <!-- Changing the output tagging -->
   <xsl:template name="graphical.admonition">
     <xsl:variable name="admon.type">
@@ -24,21 +22,22 @@
       </xsl:choose>
     </xsl:variable>
-    <div class="admonition">
-    	<div class ="admonhead">
-        <img alt="[{$admon.type}]">
+    <xsl:variable name="alt">
+      <xsl:call-template name="gentext">
+        <xsl:with-param name="key" select="$admon.type"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <div class="{name(.)}">
+      <div class ="admonhead">
+        <img alt="[{$alt}]">
           <xsl:attribute name="src">
             <xsl:call-template name="admon.graphic"/>
           </xsl:attribute>
         </img>
-        <h3 class="{name(.)}">
-          <xsl:value-of select="$admon.type"/>
-          <xsl:if test="title">
-            <xsl:text>: </xsl:text>
-            <xsl:value-of select="title"/>
-          </xsl:if>
+        <h3 class="admontitle">
+          <xsl:apply-templates select="." mode="object.title.markup"/>
         </h3>
       </div>
       <div class="admonbody">
-				<xsl:apply-templates/>
+        <xsl:apply-templates/>
       </div>
     </div>
Index: stylesheets/xhtml/lfs-legalnotice.xsl
===================================================================
--- stylesheets/xhtml/lfs-legalnotice.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/xhtml/lfs-legalnotice.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,5 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -7,6 +5,5 @@
                 version="1.0">
 
-  	<!-- Generating the page -->
-
+    <!-- Generating the page -->
   <xsl:template match="legalnotice" mode="titlepage.mode">
     <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
@@ -30,13 +27,19 @@
               <xsl:apply-templates mode="titlepage.mode"/>
             </div>
-            <hr/>
             <div class="navfooter">
               <ul class="footerlinks">
-                <li>
+                <li class="home">
                   <a accesskey="h">
                     <xsl:attribute name="href">
-                      <xsl:text>../index.html</xsl:text>
+                      <xsl:text>index.html</xsl:text>
                     </xsl:attribute>
-                    <xsl:text>Home</xsl:text>
+                    <xsl:attribute name="title">
+                      <xsl:value-of select="/book/bookinfo/title"/>
+                      <xsl:text> - </xsl:text>
+                      <xsl:value-of select="/book/bookinfo/subtitle"/>
+                    </xsl:attribute>
+                    <xsl:call-template name="navig.content">
+                      <xsl:with-param name="direction" select="'home'"/>
+                    </xsl:call-template>
                   </a>
                 </li>
Index: stylesheets/xhtml/lfs-mixed.xsl
===================================================================
--- stylesheets/xhtml/lfs-mixed.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/xhtml/lfs-mixed.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,5 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -7,26 +5,12 @@
                 version="1.0">
 
+    <!-- screen -->
   <xsl:template match="screen">
     <xsl:choose>
-    		<!-- Temporally hack -->
-<!-- Broke userinput   <xsl:when test="child::* = userinput">
-        <pre class="{name(.)}">
-           <kbd class="command">
-            <xsl:value-of select="."/>
-          </kbd>
+      <xsl:when test="child::* = userinput">
+        <pre class="userinput">
+            <xsl:apply-templates/>
         </pre>
-      </xsl:when> -->
-      <!-- This should be fixed in the XML code -->
-      
-      <xsl:when test="contains(text() , 'SBU')">
-        <p class="sbu">
-          <tt>
-            <xsl:value-of select="substring-before(text() , 'R')"/>
-            <br/>
-            <xsl:value-of select="substring-after(text() , 'U')"/>
-          </tt>
-        </p>
       </xsl:when>
-     
       <xsl:otherwise>
         <pre class="{name(.)}">
@@ -36,4 +20,130 @@
     </xsl:choose>
   </xsl:template>
+  
+    <!-- userinput -->
+  <xsl:template match="userinput">
+    <xsl:choose>
+      <xsl:when test="ancestor::screen">
+        <kbd class="command">
+          <xsl:apply-templates/>
+        </kbd>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-imports/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- Body attributes -->
+  <xsl:template name="body.attributes">
+    <xsl:attribute name="id">
+      <xsl:text>blfs</xsl:text>
+    </xsl:attribute>
+    <xsl:attribute name="class">
+      <xsl:value-of select="substring-after(/book/bookinfo/subtitle, ' ')"/>
+    </xsl:attribute>
+  </xsl:template>
+
+    <!-- External URLs in italic font -->
+  <xsl:template match="ulink" name="ulink">
+    <a>
+      <xsl:if test="@id">
+        <xsl:attribute name="id">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
+       <strong>
+        <xsl:choose>
+          <xsl:when test="count(child::node())=0">
+            <xsl:value-of select="@url"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </strong>
+    </a>
+  </xsl:template>
+  
+    <!-- The <code> xhtml tag have look issues in some browsers, like Konqueror and.
+      isn't semantically correct (a filename isn't a code fragment) We will use <tt> for now. -->
+  <xsl:template name="inline.monoseq">
+    <xsl:param name="content">
+      <xsl:call-template name="anchor"/>
+      <xsl:call-template name="simple.xlink">
+        <xsl:with-param name="content">
+          <xsl:apply-templates/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:param>
+    <tt class="{local-name(.)}">
+      <xsl:if test="@dir">
+        <xsl:attribute name="dir">
+          <xsl:value-of select="@dir"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:copy-of select="$content"/>
+    </tt>
+  </xsl:template>
+  
+  <xsl:template name="inline.boldmonoseq">
+    <xsl:param name="content">
+      <xsl:call-template name="anchor"/>
+      <xsl:call-template name="simple.xlink">
+        <xsl:with-param name="content">
+          <xsl:apply-templates/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:param>
+    <!-- don't put <strong> inside figure, example, or table titles -->
+    <!-- or other titles that may already be represented with <strong>'s. -->
+    <xsl:choose>
+      <xsl:when test="local-name(..) = 'title' and (local-name(../..) = 'figure' 
+              or local-name(../..) = 'example' or local-name(../..) = 'table' or local-name(../..) = 'formalpara')">
+        <tt class="{local-name(.)}">
+          <xsl:if test="@dir">
+            <xsl:attribute name="dir">
+              <xsl:value-of select="@dir"/>
+            </xsl:attribute>
+          </xsl:if>
+          <xsl:copy-of select="$content"/>
+        </tt>
+      </xsl:when>
+      <xsl:otherwise>
+        <strong class="{local-name(.)}">
+          <tt>
+            <xsl:if test="@dir">
+              <xsl:attribute name="dir">
+                <xsl:value-of select="@dir"/>
+              </xsl:attribute>
+            </xsl:if>
+            <xsl:copy-of select="$content"/>
+          </tt>
+        </strong>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="inline.italicmonoseq">
+    <xsl:param name="content">
+      <xsl:call-template name="anchor"/>
+      <xsl:call-template name="simple.xlink">
+        <xsl:with-param name="content">
+          <xsl:apply-templates/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:param>
+    <em class="{local-name(.)}">
+      <tt>
+        <xsl:if test="@dir">
+          <xsl:attribute name="dir">
+            <xsl:value-of select="@dir"/>
+          </xsl:attribute>
+        </xsl:if>
+        <xsl:copy-of select="$content"/>
+      </tt>
+    </em>
+  </xsl:template>
 
 </xsl:stylesheet>
Index: stylesheets/xhtml/lfs-navigational.xsl
===================================================================
--- stylesheets/xhtml/lfs-navigational.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/xhtml/lfs-navigational.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,6 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
-<!-- Updates by Bruce Dubbs <bdubbs@linuxfromscratch.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -17,5 +14,5 @@
   </xsl:template>
 
-  	<!-- Header Navigation-->
+    <!-- Header Navigation-->
   <xsl:template name="header.navigation">
     <xsl:param name="prev" select="/foo"/>
@@ -30,19 +27,18 @@
         <xsl:if test="$home != .">
           <div class="headertitles">
-            <p>
-              <xsl:apply-templates select="$home" mode="object.title.markup"/>
-              <xsl:text> &#8211; </xsl:text> <!-- ndash -->
+            <h4>
+              <xsl:text>Beyond Linux From Scratch - </xsl:text>
               <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
-            </p>
+            </h4>
             <xsl:if test="$up != $home">
-              <p><b>
+              <h3>
                 <xsl:apply-templates select="$up" mode="object.title.markup"/>
-              </b></p>
+              </h3>
             </xsl:if>
           </div>
         </xsl:if>
-        <div class="headerlinks">
-          <div class='prev'>
-            <xsl:if test="count($prev)&gt;0 and $prev != $home">
+        <ul class="headerlinks">
+          <xsl:if test="count($prev)&gt;0 and $prev != $home">
+            <li class="prev">
               <a accesskey="p">
                 <xsl:attribute name="href">
@@ -51,10 +47,18 @@
                   </xsl:call-template>
                 </xsl:attribute>
-                <xsl:text>Prev</xsl:text>
-              </a>
-            </xsl:if>
-          <xsl:text>&#160;</xsl:text></div>  <!-- nbsp -->
-          <div class='next'><xsl:text>&#160;</xsl:text>
-            <xsl:if test="count($next)&gt;0">
+                <xsl:attribute name="title">
+                  <xsl:value-of select="$prev/title"/>
+                </xsl:attribute>
+                <xsl:call-template name="navig.content">
+                  <xsl:with-param name="direction" select="'prev'"/>
+                </xsl:call-template>
+              </a>
+              <p>
+                <xsl:value-of select="$prev/title"/>
+              </p>
+            </li>
+          </xsl:if>
+          <xsl:if test="count($next)&gt;0">
+            <li class="next">
               <a accesskey="n">
                 <xsl:attribute name="href">
@@ -63,9 +67,53 @@
                   </xsl:call-template>
                 </xsl:attribute>
-                <xsl:text>Next</xsl:text>
-              </a>
-            </xsl:if>
-          </div>
-          <div class='home'>
+                <xsl:attribute name="title">
+                  <xsl:choose>
+                    <xsl:when test="local-name($next)='index'">
+                      <xsl:call-template name="gentext">
+                        <xsl:with-param name="key">Index</xsl:with-param>
+                      </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="$next/title"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:attribute>
+                <xsl:call-template name="navig.content">
+                  <xsl:with-param name="direction" select="'next'"/>
+                </xsl:call-template>
+              </a>
+              <p>
+                <xsl:choose>
+                  <xsl:when test="local-name($next)='index'">
+                    <xsl:call-template name="gentext">
+                      <xsl:with-param name="key">Index</xsl:with-param>
+                    </xsl:call-template>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="$next/title"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </p>
+            </li>
+          </xsl:if>
+            <li class="up">
+              <xsl:if test="count($up)&gt;0 and $up != $home">
+                <a accesskey="u">
+                  <xsl:attribute name="href">
+                    <xsl:call-template name="href.target">
+                      <xsl:with-param name="object" select="$up"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                  <xsl:attribute name="title">
+                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
+                  </xsl:attribute>
+                  <xsl:call-template name="navig.content">
+                    <xsl:with-param name="direction" select="'up'"/>
+                  </xsl:call-template>
+                </a>
+              </xsl:if>
+              <xsl:text>.</xsl:text>
+            </li>
+          <li class="home">
             <a accesskey="h">
               <xsl:attribute name="href">
@@ -74,13 +122,20 @@
                 </xsl:call-template>
               </xsl:attribute>
-              <xsl:text>Home</xsl:text>
+                <xsl:attribute name="title">
+                  <xsl:value-of select="$home/bookinfo/title"/>
+                  <xsl:text> - </xsl:text>
+                  <xsl:value-of select="$home/bookinfo/subtitle"/>
+                </xsl:attribute>
+                <xsl:call-template name="navig.content">
+                  <xsl:with-param name="direction" select="'home'"/>
+                </xsl:call-template>
             </a>
-          </div>
-        </div>
+          </li>
+        </ul>
       </div>
     </xsl:if>
   </xsl:template>
 
-  	<!-- Footer Navigation-->
+    <!-- Footer Navigation-->
   <xsl:template name="footer.navigation">
     <xsl:param name="prev" select="/foo"/>
@@ -93,6 +148,7 @@
     <xsl:if test="$row">
       <div class="navfooter">
-          <div class='prev'>
-            <xsl:if test="count($prev)&gt;0 and $prev != $home">
+        <ul>
+          <xsl:if test="count($prev)&gt;0 and $prev != $home">
+            <li class="prev">
               <a accesskey="p">
                 <xsl:attribute name="href">
@@ -101,13 +157,18 @@
                   </xsl:call-template>
                 </xsl:attribute>
-                <xsl:text>Prev</xsl:text>
-              </a><br/>
-              <!-- <xsl:text> </xsl:text> -->
-              <xsl:apply-templates select="$prev" mode="object.title.markup"/>
-            </xsl:if>
-            <xsl:text>&#160;</xsl:text>
-          </div> <!-- nbsp -->
-          <div class='next'><xsl:text>&#160;</xsl:text>
+                <xsl:attribute name="title">
+                  <xsl:value-of select="$prev/title"/>
+                </xsl:attribute>
+                <xsl:call-template name="navig.content">
+                  <xsl:with-param name="direction" select="'prev'"/>
+                </xsl:call-template>
+              </a>
+              <p>
+                <xsl:value-of select="$prev/title"/>
+              </p>
+            </li>
+          </xsl:if>
           <xsl:if test="count($next)&gt;0">
+            <li class="next">
               <a accesskey="n">
                 <xsl:attribute name="href">
@@ -116,34 +177,73 @@
                   </xsl:call-template>
                 </xsl:attribute>
-                <xsl:text>Next</xsl:text>
-              </a><br/>
-              <!-- <xsl:text> </xsl:text> -->
-              <xsl:apply-templates select="$next" mode="object.title.markup"/>
-            </xsl:if>
-          </div>
-          <xsl:if test="count($up)&gt;0 and $up != $home">
-            <div class='up'>
-              <a accesskey="u">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$up"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Up</xsl:text>
-              </a>
-            </div>
-          </xsl:if>
-          <div class='home'>
-            <xsl:if  test="$home != .">
-              <a accesskey="h">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$home"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Home</xsl:text>
-              </a>
-            </xsl:if>
-          </div>
+                <xsl:attribute name="title">
+                  <xsl:choose>
+                    <xsl:when test="local-name($next)='index'">
+                      <xsl:call-template name="gentext">
+                        <xsl:with-param name="key">Index</xsl:with-param>
+                      </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="$next/title"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:attribute>
+                <xsl:call-template name="navig.content">
+                  <xsl:with-param name="direction" select="'next'"/>
+                </xsl:call-template>
+              </a>
+              <p>
+                <xsl:choose>
+                  <xsl:when test="local-name($next)='index'">
+                    <xsl:call-template name="gentext">
+                      <xsl:with-param name="key">Index</xsl:with-param>
+                    </xsl:call-template>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="$next/title"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </p>
+            </li>
+          </xsl:if>
+            <li class="up">
+              <xsl:if test="count($up)&gt;0 and $up != $home">
+                <a accesskey="u">
+                  <xsl:attribute name="href">
+                    <xsl:call-template name="href.target">
+                      <xsl:with-param name="object" select="$up"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                  <xsl:attribute name="title">
+                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
+                  </xsl:attribute>
+                  <xsl:call-template name="navig.content">
+                    <xsl:with-param name="direction" select="'up'"/>
+                  </xsl:call-template>
+                </a>
+              </xsl:if>
+              <xsl:text>.</xsl:text>
+            </li>
+            <li class="home">
+              <xsl:if  test="$home != .">
+                <a accesskey="h">
+                  <xsl:attribute name="href">
+                    <xsl:call-template name="href.target">
+                      <xsl:with-param name="object" select="$home"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                  <xsl:attribute name="title">
+                    <xsl:value-of select="$home/bookinfo/title"/>
+                    <xsl:text> - </xsl:text>
+                    <xsl:value-of select="$home/bookinfo/subtitle"/>
+                  </xsl:attribute>
+                  <xsl:call-template name="navig.content">
+                    <xsl:with-param name="direction" select="'home'"/>
+                  </xsl:call-template>
+                </a>
+              </xsl:if>
+              <xsl:text>.</xsl:text>
+            </li>
+        </ul>
       </div>
     </xsl:if>
Index: stylesheets/xhtml/lfs-sections.xsl
===================================================================
--- stylesheets/xhtml/lfs-sections.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/xhtml/lfs-sections.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+
+   <!-- Sect1 attributes -->
+  <xsl:template match="sect1">
+    <div>
+      <xsl:choose>
+        <xsl:when test="@role">
+          <xsl:attribute name="class">
+            <xsl:value-of select="@role"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="class">
+            <xsl:value-of select="name(.)"/>
+          </xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:call-template name="language.attribute"/>
+      <xsl:call-template name="sect1.titlepage"/>
+      <xsl:apply-templates/>
+      <xsl:call-template name="process.chunk.footnotes"/>
+    </div>
+  </xsl:template>
+
+    <!-- Sect2 attributes -->
+  <xsl:template match="sect2">
+    <div>
+      <xsl:choose>
+        <xsl:when test="@role">
+          <xsl:attribute name="class">
+            <xsl:value-of select="@role"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="class">
+            <xsl:value-of select="name(.)"/>
+          </xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:call-template name="language.attribute"/>
+      <xsl:call-template name="sect2.titlepage"/>
+      <xsl:apply-templates/>
+      <xsl:call-template name="process.chunk.footnotes"/>
+    </div>
+  </xsl:template>
+
+</xsl:stylesheet>
Index: stylesheets/xhtml/lfs-titles.xsl
===================================================================
--- stylesheets/xhtml/lfs-titles.xsl	(revision bad8b539cbca46c3e201a7641fad633248e10696)
+++ stylesheets/xhtml/lfs-titles.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -1,5 +1,3 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- Version 0.9- Manuel Canales Esparcia <macana@lfs-es.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -9,4 +7,7 @@
   <xsl:template name="part.titlepage">
     <div class="titlepage">
+      <xsl:if test="@id">
+        <a id="{@id}" name="{@id}"/>
+      </xsl:if>
       <h1 class="{name(.)}">
         <xsl:value-of select="title"/>
@@ -17,4 +18,7 @@
   <xsl:template name="chapter.titlepage">
     <div class="titlepage">
+      <xsl:if test="@id">
+        <a id="{@id}" name="{@id}"/>
+      </xsl:if>
       <h1 class="{name(.)}">
         <xsl:value-of select="title"/>
@@ -25,4 +29,18 @@
   <xsl:template name="preface.titlepage">
     <div class="titlepage">
+      <xsl:if test="@id">
+        <a id="{@id}" name="{@id}"/>
+      </xsl:if>
+      <h1 class="{name(.)}">
+        <xsl:value-of select="title"/>
+      </h1>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="appendix.titlepage">
+    <div class="titlepage">
+      <xsl:if test="@id">
+        <a id="{@id}" name="{@id}"/>
+      </xsl:if>
       <h1 class="{name(.)}">
         <xsl:value-of select="title"/>
@@ -32,24 +50,12 @@
 
   <xsl:template name="sect1.titlepage">
-    <xsl:choose>
-    		<!-- I should find a better test -->
-      <xsl:when test="position() = 4">
-        <div class="titlepage">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <h2 class="{name(.)}">
-            <xsl:value-of select="title"/>
-          </h2>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <div class="titlepage">
-          <h1 class="{name(.)}">
-            <xsl:value-of select="title"/>
-          </h1>
-        </div>
-      </xsl:otherwise>
-    </xsl:choose>
+    <div class="titlepage">
+      <xsl:if test="@id">
+        <a id="{@id}" name="{@id}"/>
+      </xsl:if>
+      <h1 class="{name(.)}">
+        <xsl:value-of select="title"/>
+      </h1>
+    </div>
   </xsl:template>
 
@@ -62,7 +68,7 @@
             <a id="{@id}" name="{@id}"/>
           </xsl:if>
-          <h3 class="{name(.)}">
+          <h2 class="{name(.)}">
             <xsl:value-of select="title"/>
-          </h3>
+          </h2>
         </div>
       </xsl:otherwise>
@@ -78,3 +84,20 @@
   </xsl:template>
 
+    <!-- Added the role param for proper punctuation in xref calls. -->
+  <xsl:template match="*" mode="insert.title.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="title"/>
+    <xsl:param name="role"/>
+    <xsl:choose>
+      <xsl:when test="$purpose = 'xref' and titleabbrev">
+        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$title"/>
+        <xsl:value-of select="$role"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
Index: stylesheets/xhtml/lfs-xref.xsl
===================================================================
--- stylesheets/xhtml/lfs-xref.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
+++ stylesheets/xhtml/lfs-xref.xsl	(revision 3fe8b511a872c0d5eb866ccd2603295f6ae58bbf)
@@ -0,0 +1,270 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+     <!-- Making a proper punctuation in xref (only for English language).-->
+  <xsl:template match="xref" name="xref">
+    <xsl:variable name="targets" select="key('id',@linkend)"/>
+    <xsl:variable name="target" select="$targets[1]"/>
+    <xsl:variable name="refelem" select="local-name($target)"/>
+    <xsl:variable name="role" select="@role"/>
+    <xsl:call-template name="check.id.unique">
+      <xsl:with-param name="linkend" select="@linkend"/>
+    </xsl:call-template>
+    <xsl:call-template name="anchor"/>
+    <xsl:choose>
+      <xsl:when test="count($target) = 0">
+        <xsl:message>
+          <xsl:text>XRef to nonexistent id: </xsl:text>
+          <xsl:value-of select="@linkend"/>
+        </xsl:message>
+        <xsl:text>???</xsl:text>
+      </xsl:when>
+      <xsl:when test="$target/@xreflabel">
+        <a>
+          <xsl:attribute name="href">
+            <xsl:call-template name="href.target">
+              <xsl:with-param name="object" select="$target"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:call-template name="xref.xreflabel">
+            <xsl:with-param name="target" select="$target"/>
+          </xsl:call-template>
+        </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:variable name="href">
+          <xsl:call-template name="href.target">
+            <xsl:with-param name="object" select="$target"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+        <a href="{$href}">
+          <xsl:if test="$target/title or $target/*/title">
+            <xsl:attribute name="title">
+              <xsl:apply-templates select="$target" mode="xref-title"/>
+            </xsl:attribute>
+          </xsl:if>
+          <xsl:apply-templates select="$target" mode="xref-to">
+            <xsl:with-param name="referrer" select="."/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="xrefstyle">
+              <xsl:value-of select="@xrefstyle"/>
+            </xsl:with-param>
+          </xsl:apply-templates>
+        </a>
+        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5|refsect1
+          |refsect2|refsect3|refsection" mode="xref-to">
+    <xsl:param name="referrer"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="role"/>
+    <xsl:apply-templates select="." mode="object.xref.markup">
+      <xsl:with-param name="purpose" select="'xref'"/>
+      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+      <xsl:with-param name="role" select="$role"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+
+  <xsl:template match="*" mode="object.xref.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="referrer"/>
+    <xsl:param name="role"/>
+    <xsl:variable name="template">
+      <xsl:choose>
+        <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
+          <xsl:call-template name="make.gentext.template">
+            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+            <xsl:with-param name="purpose" select="$purpose"/>
+            <xsl:with-param name="referrer" select="$referrer"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
+          <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="." mode="object.xref.template">
+            <xsl:with-param name="purpose" select="$purpose"/>
+            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+            <xsl:with-param name="referrer" select="$referrer"/>
+          </xsl:apply-templates>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="$template = ''">
+      <xsl:message>
+        <xsl:text>object.xref.markup: empty xref template</xsl:text>
+        <xsl:text> for linkend="</xsl:text>
+        <xsl:value-of select="@id"/>
+        <xsl:text>" and @xrefstyle="</xsl:text>
+        <xsl:value-of select="$xrefstyle"/>
+        <xsl:text>"</xsl:text>
+      </xsl:message>
+    </xsl:if>
+    <xsl:call-template name="substitute-markup">
+      <xsl:with-param name="purpose" select="$purpose"/>
+      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+      <xsl:with-param name="referrer" select="$referrer"/>
+      <xsl:with-param name="template" select="$template"/>
+      <xsl:with-param name="role" select="$role"/>
+    </xsl:call-template>
+  </xsl:template>
+  
+  <xsl:template name="substitute-markup">
+    <xsl:param name="template" select="''"/>
+    <xsl:param name="allow-anchors" select="'0'"/>
+    <xsl:param name="title" select="''"/>
+    <xsl:param name="subtitle" select="''"/>
+    <xsl:param name="label" select="''"/>
+    <xsl:param name="pagenumber" select="''"/>
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="referrer"/>
+    <xsl:param name="role"/>
+    <xsl:choose>
+      <xsl:when test="contains($template, '%')">
+        <xsl:value-of select="substring-before($template, '%')"/>
+        <xsl:variable name="candidate"
+              select="substring(substring-after($template, '%'), 1, 1)"/>
+        <xsl:choose>
+          <xsl:when test="$candidate = 't'">
+            <xsl:apply-templates select="." mode="insert.title.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="role" select="$role"/>
+              <xsl:with-param name="title">
+                <xsl:choose>
+                  <xsl:when test="$title != ''">
+                    <xsl:copy-of select="$title"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="title.markup">
+                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+                    </xsl:apply-templates>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 's'">
+            <xsl:apply-templates select="." mode="insert.subtitle.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="subtitle">
+                <xsl:choose>
+                  <xsl:when test="$subtitle != ''">
+                    <xsl:copy-of select="$subtitle"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="subtitle.markup">
+                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+                    </xsl:apply-templates>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 'n'">
+            <xsl:apply-templates select="." mode="insert.label.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="label">
+                <xsl:choose>
+                  <xsl:when test="$label != ''">
+                    <xsl:copy-of select="$label"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="label.markup"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 'p'">
+            <xsl:apply-templates select="." mode="insert.pagenumber.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="pagenumber">
+                <xsl:choose>
+                  <xsl:when test="$pagenumber != ''">
+                    <xsl:copy-of select="$pagenumber"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="pagenumber.markup"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = 'd'">
+            <xsl:apply-templates select="." mode="insert.direction.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="direction">
+                <xsl:choose>
+                  <xsl:when test="$referrer">
+                    <xsl:variable name="referent-is-below">
+                      <xsl:for-each select="preceding::xref">
+                        <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
+                      </xsl:for-each>
+                    </xsl:variable>
+                    <xsl:choose>
+                      <xsl:when test="$referent-is-below = ''">
+                        <xsl:call-template name="gentext">
+                          <xsl:with-param name="key" select="'above'"/>
+                        </xsl:call-template>
+                      </xsl:when>
+                      <xsl:otherwise>
+                        <xsl:call-template name="gentext">
+                          <xsl:with-param name="key" select="'below'"/>
+                        </xsl:call-template>
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:with-param>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:when test="$candidate = '%' ">
+            <xsl:text>%</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        <!-- recurse with the rest of the template string -->
+        <xsl:variable name="rest"
+              select="substring($template,
+              string-length(substring-before($template, '%'))+3)"/>
+        <xsl:call-template name="substitute-markup">
+          <xsl:with-param name="template" select="$rest"/>
+          <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+          <xsl:with-param name="title" select="$title"/>
+          <xsl:with-param name="subtitle" select="$subtitle"/>
+          <xsl:with-param name="label" select="$label"/>
+          <xsl:with-param name="pagenumber" select="$pagenumber"/>
+          <xsl:with-param name="purpose" select="$purpose"/>
+          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+          <xsl:with-param name="referrer" select="$referrer"/>
+          <xsl:with-param name="role" select="$role"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$template"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
