Ignore:
Timestamp:
10/08/2013 08:03:29 PM (11 years ago)
Author:
Matthew Burgess <matthew@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
58675ce
Parents:
09a35dd
Message:

Update stylesheets to docbook-xsl-1.78.1.

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

File:
1 moved

Legend:

Unmodified
Added
Removed

  • stylesheets/lfs-xsl/docbook-xsl-1.78.1/fo/block.xsl

    r09a35dd r15c7d39  
    55
    66<!-- ********************************************************************
    7      $Id$
     7     $Id: block.xsl 9389 2012-06-02 19:02:39Z bobstayton $
    88     ********************************************************************
    99
    … …  
    1515
    1616<!-- ==================================================================== -->
    17 <!-- What should we do about styling blockinfo? -->
    1817
    1918<xsl:template match="blockinfo|info">
    … …  
    2423
    2524<xsl:template name="block.object">
     25  <xsl:variable name="keep.together">
     26    <xsl:call-template name="pi.dbfo_keep-together"/>
     27  </xsl:variable>
    2628  <fo:block>
     29    <xsl:if test="$keep.together != ''">
     30      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     31                      select="$keep.together"/></xsl:attribute>
     32    </xsl:if>
    2733    <xsl:call-template name="anchor"/>
    2834    <xsl:apply-templates/>
    … …  
    3339
    3440<xsl:template match="para">
     41  <xsl:variable name="keep.together">
     42    <xsl:call-template name="pi.dbfo_keep-together"/>
     43  </xsl:variable>
     44  <fo:block xsl:use-attribute-sets="para.properties">
     45    <xsl:if test="$keep.together != ''">
     46      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     47                      select="$keep.together"/></xsl:attribute>
     48    </xsl:if>
     49    <xsl:call-template name="anchor"/>
     50    <xsl:apply-templates/>
     51  </fo:block>
     52</xsl:template>
     53
     54<xsl:template match="simpara">
     55  <xsl:variable name="keep.together">
     56    <xsl:call-template name="pi.dbfo_keep-together"/>
     57  </xsl:variable>
    3558  <fo:block xsl:use-attribute-sets="normal.para.spacing">
    36     <xsl:call-template name="anchor"/>
    37     <xsl:apply-templates/>
    38   </fo:block>
    39 </xsl:template>
    40 
    41 <xsl:template match="simpara">
     59    <xsl:if test="$keep.together != ''">
     60      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     61                      select="$keep.together"/></xsl:attribute>
     62    </xsl:if>
     63    <xsl:call-template name="anchor"/>
     64    <xsl:apply-templates/>
     65  </fo:block>
     66</xsl:template>
     67
     68<xsl:template match="formalpara">
     69  <xsl:variable name="keep.together">
     70    <xsl:call-template name="pi.dbfo_keep-together"/>
     71  </xsl:variable>
    4272  <fo:block xsl:use-attribute-sets="normal.para.spacing">
    43     <xsl:call-template name="anchor"/>
    44     <xsl:apply-templates/>
    45   </fo:block>
    46 </xsl:template>
    47 
    48 <xsl:template match="formalpara">
    49   <fo:block xsl:use-attribute-sets="normal.para.spacing">
     73    <xsl:if test="$keep.together != ''">
     74      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     75                      select="$keep.together"/></xsl:attribute>
     76    </xsl:if>
    5077    <xsl:call-template name="anchor"/>
    5178    <xsl:apply-templates/>
    … …  
    87114
    88115<xsl:template match="blockquote">
     116  <xsl:variable name="keep.together">
     117    <xsl:call-template name="pi.dbfo_keep-together"/>
     118  </xsl:variable>
    89119  <fo:block xsl:use-attribute-sets="blockquote.properties">
     120    <xsl:if test="$keep.together != ''">
     121      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     122                      select="$keep.together"/></xsl:attribute>
     123    </xsl:if>
    90124    <xsl:call-template name="anchor"/>
    91125    <fo:block>
    … …  
    108142</xsl:template>
    109143
     144<!-- Use an em dash per Chicago Manual of Style and https://sourceforge.net/tracker/index.php?func=detail&aid=2793878&group_id=21935&atid=373747 -->
    110145<xsl:template match="epigraph">
    111146  <fo:block>
    … …  
    114149    <xsl:if test="attribution">
    115150      <fo:inline>
    116         <xsl:text>--</xsl:text>
     151        <xsl:text>&#x2014;</xsl:text>
    117152        <xsl:apply-templates select="attribution"/>
    118153      </fo:inline>
    … …  
    328363</xsl:template>
    329364
     365<!-- Turn off para space-before if sidebar starts with a para, not title -->
     366<xsl:template match="sidebar/*[1][self::para]">
     367  <xsl:variable name="keep.together">
     368    <xsl:call-template name="pi.dbfo_keep-together"/>
     369  </xsl:variable>
     370  <fo:block xsl:use-attribute-sets="para.properties">
     371    <xsl:attribute name="space-before.maximum">0pt</xsl:attribute>
     372    <xsl:attribute name="space-before.minimum">0pt</xsl:attribute>
     373    <xsl:attribute name="space-before.optimum">0pt</xsl:attribute>
     374    <xsl:if test="$keep.together != ''">
     375      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     376                      select="$keep.together"/></xsl:attribute>
     377    </xsl:if>
     378    <xsl:call-template name="anchor"/>
     379    <xsl:apply-templates/>
     380  </fo:block>
     381
     382</xsl:template>
     383
    330384<xsl:template name="margin.note">
    331385  <xsl:param name="content">
    … …  
    387441
    388442<xsl:template match="abstract">
     443  <xsl:variable name="keep.together">
     444    <xsl:call-template name="pi.dbfo_keep-together"/>
     445  </xsl:variable>
    389446  <fo:block xsl:use-attribute-sets="abstract.properties">
     447    <xsl:if test="$keep.together != ''">
     448      <xsl:attribute name="keep-together.within-column"><xsl:value-of
     449                      select="$keep.together"/></xsl:attribute>
     450    </xsl:if>
    390451    <xsl:call-template name="anchor"/>
    391452    <xsl:apply-templates/>
    … …  
    501562        <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
    502563          <fo:block xsl:use-attribute-sets="revhistory.title.properties">
    503             <xsl:call-template name="gentext">
    504               <xsl:with-param name="key" select="'RevHistory'"/>
    505             </xsl:call-template>
     564            <xsl:choose>
     565              <xsl:when test="title|info/title">
     566                <xsl:apply-templates select="title|info/title" mode="titlepage.mode"/>
     567              </xsl:when>
     568              <xsl:otherwise>
     569                <xsl:call-template name="gentext">
     570                  <xsl:with-param name="key" select="'RevHistory'"/>
     571                </xsl:call-template>
     572              </xsl:otherwise>
     573            </xsl:choose>
    506574          </fo:block>
    507575        </fo:table-cell>
    … …  
    510578    </fo:table-body>
    511579  </fo:table>
     580</xsl:template>
     581
     582<xsl:template match="revhistory/title">
     583  <!-- Handled in titlepage.mode -->
    512584</xsl:template>
    513585
    … …  
    583655<!-- ==================================================================== -->
    584656
    585 <xsl:template match="ackno">
     657<xsl:template match="ackno|acknowledgements[parent::article]">
    586658  <fo:block xsl:use-attribute-sets="normal.para.spacing">
    587659    <xsl:call-template name="anchor"/>
Note: See TracChangeset for help on using the changeset viewer.