diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-03-31 15:32:38 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2016-04-04 16:52:03 +0200 |
commit | 9dc58cc827521b11d4eb8e2dd14e7e26bef74edb (patch) | |
tree | ad52c29f6cab9c515552101084488a97f2424345 /platform | |
parent | 86595de62c24b453913fcf4e63202276bc708a57 (diff) | |
download | mupdf-9dc58cc827521b11d4eb8e2dd14e7e26bef74edb.tar.xz |
epub: Add stripped Charis SIL font to use as the default font for EPUB.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/gl/gl-font.c | 6 | ||||
-rw-r--r-- | platform/win32/generate.bat | 5 | ||||
-rw-r--r-- | platform/win32/libfonts.vcproj | 16 |
3 files changed, 25 insertions, 2 deletions
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 @@ -200,6 +200,22 @@ </References> <Files> <File + RelativePath="..\..\generated\CharisSIL-B.c" + > + </File> + <File + RelativePath="..\..\generated\CharisSIL-BI.c" + > + </File> + <File + RelativePath="..\..\generated\CharisSIL-I.c" + > + </File> + <File + RelativePath="..\..\generated\CharisSIL-R.c" + > + </File> + <File RelativePath="..\..\generated\Dingbats.c" > </File> |