pbwest 2002/11/11 17:36:53
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
FontSize.java LineHeight.java
Log:
FONode arg added to Ems.makeEms.
FONode arg added to getMappedLength calls.
Revision Changes Path
No revision
No revision
1.1.2.4 +5 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/FontSize.java
Index: FontSize.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontSize.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FontSize.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ FontSize.java 12 Nov 2002 01:36:52 -0000 1.1.2.4
@@ -9,6 +9,7 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.Property;
import java.util.Map;
@@ -35,7 +36,7 @@
throws PropertyException
{
System.out.println("font-size initial size"); //DEBUG
- return getMappedLength(MEDIUM);
+ return getMappedLength(null, MEDIUM);
}
public static final int inherited = COMPUTED;
@@ -67,13 +68,14 @@
,0.83d // smaller
};
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
System.out.println("font-size getMappedLength " + enum + " "
+ mappedLengths[enum]);
if (enum == LARGER || enum == SMALLER)
- return Ems.makeEms(PropNames.FONT_SIZE, mappedLengths[enum]);
+ return Ems.makeEms
+ (node, PropNames.FONT_SIZE, mappedLengths[enum]);
return
Length.makeLength
(PropNames.FONT_SIZE, mappedLengths[enum], Length.PT);
1.1.2.4 +3 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeight.java
Index: LineHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeight.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LineHeight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ LineHeight.java 12 Nov 2002 01:36:52 -0000 1.1.2.4
@@ -5,6 +5,7 @@
import org.apache.fop.datastructs.ROStringArray;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.Property;
public class LineHeight extends Property {
@@ -20,13 +21,13 @@
,"normal"
};
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
if (enum != NORMAL)
throw new PropertyException("Invalid MAPPED_LENGTH enum: "
+ enum);
- return Ems.makeEms(PropNames.LINE_HEIGHT, 1.2d); // normal
+ return Ems.makeEms(node, PropNames.LINE_HEIGHT, 1.2d); // normal
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
