Return-Path: 
 <svn-return-6367-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 50206 invoked from network); 4 Dec 2006 11:05:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Dec 2006 11:05:08 -0000
Received: (qmail 80027 invoked by uid 500); 4 Dec 2006 11:05:16 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 79992 invoked by uid 500); 4 Dec 2006 11:05:16 -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>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 79981 invoked by uid 99); 4 Dec 2006 11:05:16 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 03:05:16 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 03:05:05 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 740AF1A984A; Mon,  4 Dec 2006 03:04:24 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r482132 [1/2] - in /forrest/trunk/whiteboard/plugins:
 org.apache.forrest.plugin.internal.dispatcher/
 org.apache.forrest.themes.core/themes/common/fo/
Date: Mon, 04 Dec 2006 11:04:23 -0000
To: svn@forrest.apache.org
From: thorsten@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061204110424.740AF1A984A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: thorsten
Date: Mon Dec  4 03:04:20 2006
New Revision: 482132

URL: http://svn.apache.org/viewvc?view=rev&rev=482132
Log:
Extending dispatcher with fo. I used the default skin xsls and cleaned them from all references to the skinconf.

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content.ft
      - copied, changed from r478158, forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/helper-fo-footer.ft
      - copied, changed from r478158, forrest/trunk/main/webapp/skins/common/xslt/fo/footerinfo.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/helper-fo-outline.ft
      - copied, changed from r478158, forrest/trunk/main/webapp/skins/common/xslt/fo/pdfoutline.xsl
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?view=diff&rev=482132&r1=482131&r2=482132
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap Mon Dec  4 03:04:20 2006
@@ -164,6 +164,24 @@
           />
         <map:serialize type="xhtml" />
       </map:match>
+      <!--
+        Last processing step. 
+        Here we are overriding the default skin generation.
+      -->
+      <map:match pattern="**.fo">
+        <map:generate src="cocoon:/resolve.structurer.{1}" type="jx">
+          <map:parameter name="lenient-xpath" value="true" />
+          <map:parameter name="getRequest" value="{1}" />
+          <map:parameter name="getRequestExtension" value="fo" />
+        </map:generate>
+        <map:transform type="dispatcher">
+          <map:parameter name="cacheKey" value="{0}" />
+          <map:parameter name="validityFile" value="cocoon:/resolve.structurer.{1}" />
+          <map:parameter name="request" value="{1}" />
+          <map:parameter name="type" value="fo" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
       <map:match pattern="**.internal*">
         <map:generate src="cocoon:/resolve.structurer.{1}" type="jx">
           <map:parameter name="lenient-xpath" value="true" />

