diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2008-12-03 23:57:38 +1030 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2009-01-22 23:12:14 +1100 |
| commit | 6f2db9a4b07cde2c4932ea481228abc248e90145 (patch) | |
| tree | d4aa8f98daf9d2706c7642548b25e7433044a2c9 /src/cairo-scaled-font-subsets-private.h | |
| parent | 2ed08f7801a2af27e35afcf57f00f4bf5d48384a (diff) | |
| download | cairo-6f2db9a4b07cde2c4932ea481228abc248e90145.tar.gz | |
Use PS font name in CFF and TrueType PDF font subsets
James Cloos found that the font name in embedded fonts should be the
PostScript font name (nameID=6 in the name table).
http://lists.cairographics.org/archives/cairo/2008-December/015919.html
Diffstat (limited to 'src/cairo-scaled-font-subsets-private.h')
| -rw-r--r-- | src/cairo-scaled-font-subsets-private.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/cairo-scaled-font-subsets-private.h b/src/cairo-scaled-font-subsets-private.h index a78b82bc3..00344ae58 100644 --- a/src/cairo-scaled-font-subsets-private.h +++ b/src/cairo-scaled-font-subsets-private.h @@ -332,7 +332,8 @@ cairo_private cairo_int_status_t _cairo_scaled_font_subset_create_glyph_names (cairo_scaled_font_subset_t *subset); typedef struct _cairo_cff_subset { - char *base_font; + char *font_name; + char *ps_name; int *widths; long x_min, y_min, x_max, y_max; long ascent, descent; @@ -404,7 +405,8 @@ cairo_private void _cairo_cff_fallback_fini (cairo_cff_subset_t *cff_subset); typedef struct _cairo_truetype_subset { - char *base_font; + char *font_name; + char *ps_name; double *widths; double x_min, y_min, x_max, y_max; double ascent, descent; @@ -638,11 +640,17 @@ _cairo_truetype_index_to_ucs4 (cairo_scaled_font_t *scaled_font, /** * _cairo_truetype_read_font_name: * @scaled_font: the #cairo_scaled_font_t + * @ps_name: returns the PostScript name of the font or NULL if the name could not be found. * @font_name: returns the font name or NULL if the name could not be found. * * If possible (depending on the format of the underlying * #cairo_scaled_font_t and the font backend in use) read the - * font name from a TrueType/OpenType font. + * PostScript and Font names from a TrueType/OpenType font. + * + * The font name is the full name of the font eg "DejaVu Sans Bold". + * The PostScript name is a shortened name with spaces removed + * suitable for use as the font name in a PS or PDF file eg + * "DejaVuSans-Bold". * * Return value: %CAIRO_STATUS_SUCCESS if successful, * %CAIRO_INT_STATUS_UNSUPPORTED if the font is not TrueType/OpenType @@ -650,8 +658,9 @@ _cairo_truetype_index_to_ucs4 (cairo_scaled_font_t *scaled_font, * %CAIRO_STATUS_NO_MEMORY. **/ cairo_private cairo_int_status_t -_cairo_truetype_read_font_name (cairo_scaled_font_t *scaled_font, - char **font_name); +_cairo_truetype_read_font_name (cairo_scaled_font_t *scaled_font, + char **ps_name, + char **font_name); #endif /* CAIRO_HAS_FONT_SUBSET */ |