/[Apache-SVN]
ViewVC logotype

Revision 1642793


Jump to revision: Previous Next
Author: lbernardo
Date: Tue Dec 2 00:29:57 2014 UTC (9 years, 10 months ago)
Changed paths: 37
Log Message:
Merged branches/Temp_BasicSideFloat back to trunk.

Changed paths

Path Details
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/SideFloat.java
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/area/SideFloat.java, r1642790)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.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/AbstractLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FloatContentLayoutManager.java
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/FloatContentLayoutManager.java, r1642790)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/src/java/org/apache/fop/layoutmgr/inline/FloatLayoutManager.java, r1642790)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.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/list/ListBlockLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java modified , text changed
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_1.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_1.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_2.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_2.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_3.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_3.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_4.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_4.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_5.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_5.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_6.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_6.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/float_7.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/float_7.xml, r1642790)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_4.xml modified , text changed
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_5.xml
(Copied from xmlgraphics/fop/branches/Temp_BasicSideFloats/test/layoutengine/standard-testcases/flow_changing-ipd_5.xml, r1642790)
added

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26