diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-01-27 15:19:58 +0100 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2016-01-28 20:09:55 +0000 |
commit | 52ed5832db9ea4bcc9dcfd2f0391af89f5aadd95 (patch) | |
tree | 11f8c2460b8880f10b3baa048ad7e22a549b6f5c /include | |
parent | afbb36f359273f272e23fc1e22fcdc6a0cc587de (diff) | |
download | mupdf-52ed5832db9ea4bcc9dcfd2f0391af89f5aadd95.tar.xz |
Add fallback font cache to font context.
Diffstat (limited to 'include')
-rw-r--r-- | include/mupdf/fitz/font.h | 9 | ||||
-rw-r--r-- | include/mupdf/html.h | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mupdf/fitz/font.h b/include/mupdf/fitz/font.h index 236e1514..2371b485 100644 --- a/include/mupdf/fitz/font.h +++ b/include/mupdf/fitz/font.h @@ -68,9 +68,6 @@ struct fz_font_s /* cached encoding lookup */ uint16_t *encoding_cache[256]; - - /* fallback font chain */ - fz_font *fallback; }; /* common CJK font collections */ @@ -93,6 +90,10 @@ unsigned char *fz_lookup_noto_font(fz_context *ctx, int script, int serif, unsig unsigned char *fz_lookup_noto_symbol_font(fz_context *ctx, unsigned int *len); unsigned char *fz_lookup_noto_emoji_font(fz_context *ctx, unsigned int *len); +fz_font *fz_load_fallback_font(fz_context *ctx, int script, int serif, int bold, int italic); +fz_font *fz_load_fallback_symbol_font(fz_context *ctx); +fz_font *fz_load_fallback_emoji_font(fz_context *ctx); + fz_font *fz_new_type3_font(fz_context *ctx, const char *name, const fz_matrix *matrix); fz_font *fz_new_font_from_memory(fz_context *ctx, const char *name, unsigned char *data, int len, int index, int use_glyph_bbox); @@ -112,7 +113,7 @@ void fz_decouple_type3_font(fz_context *ctx, fz_font *font, void *t3doc); float fz_advance_glyph(fz_context *ctx, fz_font *font, int glyph); int fz_encode_character(fz_context *ctx, fz_font *font, int unicode); -int fz_encode_character_with_fallback(fz_context *ctx, fz_font *font, int unicode, fz_font **out_font); +int fz_encode_character_with_fallback(fz_context *ctx, fz_font *font, int unicode, int script, fz_font **out_font); void fz_print_font(fz_context *ctx, fz_output *out, fz_font *font); diff --git a/include/mupdf/html.h b/include/mupdf/html.h index 48231281..4969e15c 100644 --- a/include/mupdf/html.h +++ b/include/mupdf/html.h @@ -33,7 +33,6 @@ struct fz_html_font_face_s struct fz_html_font_set_s { fz_font *fonts[16]; - fz_font *fallback; fz_html_font_face *custom; }; |