You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/07/18 17:04:16 UTC
svn commit: r219509 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
fo/flow/ layoutmgr/ layoutmgr/inline/
Author: jeremias
Date: Mon Jul 18 08:03:47 2005
New Revision: 219509
URL: http://svn.apache.org/viewcvs?rev=219509&view=rev
Log:
Moved inline-level LMs and support classes to "inline" subpackage.
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BasicLinkLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/HyphContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLevelLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java
- copied, changed from r219460, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthInlineBox.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutPossibilities.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
- copied, changed from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/WrapperLayoutManager.java
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BasicLinkLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/HyphContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLevelLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthInlineBox.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthParagraph.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutPossibilities.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/WrapperLayoutManager.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java Mon Jul 18 08:03:47 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.layoutmgr.BasicLinkLayoutManager;
/**
* The fo:basic-link formatting object.
@@ -118,14 +114,14 @@
}
/**
- * Return the "internal-destination" property.
+ * @return the "internal-destination" property.
*/
public String getInternalDestination() {
return internalDestination;
}
/**
- * Return the "external-destination" property.
+ * @return the "external-destination" property.
*/
public String getExternalDestination() {
return externalDestination;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java Mon Jul 18 08:03:47 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,10 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.ArrayList;
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -35,9 +31,6 @@
import org.apache.fop.fo.properties.CommonFont;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.SpaceProperty;
-import org.apache.fop.layoutmgr.BidiLayoutManager;
-import org.apache.fop.layoutmgr.InlineLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
/**
* fo:bidi-override element.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java Mon Jul 18 08:03:47 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,10 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.ArrayList;
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -36,13 +32,12 @@
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
-import org.apache.fop.layoutmgr.ICLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
/**
* Class modelling the fo:inline-container object.
*/
public class InlineContainer extends FObj {
+
// The value of properties relevant for fo:inline-container.
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginInline commonMarginInline;
@@ -138,7 +133,7 @@
}
/**
- * Return the "id" property.
+ * @return the "id" property.
*/
public String getId() {
return id;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java Mon Jul 18 08:03:47 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
package org.apache.fop.fo.flow;
-import java.util.List;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
@@ -31,13 +29,14 @@
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.layoutmgr.InlineLayoutManager;
/**
* Class modelling the commonalities of several inline-level
* formatting objects.
*/
public abstract class InlineLevel extends FObjMixed {
+
+ // The value of properties relevant for inline-level FOs.
protected CommonBorderPaddingBackground commonBorderPaddingBackground;
protected CommonAccessibility commonAccessibility;
protected CommonMarginInline commonMarginInline;
@@ -70,28 +69,28 @@
}
/**
- * Return the Common Margin Properties-Inline.
+ * @return the Common Margin Properties-Inline.
*/
public CommonMarginInline getCommonMarginInline() {
return commonMarginInline;
}
/**
- * Return the Common Border, Padding, and Background Properties.
+ * @return the Common Border, Padding, and Background Properties.
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
}
/**
- * Return the Common Font Properties.
+ * @return the Common Font Properties.
*/
public CommonFont getCommonFont() {
return commonFont;
}
/**
- * Return the "color" property.
+ * @return the "color" property.
*/
public ColorType getColor() {
return color;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java Mon Jul 18 08:03:47 2005
@@ -188,84 +188,84 @@
}
/**
- * Return the "id" property.
+ * @return the "id" property.
*/
public String getId() {
return id;
}
/**
- * Return the Common Border, Padding, and Background Properties.
+ * @return the Common Border, Padding, and Background Properties.
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
}
/**
- * Return the "line-height" property.
+ * @return the "line-height" property.
*/
public Length getLineHeight() {
return lineHeight;
}
/**
- * Return the "inline-progression-dimension" property.
+ * @return the "inline-progression-dimension" property.
*/
public LengthRangeProperty getInlineProgressionDimension() {
return inlineProgressionDimension;
}
/**
- * Return the "block-progression-dimension" property.
+ * @return the "block-progression-dimension" property.
*/
public LengthRangeProperty getBlockProgressionDimension() {
return blockProgressionDimension;
}
/**
- * Return the "height" property.
+ * @return the "height" property.
*/
public Length getHeight() {
return height;
}
/**
- * Return the "width" property.
+ * @return the "width" property.
*/
public Length getWidth() {
return width;
}
/**
- * Return the "content-height" property.
+ * @return the "content-height" property.
*/
public Length getContentHeight() {
return contentHeight;
}
/**
- * Return the "content-width" property.
+ * @return the "content-width" property.
*/
public Length getContentWidth() {
return contentWidth;
}
/**
- * Return the "scaling" property.
+ * @return the "scaling" property.
*/
public int getScaling() {
return scaling;
}
/**
- * Return the "vertical-align" property.
+ * @return the "vertical-align" property.
*/
public int getVerticalAlign() {
return verticalAlign;
}
/**
- * Return the "overflow" property.
+ * @return the "overflow" property.
*/
public int getOverflow() {
return overflow;
@@ -285,9 +285,7 @@
return FO_INSTREAM_FOREIGN_OBJECT;
}
- /**
- * @see org.apache.fop.fo.FObj#getLayoutDimension(org.apache.fop.datatypes.PercentBase.DimensionType)
- */
+ /** @see org.apache.fop.fo.FObj */
public Number getLayoutDimension(PercentBase.LayoutDimension key) {
if (key == PercentBase.IMAGE_INTRINSIC_WIDTH) {
return new Integer(getIntrinsicWidth());
@@ -337,4 +335,8 @@
}
}
+ /** @see org.apache.fop.fo.FONode#addChildNode(org.apache.fop.fo.FONode) */
+ protected void addChildNode(FONode child) throws FOPException {
+ super.addChildNode(child);
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java Mon Jul 18 08:03:47 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
@@ -29,7 +26,6 @@
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.fo.properties.SpaceProperty;
-import org.apache.fop.layoutmgr.LeaderLayoutManager;
/**
* Class modelling fo:leader object.
@@ -105,6 +101,8 @@
// use inline layout manager to create inline areas
// add the inline parent multiple times until leader full
break;
+ default:
+ throw new RuntimeException("Invalid leader pattern: " + leaderPattern);
}
// letterSpacing = pList.get(PR_LETTER_SPACING);
// textShadow = pList.get(PR_TEXT_SHADOW);
@@ -120,56 +118,56 @@
/**
- * Return the "id" property.
+ * @return the "id" property.
*/
public String getId() {
return id;
}
/**
- * Return the "rule-style" property.
+ * @return the "rule-style" property.
*/
public int getRuleStyle() {
return ruleStyle;
}
/**
- * Return the "rule-thickness" property.
+ * @return the "rule-thickness" property.
*/
public Length getRuleThickness() {
return ruleThickness;
}
/**
- * Return the "leader-alignment" property.
+ * @return the "leader-alignment" property.
*/
public int getLeaderAlignment() {
return leaderAlignment;
}
/**
- * Return the "leader-length" property.
+ * @return the "leader-length" property.
*/
public LengthRangeProperty getLeaderLength() {
return leaderLength;
}
/**
- * Return the "leader-pattern" property.
+ * @return the "leader-pattern" property.
*/
public int getLeaderPattern() {
return leaderPattern;
}
/**
- * Return the "leader-pattern-width" property.
+ * @return the "leader-pattern-width" property.
*/
public Length getLeaderPatternWidth() {
return leaderPatternWidth;
}
/**
- * Return the "vertical-align" property.
+ * @return the "vertical-align" property.
*/
public int getVerticalAlign() {
return verticalAlign;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -23,6 +23,8 @@
import java.util.List;
import org.apache.fop.fonts.Font;
+import org.apache.fop.layoutmgr.inline.InlineLevelLayoutManager;
+import org.apache.fop.layoutmgr.inline.LineLayoutManager;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.area.LineArea;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -30,6 +30,7 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.SpaceProperty;
+import org.apache.fop.layoutmgr.inline.LineLayoutManager;
import org.apache.fop.traits.MinOptMax;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Mon Jul 18 08:03:47 2005
@@ -135,7 +135,7 @@
// this class represent a feasible breaking point
- protected class KnuthNode {
+ public class KnuthNode {
/** index of the breakpoint represented by this node */
public int position;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -20,6 +20,7 @@
import org.apache.fop.datatypes.PercentBase;
import org.apache.fop.fo.pagination.Flow;
+import org.apache.fop.layoutmgr.inline.InlineLevelLayoutManager;
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockParent;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java Mon Jul 18 08:03:47 2005
@@ -19,6 +19,7 @@
package org.apache.fop.layoutmgr;
import org.apache.fop.fo.Constants;
+import org.apache.fop.layoutmgr.inline.HyphContext;
import org.apache.fop.traits.MinOptMax;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java Mon Jul 18 08:03:47 2005
@@ -61,6 +61,20 @@
import org.apache.fop.fo.pagination.Title;
import org.apache.fop.area.AreaTreeHandler;
+import org.apache.fop.layoutmgr.inline.BasicLinkLayoutManager;
+import org.apache.fop.layoutmgr.inline.BidiLayoutManager;
+import org.apache.fop.layoutmgr.inline.CharacterLayoutManager;
+import org.apache.fop.layoutmgr.inline.ExternalGraphicLayoutManager;
+import org.apache.fop.layoutmgr.inline.FootnoteLayoutManager;
+import org.apache.fop.layoutmgr.inline.ICLayoutManager;
+import org.apache.fop.layoutmgr.inline.InlineLayoutManager;
+import org.apache.fop.layoutmgr.inline.InlineLevelLayoutManager;
+import org.apache.fop.layoutmgr.inline.InstreamForeignObjectLM;
+import org.apache.fop.layoutmgr.inline.LeaderLayoutManager;
+import org.apache.fop.layoutmgr.inline.PageNumberCitationLayoutManager;
+import org.apache.fop.layoutmgr.inline.PageNumberLayoutManager;
+import org.apache.fop.layoutmgr.inline.TextLayoutManager;
+import org.apache.fop.layoutmgr.inline.WrapperLayoutManager;
import org.apache.fop.layoutmgr.list.ListBlockLayoutManager;
import org.apache.fop.layoutmgr.list.ListItemLayoutManager;
import org.apache.fop.layoutmgr.table.TableLayoutManager;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -40,6 +40,7 @@
import org.apache.fop.fo.pagination.SideRegion;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.fo.pagination.StaticContent;
+import org.apache.fop.layoutmgr.inline.ContentLayoutManager;
import org.apache.fop.traits.MinOptMax;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=219509&r1=219508&r2=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -27,6 +27,7 @@
import org.apache.fop.datatypes.PercentBase;
import org.apache.fop.fo.pagination.SideRegion;
import org.apache.fop.fo.pagination.StaticContent;
+import org.apache.fop.layoutmgr.inline.InlineLevelLayoutManager;
import org.apache.fop.traits.MinOptMax;
/**
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BasicLinkLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BasicLinkLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BasicLinkLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,9 +16,10 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.fo.flow.BasicLink;
+import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.area.Trait;
import org.apache.fop.area.LinkResolver;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.ArrayList;
import java.util.List;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,10 +16,18 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.fo.flow.Character;
import org.apache.fop.fonts.Font;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthGlue;
+import org.apache.fop.layoutmgr.KnuthPenalty;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LeafPosition;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.TraitSetter;
+import org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager.AreaInfo;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.area.Trait;
import org.apache.fop.traits.MinOptMax;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,11 +16,19 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.pagination.Title;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthPossPosIter;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.PositionIterator;
+import org.apache.fop.layoutmgr.SpaceSpecifier;
import org.apache.fop.area.Area;
import org.apache.fop.area.LineArea;
import org.apache.fop.area.inline.InlineArea;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
// Java
import java.awt.geom.Rectangle2D;
@@ -27,6 +27,7 @@
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.flow.ExternalGraphic;
+import org.apache.fop.layoutmgr.TraitSetter;
/**
* LayoutManager for the fo:external-graphic formatting object
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,13 +16,18 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import org.apache.fop.fo.flow.Footnote;
+import org.apache.fop.layoutmgr.AbstractLayoutManager;
+import org.apache.fop.layoutmgr.FootnoteBodyLayoutManager;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.Position;
public class FootnoteLayoutManager extends AbstractLayoutManager
implements InlineLevelLayoutManager {
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/HyphContext.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/HyphContext.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/HyphContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
/**
* This class is used to pass information to the getNextBreakPoss()
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
// Java
import java.util.List;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.ListIterator;
import java.util.LinkedList;
@@ -25,6 +25,11 @@
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.SpaceProperty;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.NonLeafPosition;
+import org.apache.fop.layoutmgr.SpaceSpecifier;
+import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.traits.MinOptMax;
import org.apache.fop.traits.SpaceVal;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLevelLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLevelLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineLevelLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,9 +16,12 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.List;
+
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.Position;
/**
* The interface for LayoutManagers which generate inline areas
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.LinkedList;
import java.util.Iterator;
@@ -26,6 +26,14 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.properties.SpaceProperty;
+import org.apache.fop.layoutmgr.AbstractLayoutManager;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.NonLeafPosition;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.PositionIterator;
+import org.apache.fop.layoutmgr.SpaceSpecifier;
import org.apache.fop.traits.SpaceVal;
import org.apache.fop.area.Area;
import org.apache.fop.area.inline.InlineArea;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java (from r219460, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java&r1=219460&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
// Java
import java.awt.geom.Rectangle2D;
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.XMLObj;
import org.apache.fop.fo.flow.InstreamForeignObject;
+import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.Viewport;
@@ -190,7 +191,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LeafNodeLayoutManager#addId()
+ * @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId()
*/
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthInlineBox.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthInlineBox.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthInlineBox.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,11 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
+
+import org.apache.fop.layoutmgr.FootnoteBodyLayoutManager;
+import org.apache.fop.layoutmgr.KnuthBox;
+import org.apache.fop.layoutmgr.Position;
public class KnuthInlineBox extends KnuthBox {
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.area.Trait;
import org.apache.fop.area.inline.FilledArea;
@@ -26,6 +26,14 @@
import org.apache.fop.datatypes.PercentBase;
import org.apache.fop.fo.flow.Leader;
import org.apache.fop.fonts.Font;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthGlue;
+import org.apache.fop.layoutmgr.KnuthPenalty;
+import org.apache.fop.layoutmgr.KnuthPossPosIter;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LeafPosition;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.traits.MinOptMax;
import java.util.List;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,11 +16,16 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.area.Area;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.fo.FObj;
+import org.apache.fop.layoutmgr.AbstractLayoutManager;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LeafPosition;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.traits.MinOptMax;
import java.util.List;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id: LineLayoutManager.java,v 1.17 2004/04/02 10:38:29 cbowditch Exp $ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.Constants;
@@ -24,6 +24,23 @@
import org.apache.fop.fo.properties.CommonHyphenation;
import org.apache.fop.hyphenation.Hyphenation;
import org.apache.fop.hyphenation.Hyphenator;
+import org.apache.fop.layoutmgr.BlockLevelLayoutManager;
+import org.apache.fop.layoutmgr.BreakingAlgorithm;
+import org.apache.fop.layoutmgr.ElementListObserver;
+import org.apache.fop.layoutmgr.KnuthBlockBox;
+import org.apache.fop.layoutmgr.KnuthBox;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthGlue;
+import org.apache.fop.layoutmgr.KnuthPenalty;
+import org.apache.fop.layoutmgr.KnuthPossPosIter;
+import org.apache.fop.layoutmgr.KnuthSequence;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LeafPosition;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.PositionIterator;
+import org.apache.fop.layoutmgr.SpaceSpecifier;
+import org.apache.fop.layoutmgr.BreakingAlgorithm.KnuthNode;
import org.apache.fop.area.LineArea;
import java.util.ListIterator;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutPossibilities.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutPossibilities.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LineLayoutPossibilities.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java Mon Jul 18 08:03:47 2005
@@ -16,12 +16,13 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.layoutmgr.Position;
public class LineLayoutPossibilities {
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.fo.flow.PageNumberCitation;
import org.apache.fop.area.PageViewport;
@@ -26,6 +26,10 @@
import org.apache.fop.area.inline.UnresolvedPageNumber;
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.fonts.Font;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.PositionIterator;
+import org.apache.fop.layoutmgr.TraitSetter;
/**
* LayoutManager for the fo:page-number-citation formatting object
@@ -62,7 +66,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.LeafNodeLayoutManager#getLead() */
+ /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#getLead() */
public int getLead() {
return font.getAscender();
}
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,13 +16,15 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.fo.flow.PageNumber;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.Trait;
import org.apache.fop.fonts.Font;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.TraitSetter;
/**
* LayoutManager for the fo:page-number formatting object
@@ -66,7 +68,7 @@
}
- /** @see org.apache.fop.layoutmgr.LeafNodeLayoutManager#getLead() */
+ /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#getLead() */
public int getLead() {
return font.getAscender();
}
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,7 +16,7 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,15 @@
import org.apache.fop.fo.FOText;
import org.apache.fop.fo.flow.Inline;
import org.apache.fop.fonts.Font;
+import org.apache.fop.layoutmgr.KnuthBox;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthGlue;
+import org.apache.fop.layoutmgr.KnuthPenalty;
+import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LeafPosition;
+import org.apache.fop.layoutmgr.Position;
+import org.apache.fop.layoutmgr.PositionIterator;
+import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.traits.SpaceVal;
import org.apache.fop.area.Trait;
import org.apache.fop.area.inline.InlineArea;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java (from r219459, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/WrapperLayoutManager.java)
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/WrapperLayoutManager.java&r1=219459&r2=219509&rev=219509&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/WrapperLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java Mon Jul 18 08:03:47 2005
@@ -16,10 +16,11 @@
/* $Id$ */
-package org.apache.fop.layoutmgr;
+package org.apache.fop.layoutmgr.inline;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.fo.flow.Wrapper;
+import org.apache.fop.layoutmgr.LayoutContext;
/**
* This is the layout manager for the fo:wrapper formatting object.
@@ -37,7 +38,7 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.LeafNodeLayoutManager */
+ /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager */
public InlineArea get(LayoutContext context) {
//Create a zero-width, zero-height dummy area so this node can
//participate in the ID handling. Otherwise, addId() wouldn't
@@ -46,7 +47,7 @@
return area;
}
- /** @see org.apache.fop.layoutmgr.LeafNodeLayoutManager#addId() */
+ /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org