toUnicode table is generated, with some wrong character encodings

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/foray-font@450789 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 225 insertions, 606 deletions

diff --git a/src/java/org/apache/fop/pdf/PDFCMap.java b/src/java/org/apache/fop/pdf/PDFCMap.java
index 84d9f8359..18ac8c616 100644
--- a/src/java/org/apache/fop/pdf/PDFCMap.java
+++ b/src/java/org/apache/fop/pdf/PDFCMap.java
@@ -15,328 +15,100 @@
  * limitations under the License.
  */
 
+/* Based on code from the FOray project, used with permission */
 /* $Id$ */
+
  
 package org.apache.fop.pdf;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
 /**
- * Class representing the CMap encodings.
+ * class representing the CMap encodings.
  *
- * CMaps are defined in the "Predefined CJK CMap names" table.
- * In section 5.6.4 of PDF reference 1.4.
+ * CMaps are defined on page 215 and onwards.
+ * The predefined CMap names are drawn from Table 7.20
+ * on pages 215, 216 and 217 .
  */
 public class PDFCMap extends PDFStream {
 
-    /*
-     * Chinese (simplified)
-     */
-
-    /**
-     * GB-EUC-H Microsoft Code Page 936 (lfCharSet 0x86), GB 2312-80
-     * character set, EUC-CN encoding
-     */
-    public static final String ENC_GB_EUC_H = "GB-EUC-H";
-
-    /**
-     * GB-EUC-V Vertical version of GB-EUC-H
-     */
-    public static final String ENC_GB_EUC_V = "GB_EUC_V";
-
-    /**
-     * GBpc-EUC-H Mac OS, GB 2312-80 character set, EUC-CN encoding, Script Manager code 19
-     */
-    public static final String ENC_GBPC_EUC_H = "GBpc-EUC-H";
-
-    /**
-     * GBpc-EUC-V Vertical version of GBpc-EUC-H
-     */
-    public static final String ENC_GBPC_EUC_V = "GBpc-EUC-V";
-
-    /**
-     * GBK-EUC-H Microsoft Code Page 936 (lfCharSet 0x86), GBK character set, GBK encoding
-     */
-    public static final String ENC_GBK_EUC_H = "GBK-EUC-H";
-
-    /**
-     * GBK-EUC-V Vertical version of GBK-EUC-H
-     */
-    public static final String ENC_GBK_EUC_V = "GBK-EUC-V";
-
-    /**
-     * GBKp-EUC-H Same as GBK-EUC-H, but replaces half-width
-     * Latin characters with proportional forms and maps character
-     * code 0x24 to a dollar sign ($) instead of a yuan symbol
-     */
-    public static final String ENC_GBKP_EUC_H = "GBKp-EUC-H";
-
     /**
-     * GBKp-EUC-V Vertical version of GBKp-EUC-H
-     */
-    public static final String ENC_GBKP_EUC_V = "GBKp-EUC-V";
-
-    /**
-     * GBK2K-H GB 18030-2000 character set, mixed 1-, 2-, and 4-byte encoding
-     */
-    public static final String ENC_GBK2K_H = "GBK2K-H";
-
-    /**
-     * GBK2K-V Vertical version of GBK2K-H
-     */
-    public static final String ENC_GBK2K_V = "GBK2K-V";
-
-    /**
-     * UniGB-UCS2-H Unicode (UCS-2) encoding for the Adobe-GB1 character collection
-     */
-    public static final String ENC_UNIGB_UCS2_H = "UniGB-UCS2-H";
-
-    /**
-     * UniGB-UCS2-V Vertical version of UniGB-UCS2-H
-     */
-    public static final String ENC_UNIGB_UCS2_V = "UniGB-UCS2-V";
-
-
-    /*
-     * Chinese (Traditional)
-     */
-
-    /**
-     * B5pc-H Mac OS, Big Five character set, Big Five encoding, Script Manager code 2
-     */
-    public static final String ENC_B5PC_H = "B5pc-H";
-
-    /**
-     * B5pc-V Vertical version of B5pc-H
-     */
-    public static final String ENC_B5PC_V = "B5pc-V";
-
-    /**
-     * HKscs-B5-H Hong Kong SCS, an extension to the Big Five
-     * character set and encoding
-     */
-    public static final String ENC_HKSCS_B5_H = "HKscs-B5-H";
-
-    /**
-     * HKscs-B5-V Vertical version of HKscs-B5-H
-     */
-    public static final String ENC_HKSCS_B5_V = "HKscs-B5-V";
-
-    /**
-     * ETen-B5-H Microsoft Code Page 950 (lfCharSet 0x88), Big Five
-     * character set with ETen extensions
-     */
-    public static final String ENC_ETEN_B5_H = "ETen-B5-H";
-
-    /**
-     * ETen-B5-V Vertical version of ETen-B5-H
-     */
-    public static final String ENC_ETEN_B5_V = "ETen-B5-V";
-
-    /**
-     * ETenms-B5-H Same as ETen-B5-H, but replaces half-width
-     * Latin characters with proportional forms
-     */
-    public static final String ENC_ETENMS_B5_H = "ETenms-B5-H";
-
-    /**
-     * ETenms-B5-V Vertical version of ETenms-B5-H
-     */
-    public static final String ENC_ETENMS_B5_V = "ETenms-B5-V";
-
-    /**
-     * CNS-EUC-H CNS 11643-1992 character set, EUC-TW encoding
-     */
-    public static final String ENC_CNS_EUC_H = "CNS-EUC-H";
-
-    /**
-     * CNS-EUC-V Vertical version of CNS-EUC-H
+     * Chinese (simplified)
      */
-    public static final String ENC_CNS_EUC_V = "CNS-EUC-V";
+    public static final String GB_EUC_H = "GB-EUC-H";
+    public static final String GB_EUC_V = "GB_EUC-V";
+    public static final String GBPC_EUC_H = "GBpc-EUC-H";
+    public static final String GBPC_EUC_V = "GBpc-EUC-V";
+    public static final String GBK_EUC_H = "GBK-EUC-H";
+    public static final String GBK_EUC_V = "GBK-EUC-V";
+    public static final String UNIGB_UCS2_H = "UniGB-UCS2-H";
+    public static final String UNIGB_UCS2_V = "UniGB-UCS2-V";
 
     /**
-     * UniCNS-UCS2-H Unicode (UCS-2) encoding for the
-     * Adobe-CNS1 character collection
+     * Chinese (traditional)
      */
-    public static final String ENC_UNICNS_UCS2_H = "UniCNS-UCS2-H";
+    public static final String B5PC_H = "B5pc-H";
+    public static final String B5PC_V = "B5pc-V";
+    public static final String ETEN_B5_H = "ETen-B5-H";
+    public static final String ETEN_B5_V = "ETen-B5-V";
+    public static final String ETENMS_B5_H = "ETenms-B5-H";
+    public static final String ETENMS_B5_V = "ETenms-B5-V";
+    public static final String CNS_EUC_H = "CNS-EUC-H";
+    public static final String CNS_EUC_V = "CNS-EUC-V";
+    public static final String UNICNS_UCS2_H = "UniCNS-UCS2-H";
+    public static final String UNICNS_UCS2_V = "UniCNS-UCS2-V";
 
     /**
-     * UniCNS-UCS2-V Vertical version of UniCNS-UCS2-H
-     */
-    public static final String ENC_UNICNS_UCS2_V = "UniCNS-UCS2-V";
-
-    /*
      * Japanese
      */
+    public static final String J83PV_RKSJ_H = "83pv-RKSJ-H";    // no V version
+    public static final String J90MS_RKSJ_H = "90ms-RKSJ-H";
+    public static final String J90MS_RKSJ_V = "90ms-RKSJ-V";
+    public static final String J90MSP_RKSJ_H = "90msp-RKSJ-H";
+    public static final String J90MSP_RKSJ_V = "90msp-RKSJ-V";
+    public static final String J90PV_RKSJ_H = "90pv-RKSJ-H";    // no V version
+    public static final String ADD_RKSJ_H = "Add-RKSJ-H";
+    public static final String ADD_RKSJ_V = "Add-RKSJ-V";
+    public static final String EUC_H = "EUC-H";
+    public static final String EUC_V = "EUC-V";
+    public static final String EXT_RKSJ_H = "Ext-RKSJ-H";
+    public static final String EXT_RKSJ_V = "Ext-RKSJ-V";
+    public static final String H = "H";
+    public static final String V = "V";
+    public static final String UNIJIS_UCS2_H = "UniJIS-UCS2-H";
+    public static final String UNIJIS_UCS2_V = "UniJIS-UCS2-V";
+    public static final String UNIJIS_UCS2_HW_H = "UniJIS-UCS2-HW-H";
+    public static final String UNIJIS_UCS2_HW_V = "UniJIS-UCS2-HW-V";
 
     /**
-     * 83pv-RKSJ-H Mac OS, JIS X 0208 character set with KanjiTalk6
-     * extensions, Shift-JIS encoding, Script Manager code 1
-     */
-    public static final String ENC_83PV_RKSJ_H = "83pv-RKSJ-H";    // no V version
-
-    /**
-     * 90ms-RKSJ-H Microsoft Code Page 932 (lfCharSet 0x80), JIS X 0208
-     * character set with NEC and IBM extensions
-     */
-    public static final String ENC_90MS_RKSJ_H = "90ms-RKSJ-H";
-
-    /**
-     * 90ms-RKSJ-V Vertical version of 90ms-RKSJ-H
-     */
-    public static final String ENC_90MS_RKSJ_V = "90ms-RKSJ-V";
-
-    /**
-     * 90msp-RKSJ-H Same as 90ms-RKSJ-H, but replaces half-width Latin
-     * characters with proportional forms
-     */
-    public static final String ENC_90MSP_RKSJ_H = "90msp-RKSJ-H";
-
-    /**
-     * 90msp-RKSJ-V Vertical version of 90msp-RKSJ-H
-     */
-    public static final String ENC_90MSP_RKSJ_V = "90msp-RKSJ-V";
-
-    /**
-     * 90pv-RKSJ-H Mac OS, JIS X 0208 character set with KanjiTalk7
-     * extensions, Shift-JIS encoding, Script Manager code 1
-     */
-    public static final String ENC_90PV_RKSJ_H = "90pv-RKSJ-H";    // no V version
-
-    /**
-     * Add-RKSJ-H JIS X 0208 character set with Fujitsu FMR
-     * extensions, Shift-JIS encoding
-     */
-    public static final String ENC_ADD_RKSJ_H = "Add-RKSJ-H";
-
-    /**
-     * Add-RKSJ-V Vertical version of Add-RKSJ-H
-     */
-    public static final String ENC_ADD_RKSJ_V = "Add-RKSJ-V";
-
-    /**
-     * EUC-H JIS X 0208 character set, EUC-JP encoding
-     */
-    public static final String ENC_EUC_H = "EUC-H";
-
-    /**
-     * EUC-V Vertical version of EUC-H
-     */
-    public static final String ENC_EUC_V = "EUC-V";
-
-    /**
-     * Ext-RKSJ-H JIS C 6226 (JIS78) character set with
-     * NEC extensions, Shift-JIS encoding
-     */
-    public static final String ENC_EXT_RKSJ_H = "Ext-RKSJ-H";
-
-    /**
-     * Ext-RKSJ-V Vertical version of Ext-RKSJ-H
-     */
-    public static final String ENC_EXT_RKSJ_V = "Ext-RKSJ-V";
-
-    /**
-     * H JIS X 0208 character set, ISO-2022-JP encoding
-     */
-    public static final String ENC_H = "H";
-
-    /**
-     * V Vertical version of H
-     */
-    public static final String ENC_V = "V";
-
-    /**
-     * UniJIS-UCS2-H Unicode (UCS-2) encoding for the
-     * Adobe-Japan1 character collection
-     */
-    public static final String ENC_UNIJIS_UCS2_H = "UniJIS-UCS2-H";
-
-    /**
-     * UniJIS-UCS2-V Vertical version of UniJIS-UCS2-H
-     */
-    public static final String ENC_UNIJIS_UCS2_V = "UniJIS-UCS2-V";
-
-    /**
-     * UniJIS-UCS2-HW-H Same as UniJIS-UCS2-H, but replaces proportional
-     * Latin characters with half-width forms
-     */
-    public static final String ENC_UNIJIS_UCS2_HW_H = "UniJIS-UCS2-HW-H";
-
-    /**
-     * UniJIS-UCS2-HW-V Vertical version of UniJIS-UCS2-HW-H
-     */
-    public static final String ENC_UNIJIS_UCS2_HW_V = "UniJIS-UCS2-HW-V";
-
-    /*
      * Korean
      */
+    public static final String KSC_EUC_H = "KSC-EUC-H";
+    public static final String KSC_EUC_V = "KSC-EUC-V";
+    public static final String KSCMS_UHC_H = "KSCms-UHC-H";
+    public static final String KSCMS_UHC_V = "KSCms-UHC-V";
+    public static final String KSCMS_UHC_HW_H = "KSCms-UHC-HW-H";
+    public static final String KSCMS_UHC_HW_V = "KSCms-UHC-HW-V";
+    public static final String KSCPC_EUC_H = "KSCpc-EUC-H";    // no V version
+    public static final String UNIKSC_UCS2_H = "UniKSC-UCS2-H";
+    public static final String UNIKSC_UCS2_V = "UniKSC-UCS2-V";
 
     /**
-     * KSC-EUC-H KS X 1001:1992 character set, EUC-KR encoding
-     */
-    public static final String ENC_KSC_EUC_H = "KSC-EUC-H";
-
-    /**
-     * KSC-EUC-V Vertical version of KSC-EUC-H
-     */
-    public static final String ENC_KSC_EUC_V = "KSC-EUC-V";
-
-    /**
-     * KSCms-UHC-H Microsoft Code Page 949 (lfCharSet 0x81), KS X 1001:1992
-     * character set plus 8822 additional hangul,
-     * Unified Hangul Code (UHC) encoding
-     */
-    public static final String ENC_KSCMS_UHC_H = "KSCms-UHC-H";
-
-    /**
-     * KSCms-UHC-V Vertical version of KSCms-UHC-H
-     */
-    public static final String ENC_KSCMS_UHC_V = "KSCms-UHC-V";
-
-    /**
-     * KSCms-UHC-HW-H Same as KSCms-UHC-H, but replaces proportional
-     * Latin characters with half-width forms
-     */
-    public static final String ENC_KSCMS_UHC_HW_H = "KSCms-UHC-HW-H";
-
-    /**
-     * KSCms-UHC-HW-V Vertical version of KSCms-UHC-HW-H
-     */
-    public static final String ENC_KSCMS_UHC_HW_V = "KSCms-UHC-HW-V";
-
-    /**
-     * KSCpc-EUC-H Mac OS, KS X 1001:1992 character set with
-     * Mac OS KH extensions, Script Manager Code 3
-     */
-    public static final String ENC_KSCPC_EUC_H = "KSCpc-EUC-H";    // no V version
-
-    /**
-     * UniKS-UCS2-H Unicode (UCS-2) encoding for the
-     * Adobe-Korea1 character collection
-     */
-    public static final String ENC_UNIKSC_UCS2_H = "UniKSC-UCS2-H";
-
-    /**
-     * UniKS-UCS2-V Vertical version of UniKS-UCS2-H
-     */
-    public static final String ENC_UNIKSC_UCS2_V = "UniKSC-UCS2-V";
-
-    /*
      * Generic
      */
+    public static final String IDENTITY_H = "Identity-H";
+    public static final String IDENTITY_V = "Identity-V";
 
     /**
-     * Identity-H The horizontal identity mapping for 2-byte CIDs;
-     * may be used with CIDFonts using any Registry, Ordering, and
-     * Supplement values. It maps 2-byte character codes ranging from
-     * 0 to 65,535 to the same 2-byte CID value, interpreted
-     * high-order byte first.
+     * horizontal writing direction
      */
-    public static final String ENC_IDENTITY_H = "Identity-H";
+    public static final byte WMODE_HORIZONTAL = 0;
 
     /**
-     * Identity-V Vertical version of Identity-H. The mapping
-     * is the same as for Identity-H.
+     * vertical writing direction
      */
-    public static final String ENC_IDENTTITY_V = "Identity-V";
+    public static final byte WMODE_VERTICAL = 1;
 
     /**
      * /CMapName attribute, one of the predefined constants
@@ -349,16 +121,6 @@ public class PDFCMap extends PDFStream {
     protected PDFCIDSystemInfo sysInfo;
 
     /**
-     * horizontal writing direction
-     */
-    public static final byte WMODE_HORIZONTAL = 0;
-
-    /**
-     * vertical writing direction
-     */
-    public static final byte WMODE_VERTICAL = 1;
-
-    /**
      * font's writing direction
      */
     protected byte wMode = WMODE_HORIZONTAL;
@@ -374,8 +136,8 @@ public class PDFCMap extends PDFStream {
      * @param name one the registered names (see Table 7.20 on p 215)
      * @param sysInfo the attributes of the character collection of the CIDFont
      */
-    public PDFCMap(String name, PDFCIDSystemInfo sysInfo) {
-        super();
+    public PDFCMap(final PDFDocument doc, final String name,
+            final PDFCIDSystemInfo sysInfo) {
         this.name = name;
         this.sysInfo = sysInfo;
         this.base = null;
@@ -387,25 +149,16 @@ public class PDFCMap extends PDFStream {
      * @param mode is either <code>WMODE_HORIZONTAL</code>
      * or <code>WMODE_VERTICAL</code>
      */
-    public void setWMode(byte mode) {
+    public void setWMode(final byte mode) {
         this.wMode = mode;
     }
 
     /**
-     * Add the contents of this pdf object to the PDF stream.
-     */
-    public void addContents() {
-        StringBuffer p = new StringBuffer();
-        fillInPDF(p);
-        add(p.toString());
-    }
-
-    /**
      * set the base CMap
      *
-     * @param base the name of the base CMap
+     * @param base the name of the base CMap (see Table 7.20)
      */
-    public void setUseCMap(String base) {
+    public void setUseCMap(final String base) {
         this.base = base;
     }
 
@@ -414,68 +167,106 @@ public class PDFCMap extends PDFStream {
      *
      * @param base the stream to be used as base CMap
      */
-    public void setUseCMap(PDFStream base) {
+    public void setUseCMap(final PDFStream base) {
         this.base = base;
     }
 
-    /**
-     * Fill in the pdf string for this CMap.
-     *
-     * @param p the string buffer to add the pdf data to
-     */
-    public void fillInPDF(StringBuffer p) {
-        // p.append("/Type /CMap\n");
+    protected int output(final OutputStream stream) throws IOException {
+        fillInPDF(new StringBuffer());
+        return super.output(stream);
+    }
+
+    public void fillInPDF(final StringBuffer p) {
+        writePreStream(p);
+        writeStreamComments(p);
+        writeCIDInit(p);
+        writeCIDSystemInfo(p);
+        writeVersionTypeName(p);
+        writeCodeSpaceRange(p);
+        writeCIDRange(p);
+        writeBFEntries(p);
+        writeWrapUp(p);
+        writeStreamAfterComments(p);
+        writeUseCMap(p);
+        add(p.toString());
+    }
+
+    protected void writePreStream(final StringBuffer p) {
+        // p.append("/Type /CMap" + EOL);
         // p.append(sysInfo.toPDFString());
-        // p.append("/CMapName /" + name);
-        // p.append("\n");
-        p.append("%!PS-Adobe-3.0 Resource-CMap\n");
-        p.append("%%DocumentNeededResources: ProcSet (CIDInit)\n");
-        p.append("%%IncludeResource: ProcSet (CIDInit)\n");
-        p.append("%%BeginResource: CMap (" + name + ")\n");
-        p.append("%%EndComments\n");
-
-        p.append("/CIDInit /ProcSet findresource begin\n");
-        p.append("12 dict begin\n");
-        p.append("begincmap\n");
-
-        p.append("/CIDSystemInfo 3 dict dup begin\n");
-        p.append("  /Registry (Adobe) def\n");
-        p.append("  /Ordering (Identity) def\n");
-        p.append("  /Supplement 0 def\n");
-        p.append("end def\n");
-
-        p.append("/CMapVersion 1 def\n");
-        p.append("/CMapType 1 def\n");
-        p.append("/CMapName /" + name + " def\n");
-
-        p.append("1 begincodespacerange\n");
-        p.append("<0000> <FFFF>\n");
-        p.append("endcodespacerange\n");
-        p.append("1 begincidrange\n");
-        p.append("<0000> <FFFF> 0\n");
-        p.append("endcidrange\n");
-
-        // p.append("1 beginbfrange\n");
-        // p.append("<0020> <0100> <0000>\n");
-        // p.append("endbfrange\n");
-
-        p.append("endcmap\n");
-        p.append("CMapName currentdict /CMap defineresource pop\n");
-        p.append("end\n");
-        p.append("end\n");
-        p.append("%%EndResource\n");
-        p.append("%%EOF\n");
+        // p.append("/CMapName /" + name + EOL);
+    }
+
+    protected void writeStreamComments(final StringBuffer p) {
+        p.append("%!PS-Adobe-3.0 Resource-CMap" + EOL);
+        p.append("%%DocumentNeededResources: ProcSet (CIDInit)" + EOL);
+        p.append("%%IncludeResource: ProcSet (CIDInit)" + EOL);
+        p.append("%%BeginResource: CMap (" + name + ")" + EOL);
+        p.append("%%EndComments" + EOL);
+    }
+
+    protected void writeCIDInit(final StringBuffer p) {
+        p.append("/CIDInit /ProcSet findresource begin" + EOL);
+        p.append("12 dict begin" + EOL);
+        p.append("begincmap" + EOL);
+    }
+
+    protected void writeCIDSystemInfo(final StringBuffer p) {
+        p.append("/CIDSystemInfo 3 dict dup begin" + EOL);
+        p.append("  /Registry (Adobe) def" + EOL);
+        p.append("  /Ordering (Identity) def" + EOL);
+        p.append("  /Supplement 0 def" + EOL);
+        p.append("end def" + EOL);
+    }
+
+    protected void writeVersionTypeName(final StringBuffer p) {
+        p.append("/CMapVersion 1 def" + EOL);
+        p.append("/CMapType 1 def" + EOL);
+        p.append("/CMapName /" + name + " def" + EOL);
+    }
+
+    protected void writeCodeSpaceRange(final StringBuffer p) {
+        p.append("1 begincodespacerange" + EOL);
+        p.append("<0000> <FFFF>" + EOL);
+        p.append("endcodespacerange" + EOL);
+    }
+
+    protected void writeCIDRange(final StringBuffer p) {
+        p.append("1 begincidrange" + EOL);
+        p.append("<0000> <FFFF> 0" + EOL);
+        p.append("endcidrange" + EOL);
+    }
+
+    protected void writeBFEntries(final StringBuffer p) {
+        // p.append("1 beginbfrange" + EOL);
+        // p.append("<0020> <0100> <0000>" + EOL);
+        // p.append("endbfrange" + EOL);
+    }
+
+    protected void writeWrapUp(final StringBuffer p) {
+        p.append("endcmap" + EOL);
+        p.append("CMapName currentdict /CMap defineresource pop" + EOL);
+        p.append("end" + EOL);
+        p.append("end" + EOL);
+    }
+
+    protected void writeStreamAfterComments(final StringBuffer p) {
+        p.append("%%EndResource" + EOL);
+        p.append("%%EOF" + EOL);
+    }
+
+    protected void writeUseCMap(final StringBuffer p) {
         /*
-         * p.append(" /Type /CMap\n/CMapName /" + name);
-         * p.append("\n");
-         * p.append("\n/WMode "); p.append(wMode);
+         * p.append(" /Type /CMap");
+         * p.append("/CMapName /" + name + EOL);
+         * p.append("/WMode " + wMode + EOL);
          * if (base != null) {
-         * p.append("\n/UseCMap ");
-         * if (base instanceof String) {
-         * p.append("/"+base);
-         * } else {// base instanceof PDFStream
-         * p.append(((PDFStream)base).referencePDF());
-         * }
+         *     p.append("/UseCMap ");
+         *     if (base instanceof String) {
+         *         p.append("/"+base);
+         *     } else { // base instanceof PDFStream
+         *         p.append(((PDFStream)base).referencePDF());
+         *     }
          * }
          */
     }
diff --git a/src/java/org/apache/fop/pdf/PDFFactory.java b/src/java/org/apache/fop/pdf/PDFFactory.java
index 08b1382ea..ec935239a 100644
--- a/src/java/org/apache/fop/pdf/PDFFactory.java
+++ b/src/java/org/apache/fop/pdf/PDFFactory.java
@@ -1026,16 +1026,17 @@ public class PDFFactory {
 
             if (fontSubType == PDFFont.TYPE0) {
                 PDFCIDSystemInfo sysInfo = new PDFCIDSystemInfo("Adobe", "UCS", 0);
-                // TODO vh: does not work yet
-//                PDFCMap cmap = new PDFCMap("Identity-H", sysInfo);
-//                getDocument().registerObject(cmap);
+                
+                PDFToUnicodeCMap cmap = new PDFToUnicodeCMap(getDocument(),font.getPostscriptName(),sysInfo,fontUse);
+                getDocument().registerObject(cmap);
+                
                 PDFCIDFont cidFont = new PDFCIDFont(font.getPostscriptName(),
                         CIDFontType.CIDTYPE2,
                         font.getDefaultWidth(),
                         getSubsetWidths((FontPDF)fontUse.getFontOutput("application/pdf")), sysInfo,
                         (PDFCIDFontDescriptor) pdfdesc);
                 getDocument().registerObject(cidFont);
-//                ((PDFFontType0) pdfFont).setCMAP(cmap);   
+                ((PDFFontType0) pdfFont).setCMAP(cmap);   
                 ((PDFFontType0) pdfFont).setDescendantFonts(cidFont);
             } else {
             	FontPDF fontOutput = (FontPDF)fontUse.getFontOutput("application/pdf");/*TODO vh*/
diff --git a/src/java/org/apache/fop/pdf/PDFObject.java b/src/java/org/apache/fop/pdf/PDFObject.java
index b1e8e1245..2def592c6 100644
--- a/src/java/org/apache/fop/pdf/PDFObject.java
+++ b/src/java/org/apache/fop/pdf/PDFObject.java
@@ -42,6 +42,9 @@ public abstract class PDFObject {
     /** logger for all PDFObjects (and descendants) */
     protected static Log log = LogFactory.getLog(PDFObject.class.getName());
 
+    /** The String that should be used to end a line in the PDF document. */
+    public static final String EOL = "\n";
+
     /**
      * the object's number
      */
diff --git a/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java b/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
index a1810580b..d763cd7f3 100644
--- a/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
+++ b/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
@@ -1,13 +1,44 @@
-package org.apache.fop.pdf;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Based on code from the FOray project, used with permission */
+/* $Id: PDFObject.java 426576 2006-07-28 15:44:37Z jeremias $ */
 
-import org.apache.fop.fonts.CIDFont;
+package org.apache.fop.pdf;
 
+import org.axsl.fontR.FontUse;
+import org.axsl.fontR.output.FontPDF;
+
+/**
+ * Class representing ToUnicode CMaps.
+ * Here are some documentation resources:
+ * <ul>
+ * <li>PDF Reference, Second Edition, Section 5.6.4, for general information
+ * about CMaps in PDF Files.</li>
+ * <li>PDF Reference, Second Edition, Section 5.9, for specific information
+ * about ToUnicodeCMaps in PDF Files.</li>
+ * <li>
+ * <a href="http://partners.adobe.com/asn/developer/pdfs/tn/5411.ToUnicode.pdf">
+ * Adobe Technical Note #5411, "ToUnicode Mapping File Tutorial"</a>.
+ * </ul>
+ */
 public class PDFToUnicodeCMap extends PDFCMap {
 
-    /**
-     * handle to read font
-     */
-    protected CIDFont cidFont;
+    FontUse fsFont;
 
     /**
      * Constructor.
@@ -16,244 +47,37 @@ public class PDFToUnicodeCMap extends PDFCMap {
      * Reference, Second Edition.
      * @param sysInfo The attributes of the character collection of the CIDFont.
      */
-    public PDFToUnicodeCMap(CIDFont cidMetrics, String name, PDFCIDSystemInfo sysInfo) {
-        super(name, sysInfo);
-        cidFont = cidMetrics;
+    public PDFToUnicodeCMap(final PDFDocument doc, final String name,
+            final PDFCIDSystemInfo sysInfo, final FontUse fsFont) {
+        super(doc, name, sysInfo);
+        this.fsFont = fsFont;
     }
 
-    public void fillInPDF(StringBuffer p) {
+    public void fillInPDF(final StringBuffer p) {
         writeCIDInit(p);
         writeCIDSystemInfo(p);
         writeVersionTypeName(p);
         writeCodeSpaceRange(p);
+        final FontPDF fontPDF = (FontPDF) this.fsFont.getFontOutput(
+                "application/pdf");
+        final String bfEntries = fontPDF.getToUnicodeBF();
+        p.append(bfEntries);
         writeBFEntries(p);
         writeWrapUp(p);
         add(p.toString());
     }
 
-    protected void writeCIDSystemInfo(StringBuffer p) {
-        p.append("/CIDSystemInfo\n");
-        p.append("<< /Registry (Adobe)\n");
-        p.append("/Ordering (UCS)\n");
-        p.append("/Supplement 0\n");
-        p.append(">> def\n");
-    }
-
-    protected void writeVersionTypeName(StringBuffer p) {
-        p.append("/CMapName /Adobe-Identity-UCS def\n");
-        p.append("/CMapType 2 def\n");
-    }
-
-    /**
-     * Writes the character mappings for this font.
-     */
-    protected void writeBFEntries(StringBuffer p) {
-        if(cidFont == null) return;
-
-        char[] charArray = cidFont.getCharsUsed();
-
-        if(charArray != null) {
-            writeBFCharEntries(p, charArray);
-            writeBFRangeEntries(p, charArray);
-        }
-    }
-
-    protected void writeBFCharEntries(StringBuffer p, char[] charArray) {
-        int completedEntries = 0;
-        int totalEntries = 0;
-        for (int i = 0; i < charArray.length; i++) {
-            if (! partOfRange(charArray, i)) {
-                totalEntries ++;
-            }
-        }
-        if (totalEntries < 1) {
-            return;
-        }
-        int remainingEntries = totalEntries;
-        /* Limited to 100 entries in each section */
-        int entriesThisSection = Math.min(remainingEntries, 100);
-        int remainingEntriesThisSection = entriesThisSection;
-        p.append(entriesThisSection + " beginbfchar\n");
-        for (int i = 0; i < charArray.length; i++) {
-            if (partOfRange(charArray, i)) {
-                continue;
-            }
-            p.append("<" + padHexString(Integer.toHexString(i), 4)
-                    + "> ");
-            p.append("<" + padHexString(Integer.toHexString(charArray[i]), 4)
-                    + ">\n");
-            /* Compute the statistics. */
-            completedEntries ++;
-            remainingEntries = totalEntries - completedEntries;
-            remainingEntriesThisSection --;
-            if (remainingEntriesThisSection < 1) {
-                if (remainingEntries > 0) {
-                    p.append("endbfchar\n");
-                    entriesThisSection = Math.min(remainingEntries, 100);
-                    remainingEntriesThisSection = entriesThisSection;
-                    p.append(entriesThisSection + " beginbfchar\n");
-                }
-            }
-        }
-        p.append("endbfchar\n");
-    }
-
-    protected void writeBFRangeEntries(StringBuffer p, char[] charArray) {
-        int completedEntries = 0;
-        int totalEntries = 0;
-        for (int i = 0; i < charArray.length; i++) {
-            if (startOfRange(charArray, i)) {
-                totalEntries ++;
-            }
-        }
-        if (totalEntries < 1) {
-            return;
-        }
-        int remainingEntries = totalEntries;
-        int entriesThisSection = Math.min(remainingEntries, 100);
-        int remainingEntriesThisSection = entriesThisSection;
-        p.append(entriesThisSection + " beginbfrange\n");
-        for (int i = 0; i < charArray.length; i++) {
-            if (! startOfRange(charArray, i)) {
-                continue;
-            }
-            p.append("<"
-                    + padHexString(Integer.toHexString(i), 4)
-                    + "> ");
-            p.append("<"
-                    + padHexString(Integer.toHexString
-                            (endOfRange(charArray, i)), 4)
-                    + "> ");
-            p.append("<"
-                    + padHexString(Integer.toHexString(charArray[i]), 4)
-                    + ">\n");
-            /* Compute the statistics. */
-            completedEntries ++;
-            remainingEntries = totalEntries - completedEntries;
-            if (remainingEntriesThisSection < 1) {
-                if (remainingEntries > 0) {
-                    p.append("endbfrange\n");
-                    entriesThisSection = Math.min(remainingEntries, 100);
-                    remainingEntriesThisSection = entriesThisSection;
-                    p.append(entriesThisSection + " beginbfrange\n");
-                }
-            }
-        }
-        p.append("endbfrange\n");
-    }
-
-    /**
-     * Find the end of the current range.
-     * @param charArray The array which is being tested.
-     * @param startOfRange The index to the array element that is the start of
-     * the range.
-     * @return The index to the element that is the end of the range.
-     */
-    private int endOfRange(char[] charArray, int startOfRange) {
-        int endOfRange = -1;
-        for (int i = startOfRange; i < charArray.length - 1 && endOfRange < 0;
-                i++) {
-            if (! sameRangeEntryAsNext(charArray, i)) {
-                endOfRange = i;
-            }
-        }
-        return endOfRange;
+    protected void writeCIDSystemInfo(final StringBuffer p) {
+        p.append("/CIDSystemInfo" + EOL);
+        p.append("<< /Registry (Adobe)" + EOL);
+        p.append("/Ordering (UCS)" + EOL);
+        p.append("/Supplement 0" + EOL);
+        p.append(">> def" + EOL);
     }
 
-    /**
-     * Determine whether this array element should be part of a bfchar entry or
-     * a bfrange entry.
-     * @param charArray The array to be tested.
-     * @param arrayIndex The index to the array element to be tested.
-     * @return True if this array element should be included in a range.
-     */
-    private boolean partOfRange(char[] charArray, int arrayIndex) {
-        if (charArray.length < 2) {
-            return false;
-        }
-        if (arrayIndex == 0) {
-            return sameRangeEntryAsNext(charArray, 0);
-        }
-        if (arrayIndex == charArray.length - 1) {
-            return sameRangeEntryAsNext(charArray, arrayIndex - 1);
-        }
-        if (sameRangeEntryAsNext(charArray, arrayIndex - 1)) {
-            return true;
-        }
-        if (sameRangeEntryAsNext(charArray, arrayIndex)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Determine whether two bytes can be written in the same bfrange entry.
-     * @param charArray The array to be tested.
-     * @param firstItem The first of the two items in the array to be tested.
-     * The second item is firstItem + 1.
-     * @return True if both 1) the next item in the array is sequential with
-     * this one, and 2) the first byte of the character in the first position
-     * is equal to the first byte of the character in the second position.
-     */
-    private boolean sameRangeEntryAsNext(char[] charArray, int firstItem) {
-        if (charArray[firstItem] + 1 != charArray[firstItem + 1]) {
-            return false;
-        }
-        if (firstItem / 256 != (firstItem + 1) / 256) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Determine whether this array element should be the start of a bfrange
-     * entry.
-     * @param charArray The array to be tested.
-     * @param arrayIndex The index to the array element to be tested.
-     * @return True if this array element is the beginning of a range.
-     */
-    private boolean startOfRange(char[] charArray, int arrayIndex) {
-        // Can't be the start of a range if not part of a range.
-        if (! partOfRange(charArray, arrayIndex)) {
-            return false;
-        }
-        // If first element in the array, must be start of a range
-        if (arrayIndex == 0) {
-            return true;
-        }
-        // If last element in the array, cannot be start of a range
-        if (arrayIndex == charArray.length - 1) {
-            return false;
-        }
-        /*
-         * If part of same range as the previous element is, cannot be start
-         * of range.
-         */
-        if (sameRangeEntryAsNext(charArray, arrayIndex - 1)) {
-            return false;
-        }
-        // Otherwise, this is start of a range.
-        return true;
-    }
-
-    /**
-     * Prepends the input string with a sufficient number of "0" characters to
-     * get the returned string to be numChars length.
-     * @param input The input string.
-     * @param numChars The minimum characters in the output string.
-     * @return The padded string.
-     */
-    public static String padHexString(String input, int numChars) {
-        int length = input.length();
-        if (length >= numChars) {
-            return input;
-        }
-        StringBuffer returnString = new StringBuffer();
-        for (int i = 1; i <= numChars - length; i++) {
-            returnString.append("0");
-        }
-        returnString.append(input);
-        return returnString.toString();
+    protected void writeVersionTypeName(final StringBuffer p) {
+        p.append("/CMapName /Adobe-Identity-UCS def" + EOL);
+        p.append("/CMapType 2 def" + EOL);
     }
 
-}
\ No newline at end of file
+}