Commit c96f69dfaa57af0bd3e5d1f5dd030af69779f820
2002-12-03T00:39:16
* src/base/ftobjs.c: modified the logic to get Unicode charmaps. Now it loads UCS-4 charmaps when there is one. * src/base/ftobjs.c (find_unicode_charmap): new function. * src/base/ftobjs.c (open_face): refer to the above one. * src/base/ftobjs.c (FT_Select_Charmap): idem.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169
diff --git a/ChangeLog b/ChangeLog
index 8ca3e5b..a577cf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-02 Antoine Leca <Antoine-FreetypeLeca-Marti.org>
+
+ * src/base/ftobjs.c: modified the logic to get Unicode charmaps.
+ Now it loads UCS-4 charmaps when there is one.
+ * src/base/ftobjs.c (find_unicode_charmap): new function.
+ * src/base/ftobjs.c (open_face): refer to the above one.
+ * src/base/ftobjs.c (FT_Select_Charmap): idem.
+
2002-11-29 Antoine Leca <Antoine-FreetypeLeca-Marti.org>
* include/freetype/ftgzip.h: Correct the name of the controlling
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 4f53ca1..5f6d3ba 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -23,6 +23,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TABLES_H
+#include FT_TRUETYPE_IDS_H
#include FT_OUTLINE_H
@@ -702,6 +703,76 @@
/*************************************************************************/
/* */
/* <Function> */
+ /* find_unicode_charmap */
+ /* */
+ /* <Description> */
+ /* This function finds a Unicode charmap, if there is one. */
+ /* And if there is more than one, it tries to favour the more */
+ /* extensive one, i.e. one that supports UCS-4 against those which */
+ /* are limited to the BMP (said UCS-2 encoding.) */
+ /* */
+ /* This function is called from open_face() (just below), and also */
+ /* from FT_Select_Charmap( , FT_ENCODING_UNICODE). */
+ /* */
+ static FT_Error
+ find_unicode_charmap( FT_Face face )
+ {
+ FT_CharMap* first;
+ FT_CharMap* cur;
+ FT_CharMap* unicmap = NULL; /* some UCS-2 map, if we found it */
+
+
+ /* caller should have already checked that `face' is valid */
+ FT_ASSERT ( face );
+
+ first = face->charmaps;
+
+ if ( !first )
+ return FT_Err_Invalid_CharMap_Handle;
+
+ /* since the `interesting' table, with id's 3,10, is normally the */
+ /* last one, we loop backwards. This looses with type1 fonts with */
+ /* non-BMP characters (<.0001%), this wins with .ttf with non-BMP */
+ /* chars (.01% ?), and this is the same about 99.99% of the time! */
+
+ cur = first + face->num_charmaps; /* points after the last one */
+
+ for ( ; --cur >= first; )
+ {
+ if ( cur[0]->encoding == FT_ENCODING_UNICODE )
+ {
+ unicmap = cur; /* record we found a Unicode charmap */
+
+ /* XXX If some new encodings to represent UCS-4 are added, */
+ /* they should be added here. */
+ if ( ( cur[0]->platform_id == TT_PLATFORM_MICROSOFT
+ && cur[0]->encoding_id == TT_MS_ID_UCS_4 )
+ || ( cur[0]->platform_id == TT_PLATFORM_APPLE_UNICODE
+ && cur[0]->encoding_id == TT_APPLE_ID_UNICODE_32 ) )
+ /* Hurray! We found a UCS-4 charmap. We can stop the scan! */
+ {
+ face->charmap = cur[0];
+ return 0;
+ }
+ }
+ }
+
+ /* We do not have any UCS-4 charmap. Sigh. */
+ /* Let's see if we have some other kind of Unicode charmap, though. */
+ if ( unicmap != NULL )
+ {
+ face->charmap = unicmap[0];
+ return 0;
+ }
+
+ /* Chou blanc! */
+ return FT_Err_Invalid_Argument;
+ }
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
/* open_face */
/* */
/* <Description> */
@@ -718,7 +789,7 @@
FT_Memory memory;
FT_Driver_Class clazz;
FT_Face face = 0;
- FT_Error error;
+ FT_Error error, error2;
FT_Face_Internal internal;
@@ -748,7 +819,7 @@
i++ )
if ( params[i].tag == FT_PARAM_TAG_INCREMENTAL )
face->internal->incremental_interface = params[i].data;
- }
+ }
#endif
error = clazz->init_face( stream,
@@ -760,24 +831,14 @@
goto Fail;
/* select Unicode charmap by default */
- {
- FT_Int nn;
- FT_CharMap unicmap = NULL, cmap;
+ error2 = find_unicode_charmap( face );
+ /* if no Unicode charmap can be found, return FT_Err_Invalid_Argument */
-
- for ( nn = 0; nn < face->num_charmaps; nn++ )
- {
- cmap = face->charmaps[nn];
-
- if ( cmap->encoding == FT_ENCODING_UNICODE )
- {
- unicmap = cmap;
- break;
- }
- }
-
- if ( unicmap != NULL )
- face->charmap = unicmap;
+ /* no error should happen, but we want to play safe. */
+ if ( error2 && error2 != FT_Err_Invalid_Argument )
+ {
+ error = error2;
+ goto Fail;
}
*aface = face;
@@ -1441,6 +1502,13 @@
if ( !face )
return FT_Err_Invalid_Face_Handle;
+ /* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
+ /* charmap available, i.e. one with UCS-4 characters, if possible. */
+ /* */
+ /* This is done by find_unicode_charmap() above, to share code. */
+ if ( encoding == FT_ENCODING_UNICODE )
+ return find_unicode_charmap( face );
+
cur = face->charmaps;
if ( !cur )
return FT_Err_Invalid_CharMap_Handle;