[makeinstancesufo] Switch from mutatorMath.ufo.build() to ufoProcesso…

…r.build() Fixes #402
adobe-type-tools · Dec 5, 2018 · 5365b9b · 5365b9b
1 parent 55d04fb
commit 5365b9b
Show file tree

Hide file tree

Showing 85 changed files with 312 additions and 277 deletions.
diff --git a/python/afdko/makeinstancesufo.py b/python/afdko/makeinstancesufo.py
@@ -17,10 +17,11 @@
 import sys
 from subprocess import PIPE, Popen
 
+from fontTools.designspaceLib import DesignSpaceDocumentError
 from fontTools.misc.py23 import open, tounicode, tobytes
 
 from defcon import Font
-from mutatorMath.ufo import build as mutatorMathBuild
+from ufoProcessor import build as ufoProcessorBuild
 from ufonormalizer import normalizeUFO
 
 try:
@@ -32,7 +33,7 @@
 from afdko.ufotools import validateLayers
 
 
-__version__ = '2.0.0'
+__version__ = '2.1.0'
 
 logger = logging.getLogger(__name__)
 
@@ -230,7 +231,7 @@ def roundSelectedValues(dFont):
 def postProcessInstance(fontPath, options):
     dFont = Font(fontPath)
     clearCustomLibs(dFont)
-    if options.no_round:
+    if not options.no_round:
         roundSelectedValues(dFont)
     dFont.save()
 
@@ -252,8 +253,8 @@ def run(options):
         logger.info("Building 1 instance...")
     else:
         logger.info("Building %s instances..." % len(newInstancesList))
-    mutatorMathBuild(documentPath=dsPath, outputUFOFormatVersion=version,
-                     roundGeometry=(not options.no_round))
+    ufoProcessorBuild(documentPath=dsPath, outputUFOFormatVersion=version,
+                      roundGeometry=(not options.no_round), logger=logger)
     if (dsPath != options.dsPath) and os.path.exists(dsPath):
         os.remove(dsPath)
 
@@ -397,8 +398,8 @@ def main(args=None):
 
     try:
         run(opts)
-    except SnapShotError:
-        logger.error("Quitting after error.")
+    except (SnapShotError, DesignSpaceDocumentError) as err:
+        logger.error(err)
         return 1
 
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
 booleanOperations==0.8.1
 cu2qu[cli]==1.6.5
 defcon[lxml,pens]==0.6.0
-fontMath==0.4.8
+fontMath==0.4.9
 fontTools[ufo,unicode,lxml]==3.32.0
 mutatorMath==2.1.2
 psautohint==1.8.1
 ufonormalizer==0.3.5
-ufoProcessor==1.0.2
+ufoProcessor==1.0.3
diff --git a/tests/makeinstancesufo_data/expected_output/black.ufo/fontinfo.plist b/tests/makeinstancesufo_data/expected_output/black.ufo/fontinfo.plist
@@ -14,6 +14,12 @@
     <string>Source Serif Pro</string>
     <key>italicAngle</key>
     <integer>0</integer>
+    <key>openTypeHheaAscender</key>
+    <integer>1036</integer>
+    <key>openTypeHheaDescender</key>
+    <integer>-335</integer>
+    <key>openTypeHheaLineGap</key>
+    <integer>0</integer>
     <key>openTypeNameDesigner</key>
     <string>Frank Grießhammer</string>
     <key>openTypeNameLicense</key>
@@ -48,6 +54,12 @@
       <integer>2</integer>
       <integer>4</integer>
     </array>
+    <key>openTypeOS2TypoAscender</key>
+    <integer>730</integer>
+    <key>openTypeOS2TypoDescender</key>
+    <integer>-270</integer>
+    <key>openTypeOS2TypoLineGap</key>
+    <integer>0</integer>
     <key>openTypeOS2UnicodeRanges</key>
     <array>
       <integer>0</integer>
@@ -62,6 +74,10 @@
     </array>
     <key>openTypeOS2VendorID</key>
     <string>ADBO</string>
+    <key>openTypeOS2WinAscent</key>
+    <integer>1036</integer>
+    <key>openTypeOS2WinDescent</key>
+    <integer>335</integer>
     <key>postscriptBlueFuzz</key>
     <integer>0</integer>
     <key>postscriptBlueScale</key>

