diff options
Diffstat (limited to 'fo')
| -rw-r--r-- | fo/admon.xsl | 5 | ||||
| -rw-r--r-- | fo/autoidx.xsl | 41 | ||||
| -rw-r--r-- | fo/autotoc.xsl | 4 | ||||
| -rw-r--r-- | fo/callout.xsl | 73 | ||||
| -rw-r--r-- | fo/component.xsl | 18 | ||||
| -rw-r--r-- | fo/division.xsl | 26 | ||||
| -rw-r--r-- | fo/docbook.xsl | 3 | ||||
| -rw-r--r-- | fo/ebnf.xsl | 6 | ||||
| -rw-r--r-- | fo/fo.xsl | 6 | ||||
| -rw-r--r-- | fo/graphics.xsl | 21 | ||||
| -rw-r--r-- | fo/htmltbl.xsl | 5 | ||||
| -rw-r--r-- | fo/inline.xsl | 52 | ||||
| -rw-r--r-- | fo/lists.xsl | 54 | ||||
| -rw-r--r-- | fo/math.xsl | 69 | ||||
| -rw-r--r-- | fo/pagesetup.xsl | 107 | ||||
| -rw-r--r-- | fo/param.xml | 163 | ||||
| -rw-r--r-- | fo/param.xsl | 13 | ||||
| -rw-r--r-- | fo/profile-docbook.xsl | 3 | ||||
| -rw-r--r-- | fo/refentry.xsl | 10 | ||||
| -rw-r--r-- | fo/sections.xsl | 10 | ||||
| -rw-r--r-- | fo/spaces.xsl | 23 | ||||
| -rw-r--r-- | fo/table.xml | 2 | ||||
| -rw-r--r-- | fo/table.xsl | 26 | ||||
| -rw-r--r-- | fo/titlepage.templates.xml | 9 | ||||
| -rw-r--r-- | fo/titlepage.templates.xsl | 14 | ||||
| -rw-r--r-- | fo/verbatim.xsl | 4 | ||||
| -rw-r--r-- | fo/xref.xsl | 21 |
27 files changed, 429 insertions, 359 deletions
diff --git a/fo/admon.xsl b/fo/admon.xsl index 4f69be4..67bf158 100644 --- a/fo/admon.xsl +++ b/fo/admon.xsl @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: admon.xsl 7248 2007-08-18 06:50:21Z mzjn $ + $Id: admon.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -46,8 +46,7 @@ </xsl:variable> <xsl:choose> - <xsl:when test="$passivetex.extensions != 0 - or $fop.extensions != 0 + <xsl:when test="$fop.extensions != 0 or $arbortext.extensions != 0"> <xsl:value-of select="$filename"/> </xsl:when> diff --git a/fo/autoidx.xsl b/fo/autoidx.xsl index 920760f..1438118 100644 --- a/fo/autoidx.xsl +++ b/fo/autoidx.xsl @@ -13,7 +13,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx.xsl 8399 2009-04-08 07:37:42Z bobstayton $ + $Id: autoidx.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. @@ -334,16 +334,7 @@ </xsl:for-each> </xsl:variable> - <xsl:choose> - <xsl:when test="$passivetex.extensions != '0'"> - <fotex:sort xmlns:fotex="http://www.tug.org/fotex"> - <xsl:copy-of select="$page-number-citations"/> - </fotex:sort> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$page-number-citations"/> - </xsl:otherwise> - </xsl:choose> + <xsl:copy-of select="$page-number-citations"/> </xsl:otherwise> </xsl:choose> @@ -461,16 +452,7 @@ </xsl:for-each> </xsl:variable> - <xsl:choose> - <xsl:when test="$passivetex.extensions != '0'"> - <fotex:sort xmlns:fotex="http://www.tug.org/fotex"> - <xsl:copy-of select="$page-number-citations"/> - </fotex:sort> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$page-number-citations"/> - </xsl:otherwise> - </xsl:choose> + <xsl:copy-of select="$page-number-citations"/> </xsl:otherwise> </xsl:choose> @@ -591,16 +573,7 @@ </xsl:for-each> </xsl:variable> - <xsl:choose> - <xsl:when test="$passivetex.extensions != '0'"> - <fotex:sort xmlns:fotex="http://www.tug.org/fotex"> - <xsl:copy-of select="$page-number-citations"/> - </fotex:sort> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$page-number-citations"/> - </xsl:otherwise> - </xsl:choose> + <xsl:copy-of select="$page-number-citations"/> </xsl:otherwise> </xsl:choose> @@ -733,9 +706,7 @@ <fo:page-number-citation ref-id="{$id}"/> </fo:basic-link> - <xsl:if test="$passivetex.extensions = '0'"> - <xsl:copy-of select="$number.separator"/> - </xsl:if> + <xsl:copy-of select="$number.separator"/> <xsl:call-template name="reference"> <xsl:with-param name="zones" select="substring-after($zones, ' ')"/> <xsl:with-param name="scope" select="$scope"/> @@ -1145,7 +1116,7 @@ </xsl:call-template> </xsl:variable> - <xsl:text><phrase fole="pageno"></xsl:text> + <xsl:text><phrase role="pageno"></xsl:text> <xsl:if test="$target[1]/@id or $target[1]/@xml:id"> <xsl:text><link linkend="</xsl:text> <xsl:value-of select="$id"/> diff --git a/fo/autotoc.xsl b/fo/autotoc.xsl index a482343..be907bb 100644 --- a/fo/autotoc.xsl +++ b/fo/autotoc.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl 9293 2012-04-19 18:42:11Z bobstayton $ + $Id: autotoc.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -750,7 +750,7 @@ </xsl:variable> <xsl:choose> - <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0"> + <xsl:when test="$fop.extensions != 0"> <xsl:value-of select="concat($depth*$toc.indent.width, 'pt')"/> </xsl:when> <xsl:otherwise> diff --git a/fo/callout.xsl b/fo/callout.xsl index 2b7741d..e539b8f 100644 --- a/fo/callout.xsl +++ b/fo/callout.xsl @@ -8,7 +8,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: callout.xsl 8988 2011-04-06 15:56:33Z kosek $ + $Id: callout.xsl 9668 2012-11-28 00:47:59Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -84,14 +84,64 @@ </xsl:template> <xsl:template match="co"> - <fo:inline> - <xsl:call-template name="anchor"/> - <xsl:apply-templates select="." mode="callout-bug"/> - </fo:inline> + <xsl:param name="coref"/> + <!-- link to the callout? --> + <xsl:variable name="linkend"> + <xsl:choose> + <!-- if more than one target, choose the first --> + <xsl:when test="contains(normalize-space(@linkends), ' ')"> + <xsl:value-of select="substring-before(normalize-space(@linkends), ' ')"/> + </xsl:when> + <xsl:when test="string-length(normalize-space(@linkends)) != 0"> + <xsl:value-of select="normalize-space(@linkends)"/> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="string-length($linkend) != 0"> + <fo:basic-link internal-destination="{$linkend}"> + <xsl:choose> + <xsl:when test="$coref"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$coref"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="anchor"> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="." mode="callout-bug"/> + </fo:basic-link> + </xsl:when> + <xsl:otherwise> + <fo:inline> + <xsl:choose> + <xsl:when test="$coref"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$coref"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="anchor"> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="." mode="callout-bug"/> + </fo:inline> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="coref"> - <!-- tricky; this relies on the fact that we can process the "co" that's --> + <!-- this relies on the fact that we can process the "co" that's --> <!-- "over there" as if it were "right here" --> <xsl:variable name="co" select="key('id', @linkend)"/> @@ -109,10 +159,10 @@ </xsl:message> </xsl:when> <xsl:otherwise> - <fo:inline> - <xsl:call-template name="anchor"/> - <xsl:apply-templates select="$co" mode="callout-bug"/> - </fo:inline> + <!-- process it as if it were the co itself --> + <xsl:apply-templates select="$co"> + <xsl:with-param name="coref" select="."/> + </xsl:apply-templates> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -143,8 +193,7 @@ width="{$callout.icon.size}"> <xsl:attribute name="src"> <xsl:choose> - <xsl:when test="$passivetex.extensions != 0 - or $fop.extensions != 0 + <xsl:when test="$fop.extensions != 0 or $arbortext.extensions != 0"> <xsl:value-of select="$filename"/> </xsl:when> diff --git a/fo/component.xsl b/fo/component.xsl index b14a6f9..cc11b8e 100644 --- a/fo/component.xsl +++ b/fo/component.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: component.xsl 9293 2012-04-19 18:42:11Z bobstayton $ + $Id: component.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -51,14 +51,6 @@ </xsl:choose> </xsl:variable> - <xsl:if test="$passivetex.extensions != 0"> - <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" - fotex-bookmark-level="2" - fotex-bookmark-label="{$id}"> - <xsl:value-of select="$titleabbrev"/> - </fotex:bookmark> - </xsl:if> - <fo:block xsl:use-attribute-sets="component.title.properties"> <xsl:if test="$pagewide != 0"> <!-- Doesn't work to use 'all' here since not a child of fo:flow --> @@ -721,14 +713,6 @@ </xsl:attribute> </xsl:if> - <xsl:if test="$passivetex.extensions != 0"> - <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" - fotex-bookmark-level="{count(ancestor::*)+2}" - fotex-bookmark-label="{$id}"> - <xsl:value-of select="$titleabbrev"/> - </fotex:bookmark> - </xsl:if> - <fo:block xsl:use-attribute-sets="article.appendix.title.properties"> <fo:marker marker-class-name="section.head.marker"> <xsl:choose> diff --git a/fo/division.xsl b/fo/division.xsl index 9ab691d..16a13d8 100644 --- a/fo/division.xsl +++ b/fo/division.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: division.xsl 9124 2011-10-09 21:04:08Z bobstayton $ + $Id: division.xsl 9730 2013-03-15 15:26:25Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -29,14 +29,6 @@ </xsl:apply-templates> </xsl:variable> - <xsl:if test="$passivetex.extensions != 0"> - <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" - fotex-bookmark-level="1" - fotex-bookmark-label="{$id}"> - <xsl:value-of select="$title"/> - </fotex:bookmark> - </xsl:if> - <fo:block keep-with-next.within-column="always" hyphenate="false"> <xsl:if test="$axf.extensions != 0"> @@ -501,14 +493,14 @@ </xsl:call-template> </xsl:variable> - <xsl:variable name="nodes" select="reference| - preface| - chapter| - appendix| - article| - bibliography| - glossary| - index"/> + <xsl:variable name="nodes" select="$part/reference| + $part/preface| + $part/chapter| + $part/appendix| + $part/article| + $part/bibliography| + $part/glossary| + $part/index"/> <xsl:if test="count($nodes) > 0 and contains($toc.params, 'toc')"> <fo:page-sequence hyphenate="{$hyphenate}" diff --git a/fo/docbook.xsl b/fo/docbook.xsl index 6bed121..4710795 100644 --- a/fo/docbook.xsl +++ b/fo/docbook.xsl @@ -13,7 +13,7 @@ <xsl:output method="xml" indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl 9396 2012-06-02 21:56:19Z bobstayton $ + $Id: docbook.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -80,7 +80,6 @@ <xsl:include href="fop.xsl"/> <xsl:include href="fop1.xsl"/> -<xsl:include href="passivetex.xsl"/> <xsl:include href="xep.xsl"/> <xsl:include href="axf.xsl"/> <xsl:include href="ptc.xsl"/> diff --git a/fo/ebnf.xsl b/fo/ebnf.xsl index 09dcb11..27847aa 100644 --- a/fo/ebnf.xsl +++ b/fo/ebnf.xsl @@ -6,7 +6,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: ebnf.xsl 6910 2007-06-28 23:23:30Z xmldoc $ + $Id: ebnf.xsl 9664 2012-11-07 20:02:17Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -18,7 +18,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: ebnf.xsl 6910 2007-06-28 23:23:30Z xmldoc $ +$Id: ebnf.xsl 9664 2012-11-07 20:02:17Z bobstayton $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -99,7 +99,7 @@ to be incomplete. Don't forget to read the source, too :-)</para> <fo:table-cell> <fo:block text-align="start"> <xsl:text>[</xsl:text> - <xsl:number count="production" level="any"/> + <xsl:apply-templates select="." mode="label.markup"/> <xsl:text>]</xsl:text> </fo:block> </fo:table-cell> @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: fo.xsl 8287 2009-03-06 23:53:33Z bobstayton $ + $Id: fo.xsl 9720 2013-01-31 18:24:47Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -93,11 +93,11 @@ </xsl:variable> <xsl:choose> - <xsl:when test="$dingbat.font.family = ''"> + <xsl:when test="$dingbat.fontset = ''"> <xsl:copy-of select="$symbol"/> </xsl:when> <xsl:otherwise> - <fo:inline font-family="{$dingbat.font.family}"> + <fo:inline font-family="{$dingbat.fontset}"> <xsl:copy-of select="$symbol"/> </fo:inline> </xsl:otherwise> diff --git a/fo/graphics.xsl b/fo/graphics.xsl index 5937278..2f50c41 100644 --- a/fo/graphics.xsl +++ b/fo/graphics.xsl @@ -14,7 +14,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: graphics.xsl 9346 2012-05-11 03:47:30Z bobstayton $ + $Id: graphics.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -33,9 +33,6 @@ <xsl:param name="graphic.notations"> <!-- n.b. exactly one leading space, one trailing space, and one inter-word space --> <xsl:choose> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:text> PNG PDF JPG JPEG linespecific </xsl:text> - </xsl:when> <xsl:when test="$fop1.extensions != 0"> <xsl:text> BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific </xsl:text> </xsl:when> @@ -62,9 +59,6 @@ <xsl:param name="graphic.extensions"> <!-- n.b. exactly one leading space, one trailing space, and one inter-word space --> <xsl:choose> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:text> png pdf jpg jpeg </xsl:text> - </xsl:when> <xsl:when test="$fop1.extensions != 0"> <xsl:text> bmp gif tif tiff svg png pdf jpg jpeg eps </xsl:text> </xsl:when> @@ -98,10 +92,17 @@ <xsl:template match="screenshot"> <fo:block> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> +<xsl:template match="screenshot/title"> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> +</xsl:template> + <xsl:template match="screeninfo"> </xsl:template> @@ -473,6 +474,7 @@ </xsl:when> <xsl:otherwise> <fo:block> + <xsl:call-template name="anchor"/> <xsl:if test="@align"> <xsl:attribute name="text-align"> <xsl:value-of select="@align"/> @@ -763,7 +765,7 @@ <!-- ==================================================================== --> -<xsl:template match="mediaobject/caption"> +<xsl:template match="mediaobject/caption|figure/caption"> <fo:block> <xsl:if test="@align = 'right' or @align = 'left' or @align='center'"> <xsl:attribute name="text-align"><xsl:value-of @@ -779,8 +781,7 @@ <xsl:param name="filename"/> <xsl:choose> - <xsl:when test="$passivetex.extensions != 0 - or $fop.extensions != 0"> + <xsl:when test="$fop.extensions != 0"> <xsl:value-of select="$filename"/> </xsl:when> <xsl:otherwise> diff --git a/fo/htmltbl.xsl b/fo/htmltbl.xsl index 479275c..c323e5a 100644 --- a/fo/htmltbl.xsl +++ b/fo/htmltbl.xsl @@ -4,7 +4,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: htmltbl.xsl 9196 2012-01-18 17:51:39Z bobstayton $ + $Id: htmltbl.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -35,8 +35,7 @@ <fo:table xsl:use-attribute-sets="table.table.properties"> <xsl:choose> <xsl:when test="$fop.extensions != 0 or - $fop1.extensions != 0 or - $passivetex.extensions != 0"> + $fop1.extensions != 0"> <xsl:attribute name="table-layout">fixed</xsl:attribute> </xsl:when> </xsl:choose> diff --git a/fo/inline.xsl b/fo/inline.xsl index 60abd77..b69dac2 100644 --- a/fo/inline.xsl +++ b/fo/inline.xsl @@ -10,7 +10,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: inline.xsl 9228 2012-02-01 21:50:25Z bobstayton $ + $Id: inline.xsl 9718 2013-01-30 18:29:51Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -145,7 +145,35 @@ <xsl:copy-of select="$content"/> </xsl:otherwise> </xsl:choose> +</xsl:template> + +<xsl:template name="inline.sansseq"> + <xsl:param name="content"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + </xsl:param> + <fo:inline font-family="{$sans.font.family}"> + <xsl:choose> + <xsl:when test="@dir"> + <fo:inline> + <xsl:attribute name="direction"> + <xsl:choose> + <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when> + <xsl:otherwise>rtl</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:copy-of select="$content"/> + </fo:inline> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$content"/> + </xsl:otherwise> + </xsl:choose> + </fo:inline> </xsl:template> <xsl:template name="inline.charseq"> @@ -483,14 +511,14 @@ <xsl:template match="function/parameter" priority="2"> <xsl:call-template name="inline.italicmonoseq"/> - <xsl:if test="following-sibling::*"> + <xsl:if test="$function.parens != 0 and following-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> <xsl:template match="function/replaceable" priority="2"> <xsl:call-template name="inline.italicmonoseq"/> - <xsl:if test="following-sibling::*"> + <xsl:if test="$function.parens != 0 and following-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> @@ -532,7 +560,21 @@ </xsl:template> <xsl:template match="keycap"> - <xsl:call-template name="inline.boldseq"/> + <xsl:choose> + <xsl:when test="@function and normalize-space(.) = ''"> + <xsl:call-template name="inline.boldseq"> + <xsl:with-param name="content"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'keycap'"/> + <xsl:with-param name="name" select="@function"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="inline.boldseq"/> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="keycode"> @@ -869,7 +911,7 @@ <fo:basic-link internal-destination="{$termid}" xsl:use-attribute-sets="xref.properties"> - <xsl:call-template name="inline.charseq"/> + <xsl:call-template name="inline.italicseq"/> </fo:basic-link> </xsl:otherwise> </xsl:choose> diff --git a/fo/lists.xsl b/fo/lists.xsl index fee8de1..6f04014 100644 --- a/fo/lists.xsl +++ b/fo/lists.xsl @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: lists.xsl 9115 2011-10-05 20:12:49Z bobstayton $ + $Id: lists.xsl 9668 2012-11-28 00:47:59Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -136,17 +136,9 @@ </fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <xsl:choose> - <!-- * work around broken passivetex list-item-body rendering --> - <xsl:when test="$passivetex.extensions = '1'"> - <xsl:apply-templates/> - </xsl:when> - <xsl:otherwise> - <fo:block> - <xsl:apply-templates/> - </fo:block> - </xsl:otherwise> - </xsl:choose> + <fo:block> + <xsl:apply-templates/> + </fo:block> </fo:list-item-body> </xsl:variable> @@ -385,15 +377,7 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="@termlength"/> - <xsl:choose> - <!-- workaround for passivetex lack of support for non-constant expressions --> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:text>em</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>em * 0.60</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:text>em * 0.60</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -402,15 +386,7 @@ <xsl:with-param name="terms" select="varlistentry/term"/> <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/> </xsl:call-template> - <xsl:choose> - <!-- workaround for passivetex lack of support for non-constant expressions --> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:text>em</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>em * 0.60</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:text>em * 0.60</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -424,17 +400,9 @@ <xsl:variable name="label-separation">1em</xsl:variable> <xsl:variable name="distance-between-starts"> - <xsl:choose> - <!-- workaround for passivetex lack of support for non-constant expressions --> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:value-of select="$termlength"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$termlength"/> - <xsl:text>+</xsl:text> - <xsl:value-of select="$label-separation"/> - </xsl:otherwise> - </xsl:choose> + <xsl:value-of select="$termlength"/> + <xsl:text>+</xsl:text> + <xsl:value-of select="$label-separation"/> </xsl:variable> <xsl:if test="title"> @@ -1352,7 +1320,9 @@ <xsl:text>: ???</xsl:text> </xsl:when> <xsl:when test="local-name($target)='co'"> - <xsl:apply-templates select="$target" mode="callout-bug"/> + <fo:basic-link internal-destination="{$arearef}"> + <xsl:apply-templates select="$target" mode="callout-bug"/> + </fo:basic-link> </xsl:when> <xsl:when test="local-name($target)='areaset'"> <xsl:call-template name="callout-bug"> diff --git a/fo/math.xsl b/fo/math.xsl index c0c70b5..e25edf2 100644 --- a/fo/math.xsl +++ b/fo/math.xsl @@ -6,7 +6,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: math.xsl 9375 2012-05-24 16:33:32Z bobstayton $ + $Id: math.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -16,18 +16,7 @@ ******************************************************************** --> <xsl:template match="inlineequation"> - <xsl:choose> - <xsl:when test="$passivetex.extensions != 0 and $tex.math.in.alt != ''"> - <xsl:apply-templates select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']"> - <xsl:with-param name="output.delims"> - <xsl:call-template name="tex.math.output.delims"/> - </xsl:with-param> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> + <xsl:apply-templates/> </xsl:template> <xsl:template match="alt"> @@ -42,24 +31,12 @@ <!-- "Support" for MathML --> <xsl:template match="mml:math" xmlns:mml="http://www.w3.org/1998/Math/MathML"> - <xsl:choose> - <!-- * If user is using passivetex, we don't wrap the output in --> - <!-- * fo:instream-foreign-object (which passivetex doesn't support). --> - <xsl:when test="not($passivetex.extensions = 0)"> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates/> - </xsl:copy> - </xsl:when> - <xsl:otherwise> - <fo:instream-foreign-object> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates/> - </xsl:copy> - </fo:instream-foreign-object> - </xsl:otherwise> - </xsl:choose> + <fo:instream-foreign-object> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:apply-templates/> + </xsl:copy> + </fo:instream-foreign-object> </xsl:template> <xsl:template match="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> @@ -80,17 +57,6 @@ <xsl:template match="inlineequation/alt[@role='tex'] | inlineequation/inlinemediaobject/textobject[@role='tex']" priority="1"> <xsl:param name="output.delims" select="1"/> - <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''"> - <xsl:processing-instruction name="xmltex"> - <xsl:if test="$output.delims != 0"> - <xsl:text>$</xsl:text> - </xsl:if> - <xsl:value-of select="."/> - <xsl:if test="$output.delims != 0"> - <xsl:text>$</xsl:text> - </xsl:if> - </xsl:processing-instruction> - </xsl:if> </xsl:template> <xsl:template match="equation/alt[@role='tex'] | informalequation/alt[@role='tex'] | @@ -99,25 +65,6 @@ <xsl:variable name="output.delims"> <xsl:call-template name="tex.math.output.delims"/> </xsl:variable> - <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''"> - <xsl:processing-instruction name="xmltex"> - <xsl:if test="$output.delims != 0"> - <xsl:text>$$</xsl:text> - </xsl:if> - <xsl:value-of select="."/> - <xsl:if test="$output.delims != 0"> - <xsl:text>$$</xsl:text> - </xsl:if> - </xsl:processing-instruction> - </xsl:if> -</xsl:template> - -<xsl:template match="alt[@role='tex']"> - <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''"> - <xsl:message> - Your equation is misplaced. It should be in inlineequation, equation or informalequation. - </xsl:message> - </xsl:if> </xsl:template> <xsl:template name="tex.math.output.delims"> diff --git a/fo/pagesetup.xsl b/fo/pagesetup.xsl index 2fd7a82..88c22d7 100644 --- a/fo/pagesetup.xsl +++ b/fo/pagesetup.xsl @@ -4,7 +4,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: pagesetup.xsl 9157 2011-11-23 22:29:23Z bobstayton $ + $Id: pagesetup.xsl 9720 2013-01-31 18:24:47Z bobstayton $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. @@ -19,14 +19,21 @@ <xsl:value-of select="$body.font.family"/> <xsl:if test="$body.font.family != '' and $symbol.font.family != ''">,</xsl:if> - <xsl:value-of select="$symbol.font.family"/> + <xsl:value-of select="$symbol.font.family"/> </xsl:param> <xsl:param name="title.fontset"> <xsl:value-of select="$title.font.family"/> <xsl:if test="$title.font.family != '' and $symbol.font.family != ''">,</xsl:if> - <xsl:value-of select="$symbol.font.family"/> + <xsl:value-of select="$symbol.font.family"/> +</xsl:param> + +<xsl:param name="dingbat.fontset"> + <xsl:value-of select="$dingbat.font.family"/> + <xsl:if test="$dingbat.font.family != '' + and $symbol.font.family != ''">,</xsl:if> + <xsl:value-of select="$symbol.font.family"/> </xsl:param> <!-- These are internal parameters are for the individual precedence attributes --> @@ -2117,8 +2124,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="titlepage-first" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="titlepage-first" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="titlepage-odd" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2138,8 +2147,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="lot-first" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="lot-first" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="lot-odd" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2159,8 +2170,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="front-first" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="front-first" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="front-odd" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2180,8 +2193,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="body-first" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="body-first" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="body-odd" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2201,8 +2216,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="back-first" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="back-first" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="back-odd" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2222,8 +2239,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="index-first" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="index-first" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="index-odd" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2244,8 +2263,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank-draft" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="titlepage-first-draft" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="titlepage-first-draft" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="titlepage-odd-draft" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2265,8 +2286,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank-draft" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="lot-first-draft" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="lot-first-draft" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="lot-odd-draft" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2286,8 +2309,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank-draft" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="front-first-draft" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="front-first-draft" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="front-odd-draft" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2307,8 +2332,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank-draft" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="body-first-draft" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="body-first-draft" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="body-odd-draft" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2328,8 +2355,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank-draft" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="back-first-draft" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="back-first-draft" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="back-odd-draft" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -2349,8 +2378,10 @@ <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference master-reference="blank-draft" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-reference="index-first-draft" - page-position="first"/> + <xsl:if test="$force.blank.pages != 0"> + <fo:conditional-page-master-reference master-reference="index-first-draft" + page-position="first"/> + </xsl:if> <fo:conditional-page-master-reference master-reference="index-odd-draft" odd-or-even="odd"/> <fo:conditional-page-master-reference @@ -3258,6 +3289,12 @@ <xsl:param name="element" select="local-name(.)"/> <xsl:param name="master-reference" select="''"/> + <xsl:variable name="first"> + <xsl:choose> + <xsl:when test="$force.blank.pages = 0">auto</xsl:when> + <xsl:otherwise>auto-odd</xsl:otherwise> + </xsl:choose> + </xsl:variable> <!-- Select the first content that the stylesheet places after the TOC --> <xsl:variable name="first.book.content" @@ -3276,11 +3313,11 @@ <!-- double-sided output --> <xsl:when test="$double.sided != 0"> <xsl:choose> - <xsl:when test="$element = 'toc'">auto-odd</xsl:when> - <xsl:when test="$element = 'book'">1</xsl:when> + <xsl:when test="$element = 'toc'"><xsl:value-of select="$first"/></xsl:when> + <xsl:when test="$element = 'book'"><xsl:value-of select="$first"/></xsl:when> <!-- preface typically continues TOC roman numerals --> - <!-- Change page.number.format if not --> - <xsl:when test="$element = 'preface'">auto-odd</xsl:when> + <!-- If changed to 1 here, then change page.number.format too --> + <xsl:when test="$element = 'preface'"><xsl:value-of select="$first"/></xsl:when> <xsl:when test="($element = 'dedication' or $element = 'article') and not(preceding::chapter or preceding::preface @@ -3291,7 +3328,7 @@ or parent::reference)">1</xsl:when> <xsl:when test="generate-id($first.book.content) = generate-id(.)">1</xsl:when> - <xsl:otherwise>auto-odd</xsl:otherwise> + <xsl:otherwise><xsl:value-of select="$first"/></xsl:otherwise> </xsl:choose> </xsl:when> @@ -3299,7 +3336,7 @@ <xsl:otherwise> <xsl:choose> <xsl:when test="$element = 'toc'">auto</xsl:when> - <xsl:when test="$element = 'book'">1</xsl:when> + <xsl:when test="$element = 'book'">auto</xsl:when> <xsl:when test="$element = 'preface'">auto</xsl:when> <xsl:when test="($element = 'dedication' or $element = 'article') and not(preceding::chapter @@ -3322,6 +3359,8 @@ <xsl:param name="master-reference" select="''"/> <xsl:choose> + <!-- no automatic even blank pages at end of chapters --> + <xsl:when test="$force.blank.pages = 0">no-force</xsl:when> <!-- double-sided output --> <xsl:when test="$double.sided != 0">end-on-even</xsl:when> <!-- single-sided output --> @@ -3349,7 +3388,7 @@ </xsl:variable> <xsl:choose> - <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0"> + <xsl:when test="$fop.extensions != 0"> <!-- body.start.indent does not work well with these processors --> </xsl:when> <xsl:when test="starts-with($pageclass, 'body') or diff --git a/fo/param.xml b/fo/param.xml index d821c97..00a4447 100644 --- a/fo/param.xml +++ b/fo/param.xml @@ -3,7 +3,7 @@ <info> <title>FO Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb 9238 2012-03-02 18:38:42Z bobstayton $ +$Id: param.xweb 9673 2012-12-02 20:06:41Z bobstayton $ </releaseinfo> <author> <personname> @@ -1766,19 +1766,12 @@ should still be used for FOP version 0.20.5 and earlier. <refsection><info><title>Description</title></info> -<para>If non-zero, -<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://projects.oucs.ox.ac.uk/passivetex/">PassiveTeX</link> -extensions will be used. At present, this consists of PDF bookmarks -and sorted index terms. -</para> +<important><para>The PassiveTeX XSL-FO processor is +no longer supported by DocBook XSL, beginning with version 1.78.</para></important> -<para>This parameter can also affect which graphics file formats -are supported</para> - -<note> - <para>PassiveTeX is incomplete and development has ceased. In most cases, -another XSL-FO engine is probably a better choice.</para> -</note> +<para>PassiveTeX was never a complete implementation of +XSL-FO, and development has ceased. Setting this parameter will +have no effect on the output.</para> </refsection> </refentry> @@ -3464,6 +3457,71 @@ identifier does not appear in the document itself. </para> </refsection> </refentry> +<refentry version="5.0" xml:id="activate.external.olinks"> +<refmeta> +<refentrytitle>activate.external.olinks</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>activate.external.olinks</refname> +<refpurpose>Make external olinks into active links</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting xml:id="activate.external.olinks.frag"> +<xsl:param name="activate.external.olinks" select="1"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsection><info><title>Description</title></info> + +<para>If <parameter>activate.external.olinks</parameter> is nonzero +(the default), then any olinks that reference another document +become active links that can be clicked on to follow the link. +If the parameter is set to zero, then external olinks +will have the appropriate link text generated, but the link is +not made active. Olinks to destinations in +the current document remain active.</para> + +<para>To make an external olink active for HTML +outputs, the link text is wrapped in an <tag>a</tag> +element with an <tag>href</tag> attribute. To +make an external olink active for FO outputs, the link text is +wrapped in an <tag>fo:basic-link</tag> element with an +<tag>external-destination</tag> attribute.</para> + +<para>This parameter is useful when you need external olinks +to resolve but not be clickable. For example, if documents +in a collection are available independently of each other, +then having active links between them could lead to +unresolved links when a given target document is missing.</para> + +<para>The epub stylesheets set this parameter to zero by default +because there is no standard linking mechanism between Epub documents.</para> + +<para>If external links are made inactive, you should +consider setting the +stylesheet parameter <parameter>olink.doctitle</parameter> +to <literal>yes</literal>. That will append the external document's +title to the link text, making it easier for the user to +locate the other document.</para> + +<para>An olink is considered external when the +<parameter>current.docid</parameter> stylesheet parameter +is set to some value, and the olink's <tag>targetdoc</tag> +attribute has a different value. If the two values +match, then the link is considered internal. If the +<parameter>current.docid</parameter> parameter is blank, or +the <tag>olink</tag> element does not have a <tag>targetdoc</tag> attribute, +then the link is considered to be internal and will become +an active link.</para> + +<para>See also <parameter>olink.doctitle</parameter>, +<parameter>prefer.internal.olink</parameter>.</para> + +</refsection> +</refentry> + <refentry version="5.0" xml:id="collect.xref.targets"> <refmeta> <refentrytitle>collect.xref.targets</refentrytitle> @@ -6645,6 +6703,7 @@ that you may have trouble using those symbols for footnotes.</para> <xsl:attribute name="font-style">normal</xsl:attribute> <xsl:attribute name="text-align"><xsl:value-of select="$alignment"></xsl:value-of></xsl:attribute> <xsl:attribute name="start-indent">0pt</xsl:attribute> + <xsl:attribute name="end-indent">0pt</xsl:attribute> <xsl:attribute name="text-indent">0pt</xsl:attribute> <xsl:attribute name="hyphenate"><xsl:value-of select="$hyphenate"></xsl:value-of></xsl:attribute> <xsl:attribute name="wrap-option">wrap</xsl:attribute> @@ -7700,6 +7759,8 @@ zero by default, so this is simply the page-master margin-right. <xsl:when test="$paper.type = 'A4landscape'">210mm</xsl:when> <xsl:when test="$paper.type = 'USletter'">11in</xsl:when> <xsl:when test="$paper.type = 'USlandscape'">8.5in</xsl:when> + <xsl:when test="$paper.type = 'USlegal'">14in</xsl:when> + <xsl:when test="$paper.type = 'USlegallandscape'">8.5in</xsl:when> <xsl:when test="$paper.type = '4A0'">2378mm</xsl:when> <xsl:when test="$paper.type = '2A0'">1682mm</xsl:when> <xsl:when test="$paper.type = 'A0'">1189mm</xsl:when> @@ -7823,6 +7884,8 @@ this bug is fixed by RenderX. It does not affect documents with left-to-right text direction.</para> </note> +<para>See also <parameter>writing.mode</parameter>.</para> + </refsection> </refentry> @@ -7872,6 +7935,8 @@ this bug is fixed by RenderX. It does not affect documents with left-to-right text direction.</para> </note> +<para>See also <parameter>writing.mode</parameter>.</para> + </refsection> </refentry> @@ -7973,6 +8038,9 @@ landscape orientation, it is vertical. <programlisting xml:id="page.width.portrait.frag"><xsl:param name="page.width.portrait"> <xsl:choose> <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when> + <xsl:when test="$paper.type = 'USlandscape'">11in</xsl:when> + <xsl:when test="$paper.type = 'USlegal'">8.5in</xsl:when> + <xsl:when test="$paper.type = 'USlegallandscape'">14in</xsl:when> <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when> <xsl:when test="$paper.type = '2A0'">1189mm</xsl:when> <xsl:when test="$paper.type = 'A0'">841mm</xsl:when> @@ -8109,11 +8177,63 @@ B, and C sizes. See <parameter>page.width.portrait</parameter>, for example. <refsection><info><title>Description</title></info> -<para>Double-sided documents are printed with a slightly wider margin -on the binding edge of the page. +<para>This parameter is useful when printing a document +on both sides of the paper.</para> + +<para>if set to non-zero, documents are formatted using different page-masters +for odd and even pages. These can differ by using a slightly wider margin +on the binding edge of the page, and alternating left-right +positions of header or footer elements. +</para> + +<para>If set to zero (the default), then only the 'odd' page masters +are used for both even and odd numbered pages.</para> + +<para>See also <parameter>force.blank.pages</parameter>, +<parameter>page.margin.inner</parameter> and +<parameter>page.margin.outer</parameter>.</para> + +</refsection> +</refentry> + +<refentry version="5.0" xml:id="force.blank.pages"> +<refmeta> +<refentrytitle>force.blank.pages</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>force.blank.pages</refname> +<refpurpose>Generate blank page to end on even page number</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting xml:id="force.blank.pages.frag"> +<xsl:param name="force.blank.pages" select="1"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsection><info><title>Description</title></info> + +<para>If non-zero (the default), then each page sequence will be forced to +end on an even-numbered page, by inserting a blank page +if necessary. This will force the next page sequence to start +on an odd-numbered page, which is a standard convention +for printed and bound books.</para> + +<para>If zero, then such blank pages will not be inserted. +Chapters will start on the next available page, +regardless of whether it is an even or odd number. +This is useful when publishing online where blank +pages are not needed. +</para> + +<para>This param is independent of the +<parameter>double.sided</parameter> parameter, which +just triggers the use of even and odd page sequence +masters that differ in their header and footer placement. +So you can combine the two params for alternating +headers/footers and no blank pages. </para> -<para>FIXME: The current set of parameters does not take writing direction -into account.</para> </refsection> </refentry> @@ -11656,9 +11776,6 @@ used for all titles below level 5.</para> <refsynopsisdiv> <programlisting xml:id="article.appendix.title.properties.frag"> <xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties section.title.level1.properties"> - <xsl:attribute name="margin-{$direction.align.start}"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> </xsl:attribute-set> </programlisting> </refsynopsisdiv> @@ -12613,7 +12730,7 @@ to be treated as case insensitive".</para> The value is normally taken from the gentext file for the lang attribute of the document's root element, using the key name 'writing-mode' to look it up in the gentext file. -But the param can also be +But this param can also be set on the command line to override that gentext value. </para> <para>Accepted values are: @@ -12835,7 +12952,7 @@ around all these parameters.</para> <!-- This file is generated from param.xweb --> <!-- ******************************************************************** - $Id: param.xweb 9238 2012-03-02 18:38:42Z bobstayton $ + $Id: param.xweb 9673 2012-12-02 20:06:41Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -12846,6 +12963,7 @@ around all these parameters.</para> <src:fragref linkend="abstract.properties.frag"></src:fragref> <src:fragref linkend="abstract.title.properties.frag"></src:fragref> +<src:fragref linkend="activate.external.olinks.frag"></src:fragref> <src:fragref linkend="admon.graphics.extension.frag"></src:fragref> <src:fragref linkend="admon.graphics.frag"></src:fragref> <src:fragref linkend="admon.graphics.path.frag"></src:fragref> @@ -12948,6 +13066,7 @@ around all these parameters.</para> <src:fragref linkend="footnote.sep.leader.properties.frag"></src:fragref> <src:fragref linkend="fop.extensions.frag"></src:fragref> <src:fragref linkend="fop1.extensions.frag"></src:fragref> +<src:fragref linkend="force.blank.pages.frag"></src:fragref> <src:fragref linkend="formal.object.properties.frag"></src:fragref> <src:fragref linkend="formal.procedures.frag"></src:fragref> <src:fragref linkend="formal.title.placement.frag"></src:fragref> diff --git a/fo/param.xsl b/fo/param.xsl index 125689e..b7ce4a2 100644 --- a/fo/param.xsl +++ b/fo/param.xsl @@ -4,7 +4,7 @@ <!-- This file is generated from param.xweb --> <!-- ******************************************************************** - $Id: param.xweb 9238 2012-03-02 18:38:42Z bobstayton $ + $Id: param.xweb 9673 2012-12-02 20:06:41Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -28,6 +28,7 @@ <xsl:attribute name="hyphenate">false</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> </xsl:attribute-set> +<xsl:param name="activate.external.olinks" select="1"/> <xsl:param name="admon.graphics.extension">.png</xsl:param> <xsl:param name="admon.graphics" select="0"/> <xsl:param name="admon.graphics.path">images/</xsl:param> @@ -59,9 +60,6 @@ <xsl:param name="appendix.autolabel">A</xsl:param> <xsl:param name="arbortext.extensions" select="0"/> <xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties section.title.level1.properties"> - <xsl:attribute name="margin-{$direction.align.start}"> - <xsl:value-of select="$title.margin.left"/> - </xsl:attribute> </xsl:attribute-set> <xsl:param name="author.othername.in.middle" select="1"/> <xsl:param name="autotoc.label.separator">. </xsl:param> @@ -238,6 +236,7 @@ <xsl:attribute name="font-style">normal</xsl:attribute> <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute> <xsl:attribute name="start-indent">0pt</xsl:attribute> + <xsl:attribute name="end-indent">0pt</xsl:attribute> <xsl:attribute name="text-indent">0pt</xsl:attribute> <xsl:attribute name="hyphenate"><xsl:value-of select="$hyphenate"/></xsl:attribute> <xsl:attribute name="wrap-option">wrap</xsl:attribute> @@ -250,6 +249,7 @@ </xsl:attribute-set> <xsl:param name="fop.extensions" select="0"/> <xsl:param name="fop1.extensions" select="0"/> +<xsl:param name="force.blank.pages" select="1"/> <xsl:attribute-set name="formal.object.properties"> <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> <xsl:attribute name="space-before.optimum">1em</xsl:attribute> @@ -495,6 +495,8 @@ set toc,title <xsl:when test="$paper.type = 'A4landscape'">210mm</xsl:when> <xsl:when test="$paper.type = 'USletter'">11in</xsl:when> <xsl:when test="$paper.type = 'USlandscape'">8.5in</xsl:when> + <xsl:when test="$paper.type = 'USlegal'">14in</xsl:when> + <xsl:when test="$paper.type = 'USlegallandscape'">8.5in</xsl:when> <xsl:when test="$paper.type = '4A0'">2378mm</xsl:when> <xsl:when test="$paper.type = '2A0'">1682mm</xsl:when> <xsl:when test="$paper.type = 'A0'">1189mm</xsl:when> @@ -561,6 +563,9 @@ set toc,title <xsl:param name="page.width.portrait"> <xsl:choose> <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when> + <xsl:when test="$paper.type = 'USlandscape'">11in</xsl:when> + <xsl:when test="$paper.type = 'USlegal'">8.5in</xsl:when> + <xsl:when test="$paper.type = 'USlegallandscape'">14in</xsl:when> <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when> <xsl:when test="$paper.type = '2A0'">1189mm</xsl:when> <xsl:when test="$paper.type = 'A0'">841mm</xsl:when> diff --git a/fo/profile-docbook.xsl b/fo/profile-docbook.xsl index 1734d41..4233e2d 100644 --- a/fo/profile-docbook.xsl +++ b/fo/profile-docbook.xsl @@ -9,7 +9,7 @@ <xsl:output method="xml" indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl 9396 2012-06-02 21:56:19Z bobstayton $ + $Id: docbook.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -76,7 +76,6 @@ <xsl:include href="fop.xsl"/> <xsl:include href="fop1.xsl"/> -<xsl:include href="passivetex.xsl"/> <xsl:include href="xep.xsl"/> <xsl:include href="axf.xsl"/> <xsl:include href="ptc.xsl"/> diff --git a/fo/refentry.xsl b/fo/refentry.xsl index 0d0f61f..2beda75 100644 --- a/fo/refentry.xsl +++ b/fo/refentry.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: refentry.xsl 9153 2011-11-15 22:07:59Z bobstayton $ + $Id: refentry.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -637,14 +637,6 @@ </xsl:choose> </xsl:variable> - <xsl:if test="$passivetex.extensions != 0"> - <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" - fotex-bookmark-level="{$level + 2 + $offset}" - fotex-bookmark-label="{$id}"> - <xsl:value-of select="$title"/> - </fotex:bookmark> - </xsl:if> - <xsl:if test="$axf.extensions != 0"> <xsl:attribute name="axf:outline-level"> <xsl:value-of select="count(ancestor::*)-1 + $offset"/> diff --git a/fo/sections.xsl b/fo/sections.xsl index 4569f2d..81c5daa 100644 --- a/fo/sections.xsl +++ b/fo/sections.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: sections.xsl 6910 2007-06-28 23:23:30Z xmldoc $ + $Id: sections.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -294,14 +294,6 @@ </xsl:apply-templates> </xsl:variable> - <xsl:if test="$passivetex.extensions != 0"> - <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" - fotex-bookmark-level="{$level + 2}" - fotex-bookmark-label="{$id}"> - <xsl:value-of select="$marker.title"/> - </fotex:bookmark> - </xsl:if> - <xsl:if test="$axf.extensions != 0"> <xsl:attribute name="axf:outline-level"> <xsl:value-of select="count(ancestor::*)-1"/> diff --git a/fo/spaces.xsl b/fo/spaces.xsl index d34c9cd..dc3a71a 100644 --- a/fo/spaces.xsl +++ b/fo/spaces.xsl @@ -4,7 +4,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: spaces.xsl 8121 2008-09-13 17:21:11Z mzjn $ + $Id: spaces.xsl 9647 2012-10-26 17:42:03Z bobstayton $ ******************************************************************** XSL-FO specification treats all space characters like ordinary spaces. We need to map them to fo:leader with different widths in order to @@ -12,23 +12,10 @@ ******************************************************************** --> <xsl:template match="text()[namespace-uri(..) = '' or - namespace-uri(..) = 'http://docbook.org/ns/docbook']"> - <xsl:choose> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:call-template name="passivetex.dash.subst"> - <xsl:with-param name="string"> - <xsl:call-template name="space.2000.subst"> - <xsl:with-param name="string" select="."/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="space.2000.subst"> - <xsl:with-param name="string" select="."/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> + namespace-uri(..) = 'http://docbook.org/ns/docbook']"> + <xsl:call-template name="space.2000.subst"> + <xsl:with-param name="string" select="."/> + </xsl:call-template> </xsl:template> <xsl:param name="space.enquad.width">0.5em</xsl:param> <!-- U+2000 --> diff --git a/fo/table.xml b/fo/table.xml index 850a3c6..bf7bf6b 100644 --- a/fo/table.xml +++ b/fo/table.xml @@ -5,7 +5,7 @@ <info> <title>Formatting Object Table Reference</title> <releaseinfo role="meta"> - $Id: table.xsl 9345 2012-05-11 03:46:46Z bobstayton $ + $Id: table.xsl 9666 2012-11-14 04:42:56Z bobstayton $ </releaseinfo> </info> <partintro xml:id="partintro"> diff --git a/fo/table.xsl b/fo/table.xsl index 3a720af..d639efe 100644 --- a/fo/table.xsl +++ b/fo/table.xsl @@ -13,7 +13,7 @@ <xsl:include href="../common/table.xsl"/> <!-- ******************************************************************** - $Id: table.xsl 9345 2012-05-11 03:46:46Z bobstayton $ + $Id: table.xsl 9666 2012-11-14 04:42:56Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -27,7 +27,7 @@ <info> <title>Formatting Object Table Reference</title> <releaseinfo role="meta"> - $Id: table.xsl 9345 2012-05-11 03:46:46Z bobstayton $ + $Id: table.xsl 9666 2012-11-14 04:42:56Z bobstayton $ </releaseinfo> </info> <partintro xml:id="partintro"> @@ -173,6 +173,11 @@ <xsl:otherwise> <fo:block id="{$id}" xsl:use-attribute-sets="informaltable.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"> + <xsl:value-of select="$keep.together"/> + </xsl:attribute> + </xsl:if> <xsl:copy-of select="$table.layout"/> <xsl:call-template name="table.footnote.block"/> </fo:block> @@ -197,8 +202,7 @@ <xsl:param name="table.block"/> <xsl:choose> <xsl:when test="@orient='land' and - $fop.extensions = 0 and - $passivetex.extensions = 0" > + $fop.extensions = 0" > <fo:block-container reference-orientation="90" padding="6pt" xsl:use-attribute-sets="list.block.spacing"> @@ -508,8 +512,7 @@ select=".//colspec[contains(@colwidth, '*')]"/> <xsl:if test="count($prop-columns) != 0 or $fop.extensions != 0 or - $fop1.extensions != 0 or - $passivetex.extensions != 0"> + $fop1.extensions != 0"> <xsl:attribute name="table-layout">fixed</xsl:attribute> </xsl:if> @@ -642,8 +645,7 @@ <xsl:choose> <!-- These processors don't support table-layout="auto" --> <xsl:when test="$fop.extensions != 0 or - $fop1.extensions != 0 or - $passivetex.extensions != 0"> + $fop1.extensions != 0"> <xsl:text>100%</xsl:text> </xsl:when> <!-- Proportional columns imply 100% width --> @@ -672,7 +674,7 @@ <fo:table-header start-indent="0pt" end-indent="0pt"> <xsl:choose> <!-- Use recursion if @morerows is used --> - <xsl:when test="row/entry/@morerows|ro/entrytbl/@morerows"> + <xsl:when test="row/entry/@morerows|row/entrytbl/@morerows"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -702,7 +704,7 @@ <fo:table-footer start-indent="0pt" end-indent="0pt"> <xsl:choose> <!-- Use recursion if @morerows is used --> - <xsl:when test="row/entry/@morerows|ro/entrytbl/@morerows"> + <xsl:when test="row/entry/@morerows|row/entrytbl/@morerows"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -732,7 +734,7 @@ <fo:table-body start-indent="0pt" end-indent="0pt"> <xsl:choose> <!-- Use recursion if @morerows is used --> - <xsl:when test="row/entry/@morerows|ro/entrytbl/@morerows"> + <xsl:when test="row/entry/@morerows|row/entrytbl/@morerows"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -1132,7 +1134,7 @@ --> <xsl:choose> - <xsl:when test="$fop.extensions = 0 and $passivetex.extensions = 0 + <xsl:when test="$fop.extensions = 0 and $orientation != ''"> <fo:block-container reference-orientation="{$orientation}"> <xsl:if test="$rotated-width != ''"> diff --git a/fo/titlepage.templates.xml b/fo/titlepage.templates.xml index 6d63b19..1ab91f9 100644 --- a/fo/titlepage.templates.xml +++ b/fo/titlepage.templates.xml @@ -18,7 +18,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <!-- ******************************************************************** - $Id: titlepage.templates.xml 9294 2012-04-19 18:52:39Z bobstayton $ + $Id: titlepage.templates.xml 9722 2013-02-01 19:44:13Z bobstayton $ ******************************************************************** This file is part of the DocBook XSL Stylesheet distribution. @@ -1207,7 +1207,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" @@ -1237,7 +1236,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" @@ -1267,7 +1265,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" @@ -1297,7 +1294,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" @@ -1327,7 +1323,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" @@ -1357,7 +1352,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" @@ -1387,7 +1381,6 @@ space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" - margin-left="{$title.margin.left}" start-indent="0pt" font-size="&hsize3;" font-weight="bold" diff --git a/fo/titlepage.templates.xsl b/fo/titlepage.templates.xsl index ed0cffd..e3404e3 100644 --- a/fo/titlepage.templates.xsl +++ b/fo/titlepage.templates.xsl @@ -5098,7 +5098,7 @@ </xsl:template> <xsl:template name="table.of.contents.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'TableofContents'"/> </xsl:call-template></fo:block> @@ -5165,7 +5165,7 @@ </xsl:template> <xsl:template name="list.of.tables.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'ListofTables'"/> </xsl:call-template></fo:block> @@ -5232,7 +5232,7 @@ </xsl:template> <xsl:template name="list.of.figures.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'ListofFigures'"/> </xsl:call-template></fo:block> @@ -5299,7 +5299,7 @@ </xsl:template> <xsl:template name="list.of.examples.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'ListofExamples'"/> </xsl:call-template></fo:block> @@ -5366,7 +5366,7 @@ </xsl:template> <xsl:template name="list.of.equations.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'ListofEquations'"/> </xsl:call-template></fo:block> @@ -5433,7 +5433,7 @@ </xsl:template> <xsl:template name="list.of.procedures.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'ListofProcedures'"/> </xsl:call-template></fo:block> @@ -5500,7 +5500,7 @@ </xsl:template> <xsl:template name="list.of.unknowns.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'ListofUnknown'"/> </xsl:call-template></fo:block> diff --git a/fo/verbatim.xsl b/fo/verbatim.xsl index 51d8926..319ffcf 100644 --- a/fo/verbatim.xsl +++ b/fo/verbatim.xsl @@ -9,7 +9,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: verbatim.xsl 9043 2011-08-30 13:30:50Z dcramer $ + $Id: verbatim.xsl 9590 2012-09-02 20:53:23Z tom_schr $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -398,7 +398,7 @@ </xsl:when> <xsl:when test="$listings[1]/@continuation='continues'"> <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" select="listings[position() > 1]"/> + <xsl:with-param name="listings" select="$listings[position() > 1]"/> <xsl:with-param name="number" select="$number + $lines"/> </xsl:call-template> </xsl:when> diff --git a/fo/xref.xsl b/fo/xref.xsl index 90d609c..8210d56 100644 --- a/fo/xref.xsl +++ b/fo/xref.xsl @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: xref.xsl 9286 2012-04-19 10:10:58Z bobstayton $ + $Id: xref.xsl 9723 2013-02-06 13:08:06Z kosek $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -318,7 +318,7 @@ |constraintdef|formalpara|glossdiv|important|indexdiv |itemizedlist|legalnotice|lot|msg|msgexplan|msgmain |msgrel|msgset|msgsub|note|orderedlist|partintro - |productionset|qandadiv|refsynopsisdiv|segmentedlist + |productionset|qandadiv|refsynopsisdiv|screenshot|segmentedlist |set|setindex|sidebar|tip|toc|variablelist|warning" mode="xref-to"> <xsl:param name="referrer"/> @@ -987,7 +987,7 @@ <!-- * and the value of its content is not a URL that is the same as --> <!-- * URL it links to, and if ulink.show is non-zero. --> <xsl:choose> - <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)"> + <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote) and not(ancestor::*[@floatstyle='before'])"> <!-- * ulink.show and ulink.footnote are both non-zero; that --> <!-- * means we display the URL as a footnote (instead of inline) --> <fo:footnote> @@ -1098,8 +1098,6 @@ <!-- olink content may be passed in from xlink olink --> <xsl:param name="content" select="NOTANELEMENT"/> - <xsl:variable name="localinfo" select="@localinfo"/> - <xsl:choose> <!-- olinks resolved by stylesheet and target database --> <xsl:when test="@targetdoc or @targetptr or @@ -1342,14 +1340,6 @@ </xsl:template> -<xsl:template name="olink.outline"> - <xsl:param name="outline.base.uri"/> - <xsl:param name="localinfo"/> - <xsl:param name="return" select="href"/> - - <xsl:message terminate="yes">Fatal error: olink.outline template: what is this supposed to do?</xsl:message> -</xsl:template> - <!-- ==================================================================== --> <xsl:template name="title.xref"> @@ -1441,9 +1431,8 @@ <xsl:param name="title"/> <xsl:choose> - <!-- FIXME: what about the case where titleabbrev is inside the info? --> - <xsl:when test="$purpose = 'xref' and titleabbrev"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> + <xsl:when test="$purpose = 'xref'"> + <xsl:copy-of select="$title"/> </xsl:when> <xsl:otherwise> <xsl:copy-of select="$title"/> |