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 ac...@apache.org on 2008/04/01 17:09:51 UTC
svn commit: r643433 [4/9] - in
/xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ lib/ src/codegen/fonts/
src/documentation/ src/documentation/content/
src/documentation/content/xdocs/ src/documentation/content/xdocs/0.93/
src/documentation/content/xd...
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/doc.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/doc.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/doc.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/doc.xml Tue Apr 1 08:08:24 2008
@@ -97,9 +97,9 @@
Step-by-step instructions for the deployment process again:
</p>
<note>
- Please make sure you use Forrest from the 0.7 branch for the time being. You will need
+ Please make sure you use Forrest from the Trunk (revision 632959 or later) for the time being. You will need
to download it directly from SVN:
- <link href="http://svn.apache.org/repos/asf/forrest/branches/forrest_07_branch">http://svn.apache.org/repos/asf/forrest/branches/forrest_07_branch</link>
+ <link href="http://svn.apache.org/repos/asf/forrest/trunk">http://svn.apache.org/repos/asf/forrest/trunk</link>
</note>
<ul>
<li>Modify the sources of the website and check locally with Forrest (run "forrest run" or just "forrest").</li>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/release.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/release.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/release.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/dev/release.xml Tue Apr 1 08:08:24 2008
@@ -73,7 +73,7 @@
<code>fop-hyph.jar</code> to lib/ (e.g. from
<code>http://sourceforge.net/projects/offo</code></li>
<li>Alternatively, create a build-local.properties file that points to the above libs.</li>
- <li>Run build[.sh] dist. Do this once using Sun JDK 1.3.1_15 or later and once with Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
+ <li>Run build[.sh] dist. Do this using Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
<li>Create signatures. Don't forget to upload your KEY:
<code>gpg -a -b --force-v3-sigs fop-0.94-src.tar.gz</code> etc.</li>
<li>Upload the dist and signature files to your web directory
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/download.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/download.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/download.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/download.xml Tue Apr 1 08:08:24 2008
@@ -84,7 +84,7 @@
<p/>
<table>
<tr>
- <th colspan="2">Latest Release</th>
+ <th colspan="2">Latest Stable Release</th>
</tr>
<tr>
<td>Repository URL</td>
@@ -99,6 +99,25 @@
<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>
+ </td>
+ </tr>
+ <tr>
+ <th colspan="2">Latest 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>
+ </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>
</td>
</tr>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/faq.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/faq.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/faq.xml Tue Apr 1 08:08:24 2008
@@ -645,6 +645,21 @@
</p>
</answer>
</faq>
+ <faq id="pdf-ps-java2d-differences">
+ <question>Why is the output of Java2D/AWT-based renderers different than, for example, PDF or PS?</question>
+ <answer>
+ <p>
+ If you render the same document once to a PNG or TIFF and once into a PDF, the output
+ may not be the same, i.e. line breaks are different or lines may have different heights.
+ The reason for this: The Java2D-based renderers use the font subsystem of Java2D/AWT. The
+ PDF and PS renderers use FOP's own font subsystem which provides much better font metrics
+ than Java2D. These can lead to different layout decisions when the same document is
+ rendered with different renderers. An alternative approach to fix this problem might be
+ available but it hasn't been tested, yet. See also the
+ <link href="0.95/output.html#general-fonts">notes on fonts in the various output formats</link>.
+ </p>
+ </answer>
+ </faq>
</part>
<part id="part-embedding">
<title>Embedding FOP. Using FOP in a servlet.</title>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/index.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/index.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/index.xml Tue Apr 1 08:08:24 2008
@@ -29,14 +29,15 @@
<p>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java
application that reads a formatting object (FO) tree and renders the resulting
- pages to a specified output. <link href="0.94/output.html">Output formats</link>
+ pages to a specified output. <link href="0.95/output.html">Output formats</link>
currently supported include PDF, PS, PCL, AFP, XML (area tree representation),
Print, AWT and PNG, and to a lesser extent, RTF and TXT. The primary output target is PDF.
</p>
<figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" />
<p>
- The latest stable version of FOP (<link href="0.94/">0.94</link>) is the second
- stable release after a large redesign effort and implements a large subset of the
+ A beta release of the latest version of FOP (<link href="0.95/">0.95</link>) is now
+ available. After a short testing period it will become the third
+ stable release after the large redesign effort and will implement a large subset of the
<link href="http://www.w3.org/TR/xsl11/">XSL-FO Version 1.1 W3C
Recommendation</link>.
</p>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/site.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/site.xml Tue Apr 1 08:08:24 2008
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!-- $Id$ -->
<site label="FOP" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="home">
<!--
BEGIN Home tab
@@ -22,6 +23,7 @@
<about label="About">
<index label="Introduction" href="index.html"/>
<download label="Download" href="download.html"/>
+ <quickstartguide label="Quick Start Guide" href="quickstartguide.html"/>
<compliance label="Compliance" href="compliance.html" description="FOP Compliance"/>
<help label="Getting Help" href="gethelp.html"/>
<faqs label="FAQs" href="faq.html"/>
@@ -34,7 +36,6 @@
<all_sitePDF label="Full PDF" href="wholesite.pdf"/>
-->
</about>
-
<resources label="Resources">
<xsl-fo label="XSL-FO" href="fo.html"/>
@@ -57,12 +58,12 @@
-->
<!--
- BEGIN Version 0.93 documentation tab
+ BEGIN Version 0.94 documentation tab
-->
- <trunk label="FOP 0.93" href="0.93/" tab="oldstableversion">
+ <trunk label="FOP 0.94" href="0.94/" tab="previousversion">
<about label="About" href="index.html"/>
- <release label="Release Notes" href="releaseNotes_0.93.html"/>
- <changes label="Changes" href="changes_0.93.html"/>
+ <release label="Release Notes" href="releaseNotes_0.94.html"/>
+ <changes label="Changes" href="changes_0.94.html"/>
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
@@ -89,16 +90,16 @@
</trunk>
<!--
- END Version 0.93 documentation tab
+ END Version 0.94 documentation tab
-->
<!--
- BEGIN Version 0.94 documentation tab
+ BEGIN Version 0.95 documentation tab
-->
- <trunk label="FOP 0.94" href="0.94/" tab="stableversion">
+ <trunk label="FOP 0.95beta" href="0.95/" tab="stableversion">
<about label="About" href="index.html"/>
- <release label="Release Notes" href="releaseNotes_0.94.html"/>
- <changes label="Changes" href="changes_0.94.html"/>
+ <release label="Release Notes" href="releaseNotes_0.95beta.html"/>
+ <changes label="Changes" href="changes_0.95beta.html"/>
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
@@ -125,9 +126,9 @@
</trunk>
<!--
- END Version 0.94 documentation tab
+ END Version 0.95 documentation tab
-->
-
+
<!--
BEGIN Trunk documentation tab
-->
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/status.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/status.xml Tue Apr 1 08:08:24 2008
@@ -27,13 +27,13 @@
<body>
<section>
<title>Status</title>
- <p>[last updated 9 January 2007]</p>
+ <p>[last updated 4 March 2008]</p>
<figure width="585" height="175" src="images/track.png" alt="Planning and branches of FOP development"/>
<p>
This is the development status of Apache FOP. Development on
the maintenance branch where FOP 0.20.5 came from has been
halted. The code base has been largely redesigned. The new
- code base has reached release 0.94.
+ code base has reached release 0.95.
</p>
</section>
<section>
@@ -44,7 +44,7 @@
handle large documents.</p>
<p>The redesign of the code base has largely been completed. The
new code reached production quality with release 0.93. In the
- course of 2007 we plan to release version 1.0.</p>
+ course of 2008 or 2009 we hope to release version 1.0.</p>
<p>
If you're looking for a long-term road-map we have to disappoint you. This is Open
Source and we're mostly volunteers working in their free time. What we have
@@ -122,7 +122,7 @@
</tr>
<tr>
<td>Image Support</td>
- <td>stable, but in need of a redesign</td>
+ <td>beta (recently rewritten)</td>
</tr>
<tr>
<td>Hyphenation Subsystem</td>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/tabs.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/tabs.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/tabs.xml Tue Apr 1 08:08:24 2008
@@ -21,14 +21,8 @@
<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.93" dir="0.93/"/>
<tab label="Version 0.94" dir="0.94/"/>
+ <tab label="Version 0.95beta" dir="0.95/"/>
<tab label="FOP Trunk" dir="trunk/"/>
<tab label="Development" dir="dev/"/>
- <!--
- <tab label="Design" dir="design/"/>
- -->
- <!--
- <tab label="Alt Design" dir="design/alt.design/"/>
- -->
</tabs>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/team.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/team.xml Tue Apr 1 08:08:24 2008
@@ -31,7 +31,6 @@
<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="fb"><link href="mailto:bckfnn@worldonline.dk">Finn Bock</link> (FB)</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
@@ -51,10 +50,6 @@
<li id="vh"><link href="mailto:vhennebert@apache.org">Vincent Hennebert</link>
(VH), a Java developer from France; with an interest in typography, and in using
Fop as a pdf renderer for book-like documents.</li>
- <li id="ph"><link href="mailto:pherweg@web.de">Peter Herweg</link> (PH) is helping to
- integrate the jfor project's RTF support into the upcoming FOP 1.0 version.
- Born in 1978, he has been serving as an application developer for a small
- industrial company in Germany since 1999.</li>
<li id="cl"><link href="mailto:clay@apache.org">Clay Leeds</link> (CL)
is a web/WAP/Palm developer from Laguna Beach, California, USA. A
recent XML/XSL-FO convert, he has been nit-picking FAQs & assorted web
@@ -78,7 +73,11 @@
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="ot"><link href="mailto:olegt@apache.org">Oleg Tkachenko</link> (OT)</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>
<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
@@ -109,11 +108,16 @@
<section id="commit-inactive">
<title>Inactive Committers</title>
<ul>
+ <li id="fb"><link href="mailto:bckfnn@worldonline.dk">Finn Bock</link> (FB)</li>
<li id="kc"><link href="mailto:kellyc@apache.org">Kelly Campbell</link></li>
<li id="sc"><link href="mailto:gears@apache.org">Steven Coffman</link></li>
<li id="bd"><link href="mailto:bdelacretaz@apache.org">Bertrand Delacretaz</link></li>
<li id="te"><link href="mailto:tore@apache.org">Tore Engvig</link></li>
<li id="sg"><link href="mailto:stanislav@apache.org">Stanislav Gorkhover</link></li>
+ <li id="ph"><link href="mailto:pherweg@web.de">Peter Herweg</link> (PH)<!-- is helping to
+ integrate the jfor project's RTF support into the upcoming FOP 1.0 version.
+ Born in 1978, he has been serving as an application developer for a small
+ industrial company in Germany since 1999.--></li>
<li id="fj"><link href="mailto:fotis@apache.org">Fotis Jannidis</link></li>
<li id="kl"><link href="mailto:klease@apache.org">Karen Lease</link></li>
<li id="kll"><link href="mailto:keiron@apache.org">Keiron Liddle</link></li>
@@ -122,6 +126,7 @@
<li id="jn"><link href="mailto:jordan@apache.org">Jordan Naftolin</link></li>
<li id="as"><link href="mailto:arved@apache.org">Arved Sandstrom</link></li>
<li id="es"><link href="mailto:eschaeffer@apache.org">Eric Schaeffer</link></li>
+ <li id="ot"><link href="mailto:olegt@apache.org">Oleg Tkachenko</link> (OT)</li>
<li id="aw"><link href="mailto:artw@apache.org">Art Welch</link></li>
<li id="pbw"><link href="mailto:pbwest@apache.org">Peter B. West</link></li>
</ul>
@@ -264,7 +269,7 @@
<td/>
<td/>
<td/>
- <td/>
+ <td>X</td>
<td/>
<td/>
<td/>
@@ -287,6 +292,19 @@
</tr>
<tr>
<td>MIF</td>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ </tr>
+ <tr>
+ <td>AFP</td>
<td/>
<td/>
<td/>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/compiling.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/compiling.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/compiling.xml Tue Apr 1 08:08:24 2008
@@ -41,7 +41,7 @@
<section id="env-jdk">
<title>JDK</title>
<p>
- Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
+ Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4
(A Java Runtime Environment is not sufficient).
</p>
</section>
@@ -59,7 +59,7 @@
<p>
The build script uses <a href="ext:ant">Apache Ant</a>, a popular
Java-based build tool, which usually requires that the environment variable JAVA_HOME point to
- your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally
+ your local JDK root directory. This is true even if you use JDK 1.4 or above, which normally
does not need this setting.
</p>
</section>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/fonts.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/fonts.xml Tue Apr 1 08:08:24 2008
@@ -31,11 +31,6 @@
<body>
<section id="intro">
<title>Summary</title>
- <note>The FOP Font subsystem is currently undergoing a significant change.
- The details provided here especially related to the generation of FOP Font
- Metrics files and the FOP Font configuration are likely to change substantially
- in the future.
- </note>
<p>The following table summarizes the font capabilities of the various FOP renderers:</p>
<table>
<tr>
@@ -59,22 +54,22 @@
<td>yes</td>
<td>yes</td>
</tr>
- <!--tr> NOT AVAILABLE YET!!!
+ <tr>
<td>PCL</td>
<td>yes (modified)</td>
+ <td>yes (painted as bitmaps)</td>
+ <td>yes (painted as bitmaps)</td>
<td>no</td>
- <td>no</td>
- <td>no</td>
- </tr-->
+ </tr>
<tr>
- <td>TXT</td>
- <td>yes (used for layout but not for output)</td>
+ <td>AFP</td>
<td>no</td>
- <td>yes (used for layout but not for output)</td>
<td>no</td>
+ <td>yes</td>
+ <td>yes</td>
</tr>
<tr>
- <td>AWT</td>
+ <td>Java2D/AWT/Bitmap</td>
<td>if available from OS</td>
<td>yes</td>
<td>yes</td>
@@ -95,19 +90,26 @@
<td>n/a</td>
</tr>
<tr>
+ <td>TXT</td>
+ <td>yes (used for layout but not for output)</td>
+ <td>no</td>
+ <td>yes (used for layout but not for output)</td>
+ <td>no</td>
+ </tr>
+ <!--tr> NOT AVAILABLE
<td>MIF</td>
<td>n/a (font metrics not needed)</td>
<td>n/a</td>
<td>n/a</td>
<td>n/a</td>
- </tr>
- <tr>
+ </tr-->
+ <!--tr> NOT AVAILABLE
<td>SVG</td>
<td>if available from OS</td>
<td>yes</td>
<td>no</td>
<td>no</td>
- </tr>
+ </tr-->
<tr>
<td>XML</td>
<td>yes</td>
@@ -120,8 +122,8 @@
<section>
<title>Base-14 Fonts</title>
<p>
- The Adobe PDF Specification specifies a set of 14 fonts that must be
- available to every PDF reader:
+ The Adobe PostScript and PDF Specification specify a set of 14 fonts that must be
+ available to every PostScript interpreter and PDF reader:
Helvetica (normal, bold, italic, bold italic),
Times (normal, bold, italic, bold italic),
Courier (normal, bold, italic, bold italic),
@@ -147,73 +149,132 @@
</p>
</section>
<section id="awt">
- <title>AWT/Operating System Fonts</title>
- <p>The AWT family of renderers (AWT, Print, SVG), use the Java AWT libraries for font metric information. Through operating system registration, the AWT libraries know what fonts are available on the system, and the font metrics for each one.</p>
+ <title>Java2D/AWT/Operating System Fonts</title>
+ <p>
+ The Java2D family of renderers (Java2D, AWT, Print, TIFF, PNG), use the
+ Java AWT subsystem for font metric information. Through operating system
+ registration, the AWT subsystem knows what fonts are available on the system,
+ and the font metrics for each one.
+ </p>
+ <p>
+ When working with one of these output formats and you're missing a font, just
+ install it in your operating system and they should be available for these
+ renderers. Please note that this is not true for other output formats such as
+ PDF or PostScript.
+ </p>
</section>
+
<section id="custom">
<title>Custom Fonts</title>
- <p>Support for custom fonts is added by creating font metric files (written in XML) from the actual font files, and registering them with FOP. Currently only Type 1 and TrueType fonts can be added.
-More information about fonts can be found at:</p>
+ <p>
+ Support for custom fonts is highly output format dependent (see above table).
+ This section shows how to add Type 1 and TrueType fonts to the PDF, PostScript and
+ Java2D-based renderers. Other renderers (like AFP) support other font formats. Details
+ in this case can be found on the page about <a href="output.html">output formats</a>.
+ </p>
+ <p>
+ Prior to FOP version 0.94, it was always necessary to create an XML font metrics file
+ if you wanted to add a custom font. This unconvenient step has been removed and in
+ addition to that, FOP supports auto-registration of fonts, i.e. FOP can find fonts
+ installed in your operating system or can scan user-specified directories for fonts.
+ Font registration via XML font metrics file is still supported and is still necessary
+ if you want to use a TrueType Collection (*.ttc). Direct support for TrueType
+ collections may be added later. Furthermore, the XML font metrics files are still
+ required if you don't want to embed, but only reference a font.
+ </p>
+ <p>
+ Basic information about fonts can be found at:
+ </p>
<ul>
<li><a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a></li>
<li><a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a></li>
</ul>
+ </section>
+
+ <section id="basics">
+ <title>Basic font configuration</title>
+ <p>
+ If you want FOP to use custom fonts, you need to tell it where to find them. This
+ is done in the configuration file and once per renderer (because each output format
+ is a little different). In the basic form, you can either tell FOP to find your
+ operating system fonts or you can specify directories that it will search for
+ support fonts. These fonts will then automatically be registered.
+ </p>
+ <source><![CDATA[
+<fonts>
+ <!-- register all the fonts found in a directory -->
+ <directory>C:\MyFonts1</directory>
+
+ <!-- register all the fonts found in a directory
+ and all of its sub directories (use with care) -->
+ <directory recursive="true">C:\MyFonts2</directory>
+
+ <!-- automatically detect operating system installed fonts -->
+ <auto-detect/>
+</fonts>]]></source>
+ <note>
+ Review the documentation for <a href="configuration.html">FOP Configuration</a>
+ for instructions on making the FOP configuration available to FOP when it runs.
+ Otherwise, FOP has no way of finding your custom font information. It is currently
+ not possible to easily configure fonts from Java code.
+ </note>
+ </section>
+
+ <section id="advanced">
+ <title>Advanced font configuration</title>
+ <p>
+ The instructions found above should be sufficient for most users. Below are some
+ additional instructions in case the basic font configuration doesn't lead to
+ the desired results.
+ </p>
<section id="type1-metrics">
<title>Type 1 Font Metrics</title>
<p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it.
-To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
- <p>Windows (on JDK 1.4 and later):</p>
+ To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
+ <p>Windows:</p>
<source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Windows (on JDK 1.3.x):</p>
- <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar;lib\xml-apis.jar;
- lib\xercesImpl.jar;lib\xalan.jar;lib\serializer.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Unix (on JDK 1.4 and later):</p>
+ org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
+ <p>Unix:</p>
<source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Unix (on JDK 1.3.1):</p>
- <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar:lib/xml-apis.jar:
- lib/xercesImpl.jar:lib/xalan.jar:lib/serializer.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
+ org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
<p>PFMReader [options]:</p>
<ul>
<li><strong>-fn <fontname></strong> By default, FOP uses the fontname from the
-.pfm file when embedding the font. Use the "-fn" option to override this name with one you have
-chosen. This may be useful in some cases to ensure that applications using the output document
-(Acrobat Reader for example) use the embedded font instead of a local font with the same
-name.</li>
+ .pfm file when embedding the font. Use the "-fn" option to override this name with one you have
+ chosen. This may be useful in some cases to ensure that applications using the output document
+ (Acrobat Reader for example) use the embedded font instead of a local font with the same
+ name.</li>
</ul>
<note>The classpath in the above example has been simplified for readability.
-You will have to adjust the classpath to the names of the actual JAR files in the lib directory.
-xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.</note>
+ You will have to adjust the classpath to the names of the actual JAR files in the lib directory.
+ xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.</note>
<note>The tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values.
-FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file.
-The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually.
-The constructed values however appear to have no visible influence.</note>
+ FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file.
+ The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually.
+ The constructed values however appear to have no visible influence.</note>
</section>
<section id="truetype-metrics">
<title>TrueType Font Metrics</title>
<p>FOP includes TTFReader, which reads the TTF file and generates an appropriate font metrics file for it.
-Use it in a similar manner to PFMReader.
-For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:</p>
+ Use it in a similar manner to PFMReader.
+ For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:</p>
<source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
- org.apache.fop.fonts.apps.TTFReader [options]
- C:\myfonts\cmr10.ttf ttfcm.xml</source>
+ org.apache.fop.fonts.apps.TTFReader [options]
+ C:\myfonts\cmr10.ttf ttfcm.xml</source>
<p>TTFReader [options]:</p>
<ul>
<li><strong>-d <DEBUG | INFO ></strong> Sets the debug level (default is
-INFO).</li>
+ INFO).</li>
<li><strong>-fn <fontname></strong> Same as for PFMReader.</li>
<li><strong>-ttcname <fontname></strong> If you're reading data from a
-TrueType Collection (.ttc file) you must specify which font from the collection you will read
-metrics from.
-If you read from a .ttc file without this option, the fontnames will be listed for you.</li>
+ TrueType Collection (.ttc file) you must specify which font from the collection you will read
+ metrics from.
+ If you read from a .ttc file without this option, the fontnames will be listed for you.</li>
<li><strong>-enc ansi</strong> Creates a WinAnsi-encoded font metrics file.
-Without this option, a CID-keyed font metrics file is created.
-The table below summarizes the differences between these two encoding options as currently
-used within FOP.
-Please note that this information only applies to TrueType fonts and TrueType collections:</li>
+ Without this option, a CID-keyed font metrics file is created.
+ The table below summarizes the differences between these two encoding options as currently
+ used within FOP.
+ Please note that this information only applies to TrueType fonts and TrueType collections:</li>
</ul>
<table id="ttf-encoding">
<tr>
@@ -240,13 +301,13 @@
<section id="truetype-collections-metrics">
<title>TrueType Collections Font Metrics</title>
<p>TrueType collections (.ttc files) contain more than one font.
-To create metrics files for these fonts, you must specify which font in the collection should be generated, by using the "-ttcname" option with the TTFReader.</p>
+ To create metrics files for these fonts, you must specify which font in the collection should be generated, by using the "-ttcname" option with the TTFReader.</p>
<p>To get a list of the fonts in a collection, just start the TTFReader as if it were a normal TrueType file (without the -ttcname option).
-It will display all of the font names and exit with an Exception.</p>
+ It will display all of the font names and exit with an Exception.</p>
<p>Here is an example of generating a metrics file for a .ttc file:</p>
<source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
- org.apache.fop.fonts.apps.TTFReader -ttcname "MS Mincho"
- msmincho.ttc msminch.xml</source>
+ org.apache.fop.fonts.apps.TTFReader -ttcname "MS Mincho"
+ msmincho.ttc msminch.xml</source>
</section>
<section id="register">
<title>Register Fonts with FOP</title>
@@ -269,16 +330,16 @@
<!-- automatically detect operating system installed fonts -->
<auto-detect/>
</fonts>]]></source>
- <note>Review the documentation for <a href="configuration.html">FOP Configuration</a> for instructions on making the FOP configuration available to FOP when it runs. Otherwise, FOP has no way of finding your custom font information.</note>
<ul>
<li>
URLs are used to access the font metric and font files.
Relative URLs are resolved relative to the font-base property (or base) if available.
See <a href="configuration.html">FOP: Configuration</a> for more information.
</li>
+ <li>The "metrics-url" attribute is generally not necessary except if you run into problems with certain fonts.</li>
<li>Either an "embed-url" or a "metrics-url" must be specified for font tag configurations.</li>
- <li>The font "kerning" attribute is optional.</li>
- <li>If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
+ <li>The font "kerning" attribute is optional. Default is "true".</li>
+ <li>If embedding is off (i.e. embed-url is not set), the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
<li>When setting the "embed-url" attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>
<li>The fonts "directory" tag can be used to register fonts contained within a single or list of directory paths. The "recursive" attribute can be specified to recursively add fonts from all sub directories.</li>
<li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.</li>
@@ -294,37 +355,38 @@
</section>
<section id="autodetect">
<title>Auto-Detect and auto-embedd feature</title>
- <p>When the "auto-detect" flag is set in the configuration, FOP will automatically search for fonts in the default paths for your operating system.</p>
- <p>FOP will also auto-detect fonts which are available in the classpath, if they are described as "application/x-font" in the MANIFEST.MF file. For example, if your .jar file contains font/myfont.ttf:</p>
- <source>Manifest-Version: 1.0
-
-Name: font/myfont.ttf
-Content-Type: application/x-font</source>
- <p>This feature allows you to create JAR files containing fonts. The JAR files can be added to fop by providem them in the classpath, e.g. copying them into the lib/ directory.</p>
+ <p>When the "auto-detect" flag is set in the configuration, FOP will automatically search for fonts in the default paths for your operating system.</p>
+ <p>FOP will also auto-detect fonts which are available in the classpath, if they are described as "application/x-font" in the MANIFEST.MF file. For example, if your .jar file contains font/myfont.ttf:</p>
+ <source>Manifest-Version: 1.0
+
+ Name: font/myfont.ttf
+ Content-Type: application/x-font</source>
+ <p>This feature allows you to create JAR files containing fonts. The JAR files can be added to fop by providem them in the classpath, e.g. copying them into the lib/ directory.</p>
</section>
<section id="embedding">
<title>Embedding</title>
<note>The PostScript renderer does not yet support TrueType fonts, but can embed Type 1 fonts.</note>
<note>The font is simply embedded into the PDF file, it is not converted.</note>
<p>Font embedding is enabled in the userconfig.xml file and controlled by the embed-url attribute.
-If you don't specify the embed-url attribute the font will not be embedded, but will only be referenced.</p>
+ If you don't specify the embed-url attribute the font will not be embedded, but will only be referenced.</p>
<warning>
Omitting the embed-url attribute for CID-encoded TrueType fonts will currently produce invalid
PDF files! If you create the XML font metric file using the "-enc ansi" option, you can omit
the embed-url attribute for TrueType fonts but you're restricted to the WinAnsi character set.
</warning>
<p>When FOP embeds a font, it adds a prefix to the fontname to ensure that the name will not match the fontname of an installed font.
-This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</p>
+ This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</p>
<p>When embedding PostScript fonts, the entire font is always embedded.</p>
<p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
original font, containing only the glyphs used, is embedded in the output document.</p>
</section>
+ <!-- The following section should no longer be required
<section id="embedding-base14">
<title>Explicitly embedding the base 14 fonts</title>
<p>
There are cases where you might want to force the embedding of one or more of the base 14 fonts that
can normally be considered available on the target platform (viewer, printer). One of these cases is
- PDF/A which mandates the embedding of even the base 14 fonts. Embedding a font such as Helvetica or
+ <a href="pdfa.html">PDF/A</a> which mandates the embedding of even the base 14 fonts. Embedding a font such as Helvetica or
Courier is straight-forward. The "Symbol" and "ZapfDingbats" fonts, however, currently present a
problem because FOP cannot correctly determine the encoding of these two single-byte fonts through
the PFM file. FOP now correctly interprets the "encoding" value in the XML font metrics file, but the
@@ -342,7 +404,7 @@
<cap-height>673</cap-height>
<x-height>766</x-height>
[..]]]></source>
- </section>
+ </section-->
</section>
</body>
</document>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/output.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/output.xml Tue Apr 1 08:08:24 2008
@@ -48,6 +48,35 @@
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.
</p>
+ <p>
+ Theoretically, there's some potential to make the output of the PDF/PS renderers match
+ the output of the Java2D-based renderers. If FOP used the font metrics from its own
+ font subsystem but still used Java2D for text painting in the Java2D-based renderers,
+ this could probably be achieved. However, this approach hasn't been implemented, yet.
+ </p>
+ <p>
+ With a work-around, it is possible to match the PDF/PS output in a Java2D-based
+ renderer pretty closely. The clue is to use the
+ <a href="intermediate.html">intermediate format</a>. The trick is to layout the
+ document using FOP's own font subsystem but then render the document using Java2D.
+ Here are the necessary steps (using the command-line):
+ </p>
+ <ol>
+ <li>
+ Produce an IF file: <code>fop -fo myfile.fo -at application/pdf myfile.at.xml</code><br/>
+ Specifying "application/pdf" for the "-at" parameter causes FOP to use FOP's own
+ font subsystem (which is used by the PDF renderer). Note that no PDF file is created
+ in this step.
+ </li>
+ <li>Render to a PDF file: <code>fop -atin myfile.at.xml -pdf myfile.pdf</code></li>
+ <li>Render to a Java2D-based renderer:
+ <ul>
+ <li><code>fop -atin myfile.at.xml -print</code></li>
+ <li><code>fop -atin myfile.at.xml -awt</code></li>
+ <li><code>fop -atin myfile.at.xml -tiff myfile.tiff</code></li>
+ </ul>
+ </li>
+ </ol>
</section>
<section id="general-direct-output">
<title>Output to a Printer or Other Device</title>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/pdfencryption.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/pdfencryption.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/pdfencryption.xml Tue Apr 1 08:08:24 2008
@@ -204,15 +204,13 @@
</p>
<ol>
<li>
- Download the binary distribution for your JDK version. If you have JDK
- 1.3 or earlier you must also download a JCE from the same page.
+ Download the binary distribution for your JDK version.
</li>
<li>
Unpack the distribution. Add the jar file to your classpath. A
convenient way to use the jar on Linux is to simply drop it into the
FOP lib directory, it will be automatically picked up by
- <code>fop.sh</code>. If you have JDK 1.3 or earlier don't forget to
- install the JCE as well.
+ <code>fop.sh</code>.
</li>
<li>
Open the <code>java.security</code> file and add<br/>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/running.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/running.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/running.xml Tue Apr 1 08:08:24 2008
@@ -305,7 +305,7 @@
<ul>
<li>
Increase memory available to the JVM. See
- <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</a>
+ <a href="http://java.sun.com/j2se/1.4/docs/tooldocs/solaris/java.html">the -Xmx option</a>
for more information.
<warning>
It is usually unwise to increase the memory allocated to the JVM beyond the amount of
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/README.txt?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/README.txt (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/README.txt Tue Apr 1 08:08:24 2008
@@ -5,7 +5,8 @@
To create the PDF just call go.bat.
-The fully reconstruct the PDF you need to copy some fonts into
-the cfg directory. Please see the README.txt there for details.
+The fully reconstruct the PDF you need some fonts installed in
+your operating system: Verdana and Lucida Console which are
+available in every Windows installation.
You will also need English hyphenation patterns.
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/README.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/cfg/fop.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/cfg/fop.xconf?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/cfg/fop.xconf (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/cfg/fop.xconf Tue Apr 1 08:08:24 2008
@@ -17,23 +17,13 @@
-->
<!-- $Id$ -->
<fop>
- <base>.</base>
<source-resolution>72</source-resolution>
<target-resolution>300</target-resolution>
- <default-page-settings height="11in" width="8.26in"/>
<renderers>
<renderer mime="application/pdf">
<!--output-profile>cfg/ISOuncoated.icc</output-profile-->
<fonts>
- <font metrics-url="cfg\VERDANA.ttf.xml" kerning="yes" embed-url="cfg\VERDANA.ttf">
- <font-triplet name="Verdana" style="normal" weight="normal"/>
- </font>
- <font metrics-url="cfg\VERDANAB.ttf.xml" kerning="yes" embed-url="cfg\VERDANAB.ttf">
- <font-triplet name="Verdana" style="normal" weight="bold"/>
- </font>
- <font metrics-url="cfg\LUCON.ttf.xml" kerning="yes" embed-url="cfg\LUCON.ttf">
- <font-triplet name="Lucida Console" style="normal" weight="normal"/>
- </font>
+ <auto-detect/>
</fonts>
</renderer>
</renderers>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/svg/pepe-business-card.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/svg/pepe-business-card.svg?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/svg/pepe-business-card.svg (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/svg/pepe-business-card.svg Tue Apr 1 08:08:24 2008
@@ -16,7 +16,8 @@
limitations under the License.
-->
<!-- $Id$ -->
-<svg xml:space="preserve" x="-3.05102in" y="-2.2459in" width="3.31009in" height="2.08961in"
+<svg xmlns="http://www.w3.org/2000/svg"
+ xml:space="preserve" x="-3.05102in" y="-2.2459in" width="3.31009in" height="2.08961in"
style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality" viewBox="-30510 0 33101 20896">
<g>
<g>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/business-card-demo.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/business-card-demo.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/business-card-demo.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/business-card-demo.xml Tue Apr 1 08:08:24 2008
@@ -37,13 +37,13 @@
<fo:instream-foreign-object xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<svg:svg width="150mm" height="70mm" viewBox="0 0 150 70">
<svg:g transform="rotate(-7)">
- <svg:image x="0" y="12" width="84" height="53" xlink:href="svg/pepe-business-card.svg"/>
+ <svg:image x="0" y="12" width="84" height="53" xlink:href="../svg/pepe-business-card.svg"/>
</svg:g>
</svg:svg>
</fo:instream-foreign-object>
</p>
- <fo:block-container absolute-position="absolute" left="80mm" top="20mm" width="2cm" height="10cm">
- <fo:block>
+ <fo:block-container absolute-position="absolute" left="80mm" top="20mm" width="3cm" height="10cm">
+ <fo:block font-size="0" line-height="0">
<fo:instream-foreign-object xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="1.8cm" height="10cm" viewBox="0 0 20 100">
<defs>
@@ -65,11 +65,11 @@
</fo:instream-foreign-object>
</fo:block>
</fo:block-container>
- <fo:block-container absolute-position="absolute" width="100%" height="100%">
- <fo:block start-indent="112mm">
- <p>The XSLT stylesheet which contains the rules to convert the business card XML to XSL-FO:</p>
- <fo:block text-align="start" font-family="'Lucida Console'" font-size="10pt" white-space="pre"
- ><![CDATA[<?xml version="1.0" encoding="utf-8"?>
+ <fo:block-container absolute-position="absolute" width="100%">
+ <fo:block start-indent="112mm">
+ <p>The XSLT stylesheet which contains the rules to convert the business card XML to XSL-FO:</p>
+ <fo:block text-align="start" font-family="'Lucida Console'" font-size="10pt" white-space="pre"
+ ><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format">
@@ -77,7 +77,8 @@
<xsl:template match="/">
<fo:root font-family="Helvetica" font-size="10pt">
<fo:layout-master-set>
- <fo:simple-page-master master-name="bc" page-height="53mm" page-width="84mm" margin="3mm">
+ <fo:simple-page-master master-name="bc"
+ page-height="53mm" page-width="84mm" margin="3mm">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-history.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-history.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-history.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-history.xml Tue Apr 1 08:08:24 2008
@@ -39,13 +39,12 @@
</p>
<p>
In 2005, the redesign finally took a leap forward, which resulted in the first release from
- the new codebase (FOP 0.90alpha). Shortly thereafter, FOP 0.91beta was released in December
- 2005 and FOP 0.92beta in April 2006. Although 0.92beta still carries the beta tag,
- it has many advantages over the old version 0.20.5.
+ the new codebase (FOP 0.90alpha). The project team has published a number of releases
+ since then. FOP made big steps forward.
</p>
<p>
- The next version, to be released shortly, will be 0.93. This version should be the last release
- before the long-awaited version 1.0, for which the team only has to implement a handful of
- additional features.
+ The next version, to be released in March 2008, will be 0.95. Although FOP still carries
+ pre 1.0 version numbers it is production-ready. Some features are still missing before
+ version 1.0 can be released.
</p>
</section>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-poster.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-poster.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-poster.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-poster.xml Tue Apr 1 08:08:24 2008
@@ -21,11 +21,11 @@
<section href="fop-overview.xml" width="165" height="118"/>
<section href="fop-output-formats.xml" width="165" height="103"/>
<section href="fop-foreign-xml-support.xml" width="165" height="55"/>
- <section href="fop-image-support.xml" width="165" height="65"/>
- <section href="fop-use-cases.xml" width="165" height="96"/>
- <section href="fop-history.xml" width="165" height="181"/>
+ <section href="fop-image-support.xml" width="165" height="66"/>
+ <section href="fop-use-cases.xml" width="165" height="98"/>
+ <section href="fop-history.xml" width="165" height="180"/>
<section href="fop-getting-help.xml" width="165" height="67"/>
- <section href="fop-transformation-chain.xml" width="335" height="167"/>
+ <section href="fop-transformation-chain.xml" width="335" height="166"/>
<!-- section href="hello-world-in-fo.xml" width="165" height="115"/-->
- <section href="business-card-demo.xml" width="335" height="181"/>
+ <section href="business-card-demo.xml" width="335" height="185"/>
</poster>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-transformation-chain.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-transformation-chain.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-transformation-chain.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-transformation-chain.xml Tue Apr 1 08:08:24 2008
@@ -19,7 +19,7 @@
<section xmlns:fo="http://www.w3.org/1999/XSL/Format">
<title tab-width="80">Transformation Chain</title>
<fo:block space-before="10pt" space-before.conditionality="retain" space-after="10pt" text-align="center">
- <fo:external-graphic src="svg/fop-transformation-chain.svg" width="70%" content-width="scale-to-fit"/>
+ <fo:external-graphic src="../svg/fop-transformation-chain.svg" width="70%" content-width="scale-to-fit"/>
</fo:block>
<p>
This diagram shows a complete transformation chain (exemplary). It begins with your data source,
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-use-cases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-use-cases.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-use-cases.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xml/fop-use-cases.xml Tue Apr 1 08:08:24 2008
@@ -19,8 +19,7 @@
<section xmlns:fo="http://www.w3.org/1999/XSL/Format">
<title tab-width="50">Use Cases</title>
<fo:table table-layout="fixed" width="100%" border-collapse="separate">
- <fo:table-column/>
- <fo:table-column/>
+ <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
<fo:table-header>
<fo:table-row font-weight="bold">
<fo:table-cell border-bottom="solid 0.5mm black">
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/common.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/common.xsl?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/common.xsl (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/common.xsl Tue Apr 1 08:08:24 2008
@@ -37,14 +37,14 @@
<xsl:choose>
<xsl:when test="ancestor::li and not(preceding-sibling::*)">
<fo:block
- space-after="4pt">
+ space-after.optimum="0.3em" space-after.maximum="1em">
<xsl:apply-templates/>
</fo:block>
</xsl:when>
<xsl:otherwise>
<fo:block
- space-before="4pt"
- space-after="4pt">
+ space-before.optimum="0.3em" space-before.maximum="1em"
+ space-after.optimum="0.3em" space-after.maximum="1em">
<xsl:apply-templates/>
</fo:block>
</xsl:otherwise>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/fop-poster.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/fop-poster.xsl?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/fop-poster.xsl (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/poster/xslt/fop-poster.xsl Tue Apr 1 08:08:24 2008
@@ -60,9 +60,6 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<xsl:apply-templates select="section"/>
- <fo:block-container width="1cm" height="5cm">
- <fo:block/>
- </fo:block-container>
</fo:flow>
</fo:page-sequence>
</fo:root>
@@ -84,14 +81,14 @@
<path
d="M 840,575 L 280,575 c -40,0 -60,-50 -100,-50 L 0,525"
style="fill:none; stroke:blue; stroke-width:5;" />
- <image x="680" y="7" width="140" height="60" xlink:href="svg/fop-logo-reconstructed.svg"/>
+ <image x="680" y="7" width="140" height="60" xlink:href="../svg/fop-logo-reconstructed.svg"/>
<text x="15" y="35" style="fill:black; font-weight:bold; font-size:17">
Apache FOP - The leading open source XSL-FO formatter
</text>
<text x="685" y="74" style="fill:black; font-size:5.5">
A product of the Apache XML Graphics Project
</text>
- <image x="15" y="530" width="160" height="60" xlink:href="svg/asf-logo.svg"/>
+ <image x="15" y="530" width="160" height="60" xlink:href="../svg/asf-logo.svg"/>
<text x="360" y="560" style="fill:blue; font-size:12">
For more details, please visit: <a xlink:href="http://xmlgraphics.apache.org/fop/">http://xmlgraphics.apache.org/fop/</a>
</text>
@@ -111,7 +108,7 @@
</xsl:template>
<xsl:template match="section">
- <xsl:variable name="section-content" select="exslt:node-set(document(@href))"/>
+ <xsl:variable name="section-content" select="exslt:node-set(document(@href, .))"/>
<fo:block
space-before.minimum="2mm" space-before.optimum="5mm" space-before.maximum="30mm"
space-before.conditionality="discard" space-after.conditionality="discard"
@@ -129,7 +126,9 @@
</fo:instream-foreign-object>
</fo:block>
</fo:block-container>
- <fo:block-container width="{@width}mm - 8mm" height="{@height}mm - 20mm" padding="4mm" padding-top="16mm" margin="0pt">
+ <fo:block-container width="{@width}mm - 8mm" height="{@height}mm - 24mm"
+ padding="4mm" padding-top="16mm" padding-bottom="8mm" margin="0pt"
+ display-align="distribute" id="section{position()}">
<fo:block>
<xsl:apply-templates select="$section-content/section/*[local-name() != 'title']"/>
</fo:block>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/sitemap.xmap?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/sitemap.xmap (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/sitemap.xmap Tue Apr 1 08:08:24 2008
@@ -20,44 +20,13 @@
</map:components>
<map:pipelines>
- <map:pipeline>
-
- <map:match type="regexp" pattern="^(.*?)([^/]*)changes.xml$">
- <map:generate type="file" src="{project:status}" />
- <map:transform src="resources/stylesheets/changes2document.xsl" >
- <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
- <map:parameter name="path" value="{1}{2}"/>
- </map:transform>
- <map:serialize type="xml-document"/>
- </map:match>
-
- <map:match type="regexp" pattern="^(.*?)([^/]*)changes_(.*).xml$">
- <map:generate type="file" src="{project:status}" />
- <map:transform src="resources/stylesheets/changes2document.xsl" >
- <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
- <map:parameter name="path" value="{1}{2}"/>
- <map:parameter name="versionNumber" value="{3}"/>
- </map:transform>
- <map:serialize type="xml-document"/>
- </map:match>
-
- <map:match type="regexp" pattern="^(.*?)([^/]*)releaseNotes_(.*).xml$">
- <map:generate type="file" src="{project:status}" />
- <map:transform src="resources/stylesheets/releaseNotes2document.xsl">
- <map:parameter name="versionNumber" value="{3}"/>
- <map:parameter name="path" value="{1}{2}"/>
- </map:transform>
- <map:serialize type="xml-document"/>
- </map:match>
-
- </map:pipeline>
<!-- This is used by xinclude statements in knownissues.xml -->
<map:pipeline internal-only="true">
<map:match type="regexp" pattern="^(.*?)([^/]*)knownissues-raw-layoutengine.xml$">
<map:generate type="file" src="../../test/layoutengine/disabled-testcases.xml"/>
<map:transform src="resources/stylesheets/disabled-testcases2document.xsl" >
- <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+ <map:parameter name="bugtracking-url" value="{properties:bugtracking-url}"/>
<map:parameter name="path" value="{1}{2}"/>
</map:transform>
<map:serialize type="xml-document"/>
@@ -65,13 +34,13 @@
<map:match type="regexp" pattern="^(.*?)([^/]*)knownissues-raw-fotree.xml$">
<map:generate type="file" src="../../test/fotree/disabled-testcases.xml"/>
<map:transform src="resources/stylesheets/disabled-testcases2document.xsl" >
- <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+ <map:parameter name="bugtracking-url" value="{properties:bugtracking-url}"/>
<map:parameter name="path" value="{1}{2}"/>
</map:transform>
<map:serialize type="xml-document"/>
</map:match>
<map:match type="regexp" pattern="^(.*?)([^/]*)knownissues-raw-static.xml$">
- <!--<map:generate type="file" src="{project:knownissues}"/>-->
+ <!--<map:generate type="file" src="{properties:knownissues}"/>-->
<map:generate type="file" src="../../known-issues.xml"/>
<map:transform src="resources/stylesheets/known-issues2document.xsl"/>
<map:serialize type="xml-document"/>
@@ -80,7 +49,7 @@
<map:match type="regexp" pattern="^(.*?)([^/]*)knownissues-raw-layoutengine_(.*).xml$">
<map:generate type="file" src="content/xdocs/{3}/layoutengine/disabled-testcases.xml"/>
<map:transform src="resources/stylesheets/disabled-testcases2document.xsl" >
- <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+ <map:parameter name="bugtracking-url" value="{properties:bugtracking-url}"/>
<map:parameter name="path" value="{1}{2}"/>
</map:transform>
<map:serialize type="xml-document"/>
@@ -88,13 +57,13 @@
<map:match type="regexp" pattern="^(.*?)([^/]*)knownissues-raw-fotree_(.*).xml$">
<map:generate type="file" src="content/xdocs/{3}/fotree/disabled-testcases.xml"/>
<map:transform src="resources/stylesheets/disabled-testcases2document.xsl" >
- <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
+ <map:parameter name="bugtracking-url" value="{properties:bugtracking-url}"/>
<map:parameter name="path" value="{1}{2}"/>
</map:transform>
<map:serialize type="xml-document"/>
</map:match>
<map:match type="regexp" pattern="^(.*?)([^/]*)knownissues-raw-static_(.*).xml$">
- <!--<map:generate type="file" src="{project:knownissues}"/>-->
+ <!--<map:generate type="file" src="{properties:knownissues}"/>-->
<map:generate type="file" src="content/xdocs/{3}/known-issues.xml"/>
<map:transform src="resources/stylesheets/known-issues2document.xsl"/>
<map:serialize type="xml-document"/>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/skinconf.xml?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/skinconf.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/skinconf.xml Tue Apr 1 08:08:24 2008
@@ -91,7 +91,7 @@
<favicon-url></favicon-url>
<!-- The following used to construct a copyright statement -->
- <year>1999-2007</year>
+ <year>1999-2008</year>
<vendor>The Apache Software Foundation.</vendor>
<copyright-link>http://www.apache.org/licenses/</copyright-link>
@@ -164,6 +164,7 @@
.ForrestTable td.partial { background-color: #FFFFCC; text-align: center; }
.ForrestTable td.category { /*background-color: #CFDCED;*/
font-size: 1.2em }
+ .menuitemgroup{ display: block;}
</extra-css>
@@ -311,8 +312,8 @@
portrait).
Supported text alignments are left, right, justify (default left).
-->
- <page size="letter" orientation="portrait" text-align="left"/>
-
+ <page size="letter" orientation="portrait" text-align="justify"/>
+ <page-numbering-format>1</page-numbering-format>
<!--
Margins can be specified for top, bottom, inner, and outer
edges. If double-sided="false", the inner edge is always left
@@ -322,10 +323,10 @@
Specified below are the default settings.
-->
<margins double-sided="false">
- <top>1in</top>
- <bottom>1in</bottom>
+ <top>0.5in</top>
+ <bottom>0.5in</bottom>
<inner>1in</inner>
- <outer>1in</outer>
+ <outer>0.5in</outer>
</margins>
<!--
@@ -372,6 +373,13 @@
<name>ApacheCon Europe 2008</name>
<url>http://eu.apachecon.com/</url>
<image>http://apache.org/ads/ApacheCon/2008-europe-125x125.png</image>
+ <width>125</width>
+ <height>125</height>
+ </credit>
+ <credit box-location="alt2">
+ <name>ApacheCon US 2008</name>
+ <url>http://us.apachecon.com/</url>
+ <image>http://apache.org/ads/ApacheCon/2008-usa-125x125.png</image>
<width>125</width>
<height>125</height>
</credit>
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/apps/FopFactory.java?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/apps/FopFactory.java Tue Apr 1 08:08:24 2008
@@ -46,7 +46,6 @@
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fonts.FontCache;
import org.apache.fop.hyphenation.HyphenationTreeResolver;
-import org.apache.fop.image.ImageFactory;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
import org.apache.fop.render.RendererFactory;
import org.apache.fop.render.XMLHandlerRegistry;
@@ -82,9 +81,6 @@
private ColorSpaceCache colorSpaceCache = null;
- /** Image factory for creating fop image objects */
- private ImageFactory imageFactory;
-
/** Image manager for loading and caching image objects */
private ImageManager imageManager;
@@ -155,7 +151,6 @@
this.elementMappingRegistry = new ElementMappingRegistry(this);
this.foURIResolver = new FOURIResolver(validateUserConfigStrictly());
this.colorSpaceCache = new ColorSpaceCache(foURIResolver);
- this.imageFactory = new ImageFactory();
this.imageManager = new ImageManager(this);
this.rendererFactory = new RendererFactory();
this.xmlHandlers = new XMLHandlerRegistry();
@@ -288,11 +283,6 @@
/** @return the content handler factory registry */
public ContentHandlerFactoryRegistry getContentHandlerFactoryRegistry() {
return this.contentHandlerFactoryRegistry;
- }
-
- /** @return the image factory */
- public ImageFactory getImageFactory() {
- return this.imageFactory;
}
/**
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/cli/InputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/cli/InputHandler.java?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/cli/InputHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/cli/InputHandler.java Tue Apr 1 08:08:24 2008
@@ -39,8 +39,13 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
@@ -150,6 +155,7 @@
try {
InputSource is = new InputSource(new FileInputStream(
this.sourcefile));
+ is.setSystemId(this.sourcefile.toURI().toASCIIString());
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setFeature("http://xml.org/sax/features/namespaces", true);
spf.setFeature("http://apache.org/xml/features/xinclude", true);
@@ -221,7 +227,7 @@
* {@inheritDoc}
*/
public void warning(TransformerException exc) {
- log.warn(exc.toString());
+ log.warn(exc.getLocalizedMessage());
}
/**
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/ElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/ElementMapping.java?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/ElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/ElementMapping.java Tue Apr 1 08:08:24 2008
@@ -19,7 +19,7 @@
package org.apache.fop.fo;
-import java.util.HashMap;
+import java.util.Map;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -37,7 +37,7 @@
public static final String DEFAULT = "<default>";
/** The HashMap table of formatting objects defined by the ElementMapping */
- protected HashMap foObjs = null;
+ protected Map foObjs = null;
/** The namespace for the ElementMapping */
protected String namespaceURI = null;
@@ -47,7 +47,7 @@
*
* @return Table of Maker objects for this ElementMapping
*/
- public HashMap getTable() {
+ public Map getTable() {
if (foObjs == null) {
initialize();
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue Apr 1 08:08:24 2008
@@ -412,6 +412,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("top", l);
// right
@@ -419,6 +420,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("right", l);
// bottom
@@ -426,6 +428,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("bottom", l);
// left
@@ -433,6 +436,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("left", l);
}
@@ -1161,6 +1165,7 @@
m = new LengthProperty.Maker(PR_START_INDENT);
m.setInherited(true);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_REFAREA_WIDTH);
IndentPropertyMaker sCorr = new IndentPropertyMaker(m);
sCorr.setCorresponding(PR_MARGIN_LEFT, PR_MARGIN_RIGHT, PR_MARGIN_TOP);
sCorr.setUseParent(false);
@@ -1177,6 +1182,7 @@
m = new LengthProperty.Maker(PR_END_INDENT);
m.setInherited(true);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_REFAREA_WIDTH);
IndentPropertyMaker eCorr = new IndentPropertyMaker(m);
eCorr.setCorresponding(PR_MARGIN_RIGHT, PR_MARGIN_LEFT, PR_MARGIN_BOTTOM);
eCorr.setUseParent(false);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOTreeBuilder.java Tue Apr 1 08:08:24 2008
@@ -38,7 +38,6 @@
import org.apache.fop.fo.ElementMapping.Maker;
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.image.ImageFactory;
import org.apache.fop.util.ContentHandlerFactory;
import org.apache.fop.util.ContentHandlerFactory.ObjectBuiltListener;
import org.apache.fop.util.ContentHandlerFactory.ObjectSource;
@@ -57,9 +56,7 @@
/** The registry for ElementMapping instances */
protected ElementMappingRegistry elementMappingRegistry;
- /**
- * The root of the formatting object tree
- */
+ /** The root of the formatting object tree */
protected Root rootFObj = null;
/** Main DefaultHandler that handles the FO namespace. */
@@ -68,10 +65,7 @@
/** Current delegate ContentHandler to receive the SAX events */
protected ContentHandler delegate;
- /**
- * The class that handles formatting and rendering to a stream
- * (mark-fop@inomial.com)
- */
+ /** The object that handles formatting and rendering to a stream */
private FOEventHandler foEventHandler;
/** The SAX locator object managing the line and column counters */
@@ -86,14 +80,18 @@
private int depth;
/**
- * FOTreeBuilder constructor
+ * <code>FOTreeBuilder</code> constructor
+ *
* @param outputFormat the MIME type of the output format to use (ex. "application/pdf").
- * @param foUserAgent in effect for this process
- * @param stream OutputStream to direct results
- * @throws FOPException if the FOTreeBuilder cannot be properly created
- */
- public FOTreeBuilder(String outputFormat, FOUserAgent foUserAgent,
- OutputStream stream) throws FOPException {
+ * @param foUserAgent the {@link FOUserAgent} in effect for this process
+ * @param stream the <code>OutputStream</code> to direct the results to
+ * @throws FOPException if the <code>FOTreeBuilder</code> cannot be properly created
+ */
+ public FOTreeBuilder(
+ String outputFormat,
+ FOUserAgent foUserAgent,
+ OutputStream stream)
+ throws FOPException {
this.userAgent = foUserAgent;
this.elementMappingRegistry = userAgent.getFactory().getElementMappingRegistry();
@@ -108,40 +106,25 @@
});
}
- /**
- * This method enables to reduce memory consumption of the FO tree slightly. When it returns
- * true no Locator is passed to the FO tree nodes which would copy the information into
- * a SAX LocatorImpl instance.
- * @return true if no context information should be stored on each node in the FO tree.
- * @deprecated Use FOUserAgent.isLocatorEnabled() instead.
- */
- protected boolean isLocatorDisabled() {
- return !userAgent.isLocatorEnabled();
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setDocumentLocator(Locator locator) {
this.locator = locator;
}
- /** @return a Locator instance if it is available and not disabled */
+ /**
+ * @return a {@link Locator} instance if it is available and not disabled
+ */
protected Locator getEffectiveLocator() {
return (userAgent.isLocatorEnabled() ? this.locator : null);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void characters(char[] data, int start, int length)
throws SAXException {
delegate.characters(data, start, length);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void startDocument() throws SAXException {
if (used) {
throw new IllegalStateException("FOTreeBuilder (and the Fop class) cannot be reused."
@@ -159,9 +142,7 @@
this.delegate = this.mainFOHandler;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void endDocument() throws SAXException {
this.delegate.endDocument();
if (this.rootFObj == null && empty) {
@@ -173,24 +154,16 @@
log.debug("Parsing of document complete");
}
foEventHandler.endDocument();
-
- //Notify the image factory that this user agent has expired.
- ImageFactory imageFactory = userAgent.getFactory().getImageFactory();
- imageFactory.removeContext(this.userAgent);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void startElement(String namespaceURI, String localName, String rawName,
Attributes attlist) throws SAXException {
this.depth++;
delegate.startElement(namespaceURI, localName, rawName, attlist);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void endElement(String uri, String localName, String rawName)
throws SAXException {
this.delegate.endElement(uri, localName, rawName);
@@ -206,7 +179,8 @@
}
/**
- * Finds the Maker used to create node objects of a particular type
+ * Finds the {@link Maker} used to create {@link FONode} objects of a particular type
+ *
* @param namespaceURI URI for the namespace of the element
* @param localName name of the Element
* @return the ElementMapping.Maker that can create an FO object for this element
@@ -218,7 +192,7 @@
/** {@inheritDoc} */
public void warning(SAXParseException e) {
- log.warn(e.toString());
+ log.warn(e.getLocalizedMessage());
}
/** {@inheritDoc} */
@@ -233,7 +207,8 @@
}
/**
- * Provides access to the underlying FOEventHandler object.
+ * Provides access to the underlying {@link FOEventHandler} object.
+ *
* @return the FOEventHandler object
*/
public FOEventHandler getEventHandler() {
@@ -244,6 +219,7 @@
* Returns the results of the rendering process. Information includes
* the total number of pages generated and the number of pages per
* page-sequence.
+ *
* @return the results of the rendering process.
*/
public FormattingResults getResults() {
@@ -257,23 +233,17 @@
}
/**
- * Main DefaultHandler implementation which builds the FO tree.
+ * Main <code>DefaultHandler</code> implementation which builds the FO tree.
*/
private class MainFOHandler extends DefaultHandler {
- /**
- * Current formatting object being handled
- */
+ /** Current formatting object being handled */
protected FONode currentFObj = null;
- /**
- * Current propertyList for the node being handled.
- */
+ /** Current propertyList for the node being handled */
protected PropertyList currentPropertyList;
- /**
- * Current marker nesting-depth
- */
+ /** Current marker nesting-depth */
private int nestedMarkerDepth = 0;
/** {@inheritDoc} */
@@ -298,11 +268,7 @@
} else { // check that incoming node is valid for currentFObj
if (namespaceURI.equals(FOElementMapping.URI)
|| namespaceURI.equals(ExtensionElementMapping.URI)) {
- try {
- currentFObj.validateChildNode(locator, namespaceURI, localName);
- } catch (ValidationException e) {
- throw e;
- }
+ currentFObj.validateChildNode(locator, namespaceURI, localName);
}
}
@@ -391,12 +357,11 @@
if (currentFObj.getParent() == null) {
log.debug("endElement for top-level " + currentFObj.getName());
}
+
currentFObj = currentFObj.getParent();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void characters(char[] data, int start, int length)
throws FOPException {
if (currentFObj != null) {
@@ -405,6 +370,7 @@
}
}
+ /** {@inheritDoc} */
public void endDocument() throws SAXException {
currentFObj = null;
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java?rev=643433&r1=643432&r2=643433&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java Tue Apr 1 08:08:24 2008
@@ -25,8 +25,6 @@
*/
public class EmptyGridUnit extends GridUnit {
- private TableBody body;
-
/**
* @param table the containing table
* @param row the table-row element this grid unit belongs to (if any)
@@ -54,11 +52,6 @@
/** {@inheritDoc} */
public boolean isPrimary() {
return false;
- }
-
- /** {@inheritDoc} */
- public TableBody getBody() {
- return this.body;
}
/** {@inheritDoc} */
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org