Return-Path: 
 <svn-return-2267-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 63321 invoked from network); 7 May 2005 14:47:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 May 2005 14:47:24 -0000
Received: (qmail 46752 invoked by uid 500); 7 May 2005 14:50:19 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 46705 invoked by uid 500); 7 May 2005 14:50:18 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 46687 invoked by uid 99); 7 May 2005 14:50:18 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sat, 07 May 2005 07:50:18 -0700
Received: (qmail 63281 invoked by uid 65534); 7 May 2005 14:47:21 -0000
Message-ID: <20050507144721.63280.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r169084 - in /forrest/trunk:
 main/webapp/skins/common/xslt/fo/document2fo.xsl
 site-author/content/xdocs/docs/faq.xml site-author/status.xml
Date: Sat, 07 May 2005 14:47:20 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Sat May  7 07:47:19 2005
New Revision: 169084

URL: http://svn.apache.org/viewcvs?rev=3D169084&view=3Drev
Log:
Improved handling of pagebreaks, can now use them in almost any block eleme=
nt

Modified:
    forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl
    forrest/trunk/site-author/content/xdocs/docs/faq.xml
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/x=
slt/fo/document2fo.xsl?rev=3D169084&r1=3D169083&r2=3D169084&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl (origina=
l)
+++ forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl Sat May =
 7 07:47:19 2005
@@ -355,6 +355,7 @@
       width=3D"7.5in"
       font-family=3D"serif"
       font-style=3D"italic">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
@@ -370,6 +371,7 @@
       border-bottom=3D"0.25pt solid"
       padding-before=3D"6pt"
       padding-after=3D"6pt">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <!-- insert i18n stuff here -->
       NOTICE: <xsl:apply-templates/>
     </fo:block>
@@ -398,6 +400,9 @@
       font-weight=3D"bold"
       space-before=3D"12pt"
       space-after=3D"4pt">
+     =20
+      <xsl:call-template name=3D"insertPageBreaks"/>
+   =20
       <xsl:if test=3D"$heading-type =3D 'boxed'">
         <xsl:attribute name=3D"background-color">
           <xsl:value-of select=3D"$heading-color"/>
@@ -439,15 +444,6 @@
     <xsl:apply-templates>
       <xsl:with-param name=3D"level" select=3D"number($level)+1"/>
     </xsl:apply-templates>
-
-    <!-- if marked as a 'pageBreakBefore', and we're breaking on pages, an=
d were not the first node -->
-    <xsl:if test=3D"@class=3D'pageBreakBefore' and $page-break-top-section=
s and preceding-sibling::node()">
-        <fo:block break-before=3D"page"/>
-    </xsl:if>
-    <!-- if marked as a 'pageBreakAfter', and we're breaking on pages, and=
 were not the last node -->
-    <xsl:if test=3D"@class=3D'pageBreakAfter' and $page-break-top-sections=
 and following-sibling::node()">
-        <fo:block break-after=3D"page"/>
-    </xsl:if>
   </xsl:template>
=20
   <xsl:template match=3D"title">
@@ -461,6 +457,7 @@
     <fo:block
       font-weight=3D"bold"
       font-size=3D"{$size}pt">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
@@ -470,6 +467,7 @@
       space-before=3D"20pt"
       font-weight=3D"bold"
       font-size=3D"9pt">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <!-- insert i18n stuff here -->
       by
       <xsl:for-each select=3D"person">
@@ -485,6 +483,7 @@
         <fo:block
           space-after=3D"4pt"
           font-family=3D"serif">
+          <xsl:call-template name=3D"insertPageBreaks"/>
           <xsl:apply-templates/>
         </fo:block>
       </xsl:when>
@@ -493,6 +492,7 @@
           space-before=3D"4pt"
           space-after=3D"4pt"
           font-family=3D"serif">
+          <xsl:call-template name=3D"insertPageBreaks"/>
           <xsl:apply-templates/>
         </fo:block>
       </xsl:otherwise>
@@ -510,6 +510,7 @@
       white-space-treatment=3D"preserve"
       wrap-option=3D"wrap"
       text-align=3D"start">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
@@ -634,6 +635,7 @@
       border-color=3D"{$color}"
       background-color=3D"{$color}"
       color=3D"#ffffff">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <xsl:choose>
         <xsl:when test=3D"@label"><xsl:value-of select=3D"@label"/></xsl:w=
hen>
         <xsl:otherwise>Warning: </xsl:otherwise>
