From c55ea9577ba769ee08a9c3a62c05fb0dae17e1a1 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 8 Dec 2009 00:25:21 +0100 Subject: Upgrade built-in fonts to the new URW postscript fonts with Cyrillic characters, converted to TTF format with FontForge. --- fonts/Dingbats.cff | Bin 29492 -> 0 bytes fonts/Dingbats.ttf | Bin 0 -> 37284 bytes fonts/NimbusMonL-Bold.cff | Bin 32860 -> 0 bytes fonts/NimbusMonL-Bold.ttf | Bin 0 -> 108548 bytes fonts/NimbusMonL-BoldObli.cff | Bin 33584 -> 0 bytes fonts/NimbusMonL-BoldObli.ttf | Bin 0 -> 110692 bytes fonts/NimbusMonL-Regu.cff | Bin 25616 -> 0 bytes fonts/NimbusMonL-Regu.ttf | Bin 0 -> 95508 bytes fonts/NimbusMonL-ReguObli.cff | Bin 28416 -> 0 bytes fonts/NimbusMonL-ReguObli.ttf | Bin 0 -> 100900 bytes fonts/NimbusRomNo9L-Medi.cff | Bin 24324 -> 0 bytes fonts/NimbusRomNo9L-Medi.ttf | Bin 0 -> 97208 bytes fonts/NimbusRomNo9L-MediItal.cff | Bin 27120 -> 0 bytes fonts/NimbusRomNo9L-MediItal.ttf | Bin 0 -> 99844 bytes fonts/NimbusRomNo9L-Regu.cff | Bin 25264 -> 0 bytes fonts/NimbusRomNo9L-Regu.ttf | Bin 0 -> 100884 bytes fonts/NimbusRomNo9L-ReguItal.cff | Bin 27632 -> 0 bytes fonts/NimbusRomNo9L-ReguItal.ttf | Bin 0 -> 100992 bytes fonts/NimbusSanL-Bold.cff | Bin 17476 -> 0 bytes fonts/NimbusSanL-Bold.ttf | Bin 0 -> 68964 bytes fonts/NimbusSanL-BoldItal.cff | Bin 19968 -> 0 bytes fonts/NimbusSanL-BoldItal.ttf | Bin 0 -> 69488 bytes fonts/NimbusSanL-Regu.cff | Bin 16608 -> 0 bytes fonts/NimbusSanL-Regu.ttf | Bin 0 -> 66748 bytes fonts/NimbusSanL-ReguItal.cff | Bin 20160 -> 0 bytes fonts/NimbusSanL-ReguItal.ttf | Bin 0 -> 73588 bytes fonts/StandardSymL.cff | Bin 18944 -> 0 bytes fonts/StandardSymL.ttf | Bin 0 -> 25308 bytes fonts/URWChanceryL-MediItal.cff | Bin 34436 -> 0 bytes fonts/URWChanceryL-MediItal.ttf | Bin 0 -> 111624 bytes mupdf/Jamfile | 30 +++++----- mupdf/pdf_fontfile.c | 124 +++++++++++++++++++-------------------- 32 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 fonts/Dingbats.cff create mode 100644 fonts/Dingbats.ttf delete mode 100644 fonts/NimbusMonL-Bold.cff create mode 100644 fonts/NimbusMonL-Bold.ttf delete mode 100644 fonts/NimbusMonL-BoldObli.cff create mode 100644 fonts/NimbusMonL-BoldObli.ttf delete mode 100644 fonts/NimbusMonL-Regu.cff create mode 100644 fonts/NimbusMonL-Regu.ttf delete mode 100644 fonts/NimbusMonL-ReguObli.cff create mode 100644 fonts/NimbusMonL-ReguObli.ttf delete mode 100644 fonts/NimbusRomNo9L-Medi.cff create mode 100644 fonts/NimbusRomNo9L-Medi.ttf delete mode 100644 fonts/NimbusRomNo9L-MediItal.cff create mode 100644 fonts/NimbusRomNo9L-MediItal.ttf delete mode 100644 fonts/NimbusRomNo9L-Regu.cff create mode 100644 fonts/NimbusRomNo9L-Regu.ttf delete mode 100644 fonts/NimbusRomNo9L-ReguItal.cff create mode 100644 fonts/NimbusRomNo9L-ReguItal.ttf delete mode 100644 fonts/NimbusSanL-Bold.cff create mode 100644 fonts/NimbusSanL-Bold.ttf delete mode 100644 fonts/NimbusSanL-BoldItal.cff create mode 100644 fonts/NimbusSanL-BoldItal.ttf delete mode 100644 fonts/NimbusSanL-Regu.cff create mode 100644 fonts/NimbusSanL-Regu.ttf delete mode 100644 fonts/NimbusSanL-ReguItal.cff create mode 100644 fonts/NimbusSanL-ReguItal.ttf delete mode 100644 fonts/StandardSymL.cff create mode 100644 fonts/StandardSymL.ttf delete mode 100644 fonts/URWChanceryL-MediItal.cff create mode 100644 fonts/URWChanceryL-MediItal.ttf diff --git a/fonts/Dingbats.cff b/fonts/Dingbats.cff deleted file mode 100644 index ea81c873..00000000 Binary files a/fonts/Dingbats.cff and /dev/null differ diff --git a/fonts/Dingbats.ttf b/fonts/Dingbats.ttf new file mode 100644 index 00000000..6411d650 Binary files /dev/null and b/fonts/Dingbats.ttf differ diff --git a/fonts/NimbusMonL-Bold.cff b/fonts/NimbusMonL-Bold.cff deleted file mode 100644 index 64737cab..00000000 Binary files a/fonts/NimbusMonL-Bold.cff and /dev/null differ diff --git a/fonts/NimbusMonL-Bold.ttf b/fonts/NimbusMonL-Bold.ttf new file mode 100644 index 00000000..302c6fc7 Binary files /dev/null and b/fonts/NimbusMonL-Bold.ttf differ diff --git a/fonts/NimbusMonL-BoldObli.cff b/fonts/NimbusMonL-BoldObli.cff deleted file mode 100644 index 29645992..00000000 Binary files a/fonts/NimbusMonL-BoldObli.cff and /dev/null differ diff --git a/fonts/NimbusMonL-BoldObli.ttf b/fonts/NimbusMonL-BoldObli.ttf new file mode 100644 index 00000000..00bb0b15 Binary files /dev/null and b/fonts/NimbusMonL-BoldObli.ttf differ diff --git a/fonts/NimbusMonL-Regu.cff b/fonts/NimbusMonL-Regu.cff deleted file mode 100644 index f39a9ab9..00000000 Binary files a/fonts/NimbusMonL-Regu.cff and /dev/null differ diff --git a/fonts/NimbusMonL-Regu.ttf b/fonts/NimbusMonL-Regu.ttf new file mode 100644 index 00000000..fa68d3f1 Binary files /dev/null and b/fonts/NimbusMonL-Regu.ttf differ diff --git a/fonts/NimbusMonL-ReguObli.cff b/fonts/NimbusMonL-ReguObli.cff deleted file mode 100644 index 1cf5f15d..00000000 Binary files a/fonts/NimbusMonL-ReguObli.cff and /dev/null differ diff --git a/fonts/NimbusMonL-ReguObli.ttf b/fonts/NimbusMonL-ReguObli.ttf new file mode 100644 index 00000000..d5b6493d Binary files /dev/null and b/fonts/NimbusMonL-ReguObli.ttf differ diff --git a/fonts/NimbusRomNo9L-Medi.cff b/fonts/NimbusRomNo9L-Medi.cff deleted file mode 100644 index a1b3c184..00000000 Binary files a/fonts/NimbusRomNo9L-Medi.cff and /dev/null differ diff --git a/fonts/NimbusRomNo9L-Medi.ttf b/fonts/NimbusRomNo9L-Medi.ttf new file mode 100644 index 00000000..176f6d8f Binary files /dev/null and b/fonts/NimbusRomNo9L-Medi.ttf differ diff --git a/fonts/NimbusRomNo9L-MediItal.cff b/fonts/NimbusRomNo9L-MediItal.cff deleted file mode 100644 index 02f69d64..00000000 Binary files a/fonts/NimbusRomNo9L-MediItal.cff and /dev/null differ diff --git a/fonts/NimbusRomNo9L-MediItal.ttf b/fonts/NimbusRomNo9L-MediItal.ttf new file mode 100644 index 00000000..812c2ff6 Binary files /dev/null and b/fonts/NimbusRomNo9L-MediItal.ttf differ diff --git a/fonts/NimbusRomNo9L-Regu.cff b/fonts/NimbusRomNo9L-Regu.cff deleted file mode 100644 index 3ddca966..00000000 Binary files a/fonts/NimbusRomNo9L-Regu.cff and /dev/null differ diff --git a/fonts/NimbusRomNo9L-Regu.ttf b/fonts/NimbusRomNo9L-Regu.ttf new file mode 100644 index 00000000..4781fbc2 Binary files /dev/null and b/fonts/NimbusRomNo9L-Regu.ttf differ diff --git a/fonts/NimbusRomNo9L-ReguItal.cff b/fonts/NimbusRomNo9L-ReguItal.cff deleted file mode 100644 index 05a430e1..00000000 Binary files a/fonts/NimbusRomNo9L-ReguItal.cff and /dev/null differ diff --git a/fonts/NimbusRomNo9L-ReguItal.ttf b/fonts/NimbusRomNo9L-ReguItal.ttf new file mode 100644 index 00000000..72e25e60 Binary files /dev/null and b/fonts/NimbusRomNo9L-ReguItal.ttf differ diff --git a/fonts/NimbusSanL-Bold.cff b/fonts/NimbusSanL-Bold.cff deleted file mode 100644 index 2784e4e3..00000000 Binary files a/fonts/NimbusSanL-Bold.cff and /dev/null differ diff --git a/fonts/NimbusSanL-Bold.ttf b/fonts/NimbusSanL-Bold.ttf new file mode 100644 index 00000000..7d105c43 Binary files /dev/null and b/fonts/NimbusSanL-Bold.ttf differ diff --git a/fonts/NimbusSanL-BoldItal.cff b/fonts/NimbusSanL-BoldItal.cff deleted file mode 100644 index 6b4bdcb3..00000000 Binary files a/fonts/NimbusSanL-BoldItal.cff and /dev/null differ diff --git a/fonts/NimbusSanL-BoldItal.ttf b/fonts/NimbusSanL-BoldItal.ttf new file mode 100644 index 00000000..7f31256c Binary files /dev/null and b/fonts/NimbusSanL-BoldItal.ttf differ diff --git a/fonts/NimbusSanL-Regu.cff b/fonts/NimbusSanL-Regu.cff deleted file mode 100644 index 716df70a..00000000 Binary files a/fonts/NimbusSanL-Regu.cff and /dev/null differ diff --git a/fonts/NimbusSanL-Regu.ttf b/fonts/NimbusSanL-Regu.ttf new file mode 100644 index 00000000..18844b4c Binary files /dev/null and b/fonts/NimbusSanL-Regu.ttf differ diff --git a/fonts/NimbusSanL-ReguItal.cff b/fonts/NimbusSanL-ReguItal.cff deleted file mode 100644 index 72c13d0e..00000000 Binary files a/fonts/NimbusSanL-ReguItal.cff and /dev/null differ diff --git a/fonts/NimbusSanL-ReguItal.ttf b/fonts/NimbusSanL-ReguItal.ttf new file mode 100644 index 00000000..5608bc23 Binary files /dev/null and b/fonts/NimbusSanL-ReguItal.ttf differ diff --git a/fonts/StandardSymL.cff b/fonts/StandardSymL.cff deleted file mode 100644 index ab1f4b50..00000000 Binary files a/fonts/StandardSymL.cff and /dev/null differ diff --git a/fonts/StandardSymL.ttf b/fonts/StandardSymL.ttf new file mode 100644 index 00000000..1c1ac7f8 Binary files /dev/null and b/fonts/StandardSymL.ttf differ diff --git a/fonts/URWChanceryL-MediItal.cff b/fonts/URWChanceryL-MediItal.cff deleted file mode 100644 index faed6179..00000000 Binary files a/fonts/URWChanceryL-MediItal.cff and /dev/null differ diff --git a/fonts/URWChanceryL-MediItal.ttf b/fonts/URWChanceryL-MediItal.ttf new file mode 100644 index 00000000..e2970e30 Binary files /dev/null and b/fonts/URWChanceryL-MediItal.ttf differ diff --git a/mupdf/Jamfile b/mupdf/Jamfile index cb7e9eab..6ced8843 100644 --- a/mupdf/Jamfile +++ b/mupdf/Jamfile @@ -167,30 +167,30 @@ Library libcmaps : cmap_korean.c ; SubDir TOP fonts ; GenFile font_misc.c : fontdump - Dingbats.cff - StandardSymL.cff - URWChanceryL-MediItal.cff + Dingbats.ttf + StandardSymL.ttf + URWChanceryL-MediItal.ttf ; GenFile font_mono.c : fontdump - NimbusMonL-Regu.cff - NimbusMonL-ReguObli.cff - NimbusMonL-Bold.cff - NimbusMonL-BoldObli.cff + NimbusMonL-Regu.ttf + NimbusMonL-ReguObli.ttf + NimbusMonL-Bold.ttf + NimbusMonL-BoldObli.ttf ; GenFile font_serif.c : fontdump - NimbusRomNo9L-Regu.cff - NimbusRomNo9L-ReguItal.cff - NimbusRomNo9L-Medi.cff - NimbusRomNo9L-MediItal.cff + NimbusRomNo9L-Regu.ttf + NimbusRomNo9L-ReguItal.ttf + NimbusRomNo9L-Medi.ttf + NimbusRomNo9L-MediItal.ttf ; GenFile font_sans.c : fontdump - NimbusSanL-Bold.cff - NimbusSanL-BoldItal.cff - NimbusSanL-Regu.cff - NimbusSanL-ReguItal.cff + NimbusSanL-Bold.ttf + NimbusSanL-BoldItal.ttf + NimbusSanL-Regu.ttf + NimbusSanL-ReguItal.ttf ; Library libfonts : diff --git a/mupdf/pdf_fontfile.c b/mupdf/pdf_fontfile.c index 711e827a..01f963e4 100644 --- a/mupdf/pdf_fontfile.c +++ b/mupdf/pdf_fontfile.c @@ -1,36 +1,36 @@ #include "fitz.h" #include "mupdf.h" -extern const unsigned char pdf_font_Dingbats_cff_buf[]; -extern const unsigned int pdf_font_Dingbats_cff_len; -extern const unsigned char pdf_font_NimbusMonL_Bold_cff_buf[]; -extern const unsigned int pdf_font_NimbusMonL_Bold_cff_len; -extern const unsigned char pdf_font_NimbusMonL_BoldObli_cff_buf[]; -extern const unsigned int pdf_font_NimbusMonL_BoldObli_cff_len; -extern const unsigned char pdf_font_NimbusMonL_Regu_cff_buf[]; -extern const unsigned int pdf_font_NimbusMonL_Regu_cff_len; -extern const unsigned char pdf_font_NimbusMonL_ReguObli_cff_buf[]; -extern const unsigned int pdf_font_NimbusMonL_ReguObli_cff_len; -extern const unsigned char pdf_font_NimbusRomNo9L_Medi_cff_buf[]; -extern const unsigned int pdf_font_NimbusRomNo9L_Medi_cff_len; -extern const unsigned char pdf_font_NimbusRomNo9L_MediItal_cff_buf[]; -extern const unsigned int pdf_font_NimbusRomNo9L_MediItal_cff_len; -extern const unsigned char pdf_font_NimbusRomNo9L_Regu_cff_buf[]; -extern const unsigned int pdf_font_NimbusRomNo9L_Regu_cff_len; -extern const unsigned char pdf_font_NimbusRomNo9L_ReguItal_cff_buf[]; -extern const unsigned int pdf_font_NimbusRomNo9L_ReguItal_cff_len; -extern const unsigned char pdf_font_NimbusSanL_Bold_cff_buf[]; -extern const unsigned int pdf_font_NimbusSanL_Bold_cff_len; -extern const unsigned char pdf_font_NimbusSanL_BoldItal_cff_buf[]; -extern const unsigned int pdf_font_NimbusSanL_BoldItal_cff_len; -extern const unsigned char pdf_font_NimbusSanL_Regu_cff_buf[]; -extern const unsigned int pdf_font_NimbusSanL_Regu_cff_len; -extern const unsigned char pdf_font_NimbusSanL_ReguItal_cff_buf[]; -extern const unsigned int pdf_font_NimbusSanL_ReguItal_cff_len; -extern const unsigned char pdf_font_StandardSymL_cff_buf[]; -extern const unsigned int pdf_font_StandardSymL_cff_len; -extern const unsigned char pdf_font_URWChanceryL_MediItal_cff_buf[]; -extern const unsigned int pdf_font_URWChanceryL_MediItal_cff_len; +extern const unsigned char pdf_font_Dingbats_ttf_buf[]; +extern const unsigned int pdf_font_Dingbats_ttf_len; +extern const unsigned char pdf_font_NimbusMonL_Bold_ttf_buf[]; +extern const unsigned int pdf_font_NimbusMonL_Bold_ttf_len; +extern const unsigned char pdf_font_NimbusMonL_BoldObli_ttf_buf[]; +extern const unsigned int pdf_font_NimbusMonL_BoldObli_ttf_len; +extern const unsigned char pdf_font_NimbusMonL_Regu_ttf_buf[]; +extern const unsigned int pdf_font_NimbusMonL_Regu_ttf_len; +extern const unsigned char pdf_font_NimbusMonL_ReguObli_ttf_buf[]; +extern const unsigned int pdf_font_NimbusMonL_ReguObli_ttf_len; +extern const unsigned char pdf_font_NimbusRomNo9L_Medi_ttf_buf[]; +extern const unsigned int pdf_font_NimbusRomNo9L_Medi_ttf_len; +extern const unsigned char pdf_font_NimbusRomNo9L_MediItal_ttf_buf[]; +extern const unsigned int pdf_font_NimbusRomNo9L_MediItal_ttf_len; +extern const unsigned char pdf_font_NimbusRomNo9L_Regu_ttf_buf[]; +extern const unsigned int pdf_font_NimbusRomNo9L_Regu_ttf_len; +extern const unsigned char pdf_font_NimbusRomNo9L_ReguItal_ttf_buf[]; +extern const unsigned int pdf_font_NimbusRomNo9L_ReguItal_ttf_len; +extern const unsigned char pdf_font_NimbusSanL_Bold_ttf_buf[]; +extern const unsigned int pdf_font_NimbusSanL_Bold_ttf_len; +extern const unsigned char pdf_font_NimbusSanL_BoldItal_ttf_buf[]; +extern const unsigned int pdf_font_NimbusSanL_BoldItal_ttf_len; +extern const unsigned char pdf_font_NimbusSanL_Regu_ttf_buf[]; +extern const unsigned int pdf_font_NimbusSanL_Regu_ttf_len; +extern const unsigned char pdf_font_NimbusSanL_ReguItal_ttf_buf[]; +extern const unsigned int pdf_font_NimbusSanL_ReguItal_ttf_len; +extern const unsigned char pdf_font_StandardSymL_ttf_buf[]; +extern const unsigned int pdf_font_StandardSymL_ttf_len; +extern const unsigned char pdf_font_URWChanceryL_MediItal_ttf_buf[]; +extern const unsigned int pdf_font_URWChanceryL_MediItal_ttf_len; #ifndef NOCJK extern const unsigned char pdf_font_DroidSansFallback_ttf_buf[]; @@ -56,54 +56,54 @@ enum { MINCHO, GOTHIC }; static const struct { const char *name; - const unsigned char *cff; + const unsigned char *ttf; const unsigned int *len; } basefonts[] = { { "Courier", - pdf_font_NimbusMonL_Regu_cff_buf, - &pdf_font_NimbusMonL_Regu_cff_len }, + pdf_font_NimbusMonL_Regu_ttf_buf, + &pdf_font_NimbusMonL_Regu_ttf_len }, { "Courier-Bold", - pdf_font_NimbusMonL_Bold_cff_buf, - &pdf_font_NimbusMonL_Bold_cff_len }, + pdf_font_NimbusMonL_Bold_ttf_buf, + &pdf_font_NimbusMonL_Bold_ttf_len }, { "Courier-Oblique", - pdf_font_NimbusMonL_ReguObli_cff_buf, - &pdf_font_NimbusMonL_ReguObli_cff_len }, + pdf_font_NimbusMonL_ReguObli_ttf_buf, + &pdf_font_NimbusMonL_ReguObli_ttf_len }, { "Courier-BoldOblique", - pdf_font_NimbusMonL_BoldObli_cff_buf, - &pdf_font_NimbusMonL_BoldObli_cff_len }, + pdf_font_NimbusMonL_BoldObli_ttf_buf, + &pdf_font_NimbusMonL_BoldObli_ttf_len }, { "Helvetica", - pdf_font_NimbusSanL_Regu_cff_buf, - &pdf_font_NimbusSanL_Regu_cff_len }, + pdf_font_NimbusSanL_Regu_ttf_buf, + &pdf_font_NimbusSanL_Regu_ttf_len }, { "Helvetica-Bold", - pdf_font_NimbusSanL_Bold_cff_buf, - &pdf_font_NimbusSanL_Bold_cff_len }, + pdf_font_NimbusSanL_Bold_ttf_buf, + &pdf_font_NimbusSanL_Bold_ttf_len }, { "Helvetica-Oblique", - pdf_font_NimbusSanL_ReguItal_cff_buf, - &pdf_font_NimbusSanL_ReguItal_cff_len }, + pdf_font_NimbusSanL_ReguItal_ttf_buf, + &pdf_font_NimbusSanL_ReguItal_ttf_len }, { "Helvetica-BoldOblique", - pdf_font_NimbusSanL_BoldItal_cff_buf, - &pdf_font_NimbusSanL_BoldItal_cff_len }, + pdf_font_NimbusSanL_BoldItal_ttf_buf, + &pdf_font_NimbusSanL_BoldItal_ttf_len }, { "Times-Roman", - pdf_font_NimbusRomNo9L_Regu_cff_buf, - &pdf_font_NimbusRomNo9L_Regu_cff_len }, + pdf_font_NimbusRomNo9L_Regu_ttf_buf, + &pdf_font_NimbusRomNo9L_Regu_ttf_len }, { "Times-Bold", - pdf_font_NimbusRomNo9L_Medi_cff_buf, - &pdf_font_NimbusRomNo9L_Medi_cff_len }, + pdf_font_NimbusRomNo9L_Medi_ttf_buf, + &pdf_font_NimbusRomNo9L_Medi_ttf_len }, { "Times-Italic", - pdf_font_NimbusRomNo9L_ReguItal_cff_buf, - &pdf_font_NimbusRomNo9L_ReguItal_cff_len }, + pdf_font_NimbusRomNo9L_ReguItal_ttf_buf, + &pdf_font_NimbusRomNo9L_ReguItal_ttf_len }, { "Times-BoldItalic", - pdf_font_NimbusRomNo9L_MediItal_cff_buf, - &pdf_font_NimbusRomNo9L_MediItal_cff_len }, + pdf_font_NimbusRomNo9L_MediItal_ttf_buf, + &pdf_font_NimbusRomNo9L_MediItal_ttf_len }, { "Symbol", - pdf_font_StandardSymL_cff_buf, - &pdf_font_StandardSymL_cff_len }, + pdf_font_StandardSymL_ttf_buf, + &pdf_font_StandardSymL_ttf_len }, { "ZapfDingbats", - pdf_font_Dingbats_cff_buf, - &pdf_font_Dingbats_cff_len }, + pdf_font_Dingbats_ttf_buf, + &pdf_font_Dingbats_ttf_len }, { "Chancery", - pdf_font_URWChanceryL_MediItal_cff_buf, - &pdf_font_URWChanceryL_MediItal_cff_len }, + pdf_font_URWChanceryL_MediItal_ttf_buf, + &pdf_font_URWChanceryL_MediItal_ttf_len }, { nil, nil, nil } }; @@ -124,7 +124,7 @@ pdf_loadbuiltinfont(pdf_fontdesc *font, char *fontname) found: pdf_logfont("load builtin font %s\n", fontname); - data = (unsigned char *) basefonts[i].cff; + data = (unsigned char *) basefonts[i].ttf; len = *basefonts[i].len; error = fz_newfontfrombuffer(&font->font, data, len, 0); -- cgit v1.2.3