Author: vhennebert
Date: Tue Oct 27 18:16:31 2009
New Revision: 830280
URL: http://svn.apache.org/viewvc?rev=830280&view=rev
Log:
Merged changes from Trunk up to revision 830265
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/ (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/conf/fop.xconf
xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/atxml/ExampleConcat.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/atxml/ExampleStamp.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/xml/xslt/ifstamp.xsl
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/InputHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventFormatter.xml
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/ResourceEventProducer.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractRenderingContext.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerBase.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
(props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/IFParserTestCase.java
(props changed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 18:16:31 2009
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AFPGOCAResources:630874-721418
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:745924-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
-/xmlgraphics/fop/trunk:603620-829121
+/xmlgraphics/fop/trunk:603620-830265
Modified: xmlgraphics/fop/branches/Temp_Accessibility/conf/fop.xconf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/conf/fop.xconf?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/conf/fop.xconf (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/conf/fop.xconf Tue Oct 27
18:16:31 2009
@@ -443,10 +443,6 @@
</renderer>
-->
- <renderer mime="text/plain">
- <pageSize columns="80"/>
- </renderer>
-
</renderers>
</fop>
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/atxml/ExampleConcat.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/atxml/ExampleStamp.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/xml/xslt/ifstamp.xsl
('svn:mergeinfo' removed)
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
Tue Oct 27 18:16:31 2009
@@ -704,8 +704,15 @@
]]></source>
<p>When the native attribute is specified and set to "true", all image
resources will be natively injected
into the datastream using an object container rather than being
converted into an IOCA FS45 image.
- Support for native image formats (e.g. JPEG, GIF) is not always
available on printer implementations
+ Support for native image formats (e.g. JPEG, TIFF, GIF) is not always
available on printer implementations
so by default this configuration option is set to "false".</p>
+ <p>
+ Setting <code>cmyk="true"</code> on the <code>images</code> element
will enable CMYK
+ colors. This will only have an effect if the color mode is set to
"color". Example:
+ </p>
+ <source><![CDATA[
+ <images mode="color" cmyk="true"/>
+]]></source>
</section>
<section id="afp-shading-config">
<title>Shading</title>
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
('svn:mergeinfo' removed)
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
Tue Oct 27 18:16:31 2009
@@ -1028,7 +1028,11 @@
case IF_INPUT:
return new IFInputHandler(iffile);
case XSLT_INPUT:
- return new InputHandler(xmlfile, xsltfile, xsltParams,
useCatalogResolver);
+ InputHandler handler = new InputHandler(xmlfile, xsltfile,
xsltParams);
+ if (useCatalogResolver) {
+ handler.createCatalogResolver(foUserAgent);
+ }
+ return handler;
case IMAGE_INPUT:
return new ImageInputHandler(imagefile, xsltfile, xsltParams);
default:
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/InputHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/InputHandler.java?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/InputHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/InputHandler.java
Tue Oct 27 18:16:31 2009
@@ -51,6 +51,7 @@
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
+import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.render.awt.viewer.Renderable;
/**
@@ -64,8 +65,8 @@
protected File sourcefile;
private File stylesheet; // for XML/XSLT usage
private Vector xsltParams; // for XML/XSLT usage
- private EntityResolver entityResolver;
- private URIResolver uriResolver;
+ private EntityResolver entityResolver = null;
+ private URIResolver uriResolver = null;
/** the logger */
protected Log log = LogFactory.getLog(InputHandler.class);
@@ -85,23 +86,6 @@
}
/**
- * Constructor for XML->XSLT->FO input
- *
- * @param xmlfile XML file
- * @param xsltfile XSLT file
- * @param params Vector of command-line parameters (name, value,
- * name, value, ...) for XSL stylesheet, null if none
- * @param useCatalogResolver if true, use a catalog resolver
- * for XML parsing and XSLT URI resolution
- */
- public InputHandler(File xmlfile, File xsltfile, Vector params, boolean
useCatalogResolver) {
- this(xmlfile, xsltfile, params);
- if (useCatalogResolver) {
- createCatalogResolver();
- }
- }
-
- /**
* Constructor for FO input
* @param fofile the file to read the FO document.
*/
@@ -213,10 +197,12 @@
* Tries the Apache Commons Resolver, and if unsuccessful,
* tries the same built into Java 6.
*/
- private void createCatalogResolver() {
+ public void createCatalogResolver(FOUserAgent userAgent) {
String[] classNames = new String[] {
"org.apache.xml.resolver.tools.CatalogResolver",
"com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver"};
+ ResourceEventProducer eventProducer =
+
ResourceEventProducer.Provider.get(userAgent.getEventBroadcaster());
Class resolverClass = null;
for (int i = 0; i < classNames.length && resolverClass == null; ++i) {
try {
@@ -226,7 +212,7 @@
}
}
if (resolverClass == null) {
- log.error("Could not find catalog resolver in class path");
+ eventProducer.catalogResolverNotFound(this);
return;
}
try {
@@ -234,8 +220,10 @@
uriResolver = (URIResolver) resolverClass.newInstance();
} catch (InstantiationException e) {
log.error("Error creating the catalog resolver: " +
e.getMessage());
+ eventProducer.catalogResolverNotCreated(this, e.getMessage());
} catch (IllegalAccessException e) {
log.error("Error creating the catalog resolver: " +
e.getMessage());
+ eventProducer.catalogResolverNotCreated(this, e.getMessage());
}
}
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventFormatter.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventFormatter.xml?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventFormatter.xml
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventFormatter.xml
Tue Oct 27 18:16:31 2009
@@ -79,6 +79,8 @@
<message
key="org.apache.fop.events.ResourceEventProducer.foreignXMLNoHandler">Some XML
content will be ignored. No handler defined for XML with namespace
"{namespaceURI}".</message>
<message
key="org.apache.fop.events.ResourceEventProducer.imageWritingError">Error while
writing an image to the target file.[ Reason: {e}]</message>
<message
key="org.apache.fop.events.ResourceEventProducer.cannotDeleteTempFile">Temporary
file could not be deleted: {tempFile}</message>
+ <message
key="org.apache.fop.events.ResourceEventProducer.catalogResolverNotFound">Catalog
resolver not found along the classpath</message>
+ <message
key="org.apache.fop.events.ResourceEventProducer.catalogResolverNotCreated">Error
creating the catalog resolver: {message}</message>
<message
key="org.apache.fop.layoutmgr.inline.InlineLevelEventProducer.leaderWithoutContent">fo:leader
is set to "use-content" but has no content.{{locator}}</message>
<message
key="org.apache.fop.layoutmgr.inline.InlineLevelEventProducer.lineOverflows">Line
{line} of a paragraph overflows the available area by
{overflowLength,choice,50000#{overflowLength} millipoints|50000<more than 50
points}.{{locator}}</message>
<message
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.rowTooTall">The contents
of table-row {row} are taller than they should be (there is a
block-progression-dimension or height constraint on the indicated row). Due to
its contents the row grows to {effCellBPD} millipoints, but the row shouldn't
get any taller than {maxCellBPD} millipoints.{{locator}}</message>
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/ResourceEventProducer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/ResourceEventProducer.java?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/ResourceEventProducer.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/ResourceEventProducer.java
Tue Oct 27 18:16:31 2009
@@ -133,4 +133,18 @@
*/
void cannotDeleteTempFile(Object source, File tempFile);
+ /**
+ * Catalog Resolver not found along the class path
+ * @param source the event source
+ * @event.severity ERROR
+ */
+ void catalogResolverNotFound(Object source);
+
+ /**
+ * Catalog Resolver not created, due to InstantiationException or
IllegalAccessException
+ * @param source the event source
+ * @param message the exception message
+ * @event.severity ERROR
+ */
+ void catalogResolverNotCreated(Object source, String message);
}
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=830280&r1=830279&r2=830280&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
Tue Oct 27 18:16:31 2009
@@ -117,10 +117,6 @@
this.layoutListener = layoutListener;
best = new BestPageRecords();
this.footnoteSeparatorLength = (MinOptMax)
footnoteSeparatorLength.clone();
- // add some stretch, to avoid a restart for every page containing
footnotes
- if (footnoteSeparatorLength.min == footnoteSeparatorLength.max) {
- footnoteSeparatorLength.max += 10000;
- }
this.autoHeight = autoHeight;
this.favorSinglePart = favorSinglePart;
}
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractRenderingContext.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerBase.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandlerMaker.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/IFParserTestCase.java
('svn:mergeinfo' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
