From da46868e717a246b726d2baeece734d6e28e528c Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 7 May 2018 13:38:45 +0200 Subject: 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. --- source/fitz/noto.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'source/fitz/noto.c') 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); @@ -352,11 +352,21 @@ fz_lookup_noto_symbol_font(fz_context *ctx, int *size) #endif } +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 -- cgit v1.2.3