Added Font getFont(Map attributes, int strategy),

Font getGenericFont(Map attributes) and
Map makeFontAttributes(...)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197640 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/render/FontData.java b/src/java/org/apache/fop/render/FontData.java
index d7963f2e2efc2433816b35e7f4648d74290dff88..02c7e7bc7d83e28b049c94f4e0c018e034de48ea 100644 (file)
--- a/src/java/org/apache/fop/render/FontData.java
+++ b/src/java/org/apache/fop/render/FontData.java
@@ -20,6 +20,7 @@
 package org.apache.fop.render;
 
 import java.awt.Font;
+import java.util.Map;
 
 import org.apache.fop.fonts.FontException;
 
@@ -28,10 +29,13 @@ import org.apache.fop.fonts.FontException;
  * @version $Revision$ $Name$
  */
 public interface FontData {
-    public Font getFont ( String family, int style, int variant, int weight,
+    public Font getFont(Map attributes, int strategy);
+    public Font getFont(String family, int style, int variant, int weight,
             int stretch, float size, int strategy) throws FontException;
+    public Font getGenericFont(Map attributes);
     public Font getGenericFont(String type, int style, int variant, int weight,
             int stretch, float size) throws FontException;
     public Font getSystemFont(int type) throws FontException;
-
+    public Map makeFontAttributes(String family, int style, int variant,int
+            weight, int stretch, float size) throws FontException;
 }
\ No newline at end of file