Copied: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content.ft (from r478158, forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content.ft?view=diff&rev=482132&p1=forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl&r1=478158&p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content.ft&r2=482132
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content.ft Mon Dec  4 03:04:20 2006
@@ -1,1055 +1,1223 @@
 <?xml version="1.0"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- left, justify, right -->
-  <xsl:variable name="text-align" select="string(//skinconfig/pdf/page/@text-align)"/> 
-  
-  <!-- print URL of external links -->
-  <xsl:variable name="show-external-urls" select="//skinconfig/pdf/show-external-urls"/>
-  
-  <!-- Get the section depth to use when generating the minitoc (default is 2) -->
-  <xsl:variable name="toc-max-depth" select="number(//skinconfig/toc/@max-depth)"/>
-
-  <!-- The page size to be used -->
-  <xsl:variable name="pagesize"
-                select="string(//skinconfig/pdf/page/@size)"/>
-
-  <!-- The page orientation ("portrait" or "landscape") -->
-  <xsl:variable name="pageorientation"
-                select="string(//skinconfig/pdf/page/@orientation)"/>
-
-  <!-- Double-sided printing toggle -->
-  <xsl:variable name="doublesided"
-                select="string(//skinconfig/pdf/margins/@double-sided)"/>
-
-  <!-- The top page margin -->
-  <xsl:variable name="topmargin"
-                select="string(//skinconfig/pdf/margins/top)"/>
-
-  <!-- The bottom page margin -->
-  <xsl:variable name="bottommargin"
-                select="string(//skinconfig/pdf/margins/bottom)"/>
-
-  <!-- The inner page margin (always the left margin if
-  double-sided printing is off, alternating between left and right if
-  it's on) -->
-  <xsl:variable name="innermargin"
-                select="string(//skinconfig/pdf/margins/inner)"/>
-
-  <!-- The outer page margin (always the right margin if
-  double-sided printing is off, alternating between right and left if
-  it's on)-->
-  <xsl:variable name="outermargin"
-                select="string(//skinconfig/pdf/margins/outer)"/>
-
-  <xsl:param name="numbersections" select="'true'"/>
-  
-  <!-- page breaks after TOC and each page if an aggregate document -->
-  <xsl:variable name="page-break-top-sections" select="'true'"/>
-
-  <!-- page numbering format -->
-  <xsl:variable name="page-numbering-format" select="string(//skinconfig/pdf/page-numbering-format)"/>
-
-  <!-- Section depth at which we stop numbering and just indent -->
-  <xsl:param name="numbering-max-depth" select="'3'"/>
-  <xsl:param name="imagesdir" select="."/>
-  <xsl:param name="xmlbasedir"/>
-  <xsl:include href="pdfoutline.xsl"/>
-  <xsl:include href="footerinfo.xsl"/>
-
-
-  <!-- Determine page height for various page sizes (US Letter portrait
-  is the default) -->
-  <!-- FIXME: JJP:would this be better of a file? -->
-  <xsl:variable name="pageheight">
-    <xsl:choose>
-      <xsl:when test="$pageorientation = 'landscape'">
-        <xsl:choose>
-          <xsl:when test="$pagesize = 'a0'">841mm</xsl:when>
-          <xsl:when test="$pagesize = 'a1'">594mm</xsl:when>
-          <xsl:when test="$pagesize = 'a2'">420mm</xsl:when>
-          <xsl:when test="$pagesize = 'a3'">297mm</xsl:when>
-          <xsl:when test="$pagesize = 'a4'">210mm</xsl:when>
-          <xsl:when test="$pagesize = 'a5'">148mm</xsl:when>
-          <xsl:when test="$pagesize = 'executive'">7.25in</xsl:when>
-          <xsl:when test="$pagesize = 'folio'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'ledger'">11in</xsl:when>
-          <xsl:when test="$pagesize = 'legal'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'letter'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'quarto'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'tabloid'">11in</xsl:when>
-          <xsl:otherwise>8.5in</xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$pagesize = 'a0'">1189mm</xsl:when>
-          <xsl:when test="$pagesize = 'a1'">841mm</xsl:when>
-          <xsl:when test="$pagesize = 'a2'">594mm</xsl:when>
-          <xsl:when test="$pagesize = 'a3'">420mm</xsl:when>
-          <xsl:when test="$pagesize = 'a4'">297mm</xsl:when>
-          <xsl:when test="$pagesize = 'a5'">210mm</xsl:when>
-          <xsl:when test="$pagesize = 'executive'">10.5in</xsl:when>
-          <xsl:when test="$pagesize = 'folio'">13in</xsl:when>
-          <xsl:when test="$pagesize = 'ledger'">17in</xsl:when>
-          <xsl:when test="$pagesize = 'legal'">14in</xsl:when>
-          <xsl:when test="$pagesize = 'quarto'">10.83in</xsl:when>
-          <xsl:when test="$pagesize = 'tabloid'">17in</xsl:when>
-          <xsl:otherwise>11in</xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Determine page width for various page sizes (US Letter portrait
-  is the default) -->
-  <xsl:variable name="pagewidth">
-    <xsl:choose>
-      <xsl:when test="$pageorientation = 'landscape'">
+<forrest:contract
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content">
+  <description>
+    <p>content is the main xsl to transform xdocs to fo. This fo pages
+      can then be transformed with the pdf plugin.</p>
+  </description>
+  <usage>
+    <![CDATA[<forrest:contract name="content"
+      dataURI="cocoon://#{$getRequest}.xml">
+      <forrest:property name="config">
+        <!-- Settings specific to PDF output. -->
+        <!-- 
+        Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
+        folio, legal, ledger, letter, quarto, tabloid (default letter).
+        Supported page orientations are portrait, landscape (default
+        portrait).
+        Supported text alignments are left, right, justify (default left).
+        -->
+        <page size="letter" orientation="portrait"
+          text-align="left" background-color="#ffffff"/>
+        
+        <!-- 
+        Pattern of the page numbering in the footer - Default is "Page x".
+        first occurrence of '1' digit represents the current page number,
+        second occurrence of '1' digit represents the total page number,
+        anything else is considered as the static part of the numbering pattern.
+        Examples : x is the current page number, y the total page number.
+        <page-numbering-format>none</page-numbering-format> Do not displays the page numbering
+        <page-numbering-format>1</page-numbering-format> Displays "x"
+        <page-numbering-format>p1.</page-numbering-format> Displays "px."
+        <page-numbering-format>Page 1/1</page-numbering-format> Displays "Page x/y"
+        <page-numbering-format>(1-1)</page-numbering-format> Displays "(x-y)"
+        -->
+        <page-numbering-format>Page 1</page-numbering-format>
+        <!-- Configure the TOC, i.e. the Table of Contents.
+        @max-depth
+        how many "section" levels need to be included in the
+        generated Table of Contents (TOC). 
+        @min-sections
+        Minimum required to create a TOC.
+        @location ("page","menu","page,menu", "none")
+        Where to show the TOC.
+        -->
+        <toc max-depth="2" min-sections="1" location="page"/>
+        
+        
+        <!-- Heading types can be clean|underlined|boxed  -->
+        <headings type="boxed" color="#4a6d8c"/>
+        <!--
+        Margins can be specified for top, bottom, inner, and outer
+        edges. If double-sided="false", the inner edge is always left
+        and the outer is always right. If double-sided="true", the
+        inner edge will be left on odd pages, right on even pages,
+        the outer edge vice versa.
+        Specified below are the default settings.
+        -->
+        <margins double-sided="false">
+          <top>1in</top>
+          <bottom>1in</bottom>
+          <inner>1.25in</inner>
+          <outer>1in</outer>
+        </margins>
+        
+        <!--
+        Print the URL text next to all links going outside the file
+        -->
+        <show-external-urls>false</show-external-urls>
+        
+        <!--
+        Disable the copyright footer on each page of the PDF.
+        A footer is composed for each page. By default, a "credit" with role=pdf
+        will be used, as explained below. Otherwise a copyright statement
+        will be generated. This latter can be disabled.
+        -->
+        <disable-copyright-footer>
+          false</disable-copyright-footer>
+        <colors>
+          <color name="code" value="#CFDCED"/>
+          <color name="highlight" value="#ffff00"/>
+          <color name="fixme" value="#cc6600"/>
+          <color name="note" value="#006699"/>
+          <color name="warning" value="#990000"/>
+          <color name="table" value="#7099C5"/>
+          <color name="table-cell" value="#f0f0ff"/>
+          <color name="body" value="#ffffff" link="#0F3660"
+            vlink="#009999" hlink="#000066"/>
+        </colors>
+        
+        <!-- The following are used to construct a copyright statement -->
+        <disable-copyright-footer>
+          false</disable-copyright-footer>
+        <year>2006</year>
+        <vendor>Sadesi</vendor>
+        <url>http://andaluciajunta.es</url>
+      </forrest:property>
+    </forrest:contract>]]>
+  </usage>
+  <forrest:template
+    xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    name="content" inputFormat="xsl">
+    <xsl:stylesheet
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:fo="http://www.w3.org/1999/XSL/Format"
+      version="1.0">
+      <xsl:param name="config"/>
+      <!-- left, justify, right -->
+      <xsl:variable name="text-align"
+        select="string($config/page/@text-align)"/>
+      
+      <!-- print URL of external links -->
+      <xsl:variable name="show-external-urls"
+        select="$config/show-external-urls"/>
+      
+      
+      <!-- Get the section depth to use when generating the minitoc (default is 2) -->
+      <xsl:variable name="toc-max-depth"
+        select="number($config/toc/@max-depth)"/>
+      
+      <!-- The page size to be used -->
+      <xsl:variable name="pagesize"
+        select="string($config/page/@size)"/>
+      
+      
+      <!-- The page orientation ("portrait" or "landscape") -->
+      <xsl:variable name="pageorientation"
+        select="string($config/page/@orientation)"/>
+      
+      <!-- Double-sided printing toggle -->
+      <xsl:variable name="doublesided"
+        select="string($config/margins/@double-sided)"/>
+      
+      <!-- The top page margin -->
+      <xsl:variable name="topmargin"
+        select="string($config/margins/top)"/>
+      
+      <!-- The bottom page margin -->
+      <xsl:variable name="bottommargin"
+        select="string($config/margins/bottom)"/>
+      
+      <!-- The inner page margin (always the left margin if
+      double-sided printing is off, alternating between left and right if
+      it's on) -->
+      <xsl:variable name="innermargin"
+        select="string($config/margins/inner)"/>
+      
+      <!-- The outer page margin (always the right margin if
+      double-sided printing is off, alternating between right and left if
+      it's on)-->
+      <xsl:variable name="outermargin"
+        select="string($config/margins/outer)"/>
+      
+      <xsl:param name="numbersections" select="'true'"/>
+      
+      
+      <!-- page breaks after TOC and each page if an aggregate document -->
+      <xsl:variable name="page-break-top-sections"
+        select="'true'"/>
+      
+      <!-- page numbering format -->
+      <xsl:variable name="page-numbering-format"
+        select="string($config/page-numbering-format)"/>
+      
+      
+      <!-- Section depth at which we stop numbering and just indent -->
+      <xsl:param name="numbering-max-depth" select="'3'"/>
+      <xsl:param name="imagesdir" select="."/>
+      <xsl:param name="xmlbasedir"/>
+      <xsl:include
+        href="cocoon://prepare.contract.fo.helper-fo-outline"/>
+      <xsl:include
+        href="cocoon://prepare.contract.fo.helper-fo-footer"/>
+      
+      <!-- Determine page height for various page sizes (US Letter portrait
+      is the default) -->
+      <!-- FIXME: JJP:would this be better of a file? -->
+      <xsl:variable name="pageheight">
         <xsl:choose>
-          <xsl:when test="$pagesize = 'a0'">1189mm</xsl:when>
-          <xsl:when test="$pagesize = 'a1'">841mm</xsl:when>
-          <xsl:when test="$pagesize = 'a2'">594mm</xsl:when>
-          <xsl:when test="$pagesize = 'a3'">420mm</xsl:when>
-          <xsl:when test="$pagesize = 'a4'">297mm</xsl:when>
-          <xsl:when test="$pagesize = 'a5'">210mm</xsl:when>
-          <xsl:when test="$pagesize = 'executive'">10.5in</xsl:when>
-          <xsl:when test="$pagesize = 'folio'">13in</xsl:when>
-          <xsl:when test="$pagesize = 'ledger'">17in</xsl:when>
-          <xsl:when test="$pagesize = 'legal'">14in</xsl:when>
-          <xsl:when test="$pagesize = 'quarto'">10.83in</xsl:when>
-          <xsl:when test="$pagesize = 'tabloid'">17in</xsl:when>
-          <xsl:otherwise>11in</xsl:otherwise>
+          <xsl:when test="$pageorientation = 'landscape'">
+            <xsl:choose>
+              <xsl:when test="$pagesize = 'a0'">
+                841mm</xsl:when>
+              <xsl:when test="$pagesize = 'a1'">
+                594mm</xsl:when>
+              <xsl:when test="$pagesize = 'a2'">
+                420mm</xsl:when>
+              <xsl:when test="$pagesize = 'a3'">
+                297mm</xsl:when>
+              <xsl:when test="$pagesize = 'a4'">
+                210mm</xsl:when>
+              <xsl:when test="$pagesize = 'a5'">
+                148mm</xsl:when>
+              <xsl:when test="$pagesize = 'executive'">
+                7.25in</xsl:when>
+              <xsl:when test="$pagesize = 'folio'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'ledger'">
+                11in</xsl:when>
+              <xsl:when test="$pagesize = 'legal'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'letter'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'quarto'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'tabloid'">
+                11in</xsl:when>
+              <xsl:otherwise>8.5in</xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:choose>
+              <xsl:when test="$pagesize = 'a0'">
+                1189mm</xsl:when>
+              <xsl:when test="$pagesize = 'a1'">
+                841mm</xsl:when>
+              <xsl:when test="$pagesize = 'a2'">
+                594mm</xsl:when>
+              <xsl:when test="$pagesize = 'a3'">
+                420mm</xsl:when>
+              <xsl:when test="$pagesize = 'a4'">
+                297mm</xsl:when>
+              <xsl:when test="$pagesize = 'a5'">
+                210mm</xsl:when>
+              <xsl:when test="$pagesize = 'executive'">
+                10.5in</xsl:when>
+              <xsl:when test="$pagesize = 'folio'">
+                13in</xsl:when>
+              <xsl:when test="$pagesize = 'ledger'">
+                17in</xsl:when>
+              <xsl:when test="$pagesize = 'legal'">
+                14in</xsl:when>
+              <xsl:when test="$pagesize = 'quarto'">
+                10.83in</xsl:when>
+              <xsl:when test="$pagesize = 'tabloid'">
+                17in</xsl:when>
+              <xsl:otherwise>11in</xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
         </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
+      </xsl:variable>
+      
+      <!-- Determine page width for various page sizes (US Letter portrait
+      is the default) -->
+      <xsl:variable name="pagewidth">
         <xsl:choose>
-          <xsl:when test="$pagesize = 'a0'">841mm</xsl:when>
-          <xsl:when test="$pagesize = 'a1'">594mm</xsl:when>
-          <xsl:when test="$pagesize = 'a2'">420mm</xsl:when>
-          <xsl:when test="$pagesize = 'a3'">297mm</xsl:when>
-          <xsl:when test="$pagesize = 'a4'">210mm</xsl:when>
-          <xsl:when test="$pagesize = 'a5'">148mm</xsl:when>
-          <xsl:when test="$pagesize = 'executive'">7.25in</xsl:when>
-          <xsl:when test="$pagesize = 'folio'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'ledger'">11in</xsl:when>
-          <xsl:when test="$pagesize = 'legal'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'letter'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'quarto'">8.5in</xsl:when>
-          <xsl:when test="$pagesize = 'tabloid'">11in</xsl:when>
-          <xsl:otherwise>8.5in</xsl:otherwise>
+          <xsl:when test="$pageorientation = 'landscape'">
+            <xsl:choose>
+              <xsl:when test="$pagesize = 'a0'">
+                1189mm</xsl:when>
+              <xsl:when test="$pagesize = 'a1'">
+                841mm</xsl:when>
+              <xsl:when test="$pagesize = 'a2'">
+                594mm</xsl:when>
+              <xsl:when test="$pagesize = 'a3'">
+                420mm</xsl:when>
+              <xsl:when test="$pagesize = 'a4'">
+                297mm</xsl:when>
+              <xsl:when test="$pagesize = 'a5'">
+                210mm</xsl:when>
+              <xsl:when test="$pagesize = 'executive'">
+                10.5in</xsl:when>
+              <xsl:when test="$pagesize = 'folio'">
+                13in</xsl:when>
+              <xsl:when test="$pagesize = 'ledger'">
+                17in</xsl:when>
+              <xsl:when test="$pagesize = 'legal'">
+                14in</xsl:when>
+              <xsl:when test="$pagesize = 'quarto'">
+                10.83in</xsl:when>
+              <xsl:when test="$pagesize = 'tabloid'">
+                17in</xsl:when>
+              <xsl:otherwise>11in</xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:choose>
+              <xsl:when test="$pagesize = 'a0'">
+                841mm</xsl:when>
+              <xsl:when test="$pagesize = 'a1'">
+                594mm</xsl:when>
+              <xsl:when test="$pagesize = 'a2'">
+                420mm</xsl:when>
+              <xsl:when test="$pagesize = 'a3'">
+                297mm</xsl:when>
+              <xsl:when test="$pagesize = 'a4'">
+                210mm</xsl:when>
+              <xsl:when test="$pagesize = 'a5'">
+                148mm</xsl:when>
+              <xsl:when test="$pagesize = 'executive'">
+                7.25in</xsl:when>
+              <xsl:when test="$pagesize = 'folio'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'ledger'">
+                11in</xsl:when>
+              <xsl:when test="$pagesize = 'legal'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'letter'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'quarto'">
+                8.5in</xsl:when>
+              <xsl:when test="$pagesize = 'tabloid'">
+                11in</xsl:when>
+              <xsl:otherwise>8.5in</xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
         </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:template match="/">
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-      <fo:layout-master-set>
-
-        <fo:simple-page-master master-name="first-page"
-          page-height="{$pageheight}"
-          page-width="{$pagewidth}"
-          margin-top="{$topmargin}"
-          margin-bottom="{$bottommargin}"
-          margin-left="{$innermargin}"
-          margin-right="{$outermargin}">
-          <fo:region-body
-            margin-top="0.5in"
-            margin-bottom=".5in"/>
-          <fo:region-after
-            region-name="first-footer"
-            extent=".5in"
-            display-align="before"/>
-        </fo:simple-page-master>
-
-        <fo:simple-page-master master-name="even-page"
-          page-height="{$pageheight}"
-          page-width="{$pagewidth}"
-          margin-top="{$topmargin}"
-          margin-bottom="{$bottommargin}">
-          <xsl:choose>
-            <xsl:when test="$doublesided = 'true'">
-              <xsl:attribute name="margin-left">
-                <xsl:value-of select="$outermargin"/>
-              </xsl:attribute>
-              <xsl:attribute name="margin-right">
-                <xsl:value-of select="$innermargin"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="margin-left">
-                <xsl:value-of select="$innermargin"/>
-              </xsl:attribute>
-              <xsl:attribute name="margin-right">
-                <xsl:value-of select="$outermargin"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <fo:region-before
-            region-name="even-header"
-            extent="0.5in"
-            border-bottom="0.5pt solid"/>
-          <fo:region-body
-            margin-top="0.5in"
-            margin-bottom=".5in"/>
-          <fo:region-after
-            region-name="even-footer"
-            extent=".5in"
-            display-align="before"/>
-        </fo:simple-page-master>
-
-        <fo:simple-page-master master-name="odd-page"
-          page-height="{$pageheight}"
-          page-width="{$pagewidth}"
-          margin-top="{$topmargin}"
-          margin-bottom="{$bottommargin}"
-          margin-left="{$innermargin}"
-          margin-right="{$outermargin}">
-          <fo:region-before
-            region-name="odd-header"
-            extent="0.5in"
-            border-bottom="0.5pt solid"/>
-          <fo:region-body
-            margin-top="0.5in"
-            margin-bottom=".5in"/>
-          <fo:region-after
-            region-name="odd-footer"
-            extent=".5in"
-            display-align="before"/>
-        </fo:simple-page-master>
-
-        <fo:page-sequence-master master-name="book">
-          <fo:repeatable-page-master-alternatives>
-            <fo:conditional-page-master-reference
-              page-position="first"
-              master-reference="first-page"/>
-            <fo:conditional-page-master-reference
-              odd-or-even="odd"
-              master-reference="odd-page"/>
-            <fo:conditional-page-master-reference
-              odd-or-even="even"
-              master-reference="even-page"/>
-          </fo:repeatable-page-master-alternatives>
-        </fo:page-sequence-master>
-      </fo:layout-master-set>
-
-      <xsl:apply-templates select="/site/document" mode="outline"/>
-
-      <fo:page-sequence master-reference="book">
-        <xsl:apply-templates select="/site/document"/>
-      </fo:page-sequence>
-
-    </fo:root>
-  </xsl:template>
-
-  <xsl:template match="document">
-    <fo:title><xsl:value-of select="header/title"/></fo:title>
-
-    <fo:static-content flow-name="first-footer">
-      <fo:block
-        border-top="0.25pt solid"
-        padding-before="6pt"
-        text-align="center">
-        <xsl:apply-templates select="footer"/>
-      </fo:block>
-      <!-- don't list page number on first page if it's contents is just the TOC -->
-      <xsl:if test="not($toc-max-depth > 0 and $page-break-top-sections)">
-        <xsl:call-template name="insertPageNumber">
-          <xsl:with-param name="text-align">start</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:call-template name="info"/>
-    </fo:static-content>
-
-    <fo:static-content flow-name="even-header">
-      <fo:block
-        font-size="70%"
-        text-align="end"
-        font-style="italic">
-        <xsl:value-of select="header/title"/>
-      </fo:block>
-    </fo:static-content>
-
-    <fo:static-content flow-name="even-footer">
-      <fo:block
-        border-top="0.25pt solid"
-        padding-before="6pt"
-        text-align="center">
-        <xsl:apply-templates select="footer"/>
-      </fo:block>
-      <xsl:call-template name="insertPageNumber">
-        <xsl:with-param name="text-align">end</xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="info"/>
-    </fo:static-content>
-
-    <fo:static-content flow-name="odd-header">
-      <fo:block
-        font-size="70%"
-        text-align="start"
-        font-style="italic">
-        <xsl:value-of select="header/title"/>
-      </fo:block>
-    </fo:static-content>
-
-    <fo:static-content flow-name="odd-footer">
-      <fo:block
-        border-top="0.25pt solid"
-        padding-before="6pt"
-        text-align="center">
-        <xsl:apply-templates select="footer"/>
-      </fo:block>
-      <xsl:call-template name="insertPageNumber">
-        <xsl:with-param name="text-align">start</xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="info"/>
-    </fo:static-content>
-
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block
-        padding-before="24pt"
-        padding-after="24pt"
-        font-size="24pt"
-        font-weight="bold"
-        id="{generate-id()}">
-
-        <xsl:value-of select="header/title"/>
-      </fo:block>
-
-      <fo:block
-        text-align="{$text-align}"
-        padding-before="18pt"
-        padding-after="18pt">
+      </xsl:variable>
+      
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part>
+            <fo:root
+              xmlns:fo="http://www.w3.org/1999/XSL/Format">
+              <fo:layout-master-set>
+                
+                <fo:simple-page-master
+                  master-name="first-page"
+                  page-height="{$pageheight}"
+                  page-width="{$pagewidth}"
+                  margin-top="{$topmargin}"
+                  margin-bottom="{$bottommargin}"
+                  margin-left="{$innermargin}"
+                  margin-right="{$outermargin}">
+                  <fo:region-body margin-top="0.5in"
+                    margin-bottom=".5in"/>
+                  <fo:region-after region-name="first-footer"
+                    extent=".5in" display-align="before"/>
+                </fo:simple-page-master>
+                
+                <fo:simple-page-master
+                  master-name="even-page"
+                  page-height="{$pageheight}"
+                  page-width="{$pagewidth}"
+                  margin-top="{$topmargin}"
+                  margin-bottom="{$bottommargin}">
+                  <xsl:choose>
+                    <xsl:when test="$doublesided = 'true'">
+                      <xsl:attribute name="margin-left">
+                        <xsl:value-of select="$outermargin"/>
+                      </xsl:attribute>
+                      <xsl:attribute name="margin-right">
+                        <xsl:value-of select="$innermargin"/>
+                      </xsl:attribute>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:attribute name="margin-left">
+                        <xsl:value-of select="$innermargin"/>
+                      </xsl:attribute>
+                      <xsl:attribute name="margin-right">
+                        <xsl:value-of select="$outermargin"/>
+                      </xsl:attribute>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                  <fo:region-before region-name="even-header"
+                    extent="0.5in"
+                    border-bottom="0.5pt solid"/>
+                  <fo:region-body margin-top="0.5in"
+                    margin-bottom=".5in"/>
+                  <fo:region-after region-name="even-footer"
+                    extent=".5in" display-align="before"/>
+                </fo:simple-page-master>
+                
+                <fo:simple-page-master master-name="odd-page"
+                  page-height="{$pageheight}"
+                  page-width="{$pagewidth}"
+                  margin-top="{$topmargin}"
+                  margin-bottom="{$bottommargin}"
+                  margin-left="{$innermargin}"
+                  margin-right="{$outermargin}">
+                  <fo:region-before region-name="odd-header"
+                    extent="0.5in"
+                    border-bottom="0.5pt solid"/>
+                  <fo:region-body margin-top="0.5in"
+                    margin-bottom=".5in"/>
+                  <fo:region-after region-name="odd-footer"
+                    extent=".5in" display-align="before"/>
+                </fo:simple-page-master>
+                
+                <fo:page-sequence-master master-name="book">
+                  <fo:repeatable-page-master-alternatives>
+                    <fo:conditional-page-master-reference
+                      page-position="first"
+                      master-reference="first-page"/>
+                    <fo:conditional-page-master-reference
+                      odd-or-even="odd"
+                      master-reference="odd-page"/>
+                    <fo:conditional-page-master-reference
+                      odd-or-even="even"
+                      master-reference="even-page"/>
+                  </fo:repeatable-page-master-alternatives>
+                </fo:page-sequence-master>
+              </fo:layout-master-set>
+              
+              <xsl:apply-templates select="document"
+                mode="outline"/>
+              
+              <fo:page-sequence master-reference="book">
+                <xsl:apply-templates select="document"/>
+              </fo:page-sequence>
+              
+            </fo:root>
+          </forrest:part>
+        </forrest:content>
+        
+      </xsl:template>
+      
+      <xsl:template match="document">
+        <fo:title>
+          <xsl:value-of select="header/title"/>
+        </fo:title>
+        
+        <fo:static-content flow-name="first-footer">
+          <fo:block border-top="0.25pt solid"
+            padding-before="6pt" text-align="center">
+            <xsl:apply-templates select="footer"/>
+          </fo:block>
+          
+          
+          <!-- don't list page number on first page if it's contents is just the TOC -->
+          <xsl:if
+            test="not($toc-max-depth > 0 and $page-break-top-sections)">
+            <xsl:call-template name="insertPageNumber">
+              <xsl:with-param name="text-align">
+                start</xsl:with-param>
+            </xsl:call-template>
+          </xsl:if>
+          <xsl:call-template name="info"/>
+        </fo:static-content>
+        
+        <fo:static-content flow-name="even-header">
+          <fo:block font-size="70%" text-align="end"
+            font-style="italic">
+            <xsl:value-of select="header/title"/>
+          </fo:block>
+        </fo:static-content>
+        
+        <fo:static-content flow-name="even-footer">
+          <fo:block border-top="0.25pt solid"
+            padding-before="6pt" text-align="center">
+            <xsl:apply-templates select="footer"/>
+          </fo:block>
+          <xsl:call-template name="insertPageNumber">
+            <xsl:with-param name="text-align">
+              end</xsl:with-param>
+          </xsl:call-template>
+          <xsl:call-template name="info"/>
+        </fo:static-content>
+        
+        <fo:static-content flow-name="odd-header">
+          <fo:block font-size="70%" text-align="start"
+            font-style="italic">
+            <xsl:value-of select="header/title"/>
+          </fo:block>
+        </fo:static-content>
+        
+        <fo:static-content flow-name="odd-footer">
+          <fo:block border-top="0.25pt solid"
+            padding-before="6pt" text-align="center">
+            <xsl:apply-templates select="footer"/>
+          </fo:block>
+          <xsl:call-template name="insertPageNumber">
+            <xsl:with-param name="text-align">
+              start</xsl:with-param>
+          </xsl:call-template>
+          <xsl:call-template name="info"/>
+        </fo:static-content>
+        
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block padding-before="24pt" padding-after="24pt"
+            font-size="24pt" font-weight="bold"
+            id="{generate-id()}">
+            
+            <xsl:value-of select="header/title"/>
+          </fo:block>
+          
+          <fo:block text-align="{$text-align}"
+            padding-before="18pt" padding-after="18pt">
+            <xsl:apply-templates/>
+          </fo:block>
+          
+          <!-- Total number of pages calculation... -->
+          <fo:block id="term"/>
+          
+        </fo:flow>
+      </xsl:template>
+      
+      <xsl:template match="abstract">
+        <fo:block font-size="12pt" text-align="center"
+          space-before="20pt" space-after="25pt" width="7.5in"
+          font-family="serif" font-style="italic">
+          <xsl:call-template name="insertPageBreaks"/>
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:template>
+      
+      <xsl:template match="notice">
+        <fo:block font-size="10pt" text-align="left"
+          space-before="20pt" width="7.5in"
+          font-family="serif" border-top="0.25pt solid"
+          border-bottom="0.25pt solid" padding-before="6pt"
+          padding-after="6pt">
+          <xsl:call-template name="insertPageBreaks"/>
+          <!-- insert i18n stuff here --> NOTICE:
+          <xsl:apply-templates/> </fo:block>
+      </xsl:template>
+      
+      <xsl:template match="anchor">
+        <fo:block id="{@id}"/>
         <xsl:apply-templates/>
-      </fo:block>
+      </xsl:template>
       
-      <!-- Total number of pages calculation... -->
-      <fo:block id="term"/>
-
-    </fo:flow>
-  </xsl:template>
-
-  <xsl:template match="abstract">
-    <fo:block
-      font-size="12pt"
-      text-align="center"
-      space-before="20pt"
-      space-after="25pt"
-      width="7.5in"
-      font-family="serif"
-      font-style="italic">
-      <xsl:call-template name="insertPageBreaks"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="notice">
-    <fo:block
-      font-size="10pt"
-      text-align="left"
-      space-before="20pt"
-      width="7.5in"
-      font-family="serif"
-      border-top="0.25pt solid"
-      border-bottom="0.25pt solid"
-      padding-before="6pt"
-      padding-after="6pt">
-      <xsl:call-template name="insertPageBreaks"/>
-      <!-- insert i18n stuff here -->
-      NOTICE: <xsl:apply-templates/>
-    </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>
-
-    <xsl:variable name="size">
-      <!-- 14pt for level 1 12pt for level 2 -->
-      <xsl:value-of select="14-number($level)"/>
-    </xsl:variable>
-
-    <xsl:variable name="background-color" select="//skinconfig/colors/color[@name='body']/@value"/>
-    <xsl:variable name="heading-color" select="//skinconfig/colors/color[@name='subheading']/@value"/>
-    <xsl:variable name="heading-type" select="//skinconfig/headings/@type"/>
-
-    <fo:block
-      font-family="serif"
-      font-size="{$size}pt"
-      font-weight="bold"
-      space-before="12pt"
-      space-after="4pt">
-      
-      <xsl:call-template name="insertPageBreaks"/>
-    
-      <xsl:if test="$heading-type = 'boxed'">
-        <xsl:attribute name="background-color">
-          <xsl:value-of select="$heading-color"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:attribute name="id">
+      <xsl:template match="section">
+        
+        <xsl:param name="level">0</xsl:param>
+        
+        <xsl:variable name="size">
+          <!-- 14pt for level 1 12pt for level 2 -->
+          <xsl:value-of select="14-number($level)"/>
+        </xsl:variable>
+        
+        <xsl:variable name="background-color"
+          select="$config/page/@background-color"/>
+        <xsl:variable name="heading-color"
+          select="$config/headings/@color"/>
+        <xsl:variable name="heading-type"
+          select="$config/headings/@type"/>
+        
+        <fo:block font-family="serif" font-size="{$size}pt"
+          font-weight="bold" space-before="12pt"
+          space-after="4pt">
+          
+          <xsl:call-template name="insertPageBreaks"/>
+          
+          <xsl:if test="$heading-type = 'boxed'">
+            <xsl:attribute name="background-color">
+              <xsl:value-of select="$heading-color"/>
+            </xsl:attribute>
+          </xsl:if>
+          <xsl:attribute name="id">
+            <xsl:choose>
+              <xsl:when test="normalize-space(@id)!=''">
+                <xsl:value-of select="@id"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="generate-id()"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+          
+          <xsl:if
+            test="$numbersections = 'true' and number($level) &lt; $numbering-max-depth+1">
+            <xsl:number format="1.1.1.1.1.1.1" count="section"
+              level="multiple"/>
+            <xsl:text>. </xsl:text>
+          </xsl:if>
+          
+          
+          <!-- For sections 4  or more nestings deep, indent instead of number -->
+          <xsl:if
+            test="number($level) &gt; $numbering-max-depth+1">
+            <xsl:attribute name="start-indent">
+              <xsl:value-of select="4+number($level)"/>
+              <xsl:text>pt</xsl:text>
+            </xsl:attribute>
+          </xsl:if>
+          
+          <xsl:value-of select="title"/>
+        </fo:block>
+        <xsl:if test="$heading-type = 'underlined'">
+          <!-- The non-breaking space in this block is required, otherwise
+          the block won't be rendered at all. -->
+          <fo:block font-family="serif"
+            font-size="{10 div (number($level) +1 )}pt"
+            background-color="{$heading-color}">&#160;
+          </fo:block>
+        </xsl:if>
+        <fo:block background-color="{$background-color}">
+          <xsl:apply-templates>
+            <xsl:with-param name="level"
+              select="number($level)+1"/>
+          </xsl:apply-templates>
+        </fo:block>
+      </xsl:template>
+      
+      <xsl:template match="title">
+        
+        
+        <!-- do nothing as titles are handled in their parent templates -->
+      </xsl:template>
+      
+      <xsl:template match="subtitle">
+        <xsl:param name="level">0</xsl:param>
+        <xsl:variable name="size"
+          select="16-(number($level)*1.5)"/>
+        
+        <fo:block font-weight="bold" font-size="{$size}pt">
+          <xsl:call-template name="insertPageBreaks"/>
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:template>
+      
+      <xsl:template match="authors">
+        <fo:block space-before="20pt" font-weight="bold"
+          font-size="9pt">
+          <xsl:call-template name="insertPageBreaks"/>
+          <!-- insert i18n stuff here --> by
+          <xsl:for-each select="person">
+            <xsl:value-of select="@name"/>
+            <xsl:if test="not(position() = last())">,
+              </xsl:if>
+          </xsl:for-each> </fo:block>
+      </xsl:template>
+      
+      <xsl:template match="p">
         <xsl:choose>
-          <xsl:when test="normalize-space(@id)!=''">
-            <xsl:value-of select="@id"/>
+          <xsl:when
+            test="ancestor::li and not(preceding-sibling::*)">
+            <fo:block space-after="4pt" font-family="serif">
+              <xsl:call-template name="insertPageBreaks"/>
+              <xsl:apply-templates/>
+            </fo:block>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="generate-id()"/>
+            <fo:block space-before="4pt" space-after="4pt"
+              font-family="serif">
+              <xsl:call-template name="insertPageBreaks"/>
+              <xsl:apply-templates/>
+            </fo:block>
           </xsl:otherwise>
         </xsl:choose>
-      </xsl:attribute>
-
-      <xsl:if test="$numbersections = 'true' and number($level) &lt; $numbering-max-depth+1">
-        <xsl:number format="1.1.1.1.1.1.1" count="section" level="multiple"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-
-      <!-- For sections 4  or more nestings deep, indent instead of number -->
-      <xsl:if test="number($level) &gt; $numbering-max-depth+1">
-        <xsl:attribute name="start-indent">
-          <xsl:value-of select="4+number($level)"/><xsl:text>pt</xsl:text>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:value-of select="title"/>
-    </fo:block>
-    <xsl:if test="$heading-type = 'underlined'">
-      <!-- The non-breaking space in this block is required, otherwise
-      the block won't be rendered at all. --> 
-      <fo:block
-        font-family="serif"
-        font-size="{10 div (number($level) +1 )}pt"
-        background-color="{$heading-color}">&#160;</fo:block>
-    </xsl:if>
-    <fo:block
-        background-color="{$background-color}">
-      <xsl:apply-templates>
-        <xsl:with-param name="level" select="number($level)+1"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="title">
-    <!-- do nothing as titles are handled in their parent templates -->
-  </xsl:template>
-
-  <xsl:template match="subtitle">
-    <xsl:param name="level">0</xsl:param>
-    <xsl:variable name="size" select="16-(number($level)*1.5)"/>
-
-    <fo:block
-      font-weight="bold"
-      font-size="{$size}pt">
-      <xsl:call-template name="insertPageBreaks"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="authors">
-    <fo:block
-      space-before="20pt"
-      font-weight="bold"
-      font-size="9pt">
-      <xsl:call-template name="insertPageBreaks"/>
-      <!-- insert i18n stuff here -->
-      by
-      <xsl:for-each select="person">
-        <xsl:value-of select="@name"/>
-        <xsl:if test="not(position() = last())">, </xsl:if>
-      </xsl:for-each>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="p">
-    <xsl:choose>
-      <xsl:when test="ancestor::li and not(preceding-sibling::*)">
-        <fo:block
-          space-after="4pt"
-          font-family="serif">
+      </xsl:template>
+      
+      <xsl:template match="source">
+        <xsl:variable name="color"
+          select="$config/colors/color[@name='code']/@value"/>
+        <fo:block font-family="monospace" font-size="10pt"
+          background-color="{$color}"
+          white-space-collapse="false"
+          linefeed-treatment="preserve"
+          white-space-treatment="preserve" wrap-option="wrap"
+          text-align="start">
           <xsl:call-template name="insertPageBreaks"/>
           <xsl:apply-templates/>
         </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block
-          space-before="4pt"
-          space-after="4pt"
-          font-family="serif">
+      </xsl:template>
+      
+      <xsl:template match="ol|ul">
+        <fo:list-block
+          provisional-distance-between-starts="18pt"
+          provisional-label-separation="3pt"
+          text-align="start">
+          <xsl:apply-templates/>
+        </fo:list-block>
+      </xsl:template>
+      
+      <xsl:template match="ol/li">
+        <fo:list-item>
+          <xsl:if test="not(following-sibling::li[1])">
+            <xsl:attribute name="space-after">
+              6pt"</xsl:attribute>
+          </xsl:if>
+          <fo:list-item-label end-indent="label-end()">
+            <fo:block>
+              <xsl:number format="1."/>
+            </fo:block>
+          </fo:list-item-label>
+          <fo:list-item-body start-indent="body-start()">
+            <fo:block font-family="serif">
+              <xsl:apply-templates/>
+            </fo:block>
+          </fo:list-item-body>
+        </fo:list-item>
+      </xsl:template>
+      
+      <!-- Emulate browser handling of these invalid combinations that our DTD
+      unfortunately allows -->
+      <xsl:template match="ul/ul | ul/ol | ol/ul | ol/ol">
+        <fo:list-item>
+          <fo:list-item-label end-indent="label-end()">
+            <fo:block></fo:block>
+          </fo:list-item-label>
+          <fo:list-item-body start-indent="body-start()">
+            <fo:block font-family="serif">
+              <xsl:apply-templates/>
+            </fo:block>
+          </fo:list-item-body>
+        </fo:list-item>
+      </xsl:template>
+      
+      <xsl:template match="ul/li">
+        <fo:list-item>
+          <xsl:if test="not(following-sibling::li[1])">
+            <xsl:attribute name="space-after">
+              6pt</xsl:attribute>
+          </xsl:if>
+          <fo:list-item-label end-indent="label-end()">
+            <fo:block>&#x2022;
+            </fo:block>
+          </fo:list-item-label>
+          <fo:list-item-body start-indent="body-start()">
+            <fo:block font-family="serif">
+              <xsl:apply-templates/>
+            </fo:block>
+          </fo:list-item-body>
+        </fo:list-item>
+      </xsl:template>
+      
+      <xsl:template match="dl">
+        <fo:list-block
+          provisional-distance-between-starts="18pt"
+          provisional-label-separation="3pt"
+          text-align="start">
+          <xsl:apply-templates/>
+        </fo:list-block>
+      </xsl:template>
+      
+      <xsl:template match="dt">
+        <fo:list-item>
+          <fo:list-item-label end-indent="label-end()">
+            <fo:block></fo:block>
+          </fo:list-item-label>
+          <fo:list-item-body start-indent="body-start()">
+            <fo:block font-weight="bold">
+              <xsl:apply-templates/>
+            </fo:block>
+          </fo:list-item-body>
+        </fo:list-item>
+      </xsl:template>
+      
+      <xsl:template match="dd">
+        <fo:list-item>
+          <fo:list-item-label end-indent="label-end()">
+            <fo:block></fo:block>
+          </fo:list-item-label>
+          <fo:list-item-body start-indent="body-start()">
+            <fo:block>
+              <xsl:apply-templates/>
+            </fo:block>
+          </fo:list-item-body>
+        </fo:list-item>
+      </xsl:template>
+      
+      <xsl:template match="strong">
+        <fo:inline font-weight="bold">
+          <xsl:apply-templates/>
+        </fo:inline>
+      </xsl:template>
+      
+      <xsl:template match="em">
+        <fo:inline font-style="italic">
+          <xsl:apply-templates/>
+        </fo:inline>
+      </xsl:template>
+      
+      <xsl:template match="code">
+        <fo:inline font-family="monospace">
+          <xsl:apply-templates/>
+        </fo:inline>
+      </xsl:template>
+      
+      <xsl:template match="warning">
+        <xsl:variable name="color"
+          select="$config/colors/color[@name='warning']/@value"/>
+        <fo:block margin-left="0.25in" margin-right="0.25in"
+          font-weight="bold" font-size="10pt"
+          font-family="serif" space-before="10pt"
+          border-before-style="solid"
+          border-start-style="solid" border-end-style="solid"
+          border-color="{$color}" background-color="{$color}"
+          color="#ffffff">
           <xsl:call-template name="insertPageBreaks"/>
+          <xsl:choose>
+            <xsl:when test="@label">
+              <xsl:value-of select="@label"/>
+            </xsl:when>
+            <xsl:otherwise>Warning: </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="title"/>
+        </fo:block>
+        <fo:block margin-left="0.25in" margin-right="0.25in"
+          font-family="serif" font-size="8pt"
+          border-after-style="solid"
+          border-start-style="solid" border-end-style="solid"
+          border-color="{$color}" background-color="#fff0f0"
+          padding-start="3pt" padding-end="3pt"
+          padding-before="3pt" padding-after="3pt"
+          space-after="10pt">
           <xsl:apply-templates/>
         </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="source">
-    <xsl:variable name="color" select="//skinconfig/colors/color[@name='code']/@value"/>
-    <fo:block
-      font-family="monospace"
-      font-size="10pt"
-      background-color="{$color}"
-      white-space-collapse="false"
-      linefeed-treatment="preserve"
-      white-space-treatment="preserve"
-      wrap-option="wrap"
-      text-align="start">
-      <xsl:call-template name="insertPageBreaks"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-
-  <xsl:template match="ol|ul">
-    <fo:list-block
-      provisional-distance-between-starts="18pt"
-      provisional-label-separation="3pt"
-      text-align="start">
-      <xsl:apply-templates/>
-    </fo:list-block>
-  </xsl:template>
-
-  <xsl:template match="ol/li">
-    <fo:list-item>
-      <xsl:if test="not(following-sibling::li[1])">
-        <xsl:attribute name="space-after">6pt"</xsl:attribute>
-      </xsl:if>
-      <fo:list-item-label
-        end-indent="label-end()">
-        <fo:block>
-          <xsl:number format="1."/>
+      </xsl:template>
+      
+      <xsl:template match="note">
+        <xsl:variable name="color"
+          select="$config/colors/color[@name='note']/@value"/>
+        <fo:block margin-left="0.25in" margin-right="0.25in"
+          font-weight="bold" font-size="10pt" color="#ffffff"
+          font-family="serif" space-before="10pt"
+          border-before-style="solid"
+          border-start-style="solid" border-end-style="solid"
+          border-color="{$color}"
+          background-color="{$color}">
+          <xsl:call-template name="insertPageBreaks"/>
+          <xsl:choose>
+            <xsl:when test="@label">
+              <xsl:value-of select="@label"/>
+            </xsl:when>
+            <!-- insert i18n stuff here -->
+            <xsl:otherwise>Note: </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="title"/>
         </fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body
-        start-indent="body-start()">
-        <fo:block
-          font-family="serif">
+        <fo:block margin-left="0.25in" margin-right="0.25in"
+          font-family="serif" font-size="8pt"
+          space-after="10pt" border-after-style="solid"
+          border-start-style="solid" border-end-style="solid"
+          border-color="{$color}" background-color="#F0F0FF"
+          padding-start="3pt" padding-end="3pt"
+          padding-before="3pt" padding-after="3pt">
           <xsl:apply-templates/>
         </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-  <!-- Emulate browser handling of these invalid combinations that our DTD
-  unfortunately allows -->
-  <xsl:template match="ul/ul | ul/ol | ol/ul | ol/ol">
-    <fo:list-item>
-      <fo:list-item-label end-indent="label-end()">
-        <fo:block></fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block font-family="serif">
+      </xsl:template>
+      
+      <xsl:template match="fixme">
+        <xsl:variable name="color"
+          select="$config/colors/color[@name='fixme']/@value"/>
+        <fo:block margin-left="0.25in" margin-right="0.25in"
+          font-weight="bold" font-size="10pt" color="#FFFFFF"
+          font-family="serif" space-before="10pt"
+          border-before-style="solid"
+          border-start-style="solid" border-end-style="solid"
+          border-color="{$color}"
+          background-color="{$color}">
+          <xsl:call-template name="insertPageBreaks"/>
+          <!-- insert i18n stuff here --> FIXME (
+          <xsl:value-of select="@author"/>):
+          <xsl:value-of select="title"/> </fo:block>
+        <fo:block margin-left="0.25in" margin-right="0.25in"
+          font-family="serif" font-size="8pt"
+          space-after="10pt" border-after-style="solid"
+          border-start-style="solid" border-end-style="solid"
+          border-color="{$color}" background-color="#FFF0F0"
+          padding-start="3pt" padding-end="3pt"
+          padding-before="3pt" padding-after="3pt">
           <xsl:apply-templates/>
         </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-  <xsl:template match="ul/li">
-    <fo:list-item>
-      <xsl:if test="not(following-sibling::li[1])">
-        <xsl:attribute name="space-after">6pt</xsl:attribute>
-      </xsl:if>
-      <fo:list-item-label end-indent="label-end()">
-        <fo:block>&#x2022;</fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block
-          font-family="serif">
-          <xsl:apply-templates/>
+      </xsl:template>
+      
+      <xsl:template match="link|fork|jump">
+        <xsl:variable name="color"
+          select="$config/colors/color[@name = 'body']/@link"/>
+        <xsl:choose>
+          <xsl:when test="starts-with(@href, '#')">
+            <fo:basic-link color="{$color}"
+              text-decoration="underline"
+              internal-destination="{substring(@href,2)}">
+              <xsl:apply-templates/>
+            </fo:basic-link>
+          </xsl:when>
+          <xsl:otherwise>
+            <fo:basic-link color="{$color}"
+              text-decoration="underline"
+              external-destination="{@href}">
+              <xsl:apply-templates/>
+            </fo:basic-link>
+            <xsl:if
+              test="$show-external-urls = 'true' and @href != string(.)">
+              (
+              <xsl:value-of select="@href"/>) </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:template>
+      
+      <xsl:template match="figure|img">
+        <fo:block text-align="center">
+          <xsl:call-template name="insertPageBreaks"/>
+          <xsl:if test="normalize-space(@id)!=''">
+            <xsl:attribute name="id">
+              <xsl:value-of select="@id"/>
+            </xsl:attribute>
+          </xsl:if>
+          
+          <!-- Make relative paths absolute -->
+          <xsl:variable name="imgpath">
+            <xsl:choose>
+              <!-- resources image dir -->
+              <xsl:when
+                test="starts-with(string(@src),'images/')">
+                <xsl:value-of
+                  select="concat($imagesdir,substring-after(@src,'images'))"/>
+              </xsl:when>
+              <!-- already absolute -->
+              <xsl:when
+                test="contains(string(@src),':') or starts-with(string(@src),'/')">
+                <xsl:value-of select="@src"/>
+              </xsl:when>
+              <!-- relative to document -->
+              <xsl:otherwise>
+                <xsl:value-of
+                  select="concat($xmlbasedir,@src)"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+          <fo:external-graphic src="{$imgpath}">
+            <xsl:if test="@height">
+              <xsl:attribute name="height">
+                <xsl:value-of select="@height"/>
+              </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="@width">
+              <xsl:attribute name="width">
+                <xsl:value-of select="@width"/>
+              </xsl:attribute>
+            </xsl:if>
+          </fo:external-graphic>
+          <!-- alt text -->
+          <xsl:if test="$config/show-image-alt-text='true'">
+            <xsl:if test="normalize-space(@alt)!=''">
+              <fo:block>
+                <xsl:value-of select="@alt"/>
+              </fo:block>
+            </xsl:if>
+          </xsl:if>
         </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-  <xsl:template match="dl">
-    <fo:list-block
-      provisional-distance-between-starts="18pt"
-      provisional-label-separation="3pt"
-      text-align="start">
-      <xsl:apply-templates/>
-    </fo:list-block>
-  </xsl:template>
-
-  <xsl:template match="dt">
-    <fo:list-item>
-      <fo:list-item-label end-indent="label-end()">
-        <fo:block></fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block
-          font-weight="bold">
+      </xsl:template>
+      
+      <xsl:template match="table">
+        <!-- FIXME: Apache FOP must have column widths specified at present,
+        this section can be removed when this limitation is removed from Fop.
+        Unfortunately, this means that each column is a fixed width,
+        but at least the table displays! -->
+        
+        <xsl:variable name="max-number-columns">
+          <xsl:for-each select="tr">
+            <xsl:sort select="count(td|th)" data-type="number"
+              order="descending"/>
+            <xsl:if test="position() = 1">
+              <xsl:value-of select="count(td|th)"/>
+            </xsl:if>
+          </xsl:for-each>
+        </xsl:variable>
+        
+        <xsl:variable name="column-width">
+          <xsl:value-of
+            select="6.25 div number($max-number-columns)"/>
+          in </xsl:variable>
+        
+        <fo:table>
+          
+          <fo:table-column>
+            <xsl:attribute name="column-width">
+              <xsl:value-of select="$column-width"/>
+            </xsl:attribute>
+            
+            <xsl:attribute name="number-columns-repeated">
+              <xsl:value-of
+                select="number($max-number-columns)"/>
+            </xsl:attribute>
+          </fo:table-column>
+          
+          <!-- End of hack for Fop support (if removing this hack, remember
+          you need the <fo:table> element) -->
+          
+          <fo:table-body font-size="10pt"
+            font-family="sans-serif">
+            <xsl:apply-templates select="tr"/>
+          </fo:table-body>
+        </fo:table>
+        
+        <!-- FIXME: Apache Fop does not support the caption element yet.
+        
+        
+        This hack will display the table caption accordingly. -->
+        <xsl:if test="caption">
+          <fo:block text-align="center" font-weight="bold">
+            <!-- insert i18n stuff here --> Table
+            <xsl:text>
+            </xsl:text>
+            <xsl:number count="table" level="multiple"/>
+            <xsl:text>: </xsl:text>
+            <xsl:value-of select="caption"/> </fo:block>
+        </xsl:if>
+      </xsl:template>
+      
+      <xsl:template match="tr">
+        <fo:table-row>
           <xsl:apply-templates/>
-        </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-  <xsl:template match="dd">
-    <fo:list-item>
-      <fo:list-item-label end-indent="label-end()">
+        </fo:table-row>
+      </xsl:template>
+      
+      <xsl:template match="th">
+        <xsl:variable name="border-color"
+          select="$config/colors/color[@name = 'table']/@value"/>
+        <xsl:variable name="background-color"
+          select="$border-color"/>
+        <fo:table-cell padding-before="4pt"
+          padding-after="4pt" padding-start="4pt"
+          padding-end="4pt" color="#FFFFFF"
+          background-color="{$background-color}"
+          border="1pt solid {$border-color}">
+          <xsl:attribute name="number-columns-spanned">
+            <xsl:value-of select="@colspan"/>
+          </xsl:attribute>
+          <xsl:attribute name="number-rows-spanned">
+            <xsl:value-of select="@rowspan"/>
+          </xsl:attribute>
+          <fo:block text-align="center">
+            <xsl:apply-templates/>
+          </fo:block>
+        </fo:table-cell>
+      </xsl:template>
+      
+      <xsl:template match="td">
+        <xsl:variable name="border-color"
+          select="$config/colors/color[@name = 'table']/@value"/>
+        <xsl:variable name="background-color"
+          select="$config/colors/color[@name = 'table-cell']/@value"/>
+        <fo:table-cell padding-before="4pt"
+          padding-after="4pt" padding-start="4pt"
+          padding-end="4pt"
+          background-color="{$background-color}"
+          border="1pt solid {$border-color}">
+          <xsl:attribute name="number-columns-spanned">
+            <xsl:value-of select="@colspan"/>
+          </xsl:attribute>
+          <xsl:attribute name="number-rows-spanned">
+            <xsl:value-of select="@rowspan"/>
+          </xsl:attribute>
+          <fo:block>
+            <xsl:apply-templates/>
+          </fo:block>
+        </fo:table-cell>
+      </xsl:template>
+      
+      <xsl:template match="br">
         <fo:block></fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block>
+      </xsl:template>
+      
+      <xsl:template match="legal">
+        <fo:inline font-size="8pt">
           <xsl:apply-templates/>
+        </fo:inline>
+      </xsl:template>
+      
+      <xsl:template match="body[count(//section) != 0]">
+        <xsl:if test="$toc-max-depth > 0">
+          <fo:block font-family="serif" font-size="14pt"
+            font-weight="bold" space-after="5pt"
+            space-before="5pt" text-align="justify"
+            width="7.5in">
+            <xsl:call-template name="insertPageBreaks"/>
+            <!-- insert i18n stuff here -->
+            <xsl:text>Table of contents</xsl:text>
+          </fo:block>
+          <fo:block font-family="sans" font-size="12pt"
+            space-after="5pt" space-before="0pt"
+            text-align="justify" width="7.5in">
+            <xsl:if test="$page-break-top-sections">
+              <xsl:attribute name="break-after">
+                page</xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates select="section" mode="toc"/>
+          </fo:block>
+        </xsl:if>
+        <xsl:apply-templates/>
+      </xsl:template>
+      
+      <xsl:template match="section" mode="toc">
+        <!-- FIXME: see bug FOR-640 -->
+        <xsl:param name="depth" select="'1'"/>
+        <fo:block space-before="5pt" text-align-last="justify"
+          start-indent=".5em" text-indent=".5em">
+          <fo:inline>
+            <xsl:variable name="id">
+              <xsl:choose>
+                <xsl:when test="normalize-space(@id)!=''">
+                  <xsl:value-of select="@id"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="generate-id()"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <fo:basic-link internal-destination="{$id}">
+              <xsl:value-of
+                select="substring('&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;', 0, 2 * $depth - 1)"/>
+              <fo:inline font-size="10pt">
+                <xsl:number count="section"
+                  format="1.1.1.1.1.1.1" level="multiple"/>
+              </fo:inline>
+              <xsl:text>
+              </xsl:text>
+              <xsl:value-of select="title"/>
+              <fo:leader leader-pattern="dots"/>
+              <fo:page-number-citation ref-id="{$id}"/>
+            </fo:basic-link>
+          </fo:inline>
+          <xsl:if test="$toc-max-depth > $depth">
+            <xsl:apply-templates select="section" mode="toc">
+              <xsl:with-param name="depth"
+                select="$depth + 1"/>
+            </xsl:apply-templates>
+          </xsl:if>
         </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-  <xsl:template match="strong">
-    <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match="em">
-    <fo:inline font-style="italic"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match="code">
-    <fo:inline font-family="monospace"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match="warning">
-    <xsl:variable name="color" select="//skinconfig/colors/color[@name='warning']/@value"/>
-    <fo:block
-      margin-left="0.25in"
-      margin-right="0.25in"
-      font-weight="bold"
-      font-size="10pt"
-      font-family="serif"
-      space-before="10pt"
-      border-before-style="solid"
-      border-start-style="solid"
-      border-end-style="solid"
-      border-color="{$color}"
-      background-color="{$color}"
-      color="#ffffff">
-      <xsl:call-template name="insertPageBreaks"/>
-      <xsl:choose>
-        <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
-        <xsl:otherwise>Warning: </xsl:otherwise>
-      </xsl:choose><xsl:value-of select="title"/>
-    </fo:block>
-    <fo:block
-      margin-left="0.25in"
-      margin-right="0.25in"
-      font-family="serif"
-      font-size="8pt"
-      border-after-style="solid"
-      border-start-style="solid"
-      border-end-style="solid"
-      border-color="{$color}"
-      background-color="#fff0f0"
-      padding-start="3pt"
-      padding-end="3pt"
-      padding-before="3pt"
-      padding-after="3pt"
-      space-after="10pt">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="note">
-    <xsl:variable name="color" select="//skinconfig/colors/color[@name='note']/@value"/>
-    <fo:block
-      margin-left="0.25in"
-      margin-right="0.25in"
-      font-weight="bold"
-      font-size="10pt"
-      color="#ffffff"
-      font-family="serif"
-      space-before="10pt"
-      border-before-style="solid"
-      border-start-style="solid"
-      border-end-style="solid"
-      border-color="{$color}"
-      background-color="{$color}">
-      <xsl:call-template name="insertPageBreaks"/>
-      <xsl:choose>
-        <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
-        <!-- insert i18n stuff here -->
-        <xsl:otherwise>Note: </xsl:otherwise>
-      </xsl:choose><xsl:value-of select="title"/>
-    </fo:block>
-    <fo:block
-      margin-left="0.25in"
-      margin-right="0.25in"
-      font-family="serif"
-      font-size="8pt"
-      space-after="10pt"
-      border-after-style="solid"
-      border-start-style="solid"
-      border-end-style="solid"
-      border-color="{$color}"
-      background-color="#F0F0FF"
-      padding-start="3pt"
-      padding-end="3pt"
-      padding-before="3pt"
-      padding-after="3pt">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="fixme">
-    <xsl:variable name="color" select="//skinconfig/colors/color[@name='fixme']/@value"/>
-    <fo:block
-      margin-left="0.25in"
-      margin-right="0.25in"
-      font-weight="bold"
-      font-size="10pt"
-      color="#FFFFFF"
-      font-family="serif"
-      space-before="10pt"
-      border-before-style="solid"
-      border-start-style="solid"
-      border-end-style="solid"
-      border-color="{$color}"
-      background-color="{$color}">
-      <xsl:call-template name="insertPageBreaks"/>
-      <!-- insert i18n stuff here -->
-      FIXME (<xsl:value-of select="@author"/>): <xsl:value-of select="title"/>
-    </fo:block>
-    <fo:block
-      margin-left="0.25in"
-      margin-right="0.25in"
-      font-family="serif"
-      font-size="8pt"
-      space-after="10pt"
-      border-after-style="solid"
-      border-start-style="solid"
-      border-end-style="solid"
-      border-color="{$color}"
-      background-color="#FFF0F0"
-      padding-start="3pt"
-      padding-end="3pt"
-      padding-before="3pt"
-      padding-after="3pt">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>                 
-
-  <xsl:template match="link|fork|jump">
-    <xsl:variable name="color" select="//skinconfig/colors/color[@name = 'body']/@link"/>
-    <xsl:choose>
-      <xsl:when test="starts-with(@href, '#')">
-        <fo:basic-link color="{$color}" text-decoration="underline" internal-destination="{substring(@href,2)}">
+      </xsl:template>
+      
+      
+      <!-- ====================================================================== -->
+      <!-- Local Extensions section -->
+      
+      
+      <!-- ====================================================================== -->
+      
+      <xsl:template match="citation">
+        <fo:inline> [
+          <xsl:value-of select="@def"/>] </fo:inline>
+      </xsl:template>
+      
+      <xsl:template match="p[@class='quote']">
+        <fo:block start-indent="1em" space-before="4pt"
+          space-after="4pt" background-color="#f0f0f0"
+          font-family="monospace">
+          <xsl:call-template name="insertPageBreaks"/>
           <xsl:apply-templates/>
-        </fo:basic-link>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:basic-link color="{$color}" text-decoration="underline" external-destination="{@href}"><xsl:apply-templates/></fo:basic-link>
-        <xsl:if test="$show-external-urls = 'true' and @href != string(.)">
-          (<xsl:value-of select="@href"/>)
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="figure|img">
-    <fo:block text-align="center">
-      <xsl:call-template name="insertPageBreaks"/>
-      <xsl:if test="normalize-space(@id)!=''">
-          <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-      </xsl:if>
-
-      <!-- Make relative paths absolute -->
-      <xsl:variable name="imgpath">
-      <xsl:choose>
-        <!-- resources image dir -->
-        <xsl:when test="starts-with(string(@src),'images/')">
-          <xsl:value-of select="concat($imagesdir,substring-after(@src,'images'))"/>
-        </xsl:when>
-        <!-- already absolute -->
-        <xsl:when test="contains(string(@src),':') or starts-with(string(@src),'/')">
-          <xsl:value-of select="@src"/>
-        </xsl:when>
-        <!-- relative to document -->
-        <xsl:otherwise><xsl:value-of select="concat($xmlbasedir,@src)"/></xsl:otherwise>
-      </xsl:choose>
-      </xsl:variable>
-      <fo:external-graphic src="{$imgpath}">
-        <xsl:if test="@height">
-          <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
-        </xsl:if>
-        <xsl:if test="@width">
-          <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
-        </xsl:if>
-      </fo:external-graphic>
-      <!-- alt text -->
-      <xsl:if test="//skinconfig/pdf/show-image-alt-text='true'">
-        <xsl:if test="normalize-space(@alt)!=''">
-            <fo:block><xsl:value-of select="@alt"/></fo:block>
+        </fo:block>
+      </xsl:template>
+      
+      <xsl:template name="insertPageBreaks">
+        
+        
+        <!-- if marked as a 'pageBreakBefore', and we're breaking on pages, and were not the first node -->
+        <xsl:if
+          test="contains(@class, 'pageBreakBefore') and preceding-sibling::node()">
+          <xsl:attribute name="break-before">
+            page</xsl:attribute>
         </xsl:if>
-      </xsl:if>
-    </fo:block>
-  </xsl:template>
-
-  <xsl:template match="table">
-    <!-- FIXME: Apache FOP must have column widths specified at present,
-         this section can be removed when this limitation is removed from Fop.
-         Unfortunately, this means that each column is a fixed width,
-         but at least the table displays! -->
-
-    <xsl:variable name="max-number-columns">
-      <xsl:for-each select="tr">
-        <xsl:sort select="count(td|th)" data-type="number" order="descending"/>
-        <xsl:if test="position() = 1">
-          <xsl:value-of select="count(td|th)"/>
+        
+        
+        <!-- if marked as a 'pageBreakAfter', and we're breaking on pages, and were not the last node -->
+        <xsl:if
+          test="contains(@class, 'pageBreakAfter') and following-sibling::node()">
+          <xsl:attribute name="break-after">
+            page</xsl:attribute>
         </xsl:if>
-      </xsl:for-each>
-    </xsl:variable>
-
-
-    <xsl:variable name="column-width">
-      <xsl:value-of select="6.25 div number($max-number-columns)"/>in
-    </xsl:variable>
-
-    <fo:table>
-
-      <fo:table-column>
-        <xsl:attribute name="column-width">
-          <xsl:value-of select="$column-width"/>
-        </xsl:attribute>
-
-        <xsl:attribute name="number-columns-repeated">
-          <xsl:value-of select="number($max-number-columns)"/>
-        </xsl:attribute>
-      </fo:table-column>
-
-      <!-- End of hack for Fop support (if removing this hack, remember
-           you need the <fo:table> element) -->
-
-      <fo:table-body
-        font-size="10pt"
-        font-family="sans-serif">
-        <xsl:apply-templates select="tr"/>
-      </fo:table-body>
-    </fo:table>
-
-    <!-- FIXME: Apache Fop does not support the caption element yet.
-         This hack will display the table caption accordingly. -->
-    <xsl:if test="caption">
-      <fo:block
-        text-align="center"
-        font-weight="bold">
-        <!-- insert i18n stuff here -->
-        Table
-        <xsl:text> </xsl:text>
-        <xsl:number count="table" level="multiple"/>
-        <xsl:text>: </xsl:text>
-        <xsl:value-of select="caption"/>
-      </fo:block>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="tr">
-    <fo:table-row>
-      <xsl:apply-templates/>
-    </fo:table-row>
-  </xsl:template>
-
-  <xsl:template match="th">
-      <xsl:variable name="border-color" select="//skinconfig/colors/color[@name = 'table']/@value"/>
-      <xsl:variable name="background-color" select="$border-color"/>
-      <fo:table-cell
-        padding-before="4pt"
-        padding-after="4pt"
-        padding-start="4pt"
-        padding-end="4pt"
-        color="#FFFFFF"
-        background-color="{$background-color}"
-        border="1pt solid {$border-color}">
-        <xsl:attribute name="number-columns-spanned">
-          <xsl:value-of select="@colspan"/>
-        </xsl:attribute>
-        <xsl:attribute name="number-rows-spanned">
-          <xsl:value-of select="@rowspan"/>
-        </xsl:attribute>
-        <fo:block
-          text-align="center">
-          <xsl:apply-templates/>
-        </fo:block>
-      </fo:table-cell>
-  </xsl:template>
-
-  <xsl:template match="td">
-    <xsl:variable name="border-color" select="//skinconfig/colors/color[@name = 'table']/@value"/>
-    <xsl:variable name="background-color" select="//skinconfig/colors/color[@name = 'table-cell']/@value"/>
-    <fo:table-cell
-      padding-before="4pt"
-      padding-after="4pt"
-      padding-start="4pt"
-      padding-end="4pt"
-      background-color="{$background-color}"
-      border="1pt solid {$border-color}">
-      <xsl:attribute name="number-columns-spanned">
-          <xsl:value-of select="@colspan"/>
-        </xsl:attribute>
-        <xsl:attribute name="number-rows-spanned">
-          <xsl:value-of select="@rowspan"/>
-        </xsl:attribute>
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:table-cell>
-  </xsl:template>
-
-  <xsl:template match="br">
-    <fo:block></fo:block>
-  </xsl:template>
-
-  <xsl:template match="legal">
-    <fo:inline
-      font-size="8pt">
-      <xsl:apply-templates/>
-    </fo:inline>
-  </xsl:template>
-
-  <xsl:template match="body[count(//section) != 0]">
-    <xsl:if test="$toc-max-depth > 0">
-      <fo:block font-family="serif" font-size="14pt" font-weight="bold"
-      space-after="5pt" space-before="5pt" text-align="justify" width="7.5in">
-      <xsl:call-template name="insertPageBreaks"/>
-        <!-- insert i18n stuff here -->
-        <xsl:text>Table of contents</xsl:text>
-      </fo:block>
-      <fo:block font-family="sans" font-size="12pt" space-after="5pt"
-      space-before="0pt" text-align="justify" width="7.5in">
-          <xsl:if test="$page-break-top-sections">
-            <xsl:attribute name="break-after">page</xsl:attribute>
-          </xsl:if>
-          <xsl:apply-templates select="section" mode="toc" />
-      </fo:block>
-    </xsl:if>
-    <xsl:apply-templates />
-  </xsl:template>
-
-  <xsl:template match="section" mode="toc">
-    <!-- FIXME: see bug FOR-640 -->
-    <xsl:param name="depth" select="'1'"/>
-    <fo:block space-before="5pt" text-align-last="justify" start-indent=".5em" text-indent=".5em">
-      <fo:inline>
-        <xsl:variable name="id">
+      </xsl:template>
+      
+      <!-- Display the document numerotation -->
+      <xsl:template name="insertPageNumber">
+        <xsl:param name="text-align" select="'start'"/>
+        <xsl:variable name="prefixe"
+          select="substring-before($page-numbering-format,'1')"/>
+        <xsl:variable name="sep"
+          select="substring-before(substring-after($page-numbering-format,'1'),'1')"/>
+        <xsl:variable name="postfixe">
           <xsl:choose>
-            <xsl:when test="normalize-space(@id)!=''">
-              <xsl:value-of select="@id"/>
+            <xsl:when
+              test="contains(substring-after($page-numbering-format,'1'),'1')">
+              <xsl:value-of
+                select="substring-after(substring-after($page-numbering-format,'1'),'1')"/>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="generate-id()"/>
+              <xsl:value-of
+                select="substring-after($page-numbering-format,'1')"/>
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        <fo:basic-link internal-destination="{$id}">
-          <xsl:value-of select="substring('&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;', 0, 2 * $depth - 1)" />
-          <fo:inline font-size="10pt">
-          <xsl:number count="section" format="1.1.1.1.1.1.1" level="multiple" />
-          </fo:inline>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="title" />
-          <fo:leader leader-pattern="dots" />
-          <fo:page-number-citation ref-id="{$id}" />
-        </fo:basic-link>
-      </fo:inline>
-        <xsl:if test="$toc-max-depth > $depth">
-          <xsl:apply-templates select="section" mode="toc">
-            <xsl:with-param name="depth" select="$depth + 1"/>
-          </xsl:apply-templates>
+        
+        
+        <!-- if 'page-numbering-format' contains 1 digits, the page number is displayed in the footer -->
+        <xsl:if test="contains($page-numbering-format,'1')">
+          <fo:block font-size="70%"
+            text-align="{$text-align}">
+            
+            
+            <!-- if the separator is not found, the total page number is skipped -->
+            <xsl:value-of select="$prefixe"/>
+            <fo:page-number/>
+            <xsl:if test="$sep != ''">
+              <xsl:value-of select="$sep"/>
+              <fo:page-number-citation ref-id="term"/>
+            </xsl:if>
+            <xsl:value-of select="$postfixe"/>
+          </fo:block>
         </xsl:if>
-    </fo:block>
-  </xsl:template>
-
-
-<!-- ====================================================================== -->
-<!-- Local Extensions section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="citation">
-   <fo:inline>
-     [<xsl:value-of select="@def"/>]
-   </fo:inline>
- </xsl:template>
-
- <xsl:template match="p[@class='quote']">
-   <fo:block start-indent="1em"
-     space-before="4pt"
-     space-after="4pt"
-     background-color="#f0f0f0"
-     font-family="monospace">
-     <xsl:call-template name="insertPageBreaks"/>
-     <xsl:apply-templates/>
-   </fo:block>
- </xsl:template>
- 
- <xsl:template name="insertPageBreaks">
-      <!-- if marked as a 'pageBreakBefore', and we're breaking on pages, and were not the first node -->
-      <xsl:if test="contains(@class, 'pageBreakBefore') and preceding-sibling::node()">
-          <xsl:attribute name="break-before">page</xsl:attribute>
-      </xsl:if>
-      <!-- if marked as a 'pageBreakAfter', and we're breaking on pages, and were not the last node -->
-      <xsl:if test="contains(@class, 'pageBreakAfter') and following-sibling::node()">
-          <xsl:attribute name="break-after">page</xsl:attribute>
-      </xsl:if>
- </xsl:template>
-
- <!-- Display the document numerotation -->
- <xsl:template name="insertPageNumber">
-   <xsl:param name="text-align" select="'start'"/>
-     <xsl:variable name="prefixe" select="substring-before($page-numbering-format,'1')"/>
-     <xsl:variable name="sep" select="substring-before(substring-after($page-numbering-format,'1'),'1')"/>
-     <xsl:variable name="postfixe">
-       <xsl:choose>
-         <xsl:when test="contains(substring-after($page-numbering-format,'1'),'1')">
-           <xsl:value-of select="substring-after(substring-after($page-numbering-format,'1'),'1')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:value-of select="substring-after($page-numbering-format,'1')"/>
-         </xsl:otherwise>
-       </xsl:choose>
-     </xsl:variable>
-     
-     <!-- if 'page-numbering-format' contains 1 digits, the page number is displayed in the footer -->
-     <xsl:if test="contains($page-numbering-format,'1')">
-       <fo:block font-size="70%" text-align="{$text-align}">
-          <!-- if the separator is not found, the total page number is skipped -->
-          <xsl:value-of select="$prefixe"/><fo:page-number/><xsl:if test="$sep != ''"><xsl:value-of select="$sep"/><fo:page-number-citation ref-id="term"/></xsl:if><xsl:value-of select="$postfixe"/>
-      </fo:block>
-    </xsl:if>
- </xsl:template>
- 
-<!-- ====================================================================== -->
-<!-- Temporary section - subject to change on short notice  -->
-<!-- ====================================================================== -->
-
- <xsl:template match="//style"> 
-   <!-- HACK: The OpenOffice.org input plugin currently produces
-   intermediate documents that contain a style element, invalid per
-   the Forrest Document DTD. This style element must be ignored
-   here. To find out why this is done this way, read the comments
-   attached to issue FOR-433. -->
- </xsl:template>
-
-</xsl:stylesheet>
+      </xsl:template>
+      
+      
+      <!-- ====================================================================== -->
+      
+      
+      <!-- Temporary section - subject to change on short notice  -->
+      
+      
+      <!-- ====================================================================== -->
+      
+      <xsl:template match="//style">
+        <!-- HACK: The OpenOffice.org input plugin currently produces
+        intermediate documents that contain a style element, invalid per
+        the Forrest Document DTD. This style element must be ignored
+        here. To find out why this is done this way, read the comments
+        attached to issue FOR-433. -->
+      </xsl:template>
+      
+    </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>
\ No newline at end of file