r4152 - in branches/testing/BOOK: . appendixa appendixb chapter01 stylesheets stylesheets/xhtml

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Sep 10 12:06:16 PDT 2004


Author: manuel
Date: 2004-09-10 13:06:14 -0600 (Fri, 10 Sep 2004)
New Revision: 4152

Modified:
   branches/testing/BOOK/appendixa/acronymlist.xml
   branches/testing/BOOK/appendixb/acknowledgments.xml
   branches/testing/BOOK/chapter01/changelog.xml
   branches/testing/BOOK/general.ent
   branches/testing/BOOK/stylesheets/lfs.css
   branches/testing/BOOK/stylesheets/xhtml/lfs-titles.xsl
   branches/testing/BOOK/stylesheets/xhtml/lfs-toc.xsl
Log:
Making a better output for Appendix{a,b}.

Modified: branches/testing/BOOK/appendixa/acronymlist.xml
===================================================================
--- branches/testing/BOOK/appendixa/acronymlist.xml	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/appendixa/acronymlist.xml	2004-09-10 19:06:14 UTC (rev 4152)
@@ -5,12 +5,9 @@
 ]>
 <appendix id="appendixa" xreflabel="Appendix A">
 <?dbhtml dir="appendixa"?>
-<title/>
+<title>Acronyms and terms</title>
 <?dbhtml filename="acronymlist.html"?>
 
-<sect1 id="appendixa-acronymlist">
-<title>Acronyms and terms</title>
-
 <variablelist>
 <?dbfo list-presentation="list"?>
 
@@ -408,7 +405,5 @@
 
 </variablelist>
 
-</sect1>
-
 </appendix>
 

Modified: branches/testing/BOOK/appendixb/acknowledgments.xml
===================================================================
--- branches/testing/BOOK/appendixb/acknowledgments.xml	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/appendixb/acknowledgments.xml	2004-09-10 19:06:14 UTC (rev 4152)
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
 <appendix id="appendixb" xreflabel="Appendix B">
 <?dbhtml dir="appendixb"?>
-<title/>
+<title>Acknowledgments</title>
 <?dbhtml filename="acknowledgements.html"?>
 
-<sect1 id="appendixb-acknowledgments">
-<title>Acknowledgments</title>
-
 <para>We would like to thank the following people and organizations
 for their contributions to the Linux From Scratch Project.</para>
 
-<sect2> <title>Project Team Members</title>
+<bridgehead renderas="sect2">Project Team Members</bridgehead>
 
 <itemizedlist>
 
@@ -100,10 +97,8 @@
 
 </itemizedlist>
 
-</sect2>
+<bridgehead renderas="sect2">Translators</bridgehead>
 
-<sect2> <title>Translators</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:macana at lfs-es.org">Manuel Canales
@@ -125,12 +120,10 @@
 
 </itemizedlist>
 
-</sect2>
+<bridgehead renderas="sect2">Mirror Maintainers</bridgehead>
 
-<sect2> <title>Mirror Maintainers</title>
+<bridgehead renderas="sect3">North American Mirrors</bridgehead>
 
-<sect3> <title>North American Mirrors</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:scott at osuosl.org">Scott
@@ -159,10 +152,8 @@
 
 </itemizedlist>
 
-</sect3>
+<bridgehead renderas="sect3">South American Mirrors</bridgehead>
 
-<sect3> <title>South American Mirrors</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:manuel at linuxfromscratch.org">Manuel
@@ -179,10 +170,8 @@
 
 </itemizedlist>
 
-</sect3>
+<bridgehead renderas="sect3">European Mirrors</bridgehead>
 
-<sect3> <title>European Mirrors</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:barna at siker.hu">Barna
@@ -250,10 +239,8 @@
 
 </itemizedlist>
 
-</sect3>
+<bridgehead renderas="sect3">Asian Mirrors</bridgehead>
 
-<sect3> <title>Asian Mirrors</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:pyng at spam.averse.net">Pui
@@ -266,10 +253,8 @@
 
 </itemizedlist>
 
-</sect3>
+<bridgehead renderas="sect3">Australian Mirrors</bridgehead>
 
-<sect3> <title>Australian Mirrors</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:jason at dstc.edu.au">Jason
@@ -278,12 +263,8 @@
 
 </itemizedlist>
 
-</sect3>
+<bridgehead renderas="sect2">A very special thank you to our donators</bridgehead>
 
-</sect2>
-
-<sect2><title>A very special thank you to our donators</title>
-
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:dean at vipersoft.co.uk">Dean
@@ -304,9 +285,5 @@
 
 </itemizedlist>
 
