From 802da9dd5d4bc18f46a916eedc0c5c1980a15e59 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Sun, 17 Mar 2013 20:07:05 +0000 Subject: Imported from /home/lorry/working-area/delta_docbook-xsl/docbook-xsl-1.78.1.tar.bz2. --- fo/admon.xsl | 5 +- fo/autoidx.xsl | 41 ++---------- fo/autotoc.xsl | 4 +- fo/callout.xsl | 73 ++++++++++++++++---- fo/component.xsl | 18 +---- fo/division.xsl | 26 +++----- fo/docbook.xsl | 3 +- fo/ebnf.xsl | 6 +- fo/fo.xsl | 6 +- fo/graphics.xsl | 21 +++--- fo/htmltbl.xsl | 5 +- fo/inline.xsl | 52 +++++++++++++-- fo/lists.xsl | 54 ++++----------- fo/math.xsl | 69 +++---------------- fo/pagesetup.xsl | 107 +++++++++++++++++++---------- fo/param.xml | 163 +++++++++++++++++++++++++++++++++++++++------ fo/param.xsl | 13 ++-- fo/profile-docbook.xsl | 3 +- fo/refentry.xsl | 10 +-- fo/sections.xsl | 10 +-- fo/spaces.xsl | 23 ++----- fo/table.xml | 2 +- fo/table.xsl | 26 ++++---- fo/titlepage.templates.xml | 9 +-- fo/titlepage.templates.xsl | 14 ++-- fo/verbatim.xsl | 4 +- fo/xref.xsl | 21 ++---- 27 files changed, 429 insertions(+), 359 deletions(-) (limited to 'fo') 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'> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -109,10 +159,10 @@ - - - - + + + + @@ -143,8 +193,7 @@ width="{$callout.icon.size}"> - 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'> @@ -721,14 +713,6 @@ - - - - - - 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'> - - PNG PDF JPG JPEG linespecific - BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific @@ -62,9 +59,6 @@ - - png pdf jpg jpeg - bmp gif tif tiff svg png pdf jpg jpeg eps @@ -98,10 +92,17 @@ + + + + + + + @@ -473,6 +474,7 @@ + @@ -763,7 +765,7 @@ - + - + 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"> - - - - - - - - - + + + @@ -385,15 +377,7 @@ - - - - em - - - em * 0.60 - - + em * 0.60 @@ -402,15 +386,7 @@ - - - - em - - - em * 0.60 - - + em * 0.60 @@ -424,17 +400,9 @@ 1em - - - - - - - - + - - - + + + + @@ -1352,7 +1320,9 @@ : ??? - + + + 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'> - - - - - - - - - - - - + @@ -42,24 +31,12 @@ - - - - - - - - - - - - - - - - - - + + + + + + @@ -80,17 +57,6 @@ - - - - $ - - - - $ - - - - - - - $$ - - - - $$ - - - - - - - - - Your equation is misplaced. It should be in inlineequation, equation or informalequation. - - 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"> @@ -2117,8 +2124,10 @@ - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + + + + auto + auto-odd + + - auto-odd - 1 + + - - auto-odd + + 1 1 - auto-odd + @@ -3299,7 +3336,7 @@ auto - 1 + auto auto + + no-force end-on-even @@ -3349,7 +3388,7 @@ - + -$Id: param.xweb 9238 2012-03-02 18:38:42Z bobstayton $ +$Id: param.xweb 9673 2012-12-02 20:06:41Z bobstayton $ @@ -1766,19 +1766,12 @@ should still be used for FOP version 0.20.5 and earlier. Description -If non-zero, -PassiveTeX -extensions will be used. At present, this consists of PDF bookmarks -and sorted index terms. - +The PassiveTeX XSL-FO processor is +no longer supported by DocBook XSL, beginning with version 1.78. -This parameter can also affect which graphics file formats -are supported - - - PassiveTeX is incomplete and development has ceased. In most cases, -another XSL-FO engine is probably a better choice. - +PassiveTeX was never a complete implementation of +XSL-FO, and development has ceased. Setting this parameter will +have no effect on the output. @@ -3464,6 +3457,71 @@ identifier does not appear in the document itself. + + +activate.external.olinks +boolean + + +activate.external.olinks +Make external olinks into active links + + + + +<xsl:param name="activate.external.olinks" select="1"></xsl:param> + + + +Description + +If activate.external.olinks 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. + +To make an external olink active for HTML +outputs, the link text is wrapped in an a +element with an href attribute. To +make an external olink active for FO outputs, the link text is +wrapped in an fo:basic-link element with an +external-destination attribute. + +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. + +The epub stylesheets set this parameter to zero by default +because there is no standard linking mechanism between Epub documents. + +If external links are made inactive, you should +consider setting the +stylesheet parameter olink.doctitle +to yes. That will append the external document's +title to the link text, making it easier for the user to +locate the other document. + +An olink is considered external when the +current.docid stylesheet parameter +is set to some value, and the olink's targetdoc +attribute has a different value. If the two values +match, then the link is considered internal. If the +current.docid parameter is blank, or +the olink element does not have a targetdoc attribute, +then the link is considered to be internal and will become +an active link. + +See also olink.doctitle, +prefer.internal.olink. + + + + collect.xref.targets @@ -6645,6 +6703,7 @@ that you may have trouble using those symbols for footnotes. <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. +See also writing.mode. + @@ -7872,6 +7935,8 @@ this bug is fixed by RenderX. It does not affect documents with left-to-right text direction. +See also writing.mode. + @@ -7973,6 +8038,9 @@ landscape orientation, it is vertical. <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 page.width.portrait, for example. Description -Double-sided documents are printed with a slightly wider margin -on the binding edge of the page. +This parameter is useful when printing a document +on both sides of the paper. + +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. + + +If set to zero (the default), then only the 'odd' page masters +are used for both even and odd numbered pages. + +See also force.blank.pages, +page.margin.inner and +page.margin.outer. + + + + + + +force.blank.pages +boolean + + +force.blank.pages +Generate blank page to end on even page number + + + + +<xsl:param name="force.blank.pages" select="1"></xsl:param> + + + +Description + +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. + +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. + + +This param is independent of the +double.sided 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. -FIXME: The current set of parameters does not take writing direction -into account. @@ -11656,9 +11776,6 @@ used for all titles below level 5. <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> @@ -12613,7 +12730,7 @@ to be treated as case insensitive". 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. Accepted values are: @@ -12835,7 +12952,7 @@ around all these parameters. <!-- 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. <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. <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 @@ - - - - - - - - - - - - - - - - + namespace-uri(..) = 'http://docbook.org/ns/docbook']"> + + + 0.5em 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 @@ Formatting Object Table Reference - $Id: table.xsl 9345 2012-05-11 03:46:46Z bobstayton $ + $Id: table.xsl 9666 2012-11-14 04:42:56Z bobstayton $ 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 @@ + $fop1.extensions != 0"> 100% @@ -672,7 +674,7 @@ - + @@ -702,7 +704,7 @@ - + @@ -732,7 +734,7 @@ - + @@ -1132,7 +1134,7 @@ --> - 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"> - + @@ -1098,8 +1098,6 @@ - - - - - - - Fatal error: olink.outline template: what is this supposed to do? - - @@ -1441,9 +1431,8 @@ - - - + + -- cgit v1.2.1