From 427e2d22a628b77cce5e7c22b32610b5ff23d8b2 Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Wed, 13 Aug 2008 09:10:49 +0000 Subject: [PATCH] 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 ................ git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@685487 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 2 + forrest.properties | 2 +- src/documentation/content/doap.rdf | 10 +- .../content/xdocs/compliance.ihtml | 2 +- .../content/xdocs/dev/release.xml | 2 +- src/documentation/content/xdocs/download.xml | 33 ++- src/documentation/content/xdocs/news-data.xml | 202 +++++++++++++++++ src/documentation/content/xdocs/news.xml | 205 +---------------- src/documentation/content/xdocs/team.xml | 210 +----------------- .../resources/images/feed-icon-14x14.png | Bin 0 -> 689 bytes .../resources/stylesheets/news2document.xsl | 53 +++++ .../resources/stylesheets/news2rss.xsl | 58 +++++ src/documentation/sitemap.xmap | 25 ++- src/documentation/skinconf.xml | 2 - .../org/apache/fop/apps/FOURIResolver.java | 19 +- .../org/apache/fop/area/BookmarkData.java | 29 ++- src/java/org/apache/fop/fonts/FontInfo.java | 2 +- .../fop/fonts/type1/Type1FontLoader.java | 5 + .../fop/render/PrintRendererConfigurator.java | 32 ++- .../rtf/rtflib/rtfdoc/RtfFontManager.java | 15 +- .../PDFDocumentGraphics2DConfigurator.java | 3 +- status.xml | 104 +++++---- .../standard-testcases/bookmarks_2.xml | 9 + 23 files changed, 508 insertions(+), 516 deletions(-) create mode 100644 src/documentation/content/xdocs/news-data.xml create mode 100644 src/documentation/resources/images/feed-icon-14x14.png create mode 100644 src/documentation/resources/stylesheets/news2document.xsl create mode 100644 src/documentation/resources/stylesheets/news2rss.xsl 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. + + 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 @@ Previous stable release - 2007-01-02 - 0.93 + 2007-08-23 + 0.94 Previous development release - 2008-25-08 + 2008-03-26 0.95beta Latest stable release - 2007-08-23 - 0.94 + 2008-08-05 + 0.95 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 @@ 0.94 (stable) - 0.95 (beta) + 0.95 (stable) develop- ment 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
  • Commit any outstanding changes
  • Create a branch called branches/fop-v_vv
  • Edit release notes (README and status.xml in the root).
    • -
  • Update the index.xml and site.xml for the new version.
    • +
  • Update the index.xml, site.xml and download.xml for the new version.
  • Update the version numbers in the release column on the compliance page (compliance.xml); update the compliance in the release column to the current state (development column).
    • 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 @@ Repository URL - - http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/ + + http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/ Web view - - http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/ + + http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/ - Latest Release + Previous Stable Release Repository URL - - http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/ + + http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/ Web view - - http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/ + + http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/ @@ -127,17 +127,30 @@ Repository URL + Main Repository: http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/ +
    + European Mirror: + + http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/ + + Web view + Main Repository: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/ +
    + European Mirror: + + http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/ + @@ -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.

    +
    Archive Download 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 @@ + + + + + +

    + 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 Release Notes for a list of + the most important changes. +

    +     + +

    + 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 Release Notes for a list of + the most important changes. +

    +     + +

    Welcome Max Berger!

    +     + +

    Welcome Adrian Cumiskey!

    +     + +

    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 Release Notes for a list of + the most important changes.

    +     + +

    Welcome Jay Bryant!

    +     + +

    + 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. +

    +     + +

    Welcome Vincent Hennebert!

    +     + +

    + 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! +

    +     + +

    + 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! +

    +     + +

    + 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. +

    +

    + Please see also the + announcement. + +

    +     + +

    Welcome Manuel Mall!

    +     + +

    + The Apache Board of Directors agreed to the creation of the + Apache XML Graphics + 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. +

    +     + +

    Welcome Luca Furini!

    +     + +

    Welcome Simon Pepping!

    +     + +

    Welcome Web Maestro Clay Leeds!

    +     + +

    Welcome Chris Bowditch and Andreas Delmelle!

    +     + +

    Welcome Finn Bock!

    +     + +

    Welcome Peter Herweg!

    +     + +

    Changes since 0.20.4 include:

    +
      +
    • Added support for PDF encryption
      • +
    • Perfomance tuning
      • +
    • Fixed link hotspot positioning
      • +
    • Fixed multi-threading issues
      • +
    • Added support for CCITT Group 4 encoded TIFF files
      • +
    • Dynamic JAI support
      • +
    • Added autoselecting portrait/landscape for PCL and PS Renderer
      • +
    • Added continued-label extension for tables
      • +
    • Improved AWT Font-measuring/rendering
      • +
    • Improved marker handling
      • +
    • Fixed problem with jpegs with icc profile and acrobat reader 5
      • +
    • Added a fontBaseDir property
      • +
    • TXTRenderer output encoding
      • +
    • border-spacing support
      • +
    • and a lot more bugfixes
      • +
    +

    + See also the full text of the + + announcement. + +

    +     + +

    Welcome Glen Mazza!

    +     + +

    + See the full text of the announcement. +

    +     + +

    + See the full text of the announcement. +

    +     + +

    + Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC. +

    +     + +

    We are looking for a new logo. FOP logo + contest is started!

    +     + +

    + See FOP project pages at the ApacheWiki. +

    +     + +

    + See the full text of the announcement. +

    +     + +

    + The EXSLFO project is a community effort to define functional extensions + to thet XSL Formatting Objects specification. See the + EXSLFO website for details. +

    +     + +

    Welcome Victor Mote!

    +     + +

    Welcome Oleg Tkachenko!

    +     +     \ 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 @@ $Revision$ -
    - 26th March 2007 - Apache FOP 0.95beta Released -

    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 Release Notes for a list of - the most important changes.

    -
    -
    - 30 October 2007 - New Committer -

    Welcome Max Berger!

    -
    -
    - 15 October 2007 - New Committer -

    Welcome Adrian Cumiskey!

    -
    -
    - 24th August 2007 - Apache FOP 0.94 Released -

    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 Release Notes for a list of - the most important changes.

    -
    -
    - 26 January 2007 - New Committer -

    Welcome Jay Bryant!

    -
    -
    - 9 January 2007 - Apache FOP 0.93 released -

    - 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. -

    -
    -
    - 16 October 2006 - New Committer -

    Welcome Vincent Hennebert!

    -
    -
    - 18 April 2006 - Apache FOP 0.92 beta released -

    - 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! -

    -
    -
    - 23 December 2005 - Apache FOP 0.91 beta released -

    - 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! -

    -
    -
    - 22 November 2005 - Apache FOP 0.90 alpha 1 released -

    - 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. -

    -

    - Please see also the - announcement. - -

    -
    -
    - 8 September 2005 - New Committer -

    Welcome Manuel Mall!

    -
    -
    - 20 October 2004 - Creation of the Apache XML Graphics project -

    - The Apache Board of Directors agreed to the creation of the - Apache XML Graphics - 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. -

    -
    -
    - 8 October 2004 - New Committer -

    Welcome Luca Furini!

    -
    -
    - 24 April 2004 - New Committer -

    Welcome Simon Pepping!

    -
    -
    - 7 March 2004 - New Committer -

    Welcome Web Maestro Clay Leeds!

    -
    -
    - 10 January 2004 - New Committers -

    Welcome Chris Bowditch and Andreas Delmelle!

    -
    -
    - 4 January 2004 - New Committer -

    Welcome Finn Bock!

    -
    -
    - 29 November 2003 - New Committer -

    Welcome Peter Herweg!

    -
    -
    - 18 July 2003 FOP 0.20.5 released -

    Changes since 0.20.4 include:

    -
      -
    • Added support for PDF encryption
      • -
    • Perfomance tuning
      • -
    • Fixed link hotspot positioning
      • -
    • Fixed multi-threading issues
      • -
    • Added support for CCITT Group 4 encoded TIFF files
      • -
    • Dynamic JAI support
      • -
    • Added autoselecting portrait/landscape for PCL and PS Renderer
      • -
    • Added continued-label extension for tables
      • -
    • Improved AWT Font-measuring/rendering
      • -
    • Improved marker handling
      • -
    • Fixed problem with jpegs with icc profile and acrobat reader 5
      • -
    • Added a fontBaseDir property
      • -
    • TXTRenderer output encoding
      • -
    • border-spacing support
      • -
    • and a lot more bugfixes
      • -
    -

    - See also the full text of the - - announcement. - -

    -
    -
    - 29 June 2003 - New Committer -

    Welcome Glen Mazza!

    -
    -
    - 23 May 2003 - FOP 0.20.5 Release Candidate 3 available -

    - See the full text of the announcement. -

    -
    -
    - 18 February 2003 - FOP 0.20.5 Release Candidate 2 available -

    - See the full text of the announcement. -

    -
    -
    - 2 February 2003 - New XML PMC -

    - Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC. -

    -
    -
    - 28 January 2003 - FOP logo contest -

    We are looking for a new logo. FOP logo - contest is started!

    -
    -
    - 23 December 2002 - Official FOP Wiki -

    - See FOP project pages at the ApacheWiki. -

    -
    -
    - 10 December 2002 - FOP 0.20.5 Release Candidate available -

    - See the full text of the announcement. -

    -
    -
    - 23 November 2002 - EXLSFO project has been created -

    - The EXSLFO project is a community effort to define functional extensions - to thet XSL Formatting Objects specification. See the - EXSLFO website for details. -

    -
    -
    - 22 November 2002 - New Committer -

    Welcome Victor Mote!

    -
    -
    - 9 November 2002 - New Committer -

    Welcome Oleg Tkachenko!

    -
    - +

    + RSS Feed: Subproject News Feed +

    + 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 @@ Active Committers Please don't write to any developer directly if you need help on using FOP. Only if you submit questions to the FOP User Mailing List 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.
      +
    • Max Berger (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 home + page for more information.
    • Chris Bowditch (CB) is a Java/VB Programmer from England.
    • Jay Bryant (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 home page for more information.
      • -
    • Max Berger (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 home - page for more information.
    @@ -131,206 +131,6 @@
  • Peter B. West
    • -
    - Areas of Expertise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - CGFBCLJMVHPHJPSPLFJB
    Release managerX - - - - - - - - -
    XSL-FO tree - X - X - - X - -
    Properties - X - X - - - X - -
    Layout - - - XX - XXX -
    Fonts - - - X - - - - - -
    SVG - - - X - - - - - -
    Java2D (AWT) - - - X - - - - - -
    PDF - - - X - - - - - X
    PostScript - - - X - - - - - -
    PCL - - - X - - - - - -
    RTF - - - X - X - - - -
    MIF - - - - - - - - - -
    AFP - - - - - - - - - -
    Forrest - - XX - - - - - -
    -
    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 0000000000000000000000000000000000000000..b3c949d2244f2c0c81d65e74719af2a1b56d06a3 GIT binary patch literal 689 zcmV;i0#5yjP)(tky!*UETcH-TCU7SrqEjJM#?B`_A)!p7(kFf9-P@=@15kkTkGK zgFusyy#KECqZzRdBLb=P?$(kUP;>kYTDeG&{|a+iOiRbI6nbQ)j#7bOf>iF=C+|_py<&Fo1F5cC*iEM?zZGC{ejNg4LWYp=S$L6Qaby6y zp$+F`250{%tU{Lg$5*ROH}y!1UKJS4*xqd7P(Y3JQF?lrnf?yerr%&6yGXLG1ur*B z{$&R1@Oj)yl@%rY5rh?j(j10Yz_DBs`AKFU_QnB;)(aqQmGi&ieOS|21^NP9UMpa< zU&p!f6RZ6Owp^X!EXA=0SbN&h?CrQK%Q3(=YBqqHD^9ZUM0Hxt-6-KT;>lf@j?Z+v zHm(}`>85I&E<7e}oz?6UwjAogowzGO8kSN7+2`b^$Az9L{K5*ko87EV45LT-`_##3 z>d3AGh@>=mbg34|6}+-gT9N+6Dr@44VEl44O&{&|w=qpbzC#iWMKa?5)>tI+KLQK@ Xq0QFqn(9Yl00000NkvXXu0mjfZ8t + + + + + + + + +
    + News +
    + + + +     +     + + +
    + + <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"/> + + +
    +     + +     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 @@ + + + + + + + + + + <xsl:value-of select="$project-name"/> News + + + Subproject News for + + en + + + + + + + + <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"/> + + news- + /index.html#news- + + + + + + + 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 @@ --> + + + @@ -69,6 +72,26 @@ - + + + + + + + + + + + + + + + + + + + + + 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. 125 --> - PDF created by Apache FOP 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/**/ 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/**/ 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/**/ 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/**/ 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 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/**/ 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 @@ - + + + Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord. + + + Fixed ID resolution for nested bookmarks with duplicated IDs. + + + Fixed a slight error when resolving non-file URLs: avoid + altering the original 'href' if the protocol is other than 'file:' + 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. - 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). - !! Implementors of extensions that subclass FONode directly, and - offer an implementation for addCharacters() should take care to make + !! Implementors of extensions that subclass FONode directly, and + offer an implementation for addCharacters() should take care to make similar modifications in their code !! - 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. @@ -102,7 +112,7 @@ Support character-by-character font-selection strategy on fo:character element. - 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. @@ -174,7 +184,7 @@ in the font's primary encoding. - +
    Notes @@ -232,7 +242,7 @@ for building the FOP distribution but it is optional for normal builds and at run-time.

    - This final 0.95 release contains all the + This final 0.95 release also includes all of the changes made for Apache FOP 0.95beta.
    @@ -283,7 +293,7 @@ Fixed rendering of fixed block-containers in AFP output. - + Various bugfixes for table layout. @@ -501,7 +511,7 @@ will make up an entire page. See the documentation for details. - 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. @@ -630,7 +640,7 @@ Fix to avoid a ClassCastException in renderer configuration. - 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. @@ -646,9 +656,9 @@ PropertyCache phase 2:
    • 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.
    - • 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.
    • changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache.
    @@ -663,7 +673,7 @@ Fixed erroneous usage of inherited color-values in SVG. -     +     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() - Code cleanup and restructuring: + Code cleanup and restructuring: Refactoring of PageSequenceLayoutManager and provide common FObj id property use @@ -785,7 +795,7 @@ the available ipd, causing a restart. - 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. @@ -808,7 +818,7 @@ Added support for UAX#14 type line breaking. Support does not extend across nested fo:inline elements. - +
    @@ -849,10 +859,10 @@ Enabled Copy/Paste from PDF content in Acrobat Reader for text using embedded TrueType fonts. - Commented out unused properties, in order to minimize memory usage. + Commented out unused properties, in order to minimize memory usage. - Removed unused attributes from TableCell. + Removed unused attributes from TableCell. Added initial support for loading fonts without a pre-created XML font metric @@ -860,7 +870,7 @@ 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). 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. - Split up FOText instances larger than 32K characters to avoid + Split up FOText instances larger than 32K characters to avoid integer overflow during layout. @@ -908,7 +918,7 @@ Added relaxed validation for empty list-item-*, as suggested by Gary Reed. - 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 @@ -928,7 +938,7 @@ Bugfix: Table headers and footers were swallowed when a table was nested in a list-block. - 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. @@ -951,7 +961,7 @@ (Note: the use of pixels in XSL-FO is discouraged!) - Bugfix: Potential multi-threading issue (ConcurrentModificationException) + Bugfix: Potential multi-threading issue (ConcurrentModificationException) eliminated for ElementMapping classes. @@ -999,7 +1009,7 @@ Bugfix: All fonts names were converted unnecessarily to lower case in RTF output. - 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. @@ -1011,7 +1021,7 @@ table-columns. - 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. @@ -1050,7 +1060,7 @@ in a block-container. - 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. @@ -1062,14 +1072,14 @@ Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397). - 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. 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. @@ -1103,7 +1113,7 @@ FOP 0.20.5. (See "hyphenation-base" option in the user configuration) - 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. @@ -1169,19 +1179,19 @@ Added support for the from-table-column() function. - 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. - 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. - 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. - 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. @@ -1292,7 +1302,7 @@ was not rendered at all. - 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. @@ -1343,7 +1353,7 @@ 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. @@ -1363,14 +1373,14 @@ 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. Implemented "Overconstrained Geometry" rules (5.3.4, XSL 1.0) for the most important cases. - 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. @@ -1378,12 +1388,12 @@ didn't get removed. - 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. - 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. @@ -1406,15 +1416,15 @@ - Complete redesign of the FOP codebase 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 + Complete redesign of the FOP codebase 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 "svn log --verbose http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/". - 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 the CHANGES file in the SVN repository. @@ -1428,5 +1438,5 @@ - + 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 @@ Chapter 1 + + Nested Chapter 1 + Again Chapter 1 + + Chapter 2 + @@ -58,10 +64,13 @@ + + + -- 2.39.5