Merged revisions 682600,682604-682605,682616-682618,682625,682630,683136,683159,683684,684041,684491,684493,684575,684577 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

................
  r682600 | jeremias | 2008-08-05 07:46:31 +0100 (Tue, 05 Aug 2008) | 8 lines
  
  Blocked revisions 681371 via svnmerge
  
  ........
    r681371 | jeremias | 2008-07-31 15:54:16 +0200 (Do, 31 Jul 2008) | 1 line
    
    Adjust fop.bat to JAR upgrade.
  ........
................
  r682604 | jeremias | 2008-08-05 07:51:32 +0100 (Tue, 05 Aug 2008) | 26 lines
  
  Merged revisions 636407-637074,637076-637118,637120-637790,637792-637856,637858-637992,637994-638047,638049-638307,638309-638315,638318-638936,638938-640888,640890-642905,642907-647402,647404-647536,647538-648983,648985-649005,649007-649013,649015-650549,650551-651301,651303-653536,653538-654452,654454-656285,656287-656523,656525-657519,657521-661579,661581-663481,663483-664691,664693-666634,666636-666661,666663-668532,668535-668549,668551-668569,668571-668640,668642-669117,669119-669172,669174-669477,669479-670550,670552-673749,673751-674303,674305-674313,674315-674316,674318-675105,675107-675149,675153-675706,675708-680714,680716-680819,680821-681283,681285,681287-681289,681293-681370,681372-682601 via svnmerge from 
  https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
  
  ........
    r681309 | jeremias | 2008-07-31 11:31:35 +0200 (Do, 31 Jul 2008) | 2 lines
    
    0.95beta -> 0.95
    Added links to the new SVN mirror in the Netherlands.
  ........
    r681314 | vhennebert | 2008-07-31 11:41:33 +0200 (Do, 31 Jul 2008) | 2 lines
    
    Corrected bug number
  ........
    r681329 | vhennebert | 2008-07-31 12:38:10 +0200 (Do, 31 Jul 2008) | 2 lines
    
    Slight re-phrasing to make it clearer (I believe) that this page only lists changes made since 0.95beta, but that changes from that latter are of course also available in 0.95 final
  ........
    r681330 | vhennebert | 2008-07-31 12:39:50 +0200 (Do, 31 Jul 2008) | 2 lines
    
    Don't be shy Max ;-) Restored alphabetical order in the list of active committers
  ........
    r681350 | jeremias | 2008-07-31 14:09:41 +0200 (Do, 31 Jul 2008) | 1 line
    
    Fixed validation errors.
  ........
................
  r682605 | jeremias | 2008-08-05 07:55:12 +0100 (Tue, 05 Aug 2008) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
................
  r682616 | jeremias | 2008-08-05 08:46:14 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Skip IO Exception when loading a PFM and an AFM could be loaded. The PFM is only a fallback and not necessary when the AFM is available. Motivation: The "URW Bookman L" fonts from GhostScript have bad PFM files.
................
  r682617 | jeremias | 2008-08-05 08:47:18 +0100 (Tue, 05 Aug 2008) | 1 line
  
  The FontEventListener was not wired into font auto-detection. An error while loading a font wasn't relayed to the event subsystem.
................
  r682618 | jeremias | 2008-08-05 08:57:36 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Fixed small mistake with weight adjustment on font lookup. Weight 400 was slipping through the cracks.
................
  r682625 | jeremias | 2008-08-05 09:12:25 +0100 (Tue, 05 Aug 2008) | 2 lines
  
  Removed "Areas of expertise" as discussed.
  News update for 0.95 release.
................
  r682630 | jeremias | 2008-08-05 09:28:07 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Oopsy, that wasn't intended to get into trunk.
................
  r683136 | jeremias | 2008-08-06 07:49:36 +0100 (Wed, 06 Aug 2008) | 1 line
  
  Some missing release info.
................
  r683159 | jeremias | 2008-08-06 09:24:53 +0100 (Wed, 06 Aug 2008) | 1 line
  
  Converted the project news to a special XML format so I can generate an RSS feed. Mostly copied from XML Graphics Commons.
................
  r683684 | jeremias | 2008-08-07 20:26:54 +0100 (Thu, 07 Aug 2008) | 1 line
  
  Added fop.cmd to binary distribution (not sure if any of the others should be included, too)
................
  r684041 | spepping | 2008-08-08 19:38:07 +0100 (Fri, 08 Aug 2008) | 2 lines
  
  Added fop.js to binary distribution
................
  r684491 | adelmelle | 2008-08-10 13:35:42 +0100 (Sun, 10 Aug 2008) | 1 line
  
  Bugzilla 45490: Avoid altering the original 'href' if the protocol is other than 'file:' (suggested by Thomas Stieler)
................
  r684493 | adelmelle | 2008-08-10 13:40:58 +0100 (Sun, 10 Aug 2008) | 1 line
  
  Added 'due-to' to the wrong entry...
................
  r684575 | jeremias | 2008-08-10 20:18:22 +0100 (Sun, 10 Aug 2008) | 2 lines
  
  Merge from 0_95 branch:
  Fixed ID resolution for nested bookmarks with duplicated IDs.
................
  r684577 | jeremias | 2008-08-10 20:35:27 +0100 (Sun, 10 Aug 2008) | 3 lines
  
  Bugzilla #45606:
  Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord.
  Submitted by: Pavel Kysilka <goldenfish.at.linuxsoft.cz>
................


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

23 files changed, 508 insertions, 516 deletions

diff --git a/build.xml b/build.xml
index 346125c14..c46468d7a 100644
--- a/build.xml
+++ b/build.xml
@@ -67,6 +67,8 @@ list of possible build targets.
     <include name="KEYS"/>
     <include name="status.xml"/>
     <include name="fop.bat"/>
+    <include name="fop.cmd"/>
+    <include name="fop.js"/>
     <include name="fop"/>
   </fileset>
   <fileset dir="${basedir}" id="dist.bin.lib">
diff --git a/forrest.properties b/forrest.properties
index add080783..62f777d63 100644
--- a/forrest.properties
+++ b/forrest.properties
@@ -66,7 +66,7 @@ project.knownissues=known-issues.xml
 # validation properties
 
 #forrest.validate=true
-forrest.validate=false
+#forrest.validate=false
 forrest.validate.xdocs=${forrest.validate}
 forrest.validate.skinconf=${forrest.validate}
 forrest.validate.sitemap=${forrest.validate}
diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf
index c677ecbc8..734e8339b 100644
--- a/src/documentation/content/doap.rdf
+++ b/src/documentation/content/doap.rdf
@@ -77,22 +77,22 @@
     <release>
       <Version>
         <name>Previous stable release</name>
-        <created>2007-01-02</created>
-        <revision>0.93</revision>
+        <created>2007-08-23</created>
+        <revision>0.94</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Previous development release</name>
-        <created>2008-25-08</created>
+        <created>2008-03-26</created>
         <revision>0.95beta</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Latest stable release</name>
-        <created>2007-08-23</created>
-        <revision>0.94</revision>
+        <created>2008-08-05</created>
+        <revision>0.95</revision>
       </Version>
     </release>
     <repository>
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index 181f1fe1d..fc89d11d5 100644
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -492,7 +492,7 @@
 
       <th align="center">0.94 (stable)</th>
 
-      <th align="center">0.95 (beta)</th>
+      <th align="center">0.95 (stable)</th>
 
       <th align="center">develop- ment</th>
     </tr>
diff --git a/src/documentation/content/xdocs/dev/release.xml b/src/documentation/content/xdocs/dev/release.xml
index 641758d78..8cbdc0815 100644
--- a/src/documentation/content/xdocs/dev/release.xml
+++ b/src/documentation/content/xdocs/dev/release.xml
@@ -39,7 +39,7 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         <li>Commit any outstanding changes</li>
         <li>Create a branch called <code>branches/fop-v_vv</code></li>
         <li>Edit release notes (<code>README</code> and <code>status.xml</code> in the root).</li>
