Author: acumiskey
Date: Fri May 2 09:48:57 2008
New Revision: 652813
URL: http://svn.apache.org/viewvc?rev=652813&view=rev
Log:
Merged revisions
652456,652465,652467,652520,652525,652565,652581-652582,652673-652674 via
svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r652456 | adelmelle | 2008-05-01 10:16:05 +0100 (Thu, 01 May 2008) | 3 lines
Tweak: activate max-height/min-height and max-width/min-width
........
r652465 | adelmelle | 2008-05-01 10:52:24 +0100 (Thu, 01 May 2008) | 3 lines
Added enum "none" as a legitimate value for max-height/min-height (behavior
to be checked)
Added small testcase to check the correspondence mapping.
........
r652467 | adelmelle | 2008-05-01 11:01:51 +0100 (Thu, 01 May 2008) | 3 lines
Minor cleanup: remove height/width members and unused getHeight()/getWidth()
accessors
........
r652520 | acumiskey | 2008-05-01 14:46:21 +0100 (Thu, 01 May 2008) | 2 lines
Renamed variable
........
r652525 | acumiskey | 2008-05-01 15:01:54 +0100 (Thu, 01 May 2008) | 2 lines
Forgot about dependency on PrintRenderer, last commit broke the build - will
commit this rename later.
........
r652565 | adelmelle | 2008-05-01 17:15:44 +0100 (Thu, 01 May 2008) | 2 lines
Javadoc corrections
........
r652581 | jeremias | 2008-05-01 18:15:49 +0100 (Thu, 01 May 2008) | 1 line
Website fixes.
........
r652582 | jeremias | 2008-05-01 18:16:57 +0100 (Thu, 01 May 2008) | 1 line
DSC = Document Structuring Conventions!
........
r652673 | adelmelle | 2008-05-01 22:34:19 +0100 (Thu, 01 May 2008) | 2 lines
First steps towards fo:retrieve-table-marker
........
r652674 | adelmelle | 2008-05-01 22:39:17 +0100 (Thu, 01 May 2008) | 1 line
Code style: single class imports only...
........
Added:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
- copied unchanged from r652674,
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java
- copied unchanged from r652674,
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/ipd_bpd_corresponding.fo
- copied unchanged from r652674,
xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/table_retrieve-table-marker.fo
- copied unchanged from r652674,
xmlgraphics/fop/trunk/test/fotree/testcases/table_retrieve-table-marker.fo
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/compliance.ihtml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/news.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOElementMapping.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ps/PSRenderer.java
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 2 09:48:57 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-652071
+/xmlgraphics/fop/trunk:1-652808
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
Fri May 2 09:48:57 2008
@@ -324,6 +324,18 @@
</li>
</ul>
</section>
+ <section id="imageio">
+ <title>Image I/O</title>
+ <p>
+ The image loading framework in <a
href="ext:xmlgraphics.apache.org/commons">XML Graphics Commons</a>
+ provides a wrapper to load images through the
+ <a class="fork"
href="http://java.sun.com/j2se/1.4.2/docs/guide/imageio/index.html";>JDK's Image
I/O API</a> (JSR 015).
+ Image I/O allows to dynamically add additional image codecs. An
example of such an
+ add-on library are the
+ <a class="fork"
href="http://java.sun.com/products/java-media/jai/";>JAI Image I/O Tools</a>
+ available from Sun.
+ </p>
+ </section>
</section>
<section id="image-formats">
<title>Details on image formats</title>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/compliance.ihtml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/compliance.ihtml?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/compliance.ihtml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/compliance.ihtml
Fri May 2 09:48:57 2008
@@ -3995,7 +3995,7 @@
<td class="no">no</td>
- <td class="no">no</td>
+ <td class="yes">yes</td>
<td align="center"> </td>
</tr>
@@ -4014,7 +4014,7 @@
<td class="no">no</td>
- <td class="no">no</td>
+ <td class="yes">yes</td>
<td align="center"> </td>
</tr>
@@ -4033,7 +4033,7 @@
<td class="no">no</td>
- <td class="no">no</td>
+ <td class="yes">yes</td>
<td align="center"> </td>
</tr>
@@ -4052,7 +4052,7 @@
<td class="no">no</td>
- <td class="no">no</td>
+ <td class="yes">yes</td>
<td align="center"> </td>
</tr>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/news.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/news.xml?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/news.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/news.xml
Fri May 2 09:48:57 2008
@@ -16,9 +16,7 @@
limitations under the License.
-->
<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-
"http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co";>
-
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
<header>
<title>News</title>
@@ -87,7 +85,7 @@
</p>
<p>
Please see also the
- <link
href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/[EMAIL
PROTECTED]">announcement</link>.
+ <a
href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/[EMAIL
PROTECTED]">announcement</a>.
<!-- TODO re-enable and the <link
href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
</p>
</section>
@@ -99,7 +97,7 @@
<title>20 October 2004 - Creation of the Apache XML Graphics
project</title>
<p>
The Apache Board of Directors agreed to the creation of the
- <link href="http://xmlgraphics.apache.org";>Apache XML Graphics</link>
+ <a href="http://xmlgraphics.apache.org";>Apache XML Graphics</a>
project which will be comprised of Batik and FOP. Both former
Apache XML subprojects are in this way complying with the Board's
desire
to improve project oversight. Both project teams also see additional
@@ -152,8 +150,8 @@
</ul>
<p>
See also the full text of the
- <link href="http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]&msgNo=6067">
- announcement</link>.
+ <a href="http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]&msgNo=6067">
+ announcement</a>.
<!-- TODO re-enable and the <link
href="relnotes.html#FOP+0.20.5">release notes</link>.-->
</p>
</section>
@@ -164,15 +162,15 @@
<section>
<title>23 May 2003 - FOP 0.20.5 Release Candidate 3 available</title>
<p>
- See the full text of the <link
- href="http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]&msgNo=5429">announcement</link>.
+ See the full text of the <a
+ href="http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]&msgNo=5429">announcement</a>.
</p>
</section>
<section>
<title>18 February 2003 - FOP 0.20.5 Release Candidate 2
available</title>
<p>
- See the full text of the <link
- href="http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]&msgNo=4509">announcement</link>.
+ See the full text of the <a
+ href="http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]&msgNo=4509">announcement</a>.
</p>
</section>
<section>
@@ -189,16 +187,16 @@
<section>
<title>23 December 2002 - Official FOP Wiki</title>
<p>
- See <link href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages";
- >FOP project pages</link> at the ApacheWiki.
+ See <a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages";
+ >FOP project pages</a> at the ApacheWiki.
</p>
</section>
<section>
<title>10 December 2002 - FOP 0.20.5 Release Candidate available</title>
<p>
- See the full text of the <link
+ See the full text of the <a
href="http://marc.theaimsgroup.com/?l=fop-user&m=103954279712704&w=2";
- >announcement</link>.
+ >announcement</a>.
</p>
</section>
<section>
@@ -206,7 +204,7 @@
<p>
The EXSLFO project is a community effort to define functional extensions
to thet XSL Formatting Objects specification. See the
- <link href="http://exslfo.sourceforge.net";>EXSLFO website</link> for
details.
+ <a href="http://exslfo.sourceforge.net";>EXSLFO website</a> for details.
</p>
</section>
<section>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
Fri May 2 09:48:57 2008
@@ -324,6 +324,18 @@
</li>
</ul>
</section>
+ <section id="imageio">
+ <title>Image I/O</title>
+ <p>
+ The image loading framework in <a
href="ext:xmlgraphics.apache.org/commons">XML Graphics Commons</a>
+ provides a wrapper to load images through the
+ <a class="fork"
href="http://java.sun.com/j2se/1.4.2/docs/guide/imageio/index.html";>JDK's Image
I/O API</a> (JSR 015).
+ Image I/O allows to dynamically add additional image codecs. An
example of such an
+ add-on library are the
+ <a class="fork"
href="http://java.sun.com/products/java-media/jai/";>JAI Image I/O Tools</a>
+ available from Sun.
+ </p>
+ </section>
</section>
<section id="image-formats">
<title>Details on image formats</title>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
Fri May 2 09:48:57 2008
@@ -19,7 +19,8 @@
<catalogue xml:lang="en">
<message key="locator">[ (See position {loc})| (See {#gatherContextInfo})|
(No context info available)]</message>
<message key="rule.markerDescendantOfFlow">An fo:marker is permitted only as
the descendant of an fo:flow.</message>
- <message key="rule.retrieveMarkerDescendatOfStaticContent">An
fo:retrieve-marker is permitted only as the descendant of an
fo:static-content.</message>
+ <message key="rule.retrieveMarkerDescendantOfStaticContent">An
fo:retrieve-marker is permitted only as the descendant of an
fo:static-content.</message>
+ <message key="rule.retrieveTableMarkerDescendantOfHeaderOrFooter">An
fo:retrieve-table-marker is permitted only as the descendant of an
fo:table-header or an fo:table-footer.</message>
<message key="rule.bidiOverrideContent">An fo:bidi-override that is a
descendant of an fo:leader or of the fo:inline child of an fo:footnote may not
have block-level children, unless it has a nearer ancestor that is an
fo:inline-container.</message>
<message key="rule.inlineContent">An fo:inline that is a descendant of an
fo:leader or fo:footnote may not have block-level children, unless it has a
nearer ancestor that is an fo:inline-container.</message>
<message key="rule.childOfSPM">The element must be a child of
fo:simple-page-master.</message>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java
Fri May 2 09:48:57 2008
@@ -159,8 +159,10 @@
int FO_PAGE_SEQUENCE_WRAPPER = 60;
/** FO element constant - XSL 1.1 */
int FO_PAGE_NUMBER_CITATION_LAST = 61;
+ /** FO element constant - XSL 1.1 */
+ int FO_RETRIEVE_TABLE_MARKER = 62;
/** Number of FO element constants defined */
- int FRM_OBJ_COUNT = 61;
+ int FRM_OBJ_COUNT = 62;
// Masks
/**
@@ -688,8 +690,12 @@
int PR_X_WIDOW_CONTENT_LIMIT = 252;
/** Property constant - FOP proprietary: limit for orphan content in lists
and tables */
int PR_X_ORPHAN_CONTENT_LIMIT = 253;
+ /** Property constant */
+ int PR_RETRIEVE_POSITION_WITHIN_TABLE = 254;
+ /** Property constant */
+ int PR_RETRIEVE_BOUNDARY_WITHIN_TABLE = 255;
/** Number of property constants defined */
- int PROPERTY_COUNT = 253;
+ int PROPERTY_COUNT = 255;
// compound property constants
@@ -1097,6 +1103,16 @@
int EN_REPLACE = 189;
/** Enumeration constant -- for fo:basic-link show-destination */
int EN_NEW = 190;
+ /** Enumeration constant -- for fo:retrieve-table-marker */
+ int EN_FIRST_STARTING = 191;
+ /** Enumeration constant -- for fo:retrieve-table-marker */
+ int EN_LAST_STARTING = 192;
+ /** Enumeration constant -- for fo:retrieve-table-marker */
+ int EN_LAST_ENDING = 193;
+ /** Enumeration constant -- for fo:retrieve-table-marker */
+ int EN_TABLE = 194;
+ /** Enumeration constant -- for fo:retrieve-table-marker */
+ int EN_TABLE_FRAGMENT = 195;
/** Number of enumeration constants defined */
- int ENUM_COUNT = 190;
+ int ENUM_COUNT = 195;
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOElementMapping.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOElementMapping.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOElementMapping.java
Fri May 2 09:48:57 2008
@@ -135,6 +135,7 @@
foObjs.put("wrapper", new WrapperMaker());
foObjs.put("marker", new MarkerMaker());
foObjs.put("retrieve-marker", new RetrieveMarkerMaker());
+ foObjs.put("retrieve-table-marker", new
RetrieveTableMarkerMaker());
}
}
@@ -514,4 +515,9 @@
}
}
+ static class RetrieveTableMarkerMaker extends ElementMapping.Maker {
+ public FONode make(FONode parent) {
+ return new org.apache.fop.fo.flow.RetrieveTableMarker(parent);
+ }
+ }
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/FOPropertyMapping.java
Fri May 2 09:48:57 2008
@@ -1423,27 +1423,33 @@
addPropertyMaker("inline-progression-dimension", m);
// max-height
- m = new ToBeImplementedProperty.Maker(PR_MAX_HEIGHT);
+ m = new LengthProperty.Maker(PR_MAX_HEIGHT);
+ m.addEnum("NONE", getEnumProperty(EN_NONE, "NONE"));
m.setInherited(false);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("max-height", m);
// max-width
- m = new ToBeImplementedProperty.Maker(PR_MAX_WIDTH);
+ m = new LengthProperty.Maker(PR_MAX_WIDTH);
+ m.addEnum("NONE", getEnumProperty(EN_NONE, "NONE"));
m.setInherited(false);
m.setDefault("none");
+ m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("max-width", m);
// min-height
- m = new ToBeImplementedProperty.Maker(PR_MIN_HEIGHT);
+ m = new LengthProperty.Maker(PR_MIN_HEIGHT);
m.setInherited(false);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("min-height", m);
// min-width
- m = new ToBeImplementedProperty.Maker(PR_MIN_WIDTH);
+ m = new LengthProperty.Maker(PR_MIN_WIDTH);
m.setInherited(false);
- m.setDefault("");
+ m.setDefault(""); //UA dependent
+ m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("min-width", m);
// scaling
@@ -2091,6 +2097,25 @@
m.addEnum("document", getEnumProperty(EN_DOCUMENT, "DOCUMENT"));
m.setDefault("page-sequence");
addPropertyMaker("retrieve-boundary", m);
+
+ // retrieve-position-within-table
+ m = new EnumProperty.Maker(PR_RETRIEVE_POSITION_WITHIN_TABLE);
+ m.setInherited(false);
+ m.addEnum("first-starting", getEnumProperty(EN_FIRST_STARTING,
"FIRST_STARTING"));
+ m.addEnum("first-including-carryover", getEnumProperty(EN_FIC, "FIC"));
+ m.addEnum("last-starting", getEnumProperty(EN_LAST_STARTING,
"LAST_STARTING"));
+ m.addEnum("last-ending", getEnumProperty(EN_LAST_ENDING,
"LAST_ENDING"));
+ m.setDefault("first-starting");
+ addPropertyMaker("retrieve-position-within-table", m);
+
+ // retrieve-boundary-within-table
+ m = new EnumProperty.Maker(PR_RETRIEVE_BOUNDARY_WITHIN_TABLE);
+ m.setInherited(false);
+ m.addEnum("table", getEnumProperty(EN_TABLE, "TABLE"));
+ m.addEnum("table-fragment", getEnumProperty(EN_TABLE_FRAGMENT,
"TABLE_FRAGMENT"));
+ m.addEnum("page", getEnumProperty(EN_DOCUMENT, "PAGE"));
+ m.setDefault("table");
+ addPropertyMaker("retrieve-boundary-within-table", m);
}
private void createNumberToStringProperties() {
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java
Fri May 2 09:48:57 2008
@@ -48,7 +48,6 @@
private int breakBefore;
// private ToBeImplementedProperty clip;
private int displayAlign;
- private Length height;
private LengthRangeProperty inlineProgressionDimension;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
@@ -56,7 +55,6 @@
private int overflow;
private Numeric referenceOrientation;
private int span;
- private Length width;
private int writingMode;
// Unused but valid items, commented out for performance:
// private int intrusionDisplace;
@@ -87,7 +85,6 @@
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
// clip = pList.get(PR_CLIP);
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
- height = pList.get(PR_HEIGHT).getLength();
inlineProgressionDimension =
pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
@@ -95,7 +92,6 @@
overflow = pList.get(PR_OVERFLOW).getEnum();
referenceOrientation =
pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
span = pList.get(PR_SPAN).getEnum();
- width = pList.get(PR_WIDTH).getLength();
writingMode = pList.get(PR_WRITING_MODE).getEnum();
}
@@ -225,16 +221,6 @@
return writingMode;
}
- /** @return the "width" property */
- public Length getWidth() {
- return width;
- }
-
- /** @return the "height" property */
- public Length getHeight() {
- return height;
- }
-
/** [EMAIL PROTECTED] */
public String getLocalName() {
return "block-container";
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java
Fri May 2 09:48:57 2008
@@ -28,7 +28,7 @@
import org.apache.fop.fo.ValidationException;
/**
- * Class modelling the <a href=http://www.w3.org/TR/xsl/#fo_footnote";>
+ * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_footnote";>
* <code>fo:footnote</code></a> object.
*/
public class Footnote extends FObj {
@@ -40,7 +40,8 @@
private FootnoteBody footnoteBody;
/**
- * Base constructor
+ * Create a Footnote instance that is a child of the
+ * given [EMAIL PROTECTED] FONode}
*
* @param parent [EMAIL PROTECTED] FONode} that is the parent of this
object
*/
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java
Fri May 2 09:48:57 2008
@@ -29,7 +29,7 @@
import org.apache.fop.fo.ValidationException;
/**
- * Class modelling the <a href=http://www.w3.org/TR/xsl/#fo_footnote-body";>
+ * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_footnote-body";>
* <code>fo:footnote-body</code></a> object.
*/
public class FootnoteBody extends FObj {
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
Fri May 2 09:48:57 2008
@@ -30,7 +30,7 @@
import org.apache.fop.fo.properties.SpaceProperty;
/**
- * Class modelling the <a
href=http://www.w3.org/TR/xsl/#fo_initial-property-set";>
+ * Class modelling the <a
href="http://www.w3.org/TR/xsl/#fo_initial-property-set";>
* <code>fo:initial-property-set</code></a> object.
*/
public class InitialPropertySet extends FObj {
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
Fri May 2 09:48:57 2008
@@ -23,29 +23,25 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FOText;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.flow.table.Table;
-import org.apache.fop.fo.flow.table.TableFObj;
import org.xml.sax.Locator;
+import org.xml.sax.Attributes;
/**
- * Class modelling the fo:retrieve-marker object.
+ * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_retrieve-marker";>
+ * <code>fo:retrieve-marker</code></a> formatting object.
* This will create a layout manager that will retrieve
* a marker based on the information.
*/
-public class RetrieveMarker extends FObjMixed {
+public class RetrieveMarker extends AbstractRetrieveMarker {
+
// The value of properties relevant for fo:retrieve-marker.
private String retrieveClassName;
private int retrievePosition;
private int retrieveBoundary;
// End of property values
- private PropertyList propertyList;
-
/**
* Create a new RetrieveMarker instance that is a
* child of the given [EMAIL PROTECTED] FONode}.
@@ -56,12 +52,26 @@
super(parent);
}
- /** [EMAIL PROTECTED] */
- public void bind(PropertyList pList) throws FOPException {
+ /**
+ * [EMAIL PROTECTED]
+ * <i>NOTE: An <code>fo:retrieve-marker</code> is only permitted as a
descendant
+ * of an <code>fo:static-content</code>.</i>
+ */
+ public void processNode(String elementName,
+ Locator locator,
+ Attributes attlist,
+ PropertyList pList)
+ throws FOPException {
if (findAncestor(FO_STATIC_CONTENT) < 0) {
invalidChildError(locator, getParent().getName(), FO_URI,
getName(),
- "rule.retrieveMarkerDescendatOfStaticContent");
+ "rule.retrieveMarkerDescendantOfStaticContent");
+ } else {
+ super.processNode(elementName, locator, attlist, pList);
}
+ }
+
+ /** [EMAIL PROTECTED] */
+ public void bind(PropertyList pList) throws FOPException {
retrieveClassName = pList.get(PR_RETRIEVE_CLASS_NAME).getString();
retrievePosition = pList.get(PR_RETRIEVE_POSITION).getEnum();
@@ -70,8 +80,6 @@
if (retrieveClassName == null || retrieveClassName.equals("")) {
missingPropertyError("retrieve-class-name");
}
-
- propertyList = pList.getParentPropertyList();
super.bind(pList);
}
@@ -107,115 +115,6 @@
return retrieveBoundary;
}
- private PropertyList createPropertyListFor(FObj fo, PropertyList parent) {
- return getFOEventHandler().getPropertyListMaker().make(fo, parent);
- }
-
- private void cloneSingleNode(FONode child, FONode newParent,
- Marker marker, PropertyList parentPropertyList)
- throws FOPException {
-
- if (child != null) {
- FONode newChild = child.clone(newParent, true);
- if (child instanceof FObj) {
- Marker.MarkerPropertyList pList;
- PropertyList newPropertyList = createPropertyListFor(
- (FObj) newChild, parentPropertyList);
-
- pList = marker.getPropertyListFor(child);
- newChild.processNode(
- child.getLocalName(),
- getLocator(),
- pList,
- newPropertyList);
- if (newChild instanceof TableFObj) {
- // TODO calling startOfNode (and endOfNode, below) on
other fobjs may
- // have undesirable side-effects. This is really ugly and
will need to
- // be addressed sooner or later
- ((TableFObj) newChild).startOfNode();
- }
- addChildTo(newChild, (FObj) newParent);
- if (newChild.getNameId() == FO_TABLE) {
- Table t = (Table) child;
- cloneSubtree(t.getColumns().listIterator(),
- newChild, marker, newPropertyList);
- cloneSingleNode(t.getTableHeader(),
- newChild, marker, newPropertyList);
- cloneSingleNode(t.getTableFooter(),
- newChild, marker, newPropertyList);
- }
- cloneSubtree(child.getChildNodes(), newChild,
- marker, newPropertyList);
- if (newChild instanceof TableFObj) {
- // TODO this is ugly
- ((TableFObj) newChild).endOfNode();
- }
- } else if (child instanceof FOText) {
- FOText ft = (FOText) newChild;
- ft.bind(parentPropertyList);
- addChildTo(newChild, (FObj) newParent);
- }
- if (newChild instanceof FObjMixed) {
- handleWhiteSpaceFor((FObjMixed) newChild);
- }
- }
- }
-
- /**
- * Clone the FO nodes in the parent iterator,
- * attach the new nodes to the new parent,
- * and map the new nodes to the existing property lists.
- * FOText nodes are also in the new map, with a null value.
- * Clone the subtree by a recursive call to this method.
- * @param parentIter the iterator over the children of the old parent
- * @param newParent the new parent for the cloned nodes
- * @param marker the marker that contains the old property list mapping
- * @param descPLists the map of the new nodes to property lists
- */
- private void cloneSubtree(Iterator parentIter, FONode newParent,
- Marker marker, PropertyList parentPropertyList)
- throws FOPException {
- if (parentIter != null) {
- FONode child;
- while (parentIter.hasNext()) {
- child = (FONode) parentIter.next();
- cloneSingleNode(child, newParent,
- marker, parentPropertyList);
- }
- }
- }
-
- private void cloneFromMarker(Marker marker)
- throws FOPException {
- // clean up remnants from a possible earlier layout
- if (firstChild != null) {
- currentTextNode = null;
- firstChild = null;
- }
- cloneSubtree(marker.getChildNodes(), this,
- marker, propertyList);
- handleWhiteSpaceFor(this);
- }
-
- /**
- * Clone the subtree of the given marker
- *
- * @param marker the marker that is to be cloned
- */
- public void bindMarker(Marker marker) {
- if (marker.getChildNodes() != null) {
- try {
- cloneFromMarker(marker);
- } catch (FOPException exc) {
- getFOValidationEventProducer().markerCloningFailed(this,
- marker.getMarkerClassName(), exc, getLocator());
- return;
- }
- } else if (log.isDebugEnabled()) {
- log.debug("Empty marker retrieved...");
- }
- }
-
/** [EMAIL PROTECTED] */
public String getLocalName() {
return "retrieve-marker";
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
Fri May 2 09:48:57 2008
@@ -51,6 +51,7 @@
import org.apache.fop.fo.flow.PageNumberCitation;
import org.apache.fop.fo.flow.PageNumberCitationLast;
import org.apache.fop.fo.flow.RetrieveMarker;
+import org.apache.fop.fo.flow.RetrieveTableMarker;
import org.apache.fop.fo.flow.Wrapper;
import org.apache.fop.fo.flow.table.Table;
import org.apache.fop.fo.flow.table.TableBody;
@@ -117,6 +118,7 @@
makers.put(Block.class, new BlockLayoutManagerMaker());
makers.put(Leader.class, new LeaderLayoutManagerMaker());
makers.put(RetrieveMarker.class, new
RetrieveMarkerLayoutManagerMaker());
+ makers.put(RetrieveTableMarker.class, new Maker());
makers.put(Character.class, new CharacterLayoutManagerMaker());
makers.put(ExternalGraphic.class,
new ExternalGraphicLayoutManagerMaker());
@@ -207,9 +209,7 @@
return new StaticContentLayoutManager(pslm, sc, reg);
}
- /*
- * [EMAIL PROTECTED]
- */
+ /** [EMAIL PROTECTED] */
public StaticContentLayoutManager makeStaticContentLayoutManager(
PageSequenceLayoutManager pslm, StaticContent sc,
org.apache.fop.area.Block block) {
return new StaticContentLayoutManager(pslm, sc, block);
@@ -218,7 +218,6 @@
public static class Maker {
public void make(FONode node, List lms) {
// no layout manager
- return;
}
}
@@ -231,18 +230,6 @@
}
}
- /*
- public static class FObjMixedLayoutManagerMaker extends Maker {
- public void make(FONode node, List lms) {
- if (node.getChildNodes() != null) {
- InlineStackingLayoutManager lm;
- lm = new InlineStackingLayoutManager((FObjMixed) node);
- lms.add(lm);
- }
- }
- }
- */
-
public static class BidiOverrideLayoutManagerMaker extends Maker {
// public static class BidiOverrideLayoutManagerMaker extends
FObjMixedLayoutManagerMaker {
public void make(BidiOverride node, List lms) {
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ps/PSRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ps/PSRenderer.java?rev=652813&r1=652812&r2=652813&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ps/PSRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ps/PSRenderer.java
Fri May 2 09:48:57 2008
@@ -170,7 +170,10 @@
/** Whether or not the safe set page device macro will be used or not */
private boolean safeSetPageDevice = false;
- /** Whether or not Dublin Core Standard (dsc) compliant output is enforced
*/
+ /**
+ * Whether or not PostScript Document Structuring Conventions (DSC)
compliant output are
+ * enforced.
+ */
private boolean dscCompliant = true;
/** Is used to determine the document's bounding box */
@@ -181,9 +184,8 @@
/** This is a collection holding all document footer comments */
private Collection footerComments;
- /**
- * [EMAIL PROTECTED]
- */
+
+ /** [EMAIL PROTECTED] */
public void setUserAgent(FOUserAgent agent) {
super.setUserAgent(agent);
Object obj;
@@ -1703,13 +1705,14 @@
}
/**
- * Sets whether or not Dublin Core Standard (dsc) compliance is enforced.
- *
- * It can cause problems (unwanted postscript subsystem
initgraphics/erasepage calls)
+ * Sets whether or not PostScript Document Structuring Conventions (dsc)
compliance are
+ * enforced.
+ * <p>
+ * It can cause problems (unwanted PostScript subsystem
initgraphics/erasepage calls)
* on some printers when the pagedevice is set. If this causes problems
on a
* particular implementation then use this setting with a 'false' value to
try and
* minimize the number of setpagedevice calls in the postscript document
output.
- *
+ * <p>
* Set this value to false if you experience unwanted blank pages in your
* postscript output.
* @param dscCompliant boolean value (default is true)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
