Update base 14 fonts to URW++ release from 2017-07-27.

The Dingbats and Symbol fonts have not been changed.

15 files changed, 11 insertions, 6 deletions

diff --git a/platform/win32/libresources.vcproj b/platform/win32/libresources.vcproj
index 30f2e36e..b0da040b 100644
--- a/platform/win32/libresources.vcproj
+++ b/platform/win32/libresources.vcproj
@@ -743,11 +743,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\resources\fonts\urw\NimbusSans-BoldOblique.cff"
+					RelativePath="..\..\resources\fonts\urw\NimbusSans-BoldItalic.cff"
 					>
 				</File>
 				<File
-					RelativePath="..\..\resources\fonts\urw\NimbusSans-Oblique.cff"
+					RelativePath="..\..\resources\fonts\urw\NimbusSans-Italic.cff"
 					>
 				</File>
 				<File
diff --git a/resources/fonts/urw/NimbusMonoPS-Bold.cff b/resources/fonts/urw/NimbusMonoPS-Bold.cff
index 00e0e230..81b57517 100644
--- a/resources/fonts/urw/NimbusMonoPS-Bold.cff
+++ b/resources/fonts/urw/NimbusMonoPS-Bold.cff
diff --git a/resources/fonts/urw/NimbusMonoPS-BoldItalic.cff b/resources/fonts/urw/NimbusMonoPS-BoldItalic.cff
index ed130041..73573849 100644
--- a/resources/fonts/urw/NimbusMonoPS-BoldItalic.cff
+++ b/resources/fonts/urw/NimbusMonoPS-BoldItalic.cff
diff --git a/resources/fonts/urw/NimbusMonoPS-Italic.cff b/resources/fonts/urw/NimbusMonoPS-Italic.cff
index d9a88e65..110448f6 100644
--- a/resources/fonts/urw/NimbusMonoPS-Italic.cff
+++ b/resources/fonts/urw/NimbusMonoPS-Italic.cff
diff --git a/resources/fonts/urw/NimbusMonoPS-Regular.cff b/resources/fonts/urw/NimbusMonoPS-Regular.cff
index 6cfbab12..8e8b03cd 100644
--- a/resources/fonts/urw/NimbusMonoPS-Regular.cff
+++ b/resources/fonts/urw/NimbusMonoPS-Regular.cff
diff --git a/resources/fonts/urw/NimbusRoman-Bold.cff b/resources/fonts/urw/NimbusRoman-Bold.cff
index d096506b..e363f953 100644
--- a/resources/fonts/urw/NimbusRoman-Bold.cff
+++ b/resources/fonts/urw/NimbusRoman-Bold.cff
diff --git a/resources/fonts/urw/NimbusRoman-BoldItalic.cff b/resources/fonts/urw/NimbusRoman-BoldItalic.cff
index 8da61f4f..94229a76 100644
--- a/resources/fonts/urw/NimbusRoman-BoldItalic.cff
+++ b/resources/fonts/urw/NimbusRoman-BoldItalic.cff
diff --git a/resources/fonts/urw/NimbusRoman-Italic.cff b/resources/fonts/urw/NimbusRoman-Italic.cff
index 5abb5773..76f593bf 100644
--- a/resources/fonts/urw/NimbusRoman-Italic.cff
+++ b/resources/fonts/urw/NimbusRoman-Italic.cff
diff --git a/resources/fonts/urw/NimbusRoman-Regular.cff b/resources/fonts/urw/NimbusRoman-Regular.cff
index 8a1a0038..01850d04 100644
--- a/resources/fonts/urw/NimbusRoman-Regular.cff
+++ b/resources/fonts/urw/NimbusRoman-Regular.cff
diff --git a/resources/fonts/urw/NimbusSans-Bold.cff b/resources/fonts/urw/NimbusSans-Bold.cff
index 12428844..89e8cf93 100644
--- a/resources/fonts/urw/NimbusSans-Bold.cff
+++ b/resources/fonts/urw/NimbusSans-Bold.cff
diff --git a/resources/fonts/urw/NimbusSans-BoldOblique.cff b/resources/fonts/urw/NimbusSans-BoldItalic.cff
index ac3a3e65..e2756093 100644
--- a/resources/fonts/urw/NimbusSans-BoldOblique.cff
+++ b/resources/fonts/urw/NimbusSans-BoldItalic.cff
diff --git a/resources/fonts/urw/NimbusSans-Oblique.cff b/resources/fonts/urw/NimbusSans-Italic.cff
index 40cd9ad0..d560994c 100644
--- a/resources/fonts/urw/NimbusSans-Oblique.cff
+++ b/resources/fonts/urw/NimbusSans-Italic.cff
diff --git a/resources/fonts/urw/NimbusSans-Regular.cff b/resources/fonts/urw/NimbusSans-Regular.cff
index ec8e0d21..009d3ba6 100644
--- a/resources/fonts/urw/NimbusSans-Regular.cff
+++ b/resources/fonts/urw/NimbusSans-Regular.cff
diff --git a/resources/fonts/urw/tocff.sh b/resources/fonts/urw/tocff.sh
index 04b23b2e..01748905 100644
--- a/resources/fonts/urw/tocff.sh
+++ b/resources/fonts/urw/tocff.sh
@@ -1,3 +1,8 @@
+#!/bin/bash
+#
+# Make sure AFDKO version 65322 May 27 2016 is installed, for the 'tx' tool.
+# The 2017 65781 April 3 2017 version produces larger CFF files.
+
 EXCL_PCL=\
 uniEFBF,uniEFC0,uniEFC1,uniEFC2,uniEFC3,uniEFC4,uniEFC5,uniEFC6,\
 uniEFC7,uniEFC8,uniEFC9,uniEFCA,uniEFCB,uniEFCC,uniEFCD,uniEFCE,\