diff --git a/tests/makeinstancesufo_data/expected_output/black.ufo/kerning.plist b/tests/makeinstancesufo_data/expected_output/black.ufo/kerning.plist
@@ -23,6 +23,8 @@
       <integer>-50</integer>
       <key>adieresis</key>
       <integer>-50</integer>
+      <key>atilde</key>
+      <integer>-80</integer>
     </dict>
     <key>@MMK_L_LAT_a</key>
     <dict>

diff --git a/tests/makeinstancesufo_data/expected_output/bold.ufo/fontinfo.plist b/tests/makeinstancesufo_data/expected_output/bold.ufo/fontinfo.plist
@@ -15,9 +15,9 @@
     <key>italicAngle</key>
     <integer>0</integer>
     <key>openTypeHheaAscender</key>
-    <integer>289</integer>
+    <integer>1036</integer>
     <key>openTypeHheaDescender</key>
-    <integer>-93</integer>
+    <integer>-335</integer>
     <key>openTypeHheaLineGap</key>
     <integer>0</integer>
     <key>openTypeNameDesigner</key>
@@ -55,9 +55,9 @@
       <integer>4</integer>
     </array>
     <key>openTypeOS2TypoAscender</key>
-    <integer>203</integer>
+    <integer>730</integer>
     <key>openTypeOS2TypoDescender</key>
-    <integer>-75</integer>
+    <integer>-270</integer>
     <key>openTypeOS2TypoLineGap</key>
     <integer>0</integer>
     <key>openTypeOS2UnicodeRanges</key>
@@ -75,9 +75,9 @@
     <key>openTypeOS2VendorID</key>
     <string>ADBO</string>
     <key>openTypeOS2WinAscent</key>
-    <integer>289</integer>
+    <integer>1036</integer>
     <key>openTypeOS2WinDescent</key>
-    <integer>93</integer>
+    <integer>335</integer>
     <key>postscriptBlueFuzz</key>
     <integer>0</integer>
     <key>postscriptBlueScale</key>

diff --git a/tests/makeinstancesufo_data/expected_output/extralight.ufo/fontinfo.plist b/tests/makeinstancesufo_data/expected_output/extralight.ufo/fontinfo.plist
@@ -14,6 +14,12 @@
 		<string>Source Serif Pro</string>
 		<key>italicAngle</key>
 		<integer>0</integer>
+		<key>openTypeHheaAscender</key>
+		<integer>1036</integer>
+		<key>openTypeHheaDescender</key>
+		<integer>-335</integer>
+		<key>openTypeHheaLineGap</key>
+		<integer>0</integer>
 		<key>openTypeNameDesigner</key>
 		<string>Frank Grießhammer</string>
 		<key>openTypeNameLicense</key>
@@ -48,6 +54,12 @@
 			<integer>2</integer>
 			<integer>4</integer>
 		</array>
+		<key>openTypeOS2TypoAscender</key>
+		<integer>730</integer>
+		<key>openTypeOS2TypoDescender</key>
+		<integer>-270</integer>
+		<key>openTypeOS2TypoLineGap</key>
+		<integer>0</integer>
 		<key>openTypeOS2UnicodeRanges</key>
 		<array>
 			<integer>0</integer>
@@ -62,6 +74,10 @@
 		</array>
 		<key>openTypeOS2VendorID</key>
 		<string>ADBO</string>
+		<key>openTypeOS2WinAscent</key>
+		<integer>1036</integer>
+		<key>openTypeOS2WinDescent</key>
+		<integer>335</integer>
 		<key>postscriptBlueFuzz</key>
 		<integer>0</integer>
 		<key>postscriptBlueScale</key>

diff --git a/tests/makeinstancesufo_data/expected_output/extralight.ufo/kerning.plist b/tests/makeinstancesufo_data/expected_output/extralight.ufo/kerning.plist
@@ -21,6 +21,8 @@
 			<integer>-70</integer>
 			<key>@MMK_R_LAT_y</key>
 			<integer>-70</integer>
