summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2009-12-08 00:25:21 +0100
committerTor Andersson <tor@ghostscript.com>2009-12-08 00:25:21 +0100
commitc55ea9577ba769ee08a9c3a62c05fb0dae17e1a1 (patch)
tree5cf4552100726c4ceb544408dd7d0dc485fd7406
parentfc32a20845d30c6734767f08d35749d5cf34fa97 (diff)
downloadmupdf-c55ea9577ba769ee08a9c3a62c05fb0dae17e1a1.tar.xz
Upgrade built-in fonts to the new URW postscript fonts with Cyrillic characters, converted to TTF format with FontForge.
Diffstat
-rw-r--r--fonts/Dingbats.cffbin29492 -> 0 bytes
-rw-r--r--fonts/Dingbats.ttfbin0 -> 37284 bytes
-rw-r--r--fonts/NimbusMonL-Bold.cffbin32860 -> 0 bytes
-rw-r--r--fonts/NimbusMonL-Bold.ttfbin0 -> 108548 bytes
-rw-r--r--fonts/NimbusMonL-BoldObli.cffbin33584 -> 0 bytes
-rw-r--r--fonts/NimbusMonL-BoldObli.ttfbin0 -> 110692 bytes
-rw-r--r--fonts/NimbusMonL-Regu.cffbin25616 -> 0 bytes
-rw-r--r--fonts/NimbusMonL-Regu.ttfbin0 -> 95508 bytes
-rw-r--r--fonts/NimbusMonL-ReguObli.cffbin28416 -> 0 bytes
-rw-r--r--fonts/NimbusMonL-ReguObli.ttfbin0 -> 100900 bytes
-rw-r--r--fonts/NimbusRomNo9L-Medi.cffbin24324 -> 0 bytes
-rw-r--r--fonts/NimbusRomNo9L-Medi.ttfbin0 -> 97208 bytes
-rw-r--r--fonts/NimbusRomNo9L-MediItal.cffbin27120 -> 0 bytes
-rw-r--r--fonts/NimbusRomNo9L-MediItal.ttfbin0 -> 99844 bytes
-rw-r--r--fonts/NimbusRomNo9L-Regu.cffbin25264 -> 0 bytes
-rw-r--r--fonts/NimbusRomNo9L-Regu.ttfbin0 -> 100884 bytes
-rw-r--r--fonts/NimbusRomNo9L-ReguItal.cffbin27632 -> 0 bytes
-rw-r--r--fonts/NimbusRomNo9L-ReguItal.ttfbin0 -> 100992 bytes
-rw-r--r--fonts/NimbusSanL-Bold.cffbin17476 -> 0 bytes
-rw-r--r--fonts/NimbusSanL-Bold.ttfbin0 -> 68964 bytes
-rw-r--r--fonts/NimbusSanL-BoldItal.cffbin19968 -> 0 bytes
-rw-r--r--fonts/NimbusSanL-BoldItal.ttfbin0 -> 69488 bytes
-rw-r--r--fonts/NimbusSanL-Regu.cffbin16608 -> 0 bytes
-rw-r--r--fonts/NimbusSanL-Regu.ttfbin0 -> 66748 bytes
-rw-r--r--fonts/NimbusSanL-ReguItal.cffbin20160 -> 0 bytes
-rw-r--r--fonts/NimbusSanL-ReguItal.ttfbin0 -> 73588 bytes
-rw-r--r--fonts/StandardSymL.cffbin18944 -> 0 bytes
-rw-r--r--fonts/StandardSymL.ttfbin0 -> 25308 bytes
-rw-r--r--fonts/URWChanceryL-MediItal.cffbin34436 -> 0 bytes
-rw-r--r--fonts/URWChanceryL-MediItal.ttfbin0 -> 111624 bytes
-rw-r--r--mupdf/Jamfile30
-rw-r--r--mupdf/pdf_fontfile.c124
32 files changed, 77 insertions, 77 deletions
diff --git a/fonts/Dingbats.cff b/fonts/Dingbats.cff
deleted file mode 100644
index ea81c873..00000000
--- a/fonts/Dingbats.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/Dingbats.ttf b/fonts/Dingbats.ttf
new file mode 100644
index 00000000..6411d650
--- /dev/null
+++ b/fonts/Dingbats.ttf
Binary files differ
diff --git a/fonts/NimbusMonL-Bold.cff b/fonts/NimbusMonL-Bold.cff
deleted file mode 100644
index 64737cab..00000000
--- a/fonts/NimbusMonL-Bold.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusMonL-Bold.ttf b/fonts/NimbusMonL-Bold.ttf
new file mode 100644
index 00000000..302c6fc7
--- /dev/null
+++ b/fonts/NimbusMonL-Bold.ttf
Binary files differ
diff --git a/fonts/NimbusMonL-BoldObli.cff b/fonts/NimbusMonL-BoldObli.cff
deleted file mode 100644
index 29645992..00000000
--- a/fonts/NimbusMonL-BoldObli.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusMonL-BoldObli.ttf b/fonts/NimbusMonL-BoldObli.ttf
new file mode 100644
index 00000000..00bb0b15
--- /dev/null
+++ b/fonts/NimbusMonL-BoldObli.ttf
Binary files differ
diff --git a/fonts/NimbusMonL-Regu.cff b/fonts/NimbusMonL-Regu.cff
deleted file mode 100644
index f39a9ab9..00000000
--- a/fonts/NimbusMonL-Regu.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusMonL-Regu.ttf b/fonts/NimbusMonL-Regu.ttf
new file mode 100644
index 00000000..fa68d3f1
--- /dev/null
+++ b/fonts/NimbusMonL-Regu.ttf
Binary files differ
diff --git a/fonts/NimbusMonL-ReguObli.cff b/fonts/NimbusMonL-ReguObli.cff
deleted file mode 100644
index 1cf5f15d..00000000
--- a/fonts/NimbusMonL-ReguObli.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusMonL-ReguObli.ttf b/fonts/NimbusMonL-ReguObli.ttf
new file mode 100644
index 00000000..d5b6493d
--- /dev/null
+++ b/fonts/NimbusMonL-ReguObli.ttf
Binary files differ
diff --git a/fonts/NimbusRomNo9L-Medi.cff b/fonts/NimbusRomNo9L-Medi.cff
deleted file mode 100644
index a1b3c184..00000000
--- a/fonts/NimbusRomNo9L-Medi.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusRomNo9L-Medi.ttf b/fonts/NimbusRomNo9L-Medi.ttf
new file mode 100644
index 00000000..176f6d8f
--- /dev/null
+++ b/fonts/NimbusRomNo9L-Medi.ttf
Binary files differ
diff --git a/fonts/NimbusRomNo9L-MediItal.cff b/fonts/NimbusRomNo9L-MediItal.cff
deleted file mode 100644
index 02f69d64..00000000
--- a/fonts/NimbusRomNo9L-MediItal.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusRomNo9L-MediItal.ttf b/fonts/NimbusRomNo9L-MediItal.ttf
new file mode 100644
index 00000000..812c2ff6
--- /dev/null
+++ b/fonts/NimbusRomNo9L-MediItal.ttf
Binary files differ
diff --git a/fonts/NimbusRomNo9L-Regu.cff b/fonts/NimbusRomNo9L-Regu.cff
deleted file mode 100644
index 3ddca966..00000000
--- a/fonts/NimbusRomNo9L-Regu.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusRomNo9L-Regu.ttf b/fonts/NimbusRomNo9L-Regu.ttf
new file mode 100644
index 00000000..4781fbc2
--- /dev/null
+++ b/fonts/NimbusRomNo9L-Regu.ttf
Binary files differ
diff --git a/fonts/NimbusRomNo9L-ReguItal.cff b/fonts/NimbusRomNo9L-ReguItal.cff
deleted file mode 100644
index 05a430e1..00000000
--- a/fonts/NimbusRomNo9L-ReguItal.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusRomNo9L-ReguItal.ttf b/fonts/NimbusRomNo9L-ReguItal.ttf
new file mode 100644
index 00000000..72e25e60
--- /dev/null
+++ b/fonts/NimbusRomNo9L-ReguItal.ttf
Binary files differ
diff --git a/fonts/NimbusSanL-Bold.cff b/fonts/NimbusSanL-Bold.cff
deleted file mode 100644
index 2784e4e3..00000000
--- a/fonts/NimbusSanL-Bold.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusSanL-Bold.ttf b/fonts/NimbusSanL-Bold.ttf
new file mode 100644
index 00000000..7d105c43
--- /dev/null
+++ b/fonts/NimbusSanL-Bold.ttf
Binary files differ
diff --git a/fonts/NimbusSanL-BoldItal.cff b/fonts/NimbusSanL-BoldItal.cff
deleted file mode 100644
index 6b4bdcb3..00000000
--- a/fonts/NimbusSanL-BoldItal.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusSanL-BoldItal.ttf b/fonts/NimbusSanL-BoldItal.ttf
new file mode 100644
index 00000000..7f31256c
--- /dev/null
+++ b/fonts/NimbusSanL-BoldItal.ttf
Binary files differ
diff --git a/fonts/NimbusSanL-Regu.cff b/fonts/NimbusSanL-Regu.cff
deleted file mode 100644
index 716df70a..00000000
--- a/fonts/NimbusSanL-Regu.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusSanL-Regu.ttf b/fonts/NimbusSanL-Regu.ttf
new file mode 100644
index 00000000..18844b4c
--- /dev/null
+++ b/fonts/NimbusSanL-Regu.ttf
Binary files differ
diff --git a/fonts/NimbusSanL-ReguItal.cff b/fonts/NimbusSanL-ReguItal.cff
deleted file mode 100644
index 72c13d0e..00000000
--- a/fonts/NimbusSanL-ReguItal.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/NimbusSanL-ReguItal.ttf b/fonts/NimbusSanL-ReguItal.ttf
new file mode 100644
index 00000000..5608bc23
--- /dev/null
+++ b/fonts/NimbusSanL-ReguItal.ttf
Binary files differ
diff --git a/fonts/StandardSymL.cff b/fonts/StandardSymL.cff
deleted file mode 100644
index ab1f4b50..00000000
--- a/fonts/StandardSymL.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/StandardSymL.ttf b/fonts/StandardSymL.ttf
new file mode 100644
index 00000000..1c1ac7f8
--- /dev/null
+++ b/fonts/StandardSymL.ttf
Binary files differ
diff --git a/fonts/URWChanceryL-MediItal.cff b/fonts/URWChanceryL-MediItal.cff
deleted file mode 100644
index faed6179..00000000
--- a/fonts/URWChanceryL-MediItal.cff
+++ /dev/null
Binary files differ
diff --git a/fonts/URWChanceryL-MediItal.ttf b/fonts/URWChanceryL-MediItal.ttf
new file mode 100644
index 00000000..e2970e30
--- /dev/null
+++ b/fonts/URWChanceryL-MediItal.ttf
Binary files 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 09:55:41 +0000