r8192 - branches/new-xsl

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Jul 5 13:04:36 PDT 2007


Author: manuel
Date: 2007-07-05 14:04:36 -0600 (Thu, 05 Jul 2007)
New Revision: 8192

Added:
   branches/new-xsl/chunk-master.xsl
   branches/new-xsl/chunk-slave.xsl
   branches/new-xsl/chunkfast.xsl
   branches/new-xsl/common.xsl
   branches/new-xsl/nochunks.xsl
   branches/new-xsl/pdf.xsl
   branches/new-xsl/profile.xsl
Removed:
   branches/new-xsl/lfs-chunked.xsl
   branches/new-xsl/lfs-chunked1.xsl
   branches/new-xsl/lfs-chunked2.xsl
   branches/new-xsl/lfs-common.xsl
   branches/new-xsl/lfs-nochunks.xsl
   branches/new-xsl/lfs-pdf.xsl
   branches/new-xsl/lfs-profile.xsl
Log:
Renamed several top-level files to make thay book agnostic.

Copied: branches/new-xsl/chunk-master.xsl (from rev 8190, branches/new-xsl/lfs-chunked1.xsl)
===================================================================
--- branches/new-xsl/chunk-master.xsl	                        (rev 0)
+++ branches/new-xsl/chunk-master.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+   <!-- Top-level chunked code for normal processing.
+        Import customized output templates.
+        Include customized chunk templates.
+        Replaces {docbook-xsl}/xhtml/chunk.xsl -->
+
+    <!-- Our master non-chunking presentation templates -->
+  <xsl:import href="chunk-slave.xsl"/>
+
+    <!-- Upstream chunk code named templates -->
+  <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
+
+    <!-- Upstream chunk code match templates -->
+  <xsl:include href="docbook-xsl-snapshot/xhtml/chunk-code.xsl"/>
+
+    <!-- Including our customized chunks templates -->
+  <xsl:include href="xhtml/lfs-index.xsl"/>
+  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
+  <xsl:include href="xhtml/lfs-navigational.xsl"/>
+
+    <!-- sect1:
+           Prevent creation of dummy sect1 files used to emulate sub-chapters. -->
+    <!-- The original template is in {docbook-xsl}/xhtml/chunk-code.xsl
+         It match also others sect* tags. The code for that tags is unchanged. -->
+  <xsl:template match="sect1">
+    <xsl:variable name="ischunk">
+      <xsl:call-template name="chunk"/>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="@role = 'dummy'"/>
+      <xsl:when test="not(parent::*)">
+        <xsl:call-template name="process-chunk-element"/>
+      </xsl:when>
+      <xsl:when test="$ischunk = 0">
+        <xsl:apply-imports/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="process-chunk-element"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>

Copied: branches/new-xsl/chunk-slave.xsl (from rev 8190, branches/new-xsl/lfs-chunked2.xsl)
===================================================================
--- branches/new-xsl/chunk-slave.xsl	                        (rev 0)
+++ branches/new-xsl/chunk-slave.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+   <!-- Second level chunked output template.
+        Sets global params and include customized elements templates. -->
+
+    <!-- Upstream XHTML presentation templates -->
+  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
+
+    <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
+  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
+
+    <!-- Including our customized elements templates -->
+  <xsl:include href="common.xsl"/>
+  <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"/>
+
+    <!-- The CSS Stylesheets. We set here relative path from sub-dirs HTML files.
+    The path from top-level HTML files (index.html, partX.html, etc) MUST be
+    fixed via a sed in the Makefile-->
+    <!-- Master CSS Stylesheet -->
+  <xsl:param name="html.stylesheet" select="'../stylesheets/lfs.css'"/>
+    <!-- Print CSS Stylesheet -->
+    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
+  <xsl:template name='user.head.content'>
+     <link rel="stylesheet" href="../stylesheets/lfs-print.css" type="text/css" media="print"/>
+  </xsl:template>
+
+    <!-- Dropping some unwanted style attributes -->
+  <xsl:param name="ulink.target" select="''"/>
+  <xsl:param name="css.decoration" select="0"/>
+
+    <!-- No XML declaration -->
+  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
+
+    <!-- Control generation of ToCs and LoTs -->
+  <xsl:param name="generate.toc">
+    book      toc,title
+    preface   toc
+    part      toc
+    chapter   toc
+    appendix  nop
+    sect1     nop
+    sect2     nop
+    sect3     nop
+    sect4     nop
+    sect5     nop
+    section   nop
+  </xsl:param>
+
+    <!-- How deep should recursive sections appear in the TOC? -->
+  <xsl:param name="toc.section.depth">1</xsl:param>
+
+    <!-- How maximaly deep should be each TOC? -->
+  <xsl:param name="toc.max.depth">3</xsl:param>
+
+</xsl:stylesheet>

Copied: branches/new-xsl/chunkfast.xsl (from rev 8190, branches/new-xsl/lfs-chunked.xsl)
===================================================================
--- branches/new-xsl/chunkfast.xsl	                        (rev 0)
+++ branches/new-xsl/chunkfast.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,76 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
+                version="1.0"
+                exclude-result-prefixes="cf exsl">
+
+   <!-- Top-level chunked code for fast processing.
+        Import standart customized chunk code.
+        Replaces {docbook-xsl}/xhtml/chunkfast.xsl
+
+        Note: Using this file as the top-level for chunked output implies that
+              profiling must be done on a previous step. -->
+
+    <!-- Our master chunking templates -->
+  <xsl:import href="chunk-master.xsl"/>
+
+    <!-- Use chunk.fast code? 1 = yes, 0 = no -->
+  <xsl:param name="chunk.fast" select="1"/>
+
+  <!-- The code below was copied as-is from {docbook-xsl}/xhtml/chunkfast.xsl -->
+
+  <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
+
+  <xsl:template name="process-chunk-element">
+    <xsl:choose>
+      <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
+        <xsl:variable name="genid" select="generate-id()"/>
+
+        <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
+
+        <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
+        <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
+
+        <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
+        <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
+
+        <xsl:choose>
+          <xsl:when test="$onechunk != 0 and parent::*">
+            <xsl:apply-imports/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="process-chunk">
+              <xsl:with-param name="prev" select="$prev"/>
+              <xsl:with-param name="next" select="$next"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$onechunk != 0 and not(parent::*)">
+            <xsl:call-template name="chunk-all-sections"/>
+          </xsl:when>
+          <xsl:when test="$onechunk != 0">
+            <xsl:apply-imports/>
+          </xsl:when>
+          <xsl:when test="$chunk.first.sections = 0">
+            <xsl:call-template name="chunk-first-section-with-parent"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="chunk-all-sections"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>

