Updated the stylesheets to their current version.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3529 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 228 insertions, 52 deletions

diff --git a/stylesheets/pdf/lfs-index.xsl b/stylesheets/pdf/lfs-index.xsl
index 43f306ee1..817fbf9d9 100644
--- a/stylesheets/pdf/lfs-index.xsl
+++ b/stylesheets/pdf/lfs-index.xsl
@@ -3,23 +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.8.0 - Manuel Canales Esparcia <macana@lfs-es.org> -->
+<!-- Version 0.9 - Manuel Canales Esparcia <macana@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">
 
-<!--Index Stuff-->
-
-  	<!--Only one column to fit the targets titles-->
-  <xsl:param name="column.count.index" select="1"></xsl:param>
+  	<!--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:param name="allow-anchors" select="0"/>
     <xsl:text>Index of packages and important installed files</xsl:text>
 	</xsl:template>
 
@@ -38,47 +37,98 @@
               <xsl:choose>
                 <xsl:when test="$divtitle = 'A'">
                   <xsl:text>Packages</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'B'">
-                  <xsl:text>Programs</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'C'">
-                  <xsl:text>Libraries</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'D'">
-                  <xsl:text>Scripts</xsl:text>
-              </xsl:when>
-              <xsl:when test="$divtitle = 'E'">
-                  <xsl:text>Others</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$divtitle"/>
-              </xsl:otherwise>
-            </xsl:choose>
+                </xsl:when>
+                <xsl:when test="$divtitle = 'B'">
+                    <xsl:text>Programs</xsl:text>
+                </xsl:when>
+                <xsl:when test="$divtitle = 'C'">
+                    <xsl:text>Libraries</xsl:text>
+                </xsl:when>
+                <xsl:when test="$divtitle = 'D'">
+                    <xsl:text>Scripts</xsl:text>
+                </xsl:when>
+                <xsl:when test="$divtitle = 'E'">
+                    <xsl:text>Others</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$divtitle"/>
+                </xsl:otherwise>
+            	</xsl:choose>
             </xsl:with-param>
           </xsl:call-template>
         </xsl:if>
-        <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: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:if>
   </xsl:template>
 
-  	<!-- The separator -->
+  	<!-- Dropping the separator from here -->
   <xsl:template match="indexterm" mode="reference">
     <xsl:param name="scope" select="."/>
-    <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-->
   <xsl:template name="reference">
@@ -100,19 +150,26 @@
             <xsl:with-param name="object" select="$target2[1]"/>
           </xsl:call-template>
         </xsl:variable>
-        <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>
-          <xsl:text>, </xsl:text>
-        <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: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>
       </xsl:when>
       <xsl:otherwise>
         <xsl:variable name="zone" select="$zones"/>
@@ -122,12 +179,16 @@
             <xsl:with-param name="object" select="$target[1]"/>
           </xsl:call-template>
         </xsl:variable>
-        <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: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>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
diff --git a/stylesheets/pdf/lfs-pagesetup.xsl b/stylesheets/pdf/lfs-pagesetup.xsl
new file mode 100644
index 000000000..97d1b9956
--- /dev/null
+++ b/stylesheets/pdf/lfs-pagesetup.xsl
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!-- Version 0.9 - Manuel Canales Esparcia <macana@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">
+
+  	<!-- Force section1's onto a new page -->
+  <xsl:attribute-set name="section.level1.properties">
+  	<xsl:attribute name="break-after">
+    	<xsl:choose>
+  			<xsl:when test="not(position()=last())">
+      		<xsl:text>page</xsl:text>
+    		</xsl:when>
+        <xsl:otherwise>
+      		<xsl:text>auto</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:attribute>
+  </xsl:attribute-set>
+
+		<!-- Header -->
+  <xsl:attribute-set name="header.content.properties">
+    <xsl:attribute name="font-family">
+      <xsl:value-of select="$body.fontset"/>
+    </xsl:attribute>
+    <xsl:attribute name="text-align">right</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:template name="header.content">
+    <xsl:value-of select="/book/bookinfo/title"/>
+    <xsl:text> - </xsl:text>
+    <xsl:value-of select="/book/bookinfo/subtitle"/>
+  </xsl:template>
+
+  <xsl:template name="header.table">
+    <xsl:param name="gentext-key" select="''"/>
+    <xsl:choose>
+      <xsl:when test="$gentext-key = 'book'"/>
+      <xsl:otherwise>
+      	<xsl:call-template name="header.content"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+		<!-- Centered titles for book and part -->
+  <xsl:template name="book.titlepage">
+    <fo:block space-before="2in">
+      <fo:block>
+        <xsl:call-template name="book.titlepage.before.recto"/>
+        <xsl:call-template name="book.titlepage.recto"/>
+      </fo:block>
+      <fo:block>
+        <xsl:call-template name="book.titlepage.before.verso"/>
+        <xsl:call-template name="book.titlepage.verso"/>
+      </fo:block>
+      <xsl:call-template name="book.titlepage.separator"/>
+    </fo:block>
+  </xsl:template>
+
+  <xsl:template name="part.titlepage">
+    <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:block space-before="2.5in">
+        <xsl:call-template name="part.titlepage.before.recto"/>
+        <xsl:call-template name="part.titlepage.recto"/>
+      </fo:block>
+      <fo:block>
+        <xsl:call-template name="part.titlepage.before.verso"/>
+        <xsl:call-template name="part.titlepage.verso"/>
+      </fo:block>
+      <xsl:call-template name="part.titlepage.separator"/>
+    </fo:block>
+  </xsl:template>
+
+  	<!-- Margins -->
+  <xsl:param name="page.margin.inner">0.75in</xsl:param>
+  <xsl:param name="page.margin.outer">0.75in</xsl:param>
+  <xsl:param name="title.margin.left">-1pc</xsl:param>
+  <xsl:attribute-set name="normal.para.spacing">
+    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="list.block.spacing">
+    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="list.item.spacing">
+    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="verbatim.properties">
+    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">1em</xsl:attribute>
+  </xsl:attribute-set>
+
+  	<!-- Others-->
+  <xsl:param name="header.rule" select="0"></xsl:param>
+  <xsl:param name="footer.rule" select="0"></xsl:param>
+	<xsl:param name="marker.section.level" select="-1"></xsl:param>
+
+  	<!-- Dropping a blank page -->
+	<xsl:template name="book.titlepage.separator"/>
+
+</xsl:stylesheet>