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 ph...@apache.org on 2012/05/28 17:31:36 UTC
svn commit: r1343285 [5/24] - in
/xmlgraphics/fop/branches/Temp_URI_Unification: ./ conf/
examples/embedding/ examples/embedding/java/embedding/
examples/embedding/java/embedding/tools/ lib/
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/ja...
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/site.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/site.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -31,6 +31,7 @@
<license label="License" href="license.html"/>
<asf-sponsorship label="ASF Sponsorship Program" href="http://www.apache.org/foundation/sponsorship.html"/>"
<asf-thanks label="ASF Thanks" href="http://www.apache.org/foundation/thanks.html"/>"
+ <asf-security label="Security" href="http://www.apache.org/security/"/>
<!--
<all_site label="Full HTML" href="wholesite.html"/>
<all_sitePDF label="Full PDF" href="wholesite.pdf"/>
@@ -60,7 +61,7 @@
<!--
BEGIN Version 0.95 documentation tab
-->
- <trunk label="FOP 0.95" href="0.95/" tab="previousversion">
+ <trunk label="Apache⢠FOP 0.95" href="0.95/" tab="previousversion">
<about label="About" href="index.html"/>
<release label="Release Notes" href="releaseNotes_0.95.html"/>
<changes label="Changes (0.95)" href="changes_0.95.html"/>
@@ -68,7 +69,7 @@
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
- <using label="Using FOP">
+ <using label="Using Apache⢠FOP">
<build label="Build" href="compiling.html"/>
<config label="Configure" href="configuration.html"/>
<run label="Run" href="running.html"/>
@@ -98,14 +99,14 @@
<!--
BEGIN Version 1.0 documentation tab
-->
- <trunk label="FOP 1.0" href="1.0/" tab="stableversion">
+ <trunk label="Apache⢠FOP 1.0" href="1.0/" tab="stableversion">
<about label="About" href="index.html"/>
<release label="Release Notes" href="releaseNotes_1.0.html"/>
<changes label="Changes (1.0)" href="changes_1.0.html"/>
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
- <using label="Using FOP">
+ <using label="Using Apache⢠FOP">
<build label="Build" href="compiling.html"/>
<config label="Configure" href="configuration.html"/>
<run label="Run" href="running.html"/>
@@ -137,11 +138,11 @@
<!--
BEGIN Trunk documentation tab
-->
- <trunk label="FOP Trunk (dev)" href="trunk/" tab="develversion">
+ <trunk label="Apache⢠FOP Trunk (dev)" href="trunk/" tab="develversion">
<about label="About" href="index.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
- <using label="Using FOP">
+ <using label="Using Apache⢠FOP">
<build label="Build" href="compiling.html"/>
<config label="Configure" href="configuration.html"/>
<run label="Run" href="running.html"/>
@@ -150,19 +151,26 @@
<ant label="Ant Task" href="anttask.html"/>
</using>
+ <!--
+ NOTA BENE NOTA BENE NOTA BENE
+ The following features should be maintained in alphabetic order by
+ (displayed) label value.
+ NOTA BENE NOTA BENE NOTA BENE
+ -->
<features label="Features">
- <output label="Output Targets" href="output.html"/>
- <if label="Intermediate Format" href="intermediate.html"/>
- <pdfencryption label="PDF Encryption" href="pdfencryption.html"/>
- <pdfa label="PDF/A" href="pdfa.html"/>
- <pdfx label="PDF/X" href="pdfx.html"/>
- <graphics label="Graphics" href="graphics.html"/>
+ <accessibility label="Accessibility" href="accessibility.html"/>
+ <complexscripts label="Complex Scripts" href="complexscripts.html"/>
+ <events label="Events" href="events.html"/>
+ <extensions label="Extensions" href="extensions.html"/>
<fonts label="Fonts" href="fonts.html"/>
+ <graphics label="Graphics" href="graphics.html"/>
<hyphenation label="Hyphenation" href="hyphenation.html"/>
- <extensions label="Extensions" href="extensions.html"/>
- <events label="Events" href="events.html"/>
+ <if label="Intermediate Format" href="intermediate.html"/>
<metadata label="Metadata" href="metadata.html"/>
- <accessibility label="Accessibility" href="accessibility.html"/>
+ <output label="Output Targets" href="output.html"/>
+ <pdfa label="PDF/A" href="pdfa.html"/>
+ <pdfx label="PDF/X" href="pdfx.html"/>
+ <pdfencryption label="PDF Encryption" href="pdfencryption.html"/>
</features>
</trunk>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/status.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/status.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,8 +20,8 @@
<!-- Status -->
<document>
<header>
- <title>FOP Status</title>
- <subtitle>Current Status of FOP</subtitle>
+ <title>Apache⢠FOP Status</title>
+ <subtitle>Current Status of Apache⢠FOP</subtitle>
<version>$Revision$</version>
</header>
<body>
@@ -29,7 +29,7 @@
<title>Status</title>
<p>[last updated 5 July 2010]</p>
<p>
- FOP version 0.95 was released on 5 August 2008. FOP version 1.0 was released on 21 July 2010.
+ Apache⢠FOP version 0.95 was released on 5 August 2008. Apache⢠FOP version 1.0 was released on 21 July 2010.
</p>
</section>
<section>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/team.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/team.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
<document>
<header>
- <title>FOP: Development Team</title>
+ <title>Apache⢠FOP: Development Team</title>
<version>$Revision$</version>
</header>
<body>
@@ -31,6 +31,13 @@
<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="ga"><link href="mailto:gadams@apache.org">Glenn Adams</link> (GA)
+ is an independent consultant. He is former technical director of the Unicode Consortium,
+ and a co-author of the Unicode Standard. He served on ISO JTC1/SC2
+ (Coded Character Sets) and JTC1/SC18/WG8 (Document Processing) committees, and was actively
+ involved in the creation of ISO 8879 (SGML), ISO/IEC 9541 (Font Information Interchange),
+ ISO/IEC 10179 (DSSSL), ISO/IEC 10180 (SPDL), ISO/IEC 10646 (Universal Coded Character Set),
+ and, within the W3C, on XSL-FO 1.0.</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="ac"><link href="mailto:acumiskey AT apache.org">Adrian Cumiskey</link> (AC)
@@ -42,12 +49,16 @@
<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="mh"><link href="mailto:mehdi@apache.org">Mehdi Houshmand</link> (MH)
+ is a developer from the UK with a background in Physics.
+ Worked on Flow Cytometry for research and military uses, Telecoms systems and CMS software.
+ Programmed in C/C++, Java and currently learning Python</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
pages since his first webmaster position @brain.com in 1996. Most
- important creation? He's got a couple of cool kids.</li>
- <li id="jm"><link href="mailto:jeremias@apache.org">Jeremias Märki</link> (JM)
+ important creation? He's got a couple of cool kids.</li>
+ <li id="jm"><link href="mailto:jeremias@apache.org">Jeremias M�rki</link> (JM)
is an independent software engineer and consultant from Lucerne, Switzerland. He's also
the creator of <fork href="http://barcode4j.sourceforge.net">Barcode4J</fork>.
See his <fork href="http://www.jeremias-maerki.ch">home page</fork> for more information
@@ -56,7 +67,7 @@
<li id="sp"><link href="mailto:spepping@apache.org">Simon Pepping</link> (SP) came to FOP
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="jp"><link href="mailto:pietsch@apache.org">J�rg Pietschmann</link> (JP)</li>
<li id="ps"><link href="mailto:tcho@club-internet.fr">Pascal Sancho</link> (PS)
is an XML developper from Aix-en-Provence (France). He works on software solutions for
rendering various kind of documents on various supports, more specifically taking care
@@ -70,22 +81,7 @@
Geneon media solutions gmbh in Nuremberg, Germany. He needs FOP to wrestle gigabytes of
electronic data into thousands of printed pages.</li>
<li id="lm">Louis Masters</li>
- <li id="mh">Mehdi Houshmand, Young developer from the UK with a background in Physics.
- Worked on Flow Cytometry for research and military uses, Telecoms systems and CMS software.
- Programmed in C/C++, Java and currently learning Python</li>
- <li id="vr">Vanukuri Venkat Reddy is a Senior Software Engineer in UK, using XML Graphics
- Project and FOP for his work, and is committed to contributing more to the Apache to be part
- a great team.</li>
- <li id="ga">Dr. Glenn Adams is an independent consultant with 45+ years of professional
- software design and development experience in areas ranging from embedded, real-time systems,
- including military, marine and consumer electronics process control and digital signal
- processing applications, to advanced typographic and multilingual text processing systems.
- He is former technical director of the Unicode Consortium, and a co-author of the Unicode Standard.
- He has 25+ years experience in developing international standards, serving on ISO JTC1/SC2
- (Coded Character Sets) and JTC1/SC18/WG8 (Document Processing) committees, and was actively
- involved in the creation of ISO 8879 (SGML), ISO/IEC 9541 (Font Information Interchange),
- ISO/IEC 10179 (DSSSL), ISO/IEC 10180 (SPDL), ISO/IEC 10646 (Universal Coded Character Set),
- and, within the W3C, on XSL-FO 1.0.</li>
+ <li id="lb">Luis Bernardo</li>
</ul>
</section>
<section id="founder">
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/accessibility.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/accessibility.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/accessibility.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/accessibility.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
<document>
<header>
- <title>Accessibility</title>
+ <title>Apache⢠FOP: Accessibility</title>
</header>
<body>
<section id="overview">
@@ -27,7 +27,7 @@
<p>
This page describes the
<a href="http://en.wikipedia.org/wiki/Accessibility">accessibility</a>
- features of Apache FOP.
+ features of Apache⢠FOP.
<a href="http://www.section508.gov/">Section 508</a> defines accessibility in the context
of electronic documents for the USA but other countries have similar requirements.
</p>
@@ -164,4 +164,4 @@
</ul>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/anttask.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/anttask.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/anttask.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/anttask.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,12 +19,12 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Ant task</title>
+ <title>Apache⢠FOP: Ant task</title>
<version>$Revision$</version>
</header>
<body>
<p>
- Apache FOP provides an Ant task for automating the document build process.
+ Apache⢠FOP provides an Ant task for automating the document build process.
</p>
<section id="basics">
<title>Description</title>
@@ -233,5 +233,4 @@
]]></source>
</section>
</body>
-</document>
-
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/compiling.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/compiling.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/compiling.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Apache FOP: Building from Source Code</title>
+ <title>Apache⢠FOP: Building from Source Code</title>
<version>$Revision$</version>
</header>
<body>
@@ -35,7 +35,7 @@
<!-- /text for released versions -->
<!-- text for trunk -->
<p>
- FOP snapshots are either pre-compiled binary or source.
+ Apache⢠FOP snapshots are either pre-compiled binary or source.
If you are using a binary snapshot, it is already built and there is no need to build it again.
If you got the source code from a repository snapshot or via Subversion you will need to build FOP.
See the <a href="../download.html">Download Instructions</a> for information about where to obtain binary or repository snapshots, and whether a
@@ -144,5 +144,4 @@
</ul>
</section>
</body>
-</document>
-
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/configuration.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/configuration.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/configuration.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Apache FOP: Configuration</title>
+ <title>Apache⢠FOP: Configuration</title>
<version>$Revision$</version>
</header>
@@ -27,7 +27,7 @@
<section id="general">
<title>Configuration File Basics</title>
<p>
- The FOP configuration file is an XML file containing a variety of settings that are useful
+ The Apache⢠FOP configuration file is an XML file containing a variety of settings that are useful
for controlling FOP's behavior, and for helping it find resources that you wish it to use.
</p>
<p>
@@ -152,6 +152,21 @@
<td>false</td>
</tr>
<tr>
+ <td>complex-scripts</td>
+ <td>attribute disabled (optional)</td>
+ <td>
+ If present and if an attribute 'disabled' is specified with the value 'false', then
+ complex script features are disabled. The same result can be obtained on an FOP
+ per-invocation basis by specifying a '-nocs' command line option when invoking FOP.
+ When complex script features are disabled, all bidirectional processing and complex
+ character to glyph mapping processing is disabled; in addition, the loading of
+ GDEF, GSUB, and GPOS advanced typographic tables is disabled for OpenType and
+ TrueType fonts. Unless disabled by this mechanism or by use of the '-nocs' command
+ line option, complex script features will be enabled by default.
+ </td>
+ <td>n/a</td>
+ </tr>
+ <tr>
<td>default-page-settings</td>
<td>n/a</td>
<td>
@@ -380,6 +395,18 @@
<noprinthq/>
</encryption-params>
</renderer>]]></source>
+ <p>
+ By default FOP produces PDF files of version 1.4, but this can be changed in order to benefit
+ from features that appeared in newer versions of PDF. At the moment, only a few features from
+ PDF 1.5 have been implemented, but the configuration element will accept any value between
+ 1.4 and 1.7. This is the value that will appear in the PDF header, although only features up
+ to 1.5 will actually be used.
+ <source><![CDATA[
+ <renderer mime="application/pdf">
+ <version>1.5</version>
+ <!-- Versions 1.4, 1.5, 1.6 and 1.7 are accepted, all other values are invalid -->
+ </renderer>]]></source>
+ </p>
</section>
<section id="ps-renderer">
@@ -416,7 +443,7 @@
<p>
Additionally, there are certain settings that control how the renderer handles various elements.
</p>
-<source><![CDATA[<renderer mime="application/vnd.hp-PCL">
+<source><![CDATA[<renderer mime="application/x-pcl">
<rendering>quality</rendering>
<text-rendering>bitmap</text-rendering>
</renderer>]]></source>
@@ -444,6 +471,7 @@
<source><![CDATA[<renderer mime="application/x-afp">
<images mode="b+w" bits-per-pixel="8" native="true"/>
<renderer-resolution>240</renderer-resolution>
+ <line-width-correction>2.5</line-width-correction>
<!-- a default external resource group file -->
<resource-group-file>resources.afp</resource-group-file>
@@ -455,6 +483,9 @@
<p>
The default value for the "renderer-resolution" is 240 dpi.
</p>
+ <p>
+ The default line width is device dependent and may need to be fine tuned so that the output matches the expected result. The default correction value is 2.5.
+ </p>
<!--
<p>
The default value for the MO:DCA "interchange-set" is "MO:DCA-L". Other compliance settings include presentation interchange sets "MO:DCA-P IS/1" and "MO:DCA-P IS/2" (Resource Groups).
@@ -508,4 +539,3 @@ information it finds. Check if FOP finds
</section>
</body>
</document>
-
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/embedding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/embedding.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/embedding.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/embedding.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,7 +20,7 @@
<!-- Embedding FOP -->
<document>
<header>
- <title>Apache FOP: Embedding</title>
+ <title>Apache⢠FOP: Embedding</title>
<subtitle>How to Embed FOP in a Java application</subtitle>
<version>$Revision$</version>
</header>
@@ -29,11 +29,11 @@
<section id="overview">
<title>Overview</title>
<p>
- Review <a href="running.html">Running FOP</a> for important information that applies
+ Review <a href="running.html">Running Apache⢠FOP</a> for important information that applies
to embedded applications as well as command-line use, such as options and performance.
</p>
<p>
- To embed Apache FOP in your application, first create a new
+ To embed Apache⢠FOP in your application, first create a new
org.apache.fop.apps.FopFactory instance. This object can be used to launch multiple
rendering runs. For each run, create a new org.apache.fop.apps.Fop instance through
one of the factory methods of FopFactory. In the method call you specify which output
@@ -749,5 +749,4 @@ mailing list.
</section>
</section>
</body>
-</document>
-
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/events.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/events.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/events.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/events.xml Mon May 28 15:30:46 2012
@@ -19,14 +19,14 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Events/Processing Feedback</title>
+ <title>Apache⢠FOP: Events/Processing Feedback</title>
<version>$Revision$</version>
</header>
<body>
<section id="introduction">
<title>Introduction</title>
<p>
- In versions until 0.20.5, FOP used
+ In versions until 0.20.5, Apache⢠FOP used
<a href="http://excalibur.apache.org/framework/index.html">Avalon-style Logging</a> where
it was possible to supply a logger per processing run. During the redesign
the logging infrastructure was switched over to
@@ -446,4 +446,4 @@ producer.complain(this, "I'm tired", 23)
</section>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/extensions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/extensions.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/extensions.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/extensions.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,14 +19,14 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Standard FOP Extensions</title>
+ <title>Standard Apache⢠FOP Extensions</title>
<version>$Revision$</version>
</header>
<body>
<p>
By "extension", we mean any data that can be placed in the input XML document that
is not addressed by the XSL-FO standard.
- By having a mechanism for supporting extensions, FOP is able to add features that
+ By having a mechanism for supporting extensions, Apache⢠FOP is able to add features that
are not covered in the specification.
</p>
<p>
@@ -336,5 +336,4 @@ to following pages. Here is an example o
</section>
</section>
</body>
-</document>
-
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/fonts.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/fonts.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Apache FOP: Fonts</title>
+ <title>Apache⢠FOP: Fonts</title>
<version>$Revision$</version>
<authors>
<person name="Jeremias Märki" email=""/>
@@ -31,7 +31,7 @@
<body>
<section id="intro">
<title>Summary</title>
- <p>The following table summarizes the font capabilities of the various FOP renderers:</p>
+ <p>The following table summarizes the font capabilities of the various Apache� FOP renderers:</p>
<table>
<tr>
<th>Renderer</th>
@@ -576,4 +576,4 @@
</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/graphics.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/graphics.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/graphics.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/graphics.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Apache FOP: Graphics Formats</title>
+ <title>Apache⢠FOP: Graphics Formats</title>
<version>$Revision$</version>
</header>
<body>
@@ -30,7 +30,7 @@
</p>
<ul>
<li>
- The image libraries Jimi and JAI are not supported. Instead, Apache FOP uses the
+ The image libraries Jimi and JAI are not supported. Instead, Apache⢠FOP uses the
Image I/O API that was introduced with Java 1.4 for all bitmap codecs.
</li>
<li>
@@ -73,65 +73,65 @@
<tr>
<td><a href="#bmp">BMP</a> (Microsoft Windows Bitmap)</td>
<td>bitmap</td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
<td>X [1]</td>
</tr>
<tr>
<td><a href="#emf">EMF</a> (Windows Enhanced Metafile)</td>
<td>vector (with embedded bitmaps)</td>
<td>(X)</td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
</tr>
<tr>
<td><a href="#eps">EPS</a> (Encapsulated PostScript)</td>
<td>metafile (both bitmap and vector), most frequently used for vector drawings</td>
<td>(X)</td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
</tr>
<tr>
<td>GIF (Graphics Interchange Format)</td>
<td>bitmap</td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
<td>X</td>
</tr>
<tr>
<td><a href="#jpeg">JPEG</a> (Joint Photographic Experts Group)</td>
<td>bitmap</td>
<td>(X)</td>
- <td></td>
+ <td/>
<td>X</td>
</tr>
<tr>
<td><a href="#png">PNG</a> (Portable Network Graphic)</td>
<td>bitmap</td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
<td>X</td>
</tr>
<tr>
<td><a href="#svg">SVG</a> (Scalable Vector Graphics)</td>
<td>vector (with embedded bitmaps)</td>
- <td></td>
+ <td/>
<td>X</td>
- <td></td>
+ <td/>
</tr>
<tr>
<td><a href="#tiff">TIFF</a> (Tag Image Format File)</td>
<td>bitmap</td>
<td>(X)</td>
- <td></td>
+ <td/>
<td>X [1]</td>
</tr>
<tr>
<td><a href="#wmf">WMF</a> (Windows Metafile)</td>
<td>vector (with embedded bitmaps)</td>
- <td></td>
+ <td/>
<td>(X)</td>
- <td></td>
+ <td/>
</tr>
</table>
<p>
@@ -149,7 +149,7 @@
<note>
<a href="http://jai-imageio.dev.java.net/">JAI Image I/O Tools</a> is not the same as the
<a href="http://java.sun.com/javase/technologies/desktop/media/jai/">JAI library</a>! The
- former simply exposes JAI's codecs using the Image I/O API but does not include all
+ former simply exposes JAI's codecs using the Image&nbsp;I/O API but does not include all
the image manipulation functionality.
</note>
<section id="format-map">
@@ -181,21 +181,21 @@
</tr>
<tr>
<td><a href="#emf">EMF</a> (Windows Enhanced Metafile)</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
<td>X [1]</td>
</tr>
<tr>
<td><a href="#eps">EPS</a> (Encapsulated PostScript)</td>
- <td></td>
+ <td/>
<td>X [1]</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td/>
+ <td/>
+ <td/>
+ <td/>
</tr>
<tr>
<td>GIF (Graphics Interchange Format)</td>
@@ -361,7 +361,7 @@
<section id="gif">
<title>GIF</title>
<p>
- GIF images are supported through an Image I/O codec. Transparency is supported but
+ GIF images are supported through an Image&nbsp;I/O codec. Transparency is supported but
not guaranteed to work with every output format.
</p>
</section>
@@ -376,14 +376,14 @@
through without decompression. User reports indicate that grayscale, RGB, and
CMYK color spaces are all rendered properly. However, for other output formats, the
JPEG images have to be decompressed. Tests have shown that there are some limitation
- in some Image I/O codecs concerning images in the CMYK color space. Work-arounds are
+ in some Image&nbsp;I/O codecs concerning images in the CMYK color space. Work-arounds are
in place but may not always work as expected.
</p>
</section>
<section id="png">
<title>PNG</title>
<p>
- PNG images are supported through an Image I/O codec. Transparency is supported but
+ PNG images are supported through an Image&nbsp;I/O codec. Transparency is supported but
not guaranteed to work with every output format.
</p>
</section>
@@ -520,7 +520,7 @@
<p>
FOP can embed TIFF images without decompression into PDF, PostScript and AFP if they
have either CCITT T.4, CCITT T.6, or JPEG compression. Otherwise, a TIFF-capable
- Image I/O codec is necessary for decoding the image.
+ Image&nbsp;I/O codec is necessary for decoding the image.
</p>
<p>
There may be some limitation concerning images in the CMYK color space.
@@ -587,4 +587,4 @@
</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/hyphenation.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/hyphenation.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/hyphenation.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/hyphenation.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Apache FOP: Hyphenation</title>
+ <title>Apache⢠FOP: Hyphenation</title>
<version>$Revision$</version>
</header>
<body>
@@ -27,13 +27,13 @@
<title>Hyphenation Support</title>
<section id="intro">
<title>Introduction</title>
- <p>FOP uses Liang's hyphenation algorithm, well known from TeX. It needs
+ <p>Apache⢠FOP uses Liang's hyphenation algorithm, well known from TeX. It needs
language specific pattern and other data for operation.</p>
<p>Because of <a href="#license-issues">licensing issues</a> (and for
convenience), all hyphenation patterns for FOP are made available through
the <a class="fork" href="http://offo.sourceforge.net/hyphenation/index.html">Objects For
Formatting Objects</a> project.</p>
- <note>If you have made improvements to an existing FOP hyphenation pattern,
+ <note>If you have made improvements to an existing Apache⢠FOP hyphenation pattern,
or if you have created one from scratch, please consider contributing these
to OFFO so that they can benefit other FOP users as well.
Please inquire on the <a href="../maillist.html#fop-user">FOP User
@@ -145,16 +145,16 @@
confirming their accuracy, or raising specific problems that we can
address.</warning>
<ul>
- <li>The root of the pattern file is the <hyphenation-info> element.</li>
- <li><hyphen-char>: its attribute "value" contains the character signalling
- a hyphen in the <exceptions> section. It has nothing to do with the
+ <li>The root of the pattern file is the <hyphenation-info> element.</li>
+ <li><hyphen-char>: its attribute "value" contains the character signalling
+ a hyphen in the <exceptions> section. It has nothing to do with the
hyphenation character used in FOP, use the XSLFO hyphenation-character
property for defining the hyphenation character there. At some points
a dash U+002D is hardwired in the code, so you'd better use this too
(patches to rectify the situation are welcome). There is no default,
if you declare exceptions with hyphenations, you must declare the
hyphen-char too.</li>
- <li><hyphen-min> contains two attributes:
+ <li><hyphen-min> contains two attributes:
<ul>
<li>before: the minimum number of characters in a word allowed to exist
on a line immediately preceding a hyphenated word-break.</li>
@@ -164,23 +164,23 @@
This element is unused and not even read. It should be considered a
documentation for parameters used during pattern generation.
</li>
- <li><classes> contains whitespace-separated character sets. The members
+ <li><classes> contains whitespace-separated character sets. The members
of each set should be treated as equivalent for purposes of hyphenation,
usually upper and lower case of the same character. The first character
of the set is the canonical character, the patterns and exceptions
should only contain these canonical representation characters (except
digits for weight, the period (.) as word delimiter in the patterns and
the hyphen char in exceptions, of course).</li>
- <li><exceptions> contains whitespace-separated words, each of which
+ <li><exceptions> contains whitespace-separated words, each of which
has either explicit hyphen characters to denote acceptable breakage
points, or no hyphen characters, to indicate that this word should
- never be hyphenated, or contain explicit <hyp> elements for specifying
- changes of spelling due to hyphenation (like backen -> bak-ken or
- Stoffarbe -> Stoff-farbe in the old german spelling). Exceptions override
- the patterns described below. Explicit <hyp> declarations don't work
+ never be hyphenated, or contain explicit <hyp> elements for specifying
+ changes of spelling due to hyphenation (like backen -> bak-ken or
+ Stoffarbe -> Stoff-farbe in the old german spelling). Exceptions override
+ the patterns described below. Explicit <hyp> declarations don't work
yet (patches welcome). Exceptions are generally a bit brittle, test
carefully.</li>
- <li><patterns> includes whitespace-separated patterns, which are what
+ <li><patterns> includes whitespace-separated patterns, which are what
drive most hyphenation decisions. The characters in these patterns are
explained as follows:
<ul>
@@ -234,4 +234,4 @@
hyphenation.</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/index.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/index.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/index.xml Mon May 28 15:30:46 2012
@@ -19,14 +19,14 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Apache FOP Trunk (Development code)</title>
+ <title>Apache⢠FOP Trunk (Development code)</title>
<version>$Revision$</version>
</header>
<body>
<section id="intro">
<title>Introduction</title>
<p>
- <strong>FOP Trunk</strong> is the name for the current
+ Apache⢠<strong>FOP Trunk</strong> is the name for the current
development code as found in the <a
href="ext:svn-repo/trunk">Subversion repository</a>. This
section of the FOP web site provides the documentation for
@@ -47,4 +47,4 @@
</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/intermediate.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/intermediate.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/intermediate.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/intermediate.xml Mon May 28 15:30:46 2012
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Intermediate Format</title>
+ <title>Apache⢠FOP: Intermediate Format</title>
<version>$Revision$</version>
</header>
<body>
@@ -30,7 +30,7 @@
<section id="introduction">
<title>Introduction</title>
<p>
- Apache FOP now provides two different so-called intermediate formats. The first one
+ Apache⢠FOP now provides two different so-called intermediate formats. The first one
(let's call it the area tree XML format) is basically a 1:1 XML representation of FOP's
area tree as generated by the layout engine. The area tree is conceptually defined in the
<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</a>.
@@ -328,4 +328,4 @@ try {
</section>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/metadata.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/metadata.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/metadata.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/metadata.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
<document>
<header>
- <title>Metadata</title>
+ <title>Apache⢠FOP: Metadata</title>
</header>
<body>
<section id="overview">
@@ -42,7 +42,7 @@
<title>Embedding XMP in an XSL-FO document</title>
<p>
As noted above, there's no officially recommended way to embed metadata in XSL-FO.
- Apache FOP supports embedding XMP in XSL-FO. Currently, only support for document-level
+ Apache⢠FOP supports embedding XMP in XSL-FO. Currently, only support for document-level
metadata is implemented. Object-level metadata will be implemented when there's
interest.
</p>
@@ -240,4 +240,4 @@
</ul>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/output.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/output.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,7 +20,7 @@
<!-- Output Formats: Renderers -->
<document>
<header>
- <title>Apache FOP Output Formats</title>
+ <title>Apache⢠FOP Output Formats</title>
<version>$Revision$</version>
<authors>
<person name="Keiron Liddle" email="keiron@aftexsw.com"/>
@@ -30,7 +30,7 @@
<body>
<p>
- FOP supports multiple output formats by using a different renderer for each format.
+ Apache⢠FOP supports multiple output formats by using a different renderer for each format.
The renderers do not all have the same set of capabilities, sometimes because of
the output format itself, sometimes because some renderers get more development
attention than others.
@@ -406,7 +406,7 @@ out = proc.getOutputStream();]]></source
<p>
The PCL renderer configuration currently allows the following settings:
</p>
-<source><![CDATA[<renderer mime="application/vnd.hp-PCL">
+<source><![CDATA[<renderer mime="application/x-pcl">
<rendering>quality</rendering>
<text-rendering>bitmap</text-rendering>
<disable-pjl>false</disable-pjl>
@@ -757,6 +757,14 @@ Note that the value of the encoding attr
<source><![CDATA[
<renderer-resolution>240</renderer-resolution>]]></source>
</section>
+ <section id="afp-line-width-correction-config">
+ <title>Line Width Correction</title>
+ <p>The default line width in AFP is device dependent. This means that a line width specified in, say,
+ a SVG source file may not render the way it was intended. The output AFP line with can be corrected
+ by the <line-width-correction/> configuration element. Example:</p>
+ <source><![CDATA[
+ <line-width-correction>2.5</line-width-correction>]]></source>
+ </section>
<section id="afp-image-config">
<title>Images</title>
<p>By default the AFP Renderer converts all images to 8 bit grey level.
@@ -797,6 +805,17 @@ Note that the value of the encoding attr
<source><![CDATA[
<images mode="b+w" bits-per-pixel="1" dithering-quality="maximum"/>]]></source>
<p>
+ When the boolean attribute pseg (default false) is set to true, non-inline FS11 and FS45 IOCA images are wrapped in page segment.
+ This option is provided to support printers/print servers that require this MO:DCA structure.
+ </p>
+ <source><![CDATA[
+ <images mode="b+w" bits-per-pixel="8" pseg="true"/>]]></source>
+ <p>
+ Setting the boolean attribute fs45 to true (default false) will force all images to FS45.
+ </p>
+ <source><![CDATA[
+ <images mode="b+w" bits-per-pixel="8" fs45="true"/>]]></source>
+ <p>
By default, JPEG images are rasterized to a bitmap and the bitmap is included in the AFP doc.
However it is possible to encode in a lossless way to maintain maximum quality. But due
to lack of support for compression schemes like LZW (patent concerns), bitmap data is currently
@@ -1089,7 +1108,7 @@ Note that the value of the encoding attr
Please refer to the <link href="#afp-resource-level-defaults">Resource Level Defaults</link>
above to see what is used if the resource-level attribute is not specified.
</p>
- <p></p>
+ <p/>
</section>
</section>
</section>
@@ -1308,6 +1327,7 @@ Note that the value of the encoding attr
a quick-and-dirty view of the document text. The renderer is very limited,
so do not be surprised if it gives unsatisfactory results.
</p>
+ <!-- OBSOLETE OBSOLETE OBSOLETE
<p>
The Text renderer works with a fixed size page buffer. The size of this
buffer is controlled with the textCPI and textLPI public variables.
@@ -1318,6 +1338,7 @@ Note that the value of the encoding attr
Graphic elements (lines, borders, etc) are assigned a lower priority
than text, so text will overwrite any graphic element representations.
</p>
+ -->
<p>
Because FOP lays the text onto a grid during layout, there are frequently
extra or missing spaces between characters and lines, which is generally
@@ -1326,8 +1347,8 @@ Note that the value of the encoding attr
</p>
<ul>
<li>font-family="Courier"</li>
- <li>font-size="7.3pt"</li>
- <li>line-height="10.5pt"</li>
+ <li>font-size="10pt"</li>
+ <li>line-height="10pt"</li>
</ul>
</section>
<section id="sandbox">
@@ -1378,6 +1399,3 @@ Note that the value of the encoding attr
</body>
</document>
-
-
-
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfa.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfa.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfa.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfa.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
<document>
<header>
- <title>PDF/A (ISO 19005)</title>
+ <title>Apache⢠FOP: PDF/A (ISO 19005)</title>
<version>$Revision$</version>
<authors>
<person name="Jeremias Märki" email="jeremias@apache.org"/>
@@ -165,4 +165,4 @@ Fop fop = fopFactory.newFop(MimeConstant
</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfencryption.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfencryption.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfencryption.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>PDF encryption.</title>
+ <title>Apache⢠FOP: PDF encryption.</title>
<version>$Revision$</version>
<authors>
<person name="J.Pietschmann" email="pietsch@apache.org"/>
@@ -30,7 +30,7 @@
<section>
<title>Overview</title>
<p>
- FOP supports encryption of PDF output, thanks to Patrick
+ Apache⢠FOP supports encryption of PDF output, thanks to Patrick
C. Lankswert. This feature is commonly used to prevent
unauthorized viewing, printing, editing, copying text from the
document and doing annotations. It is also possible to ask the
@@ -298,4 +298,4 @@ Fop fop = fopFactory.newFop(MimeConstant
</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfx.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfx.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfx.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/pdfx.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright 2006 The Apache Software Foundation
@@ -18,7 +18,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
<document>
<header>
- <title>PDF/X (ISO 15930)</title>
+ <title>Apache⢠FOP: PDF/X (ISO 15930)</title>
<version>$Revision$</version>
<authors>
<person name="Jeremias Märki" email="jeremias@apache.org"/>
@@ -133,4 +133,4 @@ Fop fop = fopFactory.newFop(MimeConstant
</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/running.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/running.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/running.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Running Apache FOP</title>
+ <title>Running Apache⢠FOP</title>
<version>$Revision$</version>
</header>
@@ -32,13 +32,13 @@
Java 1.4.x or later Runtime Environment.
<ul>
<li>
- Many JREs >=1.4 contain older JAXP implementations (which often contain bugs). It's
+ Many JREs >=1.4 contain older JAXP implementations (which often contain bugs). It's
usually a good idea to replace them with a current implementation.
</li>
</ul>
</li>
<li>
- Apache FOP. The <a href="../download.html">FOP distribution</a> includes all libraries that you will
+ Apache⢠FOP. The <a href="../download.html">FOP distribution</a> includes all libraries that you will
need to run a basic FOP installation. These can be found in the [fop-root]/lib directory. These
libraries include the following:
<ul>
@@ -117,6 +117,7 @@ Fop [options] [-fo|-xml] infile [-xsl fi
-q quiet mode
-c cfg.xml use additional configuration file cfg.xml
-l lang the language to use for user information
+ -nocs disable complex script features
-r relaxed/less strict validation (where available)
-dpi xxx target resolution in dots per inch (dpi) where xxx is a number
-s for area tree XML, down to block areas only
@@ -209,8 +210,8 @@ Fop [options] [-fo|-xml] infile [-xsl fi
<title>Writing your own script</title>
<p>FOP's entry point for your own scripts is the class
<code>org.apache.fop.cli.Main</code>. The general pattern for the
- command line is: <code>java -classpath <CLASSPATH>
- org.apache.fop.cli.Main <arguments></code>. The arguments
+ command line is: <code>java -classpath <CLASSPATH>
+ org.apache.fop.cli.Main <arguments></code>. The arguments
consist of the options and infile and outfile specifications
as shown above for the standard scripts. You may wish to review
the standard scripts to make sure that
@@ -221,7 +222,7 @@ Fop [options] [-fo|-xml] infile [-xsl fi
<title>Running with java's <code>-jar</code> option</title>
<p>
As an alternative to the start scripts you can run <code>java
- -jar path/to/build/fop.jar <arguments></code>, relying on
+ -jar path/to/build/fop.jar <arguments></code>, relying on
FOP to build the classpath for running FOP dynamically, see <a
href="#dynamical-classpath">below</a>. If you use hyphenation,
you must put <code>fop-hyph.jar</code> in the <code>lib</code>
@@ -229,7 +230,7 @@ Fop [options] [-fo|-xml] infile [-xsl fi
</p>
<p>You can also run <code>java -jar path/to/fop.jar
- <arguments></code>, relying on the <code>Class-Path</code>
+ <arguments></code>, relying on the <code>Class-Path</code>
entry in the manifest file. This works if you put
<code>fop.jar</code> and all jar files from the <code>lib</code>
directory in a single directory. If you use hyphenation, you
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/servlets.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/servlets.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/servlets.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/servlets.xml Mon May 28 15:30:46 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,15 +19,15 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Servlets</title>
- <subtitle>How to use Apache FOP in a Servlet</subtitle>
+ <title>Apache⢠FOP: Servlets</title>
+ <subtitle>How to use Apache⢠FOP in a Servlet</subtitle>
<version>$Revision$</version>
</header>
<body>
<section id="overview">
<title>Overview</title>
<p>
- This page discusses topic all around using Apache FOP in a servlet environment.
+ This page discusses topic all around using Apache⢠FOP in a servlet environment.
</p>
</section>
<section id="example-servlets">
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/upgrading.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/upgrading.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/upgrading.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/trunk/upgrading.xml Mon May 28 15:30:46 2012
@@ -19,14 +19,14 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Upgrading from an Earlier Version of Apache FOP</title>
+ <title>Upgrading from an Earlier Version of Apache⢠FOP</title>
<version>$Revision$</version>
</header>
<body>
<section id="important">
<title>Important!</title>
<p>
- If you're planning to upgrade to the latest FOP version there are a few very important things
+ If you're planning to upgrade to the latest Apache⢠FOP version there are a few very important things
to consider:
</p>
<ul>
@@ -119,4 +119,4 @@
</ul>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd Mon May 28 15:30:46 2012
@@ -66,11 +66,8 @@
<xs:attribute name="y" use="required" type="mf:lengthType"/>
<xs:attribute name="letter-spacing" type="mf:lengthType"/>
<xs:attribute name="word-spacing" type="mf:lengthType"/>
- <xs:attribute name="dx">
- <xs:simpleType>
- <xs:list itemType="mf:lengthType"/>
- </xs:simpleType>
- </xs:attribute>
+ <xs:attribute name="dx" type="mf:lengthListType"/>
+ <xs:attribute name="dp" type="mf:dpListType"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -100,10 +97,10 @@
<xs:element name="border-rect">
<xs:complexType>
<xs:attributeGroup ref="mf:rectAtts"/>
- <xs:attribute name="start" type="mf:borderDef"/>
- <xs:attribute name="end" type="mf:borderDef"/>
- <xs:attribute name="before" type="mf:borderDef"/>
- <xs:attribute name="after" type="mf:borderDef"/>
+ <xs:attribute name="left" type="mf:borderDef"/>
+ <xs:attribute name="right" type="mf:borderDef"/>
+ <xs:attribute name="top" type="mf:borderDef"/>
+ <xs:attribute name="bottom" type="mf:borderDef"/>
</xs:complexType>
</xs:element>
<xs:element name="image">
@@ -141,4 +138,22 @@
<xs:attributeGroup name="foreignAtts">
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:attributeGroup>
+ <xs:attribute name="xmlSpace">
+ <!--
+ This is a copy of the definition of the xml:space attribute, from the schema for the XML
+ namespace. That schema can be found at http://www.w3.org/2001/xml.xsd.
+
+ Ideally we would want to re-use that schema. However, we donât want to refer to it using an
+ import statement is it causes too many connections to the W3C website. Neither can we store a
+ local copy and ship it with FOP as its license is the W3C Document License and so far we are not
+ allowed to redistribute files under such a license.
+ See also https://issues.apache.org/jira/browse/LEGAL-111
+ -->
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="default"/>
+ <xs:enumeration value="preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:schema>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd Mon May 28 15:30:46 2012
@@ -103,4 +103,22 @@
<xs:length value="4"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="dpListType">
+ <xs:list itemType="mf:dpItemType"/>
+ </xs:simpleType>
+ <xs:simpleType name="dpItemType">
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="mf:lengthType"/>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:restriction base="mf:dpZeroesType"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ <xs:simpleType name="dpZeroesType">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="Z(\d)+"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd Mon May 28 15:30:46 2012
@@ -20,8 +20,6 @@
targetNamespace="http://xmlgraphics.apache.org/fop/intermediate"
xmlns:mf="http://xmlgraphics.apache.org/fop/intermediate"
xmlns:nav="http://xmlgraphics.apache.org/fop/intermediate/document-navigation">
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="xml.xsd"/>
<xs:import namespace="http://xmlgraphics.apache.org/fop/intermediate/document-navigation"
schemaLocation="fop-intermediate-format-ng-nav.xsd"/>
<xs:import namespace="adobe:ns:meta/" schemaLocation="xmp-metadata.xsd"/>
@@ -36,6 +34,7 @@
<xs:element ref="mf:page-sequence" minOccurs="1" maxOccurs="unbounded"/>
<xs:element ref="mf:trailer"/>
</xs:sequence>
+ <xs:attribute name="version" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="header">
@@ -70,7 +69,7 @@
<xs:element ref="mf:page" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
- <xs:attribute ref="xml:space"/>
+ <xs:attribute ref="mf:xmlSpace"/>
<xs:attributeGroup ref="mf:foreignAtts"/>
</xs:complexType>
</xs:element>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/resources/images/group-logo.gif
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/resources/images/group-logo.gif?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/skinconf.xml?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/skinconf.xml (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/skinconf.xml Mon May 28 15:30:46 2012
@@ -148,6 +148,10 @@ See main/fresh-site/src/documentation/sk
<!-- The normal content should be at natural size -->
#content { font-size: 100%; }
+ .tw30 { width: 30% !important; }
+ .tw70 { width: 70% !important; }
+ .tw80 { width: 80% !important; }
+
p.quote {
margin-left: 2em;
padding: .5em;
@@ -376,6 +380,7 @@ See main/fresh-site/src/documentation/sk
<height>125</height>
</credit>
-->
+ <!--
<credit box-location="alt2">
<name>ApacheCon NA 2011</name>
<url>http://www.apachecon.com/</url>
@@ -383,6 +388,7 @@ See main/fresh-site/src/documentation/sk
<width>125</width>
<height>125</height>
</credit>
+ -->
<credit role="pdf">
<name>PDF created by Apache FOP</name>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/foschema/fop-configuration.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/foschema/fop-configuration.xsd?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/foschema/fop-configuration.xsd (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/foschema/fop-configuration.xsd Mon May 28 15:30:46 2012
@@ -48,6 +48,11 @@
<xsd:attribute name="height" type="xsd:string"></xsd:attribute>
</xsd:complexType>
</xsd:element>
+ <xsd:element name="complex-scripts" minOccurs="0"
+ <xsd:complexType>
+ <xsd:attribute name="disabled" type="xsd:boolean"/>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="renderers" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java Mon May 28 15:30:46 2012
@@ -34,7 +34,7 @@ public final class DummyStructureTreeEve
private DummyStructureTreeEventHandler() { }
/** {@inheritDoc} */
- public void startPageSequence(Locale locale) {
+ public void startPageSequence(Locale locale, String role) {
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java Mon May 28 15:30:46 2012
@@ -30,6 +30,7 @@ import org.apache.fop.fo.FOElementMappin
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fo.extensions.InternalElementMapping;
import org.apache.fop.render.intermediate.IFConstants;
+import org.apache.fop.util.XMLConstants;
/**
* Converts structure tree events to SAX events.
@@ -52,16 +53,19 @@ public final class StructureTree2SAXEven
}
/** {@inheritDoc} */
- public void startPageSequence(Locale locale) {
+ public void startPageSequence(Locale locale, String role) {
try {
-
+ AttributesImpl attributes = new AttributesImpl();
+ if (role != null) {
+ attributes.addAttribute("", "type", "type", XMLConstants.CDATA, role);
+ }
contentHandler.startPrefixMapping(
InternalElementMapping.STANDARD_PREFIX, InternalElementMapping.URI);
contentHandler.startPrefixMapping(
ExtensionElementMapping.STANDARD_PREFIX, ExtensionElementMapping.URI);
contentHandler.startElement(IFConstants.NAMESPACE,
IFConstants.EL_STRUCTURE_TREE, IFConstants.EL_STRUCTURE_TREE,
- new AttributesImpl());
+ attributes);
} catch (SAXException e) {
throw new RuntimeException(e);
}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java Mon May 28 15:30:46 2012
@@ -34,8 +34,9 @@ public interface StructureTreeEventHandl
* Starts a page sequence structure tree node.
*
* @param locale The locale of the page sequence
+ * @param role the value of the role property. May be null.
*/
- void startPageSequence(Locale locale);
+ void startPageSequence(Locale locale, String role);
/**
* Starts a structure tree node.
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java Mon May 28 15:30:46 2012
@@ -89,7 +89,8 @@ class StructureTreeEventTrigger extends
locale = new Locale(pageSeq.getLanguage());
}
}
- structureTreeEventHandler.startPageSequence(locale);
+ String role = pageSeq.getCommonAccessibility().getRole();
+ structureTreeEventHandler.startPageSequence(locale, role);
}
@Override
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPBorderPainter.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPBorderPainter.java Mon May 28 15:30:46 2012
@@ -60,13 +60,6 @@ public class AFPBorderPainter extends Ab
float y2 = unitConv.pt2units(borderPaintInfo.getY2());
switch (paintingState.getRotation()) {
- default:
- case 0:
- x1 += at.getTranslateX();
- y1 += at.getTranslateY();
- x2 += at.getTranslateX();
- y2 += at.getTranslateY();
- break;
case 90:
x1 += at.getTranslateY();
y1 += (float) (pageWidth - at.getTranslateX());
@@ -85,6 +78,13 @@ public class AFPBorderPainter extends Ab
x2 += x1;
y2 += (float) at.getTranslateX();
break;
+ case 0:
+ default:
+ x1 += at.getTranslateX();
+ y1 += at.getTranslateY();
+ x2 += at.getTranslateX();
+ y2 += at.getTranslateY();
+ break;
}
AFPLineDataInfo lineDataInfo = new AFPLineDataInfo();
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPConstants.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPConstants.java Mon May 28 15:30:46 2012
@@ -50,4 +50,15 @@ public interface AFPConstants {
* 72dpi in millipoints
*/
int DPI_72_MPTS = DPI_72 * 1000;
+
+ /**
+ * The line width is set as a multiplier of a default line with; the width of the default
+ * line width is implementation defined, which probably means different devices use different
+ * actual widths; this means that the source line width (as specified in, say, a SVG line
+ * element) needs to be corrected by a fudge factor that depends on the output device so that
+ * the final output (print to paper, screen viewer) looks as intended.
+ */
+ float LINE_WIDTH_CORRECTION = 2.5f;
+
}
+
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPGraphics2D.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPGraphics2D.java Mon May 28 15:30:46 2012
@@ -26,7 +26,6 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
-import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
import java.awt.Paint;
@@ -264,14 +263,6 @@ public class AFPGraphics2D extends Abstr
return length * factor;
}
- /** IBM's AFP Workbench paints lines that are wider than expected. We correct manually. */
- private static final double GUESSED_WIDTH_CORRECTION = 1.7;
-
- private static final double SPEC_NORMAL_LINE_WIDTH = UnitConv.in2pt(0.01); //"approx" 0.01 inch
- private static final double NORMAL_LINE_WIDTH
- = SPEC_NORMAL_LINE_WIDTH * GUESSED_WIDTH_CORRECTION;
-
-
/**
* Apply the stroke to the AFP graphics object.
* This takes the java stroke and outputs the appropriate settings
@@ -283,17 +274,11 @@ public class AFPGraphics2D extends Abstr
if (stroke instanceof BasicStroke) {
BasicStroke basicStroke = (BasicStroke) stroke;
- // set line width
+ // set line width and correct it; NOTE: apparently we need to correct the width so that the
+ // output looks OK since the default with depends on the output device
float lineWidth = basicStroke.getLineWidth();
- if (false) {
- //Old approach. Retained until verified problems with 1440 resolution
- graphicsObj.setLineWidth(Math.round(lineWidth / 2));
- } else {
- double absoluteLineWidth = lineWidth * Math.abs(getTransform().getScaleY());
- double multiplier = absoluteLineWidth / NORMAL_LINE_WIDTH;
- graphicsObj.setLineWidth((int)Math.round(multiplier));
- //TODO Use GSFLW instead of GSLW for higher accuracy?
- }
+ float correction = paintingState.getLineWidthCorrection();
+ graphicsObj.setLineWidth(lineWidth * correction);
//No line join, miter limit and end cap support in GOCA. :-(
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPImageObjectInfo.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPImageObjectInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPImageObjectInfo.java Mon May 28 15:30:46 2012
@@ -132,4 +132,4 @@ public class AFPImageObjectInfo extends
+ ", " + (isSubtractive() ? "subtractive" : "additive")
+ "}";
}
-}
\ No newline at end of file
+}
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPPaintingState.java?rev=1343285&r1=1343284&r2=1343285&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPPaintingState.java (original)
+++ xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/AFPPaintingState.java Mon May 28 15:30:46 2012
@@ -79,11 +79,24 @@ public class AFPPaintingState extends or
/** the output resolution */
private int resolution = 240; // 240 dpi
+ /**
+ * A configurable value to correct the line width so that the output matches the expected. Different
+ * devices may need different values.
+ */
+ private float lineWidthCorrection = AFPConstants.LINE_WIDTH_CORRECTION;
+
/** determines whether GOCA is enabled or disabled */
private boolean gocaEnabled = true;
/** determines whether to stroke text in GOCA mode or to use text operators where possible */
private boolean strokeGocaText = false;
+
+ /** use page segment with F11 and F45 images*/
+ private boolean pSeg;
+
+ /** use FS45 images*/
+ private boolean fs45;
+
/** the current page */
private transient AFPPagePaintingState pagePaintingState = new AFPPagePaintingState();
@@ -316,6 +329,18 @@ public class AFPPaintingState extends or
}
/**
+ * Sets the line width correction
+ *
+ * @param correction the line width multiplying factor correction
+ */
+ public void setLineWidthCorrection(float correction) {
+ if (log.isDebugEnabled()) {
+ log.debug("line width correction set to: " + correction);
+ }
+ this.lineWidthCorrection = correction;
+ }
+
+ /**
* Returns the output/device resolution.
*
* @return the resolution in dpi
@@ -325,6 +350,14 @@ public class AFPPaintingState extends or
}
/**
+ * Returns the line width correction.
+ * @return the correction
+ */
+ public float getLineWidthCorrection() {
+ return this.lineWidthCorrection;
+ }
+
+ /**
* Controls whether GOCA is enabled or disabled.
* @param enabled true if GOCA is enabled, false if it is disabled
*/
@@ -356,6 +389,41 @@ public class AFPPaintingState extends or
return this.strokeGocaText;
}
+ /**
+ * Whether FS11 and SF45 non-inline images should be wrapped in a page segment
+ * @return true iff images should be wrapped
+ */
+ public boolean getWrapPSeg() {
+ return pSeg;
+ }
+
+ /**
+ * Sets whether FS11 and FS45 non-inline images should be wrapped in a page segment
+ * @param pSeg true iff images should be wrapped
+ */
+ public void setWrapPSeg(boolean pSeg) {
+ this.pSeg = pSeg;
+ }
+
+
+ /**
+ * gets whether images should be FS45
+ * @return true iff images should be FS45
+ */
+ public boolean getFS45() {
+ return fs45;
+ }
+
+ /**
+ * sets whether images should be FS45
+ * @param fs45 true iff images should be FS45
+ */
+ public void setFS45(boolean fs45) {
+ this.fs45 = fs45;
+ }
+
+
+
/** {@inheritDoc} */
@Override
protected AbstractData instantiateData() {
@@ -685,4 +753,4 @@ public class AFPPaintingState extends or
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org