Update the built in fonts again, this time in CFF format.

32 files changed, 89 insertions, 91 deletions

diff --git a/fonts/Dingbats.cff b/fonts/Dingbats.cff
new file mode 100644
index 00000000..4dbe228f
--- /dev/null
+++ b/fonts/Dingbats.cff
diff --git a/fonts/Dingbats.ttf b/fonts/Dingbats.ttf
deleted file mode 100644
index 6411d650..00000000
--- a/fonts/Dingbats.ttf
+++ /dev/null
diff --git a/fonts/NimbusMonL-Bold.cff b/fonts/NimbusMonL-Bold.cff
new file mode 100644
index 00000000..cc375568
--- /dev/null
+++ b/fonts/NimbusMonL-Bold.cff
diff --git a/fonts/NimbusMonL-Bold.ttf b/fonts/NimbusMonL-Bold.ttf
deleted file mode 100644
index 302c6fc7..00000000
--- a/fonts/NimbusMonL-Bold.ttf
+++ /dev/null
diff --git a/fonts/NimbusMonL-BoldObli.cff b/fonts/NimbusMonL-BoldObli.cff
new file mode 100644
index 00000000..5f937066
--- /dev/null
+++ b/fonts/NimbusMonL-BoldObli.cff
diff --git a/fonts/NimbusMonL-BoldObli.ttf b/fonts/NimbusMonL-BoldObli.ttf
deleted file mode 100644
index 00bb0b15..00000000
--- a/fonts/NimbusMonL-BoldObli.ttf
+++ /dev/null
diff --git a/fonts/NimbusMonL-Regu.cff b/fonts/NimbusMonL-Regu.cff
new file mode 100644
index 00000000..9414f942
--- /dev/null
+++ b/fonts/NimbusMonL-Regu.cff
diff --git a/fonts/NimbusMonL-Regu.ttf b/fonts/NimbusMonL-Regu.ttf
deleted file mode 100644
index fa68d3f1..00000000
--- a/fonts/NimbusMonL-Regu.ttf
+++ /dev/null
diff --git a/fonts/NimbusMonL-ReguObli.cff b/fonts/NimbusMonL-ReguObli.cff
new file mode 100644
index 00000000..cd8ae364
--- /dev/null
+++ b/fonts/NimbusMonL-ReguObli.cff
diff --git a/fonts/NimbusMonL-ReguObli.ttf b/fonts/NimbusMonL-ReguObli.ttf
deleted file mode 100644
index d5b6493d..00000000
--- a/fonts/NimbusMonL-ReguObli.ttf
+++ /dev/null
diff --git a/fonts/NimbusRomNo9L-Medi.cff b/fonts/NimbusRomNo9L-Medi.cff
new file mode 100644
index 00000000..ff0bcb50
--- /dev/null
+++ b/fonts/NimbusRomNo9L-Medi.cff
diff --git a/fonts/NimbusRomNo9L-Medi.ttf b/fonts/NimbusRomNo9L-Medi.ttf
deleted file mode 100644
index 176f6d8f..00000000
--- a/fonts/NimbusRomNo9L-Medi.ttf
+++ /dev/null
diff --git a/fonts/NimbusRomNo9L-MediItal.cff b/fonts/NimbusRomNo9L-MediItal.cff
new file mode 100644
index 00000000..85147c80
--- /dev/null
+++ b/fonts/NimbusRomNo9L-MediItal.cff
diff --git a/fonts/NimbusRomNo9L-MediItal.ttf b/fonts/NimbusRomNo9L-MediItal.ttf
deleted file mode 100644
index 812c2ff6..00000000
--- a/fonts/NimbusRomNo9L-MediItal.ttf
+++ /dev/null
diff --git a/fonts/NimbusRomNo9L-Regu.cff b/fonts/NimbusRomNo9L-Regu.cff
new file mode 100644
index 00000000..78d351e2
--- /dev/null
+++ b/fonts/NimbusRomNo9L-Regu.cff
diff --git a/fonts/NimbusRomNo9L-Regu.ttf b/fonts/NimbusRomNo9L-Regu.ttf
deleted file mode 100644
index 4781fbc2..00000000
--- a/fonts/NimbusRomNo9L-Regu.ttf
+++ /dev/null
diff --git a/fonts/NimbusRomNo9L-ReguItal.cff b/fonts/NimbusRomNo9L-ReguItal.cff
new file mode 100644
index 00000000..326081a9
--- /dev/null
+++ b/fonts/NimbusRomNo9L-ReguItal.cff
diff --git a/fonts/NimbusRomNo9L-ReguItal.ttf b/fonts/NimbusRomNo9L-ReguItal.ttf
deleted file mode 100644
index 72e25e60..00000000
--- a/fonts/NimbusRomNo9L-ReguItal.ttf
+++ /dev/null
diff --git a/fonts/NimbusSanL-Bold.cff b/fonts/NimbusSanL-Bold.cff
new file mode 100644
index 00000000..932cfb70
--- /dev/null
+++ b/fonts/NimbusSanL-Bold.cff
diff --git a/fonts/NimbusSanL-Bold.ttf b/fonts/NimbusSanL-Bold.ttf
deleted file mode 100644
index 7d105c43..00000000
--- a/fonts/NimbusSanL-Bold.ttf
+++ /dev/null
diff --git a/fonts/NimbusSanL-BoldItal.cff b/fonts/NimbusSanL-BoldItal.cff
new file mode 100644
index 00000000..a0d6b458
--- /dev/null
+++ b/fonts/NimbusSanL-BoldItal.cff
diff --git a/fonts/NimbusSanL-BoldItal.ttf b/fonts/NimbusSanL-BoldItal.ttf
deleted file mode 100644
index 7f31256c..00000000
--- a/fonts/NimbusSanL-BoldItal.ttf
+++ /dev/null
diff --git a/fonts/NimbusSanL-Regu.cff b/fonts/NimbusSanL-Regu.cff
new file mode 100644
index 00000000..33cee931
--- /dev/null
+++ b/fonts/NimbusSanL-Regu.cff
diff --git a/fonts/NimbusSanL-Regu.ttf b/fonts/NimbusSanL-Regu.ttf
deleted file mode 100644
index 18844b4c..00000000
--- a/fonts/NimbusSanL-Regu.ttf
+++ /dev/null
diff --git a/fonts/NimbusSanL-ReguItal.cff b/fonts/NimbusSanL-ReguItal.cff
new file mode 100644
index 00000000..ebf1c5d1
--- /dev/null
+++ b/fonts/NimbusSanL-ReguItal.cff
diff --git a/fonts/NimbusSanL-ReguItal.ttf b/fonts/NimbusSanL-ReguItal.ttf
deleted file mode 100644
index 5608bc23..00000000
--- a/fonts/NimbusSanL-ReguItal.ttf
+++ /dev/null
diff --git a/fonts/StandardSymL.cff b/fonts/StandardSymL.cff
new file mode 100644
index 00000000..46231bc0
--- /dev/null
+++ b/fonts/StandardSymL.cff
diff --git a/fonts/StandardSymL.ttf b/fonts/StandardSymL.ttf
deleted file mode 100644
index 1c1ac7f8..00000000
--- a/fonts/StandardSymL.ttf
+++ /dev/null
diff --git a/fonts/URWChanceryL-MediItal.cff b/fonts/URWChanceryL-MediItal.cff
new file mode 100644
index 00000000..18f9cd10
--- /dev/null
+++ b/fonts/URWChanceryL-MediItal.cff
diff --git a/fonts/URWChanceryL-MediItal.ttf b/fonts/URWChanceryL-MediItal.ttf
deleted file mode 100644
index e2970e30..00000000
--- a/fonts/URWChanceryL-MediItal.ttf
+++ /dev/null
diff --git a/mupdf/Jamfile b/mupdf/Jamfile
index 6609be96..b880840e 100644
--- a/mupdf/Jamfile
+++ b/mupdf/Jamfile
@@ -119,44 +119,42 @@ Library libcmaps :
 SubDir TOP fonts ;
 
 GenFile font_misc.c : fontdump
