| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198741 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198737 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198723 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198722 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198721 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198711 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Some style improvements here and there.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198643 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198631 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
preLoadNext() renamed to clearer createChildLMs()/createNextChildLMs().
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198630 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198499 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
Cleanup of page number handling throughout application. Removed old code
from PageSequence.java.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198434 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198413 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
| |
easier to read and understand.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198390 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
to the ideas of Finn Bock and his patch in bug 30500.
Created a LayoutManagerMaker interface, with method
makeLayoutManagers(FONode, List), and two convenience methods on top
of it.
Created an implementation: LayoutManagerMapping. This is along the
pattern of FOElementMapping. It creates a Map from FObj class to Maker
objects. There are many static inner classes which are subclasses of
Maker. Each subclass implements its own version of the make method.
FOUserAgent has a setter and getter for
LayoutManagerMakerOverride. AreaTreeHandler creates a
LayoutManagerMaker, taking the user's override into account, using
LayoutManagerMapping as the default. It has a get method for it.
The LayoutManager interface has a get method for the AreaTreeHandler
object, a reference to which is held in PageSequenceLM, the top of the
LM tree.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198208 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
the retrieving retrieve-marker. The FO nodes are cloned. The new
subtree is attached to the RetrieveMarker object. The property
lists are not cloned. The subtree of property lists is attached to the
property list of the RetrieveMarker object. This is only needed for
the binding of the FO nodes. After that a subsequent retrieve-marker
may reparent the property lists.
Removed Marker's reference to its property list. In Marker.endOfNode()
the parent of the property lists of the direct children of marker is
reset to null. FOText nodes are not mapped to the Marker's property
list in Marker. This allows the Marker's property list and its
ancestors to be GC'ed.
FOText nodes use the parent FO node's property list or the
RetrieveMarker's property list for binding.
TODO: Block.handleWhiteSpace is not applied to text in retrieve-marker.
TODO: White space treatment around retrieve-marker is incorrect.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198204 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198197 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
1.) Rename of interface Resolveable to Resolvable. (http://dictionary.reference.com/search?q=resolvable)
2.) Reordering of methods in AreaTreeHandler, removal of unneeded TreeExt array.
3.) Switch from AreaTreeModel.addExtension() to .handleExtension().
4.) Removal of unneeded TreeExt.getName() (unused), getMimeType() (implementation
of an Area Tree extension up to each renderer), and isResolvable() (code changed to
use instanceof operator instead).
5.) Couple of minor layout bugs fixed.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198098 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
| |
- Field AbstractLayoutManager.fobj no longer needed.
PR: 31699
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198088 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
- Get rid of calls to FObj.getProperty() and its friends. Replace them
with the property getters on the FO nodes.
PR: 31699
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198086 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
PR: 31699
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198070 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
Some simplifications allowed as a result of having FOText extend FONode directly.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198042 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
Start of work to move FOText from extending FObj to extending FONode instead.
All work is done except for changing FObj's parent from FObj to
FONode. The RTF library works fine with the switch, but simple.fo and
franklin_alt.fo (among others I guess) will not work properly when FOText's
parent is switched. (Layout problems occur--lines don't break properly
with the switch.)
Switch to super() constructor (instead of super(fobj) one) within
within TextLayoutManager, as it is not needed for this subclass, also to
facilitate the change above.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198040 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
Removed no-longer-used getAreaTreeHandler() from LM's.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197997 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
1.) Temporary commenting out of TableAttributesConverter code until
missing code checked in.
2.) Code simplification of having AbstractLayoutManager call the fObj.AddLayoutManager()
directly.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197996 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197933 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Furini. This patch implements the algorithm for most but not yet all
inline layout managers.
For the algorithm, see D.E. Knuth and M.F. Plass, "Breaking paragraphs
into lines", Software, Practice and Experience 11 (1981) 1119-1184;
reprinted in: D. E. Knuth, "Digital typography", CSLI Lecture Notes
Number 78 (CLSI Publications, Stanford, CA, USA) pp. 67-155.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197907 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
fo:table-header
moved out of AddLMVisitor.
2.) New LayoutManager subclass created for fo:external-graphic formatting object.
3.) ValidateChildNode(), endOfNode() implemented for fo:float.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197866 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197835 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
| |
object. FOTreeHandler was primarily acting as an AreaTreeHandler,
and AreaTree had a 1-to-1 relationship with it. Comments most welcome.
2.) Created convenience methods in FOInputHandler for those subclasses
which do not handle certain signals/events called from the formatting
objects (i.e., AreaTreeHandler).
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197784 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197704 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
(Infrequently
called, and already obtainable through AbstractLayoutManager's FObj member
variable.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197701 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
available within its FObj object.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197631 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197605 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
Commons Logging
equivalents in places where previously used.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197591 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
Conversion of Avalon to Commons-Logger. (Will still need to update the
examples, which I will take care of next; Jeremias will be modifying
the PDF libraries for more efficient use of the CL loggers.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197474 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197466 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
| |
Obtained from:
Submitted by:
Reviewed by:
Switch from init() to clearer initialize() in Layout classes; removed
unneeded logger reference in ContentLayoutManager.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197460 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197443 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
choose to remove them in favor of strictly using Constants.) Two interfaces
(span and position) were removed because of conflicts with other class names.
The interface generation was moved into Constants.xsl, which is run manually
via the XsltToJava ant task and its output is then checked in. As a result,
no more autogeneration of these interfaces at build time will be done.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197213 13f79535-47bb-0310-9956-ffa450edef68
|