From c6d5e1badadc439efab44d977ab4f7782f72f720 Mon Sep 17 00:00:00 2001
From: Peter Bernard West <pbwest@apache.org>
Date: Tue, 12 Nov 2002 01:36:52 +0000
Subject: [PATCH] FONode arg added to Ems.makeEms. FONode arg added to
 getMappedLength calls.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195501 13f79535-47bb-0310-9956-ffa450edef68
---
 src/org/apache/fop/fo/properties/FontSize.java   | 8 +++++---
 src/org/apache/fop/fo/properties/LineHeight.java | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/org/apache/fop/fo/properties/FontSize.java b/src/org/apache/fop/fo/properties/FontSize.java
index 83c3937f1..e9a384584 100644
--- a/src/org/apache/fop/fo/properties/FontSize.java
+++ b/src/org/apache/fop/fo/properties/FontSize.java
@@ -9,6 +9,7 @@ import org.apache.fop.datatypes.Ems;
 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 @@ public class FontSize extends Property  {
         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 @@ public class FontSize extends Property  {
         ,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);
diff --git a/src/org/apache/fop/fo/properties/LineHeight.java b/src/org/apache/fop/fo/properties/LineHeight.java
index db31d155a..d8b526757 100644
--- a/src/org/apache/fop/fo/properties/LineHeight.java
+++ b/src/org/apache/fop/fo/properties/LineHeight.java
@@ -5,6 +5,7 @@ import org.apache.fop.datatypes.Ems;
 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 @@ public class LineHeight extends Property  {
         ,"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
     }
 }
 
-- 
2.39.5