Merge branch 'release'

NEWS.md

@@ -1,6 +1,39 @@
 Changelog
 =========
 
+2.8.4 (released 2019-01-09)
+---------------------------
+
+- [ufotools] Python 3 fix
+  ([#676](https://github.com/adobe-type-tools/afdko/pull/676))
+- [tx] Fixed `-dcf` option failing to print CFF2 global subrs
+  ([#681](https://github.com/adobe-type-tools/afdko/pull/681))
+- [tx] Fixed subroutinizer 64K limit
+  ([#687](https://github.com/adobe-type-tools/afdko/pull/687))
+- [makeinstancesufo] Switched from using mutatorMath to
+  ufoProcessor
+  ([#669](https://github.com/adobe-type-tools/afdko/pull/669))
+- [makeinstancesufo] Switched from using autohint to psautohint
+  ([#689](https://github.com/adobe-type-tools/afdko/pull/689))
+- [makeotf] Fixed calls to `sfntedit`
+  ([#690](https://github.com/adobe-type-tools/afdko/pull/690))
+- [checkoutlinesufo] Fixed failure to remove overlaps
+  ([#239](https://github.com/adobe-type-tools/afdko/issues/239))
+- [checkoutlinesufo] Fixed glyph hashes when using `-w` option
+  ([#692](https://github.com/adobe-type-tools/afdko/pull/692))
+- [spot] Updated OpenType feature tags to v1.8.3
+  ([#693](https://github.com/adobe-type-tools/afdko/pull/693))
+- [makeotfexe] Fixed "glyph not in font" error
+  ([#698](https://github.com/adobe-type-tools/afdko/pull/698))
+- [tx] Fixed CFF2 blend/path optimization
+  ([#697](https://github.com/adobe-type-tools/afdko/pull/697))
+- [otc2otf] Fixed file path bugs
+  ([#708](https://github.com/adobe-type-tools/afdko/issues/708))
+- [ttfcomponentizer] Fixed setting first component flag
+  ([#709](https://github.com/adobe-type-tools/afdko/issues/709))
+- [ttfcomponentizer] Update `maxp` maxComponentElements value
+  ([#710](https://github.com/adobe-type-tools/afdko/issues/710))
+
 2.8.3 (released 2018-11-02)
 ---------------------------
 

README.md

@@ -22,7 +22,7 @@ Please see the
 for additional information, such as links to reference materials and related
 projects.
 
-Major Changes
+Major changes
 -------------
 
 The AFDKO has been restructured so that it can be installed as a Python
@@ -118,17 +118,10 @@ You can download older versions of the tools from the [Adobe AFDKO
 homepage](http://www.adobe.com/devnet/opentype/afdko.html). The tools IS
 and checkoutlines are included in these downloads.
 
-Build from Source
+Build from source
 -----------------
 
-In order to build afdko from source get the files from the [afdko github
-repository](https://github.com/adobe-type-tools/afdko), cd to the
-top-level directory of the afdko, and use the `setup.py` script:
-
-    python setup.py install
-
-And to be able to run this install command, you must first have
-installed the development tools for your platform.
+First you must have installed the development tools for your platform.
 
 On the Mac, install these with:
 
@@ -141,3 +134,22 @@ On Linux, install these with:
     apt-get -y install python-dev
 
 On Windows, you need Visual Studio 2017.
+
+To build **afdko** from source, clone the [afdko GitHub
+repository](https://github.com/adobe-type-tools/afdko), ensure the `wheel`
+module is installed (`pip install wheel`), then `cd` to the top-level
+directory of the afdko, and run:
+
+    pip install .
+
+**Note**
+
+It's not possible to install the afdko in editable/develop mode using
+`pip install -e .`; this is because the toolkit includes binary C executables
+which setup.py tries to install in the bin/ (or Scripts/) folder, however
+this process was only meant to be used with text-based scripts (either
+written in Python or a shell scripting language). To work around this problem
+(which really only impacts the few core afdko developers who need to get live
+feedback as they modify the source files) you can use alternative methods like
+exporting a PYTHONPATH, using a .pth file or similar hacks.
+For further details read [this comment](https://github.com/adobe-type-tools/afdko/pull/677#issuecomment-436747212).

c/makeotf/makeotf_lib/build/hotpccts/featgram.g

@@ -356,14 +356,13 @@ glyphClass[int named, char *gcname]>[GNode *gnode]
 					  gcAddRange(gid, endgid, firstPart, secondPart);
 					}
 					else {
-					  zzFAIL(1,zzerr2,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk);
-					  goto fail;
+					  hotMsg(g, hotFATAL, "aborting because of errors");
 					}
 
 				}
 				else {
-				  zzFAIL(1,zzerr2,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk);
-				  goto fail;
+				  featMapGName2GID(g, firstPart, FALSE);
+				  hotMsg(g, hotFATAL, "aborting because of errors");
 				}
 				zzEXIT(zztasp4);
 			}

c/makeotf/makeotf_lib/source/hotconv/featgram.c

@@ -178,13 +178,12 @@ char *gcname;
                                                 if (gid != 0 && endgid != 0) {
                                                     gcAddRange(gid, endgid, firstPart, secondPart);
                                                 } else {
-                                                    zzFAIL(1, zzerr2, &zzMissSet, &zzMissText, &zzBadTok, &zzBadText, &zzErrk);
-                                                    goto fail;
+                                                    hotMsg(g, hotFATAL, "aborting because of errors");
                                                 }
 
                                             } else {
-                                                zzFAIL(1, zzerr2, &zzMissSet, &zzMissText, &zzBadTok, &zzBadText, &zzErrk);
-                                                goto fail;
+                                                featMapGName2GID(g, firstPart, FALSE);
+                                                hotMsg(g, hotFATAL, "aborting because of errors");
                                             }
                                             zzEXIT(zztasp4);
                                         } else {

c/makeotf/makeotf_lib/source/typecomp/recode.c

@@ -893,10 +893,10 @@ static void addWidth(recodeCtx h, Fixed width) {
         width = 0;
         switch (h->idType) {
             case SIDType:
-                parseWarning(h->g, "glyph '%s' has a negative advance width. Setting width to 0.\n", sindexGetString(h->g, (SID)h->id));
+                parseWarning(h->g, "glyph '%s' has a negative advance width. Setting width to 0.", sindexGetString(h->g, (SID)h->id));
                 break;
             case CIDType:
-                parseWarning(h->g, "glyph 'cid#%hu' has a negative advance width. Setting width to 0.\n", h->id);
+                parseWarning(h->g, "glyph 'cid#%hu' has a negative advance width. Setting width to 0.", h->id);
                 break;
             default:;
         }
@@ -4912,7 +4912,7 @@ void recodeAddNewGlyph(tcCtx g, unsigned id, unsigned fill_in_font_id, unsigned
                 diff = (diff > 0) ? diff : -diff;
 
                 if (diff == 1) {
-                    parseWarning(g, "Zero width vs  calculated Euro width round-off difference: %f, %d", FIX2DBL(zeroWidth), iwidth);
+                    parseWarning(g, "Zero width vs. calculated Euro width round-off difference: %f, %d", FIX2DBL(zeroWidth), iwidth);
                 }
                 if (diff > 1) {
                     parseWarning(g, "Problem: Zero width of target font is not same as calculated Euro width: %f, %d", FIX2DBL(zeroWidth), iwidth);

c/makeotf/source/cb.c

@@ -1818,17 +1818,17 @@ void cbConvert(cbCtx h, int flags, char *clientVers,
     if (h->fcdb.files.cnt == 0) {
         {
             fcdbGetRec(h->fcdb.ctx, FontName);
-            cbWarning(h, "Font Menu Name database is not specified or not found .[%s]", FontName);
+            cbWarning(h, "FontMenuNameDB file was not specified or not found. [%s]", FontName);
         }
     } else if (fcdbGetRec(h->fcdb.ctx, FontName)) {
         {
-            cbWarning(h, "not in Font Menu Name database [%s]", FontName);
+            cbWarning(h, "not in FontMenuNameDB [%s]", FontName);
         }
     }
 
     // Make sure that GOADB file has been read in, if required
     if ((flags & HOT_RENAME) && (h->alias.recs.cnt < 1) && (type != hotCID)) {
-        cbWarning(h, "Glyph renaming is requested, but the Glyph Alias And Order DB file was not specified.");
+        cbWarning(h, "Glyph renaming was requested, but the GlyphOrderAndAliasDB file was not specified.");
     }
 
     h->mac.cmapScript = macScript; /* Used in hotAddmiscData, in ProcessFontInfo */

c/mergefonts/build/osx/xcode/mergeFonts.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 			buildPhases = (
 			);
 			dependencies = (
+				DE2E39C421937A7400B0A033 /* PBXTargetDependency */,
 				BDEA9B641E499B3300EFF385 /* PBXTargetDependency */,
 				BDEA9B621E499B2F00EFF385 /* PBXTargetDependency */,
 				BDE02A26190F19CE0013858F /* PBXTargetDependency */,
@@ -68,6 +69,7 @@
 		BDE02A22190F19B90013858F /* libufowrite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BDE02A1C190F19940013858F /* libufowrite.a */; };
 		BDEA9B5F1E499B1800EFF385 /* libnameread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BDEA9B5A1E499AFE00EFF385 /* libnameread.a */; };
 		BDEA9B601E499B1D00EFF385 /* libvarread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BDEA9B541E499AF300EFF385 /* libvarread.a */; };
+		DEE09B6121935AEC00B474B9 /* libtx_shared.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DEE09B5F21935AD900B474B9 /* libtx_shared.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -561,6 +563,27 @@
 			remoteGlobalIDString = D2AAC045055464E500DB518D;
 			remoteInfo = varread;
 		};
+		DE2E39C021937A6700B0A033 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = DEE09B5A21935AD900B474B9 /* tx_shared.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = DE8577CC2192544500D4F584;
+			remoteInfo = tx_shared;
+		};
+		DE2E39C321937A7400B0A033 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = DEE09B5A21935AD900B474B9 /* tx_shared.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = DE8577CC2192544500D4F584;
+			remoteInfo = tx_shared;
+		};
+		DEE09B5E21935AD900B474B9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = DEE09B5A21935AD900B474B9 /* tx_shared.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DE8577CD2192544500D4F584;
+			remoteInfo = tx_shared;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -603,13 +626,15 @@
 		BDE02A17190F19940013858F /* ufowrite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ufowrite.xcodeproj; path = ../../../../public/lib/build/ufowrite/osx/xcode/ufowrite.xcodeproj; sourceTree = "<group>"; };
 		BDEA9B4F1E499AF300EFF385 /* varread.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = varread.xcodeproj; path = ../../../../public/lib/build/varread/osx/xcode/varread.xcodeproj; sourceTree = "<group>"; };
 		BDEA9B551E499AFE00EFF385 /* nameread.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = nameread.xcodeproj; path = ../../../../public/lib/build/nameread/osx/xcode/nameread.xcodeproj; sourceTree = "<group>"; };
+		DEE09B5A21935AD900B474B9 /* tx_shared.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tx_shared.xcodeproj; path = ../../../../public/lib/build/tx_shared/osx/xcode/tx_shared.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		8DD76FAD0486AB0100D96B5E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DEE09B6121935AEC00B474B9 /* libtx_shared.a in Frameworks */,
 				BDEA9B601E499B1D00EFF385 /* libvarread.a in Frameworks */,
 				BDEA9B5F1E499B1800EFF385 /* libnameread.a in Frameworks */,
 				BDE02A22190F19B90013858F /* libufowrite.a in Frameworks */,
@@ -647,6 +672,7 @@
 				BDA34AEC0D6F3F530009FF85 /* Headers */,
 				08FB7795FE84155DC02AAC07 /* Source */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
+				DEE09B6021935AEC00B474B9 /* Frameworks */,
 			);
 			name = cvt2sing;
 			sourceTree = "<group>";
@@ -774,6 +800,7 @@
 				BD43E1B90DAB3FF200F5623C /* t1write.xcodeproj */,
 				BDA34F290D6F6A9E0009FF85 /* t2cstr.xcodeproj */,
 				BDA34E9C0D6F657B0009FF85 /* ttread.xcodeproj */,
+				DEE09B5A21935AD900B474B9 /* tx_shared.xcodeproj */,
 				BDE02A11190F19730013858F /* uforead.xcodeproj */,
 				BDE02A17190F19940013858F /* ufowrite.xcodeproj */,
 				BDEA9B4F1E499AF300EFF385 /* varread.xcodeproj */,
@@ -909,6 +936,21 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		DEE09B5B21935AD900B474B9 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				DEE09B5F21935AD900B474B9 /* libtx_shared.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		DEE09B6021935AEC00B474B9 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -922,6 +964,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				DE2E39C121937A6700B0A033 /* PBXTargetDependency */,
 				BDEA9B5E1E499B1100EFF385 /* PBXTargetDependency */,
 				BDEA9B5C1E499B0D00EFF385 /* PBXTargetDependency */,
 				BDE02A20190F19A80013858F /* PBXTargetDependency */,
@@ -1053,6 +1096,10 @@
 					ProductGroup = BDA34E9D0D6F657B0009FF85 /* Products */;
 					ProjectRef = BDA34E9C0D6F657B0009FF85 /* ttread.xcodeproj */;
 				},
+				{
+					ProductGroup = DEE09B5B21935AD900B474B9 /* Products */;
+					ProjectRef = DEE09B5A21935AD900B474B9 /* tx_shared.xcodeproj */;
+				},
 				{
 					ProductGroup = BDE02A12190F19730013858F /* Products */;
 					ProjectRef = BDE02A11190F19730013858F /* uforead.xcodeproj */;
@@ -1236,6 +1283,13 @@
 			remoteRef = BDEA9B591E499AFE00EFF385 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		DEE09B5F21935AD900B474B9 /* libtx_shared.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libtx_shared.a;
+			remoteRef = DEE09B5E21935AD900B474B9 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1485,6 +1539,16 @@
 			name = varread;
 			targetProxy = BDEA9B631E499B3300EFF385 /* PBXContainerItemProxy */;
 		};
+		DE2E39C121937A6700B0A033 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = tx_shared;
+			targetProxy = DE2E39C021937A6700B0A033 /* PBXContainerItemProxy */;
+		};
+		DE2E39C421937A7400B0A033 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = tx_shared;
+			targetProxy = DE2E39C321937A7400B0A033 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */

c/mergefonts/build/win/visualstudio/mergeFonts.sln

@@ -1,10 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
+VisualStudioVersion = 15.0.26228.48
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mergeFonts", "mergeFonts.vcxproj", "{66C1C775-5375-41AC-BEC0-93173237700D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F6C5C6E-5B6D-463D-81DF-CCEB1271C759} = {0F6C5C6E-5B6D-463D-81DF-CCEB1271C759}
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54} = {34A7C3B7-FC39-49B3-A554-C532F2DC4A54}
 		{DA4450E3-E694-4F89-AEB3-D1A5498BD6F5} = {DA4450E3-E694-4F89-AEB3-D1A5498BD6F5}
 	EndProjectSection
 EndProject
@@ -54,6 +55,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nameread", "..\..\..\..\pub
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "varread", "..\..\..\..\public\lib\build\varread\win\visualstudio\varread.vcxproj", "{0F6C5C6E-5B6D-463D-81DF-CCEB1271C759}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tx_shared", "..\..\..\..\public\lib\build\tx_shared\win\visualstudio\tx_shared.vcxproj", "{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -254,6 +257,14 @@ Global
 		{0F6C5C6E-5B6D-463D-81DF-CCEB1271C759}.Release|x64.Build.0 = Release|x64
 		{0F6C5C6E-5B6D-463D-81DF-CCEB1271C759}.Release|x86.ActiveCfg = Release|Win32
 		{0F6C5C6E-5B6D-463D-81DF-CCEB1271C759}.Release|x86.Build.0 = Release|Win32
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Debug|x64.ActiveCfg = Debug|x64
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Debug|x64.Build.0 = Debug|x64
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Debug|x86.ActiveCfg = Debug|Win32
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Debug|x86.Build.0 = Debug|Win32
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Release|x64.ActiveCfg = Release|x64
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Release|x64.Build.0 = Release|x64
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Release|x86.ActiveCfg = Release|Win32
+		{34A7C3B7-FC39-49B3-A554-C532F2DC4A54}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

c/mergefonts/build/win/visualstudio/mergeFonts.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -257,6 +257,9 @@
       <Project>{0e9d40d8-c144-4760-adc1-22d0e23a72eb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\public\lib\build\tx_shared\win\visualstudio\tx_shared.vcxproj">
+      <Project>{34a7c3b7-fc39-49b3-a554-c532f2dc4a54}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\public\lib\build\uforead\win\visualstudio\uforead.vcxproj">
       <Project>{2E122640-3CD7-4064-9AA3-9C685EE1A4DA}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -272,4 +275,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>