From 44cb16aeb0cff7c6c95f05ad333d7368ad49b776 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sun, 17 Apr 2005 20:10:07 +0000
Subject: [PATCH] Updated the stylesheets to use DocBook-XSL 168.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@4989 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml           | 3 +++
 stylesheets/lfs-chunked.xsl       | 6 +++---
 stylesheets/lfs-chunked2.xsl      | 2 +-
 stylesheets/lfs-nochunks.xsl      | 2 +-
 stylesheets/lfs-pdf.xsl           | 2 +-
 stylesheets/lfs-profile.xsl       | 2 +-
 stylesheets/pdf/lfs-admon.xsl     | 2 +-
 stylesheets/pdf/lfs-mixed.xsl     | 2 +-
 stylesheets/pdf/lfs-pagesetup.xsl | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 51a661dd3..ff97c323d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -82,6 +82,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>April 17th, 2005 [manuel]: Updated the stylesheets to use
+DocBook-XSL 1.68.1.</para></listitem>
+
 <listitem><para>April 17, 2005 [matt]: Don't create hotplug's events log file;
 the bootscripts handle that for us.</para></listitem>
 
diff --git a/stylesheets/lfs-chunked.xsl b/stylesheets/lfs-chunked.xsl
index 47b564447..7234248ac 100644
--- a/stylesheets/lfs-chunked.xsl
+++ b/stylesheets/lfs-chunked.xsl
@@ -5,8 +5,8 @@
                 version="1.0">
 
   <xsl:import href="lfs-chunked2.xsl"/>
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/chunk-common.xsl"/>
-  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/manifest.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.68.1/xhtml/chunk-common.xsl"/>
+  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.68.1/xhtml/manifest.xsl"/>
 
     <!--  From the original chunk.xsl file:
 
@@ -24,7 +24,7 @@
 
     Voila! (Man I hope we can do this better in XSLT 2.0)  -->
 
-  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/profile-chunk-code.xsl"/>
+  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.68.1/xhtml/profile-chunk-code.xsl"/>
 
     <!-- Including our others customized chunks templates -->
   <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
diff --git a/stylesheets/lfs-chunked2.xsl b/stylesheets/lfs-chunked2.xsl
index 967162c8a..bdc63f289 100644
--- a/stylesheets/lfs-chunked2.xsl
+++ b/stylesheets/lfs-chunked2.xsl
@@ -5,7 +5,7 @@
                 version="1.0">
 
     <!-- We use XHTML -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/docbook.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.68.1/xhtml/docbook.xsl"/>
   <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
 
     <!-- Including our others customized elements templates -->
diff --git a/stylesheets/lfs-nochunks.xsl b/stylesheets/lfs-nochunks.xsl
index 375f1d8cd..027f42eb7 100644
--- a/stylesheets/lfs-nochunks.xsl
+++ b/stylesheets/lfs-nochunks.xsl
@@ -5,7 +5,7 @@
                 version="1.0">
 
     <!-- We use XHTML -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/profile-docbook.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.68.1/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" />
diff --git a/stylesheets/lfs-pdf.xsl b/stylesheets/lfs-pdf.xsl
index 39e3fa067..382dd2c48 100644
--- a/stylesheets/lfs-pdf.xsl
+++ b/stylesheets/lfs-pdf.xsl
@@ -4,7 +4,7 @@
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
     <!-- We use FO and FOP as the processor -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/fo/docbook.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.68.1/fo/docbook.xsl"/>
   <xsl:param name="fop.extensions" select="1"/>
   <xsl:param name="draft.mode" select="'no'"/>
 
diff --git a/stylesheets/lfs-profile.xsl b/stylesheets/lfs-profile.xsl
index 8af9ca94e..16ab132b4 100644
--- a/stylesheets/lfs-profile.xsl
+++ b/stylesheets/lfs-profile.xsl
@@ -4,7 +4,7 @@
                 version="1.0">
 
   <!-- Include common profiling stylesheet -->
-  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/profiling/profile-mode.xsl"/>
+  <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.68.1/profiling/profile-mode.xsl"/>
   
   <!-- Generate DocBook instance with correct DOCTYPE -->
   <xsl:output method="xml" 
diff --git a/stylesheets/pdf/lfs-admon.xsl b/stylesheets/pdf/lfs-admon.xsl
index 2872055fb..03325bd48 100644
--- a/stylesheets/pdf/lfs-admon.xsl
+++ b/stylesheets/pdf/lfs-admon.xsl
@@ -59,7 +59,7 @@
               provisional-label-separation="18pt" xsl:use-attribute-sets="list.block.spacing">
         <fo:list-item>
             <fo:list-item-label end-indent="label-end()">
-              <fo:block margin-left="4pt">
+              <fo:block margin-left="18pt">
                 <fo:external-graphic width="auto" height="auto"
                         content-width="{$graphic.width}" >
                   <xsl:attribute name="src">
diff --git a/stylesheets/pdf/lfs-mixed.xsl b/stylesheets/pdf/lfs-mixed.xsl
index 15fc55eaf..065128f1b 100644
--- a/stylesheets/pdf/lfs-mixed.xsl
+++ b/stylesheets/pdf/lfs-mixed.xsl
@@ -227,7 +227,7 @@
         <xsl:text>&#x2022;   </xsl:text>
         <xsl:apply-templates select="term"/>
       </fo:block>
-      <fo:block margin-left="0.1in" text-align="left">
+      <fo:block margin-left="1.4pc" text-align="left">
         <xsl:apply-templates select="listitem"/>
       </fo:block>
     </xsl:when>
diff --git a/stylesheets/pdf/lfs-pagesetup.xsl b/stylesheets/pdf/lfs-pagesetup.xsl
index 7733b45e3..88538a3cb 100644
--- a/stylesheets/pdf/lfs-pagesetup.xsl
+++ b/stylesheets/pdf/lfs-pagesetup.xsl
@@ -76,7 +76,7 @@
     <!-- Margins -->
   <xsl:param name="page.margin.inner">0.5in</xsl:param>
   <xsl:param name="page.margin.outer">0.375in</xsl:param>
-  <xsl:param name="title.margin.left">-0.7pc</xsl:param>
+  <xsl:param name="body.start.indent" select="'0.7pc'"/>
   <xsl:attribute-set name="normal.para.spacing">
     <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
     <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>