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 a9108e8..b33a2a1 100644 (file)
--- a/in_sfnt.c
+++ b/in_sfnt.c
@@ -121,6 +121,7 @@ sfnt_decode offsubdir_decode[] = {
 };
 
 #define sfnt_00010000  0x00010000
+#define TAG_OS_2       0x4f532f32
 #define TAG_cmap       0x636d6170
 #define TAG_glyf       0x676c7966
 #define TAG_head       0x68656164
@@ -147,6 +148,55 @@ sfnt_decode tabledir_decode[] = {
     { d_end }
 };
 
+/* OS/2 and Windows compatibility table */
+typedef struct t_OS_2_Tag t_OS_2;
+struct t_OS_2_Tag {
+    unsigned version;
+    int sTypoAscender, sTypoDescender;
+    int sxHeight, sCapHeight;
+};
+sfnt_decode t_OS_2_v0_decode[] = {
+    { d_uint16, offsetof(t_OS_2, version) },
+    { d_skip(66) }, /* xAvgCharWidth, usWeightClass, usWidthClass, fsType, */
+    /* ySubscriptXSize, ySubscriptYSize, ySubscriptXOffset, */
+    /* ySubscriptYOffset, ySuperscriptXSize, ySuperscriptYSize, */
+    /* ySuperscriptXOffset, ySupercriptYOffset, sFamilyClass, panose, */
+    /* ulUnicodeRange1, ulUnicodeRange2, ulUnicodeRange3, ulUnicodeRange4, */
+    /* achVendID, fsSelection, usFirstCharIndex, usLastCharIndex */
+    { d_end }
+};
+sfnt_decode t_OS_2_v1_decode[] = {
+    { d_uint16, offsetof(t_OS_2, version) },
+    { d_skip(66) }, /* xAvgCharWidth, usWeightClass, usWidthClass, fsType, */
+    /* ySubscriptXSize, ySubscriptYSize, ySubscriptXOffset, */
+    /* ySubscriptYOffset, ySuperscriptXSize, ySuperscriptYSize, */
+    /* ySuperscriptXOffset, ySupercriptYOffset, sFamilyClass, panose, */
+    /* ulUnicodeRange1, ulUnicodeRange2, ulUnicodeRange3, ulUnicodeRange4, */
+    /* achVendID, fsSelection, usFirstCharIndex, usLastCharIndex */
+    { d_int16, offsetof(t_OS_2, sTypoAscender) },
+    { d_int16, offsetof(t_OS_2, sTypoDescender) },
+    { d_skip(14) }, /* sTypoLineGap, usWinAscent, usWinDescent, */
+    /* ulCodePageRange1, ulCodePageRange2 */
+    { d_end }
+};
+sfnt_decode t_OS_2_v2_decode[] = {
+    { d_uint16, offsetof(t_OS_2, version) },
+    { d_skip(66) }, /* xAvgCharWidth, usWeightClass, usWidthClass, fsType, */
+    /* ySubscriptXSize, ySubscriptYSize, ySubscriptXOffset, */
+    /* ySubscriptYOffset, ySuperscriptXSize, ySuperscriptYSize, */
+    /* ySuperscriptXOffset, ySupercriptYOffset, sFamilyClass, panose, */
+    /* ulUnicodeRange1, ulUnicodeRange2, ulUnicodeRange3, ulUnicodeRange4, */
+    /* achVendID, fsSelection, usFirstCharIndex, usLastCharIndex */
+    { d_int16, offsetof(t_OS_2, sTypoAscender) },
+    { d_int16, offsetof(t_OS_2, sTypoDescender) },
+    { d_skip(14) }, /* sTypoLineGap, usWinAscent, usWinDescent, */
+    /* ulCodePageRange1, ulCodePageRange2 */
+    { d_int16, offsetof(t_OS_2, sxHeight) },
+    { d_int16, offsetof(t_OS_2, sCapHeight) },
+    { d_skip(6) }, /* usDefaultChar, usBreakChar, usMaxContext */
+    { d_end }
+};
+
 /* Character to Glyph ('cmap') table */
 typedef struct t_cmap_Tag t_cmap;
 struct t_cmap_Tag {
@@ -299,7 +349,6 @@ typedef struct {
     unsigned short index;
 } glyphmap;
 
-typedef struct sfnt_Tag sfnt;
 struct sfnt_Tag {
     void *data;
     size_t len;
@@ -447,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),
@@ -459,15 +512,21 @@ static unsigned short sfnt_glyphtoindex(sfnt *sf, glyph g) {
 }
 
 /*
- * Get data from 'hhea' and 'hmtx' tables
+ * Get data from 'hhea', 'hmtx', and 'OS/2' tables
  */
 void sfnt_getmetrics(font_info *fi) {
     sfnt *sf = fi->fontfile;
     t_hhea hhea;
+    t_OS_2 OS_2;
     void *ptr, *end;
     unsigned i, j;
     unsigned *hmtx;
 
+    /* First, the bounding box from the 'head' table. */
+    fi->fontbbox[0] = sf->head.xMin * FUNITS_PER_PT /  sf->head.unitsPerEm;
+    fi->fontbbox[1] = sf->head.yMin * FUNITS_PER_PT /  sf->head.unitsPerEm;
+    fi->fontbbox[2] = sf->head.xMax * FUNITS_PER_PT /  sf->head.unitsPerEm;
+    fi->fontbbox[3] = sf->head.yMax * FUNITS_PER_PT /  sf->head.unitsPerEm;
     if (!sfnt_findtable(sf, TAG_hhea, &ptr, &end))
        abort();
     if (decode(t_hhea_decode, ptr, end, &hhea) == NULL)
@@ -491,6 +550,23 @@ void sfnt_getmetrics(font_info *fi) {
        w->width = hmtx[j] * UNITS_PER_PT / sf->head.unitsPerEm;
        add234(fi->widths, w);
     }
+    /* Now see if the 'OS/2' table has any useful metrics */
+    if (!sfnt_findtable(sf, TAG_OS_2, &ptr, &end))
+       return;
+    if (decode(uint16_decode, ptr, end, &OS_2.version) == NULL)
+       return;
+    if (OS_2.version >= 2) {
+       if (decode(t_OS_2_v2_decode, ptr, end, &OS_2) == NULL)
+           return;
+       fi->xheight = OS_2.sxHeight * FUNITS_PER_PT / sf->head.unitsPerEm;
+       fi->capheight = OS_2.sCapHeight * FUNITS_PER_PT / sf->head.unitsPerEm;
+    } else if (OS_2.version == 1) {
+       if (decode(t_OS_2_v1_decode, ptr, end, &OS_2) == NULL)
+           return;
+    } else
+       return;
+    fi->ascent = OS_2.sTypoAscender * FUNITS_PER_PT / sf->head.unitsPerEm;
+    fi->descent = OS_2.sTypoDescender * FUNITS_PER_PT / sf->head.unitsPerEm;
 }
 
 /*
@@ -656,6 +732,7 @@ void sfnt_writeps(font_info const *fi, FILE *ofp) {
     size_t *breaks, glyfoff, glyflen;
     void *glyfptr, *glyfend, *locaptr, *locaend;
     unsigned *loca;
+    int cc = 0;
 
     /* XXX Unclear that this is the correct format. */
     fprintf(ofp, "%%!PS-TrueTypeFont-%u-%u\n", sf->osd.scaler_type,
@@ -686,8 +763,8 @@ void sfnt_writeps(font_info const *fi, FILE *ofp) {
     fprintf(ofp, "0 1 %u{currentfile token pop exch def}bind for\n",
        sf->nglyphs - 1);
     for (i = 0; i < sf->nglyphs; i++)
-       fprintf(ofp, "/%s\n", glyph_extern(sfnt_indextoglyph(sf, i)));
-    fprintf(ofp, "end readonly def\n");
+       ps_token(ofp, &cc, "/%s", glyph_extern(sfnt_indextoglyph(sf, i)));
+    fprintf(ofp, "\nend readonly def\n");
     fprintf(ofp, "/sfnts [<");
     breaks = snewn(sf->osd.numTables + sf->nglyphs, size_t);
     for (i = 0; i < sf->osd.numTables; i++) {
@@ -728,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;
+}