From f02d9c1b949d496bd72a840e22d50ae5b3581499 Mon Sep 17 00:00:00 2001 From: Simon Pepping Date: Sun, 7 Jan 2007 13:19:45 +0000 Subject: [PATCH] Merging changes from branch fop-0.93 back into trunk, change year 2006 in build.xml into 2007, remove PCL from unsupported output formats in known issues git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@493717 13f79535-47bb-0310-9956-ffa450edef68 --- README | 141 ++-- build.xml | 4 +- fop.bat | 2 +- forrest.properties | 1 + known-issues.xml | 102 +++ ...apshot.jar => xmlgraphics-commons-1.1.jar} | Bin 296933 -> 301249 bytes lib/xmlgraphics-commons.NOTICE.txt | 5 +- src/documentation/content/.htaccess | 44 +- src/documentation/content/doap.rdf | 10 +- .../content/xdocs/0.20.5/anttask.xml | 2 +- .../content/xdocs/0.20.5/compiling.xml | 2 +- .../content/xdocs/0.20.5/configuration.xml | 2 +- .../content/xdocs/0.20.5/embedding.xml | 2 +- .../content/xdocs/0.20.5/extensions.xml | 2 +- .../content/xdocs/0.20.5/fonts.xml | 2 +- .../content/xdocs/0.20.5/graphics.xml | 2 +- .../content/xdocs/0.20.5/hyphenation.xml | 2 +- .../content/xdocs/0.20.5/output.xml | 2 +- .../content/xdocs/0.20.5/pdfencryption.xml | 2 +- .../content/xdocs/0.20.5/running.xml | 2 +- .../content/xdocs/0.20.5/servlets.xml | 2 +- .../content/xdocs/0.92/output.xml | 401 --------- .../content/xdocs/{0.92 => 0.93}/anttask.xml | 35 +- .../xdocs/{0.92 => 0.93}/compiling.xml | 0 .../xdocs/{0.92 => 0.93}/configuration.xml | 42 + .../xdocs/{0.92 => 0.93}/embedding.xml | 0 .../xdocs/{0.92 => 0.93}/extensions.xml | 22 +- .../content/xdocs/{0.92 => 0.93}/fonts.xml | 0 .../content/xdocs/{0.92 => 0.93}/graphics.xml | 6 - .../xdocs/{0.92 => 0.93}/hyphenation.xml | 0 .../content/xdocs/{0.92 => 0.93}/index.xml | 15 +- .../xdocs/{0.92 => 0.93}/intermediate.xml | 0 .../content/xdocs/0.93/output.xml | 772 +++++++++++++++++ .../content/xdocs/{0.92 => 0.93}/pdfa.xml | 28 +- .../xdocs/{0.92 => 0.93}/pdfencryption.xml | 0 src/documentation/content/xdocs/0.93/pdfx.xml | 136 +++ .../content/xdocs/{0.92 => 0.93}/running.xml | 0 .../content/xdocs/{0.92 => 0.93}/servlets.xml | 0 .../xdocs/{0.92 => 0.93}/upgrading.xml | 38 +- src/documentation/content/xdocs/bugs.xml | 2 +- .../content/xdocs/compliance.ihtml | 798 +++++++++--------- src/documentation/content/xdocs/download.xml | 8 +- src/documentation/content/xdocs/examples.xml | 2 +- src/documentation/content/xdocs/faq.xml | 71 +- src/documentation/content/xdocs/fo.xml | 4 +- src/documentation/content/xdocs/index.xml | 4 +- .../content/xdocs/knownissues.xml | 6 +- src/documentation/content/xdocs/license.xml | 2 +- src/documentation/content/xdocs/news.xml | 11 +- src/documentation/content/xdocs/relnotes.xml | 8 +- src/documentation/content/xdocs/site.xml | 15 +- src/documentation/content/xdocs/status.xml | 73 +- src/documentation/content/xdocs/tabs.xml | 4 +- .../content/xdocs/trunk/anttask.xml | 35 +- .../content/xdocs/trunk/graphics.xml | 6 - .../content/xdocs/trunk/index.xml | 13 +- .../content/xdocs/trunk/output.xml | 5 +- .../content/xdocs/trunk/pdfencryption.xml | 0 .../content/xdocs/trunk/upgrading.xml | 38 +- .../stylesheets/changes2document.xsl | 3 +- .../stylesheets/known-issues2document.xsl | 49 ++ .../stylesheets/releaseNotes2document.xsl | 4 +- src/documentation/sitemap.xmap | 7 + status.xml | 45 +- 64 files changed, 1928 insertions(+), 1113 deletions(-) create mode 100644 known-issues.xml rename lib/{xmlgraphics-commons-1.1-snapshot.jar => xmlgraphics-commons-1.1.jar} (91%) mode change 100755 => 100644 src/documentation/content/xdocs/0.20.5/pdfencryption.xml delete mode 100644 src/documentation/content/xdocs/0.92/output.xml rename src/documentation/content/xdocs/{0.92 => 0.93}/anttask.xml (87%) rename src/documentation/content/xdocs/{0.92 => 0.93}/compiling.xml (100%) rename src/documentation/content/xdocs/{0.92 => 0.93}/configuration.xml (86%) rename src/documentation/content/xdocs/{0.92 => 0.93}/embedding.xml (100%) rename src/documentation/content/xdocs/{0.92 => 0.93}/extensions.xml (80%) rename src/documentation/content/xdocs/{0.92 => 0.93}/fonts.xml (100%) rename src/documentation/content/xdocs/{0.92 => 0.93}/graphics.xml (97%) rename src/documentation/content/xdocs/{0.92 => 0.93}/hyphenation.xml (100%) rename src/documentation/content/xdocs/{0.92 => 0.93}/index.xml (75%) rename src/documentation/content/xdocs/{0.92 => 0.93}/intermediate.xml (100%) create mode 100644 src/documentation/content/xdocs/0.93/output.xml rename src/documentation/content/xdocs/{0.92 => 0.93}/pdfa.xml (85%) rename src/documentation/content/xdocs/{0.92 => 0.93}/pdfencryption.xml (100%) mode change 100755 => 100644 create mode 100644 src/documentation/content/xdocs/0.93/pdfx.xml rename src/documentation/content/xdocs/{0.92 => 0.93}/running.xml (100%) rename src/documentation/content/xdocs/{0.92 => 0.93}/servlets.xml (100%) rename src/documentation/content/xdocs/{0.92 => 0.93}/upgrading.xml (79%) mode change 100755 => 100644 src/documentation/content/xdocs/trunk/pdfencryption.xml create mode 100644 src/documentation/resources/stylesheets/known-issues2document.xsl diff --git a/README b/README index a31247373..4f66c558b 100644 --- a/README +++ b/README @@ -69,10 +69,11 @@ Please report bugs to bugzilla at http://issues.apache.org/bugzilla/ How do I build FOP? ---------------------- -If you've downloaded a binary distribution, you don't need to build FOP. +If you've downloaded a binary distribution, you don't need to build +FOP. Otherwise, please follow the instructions found here: -http://xmlgraphics.apache.org/fop/latest/compiling.html +http://xmlgraphics.apache.org/fop/stable/compiling.html How do I run FOP? @@ -82,84 +83,74 @@ Simply by typing "fop" on the command-line. Without any parameters you will receive a screen with instruction on how to call FOP from the command-line. -For more details, see: http://xmlgraphics.apache.org/fop/latest/running.html +For more details, see: +http://xmlgraphics.apache.org/fop/stable/running.html ============================================================================== RELEASE NOTES ============================================================================== -Version 0.92 beta ---------------------- - -We don't list all the changes since the 0.20.5 release, since the codebase -was practically rewritten in large areas as part of a big redesign effort. -This is basically a new software. But the changes since 0.90 alpha 1 can be -looked up under http://xmlgraphics.apache.org/fop/changes.html. - -Upgrading from 0.20.5: -Please read http://xmlgraphics.apache.org/fop/latest/upgrading.html - -The Apache FOP team asks you for your continued feedback on the new software. -We're also interested in success stories with the new release. So if the -latest version works fine for you, please tell us! And if it doesn't, you -may tell us as well, of course. ;-) - -Caveats: - - - This release is a beta release. If you intend to use this software - in a production environment, please perform careful testing. - - With the latest changes, the API is now considered stable. Please - note that the API has changed in a backwards-incompatible way since - the last release. - - You may experience different behaviour compared to version 0.20.5. - Please consult the "Upgrading" page indicated above for details. - -Known issues: - - - PCL, MIF and SVG support have not been restored, yet. - - Java2D/AWT support contains some problems, for example with - block-containers. - - Auto table layout is not implemented, yet. - - The collapsing border model on tables is not implemented, yet. Please - use border-collapse="separate" for now. - - Footnotes may overlap with text of the region-body in multi-column - documents. - - Space resolution does not work between footnote regions. - - There's a problem involving nested block-containers and - reference-orientation 180/-180 (Bugzilla #36391) - - block-containers with no height currently don't create a fence for - spaces as they should (they behave like a normal block). - - Preserved linefeeds in fo:character are not handled correctly. - - An empty block currently produces a fence for stacking constraints - which it shouldn't. - - There are several small problems around white space handling. - - Images currently don't shrink so they fit on a page when they are - too big and shrinking is allowed to happen. - - Block-level content in fo:inlines may produce unwelcome results. - - inline-container may not work as expected. - - leaders with leader-pattern="use-content" may not work as expected. - - keep-with-previous doesn't work inside tables and lists, yet. - - White space on direct inline-level children of a marker is not - handled correctly. - - If two consecutive pages don't have the same available width, the - content currently isn't properly fit into the available space on - the new page. - - background-images on page-number-citations are not placed correctly. - - Not all FO elements can be referenced by their "id", most notably: - table-body, table-header, table-footer and table-row. - - The backgrounds of table-body, table-header, table-footer and - table-column are not painted, yet. - - Border and padding conditionality are not supported on table-cells, yet. - - Copy/Paste from PDF content in Acrobat Reader is not supported for - text using embedded TrueType fonts. - - Column balancing in multi-column documents may not work as expected - (Bugzilla #36356) - - Omitting fo:table-column or having fo:table-column without a column-width - and attempting to create columns implicitly from the first - table row is not implemented, yet (Bugzilla #35656). - - Internal basic-links don't point to the exact location on a page, yet, - as they did in 0.20.5. Currently you land in the upper left corner of - the page. +Version 0.93 +============ + +This is the first production grade release of the new FOP codebase. + +* It contains the new API first introduced in release 0.92 + beta. The preceding API has been removed. +* This release again contains many bug fixes and new features. See + below for details. + +Compliance +---------- + +This release implements the XSL 1.0 and 1.1 recommendations to a high +degree of compliance. See the compliance page +http://xmlgraphics.apache.org/fop/compliance.html for a detailed +overview. + +Known issues +------------ + +The known issues of this release are listed at +http://xmlgraphics.apache.org/fop/knownissues.html. + +Upgrading +--------- + +You may experience different behaviour compared to version +0.20.5. Please consult the "Upgrading" page +(http://xmlgraphics.apache.org/fop/stable/upgrading.html) for +details. + +Major Changes in Version 0.93 +----------------------------- + +* Added support for the use of Open Type fonts (BD) +* Support for the rgb-icc() function and for a proprietary cmyk() + function (for device CMYK colors only through the PDF renderer so + far). (JM) Thanks to Peter Coppens. Fixes 40729. +* Enabled Copy/Paste from PDF content in Acrobat Reader for + text using embedded TrueType fonts. (BD) Thanks to Adam Strzelecki, + Victor Mote. Fixes 5535. +* Added support for PDF/A-1b and PDF/X-3:2003. (Note: this may still + be a bit incomplete. Feedback is welcome!) +* The Java2DRenderer (and therefore the print and bitmap renderers) is + now offering the same quality as the PDF and PS renderers. Note: + There can still be little differences between PDF and Print/PNG/TIFF + because the latter uses a different font metrics source. +* Automatic support for all fonts available to the Java2D subsystem + for all Java2D-descendant renderers (TIFF, PNG, print, AWT). + +The long list of changes in this release is available at +http://xmlgraphics.apache.org/fop/0.93/changes_0.93.html. + +The long list of changes in this and earlier releases is available at +http://xmlgraphics.apache.org/fop/changes.html. + +The Apache FOP team asks you for your continued feedback on the +software. We're also interested in success stories with the new +release. So if the latest version works fine for you, please tell us! +And if it doesn't, you may tell us as well, of course. ;-) Release notes for older FOP versions can be found on: http://xmlgraphics.apache.org/fop/relnotes.html \ No newline at end of file diff --git a/build.xml b/build.xml index aead809dd..60d6537ae 100644 --- a/build.xml +++ b/build.xml @@ -101,8 +101,10 @@ list of possible build targets. + + @@ -146,7 +148,7 @@ list of possible build targets. - + diff --git a/fop.bat b/fop.bat index 53674c034..c6d433b38 100644 --- a/fop.bat +++ b/fop.bat @@ -60,7 +60,7 @@ set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.7.1.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.7.0.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\serializer-2.7.0.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.6.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.1-snapshot.jar +set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.1.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.1.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-logging-1.0.4.jar diff --git a/forrest.properties b/forrest.properties index f4fb7d9ca..537cb15e3 100644 --- a/forrest.properties +++ b/forrest.properties @@ -60,6 +60,7 @@ project.skin=pelt #project.lib-dir=${project.content-dir}/lib #project.classes-dir=${project.content-dir}/classes #project.translations-dir=${project.content-dir}/translations +project.knownissues=known-issues.xml ############## # validation properties diff --git a/known-issues.xml b/known-issues.xml new file mode 100644 index 000000000..25af2a217 --- /dev/null +++ b/known-issues.xml @@ -0,0 +1,102 @@ + + + + + + MIF and SVG output support have not been restored, yet. + + + Java2D/AWT support has been improved, but some problems remain, + for example with block-containers. + + + Auto table layout is not implemented, yet. + + + The collapsing border model on tables is not implemented, yet. Please + use border-collapse="separate" for now. + + + Footnotes may overlap with text of the region-body in multi-column + documents. + + + Space resolution does not work between footnote regions. + + + There's a problem involving nested block-containers and + reference-orientation 180/-180 (Bugzilla #36391) + + + block-containers with no height currently don't create a fence for + spaces as they should (they behave like a normal block). + + + Preserved linefeeds in fo:character are not handled correctly. + + + An empty block currently produces a fence for stacking constraints + which it shouldn't. + + + There are several small problems around white space handling. + + + Images currently don't shrink so they fit on a page when they are + too big and shrinking is allowed to happen. + + + inline-container may not work as expected. + + + letter-spacing and word-spacing properties may not work as expected. + + + leaders with leader-pattern="use-content" may not work as expected. + + + keep-with-previous doesn't work inside tables and lists, yet. + + + If two consecutive pages don't have the same available width, the + content currently isn't properly fit into the available space on + the new page. + + + background-images on page-number-citations are not placed correctly. + + + Not all FO elements can be referenced by their "id", most notably: + table-body, table-header, table-footer and table-row. + + + The backgrounds of table-body, table-header, table-footer and + table-column are not painted, yet. + + + Border and padding conditionality are not supported on table-cells, yet. + + + Column balancing in multi-column documents may not work as expected + (Bugzilla #36356) + + + Internal basic-links don't point to the exact location on a page, yet, as they + did in 0.20.5. Currently you land in the upper left corner of the page. + + diff --git a/lib/xmlgraphics-commons-1.1-snapshot.jar b/lib/xmlgraphics-commons-1.1.jar similarity index 91% rename from lib/xmlgraphics-commons-1.1-snapshot.jar rename to lib/xmlgraphics-commons-1.1.jar index 48ae1e945fb2870537cb97f6f2ac1a4299a2907e..7fd9648b6af488a96ae0c85b13ba5901fbf3c0c9 100644 GIT binary patch delta 14600 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 delta 10319 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 diff --git a/lib/xmlgraphics-commons.NOTICE.txt b/lib/xmlgraphics-commons.NOTICE.txt index 7196130f7..0ece4c06d 100644 --- a/lib/xmlgraphics-commons.NOTICE.txt +++ b/lib/xmlgraphics-commons.NOTICE.txt @@ -1,2 +1,5 @@ -This product includes software developed by +Apache XML Graphics Commons +Copyright 2006 The Apache Software Foundation + +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/src/documentation/content/.htaccess b/src/documentation/content/.htaccess index 17a5c21f9..7a0a17476 100644 --- a/src/documentation/content/.htaccess +++ b/src/documentation/content/.htaccess @@ -1,22 +1,28 @@ # redirect moved files -RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.20.5/anttask$1 -RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.20.5/compiling$1 -RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.20.5/configuration$1 -RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.20.5/embedding$1 -RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.20.5/extensions$1 -RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.20.5/fonts$1 -RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.20.5/graphics$1 -RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.20.5/hyphenation$1 -RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.20.5/output$1 -RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.20.5/pdfencryption$1 -RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.20.5/running$1 -RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.20.5/servlets$1 +RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.93/anttask$1 +RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.93/compiling$1 +RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.93/configuration$1 +RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.93/embedding$1 +RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.93/extensions$1 +RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.93/fonts$1 +RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.93/graphics$1 +RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.93/hyphenation$1 +RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/0.93/intermediate$1 +RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.93/output$1 +RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/0.93/pdfa$1 +RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.93/pdfencryption$1 +RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/0.93/pdfx$1 +RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.93/running$1 +RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.93/servlets$1 +RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/0.93/upgrading$1 # redirect to versioned documentation -Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.20.5 -Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.20.5 -Redirect Temp /fop/0.90alpha1 http://xmlgraphics.apache.org/fop/0.92 -Redirect Temp /fop/0.91beta http://xmlgraphics.apache.org/fop/0.92 -Redirect Temp /fop/0.92beta http://xmlgraphics.apache.org/fop/0.92 -Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/0.92 -Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/0.92 +Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.93 +Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.93 +Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk +Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/trunk +Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.20.5 +Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.20.5 +Redirect Temp /fop/0.90alpha1 http://xmlgraphics.apache.org/fop/0.93 +Redirect Temp /fop/0.91beta http://xmlgraphics.apache.org/fop/0.93 +Redirect Temp /fop/0.92beta http://xmlgraphics.apache.org/fop/0.93 diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf index 2c800a79f..27259b5f2 100644 --- a/src/documentation/content/doap.rdf +++ b/src/documentation/content/doap.rdf @@ -76,22 +76,22 @@ - Latest stable release + Previous release 2003-07-16 0.20.5 - Latest release - 2006-04-18 - 0.92beta + Latest stable release + 2007-01-02 + 0.93 - + diff --git a/src/documentation/content/xdocs/0.20.5/anttask.xml b/src/documentation/content/xdocs/0.20.5/anttask.xml index c6da0cba0..9bc3c59ee 100644 --- a/src/documentation/content/xdocs/0.20.5/anttask.xml +++ b/src/documentation/content/xdocs/0.20.5/anttask.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">

diff --git a/src/documentation/content/xdocs/0.20.5/compiling.xml b/src/documentation/content/xdocs/0.20.5/compiling.xml index 1c5d09e0f..e2e2ca8d5 100644 --- a/src/documentation/content/xdocs/0.20.5/compiling.xml +++ b/src/documentation/content/xdocs/0.20.5/compiling.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
diff --git a/src/documentation/content/xdocs/0.20.5/configuration.xml b/src/documentation/content/xdocs/0.20.5/configuration.xml index 95edd695e..88097059a 100644 --- a/src/documentation/content/xdocs/0.20.5/configuration.xml +++ b/src/documentation/content/xdocs/0.20.5/configuration.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
diff --git a/src/documentation/content/xdocs/0.20.5/embedding.xml b/src/documentation/content/xdocs/0.20.5/embedding.xml index db42a7423..e3cff158a 100644 --- a/src/documentation/content/xdocs/0.20.5/embedding.xml +++ b/src/documentation/content/xdocs/0.20.5/embedding.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co"> diff --git a/src/documentation/content/xdocs/0.20.5/extensions.xml b/src/documentation/content/xdocs/0.20.5/extensions.xml index 68a68b19d..07b98da89 100644 --- a/src/documentation/content/xdocs/0.20.5/extensions.xml +++ b/src/documentation/content/xdocs/0.20.5/extensions.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
diff --git a/src/documentation/content/xdocs/0.20.5/fonts.xml b/src/documentation/content/xdocs/0.20.5/fonts.xml index 79a5dc0ae..9b5991626 100644 --- a/src/documentation/content/xdocs/0.20.5/fonts.xml +++ b/src/documentation/content/xdocs/0.20.5/fonts.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
FOP: Fonts diff --git a/src/documentation/content/xdocs/0.20.5/graphics.xml b/src/documentation/content/xdocs/0.20.5/graphics.xml index 8f40e52cd..fe0a63a8e 100644 --- a/src/documentation/content/xdocs/0.20.5/graphics.xml +++ b/src/documentation/content/xdocs/0.20.5/graphics.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
FOP: Graphics Formats diff --git a/src/documentation/content/xdocs/0.20.5/hyphenation.xml b/src/documentation/content/xdocs/0.20.5/hyphenation.xml index aef17881a..d18f50961 100644 --- a/src/documentation/content/xdocs/0.20.5/hyphenation.xml +++ b/src/documentation/content/xdocs/0.20.5/hyphenation.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
FOP: Hyphenation diff --git a/src/documentation/content/xdocs/0.20.5/output.xml b/src/documentation/content/xdocs/0.20.5/output.xml index a5b001685..577e51b04 100644 --- a/src/documentation/content/xdocs/0.20.5/output.xml +++ b/src/documentation/content/xdocs/0.20.5/output.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co"> diff --git a/src/documentation/content/xdocs/0.20.5/pdfencryption.xml b/src/documentation/content/xdocs/0.20.5/pdfencryption.xml old mode 100755 new mode 100644 index ef60fc0b5..030c022b1 --- a/src/documentation/content/xdocs/0.20.5/pdfencryption.xml +++ b/src/documentation/content/xdocs/0.20.5/pdfencryption.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
diff --git a/src/documentation/content/xdocs/0.20.5/running.xml b/src/documentation/content/xdocs/0.20.5/running.xml index 6d491c2c2..0432735f6 100644 --- a/src/documentation/content/xdocs/0.20.5/running.xml +++ b/src/documentation/content/xdocs/0.20.5/running.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
diff --git a/src/documentation/content/xdocs/0.20.5/servlets.xml b/src/documentation/content/xdocs/0.20.5/servlets.xml index 6416c3a50..1a7514c1e 100644 --- a/src/documentation/content/xdocs/0.20.5/servlets.xml +++ b/src/documentation/content/xdocs/0.20.5/servlets.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
Servlets diff --git a/src/documentation/content/xdocs/0.92/output.xml b/src/documentation/content/xdocs/0.92/output.xml deleted file mode 100644 index 28b26934c..000000000 --- a/src/documentation/content/xdocs/0.92/output.xml +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - -
- Apache FOP Output Formats - $Revision$ - - - - -
- - -

- FOP supports multiple output formats by using a different renderer for each format. - The renderers do not all have the same set of capabilities, sometimes because of - the output format itself, sometimes because some renderers get more development - attention than others. -

-
- General Information -
- Fonts -

- Most FOP renderers use a FOP-specific system for font registration. - However, the Java2D/AWT and print renderers use the Java AWT package, which gets its - font information from the operating system registration. - This can result in several differences, including actually using different fonts, - and having different font metrics for the same font. - The net effect is that the layout of a given FO document can be quite different between - renderers that do not use the same font information. -

-
-
- Output to a Printer or Other Device -

- The most obvious way to print your document is to use the FOP - print renderer, which uses the Java2D API (AWT). - However, you can also send output from the Postscript renderer directly to a Postscript - device, or output from the PCL renderer directly to a PCL device. -

-

- Here are Windows command-line examples for Postscript and PCL: -

- - -

- Here is some Java code to accomplish the task in UNIX: -

- -

- Set the output MIME type to "application/x-pcl" (MimeConstants.MIME_PCL) and - it happily sends the PCL to the UNIX printer queue. -

-
-
-
- PDF -

- PDF is the best supported output format. It is also the most accurate - with text and layout. This creates a PDF document that is streamed out - as each page is rendered. This means that the internal page index - information is stored near the end of the document. - The PDF version supported is 1.4. PDF versions are forwards/backwards - compatible. -

-

- Note that FOP does not currently support "tagged PDF", PDF/X or PDF/A-1a. - Support for PDF/A-1b has recently been added, however. -

-
- Fonts -

- PDF has a set of fonts that are always available to all PDF viewers; - to quote from the PDF Specification: - - "PDF prescribes a set of 14 standard fonts that can be used without prior - definition. - These include four faces each of three Latin text typefaces (Courier, - Helvetica, and Times), as well as two symbolic fonts (Symbol and ITC Zapf - Dingbats). These fonts, or suitable substitute fonts with the same metrics, are - guaranteed to be available in all PDF viewer applications." -

-
-
- Post-processing -

- FOP does not currently support several desirable PDF features: XMP metadata and watermarks. - One workaround is to use Adobe Acrobat (the full version, not the Reader) to process - the file manually or with scripting that it supports. -

-

- Another popular post-processing tool is iText, - which has tools for adding security features, document properties, watermarks, and many - other features to PDF files. -

- - Caveat: iText may swallow PDF bookmarks. But - Jens Stavnstrup tells us - that this doesn't happen if you use iText's PDFStamper. - -

- Here is some sample code that uses iText to encrypt a FOP-generated PDF. (Note that FOP now - supports PDF encryption. However the principles for using - iText for other PDF features are similar.) -

- -

- Check the iText tutorial and documentation for setting access flags, password, - encryption strength and other parameters. -

-
-
- Watermarks -

- In addition to the PDF Post-processing options, consider the following workarounds: -

-
    -
  • - Use a background image for the body region. -
  • -
  • - (submitted by Trevor Campbell) Place an image in a - region that overlaps the flowing text. For example, make - region-before large enough to contain your image. Then include a - block (if necessary, use an absolutely positioned block-container) - containing the watermark image in the static-content for the - region-before. Note that the image will be drawn on top of the - normal content. -
  • -
-
-
-
- PostScript -

- The PostScript renderer has been brought up to a similar quality as the - PDF renderer, but may still be missing certain features. It provides good - support for most text and layout. - Images and SVG are not fully supported, yet. Currently, the PostScript - renderer generates PostScript Level 3 with most DSC comments. Actually, - the only Level 3 feature used is FlateDecode, everything else is Level 2. -

-
- Limitations -
    -
  • Images and SVG may not be displayed correctly. SVG support is far from being complete. No image transparency is available.
  • -
  • Only Type 1 fonts are supported.
  • -
  • Multibyte characters are not supported.
  • -
  • PPD support is still missing.
  • -
-
-
-
- RTF -

- JFOR, an open source XSL-FO to RTF converter has been integrated into Apache FOP. - This will create an RTF (rich text format) document that will - attempt to contain as much information from the fo document as - possible. The RTF output follows Microsoft's RTF specifications - and produces best results on Microsoft Word. -

-
-
- XML (Area Tree XML) -

- This is primarily for testing and verification. The XML created is simply - a representation of the internal area tree put into XML. We use that to verify - the functionality of FOP's layout engine. -

-

- The other use case of the Area Tree XML is as FOP's "intermediate format". More information - on that can be found on the page dedicated to the Intermediate Format. -

-
-
- Java2D/AWT - The Java2D/AWT, Print and Bitmap renderers may not yet fully work as expected. There are some known bugs and missing features. -

- The AWT viewer shows a window with the pages displayed inside a - Java graphic. It displays one page at a time. - The fonts used for the formatting and viewing depend on the fonts - available to your JRE. -

-
-
- Print -

- It is possible to directly print the document from the command line. - This is done with the same code that renders to the Java2D/AWT renderer. -

-
-
- Bitmap (TIFF/PNG) -

- It is possible to directly create bitmap images from the individual - pages generated by the layout engine. - This is done with the same code that renders to the Java2D/AWT renderer. -

-

- Currently, two output formats are supported: PNG and TIFF. TIFF produces - one file with multiple pages, while PNG output produces one file per - page. The quality of the bitmap depends on the resolution setting on the - FOUserAgent. -

-
-
- TXT -

- The text renderer produces plain ASCII text output - that attempts to match the output of the PDFRenderer as closely as - possible. This was originally developed to accommodate an archive system - that could only accept plain text files, and is primarily useful for getting - a quick-and-dirty view of the document text. The renderer is very limited, - so do not be surprised if it gives unsatisfactory results. -

-

- The Text renderer works with a fixed size page buffer. The size of this - buffer is controlled with the textCPI and textLPI public variables. - The textCPI is the effective horizontal characters per inch to use. - The textLPI is the vertical lines per inch to use. From these values - and the page width and height the size of the buffer is calculated. - The formatting objects to be rendered are then mapped to this grid. - Graphic elements (lines, borders, etc) are assigned a lower priority - than text, so text will overwrite any graphic element representations. -

-

- Because FOP lays the text onto a grid during layout, there are frequently - extra or missing spaces between characters and lines, which is generally - unsatisfactory. - Users have reported that the optimal settings to avoid such spacing problems are: -

-
    -
  • font-family="Courier"
  • -
  • font-size="7.3pt"
  • -
  • line-height="10.5pt"
  • -
-
-
- Output Formats in the Sandbox -

- Due to the state of certain renderers we moved some of them to a "sandbox" area until - they are ready for more serious use. The renderers and FOEventHandlers in the sandbox - can be found under src/sandbox and are compiled into build/fop-sandbox.jar during the - main build. The output formats in the sandbox are marked as such below. -

-
- PCL - The PCL Renderer is in the sandbox and not yet functional in FOP Trunk!!! Please help us ressurrect this feature. -

- This format is for the Hewlett-Packard PCL printers. - It should produce output as close to identical as possible to the - printed output of the PDFRenderer within the limitations of the - renderer, and output device. -

- - - -
-
- MIF - The MIF handler is in the sandbox and not yet functional in FOP Trunk!!! Please help us ressurrect this feature. -

- This format is the Maker Interchange Format which is used by - Adobe Framemaker. -

-
-
- SVG - The SVG renderer is in the sandbox and may not work as expected in FOP Trunk!!! Please help us improve this feature. -

- This format creates an SVG document that has links between the pages. - This is primarily for slides and creating svg images of pages. - Large documents will create SVG files that are far too large for - an SVG viewer to handle. Since FO documents usually have text the - SVG document will have a large number of text elements. - The font information for the text is obtained from the JVM in the - same way as for the AWT viewer. If the SVG is viewed on a - system where the fonts are different, such as another platform, - then the page may look wrong. -

-
-
-
- Wish list -

- Apache FOP is easily extensible and allows you to add new output formats to enhance FOP's functionality. There's a number of output formats - which are on our wish list. We're looking for volunteers to help us implement them. -

- -
- - -
- diff --git a/src/documentation/content/xdocs/0.92/anttask.xml b/src/documentation/content/xdocs/0.93/anttask.xml similarity index 87% rename from src/documentation/content/xdocs/0.92/anttask.xml rename to src/documentation/content/xdocs/0.93/anttask.xml index 9831f2c01..44550c3d7 100644 --- a/src/documentation/content/xdocs/0.92/anttask.xml +++ b/src/documentation/content/xdocs/0.93/anttask.xml @@ -37,17 +37,19 @@ One method of defining the task is as follows:

+ - - - - - - - + + + + + + + + + ]]>

@@ -74,13 +76,24 @@ format Possible output formats:
+ application/X-fop-awt-preview
+ application/X-fop-print
+ application/X-fop-areatree
application/pdf
application/postscript
- application/vnd.mif
- application/rtf
+ application/mif
+ application/rtf, + text/richtext, + text/rtf
+ application/x-pcl, application/vnd.hp-PCL
+ application/x-afp, + application/vnd.ibm.modcap
text/plain
- text/xml
+ image/svg+xml
+ image/gif
+ image/png
+ image/tiff
No, defaults to application/pdf diff --git a/src/documentation/content/xdocs/0.92/compiling.xml b/src/documentation/content/xdocs/0.93/compiling.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/compiling.xml rename to src/documentation/content/xdocs/0.93/compiling.xml diff --git a/src/documentation/content/xdocs/0.92/configuration.xml b/src/documentation/content/xdocs/0.93/configuration.xml similarity index 86% rename from src/documentation/content/xdocs/0.92/configuration.xml rename to src/documentation/content/xdocs/0.93/configuration.xml index 85cb8e25b..c40a64de5 100644 --- a/src/documentation/content/xdocs/0.92/configuration.xml +++ b/src/documentation/content/xdocs/0.93/configuration.xml @@ -221,6 +221,20 @@ ]]> +

+ Another (optional) setting specific to the PDF Renderer is an output color profile, an ICC + color profile which indicates the target color space the PDF file is generated for. This + setting is mainly used in conjunction with the PDF/X feature. + An example: +

+ + C:\FOP\Color\EuropeISOCoatedFOGRA27.icc + + ]]>
Special Settings for the PostScript Renderer @@ -246,6 +260,34 @@ ]]>
+
+ Special Settings for the PCL Renderer +

+ Non-standard fonts for the PCL renderer are made available through the Java2D subsystem which means that + you don't have to do any custom font configuration in this case but you have to use the font names + offered by Java. +

+

+ Additionally, there are certain settings that control who the renderer handles various elements. +

+ + quality + bitmap +]]> +

+ The default value for the "rendering" setting is "speed" which causes borders + to be painted as plain rectangles. In this mode, no special borders (dotted, + dashed etc.) are available. If you want support for all border modes, set the + value to "quality" as indicated above. This will cause the borders to be painted + as bitmaps. +

+

+ The default value for the "text-rendering" setting is "auto" which paints the + base fonts using PCL fonts. Non-base fonts are painted as bitmaps through Java2D. + If the mix of painting methods results in unwelcome output, you can set this + to "bitmap" which causes all text to be rendered as bitmaps. +

+
diff --git a/src/documentation/content/xdocs/0.92/embedding.xml b/src/documentation/content/xdocs/0.93/embedding.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/embedding.xml rename to src/documentation/content/xdocs/0.93/embedding.xml diff --git a/src/documentation/content/xdocs/0.92/extensions.xml b/src/documentation/content/xdocs/0.93/extensions.xml similarity index 80% rename from src/documentation/content/xdocs/0.92/extensions.xml rename to src/documentation/content/xdocs/0.93/extensions.xml index e2d19eca8..0c22ca123 100644 --- a/src/documentation/content/xdocs/0.92/extensions.xml +++ b/src/documentation/content/xdocs/0.93/extensions.xml @@ -51,8 +51,11 @@ http://xml.apache.org/fop/extensions to the root element:

]]> - Currently, no extensions are implemented in FOP Trunk which use the FOP extension namespace. + xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]> + + Currently, no extension elements are implemented in FOP Trunk which use the + FOP extension namespace. +
PDF Bookmarks @@ -101,6 +104,21 @@ to following pages. Here is an example of FO code creating such a table-header:< ]]>
+
+ fox:orphan-content-limit and fox:widow-content-limit +

+ The two proprietary extension properties, fox:orphan-content-limit and + fox:widow-content-limit, are used to improve the layout of list-blocks and tables. + If you have a table with many entries, you don't want a single row to be left over + on a page. You will want to make sure that at least two or three lines are kept + together. The properties take an absolute length which specifies the area at the + beginning (fox:widow-content-limit) or at the end (fox:orphan-content-limit) of a + table or list-block. The properties are inherited and only have an effect on fo:table + and fo:list-block. An example: fox:widow-content-limit="3 * 1.2em" would make sure + the you'll have at least three lines (assuming line-height="1.2") together on a table + or list-block. +

+
diff --git a/src/documentation/content/xdocs/0.92/fonts.xml b/src/documentation/content/xdocs/0.93/fonts.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/fonts.xml rename to src/documentation/content/xdocs/0.93/fonts.xml diff --git a/src/documentation/content/xdocs/0.92/graphics.xml b/src/documentation/content/xdocs/0.93/graphics.xml similarity index 97% rename from src/documentation/content/xdocs/0.92/graphics.xml rename to src/documentation/content/xdocs/0.93/graphics.xml index 9f56f0526..beb860223 100644 --- a/src/documentation/content/xdocs/0.92/graphics.xml +++ b/src/documentation/content/xdocs/0.93/graphics.xml @@ -255,12 +255,6 @@ viewer does not normally draw those fine curves very well (turning on Smooth Line Art in the Acrobat preferences will fix this). If the text is inserted into the PDF using the inbuilt text commands for PDF it will use a single character. -

-

-For PDF output, there is a configuration option to force SVG text to be rendered as text. -The drawback to this approach is that it is effective only for available fonts (including embedded fonts). -Font sizes are rounded to the next integer point size. -This will be improved in the future.

Note that because SVG text can be rendered as either text or a vector graphic, you may need to consider settings in your viewer for both. The Acrobat viewer has both "smooth line art" and "smooth text" settings that may need to be set for SVG images to be displayed nicely on your screen (see Edit / Preferences / Display). diff --git a/src/documentation/content/xdocs/0.92/hyphenation.xml b/src/documentation/content/xdocs/0.93/hyphenation.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/hyphenation.xml rename to src/documentation/content/xdocs/0.93/hyphenation.xml diff --git a/src/documentation/content/xdocs/0.92/index.xml b/src/documentation/content/xdocs/0.93/index.xml similarity index 75% rename from src/documentation/content/xdocs/0.92/index.xml rename to src/documentation/content/xdocs/0.93/index.xml index d42f3fe0a..66c6eb374 100644 --- a/src/documentation/content/xdocs/0.92/index.xml +++ b/src/documentation/content/xdocs/0.93/index.xml @@ -19,7 +19,7 @@

- Apache FOP 0.92 beta + Apache FOP Version 0.93 $Revision: 201586 $
@@ -27,16 +27,15 @@ Introduction

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. We would like to encourage - you to download the code and to play with it. We're still in the process of adding new major - features and stabilizing the code. We welcome any feedback you might have and even more, any + finally in a state where you can use it. It has taken over three years to get this + far and over two years without a new release from the FOP project. We're still in the process of adding new + features. We welcome any feedback you might have and even more, any other form of help to get the project forward.

- This third release contains many bug fix release and new features compared - to 0.91beta. To see what has changed since the last release, please visit the - Changes Page and the Release Notes. + This fourth release contains many bug fix release and new features compared + to 0.92beta. To see what has changed since the last release, please visit the + Changes Page and the Release Notes.

diff --git a/src/documentation/content/xdocs/0.92/intermediate.xml b/src/documentation/content/xdocs/0.93/intermediate.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/intermediate.xml rename to src/documentation/content/xdocs/0.93/intermediate.xml diff --git a/src/documentation/content/xdocs/0.93/output.xml b/src/documentation/content/xdocs/0.93/output.xml new file mode 100644 index 000000000..8c2c0213e --- /dev/null +++ b/src/documentation/content/xdocs/0.93/output.xml @@ -0,0 +1,772 @@ + + + + + + +
+ Apache FOP Output Formats + $Revision$ + + + + +
+ + +

+ FOP supports multiple output formats by using a different renderer for each format. + The renderers do not all have the same set of capabilities, sometimes because of + the output format itself, sometimes because some renderers get more development + attention than others. +

+
+ General Information +
+ Fonts +

+ Most FOP renderers use a FOP-specific system for font registration. + However, the Java2D/AWT and print renderers use the Java AWT package, which gets its + font information from the operating system registration. + This can result in several differences, including actually using different fonts, + and having different font metrics for the same font. + The net effect is that the layout of a given FO document can be quite different between + renderers that do not use the same font information. +

+
+
+ Output to a Printer or Other Device +

+ The most obvious way to print your document is to use the FOP + print renderer, which uses the Java2D API (AWT). + However, you can also send output from the Postscript renderer directly to a Postscript + device, or output from the PCL renderer directly to a PCL device. +

+

+ Here are Windows command-line examples for Postscript and PCL: +

+ + +

+ Here is some Java code to accomplish the task in UNIX: +

+ +

+ Set the output MIME type to "application/x-pcl" (MimeConstants.MIME_PCL) and + it happily sends the PCL to the UNIX printer queue. +

+
+
+
+ PDF +

+ PDF is the best supported output format. It is also the most accurate + with text and layout. This creates a PDF document that is streamed out + as each page is rendered. This means that the internal page index + information is stored near the end of the document. + The PDF version supported is 1.4. PDF versions are forwards/backwards + compatible. +

+

+ Note that FOP does not currently support "tagged PDF" or PDF/A-1a. + Support for PDF/A-1b and PDF/X has recently been added, however. +

+
+ Fonts +

+ PDF has a set of fonts that are always available to all PDF viewers; + to quote from the PDF Specification: + + "PDF prescribes a set of 14 standard fonts that can be used without prior + definition. + These include four faces each of three Latin text typefaces (Courier, + Helvetica, and Times), as well as two symbolic fonts (Symbol and ITC Zapf + Dingbats). These fonts, or suitable substitute fonts with the same metrics, are + guaranteed to be available in all PDF viewer applications." +

+
+
+ Post-processing +

+ FOP does not currently support several desirable PDF features: XMP metadata and watermarks. + One workaround is to use Adobe Acrobat (the full version, not the Reader) to process + the file manually or with scripting that it supports. +

+

+ Another popular post-processing tool is iText, + which has tools for adding security features, document properties, watermarks, and many + other features to PDF files. +

+ + Caveat: iText may swallow PDF bookmarks. But + Jens Stavnstrup tells us + that this doesn't happen if you use iText's PDFStamper. + +

+ Here is some sample code that uses iText to encrypt a FOP-generated PDF. (Note that FOP now + supports PDF encryption. However the principles for using + iText for other PDF features are similar.) +

+ +

+ Check the iText tutorial and documentation for setting access flags, password, + encryption strength and other parameters. +

+
+
+ Watermarks +

+ In addition to the PDF Post-processing options, consider the following workarounds: +

+
    +
  • + Use a background image for the body region. +
  • +
  • + (submitted by Trevor Campbell) Place an image in a + region that overlaps the flowing text. For example, make + region-before large enough to contain your image. Then include a + block (if necessary, use an absolutely positioned block-container) + containing the watermark image in the static-content for the + region-before. Note that the image will be drawn on top of the + normal content. +
  • +
+
+
+
+ PostScript +

+ The PostScript renderer has been brought up to a similar quality as the + PDF renderer, but may still be missing certain features. It provides good + support for most text and layout. + Images and SVG are not fully supported, yet. Currently, the PostScript + renderer generates PostScript Level 3 with most DSC comments. Actually, + the only Level 3 feature used is FlateDecode, everything else is Level 2. +

+
+ Limitations +
    +
  • Images and SVG may not be displayed correctly. SVG support is far from being complete. No image transparency is available.
  • +
  • Only Type 1 fonts are supported.
  • +
  • Multibyte characters are not supported.
  • +
  • PPD support is still missing.
  • +
+
+
+
+ PCL +

+ This format is for the Hewlett-Packard PCL printers and other printers + supporting PCL. It should produce output as close to identical as possible + to the printed output of the PDFRenderer within the limitations of the + renderer, and output device. +

+

+ The output created by the PCLRenderer is generic PCL 5, HP GL/2 and PJL. + This should allow any device fully supporting PCL 5 to be able to + print the output generated by the PCLRenderer. PJL is used to control the + print job and switch to the PCL language. PCL 5 is used for text, raster + graphics and rectangular fill graphics. HP GL/2 is used for more complex + painting operations. Certain painting operations are done off-screen and + rendered to PCL as bitmaps because of limitations in PCL 5. +

+
+ References + +
+
+ Limitations +
    +
  • + Text or graphics outside the left or top of the printable area are not + rendered properly. This is a limitation of PCL, not FOP. In general, + things that should print to the left of the printable area are shifted + to the right so that they start at the left edge of the printable area. +
  • +
  • + The Helvetica and Times fonts are not well supported among PCL printers + so Helvetica is mapped to Arial and Times is mapped to Times New. This + is done in the PCLRenderer, no changes are required in the FO's. The + metrics and appearance for Helvetica/Arial and Times/Times New are + nearly identical, so this has not been a problem so far. +
  • +
  • For the non-symbol fonts, the ISO 8859-1 symbol set is used (PCL set "0N").
  • +
  • + All fonts available to the Java2D subsystem are usable. The texts are + painted as bitmap much like the Windows PCL drivers do. +
  • +
  • Multibyte characters are not supported.
  • +
  • + At the moment, only monochrome output is supported. PCL5c color extensions + will only be implemented on demand. Color and grayscale images are converted + to monochrome bitmaps (1-bit). Dithering only occurs if the JAI image library + is available. +
  • +
  • + Images are scaled up to the next resolution level supported by PCL (75, + 100, 150, 200, 300, 600 dpi). For color and grayscale images an even + higher PCL resolution is selected to give the dithering algorithm a chance + to improve the bitmap quality. +
  • +
  • + Currently, there's no support for clipping and image transparency, largely + because PCL 5 has certain limitations. +
  • +
+
+
+ Configuration +

+ The PCL renderer configuration currently allows the following settings: +

+ + quality + bitmap +]]> +

+ The default value for the "rendering" setting is "speed" which causes borders + to be painted as plain rectangles. In this mode, no special borders (dotted, + dashed etc.) are available. If you want support for all border modes, set the + value to "quality" as indicated above. This will cause the borders to be painted + as bitmaps. +

+

+ The default value for the "text-rendering" setting is "auto" which paints the + base fonts using PCL fonts. Non-base fonts are painted as bitmaps through Java2D. + If the mix of painting methods results in unwelcome output, you can set this + to "bitmap" which causes all text to be rendered as bitmaps. +

+

+ You can control the output resolution for the PCL using the "target resolution" + setting on the FOUserAgent. The actual value will be rounded up to the next + supported PCL resolution. Currently, only 300 and 600 dpi are supported which + should be enough for most use cases. Note that this setting directly affects + the size of the output file and the print quality. +

+
+
+ Extensions +

The PCL Renderer supports some PCL specific extensions which can be embedded + into the input FO document. To use the extensions the appropriate namespace must + be declared in the fo:root element like this:

+ +]]> +
+ Page Source (Tray selection) +

+ The page-source extension attribute on fo:simple-page-master allows to + select the paper tray the sheet for a particular simple-page-master is + to be taken from. Example: +

+ + + ... + + +]]> +

+ Note: the tray number is a positive integer and the value depends on + the target printer. Not all PCL printers support the same paper trays. + Usually, + "1" is the default tray, + "2" is the manual paper feed, + "3" is the manual envelope feed, + "4" is the "lower" tray and + "7" is "auto-select". + Consult the technical reference for your printer for all available values. +

+
+
+
+
+ AFP + The AFP Renderer is a new addition (27-Apr-2006) to the sandbox and as such not yet fully tested or feature complete. +

+ The FOP AFP Renderer deals with creating documents conforming to the IBM AFP document architecture + also refered to as MO:DCA (Mixed Object Document Content Architecture). +

+
+ References + +
+
+ Limitations +

This list is most likely badly incomplete.

+
    +
  • + Clipping of text and graphics is not supported. +
  • +
  • + Only IBM outline and raster fonts and to a limited extend the original fonts built into FOP are supported. + Support for TrueType fonts may be added later. +
  • +
+
+
+ Configuration +
+ Fonts +

The AFP Renderer requires special configuration particularly related to fonts. + AFP Render configuration is done through the normal FOP configuration file. The MIME type + for the AFP Renderer is application/x-afp which means the AFP Renderer section in the FOP configuration file + looks like:

+ + + ... +]]> +

There are 3 font configuration variants supported:

+
    +
  1. IBM Raster fonts
  2. +
  3. IBM Outline fonts
  4. +
  5. FOP built-in Base14 fonts
  6. +
+

A typical raster font configuration looks like:

+ + + + + + + + + + + + + + + + + + + + + + + + ]]> +

An outline font configuration is simpler as the individual font size entries are not required. + However, the characterset definition is now required within the afp-font element.

+ + + + + + +]]> +

Experimentation has shown that the font metrics for the FOP built-in Base14 fonts are actually + very similar to some of the IBM outline and raster fonts. In cases were the IBM font files are not + available the path attribute in the afp-font element can be replaced by a base14-font attribute + giving the name of the matching Base14 font. In this case the AFP Renderer will take the + font metrics from the built-in font.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> +
+
+ Images +

By default the AFP Renderer converts all images to 8 bit grey level. + This can be overridden by the <images> configuration element. Example:

+ +]]> +

This will put images as RGB images into the AFP output stream. The default setting is:

+ +]]> +

Only the values "color" and "b+w" are allowed for the mode attribute. The bits-per-pixel + attribute is ignored if mode is "color". For "b+w" mode is must be 1, 4, or 8.

+
+
+
+ Extensions +

The AFP Renderer supports some AFP specific extensions which can be embedded into the input + fo document. To use the extensions the appropriate namespace must be declared in the fo:root element like this:

+ +]]> +
+ Page Overlay Extension +

The include-page-overlay extension element allows to define on a per simple-page-master basis a page overlay resource. Example:

+ + + + ... + + +]]> +

The mandatory name attribute must refer to an 8 character (space padded) resource name that + must be known in the AFP processing environment.

+
+
+ Page Segment Extension +

The include-page-segment extension element allows to define resource substitution for fo:external-graphics elements. + Example:

+ + + + + + + +]]> +

The include-page-segment extension element can only occur within a simple-page-master. + Multiple include-page-segment extension elements within a simple-page-master are allowed. + The mandatory name attribute must refer to an 8 character + (space padded) resource name that must be known in the AFP processing environment. + The value of the mandatory src attribute is compared against the value of the src attribute in + fo:external-graphic elements and if it is identical (string matching is used) in the generated + AFP the external graphic is replaced by a reference to the given resource. +

+
+
+ Tag Logical Element Extension +

The tag-logical-element extension element allows to injects TLEs into the AFP output stream. Example: + Example:

+ + + + + + + +]]> +

The tag-logical-element extension element can only occur within a simple-page-master. + Multiple tag-logical-element extension elements within a simple-page-master are allowed. + The name and value attributes are mandatory. +

+
+
+
+
+ RTF +

+ JFOR, an open source XSL-FO to RTF converter has been integrated into Apache FOP. + This will create an RTF (rich text format) document that will + attempt to contain as much information from the fo document as + possible. The RTF output follows Microsoft's RTF specifications + and produces best results on Microsoft Word. +

+
+
+ XML (Area Tree XML) +

+ This is primarily for testing and verification. The XML created is simply + a representation of the internal area tree put into XML. We use that to verify + the functionality of FOP's layout engine. +

+

+ The other use case of the Area Tree XML is as FOP's "intermediate format". More information + on that can be found on the page dedicated to the Intermediate Format. +

+
+
+ Java2D/AWT +

+ The Java2DRenderer provides the basic functionality for all + Java2D-based output formats (AWT viewer, direct print, PNG, TIFF). +

+

+ The AWT viewer shows a window with the pages displayed inside a + Java graphic. It displays one page at a time. + The fonts used for the formatting and viewing depend on the fonts + available to your JRE. +

+
+
+ Print +

+ It is possible to directly print the document from the command line. + This is done with the same code that renders to the Java2D/AWT renderer. +

+
+
+ Bitmap (TIFF/PNG) +

+ It is possible to directly create bitmap images from the individual + pages generated by the layout engine. + This is done with the same code that renders to the Java2D/AWT renderer. +

+

+ Currently, two output formats are supported: PNG and TIFF. TIFF produces + one file with multiple pages, while PNG output produces one file per + page. The quality of the bitmap depends on the target resolution setting + on the FOUserAgent. +

+
+ Configuration +

+ The TIFF and PNG renderer configuration currently allows the following settings: +

+ + true + +]]> +

+ The default value for the "transparent-page-background" setting is "false" which + paints an opaque, white background for the whole image. If you set this to true, + no such background will be painted and you will get a transparent image if + an alpha channel is available in the output format. +

+
+
+ TIFF-specific Configuration +

+ In addition to the above values the TIFF renderer configuration allows some additional + settings: +

+ + true + CCITT T.6 + +]]> +

+ The default value for the "compression" setting is "PackBits" which + which is a widely supported RLE compression scheme for TIFF. The set of compression + names to be used here matches the set that the Image I/O API uses. Note that + not all compression schemes may be available during runtime. This depends on the + actual codecs being available. Here is a list of possible values: +

+
    +
  • NONE (no compression)
  • +
  • PackBits (RLE, run-length encoding)
  • +
  • JPEG
  • +
  • Deflate
  • +
  • LZW
  • +
  • ZLib
  • +
  • CCITT T.4 (Fax Group 3)
  • +
  • CCITT T.6 (Fax Group 4)
  • +
+ + If you want to use CCITT compression, please make sure you've got a J2SE 1.4 or later and + + Java Advanced Imaging Image I/O Tools + + in your classpath. The Sun JRE doesn't come with a TIFF codec built in, so it has to be + added separately. The internal TIFF codec from XML Graphics Commons only supports PackBits, + Deflate and JPEG compression for writing. + +
+
+
+ TXT +

+ The text renderer produces plain ASCII text output + that attempts to match the output of the PDFRenderer as closely as + possible. This was originally developed to accommodate an archive system + that could only accept plain text files, and is primarily useful for getting + a quick-and-dirty view of the document text. The renderer is very limited, + so do not be surprised if it gives unsatisfactory results. +

+

+ The Text renderer works with a fixed size page buffer. The size of this + buffer is controlled with the textCPI and textLPI public variables. + The textCPI is the effective horizontal characters per inch to use. + The textLPI is the vertical lines per inch to use. From these values + and the page width and height the size of the buffer is calculated. + The formatting objects to be rendered are then mapped to this grid. + Graphic elements (lines, borders, etc) are assigned a lower priority + than text, so text will overwrite any graphic element representations. +

+

+ Because FOP lays the text onto a grid during layout, there are frequently + extra or missing spaces between characters and lines, which is generally + unsatisfactory. + Users have reported that the optimal settings to avoid such spacing problems are: +

+
    +
  • font-family="Courier"
  • +
  • font-size="7.3pt"
  • +
  • line-height="10.5pt"
  • +
+
+
+ Output Formats in the Sandbox +

+ Due to the state of certain renderers we moved some of them to a "sandbox" area until + they are ready for more serious use. The renderers and FOEventHandlers in the sandbox + can be found under src/sandbox and are compiled into build/fop-sandbox.jar during the + main build. The output formats in the sandbox are marked as such below. +

+
+ MIF + The MIF handler is in the sandbox and not yet functional in FOP Trunk!!! Please help us ressurrect this feature. +

+ This format is the Maker Interchange Format which is used by + Adobe Framemaker. +

+
+
+ SVG + The SVG renderer is in the sandbox and may not work as expected in FOP Trunk!!! Please help us improve this feature. +

+ This format creates an SVG document that has links between the pages. + This is primarily for slides and creating svg images of pages. + Large documents will create SVG files that are far too large for + an SVG viewer to handle. Since FO documents usually have text the + SVG document will have a large number of text elements. + The font information for the text is obtained from the JVM in the + same way as for the AWT viewer. If the SVG is viewed on a + system where the fonts are different, such as another platform, + then the page may look wrong. +

+
+
+
+ Wish list +

+ Apache FOP is easily extensible and allows you to add new output formats to enhance FOP's functionality. There's a number of output formats + which are on our wish list. We're looking for volunteers to help us implement them. +

+ +
+ + +
+ diff --git a/src/documentation/content/xdocs/0.92/pdfa.xml b/src/documentation/content/xdocs/0.93/pdfa.xml similarity index 85% rename from src/documentation/content/xdocs/0.92/pdfa.xml rename to src/documentation/content/xdocs/0.93/pdfa.xml index 70479f49a..505a10805 100644 --- a/src/documentation/content/xdocs/0.92/pdfa.xml +++ b/src/documentation/content/xdocs/0.93/pdfa.xml @@ -50,16 +50,10 @@ PDF/A-1b is implemented to the degree that FOP supports the creation of the elements described in ISO 19005-1.

-

- There is a restriction with - XMP metadata. If an XMP metadata packet is present in the fo:declarations - element of an FO file, the values from the XMP packet are not synchronized - with the Info PDF object as is mandated by chapter 6.7.3 of the ISO document. - However, if no XMP packet is supplied FOP automatically generates an XMP - packet from the values in the Info PDF object. -

Tests have been performed against jHove and Adobe Acrobat 7.0.7 (Preflight function). + FOP does not validate completely against Apago's PDF Appraiser. Reasons unknown due to + lack of a full license to get a detailed error protocol.

PDF/A-1a is not implemented, yet. This is mostly because of the requirement @@ -69,10 +63,9 @@

Usage (command line)

- If you specify "-pdfa1b" instead of "-pdf" for the output format on the - command line, support for PDF/A-1b is activated. If there is a violation of - one of the validation rules for PDF/A, an error message is presented and the - processing stops. + To activate PDF/A-1b from the command-line, specify "-pdfprofile PDF/A-1b" + as a parameter. If there is a violation of one of the validation rules for + PDF/A, an error message is presented and the processing stops.

@@ -83,7 +76,6 @@ Here's an example:

@@ -111,7 +103,8 @@ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent); Don't use CMYK images without an ICC color profile. PDF/A doesn't allow mixing color spaces and FOP currently only properly supports the sRGB color space. Please note that FOP embeds a standard sRGB ICC profile (sRGB IEC61966-2.1) as the - primary output intent for the PDF. + primary output intent for the PDF if no other output intent has been specified + in the configuration.
  • Don't use non-RGB colors in SVG images. Same issue as with CMYK images. @@ -129,5 +122,12 @@ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent);
  • +
    + PDF profile compatibility +

    + The PDF profiles "PDF/X-3:2003" and "PDF/A-1b" are compatible and can both be + activated at the same time. +

    +
    diff --git a/src/documentation/content/xdocs/0.92/pdfencryption.xml b/src/documentation/content/xdocs/0.93/pdfencryption.xml old mode 100755 new mode 100644 similarity index 100% rename from src/documentation/content/xdocs/0.92/pdfencryption.xml rename to src/documentation/content/xdocs/0.93/pdfencryption.xml diff --git a/src/documentation/content/xdocs/0.93/pdfx.xml b/src/documentation/content/xdocs/0.93/pdfx.xml new file mode 100644 index 000000000..cf796c74d --- /dev/null +++ b/src/documentation/content/xdocs/0.93/pdfx.xml @@ -0,0 +1,136 @@ + + + + + +
    + PDF/X (ISO 15930) + $Revision$ + + + +
    + +
    + Overview + + Support for PDF/X is available beginning with version 0.93. This feature is new and + may not be 100% complete, yet. Feedback is welcome. + +

    + PDF/X is a standard which faciliates prepress digital data exchange using PDF. + Currently, only PDF/X-3:2003 is implemented out of the many different flavours of PDF/X + profiles. PDF/X-3:2003 is documented in + ISO 15930-6:2003(E). + More info on PDF/X can be found on the + PDF/X info site. +

    +
    +
    + Implementation Status +

    + PDF/X-3:2003 is implemented to the degree that FOP supports + the creation of the elements described in ISO 15930-6. +

    +

    + An important restriction of the current implementation is that all normal + RGB colors specified in XSL-FO and SVG are left unchanged in the sRGB color + space (XSL-FO and SVG both use sRGB as their default color space). + There's no conversion to a CMYK color space. Although sRGB is a + calibrated color space, its color space has a different size than a CMYK + color space which makes the conversion a lossy conversion and can lead to + unwanted results. Although the use of the calibrated sRGB has been promoted + for years, print shops usually prefer to convert an sRGB PDF to CMYK prior + to production. Until there's full CMYK support in FOP you will have to + work closely with your print service provider to make sure you get the + intended result. +

    +

    + Tests have been performed against Adobe Acrobat 7.0.7 (Preflight function). + Note that there are bugs in Adobe Acrobat which cause false alarms if both + PDF/A-1b and PDF/X-3:2003 are activated at the same time. +

    +
    +
    + Usage (command line) +

    + To activate PDF/X-3:2003 from the command-line, specify "-pdfprofile PDF/X-3:2003" + as a parameter. If there is a violation of one of the validation rules for + PDF/X, an error message is presented and the processing stops. +

    +
    +
    + Usage (embedded) +

    + When FOP is embedded in another Java application you can set a special option + on the renderer options in the user agent to activate the PDF/A-1b profile. + Here's an example: +

    + +

    + If one of the validation rules of PDF/X is violated, an PDFConformanceException + (descendant of RuntimeException) is thrown. +

    +
    +
    + PDF/X in Action +

    + There are a number of things that must be looked after if you activate a PDF/X + profile. If you receive a PDFConformanceException, have a look at the following + list (not necessarily comprehensive): +

    +
      +
    • + Make sure all (!) fonts are embedded. If you use base 14 fonts (like Helvetica) + you need to obtain a license for them and embed them like any other font. +
    • +
    • + Don't use PDF encryption. PDF/X doesn't allow it. +
    • +
    • + Don't use CMYK images without an ICC color profile. PDF/X doesn't allow mixing + color spaces and FOP currently only properly supports the sRGB color space. However, + you will need to specify an + output device profile + (usually a CMYK profile) in the configuration. sRGB won't work here since it's a + display device profile, not an output device profile. +
    • +
    • + Don't use non-RGB colors in SVG images. Same issue as with CMYK images. +
    • +
    • + Don't use EPS graphics with fo:external-graphic. Embedding EPS graphics in PDF + is deprecated since PDF 1.4 and prohibited by PDF/X-3:2003. +
    • +
    • + PDF is forced to version 1.4 if PDF/X-3:2003 is activated. +
    • +
    +
    +
    + PDF profile compatibility +

    + The PDF profiles "PDF/X-3:2003" and "PDF/A-1b" are compatible and can both be + activated at the same time. +

    +
    + +
    diff --git a/src/documentation/content/xdocs/0.92/running.xml b/src/documentation/content/xdocs/0.93/running.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/running.xml rename to src/documentation/content/xdocs/0.93/running.xml diff --git a/src/documentation/content/xdocs/0.92/servlets.xml b/src/documentation/content/xdocs/0.93/servlets.xml similarity index 100% rename from src/documentation/content/xdocs/0.92/servlets.xml rename to src/documentation/content/xdocs/0.93/servlets.xml diff --git a/src/documentation/content/xdocs/0.92/upgrading.xml b/src/documentation/content/xdocs/0.93/upgrading.xml similarity index 79% rename from src/documentation/content/xdocs/0.92/upgrading.xml rename to src/documentation/content/xdocs/0.93/upgrading.xml index 56e105210..b8aa58200 100644 --- a/src/documentation/content/xdocs/0.92/upgrading.xml +++ b/src/documentation/content/xdocs/0.93/upgrading.xml @@ -31,24 +31,34 @@

    • - More than half of the codebase has been rewritten over the last three years. The code is - relatively new and possibly not as stable as version 0.20.5 in every regard. But the code - is quickly approaching production level, especially when you're happy - with only PDF and PostScript output. + More than half of the codebase has been rewritten over the last three years. With version 0.93 the code has reached production level.
    • - The API of FOP has changed considerably and is not backwards-compatible with version 0.20.5. + The API of FOP has changed considerably and is not + backwards-compatible with versions 0.20.5 and + 0.91beta. Version 0.92 introduced the new stable + API.
    • - If you are using a configuration file, you have to rebuild it in the new format. The format + Since version 0.92 some deprecated methods which were part + of the old API have been removed. If you upgrade from 0.91 + beta, you will need to adjust your Java code. Similarly if + you upgrade from 0.92 and use deprecated methods. +
    • +
    • + If you are using a configuration file for version 0.20.5, you have to rebuild it in the new format. The format of the configuration files has changed since version 0.20.5. See conf/fop.xconf for an example configuration file. A XML Schema file can be found under src/foschema/fop-configuration.xsd.
    • -
    • - There have been changes to the end-user API between 0.91 beta and 0.92 beta. With version 0.92, - the API is now considered stable. Some methods have been deprecated and will be removed with - the next release. If you upgrade from 0.91 beta, you will need to adjust your Java code. +
    • + If you are using font metrics files for version 0.20.5 or + 0.92 or earlier, you have to regenerate them in the new + format. The new format is characterized by a version + attribute on the top-level font-metrics element, whose value + is 2.0. The absence of a version attribute will be + interpreted as version 1.0, and such metrics files will no + longer be parsed.
    • @@ -67,7 +77,7 @@

    • Extensions and Renderers written for version 0.20.5 will not work with the new code! The new FOP extension for Barcode4J will be available in - January 2006. + January 2007.
    • The PCL Renderer and the MIF Handler have not been resurrected, yet! They are currently non-functional @@ -106,13 +116,13 @@ or instream-foreign-object objects. If images or SVGs are sized differently in your outputs with the new FOP version check Bug 37136 - as it contains some hints on what to. The file + as it contains some hints on what to do. The file "examples/fo/basic/images.fo" has - a number of good examples that shows the new, more correct behaviour. + a number of good examples that show the new, more correct behaviour.
    • - The fox:outline extension not implemented in this version anymore. + The fox:outline extension is not implemented in this version anymore. It has been superseded by the new bookmark elements from XSL-FO 1.1.
    • diff --git a/src/documentation/content/xdocs/bugs.xml b/src/documentation/content/xdocs/bugs.xml index 233a69c5b..8f0f12531 100644 --- a/src/documentation/content/xdocs/bugs.xml +++ b/src/documentation/content/xdocs/bugs.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
      diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml index 27bc26efe..a7184a7cd 100644 --- a/src/documentation/content/xdocs/compliance.ihtml +++ b/src/documentation/content/xdocs/compliance.ihtml @@ -25,7 +25,7 @@

      W3C XSL-FO 1.0 Standard

      One of FOP's design goals is conformance to the - W3C XSL-FO 1.0 standard, which specifies three levels + W3C XSL-FO 1.0 standard, which specifies three levels of "conformance": basic, extended, and complete. Although FOP does not currently conform to any of these levels, it is nevertheless a useful work-in-progress for many applications. The information presented here demonstrates FOP's progress toward the goal of conformance, @@ -183,7 +183,7 @@ merge-property-values

    -

    XSL-FO Object Support Table (§6)

    +

    XSL-FO Object Support Table (§6)

    The following is a summary of FOP's current support for the standard XSL-FO objects.

    @@ -207,15 +207,15 @@ - 0.20.5 (current stable) + 0.20.5 (previous) - 0.92 beta + 0.93 (stable) - Declarations and Pagination and Layout Formatting Objects (§6.4) + Declarations and Pagination and Layout Formatting Objects (§6.4) @@ -226,7 +226,7 @@ Basic - §6.4.2 + §6.4.2 yes @@ -246,7 +246,7 @@ Basic - §6.4.3 + §6.4.3 no @@ -266,7 +266,7 @@ Extended - §6.4.4 + §6.4.4 no @@ -286,7 +286,7 @@ Basic - §6.4.5 + §6.4.5 yes @@ -306,7 +306,7 @@ Basic - §6.4.6 + §6.4.6 yes @@ -326,7 +326,7 @@ Basic - §6.4.7 + §6.4.7 yes @@ -346,7 +346,7 @@ Basic - §6.4.8 + §6.4.8 yes @@ -366,7 +366,7 @@ Basic - §6.4.9 + §6.4.9 yes @@ -386,7 +386,7 @@ Extended - §6.4.10 + §6.4.10 yes @@ -406,7 +406,7 @@ Extended - §6.4.11 + §6.4.11 yes @@ -426,7 +426,7 @@ Basic - §6.4.12 + §6.4.12 yes @@ -437,7 +437,7 @@
    • - [0.92 beta] The page width may not change among pages of the same page-sequence + [0.93] The page width may not change among pages of the same page-sequence unless a forced break is inserted.
    @@ -451,7 +451,7 @@ Basic - §6.4.13 + §6.4.13 yes @@ -470,7 +470,7 @@ Extended - §6.4.14 + §6.4.14 yes @@ -490,7 +490,7 @@ Extended - §6.4.15 + §6.4.15 yes @@ -510,7 +510,7 @@ Extended - §6.4.16 + §6.4.16 yes @@ -530,7 +530,7 @@ Extended - §6.4.17 + §6.4.17 yes @@ -550,7 +550,7 @@ Basic - §6.4.18 + §6.4.18 yes @@ -570,7 +570,7 @@ Extended - §6.4.19 + §6.4.19 yes @@ -590,7 +590,7 @@ Extended - §6.4.20 + §6.4.20 no @@ -604,7 +604,7 @@ - Block Formatting Objects (§6.5) + Block Formatting Objects (§6.5) @@ -615,7 +615,7 @@ Basic - §6.5.2 + §6.5.2 yes @@ -635,7 +635,7 @@ Extended - §6.5.3 + §6.5.3 partial @@ -652,14 +652,14 @@ [0.20.5] For absolute positioning, use 'position="absolute"' (as 'absolute-position="absolute"' is not implemented), and specify all four of "left", "top", "width" and "height"
  • - [0.92 beta] No known restrictions. + [0.93] No known restrictions.
  • - Inline Formatting Objects (§6.6) + Inline Formatting Objects (§6.6) @@ -670,7 +670,7 @@ Extended - §6.6.2 + §6.6.2 no @@ -690,7 +690,7 @@ Basic - §6.6.3 + §6.6.3 yes @@ -710,7 +710,7 @@ Extended - §6.6.4 + §6.6.4 no @@ -730,7 +730,7 @@ Basic - §6.6.5 + §6.6.5 yes @@ -750,7 +750,7 @@ Extended - §6.6.6 + §6.6.6 yes @@ -772,7 +772,7 @@ Basic - §6.6.7 + §6.6.7 yes @@ -792,7 +792,7 @@ Extended - §6.6.8 + §6.6.8 no @@ -812,7 +812,7 @@ Basic - §6.6.9 + §6.6.9 partial @@ -832,7 +832,7 @@ Basic - §6.6.10 + §6.6.10 yes @@ -852,7 +852,7 @@ Extended - §6.6.11 + §6.6.11 partial @@ -866,14 +866,14 @@ [0.20.5] Only works for table of contents without any problems. The case where the page number doesn't fit on a line isn't handled, and any text on the same line and after the page-number might not appear exactly where you want it to.
  • - [0.92 beta] After the page number is known, no relayout is performed. The appearance may be suboptimal depending on the use case. + [0.93] After the page number is known, no relayout is performed. The appearance may be suboptimal depending on the use case.
  • - Table Formatting Objects (§6.7) + Table Formatting Objects (§6.7) @@ -884,7 +884,7 @@ Basic - §6.7.2 + §6.7.2 no @@ -904,7 +904,7 @@ Basic - §6.7.3 + §6.7.3 partial @@ -915,7 +915,7 @@
    • - [0.92 beta] Only border-collapse="separate" is supported and there's no support for automatic column widths. + [0.93] Only border-collapse="separate" is supported and there's no support for automatic column widths.
    @@ -928,7 +928,7 @@ Basic - §6.7.4 + §6.7.4 partial @@ -952,7 +952,7 @@ Extended - §6.7.5 + §6.7.5 no @@ -972,7 +972,7 @@ Basic - §6.7.6 + §6.7.6 yes @@ -992,7 +992,7 @@ Extended - §6.7.7 + §6.7.7 yes @@ -1012,7 +1012,7 @@ Basic - §6.7.8 + §6.7.8 yes @@ -1032,7 +1032,7 @@ Basic - §6.7.9 + §6.7.9 yes @@ -1052,7 +1052,7 @@ Basic - §6.7.10 + §6.7.10 partial @@ -1070,7 +1070,7 @@ - List Formatting Objects (§6.8) + List Formatting Objects (§6.8) @@ -1081,7 +1081,7 @@ Basic - §6.8.2 + §6.8.2 yes @@ -1101,7 +1101,7 @@ Basic - §6.8.3 + §6.8.3 yes @@ -1121,7 +1121,7 @@ Basic - §6.8.4 + §6.8.4 yes @@ -1141,7 +1141,7 @@ Extended - §6.8.5 + §6.8.5 yes @@ -1155,7 +1155,7 @@ - Link and Multi Formatting Objects (§6.9) + Link and Multi Formatting Objects (§6.9) @@ -1166,7 +1166,7 @@ Extended - §6.9.2 + §6.9.2 yes @@ -1190,7 +1190,7 @@ Extended - §6.9.3 + §6.9.3 no @@ -1210,7 +1210,7 @@ Basic - §6.9.4 + §6.9.4 no @@ -1230,7 +1230,7 @@ Extended - §6.9.5 + §6.9.5 no @@ -1250,7 +1250,7 @@ Extended - §6.9.6 + §6.9.6 no @@ -1270,7 +1270,7 @@ Extended - §6.9.7 + §6.9.7 no @@ -1284,7 +1284,7 @@ - Formatting Objects for Bookmarks (§6.11 in XSL 1.1 WD) + Formatting Objects for Bookmarks (§6.11 in XSL 1.1 WD) @@ -1355,7 +1355,7 @@ - Out-of-line Formatting Objects (§6.10) + Out-of-line Formatting Objects (§6.10) @@ -1366,7 +1366,7 @@ Extended - §6.10.2 + §6.10.2 no @@ -1386,7 +1386,7 @@ Extended - §6.10.3 + §6.10.3 yes @@ -1396,7 +1396,7 @@
      -
    • [0.92 beta] Restrictions with multi-column documents.
    • +
    • [0.93] Restrictions with multi-column documents.
    @@ -1408,7 +1408,7 @@ Extended - §6.10.4 + §6.10.4 yes @@ -1422,7 +1422,7 @@ - Other Formatting Objects (§6.11) + Other Formatting Objects (§6.11) @@ -1433,7 +1433,7 @@ Basic - §6.11.2 + §6.11.2 yes @@ -1443,7 +1443,7 @@
      -
    • [0.92 beta] Only works as expected with inline-level content.
    • +
    • [0.93] Only works as expected with inline-level content.
    @@ -1455,7 +1455,7 @@ Extended - §6.11.3 + §6.11.3 yes @@ -1475,7 +1475,7 @@ Extended - §6.11.4 + §6.11.4 yes @@ -1488,7 +1488,7 @@ -

    XSL-FO Property Support Table (§7)

    +

    XSL-FO Property Support Table (§7)

    The following is a summary of FOP's current support for the standard XSL-FO properties.

    @@ -1512,15 +1512,15 @@ - 0.20.5 (current stable) + 0.20.5 (previous) - 0.92 beta (unstable) + 0.93 (stable) - Common Accessibility Properties (§7.4) + Common Accessibility Properties (§7.4) @@ -1531,7 +1531,7 @@ Basic - §7.4.1 + §7.4.1 na @@ -1551,7 +1551,7 @@ Basic - §7.4.2 + §7.4.2 na @@ -1565,7 +1565,7 @@ - Common Absolute Position Properties (§7.5) + Common Absolute Position Properties (§7.5) @@ -1576,7 +1576,7 @@ Complete - §7.5.1 + §7.5.1 no @@ -1590,7 +1590,7 @@ [0.20.5] Use shorthand position="absolute" as a workaround.
  • - [0.92 beta] No restrictions. The 0.20.5 work-around is not supported. + [0.93] No restrictions. The 0.20.5 work-around is not supported.
  • @@ -1603,7 +1603,7 @@ Extended - §7.5.2 + §7.5.2 yes @@ -1623,7 +1623,7 @@ Extended - §7.5.3 + §7.5.3 yes @@ -1643,7 +1643,7 @@ Extended - §7.5.4 + §7.5.4 yes @@ -1663,7 +1663,7 @@ Extended - §7.5.5 + §7.5.5 yes @@ -1677,7 +1677,7 @@ - Common Aural Properties (§7.6) + Common Aural Properties (§7.6) @@ -1688,7 +1688,7 @@ Basic - §7.6.1 + §7.6.1 na @@ -1708,7 +1708,7 @@ Basic - §7.6.2 + §7.6.2 na @@ -1728,7 +1728,7 @@ Basic - §7.6.3 + §7.6.3 na @@ -1748,7 +1748,7 @@ Basic - §7.6.4 + §7.6.4 na @@ -1768,7 +1768,7 @@ Basic - §7.6.5 + §7.6.5 na @@ -1788,7 +1788,7 @@ Basic - §7.6.6 + §7.6.6 na @@ -1808,7 +1808,7 @@ Basic - §7.6.7 + §7.6.7 na @@ -1828,7 +1828,7 @@ Basic - §7.6.8 + §7.6.8 na @@ -1848,7 +1848,7 @@ Basic - §7.6.9 + §7.6.9 na @@ -1868,7 +1868,7 @@ Basic - §7.6.10 + §7.6.10 na @@ -1888,7 +1888,7 @@ Basic - §7.6.11 + §7.6.11 na @@ -1908,7 +1908,7 @@ Basic - §7.6.12 + §7.6.12 na @@ -1928,7 +1928,7 @@ Basic - §7.6.13 + §7.6.13 na @@ -1948,7 +1948,7 @@ Basic - §7.6.14 + §7.6.14 na @@ -1968,7 +1968,7 @@ Basic - §7.6.15 + §7.6.15 na @@ -1988,7 +1988,7 @@ Basic - §7.6.16 + §7.6.16 na @@ -2008,7 +2008,7 @@ Basic - §7.6.17 + §7.6.17 na @@ -2028,7 +2028,7 @@ Basic - §7.6.18 + §7.6.18 na @@ -2042,7 +2042,7 @@ - Common Border, Padding, and Background Properties (§7.7) + Common Border, Padding, and Background Properties (§7.7) @@ -2053,7 +2053,7 @@ Extended - §7.7.1 + §7.7.1 no @@ -2073,7 +2073,7 @@ Basic - §7.7.2 + §7.7.2 yes @@ -2084,7 +2084,7 @@
    • - [0.92 beta] not yet implemented for table-column, table-body, table-header and table-footer. + [0.93] not yet implemented for table-column, table-body, table-header and table-footer.
    @@ -2097,7 +2097,7 @@ Extended - §7.7.3 + §7.7.3 yes @@ -2108,7 +2108,7 @@
    • - [0.92 beta] not yet implemented for table-column, table-body, table-header and table-footer. + [0.93] not yet implemented for table-column, table-body, table-header and table-footer.
    @@ -2121,7 +2121,7 @@ Extended - §7.7.4 + §7.7.4 no @@ -2141,7 +2141,7 @@ Extended - §7.7.5 + §7.7.5 no @@ -2161,7 +2161,7 @@ Extended - §7.7.6 + §7.7.6 no @@ -2181,7 +2181,7 @@ Basic - §7.7.7 + §7.7.7 yes @@ -2201,7 +2201,7 @@ Basic - §7.7.8 + §7.7.8 partial @@ -2225,7 +2225,7 @@ Basic - §7.7.9 + §7.7.9 yes @@ -2245,7 +2245,7 @@ Basic - §7.7.10 + §7.7.10 yes @@ -2265,7 +2265,7 @@ Basic - §7.7.11 + §7.7.11 partial @@ -2289,7 +2289,7 @@ Basic - §7.7.12 + §7.7.12 yes @@ -2309,7 +2309,7 @@ Basic - §7.7.13 + §7.7.13 yes @@ -2329,7 +2329,7 @@ Basic - §7.7.14 + §7.7.14 partial @@ -2353,7 +2353,7 @@ Basic - §7.7.15 + §7.7.15 yes @@ -2373,7 +2373,7 @@ Basic - §7.7.16 + §7.7.16 yes @@ -2393,7 +2393,7 @@ Basic - §7.7.17 + §7.7.17 partial @@ -2417,7 +2417,7 @@ Basic - §7.7.18 + §7.7.18 yes @@ -2437,7 +2437,7 @@ Basic - §7.7.19 + §7.7.19 yes @@ -2457,7 +2457,7 @@ Basic - §7.7.20 + §7.7.20 partial @@ -2481,7 +2481,7 @@ Basic - §7.7.21 + §7.7.21 yes @@ -2501,7 +2501,7 @@ Basic - §7.7.22 + §7.7.22 yes @@ -2521,7 +2521,7 @@ Basic - §7.7.23 + §7.7.23 partial @@ -2545,7 +2545,7 @@ Basic - §7.7.24 + §7.7.24 yes @@ -2565,7 +2565,7 @@ Basic - §7.7.25 + §7.7.25 yes @@ -2585,7 +2585,7 @@ Basic - §7.7.26 + §7.7.26 partial @@ -2609,7 +2609,7 @@ Basic - §7.7.27 + §7.7.27 yes @@ -2629,7 +2629,7 @@ Basic - §7.7.28 + §7.7.28 yes @@ -2649,7 +2649,7 @@ Basic - §7.7.29 + §7.7.29 partial @@ -2673,7 +2673,7 @@ Basic - §7.7.30 + §7.7.30 yes @@ -2693,7 +2693,7 @@ Basic - §7.7.31 + §7.7.31 partial @@ -2726,7 +2726,7 @@ Basic - §7.7.32 + §7.7.32 partial @@ -2750,7 +2750,7 @@ Basic - §7.7.33 + §7.7.33 partial @@ -2774,7 +2774,7 @@ Basic - §7.7.34 + §7.7.34 partial @@ -2798,7 +2798,7 @@ Basic - §7.7.35 + §7.7.35 partial @@ -2822,7 +2822,7 @@ Basic - §7.7.36 + §7.7.36 partial @@ -2846,7 +2846,7 @@ Basic - §7.7.37 + §7.7.37 partial @@ -2870,7 +2870,7 @@ Basic - §7.7.38 + §7.7.38 partial @@ -2888,7 +2888,7 @@ - Common Font Properties (§7.8) + Common Font Properties (§7.8) @@ -2899,7 +2899,7 @@ Basic - §7.8.2 + §7.8.2 partial @@ -2913,7 +2913,7 @@ [0.20.5] font-family lists are not supported, use a single font-family name
  • - [0.92 beta] font-family lists are allowed but glyph based font selection is not supported + [0.93] font-family lists are allowed but glyph based font selection is not supported
  • @@ -2926,7 +2926,7 @@ Complete - §7.8.3 + §7.8.3 no @@ -2946,7 +2946,7 @@ Basic - §7.8.4 + §7.8.4 partial @@ -2970,7 +2970,7 @@ Extended - §7.8.5 + §7.8.5 no @@ -2990,7 +2990,7 @@ Extended - §7.8.6 + §7.8.6 no @@ -3010,7 +3010,7 @@ Basic - §7.8.7 + §7.8.7 partial @@ -3034,7 +3034,7 @@ Basic - §7.8.8 + §7.8.8 yes @@ -3054,7 +3054,7 @@ Basic - §7.8.9 + §7.8.9 partial @@ -3068,14 +3068,14 @@ [0.20.5] "normal", "bolder" and "lighter" are not supported
  • - [0.92 beta] TODO <relative> font weights + [0.93] TODO <relative> font weights
  • - Common Hyphenation Properties (§7.9) + Common Hyphenation Properties (§7.9) @@ -3086,7 +3086,7 @@ Extended - §7.9.1 + §7.9.1 yes @@ -3106,7 +3106,7 @@ Extended - §7.9.2 + §7.9.2 yes @@ -3126,7 +3126,7 @@ Extended - §7.9.3 + §7.9.3 no @@ -3146,7 +3146,7 @@ Extended - §7.9.4 + §7.9.4 yes @@ -3166,7 +3166,7 @@ Extended - §7.9.5 + §7.9.5 yes @@ -3186,7 +3186,7 @@ Extended - §7.9.6 + §7.9.6 yes @@ -3206,7 +3206,7 @@ Extended - §7.9.7 + §7.9.7 yes @@ -3220,7 +3220,7 @@ - Common Margin Properties - Block (§7.10) + Common Margin Properties - Block (§7.10) @@ -3231,7 +3231,7 @@ Basic - §7.10.1 + §7.10.1 partial @@ -3255,7 +3255,7 @@ Basic - §7.10.2 + §7.10.2 partial @@ -3279,7 +3279,7 @@ Basic - §7.10.3 + §7.10.3 partial @@ -3303,7 +3303,7 @@ Basic - §7.10.4 + §7.10.4 partial @@ -3327,7 +3327,7 @@ Basic - §7.10.5 + §7.10.5 partial @@ -3341,7 +3341,7 @@ [0.20.5] space-before.optimum supported
  • - [0.92 beta] Space adjustment may not fully work everywhere, yet. + [0.93] Space adjustment may not fully work everywhere, yet.
  • @@ -3354,7 +3354,7 @@ Basic - §7.10.6 + §7.10.6 partial @@ -3368,7 +3368,7 @@ [0.20.5] space-after.optimum supported
  • - [0.92 beta] Space adjustment may not fully work everywhere, yet. + [0.93] Space adjustment may not fully work everywhere, yet.
  • @@ -3381,7 +3381,7 @@ Basic - §7.10.7 + §7.10.7 yes @@ -3401,7 +3401,7 @@ Basic - §7.10.8 + §7.10.8 yes @@ -3415,7 +3415,7 @@ - Common Margin Properties - Inline (§7.11) + Common Margin Properties - Inline (§7.11) @@ -3426,7 +3426,7 @@ Basic - §7.11.1 + §7.11.1 no @@ -3446,7 +3446,7 @@ Basic - §7.11.2 + §7.11.2 no @@ -3460,7 +3460,7 @@ - Common Relative Position Properties (§7.12) + Common Relative Position Properties (§7.12) @@ -3471,7 +3471,7 @@ Extended - §7.12.1 + §7.12.1 no @@ -3485,7 +3485,7 @@ - Area Alignment Properties (§7.13) + Area Alignment Properties (§7.13) @@ -3496,7 +3496,7 @@ Basic - §7.13.1 + §7.13.1 no @@ -3516,7 +3516,7 @@ Basic - §7.13.2 + §7.13.2 no @@ -3536,7 +3536,7 @@ Basic - §7.13.3 + §7.13.3 partial @@ -3560,7 +3560,7 @@ Extended - §7.13.4 + §7.13.4 partial @@ -3577,7 +3577,7 @@ [0.20.5] For table-cell, the "height" attribute must be set for the parent table-row; setting the height of the table or the table-cell results in vertical centering having no effect.
  • - [0.92 beta] TODO Check e-g, i-f-o. + [0.93] TODO Check e-g, i-f-o.
  • @@ -3590,7 +3590,7 @@ Basic - §7.13.5 + §7.13.5 no @@ -3610,7 +3610,7 @@ Extended - §7.13.6 + §7.13.6 no @@ -3624,7 +3624,7 @@ - Area Dimension Properties (§7.14) + Area Dimension Properties (§7.14) @@ -3635,7 +3635,7 @@ Basic - §7.14.1 + §7.14.1 no @@ -3655,7 +3655,7 @@ Extended - §7.14.2 + §7.14.2 no @@ -3675,7 +3675,7 @@ Extended - §7.14.3 + §7.14.3 no @@ -3695,7 +3695,7 @@ Basic - §7.14.4 + §7.14.4 yes @@ -3715,7 +3715,7 @@ Basic - §7.14.5 + §7.14.5 no @@ -3735,7 +3735,7 @@ Complete - §7.14.6 + §7.14.6 no @@ -3755,7 +3755,7 @@ Complete - §7.14.7 + §7.14.7 no @@ -3775,7 +3775,7 @@ Complete - §7.14.8 + §7.14.8 no @@ -3795,7 +3795,7 @@ Complete - §7.14.9 + §7.14.9 no @@ -3815,7 +3815,7 @@ Extended - §7.14.10 + §7.14.10 no @@ -3835,7 +3835,7 @@ Extended - §7.14.11 + §7.14.11 no @@ -3855,7 +3855,7 @@ Basic - §7.14.12 + §7.14.12 yes @@ -3869,7 +3869,7 @@ - Block and Line-related Properties (§7.15) + Block and Line-related Properties (§7.15) @@ -3880,7 +3880,7 @@ Extended - §7.15.1 + §7.15.1 no @@ -3900,7 +3900,7 @@ Extended - §7.15.2 + §7.15.2 no @@ -3920,7 +3920,7 @@ Extended - §7.15.3 + §7.15.3 no @@ -3940,7 +3940,7 @@ Basic - §7.15.4 + §7.15.4 yes @@ -3960,7 +3960,7 @@ Extended - §7.15.5 + §7.15.5 no @@ -3980,7 +3980,7 @@ Basic - §7.15.6 + §7.15.6 no @@ -3991,7 +3991,7 @@
    • - [0.92 beta] value "line-height" not supported + [0.93] value "line-height" not supported
    @@ -4004,7 +4004,7 @@ Extended - §7.15.7 + §7.15.7 no @@ -4024,7 +4024,7 @@ Extended - §7.15.8 + §7.15.8 no @@ -4035,7 +4035,7 @@
    • - [0.92 beta] inline elements may interfere with correct handling of this property + [0.93] inline elements may interfere with correct handling of this property in some cases
    @@ -4049,7 +4049,7 @@ Basic - §7.15.9 + §7.15.9 partial @@ -4073,7 +4073,7 @@ Extended - §7.15.10 + §7.15.10 partial @@ -4097,7 +4097,7 @@ Basic - §7.15.11 + §7.15.11 yes @@ -4117,7 +4117,7 @@ Extended - §7.15.12 + §7.15.12 yes @@ -4137,7 +4137,7 @@ Basic - §7.15.13 + §7.15.13 yes @@ -4148,14 +4148,14 @@
    • - [0.92 beta] Only supported on fo:block. + [0.93] Only supported on fo:block.
    - Character Properties (§7.16) + Character Properties (§7.16) @@ -4166,7 +4166,7 @@ Basic - §7.16.1 + §7.16.1 yes @@ -4186,7 +4186,7 @@ Extended - §7.16.2 + §7.16.2 yes @@ -4206,7 +4206,7 @@ Extended - §7.16.3 + §7.16.3 no @@ -4226,7 +4226,7 @@ Extended - §7.16.4 + §7.16.4 yes @@ -4246,7 +4246,7 @@ Extended - §7.16.5 + §7.16.5 no @@ -4266,7 +4266,7 @@ Extended - §7.16.6 + §7.16.6 no @@ -4286,7 +4286,7 @@ Extended - §7.16.7 + §7.16.7 no @@ -4306,7 +4306,7 @@ Extended - §7.16.8 + §7.16.8 no @@ -4320,7 +4320,7 @@ - Color-related Properties (§7.17) + Color-related Properties (§7.17) @@ -4331,7 +4331,7 @@ Basic - §7.17.1 + §7.17.1 yes @@ -4351,7 +4351,7 @@ Extended - §7.17.2 + §7.17.2 no @@ -4371,7 +4371,7 @@ Extended - §7.17.3 + §7.17.3 no @@ -4385,7 +4385,7 @@ - Float-related Properties (§7.18) + Float-related Properties (§7.18) @@ -4396,7 +4396,7 @@ Extended - §7.18.1 + §7.18.1 no @@ -4416,7 +4416,7 @@ Extended - §7.18.2 + §7.18.2 no @@ -4436,7 +4436,7 @@ Extended - §7.18.3 + §7.18.3 no @@ -4450,7 +4450,7 @@ - Keeps and Breaks Properties (§7.19) + Keeps and Breaks Properties (§7.19) @@ -4461,7 +4461,7 @@ Basic - §7.19.1 + §7.19.1 yes @@ -4481,7 +4481,7 @@ Basic - §7.19.2 + §7.19.2 yes @@ -4501,7 +4501,7 @@ Extended - §7.19.3 + §7.19.3 partial @@ -4515,10 +4515,10 @@ [0.20.5] works only in table rows
  • - [0.92 beta] works on all implemented block-level FOs, but not on inline-level FOs. + [0.93] works on all implemented block-level FOs, but not on inline-level FOs.
  • - [0.92 beta] <integer> values are not supported. + [0.93] <integer> values are not supported.
  • @@ -4531,7 +4531,7 @@ Basic - §7.19.4 + §7.19.4 partial @@ -4545,10 +4545,10 @@ [0.20.5] works only in table rows
  • - [0.92 beta] works on all implemented block-level FOs, but not on inline-level FOs. + [0.93] works on all implemented block-level FOs, but not on inline-level FOs.
  • - [0.92 beta] <integer> values are not supported. + [0.93] <integer> values are not supported.
  • @@ -4561,7 +4561,7 @@ Basic - §7.19.5 + §7.19.5 partial @@ -4575,10 +4575,10 @@ [0.20.5] works only in table rows
  • - [0.92 beta] works on all implemented FOs, except list- and table-related and inline-level FOs. + [0.93] works on all implemented FOs, except list- and table-related and inline-level FOs.
  • - [0.92 beta] <integer> values are not supported. + [0.93] <integer> values are not supported.
  • @@ -4591,7 +4591,7 @@ Basic - §7.19.6 + §7.19.6 no @@ -4611,7 +4611,7 @@ Basic - §7.19.7 + §7.19.7 no @@ -4625,7 +4625,7 @@ - Layout-related Properties (§7.20) + Layout-related Properties (§7.20) @@ -4636,7 +4636,7 @@ Extended - §7.20.1 + §7.20.1 no @@ -4656,7 +4656,7 @@ Basic - §7.20.2 + §7.20.2 no @@ -4676,7 +4676,7 @@ Extended - §7.20.3 + §7.20.3 no @@ -4703,7 +4703,7 @@ Extended - §7.20.4 + §7.20.4 yes @@ -4717,7 +4717,7 @@ - Leader and Rule Properties (§7.21) + Leader and Rule Properties (§7.21) @@ -4728,7 +4728,7 @@ Extended - §7.21.1 + §7.21.1 partial @@ -4742,7 +4742,7 @@ [0.20.5] not value "page"
  • - [0.92 beta] Not supported + [0.93] Not supported
  • @@ -4755,7 +4755,7 @@ Basic - §7.21.2 + §7.21.2 partial @@ -4769,7 +4769,7 @@ [0.20.5] not value "use-content"
  • - [0.92 beta] Value "use-content" does not work in all circumstances. + [0.93] Value "use-content" does not work in all circumstances.
  • @@ -4782,7 +4782,7 @@ Extended - §7.21.3 + §7.21.3 yes @@ -4802,7 +4802,7 @@ Basic - §7.21.4 + §7.21.4 partial @@ -4826,7 +4826,7 @@ Basic - §7.21.5 + §7.21.5 yes @@ -4846,7 +4846,7 @@ Basic - §7.21.6 + §7.21.6 yes @@ -4860,7 +4860,7 @@ - Properties for Dynamic Effects Formatting Objects (§7.22) + Properties for Dynamic Effects Formatting Objects (§7.22) @@ -4871,7 +4871,7 @@ Extended - §7.22.1 + §7.22.1 no @@ -4891,7 +4891,7 @@ Extended - §7.22.2 + §7.22.2 no @@ -4911,7 +4911,7 @@ Extended - §7.22.3 + §7.22.3 no @@ -4931,7 +4931,7 @@ Extended - §7.22.4 + §7.22.4 no @@ -4951,7 +4951,7 @@ Extended - §7.22.5 + §7.22.5 no @@ -4971,7 +4971,7 @@ Basic - §7.22.6 + §7.22.6 yes @@ -4991,7 +4991,7 @@ Extended - §7.22.7 + §7.22.7 no @@ -5011,7 +5011,7 @@ Extended - §7.22.8 + §7.22.8 yes @@ -5031,7 +5031,7 @@ Extended - §7.22.9 + §7.22.9 no @@ -5051,7 +5051,7 @@ Extended - §7.22.10 + §7.22.10 no @@ -5071,7 +5071,7 @@ Extended - §7.22.11 + §7.22.11 no @@ -5091,7 +5091,7 @@ Extended - §7.22.12 + §7.22.12 no @@ -5111,7 +5111,7 @@ Extended - §7.22.13 + §7.22.13 no @@ -5131,7 +5131,7 @@ Extended - §7.22.14 + §7.22.14 no @@ -5145,7 +5145,7 @@ - Properties for Markers (§7.23) + Properties for Markers (§7.23) @@ -5156,7 +5156,7 @@ Extended - §7.23.1 + §7.23.1 no @@ -5176,7 +5176,7 @@ Extended - §7.23.2 + §7.23.2 no @@ -5196,7 +5196,7 @@ Extended - §7.23.3 + §7.23.3 no @@ -5216,7 +5216,7 @@ Extended - §7.23.4 + §7.23.4 no @@ -5230,7 +5230,7 @@ - Properties for Number to String Conversion (§7.24) + Properties for Number to String Conversion (§7.24) @@ -5241,7 +5241,7 @@ Basic - §7.24.1 + §7.24.1 no @@ -5261,7 +5261,7 @@ Extended - §7.24.2 + §7.24.2 no @@ -5281,7 +5281,7 @@ Extended - §7.24.3 + §7.24.3 no @@ -5301,7 +5301,7 @@ Basic - §7.24.4 + §7.24.4 no @@ -5315,7 +5315,7 @@ - Pagination and Layout Properties (§7.25) + Pagination and Layout Properties (§7.25) @@ -5326,7 +5326,7 @@ Extended - §7.25.1 + §7.25.1 yes @@ -5346,7 +5346,7 @@ Extended - §7.25.2 + §7.25.2 yes @@ -5366,7 +5366,7 @@ Extended - §7.25.3 + §7.25.3 yes @@ -5386,7 +5386,7 @@ Extended - §7.25.4 + §7.25.4 yes @@ -5406,7 +5406,7 @@ Basic - §7.25.5 + §7.25.5 yes @@ -5426,7 +5426,7 @@ Extended - §7.25.6 + §7.25.6 no @@ -5446,7 +5446,7 @@ Basic - §7.25.7 + §7.25.7 yes @@ -5466,7 +5466,7 @@ Basic - §7.25.8 + §7.25.8 yes @@ -5486,7 +5486,7 @@ Basic - §7.25.9 + §7.25.9 yes @@ -5506,7 +5506,7 @@ Extended - §7.25.10 + §7.25.10 yes @@ -5526,7 +5526,7 @@ Extended - §7.25.11 + §7.25.11 no @@ -5546,7 +5546,7 @@ Extended - §7.25.12 + §7.25.12 yes @@ -5566,7 +5566,7 @@ Basic - §7.25.13 + §7.25.13 yes @@ -5586,7 +5586,7 @@ Extended - §7.25.14 + §7.25.14 partial @@ -5610,7 +5610,7 @@ Basic - §7.25.15 + §7.25.15 yes @@ -5630,7 +5630,7 @@ Extended - §7.25.16 + §7.25.16 no @@ -5650,7 +5650,7 @@ Basic - §7.25.17 + §7.25.17 yes @@ -5664,7 +5664,7 @@ - Table Properties (§7.26) + Table Properties (§7.26) @@ -5675,7 +5675,7 @@ Basic - §7.26.1 + §7.26.1 no @@ -5695,7 +5695,7 @@ Basic - §7.26.2 + §7.26.2 no @@ -5715,7 +5715,7 @@ Extended - §7.26.3 + §7.26.3 partial @@ -5739,7 +5739,7 @@ Basic - §7.26.4 + §7.26.4 no @@ -5759,7 +5759,7 @@ Extended - §7.26.5 + §7.26.5 no @@ -5779,7 +5779,7 @@ Basic - §7.26.6 + §7.26.6 no @@ -5799,7 +5799,7 @@ Complete - §7.26.7 + §7.26.7 no @@ -5819,7 +5819,7 @@ Basic - §7.26.8 + §7.26.8 no @@ -5839,7 +5839,7 @@ Basic - §7.26.9 + §7.26.9 partial @@ -5863,7 +5863,7 @@ Extended - §7.26.10 + §7.26.10 no @@ -5883,7 +5883,7 @@ Extended - §7.26.11 + §7.26.11 no @@ -5903,7 +5903,7 @@ Basic - §7.26.12 + §7.26.12 no @@ -5923,7 +5923,7 @@ Basic - §7.26.13 + §7.26.13 yes @@ -5943,7 +5943,7 @@ Basic - §7.26.14 + §7.26.14 yes @@ -5963,7 +5963,7 @@ Extended - §7.26.15 + §7.26.15 no @@ -5983,7 +5983,7 @@ Extended - §7.26.16 + §7.26.16 no @@ -6003,7 +6003,7 @@ Extended - §7.26.17 + §7.26.17 yes @@ -6023,7 +6023,7 @@ Extended - §7.26.18 + §7.26.18 yes @@ -6037,7 +6037,7 @@ - Writing-mode-related Properties (§7.27) + Writing-mode-related Properties (§7.27) @@ -6048,7 +6048,7 @@ Basic - §7.27.1 + §7.27.1 no @@ -6068,7 +6068,7 @@ Extended - §7.27.2 + §7.27.2 no @@ -6088,7 +6088,7 @@ Extended - §7.27.3 + §7.27.3 no @@ -6108,7 +6108,7 @@ Extended - §7.27.4 + §7.27.4 no @@ -6128,7 +6128,7 @@ Extended - §7.27.5 + §7.27.5 no @@ -6148,7 +6148,7 @@ Extended - §7.27.6 + §7.27.6 no @@ -6168,7 +6168,7 @@ Basic - §7.27.7 + §7.27.7 no @@ -6182,7 +6182,7 @@ - Miscellaneous Properties (§7.28) + Miscellaneous Properties (§7.28) @@ -6193,7 +6193,7 @@ Extended - §7.28.1 + §7.28.1 no @@ -6213,7 +6213,7 @@ Basic - §7.28.2 + §7.28.2 yes @@ -6223,7 +6223,7 @@
      -
    • [0.92 beta] IDs on table-header, table-footer, table-body, table-row, table-and-caption, table-caption, inline-container and bidi-override are not available, yet.
    • +
    • [0.93] IDs on table-header, table-footer, table-body, table-row, table-and-caption, table-caption, inline-container and bidi-override are not available, yet.
    @@ -6235,7 +6235,7 @@ Basic - §7.28.3 + §7.28.3 yes @@ -6255,7 +6255,7 @@ Basic - §7.28.4 + §7.28.4 yes @@ -6275,7 +6275,7 @@ Extended - §7.28.5 + §7.28.5 yes @@ -6295,7 +6295,7 @@ Extended - §7.28.6 + §7.28.6 no @@ -6315,7 +6315,7 @@ Basic - §7.28.7 + §7.28.7 yes @@ -6335,7 +6335,7 @@ Extended - §7.28.8 + §7.28.8 no @@ -6355,7 +6355,7 @@ Extended - §7.28.9 + §7.28.9 no @@ -6369,7 +6369,7 @@ - Shorthand Properties (§7.29) + Shorthand Properties (§7.29) @@ -6380,7 +6380,7 @@ Complete - §7.29.1 + §7.29.1 no @@ -6400,7 +6400,7 @@ Complete - §7.29.2 + §7.29.2 no @@ -6420,7 +6420,7 @@ Complete - §7.29.3 + §7.29.3 no @@ -6440,7 +6440,7 @@ Complete - §7.29.4 + §7.29.4 yes @@ -6460,7 +6460,7 @@ Complete - §7.29.5 + §7.29.5 partial @@ -6484,7 +6484,7 @@ Complete - §7.29.6 + §7.29.6 yes @@ -6504,7 +6504,7 @@ Complete - §7.29.7 + §7.29.7 yes @@ -6524,7 +6524,7 @@ Complete - §7.29.8 + §7.29.8 partial @@ -6548,7 +6548,7 @@ Complete - §7.29.9 + §7.29.9 no @@ -6568,7 +6568,7 @@ Complete - §7.29.10 + §7.29.10 yes @@ -6588,7 +6588,7 @@ Complete - §7.29.11 + §7.29.11 yes @@ -6608,7 +6608,7 @@ Complete - §7.29.12 + §7.29.12 na @@ -6628,7 +6628,7 @@ Complete - §7.29.13 + §7.29.13 no @@ -6639,7 +6639,7 @@
    • - [0.92 beta] Enum values other than "inherit" not yet supported. + [0.93] Enum values other than "inherit" not yet supported.
    @@ -6652,7 +6652,7 @@ Complete - §7.29.14 + §7.29.14 partial @@ -6676,7 +6676,7 @@ Complete - §7.29.15 + §7.29.15 partial @@ -6709,7 +6709,7 @@ Complete - §7.29.16 + §7.29.16 no @@ -6729,7 +6729,7 @@ Complete - §7.29.17 + §7.29.17 no @@ -6749,7 +6749,7 @@ Complete - §7.29.18 + §7.29.18 no @@ -6769,7 +6769,7 @@ Complete - §7.29.19 + §7.29.19 na @@ -6789,7 +6789,7 @@ Complete - §7.29.20 + §7.29.20 partial @@ -6813,7 +6813,7 @@ Complete - §7.29.21 + §7.29.21 no @@ -6833,7 +6833,7 @@ Complete - §7.29.22 + §7.29.22 partial @@ -6847,7 +6847,7 @@ [0.20.5] Only works as a shorthand for baseline-shift property.
  • - [0.92 beta] Percentages are not supported, yet. + [0.93] Percentages are not supported, yet.
  • @@ -6860,7 +6860,7 @@ Complete - §7.29.23 + §7.29.23 no @@ -6880,7 +6880,7 @@ Complete - §7.29.24 + §7.29.24 no @@ -6893,7 +6893,7 @@ -

    XSL-FO Core Function Library Support Table (§5.10)

    +

    XSL-FO Core Function Library Support Table (§5.10)

    The following is a summary of FOP's current support for the XSL-FO Core Function Library.

    @@ -6917,15 +6917,15 @@ - 0.20.5 (current stable) + 0.20.5 (previous) - 0.92 beta (unstable) + 0.93 (stable) - Number Functions (§5.10.1) + Number Functions (§5.10.1) @@ -6936,7 +6936,7 @@ Basic - §5.10.1 + §5.10.1 yes @@ -6956,7 +6956,7 @@ Basic - §5.10.1 + §5.10.1 yes @@ -6976,7 +6976,7 @@ Basic - §5.10.1 + §5.10.1 yes @@ -6996,7 +6996,7 @@ Basic - §5.10.1 + §5.10.1 yes @@ -7016,7 +7016,7 @@ Basic - §5.10.1 + §5.10.1 yes @@ -7036,7 +7036,7 @@ Basic - §5.10.1 + §5.10.1 yes @@ -7050,7 +7050,7 @@ - Color Functions (§5.10.2) + Color Functions (§5.10.2) @@ -7061,7 +7061,7 @@ Basic - §5.10.2 + §5.10.2 yes @@ -7081,7 +7081,7 @@ Basic - §5.10.2 + §5.10.2 no @@ -7101,7 +7101,7 @@ Basic - §5.10.2 + §5.10.2 no @@ -7115,7 +7115,7 @@ - Font Functions (§5.10.3) + Font Functions (§5.10.3) @@ -7126,7 +7126,7 @@ Basic - §5.10.3 + §5.10.3 no @@ -7140,7 +7140,7 @@ - Property Value Functions (§5.10.4) + Property Value Functions (§5.10.4) @@ -7151,7 +7151,7 @@ Basic - §5.10.4 + §5.10.4 yes @@ -7171,7 +7171,7 @@ Basic - §5.10.4 + §5.10.4 yes @@ -7191,7 +7191,7 @@ Basic - §5.10.4 + §5.10.4 yes @@ -7211,7 +7211,7 @@ Basic - §5.10.4 + §5.10.4 yes @@ -7231,7 +7231,7 @@ Basic - §5.10.4 + §5.10.4 yes @@ -7251,7 +7251,7 @@ Basic - §5.10.4 + §5.10.4 no @@ -7271,7 +7271,7 @@ Basic - §5.10.4 + §5.10.4 yes @@ -7291,7 +7291,7 @@ Basic - §5.10.4 + §5.10.4 no diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml index 6c9647a69..199587417 100644 --- a/src/documentation/content/xdocs/download.xml +++ b/src/documentation/content/xdocs/download.xml @@ -116,16 +116,16 @@ Repository URL - - http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_92/ + + http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_93/ Web view - - http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_92/ + + http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_93/ diff --git a/src/documentation/content/xdocs/examples.xml b/src/documentation/content/xdocs/examples.xml index 8b40246d9..c8d4a5dde 100644 --- a/src/documentation/content/xdocs/examples.xml +++ b/src/documentation/content/xdocs/examples.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
    diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml index b12039061..e2469f7d5 100644 --- a/src/documentation/content/xdocs/faq.xml +++ b/src/documentation/content/xdocs/faq.xml @@ -137,8 +137,9 @@

    When it's ready and the committers have enough time to go through - the time-consuming process of creating a release. We'll try to do - a new release every 3 or 4 months, but that's no promise. If you + the time-consuming process of creating a release. We + released version 0.93 on 9 January 2007, and intend to + release version 1.0 later in 2007. If you want to speed up the process, consider to contribute to FOP.

    @@ -146,7 +147,7 @@ Why did you redesign FOP? -

    The core redesign of FOP was necessary in order to be able to adress following issues:

    +

    The code redesign of FOP was necessary in order to be able to adress following issues:

    • Keeps and Breaks
    • XSL-FO Compliance in general
    • @@ -209,8 +210,8 @@

      If you run FOP embedded in your servlet, web application or other Java application, check the classpath of the - application. Check the also the information pertaining servlet engines + application. Check the also the information pertaining to servlet engines for further hints.

      @@ -240,7 +241,7 @@ I get an OutOfMemoryException.

      - See FOP Memory. + See FOP Memory.

      @@ -301,7 +302,7 @@

      If you use XSLT, problems in your style sheet and in your source XML also can produce a NullPointerException. Run the transformation + href="0.93/running.html#check-input">Run the transformation separately to check for this, usually you'll get a detailed error message from the XSLT processor.

      @@ -314,7 +315,7 @@ FOP returns the message "[ERROR] object|property - 'x' is not implemented yet." When will it be implemented? -

      See the article "Review FOP's Standards Compliance".

      +

      See FOP's Standards Compliance page.

      @@ -379,7 +380,7 @@

      Try also setting the fontBaseDir + href="0.93/configuration.html#general-elements">font-base configuration.

      @@ -388,7 +389,7 @@ Problems with FOP output - Leaders don't work anymore in 0.20.5. Instead of + Leaders don't work anymore in 0.93. Instead of filling the line, only three dots or a short ruler is output. @@ -431,7 +432,7 @@

      The force-page-count + href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#force-page-count">force-page-count property controls how a FO processor pads page sequences in order to get certain page counts or last page numbers. The default is "auto". With this setting, if the next page sequence @@ -469,7 +470,7 @@ Check the following:

      Other possibilities:

      • The image format is not supported or not supported completely. - See FOP Graphics Formats for a + See FOP Graphics Formats for a list of supported formats and related issues.
      • The graphic may be too large to fit into the intended space.
      • There may be something (static content) that is obscuring the @@ -481,14 +482,14 @@ Check the following:

        My graphical images do not work properly. -

        See FOP Graphics Formats for a +

        See FOP Graphics Formats for a list of supported graphics formats and related issues.

        Why is my graphic rendered at a different resolution than it was created? -

        See Graphics Resolution.

        +

        See Graphics Resolution.

        @@ -618,9 +619,9 @@ Check the following:

        Hyphenation does not work. -

        Make sure you have set the language and/or country attributes for an appropriate XSL-FO element (fo:page-sequence, fo:block or fo:character):

        +

        Make sure you have set the language and optionally the country attributes for an appropriate XSL-FO element (fo:page-sequence, fo:block or fo:character):

        ]]> -

        See Hyphenation Support for details and instructions on using hyphenation with FOP.

        +

        See Hyphenation Support for details and instructions on using hyphenation with FOP.

        Explicitly enable hyphenation for an appropriate XSL-FO element (fo:block, fo:character):

        ]]>
        @@ -651,7 +652,7 @@ Check the following:

        How do I use FOP in a servlet?

        - See Using FOP in a Servlet. + See Using FOP in a Servlet.

        @@ -660,7 +661,7 @@ Check the following:

        transformation?

        - See Using FOP in a Servlet with XSLT Transformation. + See Using FOP in a Servlet with XSLT Transformation.

        @@ -668,7 +669,7 @@ Check the following:

        How do I pass parameters to the XSLT transformation?

        - See Using FOP in a Servlet with XSLT Transformation. + See Using FOP in a Servlet with XSLT Transformation.

        @@ -686,7 +687,7 @@ Check the following:

        How do I set the baseDir property in a servlet environment?

        - See Setting the Configuration Programmatically. + See Setting the Configuration Programmatically.

        @@ -694,7 +695,7 @@ Check the following:

        How do I use a user configuration file from a servlet?

        - See Using a Configuration File in an Embedded App. + See Using a Configuration File in an Embedded App.

        @@ -703,7 +704,7 @@ Check the following:

        get FOP working for various servlet engines?

        - See Servlet Engines. + See Servlet Engines.

        @@ -711,7 +712,7 @@ Check the following:

        Can FOP be used in multithreaded environments?

        - See Multithreading FOP. + See Multithreading FOP.

        @@ -722,13 +723,13 @@ Check the following:

        The rendering of SVG text in my PDF is of poor quality. Can I control this? -

        See Placing SVG Text into PDF.

        +

        See Placing SVG Text into PDF.

        How do I use FOP with SVG on headless servers? -

        See FOP: Graphics (Batik).

        +

        See FOP: Graphics (Batik).

        @@ -791,7 +792,7 @@ Can I control this? Why is my SVG rendered at a size different from that specified in my fo:external-graphic element? -

        See SVG Scaling.

        +

        See SVG Scaling.

        @@ -824,7 +825,7 @@ Can I control this? How do I embed fonts in PDF?

        - See the Fonts page for information + See the Fonts page for information about embedding fonts.

        @@ -843,7 +844,7 @@ Can I control this? set. For a variety of reasons, even those are not completely guaranteed to work, for example you can't use the fi ligature from the standard serif font. Check the overview for the default + href="0.93/output.html#pdf-fonts">overview for the default PDF fonts.

        @@ -851,7 +852,7 @@ Can I control this? the desired character. Furthermore the font must be available on the machine where the PDF is viewed or it must have been embedded in the PDF file. See embedding fonts. + href="0.93/fonts.html">embedding fonts.

        For most symbols, it is better to select the symbol font @@ -869,7 +870,7 @@ Can I control this? What tools are available for post-processing my PDF document? -

        See PDF Post-processing.

        +

        See PDF Post-processing.

        @@ -877,8 +878,8 @@ Can I control this? to my PDF document?

        - See PDF Encryption. - See also PDF Post-processing. + See PDF Encryption. + See also PDF Post-processing.

        @@ -886,13 +887,13 @@ Can I control this? How do I add document properties (title, author, etc.) to my PDF document? -

        See PDF Post-processing.

        +

        See PDF Post-processing.

        How do I add watermarks to my PDF document? -

        See PDF Watermarks.

        +

        See PDF Watermarks.

        @@ -925,7 +926,7 @@ Can I control this?

        This is a problem of Internet Explorer requesting the content several - times. Please see the notes on Internet Explorer + times. Please see the notes on Internet Explorer for more information.

        diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml index fa7a16ca2..f61629ec8 100644 --- a/src/documentation/content/xdocs/fo.xml +++ b/src/documentation/content/xdocs/fo.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
        XSL-FO Input @@ -463,7 +463,7 @@ This applies similarly to the extent of the after region and the bottom margin o RenderX has provided an Unofficial DTD for FO Documents, which may be helpful in validating general FO issues.

        - FOP also maintains an Unofficial FOP Schema in the FOP CVS Repository. + FOP also maintains an Unofficial FOP Schema in the FOP CVS Repository. This document can be used either to validate against the FO standard, or against the actual FOP implementation. See the notes near the beginning of the document for instructions on how to use it.

        diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml index 6edc8580e..72ff065f7 100644 --- a/src/documentation/content/xdocs/index.xml +++ b/src/documentation/content/xdocs/index.xml @@ -36,12 +36,12 @@

        - The latest stable version of FOP (0.20.5) is a partial implementation of the + The previous version of FOP (0.20.5) is a partial implementation of the XSL-FO Version 1.0 W3C Recommendation.

        - The latest version of FOP (0.92 beta) is the second preview release + The latest stable version of FOP (0.93) is the first stable release after a large redesign effort and implements a larger subset than 0.20.5 of the XSL-FO Version 1.0 W3C Recommendation as well as some parts of the XSL-FO Version 1.1 Working Draft. diff --git a/src/documentation/content/xdocs/knownissues.xml b/src/documentation/content/xdocs/knownissues.xml index dc04d9262..caf96ceaa 100644 --- a/src/documentation/content/xdocs/knownissues.xml +++ b/src/documentation/content/xdocs/knownissues.xml @@ -35,7 +35,6 @@ For additional information on known issues in Apache FOP, please have a look at the following pages, too:

        @@ -64,6 +63,11 @@

    +
    + Other known issues +

    This section lists other known issues.

    + +
    diff --git a/src/documentation/content/xdocs/license.xml b/src/documentation/content/xdocs/license.xml index e4e8e9471..62f176032 100644 --- a/src/documentation/content/xdocs/license.xml +++ b/src/documentation/content/xdocs/license.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
    diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml index f71eed636..187a91337 100644 --- a/src/documentation/content/xdocs/news.xml +++ b/src/documentation/content/xdocs/news.xml @@ -17,7 +17,7 @@ --> + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
    @@ -25,6 +25,15 @@ $Revision$
    +
    + 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!

    diff --git a/src/documentation/content/xdocs/relnotes.xml b/src/documentation/content/xdocs/relnotes.xml index 161beabca..8499d674b 100644 --- a/src/documentation/content/xdocs/relnotes.xml +++ b/src/documentation/content/xdocs/relnotes.xml @@ -44,11 +44,11 @@
  • The API has changed between 0.91beta this release. - Please consult the "Upgrading" page for details. + Please consult the "Upgrading" page for details.
  • You may experience different behaviour compared to version 0.20.5. - Please consult the "Upgrading" page for details. + Please consult the "Upgrading" page for details.
  • Known Issues:

    @@ -177,7 +177,7 @@
  • You may experience different behaviour compared to version 0.20.5. - Please consult the "Upgrading" page indicated above for details. + Please consult the "Upgrading" page indicated above for details.
  • Known Issues:

    @@ -318,7 +318,7 @@
  • You may experience different behaviour compared to version 0.20.5. - Please consult the "Upgrading" page indicated above for details. + Please consult the "Upgrading" page indicated above for details.
  • Known Issues:

    diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml index a82158024..c33403bcb 100644 --- a/src/documentation/content/xdocs/site.xml +++ b/src/documentation/content/xdocs/site.xml @@ -21,7 +21,6 @@ --> - @@ -58,7 +57,7 @@ - + @@ -86,10 +85,12 @@ --> - + + + @@ -106,6 +107,7 @@ + @@ -114,7 +116,7 @@ + "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/tab-cocoon-v10.dtd?view=co"> - + + + + + + +
    + Known Issues +
    + + + +
      + +
    +
    + +

    Currently, there are no known issues to list here!

    +
    +
    + +
    +
    + + +
  • + +
  • +
    + +
    diff --git a/src/documentation/resources/stylesheets/releaseNotes2document.xsl b/src/documentation/resources/stylesheets/releaseNotes2document.xsl index 700f5e317..e87ec4f3a 100644 --- a/src/documentation/resources/stylesheets/releaseNotes2document.xsl +++ b/src/documentation/resources/stylesheets/releaseNotes2document.xsl @@ -75,11 +75,11 @@ This is not a complete list of changes, a full list of changes in this release is available. - +
    Important Changes Code Base
      - +
    diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap index c9eed11a7..b7af0b9f0 100644 --- a/src/documentation/sitemap.xmap +++ b/src/documentation/sitemap.xmap @@ -45,6 +45,7 @@ + @@ -69,6 +70,12 @@ + + + + + + diff --git a/status.xml b/status.xml index 17c5e5df3..d2dc37c51 100644 --- a/status.xml +++ b/status.xml @@ -34,6 +34,43 @@ Added support for UAX#14 type line breaking. Support does not extend across nested fo:inline elements. + + + +

    This is the first production grade release of the new FOP + codebase.

    +
      +
    • It contains the new API first introduced in release 0.92 + beta. The preceding API has been removed. +
    • +
    • + See the compliance page for an + overview of the compliance of this release with the XSL 1.0 and + 1.1 recommendations. +
    • +
    • + This release again contains many bug fixes and new features. See + below for details. +
    • +
    • + See the known issues page + for an overview of the known issues with this release. +
    • +
    +

    Caveats:

    +
      +
    • + You may experience different behaviour compared to version 0.20.5. + Please consult the "Upgrading" page for details. +
    • +
    +
    + + Added support for the use of Open Type fonts + + + 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. @@ -44,7 +81,7 @@ Added initial support for loading fonts without a pre-created XML font metric file. - + Support for the rgb-icc() function and for a proprietary cmyk() function (for device CMYK colors only through the PDF renderer so far). @@ -151,7 +188,7 @@ Bugfix: FOUserAgent specific configuration parameters specified in config file were not set when FOP was invoked from command line. - + Added support for PDF/A-1b and PDF/X-3:2003. (Note: this may still be a bit incomplete. Feedback is welcome!) @@ -159,7 +196,7 @@ The CIDSet object is now generated for CID fonts which are embedded in PDFs. (Required by PDF/A). - + The Java2DRenderer (and therefore the print and bitmap renderers) is now offering the same quality as the PDF and PS renderers. Note: There can still be little differences between PDF and Print/PNG/TIFF because the latter uses @@ -200,7 +237,7 @@ Bugfix: NullPointerException in RTF library when there are no borders on the parent table. - + Automatic support for all fonts available to the Java2D subsystem for all Java2D-descendant renderers (TIFF, PNG, print, AWT). -- 2.39.5