Revised top-level chunk code.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/new-xsl@7981 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

lfs-chunked.xsl

@@ -4,29 +4,18 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-  <xsl:import href="lfs-chunked2.xsl"/>
-  <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
-  <xsl:include href="docbook-xsl-snapshot/xhtml/manifest.xsl"/>
-
-    <!--  From the original chunk.xsl file:
-
-    Why is chunk-code now xsl:included?
+   <!-- REVISED -->
 
-    Suppose you want to customize *both* the chunking algorithm used *and* the
-    presentation of some elements that may be chunks. In order to do that, you
-    must get the order of imports "just right". The answer is to make your own
-    copy of this file, where you replace the initial import of "docbook.xsl"
-    with an import of your own base.xsl (that does its own import of docbook.xsl).
-
-    Put the templates for changing the presentation of elements in your base.xsl.
-
-    Put the templates that control chunking after the include of chunk-code.xsl.
+    <!-- Our master non-chunking presentation templates -->
+  <xsl:import href="lfs-chunked2.xsl"/>
 
-    Voila! (Man I hope we can do this better in XSLT 2.0)  -->
+    <!-- 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/profile-chunk-code.xsl"/>
 
-    <!-- Including our others customized chunks templates -->
+    <!-- Including our customized chunks templates -->
   <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
   <xsl:include href="xhtml/lfs-index.xsl"/>
   <xsl:include href="xhtml/lfs-navigational.xsl"/>

lfs-chunked2.xsl

@@ -4,11 +4,14 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
-    <!-- We use XHTML -->
-  <xsl:import href="docbook-xsl-snapshot/docbook.xsl"/>
+   <!-- REVISED -->
+
+    <!-- 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 others customized elements templates -->
+    <!-- Including our customized elements templates -->
   <xsl:include href="xhtml/lfs-admon.xsl"/>
   <xsl:include href="xhtml/lfs-sections.xsl"/>
   <xsl:include href="xhtml/lfs-mixed.xsl"/>