diff options
Diffstat (limited to 'src/documentation/forrest.diff')
| -rw-r--r-- | src/documentation/forrest.diff | 144 |
1 files changed, 9 insertions, 135 deletions
diff --git a/src/documentation/forrest.diff b/src/documentation/forrest.diff index be5796db1..ad81726c6 100644 --- a/src/documentation/forrest.diff +++ b/src/documentation/forrest.diff @@ -1,78 +1,14 @@ -Index: src/resources/skins/common/xslt/fo/pdfoutline.xsl -=================================================================== -RCS file: /home/cvspublic/xml-forrest/src/resources/skins/common/xslt/fo/pdfoutline.xsl,v -retrieving revision 1.1 -diff -u -r1.1 pdfoutline.xsl ---- src/resources/skins/common/xslt/fo/pdfoutline.xsl 3 Dec 2002 00:23:19 -0000 1.1 -+++ src/resources/skins/common/xslt/fo/pdfoutline.xsl 3 Dec 2002 10:57:33 -0000 -@@ -1,26 +1,22 @@ - <?xml version="1.0" encoding="UTF-8"?> --<!DOCTYPE xsl:stylesheet [ --<!ENTITY copy "©"> --<!ENTITY nbsp " "> --<!ENTITY degr "º"> --<!ENTITY sup2 "²"> --<!ENTITY sup3 "³">]> --<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions" xmlns:documentation="http://sealcorp.com.au/documentation"> -+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions"> - - <xsl:template match="document" mode="outline"> -- <fox:outline internal-destination="{generate-id()}"> -- <fox:label> -- <xsl:value-of select="header/title"/> -- <xsl:text> - </xsl:text> -- <xsl:value-of select="header/authors/person/@name"/> -- </fox:label> -- <xsl:apply-templates select="body/section" mode="outline"/> -- </fox:outline> -+ <fox:bookmarks> -+ <fox:outline internal-destination="{generate-id()}"> -+ <fox:label> -+ <xsl:value-of select="header/title"/> -+ </fox:label> -+ <xsl:apply-templates select="body/section" mode="outline"/> -+ </fox:outline> -+ </fox:bookmarks> - </xsl:template> - - <xsl:template match="section" mode="outline"> - <fox:outline internal-destination="{generate-id()}"> - <fox:label> -+ <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/> -+ <xsl:text> </xsl:text> - <xsl:value-of select="title"/> - </fox:label> - <xsl:apply-templates select="section" mode="outline"/> Index: src/resources/skins/common/xslt/fo/document2fo.xsl =================================================================== RCS file: /home/cvspublic/xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl,v -retrieving revision 1.3 -diff -u -r1.3 document2fo.xsl ---- src/resources/skins/common/xslt/fo/document2fo.xsl 3 Dec 2002 00:23:19 -0000 1.3 -+++ src/resources/skins/common/xslt/fo/document2fo.xsl 3 Dec 2002 10:57:33 -0000 -@@ -2,6 +2,7 @@ - - <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:fo="http://www.w3.org/1999/XSL/Format" -+ xmlns:fox="http://xml.apache.org/fop/extensions" - version="1.0"> - - <xsl:output method="xml"/> -@@ -84,14 +85,34 @@ - </fo:layout-master-set> - - <xsl:apply-templates select="/document" mode="outline"/> -- -+ - <fo:page-sequence master-reference="book"> -+ <fo:title><xsl:value-of select="document/header/title"/></fo:title> - <xsl:apply-templates/> - </fo:page-sequence> - +retrieving revision 1.4 +diff -u -r1.4 document2fo.xsl +--- src/resources/skins/common/xslt/fo/document2fo.xsl 4 Dec 2002 14:14:29 -0000 1.4 ++++ src/resources/skins/common/xslt/fo/document2fo.xsl 5 Dec 2002 09:23:13 -0000 +@@ -93,6 +93,25 @@ </fo:root> </xsl:template> -- -+ + + <xsl:template name="info"> + <fo:block-container font-style="italic" absolute-position="absolute" + left="0pt" top="0pt" right="6.25in" bottom="150pt" @@ -95,7 +31,7 @@ diff -u -r1.3 document2fo.xsl <xsl:template match="document"> <fo:title><xsl:value-of select="header/title"/></fo:title> -@@ -106,6 +127,7 @@ +@@ -107,6 +126,7 @@ text-align="start"> Page <fo:page-number/> </fo:block> @@ -103,7 +39,7 @@ diff -u -r1.3 document2fo.xsl </fo:static-content> <fo:static-content flow-name="even-header"> -@@ -114,6 +136,7 @@ +@@ -115,6 +135,7 @@ font-style="italic"> <xsl:value-of select="header/title"/> </fo:block> @@ -111,7 +47,7 @@ diff -u -r1.3 document2fo.xsl </fo:static-content> <fo:static-content flow-name="even-footer"> -@@ -135,6 +158,7 @@ +@@ -136,6 +157,7 @@ font-style="italic"> <xsl:value-of select="header/title"/> </fo:block> @@ -119,65 +55,3 @@ diff -u -r1.3 document2fo.xsl </fo:static-content> <fo:static-content flow-name="odd-footer"> -@@ -198,6 +222,11 @@ - </fo:block> - </xsl:template> - -+ <xsl:template match="anchor"> -+ <fo:block id="{@id}"/> -+ <xsl:apply-templates/> -+ </xsl:template> -+ - <xsl:template match="section"> - - <xsl:param name="level">0</xsl:param> -@@ -212,6 +241,11 @@ - - <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/> - <xsl:text> </xsl:text> -+ -+ <xsl:if test="normalize-space(@id)!=''"> -+ <fo:block id="{@id}"/> -+ </xsl:if> -+ - <xsl:value-of select="title"/> - </fo:block> - <xsl:apply-templates> -@@ -240,8 +274,9 @@ - space-before="20pt" - font-weight="bold" - font-size="9pt"> -+ by - <xsl:for-each select="person"> -- <xsl:value-of select="@name"/>, <xsl:value-of select="@email"/> -+ <xsl:value-of select="@name"/> - <xsl:if test="not(position() = last())">, </xsl:if> - </xsl:for-each> - </fo:block> -@@ -263,6 +298,9 @@ - font-size="10pt" - background-color="#f0f0f0" - white-space-collapse="false" -+ linefeed-treatment="preserve" -+ white-space-treatment="preserve" -+ wrap-option="no-wrap" - text-align="start"> - <xsl:apply-templates/> - </fo:block> -@@ -464,7 +502,16 @@ - </xsl:template> - - <xsl:template match="link"> -+ <xsl:choose> -+ <xsl:when test="starts-with(@href, '#')"> -+ <fo:basic-link color="blue" text-decoration="underline" internal-destination="{substring(@href,2)}"> -+ <xsl:apply-templates/> -+ </fo:basic-link> -+ </xsl:when> -+ <xsl:otherwise> - <fo:basic-link color="blue" text-decoration="underline" external-destination="{@href}"><xsl:apply-templates/></fo:basic-link> -+ </xsl:otherwise> -+ </xsl:choose> - </xsl:template> - - <xsl:template match="figure"> |