-        <li>Update the <code>index.xml</code> and <code>site.xml</code> for the new version.</li>
+        <li>Update the <code>index.xml</code>, <code>site.xml</code> and <code>download.xml</code> for the new version.</li>
         <li>Update the version numbers in the release column on the
         compliance page (<code>compliance.xml</code>); update the compliance in the release column
         to the current state (development column).</li>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index f0a2a0a61..9f28efd00 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -89,35 +89,35 @@
         <tr>
           <td>Repository URL</td>
           <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
+            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/">
+              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/</code>
             </link>
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</code>
+            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/">
+              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/</code>
             </link>
           </td>
         </tr>
         <tr>
-          <th colspan="2">Latest Release</th>
+          <th colspan="2">Previous Stable Release</th>
         </tr>
         <tr>
           <td>Repository URL</td>
           <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/</code>
+            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
+              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
             </link>
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/</code>
+            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
+              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</code>
             </link>
           </td>
         </tr>
@@ -127,17 +127,30 @@
         <tr>
           <td>Repository URL</td>
           <td>
+            Main Repository:
             <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/">
               <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
             </link>
+            <br/>
+            European Mirror:
+            <link href="http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/">
+              <code>http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
+            </link>
+            
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
+            Main Repository:
             <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/">
               <code>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/</code>
             </link>
+            <br/>
+            European Mirror:
+            <link href="http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/">
+              <code>http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/</code>
+            </link>
           </td>
         </tr>
       </table>
@@ -146,7 +159,9 @@
         build FOP from the source files. For details please see the "Build" page on the documentation tab
         for the version you've downloaded.
       </p>
+      <!-- No hopes to reenable them because of problems with long path names on Solaris
       <fixme author="jeremias">Reenable the link to the SVN snapshots once they are available.</fixme>
+      -->
     </section>
     <section id="archives">
       <title>Archive Download</title>
diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml
new file mode 100644
index 000000000..56ff61094
--- /dev/null
+++ b/src/documentation/content/xdocs/news-data.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  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.
+-->
+<!-- $Id$ -->
+<news>
+  <item date="2008-08-05" title="Apache FOP 0.95 Released">
+    <p>
+      The Apache FOP team is delighted to present you a production grade
+      release of the new FOP codebase. This release
+      contains many bug fixes and new features. See the <a
+        href="0.95/releaseNotes_0.95.html">Release Notes</a> for a list of
+      the most important changes.
+    </p>
+  </item>
+  <item date="2008-03-16" title="Apache FOP 0.95beta Released">
+    <p>
+      The Apache FOP team is delighted to present you a beta version of the
+      next production grade release of the new FOP codebase. This release
+      contains many bug fixes and new features. See the <a
+        href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of
+      the most important changes.
+    </p>
+  </item>
+  <item date="2007-10-30" title="New committer">
+    <p>Welcome Max Berger!</p>
+  </item>
+  <item date="2007-10-15" title="New Committer">
+    <p>Welcome Adrian Cumiskey!</p>
+  </item>
+  <item date="2007-08-24" title="Apache FOP 0.94 Released">
+    <p>The Apache FOP team is pleased to present you the second production
+      grade release of the new FOP codebase. This release contains many bug
+      fixes and new features. See the <a
+        href="0.94/releaseNotes_0.94.html">Release Notes</a> for a list of
+      the most important changes.</p>
+  </item>
+  <item date="2007-01-26" title="New Committer">
+    <p>Welcome Jay Bryant!</p>
+  </item>
+  <item date="2007-01-09" title="Apache FOP 0.93 released">
+    <p>
+      The Apache FOP team is proud to present to you the first
+      production grade release of the new FOP codebase. This release
+      has the new API first introduced in release 0.92 beta. It
+      contains again many bug fixes and new features.
+    </p>
+  </item>
+  <item date="2006-10-16" title="New Committer">
+    <p>Welcome Vincent Hennebert!</p>
+  </item>
+  <item date="2006-04-18" title="Apache FOP 0.92 beta released">
+    <p>
+      A second "beta" grade release of the new FOP codebase with a modified and
+      now considered stable API. The release contains many bug fixes as well as
+      new features mainly related to even more extensive support of the XSL-FO
+      specification. This is expected to be the last "beta" release before we
+      go to a 1.0 release!
+    </p>
+  </item>
+  <item date="2005-12-23" title="Apache FOP 0.91 beta released">
+    <p>
+      One month after the initial release we're happy present a "beta" grade
+      release of the new FOP codebase. It's mostly a bug fix release but also
+      contains a few new features. Thanks to all those who sent us feedback
+      on the initial release!
+    </p>
+  </item>
+  <item date="2005-11-22" title="Apache FOP 0.90 alpha 1 released">
+    <p>
+      The Apache FOP team is proud to present to you the largely rewritten 
+      codebase which is finally in a state where you can start to use it. 
+      It has taken over three years to get this far and over two years 
+      without a new release from the FOP project.
+    </p>
+    <p>
+      Please see also the 
+      <a href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</a>.
+      <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
+    </p>
+  </item>
+  <item date="2005-09-08" title="New Committer">
+    <p>Welcome Manuel Mall!</p>
+  </item>
+  <item date="2004-10-20" title="Creation of the Apache XML Graphics project">
+    <p>
+      The Apache Board of Directors agreed to the creation of the 
+      <a href="http://xmlgraphics.apache.org">Apache XML Graphics</a>
+      project which will be comprised of Batik and FOP. Both former 
+      Apache XML subprojects are in this way complying with the Board's desire
+      to improve project oversight. Both project teams also see additional
+      benefits of working more closely together.
+    </p>
+  </item>
+  <item date="2004-10-08" title="New Committer">
+    <p>Welcome Luca Furini!</p>
+  </item>
+  <item date="2004-04-24" title="New Committer">
+    <p>Welcome Simon Pepping!</p>
+  </item>
+  <item date="2004-03-07" title="New Committer">
+    <p>Welcome Web Maestro Clay Leeds!</p>
+  </item>
+  <item date="2004-01-10" title="New Committers">
+    <p>Welcome Chris Bowditch and Andreas Delmelle!</p>
+  </item>
+  <item date="2004-01-04" title="New Committer">
+    <p>Welcome Finn Bock!</p>
+  </item>
+  <item date="2003-11-29" title="New Committer">
+    <p>Welcome Peter Herweg!</p>
+  </item>
+  <item date="2003-07-18" title="Apache FOP 0.20.5 released">
+    <p>Changes since 0.20.4 include:</p>
+    <ul>
+      <li>Added support for PDF encryption</li>
+      <li>Perfomance tuning</li>
+      <li>Fixed link hotspot positioning</li>
+      <li>Fixed multi-threading issues</li>
+      <li>Added support for CCITT Group 4 encoded TIFF files</li>
+      <li>Dynamic JAI support</li>
+      <li>Added autoselecting portrait/landscape for PCL and PS Renderer</li>
+      <li>Added continued-label extension for tables</li>
+      <li>Improved AWT Font-measuring/rendering</li>
+      <li>Improved marker handling</li>
+      <li>Fixed problem with jpegs with icc profile and acrobat reader 5</li>
+      <li>Added a fontBaseDir property</li>
+      <li>TXTRenderer output encoding</li>
+      <li>border-spacing support</li>
+      <li>and a lot more bugfixes</li>
+    </ul>
+    <p>
+      See also the full text of the
+      <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=6067">
+        announcement</a>.
+      <!-- TODO re-enable  and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.-->
+    </p>
+  </item>
+  <item date="2003-06-29" title="New Committer">
+    <p>Welcome Glen Mazza!</p>
+  </item>
+  <item date="2003-05-23" title="Apache FOP 0.20.5 Release Candidate 3 available">
+    <p>
+      See the full text of the <a
+        href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=5429">announcement</a>.
+    </p>
+  </item>
+  <item date="2003-02-18" title="Apache FOP 0.20.5 Release Candidate 2 available">
+    <p>
+      See the full text of the <a
+        href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=4509">announcement</a>.
+    </p>
+  </item>
+  <item date="2003-02-02" title="New XML PMC">
+    <p>
+      Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC.
+    </p>
+  </item>
+  <item date="2003-01-28" title="FOP logo contest">
+    <p>We are looking for a new logo. FOP logo
+      contest is started!</p>
+  </item>
+  <item date="2002-12-23" title="Official FOP Wiki">
+    <p>
+      See <a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages"
+        >FOP project pages</a> at the ApacheWiki.
+    </p>
+  </item>
+  <item date="2002-12-10" title="FOP 0.20.5 Release Candidate available">
+    <p>
+      See the full text of the <a
+        href="http://marc.theaimsgroup.com/?l=fop-user&amp;m=103954279712704&amp;w=2"
+        >announcement</a>.
+    </p>
+  </item>
+  <item date="2002-11-23" title="EXLSFO project has been created">
+    <p>
+      The EXSLFO project is a community effort to define functional extensions
+      to thet XSL Formatting Objects specification. See the
+      <a href="http://exslfo.sourceforge.net">EXSLFO website</a> for details.
+    </p>
+  </item>
+  <item date="2002-11-22" title="New Committer">
+    <p>Welcome Victor Mote!</p>
+  </item>
+  <item date="2002-11-09" title="New Committer">
+    <p>Welcome Oleg Tkachenko!</p>
+  </item>
+</news>
\ No newline at end of file
diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml
index 1a5c178e2..29a1e3f98 100644
--- a/src/documentation/content/xdocs/news.xml
+++ b/src/documentation/content/xdocs/news.xml
@@ -23,207 +23,10 @@
     <version>$Revision$</version>
   </header>
   <body>
