synced testing branch stylesheets

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

4 files changed, 120 insertions, 9 deletions

diff --git a/stylesheets/lfs-print.xsl b/stylesheets/lfs-print.xsl
index c1f68dce8..fa2e2d65b 100644
--- a/stylesheets/lfs-print.xsl
+++ b/stylesheets/lfs-print.xsl
@@ -13,7 +13,7 @@
   <xsl:include href="print/lfs-pagesetup.xsl"/>
 
     <!-- Paper size required by the publisher -->
-  <xsl:param name="paper.type" select="'Cunstommized'"/>
+  <xsl:param name="paper.type" select="'Customized'"/>
   <xsl:param name="page.width">7.25in</xsl:param>
   <xsl:param name="page.height">9.25in</xsl:param>
 
@@ -36,17 +36,21 @@
   <xsl:param name="toc.indent.width" select="18"></xsl:param>
 
     <!-- Page number in Xref-->
-  <xsl:param name="insert.xref.page.number">yes</xsl:param> 
+  <xsl:param name="insert.xref.page.number">no</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>
+      <!--<xsl:text>[p</xsl:text>-->
       <fo:page-number-citation ref-id="{$id}"/>
-      <xsl:text>]</xsl:text>
+      <!--<xsl:text>]</xsl:text>-->
     </fo:inline>
   </xsl:template>
 
     <!-- Prevent duplicate e-mails in the Acknowledgments pages-->
   <xsl:param name="ulink.show" select="0"/>
 
+    <!-- Sections numbering -->
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+
 </xsl:stylesheet>
diff --git a/stylesheets/patcheslist.xsl b/stylesheets/patcheslist.xsl
index 62e1d38ad..bb6c038e1 100644
--- a/stylesheets/patcheslist.xsl
+++ b/stylesheets/patcheslist.xsl
@@ -7,7 +7,7 @@
 
   <xsl:output method="text"/>
 
-  <xsl:param name="links.directory">lfs/cvs/unstable/</xsl:param>
+  <xsl:param name="links.directory">lfs/cvs/testing/</xsl:param>
   <xsl:param name="deep.to.downloads">../../../</xsl:param>
 
   <xsl:template match="/">
@@ -51,7 +51,7 @@
       </xsl:if>
       <xsl:text>/</xsl:text>
       <xsl:value-of select="substring-after(@url, $links.directory)"/>
-      <xsl:text> . &amp;&amp;&#x0a;</xsl:text>
+      <xsl:text> . &#x0a;</xsl:text>
     </xsl:if>
   </xsl:template>
 
diff --git a/stylesheets/print/lfs-pagesetup.xsl b/stylesheets/print/lfs-pagesetup.xsl
index d3a42f54a..c2948c204 100644
--- a/stylesheets/print/lfs-pagesetup.xsl
+++ b/stylesheets/print/lfs-pagesetup.xsl
@@ -18,6 +18,81 @@
     </xsl:attribute>
   </xsl:attribute-set>
 
+    <!-- Skip numeraration for sections with empty title -->
+  <xsl:template match="sect2|sect3|sect4|sect5" mode="label.markup">
+    <xsl:if test="string-length(title) > 0">
+      <!-- label the parent -->
+      <xsl:variable name="parent.label">
+        <xsl:apply-templates select=".." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="$parent.label != ''">
+        <xsl:apply-templates select=".." mode="label.markup"/>
+      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="@label">
+          <xsl:value-of select="@label"/>
+        </xsl:when>
+        <xsl:when test="$section.autolabel != 0">
+          <xsl:choose>
+            <xsl:when test="local-name(.) = 'sect2'">
+              <xsl:choose>
+                <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
+                <xsl:when test="string-length(../sect2[1]/title) = 0">
+                  <xsl:variable name="totalsect2">
+                    <xsl:number count="sect2"/>
+                  </xsl:variable>
+                  <xsl:number value="$totalsect2 - 1"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:number count="sect2"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:when>
+            <xsl:when test="local-name(.) = 'sect3'">
+              <xsl:number count="sect3"/>
+            </xsl:when>
+            <xsl:when test="local-name(.) = 'sect4'">
+              <xsl:number count="sect4"/>
+            </xsl:when>
+            <xsl:when test="local-name(.) = 'sect5'">
+              <xsl:number count="sect5"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:message>label.markup: this can't happen!</xsl:message>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Drop the trailing punctuation if title is empty -->
+  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect
+                      |bridgehead"
+                mode="object.title.template">
+    <xsl:choose>
+      <xsl:when test="$section.autolabel != 0">
+        <xsl:if test="string-length(title) > 0">
+          <xsl:call-template name="gentext.template">
+            <xsl:with-param name="context" select="'title-numbered'"/>
+            <xsl:with-param name="name">
+              <xsl:call-template name="xpath.location"/>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="gentext.template">
+          <xsl:with-param name="context" select="'title-unnumbered'"/>
+          <xsl:with-param name="name">
+            <xsl:call-template name="xpath.location"/>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
     <!-- Header -->
   <xsl:template name="header.content">
     <xsl:param name="sequence" select="''"/>
@@ -117,5 +192,37 @@
 
     <!-- How render a variablelist -->
   <xsl:param name="variablelist.as.blocks" select="1"/>
+  
+    <!-- Adding space before segmentedlist -->
+  <xsl:template match="segmentedlist">
+    <xsl:variable name="presentation">
+      <xsl:call-template name="pi-attribute">
+        <xsl:with-param name="pis"
+                        select="processing-instruction('dbfo')"/>
+        <xsl:with-param name="attribute" select="'list-presentation'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$presentation = 'table'">
+        <xsl:apply-templates select="." mode="seglist-table"/>
+      </xsl:when>
+      <xsl:when test="$presentation = 'list'">
+        <fo:block space-before.minimum="0.4em" space-before.optimum="0.6em"
+                space-before.maximum="0.8em">
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$segmentedlist.as.table != 0">
+        <xsl:apply-templates select="." mode="seglist-table"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:block space-before.minimum="0.4em" space-before.optimum="0.6em"
+                space-before.maximum="0.8em">
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 
 </xsl:stylesheet>
diff --git a/stylesheets/xhtml/lfs-mixed.xsl b/stylesheets/xhtml/lfs-mixed.xsl
index c4dbd04dd..0660116a4 100644
--- a/stylesheets/xhtml/lfs-mixed.xsl
+++ b/stylesheets/xhtml/lfs-mixed.xsl
@@ -25,16 +25,16 @@
   <!-- variablelist -->
   <xsl:template match="variablelist">
     <div class="{name(.)}">
-      <xsl:if test="title">
+      <xsl:if test="title | bridgehead">
         <xsl:choose>
           <xsl:when test="@role = 'materials'">
             <h2>
-              <xsl:value-of select="title"/>
+              <xsl:value-of select="title | bridgehead"/>
             </h2>
           </xsl:when>
           <xsl:otherwise>
             <h3>
-              <xsl:value-of select="title"/>
+              <xsl:value-of select="title | bridgehead"/>
             </h3>
           </xsl:otherwise>
         </xsl:choose>