/[Apache-SVN]
ViewVC logotype

Revision 232250


Jump to revision: Previous Next
Author: jeremias
Date: Fri Aug 12 09:50:01 2005 UTC (18 years, 10 months ago)
Changed paths: 22
Log Message:
Merged branch https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/inlineblock back into Trunk.
Revisions: 227462 to HEAD (231261)

This adds support for block-level content inside fo:inline.

The full set of changes on the branch can be extracted by:
svn log http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/inlineblock -r 227462:231261

Changed paths

Path Details
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java
(Copied from xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/area/inline/InlineBlockParent.java, r232242)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/fo/NullCharIterator.java
(Copied from xmlgraphics/fop/branches/inlineblock/src/java/org/apache/fop/fo/NullCharIterator.java, r232242)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthSequence.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java modified , text changed
Directoryxmlgraphics/fop/trunk/test/java/org/apache/fop/logging/LoggingElementListObserver.java modified , text changed
Directoryxmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt modified , text changed
Directoryxmlgraphics/fop/trunk/test/layoutengine/testcases/inline-block1.xml
(Copied from xmlgraphics/fop/branches/inlineblock/test/layoutengine/testcases/inline-block1.xml, r232242)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/testcases/inline-block2.xml
(Copied from xmlgraphics/fop/branches/inlineblock/test/layoutengine/testcases/inline-block2.xml, r232242)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/testcases/inline1.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26