r3227 - in trunk/BOOK: . appendices introduction/welcome stylesheets stylesheets/pdf

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Jan 8 22:25:30 PST 2005


Author: randy
Date: 2005-01-08 23:25:29 -0700 (Sat, 08 Jan 2005)
New Revision: 3227

Modified:
   trunk/BOOK/appendices/glossary.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/stylesheets/blfs-pdf.xsl
   trunk/BOOK/stylesheets/pdf/lfs-index.xsl
   trunk/BOOK/stylesheets/pdf/lfs-mixed.xsl
   trunk/BOOK/stylesheets/pdf/lfs-pagesetup.xsl
   trunk/BOOK/stylesheets/pdf/lfs-sections.xsl
Log:
Updated to Manuel's newest PDF stylesheets; updated Glossary

Modified: trunk/BOOK/appendices/glossary.xml
===================================================================
--- trunk/BOOK/appendices/glossary.xml	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/appendices/glossary.xml	2005-01-09 06:25:29 UTC (rev 3227)
@@ -63,6 +63,9 @@
 <glossentry id="gAVI"><glossterm><acronym>AVI</acronym></glossterm>
 <glossdef><para>Audio Video Interleave</para></glossdef></glossentry>
 
+<glossentry id="gAWT"><glossterm><acronym>AWT</acronym></glossterm>
+<glossdef><para>Abstract Window Toolkit</para></glossdef></glossentry>
+
 <glossentry id="gBIC"><glossterm><acronym>BICS</acronym></glossterm>
 <glossdef><para>Berkeley/IRCAM/CARL</para></glossdef></glossentry>
 
@@ -316,6 +319,9 @@
 <glossentry id="gIT"><glossterm><acronym>IT</acronym></glossterm>
 <glossdef><para>ImpulseTracker Module</para></glossdef></glossentry>
 
+<glossentry id="gJAI"><glossterm><acronym>JAI</acronym></glossterm>
+<glossdef><para>Java Advanced Imaging</para></glossdef></glossentry>
+ 
 <glossentry id="gJAR"><glossterm><acronym>JAR</acronym></glossterm>
 <glossdef><para>Java ARchive</para></glossdef></glossentry>
 
@@ -382,6 +388,9 @@
 <glossentry id="gMIDI"><glossterm><acronym>MIDI</acronym></glossterm>
 <glossdef><para>Musical Instrument Digital Interface</para></glossdef></glossentry>
 
+<glossentry id="gMIF"><glossterm><acronym>MIF</acronym></glossterm>
+<glossdef><para>Maker Interchange Format</para></glossdef></glossentry>
+
 <glossentry id="gMII"><glossterm><acronym>MII</acronym></glossterm>
 <glossdef><para>Media Independent Interface</para></glossdef></glossentry>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/general.ent	2005-01-09 06:25:29 UTC (rev 3227)
@@ -1,4 +1,4 @@
-<!ENTITY day          "07">
+<!ENTITY day          "09">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -500,6 +500,7 @@
 <!ENTITY psutils-version              "p17">   
 <!ENTITY gsview-version               "4.6">   
 <!ENTITY xpdf-version                 "3.00pl1">  
+<!ENTITY fop-version                  "0.20.5">  
 
 <!-- Chapter 46 --> 
 <!ENTITY tex-version                  "2.0.2"> 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-09 06:25:29 UTC (rev 3227)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>January 9th, 2005 [randy]: Updated to Manuel's newest PDF 
+stylesheets.</para></listitem>
+
 <listitem><para>January 7th, 2005 [larry]: new links to cracklib
 worklists, website no longer allows direct links.</para></listitem>
 

Modified: trunk/BOOK/stylesheets/blfs-pdf.xsl
===================================================================
--- trunk/BOOK/stylesheets/blfs-pdf.xsl	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/stylesheets/blfs-pdf.xsl	2005-01-09 06:25:29 UTC (rev 3227)
@@ -1,38 +1,37 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
 
-<!-- Version 0.9 - Manuel Canales Esparcia <macana at lfs-es.org>
-Based on the original lfs-pdf.xsl created by Matthew Burgess -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 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.65.1/fo/docbook.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/fo/docbook.xsl"/>
   <xsl:param name="fop.extensions" select="1"/>
   <xsl:param name="draft.mode" select="'no'"/>
 
   	<!-- Including our others customized templates -->
+  <xsl:include href="pdf/lfs-admon.xsl"/>
   <xsl:include href="pdf/lfs-index.xsl"/>