+			<key>atilde</key>
+			<integer>-70</integer>
 		</dict>
 		<key>@MMK_L_LAT_a</key>
 		<dict>

diff --git a/tests/makeinstancesufo_data/expected_output/light.ufo/fontinfo.plist b/tests/makeinstancesufo_data/expected_output/light.ufo/fontinfo.plist
@@ -15,9 +15,9 @@
 		<key>italicAngle</key>
 		<integer>0</integer>
 		<key>openTypeHheaAscender</key>
-		<integer>422</integer>
+		<integer>1036</integer>
 		<key>openTypeHheaDescender</key>
-		<integer>-137</integer>
+		<integer>-335</integer>
 		<key>openTypeHheaLineGap</key>
 		<integer>0</integer>
 		<key>openTypeNameDesigner</key>
@@ -55,9 +55,9 @@
 			<integer>4</integer>
 		</array>
 		<key>openTypeOS2TypoAscender</key>
-		<integer>298</integer>
+		<integer>730</integer>
 		<key>openTypeOS2TypoDescender</key>
-		<integer>-110</integer>
+		<integer>-270</integer>
 		<key>openTypeOS2TypoLineGap</key>
 		<integer>0</integer>
 		<key>openTypeOS2UnicodeRanges</key>
@@ -75,9 +75,9 @@
 		<key>openTypeOS2VendorID</key>
 		<string>ADBO</string>
 		<key>openTypeOS2WinAscent</key>
-		<integer>422</integer>
+		<integer>1036</integer>
 		<key>openTypeOS2WinDescent</key>
-		<integer>137</integer>
+		<integer>335</integer>
 		<key>postscriptBlueFuzz</key>
 		<integer>0</integer>
 		<key>postscriptBlueScale</key>

