X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_afm_data.h;h=1b835fd4c59008857642f86d19ee083abc3dd217;hp=c3446e68d10e903f1cd47e35d8185020f17af87d;hb=7f4dd5f9c0f20e4d6690685641a9cd8ea621da51;hpb=9393cbae80bfbe84837583b33fa5be93824686bf diff --git a/src/rrd_afm_data.h b/src/rrd_afm_data.h index c3446e6..1b835fd 100644 --- a/src/rrd_afm_data.h +++ b/src/rrd_afm_data.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.20 Copyright by Tobi Oetiker, 1997-2007 **************************************************************************** * rrd_afm_data.h Encoded afm (Adobe Font Metrics) for selected fonts. ****************************************************************************/ @@ -135,18 +135,7 @@ Implementation design: unicode char1, char2, resultingchar; } - Font-global info is stored in a - struct { - char *fullname; // e.g. "Futura Bold Oblique" - char *postscript_name; // e.g. "Futura-BoldOblique" - uint8 *widths; - sint16 *kerning_index; - sint8 *kerning_data; - uint16 *highchars_index; - uint16 highchars_count; - unicode *ligatures; - uint16 ligatures_count; - } + Font-global info is stored in a struct afm_fontinfo (see below). The highchars_index and ligatures structures are flattened to a simple array to avoid accidental padding between @@ -177,8 +166,9 @@ typedef const afm_sint16 afm_csint16; typedef const afm_unicode afm_cunicode; typedef struct afm_fontinfo { - const char *fullname; // e.g. "Futura Bold Oblique" - const char *postscript_name; // e.g. "Futura-BoldOblique" + const char *fullname; /* e.g. "Futura Bold Oblique" */ + const char *postscript_name; /* e.g. "Futura-BoldOblique" */ + afm_cuint16 ascender, descender; afm_cuint8 *widths; afm_csint16 *kerning_index; afm_cuint8 *kerning_data;