-</sect2>
-
-</sect1>
-
 </appendix>
 

Modified: branches/testing/BOOK/chapter01/changelog.xml
===================================================================
--- branches/testing/BOOK/chapter01/changelog.xml	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/chapter01/changelog.xml	2004-09-10 19:06:14 UTC (rev 4152)
@@ -84,6 +84,9 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 10th, 2004 [manuel]: Appendix{a,b} - Changes in
+the XML, XSL and CSS code to do a better output.</para></listitem>
+
 <listitem><para>September 9th, 2004 [gerard]: Added missing colon to
 group name in Chapter 6-Coreutils used by the test
 suite.</para></listitem>

Modified: branches/testing/BOOK/general.ent
===================================================================
--- branches/testing/BOOK/general.ent	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/general.ent	2004-09-10 19:06:14 UTC (rev 4152)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "6.0-testing-20040909">
-<!ENTITY releasedate "September 09, 2004">
+<!ENTITY version "6.0-testing-20040910">
+<!ENTITY releasedate "September 10, 2004">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">

Modified: branches/testing/BOOK/stylesheets/lfs.css
===================================================================
--- branches/testing/BOOK/stylesheets/lfs.css	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/stylesheets/lfs.css	2004-09-10 19:06:14 UTC (rev 4152)
@@ -110,7 +110,7 @@
   padding-left: 1em;
 }
 
-li.preface {
+li.preface, li.appendix {
   margin-left: 1em;
 }
 
@@ -283,11 +283,11 @@
   margin: 0;
 }
 
-div.book, div.preface, div.part, div.chapter, div.sect1, div.index {
+div.book, div.preface, div.part, div.chapter, div.sect1, div.appendix, div.index {
   padding-bottom: 0.5em;
 }
 
-div.preface h1, div.part h1, div.chapter h1, div.sect1 h1, div.index h1 {
+div.preface h1, div.part h1, div.chapter h1, div.sect1 h1, div.appendix h1, div.index h1 {
   background: #f5f6f7;
   border-bottom: .1em solid #dbddec;
   margin: 0px auto;

Modified: branches/testing/BOOK/stylesheets/xhtml/lfs-titles.xsl
===================================================================
--- branches/testing/BOOK/stylesheets/xhtml/lfs-titles.xsl	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/stylesheets/xhtml/lfs-titles.xsl	2004-09-10 19:06:14 UTC (rev 4152)
@@ -32,6 +32,16 @@
     </div>
   </xsl:template>
 
+  <xsl:template name="appendix.titlepage">
+    <div class="titlepage">
+      <h1 class="{name(.)}">
+        <xsl:apply-templates select="." mode="label.markup"/>
+        <xsl:text>. </xsl:text>
+        <xsl:value-of select="title"/>
+      </h1>
+    </div>
+  </xsl:template>
+
   <xsl:template name="sect1.titlepage">
     <xsl:choose>
         <!-- I should find a better test -->
@@ -85,7 +95,7 @@
     </div>
   </xsl:template>
 
-    <!-- Harcoded a period for proper punctuation in xrefs. -->
+    <!-- Added the role param for proper punctuation in xref calls. -->
   <xsl:template match="*" mode="insert.title.markup">
     <xsl:param name="purpose"/>
     <xsl:param name="xrefstyle"/>

Modified: branches/testing/BOOK/stylesheets/xhtml/lfs-toc.xsl
===================================================================
--- branches/testing/BOOK/stylesheets/xhtml/lfs-toc.xsl	2004-09-10 17:09:42 UTC (rev 4151)
+++ branches/testing/BOOK/stylesheets/xhtml/lfs-toc.xsl	2004-09-10 19:06:14 UTC (rev 4152)
@@ -93,6 +93,23 @@
           <xsl:apply-templates select="." mode="titleabbrev.markup"/>
         </a>
       </xsl:when>
+      <xsl:when test="local-name(.) = 'appendix'">
+        <a>
+          <xsl:attribute name="href">
+            <xsl:call-template name="href.target">
+              <xsl:with-param name="context" select="$toc-context"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:variable name="label">
+            <xsl:apply-templates select="." mode="label.markup"/>
+          </xsl:variable>
+          <xsl:copy-of select="$label"/>
+          <xsl:if test="$label != ''">
+            <xsl:value-of select="$autotoc.label.separator"/>
+          </xsl:if>
+          <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+        </a>
+      </xsl:when>
       <xsl:when test="local-name(.) = 'chapter' or local-name(.) = 'preface'">
         <h4>
           <xsl:variable name="label">




More information about the lfs-book mailing list