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 vh...@apache.org on 2009/08/03 13:50:34 UTC
svn commit: r800320 [2/2] - in
/xmlgraphics/fop/branches/Temp_ChangingIPDHack: ./
examples/embedding/java/embedding/atxml/ examples/embedding/xml/xslt/
examples/fo/advanced/ lib/ src/documentation/content/xdocs/trunk/
src/java/META-INF/services/ src/ja...
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/PCLRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/PCLRenderer.java Mon Aug 3 11:50:32 2009
@@ -289,6 +289,12 @@
gen.selectPaperSource(Integer.parseInt(paperSource));
}
+ //Output bin
+ String outputBin = page.getForeignAttributeValue(PCLElementMapping.PCL_OUTPUT_BIN);
+ if (outputBin != null) {
+ gen.selectOutputBin(Integer.parseInt(outputBin));
+ }
+
// Is Page duplex?
String pageDuplex = page.getForeignAttributeValue(PCLElementMapping.PCL_DUPLEX_MODE);
if (pageDuplex != null) {
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java Mon Aug 3 11:50:32 2009
@@ -40,6 +40,10 @@
public static final QName PCL_PAPER_SOURCE
= new QName(PCLElementMapping.NAMESPACE, null, "paper-source");
+ /** The extension attribute for the PCL output bin */
+ public static final QName PCL_OUTPUT_BIN
+ = new QName(PCLElementMapping.NAMESPACE, null, "output-bin");
+
/** The extension attribute for the PCL duplex mode */
public static final QName PCL_DUPLEX_MODE
= new QName(PCLElementMapping.NAMESPACE, null, "duplex-mode");
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java Mon Aug 3 11:50:32 2009
@@ -20,7 +20,10 @@
package org.apache.fop.render.pdf;
import java.awt.Dimension;
+import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.util.Map;
@@ -37,6 +40,8 @@
import org.apache.fop.pdf.PDFReference;
import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFResources;
+import org.apache.fop.render.extensions.prepress.PageBoundariesAttributes;
+import org.apache.fop.render.extensions.prepress.PageScaleAttributes;
import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
import org.apache.fop.render.intermediate.IFContext;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
@@ -166,13 +171,53 @@
throws IFException {
this.pdfResources = this.pdfDoc.getResources();
+ String bleedWidth = (String) getContext().getForeignAttribute(
+ PageBoundariesAttributes.EXT_BLEED);
+ String cropOffset = (String) getContext().getForeignAttribute(
+ PageBoundariesAttributes.EXT_CROP_OFFSET);
+ String cropBoxValue = (String) getContext().getForeignAttribute(
+ PageBoundariesAttributes.EXT_CROP_BOX);
+
+ Rectangle trimBox = new Rectangle(0, 0,
+ (int) size.getWidth(), (int) size.getHeight());
+ Rectangle bleedBox
+ = PageBoundariesAttributes.getBleedBoxRectangle(trimBox, bleedWidth);
+ Rectangle mediaBox
+ = PageBoundariesAttributes.getMediaBoxRectangle(trimBox, cropOffset);
+
+ Rectangle cropBox = PageBoundariesAttributes.getCropBoxRectangle(
+ trimBox, bleedBox, mediaBox, cropBoxValue);
+
+ // set scale attributes
+ double scaleX = 1;
+ double scaleY = 1;
+ String scale = (String) getContext().getForeignAttribute(
+ PageScaleAttributes.EXT_PAGE_SCALE);
+ Point2D scales = PageScaleAttributes.getScaleAttributes(scale);
+ if (scales != null) {
+ scaleX = scales.getX();
+ scaleY = scales.getY();
+ }
+
this.currentPage = this.pdfDoc.getFactory().makePage(
- this.pdfResources,
- (int)Math.round(size.getWidth() / 1000),
- (int)Math.round(size.getHeight() / 1000),
- index);
- //pageReferences.put(new Integer(index)/*page.getKey()*/, currentPage.referencePDF());
- //pvReferences.put(page.getKey(), page);
+ this.pdfResources,
+ index,
+ new Rectangle2D.Double(mediaBox.getX() * scaleX / 1000,
+ mediaBox.getY() * scaleY / 1000,
+ mediaBox.getWidth() * scaleX / 1000,
+ mediaBox.getHeight() * scaleY / 1000),
+ new Rectangle2D.Double(cropBox.getX() * scaleX / 1000,
+ cropBox.getY() * scaleY / 1000,
+ cropBox.getWidth() * scaleX / 1000,
+ cropBox.getHeight() * scaleY / 1000),
+ new Rectangle2D.Double(bleedBox.getX() * scaleX / 1000,
+ bleedBox.getY() * scaleY / 1000,
+ bleedBox.getWidth() * scaleX / 1000,
+ bleedBox.getHeight() * scaleY / 1000),
+ new Rectangle2D.Double(trimBox.getX() * scaleX / 1000,
+ trimBox.getY() * scaleY / 1000,
+ trimBox.getWidth() * scaleX / 1000,
+ trimBox.getHeight() * scaleY / 1000));
pdfUtil.generatePageLabel(index, name);
@@ -182,7 +227,8 @@
this.generator = new PDFContentGenerator(this.pdfDoc, this.outputStream, this.currentPage);
// Transform the PDF's default coordinate system (0,0 at lower left) to the PDFPainter's
AffineTransform basicPageTransform = new AffineTransform(1, 0, 0, -1, 0,
- size.height / 1000f);
+ (scaleY * size.height) / 1000f);
+ basicPageTransform.scale(scaleX, scaleY);
generator.concatenate(basicPageTransform);
}
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java Mon Aug 3 11:50:32 2009
@@ -144,15 +144,20 @@
if (pdfAction != null) {
return pdfAction;
} else if (action instanceof GoToXYAction) {
- GoToXYAction a = (GoToXYAction)action;
- PDFGoTo pdfGoTo = new PDFGoTo(null);
- getPDFDoc().assignObjectNumber(pdfGoTo);
- if (action.isComplete()) {
- updateTargetLocation(pdfGoTo, a);
+ pdfAction = (PDFAction) incompleteActions.get(action.getID());
+ if (pdfAction != null) {
+ return pdfAction;
} else {
- this.incompleteActions.put(action.getID(), pdfGoTo);
+ GoToXYAction a = (GoToXYAction)action;
+ PDFGoTo pdfGoTo = new PDFGoTo(null);
+ getPDFDoc().assignObjectNumber(pdfGoTo);
+ if (action.isComplete()) {
+ updateTargetLocation(pdfGoTo, a);
+ } else {
+ this.incompleteActions.put(action.getID(), pdfGoTo);
+ }
+ return pdfGoTo;
}
- return pdfGoTo;
} else if (action instanceof URIAction) {
URIAction u = (URIAction)action;
assert u.isComplete();
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.java Mon Aug 3 11:50:32 2009
@@ -30,7 +30,12 @@
public interface PDFEventProducer extends EventProducer {
/** Provider class for the event producer. */
- class Provider {
+ final class Provider {
+
+ /**
+ * Utility classes should not have a public or default constructor.
+ */
+ private Provider() { }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml Mon Aug 3 11:50:32 2009
@@ -1,3 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><catalogue xml:lang="en">
+<?xml version="1.0" encoding="UTF-8"?>
+<catalogue xml:lang="en">
<message key="org.apache.fop.render.pdf.PDFEventProducer.nonFullyResolvedLinkTargets">{count} link target{count,equals,1,,s} could not be fully resolved and now point{count,equals,1,,s} to the top of the page or {count,equals,1,is,are} dysfunctional.</message>
</catalogue>
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/pdf/PDFRenderer.java Mon Aug 3 11:50:32 2009
@@ -457,9 +457,8 @@
}
currentPageRef = currentPage.referencePDF();
- Rectangle2D bounds = page.getViewArea();
- double h = bounds.getHeight();
- pageHeight = (int) h;
+ Rectangle bounds = page.getViewArea();
+ pageHeight = bounds.height;
this.generator = new PDFContentGenerator(this.pdfDoc, this.ostream, this.currentPage);
this.borderPainter = new PDFBorderPainter(this.generator);
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/ps/PSRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/ps/PSRenderer.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/ps/PSRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/org/apache/fop/render/ps/PSRenderer.java Mon Aug 3 11:50:32 2009
@@ -815,8 +815,8 @@
{page.getPageNumberString(),
new Integer(this.currentPageNumber)});
- double pageWidth = Math.round(page.getViewArea().getWidth()) / 1000f;
- double pageHeight = Math.round(page.getViewArea().getHeight()) / 1000f;
+ double pageWidth = page.getViewArea().width / 1000f;
+ double pageHeight = page.getViewArea().height / 1000f;
boolean rotate = false;
List pageSizes = new java.util.ArrayList();
if (getPSUtil().isAutoRotateLandscape() && (pageHeight < pageWidth)) {
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFPainter:684572
-/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:796809
+/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:784730-800312
/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFPainter:603620-685574
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:784730-796742,796809
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:784730-800312
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:784730-796742,796809
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:784730-800312
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/org/apache/fop/render/svg/SVGPainterMaker.java:684572
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java:796809
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java:784730-800312
/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainterMaker.java:603620-685574
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/org/apache/fop/render/svg/SVGPrintPainter.java:684572
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java:796809
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java:784730-800312
/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintPainter.java:603620-685574
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/org/apache/fop/render/svg/SVGPrintPainterMaker.java:684572
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java:796809
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java:784730-800312
/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintPainterMaker.java:603620-685574
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/status.xml?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/status.xml Mon Aug 3 11:50:32 2009
@@ -58,6 +58,22 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="JM" type="add" fixes-bug="47311" due-to="Peter Coppens">
+ Added an initial set of extensions for prepress support (fox:bleed, fox:crop-offset,
+ fox:crop-box and fox:scale). This is currently supported only by PDF and Java2D renderers.
+ </action>
+ <action context="Renderers" dev="JM" type="add">
+ PCL Output: Added support for specifying the output bin.
+ </action>
+ <action context="Renderers" dev="JM" type="add">
+ AFP Output: Added support for embedding external AFP form maps (form defs) using the
+ afp:include-form-map extension.
+ </action>
+ <action context="Renderers" dev="JM" type="add">
+ AFP Output: Added support for AFP font embedding. Note: this changes the default behaviour.
+ Like with PDF and PS, all fonts are embedded by default unless matched in the
+ "referenced-fonts" section in the configuration.
+ </action>
<action context="Renderers" dev="AD" type="fix" fixes-bug="47508" due-to="Bharat Attaluri">
Bugfix: Error while writing TLE's attribute qualifier in the output.
</action>
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/StandardTestSuite.java?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/StandardTestSuite.java Mon Aug 3 11:50:32 2009
@@ -31,6 +31,7 @@
import org.apache.fop.render.pdf.PDFEncodingTestCase;
import org.apache.fop.render.pdf.PDFsRGBSettingsTestCase;
import org.apache.fop.render.rtf.RichTextFormatTestSuite;
+import org.apache.fop.render.extensions.PrepressTest;
/**
* Test suite for basic functionality of FOP.
@@ -56,6 +57,7 @@
suite.addTest(new TestSuite(ImageLoaderTestCase.class));
suite.addTest(new TestSuite(ImagePreloaderTestCase.class));
suite.addTest(new TestSuite(IFMimickingTestCase.class));
+ suite.addTest(new TestSuite(PrepressTest.class));
//$JUnit-END$
return suite;
}
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java:603620-746655
-/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java:796809
+/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java:784730-800312
/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java:603620-677588
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java:603620-746655
-/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java:796809
+/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java:784730-800312
/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java:603620-677588
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/IFParserTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 3 11:50:32 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/IFParserTestCase.java:603620-746655
/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java:603620-677588
-/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java:796809
+/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java:784730-800312
Modified: xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/afp-extension_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/afp-extension_1.xml?rev=800320&r1=800319&r2=800320&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/afp-extension_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/layoutengine/standard-testcases/afp-extension_1.xml Mon Aug 3 11:50:32 2009
@@ -36,8 +36,13 @@
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
+
+ <fo:declarations>
+ <afp:include-form-map name="FORMMAP1" src="file:../../resources/afp/F1SAMPLE.afp"/>
+ </fo:declarations>
+
<fo:page-sequence master-reference="normal" fox:test-ignore="this">
- <afp:invoke-medium-map name="MYMAP"/>
+ <afp:invoke-medium-map name="NOPAR"/>
<afp:tag-logical-element name="foo" value="bar"/>
<fo:flow flow-name="xsl-region-body">
<fo:block>Text on page <fo:page-number/>.</fo:block>
@@ -47,6 +52,9 @@
</fo:root>
</fo>
<checks xmlns:afp="apache:fop:extensions:afp">
+ <eval expected="FORMMAP1" xpath="/areaTree/extension-attachments/afp:include-form-map/@name"/>
+ <eval expected="file:../../resources/afp/F1SAMPLE.afp" xpath="/areaTree/extension-attachments/afp:include-form-map/@src"/>
+
<eval expected="4" xpath="count(/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*)"/>
<eval expected="O1SAMP1 " xpath="/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*[1]/@name"/>
<eval expected="S1ISLOGO" xpath="/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*[2]/@name"/>
@@ -57,7 +65,7 @@
<eval expected="4" xpath="count(/areaTree/pageSequence/pageViewport[@nr=2]/page/extension-attachments/child::*)"/>
<eval expected="2" xpath="count(/areaTree/pageSequence/extension-attachments/child::*)"/>
- <eval expected="MYMAP" xpath="/areaTree/pageSequence/extension-attachments/child::*[1]/@name"/>
+ <eval expected="NOPAR" xpath="/areaTree/pageSequence/extension-attachments/child::*[1]/@name"/>
<eval expected="bar" xpath="/areaTree/pageSequence/extension-attachments/afp:tag-logical-element[@name = 'foo']/@value"/>
<!-- This just tests if extension attributes make it through to the PageSequence object. -->
@@ -65,6 +73,9 @@
</checks>
<if-checks xmlns:if="http://xmlgraphics.apache.org/fop/intermediate"
xmlns:afp="apache:fop:extensions:afp">
+ <eval expected="FORMMAP1" xpath="/if:document/if:header/afp:include-form-map/@name"/>
+ <eval expected="file:../../resources/afp/F1SAMPLE.afp" xpath="/if:document/if:header/afp:include-form-map/@src"/>
+
<eval expected="4" xpath="count(//if:page[@name = '1']/if:page-header/child::*)"/>
<eval expected="O1SAMP1 " xpath="//if:page[@name = '1']/if:page-header/afp:include-page-overlay[1]/@name"/>
<eval expected="S1ISLOGO" xpath="//if:page[@name = '1']/if:page-header/afp:include-page-segment[1]/@name"/>
@@ -74,7 +85,7 @@
<eval expected="4" xpath="count(//if:page[@name = '2']/if:page-header/child::*)"/>
- <eval expected="MYMAP" xpath="//if:page-sequence/afp:invoke-medium-map/@name"/>
+ <eval expected="NOPAR" xpath="//if:page-sequence/afp:invoke-medium-map/@name"/>
<eval expected="bar" xpath="//if:page-sequence/afp:tag-logical-element[@name = 'foo']/@value"/>
<!-- This just tests if extension attributes make it through to the PageSequence object. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org