From: <mz...@us...> - 2008-09-06 16:27:35
|
Revision: 8116 http://docbook.svn.sourceforge.net/docbook/?rev=8116&view=rev Author: mzjn Date: 2008-09-06 16:27:22 +0000 (Sat, 06 Sep 2008) Log Message: ----------- Added support for a new processing instruction: dbfo funcsynopsis-style. Closes bug #1838213. Modified Paths: -------------- trunk/xsl/fo/pi.xsl trunk/xsl/fo/synop.xsl Modified: trunk/xsl/fo/pi.xsl =================================================================== --- trunk/xsl/fo/pi.xsl 2008-09-01 09:34:34 UTC (rev 8115) +++ trunk/xsl/fo/pi.xsl 2008-09-06 16:27:22 UTC (rev 8116) @@ -150,6 +150,43 @@ </xsl:call-template> </xsl:template> +<doc:pi name="dbfo_funcsynopsis-style" xmlns=""> + <refpurpose>Specifies presentation style for a funcsynopsis</refpurpose> + <refdescription> + <para>Use the <tag class="xmlpi">dbfo funcsynopsis-style</tag> PI as a child of + a <tag>funcsynopsis</tag> or anywhere within a funcsynopsis + to control the presentation style for output of all + <tag>funcprototype</tag> instances within that funcsynopsis.</para> + </refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbfo funcsynopsis-style="kr"|"ansi"</tag></synopsis> + </refsynopsisdiv> + <refparameter> + <variablelist> + <varlistentry><term>funcsynopsis-style="kr"</term> + <listitem> + <para>Displays <tag>funcprototype</tag> output in K&R style</para> + </listitem> + </varlistentry> + <varlistentry><term>funcsynopsis-style="ansi"</term> + <listitem> + <para>Displays <tag>funcprototype</tag> output in ANSI style</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>funcsynopsis.style</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbfo_funcsynopsis-style"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'funcsynopsis-style'"/> + </xsl:call-template> +</xsl:template> + <doc:pi name="dbfo_glossary-presentation" xmlns=""> <refpurpose>Specifies presentation style for a glossary</refpurpose> <refdescription> Modified: trunk/xsl/fo/synop.xsl =================================================================== --- trunk/xsl/fo/synop.xsl 2008-09-01 09:34:34 UTC (rev 8115) +++ trunk/xsl/fo/synop.xsl 2008-09-06 16:27:22 UTC (rev 8116) @@ -162,12 +162,18 @@ </xsl:template> <xsl:template match="funcprototype"> + + <xsl:variable name="style"> + <xsl:call-template name="funcsynopsis.style"/> + </xsl:variable> + <fo:block font-family="{$monospace.font.family}" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> <xsl:apply-templates/> - <xsl:if test="$funcsynopsis.style='kr'"> + + <xsl:if test="$style='kr'"> <fo:block space-before.minimum="0.8em" space-before.optimum="1em" @@ -175,6 +181,7 @@ <xsl:apply-templates select="./paramdef" mode="kr-funcsynopsis-mode"/> </fo:block> </xsl:if> + </fo:block> </xsl:template> @@ -198,8 +205,13 @@ </xsl:template> <xsl:template match="void"> + + <xsl:variable name="style"> + <xsl:call-template name="funcsynopsis.style"/> + </xsl:variable> + <xsl:choose> - <xsl:when test="$funcsynopsis.style='ansi'"> + <xsl:when test="$style='ansi'"> <xsl:text>(void);</xsl:text> </xsl:when> <xsl:otherwise> @@ -213,12 +225,17 @@ </xsl:template> <xsl:template match="paramdef"> + + <xsl:variable name="style"> + <xsl:call-template name="funcsynopsis.style"/> + </xsl:variable> + <xsl:variable name="paramnum"> <xsl:number count="paramdef" format="1"/> </xsl:variable> <xsl:if test="$paramnum=1">(</xsl:if> <xsl:choose> - <xsl:when test="$funcsynopsis.style='ansi'"> + <xsl:when test="$style='ansi'"> <xsl:apply-templates/> </xsl:when> <xsl:otherwise> @@ -262,6 +279,24 @@ <xsl:text>)</xsl:text> </xsl:template> +<!-- Return value of PI or parameter --> +<xsl:template name="funcsynopsis.style"> + <xsl:variable name="pi.style"> + <xsl:call-template name="pi.dbfo_funcsynopsis-style"> + <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/> + </xsl:call-template> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$pi.style != ''"> + <xsl:value-of select="$pi.style"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$funcsynopsis.style"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <!-- ==================================================================== --> <xsl:variable name="default-classsynopsis-language">java</xsl:variable> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-06 01:13:17
|
Revision: 8281 http://docbook.svn.sourceforge.net/docbook/?rev=8281&view=rev Author: bobstayton Date: 2009-03-06 01:13:05 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Add writing.mode param for FO output. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-05 23:34:58 UTC (rev 8280) +++ trunk/xsl/fo/param.ent 2009-03-06 01:13:05 UTC (rev 8281) @@ -329,3 +329,4 @@ <!ENTITY index.method SYSTEM "../params/index.method.xml"> <!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml"> <!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml"> +<!ENTITY writing.mode SYSTEM "../params/writing.mode.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-05 23:34:58 UTC (rev 8280) +++ trunk/xsl/fo/param.xweb 2009-03-06 01:13:05 UTC (rev 8281) @@ -492,6 +492,7 @@ &l10n.gentext.default.language; &l10n.gentext.use.xref.language; &l10n.lang.value.rfc.compliant; +&writing.mode; </reference> <reference xml:id="ebnf"><title>EBNF</title> &ebnf.assignment; @@ -853,6 +854,7 @@ <src:fragref linkend="variablelist.term.separator.frag"/> <src:fragref linkend="variablelist.term.break.after.frag"/> <src:fragref linkend="verbatim.properties.frag"/> +<src:fragref linkend="writing.mode.frag"/> <src:fragref linkend="xep.extensions.frag"/> <src:fragref linkend="xep.index.item.properties.frag"/> <src:fragref linkend="xref.label-page.separator.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-06 02:15:07
|
Revision: 8284 http://docbook.svn.sourceforge.net/docbook/?rev=8284&view=rev Author: bobstayton Date: 2009-03-06 02:15:06 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Add attribute-sets for formatting glossary terms and defs. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-06 02:14:22 UTC (rev 8283) +++ trunk/xsl/fo/param.ent 2009-03-06 02:15:06 UTC (rev 8284) @@ -330,3 +330,7 @@ <!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml"> <!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml"> <!ENTITY writing.mode SYSTEM "../params/writing.mode.xml"> +<!ENTITY glossterm.list.properties SYSTEM "../params/glossterm.list.properties.xml"> +<!ENTITY glossterm.block.properties SYSTEM "../params/glossterm.block.properties.xml"> +<!ENTITY glossdef.list.properties SYSTEM "../params/glossdef.list.properties.xml"> +<!ENTITY glossdef.block.properties SYSTEM "../params/glossdef.block.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-06 02:14:22 UTC (rev 8283) +++ trunk/xsl/fo/param.xweb 2009-03-06 02:15:06 UTC (rev 8284) @@ -213,10 +213,14 @@ &glossterm.auto.link; &firstterm.only.link; &glossary.collection; -&glossterm.separation; -&glossterm.width; &glossary.as.blocks; &glosslist.as.blocks; +&glossterm.block.properties; +&glossdef.block.properties; +&glossterm.list.properties; +&glossdef.list.properties; +&glossterm.width; +&glossterm.separation; &glossentry.show.acronym; &glossary.sort; </reference> @@ -644,6 +648,10 @@ <src:fragref linkend="glossterm.auto.link.frag"/> <src:fragref linkend="glossterm.separation.frag"/> <src:fragref linkend="glossterm.width.frag"/> +<src:fragref linkend="glossterm.list.properties.frag"/> +<src:fragref linkend="glossterm.block.properties.frag"/> +<src:fragref linkend="glossdef.list.properties.frag"/> +<src:fragref linkend="glossdef.block.properties.frag"/> <src:fragref linkend="graphic.default.extension.frag"/> <src:fragref linkend="header.content.properties.frag"/> <src:fragref linkend="header.rule.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-06 22:53:10
|
Revision: 8286 http://docbook.svn.sourceforge.net/docbook/?rev=8286&view=rev Author: bobstayton Date: 2009-03-06 22:53:04 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Add support for writing-mode="rl-tb" (right-to-left) in FO outputs. Changed instances of margin-left to margin-{$direction.align.start} and margin-right to margin-{$direction.align.end}. Those direction.align params are computed from the writing mode value in each locale's gentext key named 'writing-mode', introduced in 1.74.3 to add right-to-left support to HTML outputs. Modified Paths: -------------- trunk/xsl/fo/autotoc.xsl trunk/xsl/fo/fo.xsl trunk/xsl/fo/glossary.xsl trunk/xsl/fo/lists.xsl trunk/xsl/fo/pagesetup.xsl trunk/xsl/fo/table.xsl Modified: trunk/xsl/fo/autotoc.xsl =================================================================== --- trunk/xsl/fo/autotoc.xsl 2009-03-06 04:48:04 UTC (rev 8285) +++ trunk/xsl/fo/autotoc.xsl 2009-03-06 22:53:04 UTC (rev 8286) @@ -275,7 +275,7 @@ <xsl:if test="$nodes"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -339,10 +339,10 @@ </xsl:variable> <fo:block xsl:use-attribute-sets="toc.line.properties" - margin-left="3em" - text-indent="-3em" end-indent="{$toc.indent.width}pt" last-line-end-indent="-{$toc.indent.width}pt"> + <xsl:attribute name="margin-{$direction.align.start}">3em</xsl:attribute> + <xsl:attribute name="text-indent">-3em</xsl:attribute> <fo:inline keep-with-next.within-line="always"> <fo:basic-link internal-destination="{$id}"> <xsl:if test="$label != ''"> @@ -398,7 +398,7 @@ and $toc.max.depth > $depth.from.context and $nodes"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -434,7 +434,7 @@ and $toc.max.depth > $depth.from.context and $nodes"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -472,7 +472,7 @@ and $toc.max.depth > $depth.from.context and $nodes"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -506,7 +506,7 @@ and $toc.max.depth > $depth.from.context and refentry"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -554,7 +554,7 @@ and $toc.max.depth > $depth.from.context and $nodes"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -588,7 +588,7 @@ and $toc.max.depth > $depth.from.context and sect2"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"/> </xsl:attribute> @@ -626,7 +626,7 @@ and $toc.max.depth > $depth.from.context and sect3"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"> <xsl:with-param name="reldepth" select="$reldepth"/> </xsl:call-template> @@ -666,7 +666,7 @@ and $toc.max.depth > $depth.from.context and sect4"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"> <xsl:with-param name="reldepth" select="$reldepth"/> </xsl:call-template> @@ -706,7 +706,7 @@ and $toc.max.depth > $depth.from.context and sect5"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"> <xsl:with-param name="reldepth" select="$reldepth"/> </xsl:call-template> @@ -781,7 +781,7 @@ and $toc.max.depth > $depth.from.context and section"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"> <xsl:with-param name="reldepth" select="$reldepth"/> </xsl:call-template> @@ -897,7 +897,7 @@ and $toc.max.depth > $depth.from.context and (child::qandadiv or child::qandaentry)"> <fo:block id="toc.{$cid}.{$id}"> - <xsl:attribute name="margin-left"> + <xsl:attribute name="margin-{$direction.align.start}"> <xsl:call-template name="set.toc.indent"> <xsl:with-param name="reldepth" select="$reldepth"/> </xsl:call-template> Modified: trunk/xsl/fo/fo.xsl =================================================================== --- trunk/xsl/fo/fo.xsl 2009-03-06 04:48:04 UTC (rev 8285) +++ trunk/xsl/fo/fo.xsl 2009-03-06 22:53:04 UTC (rev 8286) @@ -13,6 +13,49 @@ ******************************************************************** --> +<!-- These variables set the margin-left or -right attribute value for FO output based on + the writing-mode specified in the gentext file for the document's lang. --> + +<xsl:param name="direction.align.start"> + <xsl:choose> + <!-- FOP does not support writing-mode="rl-tb" --> + <xsl:when test="$fop.extensions != 0">left</xsl:when> + <xsl:when test="$fop1.extensions != 0">left</xsl:when> + <xsl:when test="starts-with($writing.mode, 'lr')">left</xsl:when> + <xsl:when test="starts-with($writing.mode, 'rl')">right</xsl:when> + <xsl:otherwise>left</xsl:otherwise> + </xsl:choose> +</xsl:param> + +<xsl:param name="direction.align.end"> + <xsl:choose> + <xsl:when test="$fop.extensions != 0">right</xsl:when> + <xsl:when test="$fop1.extensions != 0">right</xsl:when> + <xsl:when test="starts-with($writing.mode, 'lr')">right</xsl:when> + <xsl:when test="starts-with($writing.mode, 'rl')">left</xsl:when> + <xsl:otherwise>right</xsl:otherwise> + </xsl:choose> +</xsl:param> + +<xsl:param name="direction.mode"> + <xsl:choose> + <xsl:when test="$fop.extensions != 0 and + starts-with($writing.mode, 'rl')"> + <xsl:message>WARNING: FOP does not support right-to-left writing-mode</xsl:message> + <xsl:text>lr-tb</xsl:text> + </xsl:when> + <xsl:when test="$fop1.extensions != 0 and + starts-with($writing.mode, 'rl')"> + <xsl:message>WARNING: FOP does not support right-to-left writing-mode</xsl:message> + <xsl:text>lr-tb</xsl:text> + </xsl:when> + <xsl:when test="starts-with($writing.mode, 'lr')">lr-tb</xsl:when> + <xsl:when test="starts-with($writing.mode, 'rl')">rl-tb</xsl:when> + <xsl:otherwise>lr-tb</xsl:otherwise> + </xsl:choose> +</xsl:param> + + <xsl:template name="anchor"> <xsl:param name="node" select="."/> <xsl:param name="conditional" select="1"/> Modified: trunk/xsl/fo/glossary.xsl =================================================================== --- trunk/xsl/fo/glossary.xsl 2009-03-06 04:48:04 UTC (rev 8285) +++ trunk/xsl/fo/glossary.xsl 2009-03-06 22:53:04 UTC (rev 8286) @@ -707,7 +707,7 @@ <xsl:call-template name="object.id"/> </xsl:variable> - <fo:list-item xsl:use-attribute-sets="normal.para.spacing"> + <fo:list-item xsl:use-attribute-sets="glossentry.list.item.properties"> <xsl:call-template name="anchor"> <xsl:with-param name="conditional"> <xsl:choose> @@ -719,7 +719,7 @@ </xsl:call-template> <fo:list-item-label end-indent="label-end()"> - <fo:block> + <fo:block xsl:use-attribute-sets="glossterm.list.properties"> <xsl:choose> <xsl:when test="$glossentry.show.acronym = 'primary'"> <xsl:choose> @@ -758,7 +758,9 @@ </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.list"/> + <fo:block xsl:use-attribute-sets="glossdef.list.properties"> + <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.list"/> + </fo:block> </fo:list-item-body> </fo:list-item> </xsl:template> @@ -929,9 +931,7 @@ <xsl:call-template name="object.id"/> </xsl:variable> - <fo:block xsl:use-attribute-sets="list.item.spacing" - keep-with-next.within-column="always" - keep-together.within-column="always"> + <fo:block xsl:use-attribute-sets="glossterm.block.properties"> <xsl:call-template name="anchor"> <xsl:with-param name="conditional"> <xsl:choose> @@ -975,7 +975,7 @@ <xsl:apply-templates select="indexterm"/> </fo:block> - <fo:block margin-left="0.25in"> + <fo:block xsl:use-attribute-sets="glossdef.block.properties"> <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.blocks"/> </fo:block> </xsl:template> Modified: trunk/xsl/fo/lists.xsl =================================================================== --- trunk/xsl/fo/lists.xsl 2009-03-06 04:48:04 UTC (rev 8285) +++ trunk/xsl/fo/lists.xsl 2009-03-06 22:53:04 UTC (rev 8286) @@ -544,7 +544,8 @@ <xsl:apply-templates select="term"/> </fo:block> - <fo:block margin-left="0.25in"> + <fo:block> + <xsl:attribute name="margin-{$direction.align.start}">0.25in</xsl:attribute> <xsl:apply-templates select="listitem"/> </fo:block> </xsl:template> Modified: trunk/xsl/fo/pagesetup.xsl =================================================================== --- trunk/xsl/fo/pagesetup.xsl 2009-03-06 04:48:04 UTC (rev 8285) +++ trunk/xsl/fo/pagesetup.xsl 2009-03-06 22:53:04 UTC (rev 8286) @@ -29,23 +29,6 @@ <xsl:value-of select="$symbol.font.family"/> </xsl:param> -<!-- PassiveTeX can't handle the math expression for - title.margin.left being negative, so ignore it. - margin-left="{$page.margin.outer} - {$title.margin.left}" ---> -<xsl:param name="margin.left.outer"> - <xsl:choose> - <xsl:when test="$passivetex.extensions != 0"> - <xsl:value-of select="$page.margin.outer"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$page.margin.outer"/> - <xsl:text> - </xsl:text> - <xsl:value-of select="$title.margin.left"/> - </xsl:otherwise> - </xsl:choose> -</xsl:param> - <xsl:param name="margin.left.inner"> <xsl:choose> <xsl:when test="$passivetex.extensions != 0"> @@ -66,9 +49,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">blank</xsl:with-param> @@ -94,9 +84,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">titlepage-first</xsl:with-param> @@ -119,9 +116,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">titlepage-odd</xsl:with-param> @@ -144,9 +148,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">titlepage-even</xsl:with-param> @@ -170,9 +181,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">lot-first</xsl:with-param> @@ -195,9 +213,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">lot-odd</xsl:with-param> @@ -220,9 +245,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">lot-even</xsl:with-param> @@ -246,9 +278,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">front-first</xsl:with-param> @@ -271,9 +310,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">front-odd</xsl:with-param> @@ -296,9 +342,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">front-even</xsl:with-param> @@ -322,9 +375,19 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">body-first</xsl:with-param> @@ -347,9 +410,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">body-odd</xsl:with-param> @@ -372,9 +442,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">body-even</xsl:with-param> @@ -398,9 +475,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">back-first</xsl:with-param> @@ -423,9 +507,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">back-odd</xsl:with-param> @@ -448,9 +539,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">back-even</xsl:with-param> @@ -474,9 +572,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$page.margin.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">index-first</xsl:with-param> @@ -499,9 +604,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$page.margin.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">index-odd</xsl:with-param> @@ -524,9 +636,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$page.margin.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">index-even</xsl:with-param> @@ -551,9 +670,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">blank-draft</xsl:with-param> @@ -586,9 +712,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">titlepage-first-draft</xsl:with-param> @@ -622,9 +755,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">titlepage-odd-draft</xsl:with-param> @@ -658,9 +798,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">titlepage-even-draft</xsl:with-param> @@ -695,9 +842,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">lot-first-draft</xsl:with-param> @@ -731,9 +885,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">lot-odd-draft</xsl:with-param> @@ -767,9 +928,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">lot-even-draft</xsl:with-param> @@ -804,9 +972,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">front-first-draft</xsl:with-param> @@ -840,9 +1015,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">front-odd-draft</xsl:with-param> @@ -876,9 +1058,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">front-even-draft</xsl:with-param> @@ -913,9 +1102,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">body-first-draft</xsl:with-param> @@ -949,9 +1145,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">body-odd-draft</xsl:with-param> @@ -985,9 +1188,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">body-even-draft</xsl:with-param> @@ -1022,9 +1232,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">back-first-draft</xsl:with-param> @@ -1058,9 +1275,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">back-odd-draft</xsl:with-param> @@ -1094,9 +1318,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$margin.left.outer}" - margin-right="{$page.margin.inner}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">back-even-draft</xsl:with-param> @@ -1131,9 +1362,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$page.margin.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">index-first-draft</xsl:with-param> @@ -1167,9 +1405,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-left="{$page.margin.inner}" - margin-right="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.inner"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.outer"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">index-odd-draft</xsl:with-param> @@ -1203,9 +1448,16 @@ page-width="{$page.width}" page-height="{$page.height}" margin-top="{$page.margin.top}" - margin-bottom="{$page.margin.bottom}" - margin-right="{$page.margin.inner}" - margin-left="{$page.margin.outer}"> + margin-bottom="{$page.margin.bottom}"> + <xsl:attribute name="margin-{$direction.align.start}"> + <xsl:value-of select="$page.margin.outer"/> + <xsl:if test="$fop.extensions != 0"> + <xsl:value-of select="concat(' - (',$title.margin.left,')')"/> + </xsl:if> + </xsl:attribute> + <xsl:attribute name="margin-{$direction.align.end}"> + <xsl:value-of select="$page.margin.inner"/> + </xsl:attribute> <xsl:if test="$axf.extensions != 0"> <xsl:call-template name="axf-page-master-properties"> <xsl:with-param name="page.master">index-even-draft</xsl:with-param> @@ -1669,7 +1921,7 @@ <xsl:choose> <xsl:when test="$pageclass = 'index'"> - <xsl:attribute name="margin-left">0pt</xsl:attribute> + <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> </xsl:when> </xsl:choose> @@ -1733,7 +1985,7 @@ <xsl:attribute name="block-progression-dimension.minimum"> <xsl:value-of select="$header.table.height"/> </xsl:attribute> - <fo:table-cell text-align="left" + <fo:table-cell text-align="start" display-align="before"> <xsl:if test="$fop.extensions = 0"> <xsl:attribute name="relative-align">baseline</xsl:attribute> @@ -1742,7 +1994,7 @@ <xsl:call-template name="header.content"> <xsl:with-param name="pageclass" select="$pageclass"/> <xsl:with-param name="sequence" select="$sequence"/> - <xsl:with-param name="position" select="'left'"/> + <xsl:with-param name="position" select="$direction.align.start"/> <xsl:with-param name="gentext-key" select="$gentext-key"/> </xsl:call-template> </fo:block> @@ -1770,7 +2022,7 @@ <xsl:call-template name="header.content"> <xsl:with-param name="pageclass" select="$pageclass"/> <xsl:with-param name="sequence" select="$sequence"/> - <xsl:with-param name="position" select="'right'"/> + <xsl:with-param name="position" select="$direction.align.end"/> <xsl:with-param name="gentext-key" select="$gentext-key"/> </xsl:call-template> </fo:block> @@ -1994,7 +2246,7 @@ <xsl:choose> <xsl:when test="$pageclass = 'index'"> - <xsl:attribute name="margin-left">0pt</xsl:attribute> + <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> </xsl:when> </xsl:choose> @@ -2057,7 +2309,7 @@ <xsl:attribute name="block-progression-dimension.minimum"> <xsl:value-of select="$footer.table.height"/> </xsl:attribute> - <fo:table-cell text-align="left" + <fo:table-cell text-align="start" display-align="after"> <xsl:if test="$fop.extensions = 0"> <xsl:attribute name="relative-align">baseline</xsl:attribute> @@ -2066,7 +2318,7 @@ <xsl:call-template name="footer.content"> <xsl:with-param name="pageclass" select="$pageclass"/> <xsl:with-param name="sequence" select="$sequence"/> - <xsl:with-param name="position" select="'left'"/> + <xsl:with-param name="position" select="$direction.align.start"/> <xsl:with-param name="gentext-key" select="$gentext-key"/> </xsl:call-template> </fo:block> @@ -2085,7 +2337,7 @@ </xsl:call-template> </fo:block> </fo:table-cell> - <fo:table-cell text-align="right" + <fo:table-cell text-align="end" display-align="after"> <xsl:if test="$fop.extensions = 0"> <xsl:attribute name="relative-align">baseline</xsl:attribute> @@ -2094,7 +2346,7 @@ <xsl:call-template name="footer.content"> <xsl:with-param name="pageclass" select="$pageclass"/> <xsl:with-param name="sequence" select="$sequence"/> - <xsl:with-param name="position" select="'right'"/> + <xsl:with-param name="position" select="$direction.align.end"/> <xsl:with-param name="gentext-key" select="$gentext-key"/> </xsl:call-template> </fo:block> Modified: trunk/xsl/fo/table.xsl =================================================================== --- trunk/xsl/fo/table.xsl 2009-03-06 04:48:04 UTC (rev 8285) +++ trunk/xsl/fo/table.xsl 2009-03-06 22:53:04 UTC (rev 8286) @@ -274,7 +274,7 @@ <xsl:if test="$colsep > 0 and number($colnum) < ancestor::tgroup/@cols"> <xsl:call-template name="border"> - <xsl:with-param name="side" select="'right'"/> + <xsl:with-param name="side" select="'end'"/> </xsl:call-template> </xsl:if> @@ -299,10 +299,10 @@ <xsl:choose> <xsl:when test="$frame='all'"> - <xsl:attribute name="border-left-style"> + <xsl:attribute name="border-start-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:attribute> - <xsl:attribute name="border-right-style"> + <xsl:attribute name="border-end-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:attribute> <xsl:attribute name="border-top-style"> @@ -311,10 +311,10 @@ <xsl:attribute name="border-bottom-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:attribute> - <xsl:attribute name="border-left-width"> + <xsl:attribute name="border-start-width"> <xsl:value-of select="$table.frame.border.thickness"/> </xsl:attribute> - <xsl:attribute name="border-right-width"> + <xsl:attribute name="border-end-width"> <xsl:value-of select="$table.frame.border.thickness"/> </xsl:attribute> <xsl:attribute name="border-top-width"> @@ -323,10 +323,10 @@ <xsl:attribute name="border-bottom-width"> <xsl:value-of select="$table.frame.border.thickness"/> </xsl:attribute> - <xsl:attribute name="border-left-color"> + <xsl:attribute name="border-start-color"> <xsl:value-of select="$table.frame.border.color"/> </xsl:attribute> - <xsl:attribute name="border-right-color"> + <xsl:attribute name="border-end-color"> <xsl:value-of select="$table.frame.border.color"/> </xsl:attribute> <xsl:attribute name="border-top-color"> @@ -337,8 +337,8 @@ </xsl:attribute> </xsl:when> <xsl:when test="$frame='bottom'"> - <xsl:attribute name="border-left-style">none</xsl:attribute> - <xsl:attribute name="border-right-style">none</xsl:attribute> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> <xsl:attribute name="border-top-style">none</xsl:attribute> <xsl:attribute name="border-bottom-style"> <xsl:value-of select="$table.frame.border.style"/> @@ -351,30 +351,30 @@ </xsl:attribute> </xsl:when> <xsl:when test="$frame='sides'"> - <xsl:attribute name="border-left-style"> + <xsl:attribute name="border-start-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:attribute> - <xsl:attribute name="border-right-style"> + <xsl:attribute name="border-end-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:attribute> <xsl:attribute name="border-top-style">none</xsl:attribute> <xsl:attribute name="border-bottom-style">none</xsl:attribute> - <xsl:attribute name="border-left-width"> + <xsl:attribute name="border-start-width"> <xsl:value-of select="$table.frame.border.thickness"/> </xsl:attribute> - <xsl:attribute name="border-right-width"> + <xsl:attribute name="border-end-width"> <xsl:value-of select="$table.frame.border.thickness"/> </xsl:attribute> - <xsl:attribute name="border-left-color"> + <xsl:attribute name="border-start-color"> <xsl:value-of select="$table.frame.border.color"/> </xsl:attribute> - <xsl:attribute name="border-right-color"> + <xsl:attribute name="border-end-color"> <xsl:value-of select="$table.frame.border.color"/> </xsl:attribute> </xsl:when> <xsl:when test="$frame='top'"> - <xsl:attribute name="border-left-style">none</xsl:attribute> - <xsl:attribute name="border-right-style">none</xsl:attribute> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> <xsl:attribute name="border-top-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:attribute> @@ -387,8 +387,8 @@ </xsl:attribute> </xsl:when> <xsl:when test="$frame='topbot'"> - <xsl:attribute name="border-left-style">none</xsl:attribute> - <xsl:attribute name="border-right-style">none</xsl:attribute> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> <xsl:attribute name="border-top-style"> <xsl:value-of select="$table.frame.border.style"/> </xsl:att... [truncated message content] |
From: <bob...@us...> - 2009-03-10 15:41:22
|
Revision: 8306 http://docbook.svn.sourceforge.net/docbook/?rev=8306&view=rev Author: bobstayton Date: 2009-03-10 15:41:04 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Add monospace.verbatim.font.width param to support @width on programlisting. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-09 17:06:48 UTC (rev 8305) +++ trunk/xsl/fo/param.ent 2009-03-10 15:41:04 UTC (rev 8306) @@ -122,6 +122,7 @@ <!ENTITY marker.section.level SYSTEM "../params/marker.section.level.xml"> <!ENTITY monospace.font.family SYSTEM "../params/monospace.font.family.xml"> <!ENTITY monospace.verbatim.properties SYSTEM "../params/monospace.verbatim.properties.xml"> +<!ENTITY monospace.verbatim.font.width SYSTEM "../params/monospace.verbatim.font.width.xml"> <!ENTITY nominal.table.width SYSTEM "../params/nominal.table.width.xml"> <!ENTITY normal.para.spacing SYSTEM "../params/normal.para.spacing.xml"> <!ENTITY olink.doctitle SYSTEM "../params/olink.doctitle.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-09 17:06:48 UTC (rev 8305) +++ trunk/xsl/fo/param.xweb 2009-03-10 15:41:04 UTC (rev 8306) @@ -265,6 +265,7 @@ &email.delimiters.enabled; &email.mailto.enabled; §ion.container.element; +&monospace.verbatim.font.width; </reference> <reference xml:id="graphics"><title>Graphics</title> &graphic.default.extension; @@ -407,6 +408,7 @@ &body.font.family; &dingbat.font.family; &monospace.font.family; +&monospace.font.family; &sans.font.family; &title.font.family; &symbol.font.family; @@ -714,6 +716,7 @@ <src:fragref linkend="monospace.font.family.frag"/> <src:fragref linkend="monospace.properties.frag"/> <src:fragref linkend="monospace.verbatim.properties.frag"/> +<src:fragref linkend="monospace.verbatim.font.width.frag"/> <src:fragref linkend="nominal.table.width.frag"/> <src:fragref linkend="normal.para.spacing.frag"/> <src:fragref linkend="olink.doctitle.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-10 20:59:17
|
Revision: 8308 http://docbook.svn.sourceforge.net/docbook/?rev=8308&view=rev Author: bobstayton Date: 2009-03-10 20:59:07 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Add glossentry.list.item.properties. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-10 20:49:34 UTC (rev 8307) +++ trunk/xsl/fo/param.ent 2009-03-10 20:59:07 UTC (rev 8308) @@ -335,3 +335,4 @@ <!ENTITY glossterm.block.properties SYSTEM "../params/glossterm.block.properties.xml"> <!ENTITY glossdef.list.properties SYSTEM "../params/glossdef.list.properties.xml"> <!ENTITY glossdef.block.properties SYSTEM "../params/glossdef.block.properties.xml"> +<!ENTITY glossentry.list.item.properties SYSTEM "../params/glossentry.list.item.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-10 20:49:34 UTC (rev 8307) +++ trunk/xsl/fo/param.xweb 2009-03-10 20:59:07 UTC (rev 8308) @@ -215,6 +215,7 @@ &glossary.collection; &glossary.as.blocks; &glosslist.as.blocks; +&glossentry.list.item.properties; &glossterm.block.properties; &glossdef.block.properties; &glossterm.list.properties; @@ -650,6 +651,7 @@ <src:fragref linkend="glossterm.auto.link.frag"/> <src:fragref linkend="glossterm.separation.frag"/> <src:fragref linkend="glossterm.width.frag"/> +<src:fragref linkend="glossentry.list.item.properties.frag"/> <src:fragref linkend="glossterm.list.properties.frag"/> <src:fragref linkend="glossterm.block.properties.frag"/> <src:fragref linkend="glossdef.list.properties.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-03-12 17:43:48
|
Revision: 8320 http://docbook.svn.sourceforge.net/docbook/?rev=8320&view=rev Author: mzjn Date: 2009-03-12 17:43:44 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Added code to handle acknowledgements in book and part. The element is processed similarly to dedication. All acknowledgements will appear as front matter, after any dedications. Modified Paths: -------------- trunk/xsl/fo/component.xsl trunk/xsl/fo/division.xsl trunk/xsl/fo/pagesetup.xsl trunk/xsl/fo/titlepage.templates.xml trunk/xsl/fo/titlepage.xsl trunk/xsl/fo/xref.xsl Modified: trunk/xsl/fo/component.xsl =================================================================== --- trunk/xsl/fo/component.xsl 2009-03-12 17:40:50 UTC (rev 8319) +++ trunk/xsl/fo/component.xsl 2009-03-12 17:43:44 UTC (rev 8320) @@ -209,6 +209,82 @@ <!-- ==================================================================== --> +<xsl:template match="acknowledgements" mode="acknowledgements"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + + <xsl:variable name="master-reference"> + <xsl:call-template name="select.pagemaster"/> + </xsl:variable> + + <fo:page-sequence hyphenate="{$hyphenate}" + master-reference="{$master-reference}"> + <xsl:attribute name="language"> + <xsl:call-template name="l10n.language"/> + </xsl:attribute> + <xsl:attribute name="format"> + <xsl:call-template name="page.number.format"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="initial-page-number"> + <xsl:call-template name="initial.page.number"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="force-page-count"> + <xsl:call-template name="force.page.count"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="hyphenation-character"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'hyphenation-character'"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="hyphenation-push-character-count"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'hyphenation-push-character-count'"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="hyphenation-remain-character-count"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:apply-templates select="." mode="running.head.mode"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:apply-templates> + + <xsl:apply-templates select="." mode="running.foot.mode"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:apply-templates> + + <fo:flow flow-name="xsl-region-body"> + <xsl:call-template name="set.flow.properties"> + <xsl:with-param name="element" select="local-name(.)"/> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:call-template> + + <fo:block id="{$id}" + xsl:use-attribute-sets="component.titlepage.properties"> + <xsl:call-template name="acknowledgements.titlepage"/> + </fo:block> + <xsl:apply-templates/> + </fo:flow> + </fo:page-sequence> +</xsl:template> + +<xsl:template match="acknowledgements"></xsl:template> +<xsl:template match="acknowledgements/info"></xsl:template> +<xsl:template match="acknowledgements/title"></xsl:template> +<xsl:template match="acknowledgements/titleabbrev"></xsl:template> +<xsl:template match="acknowledgements/subtitle"></xsl:template> + +<!-- ==================================================================== --> + <xsl:template match="colophon"> <xsl:variable name="id"> <xsl:call-template name="object.id"/> Modified: trunk/xsl/fo/division.xsl =================================================================== --- trunk/xsl/fo/division.xsl 2009-03-12 17:40:50 UTC (rev 8319) +++ trunk/xsl/fo/division.xsl 2009-03-12 17:43:44 UTC (rev 8320) @@ -257,6 +257,7 @@ </xsl:if> <xsl:apply-templates select="dedication" mode="dedication"/> + <xsl:apply-templates select="acknowledgements" mode="acknowledgements"/> <xsl:call-template name="make.book.tocs"/> Modified: trunk/xsl/fo/pagesetup.xsl =================================================================== --- trunk/xsl/fo/pagesetup.xsl 2009-03-12 17:40:50 UTC (rev 8319) +++ trunk/xsl/fo/pagesetup.xsl 2009-03-12 17:43:44 UTC (rev 8320) @@ -1764,6 +1764,7 @@ </xsl:when> <xsl:when test="$pageclass = 'lot'">lot</xsl:when> <xsl:when test="$element = 'dedication'">front</xsl:when> + <xsl:when test="$element = 'acknowledgements'">front</xsl:when> <xsl:when test="$element = 'preface'">front</xsl:when> <xsl:when test="$element = 'appendix'">back</xsl:when> <xsl:when test="$element = 'glossary'">back</xsl:when> Modified: trunk/xsl/fo/titlepage.templates.xml =================================================================== --- trunk/xsl/fo/titlepage.templates.xml 2009-03-12 17:40:50 UTC (rev 8319) +++ trunk/xsl/fo/titlepage.templates.xml 2009-03-12 17:43:44 UTC (rev 8320) @@ -428,6 +428,37 @@ <!-- ==================================================================== --> +<!-- Same formatting as dedication --> + <t:titlepage t:element="acknowledgements" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::acknowledgements[1]" + margin-left="{$title.margin.left}" + font-size="&hsize5;" + font-family="{$title.fontset}" + font-weight="bold"/> + <subtitle + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> +</t:titlepage> + + +<!-- ==================================================================== --> + <t:titlepage t:element="preface" t:wrapper="fo:block"> <t:titlepage-content t:side="recto"> <title Modified: trunk/xsl/fo/titlepage.xsl =================================================================== --- trunk/xsl/fo/titlepage.xsl 2009-03-12 17:40:50 UTC (rev 8319) +++ trunk/xsl/fo/titlepage.xsl 2009-03-12 17:43:44 UTC (rev 8320) @@ -49,6 +49,9 @@ <xsl:attribute-set name="dedication.titlepage.recto.style"/> <xsl:attribute-set name="dedication.titlepage.verso.style"/> +<xsl:attribute-set name="acknowledgements.titlepage.recto.style"/> +<xsl:attribute-set name="acknowledgements.titlepage.verso.style"/> + <xsl:attribute-set name="preface.titlepage.recto.style"/> <xsl:attribute-set name="preface.titlepage.verso.style"/> Modified: trunk/xsl/fo/xref.xsl =================================================================== --- trunk/xsl/fo/xref.xsl 2009-03-12 17:40:50 UTC (rev 8319) +++ trunk/xsl/fo/xref.xsl 2009-03-12 17:43:44 UTC (rev 8320) @@ -396,7 +396,7 @@ <xsl:apply-templates select="(.//function)[1]" mode="xref"/> </xsl:template> -<xsl:template match="dedication|preface|chapter|appendix" mode="xref-to"> +<xsl:template match="dedication|acknowledgements|preface|chapter|appendix" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> <xsl:param name="verbose" select="1"/> @@ -764,6 +764,7 @@ |ancestor::preface |ancestor::partintro |ancestor::dedication + |ancestor::acknowledgements |ancestor::colophon |ancestor::bibliography |ancestor::index @@ -1296,6 +1297,7 @@ or local-name($target) = 'equation' or local-name($target) = 'table' or local-name($target) = 'dedication' + or local-name($target) = 'acknowledgements' or local-name($target) = 'preface' or local-name($target) = 'bibliography' or local-name($target) = 'glossary' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-16 02:46:06
|
Revision: 8338 http://docbook.svn.sourceforge.net/docbook/?rev=8338&view=rev Author: bobstayton Date: 2009-03-16 02:45:55 +0000 (Mon, 16 Mar 2009) Log Message: ----------- An indexterm primary, secondary, or tertiary element with an id or xml:id now outputs that ID, so that index entries can be cross referenced to. Modified Paths: -------------- trunk/xsl/fo/autoidx.xsl trunk/xsl/fo/xref.xsl Modified: trunk/xsl/fo/autoidx.xsl =================================================================== --- trunk/xsl/fo/autoidx.xsl 2009-03-15 19:38:17 UTC (rev 8337) +++ trunk/xsl/fo/autoidx.xsl 2009-03-16 02:45:55 UTC (rev 8338) @@ -294,6 +294,13 @@ <xsl:if test="$axf.extensions != 0"> <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute> </xsl:if> + + <xsl:for-each select="$refs/primary"> + <xsl:if test="@id or @xml:id"> + <fo:inline id="{(@id|@xml:id)[1]}"/> + </xsl:if> + </xsl:for-each> + <xsl:value-of select="primary"/> <xsl:choose> @@ -403,6 +410,13 @@ <xsl:if test="$axf.extensions != 0"> <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute> </xsl:if> + + <xsl:for-each select="$refs/secondary"> + <xsl:if test="@id or @xml:id"> + <fo:inline id="{(@id|@xml:id)[1]}"/> + </xsl:if> + </xsl:for-each> + <xsl:value-of select="secondary"/> <xsl:choose> @@ -522,6 +536,13 @@ <xsl:if test="$axf.extensions != 0"> <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute> </xsl:if> + + <xsl:for-each select="$refs/tertiary"> + <xsl:if test="@id or @xml:id"> + <fo:inline id="{(@id|@xml:id)[1]}"/> + </xsl:if> + </xsl:for-each> + <xsl:value-of select="tertiary"/> <xsl:choose> Modified: trunk/xsl/fo/xref.xsl =================================================================== --- trunk/xsl/fo/xref.xsl 2009-03-15 19:38:17 UTC (rev 8337) +++ trunk/xsl/fo/xref.xsl 2009-03-16 02:45:55 UTC (rev 8338) @@ -804,6 +804,10 @@ <xsl:value-of select="primary"/> </xsl:template> +<xsl:template match="primary|secondary|tertiary" mode="xref-to"> + <xsl:value-of select="."/> +</xsl:template> + <!-- ==================================================================== --> <xsl:template match="link" name="link"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-16 06:04:19
|
Revision: 8343 http://docbook.svn.sourceforge.net/docbook/?rev=8343&view=rev Author: bobstayton Date: 2009-03-16 06:04:11 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Start using new param exsl.node.set.available to work around Xalan bug. Modified Paths: -------------- trunk/xsl/fo/footnote.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/footnote.xsl =================================================================== --- trunk/xsl/fo/footnote.xsl 2009-03-16 03:47:19 UTC (rev 8342) +++ trunk/xsl/fo/footnote.xsl 2009-03-16 06:04:11 UTC (rev 8343) @@ -196,7 +196,7 @@ </fo:block> </xsl:when> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <fo:block xsl:use-attribute-sets="table.footnote.properties"> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> <xsl:apply-templates select="*[position() > 1]"/> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-16 03:47:19 UTC (rev 8342) +++ trunk/xsl/fo/param.ent 2009-03-16 06:04:11 UTC (rev 8343) @@ -55,6 +55,7 @@ <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml"> <!ENTITY email.delimiters.enabled SYSTEM "../params/email.delimiters.enabled.xml"> <!ENTITY email.mailto.enabled SYSTEM "../params/email.mailto.enabled.xml"> +<!ENTITY exsl.node.set.available SYSTEM "../params/exsl.node.set.available.xml"> <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml"> <!ENTITY footer.rule SYSTEM "../params/footer.rule.xml"> <!ENTITY footer.column.widths SYSTEM "../params/footer.column.widths.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-16 03:47:19 UTC (rev 8342) +++ trunk/xsl/fo/param.xweb 2009-03-16 06:04:11 UTC (rev 8343) @@ -267,6 +267,7 @@ &email.mailto.enabled; §ion.container.element; &monospace.verbatim.font.width; +&exsl.node.set.available; </reference> <reference xml:id="graphics"><title>Graphics</title> &graphic.default.extension; @@ -616,6 +617,7 @@ <src:fragref linkend="email.mailto.enabled.frag"/> <src:fragref linkend="equation.properties.frag"/> <src:fragref linkend="example.properties.frag"/> +<src:fragref linkend="exsl.node.set.available.frag"/> <src:fragref linkend="figure.properties.frag"/> <src:fragref linkend="firstterm.only.link.frag"/> <src:fragref linkend="footer.content.properties.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-16 06:36:00
|
Revision: 8344 http://docbook.svn.sourceforge.net/docbook/?rev=8344&view=rev Author: bobstayton Date: 2009-03-16 06:35:43 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Use param exsl.node.set.available to test for function. Modified Paths: -------------- trunk/xsl/fo/verbatim.xsl trunk/xsl/fo/xref.xsl Modified: trunk/xsl/fo/verbatim.xsl =================================================================== --- trunk/xsl/fo/verbatim.xsl 2009-03-16 06:04:11 UTC (rev 8343) +++ trunk/xsl/fo/verbatim.xsl 2009-03-16 06:35:43 UTC (rev 8344) @@ -70,7 +70,7 @@ xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style"> <xsl:choose> <xsl:when test="$hyphenate.verbatim != 0 and - function-available('exsl:node-set')"> + $exsl.node.set.available != 0"> <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/> </xsl:when> @@ -85,7 +85,7 @@ xsl:use-attribute-sets="monospace.verbatim.properties"> <xsl:choose> <xsl:when test="$hyphenate.verbatim != 0 and - function-available('exsl:node-set')"> + $exsl.node.set.available != 0"> <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/> </xsl:when> Modified: trunk/xsl/fo/xref.xsl =================================================================== --- trunk/xsl/fo/xref.xsl 2009-03-16 06:04:11 UTC (rev 8343) +++ trunk/xsl/fo/xref.xsl 2009-03-16 06:35:43 UTC (rev 8344) @@ -233,7 +233,7 @@ </xsl:variable> <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/> </xsl:when> <xsl:otherwise> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-20 18:42:22
|
Revision: 8359 http://docbook.svn.sourceforge.net/docbook/?rev=8359&view=rev Author: bobstayton Date: 2009-03-20 18:42:06 +0000 (Fri, 20 Mar 2009) Log Message: ----------- Implement simple.xlink for glosssee and glossseealso so they can use other types of linking besides otherterm. Modified Paths: -------------- trunk/xsl/fo/footnote.xsl trunk/xsl/fo/glossary.xsl trunk/xsl/fo/pi.xsl trunk/xsl/fo/xref.xsl Modified: trunk/xsl/fo/footnote.xsl =================================================================== --- trunk/xsl/fo/footnote.xsl 2009-03-19 08:18:29 UTC (rev 8358) +++ trunk/xsl/fo/footnote.xsl 2009-03-20 18:42:06 UTC (rev 8359) @@ -3,7 +3,7 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="exsl" + exclude-result-prefixes="exsl xlink" version='1.0'> <!-- ******************************************************************** Modified: trunk/xsl/fo/glossary.xsl =================================================================== --- trunk/xsl/fo/glossary.xsl 2009-03-19 08:18:29 UTC (rev 8358) +++ trunk/xsl/fo/glossary.xsl 2009-03-20 18:42:06 UTC (rev 8359) @@ -5,6 +5,8 @@ ]> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:xlink='http://www.w3.org/1999/xlink' + exclude-result-prefixes="xlink" version='1.0'> <!-- ******************************************************************** @@ -82,7 +84,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.list"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -97,7 +99,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.blocks"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -110,7 +112,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.blocks"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -129,7 +131,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.list"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -251,7 +253,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.list"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -264,7 +266,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -276,7 +278,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -291,7 +293,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.list"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -425,7 +427,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." @@ -450,7 +452,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." @@ -477,7 +479,7 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." @@ -596,7 +598,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="glossentry"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." mode="auto-glossary-as-list"/> @@ -636,7 +638,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="glossentry"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/> @@ -684,7 +686,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.list"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -792,6 +794,7 @@ <xsl:variable name="otherterm" select="@otherterm"/> <xsl:variable name="targets" select="key('id', $otherterm)"/> <xsl:variable name="target" select="$targets[1]"/> + <xsl:variable name="xlink" select="@xlink:href"/> <fo:block> <xsl:variable name="template"> @@ -808,6 +811,13 @@ <xsl:apply-templates select="$target" mode="xref-to"/> </fo:basic-link> </xsl:when> + <xsl:when test="$xlink"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> <xsl:when test="$otherterm != '' and not($target)"> <xsl:message> <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text> @@ -861,6 +871,7 @@ <xsl:variable name="otherterm" select="@otherterm"/> <xsl:variable name="targets" select="key('id', $otherterm)"/> <xsl:variable name="target" select="$targets[1]"/> + <xsl:variable name="xlink" select="@xlink:href"/> <xsl:choose> <xsl:when test="$target"> @@ -869,6 +880,13 @@ <xsl:apply-templates select="$target" mode="xref-to"/> </fo:basic-link> </xsl:when> + <xsl:when test="$xlink"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> <xsl:when test="$otherterm != '' and not($target)"> <xsl:message> <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text> @@ -909,7 +927,7 @@ <xsl:choose> <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.blocks"> - <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> + <xsl:sort lang="{$language}" select="normalize-space(translate(concat(@sortas, glossterm[not(parent::glossentry/@sortas) or parent::glossentry/@sortas = '']), &lowercase;, &uppercase;))"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -1004,6 +1022,7 @@ <xsl:variable name="otherterm" select="@otherterm"/> <xsl:variable name="targets" select="key('id', $otherterm)"/> <xsl:variable name="target" select="$targets[1]"/> + <xsl:variable name="xlink" select="@xlink:href"/> <xsl:variable name="template"> <xsl:call-template name="gentext.template"> @@ -1019,6 +1038,13 @@ <xsl:apply-templates select="$target" mode="xref-to"/> </fo:basic-link> </xsl:when> + <xsl:when test="$xlink"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> <xsl:when test="$otherterm != '' and not($target)"> <xsl:message> <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text> @@ -1077,6 +1103,7 @@ <xsl:variable name="otherterm" select="@otherterm"/> <xsl:variable name="targets" select="key('id', $otherterm)"/> <xsl:variable name="target" select="$targets[1]"/> + <xsl:variable name="xlink" select="@xlink:href"/> <xsl:choose> <xsl:when test="$target"> @@ -1085,6 +1112,13 @@ <xsl:apply-templates select="$target" mode="xref-to"/> </fo:basic-link> </xsl:when> + <xsl:when test="$xlink"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> <xsl:when test="$otherterm != '' and not($target)"> <xsl:message> <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text> Modified: trunk/xsl/fo/pi.xsl =================================================================== --- trunk/xsl/fo/pi.xsl 2009-03-19 08:18:29 UTC (rev 8358) +++ trunk/xsl/fo/pi.xsl 2009-03-20 18:42:06 UTC (rev 8359) @@ -4,7 +4,7 @@ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" - exclude-result-prefixes="doc" + exclude-result-prefixes="doc xlink" version='1.0'> <!-- ******************************************************************** Modified: trunk/xsl/fo/xref.xsl =================================================================== --- trunk/xsl/fo/xref.xsl 2009-03-19 08:18:29 UTC (rev 8358) +++ trunk/xsl/fo/xref.xsl 2009-03-20 18:42:06 UTC (rev 8359) @@ -3,7 +3,7 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:exsl="http://exslt.org/common" xmlns:xlink='http://www.w3.org/1999/xlink' - exclude-result-prefixes="exsl" + exclude-result-prefixes="exsl xlink" version='1.0'> <!-- ******************************************************************** @@ -1159,7 +1159,7 @@ <xsl:variable name="hottext"> <xsl:choose> - <xsl:when test="$content"> + <xsl:when test="string-length($content) != 0"> <xsl:copy-of select="$content"/> </xsl:when> <xsl:otherwise> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-22 07:51:45
|
Revision: 8370 http://docbook.svn.sourceforge.net/docbook/?rev=8370&view=rev Author: bobstayton Date: 2009-03-22 07:51:29 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Add support fo dbfo keep-together processing instruction to more blocks like list items and paras. Modified Paths: -------------- trunk/xsl/fo/block.xsl trunk/xsl/fo/lists.xsl Modified: trunk/xsl/fo/block.xsl =================================================================== --- trunk/xsl/fo/block.xsl 2009-03-22 07:09:44 UTC (rev 8369) +++ trunk/xsl/fo/block.xsl 2009-03-22 07:51:29 UTC (rev 8370) @@ -23,7 +23,14 @@ <!-- ==================================================================== --> <xsl:template name="block.object"> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> <fo:block> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> @@ -32,21 +39,42 @@ <!-- ==================================================================== --> <xsl:template match="para"> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> <fo:block xsl:use-attribute-sets="normal.para.spacing"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> <xsl:template match="simpara"> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> <fo:block xsl:use-attribute-sets="normal.para.spacing"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> </xsl:template> <xsl:template match="formalpara"> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> <fo:block xsl:use-attribute-sets="normal.para.spacing"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> @@ -86,7 +114,14 @@ <!-- ==================================================================== --> <xsl:template match="blockquote"> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> <fo:block xsl:use-attribute-sets="blockquote.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:call-template name="anchor"/> <fo:block> <xsl:if test="title|info/title"> @@ -386,7 +421,14 @@ <!-- ==================================================================== --> <xsl:template match="abstract"> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> <fo:block xsl:use-attribute-sets="abstract.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </fo:block> Modified: trunk/xsl/fo/lists.xsl =================================================================== --- trunk/xsl/fo/lists.xsl 2009-03-22 07:09:44 UTC (rev 8369) +++ trunk/xsl/fo/lists.xsl 2009-03-22 07:51:29 UTC (rev 8370) @@ -27,10 +27,10 @@ <xsl:variable name="label-width"> <xsl:choose> <xsl:when test="$pi-label-width = ''"> - <xsl:value-of select="$itemizedlist.label.width"/> + <xsl:value-of select="$itemizedlist.label.width"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="$pi-label-width"/> + <xsl:value-of select="$pi-label-width"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -58,18 +58,18 @@ <xsl:choose> <xsl:when test="ancestor::listitem"> <fo:list-block id="{$id}" xsl:use-attribute-sets="itemizedlist.properties"> - <xsl:attribute name="provisional-distance-between-starts"> - <xsl:value-of select="$label-width"/> - </xsl:attribute> + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:value-of select="$label-width"/> + </xsl:attribute> <xsl:copy-of select="$content"/> </fo:list-block> </xsl:when> <xsl:otherwise> <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing itemizedlist.properties"> - <xsl:attribute name="provisional-distance-between-starts"> - <xsl:value-of select="$label-width"/> - </xsl:attribute> - <xsl:copy-of select="$content"/> + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:value-of select="$label-width"/> + </xsl:attribute> + <xsl:copy-of select="$content"/> </fo:list-block> </xsl:otherwise> </xsl:choose> @@ -107,6 +107,10 @@ <xsl:template match="itemizedlist/listitem"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + <xsl:variable name="item.contents"> <fo:list-item-label end-indent="label-end()" xsl:use-attribute-sets="itemizedlist.label.properties"> <fo:block> @@ -137,11 +141,19 @@ <xsl:choose> <xsl:when test="parent::*/@spacing = 'compact'"> <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing"> + <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="$item.contents"/> </fo:list-item> </xsl:when> <xsl:otherwise> <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing"> + <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="$item.contents"/> </fo:list-item> </xsl:otherwise> @@ -190,10 +202,10 @@ <xsl:variable name="label-width"> <xsl:choose> <xsl:when test="$pi-label-width = ''"> - <xsl:value-of select="$orderedlist.label.width"/> + <xsl:value-of select="$orderedlist.label.width"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="$pi-label-width"/> + <xsl:value-of select="$pi-label-width"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -221,17 +233,17 @@ <xsl:choose> <xsl:when test="ancestor::listitem"> <fo:list-block id="{$id}" xsl:use-attribute-sets="orderedlist.properties"> - <xsl:attribute name="provisional-distance-between-starts"> - <xsl:value-of select="$label-width"/> - </xsl:attribute> + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:value-of select="$label-width"/> + </xsl:attribute> <xsl:copy-of select="$content"/> </fo:list-block> </xsl:when> <xsl:otherwise> <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing orderedlist.properties"> - <xsl:attribute name="provisional-distance-between-starts"> - <xsl:value-of select="$label-width"/> - </xsl:attribute> + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:value-of select="$label-width"/> + </xsl:attribute> <xsl:copy-of select="$content"/> </fo:list-block> </xsl:otherwise> @@ -241,6 +253,10 @@ <xsl:template match="orderedlist/listitem"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + <xsl:variable name="item.contents"> <fo:list-item-label end-indent="label-end()" xsl:use-attribute-sets="orderedlist.label.properties"> <fo:block> @@ -257,11 +273,19 @@ <xsl:choose> <xsl:when test="parent::*/@spacing = 'compact'"> <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing"> + <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="$item.contents"/> </fo:list-item> </xsl:when> <xsl:otherwise> <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing"> + <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="$item.contents"/> </fo:list-item> </xsl:otherwise> @@ -465,9 +489,14 @@ <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> + + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + <xsl:variable name="item.contents"> <fo:list-item-label end-indent="label-end()" text-align="start"> - <fo:block xsl:-use-attribute-sets="variablelist.term.properties"> + <fo:block xsl:use-attribute-sets="variablelist.term.properties"> <xsl:apply-templates select="term"/> </fo:block> </fo:list-item-label> @@ -482,11 +511,19 @@ <xsl:when test="parent::*/@spacing = 'compact'"> <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing"> + <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="$item.contents"/> </fo:list-item> </xsl:when> <xsl:otherwise> <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing"> + <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="$item.contents"/> </fo:list-item> </xsl:otherwise> @@ -593,7 +630,7 @@ <xsl:variable name="explicit.table.width"> <xsl:call-template name="dbfo-attribute"> <xsl:with-param name="pis" - select="processing-instruction('dbfo')"/> + select="processing-instruction('dbfo')"/> <xsl:with-param name="attribute" select="'list-width'"/> </xsl:call-template> </xsl:variable> @@ -616,10 +653,10 @@ <xsl:choose> <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0"> - <xsl:attribute name="table-layout">auto</xsl:attribute> + <xsl:attribute name="table-layout">auto</xsl:attribute> <xsl:if test="$explicit.table.width != ''"> <xsl:attribute name="width"><xsl:value-of - select="$explicit.table.width"/></xsl:attribute> + select="$explicit.table.width"/></xsl:attribute> </xsl:if> </xsl:when> <xsl:otherwise> @@ -674,13 +711,13 @@ <xsl:choose> <xsl:when test="position() = last()"/> <!-- do nothing --> <xsl:otherwise> - <xsl:text>, </xsl:text> - <xsl:if test="position() = last() - 1"> - <xsl:if test="$localized-choice-separator != ''"> - <xsl:value-of select="$localized-choice-separator"/> - <xsl:text> </xsl:text> - </xsl:if> - </xsl:if> + <xsl:text>, </xsl:text> + <xsl:if test="position() = last() - 1"> + <xsl:if test="$localized-choice-separator != ''"> + <xsl:value-of select="$localized-choice-separator"/> + <xsl:text> </xsl:text> + </xsl:if> + </xsl:if> </xsl:otherwise> </xsl:choose> </xsl:for-each></fo:inline> @@ -936,7 +973,15 @@ <xsl:call-template name="object.id"/> </xsl:variable> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + <fo:list-item xsl:use-attribute-sets="list.item.spacing"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <fo:list-item-label end-indent="label-end()"> <fo:block id="{$id}"> <!-- dwc: fix for one step procedures. Use a bullet if there's no step 2 --> @@ -972,7 +1017,15 @@ <xsl:call-template name="object.id"/> </xsl:variable> + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + <fo:list-item xsl:use-attribute-sets="list.item.spacing"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <fo:list-item-label end-indent="label-end()"> <fo:block id="{$id}"> <xsl:text>•</xsl:text> @@ -1143,9 +1196,9 @@ provisional-label-separation="0.2em"> <xsl:if test="$pi-label-width != ''"> - <xsl:attribute name="provisional-distance-between-starts"> - <xsl:value-of select="$pi-label-width"/> - </xsl:attribute> + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:value-of select="$pi-label-width"/> + </xsl:attribute> </xsl:if> <xsl:apply-templates select="callout @@ -1160,7 +1213,16 @@ <xsl:template match="callout"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + + <xsl:variable name="keep.together"> + <xsl:call-template name="pi.dbfo_keep-together"/> + </xsl:variable> + <fo:list-item id="{$id}"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <fo:list-item-label end-indent="label-end()"> <fo:block> <xsl:call-template name="callout.arearefs"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-24 18:34:28
|
Revision: 8376 http://docbook.svn.sourceforge.net/docbook/?rev=8376&view=rev Author: bobstayton Date: 2009-03-24 18:34:18 +0000 (Tue, 24 Mar 2009) Log Message: ----------- Add support for dbfo row-height processing instruction, like that in dbhtml. Modified Paths: -------------- trunk/xsl/fo/pi.xsl trunk/xsl/fo/table.xsl Modified: trunk/xsl/fo/pi.xsl =================================================================== --- trunk/xsl/fo/pi.xsl 2009-03-24 04:45:34 UTC (rev 8375) +++ trunk/xsl/fo/pi.xsl 2009-03-24 18:34:18 UTC (rev 8376) @@ -899,6 +899,40 @@ >Soft page breaks</link></para> </refsee> </doc:pi> + +<doc:pi name="dbfo_row-height" xmlns=""> + <refpurpose>Specifies the height for a CALS table row</refpurpose> + <refdescription> + <para>Use the <tag class="xmlpi">dbfo row-height</tag> PI as a child of a + <tag>row</tag> to specify the height of the row.</para> + </refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbfo row-height="<replaceable>height</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter> + <variablelist> + <varlistentry><term>row-height="<replaceable>height</replaceable>"</term> + <listitem> + <para>Specifies the label height (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="RowHeight.html" + >Row height</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbfo_row-height"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'row-height'"/> + </xsl:call-template> +</xsl:template> + + <xsl:template name="pi.dbfo-need"> <xsl:variable name="pi-height"> <xsl:call-template name="dbfo-attribute"> Modified: trunk/xsl/fo/table.xsl =================================================================== --- trunk/xsl/fo/table.xsl 2009-03-24 04:45:34 UTC (rev 8375) +++ trunk/xsl/fo/table.xsl 2009-03-24 18:34:18 UTC (rev 8376) @@ -745,9 +745,23 @@ <!-- customize this template to add row properties --> <xsl:template name="table.row.properties"> + + <xsl:variable name="row-height"> + <xsl:if test="processing-instruction('dbfo')"> + <xsl:call-template name="pi.dbfo_row-height"/> + </xsl:if> + </xsl:variable> + + <xsl:if test="$row-height != ''"> + <xsl:attribute name="block-progression-dimension"> + <xsl:value-of select="$row-height"/> + </xsl:attribute> + </xsl:if> + <xsl:variable name="bgcolor"> <xsl:call-template name="pi.dbfo_bgcolor"/> </xsl:variable> + <xsl:if test="$bgcolor != ''"> <xsl:attribute name="background-color"> <xsl:value-of select="$bgcolor"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-12-02 06:05:31
|
Revision: 8543 http://docbook.svn.sourceforge.net/docbook/?rev=8543&view=rev Author: bobstayton Date: 2009-12-02 06:05:24 +0000 (Wed, 02 Dec 2009) Log Message: ----------- Add equation.number.properties. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-12-02 06:02:23 UTC (rev 8542) +++ trunk/xsl/fo/param.ent 2009-12-02 06:05:24 UTC (rev 8543) @@ -265,6 +265,7 @@ <!ENTITY figure.properties SYSTEM "../params/figure.properties.xml"> <!ENTITY example.properties SYSTEM "../params/example.properties.xml"> <!ENTITY equation.properties SYSTEM "../params/equation.properties.xml"> +<!ENTITY equation.number.properties SYSTEM "../params/equation.number.properties.xml"> <!ENTITY table.properties SYSTEM "../params/table.properties.xml"> <!ENTITY informalfigure.properties SYSTEM "../params/informalfigure.properties.xml"> <!ENTITY informalexample.properties SYSTEM "../params/informalexample.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-12-02 06:02:23 UTC (rev 8542) +++ trunk/xsl/fo/param.xweb 2009-12-02 06:05:24 UTC (rev 8543) @@ -451,6 +451,7 @@ &figure.properties; &example.properties; &equation.properties; +&equation.number.properties; &table.properties; &informalfigure.properties; &informalexample.properties; @@ -621,6 +622,7 @@ <src:fragref linkend="email.delimiters.enabled.frag"/> <src:fragref linkend="email.mailto.enabled.frag"/> <src:fragref linkend="equation.properties.frag"/> +<src:fragref linkend="equation.number.properties.frag"/> <src:fragref linkend="example.properties.frag"/> <src:fragref linkend="exsl.node.set.available.frag"/> <src:fragref linkend="figure.properties.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2010-10-01 04:45:04
|
Revision: 8913 http://docbook.svn.sourceforge.net/docbook/?rev=8913&view=rev Author: bobstayton Date: 2010-10-01 04:44:57 +0000 (Fri, 01 Oct 2010) Log Message: ----------- Apply patch to support named destination in fop1.xsl, per Sourceforge bug report #3029845. Modified Paths: -------------- trunk/xsl/fo/docbook.xsl trunk/xsl/fo/fop1.xsl trunk/xsl/fo/xref.xsl Modified: trunk/xsl/fo/docbook.xsl =================================================================== --- trunk/xsl/fo/docbook.xsl 2010-10-01 04:23:22 UTC (rev 8912) +++ trunk/xsl/fo/docbook.xsl 2010-10-01 04:44:57 UTC (rev 8913) @@ -283,6 +283,8 @@ <xsl:copy-of select="$bookmarks"/> </fo:bookmark-tree> </xsl:if> + <xsl:apply-templates select="$document.element" + mode="fop1.foxdest"/> </xsl:if> <xsl:if test="$xep.extensions != 0"> Modified: trunk/xsl/fo/fop1.xsl =================================================================== --- trunk/xsl/fo/fop1.xsl 2010-10-01 04:23:22 UTC (rev 8912) +++ trunk/xsl/fo/fop1.xsl 2010-10-01 04:44:57 UTC (rev 8913) @@ -94,6 +94,41 @@ --> </xsl:template> +<xsl:template match="*" mode="fop1.foxdest"> + <xsl:apply-templates select="*" mode="fop1.foxdest"/> +</xsl:template> + +<xsl:template match="set|book|part|reference| + preface|chapter|appendix|article + |glossary|bibliography|index|setindex + |refentry + |sect1|sect2|sect3|sect4|sect5|section" + mode="fop1.foxdest"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <xsl:variable name="bookmark-label"> + <xsl:apply-templates select="." mode="object.title.markup"/> + </xsl:variable> + <!--xsl:if test="$id != ''"> + <fox:destination internal-destination="{$id}"/> + </xsl:if--> + + <!-- Put the root element bookmark at the same level as its children --> + <!-- If the object is a set or book, generate a bookmark for the toc --> + + <xsl:choose> + <xsl:when test="self::index and $generate.index = 0"/> + <xsl:when test="parent::*"> + <fox:destination internal-destination="{$id}"/> + <xsl:apply-templates select="*" mode="fop1.foxdest"/> + </xsl:when> + <xsl:otherwise> + <fox:destination internal-destination="{$id}"/> + <xsl:apply-templates select="*" mode="fop1.foxdest"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> <!-- Metadata support ("Document Properties" in Adobe Reader) --> <xsl:template name="fop1-document-information"> <xsl:variable name="authors" select="(//author|//editor|//corpauthor|//authorgroup)[1]"/> Modified: trunk/xsl/fo/xref.xsl =================================================================== --- trunk/xsl/fo/xref.xsl 2010-10-01 04:23:22 UTC (rev 8912) +++ trunk/xsl/fo/xref.xsl 2010-10-01 04:44:57 UTC (rev 8913) @@ -1207,6 +1207,16 @@ </xsl:when> <xsl:when test="$href != ''"> <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:variable name="mybeg" select="substring-before($href,'#')"/> + <xsl:variable name="myend" select="substring-after($href,'#')"/> + <fo:basic-link external-destination="url({concat($mybeg,'#dest=',$myend)})" + xsl:use-attribute-sets="olink.properties"> + <xsl:copy-of select="$hottext"/> + </fo:basic-link> + <xsl:copy-of select="$olink.page.citation"/> + <xsl:copy-of select="$olink.docname.citation"/> + </xsl:when> <xsl:when test="$xep.extensions != 0"> <fo:basic-link external-destination="url({$href})" xsl:use-attribute-sets="olink.properties"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2011-03-27 07:41:31
|
Revision: 8983 http://docbook.svn.sourceforge.net/docbook/?rev=8983&view=rev Author: mzjn Date: 2011-03-27 07:41:25 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Added support for author/orgname in document metadata. Closes bug #3132862. Modified Paths: -------------- trunk/xsl/fo/axf.xsl trunk/xsl/fo/fop1.xsl trunk/xsl/fo/xep.xsl Modified: trunk/xsl/fo/axf.xsl =================================================================== --- trunk/xsl/fo/axf.xsl 2011-03-27 04:41:18 UTC (rev 8982) +++ trunk/xsl/fo/axf.xsl 2011-03-27 07:41:25 UTC (rev 8983) @@ -25,6 +25,9 @@ <xsl:when test="$authors[self::corpauthor]"> <xsl:value-of select="$authors"/> </xsl:when> + <xsl:when test="$authors[orgname]"> + <xsl:value-of select="$authors/orgname"/> + </xsl:when> <xsl:otherwise> <xsl:call-template name="person.name"> <xsl:with-param name="node" select="$authors"/> Modified: trunk/xsl/fo/fop1.xsl =================================================================== --- trunk/xsl/fo/fop1.xsl 2011-03-27 04:41:18 UTC (rev 8982) +++ trunk/xsl/fo/fop1.xsl 2011-03-27 07:41:25 UTC (rev 8983) @@ -168,6 +168,9 @@ <xsl:when test="$authors[self::corpauthor]"> <xsl:value-of select="$authors"/> </xsl:when> + <xsl:when test="$authors[orgname]"> + <xsl:value-of select="$authors/orgname"/> + </xsl:when> <xsl:otherwise> <xsl:call-template name="person.name"> <xsl:with-param name="node" select="$authors"/> Modified: trunk/xsl/fo/xep.xsl =================================================================== --- trunk/xsl/fo/xep.xsl 2011-03-27 04:41:18 UTC (rev 8982) +++ trunk/xsl/fo/xep.xsl 2011-03-27 07:41:25 UTC (rev 8983) @@ -33,6 +33,9 @@ <xsl:when test="$authors[self::corpauthor]"> <xsl:value-of select="$authors"/> </xsl:when> + <xsl:when test="$authors[orgname]"> + <xsl:value-of select="$authors/orgname"/> + </xsl:when> <xsl:otherwise> <xsl:call-template name="person.name"> <xsl:with-param name="node" select="$authors"/> @@ -104,6 +107,13 @@ Pdf bookmarks ******************************************************************** --> +<xsl:variable name="collapse.subtree"> + <xsl:choose> + <xsl:when test="$bookmarks.collapse != 0">true</xsl:when> + <xsl:otherwise>false</xsl:otherwise> + </xsl:choose> +</xsl:variable> + <xsl:template match="*" mode="xep.outline"> <xsl:apply-templates select="*" mode="xep.outline"/> </xsl:template> @@ -127,6 +137,9 @@ <xsl:when test="self::index and $generate.index = 0"/> <xsl:when test="parent::*"> <rx:bookmark internal-destination="{$id}"> + <xsl:attribute name="collapse-subtree"> + <xsl:value-of select="$collapse.subtree"/> + </xsl:attribute> <rx:bookmark-label> <xsl:value-of select="normalize-space($bookmark-label)"/> </rx:bookmark-label> @@ -136,6 +149,9 @@ <xsl:otherwise> <xsl:if test="$bookmark-label != ''"> <rx:bookmark internal-destination="{$id}"> + <xsl:attribute name="collapse-subtree"> + <xsl:value-of select="$collapse.subtree"/> + </xsl:attribute> <rx:bookmark-label> <xsl:value-of select="normalize-space($bookmark-label)"/> </rx:bookmark-label> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-10-05 20:12:56
|
Revision: 9115 http://docbook.svn.sourceforge.net/docbook/?rev=9115&view=rev Author: bobstayton Date: 2011-10-05 20:12:49 +0000 (Wed, 05 Oct 2011) Log Message: ----------- Add new attribute-sets calloutlist.properties and callout.properties to better support customization of calloutlists, fixing bug 3160341. Modified Paths: -------------- trunk/xsl/fo/lists.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/lists.xsl =================================================================== --- trunk/xsl/fo/lists.xsl 2011-10-05 19:56:43 UTC (rev 9114) +++ trunk/xsl/fo/lists.xsl 2011-10-05 20:12:49 UTC (rev 9115) @@ -1273,14 +1273,10 @@ |comment()[not(preceding-sibling::callout)] |processing-instruction()[not(preceding-sibling::callout)]"/> - <fo:list-block space-before.optimum="1em" - space-before.minimum="0.8em" - space-before.maximum="1.2em" - provisional-distance-between-starts="2.2em" - provisional-label-separation="0.2em"> + <fo:list-block xsl:use-attribute-sets="calloutlist.properties"> <xsl:if test="$pi-label-width != ''"> - <xsl:attribute name="provisional-distance-between-starts"> + <xsl:attribute name="provisional-distance-between-starts"> <xsl:value-of select="$pi-label-width"/> </xsl:attribute> </xsl:if> @@ -1302,7 +1298,7 @@ <xsl:call-template name="pi.dbfo_keep-together"/> </xsl:variable> - <fo:list-item id="{$id}"> + <fo:list-item id="{$id}" xsl:use-attribute-sets="callout.properties"> <xsl:if test="$keep.together != ''"> <xsl:attribute name="keep-together.within-column"><xsl:value-of select="$keep.together"/></xsl:attribute> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2011-10-05 19:56:43 UTC (rev 9114) +++ trunk/xsl/fo/param.ent 2011-10-05 20:12:49 UTC (rev 9115) @@ -341,3 +341,5 @@ <!ENTITY glossdef.block.properties SYSTEM "../params/glossdef.block.properties.xml"> <!ENTITY glossentry.list.item.properties SYSTEM "../params/glossentry.list.item.properties.xml"> <!ENTITY bookmarks.collapse SYSTEM "../params/bookmarks.collapse.xml"> +<!ENTITY callout.properties SYSTEM "../params/callout.properties.xml"> +<!ENTITY calloutlist.properties SYSTEM "../params/calloutlist.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2011-10-05 19:56:43 UTC (rev 9114) +++ trunk/xsl/fo/param.xweb 2011-10-05 20:12:49 UTC (rev 9115) @@ -47,6 +47,8 @@ &nongraphical.admonition.properties; </reference> <reference xml:id="callouts"><title>Callouts</title> +&calloutlist.properties; +&callout.properties; &callout.defaultcolumn; &callout.graphics; &callout.graphics.extension; @@ -573,6 +575,8 @@ <src:fragref linkend="body.end.indent.frag"/> <src:fragref linkend="bookmarks.collapse.frag"/> <src:fragref linkend="bridgehead.in.toc.frag"/> +<src:fragref linkend="calloutlist.properties.frag"/> +<src:fragref linkend="callout.properties.frag"/> <src:fragref linkend="callout.defaultcolumn.frag"/> <src:fragref linkend="callout.graphics.extension.frag"/> <src:fragref linkend="callout.graphics.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-10-09 07:21:56
|
Revision: 9122 http://docbook.svn.sourceforge.net/docbook/?rev=9122&view=rev Author: bobstayton Date: 2011-10-09 07:21:49 +0000 (Sun, 09 Oct 2011) Log Message: ----------- Add attribute-set task.properties to task element to support customization. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb trunk/xsl/fo/task.xsl Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2011-10-09 07:15:05 UTC (rev 9121) +++ trunk/xsl/fo/param.ent 2011-10-09 07:21:49 UTC (rev 9122) @@ -343,3 +343,4 @@ <!ENTITY bookmarks.collapse SYSTEM "../params/bookmarks.collapse.xml"> <!ENTITY callout.properties SYSTEM "../params/callout.properties.xml"> <!ENTITY calloutlist.properties SYSTEM "../params/calloutlist.properties.xml"> +<!ENTITY task.properties SYSTEM "../params/task.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2011-10-09 07:15:05 UTC (rev 9121) +++ trunk/xsl/fo/param.xweb 2011-10-09 07:21:49 UTC (rev 9122) @@ -455,6 +455,7 @@ &equation.properties; &equation.number.properties; &table.properties; +&task.properties; &informalfigure.properties; &informalexample.properties; &informalequation.properties; @@ -854,6 +855,7 @@ <src:fragref linkend="table.table.properties.frag"/> <src:fragref linkend="target.database.document.frag"/> <src:fragref linkend="targets.filename.frag"/> +<src:fragref linkend="task.properties.frag"/> <src:fragref linkend="textdata.default.encoding.frag"/> <src:fragref linkend="tex.math.delims.frag"/> <src:fragref linkend="tex.math.in.alt.frag"/> Modified: trunk/xsl/fo/task.xsl =================================================================== --- trunk/xsl/fo/task.xsl 2011-10-09 07:15:05 UTC (rev 9121) +++ trunk/xsl/fo/task.xsl 2011-10-09 07:21:49 UTC (rev 9122) @@ -45,7 +45,7 @@ </xsl:variable> <fo:block id="{$id}" - xsl:use-attribute-sets="formal.object.properties"> + xsl:use-attribute-sets="task.properties"> <xsl:if test="$keep.together != ''"> <xsl:attribute name="keep-together.within-column"><xsl:value-of This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-11-26 23:03:01
|
Revision: 9161 http://docbook.svn.sourceforge.net/docbook/?rev=9161&view=rev Author: bobstayton Date: 2011-11-26 23:02:55 +0000 (Sat, 26 Nov 2011) Log Message: ----------- Add support for itermset in info elements, using titlepage mechanism to ensure entries are placed inside page-sequence. Modified Paths: -------------- trunk/xsl/fo/titlepage.templates.xml trunk/xsl/fo/titlepage.xsl Modified: trunk/xsl/fo/titlepage.templates.xml =================================================================== --- trunk/xsl/fo/titlepage.templates.xml 2011-11-26 18:54:12 UTC (rev 9160) +++ trunk/xsl/fo/titlepage.templates.xml 2011-11-26 23:02:55 UTC (rev 9161) @@ -70,6 +70,7 @@ margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -111,6 +112,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -154,6 +156,7 @@ because only the first editor generates the list of editors. <editor t:predicate="[position() = 1]"/> --> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -208,6 +211,7 @@ font-weight='bold' font-style='italic' font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -248,6 +252,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -289,6 +294,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -310,6 +316,7 @@ <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -331,6 +338,7 @@ <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -352,6 +360,7 @@ <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -373,6 +382,7 @@ <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -394,6 +404,7 @@ <t:titlepage-content t:side="recto"> <title font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -423,6 +434,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -453,6 +465,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -494,6 +507,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -544,6 +558,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -583,6 +598,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -618,6 +634,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -651,6 +668,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -684,6 +702,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -717,6 +736,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -750,6 +770,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -783,6 +804,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -816,6 +838,7 @@ <revision/> <revhistory/> <abstract/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -845,6 +868,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -872,6 +896,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -901,6 +926,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -928,6 +954,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -958,6 +985,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -986,6 +1014,7 @@ param:title="title"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -1016,6 +1045,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -1045,6 +1075,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -1069,6 +1100,7 @@ font-weight="bold"/> <subtitle font-family="{$title.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> @@ -1122,6 +1154,7 @@ margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"/> + <itermset/> </t:titlepage-content> <t:titlepage-content t:side="verso"> Modified: trunk/xsl/fo/titlepage.xsl =================================================================== --- trunk/xsl/fo/titlepage.xsl 2011-11-26 18:54:12 UTC (rev 9160) +++ trunk/xsl/fo/titlepage.xsl 2011-11-26 23:02:55 UTC (rev 9161) @@ -411,7 +411,7 @@ </xsl:template> <xsl:template match="itermset" mode="titlepage.mode"> - <!-- discard --> + <xsl:apply-templates select="indexterm"/> </xsl:template> <xsl:template match="invpartnumber" mode="titlepage.mode"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-11-27 00:12:17
|
Revision: 9162 http://docbook.svn.sourceforge.net/docbook/?rev=9162&view=rev Author: bobstayton Date: 2011-11-27 00:12:10 +0000 (Sun, 27 Nov 2011) Log Message: ----------- Check in new params for FO side regions in page masters. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2011-11-26 23:02:55 UTC (rev 9161) +++ trunk/xsl/fo/param.ent 2011-11-27 00:12:10 UTC (rev 9162) @@ -345,3 +345,12 @@ <!ENTITY calloutlist.properties SYSTEM "../params/calloutlist.properties.xml"> <!ENTITY task.properties SYSTEM "../params/task.properties.xml"> <!ENTITY generate.consistent.ids SYSTEM "../params/generate.consistent.ids.xml"> +<!ENTITY region.inner.extent SYSTEM "../params/region.inner.extent.xml"> +<!ENTITY region.outer.extent SYSTEM "../params/region.outer.extent.xml"> +<!ENTITY body.margin.inner SYSTEM "../params/body.margin.inner.xml"> +<!ENTITY body.margin.outer SYSTEM "../params/body.margin.outer.xml"> +<!ENTITY side.region.precedence SYSTEM "../params/side.region.precedence.xml"> +<!ENTITY inner.region.content.properties SYSTEM "../params/inner.region.content.properties.xml"> +<!ENTITY outer.region.content.properties SYSTEM "../params/outer.region.content.properties.xml"> +<!ENTITY region.inner.properties SYSTEM "../params/region.inner.properties.xml"> +<!ENTITY region.outer.properties SYSTEM "../params/region.outer.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2011-11-26 23:02:55 UTC (rev 9161) +++ trunk/xsl/fo/param.xweb 2011-11-27 00:12:10 UTC (rev 9162) @@ -375,6 +375,8 @@ &double.sided; &body.margin.bottom; &body.margin.top; +&body.margin.inner; +&body.margin.outer; &body.start.indent; &body.end.indent; &alignment; @@ -394,6 +396,8 @@ &column.gap.titlepage; ®ion.after.extent; ®ion.before.extent; +®ion.inner.extent; +®ion.outer.extent; &default.units; &normal.para.spacing; &body.font.master; @@ -415,6 +419,11 @@ &header.content.properties; &footer.content.properties; &marker.section.level; +&side.region.precedence; +®ion.inner.properties; +®ion.outer.properties; +&inner.region.content.properties; +&outer.region.content.properties; </reference> <reference xml:id="fonts"><title>Font Families</title> &body.font.family; @@ -896,6 +905,15 @@ <src:fragref linkend="xref.properties.frag"/> <src:fragref linkend="xref.title-page.separator.frag"/> <src:fragref linkend="xref.with.number.and.title.frag"/> +<src:fragref linkend="region.inner.extent.frag"/> +<src:fragref linkend="region.outer.extent.frag"/> +<src:fragref linkend="body.margin.inner.frag"/> +<src:fragref linkend="body.margin.outer.frag"/> +<src:fragref linkend="side.region.precedence.frag"/> +<src:fragref linkend="inner.region.content.properties.frag"/> +<src:fragref linkend="outer.region.content.properties.frag"/> +<src:fragref linkend="region.inner.properties.frag"/> +<src:fragref linkend="region.outer.properties.frag"/> </xsl:stylesheet> </src:fragment> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2011-12-08 13:40:34
|
Revision: 9167 http://docbook.svn.sourceforge.net/docbook/?rev=9167&view=rev Author: kosek Date: 2011-12-08 13:40:25 +0000 (Thu, 08 Dec 2011) Log Message: ----------- Added missing parameter definitions (though not sure why base.dir and chunk.quietly is needed in FO, maybe olinks?) Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2011-12-08 13:28:31 UTC (rev 9166) +++ trunk/xsl/fo/param.ent 2011-12-08 13:40:25 UTC (rev 9167) @@ -11,6 +11,7 @@ <!ENTITY author.othername.in.middle SYSTEM "../params/author.othername.in.middle.xml"> <!ENTITY autotoc.label.separator SYSTEM "../params/autotoc.label.separator.xml"> <!ENTITY axf.extensions SYSTEM "../params/axf.extensions.xml"> +<!ENTITY base.dir SYSTEM "../params/base.dir.xml"> <!ENTITY biblioentry.item.separator SYSTEM "../params/biblioentry.item.separator.xml"> <!ENTITY bibliography.collection SYSTEM "../params/bibliography.collection.xml"> <!ENTITY blockquote.properties SYSTEM "../params/blockquote.properties.xml"> @@ -31,6 +32,7 @@ <!ENTITY callout.unicode.start.character SYSTEM "../params/callout.unicode.start.character.xml"> <!ENTITY callouts.extension SYSTEM "../params/callouts.extension.xml"> <!ENTITY chapter.autolabel SYSTEM "../params/chapter.autolabel.xml"> +<!ENTITY chunk.quietly SYSTEM "../params/chunk.quietly.xml"> <!ENTITY column.count.back SYSTEM "../params/column.count.back.xml"> <!ENTITY column.count.body SYSTEM "../params/column.count.body.xml"> <!ENTITY column.count.front SYSTEM "../params/column.count.front.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2011-12-08 13:28:31 UTC (rev 9166) +++ trunk/xsl/fo/param.xweb 2011-12-08 13:40:25 UTC (rev 9167) @@ -278,6 +278,8 @@ &exsl.node.set.available; &bookmarks.collapse; &generate.consistent.ids; +&base.dir; +&chunk.quietly; </reference> <reference xml:id="graphics"><title>Graphics</title> &graphic.default.extension; @@ -566,6 +568,7 @@ <src:fragref linkend="admon.textlabel.frag"/> <src:fragref linkend="admonition.properties.frag"/> <src:fragref linkend="admonition.title.properties.frag"/> +<src:fragref linkend="base.dir.frag"/> <src:fragref linkend="graphical.admonition.properties.frag"/> <src:fragref linkend="nongraphical.admonition.properties.frag"/> <src:fragref linkend="alignment.frag"/> @@ -604,6 +607,7 @@ <src:fragref linkend="callout.unicode.start.character.frag"/> <src:fragref linkend="callouts.extension.frag"/> <src:fragref linkend="chapter.autolabel.frag"/> +<src:fragref linkend="chunk.quietly.frag"/> <src:fragref linkend="collect.xref.targets.frag"/> <src:fragref linkend="column.count.back.frag"/> <src:fragref linkend="column.count.body.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-01-08 23:43:26
|
Revision: 9176 http://docbook.svn.sourceforge.net/docbook/?rev=9176&view=rev Author: bobstayton Date: 2012-01-08 23:43:19 +0000 (Sun, 08 Jan 2012) Log Message: ----------- Refactored the 'process.image' template to create modular templates for each attribute so they can be individually customized. Also merged in support for embedded svg and mml content so they can have image attributes too. Modified Paths: -------------- trunk/xsl/fo/graphics.xsl trunk/xsl/fo/math.xsl Modified: trunk/xsl/fo/graphics.xsl =================================================================== --- trunk/xsl/fo/graphics.xsl 2012-01-03 19:55:59 UTC (rev 9175) +++ trunk/xsl/fo/graphics.xsl 2012-01-08 23:43:19 UTC (rev 9176) @@ -135,166 +135,305 @@ <!-- Override these templates for FO --> <!-- ==================================================================== --> +<xsl:template name="image.scalefit"> + <xsl:choose> + <xsl:when test="$ignore.image.scaling != 0">0</xsl:when> + <xsl:when test="@contentwidth">0</xsl:when> + <xsl:when test="@contentdepth and + @contentdepth != '100%'">0</xsl:when> + <xsl:when test="@scale">0</xsl:when> + <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when> + <xsl:when test="@width or @depth">1</xsl:when> + <xsl:when test="$default.image.width != ''">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.scale"> + <xsl:choose> + <xsl:when test="$ignore.image.scaling != 0">0</xsl:when> + <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when> + <xsl:when test="@scale"> + <xsl:value-of select="@scale div 100.0"/> + </xsl:when> + <xsl:otherwise>1.0</xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.filename"> + <xsl:choose> + <xsl:when test="svg:*" xmlns:svg="http://www.w3.org/2000/svg"> + <!-- no filename for inline SVG content --> + </xsl:when> + <xsl:when test="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> + <!-- no filename for inline MathML content --> + </xsl:when> + <xsl:when test="local-name(.) = 'graphic' + or local-name(.) = 'inlinegraphic'"> + <!-- handle legacy graphic and inlinegraphic by new template --> + <xsl:call-template name="mediaobject.filename"> + <xsl:with-param name="object" select="."/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <!-- imagedata, videodata, audiodata --> + <xsl:call-template name="mediaobject.filename"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.src"> + <xsl:param name="filename"/> + + <xsl:choose> + <xsl:when test="svg:*" xmlns:svg="http://www.w3.org/2000/svg"> + <!-- no src attribute for inline SVG content --> + </xsl:when> + <xsl:when test="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> + <!-- no src attribute for inline MathML content --> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="fo-external-image"> + <xsl:with-param name="filename"> + <xsl:if test="$img.src.path != '' and + not(starts-with($filename, '/')) and + not(contains($filename, '://'))"> + <xsl:value-of select="$img.src.path"/> + </xsl:if> + <xsl:value-of select="$filename"/> + </xsl:with-param> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.content.type"> + <xsl:if test="@format"> + <xsl:call-template name="graphic.format.content-type"> + <xsl:with-param name="format" select="@format"/> + </xsl:call-template> + </xsl:if> +</xsl:template> + +<xsl:template name="image.bgcolor"> + <xsl:call-template name="pi.dbfo_background-color"> + <xsl:with-param name="node" select=".."/> + </xsl:call-template> +</xsl:template> + +<xsl:template name="image.width"> + <xsl:choose> + <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> + <xsl:when test="contains(@width,'%')"> + <xsl:value-of select="@width"/> + </xsl:when> + <xsl:when test="@width and not(@width = '')"> + <xsl:call-template name="length-spec"> + <xsl:with-param name="length" select="@width"/> + <xsl:with-param name="default.units" select="'px'"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="not(@depth) and $default.image.width != ''"> + <xsl:call-template name="length-spec"> + <xsl:with-param name="length" select="$default.image.width"/> + <xsl:with-param name="default.units" select="'px'"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.height"> + <xsl:choose> + <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> + <xsl:when test="contains(@depth,'%')"> + <xsl:value-of select="@depth"/> + </xsl:when> + <xsl:when test="@depth"> + <xsl:call-template name="length-spec"> + <xsl:with-param name="length" select="@depth"/> + <xsl:with-param name="default.units" select="'px'"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.content.width"> + <xsl:param name="scalefit" select="0"/> + <xsl:param name="scale" select="'1.0'"/> + + <xsl:choose> + <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> + <xsl:when test="contains(@contentwidth,'%')"> + <xsl:value-of select="@contentwidth"/> + </xsl:when> + <xsl:when test="@contentwidth"> + <xsl:call-template name="length-spec"> + <xsl:with-param name="length" select="@contentwidth"/> + <xsl:with-param name="default.units" select="'px'"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="number($scale) != 1.0"> + <xsl:value-of select="$scale * 100"/> + <xsl:text>%</xsl:text> + </xsl:when> + <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when> + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.content.height"> + <xsl:param name="scalefit" select="0"/> + <xsl:param name="scale" select="0"/> + + <xsl:choose> + <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> + <xsl:when test="contains(@contentdepth,'%')"> + <xsl:value-of select="@contentdepth"/> + </xsl:when> + <xsl:when test="@contentdepth"> + <xsl:call-template name="length-spec"> + <xsl:with-param name="length" select="@contentdepth"/> + <xsl:with-param name="default.units" select="'px'"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="number($scale) != 1.0"> + <xsl:value-of select="$scale * 100"/> + <xsl:text>%</xsl:text> + </xsl:when> + <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when> + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="image.align"> + <xsl:value-of select="@align"/> +</xsl:template> + +<xsl:template name="image.valign"> + <xsl:choose> + <xsl:when test="@valign = 'top'">before</xsl:when> + <xsl:when test="@valign = 'middle'">center</xsl:when> + <xsl:when test="@valign = 'bottom'">after</xsl:when> + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template name="process.image"> <!-- When this template is called, the current node should be --> <!-- a graphic, inlinegraphic, imagedata, or videodata. All --> <!-- those elements have the same set of attributes, so we can --> <!-- handle them all in one place. --> + <!-- Compute each attribute value with its own customizable template call --> <xsl:variable name="scalefit"> - <xsl:choose> - <xsl:when test="$ignore.image.scaling != 0">0</xsl:when> - <xsl:when test="@contentwidth">0</xsl:when> - <xsl:when test="@contentdepth and - @contentdepth != '100%'">0</xsl:when> - <xsl:when test="@scale">0</xsl:when> - <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when> - <xsl:when test="@width or @depth">1</xsl:when> - <xsl:when test="$default.image.width != ''">1</xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> + <xsl:call-template name="image.scalefit"/> </xsl:variable> <xsl:variable name="scale"> - <xsl:choose> - <xsl:when test="$ignore.image.scaling != 0">0</xsl:when> - <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when> - <xsl:when test="@scale"> - <xsl:value-of select="@scale div 100.0"/> - </xsl:when> - <xsl:otherwise>1.0</xsl:otherwise> - </xsl:choose> + <xsl:call-template name="image.scale"/> </xsl:variable> <xsl:variable name="filename"> + <xsl:call-template name="image.filename"/> + </xsl:variable> + + <xsl:variable name="src"> + <xsl:call-template name="image.src"> + <xsl:with-param name="filename" select="$filename"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="content.type"> + <xsl:call-template name="image.content.type"/> + </xsl:variable> + + <xsl:variable name="bgcolor"> + <xsl:call-template name="image.bgcolor"/> + </xsl:variable> + + <xsl:variable name="width"> + <xsl:call-template name="image.width"/> + </xsl:variable> + + <xsl:variable name="height"> + <xsl:call-template name="image.height"/> + </xsl:variable> + + <xsl:variable name="content.width"> + <xsl:call-template name="image.content.width"> + <xsl:with-param name="scalefit" select="$scalefit"/> + <xsl:with-param name="scale" select="$scale"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="content.height"> + <xsl:call-template name="image.content.height"> + <xsl:with-param name="scalefit" select="$scalefit"/> + <xsl:with-param name="scale" select="$scale"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="align"> + <xsl:call-template name="image.align"/> + </xsl:variable> + + <xsl:variable name="valign"> + <xsl:call-template name="image.valign"/> + </xsl:variable> + + <xsl:variable name="element.name"> <xsl:choose> - <xsl:when test="local-name(.) = 'graphic' - or local-name(.) = 'inlinegraphic'"> - <!-- handle legacy graphic and inlinegraphic by new template --> - <xsl:call-template name="mediaobject.filename"> - <xsl:with-param name="object" select="."/> - </xsl:call-template> + <xsl:when test="svg:*" xmlns:svg="http://www.w3.org/2000/svg"> + <xsl:text>fo:instream-foreign-object</xsl:text> </xsl:when> + <xsl:when test="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> + <xsl:text>fo:instream-foreign-object</xsl:text> + </xsl:when> <xsl:otherwise> - <!-- imagedata, videodata, audiodata --> - <xsl:call-template name="mediaobject.filename"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> + <xsl:text>fo:external-graphic</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:variable name="content-type"> - <xsl:if test="@format"> - <xsl:call-template name="graphic.format.content-type"> - <xsl:with-param name="format" select="@format"/> - </xsl:call-template> + <xsl:element name="{$element.name}"> + + <xsl:if test="$src != ''"> + <xsl:attribute name="src"> + <xsl:value-of select="$src"/> + </xsl:attribute> </xsl:if> - </xsl:variable> - <xsl:variable name="bgcolor"> - <xsl:call-template name="pi.dbfo_background-color"> - <xsl:with-param name="node" select=".."/> - </xsl:call-template> - </xsl:variable> + <xsl:if test="$width != ''"> + <xsl:attribute name="width"> + <xsl:value-of select="$width"/> + </xsl:attribute> + </xsl:if> - <fo:external-graphic> - <xsl:attribute name="src"> - <xsl:call-template name="fo-external-image"> - <xsl:with-param name="filename"> - <xsl:if test="$img.src.path != '' and - not(starts-with($filename, '/')) and - not(contains($filename, '://'))"> - <xsl:value-of select="$img.src.path"/> - </xsl:if> - <xsl:value-of select="$filename"/> - </xsl:with-param> - </xsl:call-template> - </xsl:attribute> + <xsl:if test="$height != ''"> + <xsl:attribute name="height"> + <xsl:value-of select="$height"/> + </xsl:attribute> + </xsl:if> - <xsl:attribute name="width"> - <xsl:choose> - <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> - <xsl:when test="contains(@width,'%')"> - <xsl:value-of select="@width"/> - </xsl:when> - <xsl:when test="@width and not(@width = '')"> - <xsl:call-template name="length-spec"> - <xsl:with-param name="length" select="@width"/> - <xsl:with-param name="default.units" select="'px'"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="not(@depth) and $default.image.width != ''"> - <xsl:call-template name="length-spec"> - <xsl:with-param name="length" select="$default.image.width"/> - <xsl:with-param name="default.units" select="'px'"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise>auto</xsl:otherwise> - </xsl:choose> - </xsl:attribute> + <xsl:if test="$content.width != ''"> + <xsl:attribute name="content-width"> + <xsl:value-of select="$content.width"/> + </xsl:attribute> + </xsl:if> - <xsl:attribute name="height"> - <xsl:choose> - <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> - <xsl:when test="contains(@depth,'%')"> - <xsl:value-of select="@depth"/> - </xsl:when> - <xsl:when test="@depth"> - <xsl:call-template name="length-spec"> - <xsl:with-param name="length" select="@depth"/> - <xsl:with-param name="default.units" select="'px'"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise>auto</xsl:otherwise> - </xsl:choose> - </xsl:attribute> + <xsl:if test="$content.height != ''"> + <xsl:attribute name="content-height"> + <xsl:value-of select="$content.height"/> + </xsl:attribute> + </xsl:if> - <xsl:attribute name="content-width"> - <xsl:choose> - <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> - <xsl:when test="contains(@contentwidth,'%')"> - <xsl:value-of select="@contentwidth"/> - </xsl:when> - <xsl:when test="@contentwidth"> - <xsl:call-template name="length-spec"> - <xsl:with-param name="length" select="@contentwidth"/> - <xsl:with-param name="default.units" select="'px'"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="number($scale) != 1.0"> - <xsl:value-of select="$scale * 100"/> - <xsl:text>%</xsl:text> - </xsl:when> - <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when> - <xsl:otherwise>auto</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <xsl:attribute name="content-height"> - <xsl:choose> - <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when> - <xsl:when test="contains(@contentdepth,'%')"> - <xsl:value-of select="@contentdepth"/> - </xsl:when> - <xsl:when test="@contentdepth"> - <xsl:call-template name="length-spec"> - <xsl:with-param name="length" select="@contentdepth"/> - <xsl:with-param name="default.units" select="'px'"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="number($scale) != 1.0"> - <xsl:value-of select="$scale * 100"/> - <xsl:text>%</xsl:text> - </xsl:when> - <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when> - <xsl:otherwise>auto</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <xsl:if test="$content-type != ''"> + <xsl:if test="$content.type != ''"> <xsl:attribute name="content-type"> - <xsl:value-of select="concat('content-type:',$content-type)"/> + <xsl:value-of select="concat('content-type:',$content.type)"/> </xsl:attribute> </xsl:if> @@ -304,23 +443,28 @@ </xsl:attribute> </xsl:if> - <xsl:if test="@align"> + <xsl:if test="$align != ''"> <xsl:attribute name="text-align"> - <xsl:value-of select="@align"/> + <xsl:value-of select="$align"/> </xsl:attribute> </xsl:if> - <xsl:if test="@valign"> + <xsl:if test="$valign != ''"> <xsl:attribute name="display-align"> - <xsl:choose> - <xsl:when test="@valign = 'top'">before</xsl:when> - <xsl:when test="@valign = 'middle'">center</xsl:when> - <xsl:when test="@valign = 'bottom'">after</xsl:when> - <xsl:otherwise>auto</xsl:otherwise> - </xsl:choose> + <xsl:value-of select="$valign"/> </xsl:attribute> </xsl:if> - </fo:external-graphic> + + <!-- copy literal SVG elements to output --> + <xsl:if test="svg:*" xmlns:svg="http://www.w3.org/2000/svg"> + <xsl:call-template name="process.svg"/> + </xsl:if> + + <xsl:if test="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> + <xsl:call-template name="process.mml"/> + </xsl:if> + + </xsl:element> </xsl:template> <!-- ==================================================================== --> @@ -490,28 +634,27 @@ <xsl:copy/> </xsl:template> +<xsl:template name="process.mml"> + <xsl:apply-templates mode="copy-all" select="*"/> +</xsl:template> + +<xsl:template name="process.svg"> + <xsl:apply-templates mode="copy-all" select="*"/> +</xsl:template> + <!-- ==================================================================== --> <xsl:template match="imagedata"> - <xsl:variable name="vendor" select="system-property('xsl:vendor')"/> - <xsl:variable name="filename"> - <xsl:call-template name="mediaobject.filename"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:variable> - <xsl:choose> - <xsl:when test="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> - <xsl:apply-templates/> - </xsl:when> + <xsl:when test="@format='linespecific'"> + <xsl:variable name="vendor" select="system-property('xsl:vendor')"/> + + <xsl:variable name="filename"> + <xsl:call-template name="mediaobject.filename"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> + </xsl:variable> - <xsl:when test="svg:*" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:instream-foreign-object> - <xsl:apply-templates mode="copy-all" select="*"/> - </fo:instream-foreign-object> - </xsl:when> - - <xsl:when test="@format='linespecific'"> <xsl:choose> <xsl:when test="$use.extensions != '0' and $textinsert.extension != '0'"> Modified: trunk/xsl/fo/math.xsl =================================================================== --- trunk/xsl/fo/math.xsl 2012-01-03 19:55:59 UTC (rev 9175) +++ trunk/xsl/fo/math.xsl 2012-01-08 23:43:19 UTC (rev 9176) @@ -39,36 +39,6 @@ </fo:inline> </xsl:template> -<!-- "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> -</xsl:template> - -<xsl:template match="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML"> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates/> - </xsl:copy> -</xsl:template> - <xsl:template match="equation/graphic | informalequation/graphic"> <xsl:if test="$passivetex.extensions = 0 or $tex.math.in.alt = ''"> <fo:block> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-02-01 05:23:02
|
Revision: 9226 http://docbook.svn.sourceforge.net/docbook/?rev=9226&view=rev Author: bobstayton Date: 2012-02-01 05:22:56 +0000 (Wed, 01 Feb 2012) Log Message: ----------- Add table.caption.properties to format table captions. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2012-02-01 05:21:37 UTC (rev 9225) +++ trunk/xsl/fo/param.ent 2012-02-01 05:22:56 UTC (rev 9226) @@ -356,3 +356,4 @@ <!ENTITY outer.region.content.properties SYSTEM "../params/outer.region.content.properties.xml"> <!ENTITY region.inner.properties SYSTEM "../params/region.inner.properties.xml"> <!ENTITY region.outer.properties SYSTEM "../params/region.outer.properties.xml"> +<!ENTITY table.caption.properties SYSTEM "../params/table.caption.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2012-02-01 05:21:37 UTC (rev 9225) +++ trunk/xsl/fo/param.xweb 2012-02-01 05:22:56 UTC (rev 9226) @@ -163,6 +163,7 @@ &table.cell.border.style; &table.cell.border.color; &table.table.properties; +&table.caption.properties; </reference> <reference xml:id="links"><title>Linking</title> ¤t.docid; @@ -872,6 +873,7 @@ <src:fragref linkend="table.properties.frag"/> <src:fragref linkend="tablecolumns.extension.frag"/> <src:fragref linkend="table.table.properties.frag"/> +<src:fragref linkend="table.caption.properties.frag"/> <src:fragref linkend="target.database.document.frag"/> <src:fragref linkend="targets.filename.frag"/> <src:fragref linkend="task.properties.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-03-02 18:38:48
|
Revision: 9238 http://docbook.svn.sourceforge.net/docbook/?rev=9238&view=rev Author: bobstayton Date: 2012-03-02 18:38:42 +0000 (Fri, 02 Mar 2012) Log Message: ----------- Add new para.properties attribute-set for paragraphs. Modified Paths: -------------- trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2012-03-02 18:35:14 UTC (rev 9237) +++ trunk/xsl/fo/param.ent 2012-03-02 18:38:42 UTC (rev 9238) @@ -357,3 +357,4 @@ <!ENTITY region.inner.properties SYSTEM "../params/region.inner.properties.xml"> <!ENTITY region.outer.properties SYSTEM "../params/region.outer.properties.xml"> <!ENTITY table.caption.properties SYSTEM "../params/table.caption.properties.xml"> +<!ENTITY para.properties SYSTEM "../params/para.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2012-03-02 18:35:14 UTC (rev 9237) +++ trunk/xsl/fo/param.xweb 2012-03-02 18:38:42 UTC (rev 9238) @@ -403,6 +403,7 @@ ®ion.outer.extent; &default.units; &normal.para.spacing; +¶.properties; &body.font.master; &body.font.size; &footnote.font.size; @@ -920,6 +921,7 @@ <src:fragref linkend="outer.region.content.properties.frag"/> <src:fragref linkend="region.inner.properties.frag"/> <src:fragref linkend="region.outer.properties.frag"/> +<src:fragref linkend="para.properties.frag"/> </xsl:stylesheet> </src:fragment> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-03-19 20:02:55
|
Revision: 9247 http://docbook.svn.sourceforge.net/docbook/?rev=9247&view=rev Author: bobstayton Date: 2012-03-19 20:02:49 +0000 (Mon, 19 Mar 2012) Log Message: ----------- Add make.component.tocs to support lists of tables, etc. for article and other components. Added component.list.of.tables to titlepage.templates.xml to format the title. Modified Paths: -------------- trunk/xsl/fo/autotoc.xsl trunk/xsl/fo/component.xsl trunk/xsl/fo/titlepage.templates.xml Modified: trunk/xsl/fo/autotoc.xsl =================================================================== --- trunk/xsl/fo/autotoc.xsl 2012-03-19 17:29:30 UTC (rev 9246) +++ trunk/xsl/fo/autotoc.xsl 2012-03-19 20:02:49 UTC (rev 9247) @@ -856,6 +856,44 @@ </xsl:if> </xsl:template> +<xsl:template name="component.list.of.titles"> + <xsl:param name="titles" select="'table'"/> + <xsl:param name="nodes" select=".//table"/> + <xsl:param name="toc-context" select="."/> + + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + + <xsl:if test="$nodes"> + <fo:block id="lot...{$titles}...{$id}"> + <xsl:choose> + <xsl:when test="$titles='table'"> + <xsl:call-template name="component.list.of.tables.titlepage"/> + </xsl:when> + <xsl:when test="$titles='figure'"> + <xsl:call-template name="component.list.of.figures.titlepage"/> + </xsl:when> + <xsl:when test="$titles='equation'"> + <xsl:call-template name="component.list.of.equations.titlepage"/> + </xsl:when> + <xsl:when test="$titles='example'"> + <xsl:call-template name="component.list.of.examples.titlepage"/> + </xsl:when> + <xsl:when test="$titles='procedure'"> + <xsl:call-template name="component.list.of.procedures.titlepage"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="component.list.of.unknowns.titlepage"/> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="$nodes" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </fo:block> + </xsl:if> +</xsl:template> + <xsl:template match="figure|table|example|equation|procedure" mode="toc"> <xsl:param name="toc-context" select="."/> <xsl:call-template name="toc.line"> Modified: trunk/xsl/fo/component.xsl =================================================================== --- trunk/xsl/fo/component.xsl 2012-03-19 17:29:30 UTC (rev 9246) +++ trunk/xsl/fo/component.xsl 2012-03-19 20:02:49 UTC (rev 9247) @@ -440,19 +440,7 @@ <xsl:call-template name="preface.titlepage"/> </fo:block> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" - select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - <xsl:if test="contains($toc.params, 'toc')"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - <xsl:call-template name="component.toc.separator"/> - </xsl:if> + <xsl:call-template name="make.component.tocs"/> <xsl:apply-templates/> </fo:flow> @@ -533,18 +521,8 @@ <xsl:call-template name="chapter.titlepage"/> </fo:block> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - <xsl:if test="contains($toc.params, 'toc')"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - <xsl:call-template name="component.toc.separator"/> - </xsl:if> + <xsl:call-template name="make.component.tocs"/> + <xsl:apply-templates/> </fo:flow> </fo:page-sequence> @@ -624,19 +602,8 @@ <xsl:call-template name="appendix.titlepage"/> </fo:block> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> + <xsl:call-template name="make.component.tocs"/> - <xsl:if test="contains($toc.params, 'toc')"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - <xsl:call-template name="component.toc.separator"/> - </xsl:if> <xsl:apply-templates/> </fo:flow> </fo:page-sequence> @@ -716,19 +683,8 @@ <xsl:call-template name="article.titlepage"/> </fo:block> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> + <xsl:call-template name="make.component.tocs"/> - <xsl:if test="contains($toc.params, 'toc')"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - <xsl:call-template name="component.toc.separator"/> - </xsl:if> <xsl:apply-templates/> </fo:flow> </fo:page-sequence> @@ -787,20 +743,8 @@ <xsl:copy-of select="$title"/> </fo:block> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> + <xsl:call-template name="make.component.tocs"/> - <xsl:if test="contains($toc.params, 'toc')"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - <xsl:call-template name="component.toc.separator"/> - </xsl:if> - <xsl:apply-templates/> </fo:block> </xsl:template> @@ -897,5 +841,71 @@ </fo:page-sequence> </xsl:template> +<xsl:template name="make.component.tocs"> + + <xsl:variable name="toc.params"> + <xsl:call-template name="find.path.params"> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + </xsl:call-template> + </xsl:variable> + + <xsl:if test="contains($toc.params, 'toc')"> + <xsl:call-template name="component.toc"> + <xsl:with-param name="toc.title.p" + select="contains($toc.params, 'title')"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="contains($toc.params,'figure') and .//figure"> + <xsl:call-template name="component.list.of.titles"> + <xsl:with-param name="titles" select="'figure'"/> + <xsl:with-param name="nodes" select=".//figure"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="contains($toc.params,'table') and .//table"> + <xsl:call-template name="component.list.of.titles"> + <xsl:with-param name="titles" select="'table'"/> + <xsl:with-param name="nodes" select=".//table[not(@tocentry = 0)]"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="contains($toc.params,'example') and .//example"> + <xsl:call-template name="component.list.of.titles"> + <xsl:with-param name="titles" select="'example'"/> + <xsl:with-param name="nodes" select=".//example"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="contains($toc.params,'equation') and + .//equation[title or info/title]"> + <xsl:call-template name="component.list.of.titles"> + <xsl:with-param name="titles" select="'equation'"/> + <xsl:with-param name="nodes" + select=".//equation[title or info/title]"/> + </xsl:call-template> + </xsl:if> + + <xsl:if test="contains($toc.params,'procedure') and + .//procedure[title or info/title]"> + <xsl:call-template name="component.list.of.titles"> + <xsl:with-param name="titles" select="'procedure'"/> + <xsl:with-param name="nodes" + select=".//procedure[title or info/title]"/> + </xsl:call-template> + </xsl:if> + + <xsl:choose> + <xsl:when test="$toc.params = ''"> + </xsl:when> + <xsl:when test="$toc.params = 'nop'"> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="component.toc.separator"/> + </xsl:otherwise> + </xsl:choose> + +</xsl:template> + </xsl:stylesheet> Modified: trunk/xsl/fo/titlepage.templates.xml =================================================================== --- trunk/xsl/fo/titlepage.templates.xml 2012-03-19 17:29:30 UTC (rev 9246) +++ trunk/xsl/fo/titlepage.templates.xml 2012-03-19 20:02:49 UTC (rev 9247) @@ -1382,6 +1382,180 @@ </t:titlepage-before> </t:titlepage> + <t:titlepage t:element="component.list.of.tables" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="gentext" + param:key="'ListofTables'" + space-before.minimum="1em" + space-before.optimum="1em" + space-before.maximum="1em" + space-after="0.5em" + margin-left="{$title.margin.left}" + font-size="&hsize1;" + font-weight="bold" + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> + </t:titlepage> + + <t:titlepage t:element="component.list.of.figures" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="gentext" + param:key="'ListofFigures'" + space-before.minimum="1em" + space-before.optimum="1em" + space-before.maximum="1em" + space-after="0.5em" + margin-left="{$title.margin.left}" + font-size="&hsize1;" + font-weight="bold" + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> + </t:titlepage> + + <t:titlepage t:element="component.list.of.examples" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="gentext" + param:key="'ListofExamples'" + space-before.minimum="1em" + space-before.optimum="1em" + space-before.maximum="1em" + space-after="0.5em" + margin-left="{$title.margin.left}" + font-size="&hsize1;" + font-weight="bold" + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> + </t:titlepage> + + <t:titlepage t:element="component.list.of.equations" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="gentext" + param:key="'ListofEquations'" + space-before.minimum="1em" + space-before.optimum="1em" + space-before.maximum="1em" + space-after="0.5em" + margin-left="{$title.margin.left}" + font-size="&hsize1;" + font-weight="bold" + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> + </t:titlepage> + + <t:titlepage t:element="component.list.of.procedures" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="gentext" + param:key="'ListofProcedures'" + space-before.minimum="1em" + space-before.optimum="1em" + space-before.maximum="1em" + space-after="0.5em" + margin-left="{$title.margin.left}" + font-size="&hsize1;" + font-weight="bold" + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> + </t:titlepage> + + <t:titlepage t:element="component.list.of.unknowns" t:wrapper="fo:block"> + <t:titlepage-content t:side="recto"> + <title + t:force="1" + t:named-template="gentext" + param:key="'ListofUnknown'" + space-before.minimum="1em" + space-before.optimum="1em" + space-before.maximum="1em" + space-after="0.5em" + margin-left="{$title.margin.left}" + font-size="&hsize1;" + font-weight="bold" + font-family="{$title.fontset}"/> + </t:titlepage-content> + + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> + </t:titlepage> + <!-- ==================================================================== --> </t:templates> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |