You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/08/12 14:36:35 UTC
svn commit: r685132 [1/3] - in
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ lib/
src/documentation/ src/documentation/content/
src/documentation/content/xdocs/ src/documentation/content/xdocs/0.95/
src/documentation/content/xdocs/dev/ src/docum...
Author: jeremias
Date: Tue Aug 12 05:36:18 2008
New Revision: 685132
URL: http://svn.apache.org/viewvc?rev=685132&view=rev
Log:
Merge from Trunk revisions 680381-685126.
Added:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news-data.xml
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/resources/images/feed-icon-14x14.png
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/documentation/resources/images/feed-icon-14x14.png
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/resources/stylesheets/news2document.xsl
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/documentation/resources/stylesheets/news2document.xsl
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/resources/stylesheets/news2rss.xsl
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/documentation/resources/stylesheets/news2rss.xsl
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/properties/BreakPropertySet.java
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BreakPropertySet.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java
- copied unchanged from r685126, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_break-before_bug44412_2.xml
- copied unchanged from r685126, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug44412_2.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/resources/images/circles.svg
- copied unchanged from r685126, xmlgraphics/fop/trunk/test/resources/images/circles.svg
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/ (props changed)
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/README
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/build.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/forrest.properties
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/known-issues.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/lib/avalon-framework-4.2.0.jar
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/doap.rdf
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/compiling.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/output.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/compliance.ihtml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/dev/release.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/download.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/knownissues.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/site.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/tabs.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/team.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/compiling.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/sitemap.xmap
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/FOURIResolver.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/BookmarkData.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/Block.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/BlockContainer.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListBlock.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListItem.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/FontInfo.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/MultiByteFont.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFContentHandler.java (props changed)
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFPainter.java (props changed)
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFRenderer.java (props changed)
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/BreakUtil.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_2.xml
Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 12 05:36:18 2008
@@ -1 +1,2 @@
-/xmlgraphics/fop/trunk:603620-680380
+/xmlgraphics/fop/branches/fop-0_95:684572
+/xmlgraphics/fop/trunk:603620-685126
Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/
('svnmerge-blocked' removed)
Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 12 05:36:18 2008
@@ -1 +1 @@
-/xmlgraphics/fop/branches/fop-0_95:1-636405,636407-664698 /xmlgraphics/fop/trunk:1-611115
+/xmlgraphics/fop/trunk:1-611115
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/README
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/README?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/README (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/README Tue Aug 12 05:36:18 2008
@@ -90,11 +90,11 @@
RELEASE NOTES
==============================================================================
-Version 0.95beta
-================
+Version 0.95
+============
-This is a pre-version of the third production grade release of the new FOP
-codebase. It contains many bug fixes and new features. See below for details.
+This is a production grade release of Apache FOP.
+It contains many bug fixes and new features. See below for details.
Compliance
----------
@@ -128,6 +128,10 @@
The long list of changes in this and earlier releases is available at
http://xmlgraphics.apache.org/fop/changes.html.
+Changes since Version 0.95beta
+------------------------------
+Please refer to the list of changes on the web:
+http://xmlgraphics.apache.org/fop/changes.html
Version 0.94
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/build.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/build.xml Tue Aug 12 05:36:18 2008
@@ -67,6 +67,8 @@
<include name="KEYS"/>
<include name="status.xml"/>
<include name="fop.bat"/>
+ <include name="fop.cmd"/>
+ <include name="fop.js"/>
<include name="fop"/>
</fileset>
<fileset dir="${basedir}" id="dist.bin.lib">
@@ -401,6 +403,7 @@
<include name="**/*.icm"/>
<include name="**/*.xml"/>
<include name="**/*.LICENSE.txt"/>
+ <include name="**/*.xsl"/>
</fileset>
<fileset dir="${build.gensrc.dir}">
<include name="**/*.xml"/>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/forrest.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/forrest.properties?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/forrest.properties (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/forrest.properties Tue Aug 12 05:36:18 2008
@@ -66,7 +66,7 @@
# validation properties
#forrest.validate=true
-forrest.validate=false
+#forrest.validate=false
forrest.validate.xdocs=${forrest.validate}
forrest.validate.skinconf=${forrest.validate}
forrest.validate.sitemap=${forrest.validate}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/known-issues.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/known-issues.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/known-issues.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/known-issues.xml Tue Aug 12 05:36:18 2008
@@ -21,8 +21,9 @@
MIF and SVG output support have not been restored, yet.
</known-issue>
<known-issue>
- Java2D/AWT support has been improved, but some problems remain,
- for example with block-containers.
+ RTF output is inferior to other output formats supported by FOP.
+ For details, please see the "Output Targets" page of the release
+ you're using.
</known-issue>
<known-issue>
Auto table layout is not implemented, yet.
@@ -81,10 +82,6 @@
table-body, table-header, table-footer and table-row.
</known-issue>
<known-issue>
- The backgrounds of table-body, table-header, table-footer and
- table-column are not painted, yet.
- </known-issue>
- <known-issue>
Border and padding conditionality are not supported on table-cells, yet.
</known-issue>
<known-issue>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/lib/avalon-framework-4.2.0.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/lib/avalon-framework-4.2.0.jar?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/doap.rdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/doap.rdf?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/doap.rdf (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/doap.rdf Tue Aug 12 05:36:18 2008
@@ -77,22 +77,22 @@
<release>
<Version>
<name>Previous stable release</name>
- <created>2007-01-02</created>
- <revision>0.93</revision>
+ <created>2007-08-23</created>
+ <revision>0.94</revision>
</Version>
</release>
<release>
<Version>
<name>Previous development release</name>
- <created>2008-25-08</created>
+ <created>2008-03-26</created>
<revision>0.95beta</revision>
</Version>
</release>
<release>
<Version>
<name>Latest stable release</name>
- <created>2007-08-23</created>
- <revision>0.94</revision>
+ <created>2008-08-05</created>
+ <revision>0.95</revision>
</Version>
</release>
<repository>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/compiling.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/compiling.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/compiling.xml Tue Aug 12 05:36:18 2008
@@ -66,7 +66,7 @@
<section id="env-ant">
<title>Apache Ant</title>
<p>
- <a href="ext:ant">Apache Ant</a> must be installed in order to
+ <a href="ext:ant">Apache Ant</a> (Version 1.7 or later) must be installed in order to
build FOP. Following best practices we don't include Ant with FOP anymore. You can find the
<a href="ext:ant/manual/">instructions to install Ant in the Ant manual</a> on the web.
</p>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/output.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/0.95/output.xml Tue Aug 12 05:36:18 2008
@@ -703,6 +703,24 @@
<note>RTF output is currently unmaintained and lacks many features compared to other output
formats. Using other editable formats like Open Document Format, instead of producing XSL-FO
then RTF through FOP, might give better results.</note>
+ <p>
+ These are some known restrictions compared to other supported output formats (not a complete list):
+ </p>
+ <ul>
+ <li>
+ Not supported/implemented:
+ <ul>
+ <li>break-before/after (supported by the RTF library but not tied into the RTFHandler)</li>
+ <li>fo:page-number-citation-last</li>
+ <li>keeps (supported by the RTF library but not tied into the RTFHandler)</li>
+ <li>region-start/end (RTF limitation)</li>
+ <li>multiple columns</li>
+ </ul>
+ </li>
+ <li>Only a single page-master is supported</li>
+ <li>Not all variations of fo:leader are supported (RTF limitation)</li>
+ <li>percentages are not supported everywhere</li>
+ </ul>
</section>
<section id="xml">
<title>XML (Area Tree XML)</title>
@@ -735,6 +753,16 @@
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.
</p>
+ <section id="print-issues">
+ <title>Known issues</title>
+ <p>
+ If you run into the problem that the printed output is incomplete on Windows:
+ this often happens to users printing to a PCL printer.
+ There seems to be an incompatibility between Java and certain PCL printer drivers
+ on Windows. Since most network-enabled laser printers support PostScript, try
+ switching to the PostScript printer driver for that printer model.
+ </p>
+ </section>
</section>
<section id="bitmap">
<title>Bitmap (TIFF/PNG)</title>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/compliance.ihtml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/compliance.ihtml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/compliance.ihtml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/compliance.ihtml Tue Aug 12 05:36:18 2008
@@ -492,7 +492,7 @@
<th align="center">0.94 (stable)</th>
- <th align="center">0.95 (beta)</th>
+ <th align="center">0.95 (stable)</th>
<th align="center">develop- ment</th>
</tr>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/dev/release.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/dev/release.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/dev/release.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/dev/release.xml Tue Aug 12 05:36:18 2008
@@ -39,7 +39,7 @@
<li>Commit any outstanding changes</li>
<li>Create a branch called <code>branches/fop-v_vv</code></li>
<li>Edit release notes (<code>README</code> and <code>status.xml</code> in the root).</li>
- <li>Update the <code>index.xml</code> and <code>site.xml</code> for the new version.</li>
+ <li>Update the <code>index.xml</code>, <code>site.xml</code> and <code>download.xml</code> for the new version.</li>
<li>Update the version numbers in the release column on the
compliance page (<code>compliance.xml</code>); update the compliance in the release column
to the current state (development column).</li>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/download.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/download.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/download.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/download.xml Tue Aug 12 05:36:18 2008
@@ -89,35 +89,35 @@
<tr>
<td>Repository URL</td>
<td>
- <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
- <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
+ <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/">
+ <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/</code>
</link>
</td>
</tr>
<tr>
<td>Web view</td>
<td>
- <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
- <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</code>
+ <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/">
+ <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/</code>
</link>
</td>
</tr>
<tr>
- <th colspan="2">Latest Release</th>
+ <th colspan="2">Previous Stable Release</th>
</tr>
<tr>
<td>Repository URL</td>
<td>
- <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/">
- <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/</code>
+ <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
+ <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
</link>
</td>
</tr>
<tr>
<td>Web view</td>
<td>
- <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/">
- <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/</code>
+ <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
+ <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</code>
</link>
</td>
</tr>
@@ -127,17 +127,30 @@
<tr>
<td>Repository URL</td>
<td>
+ Main Repository:
<link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/">
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
</link>
+ <br/>
+ European Mirror:
+ <link href="http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/">
+ <code>http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
+ </link>
+
</td>
</tr>
<tr>
<td>Web view</td>
<td>
+ Main Repository:
<link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/">
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/</code>
</link>
+ <br/>
+ European Mirror:
+ <link href="http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/">
+ <code>http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/</code>
+ </link>
</td>
</tr>
</table>
@@ -146,7 +159,9 @@
build FOP from the source files. For details please see the "Build" page on the documentation tab
for the version you've downloaded.
</p>
+ <!-- No hopes to reenable them because of problems with long path names on Solaris
<fixme author="jeremias">Reenable the link to the SVN snapshots once they are available.</fixme>
+ -->
</section>
<section id="archives">
<title>Archive Download</title>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/knownissues.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/knownissues.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/knownissues.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/knownissues.xml Tue Aug 12 05:36:18 2008
@@ -66,6 +66,7 @@
<section>
<title>Other known issues</title>
<p>This section lists other known issues.</p>
+ <!-- See <root>/known-issues.xml for the source document of this section! -->
<xi:include href="cocoon://knownissues-raw-static.xml#xpointer(/document/body/*)"/>
</section>
</section>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml Tue Aug 12 05:36:18 2008
@@ -23,207 +23,10 @@
<version>$Revision$</version>
</header>
<body>
- <section>
- <title>26th March 2007 - Apache FOP 0.95beta Released</title>
- <p>The Apache FOP team is delighted to present you a beta version of the
- next production grade release of the new FOP codebase. This release
- contains many bug fixes and new features. See the <a
- href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of
- the most important changes.</p>
- </section>
- <section>
- <title>30 October 2007 - New Committer</title>
- <p>Welcome Max Berger!</p>
- </section>
- <section>
- <title>15 October 2007 - New Committer</title>
- <p>Welcome Adrian Cumiskey!</p>
- </section>
- <section>
- <title>24th August 2007 - Apache FOP 0.94 Released</title>
- <p>The Apache FOP team is pleased to present you the second production
- grade release of the new FOP codebase. This release contains many bug
- fixes and new features. See the <a
- href="0.94/releaseNotes_0.94.html">Release Notes</a> for a list of
- the most important changes.</p>
- </section>
- <section>
- <title>26 January 2007 - New Committer</title>
- <p>Welcome Jay Bryant!</p>
- </section>
- <section>
- <title>9 January 2007 - Apache FOP 0.93 released</title>
- <p>
- The Apache FOP team is proud to present to you the first
- production grade release of the new FOP codebase. This release
- has the new API first introduced in release 0.92 beta. It
- contains again many bug fixes and new features.
- </p>
- </section>
- <section>
- <title>16 October 2006 - New Committer</title>
- <p>Welcome Vincent Hennebert!</p>
- </section>
- <section>
- <title>18 April 2006 - Apache FOP 0.92 beta released</title>
- <p>
- A second "beta" grade release of the new FOP codebase with a modified and
- now considered stable API. The release contains many bug fixes as well as
- new features mainly related to even more extensive support of the XSL-FO
- specification. This is expected to be the last "beta" release before we
- go to a 1.0 release!
- </p>
- </section>
- <section>
- <title>23 December 2005 - Apache FOP 0.91 beta released</title>
- <p>
- One month after the initial release we're happy present a "beta" grade
- release of the new FOP codebase. It's mostly a bug fix release but also
- contains a few new features. Thanks to all those who sent us feedback
- on the initial release!
- </p>
- </section>
- <section>
- <title>22 November 2005 - Apache FOP 0.90 alpha 1 released</title>
- <p>
- The Apache FOP team is proud to present to you the largely rewritten
- codebase which is finally in a state where you can start to use it.
- It has taken over three years to get this far and over two years
- without a new release from the FOP project.
- </p>
- <p>
- Please see also the
- <a href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</a>.
- <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
- </p>
- </section>
- <section>
- <title>8 September 2005 - New Committer</title>
- <p>Welcome Manuel Mall!</p>
- </section>
- <section>
- <title>20 October 2004 - Creation of the Apache XML Graphics project</title>
- <p>
- The Apache Board of Directors agreed to the creation of the
- <a href="http://xmlgraphics.apache.org">Apache XML Graphics</a>
- project which will be comprised of Batik and FOP. Both former
- Apache XML subprojects are in this way complying with the Board's desire
- to improve project oversight. Both project teams also see additional
- benefits of working more closely together.
- </p>
- </section>
- <section>
- <title>8 October 2004 - New Committer</title>
- <p>Welcome Luca Furini!</p>
- </section>
- <section>
- <title>24 April 2004 - New Committer</title>
- <p>Welcome Simon Pepping!</p>
- </section>
- <section>
- <title>7 March 2004 - New Committer</title>
- <p>Welcome Web Maestro Clay Leeds!</p>
- </section>
- <section>
- <title>10 January 2004 - New Committers</title>
- <p>Welcome Chris Bowditch and Andreas Delmelle!</p>
- </section>
- <section>
- <title>4 January 2004 - New Committer</title>
- <p>Welcome Finn Bock!</p>
- </section>
- <section>
- <title>29 November 2003 - New Committer</title>
- <p>Welcome Peter Herweg!</p>
- </section>
- <section>
- <title>18 July 2003 FOP 0.20.5 released</title>
- <p>Changes since 0.20.4 include:</p>
- <ul>
- <li>Added support for PDF encryption</li>
- <li>Perfomance tuning</li>
- <li>Fixed link hotspot positioning</li>
- <li>Fixed multi-threading issues</li>
- <li>Added support for CCITT Group 4 encoded TIFF files</li>
- <li>Dynamic JAI support</li>
- <li>Added autoselecting portrait/landscape for PCL and PS Renderer</li>
- <li>Added continued-label extension for tables</li>
- <li>Improved AWT Font-measuring/rendering</li>
- <li>Improved marker handling</li>
- <li>Fixed problem with jpegs with icc profile and acrobat reader 5</li>
- <li>Added a fontBaseDir property</li>
- <li>TXTRenderer output encoding</li>
- <li>border-spacing support</li>
- <li>and a lot more bugfixes</li>
- </ul>
- <p>
- See also the full text of the
- <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&msgNo=6067">
- announcement</a>.
- <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.-->
- </p>
- </section>
- <section>
- <title>29 June 2003 - New Committer</title>
- <p>Welcome Glen Mazza!</p>
- </section>
- <section>
- <title>23 May 2003 - FOP 0.20.5 Release Candidate 3 available</title>
- <p>
- See the full text of the <a
- href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&msgNo=5429">announcement</a>.
- </p>
- </section>
- <section>
- <title>18 February 2003 - FOP 0.20.5 Release Candidate 2 available</title>
- <p>
- See the full text of the <a
- href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&msgNo=4509">announcement</a>.
- </p>
- </section>
- <section>
- <title>2 February 2003 - New XML PMC</title>
- <p>
- Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC.
- </p>
- </section>
- <section>
- <title>28 January 2003 - FOP logo contest</title>
- <p>We are looking for a new logo. FOP logo
- contest is started!</p>
- </section>
- <section>
- <title>23 December 2002 - Official FOP Wiki</title>
- <p>
- See <a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages"
- >FOP project pages</a> at the ApacheWiki.
- </p>
- </section>
- <section>
- <title>10 December 2002 - FOP 0.20.5 Release Candidate available</title>
- <p>
- See the full text of the <a
- href="http://marc.theaimsgroup.com/?l=fop-user&m=103954279712704&w=2"
- >announcement</a>.
- </p>
- </section>
- <section>
- <title>23 November 2002 - EXLSFO project has been created</title>
- <p>
- The EXSLFO project is a community effort to define functional extensions
- to thet XSL Formatting Objects specification. See the
- <a href="http://exslfo.sourceforge.net">EXSLFO website</a> for details.
- </p>
- </section>
- <section>
- <title>22 November 2002 - New Committer</title>
- <p>Welcome Victor Mote!</p>
- </section>
- <section>
- <title>9 November 2002 - New Committer</title>
- <p>Welcome Oleg Tkachenko!</p>
- </section>
-
+ <p>
+ RSS Feed: <a href="subproject-news-feed.rss"><img src="feed-icon-14x14.png" alt="Subproject News Feed"/></a>
+ </p>
+ <xi:include href="cocoon://subproject-news-document.xml#xpointer(/document/body/*)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</body>
</document>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/site.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/site.xml Tue Aug 12 05:36:18 2008
@@ -96,10 +96,11 @@
<!--
BEGIN Version 0.95 documentation tab
-->
- <trunk label="FOP 0.95beta" href="0.95/" tab="stableversion">
+ <trunk label="FOP 0.95" href="0.95/" tab="stableversion">
<about label="About" href="index.html"/>
- <release label="Release Notes" href="releaseNotes_0.95beta.html"/>
- <changes label="Changes" href="changes_0.95beta.html"/>
+ <release label="Release Notes" href="releaseNotes_0.95.html"/>
+ <changes label="Changes (0.95)" href="changes_0.95.html"/>
+ <changes-beta label="Changes (0.95beta)" href="changes_0.95beta.html"/>
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/tabs.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/tabs.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/tabs.xml Tue Aug 12 05:36:18 2008
@@ -22,7 +22,7 @@
<tabs software="FOP" title="FOP" copyright="@year@ The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink">
<tab label="Home" dir=""/>
<tab label="Version 0.94" dir="0.94/"/>
- <tab label="Version 0.95beta" dir="0.95/"/>
+ <tab label="Version 0.95" dir="0.95/"/>
<tab label="FOP Trunk" dir="trunk/"/>
<tab label="Development" dir="dev/"/>
</tabs>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/team.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/team.xml Tue Aug 12 05:36:18 2008
@@ -31,6 +31,11 @@
<title>Active Committers</title>
<note label="Important">Please don't write to any developer directly if you need help on using FOP. Only if you submit questions to the <link href="maillist.html#fop-user">FOP User Mailing List</link> will other FOP users be able to profit from answers given to your question. Another point is that a developer may have gone inactive or is on holidays in which case you may not get an answer in time.</note>
<ul>
+ <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
+ PostDoc pursuing an academic career in computer science. His main interest in FOP is to
+ improve the DocBook to PDF tool-chain to produce high quality output, while still
+ conforming to given style-guides. See his <link href="http://max.berger.name">home
+ page</link> for more information.</li>
<li id="cb"><link href="mailto:bowditch_chris@hotmail.com">Chris Bowditch</link> (CB)
is a Java/VB Programmer from England.</li>
<li id="jb"><link href="mailto:jay@bryantcs.com">Jay Bryant</link> (JB) is a
@@ -73,11 +78,6 @@
from the TeX/LaTeX world. See his <fork href="http://www.leverkruid.eu">home
page</fork> for some of his private projects.</li>
<li id="jp"><link href="mailto:pietsch@apache.org">Jörg Pietschmann</link> (JP)</li>
- <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
- PostDoc pursuing an academic career in computer science. His main interest in FOP is to
- improve the DocBook to PDF tool-chain to produce high quality output, while still
- conforming to given style-guides. See his <link href="http://max.berger.name">home
- page</link> for more information.</li>
</ul>
</section>
<section id="contribute-active">
@@ -126,206 +126,6 @@
<li id="pbw"><link href="mailto:pbwest@apache.org">Peter B. West</link></li>
</ul>
</section>
- <section id="expertise">
- <title>Areas of Expertise</title>
- <table>
- <tr>
- <th/>
- <th>CG</th>
- <th>FB</th>
- <th>CL</th>
- <th>JM</th>
- <th>VH</th>
- <th>PH</th>
- <th>JP</th>
- <th>SP</th>
- <th>LF</th>
- <th>JB</th>
- </tr>
- <tr>
- <td>Release manager</td>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>XSL-FO tree</td>
- <td/>
- <td>X</td>
- <td/>
- <td>X</td>
- <td></td>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>Properties</td>
- <td/>
- <td>X</td>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>Layout</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td>X</td>
- <td/>
- <td>X</td>
- <td>X</td>
- <td>X</td>
- <td/>
- </tr>
- <tr>
- <td>Fonts</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>SVG</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>Java2D (AWT)</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>PDF</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- </tr>
- <tr>
- <td>PostScript</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>PCL</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>RTF</td>
- <td/>
- <td/>
- <td/>
- <td>X</td>
- <td/>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>MIF</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>AFP</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- <tr>
- <td>Forrest</td>
- <td/>
- <td/>
- <td>X</td>
- <td>X</td>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- <td/>
- </tr>
- </table>
- </section>
</body>
</document>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/compiling.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/compiling.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/compiling.xml Tue Aug 12 05:36:18 2008
@@ -66,7 +66,7 @@
<section id="env-ant">
<title>Apache Ant</title>
<p>
- <a href="ext:ant">Apache Ant</a> must be installed in order to
+ <a href="ext:ant">Apache Ant</a> (Version 1.7 or later) must be installed in order to
build FOP. Following best practices we don't include Ant with FOP anymore. You can find the
<a href="ext:ant/manual/">instructions to install Ant in the Ant manual</a> on the web.
</p>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml Tue Aug 12 05:36:18 2008
@@ -728,6 +728,24 @@
<note>RTF output is currently unmaintained and lacks many features compared to other output
formats. Using other editable formats like Open Document Format, instead of producing XSL-FO
then RTF through FOP, might give better results.</note>
+ <p>
+ These are some known restrictions compared to other supported output formats (not a complete list):
+ </p>
+ <ul>
+ <li>
+ Not supported/implemented:
+ <ul>
+ <li>break-before/after (supported by the RTF library but not tied into the RTFHandler)</li>
+ <li>fo:page-number-citation-last</li>
+ <li>keeps (supported by the RTF library but not tied into the RTFHandler)</li>
+ <li>region-start/end (RTF limitation)</li>
+ <li>multiple columns</li>
+ </ul>
+ </li>
+ <li>Only a single page-master is supported</li>
+ <li>Not all variations of fo:leader are supported (RTF limitation)</li>
+ <li>percentages are not supported everywhere</li>
+ </ul>
</section>
<section id="xml">
<title>XML (Area Tree XML)</title>
@@ -760,6 +778,16 @@
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.
</p>
+ <section id="print-issues">
+ <title>Known issues</title>
+ <p>
+ If you run into the problem that the printed output is incomplete on Windows:
+ this often happens to users printing to a PCL printer.
+ There seems to be an incompatibility between Java and certain PCL printer drivers
+ on Windows. Since most network-enabled laser printers support PostScript, try
+ switching to the PostScript printer driver for that printer model.
+ </p>
+ </section>
</section>
<section id="bitmap">
<title>Bitmap (TIFF/PNG)</title>
@@ -911,3 +939,4 @@
</document>
+
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/sitemap.xmap?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/sitemap.xmap (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/sitemap.xmap Tue Aug 12 05:36:18 2008
@@ -17,6 +17,9 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:components>
+ <map:serializers default="html">
+ <map:serializer name="rss" mime-type="application/rss+xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
+ </map:serializers>
</map:components>
<map:pipelines>
@@ -69,6 +72,26 @@
<map:serialize type="xml-document"/>
</map:match>
</map:pipeline>
-
+
+ <!-- This is used by xinclude statements for News-->
+ <map:pipeline>
+ <map:match type="regexp" pattern="^(.*?)([^/]*)subproject-news-document.xml">
+ <map:generate src="{properties:content.xdocs}{1}news-data.xml"/>
+ <map:transform src="resources/stylesheets/news2document.xsl" >
+ <map:parameter name="path" value="{1}{2}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
+ <map:match type="regexp" pattern="^(.*?)([^/]*)subproject-news-feed.rss">
+ <map:generate src="{properties:content.xdocs}{1}news-data.xml"/>
+ <map:transform src="resources/stylesheets/news2rss.xsl" >
+ <map:parameter name="path" value="{1}{2}"/>
+ <map:parameter name="project-name" value="{properties:projectInfo.project.fullname}"/>
+ <map:parameter name="project-url" value="{properties:projectInfo.project.url}"/>
+ </map:transform>
+ <map:serialize type="rss"/>
+ </map:match>
+ </map:pipeline>
+
</map:pipelines>
</map:sitemap>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/FOURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/FOURIResolver.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/FOURIResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/FOURIResolver.java Tue Aug 12 05:36:18 2008
@@ -108,6 +108,8 @@
/**
* Handles resolve exceptions appropriately.
*
+ * @param e
+ * the exception
* @param errorStr
* error string
* @param strict
@@ -232,17 +234,16 @@
* The URL class does not implement this work around, so we
* do.
*/
+ assert (baseURL != null);
String scheme = baseURL.getProtocol() + ":";
- if (href.startsWith(scheme)) {
+ if (href.startsWith(scheme) && "file:".equals(scheme)) {
href = href.substring(scheme.length());
- if ("file:".equals(scheme)) {
- int colonPos = href.indexOf(':');
- int slashPos = href.indexOf('/');
- if (slashPos >= 0 && colonPos >= 0
- && colonPos < slashPos) {
- href = "/" + href; // Absolute file URL doesn't
- // have a leading slash
- }
+ int colonPos = href.indexOf(':');
+ int slashPos = href.indexOf('/');
+ if (slashPos >= 0 && colonPos >= 0
+ && colonPos < slashPos) {
+ href = "/" + href; // Absolute file URL doesn't
+ // have a leading slash
}
}
try {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/BookmarkData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/BookmarkData.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/BookmarkData.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/BookmarkData.java Tue Aug 12 05:36:18 2008
@@ -218,25 +218,24 @@
* id reference.
*
* {@inheritDoc} List)
- * @todo check to make sure it works if multiple bookmark-items
- * have the same idref
*/
public void resolveIDRef(String id, List pages) {
- if (!id.equals(idRef)) {
- Collection refs = (Collection)unresolvedIDRefs.get(id);
- if (refs != null) {
- Iterator iter = refs.iterator();
- while (iter.hasNext()) {
- BookmarkData bd = (BookmarkData)iter.next();
- bd.resolveIDRef(id, pages);
- }
- unresolvedIDRefs.remove(id);
- }
- } else {
+ if (id.equals(idRef)) {
+ //Own ID has been resolved, so note the page
pageRef = (PageViewport) pages.get(0);
- // TODO get rect area of id on page
- unresolvedIDRefs.remove(idRef);
+ //Note: Determining the placement inside the page is the renderer's job.
+ }
+
+ //Notify all child bookmarks
+ Collection refs = (Collection)unresolvedIDRefs.get(id);
+ if (refs != null) {
+ Iterator iter = refs.iterator();
+ while (iter.hasNext()) {
+ BookmarkData bd = (BookmarkData)iter.next();
+ bd.resolveIDRef(id, pages);
+ }
}
+ unresolvedIDRefs.remove(id);
}
/**
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/Block.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/Block.java Tue Aug 12 05:36:18 2008
@@ -32,6 +32,7 @@
import org.apache.fop.fo.NullCharIterator;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
import org.apache.fop.fo.properties.CommonHyphenation;
@@ -44,7 +45,7 @@
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_block">
* <code>fo:block object</code></a>.
*/
-public class Block extends FObjMixed {
+public class Block extends FObjMixed implements BreakPropertySet {
// used for FO validation
private boolean blockOrInlineItemFound = false;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/BlockContainer.java Tue Aug 12 05:36:18 2008
@@ -28,6 +28,7 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonAbsolutePosition;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
@@ -38,7 +39,7 @@
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_block-container">
* <code>fo:block-container</code></a> object.
*/
-public class BlockContainer extends FObj {
+public class BlockContainer extends FObj implements BreakPropertySet {
// The value of properties relevant for fo:block-container.
private CommonAbsolutePosition commonAbsolutePosition;
private CommonBorderPaddingBackground commonBorderPaddingBackground;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListBlock.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListBlock.java Tue Aug 12 05:36:18 2008
@@ -27,6 +27,7 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.KeepProperty;
@@ -35,7 +36,7 @@
* Class modelling the <a href=http://www.w3.org/TR/xsl/#fo_list-block">
* <code>fo:list-block</code></a> object.
*/
-public class ListBlock extends FObj {
+public class ListBlock extends FObj implements BreakPropertySet {
// The value of properties relevant for fo:list-block.
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginBlock commonMarginBlock;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListItem.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/ListItem.java Tue Aug 12 05:36:18 2008
@@ -26,6 +26,7 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.KeepProperty;
@@ -34,7 +35,7 @@
* Class modelling the <a href=http://www.w3.org/TR/xsl/#fo_list-item">
* <code>fo:list-item</code></a> object.
*/
-public class ListItem extends FObj {
+public class ListItem extends FObj implements BreakPropertySet {
// The value of properties relevant for fo:list-item.
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginBlock commonMarginBlock;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java Tue Aug 12 05:36:18 2008
@@ -31,6 +31,7 @@
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.StaticPropertyList;
import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.KeepProperty;
@@ -42,7 +43,7 @@
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_table">
* <code>fo:table</code></a> object.
*/
-public class Table extends TableFObj implements ColumnNumberManagerHolder {
+public class Table extends TableFObj implements ColumnNumberManagerHolder, BreakPropertySet {
/** properties */
private CommonBorderPaddingBackground commonBorderPaddingBackground;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Tue Aug 12 05:36:18 2008
@@ -32,7 +32,7 @@
* <code>fo:table-and-caption</code></a> property.
* @todo needs implementation
*/
-public class TableAndCaption extends FObj {
+public class TableAndCaption extends FObj /*implements BreakPropertySet*/ {
// The value of properties relevant for fo:table-and-caption.
// Unused but valid items, commented out for performance:
// private CommonAccessibility commonAccessibility;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java Tue Aug 12 05:36:18 2008
@@ -27,6 +27,7 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
@@ -35,7 +36,7 @@
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_table-row">
* <code>fo:table-row</code></a> object.
*/
-public class TableRow extends TableCellContainer {
+public class TableRow extends TableCellContainer implements BreakPropertySet {
// The value of properties relevant for fo:table-row.
private LengthRangeProperty blockProgressionDimension;
private CommonBorderPaddingBackground commonBorderPaddingBackground;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/FontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/FontInfo.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/FontInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/FontInfo.java Tue Aug 12 05:36:18 2008
@@ -436,7 +436,7 @@
FontTriplet key = null;
String f = null;
int newWeight = weight;
- if (newWeight < 400) {
+ if (newWeight <= 400) {
while (f == null && newWeight > 100) {
newWeight -= 100;
key = createFontKey(family, style, newWeight);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/MultiByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/MultiByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/MultiByteFont.java Tue Aug 12 05:36:18 2008
@@ -29,7 +29,6 @@
public class MultiByteFont extends CIDFont {
private static int uniqueCounter = -1;
- private static final DecimalFormat COUNTER_FORMAT = new DecimalFormat("00000");
private String ttcName = null;
private String encoding = "Identity-H";
@@ -58,7 +57,8 @@
uniqueCounter = 0; //We need maximum 5 character then we start again
}
}
- String cntString = COUNTER_FORMAT.format(uniqueCounter);
+ DecimalFormat counterFormat = new DecimalFormat("00000");
+ String cntString = counterFormat.format(uniqueCounter);
//Subset prefix as described in chapter 5.5.3 of PDF 1.4
StringBuffer sb = new StringBuffer("E");
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java Tue Aug 12 05:36:18 2008
@@ -100,6 +100,11 @@
try {
pfm = new PFMFile();
pfm.load(pfmIn);
+ } catch (IOException ioe) {
+ if (afm == null) {
+ //Ignore the exception if we have a valid PFM. PFM is only the fallback.
+ throw ioe;
+ }
} finally {
IOUtils.closeQuietly(pfmIn);
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java Tue Aug 12 05:36:18 2008
@@ -68,10 +68,10 @@
}
//Prepare
- float pxToMillimeter = (float)UnitConv.mm2in(72); //default: 72dpi
+ float pxToMillimeter = UnitConv.IN2MM / 72; //default: 72dpi
Number ptm = (Number)hints.get(ImageProcessingHints.SOURCE_RESOLUTION);
if (ptm != null) {
- pxToMillimeter = (float)UnitConv.mm2in(ptm.doubleValue());
+ pxToMillimeter = (float)(UnitConv.IN2MM / ptm.doubleValue());
}
UserAgent ua = createBatikUserAgent(pxToMillimeter);
GVTBuilder builder = new GVTBuilder();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java Tue Aug 12 05:36:18 2008
@@ -45,6 +45,7 @@
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
import org.apache.xmlgraphics.util.MimeConstants;
+import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.svg.SimpleSVGUserAgent;
import org.apache.fop.util.UnclosableInputStream;
@@ -118,7 +119,7 @@
in.mark(length + 1);
SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(
getParserName());
- doc = (SVGDocument) factory.createSVGDocument(src.getSystemId(), in);
+ doc = factory.createSVGDocument(src.getSystemId(), in);
}
ImageInfo info = createImageInfo(uri, context, doc);
@@ -153,7 +154,7 @@
private ImageInfo createImageInfo(String uri, ImageContext context, SVGDocument doc) {
Element e = doc.getRootElement();
- float pxUnitToMillimeter = 25.4f / context.getSourceResolution();
+ float pxUnitToMillimeter = UnitConv.IN2MM / context.getSourceResolution();
UserAgent userAg = new SimpleSVGUserAgent(pxUnitToMillimeter,
new AffineTransform()) {
@@ -183,9 +184,12 @@
float height = UnitProcessor.svgVerticalLengthToUserSpace(
s, SVGOMDocument.SVG_HEIGHT_ATTRIBUTE, uctx);
+ int widthMpt = (int)Math.round(px2mpt(width, context.getSourceResolution()));
+ int heightMpt = (int)Math.round(px2mpt(height, context.getSourceResolution()));
+
ImageInfo info = new ImageInfo(uri, MimeConstants.MIME_SVG);
ImageSize size = new ImageSize();
- size.setSizeInMillipoints(Math.round(width * 1000), Math.round(height * 1000));
+ size.setSizeInMillipoints(widthMpt, heightMpt);
//Set the resolution to that of the FOUserAgent
size.setResolution(context.getSourceResolution());
size.calcPixelsFromSize();
@@ -209,4 +213,8 @@
}
+ private static double px2mpt(double px, double resolution) {
+ return px * 1000 * UnitConv.IN2PT / resolution;
+ }
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Tue Aug 12 05:36:18 2008
@@ -251,12 +251,11 @@
List returnList = new LinkedList();
if (!breakBeforeServed) {
- try {
+ breakBeforeServed = true;
+ if (!context.suppressBreakBefore()) {
if (addKnuthElementsForBreakBefore(returnList, context)) {
return returnList;
}
- } finally {
- breakBeforeServed = true;
}
}
@@ -281,6 +280,10 @@
childLC.setStackLimitBP(MinOptMax.subtract(context.getStackLimitBP(), stackLimit));
childLC.setRefIPD(relDims.ipd);
childLC.setWritingMode(getBlockContainerFO().getWritingMode());
+ if (curLM == this.childLMs.get(0)) {
+ childLC.setFlags(LayoutContext.SUPPRESS_BREAK_BEFORE);
+ //Handled already by the parent (break collapsing, see above)
+ }
// get elements from curLM
returnedList = curLM.getNextKnuthElements(childLC, alignment);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Tue Aug 12 05:36:18 2008
@@ -31,11 +31,13 @@
import org.apache.fop.area.Block;
import org.apache.fop.area.BlockParent;
import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.properties.BreakPropertySet;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.SpaceProperty;
import org.apache.fop.layoutmgr.inline.InlineLayoutManager;
import org.apache.fop.layoutmgr.inline.LineLayoutManager;
import org.apache.fop.traits.MinOptMax;
+import org.apache.fop.util.BreakUtil;
import org.apache.fop.util.ListUtil;
/**
@@ -255,12 +257,11 @@
List returnList = new LinkedList();
if (!breakBeforeServed) {
- try {
+ breakBeforeServed = true;
+ if (!context.suppressBreakBefore()) {
if (addKnuthElementsForBreakBefore(returnList, context)) {
return returnList;
}
- } finally {
- breakBeforeServed = true;
}
}
@@ -294,6 +295,10 @@
childLC.setStackLimitBP(context.getStackLimitBP());
childLC.setRefIPD(referenceIPD);
}
+ if (curLM == this.childLMs.get(0)) {
+ childLC.setFlags(LayoutContext.SUPPRESS_BREAK_BEFORE);
+ //Handled already by the parent (break collapsing, see above)
+ }
// get elements from curLM
returnedList = curLM.getNextKnuthElements(childLC, alignment);
@@ -1004,18 +1009,7 @@
*/
protected boolean addKnuthElementsForBreakBefore(List returnList,
LayoutContext context) {
- int breakBefore = -1;
- if (fobj instanceof org.apache.fop.fo.flow.Block) {
- breakBefore = ((org.apache.fop.fo.flow.Block) fobj).getBreakBefore();
- } else if (fobj instanceof org.apache.fop.fo.flow.BlockContainer) {
- breakBefore = ((org.apache.fop.fo.flow.BlockContainer) fobj).getBreakBefore();
- } else if (fobj instanceof org.apache.fop.fo.flow.ListBlock) {
- breakBefore = ((org.apache.fop.fo.flow.ListBlock) fobj).getBreakBefore();
- } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) {
- breakBefore = ((org.apache.fop.fo.flow.ListItem) fobj).getBreakBefore();
- } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) {
- breakBefore = ((org.apache.fop.fo.flow.table.Table) fobj).getBreakBefore();
- }
+ int breakBefore = getBreakBefore();
if (breakBefore == EN_PAGE
|| breakBefore == EN_COLUMN
|| breakBefore == EN_EVEN_PAGE
@@ -1030,6 +1024,27 @@
}
/**
+ * Returns the break-before value of the current formatting object.
+ * @return the break-before value (Constants.EN_*)
+ */
+ private int getBreakBefore() {
+ int breakBefore = EN_AUTO;
+ if (fobj instanceof BreakPropertySet) {
+ breakBefore = ((BreakPropertySet)fobj).getBreakBefore();
+ }
+ if (true /* uncomment to only partially merge: && breakBefore != EN_AUTO*/) {
+ LayoutManager lm = getChildLM();
+ //It is assumed this is only called when the first LM is active.
+ if (lm instanceof BlockStackingLayoutManager) {
+ BlockStackingLayoutManager bslm = (BlockStackingLayoutManager)lm;
+ breakBefore = BreakUtil.compareBreakClasses(
+ breakBefore, bslm.getBreakBefore());
+ }
+ }
+ return breakBefore;
+ }
+
+ /**
* Creates Knuth elements for break-after and adds them to the return list.
* @param returnList return list to add the additional elements to
* @param context the layout context
@@ -1038,16 +1053,8 @@
protected boolean addKnuthElementsForBreakAfter(List returnList,
LayoutContext context) {
int breakAfter = -1;
- if (fobj instanceof org.apache.fop.fo.flow.Block) {
- breakAfter = ((org.apache.fop.fo.flow.Block) fobj).getBreakAfter();
- } else if (fobj instanceof org.apache.fop.fo.flow.BlockContainer) {
- breakAfter = ((org.apache.fop.fo.flow.BlockContainer) fobj).getBreakAfter();
- } else if (fobj instanceof org.apache.fop.fo.flow.ListBlock) {
- breakAfter = ((org.apache.fop.fo.flow.ListBlock) fobj).getBreakAfter();
- } else if (fobj instanceof org.apache.fop.fo.flow.ListItem) {
- breakAfter = ((org.apache.fop.fo.flow.ListItem) fobj).getBreakAfter();
- } else if (fobj instanceof org.apache.fop.fo.flow.table.Table) {
- breakAfter = ((org.apache.fop.fo.flow.table.Table) fobj).getBreakAfter();
+ if (fobj instanceof BreakPropertySet) {
+ breakAfter = ((BreakPropertySet)fobj).getBreakAfter();
}
if (breakAfter == EN_PAGE
|| breakAfter == EN_COLUMN
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/LayoutContext.java Tue Aug 12 05:36:18 2008
@@ -47,12 +47,10 @@
public static final int CHECK_REF_AREA = 0x08;
/**
- * If this flag is set, it indicates that any leading fo:character
- * objects with suppress-at-line-break="suppress" should not generate
- * areas. This is the case at the beginning of each new LineArea
- * except the first.
+ * If this flag is set, it indicates that any break-before values other than "auto" should
+ * not cause a mandatory break as this break was already handled by a parent layout manager.
*/
- public static final int SUPPRESS_LEADING_SPACE = 0x10;
+ public static final int SUPPRESS_BREAK_BEFORE = 0x10;
public static final int FIRST_AREA = 0x20;
public static final int TRY_HYPHENATE = 0x40;
public static final int LAST_AREA = 0x80;
@@ -227,8 +225,8 @@
return ((this.flags & LAST_AREA) != 0);
}
- public boolean suppressLeadingSpace() {
- return ((this.flags & SUPPRESS_LEADING_SPACE) != 0);
+ public boolean suppressBreakBefore() {
+ return ((this.flags & SUPPRESS_BREAK_BEFORE) != 0);
}
/**
@@ -655,7 +653,7 @@
+ "\nSpace Adjust: \t" + getSpaceAdjust()
+ "\nIPD Adjust: \t" + getIPDAdjust()
+ "\nResolve Leading Space: \t" + resolveLeadingSpace()
- + "\nSuppress Leading Space: \t" + suppressLeadingSpace()
+ + "\nSuppress Break Before: \t" + suppressBreakBefore()
+ "\nIs First Area: \t" + isFirstArea()
+ "\nStarts New Area: \t" + startsNewArea()
+ "\nIs Last Area: \t" + isLastArea()
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Tue Aug 12 05:36:18 2008
@@ -197,12 +197,11 @@
List returnList = new LinkedList();
if (!breakBeforeServed) {
- try {
+ breakBeforeServed = true;
+ if (!context.suppressBreakBefore()) {
if (addKnuthElementsForBreakBefore(returnList, context)) {
return returnList;
}
- } finally {
- breakBeforeServed = true;
}
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Tue Aug 12 05:36:18 2008
@@ -184,10 +184,22 @@
* @return the computed base unit (in millipoint)
*/
protected double computeTableUnit(TableLayoutManager tlm) {
+ return computeTableUnit(tlm, tlm.getContentAreaIPD());
+ }
+
+ /**
+ * Works out the base unit for resolving proportional-column-width()
+ * [p-c-w(x) = x * base_unit_ipd]
+ *
+ * @param percentBaseContext the percent base context for relative values
+ * @param contentAreaIPD the IPD of the available content area
+ * @return the computed base unit (in millipoints)
+ */
+ public float computeTableUnit(PercentBaseContext percentBaseContext, int contentAreaIPD) {
int sumCols = 0;
float factors = 0;
- double unit = 0;
+ float unit = 0;
/* calculate the total width (specified absolute/percentages),
* and work out the total number of factors to use to distribute
@@ -196,7 +208,7 @@
for (Iterator i = colWidths.iterator(); i.hasNext();) {
Length colWidth = (Length) i.next();
if (colWidth != null) {
- sumCols += colWidth.getValue(tlm);
+ sumCols += colWidth.getValue(percentBaseContext);
if (colWidth instanceof RelativeNumericProperty) {
factors += ((RelativeNumericProperty) colWidth).getTableUnits();
} else if (colWidth instanceof TableColLength) {
@@ -209,8 +221,8 @@
* factors (if any)
*/
if (factors > 0) {
- if (sumCols < tlm.getContentAreaIPD()) {
- unit = (tlm.getContentAreaIPD() - sumCols) / factors;
+ if (sumCols < contentAreaIPD) {
+ unit = (contentAreaIPD - sumCols) / factors;
} else {
log.warn("No space remaining to distribute over columns.");
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Tue Aug 12 05:36:18 2008
@@ -267,12 +267,14 @@
}
addKnuthElementsForSpaceAfter(returnList, alignment);
- //addKnuthElementsForBreakBefore(returnList, context);
- int breakBefore = BreakUtil.compareBreakClasses(getTable().getBreakBefore(),
- childLC.getBreakBefore());
- if (breakBefore != Constants.EN_AUTO) {
- returnList.add(0, new BreakElement(getAuxiliaryPosition(), 0,
- -KnuthElement.INFINITE, breakBefore, context));
+ if (!context.suppressBreakBefore()) {
+ //addKnuthElementsForBreakBefore(returnList, context);
+ int breakBefore = BreakUtil.compareBreakClasses(getTable().getBreakBefore(),
+ childLC.getBreakBefore());
+ if (breakBefore != Constants.EN_AUTO) {
+ returnList.add(0, new BreakElement(getAuxiliaryPosition(), 0,
+ -KnuthElement.INFINITE, breakBefore, context));
+ }
}
//addKnuthElementsForBreakAfter(returnList, context);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org