diff --git a/source/fitz/noto.c b/source/fitz/noto.c
index 3842881d..b01614d4 100644
--- a/source/fitz/noto.c
+++ b/source/fitz/noto.c
@@ -71,9 +71,9 @@ fz_lookup_base14_font(fz_context *ctx, const char *name, int *size)
 	if (!strcmp(name, "Courier-Bold")) RETURN(urw,NimbusMonoPS_Bold_cff);
 	if (!strcmp(name, "Courier-BoldOblique")) RETURN(urw,NimbusMonoPS_BoldItalic_cff);
 	if (!strcmp(name, "Helvetica")) RETURN(urw,NimbusSans_Regular_cff);
-	if (!strcmp(name, "Helvetica-Oblique")) RETURN(urw,NimbusSans_Oblique_cff);
+	if (!strcmp(name, "Helvetica-Oblique")) RETURN(urw,NimbusSans_Italic_cff);
 	if (!strcmp(name, "Helvetica-Bold")) RETURN(urw,NimbusSans_Bold_cff);
-	if (!strcmp(name, "Helvetica-BoldOblique")) RETURN(urw,NimbusSans_BoldOblique_cff);
+	if (!strcmp(name, "Helvetica-BoldOblique")) RETURN(urw,NimbusSans_BoldItalic_cff);
 	if (!strcmp(name, "Times-Roman")) RETURN(urw,NimbusRoman_Regular_cff);
 	if (!strcmp(name, "Times-Italic")) RETURN(urw,NimbusRoman_Italic_cff);
 	if (!strcmp(name, "Times-Bold")) RETURN(urw,NimbusRoman_Bold_cff);
@@ -103,9 +103,9 @@ fz_lookup_builtin_font(fz_context *ctx, const char *name, int is_bold, int is_it
 	}
 	if (!strcmp(name, "Helvetica") || !strcmp(name, "Arial")) {
 		FAMILY(urw, NimbusSans_Regular_cff,
-				NimbusSans_Oblique_cff,
+				NimbusSans_Italic_cff,
 				NimbusSans_Bold_cff,
-				NimbusSans_BoldOblique_cff)
+				NimbusSans_BoldItalic_cff)
 	}
 	if (!strcmp(name, "Times") || !strcmp(name, "Times Roman") || !strcmp(name, "Times New Roman")) {
 		FAMILY(urw, NimbusRoman_Regular_cff,