+  <xsl:include href="pdf/lfs-mixed.xsl"/>
   <xsl:include href="pdf/lfs-pagesetup.xsl"/>
+  <xsl:include href="pdf/lfs-sections.xsl"/>
+  <xsl:include href="pdf/lfs-xref.xsl"/>
 
+    <!-- This file contains our localization strings (for internationalization) -->
+  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
+
   	<!-- Probably want to make the paper size configurable -->
   <xsl:param name="paper.type" select="'letter'"/>
 
-		<!-- Don't hyphenate -->
+    <!-- Printing Style -->
+  <xsl:param name="double.sided" select="1"/>
   <xsl:param name="hyphenate">false</xsl:param>
-  <xsl:param name="alignment">left</xsl:param>
+  <xsl:param name="alignment">justify</xsl:param>
 
   	<!-- Font size -->
-  <xsl:param name="body.font.master">8</xsl:param>
-  <xsl:param name="body.font.size">10pt</xsl:param>
+  <xsl:param name="body.font.master">9</xsl:param>
+  <xsl:param name="body.font.size">12pt</xsl:param>
 
-  	<!-- Graphics in admonitions -->
-	<xsl:param name="admon.graphics" select="1"/>
-
-		<!-- Shade screen -->
-	<xsl:param name="shade.verbatim" select="1"/>
-
   	<!-- TOC generation -->
   <xsl:param name="generate.toc">
     book      toc
@@ -43,15 +42,7 @@
   <xsl:param name="toc.indent.width" select="18"/>
 
   <!-- Page number in Xref-->
-  <xsl:param name="insert.xref.page.number">yes</xsl:param>
-	<xsl:template match="*" mode="page.citation">
-  	<xsl:param name="id" select="'???'"/>
-  	<fo:inline keep-together.within-line="always">
-  		<xsl:text>[p.</xsl:text>
-      <fo:page-number-citation ref-id="{$id}"/>
-  		<xsl:text>]</xsl:text>
-  	</fo:inline>
-	</xsl:template>
+  <xsl:param name="insert.xref.page.number">no</xsl:param>
 
   <!-- Prevent duplicate e-mails in the Acknowledgments pages-->
   <xsl:param name="ulink.show" select="0"/>

Modified: trunk/BOOK/stylesheets/pdf/lfs-index.xsl
===================================================================
--- trunk/BOOK/stylesheets/pdf/lfs-index.xsl	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/stylesheets/pdf/lfs-index.xsl	2005-01-09 06:25:29 UTC (rev 3227)
@@ -3,26 +3,22 @@
 <!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
 <!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
 <!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas)]))'>
 <!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())'>
-<!ENTITY sep '" "'>
 ]> 
 
-<!-- Version 0.9 - Manuel Canales Esparcia <macana at lfs-es.org> -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
 
-  	<!--Only one column to fit the table layout-->
-  <xsl:param name="column.count.index" select="1"/>
-
     <!--Title-->
   <xsl:template match="index" mode="title.markup">
-    <xsl:text>Index of packages and important installed files</xsl:text>
-	</xsl:template>
+    <xsl:param name="allow-anchors" select="0"/>
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key">Index</xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
 
-  	<!-- Divisions-->
+    <!-- Divisions-->
   <xsl:template match="indexterm" mode="index-div">
     <xsl:param name="scope" select="."/>
     <xsl:variable name="key"
@@ -36,107 +32,70 @@
             <xsl:with-param name="titlecontent">
               <xsl:choose>
                 <xsl:when test="$divtitle = 'A'">
-                  <xsl:text>Packages</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Packages</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:when test="$divtitle = 'B'">
-                    <xsl:text>Programs</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Programs</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:when test="$divtitle = 'C'">
-                    <xsl:text>Libraries</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Libraries</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:when test="$divtitle = 'D'">
-                    <xsl:text>Scripts</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Scripts</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:when test="$divtitle = 'E'">
-                    <xsl:text>Configuration Files</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Configuration Files</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:when test="$divtitle = 'F'">
-                  <xsl:text>Bootscripts</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Bootscripts</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:when test="$divtitle = 'G'">
-                    <xsl:text>Others</xsl:text>
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key">Others</xsl:with-param>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                   <xsl:value-of select="$divtitle"/>
                 </xsl:otherwise>
-            	</xsl:choose>
+              </xsl:choose>
             </xsl:with-param>
           </xsl:call-template>
         </xsl:if>