@@ -673,6 +675,7 @@
       border-end-style=3D"solid"
       border-color=3D"{$color}"
       background-color=3D"{$color}">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <xsl:choose>
         <xsl:when test=3D"@label"><xsl:value-of select=3D"@label"/></xsl:w=
hen>
         <!-- insert i18n stuff here -->
@@ -713,6 +716,7 @@
       border-end-style=3D"solid"
       border-color=3D"{$color}"
       background-color=3D"{$color}">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <!-- insert i18n stuff here -->
       FIXME (<xsl:value-of select=3D"@author"/>): <xsl:value-of select=3D"=
title"/>
     </fo:block>
@@ -754,6 +758,7 @@
=20
   <xsl:template match=3D"figure|img">
     <fo:block text-align=3D"center">
+      <xsl:call-template name=3D"insertPageBreaks"/>
       <xsl:if test=3D"normalize-space(@id)!=3D''">
           <xsl:attribute name=3D"id"><xsl:value-of select=3D"@id"/></xsl:a=
ttribute>
       </xsl:if>
@@ -913,6 +918,7 @@
     <xsl:if test=3D"$toc-max-depth > 0">
       <fo:block font-family=3D"serif" font-size=3D"14pt" font-weight=3D"bo=
ld"
       space-after=3D"5pt" space-before=3D"5pt" text-align=3D"justify" widt=
h=3D"7.5in">
+      <xsl:call-template name=3D"insertPageBreaks"/>
         <!-- insert i18n stuff here -->
         <xsl:text>Table of contents</xsl:text>
       </fo:block>
@@ -977,8 +983,20 @@
      space-after=3D"4pt"
      background-color=3D"#f0f0f0"
      font-family=3D"monospace">
+     <xsl:call-template name=3D"insertPageBreaks"/>
      <xsl:apply-templates/>
    </fo:block>
+ </xsl:template>
+=20
+ <xsl:template name=3D"insertPageBreaks">
+      <!-- if marked as a 'pageBreakBefore', and we're breaking on pages, =
and were not the first node -->
+      <xsl:if test=3D"contains(@class, 'pageBreakBefore') and preceding-si=
bling::node()">
+          <xsl:attribute name=3D"break-before">page</xsl:attribute>
+      </xsl:if>
+      <!-- if marked as a 'pageBreakAfter', and we're breaking on pages, a=
nd were not the last node -->
+      <xsl:if test=3D"contains(@class, 'pageBreakAfter') and following-sib=
ling::node()">
+          <xsl:attribute name=3D"break-after">page</xsl:attribute>
+      </xsl:if>
  </xsl:template>
=20
 <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->

Modified: forrest/trunk/site-author/content/xdocs/docs/faq.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/=
docs/faq.xml?rev=3D169084&r1=3D169083&r2=3D169084&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/site-author/content/xdocs/docs/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs/faq.xml Sat May  7 07:47:1=
9 2005
@@ -123,8 +123,10 @@
         <p>Page breaks do not make a great deal of sense in HTML documents=
 intended for display on a
           screen. However, PDF documents are intended for printing and the=
refore page breaks can be
           important.</p>
-        <p>To insert a page break in a PDF document simply add <em>pageBre=
akBefore</em> or
-            <em>pageBreakAfter</em> to the class attribute of a section.</=
p>
+        <p>To insert a page break in a PDF document simply add <em>pageBre=
akBefore</em> and/or
+            <em>pageBreakAfter</em> to the class attribute of the block yo=
u wish to force a
+            page break on. All the common block grouping elements support =
this class, for example,=20
+            note, warning, p and so on.</p>
         <p>If you want these classes to be processed in your HTML document=
s as well you should add
           the following to the <code>extra-css</code> element in your proj=
ects
           <code>skinconf.xml</code>

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=
=3D169084&r1=3D169083&r2=3D169084&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Sat May  7 07:47:19 2005
@@ -51,6 +51,8 @@
         Added document to facilitate
         <link href=3D"site:upgrading_07">upgrading to v0.7</link>
       </action>
+      <action dev=3D"RDG" type=3D"update" context=3D"skins">
+        Added ability to add page breaks to output. See <link href=3D"site=
:faq/pageBreaks">Page Breaks FAQ</link>
       <action dev=3D"RDG" type=3D"update" context=3D"docs" fixes-bug=3D"FO=
R-185">
         Allow the serving of raw SVG files to allow clients to render loca=
lly.
       </action>