FOP-2504: Truetype support for AFP

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

3 files changed, 18 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/afp/fonts/CharacterSet.java b/src/java/org/apache/fop/afp/fonts/CharacterSet.java
index d57b14ed7..593b40592 100644
--- a/src/java/org/apache/fop/afp/fonts/CharacterSet.java
+++ b/src/java/org/apache/fop/afp/fonts/CharacterSet.java
@@ -108,8 +108,12 @@ public class CharacterSet {
 
         // the character set name must be 8 chars long
         this.name = padName(name);
-        // the code page name must be 8 chars long
-        this.codePage = padName(codePage);
+        if (codePage == null) {
+            this.codePage = null;
+        } else {
+            // the code page name must be 8 chars long
+            this.codePage = padName(codePage);
+        }
 
         this.encoding = encoding;
         this.encoder = charsetType.getEncoder(encoding);
diff --git a/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java b/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
index e7b9041ba..39d2be845 100644
--- a/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
+++ b/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
@@ -232,6 +232,12 @@ public abstract class CharacterSetBuilder {
                 eventProducer);
     }
 
+    public CharacterSet build(String characterSetName, String codePageName, String encoding,
+                              Typeface typeface, AFPResourceAccessor accessor, AFPEventProducer eventProducer)
+        throws IOException {
+        return new FopCharacterSet(codePageName, encoding, characterSetName, typeface, accessor, eventProducer);
+    }
+
     private CharacterSet processFont(String characterSetName, String codePageName, String encoding,
             CharacterSetType charsetType, AFPResourceAccessor accessor, AFPEventProducer eventProducer)
             throws IOException {
diff --git a/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java b/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
index d3af78f7b..9d53cc7ea 100644
--- a/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
+++ b/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
@@ -49,6 +49,12 @@ public class FopCharacterSet extends CharacterSet {
         this.charSet = charSet;
     }
 
+    public FopCharacterSet(String codePage, String encoding, String name, Typeface charSet,
+                           AFPResourceAccessor accessor, AFPEventProducer eventProducer) {
+        super(codePage, encoding, CharacterSetType.SINGLE_BYTE, name, accessor, eventProducer);
+        this.charSet = charSet;
+    }
+
     /**
      * Ascender height is the distance from the character baseline to the
      * top of the character box. A negative ascender height signifies that