-        <fo:table table-layout="fixed" width="100%">
-      		<fo:table-column column-number="1" column-width="11em"/>
-      		<fo:table-column column-number="2" column-width="19em"/>
-      		<fo:table-column column-number="3"/>
-          <fo:table-body>
-            <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                        [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                                mode="index-primary">
-              <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-              <xsl:with-param name="scope" select="$scope"/>
-            </xsl:apply-templates>
-	        </fo:table-body>
-        </fo:table>
+        <fo:block>
+          <xsl:apply-templates select="key('letter', $key)[&scope;]
+                                      [count(.|key('primary', &primary;)[&scope;][1])=1]"
+                              mode="index-primary">
+            <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
+            <xsl:with-param name="scope" select="$scope"/>
+          </xsl:apply-templates>
+        </fo:block>
       </fo:block>
     </xsl:if>
   </xsl:template>
 
-  	<!-- Dropping the separator from here -->
+    <!-- The separator -->
   <xsl:template match="indexterm" mode="reference">
     <xsl:param name="scope" select="."/>
-    	<xsl:call-template name="reference">
+    <xsl:text>:   </xsl:text>
+      <xsl:call-template name="reference">
         <xsl:with-param name="zones" select="normalize-space(@zone)"/>
         <xsl:with-param name="scope" select="$scope"/>
       </xsl:call-template>
   </xsl:template>
-
-  	<!-- Changing the output tags and re-addind the separator-->
-  <xsl:template match="indexterm" mode="index-primary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="&primary;"/>
-    <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-    <fo:table-row>
-    	<fo:table-cell>
-      	<fo:block>
-          <xsl:value-of select="primary"/>
-          <xsl:text>: </xsl:text>
-				</fo:block>
-      </fo:table-cell>
-      <xsl:for-each select="$refs[not(see) and not(seealso)
-                            and not(secondary)]">
-        <xsl:apply-templates select="." mode="reference">
-          <xsl:with-param name="scope" select="$scope"/>
-        </xsl:apply-templates>
-      </xsl:for-each>
-		</fo:table-row>
-		<xsl:if test="$refs/secondary">
-      <xsl:apply-templates select="$refs[secondary and count(.|key('secondary',
-      				concat($key, &sep;, &secondary;))[&scope;][1]) = 1]" mode="index-secondary">
-				<xsl:with-param name="scope" select="$scope"/>
-				<xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-			</xsl:apply-templates>
-		</xsl:if>
-  </xsl:template>
-
-  <xsl:template match="indexterm" mode="index-secondary">
-    <xsl:param name="scope" select="."/>
- 		<xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-    <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-    <fo:table-row>
-    	<fo:table-cell>
-		    <fo:block start-indent="1pc">
-          <xsl:value-of select="secondary"/>
-          <xsl:text>: </xsl:text>
-        </fo:block>
-    	</fo:table-cell>
-      <xsl:for-each select="$refs[not(see) and not(seealso) and not(tertiary)]">
-        <xsl:apply-templates select="." mode="reference">
-          <xsl:with-param name="scope" select="$scope"/>
-        </xsl:apply-templates>
-      </xsl:for-each>
-		</fo:table-row>
-  </xsl:template>
   
-  	<!-- Targets titles and bookmarks-->
+    <!--Bookmarks-->
   <xsl:template name="reference">
     <xsl:param name="scope" select="."/>
     <xsl:param name="zones"/>
@@ -156,26 +115,17 @@
             <xsl:with-param name="object" select="$target2[1]"/>
           </xsl:call-template>
         </xsl:variable>
-        <fo:table-cell>
-        	<fo:block>
-            <fo:basic-link internal-destination="{$id}">
-              <xsl:value-of select="$target/title"/>
-              <xsl:apply-templates select="$target" mode="page.citation">
-                <xsl:with-param name="id" select="$id"/>
-              </xsl:apply-templates>
-            </fo:basic-link>
-        	</fo:block>
-				</fo:table-cell>
-        <fo:table-cell>
-        	<fo:block>
-            <fo:basic-link internal-destination="{$id2}">
-              <xsl:text>description</xsl:text>
-              <xsl:apply-templates select="$target2" mode="page.citation">
-                <xsl:with-param name="id" select="$id2"/>
-              </xsl:apply-templates>
-            </fo:basic-link>
-        	</fo:block>
-				</fo:table-cell>
+        <fo:basic-link internal-destination="{$id}">
+          <xsl:apply-templates select="$target" mode="page.citation">
+            <xsl:with-param name="id" select="$id"/>
+          </xsl:apply-templates>
+        </fo:basic-link>
+          <xsl:text> ,  </xsl:text>
+        <fo:basic-link internal-destination="{$id2}">
+          <xsl:apply-templates select="$target2" mode="page.citation">
+            <xsl:with-param name="id" select="$id2"/>
+          </xsl:apply-templates>
+        </fo:basic-link>
       </xsl:when>
       <xsl:otherwise>
         <xsl:variable name="zone" select="$zones"/>
