Jeremias Maerki
4334502a08
Reactivating table-row background.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198625 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
23c718504a
Fix for display-align on table-cell.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198624 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
2a5effe5ca
Improved handling of explicit height/block-progression-dimension on table-cell and table-row. May not yet be perfect, though.
Some helper methods moved to a utility class: ElementListUtils.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198623 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
c9207efbe0
More careful approach to handling missing grid units during addAreas stage.
Plus some comments in code.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198622 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
ea8e710085
Copied the logic over incorrectly--fixed (even though IIRC
RetrieveMarkers work currently anyway.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198621 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
1b5fcf5e4f
Better consolidation of the RetrieveMarker handling code.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198620 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
74bad2ed49
Eclipse is so cool. It lets us know when we have unused imports.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198619 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
388f5f641e
Fix for ArrayIndexOutOfBoundsException when empty grid units are involved.
Convenience accessor for GridUnits on EffRow.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198618 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
409f77fa19
Pretty radical clean-up.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198617 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a1f72643c5
Fix for row spans ending early thus leaving empty grid units.
Adds a sanity check for the stepper.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198616 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
979b6a3e93
System.out removed.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198615 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
3629fbed98
Checkstyle is cool. It finds every tab character in our sources.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198614 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
527e78fbce
The RowBorder3 example fully works now except for the empty cells currently not being painted.
EffRow is now in its own file.
Stepping algorithm is now extracted into the new class TableStepper.
Element generation now calculates with borders (separate border model only at this time) and headers/footers.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198613 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6b398717d3
spanned grid units may have a different table-row element associated with them. This is important for border resolution.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198612 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
c2e2b26f33
Moved the FLAGGED_PENALTY constant to the KnuthPenalty class
because it will be easier to understand this constant's meaning
within the framework of comments/notes in this class.
Removed unused setFObj() requirement from LayoutManager interface.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198611 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
d417971290
Removed addID() from AbstractLayoutManager in favor of actual
method in PSLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198610 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
4765a6bce5
Added getPSLM() to LM interface, removed six other methods.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198609 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
494b617241
resolveRefID() --> getFirstPVWithID() renaming.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198608 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
aafc170e76
Improved the comment for addUnresolvedArea().
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198607 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
a9a23b40d3
More simplifications to PSLM. (Hmmm...I wonder if there's a way to have
CVS just default this message... ;-)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198606 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
ae774a97b6
More clarifications to PSLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198605 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
76351a6a79
Fixed a number of issues mainly related to border painting and row spanning.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198604 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
d569ad27e7
Fix for NPE
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198603 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
938ba653e4
Next step: Basic border resolution and proper painting (even though it's following a possibly misinterpreted model ATM)
Bugfixes in the collapsing border model resolution.
Note: The Knuth elements do not take borders into account, yet, so page breaking is off-target.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198602 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
96c0bf73d4
Finn's refactoring of Knuth's breaking code, with small changes
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198601 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
b7404079ee
Fix for left outer border painting.
Fix for after/end outer border edge painting.
Style.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198600 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
b2ba4fc7b1
-- Modified the PSLM constructor and mapping Maker to take an
AreaTreeHandler object. The Maker also returns a PSLM object to allow
for future detachment of PSLM from increasingly ill-fitting
AbstractLayoutManager and/or LayoutManager.
-- Removed areaTreeModel instance variable from PSLM hopefully
to increase code comprehension (better clarifies that the
ATM is owned by the ATH.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198599 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
0427280b10
More PSLM simplifications.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198598 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
76f148a8b2
Switched from curPage to uglier but more accurate curPV in PSLM; ditto
in LM interface, removed addMarkersToPV() middleman.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198597 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
f725a49bed
Fix for NPE in Cell.java (getBorders() can return null).
Added fetching of row groups as per definition in http://wiki.apache.org/xmlgraphics-fop/TableLayout/KnuthElementsForTables .
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198596 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
dfd9cbb4be
Using a more clear boolean instead of an int, as suggested by Glen and Andreas
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198595 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
83ff5d8ec6
Partial fix to break handling
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198594 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
8a38973ad8
removed duplicate addMarkerMap() method, renamed addMarkers()
to addMarkersToPV().
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198593 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
a0efc1fcf6
Minor simplifications.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198592 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
b8c3035121
--Validation for fo:wrapper added.
--Made LayoutManagerMapping.initialize() protected to facilitate
subclassing of this class.
--For direct requests of particular LayoutManager overrides, switched
from FOPException to IllegalStateException when the mapping is
missing or duplicate.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198591 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
5eca263327
Setting default validation to "strict"; adding a command line -r option
to use relaxed validation.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198590 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
b4f3f139d6
Using the correct height, stored in the LineBreakPositions, when creating the sequence of elements.
Comments translated.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198586 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
18b6633d3d
Fixes for test cases list1-3.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198585 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
b8577a7ef6
Class actually iterates over element lists not break possibilities.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198584 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
258fd21aab
Added convenience methods performing the cast between FObj and Block, FObj and BlockContainer
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198583 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
f8518111fd
1.) Moved RegionViewport & Reference creation code from PageViewport to Page(Reference).
2.) Created new .getColumnWidth() in Span to facilitate its querying in layout code.
3.) Removed unneeded retrieveMarker() method in FLM and never-used addMarker method from
SCLM (validation prevents this from occurring)
4.) Removed duplicate flowBPD and flowIPD variables from PSLM (this information
is already available in the Area classes)
5.) Removed inaccurate setLayoutDimension() code from PSLM; added the
current code in FLM to SCLM in this regard
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198582 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
ed5d157793
Creating a combined list for label and body
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198581 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
7d1a1c697c
More validation added for fo:retrieve-marker and fo:marker.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198580 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Simon Pepping
eb048612b0
This solves a compilation problem in TableContentLayoutManager
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198579 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
d760204724
Setting layout dimensions in the FlowLM
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198578 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
ac0214ef10
Some javadocs
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198577 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
09c9c9860c
Initial support for table headers and footers including omit-*-at-break, but without border-before|after handling.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198576 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
9f004f76e2
Yesterday I forgot to commit this small change, sorry.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198574 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
dc17219f50
First working implementation for lists; at the moment, ListItemLM just uses the "body" elements; coming soon: creation of elements combining the label list and the body list.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198573 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Luca Furini
0135f93e3d
Moved methods from BlockLM to BlockStackingLM, modified parameters; these methods will be used by other subclasses of BlockStackingLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198572 13f79535-47bb-0310-9956-ffa450edef68
19 years ago