-    Dingbats.ttf
-    StandardSymL.ttf
-    URWChanceryL-MediItal.ttf
-    ;
+	Dingbats.cff
+	StandardSymL.cff
+	URWChanceryL-MediItal.cff
+	;
 
 GenFile font_mono.c : fontdump
-    NimbusMonL-Regu.ttf
-    NimbusMonL-ReguObli.ttf
-    NimbusMonL-Bold.ttf
-    NimbusMonL-BoldObli.ttf
-    ;
+	NimbusMonL-Regu.cff
+	NimbusMonL-ReguObli.cff
+	NimbusMonL-Bold.cff
+	NimbusMonL-BoldObli.cff
+	;
 
 GenFile font_serif.c : fontdump
-    NimbusRomNo9L-Regu.ttf
-    NimbusRomNo9L-ReguItal.ttf
-    NimbusRomNo9L-Medi.ttf
-    NimbusRomNo9L-MediItal.ttf
-    ;
+	NimbusRomNo9L-Regu.cff
+	NimbusRomNo9L-ReguItal.cff
+	NimbusRomNo9L-Medi.cff
+	NimbusRomNo9L-MediItal.cff
+	;
 
 GenFile font_sans.c : fontdump
-    NimbusSanL-Bold.ttf
-    NimbusSanL-BoldItal.ttf
-    NimbusSanL-Regu.ttf
-    NimbusSanL-ReguItal.ttf
-    ;
+	NimbusSanL-Bold.cff
+	NimbusSanL-BoldItal.cff
+	NimbusSanL-Regu.cff
+	NimbusSanL-ReguItal.cff
+	;
 
 Library libfonts :
