You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2002/12/03 12:00:23 UTC
cvs commit: xml-fop/src/documentation forrest.diff
keiron 2002/12/03 03:00:23
Modified: src/documentation forrest.diff
Log:
updated to latest forrest
Revision Changes Path
1.4 +71 -43 xml-fop/src/documentation/forrest.diff
Index: forrest.diff
===================================================================
RCS file: /home/cvs/xml-fop/src/documentation/forrest.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- forrest.diff 19 Nov 2002 07:32:14 -0000 1.3
+++ forrest.diff 3 Dec 2002 11:00:23 -0000 1.4
@@ -1,10 +1,55 @@
+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.2
-diff -u -r1.2 document2fo.xsl
---- src/resources/skins/common/xslt/fo/document2fo.xsl 16 Nov 2002 22:58:50 -0000 1.2
-+++ src/resources/skins/common/xslt/fo/document2fo.xsl 19 Nov 2002 07:30:58 -0000
+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"
@@ -13,16 +58,12 @@
version="1.0">
<xsl:output method="xml"/>
-@@ -80,14 +81,57 @@
- </fo:repeatable-page-master-alternatives>
- </fo:page-sequence-master>
+@@ -84,14 +85,34 @@
</fo:layout-master-set>
+
+ <xsl:apply-templates select="/document" mode="outline"/>
-
+
-+ <fox:bookmarks>
-+ <xsl:apply-templates select="document/body/section" mode="bookmarks"/>
-+ </fox:bookmarks>
-+
<fo:page-sequence master-reference="book">
+ <fo:title><xsl:value-of select="document/header/title"/></fo:title>
<xsl:apply-templates/>
@@ -32,25 +73,6 @@
</xsl:template>
-
+
-+ <xsl:template match="section" mode="bookmarks">
-+ <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 mode="bookmarks"/>
-+ </fox:outline>
-+ </xsl:template>
-+
-+ <xsl:template match="*" mode="bookmarks">
-+ <xsl:apply-templates mode="bookmarks"/>
-+ </xsl:template>
-+
-+ <xsl:template match="text()" mode="bookmarks">
-+ <!-- suppress text nodes in bookmarks -->
-+ </xsl:template>
-+
+ <xsl:template name="info">
+ <fo:block-container font-style="italic" absolute-position="absolute"
+ left="0pt" top="0pt" right="6.25in" bottom="150pt"
@@ -73,7 +95,7 @@
<xsl:template match="document">
<fo:title><xsl:value-of select="header/title"/></fo:title>
-@@ -102,6 +146,7 @@
+@@ -106,6 +127,7 @@
text-align="start">
Page <fo:page-number/>
</fo:block>
@@ -81,7 +103,7 @@
</fo:static-content>
<fo:static-content flow-name="even-header">
-@@ -110,6 +155,7 @@
+@@ -114,6 +136,7 @@
font-style="italic">
<xsl:value-of select="header/title"/>
</fo:block>
@@ -89,7 +111,7 @@
</fo:static-content>
<fo:static-content flow-name="even-footer">
-@@ -131,6 +177,7 @@
+@@ -135,6 +158,7 @@
font-style="italic">
<xsl:value-of select="header/title"/>
</fo:block>
@@ -97,7 +119,7 @@
</fo:static-content>
<fo:static-content flow-name="odd-footer">
-@@ -192,6 +239,11 @@
+@@ -198,6 +222,11 @@
</fo:block>
</xsl:template>
@@ -109,13 +131,8 @@
<xsl:template match="section">
<xsl:param name="level">0</xsl:param>
-@@ -201,9 +253,15 @@
- font-family="serif"
- font-size="{$size}pt"
- font-weight="bold"
-- space-before="12pt">
-+ space-before="12pt"
-+ id="{generate-id()}">
+@@ -212,6 +241,11 @@
+
<xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
<xsl:text> </xsl:text>
+
@@ -126,7 +143,18 @@
<xsl:value-of select="title"/>
</fo:block>
<xsl:apply-templates>
-@@ -255,6 +313,9 @@
+@@ -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"
@@ -136,7 +164,7 @@
text-align="start">
<xsl:apply-templates/>
</fo:block>
-@@ -456,7 +517,16 @@
+@@ -464,7 +502,16 @@
</xsl:template>
<xsl:template match="link">
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org