@@ -185,18 +135,23 @@
             <xsl:with-param name="object" select="$target[1]"/>
           </xsl:call-template>
         </xsl:variable>
-        <fo:table-cell>
-        	<fo:block>
-            <fo:basic-link internal-destination="{$id}">
-              <xsl:value-of select="$target/title"/>
-              <xsl:apply-templates select="$target" mode="page.citation">
-                <xsl:with-param name="id" select="$id"/>
-              </xsl:apply-templates>
-            </fo:basic-link>
-        	</fo:block>
-				</fo:table-cell>
+        <fo:basic-link internal-destination="{$id}">
+          <xsl:apply-templates select="$target" mode="page.citation">
+            <xsl:with-param name="id" select="$id"/>
+          </xsl:apply-templates>
+        </fo:basic-link>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
+    <!-- Page number in Index-->
+  <xsl:template match="*" mode="page.citation">
+    <xsl:param name="id" select="'???'"/>
+    <fo:inline keep-together.within-line="always">
+      <!--<xsl:text>[p</xsl:text>-->
+      <fo:page-number-citation ref-id="{$id}"/>
+      <!--<xsl:text>]</xsl:text>-->
+    </fo:inline>
+  </xsl:template>
+
 </xsl:stylesheet>

Modified: trunk/BOOK/stylesheets/pdf/lfs-mixed.xsl
===================================================================
--- trunk/BOOK/stylesheets/pdf/lfs-mixed.xsl	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/stylesheets/pdf/lfs-mixed.xsl	2005-01-09 06:25:29 UTC (rev 3227)
@@ -32,7 +32,7 @@
   </xsl:template>
 
     <!-- Show URLs in italic font -->
-  <xsl:template match="ulink" name="ulink">
+  <!--<xsl:template match="ulink" name="ulink">
     <fo:inline font-style="italic">
       <fo:basic-link xsl:use-attribute-sets="xref.properties">
         <xsl:attribute name="external-destination">
@@ -54,9 +54,9 @@
     </fo:inline>
     <xsl:if test="count(child::node()) != 0
                   and string(.) != @url
-                  and $ulink.show != 0">
+                  and $ulink.show != 0">-->
       <!-- yes, show the URI -->
-      <xsl:choose>
+    <!--  <xsl:choose>
         <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)">
           <xsl:text>&#xA0;</xsl:text>
           <fo:footnote>
@@ -84,7 +84,7 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:if>
-  </xsl:template>
+  </xsl:template>-->
 
     <!-- Split URLs (obsolete, keeped as reference) -->
   <!--<xsl:template name="hyphenate-url">

Modified: trunk/BOOK/stylesheets/pdf/lfs-pagesetup.xsl
===================================================================
--- trunk/BOOK/stylesheets/pdf/lfs-pagesetup.xsl	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/stylesheets/pdf/lfs-pagesetup.xsl	2005-01-09 06:25:29 UTC (rev 3227)
@@ -14,8 +14,7 @@
           <xsl:otherwise>left</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
-      <xsl:value-of select="/book/bookinfo/title"/>
-      <xsl:text> - </xsl:text>
+      <xsl:text>Beyond Linux From Scratch - </xsl:text>
       <xsl:value-of select="/book/bookinfo/subtitle"/>
     </fo:block>
   </xsl:template>

Modified: trunk/BOOK/stylesheets/pdf/lfs-sections.xsl
===================================================================
--- trunk/BOOK/stylesheets/pdf/lfs-sections.xsl	2005-01-09 02:36:50 UTC (rev 3226)
+++ trunk/BOOK/stylesheets/pdf/lfs-sections.xsl	2005-01-09 06:25:29 UTC (rev 3227)
@@ -19,8 +19,8 @@
   </xsl:attribute-set>
 
     <!-- Sections numbering -->
-  <xsl:param name="section.autolabel" select="1"/>
-  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="section.autolabel" select="0"/>
+  <xsl:param name="section.label.includes.component.label" select="0"/>
 
     <!-- Skip numeraration for sections with empty title -->
   <xsl:template match="sect2|sect3|sect4|sect5" mode="label.markup">




More information about the blfs-book mailing list