/[Apache-SVN]
ViewVC logotype

Revision 1562429


Jump to revision: Previous Next
Author: vhennebert
Date: Wed Jan 29 12:52:26 2014 UTC (10 years, 3 months ago)
Changed paths: 38
Log Message:
Merged branch Temp_InlineContainer back into trunk


Changed paths

Path Details
Directoryxmlgraphics/fop/trunk/ modified , props changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.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/AreaAdditionUtil.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.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/BlockStackingLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManager.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/SpacedBorderedPaddedBlockLayoutManager.java
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/SpacedBorderedPaddedBlockLayoutManager.java, r1562399)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java deleted
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java, r1562399)
added
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml 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/ListItemLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java modified , text changed
Directoryxmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java modified , text changed
Directoryxmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml modified , text changed
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_alignment-baseline.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-baseline.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_alignment.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_basic.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_basic.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_block_nested.xml deleted
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_bpd.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_dominant-baseline.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_dominant-baseline.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_ipd-auto.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_ipd-auto.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_ipd-percent.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_ipd-percent.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_keeps.xml
(Copied from xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_keeps.xml, r1562399)
added
Directoryxmlgraphics/fop/trunk/test/layoutengine/testcase2checks.xsl modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26