Author: jeremias
Date: Fri Feb 4 08:14:41 2011
New Revision: 1067109
URL: http://svn.apache.org/viewvc?rev=1067109&view=rev
Log:
Bugzilla #50705:
Fix to preserve the order of AFP TLEs and NOPs as given in the XSL-FO document.
Submitted by: Mehdi Houshmand <med1985.at.gmail.com>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java?rev=1067109&r1=1067108&r2=1067109&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
Fri Feb 4 08:14:41 2011
@@ -57,11 +57,8 @@ public abstract class AbstractPageObject
/** The current presentation text object */
private PresentationTextObject currentPresentationTextObject = null;
- /** The list of tag logical elements */
- protected List/*<TagLogicalElement>*/ tagLogicalElements = null;
-
/** The list of objects within this resource container */
- protected List/*<AbstractStructuredAFPObject>*/ objects = new
java.util.ArrayList();
+ protected List/*<AbstractStructuredObject>*/ objects = new
java.util.ArrayList();
/** The page width */
private int width;
@@ -217,10 +214,10 @@ public abstract class AbstractPageObject
* @return the TLEs
*/
protected List getTagLogicalElements() {
- if (tagLogicalElements == null) {
- this.tagLogicalElements = new
java.util.ArrayList/*<TagLogicalElement>*/();
+ if (objects == null) {
+ this.objects = new
java.util.ArrayList/*<AbstractStructuredObject>*/();
}
- return this.tagLogicalElements;
+ return this.objects;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java?rev=1067109&r1=1067108&r2=1067109&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java Fri
Feb 4 08:14:41 2011
@@ -72,7 +72,6 @@ public class Overlay extends PageObject
getActiveEnvironmentGroup().writeToStream(os);
- writeObjects(tagLogicalElements, os);
writeObjects(objects, os);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java?rev=1067109&r1=1067108&r2=1067109&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java Fri
Feb 4 08:14:41 2011
@@ -76,12 +76,6 @@ public class PageGroup extends AbstractR
}
/** {@inheritDoc} */
- protected void writeContent(OutputStream os) throws IOException {
- writeObjects(tagLogicalElements, os, true);
- super.writeContent(os);
- }
-
- /** {@inheritDoc} */
protected void writeStart(OutputStream os) throws IOException {
byte[] data = new byte[17];
copySF(data, Type.BEGIN, Category.PAGE_GROUP);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java?rev=1067109&r1=1067108&r2=1067109&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java Fri
Feb 4 08:14:41 2011
@@ -185,7 +185,6 @@ public class PageObject extends Abstract
getActiveEnvironmentGroup().writeToStream(os);
- writeObjects(tagLogicalElements, os);
writeObjects(objects, os);
}
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1067109&r1=1067108&r2=1067109&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Feb 4 08:14:41 2011
@@ -59,6 +59,9 @@
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="fix" fixes-bug="50705"
due-to="Mehdi Houshmand">
+ Fix to preserve the order of AFP TLEs and NOPs as given in the XSL-FO
document.
+ </action>
<action context="Fonts" dev="JM" type="add" fixes-bug="50699"
due-to="Alexandros Papadakis">
Added support for lookup of alternative glyphs when additional
single-byte encodings are
used, ex. replacing "Omegagreek" by "Omega" and vice versa.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
