From: Jirka K. <ko...@us...> - 2003-05-15 18:00:38
|
Update of /cvsroot/docbook/xsl/fo In directory sc8-pr-cvs1:/tmp/cvs-serv18246/fo Modified Files: autoidx.xsl autotoc.xsl component.xsl division.xsl docbook.xsl index.xsl param.ent param.xweb refentry.xsl sections.xsl Log Message: Added support for AntennaHouse XSL Formatter. You can use axf.extensions=1 setting to generate bookmarks, document info and to merge duplicate page numbers in index. Index: autoidx.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/autoidx.xsl,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** autoidx.xsl 14 May 2003 12:34:42 -0000 1.23 --- autoidx.xsl 15 May 2003 17:30:34 -0000 1.24 *************** *** 15,18 **** --- 15,19 ---- xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:rx="http://www.renderx.com/XSL/Extensions" + xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions" version="1.0"> *************** *** 154,157 **** --- 155,161 ---- <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/> <fo:block> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute> + </xsl:if> <xsl:value-of select="primary"/> *************** *** 224,227 **** --- 228,234 ---- <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/> <fo:block> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute> + </xsl:if> <xsl:value-of select="secondary"/> *************** *** 295,298 **** --- 302,308 ---- <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/> <fo:block> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute> + </xsl:if> <xsl:value-of select="tertiary"/> Index: autotoc.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/autotoc.xsl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** autotoc.xsl 23 Jan 2003 12:08:22 -0000 1.15 --- autotoc.xsl 15 May 2003 17:30:34 -0000 1.16 *************** *** 2,5 **** --- 2,6 ---- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions" version='1.0'> *************** *** 34,37 **** --- 35,47 ---- <fo:block id="toc...{$id}" xsl:use-attribute-sets="toc.margin.properties"> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:outline-level">1</xsl:attribute> + <xsl:attribute name="axf:outline-expand">false</xsl:attribute> + <xsl:attribute name="axf:outline-title"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'TableofContents'"/> + </xsl:call-template> + </xsl:attribute> + </xsl:if> <xsl:call-template name="table.of.contents.titlepage"/> <xsl:apply-templates select="$nodes" mode="toc"> *************** *** 65,68 **** --- 75,87 ---- <fo:block id="toc...{$cid}" xsl:use-attribute-sets="toc.margin.properties"> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:outline-level">1</xsl:attribute> + <xsl:attribute name="axf:outline-expand">false</xsl:attribute> + <xsl:attribute name="axf:outline-title"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'TableofContents'"/> + </xsl:call-template> + </xsl:attribute> + </xsl:if> <xsl:call-template name="table.of.contents.titlepage"/> <xsl:apply-templates select="$nodes" mode="toc"> Index: component.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/component.xsl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** component.xsl 12 Apr 2003 20:56:04 -0000 1.20 --- component.xsl 15 May 2003 17:30:35 -0000 1.21 *************** *** 2,5 **** --- 2,6 ---- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions" version='1.0'> *************** *** 64,67 **** --- 65,77 ---- </xsl:call-template> </xsl:attribute> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:outline-level"> + <xsl:value-of select="count($node/ancestor::*)"/> + </xsl:attribute> + <xsl:attribute name="axf:outline-expand">false</xsl:attribute> + <xsl:attribute name="axf:outline-title"> + <xsl:value-of select="$title"/> + </xsl:attribute> + </xsl:if> <xsl:copy-of select="$title"/> </fo:block> Index: division.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/division.xsl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** division.xsl 12 Apr 2003 20:56:25 -0000 1.20 --- division.xsl 15 May 2003 17:30:35 -0000 1.21 *************** *** 2,5 **** --- 2,6 ---- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions" version='1.0'> *************** *** 37,40 **** --- 38,55 ---- <fo:block keep-with-next.within-column="always" hyphenate="false"> + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:outline-level"> + <xsl:choose> + <xsl:when test="count($node/ancestor::*) > 0"> + <xsl:value-of select="count($node/ancestor::*)"/> + </xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="axf:outline-expand">false</xsl:attribute> + <xsl:attribute name="axf:outline-title"> + <xsl:value-of select="$title"/> + </xsl:attribute> + </xsl:if> <xsl:copy-of select="$title"/> </fo:block> Index: docbook.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/docbook.xsl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** docbook.xsl 14 Apr 2003 15:22:14 -0000 1.22 --- docbook.xsl 15 May 2003 17:30:35 -0000 1.23 *************** *** 70,73 **** --- 70,74 ---- <xsl:include href="passivetex.xsl"/> <xsl:include href="xep.xsl"/> + <xsl:include href="axf.xsl"/> <xsl:param name="stylesheet.result.type" select="'fo'"/> *************** *** 123,126 **** --- 124,130 ---- <xsl:if test="$xep.extensions != 0"> <xsl:call-template name="xep-document-information"/> + </xsl:if> + <xsl:if test="$axf.extensions != 0"> + <xsl:call-template name="axf-document-information"/> </xsl:if> <xsl:call-template name="setup.pagemasters"/> Index: index.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/index.xsl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** index.xsl 14 May 2003 12:34:42 -0000 1.21 --- index.xsl 15 May 2003 17:30:35 -0000 1.22 *************** *** 258,262 **** <xsl:template match="indexterm" name="indexterm"> ! <fo:wrapper> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> --- 258,270 ---- <xsl:template match="indexterm" name="indexterm"> ! <!-- Temporal workaround for bug in AXF --> ! <xsl:variable name="wrapper.name"> ! <xsl:choose> ! <xsl:when test="$axf.extensions != 0">fo:block</xsl:when> ! <xsl:otherwise>fo:wrapper</xsl:otherwise> ! </xsl:choose> ! </xsl:variable> ! ! <xsl:element name="{$wrapper.name}"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> *************** *** 294,298 **** </xsl:otherwise> </xsl:choose> ! </fo:wrapper> </xsl:template> --- 302,306 ---- </xsl:otherwise> </xsl:choose> ! </xsl:element> </xsl:template> Index: param.ent =================================================================== RCS file: /cvsroot/docbook/xsl/fo/param.ent,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -r1.47 -r1.48 *** param.ent 14 May 2003 12:34:42 -0000 1.47 --- param.ent 15 May 2003 17:30:35 -0000 1.48 *************** *** 10,13 **** --- 10,14 ---- <!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 biblioentry.item.separator SYSTEM "../params/biblioentry.item.separator.xml"> <!ENTITY bibliography.collection SYSTEM "../params/bibliography.collection.xml"> Index: param.xweb =================================================================== RCS file: /cvsroot/docbook/xsl/fo/param.xweb,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** param.xweb 14 May 2003 12:34:42 -0000 1.55 --- param.xweb 15 May 2003 17:30:35 -0000 1.56 *************** *** 108,111 **** --- 108,112 ---- <reference><title>Processor Extensions</title> &arbortext.extensions; + &axf.extensions; &fop.extensions; &passivetex.extensions; *************** *** 456,459 **** --- 457,461 ---- <src:fragref linkend="author.othername.in.middle.frag"/> <src:fragref linkend="autotoc.label.separator.frag"/> + <src:fragref linkend="axf.extensions.frag"/> <src:fragref linkend="biblioentry.item.separator.frag"/> <src:fragref linkend="bibliography.collection.frag"/> Index: refentry.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/refentry.xsl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** refentry.xsl 12 Apr 2003 21:00:15 -0000 1.14 --- refentry.xsl 15 May 2003 17:30:35 -0000 1.15 *************** *** 2,5 **** --- 2,6 ---- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions" version='1.0'> *************** *** 392,395 **** --- 393,406 ---- <xsl:value-of select="$title"/> </fotex:bookmark> + </xsl:if> + + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:outline-level"> + <xsl:value-of select="count(ancestor::*)-1"/> + </xsl:attribute> + <xsl:attribute name="axf:outline-expand">false</xsl:attribute> + <xsl:attribute name="axf:outline-title"> + <xsl:value-of select="$title"/> + </xsl:attribute> </xsl:if> Index: sections.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/sections.xsl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** sections.xsl 12 Apr 2003 21:00:54 -0000 1.25 --- sections.xsl 15 May 2003 17:30:35 -0000 1.26 *************** *** 2,5 **** --- 2,6 ---- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions" version='1.0'> *************** *** 148,151 **** --- 149,162 ---- <xsl:value-of select="$titleabbrev"/> </fotex:bookmark> + </xsl:if> + + <xsl:if test="$axf.extensions != 0"> + <xsl:attribute name="axf:outline-level"> + <xsl:value-of select="count(ancestor::*)-1"/> + </xsl:attribute> + <xsl:attribute name="axf:outline-expand">false</xsl:attribute> + <xsl:attribute name="axf:outline-title"> + <xsl:value-of select="$title"/> + </xsl:attribute> </xsl:if> |