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 fe16941..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),
@@ -802,3 +805,9 @@ void sfnt_writeps(font_info const *fi, FILE *ofp) {
     sfree(breaks);
     fprintf(ofp, "end /%s exch definefont\n", fi->name);
 }
+
+void sfnt_data(font_info *fi, char **bufp, size_t *lenp) {
+    sfnt *sf = fi->fontfile;
+    *bufp = sf->data;
+    *lenp = sf->len;
+}