cvs commit: LFS/newxml/stylesheets lfs-chunked.xsl

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Sat Mar 6 15:29:10 PST 2004


matthew     04/03/06 16:29:10

  Modified:    newxml   Makefile TODO index.xml
               newxml/stylesheets lfs-chunked.xsl
  Log:
  * Applied Manuels patch to index.xml to sort out duplication of "Part x." and     the filenames for book parts.
  * Updated Makefile to support the above.
  * Fixed the generation of legalnotice.html
  
  Revision  Changes    Path
  1.3       +7 -7      LFS/newxml/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvsroot/LFS/newxml/Makefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile	6 Mar 2004 21:23:26 -0000	1.2
  +++ Makefile	6 Mar 2004 23:29:10 -0000	1.3
  @@ -5,17 +5,17 @@
   	cd ../output && xsltproc --xinclude --nonet -stringparam base.dir \
   	$(BASEDIR) stylesheets/lfs-chunked.xsl index.xml
   
  -	if [ ! -e $(BASEDIR)/stylesheets ]; then \
  -	  mkdir -p $(BASEDIR)/stylesheets; \
  +	if [ ! -e $(BASEDIR)stylesheets ]; then \
  +	  mkdir -p $(BASEDIR)stylesheets; \
   	fi;
   	cp ../output/stylesheets/lfs.css $(BASEDIR)/stylesheets
   
  -	if [ ! -e $(BASEDIR)/images ]; then \
  -	  mkdir -p $(BASEDIR)/images; \
  +	if [ ! -e $(BASEDIR)images ]; then \
  +	  mkdir -p $(BASEDIR)images; \
   	fi;
   	cp /usr/share/xml/docbook/xsl-stylesheets-1.65.0/images/*.png \
  -	  $(BASEDIR)/images
  +	  $(BASEDIR)images
   	sed -i -e "s at ../stylesheets at stylesheets@" \
  -	  $(BASEDIR)/{index,pt01,pt02,pt03,pt04}.html
  +	  $(BASEDIR){index,part1,part2,part3,part4}.html
   	sed -i -e "s at ../images at images@g" \
  -	  $(BASEDIR)/{index,pt01,pt02,pt03,pt04}.html
  +	  $(BASEDIR){index,part1,part2,part3,part4}.html
  
  
  
  1.5       +1 -2      LFS/newxml/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvsroot/LFS/newxml/TODO,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TODO	6 Mar 2004 21:23:26 -0000	1.4
  +++ TODO	6 Mar 2004 23:29:10 -0000	1.5
  @@ -13,8 +13,7 @@
      particular http://www.sagehill.net/docbookxsl/OtherOutputForms.html#d0e23340.
   5. The legalinfo page:
        * It generates it's own hyperlink ("Legal Notice") but the current book has
  -       it linked to via the "Copyright" message above. The hyperlink also links
  -       to prologue/legalnotice.html which isn't produced.
  +       it linked to via the "Copyright" message above.  Does this matter?
   6. Decide on what levels the TOCs should go down to.
      * Section elements now no longer have a TOC generated for them - the book TOC
        remains unchanged as do the part and appendix level TOCs.
  
  
  
  1.6       +8 -4      LFS/newxml/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/newxml/index.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.xml	6 Mar 2004 21:23:26 -0000	1.5
  +++ index.xml	6 Mar 2004 23:29:10 -0000	1.6
  @@ -11,7 +11,8 @@
   
   
   <part id="part1">
  -<title>Part I - Introduction</title>
  +<title>Introduction</title>
  +<?dbhtml filename="part1.html"?>
   <xi:include href="chapter01/chapter01.xml"/>
   
   <xi:include href="chapter02/chapter02.xml"/>
  @@ -19,7 +20,8 @@
   </part>
   
   <part id="part2">
  -<title>Part II - Preparing for the build</title>
  +<title>Preparing for the build</title>
  +<?dbhtml filename="part2.html"?>
   <xi:include href="chapter03/chapter03.xml"/>
   
   <xi:include href="chapter04/chapter04.xml"/>
  @@ -31,7 +33,8 @@
   </part>
   
   <part id="part3">
  -<title>Part III - Building the LFS system</title>
  +<title>Building the LFS system</title>
  +<?dbhtml filename="part3.html"?>
   <xi:include href="chapter06/chapter06.xml"/>
   
   
  @@ -46,7 +49,8 @@
   </part>
   
   <part id="part4">
  -<title>Part IV - Appendices</title>
  +<title>Appendices</title>
  +<?dbhtml filename="part4.html"?>
   <xi:include href="appendixa/appendixa.xml"/>
   
   <xi:include href="appendixb/appendixb.xml"/>
  
  
  
  1.5       +2 -1      LFS/newxml/stylesheets/lfs-chunked.xsl
  
  Index: lfs-chunked.xsl
  ===================================================================
  RCS file: /home/cvsroot/LFS/newxml/stylesheets/lfs-chunked.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- lfs-chunked.xsl	6 Mar 2004 21:52:04 -0000	1.4
  +++ lfs-chunked.xsl	6 Mar 2004 23:29:10 -0000	1.5
  @@ -17,7 +17,8 @@
         <xsl:when test="$generate.legalnotice.link != 0">
           <xsl:variable name="filename">
             <xsl:call-template name="make-relative-filename">
  -            <xsl:with-param name="base.name">prologue/legalnotice.html</xsl:with-param>
  +            <xsl:with-param name="base.dir" select="''"/>
  +            <xsl:with-param name="base.name" select="concat($base.dir, 'prologue/legalnotice.html')"/>
             </xsl:call-template>
           </xsl:variable>
           <xsl:variable name="title">
  
  
  



More information about the lfs-book mailing list