suppress text nodes in bookmarks

added page sequence title

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

diff --git a/src/documentation/forrest.diff b/src/documentation/forrest.diff
index 1d81c72ab92d506d0c58f3d7321b8495dc9ceeb1..10c425e1fbed3a5066efba5254fa7336381cebe5 100644 (file)
--- a/src/documentation/forrest.diff
+++ b/src/documentation/forrest.diff
@@ -4,7 +4,7 @@ RCS file: /home/cvspublic/xml-forrest/src/resources/skins/common/xslt/fo/documen
 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 18 Nov 2002 14:09:29 -0000
++++ src/resources/skins/common/xslt/fo/document2fo.xsl 19 Nov 2002 07:30:58 -0000
 @@ -2,6 +2,7 @@
  
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -13,7 +13,7 @@ diff -u -r1.2 document2fo.xsl
                  version="1.0">
  
    <xsl:output method="xml"/>
-@@ -80,14 +81,52 @@
+@@ -80,14 +81,57 @@
            </fo:repeatable-page-master-alternatives>
          </fo:page-sequence-master>
        </fo:layout-master-set>
@@ -24,6 +24,7 @@ diff -u -r1.2 document2fo.xsl
 +      </fox:bookmarks>
 +
        <fo:page-sequence master-reference="book">
++        <fo:title><xsl:value-of select="document/header/title"/></fo:title>
          <xsl:apply-templates/>
        </fo:page-sequence>
        
@@ -46,6 +47,10 @@ diff -u -r1.2 document2fo.xsl
 +    <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"
@@ -68,7 +73,7 @@ diff -u -r1.2 document2fo.xsl
    <xsl:template match="document">
      <fo:title><xsl:value-of select="header/title"/></fo:title>
      
-@@ -102,6 +141,7 @@
+@@ -102,6 +146,7 @@
          text-align="start">
          Page <fo:page-number/>
        </fo:block>
@@ -76,7 +81,7 @@ diff -u -r1.2 document2fo.xsl
      </fo:static-content>
  
      <fo:static-content flow-name="even-header">
-@@ -110,6 +150,7 @@
+@@ -110,6 +155,7 @@
          font-style="italic">
          <xsl:value-of select="header/title"/>
        </fo:block>
@@ -84,7 +89,7 @@ diff -u -r1.2 document2fo.xsl
      </fo:static-content>
  
      <fo:static-content flow-name="even-footer">
-@@ -131,6 +172,7 @@
+@@ -131,6 +177,7 @@
          font-style="italic">
          <xsl:value-of select="header/title"/>
        </fo:block>
@@ -92,7 +97,7 @@ diff -u -r1.2 document2fo.xsl
      </fo:static-content>
      
      <fo:static-content flow-name="odd-footer">
-@@ -192,6 +234,11 @@
+@@ -192,6 +239,11 @@
      </fo:block>
    </xsl:template>
  
@@ -104,7 +109,7 @@ diff -u -r1.2 document2fo.xsl
    <xsl:template match="section">
      
      <xsl:param name="level">0</xsl:param>
-@@ -201,9 +248,15 @@
+@@ -201,9 +253,15 @@
        font-family="serif"
        font-size="{$size}pt"
        font-weight="bold"
@@ -121,7 +126,7 @@ diff -u -r1.2 document2fo.xsl
        <xsl:value-of select="title"/>
      </fo:block>
      <xsl:apply-templates>
-@@ -255,6 +308,9 @@
+@@ -255,6 +313,9 @@
        font-size="10pt"
        background-color="#f0f0f0"
        white-space-collapse="false"
@@ -131,7 +136,7 @@ diff -u -r1.2 document2fo.xsl
        text-align="start">
        <xsl:apply-templates/>
      </fo:block>
-@@ -456,7 +512,16 @@
+@@ -456,7 +517,16 @@
    </xsl:template>
  
    <xsl:template match="link">
@@ -148,11 +153,3 @@ diff -u -r1.2 document2fo.xsl
    </xsl:template>
  
    <xsl:template match="figure">
-@@ -587,7 +652,6 @@
-      [<xsl:value-of select="@def"/>]
-    </fo:inline>
-  </xsl:template>
--
- 
- 
- </xsl:stylesheet>