updated to latest forrest

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195731 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/forrest.diff b/src/documentation/forrest.diff
index 10c425e1fbed3a5066efba5254fa7336381cebe5..be5796db11b3c456aa6db070d9b205824d7c1ac3 100644 (file)
--- a/src/documentation/forrest.diff
+++ b/src/documentation/forrest.diff
@@ -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 "&#169;">
+-<!ENTITY nbsp "&#160;">
+-<!ENTITY degr "&#186;">
+-<!ENTITY sup2 "&#178;">
+-<!ENTITY sup3 "&#179;">]>
+-<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,15 +58,11 @@ diff -u -r1.2 document2fo.xsl
                  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>
@@ -32,25 +73,6 @@ diff -u -r1.2 document2fo.xsl
    </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 @@ diff -u -r1.2 document2fo.xsl
    <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 @@ diff -u -r1.2 document2fo.xsl
      </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 @@ diff -u -r1.2 document2fo.xsl
      </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 @@ diff -u -r1.2 document2fo.xsl
      </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 @@ diff -u -r1.2 document2fo.xsl
    <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 @@ diff -u -r1.2 document2fo.xsl
        <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 @@ diff -u -r1.2 document2fo.xsl
        text-align="start">
        <xsl:apply-templates/>
      </fo:block>
-@@ -456,7 +517,16 @@
+@@ -464,7 +502,16 @@
    </xsl:template>
  
    <xsl:template match="link">