summaryrefslogtreecommitdiff
path: root/source/html
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2016-03-31 15:32:38 +0200
committerTor Andersson <tor.andersson@artifex.com>2016-04-04 16:52:03 +0200
commit9dc58cc827521b11d4eb8e2dd14e7e26bef74edb (patch)
treead52c29f6cab9c515552101084488a97f2424345 /source/html
parent86595de62c24b453913fcf4e63202276bc708a57 (diff)
downloadmupdf-9dc58cc827521b11d4eb8e2dd14e7e26bef74edb.tar.xz
epub: Add stripped Charis SIL font to use as the default font for EPUB.
Diffstat (limited to 'source/html')
-rw-r--r--source/html/html-font.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/html/html-font.c b/source/html/html-font.c
index 389ddb34..3b8f7c72 100644
--- a/source/html/html-font.c
+++ b/source/html/html-font.c
@@ -5,7 +5,8 @@ fz_load_html_default_font(fz_context *ctx, fz_html_font_set *set, const char *fa
{
int is_mono = !strcmp(family, "monospace");
int is_sans = !strcmp(family, "sans-serif");
- const char *real_family = is_mono ? "Courier" : is_sans ? "Helvetica" : "Times";
+ const char *real_family = is_mono ? "Courier" : is_sans ? "Helvetica" : "Charis SIL";
+ const char *backup_family = is_mono ? "Courier" : is_sans ? "Helvetica" : "Times";
int idx = (is_mono ? 8 : is_sans ? 4 : 0) + is_bold * 2 + is_italic;
if (!set->fonts[idx])
{
@@ -14,6 +15,8 @@ fz_load_html_default_font(fz_context *ctx, fz_html_font_set *set, const char *fa
data = fz_lookup_builtin_font(ctx, real_family, is_bold, is_italic, &size);
if (!data)
+ data = fz_lookup_builtin_font(ctx, backup_family, is_bold, is_italic, &size);
+ if (!data)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot load html font: %s", real_family);
set->fonts[idx] = fz_new_font_from_memory(ctx, NULL, data, size, 0, 1);
set->fonts[idx]->is_serif = !is_sans;