-    <section>
-      <title>26th March 2007 - Apache FOP 0.95beta Released</title>
-      <p>The Apache FOP team is delighted to present you a beta version of the
-        next production grade release of the new FOP codebase. This release
-        contains many bug fixes and new features. See the <a
-          href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of
-        the most important changes.</p>
-    </section>
-    <section>
-      <title>30 October 2007 - New Committer</title>
-      <p>Welcome Max Berger!</p>
-    </section>
-    <section>
-      <title>15 October 2007 - New Committer</title>
-      <p>Welcome Adrian Cumiskey!</p>
-    </section>
-    <section>
-      <title>24th August 2007 - Apache FOP 0.94 Released</title>
-      <p>The Apache FOP team is pleased to present you the second production
-        grade release of the new FOP codebase. This release contains many bug
-        fixes and new features. See the <a
-          href="0.94/releaseNotes_0.94.html">Release Notes</a> for a list of
-        the most important changes.</p>
-    </section>
-    <section>
-      <title>26 January 2007 - New Committer</title>
-      <p>Welcome Jay Bryant!</p>
-    </section>
-    <section>
-      <title>9 January 2007 - Apache FOP 0.93 released</title>
-      <p>
-        The Apache FOP team is proud to present to you the first
-        production grade release of the new FOP codebase. This release
-        has the new API first introduced in release 0.92 beta. It
-        contains again many bug fixes and new features.
-      </p>
-    </section>
-    <section>
-      <title>16 October 2006 - New Committer</title>
-      <p>Welcome Vincent Hennebert!</p>
-    </section>
-    <section>
-      <title>18 April 2006 - Apache FOP 0.92 beta released</title>
-      <p>
-        A second "beta" grade release of the new FOP codebase with a modified and
-        now considered stable API. The release contains many bug fixes as well as
-        new features mainly related to even more extensive support of the XSL-FO
-        specification. This is expected to be the last "beta" release before we
-        go to a 1.0 release!
-      </p>
-    </section>
-    <section>
-      <title>23 December 2005 - Apache FOP 0.91 beta released</title>
-      <p>
-        One month after the initial release we're happy present a "beta" grade
-        release of the new FOP codebase. It's mostly a bug fix release but also
-        contains a few new features. Thanks to all those who sent us feedback
-        on the initial release!
-      </p>
-    </section>
-    <section>
-      <title>22 November 2005 - Apache FOP 0.90 alpha 1 released</title>
-      <p>
-        The Apache FOP team is proud to present to you the largely rewritten 
-        codebase which is finally in a state where you can start to use it. 
-        It has taken over three years to get this far and over two years 
-        without a new release from the FOP project.
-      </p>
-      <p>
-        Please see also the 
-        <a href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</a>.
-        <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
-      </p>
-    </section>
-    <section>
-      <title>8 September 2005 - New Committer</title>
-      <p>Welcome Manuel Mall!</p>
-    </section>
-    <section>
-      <title>20 October 2004 - Creation of the Apache XML Graphics project</title>
-      <p>
-        The Apache Board of Directors agreed to the creation of the 
-        <a href="http://xmlgraphics.apache.org">Apache XML Graphics</a>
-        project which will be comprised of Batik and FOP. Both former 
-        Apache XML subprojects are in this way complying with the Board's desire
-        to improve project oversight. Both project teams also see additional
-        benefits of working more closely together.
-      </p>
-    </section>
-    <section>
-      <title>8 October 2004 - New Committer</title>
-      <p>Welcome Luca Furini!</p>
-    </section>
-    <section>
-      <title>24 April 2004 - New Committer</title>
-      <p>Welcome Simon Pepping!</p>
-    </section>
-    <section>
-      <title>7 March 2004 - New Committer</title>
-      <p>Welcome Web Maestro Clay Leeds!</p>
-    </section>
-    <section>
-      <title>10 January 2004 - New Committers</title>
-      <p>Welcome Chris Bowditch and Andreas Delmelle!</p>
-    </section>
-    <section>
-      <title>4 January 2004 - New Committer</title>
-      <p>Welcome Finn Bock!</p>
-    </section>
-    <section>
-      <title>29 November 2003 - New Committer</title>
-      <p>Welcome Peter Herweg!</p>
-    </section>
-    <section>
-      <title>18 July 2003 FOP 0.20.5 released</title>
-      <p>Changes since 0.20.4 include:</p>
-      <ul>
-        <li>Added support for PDF encryption</li>
-        <li>Perfomance tuning</li>
-        <li>Fixed link hotspot positioning</li>
-        <li>Fixed multi-threading issues</li>
-        <li>Added support for CCITT Group 4 encoded TIFF files</li>
-        <li>Dynamic JAI support</li>
-        <li>Added autoselecting portrait/landscape for PCL and PS Renderer</li>
-        <li>Added continued-label extension for tables</li>
-        <li>Improved AWT Font-measuring/rendering</li>
-        <li>Improved marker handling</li>
-        <li>Fixed problem with jpegs with icc profile and acrobat reader 5</li>
-        <li>Added a fontBaseDir property</li>
-        <li>TXTRenderer output encoding</li>
-        <li>border-spacing support</li>
-        <li>and a lot more bugfixes</li>
-      </ul>
-      <p>
-      See also the full text of the
-      <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=6067">
-        announcement</a>.
-      <!-- TODO re-enable  and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.-->
-      </p>
-    </section>
-    <section>
-      <title>29 June 2003 - New Committer</title>
-      <p>Welcome Glen Mazza!</p>
-    </section>
-    <section>
-      <title>23 May 2003 - FOP 0.20.5 Release Candidate 3 available</title>
-      <p>
-      See the full text of the <a
-      href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=5429">announcement</a>.
-      </p>
-    </section>
-    <section>
-      <title>18 February 2003 - FOP 0.20.5 Release Candidate 2 available</title>
-      <p>
-      See the full text of the <a
-      href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=4509">announcement</a>.
-      </p>
-    </section>
-    <section>
-      <title>2 February 2003 - New XML PMC</title>
-      <p>
-      Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC.
-      </p>
-    </section>
-    <section>
-      <title>28 January 2003 - FOP logo contest</title>
-      <p>We are looking for a new logo. FOP logo
-      contest is started!</p>
-    </section>
-    <section>
-      <title>23 December 2002 - Official FOP Wiki</title>
-      <p>
-      See <a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages"
-      >FOP project pages</a> at the ApacheWiki.
-      </p>
-    </section>
-    <section>
-      <title>10 December 2002 - FOP 0.20.5 Release Candidate available</title>
-      <p>
-      See the full text of the <a
-      href="http://marc.theaimsgroup.com/?l=fop-user&amp;m=103954279712704&amp;w=2"
-      >announcement</a>.
-      </p>
-    </section>
-    <section>
-      <title>23 November 2002 - EXLSFO project has been created</title>
-      <p>
-      The EXSLFO project is a community effort to define functional extensions
-      to thet XSL Formatting Objects specification. See the
-      <a href="http://exslfo.sourceforge.net">EXSLFO website</a> for details.
-      </p>
-    </section>
-    <section>
-      <title>22 November 2002 - New Committer</title>
-  <p>Welcome Victor Mote!</p>
- </section>
-    <section>
-      <title>9 November 2002 - New Committer</title>
-  <p>Welcome Oleg Tkachenko!</p>
- </section>
-
+    <p>
+      RSS Feed: <a href="subproject-news-feed.rss"><img src="feed-icon-14x14.png" alt="Subproject News Feed"/></a>
+    </p>
+    <xi:include href="cocoon://subproject-news-document.xml#xpointer(/document/body/*)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     </body>
 </document>
 