diff --git a/tests/makeinstancesufo_data/expected_output/regular.ufo/data/com.adobe.type.processedHashMap b/tests/makeinstancesufo_data/expected_output/regular.ufo/data/com.adobe.type.processedHashMap
@@ -1,12 +1,12 @@
 {
-'A': ['4944cad22da408217295cbd203c40ece91a2856e9969b46fb2c862fd9aade8bc18e55af29aea01e1354cdd757107784ddd361626b0cf4801c5beec0565a3076f', ['checkOutlines', 'autohint']],
-'Aacute': ['548fc097df064be212dd499b20511a2657aaf7f48ac39a52b3e9de17f0e8edd0b9a5d1074e556da3ee3a518bf0e9805cc060d34fa89e2ce8a6d814448cf9efbb', ['checkOutlines', 'autohint']],
-'Adieresis': ['9c8849906fd3dbd98998ae380bccda84e3e19183acfeffe51fc60c1d3dcd84dd120658ffbf615b12d8ec470c81843d9fafca7512dbf4a529f7b2380e59c771d3', ['checkOutlines', 'autohint']],
-'Atilde': ['60c8abeed875f5f674771d4e73441c85699e207ee58ed74b5ffc212e1b996db706aeb4046846b93fa39aa20844ba68ef654a28005c9a947457f35759baee47e8', ['checkOutlines', 'autohint']],
-'Y': ['b4cc65773449797505de78a6776bbb2aa83347d2df6b0cf382d9b415c489296cfa2009377338f073bb3aae89fb586183ca1dbc0a62851c3cad587e6f933e30d1', ['checkOutlines', 'autohint']],
-'Yacute': ['4b25276d21339b200c20d5830ff7e3ef755e2295bf46a2a79ef276cf2ceb097cbc1cb412685cd16c9d604e453163d123861e2527bf85850fa0bc5fd9bd6a2257', ['checkOutlines', 'autohint']],
-'Ydieresis': ['77487baa3159a82a4ba4f9c46a2bdcfe3c82e790078717d0338f83e2df6feda338807d23d1dac7ef8380461b11cf8e40f1cc4d8694f8af171b1b86ba57e7c662', ['checkOutlines', 'autohint']],
-'Ytilde': ['f4f2fffc7659167846b5dacba5b0af7bf478db14a82cec056042219112699ee659cd7e5f5846cc4d667acb6b609894d7ea1b267197f8ac33ab4687985e98c713', ['checkOutlines', 'autohint']],
+'A': ['ab31685b70ff42aa22a7faff9e2e5e42c467e26f269a2dc01aa99f51f0baee41d952e8d83338dd33710c5152a03ecfe920ca578aa7bd98beeaef8664659ecffe', ['checkOutlines', 'autohint']],
+'Aacute': ['c84f6755b2beaa2155cb76946e94b3ed20bdbee8f51a1efa744833002e3b566506337a32ee86fc3bacef3f142c5cb0ee4924dbcbdcf9e219edb1866d9470565f', ['checkOutlines', 'autohint']],
+'Adieresis': ['3345f84a3f6065988c0da25f4879b4a14fadb4afafeadf856928e0487f0f870e8e91b6db5a4e430278193922693c1384c4159bd3c8857e22928aabe8f2d0f982', ['checkOutlines', 'autohint']],
+'Atilde': ['e9cd309a5122bde6186e897069fc6bed48be50c1975b73f3520e532f141b89bc5c8303af3c0a029412cf014341b575fc45e4efbda1664409bf77a776472e256f', ['checkOutlines', 'autohint']],
+'Y': ['ada6076dc896c63bcf8eba2cd11e8bf87a5d21fa97880e83d25e82a0d32a98dde495e9859244565842fc964d4d98f33093dd07faa16d92539724c760a006bcc8', ['checkOutlines', 'autohint']],
+'Yacute': ['9f1bfebb7771a4b2cec140e3454db79e7e87a90cb7116096694ba99ce662f8c6ac5c0c1101daf3412724b35f22c9a27dbef64785b1388b56a1d1392468079c3c', ['checkOutlines', 'autohint']],
+'Ydieresis': ['465f84940034f4042c3578fa5e3437a5fc7eaf548cb83091350e9872934e4551a1bfadc43530081ad35a6abce081fb1c4b798edb5c22673c4977f3d85138dc37', ['checkOutlines', 'autohint']],
+'Ytilde': ['ab2d02346e154a72aed387e22350a3d56fac51561d0504db41bf77395f9e73baeaf17df68484621734521be8cd16cd4e75dcdb7d235660d70e315c1d7550e3a5', ['checkOutlines', 'autohint']],
 'a': ['e03e2caf996c517981eeffe3c0f56a87f7dc494446ab14cd08505eccebc44ade7b6b2a7e2bc5e479a1e8d163088c8a7256fd9b7a6023fdc30606f903d5a3d087', ['checkOutlines', 'autohint']],
 'aacute': ['a65637a3a8a00811c3234f50053425ca5f640131546ab1844b5cde4c300ddd6eb657e59ed56907aec15fdae6af34e1eec0801848966b4b10b9e1ab900abf3811', ['checkOutlines', 'autohint']],
 'acutecmb': ['9679a08d8441bfcc2926fdce8721b3e27e2f81b780f2eedb0d05292ca49d54b25d984efdc3dd6ec2827bf4ce0325d56fdb831a27ea5f402f806ea79bf33f3eb1', ['checkOutlines', 'autohint']],

diff --git a/tests/makeinstancesufo_data/expected_output/regular.ufo/fontinfo.plist b/tests/makeinstancesufo_data/expected_output/regular.ufo/fontinfo.plist
@@ -3,21 +3,21 @@
 <plist version="1.0">
 	<dict>
 		<key>ascender</key>
-		<integer>729</integer>
+		<real>729.2183544304</real>
 		<key>capHeight</key>
-		<integer>669</integer>
+		<real>669.2594936709</real>
 		<key>copyright</key>
 		<string>Copyright 2014 - 2017 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.</string>
 		<key>descender</key>
-		<integer>-239</integer>
+		<real>-239.2594936709</real>
 		<key>familyName</key>
 		<string>Source Serif Pro</string>
 		<key>italicAngle</key>
 		<integer>0</integer>
 		<key>openTypeHheaAscender</key>
-		<integer>993</integer>
+		<integer>1036</integer>
 		<key>openTypeHheaDescender</key>
-		<integer>-321</integer>
+		<integer>-335</integer>
 		<key>openTypeHheaLineGap</key>
 		<integer>0</integer>
 		<key>openTypeNameDesigner</key>
@@ -55,9 +55,9 @@
 			<integer>4</integer>
 		</array>
 		<key>openTypeOS2TypoAscender</key>
-		<integer>700</integer>
+		<integer>730</integer>
 		<key>openTypeOS2TypoDescender</key>
-		<integer>-259</integer>
+		<integer>-270</integer>
 		<key>openTypeOS2TypoLineGap</key>
 		<integer>0</integer>
 		<key>openTypeOS2UnicodeRanges</key>
@@ -75,29 +75,29 @@
 		<key>openTypeOS2VendorID</key>
 		<string>ADBO</string>
 		<key>openTypeOS2WinAscent</key>
-		<integer>993</integer>
+		<integer>1036</integer>
 		<key>openTypeOS2WinDescent</key>
-		<integer>321</integer>
+		<integer>335</integer>
 		<key>postscriptBlueFuzz</key>
 		<integer>0</integer>
 		<key>postscriptBlueScale</key>
 		<real>0.0375</real>
 		<key>postscriptBlueValues</key>
 		<array>
-			<real>-15.21</real>
+			<real>-15.2056962025</real>
 			<integer>0</integer>
-			<real>474.53</real>
-			<real>487.66</real>
-			<real>526.51</real>
-			<real>539.63</real>
-			<real>549.42</real>
-			<real>562.55</real>
-			<real>646.05</real>
-			<real>659.18</real>
-			<real>669.26</real>
-			<real>684.47</real>
-			<real>729.22</real>
-			<real>749.22</real>
+			<real>474.5348101266</real>
+			<real>487.6582278481</real>
+			<real>526.5063291139</real>
+			<real>539.6297468354</real>
+			<real>549.4240506329</real>
+			<real>562.5474683544</real>
+			<real>646.0537974684</real>
+			<real>659.1772151899</real>
+			<real>669.2594936709</real>
+			<real>684.4651898734</real>
+			<real>729.2183544304</real>
+			<real>749.2183544304</real>
 		</array>
 		<key>postscriptFamilyBlues</key>
 		<array>
@@ -125,18 +125,18 @@
 		<string>SourceSerifPro-Regular</string>
 		<key>postscriptOtherBlues</key>
 		<array>
-			<real>-249.26</real>
-			<real>-239.26</real>
+			<real>-249.2594936709</real>
+			<real>-239.2594936709</real>
 		</array>
 		<key>postscriptStemSnapH</key>
 		<array>
-			<real>55.78</real>
-			<real>40.82</real>
+			<real>55.7816455696</real>
+			<real>40.8227848101</real>
 		</array>
 		<key>postscriptStemSnapV</key>
 		<array>
-			<real>84.53</real>
-			<real>94.53</real>
+			<real>84.5253164557</real>
+			<real>94.5253164557</real>
 		</array>
 		<key>postscriptUnderlinePosition</key>
 		<integer>-75</integer>
@@ -153,6 +153,6 @@
 		<key>versionMinor</key>
 		<integer>0</integer>
 		<key>xHeight</key>
-		<integer>475</integer>
+		<real>474.5348101266</real>
 	</dict>
 </plist>
diff --git a/...stancesufo_data/expected_output/regular.ufo/glyphs.com.adobe.type.processedglyphs/A_.glif b/...stancesufo_data/expected_output/regular.ufo/glyphs.com.adobe.type.processedglyphs/A_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph format="1" name="A">
-  <advance width="664" />
+  <advance width="663.6993670886" />
   <unicode hex="0041" />
   <outline>
     <contour>
@@ -32,7 +32,7 @@
       <key>com.adobe.type.autohint.v2</key>
       <dict>
         <key>id</key>
-        <string>7780e04248642674813a2d2c471fbb3f9b21a4c2aea4421fb53e99d0dca3f6865ff730ac7f612c1ce78a83f7acd311df8412fe2e2711a6527d8fcec57eee0ff9</string>
+        <string>e9a195a987fd041efd7d6e9d3049974a1b80346fe8510faace053b96e279779880507d37a9a742c8be0f8e91ad5029419785d2af1fdc10c9009dba7363fa8523</string>
         <key>hintSetList</key>
         <array>
           <dict>