Jeremias Maerki
ccbd2cad56
Proper generation of grid units for spanned cells (both directions).
start|end border resolution.
Border painting adjusted to new grid units
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198571 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
efb1596792
Fix for logic error causing array index exceptions
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198570 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
8b50da9082
Row backgrounds
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198569 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
c30c27caca
Fixing X-placement of cells when there's start-indent on the table.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198568 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
d6af636d4a
Stupid mistake, cell widths were not right.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198567 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
943be3b89f
Fixed setting the BPD on the block area for the table (fixes table background and cursor advancement in renderers).
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198566 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
041733ad1f
Making display-align work again. May not be the optimal way to do this, but I didn't want to run a Breaker just to do alignment like I did for block-container.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198565 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
c17fb7108e
Basic framework for table layout with Knuth elements as documented on the Wiki. The old code is mostly still there for reference.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198563 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
559cc1bab8
Consolidated blocklist logging
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198562 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
fe3f103534
number -> lineCount
Translations
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198561 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
5e07cd5bab
toString() methods for debugging
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198560 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
248ac1ce55
More simplifications.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198559 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
2a4afee740
Removed duplication of pageNumber & pageNumberString in PSLM;
removed LM.getCurrPageString() in favor of already existing
curPage.getPageString(); switched from LM.getCurrentPageString() to
LM.getCurrentPageViewport() (latter giving access to the former.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198558 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
2c90524826
Pulled out the AreaTreeHandler from the LayoutManager interface, only
its LayoutManagerMaker (now included) was being called.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198557 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
b49e8724d0
Moved page viewport creation logic from PSLM to PageViewport.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198556 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
ebb1892cff
Removed the curSpan instance variable -- now obtainable via curPage.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198555 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
ec8a189c3f
Created an instance variable in PageViewport for the
SimplePageMaster object; removed currentSimplePageMaster variable
in PSLM in favor of curPage.getSPM().
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198551 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
ac1064b4c2
Moved the logic for creating Spans to MainReference. Moved the overflow/column count
check to fo:region-body (will need more work if we allow >1 colcounts w/scrolling again,
as I don't see the ability to alter Numerics.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198550 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
14e05b595b
Moved creation of normal flow areas to area.Span.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198549 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
145f8bb848
Factored out phase 1 (knuth element generation) in LineLM into a separate method to make the code easier to understand.
Renamed *lineNumber to *lineCount (it confused me).
Missing file header for LineLayoutPossibilities.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198539 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
fa903e83af
Javadocs and toString() methods.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198538 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
8be3eb6c2c
Additional accessors.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198537 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
5fe47096d1
Missing license header and javadocs.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198535 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a59022ae06
Fix for NPE with empty block-containers (normal-breaking3)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198529 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
16584886bb
I don't see the reason for the distinction beween justified and other alignments.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198528 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
16bb03cd0d
Check within-column, too. Note: This is all very basic for now and needs to be improved in time.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198527 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
43f28c8c39
Avoid unnecessary penalties at the beginning of the returnList. They may also badly influence penalties for keeps. Normal penalties between blocks not in the same block are handled higher up.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198524 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
5234d61922
Bugfix for keep-together: parent LMs were not taken into account when determining keep-together status.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198522 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
099e15ab90
Semantic adjustments.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198521 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
5ebdc9519d
Clean-up for accessing column-count and column-gap in area tree.
Renamed RegionOuter to SideRegion.
Start for multi-column layout (only plain multi-columns, no spans, no column balancing, yet).
More consequent use of BlockSequence instead of KnuthSequence in page breaking so the info where a sequence is to be placed (even/odd page...) is easily available.
Hard breaks now handled under control of the breaker instead of in getParentArea().
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198518 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
01a64f1869
Insert penalties for column breaks, too.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198517 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
7d145bd451
Resurrected outer region support.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198516 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a432964176
Code to handle "no content" conditions.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198515 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
1be1a89f53
Code to handle "no content" conditions.
Some attempts at translating comments to English.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198514 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
b44957f8da
Common base class for all outer regions (for easier access to the extent property).
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198513 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
63ed8eb403
Accessor for clip value.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198512 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6d776daf01
Initial commit for the knuth-style page breaking code.
Based on work by Luca Furini.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198509 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
11b33608e1
Convenience method for checking "auto" enum value on a property. Makes code more readable.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198506 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
b867098c77
Reenabling consistency check.
Had to rename "bChecked" to "consistent" because that first check in checkConsistency() somehow malfunctioned with the other name. Very weird.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198505 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
2332ae0d9b
More accessors on block-containers.
Javadocs touch-up
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198504 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
5c82c15413
Slight deviation from the template.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198503 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
5581e549ee
Changed from addChild(Area) to clearer addChildArea(Area).
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198499 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
6079f6f376
1.) Moved setting of idp value into Span constructor because the class is in an
invalid state without it.
2.) Creating first column/normal flow by default in Span, as this class
must have at least one column to be valid.
3.) More simplifications, clarifications in PSLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198498 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Clay Leeds
45b8c51c27
Updated FOP example graphic to include more content & image
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198497 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
4aa732439c
More simplifications to PSLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198493 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
fbaf02105a
Removing illegal tab characters.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198492 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
0304064f34
More simplifications to PSLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198491 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
fbc248fb1e
More simplifications to PSLM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198490 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
2b20d5f7c6
Stray "x" removed.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198489 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
7bd48e5212
Lots of smaller updates:
- mailing list archive links
- XML -> XML Graphics
- Defoe -> Folio
etc.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198488 13f79535-47bb-0310-9956-ffa450edef68
19 years ago