diff --git a/src/documentation/content/xdocs/team.xml b/src/documentation/content/xdocs/team.xml
index a65840270..b211c58b0 100644
--- a/src/documentation/content/xdocs/team.xml
+++ b/src/documentation/content/xdocs/team.xml
@@ -31,6 +31,11 @@
       <title>Active Committers</title>
       <note label="Important">Please don't write to any developer directly if you need help on using FOP. Only if you submit questions to the <link href="maillist.html#fop-user">FOP User Mailing List</link> will other FOP users be able to profit from answers given to your question. Another point is that a developer may have gone inactive or is on holidays in which case you may not get an answer in time.</note>
       <ul>
+        <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
+          PostDoc pursuing an academic career in computer science. His main interest in FOP is to
+          improve the DocBook to PDF tool-chain to produce high quality output, while still
+          conforming to given style-guides. See his <link href="http://max.berger.name">home
+            page</link> for more information.</li>
         <li id="cb"><link href="mailto:bowditch_chris@hotmail.com">Chris Bowditch</link> (CB)
             is a Java/VB Programmer from England.</li>
         <li id="jb"><link href="mailto:jay@bryantcs.com">Jay Bryant</link> (JB) is a
@@ -78,11 +83,6 @@
           improve the DocBook to PDF tool-chain to produce high quality output, while still
           conforming to given style-guides. See his <link href="http://max.berger.name">home
             page</link> for more information.</li>
-        <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
-          PostDoc pursuing an academic career in computer science. His main interest in FOP is to
-          improve the DocBook to PDF tool-chain to produce high quality output, while still
-          conforming to given style-guides. See his <link href="http://max.berger.name">home
-            page</link> for more information.</li>
       </ul>
     </section>
     <section id="contribute-active">
@@ -131,206 +131,6 @@
         <li id="pbw"><link href="mailto:pbwest@apache.org">Peter B. West</link></li>
       </ul>
     </section>
-    <section id="expertise">
-      <title>Areas of Expertise</title>
-      <table>
-        <tr>
-          <th/>
-          <th>CG</th>
-          <th>FB</th>
-          <th>CL</th>
-          <th>JM</th>
-          <th>VH</th>
-          <th>PH</th>
-          <th>JP</th>
-          <th>SP</th>
-          <th>LF</th>
-          <th>JB</th>
-        </tr>
-        <tr>
-          <td>Release manager</td>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>XSL-FO tree</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td></td>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Properties</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Layout</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td>X</td>
-          <td>X</td>
-          <td/>
-        </tr>
-        <tr>
-          <td>Fonts</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>SVG</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Java2D (AWT)</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>PDF</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-        </tr>
-        <tr>
-          <td>PostScript</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>PCL</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>RTF</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>MIF</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>AFP</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Forrest</td>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-      </table>
-    </section>
   </body>
 </document>
 
diff --git a/src/documentation/resources/images/feed-icon-14x14.png b/src/documentation/resources/images/feed-icon-14x14.png
new file mode 100644
index 000000000..b3c949d22
--- /dev/null
+++ b/src/documentation/resources/images/feed-icon-14x14.png
diff --git a/src/documentation/resources/stylesheets/news2document.xsl b/src/documentation/resources/stylesheets/news2document.xsl
new file mode 100644
index 000000000..dae1552bd
--- /dev/null
+++ b/src/documentation/resources/stylesheets/news2document.xsl
@@ -0,0 +1,53 @@
+<?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.
+-->
+<!-- $Id$ -->
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:date="http://exslt.org/dates-and-times"
+    extension-element-prefixes="date"
+    version="1.0">
+
+  <date:date-format lang="en" first-day-in-week="monday"/>
+
+  <xsl:template match="news">
+    <document>
+      <header>
+        <title>News</title>
+      </header>
+      <body>
+        <xsl:apply-templates select="item"/>
+      </body>
+    </document>  
+  </xsl:template>
+
+  <xsl:template match="item">
+    <section id="news-{@date}">
+      <title>
+        <xsl:value-of select="date:day-in-month(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:month-abbreviation(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:year(@date)"/>
+        <xsl:text>: </xsl:text>
+        <xsl:value-of select="@title"/>
+      </title>
+      <xsl:copy-of select="."/>
+    </section>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/documentation/resources/stylesheets/news2rss.xsl b/src/documentation/resources/stylesheets/news2rss.xsl
new file mode 100644
index 000000000..d629ba6f4
--- /dev/null
+++ b/src/documentation/resources/stylesheets/news2rss.xsl
@@ -0,0 +1,58 @@
+<?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.
+-->
+<!-- $Id$ -->
+<xsl:stylesheet 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:date="http://exslt.org/dates-and-times"
+    extension-element-prefixes="date"
+    version="1.0">
+  <xsl:param name="project-name" select="//skinconfig/project-name"/>
+  <xsl:param name="project-url" select="//skinconfig/project-url"/>
+  <xsl:template match="news">
+    <rss version="2.0">
+      <channel>
+        <title><xsl:value-of select="$project-name"/> News</title>
+        <link><xsl:value-of select="$project-url"/></link>
+        <description>
+          Subproject News for <xsl:value-of select="$project-name"/>
+        </description>
+        <language>en</language>
+        <xsl:apply-templates/>
+      </channel>
+    </rss>
+  </xsl:template>
+  <xsl:template match="item">
+    <item>
+      <title>
+        <xsl:value-of select="date:day-in-month(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:month-abbreviation(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:year(@date)"/>
+        <xsl:text>: </xsl:text>
+        <xsl:value-of select="@title"/>
+      </title>
+      <guid>news-<xsl:value-of select="@date"/></guid>
+      <link><xsl:value-of select="$project-url"/>/index.html#news-<xsl:value-of select="@date"/></link>
+      <pubDate><xsl:value-of select="date:format-date(@date, 'EEE, d MMM yyyy HH:mm:ss Z')"/></pubDate>
+      <description>
+        <xsl:apply-templates/>
+      </description>
+    </item>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap
index 470db0b7b..0e845d0bc 100644
--- a/src/documentation/sitemap.xmap
+++ b/src/documentation/sitemap.xmap
@@ -17,6 +17,9 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
+    <map:serializers default="html">
+      <map:serializer name="rss" mime-type="application/rss+xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
+    </map:serializers>
   </map:components>
 
   <map:pipelines>
@@ -69,6 +72,26 @@
         <map:serialize type="xml-document"/>
       </map:match>
     </map:pipeline>
