From a972dbb9bd731a439d009bd51e36981c41a06232 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 20 Oct 2009 18:12:26 +0000
Subject: *** empty log message ***

---
 src/pdflib/font/ft_cid.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/pdflib/font/ft_cid.c')

diff --git a/src/pdflib/font/ft_cid.c b/src/pdflib/font/ft_cid.c
index aff9784..d1815fd 100644
--- a/src/pdflib/font/ft_cid.c
+++ b/src/pdflib/font/ft_cid.c
@@ -10,7 +10,7 @@
  |                                                                           |
  *---------------------------------------------------------------------------*/
 
-/* $Id: ft_cid.c,v 1.1 2008/10/17 06:10:43 scuri Exp $
+/* $Id: ft_cid.c,v 1.2 2009/10/20 18:12:26 scuri Exp $
  *
  * FONT CID functions
  *
@@ -57,17 +57,17 @@ static const fnt_cmap_info fnt_predefined_cmaps[] =
     { "GBK-EUC-V",        cc_simplified_chinese, 0, PDC_1_3, 2, 2, 2, 2, 1},
     { "GBKp-EUC-H",       cc_simplified_chinese, 0, PDC_1_4, 0, 2, 2, 2, 0},
     { "GBKp-EUC-V",       cc_simplified_chinese, 0, PDC_1_4, 0, 2, 2, 2, 1},
-    { "GBK2K-H",          cc_simplified_chinese, 0, PDC_1_4, 0, 4, 4, 4, 0},
-    { "GBK2K-V",          cc_simplified_chinese, 0, PDC_1_4, 0, 4, 4, 4, 1},
+    { "GBK2K-H",          cc_simplified_chinese, 0, PDC_1_4, 0, 4, 4, 5, 0},
+    { "GBK2K-V",          cc_simplified_chinese, 0, PDC_1_4, 0, 4, 4, 5, 1},
     { "UniGB-UCS2-H",     cc_simplified_chinese, 2, PDC_1_3, 2, 4, 4, 4, 0},
     { "UniGB-UCS2-V",     cc_simplified_chinese, 2, PDC_1_3, 2, 4, 4, 4, 1},
-    { "UniGB-UTF16-H",    cc_simplified_chinese, 2, PDC_1_5, 0, 0, 4, 4, 0},
-    { "UniGB-UTF16-V",    cc_simplified_chinese, 2, PDC_1_5, 0, 0, 4, 4, 1},
+    { "UniGB-UTF16-H",    cc_simplified_chinese, 2, PDC_1_5, 0, 0, 4, 5, 0},
+    { "UniGB-UTF16-V",    cc_simplified_chinese, 2, PDC_1_5, 0, 0, 4, 5, 1},
 
     { "B5pc-H",           cc_traditional_chinese, 0, PDC_1_3, 0, 0, 0, 0, 0},
     { "B5pc-V",           cc_traditional_chinese, 0, PDC_1_3, 0, 0, 0, 0, 1},
-    { "HKscs-B5-H",       cc_traditional_chinese, 0, PDC_1_4, 0, 3, 3, 3, 0},
-    { "HKscs-B5-V",       cc_traditional_chinese, 0, PDC_1_4, 0, 3, 3, 3, 1},
+    { "HKscs-B5-H",       cc_traditional_chinese, 0, PDC_1_4, 0, 3, 3, 5, 0},
+    { "HKscs-B5-V",       cc_traditional_chinese, 0, PDC_1_4, 0, 3, 3, 5, 1},
     { "ETen-B5-H",        cc_traditional_chinese, 0, PDC_1_3, 0, 0, 0, 0, 0},
     { "ETen-B5-V",        cc_traditional_chinese, 0, PDC_1_3, 0, 0, 0, 0, 1},
     { "ETenms-B5-H",      cc_traditional_chinese, 0, PDC_1_3, 0, 0, 0, 0, 0},
@@ -94,7 +94,7 @@ static const fnt_cmap_info fnt_predefined_cmaps[] =
     { "Identity-H",       cc_identity, 0, PDC_1_3, 0, 0, 0, 0, 0},
     { "Identity-V",       cc_identity, 0, PDC_1_3, 0, 0, 0, 0, 1},
 
-    { NULL,               0, 0, 0, 0, 0, 0, 0, 0},
+    { NULL,               cc_none, 0, 0, 0, 0, 0, 0, 0},
 };
 
 static int
@@ -246,8 +246,11 @@ fnt_get_maxcid(int charcoll, int supplement)
             return 22352;
 
             case 4:
-            default:
             return 29063;
+
+            case 5:
+            default:
+            return 30283;
         }
 
         case cc_traditional_chinese:
@@ -266,8 +269,11 @@ fnt_get_maxcid(int charcoll, int supplement)
             return 18845;
 
             case 4:
-            default:
             return 18964;
+
+            case 5:
+            default:
+            return 19087;
         }
 
         case cc_korean:
-- 
cgit v1.2.3