You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2007/03/02 00:25:27 UTC
svn commit: r513493 - /db/derby/docs/trunk/lib/
Author: fuzzylogic
Date: Thu Mar 1 13:13:24 2007
New Revision: 513493
URL: http://svn.apache.org/viewvc?view=rev&rev=513493
Log:
DERBY-2373: Upgrade Derby documentation PDF builds to use FOP 0.93
Added:
db/derby/docs/trunk/lib/avalon-framework-4.2.0.jar (with props)
db/derby/docs/trunk/lib/batik-all-1.6.jar (with props)
db/derby/docs/trunk/lib/commons-io-1.1.jar (with props)
db/derby/docs/trunk/lib/commons-logging-1.0.4.jar (with props)
db/derby/docs/trunk/lib/serializer-2.7.0.jar (with props)
db/derby/docs/trunk/lib/xalan-2.7.0.jar (with props)
db/derby/docs/trunk/lib/xercesImpl-2.7.1.jar (with props)
db/derby/docs/trunk/lib/xml-apis-1.3.02.jar (with props)
db/derby/docs/trunk/lib/xmlgraphics-commons-1.1.jar (with props)
Removed:
db/derby/docs/trunk/lib/avalon-framework-cvs-20020806.jar
db/derby/docs/trunk/lib/batik.jar
Modified:
db/derby/docs/trunk/lib/dita2fo-shell.xsl
db/derby/docs/trunk/lib/dita2fo-subroutines.xsl
db/derby/docs/trunk/lib/fop.jar
Added: db/derby/docs/trunk/lib/avalon-framework-4.2.0.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/avalon-framework-4.2.0.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/avalon-framework-4.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/batik-all-1.6.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/batik-all-1.6.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/batik-all-1.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/commons-io-1.1.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/commons-io-1.1.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/commons-io-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/commons-logging-1.0.4.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/commons-logging-1.0.4.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/commons-logging-1.0.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: db/derby/docs/trunk/lib/dita2fo-shell.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/dita2fo-shell.xsl?view=diff&rev=513493&r1=513492&r2=513493
==============================================================================
--- db/derby/docs/trunk/lib/dita2fo-shell.xsl (original)
+++ db/derby/docs/trunk/lib/dita2fo-shell.xsl Thu Mar 1 13:13:24 2007
@@ -72,10 +72,10 @@
<!-- this template rule defines the overall output organization -->
<xsl:template name="dita-setup">
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <!-- create FOP outline elements for PDF bookmarks -->
- <xsl:apply-templates mode="outline"/>
<!-- get the overall master page defs here -->
<xsl:call-template name="define-page-masters-dita"/>
+ <!-- create FOP outline elements for PDF bookmarks -->
+ <xsl:call-template name="create-bookmark-tree"/>
<!-- place generated content -->
<xsl:call-template name="front-covers"/>
<!--xsl:call-template name="titlepage-ednotice"/-->
@@ -88,14 +88,26 @@
</fo:root>
</xsl:template>
<!-- create FOP outline elements for PDF bookmarks -->
+ <xsl:template name="create-bookmark-tree">
+ <fo:bookmark-tree>
+ <!-- hard code bookmarks for the table of contents and cover -->
+ <fo:bookmark internal-destination="cover">
+ <fo:bookmark-title>Cover</fo:bookmark-title>
+ </fo:bookmark>
+ <fo:bookmark internal-destination="contents">
+ <fo:bookmark-title>Contents</fo:bookmark-title>
+ </fo:bookmark>
+ <xsl:apply-templates mode="outline"/>
+ </fo:bookmark-tree>
+ </xsl:template>
<xsl:template match="*" mode="outline">
<xsl:if test="contains(@class,' topic/topic ')">
- <fox:outline>
+ <fo:bookmark>
<xsl:attribute name="internal-destination">
<!-- use id attribute node to generate anchor for PDF bookmark fix bug#1304859 -->
<xsl:value-of select="@id"/>
</xsl:attribute>
- <fox:label>
+ <fo:bookmark-title>
<!-- if topic contains navtitle, use that as label for PDF bookmark -->
<!-- otherwise, use title -->
<xsl:choose>
@@ -106,9 +118,9 @@
<xsl:apply-templates select="title" mode="text-only"/>
</xsl:otherwise>
</xsl:choose>
- </fox:label>
+ </fo:bookmark-title>
<xsl:apply-templates mode="outline" />
- </fox:outline>
+ </fo:bookmark>
</xsl:if>
</xsl:template>
<xsl:template match="*" mode="text-only">
@@ -161,7 +173,7 @@
<!-- Custom cover art/text goes here -->
<xsl:call-template name="place-cover-art"/>
<!-- End of custom art section -->
- <fo:block text-align="left" font-family="Helvetica">
+ <fo:block text-align="left" font-family="Helvetica" id="cover">
<!-- set the brand and title -->
<fo:block font-size="22pt" font-weight="bold" line-height="140%">
<xsl:value-of select="//*[contains(@class,' topic/prodinfo ')]/*[contains(@class,' topic/prodname ')]"/>
@@ -256,7 +268,7 @@
<fo:leader color="black" leader-pattern="rule"
rule-thickness="3pt" leader-length="2in"/>
</fo:block>
- <fo:block font-size="20pt" font-weight="bold" line-height="140%">
+ <fo:block font-size="20pt" font-weight="bold" line-height="140%" id="contents">
Contents </fo:block>
<xsl:call-template name="gen-toc"/>
</fo:block>
Modified: db/derby/docs/trunk/lib/dita2fo-subroutines.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/dita2fo-subroutines.xsl?view=diff&rev=513493&r1=513492&r2=513493
==============================================================================
--- db/derby/docs/trunk/lib/dita2fo-subroutines.xsl (original)
+++ db/derby/docs/trunk/lib/dita2fo-subroutines.xsl Thu Mar 1 13:13:24 2007
@@ -38,12 +38,13 @@
<xsl:template match="@id">
<!-- Filler for A-name anchors (empty links)-->
<xsl:variable name="afill"></xsl:variable>
- <fo:inline>
+ <fo:block>
<xsl:attribute name="id">
<!--We delete the line to get parent id here -->
<xsl:value-of select="."/><!-- generate id according to current node -->
</xsl:attribute>
- <xsl:value-of select="$afill"/></fo:inline>
+ <xsl:value-of select="$afill"/>
+ </fo:block>
</xsl:template>
Modified: db/derby/docs/trunk/lib/fop.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/fop.jar?view=diff&rev=513493&r1=513492&r2=513493
==============================================================================
Binary files - no diff available.
Added: db/derby/docs/trunk/lib/serializer-2.7.0.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/serializer-2.7.0.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/serializer-2.7.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/xalan-2.7.0.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/xalan-2.7.0.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/xalan-2.7.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/xercesImpl-2.7.1.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/xercesImpl-2.7.1.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/xercesImpl-2.7.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/xml-apis-1.3.02.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/xml-apis-1.3.02.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/xml-apis-1.3.02.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/docs/trunk/lib/xmlgraphics-commons-1.1.jar
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/xmlgraphics-commons-1.1.jar?view=auto&rev=513493
==============================================================================
Binary file - no diff available.
Propchange: db/derby/docs/trunk/lib/xmlgraphics-commons-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream