--- zkfftype.c.old Wed Dec 3 19:35:34 1997 +++ zkfftype.c Tue Dec 16 10:58:15 1997 @@ -278,10 +278,11 @@ dp = ht * index->depth + 0.5; if ((code = TT_New_Glyph(index->face, &glyph)) != 0) goto fterr; - if ((code = TT_Set_Instance_PointSize(index->instance, 10)) != 0) + if ((code = TT_Set_Instance_CharSizes(index->instance, + wd * 64, ht * 64)) != 0) goto fterr; - if ((code = TT_Set_Instance_Resolution(index->instance, - (int)(wd * 72 / 10), (int)(ht * 72 / 10))) != 0) + if ((code = TT_Set_Instance_Resolutions(index->instance, + 72, 72)) != 0) goto fterr; if (index->codeconv == NULL) { charcode = jis_code; @@ -376,7 +377,7 @@ 0x0000, 0x0000, 0x0000, 0x2220, 0x22A5, 0x2312, 0x2202, 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D, 0x2235, 0x222B, 0x222C, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -0x0000, 0x212B, 0x2030, 0x266F, 0x266B, 0x266A, 0x2020, 0x2021, +0x0000, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020, 0x2021, 0x00B6, 0x0000, 0x0000, 0x0000, 0x0000, 0x25EF}, { /* category 03 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1576,9 +1577,9 @@ } else { k += 0x9e - 0x21; } - if (k > 0x7f) k++; + if (k >= 0x7f) k++; k1 = (k1 - 0x21) / 2 + 0x81; if (k1 >= 0xa0) k1 += 0x40; - return ((k1 << 8) + k1); + return ((k1 << 8) + k); }