Merge branch 'release'

adobe-type-tools · May 28, 2019 · 417dfc1 · 417dfc1
2 parents 5e01571 + 2a15fa4
commit 417dfc1
Show file tree

Hide file tree

Showing 46 changed files with 6,002 additions and 9,904 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+2.8.10 (released 2019-05-28)
+---------------------------
+
+- **buildcff2vf** tool was rewritten to support sparse masters,
+  glyph subsets, and to rely more on `fontTools.varLib`. Existing
+  options were renamed and new ones were added
+  ([#792](https://github.com/adobe-type-tools/afdko/pull/792),
+  [#800](https://github.com/adobe-type-tools/afdko/pull/800))
+- [mergefonts] Ignore height advance value in UFO glyph files
+  ([#795](https://github.com/adobe-type-tools/afdko/pull/795))
+
 2.8.9 (released 2019-04-29)
 ---------------------------
 

diff --git a/c/mergefonts/build/osx/xcode/mergeFonts.xcodeproj/project.pbxproj b/c/mergefonts/build/osx/xcode/mergeFonts.xcodeproj/project.pbxproj
@@ -1005,13 +1005,14 @@
 			};
 			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "mergeFonts" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				ja,
+				en,
+				de,
+				Base,
+				fr,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* cvt2sing */;
 			projectDirPath = "";

diff --git a/c/public/lib/build/absfont/osx/xcode/absfont.xcodeproj/project.pbxproj b/c/public/lib/build/absfont/osx/xcode/absfont.xcodeproj/project.pbxproj
@@ -152,13 +152,14 @@
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "absfont" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				de,
+				ja,
+				fr,
+				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";

diff --git a/c/public/lib/build/cfembed/osx/xcode/cfembed.xcodeproj/project.pbxproj b/c/public/lib/build/cfembed/osx/xcode/cfembed.xcodeproj/project.pbxproj
@@ -125,14 +125,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "cfembed" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -176,6 +177,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -210,6 +212,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/cffread/osx/xcode/cffread.xcodeproj/project.pbxproj b/c/public/lib/build/cffread/osx/xcode/cffread.xcodeproj/project.pbxproj
@@ -129,13 +129,14 @@
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "cffread" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				de,
+				ja,
+				fr,
+				Base,
+				en,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";

diff --git a/c/public/lib/build/cffwrite/osx/xcode/cffwrite.xcodeproj/project.pbxproj b/c/public/lib/build/cffwrite/osx/xcode/cffwrite.xcodeproj/project.pbxproj
@@ -195,13 +195,14 @@
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "cffwrite" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				de,
+				fr,
+				Base,
+				ja,
+				en,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";

diff --git a/c/public/lib/build/ctutil/osx/xcode/ctutil.xcodeproj/project.pbxproj b/c/public/lib/build/ctutil/osx/xcode/ctutil.xcodeproj/project.pbxproj
@@ -125,14 +125,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "ctutil" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -178,6 +179,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -212,6 +214,7 @@
 			baseConfigurationReference = BDA34BAF0D6F46BD0009FF85 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/dynarr/osx/xcode/dynarr.xcodeproj/project.pbxproj b/c/public/lib/build/dynarr/osx/xcode/dynarr.xcodeproj/project.pbxproj
@@ -125,14 +125,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "dynarr" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -178,6 +179,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -212,6 +214,7 @@
 			baseConfigurationReference = BDA34BAF0D6F46BD0009FF85 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/nameread/osx/xcode/nameread.xcodeproj/project.pbxproj b/c/public/lib/build/nameread/osx/xcode/nameread.xcodeproj/project.pbxproj
@@ -131,13 +131,14 @@
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "nameread" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				en,
+				ja,
+				Base,
+				fr,
+				de,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";

diff --git a/c/public/lib/build/pdfwrite/osx/xcode/pdfwrite.xcodeproj/project.pbxproj b/c/public/lib/build/pdfwrite/osx/xcode/pdfwrite.xcodeproj/project.pbxproj
@@ -127,14 +127,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "pdfwrite" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -180,6 +181,7 @@
 			baseConfigurationReference = BD8A5ABA0D6F8FA900301916 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -214,6 +216,7 @@
 			baseConfigurationReference = BD8A5AB90D6F8FA900301916 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/pstoken/osx/xcode/pstoken.xcodeproj/project.pbxproj b/c/public/lib/build/pstoken/osx/xcode/pstoken.xcodeproj/project.pbxproj
@@ -133,14 +133,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "pstoken" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -186,6 +187,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -220,6 +222,7 @@
 			baseConfigurationReference = BDA34BAF0D6F46BD0009FF85 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/sfntread/osx/xcode/sfntread.xcodeproj/project.pbxproj b/c/public/lib/build/sfntread/osx/xcode/sfntread.xcodeproj/project.pbxproj
@@ -125,14 +125,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sfntread" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -178,6 +179,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -212,6 +214,7 @@
 			baseConfigurationReference = BDA34BAF0D6F46BD0009FF85 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/sfntwrite/osx/xcode/sfntwrite.xcodeproj/project.pbxproj b/c/public/lib/build/sfntwrite/osx/xcode/sfntwrite.xcodeproj/project.pbxproj
@@ -125,14 +125,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sfntwrite" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -178,6 +179,7 @@
 			baseConfigurationReference = BDA34BAE0D6F46BD0009FF85 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -212,6 +214,7 @@
 			baseConfigurationReference = BDA34BAF0D6F46BD0009FF85 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;

diff --git a/c/public/lib/build/sha1/osx/xcode/sha1.xcodeproj/project.pbxproj b/c/public/lib/build/sha1/osx/xcode/sha1.xcodeproj/project.pbxproj
@@ -119,14 +119,15 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "sha1" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* absfont */;
 			projectDirPath = "";
@@ -172,6 +173,7 @@
 			baseConfigurationReference = BD8A5ABA0D6F8FA900301916 /* debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -206,6 +208,7 @@
 			baseConfigurationReference = BD8A5AB90D6F8FA900301916 /* release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;