cvs commit: BLFS/BOOK/stylesheets/xhtml lfs-navigational.xsl

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sun May 16 23:26:42 PDT 2004


bdubbs      04/05/17 00:26:42

  Modified:    BOOK     Makefile
               BOOK/stylesheets blfs-chunked.xsl blfs.css
               BOOK/stylesheets/xhtml lfs-navigational.xsl
  Added:       BOOK     goTidy tidy.conf
               BOOK/stylesheets blfs-print.css
  Log:
  Update to style sheets;  added tidy to Makefile
  
  Revision  Changes    Path
  1.10      +2 -1      BLFS/BOOK/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/Makefile,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile	16 May 2004 13:45:10 -0000	1.9
  +++ Makefile	17 May 2004 06:26:42 -0000	1.10
  @@ -41,7 +41,7 @@
   	if [ ! -e $(BASEDIR)stylesheets ]; then \
   	  mkdir -p $(BASEDIR)stylesheets; \
   	fi;
  -	cp stylesheets/blfs.css $(BASEDIR)stylesheets
  +	cp stylesheets/*.css $(BASEDIR)stylesheets
   	if [ ! -e $(BASEDIR)images ]; then \
   	  mkdir -p $(BASEDIR)images; \
   	fi;
  @@ -50,6 +50,7 @@
   	  index.html 
   	cd $(BASEDIR); sed -i -e "s at ../images at images@g" \
   	  index.html 
  +	sh goTidy $(BASEDIR)/  
   
   pdf:
   	xsltproc --xinclude --nonet --output blfs.fo \
  
  
  
  1.1                  BLFS/BOOK/goTidy
  
  Index: goTidy
  ===================================================================
  #!/bin/bash
  #######################################################################
  #
  # File:        goTidy
  #
  # Description: Tidy is best used inside a loop, but Makefiles don't do
  # bash loops well.  This file alleviates that problem.
  #
  # Author:      James Robertson
  #
  ########################################################################
  
  for file in `find "$1" -name "*.html"`; do
          tidy -config tidy.conf $file
  done
  
  exit 0
  
  
  
  1.1                  BLFS/BOOK/tidy.conf
  
  Index: tidy.conf
  ===================================================================
  indent-spaces: 2
  wrap: 78
  tab-size: 8
  input-encoding: latin1
  output-encoding: latin1
  newline: LF
  write-back: yes
  markup: yes
  indent: yes
  hide-endtags: no
  uppercase-tags: no
  logical-emphasis: no
  drop-font-tags: no
  tidy-mark: no
  numeric-entities: no
  show-warnings: no
  quiet: yes
  
  
  
  1.5       +7 -2      BLFS/BOOK/stylesheets/blfs-chunked.xsl
  
  Index: blfs-chunked.xsl
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/stylesheets/blfs-chunked.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- blfs-chunked.xsl	8 May 2004 03:02:31 -0000	1.4
  +++ blfs-chunked.xsl	17 May 2004 06:26:42 -0000	1.5
  @@ -27,7 +27,12 @@
     <xsl:param name="ulink.target" select="''"></xsl:param>
     <xsl:param name="css.decoration" select="0"></xsl:param>
     
  -  	<!-- No XML declaration -->
  -	<xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
  +    <!-- No XML declaration -->
  +  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
  +  
  +    <!-- Insert a stylesheet for printing -->
  +  <xsl:template name='user.head.content'>
  +     <link rel='stylesheet' href="../stylesheets/blfs-print.css" type="text/css" media='print'/>
  +  </xsl:template> 
   
   </xsl:stylesheet>
  
  
  
  1.5       +45 -1     BLFS/BOOK/stylesheets/blfs.css
  
  Index: blfs.css
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/stylesheets/blfs.css,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- blfs.css	8 May 2004 02:42:12 -0000	1.4
  +++ blfs.css	17 May 2004 06:26:42 -0000	1.5
  @@ -9,9 +9,48 @@
   	list-style: none;
   }
   
  -.navheader, .navfooter {
  +.navheader {
     font-size: smaller;
     text-align: center;
  +  padding-bottom: 0.5em;
  +  border-bottom: solid 2px #080;
  +}
  +
  +.navheader p {
  +  margin: 1em 0em;
  +}
  +
  +.navfooter {
  +  font-size: smaller;
  +  text-align: center;
  +  padding-top: 0.5em;
  +  border-top: solid 2px #080;
  +}
  +
  +div.sect3 li {
  +  /* padding: 0em; */
  +}
  +
  +div.sect3 li p {
  +  padding: 0.3em;
  +  margin: 0em;
  +  background-color: #f0fff0;
  +}
  +
  +.prev {
  +  float: left;
  +  text-align: left;
  +  padding-left: 1em;
  +}
  +
  +.next {
  +  float: right;
  +  text-align: right;
  +  padding-right: 1em;
  +}
  +
  +p, h1, h2, h3, h4, h5, h6 {
  +  margin: 0.5em 0em;
   }
   
   div.navheader ul li, div.navfooter ul li {
  @@ -63,6 +102,11 @@
   pre.screen {
       color: black;
       background-color: #dddddd;
  +}
  +
  +pre.screen {
  +  padding-left: 1.5em;
  +  line-height: 110%;
   }
   
   pre.synopsis {
  
  
  
  1.1                  BLFS/BOOK/stylesheets/blfs-print.css
  
  Index: blfs-print.css
  ===================================================================
  
  @import url(blfs.css);
  
  .navfooter, .headerlinks {
     display: none;
  } 
  
  
  
  1.2       +38 -42    BLFS/BOOK/stylesheets/xhtml/lfs-navigational.xsl
  
  Index: lfs-navigational.xsl
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/stylesheets/xhtml/lfs-navigational.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lfs-navigational.xsl	8 May 2004 02:42:12 -0000	1.1
  +++ lfs-navigational.xsl	17 May 2004 06:26:42 -0000	1.2
  @@ -40,9 +40,9 @@
               </xsl:if>
             </div>
           </xsl:if>
  -        <ul class="headerlinks">
  +        <div class="headerlinks">
             <xsl:if test="count($prev)>0 and $prev != $home">
  -            <li>
  +            <div class='prev'>
                 <a accesskey="p">
                   <xsl:attribute name="href">
                     <xsl:call-template name="href.target">
  @@ -51,20 +51,10 @@
                   </xsl:attribute>
                   <xsl:text>Prev</xsl:text>
                 </a>
  -            </li>
  +            </div>
             </xsl:if>
  -          <li>
  -            <a accesskey="h">
  -              <xsl:attribute name="href">
  -                <xsl:call-template name="href.target">
  -                  <xsl:with-param name="object" select="$home"/>
  -                </xsl:call-template>
  -              </xsl:attribute>
  -              <xsl:text>Home</xsl:text>
  -            </a>
  -          </li>
             <xsl:if test="count($next)>0">
  -            <li>
  +            <div class='next'>
                 <a accesskey="n">
                   <xsl:attribute name="href">
                     <xsl:call-template name="href.target">
  @@ -73,11 +63,20 @@
                   </xsl:attribute>
                   <xsl:text>Next</xsl:text>
                 </a>
  -            </li>
  +            </div>
             </xsl:if>
  -        </ul>
  +          <div class='home'>
  +            <a accesskey="h">
  +              <xsl:attribute name="href">
  +                <xsl:call-template name="href.target">
  +                  <xsl:with-param name="object" select="$home"/>
  +                </xsl:call-template>
  +              </xsl:attribute>
  +              <xsl:text>Home</xsl:text>
  +            </a>
  +          </div>
  +        </div>
         </div>
  -      <hr/>
       </xsl:if>
     </xsl:template>
   
  @@ -91,11 +90,9 @@
       <xsl:variable name="row" select="count($prev) > 0 or count($up) > 0
               or count($next) > 0 or generate-id($home) != generate-id(.)"/>
       <xsl:if test="$row">
  -      <hr/>
         <div class="navfooter">
  -        <ul>
             <xsl:if test="count($prev)>0 and $prev != $home">
  -            <li>
  +            <div class='prev'>
                 <a accesskey="p">
                   <xsl:attribute name="href">
                     <xsl:call-template name="href.target">
  @@ -103,13 +100,27 @@
                     </xsl:call-template>
                   </xsl:attribute>
                   <xsl:text>Prev</xsl:text>
  -              </a>
  -              <xsl:text> </xsl:text>
  +              </a><br/>
  +              <!-- <xsl:text> </xsl:text> -->
                 <xsl:apply-templates select="$prev" mode="object.title.markup"/>
  -            </li>
  +            </div>
  +          </xsl:if>
  +          <xsl:if test="count($next)>0">
  +            <div class='next'>
  +              <a accesskey="n">
  +                <xsl:attribute name="href">
  +                  <xsl:call-template name="href.target">
  +                    <xsl:with-param name="object" select="$next"/>
  +                  </xsl:call-template>
  +                </xsl:attribute>
  +                <xsl:text>Next</xsl:text>
  +              </a><br/>
  +              <!-- <xsl:text> </xsl:text> -->
  +              <xsl:apply-templates select="$next" mode="object.title.markup"/>
  +            </div>
             </xsl:if>
             <xsl:if test="count($up)>0 and $up != $home">
  -            <li>
  +            <div class='up'>
                 <a accesskey="u">
                   <xsl:attribute name="href">
                     <xsl:call-template name="href.target">
  @@ -118,10 +129,10 @@
                   </xsl:attribute>
                   <xsl:text>Up</xsl:text>
                 </a>
  -            </li>
  +            </div>
             </xsl:if>
             <xsl:if  test="$home != .">
  -            <li>
  +            <div class='home'>
                 <a accesskey="h">
                   <xsl:attribute name="href">
                     <xsl:call-template name="href.target">
  @@ -130,23 +141,8 @@
                   </xsl:attribute>
                   <xsl:text>Home</xsl:text>
                 </a>
  -            </li>
  -          </xsl:if>
  -          <xsl:if test="count($next)>0">
  -            <li>
  -              <a accesskey="n">
  -                <xsl:attribute name="href">
  -                  <xsl:call-template name="href.target">
  -                    <xsl:with-param name="object" select="$next"/>
  -                  </xsl:call-template>
  -                </xsl:attribute>
  -                <xsl:text>Next</xsl:text>
  -              </a>
  -              <xsl:text> </xsl:text>
  -              <xsl:apply-templates select="$next" mode="object.title.markup"/>
  -            </li>
  +            </div>
             </xsl:if>
  -        </ul>
         </div>
       </xsl:if>
     </xsl:template>
  
  
  



More information about the blfs-book mailing list