Copied: branches/new-xsl/common.xsl (from rev 8190, branches/new-xsl/lfs-common.xsl)
===================================================================
--- branches/new-xsl/common.xsl	                        (rev 0)
+++ branches/new-xsl/common.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,458 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+  <!-- This stylesheet contains common params and templates for all outputs. -->
+
+    <!-- This file contains our localization strings (for internationalization) -->
+  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
+
+
+<!-- INDEX -->
+
+    <!-- Should the Index be generated? 1 = yes, 0 = no -->
+  <xsl:param name="generate.index" select="1"></xsl:param>
+
+    <!-- The indexing method used. Only 'basic' is supported by xsltproc -->
+  <xsl:param name="index.method" select="'basic'"></xsl:param>
+
+    <!-- The Index title:
+           We create this param to can have gentext support in both
+           the Index page title and links that point to the Index page.
+           It also allow us to change the title, if wanted.
+           Note: To change the title involves creating the appropiate
+           entries in lfs-l10n.xml -->
+  <xsl:param name="index-title">Index</xsl:param>
+
+    <!-- Index title generation. -->
+    <!-- The original template is in {docbook-xsl}/common/titles.xsl -->
+  <xsl:template match="index" mode="title.markup">
+    <xsl:param name="allow-anchors" select="0"/>
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="$index-title"/>
+    </xsl:call-template>
+  </xsl:template>
+
+    <!-- indexterm:
+           Dropping unneeded anchors and fo:wraper elemments. -->
+    <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
+  <xsl:template match="indexterm"/>
+
+<!-- -->
+
+<!-- LABELS -->
+
+    <!-- Are sections enumerated? 1 = yes, 0 = no -->
+  <xsl:param name="section.autolabel" select="1"/>
+
+    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+
+    <!-- sect1 label.markup:
+           Use lowercase roman numbers for sect1 in preface. -->
+    <!-- The original template is in {docbook-xsl}/common/labels.xsl -->
+  <xsl:template match="sect1" mode="label.markup">
+    <!-- if the parent is a component, maybe label that too -->
+    <xsl:variable name="parent.is.component">
+      <xsl:call-template name="is.component">
+        <xsl:with-param name="node" select=".."/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="component.label">
+      <xsl:if test="$section.label.includes.component.label != 0
+                    and $parent.is.component != 0">
+        <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:if>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="@label">
+        <xsl:value-of select="@label"/>
+      </xsl:when>
+      <xsl:when test="$section.autolabel != 0">
+        <xsl:copy-of select="$component.label"/>
+        <xsl:choose>
+          <xsl:when test="ancestor::preface">
+            <xsl:number format="i" count="sect1"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:number format="1" count="sect1"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- sect2 label.markup:
+           Skip numeration for sect2 with empty title. -->
+    <!-- The original template is in {docbook-xsl}/common/labels.xsl
+         It match also sect3, sect4, and sect5, that are unchanged. -->
+  <xsl:template match="sect2" mode="label.markup">
+      <!-- label the parent -->
+      <xsl:variable name="parent.section.label">
+        <xsl:call-template name="label.this.section">
+          <xsl:with-param name="section" select=".."/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="$parent.section.label != '0'">
+        <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>
+            <!-- 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:choose>
+  </xsl:template>
+
+    <!-- object.title.template:
+           Skip numeration for sectX > sect1 in preface. -->
+    <!-- The original template is in {docbook-xsl}/common/gentext.xsl. -->
+  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect|bridgehead"
+                mode="object.title.template">
+    <xsl:variable name="is.numbered">
+      <xsl:call-template name="label.this.section"/>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$is.numbered != 0 and not(ancestor::preface/sect1)">
+        <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: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>
+
+<!-- -->
+
+<!-- XREF (see {xhtml,pdf}/xref.xsl) -->
+
+    <!-- mode object.xref.markup:
+           Propagate role to named template substitute-markup -->
+    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
+  <xsl:template match="*" mode="object.xref.markup">
+    <xsl:param name="purpose"/>
+    <xsl:param name="xrefstyle"/>
+    <xsl:param name="referrer"/>
+    <xsl:param name="verbose" select="1"/>
+    <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 = '' and $verbose != 0">
+      <xsl:message>
+        <xsl:text>object.xref.markup: empty xref template</xsl:text>
+        <xsl:text> for linkend="</xsl:text>
+        <xsl:value-of select="@id|@xml: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="verbose" select="$verbose"/>
+      <xsl:with-param name="role" select="$role"/>
+    </xsl:call-template>
+  </xsl:template>
+
+    <!-- substitute-markup:
+           Propagate role to mode insert.title.markup -->
+    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
+  <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="docname" 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="verbose"/>
+    <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:with-param name="verbose" select="$verbose"/>
+                    </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 = 'o'">
+            <!-- olink target document title -->
+            <xsl:apply-templates select="." mode="insert.olink.docname.markup">
+              <xsl:with-param name="purpose" select="$purpose"/>
+              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+              <xsl:with-param name="docname">
+                <xsl:choose>
+                  <xsl:when test="$docname != ''">
+                    <xsl:copy-of select="$docname"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="olink.docname.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="docname" select="$docname"/>
+          <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="verbose" select="$verbose"/>
+          <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>
+
+<!-- -->
+
+<!-- Total packages size calculation -->
+
+    <!-- returnvalue:
+            If the tag is not empty, apply the original template.
+            Otherwise apply the calculation template. -->
+  <xsl:template match="returnvalue">
+    <xsl:choose>
+      <xsl:when test="count(*)>0">
+        <xsl:apply-imports/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="calculation">
+          <xsl:with-param name="scope" select="../../variablelist"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- Self-made calculation template. -->
+  <xsl:template name="calculation">
+    <xsl:param name="scope"/>
+    <xsl:param name="total">0</xsl:param>
+    <xsl:param name="position">1</xsl:param>
+    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
+    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
+    <xsl:variable name="size" select="substring-before($token,' KB')"/>
+    <xsl:variable name="rawsize">
+      <xsl:choose>
+        <xsl:when test="contains($size,',')">
+          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$size"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$position <= $tokens">
+        <xsl:call-template name="calculation">
+          <xsl:with-param name="scope" select="$scope"/>
+          <xsl:with-param name="position" select="$position +1"/>
+          <xsl:with-param name="total" select="$total + $rawsize"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$total < '1000'">
+            <xsl:value-of select="$total"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:when test="$total > '1000' and $total < '5000'">
+            <xsl:value-of select="substring($total,1,1)"/>
+            <xsl:text>,</xsl:text>
+            <xsl:value-of select="substring($total,2)"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="round($total div 1024)"/>
+            <xsl:text>  MB</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+<!-- -->
+
+</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-chunked.xsl
===================================================================
--- branches/new-xsl/lfs-chunked.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-chunked.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,68 +0,0 @@
-<?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"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                version="1.0"
-                exclude-result-prefixes="cf exsl">
-
-   <!-- Top-level chunked templates.
-        Import customized chunks templates.
-        Replaces {docbook-xsl}/xhtml/chunkfast.xsl -->
-
-    <!-- Our master chunking templates -->
-  <xsl:import href="lfs-chunked1.xsl"/>
-
-    <!-- Use chunk.fast code? 1 = yes, 0 = no -->
-  <xsl:param name="chunk.fast" select="1"/>
-
-  <!-- The code below was copied as-is from {docbook-xsl}/xhtml/chunkfast.xsl -->
-
-  <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-
-  <xsl:template name="process-chunk-element">
-    <xsl:choose>
-      <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-        <xsl:variable name="genid" select="generate-id()"/>
-
-        <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-        <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-        <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-        <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-        <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and parent::*">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="process-chunk">
-              <xsl:with-param name="prev" select="$prev"/>
-              <xsl:with-param name="next" select="$next"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and not(parent::*)">
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:when>
-          <xsl:when test="$onechunk != 0">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:when test="$chunk.first.sections = 0">
-            <xsl:call-template name="chunk-first-section-with-parent"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-chunked1.xsl
===================================================================
--- branches/new-xsl/lfs-chunked1.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-chunked1.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,47 +0,0 @@
-<?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">
-
-   <!-- Chunked output templates.
-        Include customized chunks templates.
-        Replaces {docbook-xsl}/xhtml/chunk.xsl -->
-
-    <!-- Our master non-chunking presentation templates -->
-  <xsl:import href="lfs-chunked2.xsl"/>
-
-    <!-- Upstream chunk code named templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
-
-    <!-- Upstream chunk code match templates -->
-  <xsl:include href="docbook-xsl-snapshot/xhtml/chunk-code.xsl"/>
-
-    <!-- Including our customized chunks templates -->
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
-  <xsl:include href="xhtml/lfs-navigational.xsl"/>
-
-    <!-- sect1:
-           Prevent creation of dummy sect1 files used to emulate sub-chapters. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-code.xsl
-         It match also others sect* tags. The code for that tags is unchanged. -->
-  <xsl:template match="sect1">
-    <xsl:variable name="ischunk">
-      <xsl:call-template name="chunk"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:when test="not(parent::*)">
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:when>
-      <xsl:when test="$ischunk = 0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-chunked2.xsl
===================================================================
--- branches/new-xsl/lfs-chunked2.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-chunked2.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,67 +0,0 @@
-<?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">
-
-   <!-- Second level chunked output template.
-        Sets global params and include customized elements templates-->
-
-    <!-- Upstream XHTML presentation templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
-
-    <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
-
-    <!-- Including our customized elements templates -->
-  <xsl:include href="lfs-common.xsl"/>
-  <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"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">lfs</xsl:param>
-
-    <!-- The CSS Stylesheets. We set here relative path from sub-dirs HTML files.
-    The path from top-level HTML files (index.html, partX.html, etc) MUST be
-    fixed via a sed in the Makefile-->
-    <!-- Master CSS Stylesheet -->
-  <xsl:param name="html.stylesheet" select="'../stylesheets/lfs.css'"/>
-    <!-- Print CSS Stylesheet -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-     <link rel="stylesheet" href="../stylesheets/lfs-print.css" type="text/css" media="print"/>
-  </xsl:template>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"/>
-  <xsl:param name="css.decoration" select="0"/>
-
-    <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   toc
-    part      toc
-    chapter   toc
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-common.xsl
===================================================================
--- branches/new-xsl/lfs-common.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-common.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,453 +0,0 @@
-<?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">
-
-  <!-- This stylesheet contains common params and templates for all outputs. -->
-
-    <!-- This file contains our localization strings (for internationalization) -->
-  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
-
-
-<!-- INDEX -->
-
-    <!-- Should the Index be generated? 1 = yes, 0 = no -->
-  <xsl:param name="generate.index" select="1"></xsl:param>
-
-    <!-- The indexing method used. Only 'basic' is supported by xsltproc -->
-  <xsl:param name="index.method" select="'basic'"></xsl:param>
-
-    <!-- The Index title:
-           We create this param to can have gentext support in both
-           the Index page title and links that point to the Index page.
-           It also allow us to change the title, if wanted.
-           Note: To change the title involves creating the appropiate
-           entries in lfs-l10n.xml -->
-  <xsl:param name="index-title">Index</xsl:param>
-
-    <!-- Index title generation. -->
-    <!-- The original template is in {docbook-xsl}/common/titles.xsl -->
-  <xsl:template match="index" mode="title.markup">
-    <xsl:param name="allow-anchors" select="0"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="$index-title"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- indexterm:
-           Dropping unneeded anchors and fo:wraper elemments. -->
-    <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
-  <xsl:template match="indexterm"/>
-
-<!-- -->
-
-<!-- LABELS -->
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no -->
-  <xsl:param name="section.autolabel" select="1"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-
-    <!-- sect1 label.markup:
-           Use lowercase roman numbers for sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl -->
-  <xsl:template match="sect1" mode="label.markup">
-    <!-- if the parent is a component, maybe label that too -->
-    <xsl:variable name="parent.is.component">
-      <xsl:call-template name="is.component">
-        <xsl:with-param name="node" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="component.label">
-      <xsl:if test="$section.label.includes.component.label != 0
-                    and $parent.is.component != 0">
-        <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:if>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@label">
-        <xsl:value-of select="@label"/>
-      </xsl:when>
-      <xsl:when test="$section.autolabel != 0">
-        <xsl:copy-of select="$component.label"/>
-        <xsl:choose>
-          <xsl:when test="ancestor::preface">
-            <xsl:number format="i" count="sect1"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:number format="1" count="sect1"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect2 label.markup:
-           Skip numeration for sect2 with empty title. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl
-         It match also sect3, sect4, and sect5, that are unchanged. -->
-  <xsl:template match="sect2" mode="label.markup">
-      <!-- label the parent -->
-      <xsl:variable name="parent.section.label">
-        <xsl:call-template name="label.this.section">
-          <xsl:with-param name="section" select=".."/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="$parent.section.label != '0'">
-        <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>
-            <!-- 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:choose>
-  </xsl:template>
-
-    <!-- object.title.template:
-           Skip numeration for sectX > sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl. -->
-  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect|bridgehead"
-                mode="object.title.template">
-    <xsl:variable name="is.numbered">
-      <xsl:call-template name="label.this.section"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$is.numbered != 0 and not(ancestor::preface/sect1)">
-        <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: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>
-
-<!-- -->
-
-<!-- XREF (see {xhtml,pdf}/xref.xsl) -->
-
-    <!-- mode object.xref.markup:
-           Propagate role to named template substitute-markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template match="*" mode="object.xref.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose" select="1"/>
-    <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 = '' and $verbose != 0">
-      <xsl:message>
-        <xsl:text>object.xref.markup: empty xref template</xsl:text>
-        <xsl:text> for linkend="</xsl:text>
-        <xsl:value-of select="@id|@xml: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="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- substitute-markup:
-           Propagate role to mode insert.title.markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <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="docname" 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="verbose"/>
-    <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:with-param name="verbose" select="$verbose"/>
-                    </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 = 'o'">
-            <!-- olink target document title -->
-            <xsl:apply-templates select="." mode="insert.olink.docname.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="docname">
-                <xsl:choose>
-                  <xsl:when test="$docname != ''">
-                    <xsl:copy-of select="$docname"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="olink.docname.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="docname" select="$docname"/>
-          <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="verbose" select="$verbose"/>
-          <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>
-
-<!-- -->
-
-<!-- Total packages size calculation -->
-
-    <!-- returnvalue:
-            If the tag is not empty, apply the original template.
-            Otherwise apply the calculation template. -->
-  <xsl:template match="returnvalue">
-    <xsl:choose>
-      <xsl:when test="count(*)>0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="../../variablelist"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made calculation template. -->
-  <xsl:template name="calculation">
-    <xsl:param name="scope"/>
-    <xsl:param name="total">0</xsl:param>
-    <xsl:param name="position">1</xsl:param>
-    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
-    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
-    <xsl:variable name="size" select="substring-before($token,' KB')"/>
-    <xsl:variable name="rawsize">
-      <xsl:choose>
-        <xsl:when test="contains($size,',')">
-          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$size"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$position <= $tokens">
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="position" select="$position +1"/>
-          <xsl:with-param name="total" select="$total + $rawsize"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$total < '1000'">
-            <xsl:value-of select="$total"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:when test="$total > '1000' and $total < '5000'">
-            <xsl:value-of select="substring($total,1,1)"/>
-            <xsl:text>,</xsl:text>
-            <xsl:value-of select="substring($total,2)"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="round($total div 1024)"/>
-            <xsl:text>  MB</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-nochunks.xsl
===================================================================
--- branches/new-xsl/lfs-nochunks.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-nochunks.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,635 +0,0 @@
-<?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">
-
-   <!-- Stylesheet for non-chunked XHTML output
-        Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
-
-    <!-- Upstream XHTML profiled templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/profile-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="lfs-common.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"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">lfs</xsl:param>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   nop
-    part      nop
-    chapter   nop
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"></xsl:param>
-  <xsl:param name="css.decoration" select="0"></xsl:param>
-
-    <!-- Don't use graphics in admonitions -->
-  <xsl:param name="admon.graphics" select="0"/>
-
-    <!-- Changing the admonitions output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="nongraphical.admonition">
-    <div class="admon {name(.)}">
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface (actualy, skip the hardcoded dot). -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h3 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h3>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- The CSS Stylesheet:
-           Note: there is some diferences with lfs.css code releated
-                 to h* values, admonitions and no navigational code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <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: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book {
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-.book h1, .book .authorgroup, .book .copyright, .book .legalnotice .revhistory {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: .1em 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  border-bottom: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.preface h2, .part h1, .chapter h2, .appendix h2, .index h1, .sect1 h2 {
-  background: #f5f6f7;
-  border-top: .2em solid #dbddec;
-  border-bottom: .2em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 1em;
-  padding: .4em;
-  text-align: center;
-}
-
-.sect1 h2, .appendix h2 {
-  margin-left: -.2em;
-}
-
-.wrap h2 {
-  background: #f5f6f7;
-  border-bottom: 0;
-  margin-top: 1em;
-  margin-bottom: 0;
-  padding-top: .4em;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-.appendix h3 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-
-/* Index */
-.item {
-    float: left;
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 30em;
-}
-
-.secitem + .indexref {
-    margin-left: 31em;
-}
-
-
-/* Admonitions */
-div.admon h3 {
-  padding-left: 2.5em;
-  padding-top: 1em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-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: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-.variablelist td p {
-  margin-top: 0;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .2em;
-  margin-bottom: .2em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
-      </xsl:text>
-    </style>
-  </xsl:template>
-
-</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-pdf.xsl
===================================================================
--- branches/new-xsl/lfs-pdf.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-pdf.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,106 +0,0 @@
-<?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">
-
-   <!-- Stylesheet for FO output used to generate PDF
-        Sets global params and include customization stylesheets. -->
-
-    <!-- Upstream FO templates. Profiled version is not supported by
-         xsltproc, thus pofiling must be done in two steps (see Makefile) -->
-  <xsl:import href="docbook-xsl-snapshot/fo/docbook.xsl"/>
-
-    <!-- Uncomment the next for debugging the raw FO code.
-         Note that FOP will complaints about a lot of paragraph overflows
-         due that verbatim output is also indented.
-         Remember to comment the "rm $(BASEDIR)/lfs-pdf.fo" in
-         the Makefile. -->
-  <!--<xsl:output  encoding="UTF-8" indent="yes" />-->
-
-    <!-- Including our others customized templates. -->
-  <xsl:include href="lfs-common.xsl"/>
-  <xsl:include href="pdf/lfs-admon.xsl"/>
-  <xsl:include href="pdf/lfs-index.xsl"/>
-  <xsl:include href="pdf/lfs-lists.xsl"/>
-  <xsl:include href="pdf/lfs-mixed.xsl"/>
-  <xsl:include href="pdf/lfs-pagesetup.xsl"/>
-  <xsl:include href="pdf/lfs-xref.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">lfs</xsl:param>
-
-    <!-- Activating FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
-  <xsl:param name="fop1.extensions" select="1"/>
-
-    <!-- Desactivate draft mode at all. -->
-  <xsl:param name="draft.mode" select="'no'"/>
-
-   <!-- Paper size -->
-  <xsl:param name="paper.type" select="'USletter'"/>
-
-    <!-- Paper size required by the publisher
-  <xsl:param name="paper.type" select="'Customized'"/>
-  <xsl:param name="page.width">7.25in</xsl:param>
-  <xsl:param name="page.height">9.25in</xsl:param>
-    -->
-
-    <!-- Is the document to be printed double sided? 1 = yes, 0 = no -->
-    <!-- Change "double.sided" to "1" for published versions. -->
-  <xsl:param name="double.sided" select="0"/>
-
-    <!-- Hyphenate? -->
-  <xsl:param name="hyphenate">false</xsl:param>
-
-    <!-- Allow URLs to be automatically hyphenated.
-         We have expanded the support to several inline tags.
-         See pdf/lfs-mixed.xsl -->
-  <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
-
-    <!-- List of characters to allow ulink URLs, and supported inline tags,
-         to be automatically hyphenated on.
-         Note: the / character is in the list but FOP-0.93 ignores it. -->
-  <xsl:param name="ulink.hyphenate.chars" select="'/._-'"/>
-
-    <!-- Specify the default text alignment. -->
-  <xsl:param name="alignment">justify</xsl:param>
-
-    <!-- Specifies the default point size for body text.
-         Used for titles size calculation. -->
-  <xsl:param name="body.font.master">9</xsl:param>
-
-    <!-- Specifies the default font size for body text. -->
-  <xsl:param name="body.font.size">12pt</xsl:param>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    part      nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- Amount of indentation for TOC entries. -->
-  <xsl:param name="toc.indent.width" select="18"/>
-
-    <!-- Turns page numbers in xrefs on and off. -->
-  <xsl:param name="insert.xref.page.number">no</xsl:param>
-
-    <!-- Display URLs after ulinks? 1 = yes, 0 = no
-         Set to 0 to prevent duplicate e-mails in the Acknowledgments pages. -->
-  <xsl:param name="ulink.show" select="0"/>
-
-    <!-- Processing instruction for hard page breaks.
-         FOP-0.93 supports now @keep-*.*, @orphans, and @widows attributes,
-         that solves several page break issues.
-         It also supports the soft page break procesing instruction included
-         in the DocBook stylesheets.
-         But some times we may need hard page breaks for final book versions. -->
-    <!-- To know how to use all that page break features, see
-         http://www.sagehill.net/docbookxsl/PageBreaking.html -->
-  <xsl:template match="processing-instruction('hard-pagebreak')">
-    <fo:block break-before='page'/>
-  </xsl:template>
-
-</xsl:stylesheet>

Deleted: branches/new-xsl/lfs-profile.xsl
===================================================================
--- branches/new-xsl/lfs-profile.xsl	2007-07-05 18:56:40 UTC (rev 8191)
+++ branches/new-xsl/lfs-profile.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -1,50 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <!-- Stylesheet to create profiled XML output.
-       Replaces {docbook-xsl}/profiling/profile.xsl -->
-
-  <!-- Include common profiling stylesheet -->
-  <xsl:import href="docbook-xsl-snapshot/profiling/profile-mode.xsl"/>
-
-    <!-- This file must be included, because profile-mode is using
-         templates from it -->
-  <xsl:import href="docbook-xsl-snapshot/common/stripns.xsl"/>
-
-    <!-- In the two pass processing there is no need for base URI fixup -->
-  <xsl:param name="profile.baseuri.fixup" select="false()"/>
-
-  <!-- Generate DocBook instance with correct DOCTYPE -->
-  <xsl:output method="xml"
-              doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
-              doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
-
-  <!-- Profiling parameters:
-         profile.separator changed from ";" to "," to let it work
-         at command line. -->
-  <xsl:param name="profile.arch" select="''"/>
-  <xsl:param name="profile.audience" select="''"/>
-  <xsl:param name="profile.condition" select="''"/>
-  <xsl:param name="profile.conformance" select="''"/>
-  <xsl:param name="profile.lang" select="''"/>
-  <xsl:param name="profile.os" select="''"/>
-  <xsl:param name="profile.revision" select="''"/>
-  <xsl:param name="profile.revisionflag" select="''"/>
-  <xsl:param name="profile.role" select="''"/>
-  <xsl:param name="profile.security" select="''"/>
-  <xsl:param name="profile.status" select="''"/>
-  <xsl:param name="profile.userlevel" select="''"/>
-  <xsl:param name="profile.vendor" select="''"/>
-  <xsl:param name="profile.wordsize" select="''"/>
-  <xsl:param name="profile.attribute" select="''"/>
-  <xsl:param name="profile.value" select="''"/>
-  <xsl:param name="profile.separator" select="','"/>
-
-  <!-- Call common profiling mode -->
-  <xsl:template match="/">
-    <xsl:apply-templates select="." mode="profile"/>
-  </xsl:template>
-
-</xsl:stylesheet>

Copied: branches/new-xsl/nochunks.xsl (from rev 8190, branches/new-xsl/lfs-nochunks.xsl)
===================================================================
--- branches/new-xsl/nochunks.xsl	                        (rev 0)
+++ branches/new-xsl/nochunks.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,637 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+   <!-- Stylesheet for non-chunked XHTML output
+        Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
+
+    <!-- Upstream XHTML profiled templates -->
+  <xsl:import href="docbook-xsl-snapshot/xhtml/profile-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="common.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"/>
+
+    <!-- Control generation of ToCs and LoTs -->
+  <xsl:param name="generate.toc">
+    book      toc,title
+    preface   nop
+    part      nop
+    chapter   nop
+    appendix  nop
+    sect1     nop
+    sect2     nop
+    sect3     nop
+    sect4     nop
+    sect5     nop
+    section   nop
+  </xsl:param>
+
+    <!-- How deep should recursive sections appear in the TOC? -->
+  <xsl:param name="toc.section.depth">1</xsl:param>
+
+    <!-- How maximaly deep should be each TOC? -->
+  <xsl:param name="toc.max.depth">3</xsl:param>
+
+    <!-- Dropping some unwanted style attributes -->
+  <xsl:param name="ulink.target" select="''"></xsl:param>
+  <xsl:param name="css.decoration" select="0"></xsl:param>
+
+    <!-- Don't use graphics in admonitions -->
+  <xsl:param name="admon.graphics" select="0"/>
+
+    <!-- Changing the admonitions output tagging:
+           Removed $admon.style support
+           Hardcoded $admon.textlabel feature -->
+    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
+  <xsl:template name="nongraphical.admonition">
+    <div class="admon {name(.)}">
+      <h3>
+        <xsl:apply-templates select="." mode="object.title.markup"/>
+      </h3>
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
+    <!-- sect2.titlepage:
+           Removed a lot of unneeded code.
+           Skip empty titles.
+           No label in preface (actualy, skip the hardcoded dot). -->
+    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
+  <xsl:template name="sect2.titlepage">
+    <xsl:choose>
+      <xsl:when test="string-length(title) = 0"/>
+      <xsl:otherwise>
+        <h3 class="{name(.)}">
+          <xsl:if test="@id">
+            <a id="{@id}" name="{@id}"/>
+          </xsl:if>
+          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
+            <xsl:apply-templates select="." mode="label.markup"/>
+            <xsl:text>. </xsl:text>
+          </xsl:if>
+          <xsl:value-of select="title"/>
+        </h3>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+    <!-- The CSS Stylesheet:
+           Note: there is some diferences with lfs.css code releated
+                 to h* values, admonitions and no navigational code. -->
+    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
+  <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: #222;
+  margin: 1em;
+  padding: 0;
+  font-size: 1em;
+  line-height: 1.2em
+}
+
+
+/* Links */
+a:link { color: #22b; }
+a.ulink:link { font-weight: bold; color: #55f; }
+a:visited { color: #7e4988 ! important; }
+a:hover, a:focus { color: #d30e08 ! important; }
+a:active { color: #6b77b1 ! important;}
+
+
+/* Book titlepage */
+.book {
+  margin: 0px auto;
+  padding: 0 1em;
+}
+
+.book h1, .book .authorgroup, .book .copyright, .book .legalnotice .revhistory {
+  background: #f5f6f7;
+  margin: 0px auto;
+  padding: .1em 1em;
+}
+
+.book hr {
+  background: #dbddec;
+  height: .3em;
+  border: 0px;
+  margin: 0;
+  padding: 0;
+}
+
+div.dedication {
+  padding-left: 1em;
+}
+
+
+/* Sections */
+div.sect1, div.appendix {
+  padding-left: .3em;
+}
+
+.package, .kernel, .installation, .commands, .testing, .configuration, .content {
+  padding: 0 .5em .2em 0;
+  margin: 0;
+}
+
+.lfs .package {
+  background: #f5f6f7;
+  border-bottom: 0.2em solid #dbddec;
+  padding-top: .1em;
+  margin-top: 0;
+}
+
+.lfs .configuration {
+  background:   #fefefe;
+  border-top: 0.2em solid #dbddec;
+}
+
+.lfs .content {
+  background: #f5f6f7;
+  border-top: 0.2em solid #dbddec;
+  border-bottom: 0.2em solid #dbddec;
+  padding-bottom: .1em;
+  margin-bottom: 0;
+}
+
+
+/* Headers */
+h1, h2, h3, h4, h5, h6, b, .strong {
+  color: #000;
+  font-weight: bold;
+  line-height: 1em;
+}
+
+h1 {
+  font-size: 173%;
+  text-align: center;
+}
+
+.book h1 {
+  margin: 0;
+  padding: 0.4em;
+}
+
+h1.title sup {
+  font-size: small;
+}
+
+h2 {
+  font-size: 144%;
+}
+
+.preface h2, .part h1, .chapter h2, .appendix h2, .index h1, .sect1 h2 {
+  background: #f5f6f7;
+  border-top: .2em solid #dbddec;
+  border-bottom: .2em solid #dbddec;
+  margin-bottom: 1em;
+  margin-top: 1em;
+  padding: .4em;
+  text-align: center;
+}
+
+.sect1 h2, .appendix h2 {
+  margin-left: -.2em;
+}
+
+.wrap h2 {
+  background: #f5f6f7;
+  border-bottom: 0;
+  margin-top: 1em;
+  margin-bottom: 0;
+  padding-top: .4em;
+}
+
+.book h2.subtitle {
+  text-align: center;
+  background: #dbddec;
+  margin: 0;
+  padding: 0.2em;
+}
+
+h3 {
+  font-size: 120%;
+}
+
+.appendix h3 {
+  font-size: 133%;
+  margin-top: .8em;
+  margin-bottom: 0.2em;
+}
+
+h4 {
+  font-size: 110%;
+}
+
+.package h4, h5, h6 {
+  font-size: 100%;
+  font-style: italic;
+}
+
+
+/* TOC */
+div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
+  list-style: none;
+}
+
+div.toc {
+  padding-left: 1em;
+}
+
+li.preface, .part li.appendix {
+  margin-left: 1em;
+}
+
+div.toc h3 {
+  margin: 1em 0 .3em 0;
+}
+
+li.appendix h3, li.glossary h3, li.index h3 {
+  margin: .5em
+}
+
+div.toc h4 {
+  margin: .6em 0 .2em 0;
+}
+
+li.chapter h4 a {
+  display: block;
+  margin-bottom: .4em
+}
+
+.dummy {
+  display: block;
+  font-weight: bold;
+  font-size: 110%;
+  margin: .6em 0 .2em 0;
+}
+
+
+/* Index */
+.item {
+    float: left;
+}
+
+.secitem {
+    font-weight: normal;
+    float: left;
+}
+
+.indexref {
+    display: block;
+}
+
+.item + .indexref {
+    margin-left: 30em;
+}
+
+.secitem + .indexref {
+    margin-left: 31em;
+}
+
+
+/* Admonitions */
+div.admon h3 {
+  padding-left: 2.5em;
+  padding-top: 1em;
+}
+
+div.admon p {
+  margin-left: .5em;
+}
+
+div.admon pre {
+  margin: 0.5em 3em;
+}
+
+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: .5em auto;
+  color: #600;
+}
+
+div.important h3, div.warning h3, div.caution h3 {
+  color: #900;
+}
+
+div.important em, div.warning em, div.caution em {
+  color: #000;
+  font-weight: bold;
+}
+
+
+/* table */
+.table p.title {
+  text-align: center;
+  margin-top: 0;
+  margin-bottom: .3em;
+}
+
+.table table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.table table th, .table table td {
+  padding: 0.2em 2em 0.2em 2em;
+  text-align: left;
+}
+
+.revhistory {
+  padding-left: 1em;
+}
+
+.revhistory th {
+  line-height: 2em;
+  text-align: left;
+}
+
+.revhistory td {
+  padding-right: 1em;
+}
+
+
+/* variablelist as table */
+.variablelist table {
+  width: auto;
+  margin: 0 1em 0 1em;
+}
+
+.variablelist td {
+  vertical-align: top;
+}
+
+.variablelist td span, td p {
+  margin: 0.25em;
+}
+
+.variablelist td p {
+  margin-top: 0;
+}
+
+
+/* variablelist as list */
+dl {
+  padding-left: 1em
+}
+
+dt {
+  font-weight: bold;
+  margin-left: 1em;
+}
+
+dd {
+  margin-bottom: .6em;
+  margin-left: 1em;
+}
+
+dd p {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+div.materials dt {
+  display: list-item;
+}
+
+div.materials dd {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+
+/* segmentedlist */
+.appendix .segmentedlist {
+  padding-left: 1em;
+}
+
+.package .seg {
+  margin-bottom: 0em;
+  margin-top: 0em;
+  clear: left;
+}
+
+.content .seg {
+  margin-bottom: .4em;
+  margin-top: .4em;
+  clear: left;
+}
+
+.segtitle {
+  float: left;
+}
+
+.package .segbody, .appendix .segbody {
+  display: block;
+  padding-left: 14em;
+}
+
+.content .segbody {
+  display: block;
+  padding-left: 12em;
+}
+
+
+/* itemizedlist */
+ul {
+  padding-left: 1em
+}
+
+.itemizedlist ul {
+  margin-left: 1em
+}
+
+.itemizedlist li ul {
+  margin-bottom: 1.2em;
+}
+
+.itemizedlist li ul li p {
+  margin-top: .2em;
+  margin-bottom: .2em;
+}
+
+.itemizedlist li ul li:first-child p:first-child {
+  margin-top: -.6em;
+}
+
+ul.compact {
+  list-style: none;
+}
+
+.blfs ul.compact {
+  list-style: disc;
+}
+
+ul.compact li {
+  margin: 0em;
+  padding: 0em;
+}
+
+ul.compact li p {
+  padding: 0.3em;
+  margin: 0em;
+}
+
+.blfs ul.compact li p {
+  background-color: #f0fff0;
+}
+
+/* orderedlist */
+ol {
+  list-style: decimal;
+}
+
+ol ol {
+  list-style: lower-alpha;
+}
+
+ol ol ol {
+  list-style: lower-roman;
+}
+
+ol.compact li {
+  margin: 0em;
+  padding: 0em;
+}
+
+ol.compact li p {
+  padding: 0.3em;
+  margin: 0em;
+}
+
+
+/* Indented blocks */
+p, blockquote {
+  padding-left: 1em;
+  padding-right: 1em;
+}
+
+
+/* Monospaced elements */
+tt, code, kbd, pre, .command {
+  font-family: monospace;
+}
+
+.systemitem {
+  font-style: italic;
+}
+
+pre {
+  background-color: #e5e5e5;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em .5em 2em;
+  font-weight: bold;
+}
+
+pre.userinput {
+  color: #101310;
+}
+
+pre.root {
+  color: #101310;
+  border: 1px solid #11a;
+}
+
+pre.screen {
+  color: #000;
+  background-color: #e9e9e9;
+  font-weight: normal;
+}
+
+.literal, .prompt {
+  font-weight: normal;
+}
+
+
+/* Mixed tags */
+p.usernotes {
+  margin-left: -1em;
+  font-size: small;
+  font-weight: bold;
+  font-style: italic;
+}
+
+.underlined {
+  text-decoration: underline;
+}
+
+
+/* Last edited info */
+p.updated {
+  font-size: small;
+  font-weight: bold;
+  font-style: italic;
+}
+
+
+/* Special colored blocks */
+  /* OrangeRed4 */
+.feature-ssp {
+  color: #8B2500;
+}
+
+  /* RoyalBlue3 */
+.feature-aslr {
+  color: #3A5FCD;
+}
+
+  /* NavyBlue */
+.feature-pax {
+  color: #000080;
+}
+
+  /* VioletRed */
+.feature-hardened_tmp {
+  color: #d02090;
+}
+
+  /* PaleTurquoise4 */
+.feature-warnings {
+  color: #668b8b;
+}
+
+  /* RosyBrown */
+.feature-misc {
+  color: #bc8f8f;
+}
+
+  /* Sienna*/
+.feature-blowfish {
+  color: #8E6B23
+}
+      </xsl:text>
+    </style>
+  </xsl:template>
+
+</xsl:stylesheet>

Copied: branches/new-xsl/pdf.xsl (from rev 8190, branches/new-xsl/lfs-pdf.xsl)
===================================================================
--- branches/new-xsl/pdf.xsl	                        (rev 0)
+++ branches/new-xsl/pdf.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+   <!-- Stylesheet for FO output used to generate PDF
+        Sets global params and include customization stylesheets. -->
+
+    <!-- Upstream FO templates. Profiled version is not supported by
+         xsltproc, thus pofiling must be done in two steps (see Makefile) -->
+  <xsl:import href="docbook-xsl-snapshot/fo/docbook.xsl"/>
+
+    <!-- Uncomment the next for debugging the raw FO code.
+         Note that FOP will complaints about a lot of paragraph overflows
+         due that verbatim output is also indented.
+         Remember to comment the "rm $(BASEDIR)/lfs-pdf.fo" in
+         the Makefile. -->
+  <!--<xsl:output  encoding="UTF-8" indent="yes" />-->
+
+    <!-- Including our others customized templates. -->
+  <xsl:include href="common.xsl"/>
+  <xsl:include href="pdf/lfs-admon.xsl"/>
+  <xsl:include href="pdf/lfs-index.xsl"/>
+  <xsl:include href="pdf/lfs-lists.xsl"/>
+  <xsl:include href="pdf/lfs-mixed.xsl"/>
+  <xsl:include href="pdf/lfs-pagesetup.xsl"/>
+  <xsl:include href="pdf/lfs-xref.xsl"/>
+
+    <!-- Activating FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
+  <xsl:param name="fop1.extensions" select="1"/>
+
+    <!-- Desactivate draft mode at all. -->
+  <xsl:param name="draft.mode" select="'no'"/>
+
+   <!-- Paper size -->
+  <xsl:param name="paper.type" select="'USletter'"/>
+
+    <!-- Paper size required by the publisher
+  <xsl:param name="paper.type" select="'Customized'"/>
+  <xsl:param name="page.width">7.25in</xsl:param>
+  <xsl:param name="page.height">9.25in</xsl:param>
+    -->
+
+    <!-- Is the document to be printed double sided? 1 = yes, 0 = no -->
+    <!-- Change "double.sided" to "1" for published versions. -->
+  <xsl:param name="double.sided" select="0"/>
+
+    <!-- Hyphenate? -->
+  <xsl:param name="hyphenate">false</xsl:param>
+
+    <!-- Allow URLs to be automatically hyphenated.
+         We have expanded the support to several inline tags.
+         See pdf/lfs-mixed.xsl -->
+  <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
+
+    <!-- List of characters to allow ulink URLs, and supported inline tags,
+         to be automatically hyphenated on.
+         Note: the / character is in the list but FOP-0.93 ignores it. -->
+  <xsl:param name="ulink.hyphenate.chars" select="'/._-'"/>
+
+    <!-- Specify the default text alignment. -->
+  <xsl:param name="alignment">justify</xsl:param>
+
+    <!-- Specifies the default point size for body text.
+         Used for titles size calculation. -->
+  <xsl:param name="body.font.master">9</xsl:param>
+
+    <!-- Specifies the default font size for body text. -->
+  <xsl:param name="body.font.size">12pt</xsl:param>
+
+    <!-- Control generation of ToCs and LoTs -->
+  <xsl:param name="generate.toc">
+    book      toc,title
+    part      nop
+  </xsl:param>
+
+    <!-- How deep should recursive sections appear in the TOC? -->
+  <xsl:param name="toc.section.depth">1</xsl:param>
+
+    <!-- Amount of indentation for TOC entries. -->
+  <xsl:param name="toc.indent.width" select="18"/>
+
+    <!-- Turns page numbers in xrefs on and off. -->
+  <xsl:param name="insert.xref.page.number">no</xsl:param>
+
+    <!-- Display URLs after ulinks? 1 = yes, 0 = no
+         Set to 0 to prevent duplicate e-mails in the Acknowledgments pages. -->
+  <xsl:param name="ulink.show" select="0"/>
+
+    <!-- Processing instruction for hard page breaks.
+         FOP-0.93 supports now @keep-*.*, @orphans, and @widows attributes,
+         that solves several page break issues.
+         It also supports the soft page break procesing instruction included
+         in the DocBook stylesheets.
+         But some times we may need hard page breaks for final book versions. -->
+    <!-- To know how to use all that page break features, see
+         http://www.sagehill.net/docbookxsl/PageBreaking.html -->
+  <xsl:template match="processing-instruction('hard-pagebreak')">
+    <fo:block break-before='page'/>
+  </xsl:template>
+
+</xsl:stylesheet>

Copied: branches/new-xsl/profile.xsl (from rev 8190, branches/new-xsl/lfs-profile.xsl)
===================================================================
--- branches/new-xsl/profile.xsl	                        (rev 0)
+++ branches/new-xsl/profile.xsl	2007-07-05 20:04:36 UTC (rev 8192)
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+  <!-- Stylesheet to create profiled XML output.
+       Replaces {docbook-xsl}/profiling/profile.xsl -->
+
+  <!-- Include common profiling stylesheet -->
+  <xsl:import href="docbook-xsl-snapshot/profiling/profile-mode.xsl"/>
+
+    <!-- This file must be included, because profile-mode is using
+         templates from it -->
+  <xsl:import href="docbook-xsl-snapshot/common/stripns.xsl"/>
+
+    <!-- In the two pass processing there is no need for base URI fixup -->
+  <xsl:param name="profile.baseuri.fixup" select="false()"/>
+
+  <!-- Generate DocBook instance with correct DOCTYPE -->
+  <xsl:output method="xml"
+              doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
+              doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
+
+  <!-- Profiling parameters:
+         profile.separator changed from ";" to "," to let it work
+         at command line. -->
+  <xsl:param name="profile.arch" select="''"/>
+  <xsl:param name="profile.audience" select="''"/>
+  <xsl:param name="profile.condition" select="''"/>
+  <xsl:param name="profile.conformance" select="''"/>
+  <xsl:param name="profile.lang" select="''"/>
+  <xsl:param name="profile.os" select="''"/>
+  <xsl:param name="profile.revision" select="''"/>
+  <xsl:param name="profile.revisionflag" select="''"/>
+  <xsl:param name="profile.role" select="''"/>
+  <xsl:param name="profile.security" select="''"/>
+  <xsl:param name="profile.status" select="''"/>
+  <xsl:param name="profile.userlevel" select="''"/>
+  <xsl:param name="profile.vendor" select="''"/>
+  <xsl:param name="profile.wordsize" select="''"/>
+  <xsl:param name="profile.attribute" select="''"/>
+  <xsl:param name="profile.value" select="''"/>
+  <xsl:param name="profile.separator" select="','"/>
+
+  <!-- Call common profiling mode -->
+  <xsl:template match="/">
+    <xsl:apply-templates select="." mode="profile"/>
+  </xsl:template>
+
+</xsl:stylesheet>




More information about the lfs-book mailing list