aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Commit message (Collapse)AuthorAgeFilesLines
* My work on block content in inline content sofar. Block content inSimon Pepping2005-08-041-2/+5
| | | | | | | | | fo:inline is implemented. Basic rendering of this content is in place. BasicLinkLM uses the new structure for returning new Knuth elements git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/inlineblock@227471 13f79535-47bb-0310-9956-ffa450edef68
* Adjusting verticals spaces (coming from space-before and space-after ↵Luca Furini2005-08-021-38/+32
| | | | | | properties) in order to fill the region, whenever possible git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@226973 13f79535-47bb-0310-9956-ffa450edef68
* Send the ID of the producing FO to the area tree as trait where possible. Jeremias Maerki2005-07-261-0/+1
| | | | | | This is useful for testing and may later be interesting for FO editor implementors and for other things where you want to identify the generating FO from a particular object in the output. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@225268 13f79535-47bb-0310-9956-ffa450edef68
* Moved inline-level LMs and support classes to "inline" subpackage.Jeremias Maerki2005-07-181-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@219509 13f79535-47bb-0310-9956-ffa450edef68
* Removed unused functions. Team, I switched from generatesInlineAreas() callsGlen Mazza2005-06-101-2/+2
| | | | | | | | | to "instanceof InlineLevelLayoutManager", because AFAICT there is a 1-to-1 mapping between the two. If no one has problems with this, I will be removing the generatesInlineAreas() implementations next. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198736 13f79535-47bb-0310-9956-ffa450edef68
* Removed LM.initialize() -- switched to internal initialization of all LM's.Glen Mazza2005-06-071-6/+2
| | | | | | | | | | | | Did initialization from constructor, as that appeared sufficient for all of them. Should for any LM, initialization not be available until the parentLM set, then we just need to do this process within a setParent() override. Also removed calls to superclass initialization, because as yet no initialization was occurring in those superclasses. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198719 13f79535-47bb-0310-9956-ffa450edef68
* New member variable "index" on Position (used for first/last checks).Jeremias Maerki2005-05-301-13/+30
| | | | | | | | | | | | | Position numbering implemented in BlockStackingLayoutManager (see member variables: lastGeneratedPosition and smallestPosNumberChecked) Use notifyPos to give a Position an index (Don't reuse Position instances that get an index!) Flags on TableContentPosition indicating first and last status (see TableStepper). New way of determining first/last area implemented on all currently implemented block-level FOs. Removed obsolete isBogus() method from LayoutManager. Removed duplicate wrapPositionElements() method in FlowLayoutManager. Some javadocs here and there. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198701 13f79535-47bb-0310-9956-ffa450edef68
* Removed a lot of obsolete code from the old page breaking approach.Jeremias Maerki2005-05-171-186/+1
| | | | | | | Some style improvements here and there. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198643 13f79535-47bb-0310-9956-ffa450edef68
* PSLM.getParentArea() consolidated into FLM's version; preLoadList()Glen Mazza2005-05-141-6/+6
| | | | | | | preLoadNext() renamed to clearer createChildLMs()/createNextChildLMs(). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198630 13f79535-47bb-0310-9956-ffa450edef68
* Merge of branch Temp_KnuthStylePageBreaking back into HEAD.Jeremias Maerki2005-05-131-26/+243
| | | | | | | Temp_KnuthStylePageBreaking branch and HEAD have been tagged prior to the merge, so merging uncommitted work from the branch should be easier. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198627 13f79535-47bb-0310-9956-ffa450edef68
* Changed from addChild(Area) to clearer addChildArea(Area).Glen Mazza2005-03-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198499 13f79535-47bb-0310-9956-ffa450edef68
* Corrected the logic of adding markers. LayoutManagers are responsibleSimon Pepping2005-02-201-2/+13
| | | | | | | | | | for correctly setting is-first and is-last on the BreakPoss and from there in the arguments of the addMarkers method. Implemented this for BlockLM. Also made a small change in the retrieval of markers from preceding pages. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198447 13f79535-47bb-0310-9956-ffa450edef68
* Temporary fix for markers (using isBogus() check)Jeremias Maerki2005-02-071-3/+10
| | | | | | | 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
* Bugfix for special case when markers weren't added correctly. This happens ↵Jeremias Maerki2005-02-011-27/+28
| | | | | | 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
* Too many optimizations.Jeremias Maerki2005-01-251-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198316 13f79535-47bb-0310-9956-ffa450edef68
* Removed unnecessary parameterJeremias Maerki2005-01-251-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198315 13f79535-47bb-0310-9956-ffa450edef68
* Adding todo item for a static variable.Jeremias Maerki2005-01-171-4/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198279 13f79535-47bb-0310-9956-ffa450edef68
* Removed the "inheritedStartIndent" hack again.Jeremias Maerki2005-01-121-23/+33
| | | | | | | | | Switched to start|end-indent-oriented calculation. Improved line painting in the PDFRenderer. Some improvements in BlockContainerLayoutManager (but still WIP ATM). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198259 13f79535-47bb-0310-9956-ffa450edef68
* Bugfix for start-indent calculation for nested blocks. The inherited ↵Jeremias Maerki2005-01-071-11/+41
| | | | | | | | | start-indent wasn't taken into account as described in 5.3.2 of the spec. Minor style and javadoc improvements on the way. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198247 13f79535-47bb-0310-9956-ffa450edef68
* Removed RetrieveMarkerLM. The LMs of the marker children are attachedSimon Pepping2004-12-071-2/+0
| | | | | | | | in the LM tree as the direct children of the LM of the parent of the RetrieveMarker. This patch solves bug 32253. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198192 13f79535-47bb-0310-9956-ffa450edef68
* Patch 31206 by Luca Furini:Simon Pepping2004-11-131-1/+3
| | | | | | | | | | | | | | | | | - A new interface InlineLevelLayoutManager, implemented by LeafNodeLM, InlineLM, TextLM, BasicLinkLM and ContentLM - Leaders with pattern "use-content" and "dots" now works - Better handling of preserved linefeeds - Correct calculation of the lineheight, according to the value of the property vertical-align For a few points which may need further work, see the bugzilla page. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198142 13f79535-47bb-0310-9956-ffa450edef68
* Third phase of performance improvement.Finn Bock2004-10-201-19/+9
| | | | | | | | | - Use the new CommonXXX fields. PR: 31699 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198078 13f79535-47bb-0310-9956-ffa450edef68
* Third phase of performance improvement.Finn Bock2004-10-191-11/+5
| | | | | | | | - Use CommonBorderPaddingBackground. PR: 31699 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198072 13f79535-47bb-0310-9956-ffa450edef68
* Third phase of performance improvement.Finn Bock2004-10-191-11/+10
| | | | | | | | | - Remove use of TextInfo. PR: 31699 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198068 13f79535-47bb-0310-9956-ffa450edef68
* When the child LM is a RetrieveMarker, it need a valid parent beforeFinn Bock2004-10-101-0/+2
| | | | | | | generatesInlineAreas() are called. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198029 13f79535-47bb-0310-9956-ffa450edef68
* Set content ipd/bpd instead of allocation width/height.Finn Bock2004-09-221-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197958 13f79535-47bb-0310-9956-ffa450edef68
* Removed unneeded import statements. Makes eclipse happy.Finn Bock2004-09-071-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197933 13f79535-47bb-0310-9956-ffa450edef68
* Renamed FOInputHandler to somewhat more intuitive FOEventHandler.Glen Mazza2004-09-061-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197911 13f79535-47bb-0310-9956-ffa450edef68
* Moved some functionality from LMiter to the LayoutManagers. The LMsSimon Pepping2004-08-261-43/+61
| | | | | | | | | | now hold the list of child LMs and the method preLoadNext. This makes it possible to create a new LMiter object for a LM, or even a list iterator over the list of child LMs if the latter is known to be complete. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197890 13f79535-47bb-0310-9956-ffa450edef68
* 1. Moved getNameId() from FObj to FONode.Glen Mazza2004-08-181-0/+2
| | | | | | | | | | | 2. Centralized determination of generatesInlineAreas() from multiple FObj subclasses into fo.PropertySets BitSet object. 3. validateChildNode() implemented for fo:list-item. 4. fo:initial-property-set now extending FObj instead of ToBeImplementedElement; burden of implementation on individual FOInputHandler subclasses. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197882 13f79535-47bb-0310-9956-ffa450edef68
* 1. FOTreeBuilder modified to handle more of the renderer initialization.Glen Mazza2004-06-181-1/+1
| | | | | | | | | | 2. AreaTree now takes a Renderer as a constructor, handles RenderPagesModel initialization. 3. FontInfo object moved from Driver/Document to fo.FOInputHandler. 4. getFontState/getFontInfo now take a fontInfo object directly instead of a apps.Document. 5. validity checking added to PageSequence.java git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197734 13f79535-47bb-0310-9956-ffa450edef68
* 1.) Check for fo:color-profile made to ensure no child elements during ↵Glen Mazza2004-06-161-1/+1
| | | | | | | | | | | processing. 2.) Error messages for bad fo: files now give locator (line/col. #) information. 3.) Parent of the fo:root (FO Tree) "lowered" from apps.Document to fo.FOInputHandler; IDReferences moved from former to latter. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197717 13f79535-47bb-0310-9956-ffa450edef68
* 1.) Added restriction to fo:declarations that fo:color-profile is the only ↵Glen Mazza2004-06-151-1/+1
| | | | | | | | | XSL namespace child element allowed. 2.) Switched from fo.FOTreeControl to apps.Document throughout app, to better clarify that it is the apps.Document object being accessed/used. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197716 13f79535-47bb-0310-9956-ffa450edef68
* implemented break-before propertyChris Bowditch2004-05-271-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197635 13f79535-47bb-0310-9956-ffa450edef68
* Removed PropertyManager argument from initProperties(), as it is alreadyGlen Mazza2004-05-261-13/+13
| | | | | | | available within its FObj object. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197631 13f79535-47bb-0310-9956-ffa450edef68
* fixed problem with top/bottom borders on regular blocksChris Bowditch2004-05-201-13/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197611 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-05-151-3/+1
| | | | | | | | | | Obtained from: Submitted by: Reviewed by: Moved FOUserAgent, FObj initialization from AddLMVisitor to constructors of respective LayoutManagers. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197602 13f79535-47bb-0310-9956-ffa450edef68
* For area.Blocks created in BlockLayoutManager.getParentArea(), I set theGlen Mazza2004-04-251-21/+24
| | | | | | | | | | | | | | | width of the Block to that of its parent block. This fixes a layout problem where <fo:table-cell><fo:block border-bottom="1pt solid black">some text</ ></ > was causing a line to draw across the entire page, because the cell width present in fo:table-cell's Block was not copied into the inner fo:block's Block. (This problem did not occur if the border-bottom attribute was set in fo:table-cell.) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197539 13f79535-47bb-0310-9956-ffa450edef68
* Merged LayoutProcessor into LayoutManager interface.Glen Mazza2004-03-211-7/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197466 13f79535-47bb-0310-9956-ffa450edef68
* Applied Apache License Version 2.0 by following the instructions at ↵Jeremias Maerki2004-02-271-48/+16
| | | | | | http://www.apache.org/dev/apply-license.html. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197384 13f79535-47bb-0310-9956-ffa450edef68
* Use the new property expressions. Clients must use Length when retrievingFinn Bock2004-02-261-0/+5
| | | | | | | | | | a length and must delay the call to Length.getValue() until the baselength has been assigned by the LayoutManagers. PR: 26778 (second half) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197382 13f79535-47bb-0310-9956-ffa450edef68
* Set the SPACE_START and SPACE_END traits and adjust the height to takeFinn Bock2004-01-291-3/+9
| | | | | | | | | border and padding into account. PR: 25802. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197294 13f79535-47bb-0310-9956-ffa450edef68
* Bug #25813 (Patch by Finn Bock): Calculation change in setBlockTextInfo().Glen Mazza2003-12-301-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197077 13f79535-47bb-0310-9956-ffa450edef68
* 1.) Chris Bowditch's patch on padding-start implemented. (Changes wereGlen Mazza2003-11-241-0/+3
| | | | | | | | | | | | | | extended to implement part of padding-end as well.) 2.) Switched from TOP/BOTTOM/LEFT/RIGHT to BEFORE/AFTER/START/END in CommonBorderAndPadding--this is more appropriate for BlockLayout, also the various places calling it already were either (1) commenting on the need to switch to the above, or (2) placing the results of the above functions using the former constants into variables emphasizing the latter. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197023 13f79535-47bb-0310-9956-ffa450edef68
* Partial implementation of space-after functionality--mostly working, butGlen Mazza2003-11-111-3/+12
| | | | | | | | | | | | | | some remaining problems: 1.) relying on a static variable to carry space-after value from previous block to current. (BlockLayoutManager is be instantiated for each block instead of being in memory for all blocks--bad design?) 2.) The space-after of a block ending at the bottom of the page is not currently being added to the beginning of the subsequent page. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197004 13f79535-47bb-0310-9956-ffa450edef68
* fo:block space-before property now activated only on the first Area.Block ↵Glen Mazza2003-11-111-4/+21
| | | | | | | | | | | | | object used in rendering the fo:block. (Previous implementation repeated space-before at the top of every page.) Suggestion from Chris Bowditch. (Space-after property still needs work: renders at the correct places but results in subsequent text overrunning region borders.) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197003 13f79535-47bb-0310-9956-ffa450edef68
* 1. tie the LMIter objects to their LM "parent"William Victor Mote2003-09-121-3/+3
| | | | | | | | | | | 2. tie the PageLayoutManager object to its parent LayoutManagerLS 3. create methods for going up the LM tree to get to the LayoutManagerLS 4. store an AddLMVisitor object in LayoutManagerLS so that subclasses can be stored there and used instead of AddLMVisitor itself (so that third-party users can subclass instead of modifying AddLMVisitor) 5. use the stored AddLMVisitor instead of creating one for each LMIter 6. add some accessor methods to AddLMVisitor so that subclasses can use Lists stored therein git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196901 13f79535-47bb-0310-9956-ffa450edef68
* remove global import statementsWilliam Victor Mote2003-09-081-13/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196891 13f79535-47bb-0310-9956-ffa450edef68
* move layoutmgr/MinOptMax to traits/MinOptMaxWilliam Victor Mote2003-08-281-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196870 13f79535-47bb-0310-9956-ffa450edef68
* move fo/FOUserAgent to apps/FOUserAgent, as it manages configuration ↵William Victor Mote2003-08-221-0/+1
| | | | | | information for the application as a whole git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196827 13f79535-47bb-0310-9956-ffa450edef68