]> source.dussan.org Git - xmlgraphics-fop.git/commit
Merged branch https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/inlineblock...
authorJeremias Maerki <jeremias@apache.org>
Fri, 12 Aug 2005 09:50:01 +0000 (09:50 +0000)
committerJeremias Maerki <jeremias@apache.org>
Fri, 12 Aug 2005 09:50:01 +0000 (09:50 +0000)
commitff1072cb52160c65b5ecd1a084f3dea42b47a12f
tree6a07fee41b2652e17120d297423f5ee1a9802993
parente456364d25d04780f25b83dffe7164908735b41a
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

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@232250 13f79535-47bb-0310-9956-ffa450edef68
22 files changed:
src/java/org/apache/fop/area/LineArea.java
src/java/org/apache/fop/area/inline/InlineBlockParent.java [new file with mode: 0644]
src/java/org/apache/fop/fo/NullCharIterator.java [new file with mode: 0644]
src/java/org/apache/fop/fo/flow/Block.java
src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
src/java/org/apache/fop/layoutmgr/KnuthSequence.java
src/java/org/apache/fop/layoutmgr/LayoutContext.java
src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
src/java/org/apache/fop/render/AbstractRenderer.java
src/java/org/apache/fop/render/pdf/PDFRenderer.java
src/java/org/apache/fop/render/xml/XMLRenderer.java
test/java/org/apache/fop/logging/LoggingElementListObserver.java
test/layoutengine/disabled-testcases.txt
test/layoutengine/testcases/inline-block1.xml [new file with mode: 0644]
test/layoutengine/testcases/inline-block2.xml [new file with mode: 0644]
test/layoutengine/testcases/inline1.xml