-    font_misc.c
-    font_mono.c
-    font_serif.c
-    font_sans.c
-    ;
+	font_misc.c
+	font_mono.c
+	font_serif.c
+	font_sans.c
+	;
 
 if ! ( NOCJK in $(DEFINES) )
 {
-    SubDir TOP fonts droid ;
-    GenFile font_cjk.c : fontdump DroidSansFallback.ttf ;
-    Library libfonts : font_cjk.c ;
+	SubDir TOP fonts droid ;
+	GenFile font_cjk.c : fontdump DroidSansFallback.ttf ;
+	Library libfonts : font_cjk.c ;
 }
-
-
diff --git a/mupdf/pdf_fontfile.c b/mupdf/pdf_fontfile.c
index de63e6fb..8cd44d66 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_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;
+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;
 
 #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 *ttf;
+	const unsigned char *cff;
 	const unsigned int *len;
 	} basefonts[] = {
 	{ "Courier",
-		pdf_font_NimbusMonL_Regu_ttf_buf,
-		&pdf_font_NimbusMonL_Regu_ttf_len },
+		pdf_font_NimbusMonL_Regu_cff_buf,
+		&pdf_font_NimbusMonL_Regu_cff_len },
 	{ "Courier-Bold",
-		pdf_font_NimbusMonL_Bold_ttf_buf,
-		&pdf_font_NimbusMonL_Bold_ttf_len },
+		pdf_font_NimbusMonL_Bold_cff_buf,
+		&pdf_font_NimbusMonL_Bold_cff_len },
 	{ "Courier-Oblique",
-		pdf_font_NimbusMonL_ReguObli_ttf_buf,
-		&pdf_font_NimbusMonL_ReguObli_ttf_len },
+		pdf_font_NimbusMonL_ReguObli_cff_buf,
+		&pdf_font_NimbusMonL_ReguObli_cff_len },
 	{ "Courier-BoldOblique",
-		pdf_font_NimbusMonL_BoldObli_ttf_buf,
-		&pdf_font_NimbusMonL_BoldObli_ttf_len },
+		pdf_font_NimbusMonL_BoldObli_cff_buf,
+		&pdf_font_NimbusMonL_BoldObli_cff_len },
 	{ "Helvetica",
-		pdf_font_NimbusSanL_Regu_ttf_buf,
-		&pdf_font_NimbusSanL_Regu_ttf_len },
+		pdf_font_NimbusSanL_Regu_cff_buf,
+		&pdf_font_NimbusSanL_Regu_cff_len },
 	{ "Helvetica-Bold",
-		pdf_font_NimbusSanL_Bold_ttf_buf,
-		&pdf_font_NimbusSanL_Bold_ttf_len },
+		pdf_font_NimbusSanL_Bold_cff_buf,
+		&pdf_font_NimbusSanL_Bold_cff_len },
 	{ "Helvetica-Oblique",
-		pdf_font_NimbusSanL_ReguItal_ttf_buf,
-		&pdf_font_NimbusSanL_ReguItal_ttf_len },
+		pdf_font_NimbusSanL_ReguItal_cff_buf,
+		&pdf_font_NimbusSanL_ReguItal_cff_len },
 	{ "Helvetica-BoldOblique",
-		pdf_font_NimbusSanL_BoldItal_ttf_buf,
-		&pdf_font_NimbusSanL_BoldItal_ttf_len },
+		pdf_font_NimbusSanL_BoldItal_cff_buf,
+		&pdf_font_NimbusSanL_BoldItal_cff_len },
 	{ "Times-Roman",
-		pdf_font_NimbusRomNo9L_Regu_ttf_buf,
-		&pdf_font_NimbusRomNo9L_Regu_ttf_len },
+		pdf_font_NimbusRomNo9L_Regu_cff_buf,
+		&pdf_font_NimbusRomNo9L_Regu_cff_len },
 	{ "Times-Bold",
-		pdf_font_NimbusRomNo9L_Medi_ttf_buf,
-		&pdf_font_NimbusRomNo9L_Medi_ttf_len },
+		pdf_font_NimbusRomNo9L_Medi_cff_buf,
+		&pdf_font_NimbusRomNo9L_Medi_cff_len },
 	{ "Times-Italic",
-		pdf_font_NimbusRomNo9L_ReguItal_ttf_buf,
-		&pdf_font_NimbusRomNo9L_ReguItal_ttf_len },
+		pdf_font_NimbusRomNo9L_ReguItal_cff_buf,
+		&pdf_font_NimbusRomNo9L_ReguItal_cff_len },
 	{ "Times-BoldItalic",
-		pdf_font_NimbusRomNo9L_MediItal_ttf_buf,
-		&pdf_font_NimbusRomNo9L_MediItal_ttf_len },
+		pdf_font_NimbusRomNo9L_MediItal_cff_buf,
+		&pdf_font_NimbusRomNo9L_MediItal_cff_len },
 	{ "Symbol",
-		pdf_font_StandardSymL_ttf_buf,
-		&pdf_font_StandardSymL_ttf_len },
+		pdf_font_StandardSymL_cff_buf,
+		&pdf_font_StandardSymL_cff_len },
 	{ "ZapfDingbats",
-		pdf_font_Dingbats_ttf_buf,
-		&pdf_font_Dingbats_ttf_len },
+		pdf_font_Dingbats_cff_buf,
+		&pdf_font_Dingbats_cff_len },
 	{ "Chancery",
-		pdf_font_URWChanceryL_MediItal_ttf_buf,
-		&pdf_font_URWChanceryL_MediItal_ttf_len },
+		pdf_font_URWChanceryL_MediItal_cff_buf,
+		&pdf_font_URWChanceryL_MediItal_cff_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].ttf;
+	data = (unsigned char *) basefonts[i].cff;
 	len = *basefonts[i].len;
 
 	error = fz_newfontfrombuffer(&font->font, data, len, 0);