-     
+
+    <!-- This is used by xinclude statements for News-->
+    <map:pipeline>
+      <map:match type="regexp" pattern="^(.*?)([^/]*)subproject-news-document.xml">
+        <map:generate src="{properties:content.xdocs}{1}news-data.xml"/>
+        <map:transform src="resources/stylesheets/news2document.xsl" >
+          <map:parameter name="path" value="{1}{2}"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match type="regexp" pattern="^(.*?)([^/]*)subproject-news-feed.rss">
+        <map:generate src="{properties:content.xdocs}{1}news-data.xml"/>
+        <map:transform src="resources/stylesheets/news2rss.xsl" >
+          <map:parameter name="path" value="{1}{2}"/>
+          <map:parameter name="project-name" value="{properties:projectInfo.project.fullname}"/>
+          <map:parameter name="project-url" value="{properties:projectInfo.project.url}"/>
+        </map:transform>
+        <map:serialize type="rss"/>
+      </map:match>
+    </map:pipeline>
+    
   </map:pipelines>
 </map:sitemap>
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index b9a12fa59..20b12808e 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -378,7 +378,6 @@ which will be used to configure the chosen Forrest skin.
       <height>125</height>
     </credit>
     -->
-    <!--
     <credit box-location="alt2">
       <name>ApacheCon US 2008</name>
       <url>http://us.apachecon.com/</url>
@@ -386,7 +385,6 @@ which will be used to configure the chosen Forrest skin.
       <width>125</width>
       <height>125</height>
     </credit>
-    -->
     
     <credit role="pdf">
       <name>PDF created by Apache FOP</name>
diff --git a/src/java/org/apache/fop/apps/FOURIResolver.java b/src/java/org/apache/fop/apps/FOURIResolver.java
index 9a49b28f1..1f4425a95 100644
--- a/src/java/org/apache/fop/apps/FOURIResolver.java
+++ b/src/java/org/apache/fop/apps/FOURIResolver.java
@@ -108,6 +108,8 @@ public class FOURIResolver implements javax.xml.transform.URIResolver {
     /**
      * Handles resolve exceptions appropriately.
      *
+     * @param e
+     *            the exception
      * @param errorStr
      *            error string
      * @param strict
@@ -232,17 +234,16 @@ public class FOURIResolver implements javax.xml.transform.URIResolver {
                      * The URL class does not implement this work around, so we
                      * do.
                      */
+                    assert (baseURL != null);
                     String scheme = baseURL.getProtocol() + ":";
-                    if (href.startsWith(scheme)) {
+                    if (href.startsWith(scheme) && "file:".equals(scheme)) {
                         href = href.substring(scheme.length());
-                        if ("file:".equals(scheme)) {
-                            int colonPos = href.indexOf(':');
-                            int slashPos = href.indexOf('/');
-                            if (slashPos >= 0 && colonPos >= 0
-                                    && colonPos < slashPos) {
-                                href = "/" + href; // Absolute file URL doesn't
-                                // have a leading slash
-                            }
+                        int colonPos = href.indexOf(':');
+                        int slashPos = href.indexOf('/');
+                        if (slashPos >= 0 && colonPos >= 0
+                                && colonPos < slashPos) {
+                            href = "/" + href; // Absolute file URL doesn't
+                            // have a leading slash
                         }
                     }
                     try {
diff --git a/src/java/org/apache/fop/area/BookmarkData.java b/src/java/org/apache/fop/area/BookmarkData.java
index d009cb425..28ee2c23e 100644
--- a/src/java/org/apache/fop/area/BookmarkData.java
+++ b/src/java/org/apache/fop/area/BookmarkData.java
@@ -218,25 +218,24 @@ public class BookmarkData extends AbstractOffDocumentItem implements Resolvable
      * id reference.
      *
      * {@inheritDoc} List)
-     * @todo check to make sure it works if multiple bookmark-items
-     * have the same idref
      */
     public void resolveIDRef(String id, List pages) {
-        if (!id.equals(idRef)) {
-            Collection refs = (Collection)unresolvedIDRefs.get(id);
-            if (refs != null) {
-                Iterator iter = refs.iterator();
-                while (iter.hasNext()) {
-                    BookmarkData bd = (BookmarkData)iter.next();
-                    bd.resolveIDRef(id, pages);
-                }
-                unresolvedIDRefs.remove(id);
-            }
-        } else {
+        if (id.equals(idRef)) {
+            //Own ID has been resolved, so note the page
             pageRef = (PageViewport) pages.get(0);
-            // TODO get rect area of id on page
-            unresolvedIDRefs.remove(idRef);
+            //Note: Determining the placement inside the page is the renderer's job.
+        }
+
+        //Notify all child bookmarks
+        Collection refs = (Collection)unresolvedIDRefs.get(id);
+        if (refs != null) {
+            Iterator iter = refs.iterator();
+            while (iter.hasNext()) {
+                BookmarkData bd = (BookmarkData)iter.next();
+                bd.resolveIDRef(id, pages);
+            }
         }
+        unresolvedIDRefs.remove(id);
     }
 
     /**
diff --git a/src/java/org/apache/fop/fonts/FontInfo.java b/src/java/org/apache/fop/fonts/FontInfo.java
index 81b5ff877..d9f2e0de8 100644
--- a/src/java/org/apache/fop/fonts/FontInfo.java
+++ b/src/java/org/apache/fop/fonts/FontInfo.java
@@ -450,7 +450,7 @@ public class FontInfo {
         FontTriplet key = null;
         String f = null;
         int newWeight = weight;
-        if (newWeight < 400) {
+        if (newWeight <= 400) {
             while (f == null && newWeight > 100) {
                 newWeight -= 100;
                 key = createFontKey(family, style, newWeight);
diff --git a/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java b/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
index 5438d3a42..981f3ad69 100644
--- a/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
+++ b/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
@@ -100,6 +100,11 @@ public class Type1FontLoader extends FontLoader {
             try {
                 pfm = new PFMFile();
                 pfm.load(pfmIn);
+            } catch (IOException ioe) {
+                if (afm == null) {
+                    //Ignore the exception if we have a valid PFM. PFM is only the fallback.
+                    throw ioe;
+                }
             } finally {
                 IOUtils.closeQuietly(pfmIn);
             }
diff --git a/src/java/org/apache/fop/render/PrintRendererConfigurator.java b/src/java/org/apache/fop/render/PrintRendererConfigurator.java
index 4409c62b8..e8127ae34 100644
--- a/src/java/org/apache/fop/render/PrintRendererConfigurator.java
+++ b/src/java/org/apache/fop/render/PrintRendererConfigurator.java
@@ -43,6 +43,8 @@ import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.fonts.EmbedFontInfo;
 import org.apache.fop.fonts.FontCache;
+import org.apache.fop.fonts.FontEventAdapter;
+import org.apache.fop.fonts.FontEventListener;
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.fonts.FontManager;
 import org.apache.fop.fonts.FontResolver;
@@ -94,8 +96,10 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
         boolean strict = factory.validateUserConfigStrictly();
         FontCache fontCache = fontManager.getFontCache();
 
+        FontEventListener listener = new FontEventAdapter(
+                renderer.getUserAgent().getEventBroadcaster());
         List/*<EmbedFontInfo>*/ embedFontInfoList = buildFontListFromConfiguration(cfg,
-                fontResolver, strict, fontManager);
+                fontResolver, strict, fontManager, listener);
 
         if (fontCache != null && fontCache.hasChanged()) {
             fontCache.save();
@@ -110,12 +114,14 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
      * @param fontResolver the FontResolver to use
      * @param strict true if an Exception should be thrown if an error is found.
      * @param fontManager the font manager
+     * @param listener a font event listener
      * @return a List of EmbedFontInfo objects.
      * @throws FOPException If an error occurs while processing the configuration
      */
     public static List/*<EmbedFontInfo>*/ buildFontListFromConfiguration(Configuration cfg,
             FontResolver fontResolver,
-            boolean strict, FontManager fontManager) throws FOPException {
+            boolean strict, FontManager fontManager,
+            FontEventListener listener) throws FOPException {
         FontCache fontCache = fontManager.getFontCache();
         String fontBaseURL = fontManager.getFontBaseURL();
         List/*<EmbedFontInfo>*/ fontInfoList
@@ -144,7 +150,8 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
                                     fontFileFinder.find(fontBase.getAbsolutePath()),
                                     fontInfoList,
                                     fontResolver,
-                                    fontCache
+                                    fontCache,
+                                    listener
                             );
                         }
                     } catch (IOException e) {
@@ -158,7 +165,8 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
                             fontFileFinder.find(),
                             fontInfoList,
                             fontResolver,
-                            fontCache
+                            fontCache,
+                            listener
                     );
                 } catch (IOException e) {
                     LogUtil.handleException(log, e, strict);
@@ -167,12 +175,12 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
                 // load fonts from classpath
                 addFontInfoListFromFileList(ClasspathResource.getInstance()
                         .listResourcesOfMimeType("application/x-font"),
-                        fontInfoList, fontResolver, fontCache);
+                        fontInfoList, fontResolver, fontCache, listener);
                 addFontInfoListFromFileList(
                         ClasspathResource.getInstance()
                                 .listResourcesOfMimeType(
                                         "application/x-font-truetype"),
-                        fontInfoList, fontResolver, fontCache);
+                        fontInfoList, fontResolver, fontCache, listener);
             }
 
             // directory (multiple font) configuration
