diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-05-07 13:38:45 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-05-16 12:48:07 +0200 |
| commit | da46868e717a246b726d2baeece734d6e28e528c (patch) | |
| tree | b4d0316e6259aec68d0c02eab1ce1697e5fd4762 /source/fitz/noto.c | |
| parent | 4f4cae9812ea4e1f4d78ea8b90a46d8f20519883 (diff) | |
| download | mupdf-da46868e717a246b726d2baeece734d6e28e528c.tar.xz | |
Restore Emoji font.
The Noto symbol font has been split into two. The second symbol font only
contains a subset of the emojis, so reinstate the real emoji font and add
both symbol fonts to the fallback chain.
Diffstat (limited to 'source/fitz/noto.c')
| -rw-r--r-- | source/fitz/noto.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/fitz/noto.c b/source/fitz/noto.c index 02a90839..140f3aa8 100644 --- a/source/fitz/noto.c +++ b/source/fitz/noto.c @@ -17,7 +17,7 @@ Define TOFU_CJK to skip DroidSansFallback (and the above). Define TOFU_NOTO to skip ALL non-CJK noto fonts. - Define TOFU_SYMBOL to skip symbol font. + Define TOFU_SYMBOL to skip symbol fonts. Define TOFU_EMOJI to skip emoji/extended symbol font. Define TOFU_SIL to skip the SIL fonts (warning: makes EPUB documents ugly). @@ -343,7 +343,7 @@ fz_lookup_noto_font(fz_context *ctx, int script, int language, int serif, int *s } const unsigned char * -fz_lookup_noto_symbol_font(fz_context *ctx, int *size) +fz_lookup_noto_symbol1_font(fz_context *ctx, int *size) { #ifndef TOFU_SYMBOL RETURN(noto_NotoSansSymbols_Regular_otf); @@ -353,10 +353,20 @@ fz_lookup_noto_symbol_font(fz_context *ctx, int *size) } const unsigned char * +fz_lookup_noto_symbol2_font(fz_context *ctx, int *size) +{ +#ifndef TOFU_SYMBOL + RETURN(noto_NotoSansSymbols2_Regular_otf); +#else + return *size = 0, NULL; +#endif +} + +const unsigned char * fz_lookup_noto_emoji_font(fz_context *ctx, int *size) { #ifndef TOFU_EMOJI - RETURN(noto_NotoSansSymbols2_Regular_otf); + RETURN(noto_NotoEmoji_Regular_ttf); #else return *size = 0, NULL; #endif |