Jeremias Maerki
1fa0713ce0
Forgot to take padding into account.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198399 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
68c9b73a81
Fix for ArrayOutOfBoundsException in resetPosition().
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198397 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
f64b3f5563
Support for column-number on table-cell.
RowLM now also handles gaps (=empty cells) properly.
Positioning of cells inside the row changed. More responsibility into getNextBreakPoss stage because it is a lot easier to implement and there's less redundancy.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198396 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
692ba9ae38
Method for checking if there's a column-number
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198395 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
2458865802
Initial support for column spanning. Still WIP.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198394 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6ef1677fb7
Correct cell-borders when border-collapse="separate" and initial support for horizontal border-separation.
This is WIP, just a save-point while I'm investigating other issues surrounding tables.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198393 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a5e511a608
Support for table-cells as direct children of table-body|header|footer.
The table-cells are grouped into table-rows using starts-row and ends-row properties during FO tree building so the layout managers don't have to handle both cases. This will hopefully keep the code simpler.
Additional accessors on some FO objects.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198391 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
37374bcb69
moving retrieve-marker replacement into separate method to make preLoadList easier to read and understand.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198390 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
83371d2d60
Support for border-spacing shorthand.
Accessor for border-separation on table.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198389 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
36a0409306
Temporary fix for markers (using isBogus() check)
ipd/height and display-align support for table rows and cells.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198387 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
7cd913f036
Fix for adding absolutely positioned block without children.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198386 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
3d67d750ea
use hasBackground() as a fail-fast.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198385 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
c170f76658
Additional accessors and style.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198384 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
d6f3fb4902
Method for determining if there's a background at all.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198383 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
365625169d
PR:
Obtained from:
Submitted by:
Reviewed by:
Rolled the PageNumberGenerator from PSLM back into PageSequence (slightly simpler, also this functionality is useful for non-layout render types), renamed PageViewport.getPageNumber() to .getPageNumberString() to emphasize what it is actually returning.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198381 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
53e0eb6fda
PR:
Obtained from:
Submitted by:
Reviewed by:
Minor variable renaming in PSLM, removed pageCount variable from ATH.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198380 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
0595a4565b
PR:
Obtained from:
Submitted by:
Reviewed by:
Switch to Root's page number counter.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198379 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
e68c91ec57
Better table-column build-up. Columns can now be in non-consecutive order (using column-number) and number-columns-repeated is now respected. Missing columns (gaps) are logged as an error but no further handling ATM.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198376 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
7cdc09c095
Checks and an addtional method to determine whether a column-number is set.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198375 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
06ad501615
Bugfix for list labels that were not properly placed when the list-block is a child of a flow and there are margins on the page-master.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198373 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
20c39d9367
Notify the AreaTreeHandler about new pages being added.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198372 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
2af04b9624
Add a facility for the PageSequenceLayoutManager to notify about a new page being added so the rendering statistics work again.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198371 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
69d42ce263
Bugfix for whitespace handling that surfaced after my last fix for linefeed handling when markers are involved. Nodes preceeding a marker that don't create an area were removed from the childNodes list but the firstInlineChild was not cleared creating additional unwanted empty lines in the output.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198368 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
12e189afcf
Bugfix for blocks with forced linefeeds that break over the page boundary.
Submitted by: Luca Furini <lfurini.at.cs.unibo.it>
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198366 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
ccbaa31a9f
Don't ignore linefeeds when building Knuth elements.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198365 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
919269d147
Bugfix for omitted empty lines caused by forced linefeeds.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198364 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
1468dbd2b4
Bug #33321
Fix for invalid regular expressions. Patch committed with modifications.
Submitted by: James Shaw <hertzsprrrung.at.btopenworld.com>
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198361 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6413a65e97
Name of parameter was wrong.
Some style updates while at it.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198359 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
4662ada252
Bugfix for special case when markers weren't added correctly. This happens when a block is empty except for marker elements.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198356 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6f41573fc5
Both fore- and background colors are initially black. This fixes a bug where in a certain situation a white background resulted in a black rectangle being painted because the color operators are only generated if the color changes.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198355 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
ed4c1da52c
PR:
Obtained from:
Submitted by:
Reviewed by:
Copyright years fixed.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198354 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
2265f3fa72
Addition of new fo:page-sequence-wrapper FO from XSL 1.1. Currently not "plugged in" (it is commented out in FOElementMapping) nor functionally implemented.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198353 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6123b54cc9
Border, Padding and spaces on level fo:table.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198352 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
38c76806d4
table-cell generates a normal reference-area.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198347 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
ae6f9e9fd5
Added the page number to the pageViewport
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198344 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Glen Mazza
d69f26fbac
PR:
Obtained from:
Submitted by:
Reviewed by:
Altered TestConverter to use FileCompare's file comparison logic.
Renamed Compare to FileCompare.
Simplified logger implementation in TestConverter.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198343 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Simon Pepping
765e233dfb
Updated the paths in the Makefile and the customization stylesheets.
Created an Ant build file.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198342 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Simon Pepping
1095620ae6
Updated to the current situation. Patch by renaud richardet, see bug 33126
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198341 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
096a0bfab6
Added border, padding and spacing for list-blocks and list-items.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198338 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a1d60d9097
Cleanup and added missing some public accessors.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198337 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
dd518f0885
corresponding.compute() may also return null to indicate that the inherited value should be used.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198335 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
f79638aa9b
Fixed a bug for labels, giving the wrong reference IPD.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198333 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
5041422b29
CONTAINING_REFAREA seems to work now, so use it.
Rearranged calculation.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198332 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
daddb74bf2
Fixed CONTAINING_REFAREA (for list indents)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198331 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a1ed5f808c
Fixed a bug in markers with boundary document and page-sequence.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198329 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
6c2f7aa7ac
Switching off reuse of static LMs, which fixes page numbers and markers on pages >1.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198327 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
a9d8444aef
toString()
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198326 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
8e85098492
Added a check for endless loops.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198323 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
1a9a4db0fc
Bugfix for layout of block-containers with fixed BPD. They weren't properly broken over to the next page if they didn't fit.
If autoHeight is false, the whole block-container is considered a non-breakable block. Seems to match the behaviour of other implementations but I still haven't found the right place in the spec.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198322 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jeremias Maerki
4da85b8ab3
Commenting a variable that was already defined in the superclass.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198321 13f79535-47bb-0310-9956-ffa450edef68
19 years ago