Improve (and greatly complicate) CMap generation for TrueType fonts.

[sgt/halibut] / in_sfnt.c

diff --git a/in_sfnt.c b/in_sfnt.c
index 9e21bf2..b33a2a1 100644 (file)
--- a/in_sfnt.c
+++ b/in_sfnt.c
@@ -349,7 +349,6 @@ typedef struct {
     unsigned short index;
 } glyphmap;
 
-typedef struct sfnt_Tag sfnt;
 struct sfnt_Tag {
     void *data;
     size_t len;
@@ -497,11 +496,15 @@ static void sfnt_mapglyphs(font_info *fi) {
          glyphsbyname_cmp);
 }
 
-static glyph sfnt_indextoglyph(sfnt *sf, unsigned short idx) {
+glyph sfnt_indextoglyph(sfnt *sf, unsigned idx) {
     return sf->glyphsbyindex[idx];
 }
 
-static unsigned short sfnt_glyphtoindex(sfnt *sf, glyph g) {
+unsigned sfnt_nglyphs(sfnt *sf) {
+    return sf->nglyphs;
+}
+
+unsigned sfnt_glyphtoindex(sfnt *sf, glyph g) {
     cmp_glyphsbyindex = sf->glyphsbyindex;
     return *(unsigned short *)bsearch(&g, sf->glyphsbyname, sf->nglyphs,
                                      sizeof(*sf->glyphsbyname),
@@ -803,46 +806,6 @@ void sfnt_writeps(font_info const *fi, FILE *ofp) {
     fprintf(ofp, "end /%s exch definefont\n", fi->name);
 }
 
-void sfnt_cmap(font_encoding *fe, object *cmap) {
-    unsigned i;
-
-    objtext(cmap, "<</Type/CMap\n/CMapName/");
-    objtext(cmap, fe->name);
-    objtext(cmap, "\n/CIDSystemInfo<</Registry(Adobe)/Ordering(Identity)"
-           "/Supplement 0>>\n");
-    objstream(cmap, "%!PS-Adobe-3.0 Resource-CMap\n"
-             "%%DocumentNeededResources: procset CIDInit\n"
-             "%%IncludeResource: procset CIDInit\n"
-             "%%BeginResource: CMap ");
-    objstream(cmap, fe->name);
-    objstream(cmap, "\n%%Title (");
-    objstream(cmap, fe->name);
-    objstream(cmap, " Adobe Identity 0)\n%%Version: 1\n%%EndComments\n");
-    objstream(cmap, "/CIDInit/ProcSet findresource begin\n");
-    objstream(cmap, "12 dict begin begincmap\n");
-    objstream(cmap, "/CIDSystemInfo 3 dict dup begin\n"
-             "/Registry(Adobe)def/Ordering(Identity)def/Supplement 0 def "
-             "end def\n");
-    objstream(cmap, "/CMapName/");
-    objstream(cmap, fe->name);
-    objstream(cmap, " def/CMapType 0 def/WMode 0 def\n");
-    objstream(cmap, "1 begincodespacerange<00><FF>endcodespacerange\n");
-    for (i = 0; i < 256; i++) {
-       char buf[20];
-       if (fe->vector[i] == NOGLYPH)
-           continue;
-       objstream(cmap, "1 begincidchar");
-       sprintf(buf, "<%02X>", i);
-       objstream(cmap, buf);
-       sprintf(buf, "%hu", sfnt_glyphtoindex(fe->font->info->fontfile,
-                                             fe->vector[i]));
-       objstream(cmap, buf);
-       objstream(cmap, " endcidchar\n");
-    }
-    objstream(cmap, "endcmap CMapName currentdict /CMap defineresource pop "
-             "end end\n%%EndResource\n%%EOF\n");
-}
-
 void sfnt_data(font_info *fi, char **bufp, size_t *lenp) {
     sfnt *sf = fi->fontfile;
     *bufp = sf->data;