From 9dc58cc827521b11d4eb8e2dd14e7e26bef74edb Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 31 Mar 2016 15:32:38 +0200 Subject: epub: Add stripped Charis SIL font to use as the default font for EPUB. --- platform/gl/gl-font.c | 6 ++++-- platform/win32/generate.bat | 5 +++++ platform/win32/libfonts.vcproj | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) (limited to 'platform') diff --git a/platform/gl/gl-font.c b/platform/gl/gl-font.c index 11430208..58ead8ee 100644 --- a/platform/gl/gl-font.c +++ b/platform/gl/gl-font.c @@ -86,8 +86,10 @@ void ui_init_fonts(fz_context *ctx, float pixelsize) clear_font_cache(); - data = fz_lookup_base14_font(ctx, "Times-Roman", &size); - g_font = fz_new_font_from_memory(ctx, "Times-Roman", data, size, 0, 0); + data = fz_lookup_builtin_font(ctx, "Charis SIL", 0, 0, &size); + if (!data) + data = fz_lookup_builtin_font(ctx, "Times", 0, 0, &size); + g_font = fz_new_font_from_memory(ctx, NULL, data, size, 0, 0); g_font_size = pixelsize; } diff --git a/platform/win32/generate.bat b/platform/win32/generate.bat index e0fec0a8..52a00ca5 100644 --- a/platform/win32/generate.bat +++ b/platform/win32/generate.bat @@ -47,6 +47,11 @@ if not exist generated/NimbusSanL-Reg.c fontdump.exe generated/NimbusSanL-Reg.c if not exist generated/NimbusSanL-RegIta.c fontdump.exe generated/NimbusSanL-RegIta.c resources/fonts/urw/NimbusSanL-RegIta.cff if not exist generated/StandardSymL.c fontdump.exe generated/StandardSymL.c resources/fonts/urw/StandardSymL.cff +if not exist generated/CharisSIL-R.c fontdump.exe generated/CharisSIL-R.c resources/fonts/sil/CharisSIL-R.cff +if not exist generated/CharisSIL-I.c fontdump.exe generated/CharisSIL-I.c resources/fonts/sil/CharisSIL-I.cff +if not exist generated/CharisSIL-B.c fontdump.exe generated/CharisSIL-B.c resources/fonts/sil/CharisSIL-B.cff +if not exist generated/CharisSIL-BI.c fontdump.exe generated/CharisSIL-BI.c resources/fonts/sil/CharisSIL-BI.cff + if not exist generated/NotoEmoji-Regular.c fontdump.exe generated/NotoEmoji-Regular.c resources/fonts/noto/NotoEmoji-Regular.ttf if not exist generated/NotoKufiArabic-Regular.c fontdump.exe generated/NotoKufiArabic-Regular.c resources/fonts/noto/NotoKufiArabic-Regular.ttf if not exist generated/NotoNaskhArabic-Regular.c fontdump.exe generated/NotoNaskhArabic-Regular.c resources/fonts/noto/NotoNaskhArabic-Regular.ttf diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj index ab4b2063..c356de07 100644 --- a/platform/win32/libfonts.vcproj +++ b/platform/win32/libfonts.vcproj @@ -199,6 +199,22 @@ + + + + + + + + -- cgit v1.2.3