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 kl...@apache.org on 2001/11/11 15:10:30 UTC
cvs commit: xml-fop/src/org/apache/fop/area/inline InlineArea.java
klease 01/11/11 06:10:29
Modified: src/org/apache/fop/area MainReference.java MinOptMax.java
Span.java
src/org/apache/fop/area/inline InlineArea.java
Log:
A few changes to tie in some more LayoutManager classes
Revision Changes Path
1.4 +2 -1 xml-fop/src/org/apache/fop/area/MainReference.java
Index: MainReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/MainReference.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MainReference.java 2001/11/09 22:02:34 1.3
+++ MainReference.java 2001/11/11 14:10:29 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: MainReference.java,v 1.3 2001/11/09 22:02:34 klease Exp $
+ * $Id: MainReference.java,v 1.4 2001/11/11 14:10:29 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -19,6 +19,7 @@
public void addSpan(Span span) {
spanAreas.add(span);
+ span.setParent(this);
}
public List getSpans() {
1.2 +2 -2 xml-fop/src/org/apache/fop/area/MinOptMax.java
Index: MinOptMax.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/MinOptMax.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MinOptMax.java 2001/11/09 21:59:02 1.1
+++ MinOptMax.java 2001/11/11 14:10:29 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: MinOptMax.java,v 1.1 2001/11/09 21:59:02 klease Exp $
+ * $Id: MinOptMax.java,v 1.2 2001/11/11 14:10:29 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -14,7 +14,7 @@
* variables are package visible.
*/
-public class MinOptMax {
+public class MinOptMax implements java.io.Serializable {
/** Publicly visible min(imum), opt(imum) and max(imum) values.*/
public int min;
1.4 +2 -1 xml-fop/src/org/apache/fop/area/Span.java
Index: Span.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/Span.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Span.java 2001/11/09 22:02:34 1.3
+++ Span.java 2001/11/11 14:10:29 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: Span.java,v 1.3 2001/11/09 22:02:34 klease Exp $
+ * $Id: Span.java,v 1.4 2001/11/11 14:10:29 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -22,6 +22,7 @@
public void addFlow(Flow flow) {
flowAreas.add(flow);
+ flow.setParent(this);
}
public int getColumnCount() {
1.4 +8 -1 xml-fop/src/org/apache/fop/area/inline/InlineArea.java
Index: InlineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/InlineArea.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InlineArea.java 2001/11/02 07:45:17 1.3
+++ InlineArea.java 2001/11/11 14:10:29 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: InlineArea.java,v 1.3 2001/11/02 07:45:17 keiron Exp $
+ * $Id: InlineArea.java,v 1.4 2001/11/11 14:10:29 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -8,6 +8,7 @@
package org.apache.fop.area.inline;
import org.apache.fop.area.Area;
+import org.apache.fop.area.MinOptMax;
import org.apache.fop.area.Property;
import org.apache.fop.render.Renderer;
@@ -43,6 +44,12 @@
public int getWidth() {
return width;
+ }
+
+ public MinOptMax getAllocationIPD() {
+ // Should also account for any borders and padding in the
+ // inline progression dimension
+ return new MinOptMax(width);
}
public void setOffset(int v) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org