AWTRenderer uses now system fonts and not pdf fonts. All (error) messages

are handled in the Gui [Dorothea Wiarda]


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193823 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 5 deletions

diff --git a/src/org/apache/fop/layout/FontState.java b/src/org/apache/fop/layout/FontState.java
index c9dcbbbc4..55508dc70 100644
--- a/src/org/apache/fop/layout/FontState.java
+++ b/src/org/apache/fop/layout/FontState.java
@@ -73,15 +73,15 @@ public class FontState {
     }
 
     public int getAscender() {
-	return fontSize * metric.getAscender() / 1000;
+	return  metric.getAscender(fontSize) / 1000;
     }
 
     public int getCapHeight() {
-	return fontSize * metric.getCapHeight() / 1000;
+	return metric.getCapHeight(fontSize) / 1000;
     }
 
     public int getDescender() {
-	return fontSize * metric.getDescender() / 1000;
+	return metric.getDescender(fontSize) / 1000;
     }
 
     public String getFontName() {
@@ -109,11 +109,11 @@ public class FontState {
     }
 
     public int getXHeight() {
-	return fontSize * metric.getXHeight() / 1000;
+	return metric.getXHeight(fontSize) / 1000;
     }
 
     public int width(int charnum) {
 	// returns width of given character number in millipoints
-	return (fontSize * metric.width(charnum) / 1000);
+	return (metric.width(charnum, fontSize) / 1000);
     }
 }