@@ -197,7 +205,8 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
                             fontFileFinder.find(directory),
                             fontInfoList,
                             fontResolver,
-                            fontCache
+                            fontCache,
+                            listener
                     );
                 } catch (IOException e) {
                     LogUtil.handleException(log, e, strict);
@@ -208,7 +217,7 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
             Configuration[] font = fonts.getChildren("font");
             for (int i = 0; i < font.length; i++) {
                 EmbedFontInfo embedFontInfo = getFontInfoFromConfiguration(
-                        font[i], fontResolver, strict, fontCache);
+                        font[i], fontResolver, strict, fontCache, listener);
                 if (embedFontInfo != null) {
                     fontInfoList.add(embedFontInfo);
                 }
@@ -252,11 +261,12 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
      */
     private static void addFontInfoListFromFileList(
             List fontFileList, List/*<EmbedFontInfo>*/ embedFontInfoList,
-            FontResolver resolver, FontCache fontCache) {
+            FontResolver resolver, FontCache fontCache, FontEventListener listener) {
         for (Iterator iter = fontFileList.iterator(); iter.hasNext();) {
             URL fontUrl = (URL)iter.next();
             // parse font to ascertain font info
             FontInfoFinder finder = new FontInfoFinder();
+            finder.setEventListener(listener);
             //EmbedFontInfo fontInfo = finder.find(fontUrl, resolver, fontCache);
 
             //List<EmbedFontInfo> embedFontInfoList = finder.find(fontUrl, resolver, fontCache);
@@ -332,7 +342,8 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
      * @throws FOPException if something's wrong with the config data
      */
     private static EmbedFontInfo getFontInfoFromConfiguration(
-            Configuration fontCfg, FontResolver fontResolver, boolean strict, FontCache fontCache)
+            Configuration fontCfg, FontResolver fontResolver, boolean strict,
+            FontCache fontCache, FontEventListener listener)
                     throws FOPException {
         String metricsUrl = fontCfg.getAttribute("metrics-url", null);
         String embedUrl = fontCfg.getAttribute("embed-url", null);
@@ -384,6 +395,7 @@ public class PrintRendererConfigurator extends AbstractRendererConfigurator
             }
             if (fontFile != null) {
                 FontInfoFinder finder = new FontInfoFinder();
+                finder.setEventListener(listener);
                 EmbedFontInfo[] infos = finder.find(fontUrl, fontResolver, fontCache);
                 return infos[0]; //When subFont is set, only one font is returned
             } else {
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
index 06dbaccd5..6694f0a7d 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
@@ -144,21 +144,22 @@ public final class RtfFontManager {
         }
 
         header.newLine();
-        header.writeGroupMark (true);
-        header.writeControlWord ("fonttbl;");
+        header.writeGroupMark(true);
+        header.writeControlWord("fonttbl");
 
         int len = fontTable.size ();
 
         for (int i = 0; i < len; i++) {
-            header.writeGroupMark (true);
+            header.writeGroupMark(true);
             header.newLine();
-            header.write ("\\f" + i);
-            header.write (" " + (String) fontTable.elementAt (i));
-            header.writeGroupMark (false);
+            header.write("\\f" + i);
+            header.write(" " + (String) fontTable.elementAt (i));
+            header.write(";");
+            header.writeGroupMark(false);
         }
 
         header.newLine();
-        header.writeGroupMark (false);
+        header.writeGroupMark(false);
     }
 
 
diff --git a/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java b/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
index 2d1c9279c..03ad4ee71 100644
--- a/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
+++ b/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
@@ -63,7 +63,8 @@ public class PDFDocumentGraphics2DConfigurator {
 
             List/*<EmbedFontInfo>*/ embedFontInfoList
                 = PrintRendererConfigurator.buildFontListFromConfiguration(
-                    cfg, fontResolver, false, fontManager);
+                    cfg, fontResolver, false, fontManager, null);
+            //TODO Wire in the FontEventListener
             if (fontManager.useCache()) {
                 fontManager.getFontCache().save();
             }
diff --git a/status.xml b/status.xml
index cd5321ebf..d5ca1ac9f 100644
--- a/status.xml
+++ b/status.xml
@@ -50,9 +50,19 @@
     <context id="Extensions" title="Changes to the Bundled Extensions"/>
     <context id="Images" title="Changes to the Image Support"/>
   </contexts>
-  
+
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Renderers" dev="JM" type="fix" fixes-bug="45606" due-to="Pavel Kysilka">
+        Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord.
+      </action>
+      <action context="Layout" dev="JM" type="fix">
+        Fixed ID resolution for nested bookmarks with duplicated IDs.
+      </action>
+      <action context="Code" dev="AD" type="fix" fixes-bug="45490" due-to="Thomas Stieler">
+        Fixed a slight error when resolving non-file URLs: avoid
+        altering the original 'href' if the protocol is other than 'file:'
+      </action>
       <action context="Layout" dev="JM" type="fix" fixes-bug="45470">
         Added LayoutManagerMapping.registerMaker() to make registration of custom
         layout managers easier.
@@ -74,10 +84,10 @@
         when the page bpd is not the same for all pages.
       </action>
       <action context="Code" dev="AD" type="update" importance="high">
-        Changed FONode.addCharacters() parameter to closer match the signature of 
+        Changed FONode.addCharacters() parameter to closer match the signature of
         the standard SAX characters() event (reduces confusion and computations).
-        <em>!! Implementors of extensions that subclass FONode directly, and 
-        offer an implementation for addCharacters() should take care to make 
+        <em>!! Implementors of extensions that subclass FONode directly, and
+        offer an implementation for addCharacters() should take care to make
         similar modifications in their code !!</em>
       </action>
       <!-- change reverted, to be added back later
@@ -88,7 +98,7 @@
         Added de-duplication and externalization support for IOCA and GOCA data resource objects.
       </action -->
       <action context="Renderers" dev="JM" type="add" fixes-bug="45115" due-to="Martin Edge">
-        Added a PCL-specific extension attribute on simple-page-master for controlling 
+        Added a PCL-specific extension attribute on simple-page-master for controlling
         the simplex/duplex mode.
       </action>
       <action context="Code" dev="AD" type="fix" fixes-bug="45097">
@@ -102,7 +112,7 @@
         Support character-by-character font-selection strategy on fo:character element.
       </action>
       <action context="Layout" dev="AD" type="fix" fixes-bug="44794">
-        Added support for page-number-citation and page-number-citation-last 
+        Added support for page-number-citation and page-number-citation-last
         of fo:inline. Corrected behavior for page-number-citation-last
         of fo:block: forward references now properly resolved.
       </action>
@@ -174,7 +184,7 @@
         in the font's primary encoding.
       </action>
     </release>
-    <release version="0.95" date="TBD">
+    <release version="0.95" date="05 August 2008">
       <notes>
         <section>
           <title>Notes</title>
@@ -232,7 +242,7 @@
             for building the FOP distribution but it is optional for normal builds and at run-time.
           </p>
           <note>
-            This final 0.95 release contains all the 
+            This final 0.95 release also includes all of the
             <a href="changes_0.95beta.html">changes made for Apache FOP 0.95beta</a>.
           </note>
         </section>
@@ -283,7 +293,7 @@
       <action context="Renderers" dev="JM" type="fix" importance="high">
         Fixed rendering of fixed block-containers in AFP output.
       </action>
-      <action context="Layout" dev="VH" type="fix" fixes-bug="41621" importance="high">
+      <action context="Layout" dev="VH" type="fix" fixes-bug="44621" importance="high">
         Various bugfixes for table layout.
       </action>
       <action context="Renderers" dev="JM" type="fix">
@@ -501,7 +511,7 @@
         will make up an entire page. See the documentation for details.
       </action>
       <action context="Layout" dev="JM" type="add">
-        Added minimal support for the .minimum/.maximum components of block/inline-progression-dimension 
+        Added minimal support for the .minimum/.maximum components of block/inline-progression-dimension
         on fo:external-graphic and fo:instream-foreign-object.
       </action>
       <action context="Layout" dev="JM" type="add" importance="high">
@@ -630,7 +640,7 @@
         Fix to avoid a ClassCastException in renderer configuration.
       </action>
       <action context="Renderers" dev="JM" type="fix" fixes-bug="43439" due-to="Adrian Cumiskey">
-        Fixed the restoration of the TLE values from the intermediate format 
+        Fixed the restoration of the TLE values from the intermediate format
         for the AFP extension elements.
       </action>
       <action context="Renderers" dev="JM" type="add" fixes-bug="43041" due-to="Adrian Cumiskey">
@@ -646,9 +656,9 @@
       <action context="Layout" dev="AD" type="update">
         PropertyCache phase 2:<br/>
         • improvement of the PropertyCache itself should now guarantee acceptable
-            performance of the static caches in multi-session environments, which is 
+            performance of the static caches in multi-session environments, which is
             a possible problem with synchronizedMap.<br/>
-        • changed CommonFont to use the cache: 
+        • changed CommonFont to use the cache:
             added CachedCommonFont to contain the properties that are always cacheable
             CommonFont itself is only cached if the remaining properties are absolutes.<br/>
         • changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache.<br/>
@@ -663,7 +673,7 @@
       <action context="Layout" dev="AD" type="fix" fixes-bug="43274" due-to="ckohrn.at.tng.de">
         Fixed erroneous usage of inherited color-values in SVG.
       </action>
-    </release>    
+    </release>
     <release version="0.94" date="24th August 2007">
       <action context="Code" dev="JM" type="fix">
         AFP Renderer: Bugfix for 1 bit images where the width is not a multiple of 8.
@@ -696,7 +706,7 @@
         -> changed implementations of FObj.addChildNode(), .removeChild() and .getChildNodes()
       </action>
       <action context="Code" dev="AD" type="update" fixes-bug="42089" due-to="Adrian Cumiskey">
-        Code cleanup and restructuring: 
+        Code cleanup and restructuring:
         Refactoring of PageSequenceLayoutManager and provide common FObj id property use
       </action>
       <action context="Code" dev="AD" type="add">
@@ -785,7 +795,7 @@
         the available ipd, causing a restart.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Fix for PDF corruption when a TrueType font with spaces in its name is embedded and no 
+        Fix for PDF corruption when a TrueType font with spaces in its name is embedded and no
         XML font metrics file for that font is used.
       </action>
       <action context="Code" dev="JM" type="fix" fixes-bug="41426" due-to="Adrian Cumiskey">
@@ -808,7 +818,7 @@
       <action context="Code" dev="MM" type="add" importance="high">
         Added support for UAX#14 type line breaking. Support does not extend across nested fo:inline elements.
       </action>
-    </release>    
+    </release>
     <release version="0.93" date="9 January 2007">
       <notes>
         <section>
@@ -849,10 +859,10 @@
         Enabled Copy/Paste from PDF content in Acrobat Reader for text using embedded TrueType fonts.
       </action>
       <action context="Code" dev="SP" type="update" fixes-bug="41044" due-to="Richard Wheeldon">
-        Commented out unused properties, in order to minimize memory usage. 
+        Commented out unused properties, in order to minimize memory usage.
       </action>
       <action context="Code" dev="SP" type="update" fixes-bug="41009" due-to="Richard Wheeldon">
-        Removed unused attributes from TableCell. 
+        Removed unused attributes from TableCell.
       </action>
       <action context="Code" dev="JM" type="add">
         Added initial support for loading fonts without a pre-created XML font metric
@@ -860,7 +870,7 @@
       </action>
       <action context="Code" dev="JM" type="add" fixes-bug="40729" due-to="Peter Coppens" importance="high">
         Support for the rgb-icc() function and for a proprietary cmyk() function (for device CMYK
-        colors only through the PDF renderer so far). 
+        colors only through the PDF renderer so far).
       </action>
       <action context="Code" dev="JM" type="update" fixes-bug="40813" due-to="Richard Wheeldon">
         Minor fixes and improvements for the AWT Preview (keyboard shortcuts, scrolling, windows
@@ -890,7 +900,7 @@
         white background in order to produce bitmap output with transparency.
       </action>
       <action context="Code" dev="AD" type="fix" fixes-bug="39414">
-        Split up FOText instances larger than 32K characters to avoid 
+        Split up FOText instances larger than 32K characters to avoid
         integer overflow during layout.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -908,7 +918,7 @@
         Added relaxed validation for empty list-item-*, as suggested by Gary Reed.
       </action>
       <action context="Code" dev="AD" type="update">
-        Modified proportional-column-width() function to log an error if used 
+        Modified proportional-column-width() function to log an error if used
         with table-layout=auto
       </action>
       <action context="Code" dev="AD" type="fix">
@@ -928,7 +938,7 @@
         Bugfix: Table headers and footers were swallowed when a table was nested in a list-block.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Fixed a bug with indent handling when margins are used on a surrounding block and 
+        Fixed a bug with indent handling when margins are used on a surrounding block and
         not start/end-indent.
       </action>
       <action context="Code" dev="JM" type="fix" fixes-bug="40106" due-to="Jeroen Meijer">
@@ -951,7 +961,7 @@
         (Note: the use of pixels in XSL-FO is discouraged!)
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix: Potential multi-threading issue (ConcurrentModificationException) 
+        Bugfix: Potential multi-threading issue (ConcurrentModificationException)
         eliminated for ElementMapping classes.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -999,7 +1009,7 @@
         Bugfix: All fonts names were converted unnecessarily to lower case in RTF output.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix: The combination of hyphenation and kerning resulted in slightly ragged 
+        Bugfix: The combination of hyphenation and kerning resulted in slightly ragged
         right ends for right-aligned and justified text.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -1011,7 +1021,7 @@
         table-columns.
       </action>
       <action context="Code" dev="JM" type="fix" fixes-bug="39607" due-to="Julien Aymé">
-        Bugfix: NullPointerException in RTF library when there are no borders on 
+        Bugfix: NullPointerException in RTF library when there are no borders on
         the parent table.
       </action>
       <action context="Code" dev="JM" type="add" importance="high">
@@ -1050,7 +1060,7 @@
         in a block-container.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix: basic-links with internal destinations in documents with multiple 
+        Bugfix: basic-links with internal destinations in documents with multiple
         page-sequences sometimes pointed at the wrong page.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -1062,14 +1072,14 @@
         Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397).
       </action>
       <action context="Code" dev="JM" type="add" fixes-bug="39118" due-to="Pierre-Henri Kraus">
-        Initial support for page-number-citation-last (XSL 1.1). Works without problems 
+        Initial support for page-number-citation-last (XSL 1.1). Works without problems
         only for page-sequence so far.
       </action>
     </release>
     <release version="0.92beta" date="18 Apr 2006">
       <action context="Code" dev="JM" type="fix">
         Bugfix: The generation of the PDF "d" (setdash) command was assuming that
-        only integer values can be used but that isn't the case. Dash patterns 
+        only integer values can be used but that isn't the case. Dash patterns
         PDFGraphics2D would be wrong in the process.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -1103,7 +1113,7 @@
         FOP 0.20.5. (See "hyphenation-base" option in the user configuration)
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix: Certain filter combinations in PDF could lead to invalid PDFs. 
+        Bugfix: Certain filter combinations in PDF could lead to invalid PDFs.
         DecodeParams were not properly handled.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -1169,19 +1179,19 @@
         Added support for the from-table-column() function.
       </action>
       <action context="Code" dev="JM" type="fix" fixes-bug="38397">
-        Bugfix: Spanned cells could lead to an false error message about overlapping 
+        Bugfix: Spanned cells could lead to an false error message about overlapping
         cells and ultimately a NullPointerException.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix: Regions with non-standard names got ignored in RTF output leading to 
+        Bugfix: Regions with non-standard names got ignored in RTF output leading to
         missing headers and footers.
       </action>
       <action context="Code" dev="JM" type="fix">
-        The RTF output now properly generates the "\landscape" flag for documents in 
+        The RTF output now properly generates the "\landscape" flag for documents in
         landscape orientation.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Following a clarification by the XSL FO SG, space traits are only set on the 
+        Following a clarification by the XSL FO SG, space traits are only set on the
         first and last area generated by an FO, and not on every area anymore.
       </action>
       <action context="Code" dev="JM" type="add">
@@ -1292,7 +1302,7 @@
         was not rendered at all.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Fixed a bug where the area for a finished cell that is broken over pages was 
+        Fixed a bug where the area for a finished cell that is broken over pages was
         created once for each row it was spanned over instead of only once.
       </action>
       <action context="Code" dev="JM" type="add">
@@ -1343,7 +1353,7 @@
       <action context="Code" dev="JM" type="add">
         Added an alternative set of rules for calculating text indents which tries to mimic
         the behaviour of many commercial FO implementations that chose to break the rules
-        in the FO specification in order to better meet the natural expectations of 
+        in the FO specification in order to better meet the natural expectations of
         inexperienced FO users.
       </action>
       <action context="Code" dev="JM" type="fix" fixes-bug="37815" due-to="Tom Craddock">
@@ -1363,14 +1373,14 @@
       </action>
       <action context="Code" dev="JM" type="add">
         font-family list still not fully supported but a comma-separated list is now properly tokenized.
-        FOP will now go through all fonts in the list to find one that is available, but it doesn't 
-        do so per character, yet. 
+        FOP will now go through all fonts in the list to find one that is available, but it doesn't
+        do so per character, yet.
       </action>
       <action context="Code" dev="JM" type="add">
         Implemented "Overconstrained Geometry" rules (5.3.4, XSL 1.0) for the most important cases.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix: Relatively positioned BlockViewports (from block-containers) caused the paint 
+        Bugfix: Relatively positioned BlockViewports (from block-containers) caused the paint
         cursor not be be properly advanced when space-before or space-after were present.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -1378,12 +1388,12 @@
         didn't get removed.
       </action>
       <action context="Code" dev="JM" type="fix">
-        The validation check for non-zero borders and padding on a region-* and for empty static-content 
-        elements is now turned off when relaxed validation is active to improve compatibility with 
+        The validation check for non-zero borders and padding on a region-* and for empty static-content
+        elements is now turned off when relaxed validation is active to improve compatibility with
         FO documents written for other FO implementations.
       </action>
       <action context="Code" dev="JM" type="fix">
-        Bugfix for "/ by zero" ArithmeticExceptions when an URL to a non-existing image is used 
+        Bugfix for "/ by zero" ArithmeticExceptions when an URL to a non-existing image is used
         and content-width and/or content-height is used.
       </action>
       <action context="Code" dev="JM" type="fix">
@@ -1406,15 +1416,15 @@
     </release>
     <release version="0.90alpha1" date="22 Nov 2005">
       <action context="Code" dev="all" type="update">
-        <strong>Complete redesign of the FOP codebase</strong> in the period between Dec 2001 and Nov 2005. 
-        There are just too many changes to list here. If you like to know details, run 
+        <strong>Complete redesign of the FOP codebase</strong> in the period between Dec 2001 and Nov 2005.
+        There are just too many changes to list here. If you like to know details, run
         <code>"svn log --verbose http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/"</code>.
       </action>
     </release>
     <release version="0.20.5" date="18 July 2003">
       <action context="Code" dev="all" type="update">
-        For the change log for the maintenance branch 
-        (where FOP 0.20.5 came from), please see the "CHANGES" file in the distribution, or 
+        For the change log for the maintenance branch
+        (where FOP 0.20.5 came from), please see the "CHANGES" file in the distribution, or
         <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/branches/fop-0_20_2-maintain/CHANGES?view=markup">the CHANGES file in the SVN repository</link>.
       </action>
     </release>
@@ -1428,5 +1438,5 @@
       </action>
     </actions>
   </todo>
-  
+
 </status>
diff --git a/test/layoutengine/standard-testcases/bookmarks_2.xml b/test/layoutengine/standard-testcases/bookmarks_2.xml
index b66b27bcf..90a801412 100644
--- a/test/layoutengine/standard-testcases/bookmarks_2.xml
+++ b/test/layoutengine/standard-testcases/bookmarks_2.xml
@@ -34,10 +34,16 @@
       <fo:bookmark-tree>
         <fo:bookmark internal-destination="chapter1">
           <fo:bookmark-title>Chapter 1</fo:bookmark-title>
+          <fo:bookmark internal-destination="chapter1">
+            <fo:bookmark-title>Nested Chapter 1</fo:bookmark-title>
+          </fo:bookmark>
         </fo:bookmark>
         <fo:bookmark internal-destination="chapter1" starting-state="hide">
           <fo:bookmark-title>Again Chapter 1</fo:bookmark-title>
         </fo:bookmark>
+        <fo:bookmark internal-destination="chapter2">
+          <fo:bookmark-title>Chapter 2</fo:bookmark-title>
+        </fo:bookmark>
       </fo:bookmark-tree>
       <fo:page-sequence id="page-sequence" master-reference="normal">
         <fo:flow flow-name="xsl-region-body">
@@ -58,10 +64,13 @@
     
     <eval expected="Chapter 1" xpath="//bookmarkTree/bookmark[1]/@title"/>
     <eval expected="true" xpath="//bookmarkTree/bookmark[1]/@show-children"/>
+    <eval expected="Nested Chapter 1" xpath="//bookmarkTree/bookmark[1]/bookmark[1]/@title"/>
+    <eval expected="true" xpath="//bookmarkTree/bookmark[1]/bookmark[1]/@show-children"/>
     <eval expected="Again Chapter 1" xpath="//bookmarkTree/bookmark[2]/@title"/>
     <eval expected="false" xpath="//bookmarkTree/bookmark[2]/@show-children"/>
 
     <eval expected="(P1,chapter1)" xpath="//bookmarkTree/bookmark[1]/@internal-link"/>
+    <eval expected="(P1,chapter1)" xpath="//bookmarkTree/bookmark[1]/bookmark[1]/@internal-link"/>
     <eval expected="(P1,chapter1)" xpath="//bookmarkTree/bookmark[2]/@internal-link"/>
     
   </checks>