diff --git a/Lib/fontTools/cffLib/__init__.py b/Lib/fontTools/cffLib/__init__.py index c1750479f..3c5f36df2 100644 --- a/Lib/fontTools/cffLib/__init__.py +++ b/Lib/fontTools/cffLib/__init__.py @@ -207,6 +207,13 @@ class CFFFontSet(object): continue name, attrs, content = element topDict.fromXML(name, attrs, content) + + if hasattr(topDict, "VarStore") and topDict.FDArray[0].vstore is None: + fdArray = topDict.FDArray + for fontDict in fdArray: + if hasattr(fontDict, "Private"): + fontDict.Private.vstore = topDict.VarStore + elif name == "GlobalSubrs": subrCharStringClass = psCharStrings.T2CharString if not hasattr(self, "GlobalSubrs"): diff --git a/Tests/cffLib/cffLib_test.py b/Tests/cffLib/cffLib_test.py index ce73b3440..cc28e4e9b 100644 --- a/Tests/cffLib/cffLib_test.py +++ b/Tests/cffLib/cffLib_test.py @@ -47,16 +47,19 @@ class CffLibTest(DataFilesHandler): self.assertEqual(topDict.FontBBox, [0, 0, 0, 0]) def test_topDict_set_Encoding(self): - file_name = 'TestOTF.otf' - font_path = self.getpath(file_name) - temp_path = self.temp_font(font_path, file_name) - save_path = temp_path[:-4] + '2.otf' - font = TTFont(temp_path) + ttx_path = self.getpath('TestOTF.ttx') + font = TTFont(recalcBBoxes=False, recalcTimestamp=False) + font.importXML(ttx_path) + topDict = font["CFF "].cff.topDictIndex[0] encoding = [".notdef"] * 256 encoding[0x20] = "space" topDict.Encoding = encoding + + self.temp_dir() + save_path = os.path.join(self.tempdir, 'TestOTF.otf') font.save(save_path) + font2 = TTFont(save_path) topDict2 = font2["CFF "].cff.topDictIndex[0] self.assertEqual(topDict2.Encoding[32], "space") diff --git a/Tests/cffLib/data/TestOTF.otf b/Tests/cffLib/data/TestOTF.otf deleted file mode 100644 index cd0bdf67d..000000000 Binary files a/Tests/cffLib/data/TestOTF.otf and /dev/null differ diff --git a/Tests/cffLib/data/TestOTF.ttx b/Tests/cffLib/data/TestOTF.ttx new file mode 100644 index 000000000..0e0c4d70b --- /dev/null +++ b/Tests/cffLib/data/TestOTF.ttx @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright (c) 2015 by FontTools. No rights reserved. + + + Test OTF + + + Regular + + + FontTools: Test OTF: 2015 + + + Test OTF + + + Version 1.000 + + + TestOTF-Regular + + + Test OTF is not a trademark of FontTools. + + + FontTools + + + FontTools + + + https://github.com/behdad/fonttools + + + https://github.com/behdad/fonttools + + + https://github.com/behdad/fonttools/blob/master/LICENSE.txt + + + Test TTF + + + Copyright (c) 2015 by FontTools. No rights reserved. + + + Test OTF + + + Regular + + + FontTools: Test OTF: 2015 + + + Test OTF + + + Version 1.000 + + + TestOTF-Regular + + + Test OTF is not a trademark of FontTools. + + + FontTools + + + FontTools + + + https://github.com/behdad/fonttools + + + https://github.com/behdad/fonttools + + + https://github.com/behdad/fonttools/blob/master/LICENSE.txt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 131 122 -131 hlineto + return + + + + + + 500 450 hmoveto + 750 -400 -750 vlineto + 50 50 rmoveto + 650 300 -650 vlineto + endchar + + + 0 endchar + + + 250 endchar + + + 723 55 hmoveto + -107 callsubr + 241 -122 rmoveto + -107 callsubr + 241 -122 rmoveto + -107 callsubr + endchar + + + 241 55 hmoveto + -107 callsubr + endchar + + + 250 endchar + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/cffLib/data/TestSparseCFF2VF.otf b/Tests/cffLib/data/TestSparseCFF2VF.otf deleted file mode 100644 index 8390c8301..000000000 Binary files a/Tests/cffLib/data/TestSparseCFF2VF.otf and /dev/null differ diff --git a/Tests/cffLib/data/TestSparseCFF2VF.ttx b/Tests/cffLib/data/TestSparseCFF2VF.ttx new file mode 100644 index 000000000..f1ae063b3 --- /dev/null +++ b/Tests/cffLib/data/TestSparseCFF2VF.ttx @@ -0,0 +1,1980 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Weight + + + Kanji-w0.00 + + + SHSansJPVFTest-Kanji-w0.00 + + + Kanji-w239.00 + + + SHSansJPVFTest-Kanji-w239.00 + + + Kanji-w240.00 + + + SHSansJPVFTest-Kanji-w240.00 + + + Kanji-w439.00 + + + SHSansJPVFTest-Kanji-w439.00 + + + Kanji-w440.00 + + + SHSansJPVFTest-Kanji-w440.00 + + + Kanji-w499.00 + + + SHSansJPVFTest-Kanji-w499.00 + + + Kanji-w500.00 + + + SHSansJPVFTest-Kanji-w500.00 + + + Kanji-w599.00 + + + SHSansJPVFTest-Kanji-w599.00 + + + Kanji-w600.00 + + + SHSansJPVFTest-Kanji-w600.00 + + + Kanji-w669.00 + + + SHSansJPVFTest-Kanji-w669.00 + + + Kanji-w670.00 + + + SHSansJPVFTest-Kanji-w670.00 + + + Kanji-w699.00 + + + SHSansJPVFTest-Kanji-w699.00 + + + Kanji-w700.00 + + + SHSansJPVFTest-Kanji-w700.00 + + + Kanji-799.00 + + + SHSansJPVFTest-Kanji-799.00 + + + Kanji-w800.00 + + + SHSansJPVFTest-Kanji-w800.00 + + + Kanji-w889.00 + + + SHSansJPVFTest-Kanji-w889.00 + + + Kanji-w890.00 + + + SHSansJPVFTest-Kanji-w890.00 + + + Kanji-w1000.00 + + + SHSansJPVFTest-Kanji-w1000.00 + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w0.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w0.00 + + + SHSansJPVF w0.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w0.00 + + + Weight + + + Kanji-w0.00 + + + SHSansJPVFTest-Kanji-w0.00 + + + Kanji-w239.00 + + + SHSansJPVFTest-Kanji-w239.00 + + + Kanji-w240.00 + + + SHSansJPVFTest-Kanji-w240.00 + + + Kanji-w439.00 + + + SHSansJPVFTest-Kanji-w439.00 + + + Kanji-w440.00 + + + SHSansJPVFTest-Kanji-w440.00 + + + Kanji-w499.00 + + + SHSansJPVFTest-Kanji-w499.00 + + + Kanji-w500.00 + + + SHSansJPVFTest-Kanji-w500.00 + + + Kanji-w599.00 + + + SHSansJPVFTest-Kanji-w599.00 + + + Kanji-w600.00 + + + SHSansJPVFTest-Kanji-w600.00 + + + Kanji-w669.00 + + + SHSansJPVFTest-Kanji-w669.00 + + + Kanji-w670.00 + + + SHSansJPVFTest-Kanji-w670.00 + + + Kanji-w699.00 + + + SHSansJPVFTest-Kanji-w699.00 + + + Kanji-w700.00 + + + SHSansJPVFTest-Kanji-w700.00 + + + Kanji-799.00 + + + SHSansJPVFTest-Kanji-799.00 + + + Kanji-w800.00 + + + SHSansJPVFTest-Kanji-w800.00 + + + Kanji-w889.00 + + + SHSansJPVFTest-Kanji-w889.00 + + + Kanji-w890.00 + + + SHSansJPVFTest-Kanji-w890.00 + + + Kanji-w1000.00 + + + SHSansJPVFTest-Kanji-w1000.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 -120 rmoveto + 800 1000 -800 hlineto + 400 -459 rmoveto + -318 409 rlineto + 636 hlineto + -286 -450 rmoveto + 318 409 rlineto + -818 vlineto + -668 -41 rmoveto + 318 409 318 -409 rlineto + -668 859 rmoveto + 318 -409 -318 -409 rlineto + + + 134 755 107 18 2 blend + rmoveto + -48 -137 1 blend + hlineto + 8 -565 16 50 2 blend + rlineto + 32 106 1 blend + hlineto + -17 -202 -52 -67 2 blend + rmoveto + 24 14 18 22 25 -14 18 -22 -23 -14 -21 -24 -18 13 -20 22 38 25 26 38 37 -28 25 -37 -34 -30 -22 -38 -40 27 -26 39 16 blend + hvcurveto + + + + + 5 vsindex + 326 793 1 0 2 17 0 29 2 blend + rmoveto + -280 24 0 40 1 blend + vlineto + -47 16 -8 59 -31 0 -53 6 0 10 -13 0 -21 20 0 33 4 blend + vhcurveto + 13 120 4 0 6 -46 0 -76 2 blend + 0 13 4 0 7 1 blend + hhcurveto + 49 10 20 82 4 12 0 19 12 0 20 3 0 5 2 0 3 4 0 8 5 blend + hvcurveto + -10 2 -11 5 -8 6 -12 0 -21 3 0 5 -21 0 -35 6 0 11 -9 0 -14 7 0 11 6 blend + rrcurveto + -75 19 0 32 1 blend + -3 -5 -10 -29 -24 -102 1 0 1 1 0 2 7 0 12 9 0 14 42 0 70 5 blend + 0 -18 6 0 10 1 blend + hhcurveto + -38 -6 4 21 10 0 18 2 0 3 0 0 -1 4 0 7 4 blend + hvcurveto + 280 -25 0 -41 1 blend + vlineto + -41 -464 -40 -8 -74 10 20 41 2 blend + rmoveto + -30 617 30 -50 -4 -90 -5 12 5 50 4 90 3 blend + vlineto + -661 -178 11 -4 12 4 -13 -7 2 blend + rmoveto + -30 689 30 -52 -3 -92 -11 0 -18 52 3 92 3 blend + vlineto + -481 284 -27 -2 -48 -32 36 -21 2 blend + rmoveto + -306 30 306 0 -13 0 60 2 103 0 13 0 3 blend + vlineto + 218 0 -61 0 -102 -1 0 -1 2 blend + rmoveto + -306 30 306 0 -13 0 61 1 104 0 13 0 3 blend + vlineto + -417 358 -17 -1 -30 19 -43 -12 2 blend + rmoveto + -30 217 -116 -217 -30 247 176 -36 0 -61 -52 0 -87 50 0 84 52 0 87 -37 0 -62 -6 0 -10 23 0 39 7 blend + vlineto + 75 -26 0 -44 1 blend + hmoveto + -280 24 0 40 1 blend + vlineto + -47 17 -8 60 -31 0 -53 5 0 9 -13 0 -21 20 0 33 4 blend + vhcurveto + 12 125 5 0 8 -47 0 -78 2 blend + 0 14 4 0 7 1 blend + hhcurveto + 49 11 20 82 3 12 0 20 12 0 19 3 1 6 2 1 6 5 0 9 5 blend + hvcurveto + -9 2 -12 4 -8 7 -14 1 -22 3 0 5 -19 -1 -34 7 0 12 -9 0 -14 6 0 10 6 blend + rrcurveto + -75 19 -1 29 1 blend + -3 -5 -10 -30 -25 -105 1 -1 1 8 0 13 8 0 14 42 0 70 4 blend + 0 -18 6 0 9 1 blend + hhcurveto + -40 -6 4 21 11 0 19 2 0 3 0 0 -1 4 1 8 4 blend + hvcurveto + 280 -25 -1 -42 1 blend + vlineto + -16 -29 0 -48 1 blend + hmoveto + -30 217 -116 -217 -30 247 176 -36 0 -61 -50 0 -84 50 0 84 50 0 84 -37 0 -62 -3 0 -5 23 0 39 7 blend + vlineto + -424 -714 -19 0 -32 -12 0 -21 2 blend + rmoveto + -52 -54 -91 -49 -81 -33 8 -5 11 -13 4 -6 80 36 94 56 56 58 7 0 11 9 0 15 5 0 9 11 0 18 -2 0 -3 9 0 15 13 0 22 -11 0 -18 24 0 39 -22 0 -36 11 0 19 -12 0 -21 4 0 7 -4 0 -6 2 0 2 -2 0 -4 -1 0 -1 3 0 5 18 blend + rrcurveto + 200 -7 -92 0 -154 -5 0 -8 2 blend + rmoveto + 76 -41 90 -62 46 -42 -6 0 -10 5 0 8 -5 0 -7 6 0 10 -4 0 -7 4 0 7 6 blend + rrcurveto + 22 23 -46 42 -91 60 -75 39 60 0 100 29 0 48 0 0 -1 -3 0 -5 3 0 5 -7 0 -11 6 0 11 -7 0 -11 8 blend + rlinecurve + -499 750 -48 0 -81 6 0 10 2 blend + rmoveto + -54 -167 -87 -164 -96 -108 7 -6 11 -12 4 -6 98 116 88 165 58 175 7 0 13 15 0 25 10 0 16 14 0 22 11 0 19 10 0 17 9 0 15 -20 0 -33 15 0 24 -44 0 -73 4 0 7 -18 0 -30 4 0 6 4 0 6 3 0 6 19 0 32 0 0 -1 1 0 1 18 blend + rrcurveto + -113 -214 -60 0 -100 -23 0 -37 2 blend + rmoveto + -691 30 718 20 0 33 64 0 108 43 0 72 3 blend + vlineto + -1 -1 0 -3 1 blend + 2 rlineto + + + 1 vsindex + 306 142 -19 1 -27 7 0 10 2 blend + rmoveto + -156 45 -2 64 1 blend + vlineto + -50 22 -8 79 -42 2 -59 8 -1 11 -18 0 -27 43 -1 62 4 blend + vhcurveto + 17 186 8 -1 11 -68 3 -97 2 blend + 0 18 8 0 12 1 blend + hhcurveto + 70 13 25 114 5 22 -1 31 17 -1 24 2 1 4 0 -1 -1 7 0 10 5 blend + hvcurveto + -9 3 -12 4 -9 6 -20 1 -28 3 0 4 -31 1 -45 10 0 15 -13 0 -19 9 -1 13 6 blend + rrcurveto + -109 -4 -7 -13 -49 -38 -156 33 -1 47 -1 0 -1 1 0 1 2 0 3 10 0 15 9 0 13 60 -3 85 7 blend + 0 -27 5 0 8 1 blend + hhcurveto + -59 -10 5 22 11 0 16 2 -1 2 -1 0 -2 4 0 6 4 blend + hvcurveto + 157 -47 2 -67 1 blend + vlineto + 63 34 -74 3 -106 -25 1 -36 2 blend + rmoveto + 65 -30 74 -47 37 -37 -7 1 -10 5 -1 7 -3 0 -4 5 0 7 -3 0 -4 6 0 9 6 blend + rrcurveto + 20 22 -37 36 -75 47 -65 28 48 -2 68 47 -2 67 -1 0 -1 -6 1 -8 2 0 3 -8 0 -11 8 -1 11 -6 0 -9 8 blend + rlinecurve + 320 -64 -49 3 -69 -32 1 -46 2 blend + rmoveto + 76 -49 83 -75 38 -12 0 -18 -6 1 -8 -13 0 -19 -4 0 -6 -9 1 -12 5 blend + -54 rrcurveto + 23 19 -38 54 -84 73 -76 49 69 -3 98 35 -2 50 5 0 8 2 0 3 11 0 16 2 0 2 13 -1 18 2 0 4 8 blend + rlinecurve + -557 -5 -85 4 -121 -6 0 -9 2 blend + rmoveto + -28 -68 -50 -72 -77 -40 5 -1 6 1 0 1 3 1 5 6 0 9 13 -1 18 1 0 1 6 blend + rrcurveto + 24 -17 79 42 47 74 31 71 62 -3 89 -42 2 -60 -7 1 -10 5 -1 7 -6 0 -8 1 0 1 -2 -1 -4 4 1 7 8 blend + rlinecurve + -117 625 -26 2 -36 42 -3 59 2 blend + rmoveto + -30 775 30 -57 3 -81 -3 0 -5 57 -3 81 3 blend + vlineto + -818 -176 -1 0 -2 12 0 18 2 blend + rmoveto + -30 869 30 -56 2 -81 3 0 5 56 -2 81 3 blend + vlineto + -455 258 -40 2 -57 -38 2 -54 2 blend + rmoveto + -99 30 99 -18 0 -27 81 -3 116 18 0 27 3 blend + vlineto + -236 -127 -60 2 -86 -18 0 -27 2 blend + rmoveto + 26 -40 25 -53 9 -36 -12 1 -17 10 0 15 -10 -1 -15 13 0 19 -4 0 -6 11 -1 15 6 blend + rrcurveto + 29 12 -10 35 -25 53 -27 39 76 -3 109 12 0 18 3 1 5 -10 0 -15 10 -1 14 -15 1 -21 11 0 16 -11 0 -16 8 blend + rlinecurve + 393 2 -112 4 -161 -1 0 -2 2 blend + rmoveto + -16 -38 -31 -57 -23 -35 7 0 11 12 -1 17 13 -1 18 19 0 28 10 0 14 8 -1 11 6 blend + rrcurveto + 27 -12 24 36 26 48 23 46 70 -2 101 -10 1 -14 -8 0 -12 -13 1 -18 -6 -1 -9 -17 0 -25 -1 1 -1 -10 1 -14 8 blend + rlinecurve + -504 -378 27 -1 39 -8 0 -12 2 blend + rmoveto + 559 -94 -559 -110 5 -157 44 -2 63 110 -5 157 3 blend + hlineto + 216 -52 2 -74 1 blend + vmoveto + 559 -92 -559 -110 5 -157 43 -1 62 110 -5 157 3 blend + hlineto + -30 122 -75 3 -107 -4 0 -6 2 blend + rmoveto + -276 619 276 -26 0 -38 45 -2 64 26 0 38 3 blend + vlineto + + + 5 vsindex + 51 612 -8 0 -14 29 0 49 2 blend + rmoveto + -30 -60 0 -100 1 blend + 307 30 60 0 100 1 blend + vlineto + -149 228 -32 0 -53 -20 0 -34 2 blend + rmoveto + -918 30 918 -19 0 -32 62 0 103 19 0 32 3 blend + vlineto + -36 -238 -55 0 -91 -32 0 -53 2 blend + rmoveto + -31 -160 -74 -193 -68 -95 7 -5 10 -11 6 -8 70 101 74 203 33 160 6 0 10 25 0 42 13 0 21 23 0 37 4 0 7 1 0 2 8 0 14 -18 0 -30 13 0 21 -27 0 -44 4 0 7 -19 0 -32 1 0 2 6 0 10 -12 0 -20 -2 0 -3 -2 0 -4 -1 0 -2 18 blend + rrcurveto + 4 -143 19 0 32 77 0 128 2 blend + rmoveto + -21 -16 25 -26 72 -92 21 -33 -23 0 -38 -34 0 -57 1 0 2 -15 0 -24 -12 0 -21 -6 0 -11 2 0 3 -18 0 -29 8 blend + rlinecurve + 24 24 -18 25 -81 96 -22 22 28 0 48 63 0 105 2 0 2 -1 0 -2 1 0 3 10 0 16 1 0 1 1 0 2 8 blend + rlinecurve + 157 278 1 0 1 -14 0 -23 2 blend + rmoveto + -30 559 30 -54 0 -90 -17 3 -23 54 0 90 3 blend + vlineto + -457 -518 29 -3 43 -9 -3 -20 2 blend + rmoveto + -30 176 30 -46 0 -77 -17 0 -27 46 0 77 3 blend + vlineto + -194 120 -3 0 -5 -42 37 -35 2 blend + rmoveto + -365 30 365 38 -29 45 53 0 88 -38 29 -45 3 blend + vlineto + 135 508 -87 0 -146 33 -34 24 2 blend + rmoveto + -122 30 122 -19 0 -31 63 0 106 19 0 31 3 blend + vlineto + -115 -172 -60 0 -100 -27 34 -19 2 blend + rmoveto + -288 30 288 11 -24 18 50 0 83 -11 24 -18 3 blend + vlineto + 148 -62 -2 -106 1 blend + hmoveto + -288 30 288 11 -24 18 50 0 83 -11 24 -18 3 blend + vlineto + 156 -394 -30 2 -47 19 -34 6 2 blend + rmoveto + -52 -36 -89 -48 -61 -29 7 0 12 2 0 4 14 0 23 3 0 4 11 0 18 4 0 8 6 blend + rrcurveto + 15 -21 62 28 86 41 57 44 25 0 42 -39 0 -66 -10 0 -17 -4 0 -6 -12 0 -19 -3 0 -5 -6 0 -11 -5 0 -9 8 blend + rlinecurve + -541 323 10 0 17 44 5 84 2 blend + rmoveto + -30 517 -150 -517 -30 547 210 -46 -2 -81 -74 0 -123 54 -13 80 74 0 123 -46 -2 -81 -19 0 -32 38 17 82 7 blend + vlineto + -232 -242 -10 0 -16 -28 29 -27 2 blend + rmoveto + -344 58 -32 71 1 blend + vlineto + -47 15 -9 54 -33 -2 -58 3 0 4 -15 0 -25 22 0 37 4 blend + vhcurveto + 12 100 3 0 5 -47 0 -78 2 blend + 0 12 4 0 6 1 blend + hhcurveto + 48 10 25 102 3 12 0 20 11 0 19 4 1 9 11 -1 16 5 0 8 5 blend + hvcurveto + -9 3 -11 4 -8 6 -14 0 -23 3 -1 5 -23 1 -37 8 1 15 -8 -1 -15 8 0 12 6 blend + rrcurveto + -97 11 1 20 1 blend + -3 -4 -14 -29 -21 -84 0 0 1 1 -1 1 10 0 16 10 1 17 43 -1 71 5 blend + 0 -16 7 0 12 1 blend + hhcurveto + -33 -6 5 22 13 0 22 3 0 5 -1 0 -2 4 0 7 4 blend + hvcurveto + 344 -59 34 -71 1 blend + vlineto + -346 -371 -24 0 -41 65 -34 78 2 blend + rmoveto + 10 -31 77 16 100 22 99 21 3 0 5 -54 0 -90 -2 0 -3 -3 0 -5 -9 0 -15 -6 0 -10 -10 0 -17 -5 0 -8 8 blend + rlinecurve + -2 29 -108 -22 -104 -22 -72 -13 -3 0 -5 52 0 86 9 0 16 6 0 10 8 0 13 6 0 11 4 0 6 4 0 6 8 blend + rlinecurve + -16 767 -44 0 -72 -13 0 -21 2 blend + rmoveto + -316 -6 0 -11 1 blend + vlineto + -142 -7 -194 -74 -141 2 0 2 -2 0 -2 2 0 4 6 0 9 4 blend + vhcurveto + 8 -3 13 -7 5 -6 13 0 21 -7 0 -11 25 0 43 -20 0 -34 11 0 17 -10 0 -17 6 blend + rrcurveto + 75 143 10 205 145 4 0 7 3 0 5 2 0 4 21 0 35 9 0 15 5 blend + vvcurveto + 316 6 0 11 1 blend + vlineto + + + 3 vsindex + 58 743 -1 0 -2 26 0 60 2 blend + rmoveto + -30 887 30 -43 0 -99 2 0 5 43 0 99 3 blend + vlineto + -630 96 -29 0 -66 -19 0 -44 2 blend + rmoveto + -207 30 207 -2 -2 -9 50 0 114 2 2 9 3 blend + vlineto + 305 -44 0 -100 1 blend + hmoveto + -207 30 207 -2 -2 -9 51 0 115 2 2 9 3 blend + vlineto + -521 -240 -36 0 -82 2 0 4 2 blend + rmoveto + -206 -5 0 -10 1 blend + vlineto + -137 -15 -184 -109 -136 5 0 11 3 0 6 5 0 10 -1 0 -1 8 0 19 5 blend + vhcurveto + 7 -3 12 -9 5 -6 12 0 27 -6 0 -13 22 0 51 -15 0 -35 10 0 21 -8 0 -19 6 blend + rrcurveto + 112 139 18 194 141 3 0 7 -4 0 -8 1 0 3 11 0 24 4 0 10 5 blend + vvcurveto + 207 5 0 11 1 blend + vlineto + -19 -18 0 -42 1 blend + hmoveto + -30 670 -153 -670 -30 700 213 -38 0 -87 -64 0 -144 48 0 111 64 0 144 -38 0 -87 -14 0 -30 28 0 63 7 blend + vlineto + -531 -249 -15 0 -36 -23 0 -51 2 blend + rmoveto + -343 50 0 112 1 blend + vlineto + -66 31 -12 105 -29 0 -66 6 0 14 -13 0 -28 29 0 66 4 blend + vhcurveto + 23 278 5 0 12 -59 0 -134 2 blend + 0 24 6 0 14 1 blend + hhcurveto + 96 15 31 123 8 20 0 44 11 0 26 4 0 8 14 0 32 5 0 11 5 blend + hvcurveto + -9 3 -13 4 -9 7 -13 0 -30 2 0 5 -21 0 -48 8 0 17 -10 -1 -23 6 0 15 6 blend + rrcurveto + -117 -6 -11 -21 -69 -56 -236 8 0 18 -1 1 -1 1 -1 1 3 0 7 3 1 9 7 0 15 49 0 112 7 blend + 0 -41 4 0 8 1 blend + hhcurveto + -84 -16 11 37 4 0 10 2 0 5 -3 0 -7 1 0 2 4 blend + hvcurveto + 343 -51 0 -115 1 blend + vlineto + 444 -47 -59 0 -135 26 0 59 2 blend + rmoveto + -101 -52 -195 -56 -169 -40 4 -7 5 -10 3 -7 172 40 193 54 120 56 4 0 8 3 0 7 18 0 43 9 0 19 12 0 26 8 0 19 5 0 12 -10 0 -22 7 0 15 -18 0 -41 1 0 3 -11 0 -25 -8 0 -19 -9 0 -21 -8 0 -18 -8 0 -19 5 0 11 0 0 1 18 blend + rrcurveto + + + 2 vsindex + 53 761 -3 0 -3 36 0 40 2 blend + rmoveto + -30 896 30 -65 -1 -73 5 0 5 65 1 73 3 blend + vlineto + -631 78 -46 0 -52 -22 0 -24 2 blend + rmoveto + -162 30 162 -8 -32 -41 98 1 111 8 32 41 3 blend + vlineto + 296 -105 -1 -118 1 blend + hmoveto + -162 30 162 -8 -32 -41 100 1 112 8 32 41 3 blend + vlineto + -47 -217 -23 0 -26 -57 -1 -64 2 blend + rmoveto + 209 -109 -209 -101 -1 -113 72 1 81 101 1 113 3 blend + hlineto + -235 109 24 0 27 -72 -1 -81 2 blend + rmoveto + 205 -109 -205 -99 -1 -111 72 1 81 99 1 111 3 blend + hlineto + -227 109 18 1 21 -72 -1 -81 2 blend + rmoveto + 197 -109 -197 -93 -2 -105 72 1 81 93 2 105 3 blend + hlineto + -30 139 -87 -2 -98 -15 0 -17 2 blend + rmoveto + -169 731 169 -41 0 -46 38 0 42 41 0 46 3 blend + vlineto + -650 -375 62 1 70 -32 0 -36 2 blend + rmoveto + 571 -76 -571 -159 -1 -179 48 0 54 159 1 179 3 blend + hlineto + -30 -38 0 -43 1 blend + vmoveto + 571 -77 -571 -159 -1 -179 48 0 54 159 1 179 3 blend + hlineto + 287 -66 -1 -74 1 blend + vmoveto + 571 -74 -571 -159 -1 -179 46 0 52 159 1 179 3 blend + hlineto + -30 104 -99 -1 -111 -4 0 -5 2 blend + rmoveto + -347 631 347 -18 0 -20 45 0 50 18 0 20 3 blend + vlineto + -216 -389 -86 -1 -96 -31 0 -35 2 blend + rmoveto + 127 -34 121 -39 72 -31 -17 0 -19 2 0 2 -13 0 -15 -2 0 -2 -13 0 -15 3 0 3 6 blend + rrcurveto + 31 22 -78 32 -126 39 -121 136 1 153 39 0 44 1 0 1 -3 0 -3 -8 0 -9 4 0 5 9 0 10 7 blend + 31 rlinecurve + -258 -1 -67 -1 -75 0 0 -1 2 blend + rmoveto + -81 -39 -128 -36 -107 -23 8 -6 12 -12 5 -6 103 25 130 41 86 43 9 0 10 6 0 7 3 0 4 7 0 8 -4 0 -5 7 0 8 19 0 22 -14 0 -16 32 0 36 -32 0 -36 17 0 19 -19 0 -21 3 0 3 -1 0 -1 5 0 6 2 0 2 1 0 1 4 0 5 18 blend + rrcurveto + + + 2 vsindex + 53 761 -3 0 -3 31 0 35 2 blend + rmoveto + -30 896 30 -76 -1 -86 5 0 5 76 1 86 3 blend + vlineto + -802 -461 2 0 2 -23 0 -26 2 blend + rmoveto + -30 703 30 -53 0 -60 3 0 4 53 0 60 3 blend + vlineto + -532 539 -58 -1 -65 6 0 7 2 blend + rmoveto + -171 30 171 -16 -19 -36 102 1 114 16 19 36 3 blend + vlineto + 299 -100 -1 -112 1 blend + hmoveto + -171 30 171 -16 -19 -36 102 1 115 16 19 36 3 blend + vlineto + -46 -219 -34 0 -39 -64 -1 -72 2 blend + rmoveto + 204 -121 -204 -110 -1 -123 83 1 93 110 1 123 3 blend + hlineto + -230 121 33 1 38 -83 -1 -93 2 blend + rmoveto + 200 -121 -200 -108 -2 -122 83 1 93 108 2 122 3 blend + hlineto + -222 121 27 -1 30 -83 -1 -93 2 blend + rmoveto + 192 -121 -192 -101 -1 -114 83 1 93 101 1 114 3 blend + hlineto + -30 151 -87 -1 -98 -29 0 -33 2 blend + rmoveto + -181 716 181 -24 0 -27 11 0 12 24 0 27 3 blend + vlineto + -788 -240 -17 0 -19 9 0 11 2 blend + rmoveto + -130 30 100 786 -100 30 130 -37 0 -42 88 1 99 -20 0 -23 -150 -1 -168 20 0 23 95 1 106 37 0 42 7 blend + vlineto + -610 -123 -56 -1 -63 -44 0 -50 2 blend + rmoveto + -50 -62 -93 -73 -118 -54 8 -4 10 -9 6 -7 121 58 92 75 59 70 9 0 11 13 0 15 19 0 21 29 0 32 9 0 10 22 0 25 12 0 14 -11 0 -12 19 0 21 -26 0 -30 7 0 8 -16 0 -18 3 0 3 -13 0 -14 -10 0 -11 -19 0 -21 -2 0 -2 8 0 8 18 blend + rrcurveto + 124 -78 -89 -1 -100 32 0 36 2 blend + rmoveto + -7 -6 0 -6 1 blend + vlineto + -65 -139 -176 -81 -162 -31 6 -6 8 -12 3 -8 168 37 178 84 72 154 16 0 17 30 0 34 36 0 41 26 0 29 -7 0 -8 12 0 13 12 0 14 -16 0 -18 15 0 16 -30 0 -33 5 0 6 -18 0 -21 26 0 29 -5 0 -5 -23 0 -26 -12 0 -14 -5 0 -5 6 0 7 18 blend + rrcurveto + -19 11 -6 -2 -47 0 -53 13 0 15 -13 0 -15 0 0 -1 4 blend + rlineto + -333 -72 75 1 85 -55 0 -61 2 blend + rmoveto + 65 -25 75 -46 38 -35 -35 0 -40 8 0 9 -38 0 -42 15 0 17 -18 0 -21 14 0 15 6 blend + rrcurveto + 26 19 -39 34 -76 45 -64 25 49 0 56 31 0 35 19 0 21 -14 0 -16 39 0 44 -18 0 -20 32 0 36 -9 0 -10 8 blend + rlinecurve + 72 55 -55 0 -62 28 0 31 2 blend + rmoveto + -30 -30 -42 0 -47 -42 0 -47 2 blend + rlineto + 269 30 -14 0 -16 42 0 47 2 blend + hlineto + 74 74 13 0 15 -22 0 -24 2 blend + rmoveto + -276 80 1 90 1 blend + vlineto + -52 21 -9 77 -48 0 -54 8 0 9 -21 0 -24 44 0 49 4 blend + vhcurveto + 16 182 8 0 9 -90 -1 -101 2 blend + 0 18 8 0 9 1 blend + hhcurveto + 62 12 21 88 4 25 0 28 20 0 22 6 0 7 10 0 11 9 0 10 5 blend + hvcurveto + -9 2 -12 5 -8 6 -24 0 -26 4 0 5 -34 0 -39 12 0 13 -16 0 -18 10 0 11 6 blend + rrcurveto + -81 25 0 28 1 blend + -4 -6 -11 -41 -37 -154 -1 0 -1 0 1 1 11 -1 12 15 1 17 79 1 89 5 blend + 0 -26 9 0 10 1 blend + hhcurveto + -56 -9 6 25 17 0 19 2 0 3 -1 -1 -2 4 0 5 4 blend + hvcurveto + 276 -81 -1 -91 1 blend + vlineto + 278 -62 -114 -1 -128 32 0 36 2 blend + rmoveto + -66 -32 -126 -33 -107 -23 5 -7 5 -10 2 -7 110 22 126 32 81 36 10 0 11 7 0 8 30 0 34 11 0 12 21 0 23 9 0 10 7 0 8 -14 0 -16 9 0 10 -27 0 -30 3 0 4 -15 0 -17 -15 0 -17 -10 0 -11 -12 0 -14 -11 0 -12 3 0 4 -3 0 -4 18 blend + rrcurveto + + + 3 vsindex + 193 296 41 0 93 -8 0 -19 2 blend + rmoveto + 625 -94 -625 -84 -1 -192 27 0 63 84 1 192 3 blend + hlineto + -30 124 -48 0 -110 -6 0 -14 2 blend + rmoveto + -154 685 154 -15 0 -34 16 0 38 15 0 34 3 blend + vlineto + -365 -132 -33 0 -76 1 1 3 2 blend + rmoveto + -232 -7 -1 -16 1 blend + vlineto + 30 -5 51 0 117 -11 0 -27 2 blend + rlineto + 237 18 1 43 1 blend + vlineto + -11 -92 -27 0 -62 1 -1 2 2 blend + rmoveto + -30 397 30 -22 0 -52 -12 0 -27 22 0 52 3 blend + vlineto + -760 647 25 0 56 -4 0 -9 2 blend + rmoveto + -30 811 30 -28 0 -65 -12 0 -27 28 0 65 3 blend + vlineto + -823 -13 0 -29 1 blend + hmoveto + -143 12 0 27 1 blend + vlineto + -83 -13 -107 -75 -82 4 0 9 3 0 6 5 1 12 -1 0 -1 5 -1 11 5 blend + vhcurveto + 7 -4 11 -9 5 -6 10 0 21 -5 0 -12 20 0 46 -17 0 -38 6 0 15 -8 0 -18 6 blend + rrcurveto + 79 5 0 11 1 blend + 85 16 118 88 1 1 3 9 0 19 6 0 15 3 blend + vvcurveto + 143 -11 0 -25 1 blend + vlineto + 199 -25 -46 -1 -106 -23 0 -54 2 blend + rmoveto + -167 30 37 0 85 1 blend + 167 vlineto + -14 -59 -18 0 -42 8 0 18 2 blend + rmoveto + -30 185 30 -12 0 -26 -4 0 -9 12 0 26 3 blend + vlineto + -365 -96 10 0 22 7 0 17 2 blend + rmoveto + -30 392 30 -17 0 -39 -4 0 -9 17 0 39 3 blend + vlineto + -218 -10 -15 0 -33 -6 0 -13 2 blend + rmoveto + -160 23 0 51 1 blend + vlineto + -8 -2 0 0 -1 1 blend + -3 -11 -1 1 0 3 0 0 1 2 blend + vhcurveto + -11 -1 -30 2 0 4 1 0 1 4 0 10 3 blend + 0 -47 13 0 30 1 blend + 1 5 -9 6 -10 2 -9 4 0 8 -6 0 -13 6 0 13 -11 0 -25 2 0 6 -8 0 -19 6 blend + rrcurveto + 50 30 -5 0 -11 1 0 2 2 blend + 0 6 17 3 0 8 5 1 12 2 blend + hvcurveto + 17 5 4 9 21 6 -1 12 4 0 9 1 0 3 4 0 8 11 0 25 5 blend + vvcurveto + 159 -21 0 -46 1 blend + vlineto + -132 -50 -39 0 -88 1 0 1 2 blend + rmoveto + -25 -42 -40 -39 -44 -30 8 -4 13 -10 5 -4 41 6 0 12 3 0 8 7 0 16 3 0 5 5 0 13 1 0 4 6 0 13 -3 0 -8 10 0 22 -6 0 -14 5 0 12 -5 0 -10 -3 0 -8 13 blend + 30 45 -7 0 -14 1 blend + 47 26 45 -3 0 -8 1 0 1 2 blend + rrcurveto + 153 -7 -13 0 -30 -1 0 -2 2 blend + rmoveto + 35 -27 38 -39 18 -28 -8 3 -11 3 -5 -3 -9 3 -14 6 -7 -3 -5 1 -9 4 -4 0 6 blend + rrcurveto + 24 18 -18 27 -39 39 -34 25 23 1 55 6 -1 12 4 -1 8 -3 4 1 9 -3 13 -6 7 2 7 -3 9 -4 5 4 8 blend + rlinecurve + 115 330 -53 -1 -124 9 1 21 2 blend + rmoveto + 14 -286 131 -209 160 0 50 1 18 34 6 108 -9 3 -11 5 -9 7 -4 -92 -9 -34 -31 -1 -137 -2 -126 185 -12 281 3 0 8 6 0 14 5 0 10 -10 0 -22 -3 0 -6 0 0 -1 14 0 33 -1 0 -1 11 0 23 -3 0 -8 5 0 12 10 0 24 -10 0 -23 3 0 7 -14 0 -32 8 0 18 -8 0 -17 8 0 17 0 0 -1 11 0 26 0 0 1 4 0 9 5 0 11 1 0 1 29 0 67 0 1 2 8 0 17 0 -1 -1 -2 0 -4 -37 0 -85 30 blend + rrcurveto + 207 -169 -37 0 -85 -4 0 -9 2 blend + rmoveto + -61 -129 -111 -108 -121 -69 7 -5 12 -11 5 -6 119 74 113 110 66 136 4 15 19 8 14 33 4 28 29 8 5 22 2 28 27 6 2 17 8 1 20 -6 0 -14 14 1 34 -13 -1 -31 6 0 15 -7 0 -17 0 -28 -23 -4 -2 -10 0 -27 -20 -1 -3 -5 -1 -16 -12 -1 -15 -19 18 blend + rrcurveto + -156 153 -20 -2 -49 -2 0 -3 2 blend + rmoveto + 52 -15 63 -26 34 -1 0 -3 -1 0 -1 0 0 1 0 0 -2 0 0 -2 5 blend + -21 rrcurveto + 15 27 -34 20 -64 24 -51 14 21 0 48 20 0 47 -1 0 -1 1 0 1 0 0 -1 0 0 1 1 0 3 -1 0 -2 8 blend + rlinecurve + -453 -763 1 0 2 12 0 27 2 blend + rmoveto + -25 -16 -31 0 -71 -7 0 -17 2 blend + rlineto + -100 89 146 -18 233 -21 0 -46 -5 0 -12 -13 0 -29 -4 0 -9 -8 0 -18 5 blend + hhcurveto + 249 23 0 53 1 blend + hlineto + 2 8 6 14 6 8 -35 0 -207 2 -1 3 11 0 25 5 1 12 17 0 38 4 0 10 8 0 18 -16 0 -37 -1 0 -3 -1 0 -2 9 blend + 0 -22 -14 0 -32 1 blend + 0 -214 0 -150 15 -78 89 24 0 55 0 0 1 18 0 40 -2 0 -5 12 0 28 -1 0 -2 6 blend + rrcurveto + 5 62 -50 0 -114 -10 0 -22 2 blend + rmoveto + -30 -97 -92 -60 -107 -36 8 -6 12 -11 4 -6 105 41 99 65 32 106 5 0 12 7 0 15 15 0 34 1 0 3 7 0 16 1 0 2 10 0 22 -6 0 -15 18 0 41 -17 0 -37 8 0 18 -8 0 -19 -2 0 -5 4 0 9 -12 0 -27 7 0 16 -1 0 -2 6 0 14 18 blend + rrcurveto + + + 1 vsindex + 55 767 2 0 3 37 -2 55 2 blend + rmoveto + -30 892 30 -44 2 -62 -6 0 -9 44 -2 62 3 blend + vlineto + -637 72 -28 1 -40 -26 2 -39 2 blend + rmoveto + -153 30 153 -27 0 -27 77 -2 111 27 0 27 3 blend + vlineto + 315 -89 3 -128 1 blend + hmoveto + -153 30 153 -27 0 -27 79 -3 113 27 0 27 3 blend + vlineto + -462 -288 8 0 12 -11 0 -16 2 blend + rmoveto + 571 -62 -571 -102 3 -147 27 -1 39 102 -3 147 3 blend + hlineto + 152 -29 1 -42 1 blend + vmoveto + 571 -60 -571 -102 3 -147 26 -1 37 102 -3 147 3 blend + hlineto + -30 -71 2 -102 1 blend + 90 rmoveto + -212 631 212 -23 1 -32 45 -2 64 23 -1 32 3 blend + vlineto + -776 -263 -22 1 -31 -4 0 -5 2 blend + rmoveto + -30 905 30 -42 2 -60 10 0 14 42 -2 60 3 blend + vlineto + -716 -160 36 -1 52 -26 2 -37 2 blend + rmoveto + -30 554 30 -13 0 -19 -59 2 -85 13 0 19 3 blend + vlineto + -554 -78 59 -2 85 5 -1 7 2 blend + rmoveto + -30 563 30 -13 1 -19 -56 1 -81 13 -1 19 3 blend + vlineto + -578 -79 2 1 4 6 0 8 2 blend + rmoveto + -30 617 30 -27 1 -39 4 -1 5 27 -1 39 3 blend + vlineto + -477 382 -24 2 -34 8 0 12 2 blend + rmoveto + -46 -92 -113 -104 -167 -65 7 -5 10 -9 5 -8 172 70 111 106 55 101 6 -1 8 -5 -1 -8 17 0 25 11 0 16 -3 -1 -5 6 0 9 12 0 18 -11 0 -16 18 0 26 -27 1 -39 6 -1 8 -16 1 -23 14 0 20 3 0 5 -6 0 -8 1 0 1 3 0 4 28 -1 41 18 blend + rrcurveto + 298 -65 -24 0 -35 3 0 4 2 blend + rmoveto + -25 -12 -55 2 -79 -15 0 -22 2 blend + rlineto + 62 -80 121 -81 100 -38 5 8 9 11 7 6 -101 33 -119 76 -59 77 2 0 3 -14 1 -20 -10 1 -14 2 0 3 20 0 29 1 0 2 9 -1 13 18 -1 25 20 -1 28 26 -1 38 14 0 21 14 -1 19 -13 0 -19 -7 0 -10 9 0 13 -18 2 -25 4 -1 5 -7 0 -10 18 blend + rrcurveto + -211 -88 -39 3 -55 -12 1 -17 2 blend + rmoveto + -239 30 239 -2 -1 -4 69 -4 98 2 1 4 3 blend + vlineto + 316 -223 -74 3 -106 11 -1 15 2 blend + rmoveto + -6 -4 0 -6 1 blend + vlineto + -8 -87 -7 -34 -10 -10 2 0 3 24 -1 35 -1 1 -1 6 0 9 1 -1 1 1 0 1 6 blend + rrcurveto + -6 -1 0 -1 1 blend + -6 -6 -1 -12 2 0 3 1 blend + hhcurveto + -11 -31 1 0 1 10 0 15 2 blend + 1 3 -34 0 -1 -1 9 0 13 2 blend + hvcurveto + 5 -8 3 -13 6 -1 8 -11 1 -16 5 0 8 -19 1 -26 4 blend + 1 -8 28 -2 30 -1 14 1 -14 1 -20 7 -1 9 1 0 1 2 0 3 2 -1 2 3 1 5 0 1 1 7 blend + 21 0 10 4 10 9 16 15 7 35 2 -1 2 8 -1 11 2 0 3 5 0 7 5 0 8 3 -1 4 3 0 4 2 1 4 3 0 4 9 blend + 9 89 -15 1 -21 1 blend + rrcurveto + 7 1 1 12 6 -1 8 1 0 1 1 -1 1 9 0 13 4 blend + 0 hhcurveto + -660 -34 -57 3 -82 -8 0 -11 2 blend + rmoveto + -17 -46 1 0 2 7 0 10 2 blend + -32 -46 -46 5 0 7 5 0 7 2 blend + -23 rrcurveto + 20 -21 52 28 31 51 17 46 56 -2 81 -24 0 -35 -4 -1 -7 0 1 1 -4 1 -5 -7 0 -10 1 -1 1 0 0 -1 8 blend + rlinecurve + 110 -3 -67 3 -96 1 0 2 2 blend + rmoveto + 13 -38 10 -49 0 -32 -3 0 -4 4 -1 5 -2 0 -3 2 1 4 -1 1 -1 3 0 4 6 blend + rrcurveto + 29 6 55 -3 78 8 -1 11 2 blend + -1 31 -10 50 -15 37 -3 0 -4 0 1 1 -4 0 -6 3 -1 4 -4 1 -5 5 blend + rlinecurve + 113 -6 -56 3 -80 -7 0 -10 2 blend + rmoveto + 22 -32 20 -44 7 -30 2 0 3 1 -1 1 3 -1 3 1 0 1 2 0 3 5 blend + rrcurveto + 28 10 -8 29 -21 44 -23 32 48 -2 69 15 0 22 -2 1 -2 -1 0 -2 0 -1 -1 -5 1 -6 -1 1 -1 -4 0 -6 8 blend + rlinecurve + 117 -5 -45 1 -65 -17 1 -24 2 blend + rmoveto + 25 -23 -1 0 -1 2 -1 2 2 blend + 27 -32 13 -23 -2 1 -2 1 0 2 2 blend + rrcurveto + 21 14 -12 44 -2 63 20 -1 28 0 0 -1 3 blend + 22 -27 32 -26 22 -2 0 -2 -2 0 -3 1 0 1 -2 1 -2 4 blend + rlinecurve + -381 267 39 -1 56 7 -1 10 2 blend + rmoveto + -16 -30 -33 1 -47 -23 1 -33 2 blend + rlineto + 498 30 -42 1 -61 23 -1 33 2 blend + hlineto + -516 -23 21 0 31 -14 0 -21 2 blend + rmoveto + -224 30 247 6 0 9 75 -4 106 10 0 14 3 blend + vlineto + + + 4 vsindex + 529 746 23 0 29 30 4 43 2 blend + rmoveto + -30 320 30 -58 0 -73 -29 0 -36 58 0 73 3 blend + vlineto + -397 -495 15 0 18 12 -4 10 2 blend + rmoveto + -30 442 30 -56 0 -71 21 0 27 56 0 71 3 blend + vlineto + -420 149 -6 0 -8 6 -4 2 2 blend + rmoveto + -30 374 30 -54 0 -68 -25 0 -31 54 0 68 3 blend + vlineto + -514 -420 34 0 42 -3 4 1 2 blend + rmoveto + -30 626 30 -66 0 -82 -29 0 -36 66 0 82 3 blend + vlineto + -531 144 15 0 19 -9 0 -11 2 blend + rmoveto + -30 460 30 -55 0 -69 -4 0 -5 55 0 69 3 blend + vlineto + -53 622 -42 0 -53 -6 4 -2 2 blend + rmoveto + -7 -9 0 -12 1 blend + vlineto + -86 -171 -222 -118 -188 -45 7 -7 8 -11 3 -8 192 51 224 119 94 187 14 0 18 37 0 46 27 0 34 19 0 24 -7 0 -9 5 0 7 15 0 18 -16 0 -20 17 0 22 -32 0 -40 9 0 11 -19 0 -24 21 0 26 3 0 3 -17 0 -21 -9 0 -11 2 0 2 -3 0 -4 18 blend + rrcurveto + -19 12 -6 -2 -55 0 -68 27 0 34 -12 0 -15 -3 0 -3 4 blend + rlineto + -323 -32 55 0 69 -25 0 -32 2 blend + rmoveto + -25 -11 -68 0 -86 -23 0 -28 2 blend + rlineto + 83 -154 177 -116 201 -44 4 8 9 12 7 6 -200 39 -177 113 -79 147 11 0 14 12 0 15 -18 0 -22 21 0 26 -1 0 -1 4 0 5 11 0 13 21 0 26 21 0 27 32 0 40 17 0 21 16 0 20 9 0 11 -10 0 -12 17 0 21 -36 0 -45 1 0 2 -37 0 -47 18 blend + rrcurveto + 59 127 -46 0 -58 9 -4 6 2 blend + rmoveto + -40 -82 -80 -104 -112 -75 8 -4 10 -9 6 -7 115 80 2 0 2 8 0 10 7 0 9 23 0 29 2 0 3 16 0 20 16 0 20 -12 0 -15 26 0 32 -30 0 -37 10 0 13 -18 0 -23 8 0 10 -4 0 -5 14 blend + 80 106 47 90 -13 0 -16 11 0 13 14 0 17 3 blend + rrcurveto + -129 -493 -106 -5 -137 21 6 34 2 blend + rmoveto + -27 -73 -43 -71 -51 -50 8 -5 13 -9 5 -5 49 52 47 77 29 77 6 0 8 11 0 14 7 0 8 8 0 10 5 0 7 8 0 10 16 0 20 -8 0 -10 28 0 35 -17 -1 -22 15 0 18 -11 0 -14 -3 0 -4 -4 0 -5 -2 0 -2 -1 0 -1 -3 0 -4 -3 1 -3 18 blend + rrcurveto + 124 -1 -66 4 -77 10 15 31 2 blend + rmoveto + -374 30 374 4 0 5 84 0 105 -4 0 -5 3 blend + vlineto + -586 460 -72 0 -90 2 -21 -24 2 blend + rmoveto + -875 30 845 209 30 -27 0 -33 77 0 96 -53 0 -66 -79 0 -99 80 0 99 5 blend + vlineto + -8 -29 0 -36 1 blend + hmoveto + -7 -29 0 -36 1 blend + vlineto + -28 -75 -43 -102 -46 -95 14 0 17 10 0 13 11 0 14 -41 0 -51 17 0 22 4 0 5 6 blend + rrcurveto + 89 -91 24 -74 -63 -32 0 -40 23 0 28 -11 0 -14 10 0 13 17 0 21 5 blend + vvcurveto + -33 -6 -35 -19 -13 3 0 4 1 0 1 15 0 18 7 0 9 4 0 5 5 blend + vhcurveto + -10 -6 -12 3 0 3 0 0 1 1 0 2 3 blend + -3 -14 -1 -20 -2 -26 1 -29 4 0 5 1 0 1 7 0 9 2 0 2 13 0 16 -1 0 -1 11 0 14 7 blend + 2 7 -9 4 -13 11 0 13 -21 0 -26 5 0 6 -33 0 -41 4 blend + 1 -8 22 -2 27 0 22 -21 0 -27 1 0 2 1 0 1 -3 0 -4 0 0 1 -4 0 -5 6 blend + 2 19 2 17 5 12 9 3 0 4 2 0 2 3 0 3 2 0 2 4 0 5 3 0 4 6 blend + rrcurveto + 25 17 10 7 0 9 5 0 7 4 0 5 3 blend + 43 44 22 0 27 1 blend + vvcurveto + 67 -22 76 -86 89 -8 0 -10 9 0 12 -6 0 -8 24 0 30 -11 0 -13 5 blend + vhcurveto + 39 84 42 98 33 81 -10 0 -13 -4 0 -5 -8 0 -10 14 0 17 -6 0 -8 7 0 9 6 blend + rrcurveto + -20 14 -6 -2 -60 0 -75 32 0 40 -12 0 -14 -2 0 -3 4 blend + rlineto + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wght + 0x0 + 200.0 + 200.0 + 900.0 + 256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/cffLib/specializer_test.py b/Tests/cffLib/specializer_test.py index 3abd12d2e..a6f930155 100644 --- a/Tests/cffLib/specializer_test.py +++ b/Tests/cffLib/specializer_test.py @@ -7,6 +7,7 @@ from fontTools.cffLib.specializer import (programToString, stringToProgram, from fontTools.ttLib import TTFont import os import unittest +from fontTools.misc.testTools import parseXML, DataFilesHandler # TODO # https://github.com/fonttools/fonttools/pull/959#commitcomment-22059841 @@ -918,14 +919,7 @@ class CFFSpecializeProgramTest(unittest.TestCase): self.assertEqual(get_specialized_charstr(test_charstr), xpct_charstr) -class CFF2VFTestSpecialize(unittest.TestCase): - - def __init__(self, methodName): - unittest.TestCase.__init__(self, methodName) - # Python 3 renamed assertRaisesRegexp to assertRaisesRegex, - # and fires deprecation warnings if a program uses the old name. - if not hasattr(self, "assertRaisesRegex"): - self.assertRaisesRegex = self.assertRaisesRegexp +class CFF2VFTestSpecialize(DataFilesHandler): @staticmethod def get_test_input(test_file_or_folder): @@ -933,13 +927,13 @@ class CFF2VFTestSpecialize(unittest.TestCase): return os.path.join(path, "data", test_file_or_folder) def test_blend_round_trip(self): - otfvf_path = self.get_test_input('TestSparseCFF2VF.otf') - ttf_font = TTFont(otfvf_path) + ttx_path = self.getpath('TestSparseCFF2VF.ttx') + ttf_font = TTFont(recalcBBoxes=False, recalcTimestamp=False) + ttf_font.importXML(ttx_path) fontGlyphList = ttf_font.getGlyphOrder() topDict = ttf_font['CFF2'].cff.topDictIndex[0] charstrings = topDict.CharStrings for glyphName in fontGlyphList: - print(glyphName) cs = charstrings[glyphName] cs.decompile() cmds = programToCommands(cs.program, getNumRegions=cs.getNumRegions) diff --git a/Tests/subset/subset_test.py b/Tests/subset/subset_test.py index a269faccb..8851aa686 100644 --- a/Tests/subset/subset_test.py +++ b/Tests/subset/subset_test.py @@ -571,8 +571,8 @@ class SubsetTest(unittest.TestCase): self.assertEqual(cs["B"].program, ["endchar"]) def test_retain_gids_cff2(self): - fontpath = self.getpath("../../varLib/data/TestCFF2VF.otf") - font = TTFont(fontpath) + ttx_path = self.getpath("../../varLib/data/master_ttx_varfont_otf/TestCFF2VF.ttx") + font, fontpath = self.compile_font(ttx_path, ".otf") self.assertEqual(font["hmtx"]["A"], (600, 31)) self.assertEqual(font["hmtx"]["T"], (600, 41)) diff --git a/Tests/varLib/data/TestCFF2VF.otf b/Tests/varLib/data/TestCFF2VF.otf deleted file mode 100644 index 590ad2717..000000000 Binary files a/Tests/varLib/data/TestCFF2VF.otf and /dev/null differ diff --git a/Tests/varLib/data/master_cff2/TestCFF2_Black.otf b/Tests/varLib/data/master_cff2/TestCFF2_Black.otf deleted file mode 100644 index b4249e107..000000000 Binary files a/Tests/varLib/data/master_cff2/TestCFF2_Black.otf and /dev/null differ diff --git a/Tests/varLib/data/master_cff2/TestCFF2_Black.ttx b/Tests/varLib/data/master_cff2/TestCFF2_Black.ttx new file mode 100644 index 000000000..7270a161b --- /dev/null +++ b/Tests/varLib/data/master_cff2/TestCFF2_Black.ttx @@ -0,0 +1,518 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCode_Black + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCode_Black + + + Roman Master 2 + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCode_Black + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCode_Black + + + Roman Master 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 24 0 rmoveto + 552 0 rlineto + 0 660 rlineto + -552 0 rlineto + 0 -660 rlineto + 212 104 rmoveto + 26 56 rlineto + 36 96 rlineto + 4 0 rlineto + 36 -96 rlineto + 26 -56 rlineto + -128 0 rlineto + -100 68 rmoveto + 0 336 rlineto + 82 -168 rlineto + -82 -168 rlineto + 162 252 rmoveto + -40 96 rlineto + -18 36 rlineto + 120 0 rlineto + -18 -36 rlineto + -40 -96 rlineto + -4 0 rlineto + 84 -84 rmoveto + 82 168 rlineto + 0 -336 rlineto + -82 168 rlineto + endchar + + + 0 0 rmoveto + 176 0 rlineto + 73 316 rlineto + 14 62 17 78 14 66 rrcurveto + 4 0 rlineto + 14 -66 19 -78 14 -62 rrcurveto + 73 -316 rlineto + 182 0 rlineto + -196 650 rlineto + -208 0 rlineto + -196 -650 rlineto + 141 138 rmoveto + 316 0 rlineto + 0 133 rlineto + -316 0 rlineto + 0 -133 rlineto + endchar + + + 214 0 rmoveto + 172 0 rlineto + 0 506 rlineto + 187 0 rlineto + 0 144 rlineto + -546 0 rlineto + 0 -144 rlineto + 187 0 rlineto + 0 -506 rlineto + endchar + + + -107 260 39 rmoveto + -65 0 -28 11 -49 24 rrcurveto + 89 -53 rlineto + -15 89 rlineto + -9 52 -22 18 -43 0 rrcurveto + -26 0 -27 -14 -14 -38 rrcurveto + 0 -90 71 -54 139 0 rrcurveto + 163 0 99 84 0 117 rrcurveto + 0 98 -58 68 -142 45 rrcurveto + -33 10 rlineto + -72 22 -24 24 0 49 rrcurveto + 0 61 47 23 67 0 rrcurveto + 42 0 27 -4 52 -24 rrcurveto + -85 47 rlineto + 10 -67 rlineto + 11 -75 37 -14 39 0 rrcurveto + 26 0 29 15 5 41 rrcurveto + -8 88 -76 48 -121 0 rrcurveto + -158 0 -85 -80 0 -115 rrcurveto + 0 -93 66 -69 121 -39 rrcurveto + 32 -11 rlineto + 80 -28 23 -19 0 -53 rrcurveto + 0 -55 -43 -39 -72 0 rrcurveto + 64 275 rmoveto + 0 417 rlineto + -71 0 rlineto + 0 -417 rlineto + 71 0 rlineto + -79 -429 rmoveto + 71 0 rlineto + 0 429 rlineto + -71 0 rlineto + 0 -429 rlineto + endchar + + + 292 34 rmoveto + 163 0 83 80 0 100 rrcurveto + 0 182 -302 -4 0 56 rrcurveto + 0 21 18 11 36 0 rrcurveto + 55 0 39 -16 52 -32 rrcurveto + 84 98 rlineto + -53 52 -69 36 -97 0 rrcurveto + -141 0 -88 -68 0 -104 rrcurveto + 0 -188 302 12 0 -68 rrcurveto + 0 -20 -19 -10 -37 0 rrcurveto + -61 0 -55 20 -72 40 rrcurveto + -74 -116 rlineto + 65 -54 101 -28 70 0 rrcurveto + -19 -150 rmoveto + 160 854 rlineto + -100 12 rlineto + -160 -854 rlineto + 100 -12 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_cff2/TestCFF2_ExtraLight.otf b/Tests/varLib/data/master_cff2/TestCFF2_ExtraLight.otf deleted file mode 100644 index 4464791a2..000000000 Binary files a/Tests/varLib/data/master_cff2/TestCFF2_ExtraLight.otf and /dev/null differ diff --git a/Tests/varLib/data/master_cff2/TestCFF2_ExtraLight.ttx b/Tests/varLib/data/master_cff2/TestCFF2_ExtraLight.ttx new file mode 100644 index 000000000..41dbb750e --- /dev/null +++ b/Tests/varLib/data/master_cff2/TestCFF2_ExtraLight.ttx @@ -0,0 +1,518 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCode_ExtraLight + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCode_ExtraLight + + + Roman Master 0 + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCode_ExtraLight + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCode_ExtraLight + + + Roman Master 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 84 0 rmoveto + 432 0 rlineto + 0 660 rlineto + -432 0 rlineto + 0 -660 rlineto + 48 32 rmoveto + 102 176 rlineto + 64 106 rlineto + 4 0 rlineto + 62 -106 rlineto + 100 -176 rlineto + -332 0 rlineto + -10 42 rmoveto + 0 536 rlineto + 154 -270 rlineto + -154 -266 rlineto + 176 292 rmoveto + -56 92 rlineto + -94 168 rlineto + 302 0 rlineto + -94 -168 rlineto + -54 -92 rlineto + -4 0 rlineto + 26 -26 rmoveto + 152 270 rlineto + 0 -536 rlineto + -152 266 rlineto + endchar + + + 50 0 rmoveto + 32 0 rlineto + 140 396 rlineto + 28 80 24 68 24 82 rrcurveto + 4 0 rlineto + 24 -82 24 -68 28 -80 rrcurveto + 138 -396 rlineto + 34 0 rlineto + -236 660 rlineto + -28 0 rlineto + -236 -660 rlineto + 102 236 rmoveto + 293 0 rlineto + 0 28 rlineto + -293 0 rlineto + 0 -28 rlineto + endchar + + + 284 0 rmoveto + 32 0 rlineto + 0 632 rlineto + 234 0 rlineto + 0 28 rlineto + -500 0 rlineto + 0 -28 rlineto + 234 0 rlineto + 0 -632 rlineto + endchar + + + -107 245 7 rmoveto + -65 0 -39 15 -46 50 rrcurveto + 36 -48 rlineto + -28 100 rlineto + -4 16 -12 4 -11 0 rrcurveto + -14 0 -8 -7 -1 -14 rrcurveto + 24 -85 61 -51 107 0 rrcurveto + 91 0 90 53 0 111 rrcurveto + 0 70 -26 66 -134 57 rrcurveto + -19 8 rlineto + -93 39 -42 49 0 68 rrcurveto + 0 91 60 48 88 0 rrcurveto + 56 0 35 -14 44 -50 rrcurveto + -38 47 rlineto + 28 -100 rlineto + 6 -15 10 -5 11 0 rrcurveto + 14 0 8 7 1 14 rrcurveto + -24 88 -67 48 -84 0 rrcurveto + -92 0 -82 -51 0 -108 rrcurveto + 0 -80 45 -53 92 -42 rrcurveto + 37 -17 rlineto + 114 -52 26 -46 0 -65 rrcurveto + 0 -92 -65 -54 -90 0 rrcurveto + 18 327 rmoveto + 0 428 rlineto + -22 0 rlineto + 0 -428 rlineto + 22 0 rlineto + -22 -449 rmoveto + 22 0 rlineto + 0 449 rlineto + -22 0 rlineto + 0 -449 rlineto + endchar + + + 311 34 rmoveto + 103 0 88 56 0 94 rrcurveto + 0 184 -338 -32 0 142 rrcurveto + 0 68 57 44 85 0 rrcurveto + 76 0 34 -24 44 -38 rrcurveto + 20 20 rlineto + -41 38 -45 32 -85 0 rrcurveto + -99 0 -78 -54 0 -88 rrcurveto + 0 -166 338 28 0 -156 rrcurveto + 0 -70 -56 -50 -103 0 rrcurveto + -85 0 -66 38 -40 34 rrcurveto + -18 -22 rlineto + 45 -38 73 -40 91 0 rrcurveto + -70 -146 rmoveto + 158 860 rlineto + -30 4 rlineto + -158 -860 rlineto + 30 -4 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_cff2/TestCFF2_Regular.otf b/Tests/varLib/data/master_cff2/TestCFF2_Regular.otf deleted file mode 100644 index c87342e41..000000000 Binary files a/Tests/varLib/data/master_cff2/TestCFF2_Regular.otf and /dev/null differ diff --git a/Tests/varLib/data/master_cff2/TestCFF2_Regular.ttx b/Tests/varLib/data/master_cff2/TestCFF2_Regular.ttx new file mode 100644 index 000000000..49d116ce4 --- /dev/null +++ b/Tests/varLib/data/master_cff2/TestCFF2_Regular.ttx @@ -0,0 +1,516 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCodeVariable-Roman + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCodeVariable-Roman + + + Roman + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCodeVariable-Roman + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCodeVariable-Roman + + + Roman + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 62 0 rmoveto + 476 0 rlineto + 0 660 rlineto + -476 0 rlineto + 0 -660 rlineto + 109 59 rmoveto + 73 131 rlineto + 54 102 rlineto + 4 0 rlineto + 52 -102 rlineto + 73 -131 rlineto + -256 0 rlineto + -44 52 rmoveto + 0 461 rlineto + 127 -232 rlineto + -127 -229 rlineto + 171 277 rmoveto + -50 93 rlineto + -66 119 rlineto + 234 0 rlineto + -65 -119 rlineto + -49 -93 rlineto + -4 0 rlineto + 48 -48 rmoveto + 126 232 rlineto + 0 -461 rlineto + -126 229 rlineto + endchar + + + 31 0 rmoveto + 86 0 rlineto + 115 366 rlineto + 23 73 21 72 21 76 rrcurveto + 4 0 rlineto + 20 -76 22 -72 23 -73 rrcurveto + 113 -366 rlineto + 90 0 rlineto + -221 656 rlineto + -96 0 rlineto + -221 -656 rlineto + 117 199 rmoveto + 301 0 rlineto + 0 68 rlineto + -301 0 rlineto + 0 -68 rlineto + endchar + + + 258 0 rmoveto + 84 0 rlineto + 0 585 rlineto + 217 0 rlineto + 0 71 rlineto + -518 0 rlineto + 0 -71 rlineto + 217 0 rlineto + 0 -585 rlineto + endchar + + + -107 248 35 rmoveto + -39 0 -45 5 -46 18 rrcurveto + 53 -36 rlineto + -17 76 rlineto + -12 53 -22 13 -24 0 rrcurveto + -22 0 -14 -11 -9 -20 rrcurveto + 4 -87 81 -59 107 0 rrcurveto + 136 0 82 76 0 107 rrcurveto + 0 82 -41 65 -135 47 rrcurveto + -38 13 rlineto + -71 23 -40 35 0 64 rrcurveto + 0 75 57 37 74 0 rrcurveto + 30 0 36 -5 42 -17 rrcurveto + -52 36 rlineto + 17 -76 rlineto + 12 -52 25 -14 22 0 rrcurveto + 19 0 17 10 8 21 rrcurveto + -6 86 -80 60 -101 0 rrcurveto + -115 0 -83 -80 0 -102 rrcurveto + 0 -100 62 -54 105 -37 rrcurveto + 37 -13 rlineto + 85 -30 36 -30 0 -63 rrcurveto + 0 -74 -53 -42 -82 0 rrcurveto + 31 287 rmoveto + 0 428 rlineto + -40 0 rlineto + 0 -428 rlineto + 40 0 rlineto + -41 -437 rmoveto + 40 0 rlineto + 0 437 rlineto + -40 0 rlineto + 0 -437 rlineto + endchar + + + 304 34 rmoveto + 125 0 86 65 0 96 rrcurveto + 0 183 -324 -21 0 110 rrcurveto + 0 50 42 32 67 0 rrcurveto + 68 0 36 -21 47 -36 rrcurveto + 44 49 rlineto + -46 44 -54 33 -89 0 rrcurveto + -115 0 -81 -59 0 -94 rrcurveto + 0 -174 324 22 0 -124 rrcurveto + 0 -51 -42 -35 -78 0 rrcurveto + -76 0 -62 31 -52 37 rrcurveto + -39 -58 rlineto + 52 -43 84 -36 83 0 rrcurveto + -51 -147 rmoveto + 159 857 rlineto + -56 7 rlineto + -159 -858 rlineto + 56 -6 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w0.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w0.00.otf deleted file mode 100644 index e67649026..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w0.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w0.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w0.00.ttx new file mode 100644 index 000000000..577315845 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w0.00.ttx @@ -0,0 +1,1266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w0.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w0.00 + + + SHSansJPVF w0.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w0.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + -273 endchar + + + -282 -12 83 hstemhm + 74 73 -57 40 hintmask 10100000 + 134 755 rmoveto + -48 0 rlineto + 8 -565 rlineto + 32 0 rlineto + hintmask 11000000 + -17 -202 rmoveto + 24 0 14 18 0 22 rrcurveto + 0 25 -14 18 -22 0 rrcurveto + -23 0 -14 -21 0 -24 rrcurveto + 0 -18 13 -20 22 0 rrcurveto + endchar + + + 1000 -72 30 253 30 94 30 92 30 65 30 131 45 -30 112 -99 17 hstemhm + 193 30 83 30 147 30 173 30 66 30 hintmask 1111100011111000 + 306 142 rmoveto + 0 -156 rlineto + 0 -50 22 -8 79 0 rrcurveto + 17 0 186 0 18 0 rrcurveto + 70 0 13 25 5 114 rrcurveto + -9 3 -12 4 -9 6 rrcurveto + -4 -109 -7 -13 -49 0 rrcurveto + -38 0 -156 0 -27 0 rrcurveto + -59 0 -10 5 0 22 rrcurveto + 0 157 rlineto + 63 34 rmoveto + 65 -30 74 -47 37 -37 rrcurveto + 20 22 rlineto + -37 36 -75 47 -65 28 rrcurveto + 320 -64 rmoveto + 76 -49 83 -75 38 -54 rrcurveto + 23 19 rlineto + -38 54 -84 73 -76 49 rrcurveto + -557 -5 rmoveto + -28 -68 -50 -72 -77 -40 rrcurveto + 24 -17 rlineto + 79 42 47 74 31 71 rrcurveto + -117 625 rmoveto + 0 -30 rlineto + 775 0 rlineto + 0 30 rlineto + -818 -176 rmoveto + 0 -30 rlineto + 869 0 rlineto + 0 30 rlineto + hintmask 0000001000100000 + -455 258 rmoveto + hintmask 0000000100100000 + 0 -99 rlineto + 30 0 rlineto + hintmask 0000001000100000 + 0 99 rlineto + hintmask 0111010010001000 + -236 -127 rmoveto + 26 -40 25 -53 9 -36 rrcurveto + 29 12 rlineto + -10 35 -25 53 -27 39 rrcurveto + 393 2 rmoveto + -16 -38 -31 -57 -23 -35 rrcurveto + 27 -12 rlineto + 24 36 26 48 23 46 rrcurveto + -504 -378 rmoveto + 559 0 rlineto + 0 -94 rlineto + -559 0 rlineto + 0 216 rmoveto + 559 0 rlineto + 0 -92 rlineto + -559 0 rlineto + -30 122 rmoveto + 0 -276 rlineto + 619 0 rlineto + 0 276 rlineto + endchar + + + 1000 -60 30 203 30 -9 9 67 7 -7 14 -14 30 -20 20 80 30 59 30 121 30 18 93 -30 30 -30 108 hstemhm + 77 30 42 30 139 30 23 30 71 10 74 30 15 30 16 30 158 30 28 30 -4 29 hintmask 110001011101011101101101 + 53 761 rmoveto + 0 -30 rlineto + 896 0 rlineto + 0 30 rlineto + -802 -461 rmoveto + 0 -30 rlineto + 703 0 rlineto + 0 30 rlineto + hintmask 000000000000100100000000 + -532 539 rmoveto + hintmask 000000000010000100000000 + 0 -171 rlineto + 30 0 rlineto + hintmask 000000000000100100001000 + 0 171 rlineto + 299 0 rmoveto + hintmask 000000000010000000001000 + 0 -171 rlineto + 30 0 rlineto + hintmask 000000000000100000001000 + 0 171 rlineto + hintmask 000000111100011010010100 + -46 -219 rmoveto + 204 0 rlineto + 0 -121 rlineto + -204 0 rlineto + -230 121 rmoveto + 200 0 rlineto + 0 -121 rlineto + -200 0 rlineto + -222 121 rmoveto + 192 0 rlineto + 0 -121 rlineto + -192 0 rlineto + -30 151 rmoveto + 0 -181 rlineto + 716 0 rlineto + 0 181 rlineto + -788 -240 rmoveto + 0 -130 rlineto + 30 0 rlineto + 0 100 rlineto + hintmask 000000110000000000000010 + 786 0 rlineto + 0 -100 rlineto + 30 0 rlineto + 0 130 rlineto + hintmask 000010000000000100000000 + -610 -123 rmoveto + -50 -62 -93 -73 -118 -54 rrcurveto + 8 -4 10 -9 6 -7 rrcurveto + hintmask 010000000000000001000000 + 121 58 92 75 59 70 rrcurveto + 124 -78 rmoveto + 0 -7 rlineto + -65 -139 -176 -81 -162 -31 rrcurveto + 6 -6 8 -12 3 -8 rrcurveto + hintmask 001000000000000001000000 + 168 37 178 84 72 154 rrcurveto + hintmask 110100000000000001100001 + -19 11 rlineto + -6 -2 rlineto + -333 -72 rmoveto + 65 -25 75 -46 38 -35 rrcurveto + 26 19 rlineto + -39 34 -76 45 -64 25 rrcurveto + 72 55 rmoveto + -30 -30 rlineto + 269 0 rlineto + 0 30 rlineto + 74 74 rmoveto + 0 -276 rlineto + 0 -52 21 -9 77 0 rrcurveto + 16 0 182 0 18 0 rrcurveto + 62 0 12 21 4 88 rrcurveto + -9 2 -12 5 -8 6 rrcurveto + -4 -81 -6 -11 -41 0 rrcurveto + -37 0 -154 0 -26 0 rrcurveto + -56 0 -9 6 0 25 rrcurveto + 0 276 rlineto + 278 -62 rmoveto + -66 -32 -126 -33 -107 -23 rrcurveto + 5 -7 5 -10 2 -7 rrcurveto + 110 22 126 32 81 36 rrcurveto + endchar + + + 1000 -58 30 100 30 70 22 -22 30 94 30 19 31 -17 28 152 20 -20 30 -12 12 66 30 -30 89 -5 30 -30 121 hstemhm + 127 30 -18 18 199 30 -20 20 -20 30 -24 14 97 30 -11 11 72 31 202 30 87 29 hintmask 00011000000000000000000100000000 + 193 296 rmoveto + 625 0 rlineto + 0 -94 rlineto + -625 0 rlineto + -30 124 rmoveto + 0 -154 rlineto + 685 0 rlineto + 0 154 rlineto + hintmask 00100000000000000000100000000000 + -365 -132 rmoveto + 0 -232 rlineto + 30 -5 rlineto + 0 237 rlineto + hintmask 01000000000010010000010000000000 + -11 -92 rmoveto + 0 -30 rlineto + 397 0 rlineto + 0 30 rlineto + -760 647 rmoveto + 0 -30 rlineto + 811 0 rlineto + 0 30 rlineto + hintmask 00000000000010100000000000000000 + -823 0 rmoveto + 0 -143 rlineto + 0 -83 -13 -107 -75 -82 rrcurveto + 7 -4 11 -9 5 -6 rrcurveto + 79 85 16 118 0 88 rrcurveto + 0 143 rlineto + hintmask 00000000010100001000000000000000 + 199 -25 rmoveto + 0 -167 rlineto + hintmask 00000000010100000100000000000000 + 30 0 rlineto + 0 167 rlineto + hintmask 00000000101000000001000000000000 + -14 -59 rmoveto + 0 -30 rlineto + 185 0 rlineto + 0 30 rlineto + -365 -96 rmoveto + 0 -30 rlineto + 392 0 rlineto + 0 30 rlineto + hintmask 00000011000000000100000000000000 + -218 -10 rmoveto + 0 -160 rlineto + 0 -8 -2 -3 -11 -1 rrcurveto + -11 -1 -30 0 -47 1 rrcurveto + 5 -9 6 -10 2 -9 rrcurveto + hintmask 00000011000001000010001000000000 + 50 0 30 0 17 6 rrcurveto + 17 5 4 9 0 21 rrcurveto + 0 159 rlineto + -132 -50 rmoveto + -25 -42 -40 -39 -44 -30 rrcurveto + 8 -4 13 -10 5 -4 rrcurveto + 41 30 45 47 26 45 rrcurveto + 153 -7 rmoveto + 35 -27 38 -39 18 -28 rrcurveto + 24 18 rlineto + -18 27 -39 39 -34 25 rrcurveto + 115 330 rmoveto + hintmask 10000101000001000000001010000000 + 14 -286 131 -209 160 0 rrcurveto + 50 1 18 34 6 108 rrcurveto + -9 3 -11 5 -9 7 rrcurveto + -4 -92 -9 -34 -31 -1 rrcurveto + -137 -2 -126 185 -12 281 rrcurveto + 207 -169 rmoveto + -61 -129 -111 -108 -121 -69 rrcurveto + 7 -5 12 -11 5 -6 rrcurveto + 119 74 113 110 66 136 rrcurveto + -156 153 rmoveto + 52 -15 63 -26 34 -21 rrcurveto + 15 27 rlineto + -34 20 -64 24 -51 14 rrcurveto + -453 -763 rmoveto + -25 -16 rlineto + 89 -100 146 -18 233 0 rrcurveto + 185 0 rlineto + 64 0 rlineto + 2 8 6 14 6 8 rrcurveto + -35 0 -207 0 -22 0 rrcurveto + -214 0 -150 15 -78 89 rrcurveto + 5 62 rmoveto + -30 -97 -92 -60 -107 -36 rrcurveto + 8 -6 12 -11 4 -6 rrcurveto + 105 41 99 65 32 106 rrcurveto + endchar + + + 1000 -80 27 95 49 -48 48 -45 45 -30 30 -16 16 -13 13 49 30 48 30 47 19 -19 30 53 30 -18 18 51 11 -11 30 -22 22 62 30 60 30 15 81 -30 30 -30 102 hstemhm + 193 30 -1 30 -15 15 106 29 96 30 142 30 109 30 5 10 hintmask 10000011101100101101000101110000 + 55 767 rmoveto + 0 -30 rlineto + 892 0 rlineto + 0 30 rlineto + hintmask 00000000000000000000100000000000 + -637 72 rmoveto + hintmask 00000000000000000010000000000000 + 0 -153 rlineto + 30 0 rlineto + hintmask 00000000000000000000100000100000 + 0 153 rlineto + 315 0 rmoveto + hintmask 00000000000000000010000000100000 + 0 -153 rlineto + 30 0 rlineto + hintmask 00000000000100101100110000110000 + 0 153 rlineto + -462 -288 rmoveto + 571 0 rlineto + 0 -62 rlineto + -571 0 rlineto + 0 152 rmoveto + 571 0 rlineto + 0 -60 rlineto + -571 0 rlineto + -30 90 rmoveto + 0 -212 rlineto + 631 0 rlineto + 0 212 rlineto + -776 -263 rmoveto + 0 -30 rlineto + 905 0 rlineto + 0 30 rlineto + hintmask 00000001100000000000000100000000 + -716 -160 rmoveto + 0 -30 rlineto + 554 0 rlineto + 0 30 rlineto + -554 -78 rmoveto + 0 -30 rlineto + 563 0 rlineto + 0 30 rlineto + hintmask 00000010000000000000001000000000 + -578 -79 rmoveto + hintmask 00001000000000000000001000001000 + 0 -30 rlineto + 617 0 rlineto + hintmask 00000010000001000000000000001000 + 0 30 rlineto + -477 382 rmoveto + -46 -92 -113 -104 -167 -65 rrcurveto + 7 -5 10 -9 5 -8 rrcurveto + hintmask 00000100010010010000000001000000 + 172 70 111 106 55 101 rrcurveto + 298 -65 rmoveto + -25 -12 rlineto + 62 -80 121 -81 100 -38 rrcurveto + 5 8 9 11 7 6 rrcurveto + -101 33 -119 76 -59 77 rrcurveto + -211 -88 rmoveto + 0 -239 rlineto + 30 0 rlineto + 0 239 rlineto + hintmask 10000010000000000000000000001000 + 316 -223 rmoveto + 0 -6 rlineto + -8 -87 -7 -34 -10 -10 rrcurveto + -6 -6 -6 -1 -12 0 rrcurveto + -11 0 -31 1 -34 3 rrcurveto + 5 -8 3 -13 1 -8 rrcurveto + 28 -2 30 -1 14 1 rrcurveto + 21 0 10 4 10 9 rrcurveto + 16 15 7 35 9 89 rrcurveto + 1 7 1 12 0 0 rrcurveto + -660 -34 rmoveto + -17 -46 -32 -46 -46 -23 rrcurveto + 20 -21 rlineto + hintmask 10010000000000000000000000000000 + 52 28 31 51 17 46 rrcurveto + hintmask 00100000000000000000000010000000 + 110 -3 rmoveto + 13 -38 10 -49 0 -32 rrcurveto + 29 6 rlineto + -1 31 -10 50 -15 37 rrcurveto + hintmask 01000000000000000000000000100000 + 113 -6 rmoveto + 22 -32 20 -44 7 -30 rrcurveto + 28 10 rlineto + -8 29 -21 44 -23 32 rrcurveto + hintmask 00010000001000000000001000000000 + 117 -5 rmoveto + 25 -23 27 -32 13 -23 rrcurveto + 21 14 rlineto + -12 22 -27 32 -26 22 rrcurveto + -381 267 rmoveto + -16 -30 rlineto + 498 0 rlineto + 0 30 rlineto + -516 -23 rmoveto + hintmask 00000010000000000000001000000000 + 0 -224 rlineto + hintmask 00000010001000000000000100000000 + 30 0 rlineto + 0 247 rlineto + endchar + + + 1000 -50 30 -19 19 114 30 44 30 23 30 -30 114 35 30 316 30 -10 10 37 12 hstemhm + 82 30 197 30 -26 8 317 30 168 13 hintmask 1010101101110110 + 529 746 rmoveto + 0 -30 rlineto + 320 0 rlineto + 0 30 rlineto + -397 -495 rmoveto + 0 -30 rlineto + 442 0 rlineto + 0 30 rlineto + -420 149 rmoveto + 0 -30 rlineto + 374 0 rlineto + 0 30 rlineto + -514 -420 rmoveto + 0 -30 rlineto + 626 0 rlineto + 0 30 rlineto + -531 144 rmoveto + 0 -30 rlineto + 460 0 rlineto + 0 30 rlineto + -53 622 rmoveto + 0 -7 rlineto + -86 -171 -222 -118 -188 -45 rrcurveto + 7 -7 8 -11 3 -8 rrcurveto + hintmask 0000000010000010 + 192 51 224 119 94 187 rrcurveto + hintmask 0100010100000110 + -19 12 rlineto + -6 -2 rlineto + -323 -32 rmoveto + -25 -11 rlineto + 83 -154 177 -116 201 -44 rrcurveto + 4 8 9 12 7 6 rrcurveto + -200 39 -177 113 -79 147 rrcurveto + 59 127 rmoveto + -40 -82 -80 -104 -112 -75 rrcurveto + 8 -4 10 -9 6 -7 rrcurveto + 115 80 80 106 47 90 rrcurveto + -129 -493 rmoveto + -27 -73 -43 -71 -51 -50 rrcurveto + 8 -5 13 -9 5 -5 rrcurveto + 49 52 47 77 29 77 rrcurveto + 124 -1 rmoveto + 0 -374 rlineto + 30 0 rlineto + 0 374 rlineto + hintmask 0000000000101000 + -586 460 rmoveto + 0 -875 rlineto + 30 0 rlineto + 0 845 rlineto + 209 0 rlineto + 0 30 rlineto + -8 0 rmoveto + 0 -7 rlineto + -28 -75 -43 -102 -46 -95 rrcurveto + hintmask 0001000000010000 + 89 -91 24 -74 0 -63 rrcurveto + 0 -33 -6 -35 -19 -13 rrcurveto + -10 -6 -12 -3 -14 -1 rrcurveto + -20 -2 -26 1 -29 2 rrcurveto + 7 -9 4 -13 1 -8 rrcurveto + 22 -2 27 0 22 2 rrcurveto + 19 2 17 5 12 9 rrcurveto + 25 17 10 43 0 44 rrcurveto + 0 67 -22 76 -86 89 rrcurveto + hintmask 0000000001001000 + 39 84 42 98 33 81 rrcurveto + hintmask 0000000000001000 + -20 14 rlineto + -6 -2 rlineto + endchar + + + 1000 121 30 -22 22 148 30 -30 136 23 30 129 30 116 30 hstemhm + 167 30 129 30 -16 16 123 30 48 30 -6 29 -29 111 -30 30 -16 16 201 30 1 29 hintmask 011011111011001010000000 + 326 793 rmoveto + 0 -280 rlineto + 0 -47 16 -8 59 0 rrcurveto + hintmask 000010000000100000000000 + 13 0 120 0 13 0 rrcurveto + 49 0 10 20 4 82 rrcurveto + hintmask 101010101000010000000000 + -10 2 -11 5 -8 6 rrcurveto + -3 -75 -5 -10 -29 0 rrcurveto + -24 0 -102 0 -18 0 rrcurveto + -38 0 -6 4 0 21 rrcurveto + 0 280 rlineto + -41 -464 rmoveto + 0 -30 rlineto + 617 0 rlineto + 0 30 rlineto + -661 -178 rmoveto + 0 -30 rlineto + 689 0 rlineto + 0 30 rlineto + hintmask 010101100111001000000000 + -481 284 rmoveto + 0 -306 rlineto + 30 0 rlineto + 0 306 rlineto + 218 0 rmoveto + 0 -306 rlineto + 30 0 rlineto + 0 306 rlineto + -417 358 rmoveto + 0 -30 rlineto + 217 0 rlineto + 0 -116 rlineto + -217 0 rlineto + 0 -30 rlineto + 247 0 rlineto + 0 176 rlineto + 75 0 rmoveto + hintmask 000010100000001001000000 + 0 -280 rlineto + 0 -47 17 -8 60 0 rrcurveto + 12 0 125 0 14 0 rrcurveto + 49 0 11 20 3 82 rrcurveto + -9 2 -12 4 -8 7 rrcurveto + -3 -75 -5 -10 -30 0 rrcurveto + -25 0 -105 0 -18 0 rrcurveto + -40 0 -6 4 0 21 rrcurveto + 0 280 rlineto + hintmask 000001110000000110000000 + -16 0 rmoveto + 0 -30 rlineto + 217 0 rlineto + 0 -116 rlineto + -217 0 rlineto + 0 -30 rlineto + 247 0 rlineto + 0 176 rlineto + -424 -714 rmoveto + -52 -54 -91 -49 -81 -33 rrcurveto + 8 -5 11 -13 4 -6 rrcurveto + 80 36 94 56 56 58 rrcurveto + 200 -7 rmoveto + 76 -41 90 -62 46 -42 rrcurveto + 22 23 rlineto + -46 42 -91 60 -75 39 rrcurveto + -499 750 rmoveto + -54 -167 -87 -164 -96 -108 rrcurveto + 7 -6 11 -12 4 -6 rrcurveto + 98 116 88 165 58 175 rrcurveto + -113 -214 rmoveto + 0 -691 rlineto + 30 0 rlineto + 0 718 rlineto + -1 2 rlineto + endchar + + + 1000 -67 29 219 30 154 30 -16 16 150 30 -30 122 -85 30 -18 18 87 30 -30 140 -122 12 hstemhm + 51 188 -30 30 -30 149 21 30 -18 18 -13 13 66 30 -12 12 135 30 41 30 172 30 -6 28 hintmask 000000100001000000000000 + 51 612 rmoveto + 0 -30 rlineto + hintmask 000000100000010000000000 + 307 0 rlineto + 0 30 rlineto + hintmask 000000010010100100000000 + -149 228 rmoveto + 0 -918 rlineto + 30 0 rlineto + 0 918 rlineto + -36 -238 rmoveto + -31 -160 -74 -193 -68 -95 rrcurveto + 7 -5 10 -11 6 -8 rrcurveto + 70 101 74 203 33 160 rrcurveto + 4 -143 rmoveto + -21 -16 rlineto + 25 -26 72 -92 21 -33 rrcurveto + 24 24 rlineto + -18 25 -81 96 -22 22 rrcurveto + 157 278 rmoveto + hintmask 000000001000000100000000 + 0 -30 rlineto + 559 0 rlineto + hintmask 010000000010000000100000 + 0 30 rlineto + -457 -518 rmoveto + 0 -30 rlineto + 176 0 rlineto + 0 30 rlineto + hintmask 000000000100000001010000 + -194 120 rmoveto + 0 -365 rlineto + 30 0 rlineto + 0 365 rlineto + 135 508 rmoveto + hintmask 000000000010000000010000 + 0 -122 rlineto + 30 0 rlineto + hintmask 000101000100000000010000 + 0 122 rlineto + -115 -172 rmoveto + 0 -288 rlineto + 30 0 rlineto + 0 288 rlineto + 148 0 rmoveto + 0 -288 rlineto + 30 0 rlineto + 0 288 rlineto + 156 -394 rmoveto + -52 -36 -89 -48 -61 -29 rrcurveto + 15 -21 rlineto + 62 28 86 41 57 44 rrcurveto + hintmask 101010000000000010001100 + -541 323 rmoveto + 0 -30 rlineto + 517 0 rlineto + 0 -150 rlineto + -517 0 rlineto + 0 -30 rlineto + 547 0 rlineto + 0 210 rlineto + -232 -242 rmoveto + 0 -344 rlineto + 0 -47 15 -9 54 0 rrcurveto + hintmask 100000000010001000001010 + 12 0 100 0 12 0 rrcurveto + 48 0 10 25 3 102 rrcurveto + -9 3 -11 4 -8 6 rrcurveto + -3 -97 -4 -14 -29 0 rrcurveto + -21 0 -84 0 -16 0 rrcurveto + -33 0 -6 5 0 22 rrcurveto + 0 344 rlineto + -346 -371 rmoveto + 10 -31 rlineto + 77 16 100 22 99 21 rrcurveto + -2 29 rlineto + -108 -22 -104 -22 -72 -13 rrcurveto + -16 767 rmoveto + 0 -316 rlineto + 0 -142 -7 -194 -74 -141 rrcurveto + 8 -3 13 -7 5 -6 rrcurveto + 75 143 10 205 0 145 rrcurveto + 0 316 rlineto + endchar + + + 1000 -71 30 427 30 153 30 33 111 -30 30 -30 126 hstemhm + 159 30 -19 19 126 30 -6 30 281 30 160 30 18 31 hintmask 1110100101110000 + 58 743 rmoveto + 0 -30 rlineto + 887 0 rlineto + 0 30 rlineto + hintmask 0000010010000000 + -630 96 rmoveto + hintmask 0001000010000000 + 0 -207 rlineto + 30 0 rlineto + hintmask 0000010010100000 + 0 207 rlineto + 305 0 rmoveto + hintmask 0001000000100000 + 0 -207 rlineto + 30 0 rlineto + hintmask 0010011000100000 + 0 207 rlineto + -521 -240 rmoveto + 0 -206 rlineto + 0 -137 -15 -184 -109 -136 rrcurveto + 7 -3 12 -9 5 -6 rrcurveto + hintmask 1110000101010000 + 112 139 18 194 0 141 rrcurveto + 0 207 rlineto + -19 0 rmoveto + 0 -30 rlineto + 670 0 rlineto + 0 -153 rlineto + -670 0 rlineto + 0 -30 rlineto + 700 0 rlineto + 0 213 rlineto + -531 -249 rmoveto + 0 -343 rlineto + 0 -66 31 -12 105 0 rrcurveto + 23 0 278 0 24 0 rrcurveto + hintmask 1000000001001000 + 96 0 15 31 8 123 rrcurveto + -9 3 -13 4 -9 7 rrcurveto + -6 -117 -11 -21 -69 0 rrcurveto + -56 0 -236 0 -41 0 rrcurveto + -84 0 -16 11 0 37 rrcurveto + 0 343 rlineto + 444 -47 rmoveto + -101 -52 -195 -56 -169 -40 rrcurveto + 4 -7 5 -10 3 -7 rrcurveto + 172 40 193 54 120 56 rrcurveto + endchar + + + 1000 64 30 77 30 76 30 74 30 72 30 109 30 25 84 -30 30 -30 108 hstemhm + 135 30 21 30 102 30 14 30 205 30 17 30 113 30 19 30 hintmask 111111010011001100000000 + 53 761 rmoveto + 0 -30 rlineto + 896 0 rlineto + 0 30 rlineto + hintmask 000000001001000000000000 + -631 78 rmoveto + hintmask 000000100001000000000000 + 0 -162 rlineto + 30 0 rlineto + hintmask 000000001001001000000000 + 0 162 rlineto + 296 0 rmoveto + hintmask 000000100000001000000000 + 0 -162 rlineto + 30 0 rlineto + hintmask 000000001000001000000000 + 0 162 rlineto + hintmask 000011000100110010000000 + -47 -217 rmoveto + 209 0 rlineto + 0 -109 rlineto + -209 0 rlineto + -235 109 rmoveto + 205 0 rlineto + 0 -109 rlineto + -205 0 rlineto + -227 109 rmoveto + 197 0 rlineto + 0 -109 rlineto + -197 0 rlineto + -30 139 rmoveto + 0 -169 rlineto + 731 0 rlineto + 0 169 rlineto + hintmask 111100000010000100000000 + -650 -375 rmoveto + 571 0 rlineto + 0 -76 rlineto + -571 0 rlineto + 0 -30 rmoveto + 571 0 rlineto + 0 -77 rlineto + -571 0 rlineto + 0 287 rmoveto + 571 0 rlineto + 0 -74 rlineto + -571 0 rlineto + -30 104 rmoveto + 0 -347 rlineto + 631 0 rlineto + 0 347 rlineto + -216 -389 rmoveto + 127 -34 121 -39 72 -31 rrcurveto + 31 22 rlineto + -78 32 -126 39 -121 31 rrcurveto + -258 -1 rmoveto + -81 -39 -128 -36 -107 -23 rrcurveto + 8 -6 12 -12 5 -6 rrcurveto + 103 25 130 41 86 43 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w1000.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w1000.00.otf deleted file mode 100644 index 3f4098530..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w1000.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w1000.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w1000.00.ttx new file mode 100644 index 000000000..e527d0754 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w1000.00.ttx @@ -0,0 +1,1266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w1000.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w1000.00 + + + SHSansJPVF w1000.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w1000.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + -405 endchar + + + -316 -11 209 hstemhm + 48 202 -182 161.5 hintmask 10100000 + 241 773 rmoveto + -185 0 rlineto + 24 -515 rlineto + 138 0 rlineto + hintmask 11000000 + -69 -269 rmoveto + 62 0 39 44 0 60 rrcurveto + 0 62 -42 43 -59 0 rrcurveto + -57 0 -44 -43 0 -62 rrcurveto + 0 -58 40 -46 61 0 rrcurveto + endchar + + + 1000 -84 115 161 86 31 81 30 86 34 111 50 108 -111 157 -126 80 hstemhm + 165 137 -23 141 6 146 59 122 -49 144 hintmask 1111100011111000 + 279 152 rmoveto + 0 -92 rlineto + 0 -109 33 -35 141 0 rrcurveto + 28 0 89 0 30 0 rrcurveto + 101 0 37 29 15 113 rrcurveto + -37 7 -57 19 -28 19 rrcurveto + -5 -62 -6 -10 -34 0 rrcurveto + -25 0 -71 0 -19 0 rrcurveto + -43 0 -8 3 0 28 rrcurveto + 0 90 rlineto + -43 -2 rmoveto + 55 -23 70 -40 33 -28 rrcurveto + 88 89 rlineto + -38 28 -72 36 -54 19 rrcurveto + 251 -110 rmoveto + 58 -57 64 -81 26 -54 rrcurveto + 121 69 rlineto + -30 57 -68 75 -58 53 rrcurveto + -678 -14 rmoveto + -22 -67 -45 -63 -59 -39 rrcurveto + 113 -77 rlineto + 69 49 39 75 27 78 rrcurveto + -153 684 rmoveto + 0 -111 rlineto + 770 0 rlineto + 0 111 rlineto + -820 -158 rmoveto + 0 -111 rlineto + 874 0 rlineto + 0 111 rlineto + hintmask 0000001000100000 + -512 204 rmoveto + hintmask 0000000100100000 + 0 -126 rlineto + 146 0 rlineto + hintmask 0000001000100000 + 0 126 rlineto + hintmask 0111010010001000 + -322 -154 rmoveto + 9 -25 10 -34 3 -21 rrcurveto + 138 30 rlineto + -5 20 -11 32 -11 23 rrcurveto + 232 0 rmoveto + -5 -21 -13 -29 -9 -24 rrcurveto + 128 -26 rlineto + 12 18 17 23 22 32 rrcurveto + -465 -390 rmoveto + 402 0 rlineto + 0 -31 rlineto + -402 0 rlineto + 0 142 rmoveto + 402 0 rlineto + 0 -30 rlineto + -402 0 rlineto + -137 116 rmoveto + 0 -314 rlineto + 683 0 rlineto + 0 314 rlineto + endchar + + + 1000 -86 106 92 77 -23 23 30 20 -20 22.5 -22.5 90 -56 56 21 95 21 90 28 90 -6 148 -116 116 -116 175 hstemhm + 61 129 -50 128 -7 144 -59 114 -55 40 89 131 -127 114 -60 145 -4 135 -60 136 -95 112 hintmask 110001011101011101101101 + 50 796 rmoveto + 0 -116 rlineto + 901 0 rlineto + 0 116 rlineto + -800 -487 rmoveto + 0 -90 rlineto + 707 0 rlineto + 0 90 rlineto + hintmask 000000000000100100000000 + -597 546 rmoveto + hintmask 000000000010000100000000 + 0 -207 rlineto + 144 0 rlineto + hintmask 000000000000100100001000 + 0 207 rlineto + 187 0 rmoveto + hintmask 000000000010000000001000 + 0 -207 rlineto + 145 0 rlineto + hintmask 000000000000100000001000 + 0 207 rlineto + hintmask 000000111100011010010100 + -85 -291 rmoveto + 81 0 rlineto + 0 -28 rlineto + -81 0 rlineto + -192 28 rmoveto + 78 0 rlineto + 0 -28 rlineto + -78 0 rlineto + -192 28 rmoveto + 78 0 rlineto + 0 -28 rlineto + -78 0 rlineto + -128 118 rmoveto + 0 -208 rlineto + 728 0 rlineto + 0 208 rlineto + -807 -229 rmoveto + 0 -172 rlineto + 129 0 rlineto + 0 77 rlineto + hintmask 000000110000000000000010 + 618 0 rlineto + 0 -77 rlineto + 136 0 rlineto + 0 172 rlineto + hintmask 000010000000000100000000 + -673 -173 rmoveto + -39 -47 -72 -41 -108 -29 rrcurveto + 22 -16 31 -39 14 -25 rrcurveto + hintmask 010000000000000001000000 + 124 44 81 54 57 78 rrcurveto + 24 -42 rmoveto + 0 -13 rlineto + -48 -105 -135 -52 -170 -18 rrcurveto + 20 -24 24 -45 9 -29 rrcurveto + hintmask 001000000000000001000000 + 197 32 152 70 67 161 rrcurveto + hintmask 110100000000000001100001 + -72 26 rlineto + -21 -3 rlineto + -248 -133 rmoveto + 25 -16 33 -29 17 -20 rrcurveto + 82 54 rlineto + -18 18 -32 25 -28 15 rrcurveto + 10 86 rmoveto + -77 -77 rlineto + 253 0 rlineto + 0 77 rlineto + 89 50 rmoveto + 0 -186 rlineto + 0 -106 30 -33 126 0 rrcurveto + 25 0 81 0 27 0 rrcurveto + 90 0 34 28 14 99 rrcurveto + -35 7 -51 18 -26 17 rrcurveto + -4 -53 -7 -10 -29 0 rrcurveto + -20 0 -65 0 -16 0 rrcurveto + -37 0 -6 4 0 30 rrcurveto + 0 185 rlineto + 150 -26 rmoveto + -55 -24 -92 -21 -84 -13 rrcurveto + 13 -23 15 -40 6 -24 rrcurveto + 93 11 112 20 85 32 rrcurveto + endchar + + + 1000 -82 111 26 82 31 59 -59 78 31 79 -7 124 -124 84 74 46 -46 69 -47 47 23 56 -56 97 -16 95 -95 173 hstemhm + 100 131 -63 63 93 115 -91 91 -91 121 -86 56 -11 147 -73 73 -50 130 64 150 14 101 hintmask 00011000000000000000000100000000 + 286 277 rmoveto + 433 0 rlineto + 0 -31 rlineto + -433 0 rlineto + -140 110 rmoveto + 0 -188 rlineto + 723 0 rlineto + 0 188 rlineto + hintmask 00100000000000000000100000000000 + -441 -129 rmoveto + 0 -248 rlineto + 147 -32 rlineto + 0 280 rlineto + hintmask 01000000000010010000010000000000 + -73 -90 rmoveto + 0 -82 rlineto + 370 0 rlineto + 0 82 rlineto + -704 638 rmoveto + 0 -95 rlineto + 784 0 rlineto + 0 95 rlineto + hintmask 00000000000010100000000000000000 + -852 0 rmoveto + 0 -116 rlineto + 0 -74 -7 -95 -76 -71 rrcurveto + 28 -16 57 -47 20 -24 rrcurveto + 90 85 19 137 0 103 rrcurveto + 0 118 rlineto + hintmask 00000000010100001000000000000000 + 93 -79 rmoveto + 0 -167 rlineto + hintmask 00000000010100000100000000000000 + 115 0 rlineto + 0 167 rlineto + hintmask 00000000101000000001000000000000 + -56 -41 rmoveto + 0 -56 rlineto + 176 0 rlineto + 0 56 rlineto + -343 -79 rmoveto + 0 -69 rlineto + 383 0 rlineto + 0 69 rlineto + hintmask 00000011000000000100000000000000 + -251 -23 rmoveto + 0 -109 rlineto + 0 -8 -3 -3 -8 0 rrcurveto + -7 0 -20 0 -17 1 rrcurveto + 13 -22 19 -35 8 -28 rrcurveto + hintmask 00000011000001000010001000000000 + 39 0 32 0 29 14 rrcurveto + 29 14 7 17 0 46 rrcurveto + 0 113 rlineto + -220 -49 rmoveto + -13 -34 -24 -34 -31 -26 rrcurveto + 21 -12 35 -24 17 -14 rrcurveto + 33 30 31 47 18 46 rrcurveto + 123 -9 rmoveto + 24 -30 24 -42 9 -28 rrcurveto + 79 30 rlineto + -10 28 -26 41 -25 29 rrcurveto + -9 351 rmoveto + hintmask 10000101000001000000001010000000 + 22 -272 141 -231 154 -1 rrcurveto + 83 0 41 26 18 132 rrcurveto + -32 10 -43 23 -26 24 rrcurveto + -5 -66 -8 -25 -20 0 rrcurveto + -70 0 -109 184 -16 196 rrcurveto + 122 -178 rmoveto + -42 -96 -82 -86 -94 -52 rrcurveto + 27 -19 46 -42 20 -23 rrcurveto + 96 64 93 105 54 117 rrcurveto + -205 150 rmoveto + 49 -16 64 -28 32 -21 rrcurveto + 63 74 rlineto + -35 21 -65 25 -48 12 rrcurveto + -451 -736 rmoveto + -96 -33 rlineto + 77 -146 117 -27 215 0 rrcurveto + 234 0 rlineto + 68 0 rlineto + 5 33 18 52 16 26 rrcurveto + -72 -3 -209 0 -54 0 rrcurveto + -159 1 -110 10 -50 87 rrcurveto + -109 40 rmoveto + -18 -82 -58 -57 -91 -34 rrcurveto + 30 -21 53 -48 22 -25 rrcurveto + 100 50 72 81 30 120 rrcurveto + endchar + + + 1000 -94 86 19 87 -85 85 -84 84 -69 69 -35 35 -33 33 22 49 22 49 21 45 -45 63 23 90 -60 60 24 21 -21 67 -56 56 23 64 23 67 -30 147 -92 92 -92 125 hstemhm + 153 132 -81 136 -44 44 -42 107 37 128 22 143 -26 139 -68 46 hintmask 10000011101100101101000101110000 + 58 822 rmoveto + 0 -92 rlineto + 883 0 rlineto + 0 92 rlineto + hintmask 00000000000000000000100000000000 + -677 33 rmoveto + hintmask 00000000000000000010000000000000 + 0 -180 rlineto + 141 0 rlineto + hintmask 00000000000000000000100000100000 + 0 180 rlineto + 187 0 rmoveto + hintmask 00000000000000000010000000100000 + 0 -180 rlineto + 143 0 rlineto + hintmask 00000000000100101100110000110000 + 0 180 rlineto + -450 -304 rmoveto + 424 0 rlineto + 0 -23 rlineto + -424 0 rlineto + 0 110 rmoveto + 424 0 rlineto + 0 -23 rlineto + -424 0 rlineto + -132 90 rmoveto + 0 -244 rlineto + 695 0 rlineto + 0 244 rlineto + -807 -268 rmoveto + 0 -90 rlineto + 919 0 rlineto + 0 90 rlineto + hintmask 00000001100000000000000100000000 + -664 -197 rmoveto + 0 -49 rlineto + 469 0 rlineto + 0 49 rlineto + -469 -71 rmoveto + 0 -49 rlineto + 482 0 rlineto + 0 49 rlineto + hintmask 00000010000000000000001000000000 + -574 -71 rmoveto + hintmask 00001000000000000000001000001000 + 0 -69 rlineto + 622 0 rlineto + hintmask 00000010000001000000000000001000 + 0 69 rlineto + -511 394 rmoveto + -38 -100 -88 -88 -172 -56 rrcurveto + 25 -21 36 -48 13 -31 rrcurveto + hintmask 00000100010010010000000001000000 + 192 75 103 107 59 142 rrcurveto + 263 -61 rmoveto + -104 -34 rlineto + 65 -100 107 -78 129 -36 rrcurveto + 18 33 37 49 28 25 rrcurveto + -120 23 -106 51 -54 67 rrcurveto + -266 -105 rmoveto + 0 -243 rlineto + 128 0 rlineto + 0 243 rlineto + hintmask 10000010000000000000000000001000 + 210 -208 rmoveto + 0 -12 rlineto + -5 -52 -8 -25 -9 -9 rrcurveto + -6 -7 -6 -1 -9 0 rrcurveto + -10 0 -16 1 -21 2 rrcurveto + 13 -24 11 -39 1 -28 rrcurveto + 37 -1 33 1 19 2 rrcurveto + 21 2 21 7 17 17 rrcurveto + 20 19 11 39 9 68 rrcurveto + 2 15 2 25 0 0 rrcurveto + -742 -45 rmoveto + -15 -36 -32 -39 -39 -23 rrcurveto + 101 -56 rlineto + hintmask 10010000000000000000000000000000 + 45 29 26 41 18 45 rrcurveto + hintmask 00100000000000000000000010000000 + 14 -1 rmoveto + 9 -33 7 -45 -1 -28 rrcurveto + 107 17 rlineto + -1 27 -9 44 -11 32 rrcurveto + hintmask 01000000000000000000000000100000 + 33 -16 rmoveto + 22 -29 21 -41 8 -27 rrcurveto + 97 32 rlineto + -10 27 -22 38 -24 26 rrcurveto + hintmask 00010000001000000000001000000000 + 52 -29 rmoveto + 24 -21 27 -32 11 -21 rrcurveto + 84 42 rlineto + -13 22 -29 29 -25 20 rrcurveto + -325 277 rmoveto + -63 -63 rlineto + 437 0 rlineto + 0 63 rlineto + -485 -44 rmoveto + hintmask 00000010000000000000001000000000 + 0 -215 rlineto + hintmask 00000010001000000000000100000000 + 136 0 rlineto + 0 261 rlineto + endchar + + + 1000 -76 112 -29 29 34 99 -55 124 -35 101 -101 173 -19 98 231 103 -41 41 -26 49 hstemhm + 66 126 61 127 -122 44 305 135 60 40 hintmask 1010101101110110 + 558 789 rmoveto + 0 -103 rlineto + 284 0 rlineto + 0 103 rlineto + -379 -485 rmoveto + 0 -101 rlineto + 469 0 rlineto + 0 101 rlineto + -428 151 rmoveto + 0 -98 rlineto + 343 0 rlineto + 0 98 rlineto + -472 -419 rmoveto + 0 -112 rlineto + 590 0 rlineto + 0 112 rlineto + -512 133 rmoveto + 0 -99 rlineto + 455 0 rlineto + 0 99 rlineto + -106 620 rmoveto + 0 -19 rlineto + -68 -125 -188 -94 -197 -38 rrcurveto + 25 -27 30 -51 14 -32 rrcurveto + hintmask 0000000010000010 + 218 54 203 108 96 183 rrcurveto + hintmask 0100010100000110 + -87 46 rlineto + -21 -5 rlineto + -254 -64 rmoveto + -111 -39 rlineto + 97 -139 155 -90 200 -39 rrcurveto + 17 34 36 52 28 26 rrcurveto + -189 27 -156 68 -77 100 rrcurveto + 1 133 rmoveto + -38 -72 -71 -75 -109 -55 rrcurveto + 28 -19 42 -46 19 -30 rrcurveto + 125 75 80 90 60 107 rrcurveto + -266 -459 rmoveto + -19 -59 -35 -61 -44 -40 rrcurveto + 28 -15 48 -31 23 -19 rrcurveto + 45 47 45 76 25 74 rrcurveto + 47 30 rmoveto + 0 -369 rlineto + 135 0 rlineto + 0 369 rlineto + hintmask 0000000000101000 + -676 436 rmoveto + 0 -908 rlineto + 126 0 rlineto + 0 779 rlineto + 110 0 rlineto + 0 129 rlineto + -44 0 rmoveto + 0 -43 rlineto + -11 -62 -29 -153 -24 -90 rrcurveto + hintmask 0001000000010000 + 49 -63 10 -61 0 -42 rrcurveto + 0 -29 -5 -17 -10 -8 rrcurveto + -7 -5 -10 -3 -9 0 rrcurveto + -11 0 -10 0 -15 2 rrcurveto + 20 -35 10 -54 1 -35 rrcurveto + 24 -1 23 1 17 2 rrcurveto + 23 4 20 7 17 13 rrcurveto + 34 24 15 43 0 71 rrcurveto + 0 57 -10 68 -56 76 rrcurveto + hintmask 0000000001001000 + 26 79 32 115 25 90 rrcurveto + hintmask 0000000000001000 + -95 54 rlineto + -20 -5 rlineto + endchar + + + 1000 92 122 -43 43 65 120 -120 198 -24 99 55 92 32 91 hstemhm + 118 138 72 115 -64 64 0 133 -67 107 -76 99 -99 222 -115 115 -64 64 69 109 -74 99 hintmask 011011111011001010000000 + 328 822 rmoveto + 0 -240 rlineto + 0 -100 26 -29 92 0 rrcurveto + hintmask 000010000000100000000000 + 19 0 44 0 20 0 rrcurveto + 68 0 30 25 12 85 rrcurveto + hintmask 101010101000010000000000 + -31 7 -46 16 -22 17 rrcurveto + -3 -43 -4 -8 -17 0 rrcurveto + -10 0 -32 0 -8 0 rrcurveto + -20 0 -3 3 0 28 rrcurveto + 0 239 rlineto + -115 -423 rmoveto + 0 -120 rlineto + 622 0 rlineto + 0 120 rlineto + -649 -185 rmoveto + 0 -122 rlineto + 671 0 rlineto + 0 122 rlineto + hintmask 010101100111001000000000 + -529 263 rmoveto + 0 -306 rlineto + 133 0 rlineto + 0 306 rlineto + 116 -1 rmoveto + 0 -306 rlineto + 134 0 rlineto + 0 306 rlineto + -447 346 rmoveto + 0 -91 rlineto + 130 0 rlineto + 0 -32 rlineto + -130 0 rlineto + 0 -92 rlineto + 237 0 rlineto + 0 215 rlineto + 31 0 rmoveto + hintmask 000010100000001001000000 + 0 -240 rlineto + 0 -100 26 -29 93 0 rrcurveto + 20 0 47 0 21 0 rrcurveto + 69 0 30 26 12 88 rrcurveto + -31 7 -46 16 -22 17 rrcurveto + -3 -46 -5 -9 -17 0 rrcurveto + -11 0 -35 0 -9 0 rrcurveto + -21 0 -3 3 0 29 rrcurveto + 0 238 rlineto + hintmask 000001110000000110000000 + -64 0 rmoveto + 0 -91 rlineto + 133 0 rlineto + 0 -32 rlineto + -133 0 rlineto + 0 -92 rlineto + 242 0 rlineto + 0 215 rlineto + -456 -735 rmoveto + -41 -39 -82 -31 -84 -18 rrcurveto + 30 -23 50 -49 23 -27 rrcurveto + 87 30 96 52 55 63 rrcurveto + 46 -15 rmoveto + 66 -33 83 -52 39 -35 rrcurveto + 122 71 rlineto + -47 37 -86 49 -64 28 rrcurveto + -580 760 rmoveto + -41 -142 -71 -142 -77 -91 rrcurveto + 22 -39 35 -85 11 -36 rrcurveto + 104 122 94 197 57 176 rrcurveto + -213 -251 rmoveto + 0 -658 rlineto + 138 0 rlineto + 0 790 rlineto + -4 2 rlineto + endchar + + + 1000 -89 107 113 107 62 111 -17 17 70 111 -111 183 -133 130 -125 125 -5 120 -120 199 -153 74 hstemhm + 37 238 -133 133 -133 202 14 128 -59 59 -40 40 13 118 -68 68 -11 136 -29 120 7 121 -76 103 hintmask 000000100001000000000000 + 37 661 rmoveto + 0 -130 rlineto + hintmask 000000100000010000000000 + 307 0 rlineto + 0 130 rlineto + hintmask 000000010010100100000000 + -202 194 rmoveto + 0 -950 rlineto + 133 0 rlineto + 0 950 rlineto + -127 -291 rmoveto + -21 -118 -53 -156 -61 -93 rrcurveto + 21 -35 31 -55 13 -40 rrcurveto + 72 111 54 200 29 158 rrcurveto + 36 -15 rmoveto + -59 -73 rlineto + 27 -50 51 -103 24 -62 rrcurveto + 72 129 rlineto + -16 23 -78 112 -21 24 rrcurveto + 158 255 rmoveto + hintmask 000000001000000100000000 + 0 -120 rlineto + 536 0 rlineto + hintmask 010000000010000000100000 + 0 120 rlineto + -414 -538 rmoveto + 0 -107 rlineto + 149 0 rlineto + 0 107 rlineto + hintmask 000000000100000001010000 + -199 85 rmoveto + 0 -320 rlineto + 118 0 rlineto + 0 320 rlineto + -11 532 rmoveto + hintmask 000000000010000000010000 + 0 -153 rlineto + 136 0 rlineto + hintmask 000101000100000000010000 + 0 153 rlineto + -215 -191 rmoveto + 0 -270 rlineto + 113 0 rlineto + 0 270 rlineto + 42 0 rmoveto + 0 -270 rlineto + 113 0 rlineto + 0 270 rlineto + 109 -388 rmoveto + -40 -32 -66 -44 -43 -21 rrcurveto + 57 -87 rlineto + 45 22 67 36 46 35 rrcurveto + hintmask 101010000000000010001100 + -524 407 rmoveto + 0 -111 rlineto + 394 0 rlineto + 0 -70 rlineto + -394 0 rlineto + 0 -111 rlineto + 515 0 rlineto + 0 292 rlineto + -248 -269 rmoveto + 0 -273 rlineto + 0 -105 19 -34 91 0 rrcurveto + hintmask 100000000010001000001010 + 17 0 22 0 18 0 rrcurveto + 68 0 29 34 11 118 rrcurveto + -32 8 -48 19 -23 18 rrcurveto + -3 -77 -3 -13 -13 0 rrcurveto + -4 0 -13 0 -4 0 rrcurveto + -11 0 -1 3 0 29 rrcurveto + 0 273 rlineto + -387 -293 rmoveto + 15 -121 rlineto + 74 11 85 12 82 13 rrcurveto + -7 115 rlineto + -92 -12 -91 -11 -66 -7 rrcurveto + -88 746 rmoveto + 0 -327 rlineto + 0 -142 -5 -196 -70 -132 rrcurveto + 29 -14 56 -41 22 -23 rrcurveto + 82 148 14 240 0 160 rrcurveto + 0 327 rlineto + endchar + + + 1000 -84 132 295 117 42 117 20 164 -129 129 -129 181 hstemhm + 143 144 -61 61 -35 144 -67 141 131 145 6 144 -66 132 hintmask 1110100101110000 + 56 803 rmoveto + 0 -129 rlineto + 892 0 rlineto + 0 129 rlineto + hintmask 0000010010000000 + -696 52 rmoveto + hintmask 0001000010000000 + 0 -216 rlineto + 144 0 rlineto + hintmask 0000010010100000 + 0 216 rlineto + 205 0 rmoveto + hintmask 0001000000100000 + 0 -216 rlineto + 145 0 rlineto + hintmask 0010011000100000 + 0 216 rlineto + -603 -236 rmoveto + 0 -216 rlineto + 0 -126 -9 -174 -110 -117 rrcurveto + 34 -16 63 -44 26 -25 rrcurveto + hintmask 1110000101010000 + 119 131 21 218 0 151 rrcurveto + 0 218 rlineto + -61 0 rmoveto + 0 -117 rlineto + 526 0 rlineto + 0 -42 rlineto + -526 0 rlineto + 0 -117 rlineto + 670 0 rlineto + 0 276 rlineto + -567 -300 rmoveto + 0 -231 rlineto + 0 -132 45 -40 171 0 rrcurveto + 35 0 144 0 38 0 rrcurveto + hintmask 1000000001001000 + 140 0 41 39 19 155 rrcurveto + -39 8 -61 21 -32 22 rrcurveto + -7 -99 -10 -14 -60 0 rrcurveto + -41 0 -124 0 -33 0 rrcurveto + -74 0 -11 4 0 39 rrcurveto + 0 228 rlineto + 309 12 rmoveto + -93 -45 -152 -37 -143 -21 rrcurveto + 16 -29 20 -51 6 -32 rrcurveto + 153 19 175 35 131 57 rrcurveto + endchar + + + 1000 62 77 23 73 22 73 22 77 24 93 28 94 -16 149 -103 103 -103 157 hstemhm + 114 128 -76 141 -39 141 -75 114 94 114 -69 142 -30 148 -95 135 hintmask 111111010011001100000000 + 50 801 rmoveto + 0 -103 rlineto + 901 0 rlineto + 0 103 rlineto + hintmask 000000001001000000000000 + -683 54 rmoveto + hintmask 000000100001000000000000 + 0 -203 rlineto + 141 0 rlineto + hintmask 000000001001001000000000 + 0 203 rlineto + 178 0 rmoveto + hintmask 000000100000001000000000 + 0 -203 rlineto + 142 0 rlineto + hintmask 000000001000001000000000 + 0 203 rlineto + hintmask 000011000100110010000000 + -73 -281 rmoveto + 96 0 rlineto + 0 -28 rlineto + -96 0 rlineto + -208 28 rmoveto + 94 0 rlineto + 0 -28 rlineto + -94 0 rlineto + -206 28 rmoveto + 92 0 rlineto + 0 -28 rlineto + -92 0 rlineto + -128 122 rmoveto + 0 -215 rlineto + 773 0 rlineto + 0 215 rlineto + hintmask 111100000010000100000000 + -580 -411 rmoveto + 392 0 rlineto + 0 -22 rlineto + -392 0 rlineto + 0 -73 rmoveto + 392 0 rlineto + 0 -23 rlineto + -392 0 rlineto + 0 213 rmoveto + 392 0 rlineto + 0 -22 rlineto + -392 0 rlineto + -141 99 rmoveto + 0 -367 rlineto + 681 0 rlineto + 0 367 rlineto + -312 -424 rmoveto + 108 -32 106 -41 57 -28 rrcurveto + 184 66 rlineto + -77 29 -135 44 -111 31 rrcurveto + -333 -2 rmoveto + -71 -32 -124 -28 -112 -15 rrcurveto + 30 -22 48 -48 24 -27 rrcurveto + 106 24 136 43 87 48 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w439.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w439.00.otf deleted file mode 100644 index f21baf499..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w439.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w439.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w439.00.ttx new file mode 100644 index 000000000..5a0df5271 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w439.00.ttx @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w439.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w439.00 + + + SHSansJPVF w439.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w439.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -69 66 68 52 53 38 -38 51 67 51 8 72 -64 52 118 31 -31 47 -27 27 47 42 -42 93 -10 58 -58 144 hstemhm + 115 74 -37 37 153 67 -51 51 -51 70 -51 32 50 81 -38 38 19 74 142 82 55 61 hintmask 00011000000000000000000100000000 + 234 288 rmoveto + 541 0 rlineto + 0 -67 rlineto + -541 0 rlineto + -78 118 rmoveto + 0 -169 rlineto + 701 0 rlineto + 0 169 rlineto + hintmask 00100000000000000000100000000000 + -398 -131 rmoveto + 0 -239 rlineto + 81 -16 rlineto + 0 255 rlineto + hintmask 01000000000010010000010000000000 + -38 -91 rmoveto + 0 -52 rlineto + 385 0 rlineto + 0 52 rlineto + -735 643 rmoveto + 0 -58 rlineto + 799 0 rlineto + 0 58 rlineto + hintmask 00000000000010100000000000000000 + -836 0 rmoveto + 0 -131 rlineto + 0 -79 -10 -102 -76 -77 rrcurveto + 17 -9 31 -26 11 -14 rrcurveto + 84 85 17 127 0 94 rrcurveto + 0 132 rlineto + hintmask 00000000010100001000000000000000 + 153 -48 rmoveto + 0 -167 rlineto + hintmask 00000000010100000100000000000000 + 67 0 rlineto + 0 167 rlineto + hintmask 00000000101000000001000000000000 + -32 -51 rmoveto + 0 -42 rlineto + 181 0 rlineto + 0 42 rlineto + -355 -89 rmoveto + 0 -47 rlineto + 388 0 rlineto + 0 47 rlineto + hintmask 00000011000000000100000000000000 + -233 -16 rmoveto + 0 -137 rlineto + 0 -8 -2 -3 -10 -1 rrcurveto + -9 0 -26 0 -34 1 rrcurveto + 9 -15 12 -21 4 -17 rrcurveto + hintmask 00000011000001000010001000000000 + 45 0 31 0 22 9 rrcurveto + 23 9 5 13 0 32 rrcurveto + 0 138 rlineto + -171 -49 rmoveto + -19 -39 -33 -36 -39 -29 rrcurveto + 14 -7 23 -16 10 -9 rrcurveto + 38 30 38 47 23 46 rrcurveto + 140 -8 rmoveto + 27 -24 29 -33 13 -24 rrcurveto + 47 24 rlineto + -14 24 -30 33 -27 21 rrcurveto + 62 339 rmoveto + hintmask 10000101000001000000001010000000 + 17 -280 136 -219 157 0 rrcurveto + 64 0 29 31 11 118 rrcurveto + -19 6 -25 13 -17 15 rrcurveto + -4 -81 -9 -30 -26 0 rrcurveto + -108 -2 -118 185 -14 244 rrcurveto + 170 -173 rmoveto + -57 -121 -107 -100 -119 -63 rrcurveto + 15 -11 26 -24 11 -13 rrcurveto + 119 70 113 109 65 135 rrcurveto + -176 151 rmoveto + 51 -16 63 -26 34 -21 rrcurveto + 36 47 rlineto + -35 21 -64 24 -50 13 rrcurveto + -452 -751 rmoveto + -56 -23 rlineto + 84 -121 133 -22 225 0 rrcurveto + 206 0 rlineto + 66 0 rlineto + 4 19 11 31 10 16 rrcurveto + -51 -1 -208 0 -36 0 rrcurveto + -190 0 -132 13 -66 88 rrcurveto + -45 52 rmoveto + -25 -90 -77 -59 -100 -35 rrcurveto + 18 -12 30 -28 12 -14 rrcurveto + 103 45 87 72 31 112 rrcurveto + endchar + + + 1000 -77 75 369 68 105 68 29 132 -73 73 -73 150 hstemhm + 152 80 -37 37 55 80 -32 78 215 81 92 80 -18 75 hintmask 1110100101110000 + 57 769 rmoveto + 0 -73 rlineto + 889 0 rlineto + 0 73 rlineto + hintmask 0000010010000000 + -659 77 rmoveto + hintmask 0001000010000000 + 0 -209 rlineto + 80 0 rlineto + hintmask 0000010010100000 + 0 209 rlineto + 261 0 rmoveto + hintmask 0001000000100000 + 0 -209 rlineto + 81 0 rlineto + hintmask 0010011000100000 + 0 209 rlineto + -557 -238 rmoveto + 0 -211 rlineto + 0 -132 -12 -179 -110 -128 rrcurveto + 19 -9 34 -24 15 -14 rrcurveto + hintmask 1110000101010000 + 115 135 19 205 0 145 rrcurveto + 0 212 rlineto + -37 0 rmoveto + 0 -68 rlineto + 606 0 rlineto + 0 -105 rlineto + -606 0 rlineto + 0 -68 rlineto + 686 0 rlineto + 0 241 rlineto + -546 -272 rmoveto + 0 -293 rlineto + 0 -95 37 -25 134 0 rrcurveto + 28 0 219 0 30 0 rrcurveto + hintmask 1000000001001000 + 116 0 26 35 13 137 rrcurveto + -22 5 -34 12 -19 13 rrcurveto + -7 -109 -10 -18 -66 0 rrcurveto + -49 0 -187 0 -37 0 rrcurveto + -80 0 -14 8 0 38 rrcurveto + 0 292 rlineto + 385 -21 rmoveto + -97 -49 -177 -47 -157 -32 rrcurveto + 9 -17 12 -28 4 -18 rrcurveto + 164 31 185 46 125 56 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w440.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w440.00.otf deleted file mode 100644 index e2fc27858..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w440.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w440.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w440.00.ttx new file mode 100644 index 000000000..b0a8ffa65 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w440.00.ttx @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w440.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w440.00 + + + SHSansJPVF w440.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w440.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -69 66 68 52 53 39 -39 51 67 51 8 72 -64 52 118 31 -31 47 -27 27 47 42 -42 93 -10 58 -58 144 hstemhm + 115 75 -38 38 152 67 -51 51 -51 70 -51 32 50 81 -38 38 19 74 141 83 55 61 hintmask 00011000000000000000000100000000 + 234 288 rmoveto + 540 0 rlineto + 0 -67 rlineto + -540 0 rlineto + -78 118 rmoveto + 0 -169 rlineto + 701 0 rlineto + 0 169 rlineto + hintmask 00100000000000000000100000000000 + -398 -130 rmoveto + 0 -240 rlineto + 81 -16 rlineto + 0 256 rlineto + hintmask 01000000000010010000010000000000 + -38 -92 rmoveto + 0 -52 rlineto + 385 0 rlineto + 0 52 rlineto + -735 643 rmoveto + 0 -58 rlineto + 799 0 rlineto + 0 58 rlineto + hintmask 00000000000010100000000000000000 + -836 0 rmoveto + 0 -131 rlineto + 0 -79 -10 -101 -76 -78 rrcurveto + 17 -9 31 -26 11 -14 rrcurveto + 84 85 18 127 0 94 rrcurveto + 0 132 rlineto + hintmask 00000000010100001000000000000000 + 152 -48 rmoveto + 0 -167 rlineto + hintmask 00000000010100000100000000000000 + 67 0 rlineto + 0 167 rlineto + hintmask 00000000101000000001000000000000 + -32 -51 rmoveto + 0 -42 rlineto + 181 0 rlineto + 0 42 rlineto + -355 -89 rmoveto + 0 -47 rlineto + 388 0 rlineto + 0 47 rlineto + hintmask 00000011000000000100000000000000 + -233 -16 rmoveto + 0 -137 rlineto + 0 -8 -2 -3 -10 -1 rrcurveto + -9 0 -26 0 -34 1 rrcurveto + 9 -15 12 -21 4 -17 rrcurveto + hintmask 00000011000001000010001000000000 + 45 0 31 0 23 9 rrcurveto + 22 9 5 13 0 32 rrcurveto + 0 138 rlineto + -171 -49 rmoveto + -19 -39 -33 -36 -39 -29 rrcurveto + 14 -7 23 -16 10 -9 rrcurveto + 38 30 38 47 23 46 rrcurveto + 140 -8 rmoveto + 30 -29 32 -40 14 -28 rrcurveto + 48 23 rlineto + -15 28 -33 40 -30 26 rrcurveto + 61 340 rmoveto + hintmask 10000101000001000000001010000000 + 17 -280 136 -219 157 0 rrcurveto + 64 0 29 31 11 118 rrcurveto + -19 6 -25 13 -17 15 rrcurveto + -4 -81 -9 -30 -26 0 rrcurveto + -108 -1 -118 184 -14 244 rrcurveto + 170 -173 rmoveto + -42 -107 -79 -95 -91 -61 rrcurveto + 16 -11 27 -25 11 -13 rrcurveto + 91 68 86 106 49 120 rrcurveto + -178 151 rmoveto + 51 -16 63 -26 34 -21 rrcurveto + 36 47 rlineto + -35 21 -64 24 -50 13 rrcurveto + -452 -751 rmoveto + -56 -23 rlineto + 84 -121 133 -22 225 0 rrcurveto + 206 0 rlineto + 66 0 rlineto + 3 19 12 31 10 16 rrcurveto + -51 -1 -208 0 -36 0 rrcurveto + -190 0 -132 13 -66 88 rrcurveto + -45 52 rmoveto + -25 -90 -77 -59 -100 -35 rrcurveto + 18 -12 30 -28 12 -14 rrcurveto + 103 45 87 72 31 112 rrcurveto + endchar + + + 1000 -77 75 369 68 105 68 27 134 -73 73 -73 150 hstemhm + 152 80 -37 37 55 80 -32 78 215 81 92 80 -19 76 hintmask 1110100101110000 + 57 769 rmoveto + 0 -73 rlineto + 889 0 rlineto + 0 73 rlineto + hintmask 0000010010000000 + -659 77 rmoveto + hintmask 0001000010000000 + 0 -211 rlineto + 80 0 rlineto + hintmask 0000010010100000 + 0 211 rlineto + 261 0 rmoveto + hintmask 0001000000100000 + 0 -211 rlineto + 81 0 rlineto + hintmask 0010011000100000 + 0 211 rlineto + -557 -238 rmoveto + 0 -211 rlineto + 0 -132 -12 -179 -110 -128 rrcurveto + 19 -9 34 -24 15 -14 rrcurveto + hintmask 1110000101010000 + 115 135 19 205 0 145 rrcurveto + 0 212 rlineto + -37 0 rmoveto + 0 -68 rlineto + 606 0 rlineto + 0 -105 rlineto + -606 0 rlineto + 0 -68 rlineto + 686 0 rlineto + 0 241 rlineto + -546 -272 rmoveto + 0 -293 rlineto + 0 -95 37 -25 134 0 rrcurveto + 28 0 219 0 30 0 rrcurveto + hintmask 1000000001001000 + 116 0 26 35 13 137 rrcurveto + -22 5 -34 12 -20 13 rrcurveto + -6 -109 -11 -18 -65 0 rrcurveto + -49 0 -187 0 -37 0 rrcurveto + -80 0 -14 8 0 38 rrcurveto + 0 292 rlineto + 385 -21 rmoveto + -97 -49 -177 -47 -157 -32 rrcurveto + 9 -17 12 -28 4 -18 rrcurveto + 164 31 185 46 125 56 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w599.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w599.00.otf deleted file mode 100644 index 7d04d426a..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w599.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w599.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w599.00.ttx new file mode 100644 index 000000000..65809d407 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w599.00.ttx @@ -0,0 +1,487 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w599.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w599.00 + + + SHSansJPVF w599.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w599.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 100 82 -54 54 94 80 -80 158 21 71 85 67 66 66 hstemhm + 138 94 95 81 -45 45 51 90 -21 76 -48 71 -71 178 -81 81 -45 45 122 77 -44 71 hintmask 011011111011001010000000 + 327 810 rmoveto + 0 -256 rlineto + 0 -78 22 -21 79 0 rrcurveto + hintmask 000010000000100000000000 + 17 0 74 0 17 0 rrcurveto + 61 0 22 23 8 84 rrcurveto + hintmask 101010101000010000000000 + -22 5 -32 11 -17 13 rrcurveto + -3 -56 -4 -9 -22 0 rrcurveto + -15 0 -60 0 -12 0 rrcurveto + -28 0 -4 4 0 25 rrcurveto + 0 255 rlineto + -81 -454 rmoveto + 0 -80 rlineto + 612 0 rlineto + 0 80 rlineto + -650 -174 rmoveto + 0 -82 rlineto + 678 0 rlineto + 0 82 rlineto + hintmask 010101100111001000000000 + -508 252 rmoveto + 0 -306 rlineto + 90 0 rlineto + 0 306 rlineto + 157 -1 rmoveto + 0 -306 rlineto + 91 0 rlineto + 0 306 rlineto + -434 377 rmoveto + 0 -66 rlineto + 165 0 rlineto + 0 -66 rlineto + -165 0 rlineto + 0 -67 rlineto + 241 0 rlineto + 0 199 rlineto + 49 0 rmoveto + hintmask 000010100000001001000000 + 0 -256 rlineto + 0 -78 22 -21 80 0 rrcurveto + 17 0 78 0 18 0 rrcurveto + 61 0 23 23 8 84 rrcurveto + -23 5 -31 11 -17 13 rrcurveto + -3 -56 -5 -9 -22 0 rrcurveto + -17 0 -63 0 -12 0 rrcurveto + -29 0 -4 4 0 25 rrcurveto + 0 255 rlineto + hintmask 000001110000000110000000 + -45 0 rmoveto + 0 -66 rlineto + 167 0 rlineto + 0 -66 rlineto + -167 0 rlineto + 0 -67 rlineto + 244 0 rlineto + 0 199 rlineto + -443 -726 rmoveto + -45 -45 -86 -38 -83 -24 rrcurveto + 21 -16 35 -35 15 -18 rrcurveto + 84 32 96 54 55 61 rrcurveto + 108 -12 rmoveto + 70 -36 85 -56 42 -38 rrcurveto + 82 52 rlineto + -46 39 -88 53 -69 32 rrcurveto + -547 756 rmoveto + -47 -152 -77 -150 -85 -98 rrcurveto + 16 -26 26 -56 8 -24 rrcurveto + 102 120 91 184 58 176 rrcurveto + -173 -237 rmoveto + 0 -671 rlineto + 94 0 rlineto + 0 761 rlineto + -2 2 rlineto + endchar + + + 1000 -81 75 160 76 101 76 -34 34 96 76 -76 147 -99 90 -82 82 32 84 -84 176 -141 49 hstemhm + 43 218 -92 92 -92 181 16 89 -42 42 -29 29 34 83 -45 45 48 93 -1 84 73 85 -48 73 hintmask 000000100001000000000000 + 43 641 rmoveto + 0 -90 rlineto + hintmask 000000100000010000000000 + 307 0 rlineto + 0 90 rlineto + hintmask 000000010010100100000000 + -181 208 rmoveto + 0 -937 rlineto + 92 0 rlineto + 0 937 rlineto + -91 -270 rmoveto + -25 -135 -61 -170 -64 -94 rrcurveto + 15 -23 23 -38 10 -27 rrcurveto + 71 107 62 201 31 159 rrcurveto + 23 -66 rmoveto + -44 -50 rlineto + 26 -41 60 -98 23 -51 rrcurveto + 52 87 rlineto + -16 24 -80 106 -21 23 rrcurveto + 158 264 rmoveto + hintmask 000000001000000100000000 + 0 -84 rlineto + 542 0 rlineto + hintmask 010000000010000000100000 + 0 84 rlineto + -428 -527 rmoveto + 0 -76 rlineto + 159 0 rlineto + 0 76 rlineto + hintmask 000000000100000001010000 + -197 78 rmoveto + 0 -327 rlineto + 83 0 rlineto + 0 327 rlineto + 48 541 rmoveto + hintmask 000000000010000000010000 + 0 -141 rlineto + 93 0 rlineto + hintmask 000101000100000000010000 + 0 141 rlineto + -175 -199 rmoveto + 0 -277 rlineto + 80 0 rlineto + 0 277 rlineto + 86 0 rmoveto + 0 -277 rlineto + 80 0 rlineto + 0 277 rlineto + 126 -375 rmoveto + -45 -34 -75 -45 -50 -25 rrcurveto + 40 -60 rlineto + 52 24 74 38 51 39 rrcurveto + hintmask 101010000000000010001100 + -531 367 rmoveto + 0 -76 rlineto + 443 0 rlineto + 0 -96 rlineto + -443 0 rlineto + 0 -76 rlineto + 528 0 rlineto + 0 248 rlineto + -242 -270 rmoveto + 0 -286 rlineto + 0 -80 18 -24 76 0 rrcurveto + hintmask 100000000010001000001010 + 15 0 53 0 16 0 rrcurveto + 60 0 21 29 8 113 rrcurveto + -23 6 -34 12 -16 14 rrcurveto + -3 -86 -4 -13 -19 0 rrcurveto + -11 0 -41 0 -9 0 rrcurveto + -20 0 -3 4 0 26 rrcurveto + 0 285 rlineto + -370 -306 rmoveto + 13 -85 rlineto + 75 13 91 16 89 16 rrcurveto + -5 81 rlineto + -99 -16 -96 -16 -68 -9 rrcurveto + -60 754 rmoveto + 0 -322 rlineto + 0 -142 -5 -196 -72 -135 rrcurveto + 21 -10 38 -27 16 -16 rrcurveto + 79 146 12 226 0 154 rrcurveto + 0 322 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w600.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w600.00.otf deleted file mode 100644 index 1a44a4ae3..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w600.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w600.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w600.00.ttx new file mode 100644 index 000000000..e0b217f80 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w600.00.ttx @@ -0,0 +1,487 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w600.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w600.00 + + + SHSansJPVF w600.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w600.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 104 85 -31 31 103 84 -84 185 -22 71 85 67 66 66 hstemhm + 138 94 95 81 -45 45 49 92 -21 76 -48 71 -71 178 -81 81 -45 45 122 77 -44 71 hintmask 011011111011001010000000 + 327 810 rmoveto + 0 -256 rlineto + 0 -78 22 -21 79 0 rrcurveto + hintmask 000010000000100000000000 + 17 0 74 0 17 0 rrcurveto + 61 0 22 23 8 84 rrcurveto + hintmask 101010101000010000000000 + -22 5 -32 11 -17 13 rrcurveto + -3 -56 -4 -9 -22 0 rrcurveto + -15 0 -60 0 -12 0 rrcurveto + -28 0 -4 4 0 25 rrcurveto + 0 255 rlineto + -89 -434 rmoveto + 0 -84 rlineto + 624 0 rlineto + 0 84 rlineto + -654 -187 rmoveto + 0 -85 rlineto + 678 0 rlineto + 0 85 rlineto + hintmask 010101100111001000000000 + -510 288 rmoveto + 0 -319 rlineto + 92 0 rlineto + 0 319 rlineto + 157 -1 rmoveto + 0 -319 rlineto + 92 0 rlineto + 0 319 rlineto + -435 334 rmoveto + 0 -66 rlineto + 165 0 rlineto + 0 -66 rlineto + -165 0 rlineto + 0 -67 rlineto + 241 0 rlineto + 0 199 rlineto + 49 0 rmoveto + hintmask 000010100000001001000000 + 0 -256 rlineto + 0 -78 22 -21 80 0 rrcurveto + 17 0 78 0 18 0 rrcurveto + 61 0 23 24 8 85 rrcurveto + -22 5 -32 11 -17 13 rrcurveto + -3 -57 -5 -10 -22 0 rrcurveto + -17 0 -63 0 -12 0 rrcurveto + -29 0 -4 4 0 26 rrcurveto + 0 254 rlineto + hintmask 000001110000000110000000 + -45 0 rmoveto + 0 -66 rlineto + 167 0 rlineto + 0 -66 rlineto + -167 0 rlineto + 0 -67 rlineto + 244 0 rlineto + 0 199 rlineto + -443 -726 rmoveto + -45 -45 -86 -38 -83 -24 rrcurveto + 21 -16 35 -35 15 -18 rrcurveto + 84 32 96 54 55 61 rrcurveto + 108 -12 rmoveto + 70 -36 85 -56 42 -38 rrcurveto + 82 52 rlineto + -46 39 -88 53 -69 32 rrcurveto + -547 756 rmoveto + -47 -152 -77 -150 -85 -98 rrcurveto + 16 -26 26 -56 8 -24 rrcurveto + 102 120 91 184 58 176 rrcurveto + -173 -237 rmoveto + 0 -671 rlineto + 94 0 rlineto + 0 761 rlineto + -2 2 rlineto + endchar + + + 1000 -81 75 157 76 92 78 -14 14 109 78 -78 178 -133 90 -82 82 32 84 -84 176 -141 49 hstemhm + 43 218 -92 92 -92 181 16 89 -42 42 -29 29 34 83 -45 45 48 93 -1 84 73 85 -48 73 hintmask 000000100001000000000000 + 43 641 rmoveto + 0 -90 rlineto + hintmask 000000100000010000000000 + 307 0 rlineto + 0 90 rlineto + hintmask 000000010010100100000000 + -181 208 rmoveto + 0 -937 rlineto + 92 0 rlineto + 0 937 rlineto + -91 -270 rmoveto + -25 -135 -61 -170 -64 -94 rrcurveto + 15 -23 23 -38 10 -27 rrcurveto + 71 107 62 201 31 159 rrcurveto + 23 -66 rmoveto + -44 -50 rlineto + 26 -41 60 -98 23 -51 rrcurveto + 52 87 rlineto + -16 24 -80 106 -21 23 rrcurveto + 158 264 rmoveto + hintmask 000000001000000100000000 + 0 -84 rlineto + 545 0 rlineto + hintmask 010000000010000000100000 + 0 84 rlineto + -431 -530 rmoveto + 0 -76 rlineto + 159 0 rlineto + 0 76 rlineto + hintmask 000000000100000001010000 + -197 115 rmoveto + 0 -356 rlineto + 83 0 rlineto + 0 356 rlineto + 48 507 rmoveto + hintmask 000000000010000000010000 + 0 -141 rlineto + 93 0 rlineto + hintmask 000101000100000000010000 + 0 141 rlineto + -175 -165 rmoveto + 0 -301 rlineto + 80 0 rlineto + 0 301 rlineto + 84 0 rmoveto + 0 -301 rlineto + 80 0 rlineto + 0 301 rlineto + 128 -409 rmoveto + -45 -34 -75 -45 -50 -25 rrcurveto + 40 -60 rlineto + 52 24 74 38 51 39 rrcurveto + hintmask 101010000000000010001100 + -531 372 rmoveto + 0 -78 rlineto + 443 0 rlineto + 0 -109 rlineto + -443 0 rlineto + 0 -78 rlineto + 528 0 rlineto + 0 265 rlineto + -242 -241 rmoveto + 0 -318 rlineto + 0 -82 18 -24 76 0 rrcurveto + hintmask 100000000010001000001010 + 15 0 53 0 16 0 rrcurveto + 60 0 21 30 8 112 rrcurveto + -23 5 -33 13 -17 14 rrcurveto + -3 -85 -4 -14 -19 0 rrcurveto + -10 0 -42 0 -9 0 rrcurveto + -20 0 -3 4 0 26 rrcurveto + 0 319 rlineto + -370 -340 rmoveto + 13 -85 rlineto + 75 13 91 16 89 16 rrcurveto + -5 81 rlineto + -99 -16 -96 -16 -68 -9 rrcurveto + -60 754 rmoveto + 0 -322 rlineto + 0 -142 -5 -196 -72 -135 rrcurveto + 21 -10 38 -27 16 -16 rrcurveto + 79 146 12 226 0 154 rrcurveto + 0 322 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w669.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w669.00.otf deleted file mode 100644 index 0f297c14f..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w669.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w669.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w669.00.ttx new file mode 100644 index 000000000..94831b49e --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w669.00.ttx @@ -0,0 +1,492 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w669.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w669.00 + + + SHSansJPVF w669.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w669.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -80 89 189 69 50 65 49 69 44 86 75 89 -87 143 -117 61 hstemhm + 173 105 9 108 48 111 94 94 -15 110 hintmask 1111100011111000 + 287 149 rmoveto + 0 -111 rlineto + 0 -92 30 -26 122 0 rrcurveto + 25 0 118 0 26 0 rrcurveto + 92 0 30 27 12 114 rrcurveto + -29 6 -43 14 -22 15 rrcurveto + -5 -76 -6 -11 -39 0 rrcurveto + -29 0 -96 0 -22 0 rrcurveto + -48 0 -8 4 0 26 rrcurveto + 0 110 rlineto + -11 9 rmoveto + 58 -25 71 -42 34 -31 rrcurveto + 68 69 rlineto + -38 30 -73 39 -57 22 rrcurveto + 271 -96 rmoveto + 64 -55 70 -79 29 -54 rrcurveto + 92 54 rlineto + -33 56 -73 75 -63 51 rrcurveto + -642 -11 rmoveto + -23 -67 -47 -66 -64 -39 rrcurveto + 86 -59 rlineto + 72 47 41 75 29 75 rrcurveto + -143 667 rmoveto + 0 -87 rlineto + 772 0 rlineto + 0 87 rlineto + -819 -164 rmoveto + 0 -86 rlineto + 872 0 rlineto + 0 86 rlineto + hintmask 0000001000100000 + -495 220 rmoveto + hintmask 0000000100100000 + 0 -117 rlineto + 111 0 rlineto + hintmask 0000001000100000 + 0 117 rlineto + hintmask 0111010010001000 + -296 -145 rmoveto + 14 -30 15 -40 5 -25 rrcurveto + 105 24 rlineto + -7 25 -15 38 -16 28 rrcurveto + 281 1 rmoveto + -9 -26 -18 -38 -13 -27 rrcurveto + 97 -22 rlineto + 16 23 20 31 22 36 rrcurveto + -477 -386 rmoveto + 449 0 rlineto + 0 -50 rlineto + -449 0 rlineto + 0 164 rmoveto + 449 0 rlineto + 0 -49 rlineto + -449 0 rlineto + -105 118 rmoveto + 0 -302 rlineto + 664 0 rlineto + 0 302 rlineto + endchar + + + 1000 -90 68 42 76 -74 74 -72 72 -57 57 -29 29 -27 27 30 43 30 43 29 37 -37 53 32 72 -47 47 32 18 -18 56 -46 46 35 54 34 56 -25 134 -74 74 -74 120 hstemhm + 165 101 -57 105 -36 36 2 84 54 99 58 109 15 106 -46 35 hintmask 10000011101100101101000101110000 + 57 804 rmoveto + 0 -74 rlineto + 886 0 rlineto + 0 74 rlineto + hintmask 00000000000000000000100000000000 + -665 46 rmoveto + hintmask 00000000000000000010000000000000 + 0 -180 rlineto + 107 0 rlineto + hintmask 00000000000000000000100000100000 + 0 180 rlineto + 226 0 rmoveto + hintmask 00000000000000000010000000100000 + 0 -180 rlineto + 109 0 rlineto + hintmask 00000000000100101100110000110000 + 0 180 rlineto + -454 -299 rmoveto + 469 0 rlineto + 0 -35 rlineto + -469 0 rlineto + 0 123 rmoveto + 469 0 rlineto + 0 -34 rlineto + -469 0 rlineto + -101 90 rmoveto + 0 -235 rlineto + 676 0 rlineto + 0 235 rlineto + -798 -267 rmoveto + 0 -72 rlineto + 915 0 rlineto + 0 72 rlineto + hintmask 00000001100000000000000100000000 + -680 -186 rmoveto + 0 -43 rlineto + 495 0 rlineto + 0 43 rlineto + -495 -73 rmoveto + 0 -43 rlineto + 507 0 rlineto + 0 43 rlineto + hintmask 00000010000000000000001000000000 + -576 -73 rmoveto + hintmask 00001000000000000000001000001000 + 0 -57 rlineto + 621 0 rlineto + hintmask 00000010000001000000000000001000 + 0 57 rlineto + -501 390 rmoveto + -40 -97 -96 -93 -170 -59 rrcurveto + 19 -16 28 -36 11 -24 rrcurveto + hintmask 00000100010010010000000001000000 + 186 73 105 107 58 129 rrcurveto + 274 -62 rmoveto + -80 -27 rlineto + 64 -94 111 -79 120 -37 rrcurveto + 14 26 29 37 21 20 rrcurveto + -114 26 -110 58 -55 70 rrcurveto + -250 -100 rmoveto + 0 -241 rlineto + 99 0 rlineto + 0 241 rlineto + hintmask 10000010000000000000000000001000 + 242 -212 rmoveto + 0 -10 rlineto + -6 -63 -8 -28 -9 -9 rrcurveto + -6 -7 -6 -1 -10 0 rrcurveto + -10 0 -21 1 -25 3 rrcurveto + 11 -19 8 -32 1 -22 rrcurveto + 35 -1 32 1 17 1 rrcurveto + 21 2 18 6 15 14 rrcurveto + 19 18 9 38 9 74 rrcurveto + 2 13 2 21 0 0 rrcurveto + -717 -42 rmoveto + -16 -39 -32 -41 -41 -23 rrcurveto + 76 -45 rlineto + hintmask 10010000000000000000000000000000 + 48 28 27 44 18 46 rrcurveto + hintmask 00100000000000000000000010000000 + 43 -2 rmoveto + 10 -34 8 -47 -1 -29 rrcurveto + 84 14 rlineto + -1 28 -10 46 -12 33 rrcurveto + hintmask 01000000000000000000000000100000 + 57 -13 rmoveto + 22 -30 21 -41 8 -28 rrcurveto + 76 25 rlineto + -10 28 -21 39 -24 28 rrcurveto + hintmask 00010000001000000000001000000000 + 72 -22 rmoveto + 24 -21 27 -32 11 -22 rrcurveto + 65 34 rlineto + -12 22 -29 30 -25 20 rrcurveto + -342 274 rmoveto + -49 -53 rlineto + 456 0 rlineto + 0 53 rlineto + -495 -37 rmoveto + hintmask 00000010000000000000001000000000 + 0 -218 rlineto + hintmask 00000010001000000000000100000000 + 105 0 rlineto + 0 257 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w670.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w670.00.otf deleted file mode 100644 index 4ff327201..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w670.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w670.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w670.00.ttx new file mode 100644 index 000000000..eff2eec21 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w670.00.ttx @@ -0,0 +1,492 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w670.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w670.00 + + + SHSansJPVF w670.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w670.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -80 87 191 68 52 64 50 68 44 84 77 87 -84 142 -117 59 hstemhm + 174 102 12 104 53 108 96 92 -11 106 hintmask 1111100011111000 + 288 149 rmoveto + 0 -113 rlineto + 0 -90 29 -26 121 0 rrcurveto + 24 0 121 0 26 0 rrcurveto + 91 0 29 28 12 113 rrcurveto + -28 6 -42 14 -22 14 rrcurveto + -5 -77 -6 -11 -39 0 rrcurveto + -29 0 -99 0 -22 0 rrcurveto + -48 0 -9 4 0 26 rrcurveto + 0 112 rlineto + -8 10 rmoveto + 59 -26 71 -42 34 -31 rrcurveto + 66 67 rlineto + -38 31 -73 39 -58 22 rrcurveto + 274 -95 rmoveto + 64 -54 70 -79 30 -54 rrcurveto + 89 52 rlineto + -33 56 -73 75 -64 51 rrcurveto + -638 -11 rmoveto + -24 -67 -46 -66 -65 -39 rrcurveto + 83 -57 rlineto + 73 46 41 75 28 76 rrcurveto + -141 664 rmoveto + 0 -84 rlineto + 772 0 rlineto + 0 84 rlineto + -819 -164 rmoveto + 0 -84 rlineto + 872 0 rlineto + 0 84 rlineto + hintmask 0000001000100000 + -493 222 rmoveto + hintmask 0000000100100000 + 0 -117 rlineto + 108 0 rlineto + hintmask 0000001000100000 + 0 117 rlineto + hintmask 0111010010001000 + -294 -145 rmoveto + 15 -30 14 -40 5 -26 rrcurveto + 102 24 rlineto + -6 25 -16 39 -16 28 rrcurveto + 285 1 rmoveto + -9 -27 -19 -38 -13 -28 rrcurveto + 95 -21 rlineto + 16 24 19 31 23 37 rrcurveto + -478 -386 rmoveto + 454 0 rlineto + 0 -52 rlineto + -454 0 rlineto + 0 166 rmoveto + 454 0 rlineto + 0 -50 rlineto + -454 0 rlineto + -102 118 rmoveto + 0 -302 rlineto + 662 0 rlineto + 0 302 rlineto + endchar + + + 1000 -89 66 44 75 -73 73 -71 71 -56 56 -29 29 -27 27 31 42 31 43 29 37 -37 52 33 70 -46 46 33 18 -18 55 -45 45 36 53 35 55 -24 132 -72 72 -72 120 hstemhm + 166 99 -55 101 -34 34 7 81 57 95 62 106 18 103 -44 34 hintmask 10000011101100101101000101110000 + 57 802 rmoveto + 0 -72 rlineto + 886 0 rlineto + 0 72 rlineto + hintmask 00000000000000000000100000000000 + -664 48 rmoveto + hintmask 00000000000000000010000000000000 + 0 -180 rlineto + 105 0 rlineto + hintmask 00000000000000000000100000100000 + 0 180 rlineto + 229 0 rmoveto + hintmask 00000000000000000010000000100000 + 0 -180 rlineto + 106 0 rlineto + hintmask 00000000000100101100110000110000 + 0 180 rlineto + -454 -299 rmoveto + 472 0 rlineto + 0 -36 rlineto + -472 0 rlineto + 0 124 rmoveto + 472 0 rlineto + 0 -35 rlineto + -472 0 rlineto + -99 90 rmoveto + 0 -234 rlineto + 674 0 rlineto + 0 234 rlineto + -797 -267 rmoveto + 0 -70 rlineto + 915 0 rlineto + 0 70 rlineto + hintmask 00000001100000000000000100000000 + -681 -184 rmoveto + 0 -43 rlineto + 497 0 rlineto + 0 43 rlineto + -497 -74 rmoveto + 0 -42 rlineto + 508 0 rlineto + 0 42 rlineto + hintmask 00000010000000000000001000000000 + -575 -73 rmoveto + hintmask 00001000000000000000001000001000 + 0 -56 rlineto + 620 0 rlineto + hintmask 00000010000001000000000000001000 + 0 56 rlineto + -499 390 rmoveto + -41 -98 -96 -93 -171 -59 rrcurveto + 19 -16 28 -35 10 -23 rrcurveto + hintmask 00000100010010010000000001000000 + 186 73 105 107 58 128 rrcurveto + 274 -62 rmoveto + -78 -27 rlineto + 64 -93 112 -79 120 -37 rrcurveto + 13 25 28 36 21 19 rrcurveto + -114 26 -110 60 -56 70 rrcurveto + -247 -99 rmoveto + 0 -242 rlineto + 95 0 rlineto + 0 242 rlineto + hintmask 10000010000000000000000000001000 + 245 -213 rmoveto + 0 -10 rlineto + -6 -64 -7 -28 -10 -9 rrcurveto + -6 -7 -6 -1 -10 0 rrcurveto + -10 0 -21 1 -25 2 rrcurveto + 10 -18 8 -31 1 -21 rrcurveto + 34 -1 32 0 18 2 rrcurveto + 21 1 17 6 15 14 rrcurveto + 18 18 10 38 9 75 rrcurveto + 2 12 1 21 0 0 rrcurveto + -714 -42 rmoveto + -16 -39 -32 -41 -41 -23 rrcurveto + 74 -45 rlineto + hintmask 10010000000000000000000000000000 + 47 29 28 44 17 46 rrcurveto + hintmask 00100000000000000000000010000000 + 46 -2 rmoveto + 10 -35 8 -46 0 -29 rrcurveto + 81 13 rlineto + -1 28 -9 46 -13 34 rrcurveto + hintmask 01000000000000000000000000100000 + 60 -13 rmoveto + 22 -30 20 -42 8 -28 rrcurveto + 74 25 rlineto + -9 28 -22 40 -23 28 rrcurveto + hintmask 00010000001000000000001000000000 + 73 -21 rmoveto + 24 -22 27 -32 12 -22 rrcurveto + 63 33 rlineto + -12 22 -29 30 -25 21 rrcurveto + -343 273 rmoveto + -48 -52 rlineto + 457 0 rlineto + 0 52 rlineto + -495 -37 rmoveto + hintmask 00000010000000000000001000000000 + 0 -218 rlineto + hintmask 00000010001000000000000100000000 + 101 0 rlineto + 0 257 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w799.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w799.00.otf deleted file mode 100644 index 2bd65d9d4..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w799.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w799.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w799.00.ttx new file mode 100644 index 000000000..cfccfa21f --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w799.00.ttx @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w799.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w799.00 + + + SHSansJPVF w799.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w799.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -71 96 -48 48 50 85 -35 105 -23 86 -86 140 17 84 240 88 -34 34 -9 42 hstemhm + 69 107 88 108 -103 37 307 114 82 34 hintmask 1010101101110110 + 552 776 rmoveto + 0 -88 rlineto + 291 0 rlineto + 0 88 rlineto + -382 -483 rmoveto + 0 -86 rlineto + 463 0 rlineto + 0 86 rlineto + -426 155 rmoveto + 0 -84 rlineto + 349 0 rlineto + 0 84 rlineto + -480 -423 rmoveto + 0 -96 rlineto + 597 0 rlineto + 0 96 rlineto + -516 135 rmoveto + 0 -85 rlineto + 456 0 rlineto + 0 85 rlineto + -95 616 rmoveto + 0 -16 rlineto + -72 -134 -195 -99 -195 -40 rrcurveto + 22 -23 25 -43 12 -27 rrcurveto + hintmask 0000000010000010 + 213 54 207 110 96 184 rrcurveto + hintmask 0100010100000110 + -74 39 rlineto + -18 -5 rlineto + -268 -57 rmoveto + -93 -34 rlineto + 94 -142 159 -95 200 -40 rrcurveto + 15 29 30 44 24 22 rrcurveto + -191 29 -160 77 -78 110 rrcurveto + 13 136 rmoveto + -38 -74 -73 -81 -110 -59 rrcurveto + 24 -16 36 -39 16 -25 rrcurveto + 123 76 80 93 58 104 rrcurveto + -235 -472 rmoveto + -21 -62 -36 -63 -46 -42 rrcurveto + 24 -13 41 -26 20 -16 rrcurveto + 46 48 45 76 26 74 rrcurveto + 58 9 rmoveto + 0 -370 rlineto + 114 0 rlineto + 0 370 rlineto + hintmask 0000000000101000 + -658 462 rmoveto + 0 -902 rlineto + 107 0 rlineto + 0 792 rlineto + 130 0 rlineto + 0 110 rlineto + -37 0 rmoveto + 0 -36 rlineto + -14 -65 -32 -143 -29 -91 rrcurveto + hintmask 0001000000010000 + 57 -68 13 -64 0 -46 rrcurveto + 0 -30 -5 -20 -12 -9 rrcurveto + -7 -6 -11 -3 -10 0 rrcurveto + -13 0 -13 0 -18 2 rrcurveto + 18 -30 9 -46 1 -29 rrcurveto + 23 -1 24 0 18 2 rrcurveto + 22 4 20 7 16 12 rrcurveto + 32 22 14 43 0 66 rrcurveto + 0 59 -13 70 -62 78 rrcurveto + hintmask 0000000001001000 + 29 80 34 112 27 88 rrcurveto + hintmask 0000000000001000 + -80 46 rlineto + -18 -4 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w800.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w800.00.otf deleted file mode 100644 index 9f86e1250..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w800.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w800.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w800.00.ttx new file mode 100644 index 000000000..765a381d0 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w800.00.ttx @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w800.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w800.00 + + + SHSansJPVF w800.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w800.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -71 96 -27 27 50 85 -35 105 -23 86 -86 161 -8 84 248 88 -34 34 -13 42 hstemhm + 69 107 88 108 -103 37 307 114 82 34 hintmask 1010101101110110 + 552 780 rmoveto + 0 -88 rlineto + 291 0 rlineto + 0 88 rlineto + -382 -487 rmoveto + 0 -86 rlineto + 463 0 rlineto + 0 86 rlineto + -426 151 rmoveto + 0 -84 rlineto + 349 0 rlineto + 0 84 rlineto + -480 -419 rmoveto + 0 -96 rlineto + 597 0 rlineto + 0 96 rlineto + -516 135 rmoveto + 0 -85 rlineto + 456 0 rlineto + 0 85 rlineto + -95 620 rmoveto + 0 -16 rlineto + -72 -134 -195 -99 -195 -40 rrcurveto + 22 -23 25 -43 12 -27 rrcurveto + hintmask 0000000010000010 + 213 54 207 110 96 184 rrcurveto + hintmask 0100010100000110 + -74 39 rlineto + -18 -5 rlineto + -268 -57 rmoveto + -93 -34 rlineto + 94 -142 159 -95 200 -40 rrcurveto + 15 29 30 44 24 22 rrcurveto + -191 29 -160 77 -78 110 rrcurveto + 13 132 rmoveto + -38 -74 -73 -81 -110 -59 rrcurveto + 24 -16 36 -39 16 -25 rrcurveto + 123 76 80 93 58 104 rrcurveto + -239 -466 rmoveto + -21 -62 -36 -63 -46 -42 rrcurveto + 24 -13 41 -27 20 -16 rrcurveto + 46 48 45 76 26 75 rrcurveto + 62 24 rmoveto + 0 -370 rlineto + 114 0 rlineto + 0 370 rlineto + hintmask 0000000000101000 + -658 441 rmoveto + 0 -902 rlineto + 107 0 rlineto + 0 792 rlineto + 130 0 rlineto + 0 110 rlineto + -37 0 rmoveto + 0 -36 rlineto + -14 -65 -32 -143 -29 -91 rrcurveto + hintmask 0001000000010000 + 57 -68 13 -64 0 -46 rrcurveto + 0 -30 -5 -20 -12 -9 rrcurveto + -7 -6 -11 -3 -10 0 rrcurveto + -13 0 -13 0 -18 2 rrcurveto + 18 -30 9 -46 1 -29 rrcurveto + 23 -1 24 0 18 2 rrcurveto + 22 4 20 7 16 12 rrcurveto + 32 22 14 43 0 66 rrcurveto + 0 59 -13 70 -62 78 rrcurveto + hintmask 0000000001001000 + 29 80 34 112 27 88 rrcurveto + hintmask 0000000000001000 + -80 46 rlineto + -18 -4 rlineto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w889.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w889.00.otf deleted file mode 100644 index ea969dc21..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w889.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w889.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w889.00.ttx new file mode 100644 index 000000000..a90da39a4 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w889.00.ttx @@ -0,0 +1,473 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w889.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w889.00 + + + SHSansJPVF w889.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w889.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -83 97 105 72 -22 22 34 18 -18 21.5 -21.5 83 -52 52 28 87 26 83 38 84 12 126 -106 106 -106 167 hstemhm + 63 118 -40 117 9 132 -50 104 -41 37 87 120 -111 105 -52 132 14 124 -51 125 -85 103 hintmask 110001011101011101101101 + 50 792 rmoveto + 0 -106 rlineto + 901 0 rlineto + 0 106 rlineto + -800 -484 rmoveto + 0 -83 rlineto + 706 0 rlineto + 0 83 rlineto + hintmask 000000000000100100000000 + -590 545 rmoveto + hintmask 000000000010000100000000 + 0 -187 rlineto + 132 0 rlineto + hintmask 000000000000100100001000 + 0 187 rlineto + 199 0 rmoveto + hintmask 000000000010000000001000 + 0 -187 rlineto + 132 0 rlineto + hintmask 000000000000100000001000 + 0 187 rlineto + hintmask 000000111100011010010100 + -80 -283 rmoveto + 94 0 rlineto + 0 -38 rlineto + -94 0 rlineto + -197 38 rmoveto + 92 0 rlineto + 0 -38 rlineto + -92 0 rlineto + -195 38 rmoveto + 91 0 rlineto + 0 -38 rlineto + -91 0 rlineto + -117 122 rmoveto + 0 -205 rlineto + 727 0 rlineto + 0 205 rlineto + -805 -231 rmoveto + 0 -167 rlineto + 118 0 rlineto + 0 80 rlineto + hintmask 000000110000000000000010 + 636 0 rlineto + 0 -80 rlineto + 125 0 rlineto + 0 167 rlineto + hintmask 000010000000000100000000 + -666 -167 rmoveto + -41 -49 -74 -44 -109 -32 rrcurveto + 20 -15 29 -35 13 -23 rrcurveto + hintmask 010000000000000001000000 + 124 45 82 56 57 78 rrcurveto + 35 -46 rmoveto + 0 -13 rlineto + -49 -109 -140 -55 -169 -19 rrcurveto + 18 -22 23 -42 8 -26 rrcurveto + hintmask 001000000000000001000000 + 194 32 155 72 67 160 rrcurveto + hintmask 110100000000000001100001 + -66 24 rlineto + -19 -2 rlineto + -258 -127 rmoveto + 30 -17 37 -31 20 -21 rrcurveto + 75 50 rlineto + -20 20 -37 27 -32 16 rrcurveto + 17 83 rmoveto + -72 -72 rlineto + 255 0 rlineto + 0 72 rlineto + 87 52 rmoveto + 0 -196 rlineto + 0 -100 29 -30 121 0 rrcurveto + 24 0 92 0 26 0 rrcurveto + 87 0 32 27 13 98 rrcurveto + -33 6 -46 17 -24 16 rrcurveto + -4 -56 -7 -11 -30 0 rrcurveto + -22 0 -75 0 -17 0 rrcurveto + -39 0 -7 5 0 29 rrcurveto + 0 195 rlineto + 164 -30 rmoveto + -56 -25 -96 -22 -86 -14 rrcurveto + 12 -21 14 -37 5 -22 rrcurveto + 95 12 114 21 84 33 rrcurveto + endchar + + + 1000 62 72 29 68 28 68 28 72 29 86 37 87 17 114 -95 95 -95 151 hstemhm + 116 117 -65 129 -23 128 -65 105 106 105 -60 130 -14 135 -83 124 hintmask 111111010011001100000000 + 50 797 rmoveto + 0 -95 rlineto + 901 0 rlineto + 0 95 rlineto + hintmask 000000001001000000000000 + -677 56 rmoveto + hintmask 000000100001000000000000 + 0 -170 rlineto + 128 0 rlineto + hintmask 000000001001001000000000 + 0 170 rlineto + 191 0 rmoveto + hintmask 000000100000001000000000 + 0 -170 rlineto + 130 0 rlineto + hintmask 000000001000001000000000 + 0 170 rlineto + hintmask 000011000100110010000000 + -70 -274 rmoveto + 108 0 rlineto + 0 -37 rlineto + -108 0 rlineto + -211 37 rmoveto + 106 0 rlineto + 0 -37 rlineto + -106 0 rlineto + -209 37 rmoveto + 104 0 rlineto + 0 -37 rlineto + -104 0 rlineto + -117 124 rmoveto + 0 -210 rlineto + 769 0 rlineto + 0 210 rlineto + hintmask 111100000010000100000000 + -588 -407 rmoveto + 412 0 rlineto + 0 -28 rlineto + -412 0 rlineto + 0 -68 rmoveto + 412 0 rlineto + 0 -29 rlineto + -412 0 rlineto + 0 221 rmoveto + 412 0 rlineto + 0 -28 rlineto + -412 0 rlineto + -129 100 rmoveto + 0 -365 rlineto + 676 0 rlineto + 0 365 rlineto + -302 -420 rmoveto + 110 -32 108 -41 59 -28 rrcurveto + 167 61 rlineto + -77 29 -134 43 -112 31 rrcurveto + -325 -1 rmoveto + -72 -33 -125 -29 -111 -16 rrcurveto + 27 -20 44 -44 22 -25 rrcurveto + 106 24 135 43 87 47 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w890.00.otf b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w890.00.otf deleted file mode 100644 index d3a3585aa..000000000 Binary files a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w890.00.otf and /dev/null differ diff --git a/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w890.00.ttx b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w890.00.ttx new file mode 100644 index 000000000..a0aed4f53 --- /dev/null +++ b/Tests/varLib/data/master_sparse_cff2/MasterSet_Kanji-w890.00.ttx @@ -0,0 +1,473 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + SHSansJPVF w890.00 + + + Regular + + + 1.002;ADBE;MasterSet_Kanji-w890.00 + + + SHSansJPVF w890.00 + + + Version 1.002;hotconv 1.0.109;makeotfexe 2.5.65596 DEVELOPMENT + + + MasterSet_Kanji-w890.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 393 -120 50 859 91 -50 50 hstemhm + 100 50 700 50 hintmask 10111000 + 100 -120 rmoveto + 800 0 rlineto + 0 1000 rlineto + -800 0 rlineto + 400 -459 rmoveto + -318 409 rlineto + 636 0 rlineto + -286 -450 rmoveto + hintmask 11011000 + 318 409 rlineto + 0 -818 rlineto + -668 -41 rmoveto + 318 409 rlineto + 318 -409 rlineto + -668 859 rmoveto + 318 -409 rlineto + -318 -409 rlineto + endchar + + + 1000 -83 98 104 72 -22 22 34 18 -18 21.5 -21.5 83 -52 52 28 87 26 83 38 84 -7 145 -106 106 -106 167 hstemhm + 63 118 -40 117 9 132 -50 105 -42 37 87 120 -111 105 -52 132 14 124 -51 125 -85 103 hintmask 110001011101011101101101 + 50 792 rmoveto + 0 -106 rlineto + 901 0 rlineto + 0 106 rlineto + -800 -484 rmoveto + 0 -83 rlineto + 706 0 rlineto + 0 83 rlineto + hintmask 000000000000100100000000 + -590 545 rmoveto + hintmask 000000000010000100000000 + 0 -206 rlineto + 132 0 rlineto + hintmask 000000000000100100001000 + 0 206 rlineto + 199 0 rmoveto + hintmask 000000000010000000001000 + 0 -206 rlineto + 132 0 rlineto + hintmask 000000000000100000001000 + 0 206 rlineto + hintmask 000000111100011010010100 + -80 -283 rmoveto + 94 0 rlineto + 0 -38 rlineto + -94 0 rlineto + -196 38 rmoveto + 91 0 rlineto + 0 -38 rlineto + -91 0 rlineto + -196 38 rmoveto + 91 0 rlineto + 0 -38 rlineto + -91 0 rlineto + -117 122 rmoveto + 0 -205 rlineto + 727 0 rlineto + 0 205 rlineto + -805 -231 rmoveto + 0 -167 rlineto + 118 0 rlineto + 0 80 rlineto + hintmask 000000110000000000000010 + 636 0 rlineto + 0 -80 rlineto + 125 0 rlineto + 0 167 rlineto + hintmask 000010000000000100000000 + -666 -167 rmoveto + -41 -49 -74 -44 -109 -32 rrcurveto + 20 -15 29 -35 13 -23 rrcurveto + hintmask 010000000000000001000000 + 124 45 82 56 57 78 rrcurveto + 35 -46 rmoveto + 0 -13 rlineto + -49 -109 -140 -55 -169 -19 rrcurveto + 18 -22 23 -42 8 -26 rrcurveto + hintmask 001000000000000001000000 + 194 32 155 72 67 160 rrcurveto + hintmask 110100000000000001100001 + -66 24 rlineto + -19 -2 rlineto + -258 -127 rmoveto + 30 -17 37 -31 20 -21 rrcurveto + 75 50 rlineto + -20 20 -37 27 -32 16 rrcurveto + 17 83 rmoveto + -72 -72 rlineto + 255 0 rlineto + 0 72 rlineto + 87 52 rmoveto + 0 -196 rlineto + 0 -100 29 -30 121 0 rrcurveto + 24 0 92 0 26 0 rrcurveto + 87 0 32 27 13 98 rrcurveto + -33 6 -46 17 -24 16 rrcurveto + -4 -56 -7 -10 -31 0 rrcurveto + -21 0 -75 0 -17 0 rrcurveto + -39 0 -7 4 0 29 rrcurveto + 0 195 rlineto + 164 -30 rmoveto + -56 -25 -96 -22 -86 -14 rrcurveto + 12 -21 14 -37 5 -22 rrcurveto + 95 12 114 21 84 33 rrcurveto + endchar + + + 1000 62 72 29 68 28 68 28 72 29 86 37 87 -15 146 -95 95 -95 151 hstemhm + 116 118 -66 129 -23 128 -65 105 106 105 -60 130 -14 135 -83 124 hintmask 111111010011001100000000 + 50 797 rmoveto + 0 -95 rlineto + 901 0 rlineto + 0 95 rlineto + hintmask 000000001001000000000000 + -677 56 rmoveto + hintmask 000000100001000000000000 + 0 -202 rlineto + 128 0 rlineto + hintmask 000000001001001000000000 + 0 202 rlineto + 191 0 rmoveto + hintmask 000000100000001000000000 + 0 -202 rlineto + 130 0 rlineto + hintmask 000000001000001000000000 + 0 202 rlineto + hintmask 000011000100110010000000 + -70 -274 rmoveto + 108 0 rlineto + 0 -37 rlineto + -108 0 rlineto + -211 37 rmoveto + 106 0 rlineto + 0 -37 rlineto + -106 0 rlineto + -208 37 rmoveto + 103 0 rlineto + 0 -37 rlineto + -103 0 rlineto + -118 124 rmoveto + 0 -210 rlineto + 769 0 rlineto + 0 210 rlineto + hintmask 111100000010000100000000 + -588 -407 rmoveto + 412 0 rlineto + 0 -28 rlineto + -412 0 rlineto + 0 -68 rmoveto + 412 0 rlineto + 0 -29 rlineto + -412 0 rlineto + 0 221 rmoveto + 412 0 rlineto + 0 -28 rlineto + -412 0 rlineto + -129 100 rmoveto + 0 -365 rlineto + 676 0 rlineto + 0 365 rlineto + -302 -420 rmoveto + 110 -32 108 -41 59 -28 rrcurveto + 167 61 rlineto + -77 29 -134 43 -112 31 rrcurveto + -325 -1 rmoveto + -72 -33 -125 -29 -111 -16 rrcurveto + 27 -20 44 -44 22 -25 rrcurveto + 106 24 135 43 87 47 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_ttx_varfont_otf/TestCFF2VF.ttx b/Tests/varLib/data/master_ttx_varfont_otf/TestCFF2VF.ttx new file mode 100644 index 000000000..c2a718ec9 --- /dev/null +++ b/Tests/varLib/data/master_ttx_varfont_otf/TestCFF2VF.ttx @@ -0,0 +1,835 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCodeVariable-Roman + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCodeVariable-Roman + + + Roman + + + Weight + + + ExtraLight + + + TestCFF2Roman-ExtraLight + + + Light + + + TestCFF2Roman-Light + + + Regular + + + TestCFF2Roman-Regular + + + Medium + + + TestCFF2Roman-Medium + + + Semibold + + + TestCFF2Roman-Semibold + + + Bold + + + TestCFF2Roman-Bold + + + Black + + + TestCFF2Roman-Black + + + Source Code Variable + + + Regular + + + 1.010;ADBO;SourceCodeVariable-Roman + + + Source Code Variable + + + Version 1.010;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SourceCodeVariable-Roman + + + Roman + + + Weight + + + ExtraLight + + + TestCFF2Roman-ExtraLight + + + Light + + + TestCFF2Roman-Light + + + Regular + + + TestCFF2Roman-Regular + + + Medium + + + TestCFF2Roman-Medium + + + Semibold + + + TestCFF2Roman-Semibold + + + Bold + + + TestCFF2Roman-Bold + + + Black + + + TestCFF2Roman-Black + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 304 7 -12 1 blend + 34 rmoveto + 125 86 65 96 -22 38 2 -3 -9 15 -2 4 4 blend + hvcurveto + 183 -324 -21 110 1 -1 -14 22 -11 17 32 -54 4 blend + vvcurveto + 50 42 32 67 68 36 -21 -36 47 18 -29 15 -24 12 -21 18 -31 8 -13 -2 3 -3 5 -2 4 -3 5 9 blend + vhcurveto + 44 49 -24 40 -29 49 2 blend + rlineto + 44 -46 -54 33 -89 -6 8 5 -7 9 -15 -1 3 4 -8 5 blend + hhcurveto + -115 -81 -59 -94 16 -26 3 -7 5 -9 6 -10 4 blend + hvcurveto + -174 324 22 -124 8 -14 14 -22 6 -10 -32 56 4 blend + vvcurveto + -51 -42 -35 -78 -76 -62 31 37 -52 -19 31 -14 23 -15 25 -25 41 -9 15 -4 7 7 -11 -3 3 12 -20 9 blend + vhcurveto + -39 -58 + + 1 blend + hlineto + + + 2 blend + rmoveto + + + + + + + + 62 22 -38 1 blend + hmoveto + 476 -44 76 1 blend + 660 -476 44 -76 -106 callsubr + 109 -601 -61 103 -27 45 -105 callsubr + 73 131 54 102 29 -47 45 -75 10 -18 4 -6 4 blend + rlineto + 4 hlineto + 52 -102 73 -131 10 -16 -4 6 27 -47 -45 75 4 blend + rlineto + -300 52 -42 72 -10 16 -105 callsubr + 461 75 -125 1 blend + vlineto + 127 -232 27 -45 -38 64 2 blend + rlineto + 44 48 -22 36 -22 36 -105 callsubr + -50 93 -66 119 -6 10 -1 3 -28 48 49 -83 4 blend + rlineto + 234 68 -114 -106 callsubr + -65 -119 -49 -93 -29 47 -49 83 -5 9 1 -3 4 blend + rlineto + 44 -48 -22 36 22 -36 -105 callsubr + 126 232 26 -44 38 -64 2 blend + rlineto + -461 -75 125 1 blend + vlineto + + + 31 19 -31 1 blend + hmoveto + 86 -54 90 -106 callsubr + 115 366 23 73 21 72 21 76 25 -42 30 -50 5 -9 7 -11 3 -4 -4 6 3 -7 6 -10 8 blend + rlinecurve + 4 hlineto + 20 -76 22 -72 23 -73 113 -366 4 -6 -6 10 2 -3 4 -6 5 -9 -7 11 25 -40 -30 50 8 blend + rcurveline + 90 -56 92 -106 callsubr + -221 656 -15 25 4 -6 2 blend + rlineto + -96 68 -112 -106 callsubr + -104 -457 -30 49 33 -55 -105 callsubr + 301 68 -301 -8 15 -40 65 8 -15 3 blend + hlineto + + + 258 26 -44 1 blend + hmoveto + 84 585 217 71 -518 -71 217 -52 88 47 -79 17 -30 -43 73 18 -28 43 -73 17 -30 7 blend + hlineto + + + -107 callsubr + 73 -26 73 -26 73 -27 21 -35 36 -58 -28 -8 -12 -28 0 28 -14 -2 18 -3 27 27 8 blend + rlinecurve + -24 566 6 -21 0 -34 -105 callsubr + 56 -26 56 -106 callsubr + 50 0 9 1 blend + 0 50 50 0 9 0 10 2 blend + vvcurveto + -56 26 -56 -106 callsubr + -50 0 -9 1 blend + 0 -50 -50 0 -9 0 -10 2 blend + vvcurveto + -562 0 102 1 blend + vmoveto + -148 56 148 0 -68 -26 56 0 68 3 blend + vlineto + + + -107 callsubr + 21 -35 36 -58 2 blend + rlineto + -43 52 84 -36 83 5 -11 -7 13 -11 17 -4 8 8 -13 5 blend + hhcurveto + -51 -147 -19 32 1 -3 -105 callsubr + 159 857 -56 7 -159 -858 -1 1 3 -3 26 -44 -3 5 1 -1 -2 4 6 blend + rlineto + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wght + 0x0 + 200.0 + 400.0 + 900.0 + 256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_vvar_cff2/TestVVAR.0.otf b/Tests/varLib/data/master_vvar_cff2/TestVVAR.0.otf deleted file mode 100644 index 9749ab5b0..000000000 Binary files a/Tests/varLib/data/master_vvar_cff2/TestVVAR.0.otf and /dev/null differ diff --git a/Tests/varLib/data/master_vvar_cff2/TestVVAR.0.ttx b/Tests/varLib/data/master_vvar_cff2/TestVVAR.0.ttx new file mode 100644 index 000000000..7383c1710 --- /dev/null +++ b/Tests/varLib/data/master_vvar_cff2/TestVVAR.0.ttx @@ -0,0 +1,821 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + Source Han Sans VVAR TEST + + + Regular + + + 1.003;UKWN;SHSansVVARTest_75-w0.00 + + + Source Han Sans VVAR TEST + + + Version 1.003;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SHSansVVARTest_75-w0.00 + + + Adobe Systems Co., Ltd. + + + Ryoko Nishizuka + + + Masataka HATTORI (variable font production) + + + http://www.adobe.com + + + Master3 + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + Source Han Sans VVAR TEST + + + Regular + + + 1.003;UKWN;SHSansVVARTest_75-w0.00 + + + Source Han Sans VVAR TEST + + + Version 1.003;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SHSansVVARTest_75-w0.00 + + + Adobe Systems Co., Ltd. + + + Ryoko Nishizuka + + + Masataka HATTORI 服部正貴 (variable font production) + + + http://www.adobe.com + + + Master3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -669 endchar + + + 667 26 rmoveto + -12 22 rlineto + -47 -20 -60 -12 -73 0 rrcurveto + -168 0 -128 95 0 142 rrcurveto + 0 170 146 130 211 0 rrcurveto + 180 0 104 -93 0 -133 rrcurveto + 0 -100 -81 -70 -60 0 rrcurveto + -50 0 -17 22 22 78 rrcurveto + 49 166 rlineto + -31 9 -32 8 -47 0 rrcurveto + -150 0 -117 -98 0 -105 rrcurveto + 0 -65 58 -38 58 0 rrcurveto + 74 0 53 25 44 55 rrcurveto + 4 0 rlineto + -9 -60 39 -20 43 0 rrcurveto + 90 0 96 72 0 128 rrcurveto + 0 140 -120 103 -193 0 rrcurveto + -233 0 -168 -141 0 -184 rrcurveto + 0 -160 149 -102 182 0 rrcurveto + 70 0 67 11 57 25 rrcurveto + -23 379 rmoveto + -32 -109 rlineto + -20 -69 -71 -69 -88 0 rrcurveto + -62 0 -31 34 0 42 rrcurveto + 0 95 102 86 124 0 rrcurveto + 38 0 25 -5 15 -5 rrcurveto + endchar + + + 768 0 rmoveto + 37 0 rlineto + -297 546 rlineto + -35 0 rlineto + -296 -546 rlineto + 34 0 rlineto + 106 190 rlineto + 346 0 rlineto + 105 -190 rlineto + -439 217 rmoveto + 62 110 rlineto + 34 65 32 55 32 67 rrcurveto + 4 0 rlineto + 34 -67 30 -54 35 -66 rrcurveto + 61 -110 rlineto + -324 0 rlineto + endchar + + + 276 98 rmoveto + 0 -74 92 -33 92 0 rrcurveto + 80 0 83 33 62 36 rrcurveto + 2 0 rlineto + 4 -60 rlineto + 29 0 rlineto + 0 255 rlineto + 0 83 -54 68 -140 0 rrcurveto + -94 0 -93 -35 -37 -24 rrcurveto + 18 -25 rlineto + 40 23 81 32 83 0 rrcurveto + 128 0 34 -62 1 -67 rrcurveto + -290 -19 -121 -42 0 -89 rrcurveto + 35 2 rmoveto + 0 65 93 39 283 19 rrcurveto + 0 -131 rlineto + -79 -48 -75 -25 -70 0 rrcurveto + -74 0 -78 23 0 58 rrcurveto + endchar + + + 411 586 rmoveto + 0 -5 -1 -11 -1 -12 rrcurveto + -7 -56 -23 -131 0 -107 rrcurveto + 0 -83 26 -102 28 -67 rrcurveto + 28 10 rlineto + -29 66 -27 95 0 79 rrcurveto + 0 111 18 128 14 56 rrcurveto + 2 10 4 14 3 4 rrcurveto + -35 1 rlineto + -254 -92 rmoveto + 1 -31 rlineto + 35 -2 78 -2 33 0 rrcurveto + 147 0 184 11 152 19 rrcurveto + -1 29 rlineto + -124 -20 -198 -13 -161 0 rrcurveto + -25 0 -87 3 -34 6 rrcurveto + 513 -70 rmoveto + -1 -9 -3 -10 -2 -6 rrcurveto + -51 -139 -97 -93 -105 -65 rrcurveto + -69 -42 -62 -17 -53 0 rrcurveto + -42 0 -26 18 0 36 rrcurveto + 0 84 110 92 126 39 rrcurveto + 53 17 75 18 77 0 rrcurveto + 164 0 92 -72 0 -81 rrcurveto + 0 -117 -146 -66 -168 -14 rrcurveto + 18 -25 rlineto + 219 27 106 85 0 109 rrcurveto + 0 93 -99 84 -191 0 rrcurveto + -55 0 -80 -11 -67 -20 rrcurveto + -137 -43 -128 -101 0 -100 rrcurveto + 0 -52 42 -29 59 0 rrcurveto + 54 0 73 23 64 39 rrcurveto + 115 68 96 106 63 142 rrcurveto + 3 8 3 8 4 8 rrcurveto + -34 8 rlineto + endchar + + + 389 497 rmoveto + 0 -26 rlineto + 554 0 rlineto + 0 26 rlineto + -554 0 rlineto + 23 -174 rmoveto + 0 -27 rlineto + 479 0 rlineto + 0 27 rlineto + -479 0 rlineto + 241 308 rmoveto + 0 -324 rlineto + 28 0 rlineto + 0 324 rlineto + -28 0 rlineto + -158 -332 rmoveto + -27 -9 rlineto + 80 -174 169 -123 229 -55 rrcurveto + 5 8 7 10 8 6 rrcurveto + -229 49 -166 122 -76 166 rrcurveto + 386 24 rmoveto + 0 -6 rlineto + -86 -194 -242 -117 -228 -43 rrcurveto + 7 -6 7 -11 3 -8 rrcurveto + 234 49 243 118 94 211 rrcurveto + -19 9 rlineto + -6 -2 rlineto + -7 0 rlineto + -854 -111 rmoveto + 14 -28 rlineto + 91 23 125 31 119 30 rrcurveto + -5 27 rlineto + -128 -33 -131 -31 -85 -19 rrcurveto + 15 254 rmoveto + 0 -26 rlineto + 325 0 rlineto + 0 26 rlineto + -325 0 rlineto + 164 164 rmoveto + 0 -650 rlineto + 0 -11 -6 -3 -13 0 rrcurveto + -13 -1 -43 0 -53 1 rrcurveto + 4 -8 6 -12 2 -7 rrcurveto + 64 0 34 1 18 4 rrcurveto + 19 5 9 10 0 22 rrcurveto + 0 649 rlineto + -28 0 rlineto + endchar + + + 231 479 rmoveto + 0 -26 rlineto + 546 0 rlineto + 0 26 rlineto + -546 0 rlineto + 30 -166 rmoveto + 0 -27 rlineto + 487 0 rlineto + 0 27 rlineto + -487 0 rlineto + -50 -190 rmoveto + 0 -26 rlineto + 592 0 rlineto + 0 26 rlineto + -592 0 rlineto + 270 348 rmoveto + 0 -362 rlineto + 28 0 rlineto + 0 362 rlineto + -28 0 rlineto + 124 -227 rmoveto + 46 -28 52 -40 25 -26 rrcurveto + 22 13 rlineto + -25 27 -52 38 -47 28 rrcurveto + -21 -12 rlineto + -518 347 rmoveto + 0 -653 rlineto + 29 0 rlineto + 0 627 rlineto + 771 0 rlineto + 0 -627 rlineto + 28 0 rlineto + 0 653 rlineto + -828 0 rlineto + 14 -588 rmoveto + 0 -26 rlineto + 799 0 rlineto + 0 26 rlineto + -799 0 rlineto + endchar + + + -107 304 779 rmoveto + 0 -6 -1 -13 -1 -16 rrcurveto + -5 -73 -17 -177 0 -145 rrcurveto + 0 -105 19 -135 22 -89 rrcurveto + 30 9 rlineto + -22 88 -20 128 0 100 rrcurveto + 0 151 13 173 11 74 rrcurveto + 1 12 3 18 3 5 rrcurveto + -36 1 rlineto + -188 -126 rmoveto + 1 -33 rlineto + 27 -3 58 -3 27 0 rrcurveto + 110 0 142 16 111 25 rrcurveto + 0 31 rlineto + -95 -26 -144 -19 -125 0 rrcurveto + -21 0 -66 5 -25 7 rrcurveto + 382 -89 rmoveto + -1 -11 -2 -9 -3 -9 rrcurveto + -37 -188 -69 -128 -76 -89 rrcurveto + -51 -56 -47 -22 -39 0 rrcurveto + -30 0 -19 24 0 49 rrcurveto + 0 117 79 126 92 53 rrcurveto + 39 23 56 23 59 0 rrcurveto + 120 0 67 -98 0 -110 rrcurveto + 0 -162 -102 -88 -128 -18 rrcurveto + 18 -26 rlineto + 167 36 77 111 0 145 rrcurveto + 0 122 -78 112 -144 0 rrcurveto + -42 0 -61 -15 -50 -27 rrcurveto + -105 -57 -96 -133 0 -133 rrcurveto + 0 -67 34 -37 46 0 rrcurveto + 44 0 56 30 48 51 rrcurveto + 83 92 74 143 46 190 rrcurveto + 4 10 3 7 3 9 rrcurveto + -35 10 rlineto + endchar + + + -107 175 638 rmoveto + 0 -28 rlineto + 404 0 rlineto + 0 28 rlineto + -404 0 rlineto + 22 -225 rmoveto + 0 -28 rlineto + 362 0 rlineto + 0 28 rlineto + -362 0 rlineto + -36 -254 rmoveto + 0 -29 rlineto + 437 0 rlineto + 0 29 rlineto + -437 0 rlineto + 196 470 rmoveto + 0 -487 rlineto + 30 0 rlineto + 0 487 rlineto + -30 0 rlineto + 95 -303 rmoveto + 33 -38 37 -54 17 -36 rrcurveto + 23 16 rlineto + -18 36 -37 52 -34 38 rrcurveto + -21 -14 rlineto + -388 460 rmoveto + 0 -868 rlineto + 31 0 rlineto + 0 841 rlineto + 562 0 rlineto + 0 -841 rlineto + 31 0 rlineto + 0 868 rlineto + -624 0 rlineto + 16 -788 rmoveto + 0 -27 rlineto + 590 0 rlineto + 0 27 rlineto + -590 0 rlineto + endchar + + + -107 293 659 rmoveto + 0 -28 rlineto + 415 0 rlineto + 0 28 rlineto + -415 0 rlineto + 16 -233 rmoveto + 0 -28 rlineto + 355 0 rlineto + 0 28 rlineto + -355 0 rlineto + 177 414 rmoveto + 0 -432 rlineto + 31 0 rlineto + 0 432 rlineto + -31 0 rlineto + -108 -439 rmoveto + -29 -9 rlineto + 61 -235 124 -167 171 -73 rrcurveto + 5 8 9 11 8 6 rrcurveto + -169 66 -124 165 -56 228 rrcurveto + 276 25 rmoveto + 0 -7 rlineto + -62 -262 -176 -156 -173 -58 rrcurveto + 7 -5 8 -12 2 -9 rrcurveto + 180 66 178 156 69 278 rrcurveto + -20 11 rlineto + -6 -2 rlineto + -7 0 rlineto + -635 -150 rmoveto + 13 -28 rlineto + 68 30 95 43 89 40 rrcurveto + -5 28 rlineto + -96 -43 -99 -43 -65 -27 rrcurveto + 12 342 rmoveto + 0 -28 rlineto + 245 0 rlineto + 0 28 rlineto + -245 0 rlineto + 119 221 rmoveto + 0 -873 rlineto + 0 -15 -5 -4 -9 0 rrcurveto + -10 -1 -32 0 -39 1 rrcurveto + 5 -8 5 -12 2 -7 rrcurveto + 49 -1 26 1 16 5 rrcurveto + 16 6 6 10 0 26 rrcurveto + 0 872 rlineto + -30 0 rlineto + endchar + + + -107 501 35 rmoveto + -9 27 rlineto + -35 -29 -45 -16 -54 0 rrcurveto + -126 0 -96 130 0 189 rrcurveto + 0 226 111 176 155 0 rrcurveto + 135 0 77 -123 0 -181 rrcurveto + 0 -133 -60 -95 -44 0 rrcurveto + -34 0 -13 29 15 106 rrcurveto + 35 223 rlineto + -22 12 -26 9 -36 0 rrcurveto + -114 0 -86 -130 0 -141 rrcurveto + 0 -85 43 -51 45 0 rrcurveto + 54 0 40 34 32 75 rrcurveto + 3 0 rlineto + -6 -82 29 -27 34 0 rrcurveto + 71 0 72 95 0 172 rrcurveto + 0 185 -93 138 -146 0 rrcurveto + -176 0 -126 -187 0 -246 rrcurveto + 0 -213 113 -136 137 0 rrcurveto + 53 0 50 15 43 34 rrcurveto + -24 509 rmoveto + -22 -149 rlineto + -15 -95 -50 -94 -61 0 rrcurveto + -45 0 -23 46 0 58 rrcurveto + 0 128 73 119 89 0 rrcurveto + 26 0 18 -7 10 -6 rrcurveto + endchar + + + -107 569 0 rmoveto + 41 0 rlineto + -220 726 rlineto + -42 0 rlineto + -219 -726 rlineto + 38 0 rlineto + 75 260 rlineto + 253 0 rlineto + 74 -260 rlineto + -316 288 rmoveto + 42 153 rlineto + 25 87 24 73 23 89 rrcurveto + 3 0 rlineto + 25 -89 22 -71 25 -89 rrcurveto + 43 -153 rlineto + -232 0 rlineto + endchar + + + -107 202 128 rmoveto + 0 -99 68 -41 71 0 rrcurveto + 59 0 62 44 46 49 rrcurveto + 2 0 rlineto + 4 -81 rlineto + 31 0 rlineto + 0 341 rlineto + 0 106 -45 90 -106 0 rrcurveto + -71 0 -70 -48 -31 -30 rrcurveto + 17 -26 rlineto + 32 31 59 43 59 0 rrcurveto + 92 0 26 -87 2 -93 rrcurveto + -217 -26 -90 -56 0 -117 rrcurveto + 38 2 rmoveto + 0 90 65 53 204 26 rrcurveto + 0 -180 rlineto + -57 -68 -53 -33 -52 0 rrcurveto + -53 0 -54 30 0 82 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/master_vvar_cff2/TestVVAR.1.otf b/Tests/varLib/data/master_vvar_cff2/TestVVAR.1.otf deleted file mode 100644 index 2ea0e9f07..000000000 Binary files a/Tests/varLib/data/master_vvar_cff2/TestVVAR.1.otf and /dev/null differ diff --git a/Tests/varLib/data/master_vvar_cff2/TestVVAR.1.ttx b/Tests/varLib/data/master_vvar_cff2/TestVVAR.1.ttx new file mode 100644 index 000000000..f60209774 --- /dev/null +++ b/Tests/varLib/data/master_vvar_cff2/TestVVAR.1.ttx @@ -0,0 +1,821 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + Source Han Sans VVAR TEST + + + Regular + + + 1.003;UKWN;SHSansVVARTest_75-w1000.00 + + + Source Han Sans VVAR TEST + + + Version 1.003;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SHSansVVARTest_75-w1000.00 + + + Adobe Systems Co., Ltd. + + + Ryoko Nishizuka + + + Masataka HATTORI (variable font production) + + + http://www.adobe.com + + + Master4 + + + Copyright © 2018 Adobe systems Co., Ltd. All Rights Reserved. + + + Source Han Sans VVAR TEST + + + Regular + + + 1.003;UKWN;SHSansVVARTest_75-w1000.00 + + + Source Han Sans VVAR TEST + + + Version 1.003;hotconv 1.0.109;makeotfexe 2.5.65596 + + + SHSansVVARTest_75-w1000.00 + + + Adobe Systems Co., Ltd. + + + Ryoko Nishizuka + + + Masataka HATTORI 服部正貴 (variable font production) + + + http://www.adobe.com + + + Master4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -669 endchar + + + 683 21 rmoveto + -20 52 rlineto + -46 -17 -62 -8 -59 0 rrcurveto + -170 0 -122 79 0 145 rrcurveto + 0 163 152 100 177 0 rrcurveto + 178 0 96 -86 0 -108 rrcurveto + 0 -100 -63 -45 -49 2 rrcurveto + -33 1 -9 22 12 47 rrcurveto + 35 160 rlineto + -29 12 -55 10 -50 0 rrcurveto + -164 0 -104 -95 0 -105 rrcurveto + 0 -72 54 -42 74 0 rrcurveto + 61 0 51 22 36 42 rrcurveto + 3 0 rlineto + 4 -42 38 -22 55 0 rrcurveto + 121 0 94 81 0 125 rrcurveto + 0 145 -142 105 -201 0 rrcurveto + -256 0 -171 -154 0 -174 rrcurveto + 0 -171 167 -103 188 0 rrcurveto + 80 0 60 8 69 23 rrcurveto + -98 352 rmoveto + -18 -78 rlineto + -10 -49 -46 -34 -44 0 rrcurveto + -38 0 -19 18 0 31 rrcurveto + 0 63 60 52 78 0 rrcurveto + 15 0 12 -1 10 -2 rrcurveto + endchar + + + 688 0 rmoveto + 179 0 rlineto + -266 562 rlineto + -207 0 rlineto + -261 -562 rlineto + 172 0 rlineto + 55 125 rlineto + 272 0 rlineto + 56 -125 rlineto + -293 232 rmoveto + 24 44 rlineto + 24 56 27 68 23 58 rrcurveto + 4 0 rlineto + 25 -56 28 -70 24 -56 rrcurveto + 23 -44 rlineto + -202 0 rlineto + endchar + + + 229 121 rmoveto + 0 -71 73 -59 114 0 rrcurveto + 74 0 72 25 57 30 rrcurveto + 5 0 rlineto + 11 -46 rlineto + 132 0 rlineto + 0 242 rlineto + 0 138 -96 61 -158 0 rrcurveto + -96 0 -91 -23 -77 -34 rrcurveto + 59 -92 rlineto + 62 25 56 14 57 0 rrcurveto + 78 0 40 -18 4 -34 rrcurveto + -270 -12 -106 -51 0 -95 rrcurveto + 154 12 rmoveto + 0 32 49 25 173 6 rrcurveto + 0 -63 rlineto + -42 -19 -45 -17 -51 0 rrcurveto + -50 0 -34 11 0 25 rrcurveto + endchar + + + 361 613 rmoveto + 1 -15 -2 -21 -2 -15 rrcurveto + -12 -81 -17 -104 0 -94 rrcurveto + 0 -120 29 -115 31 -68 rrcurveto + 126 33 rlineto + -34 78 -29 80 0 133 rrcurveto + 0 87 16 101 20 74 rrcurveto + 4 13 4 14 6 17 rrcurveto + -141 3 rlineto + -230 -68 rmoveto + 3 -107 rlineto + 48 -2 78 -3 55 0 rrcurveto + 152 0 213 10 136 19 rrcurveto + -1 108 rlineto + -157 -31 -145 -5 -193 0 rrcurveto + -66 0 -88 8 -35 3 rrcurveto + 490 -108 rmoveto + -1 -20 -8 -40 -7 -19 rrcurveto + -39 -92 -64 -56 -69 -45 rrcurveto + -60 -43 -67 -27 -47 0 rrcurveto + -32 0 -12 11 0 20 rrcurveto + 0 38 67 64 97 34 rrcurveto + 48 16 71 21 93 0 rrcurveto + 132 0 70 -47 0 -58 rrcurveto + 0 -58 -70 -76 -196 -17 rrcurveto + 73 -98 rlineto + 249 29 80 109 0 105 rrcurveto + 0 125 -143 81 -186 0 rrcurveto + -78 0 -82 -12 -65 -17 rrcurveto + -162 -44 -126 -113 0 -108 rrcurveto + 0 -84 64 -36 74 0 rrcurveto + 91 0 89 36 65 36 rrcurveto + 92 47 104 98 57 134 rrcurveto + 7 18 17 44 8 17 rrcurveto + -134 27 rlineto + endchar + + + 399 539 rmoveto + 0 -104 rlineto + 554 0 rlineto + 0 104 rlineto + -554 0 rlineto + 16 -169 rmoveto + 0 -102 rlineto + 426 0 rlineto + 0 102 rlineto + -426 0 rlineto + 193 273 rmoveto + 0 -321 rlineto + 132 0 rlineto + 0 321 rlineto + -132 0 rlineto + -41 -370 rmoveto + -120 -33 rlineto + 91 -146 145 -105 217 -53 rrcurveto + 19 30 39 46 29 24 rrcurveto + -202 38 -147 87 -71 112 rrcurveto + 242 97 rmoveto + 0 -17 rlineto + -59 -167 -186 -106 -249 -42 rrcurveto + 25 -24 32 -50 13 -30 rrcurveto + 276 61 199 122 81 229 rrcurveto + -86 27 rlineto + -22 -3 rlineto + -24 0 rlineto + -792 -100 rmoveto + 31 -108 rlineto + 102 19 129 22 120 24 rrcurveto + -16 104 rlineto + -131 -24 -140 -23 -95 -14 rrcurveto + 17 238 rmoveto + 0 -105 rlineto + 349 0 rlineto + 0 105 rlineto + -349 0 rlineto + 122 134 rmoveto + 0 -596 rlineto + 0 -11 -5 -3 -14 0 rrcurveto + -13 0 -42 0 -37 1 rrcurveto + 16 -29 16 -45 4 -29 rrcurveto + 72 0 50 3 36 17 rrcurveto + 35 17 11 28 0 51 rrcurveto + 0 596 rlineto + -129 0 rlineto + endchar + + + 252 482 rmoveto + 0 -92 rlineto + 490 0 rlineto + 0 92 rlineto + -490 0 rlineto + 26 -138 rmoveto + 0 -89 rlineto + 443 0 rlineto + 0 89 rlineto + -443 0 rlineto + -36 -167 rmoveto + 0 -94 rlineto + 515 0 rlineto + 0 94 rlineto + -515 0 rlineto + 194 280 rmoveto + 0 -319 rlineto + 122 0 rlineto + 0 319 rlineto + -122 0 rlineto + 146 -225 rmoveto + 27 -22 32 -31 15 -18 rrcurveto + 87 41 rlineto + -16 18 -35 29 -27 20 rrcurveto + -83 -37 rlineto + -513 380 rmoveto + 0 -686 rlineto + 132 0 rlineto + 0 581 rlineto + 595 0 rlineto + 0 -581 rlineto + 137 0 rlineto + 0 686 rlineto + -864 0 rlineto + 77 -550 rmoveto + 0 -105 rlineto + 702 0 rlineto + 0 105 rlineto + -702 0 rlineto + endchar + + + -107 260 812 rmoveto + 0 -18 -1 -26 -2 -20 rrcurveto + -10 -103 -11 -143 0 -129 rrcurveto + 0 -153 22 -150 23 -90 rrcurveto + 118 38 rlineto + -28 103 -21 110 0 166 rrcurveto + 0 121 12 139 15 96 rrcurveto + 4 16 3 18 6 22 rrcurveto + -130 3 rlineto + -168 -96 rmoveto + 3 -128 rlineto + 40 -2 58 -4 47 0 rrcurveto + 114 0 167 14 98 25 rrcurveto + -1 128 rlineto + -126 -39 -96 -8 -152 0 rrcurveto + -59 0 -66 9 -27 5 rrcurveto + 363 -137 rmoveto + -1 -23 -7 -48 -6 -23 rrcurveto + -27 -131 -41 -83 -43 -63 rrcurveto + -43 -57 -52 -35 -34 0 rrcurveto + -21 0 -6 16 0 30 rrcurveto + 0 60 41 91 66 47 rrcurveto + 34 22 53 26 74 0 rrcurveto + 92 0 47 -68 0 -82 rrcurveto + 0 -89 -35 -99 -154 -21 rrcurveto + 67 -117 rlineto + 194 37 53 141 0 142 rrcurveto + 0 160 -116 109 -138 0 rrcurveto + -64 0 -63 -16 -48 -23 rrcurveto + -127 -58 -94 -150 0 -142 rrcurveto + 0 -106 52 -46 61 0 rrcurveto + 75 0 70 46 50 48 rrcurveto + 65 66 78 134 42 179 rrcurveto + 6 23 16 51 7 20 rrcurveto + -123 32 rlineto + endchar + + + -107 194 642 rmoveto + 0 -110 rlineto + 355 0 rlineto + 0 110 rlineto + -355 0 rlineto + 18 -190 rmoveto + 0 -106 rlineto + 323 0 rlineto + 0 106 rlineto + -323 0 rlineto + -23 -227 rmoveto + 0 -111 rlineto + 368 0 rlineto + 0 111 rlineto + -368 0 rlineto + 128 387 rmoveto + 0 -434 rlineto + 112 0 rlineto + 0 434 rlineto + -112 0 rlineto + 114 -300 rmoveto + 16 -31 20 -43 9 -26 rrcurveto + 80 49 rlineto + -11 26 -22 40 -15 28 rrcurveto + -77 -43 rlineto + -383 499 rmoveto + 0 -907 rlineto + 122 0 rlineto + 0 784 rlineto + 407 0 rlineto + 0 -784 rlineto + 127 0 rlineto + 0 907 rlineto + -656 0 rlineto + 72 -741 rmoveto + 0 -123 rlineto + 505 0 rlineto + 0 123 rlineto + -505 0 rlineto + endchar + + + -107 301 710 rmoveto + 0 -123 rlineto + 416 0 rlineto + 0 123 rlineto + -416 0 rlineto + 10 -226 rmoveto + 0 -121 rlineto + 309 0 rlineto + 0 121 rlineto + -309 0 rlineto + 135 370 rmoveto + 0 -428 rlineto + 122 0 rlineto + 0 428 rlineto + -122 0 rlineto + -4 -486 rmoveto + -112 -37 rlineto + 72 -202 103 -143 160 -71 rrcurveto + 17 35 37 54 27 28 rrcurveto + -147 54 -106 123 -51 159 rrcurveto + 148 116 rmoveto + 0 -21 rlineto + -38 -227 -126 -145 -191 -56 rrcurveto + 22 -29 29 -58 12 -36 rrcurveto + 217 80 140 160 58 302 rrcurveto + -80 34 rlineto + -20 -4 rlineto + -23 0 rlineto + -579 -136 rmoveto + 27 -128 rlineto + 78 26 99 32 90 32 rrcurveto + -14 123 rlineto + -100 -33 -107 -33 -73 -19 rrcurveto + 13 320 rmoveto + 0 -123 rlineto + 267 0 rlineto + 0 123 rlineto + -267 0 rlineto + 82 185 rmoveto + 0 -805 rlineto + 0 -14 -4 -4 -10 -1 rrcurveto + -10 0 -31 0 -24 2 rrcurveto + 14 -34 15 -55 3 -34 rrcurveto + 56 0 41 4 30 20 rrcurveto + 31 21 8 32 0 63 rrcurveto + 0 805 rlineto + -119 0 rlineto + endchar + + + -107 516 29 rmoveto + -17 64 rlineto + -34 -24 -47 -12 -41 0 rrcurveto + -127 0 -92 109 0 192 rrcurveto + 0 219 116 140 126 0 rrcurveto + 132 0 70 -115 0 -151 rrcurveto + 0 -133 -42 -64 -35 2 rrcurveto + -21 0 -5 30 7 68 rrcurveto + 23 215 rlineto + -20 16 -49 12 -37 0 rrcurveto + -127 0 -74 -127 0 -140 rrcurveto + 0 -94 40 -55 58 0 rrcurveto + 44 0 36 30 25 59 rrcurveto + 3 0 rlineto + 6 -60 29 -29 43 0 rrcurveto + 98 0 70 105 0 169 rrcurveto + 0 191 -110 140 -154 0 rrcurveto + -198 0 -128 -202 0 -236 rrcurveto + 0 -224 129 -137 143 0 rrcurveto + 62 0 43 10 55 32 rrcurveto + -90 475 rmoveto + -11 -111 rlineto + -5 -69 -28 -52 -24 0 rrcurveto + -23 0 -12 27 0 44 rrcurveto + 0 90 37 76 47 0 rrcurveto + 7 0 5 -2 7 -3 rrcurveto + endchar + + + -107 498 0 rmoveto + 166 0 rlineto + -192 746 rlineto + -195 0 rlineto + -188 -746 rlineto + 162 0 rlineto + 29 179 rlineto + 187 0 rlineto + 31 -179 rlineto + -187 306 rmoveto + 10 73 rlineto + 15 76 20 87 16 80 rrcurveto + 3 0 rlineto + 15 -78 21 -89 15 -76 rrcurveto + 10 -73 rlineto + -125 0 rlineto + endchar + + + -107 161 157 rmoveto + 0 -95 51 -74 91 0 rrcurveto + 53 0 52 34 42 43 rrcurveto + 3 0 rlineto + 11 -65 rlineto + 122 0 rlineto + 0 326 rlineto + 0 172 -81 82 -124 0 rrcurveto + -72 0 -68 -32 -66 -44 rrcurveto + 53 -108 rlineto + 51 32 37 22 37 0 rrcurveto + 48 0 30 -33 5 -52 rrcurveto + -199 -17 -76 -65 0 -126 rrcurveto + 143 13 rmoveto + 0 50 27 37 105 9 rrcurveto + 0 -96 rlineto + -24 -33 -27 -23 -35 0 rrcurveto + -30 0 -16 17 0 39 rrcurveto + endchar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/varLib/mutator_test.py b/Tests/varLib/mutator_test.py index 8625de3c6..d781d59ed 100644 --- a/Tests/varLib/mutator_test.py +++ b/Tests/varLib/mutator_test.py @@ -162,13 +162,22 @@ class MutatorTest(unittest.TestCase): self.expect_ttx(instfont, expected_ttx_path, tables) def test_varlib_mutator_CFF2(self): + suffix = '.otf' + ttx_dir = self.get_test_input('master_ttx_varfont_otf') + + self.temp_dir() + ttx_paths = self.get_file_list(ttx_dir, '.ttx', 'TestCFF2VF') + for path in ttx_paths: + self.compile_font(path, suffix, self.tempdir) + + varfont_name = 'TestCFF2VF' + varfont_path = os.path.join(self.tempdir, varfont_name + suffix) - otf_vf_path = self.get_test_input('TestCFF2VF.otf') expected_ttx_name = 'InterpolateTestCFF2VF' tables = ["hmtx", "CFF2"] loc = {'wght':float(200)} - varfont = TTFont(otf_vf_path) + varfont = TTFont(varfont_path) new_font = make_instance(varfont, loc) expected_ttx_path = self.get_test_output(expected_ttx_name + '.ttx') self.expect_ttx(new_font, expected_ttx_path, tables) diff --git a/Tests/varLib/varLib_test.py b/Tests/varLib/varLib_test.py index 64f194d7f..d93c68b45 100644 --- a/Tests/varLib/varLib_test.py +++ b/Tests/varLib/varLib_test.py @@ -229,37 +229,51 @@ class BuildTest(unittest.TestCase): def test_varlib_build_CFF2(self): ds_path = self.get_test_input('TestCFF2.designspace') - suffix = '.otf' - expected_ttx_name = 'BuildTestCFF2' - tables = ["fvar", "CFF2"] + ttx_dir = self.get_test_input("master_cff2") + expected_ttx_path = self.get_test_output("BuildTestCFF2.ttx") - finder = lambda s: s.replace('.ufo', suffix) - varfont, model, _ = build(ds_path, finder) - # some data (e.g. counts printed in TTX inline comments) is only - # calculated at compile time, so before we can compare the TTX - # dumps we need to save to a temporary stream, and realod the font + self.temp_dir() + for path in self.get_file_list(ttx_dir, '.ttx', 'TestCFF2_'): + print(path) + self.compile_font(path, ".otf", self.tempdir) + + ds = DesignSpaceDocument.fromfile(ds_path) + for source in ds.sources: + source.path = os.path.join( + self.tempdir, os.path.basename(source.filename).replace(".ufo", ".otf") + ) + ds.updatePaths() + + varfont, _, _ = build(ds) varfont = reload_font(varfont) - expected_ttx_path = self.get_test_output(expected_ttx_name + '.ttx') + tables = ["fvar", "CFF2"] self.expect_ttx(varfont, expected_ttx_path, tables) - self.check_ttx_dump(varfont, expected_ttx_path, tables, suffix) + def test_varlib_build_sparse_CFF2(self): ds_path = self.get_test_input('TestSparseCFF2VF.designspace') - suffix = '.otf' - expected_ttx_name = 'TestSparseCFF2VF' - tables = ["fvar", "CFF2"] + ttx_dir = self.get_test_input("master_sparse_cff2") + expected_ttx_path = self.get_test_output("TestSparseCFF2VF.ttx") - finder = lambda s: s.replace('.ufo', suffix) - varfont, model, _ = build(ds_path, finder) - # some data (e.g. counts printed in TTX inline comments) is only - # calculated at compile time, so before we can compare the TTX - # dumps we need to save to a temporary stream, and realod the font + self.temp_dir() + for path in self.get_file_list(ttx_dir, '.ttx', 'MasterSet_Kanji-'): + print(path) + self.compile_font(path, ".otf", self.tempdir) + + ds = DesignSpaceDocument.fromfile(ds_path) + for source in ds.sources: + source.path = os.path.join( + self.tempdir, os.path.basename(source.filename).replace(".ufo", ".otf") + ) + ds.updatePaths() + + varfont, _, _ = build(ds) varfont = reload_font(varfont) - expected_ttx_path = self.get_test_output(expected_ttx_name + '.ttx') + tables = ["fvar", "CFF2"] self.expect_ttx(varfont, expected_ttx_path, tables) - self.check_ttx_dump(varfont, expected_ttx_path, tables, suffix) + def test_varlib_main_ttf(self): """Mostly for testing varLib.main() @@ -461,15 +475,26 @@ class BuildTest(unittest.TestCase): def test_varlib_build_VVAR_CFF2(self): ds_path = self.get_test_input('TestVVAR.designspace') - suffix = '.otf' + ttx_dir = self.get_test_input("master_vvar_cff2") expected_ttx_name = 'TestVVAR' - tables = ["VVAR"] + suffix = '.otf' - finder = lambda s: s.replace('.ufo', suffix) - varfont, model, _ = build(ds_path, finder) + self.temp_dir() + for path in self.get_file_list(ttx_dir, '.ttx', 'TestVVAR'): + font, savepath = self.compile_font(path, suffix, self.tempdir) + + ds = DesignSpaceDocument.fromfile(ds_path) + for source in ds.sources: + source.path = os.path.join( + self.tempdir, os.path.basename(source.filename).replace(".ufo", suffix) + ) + ds.updatePaths() + + varfont, _, _ = build(ds) varfont = reload_font(varfont) expected_ttx_path = self.get_test_output(expected_ttx_name + '.ttx') + tables = ["VVAR"] self.expect_ttx(varfont, expected_ttx_path, tables) self.check_ttx_dump(varfont, expected_ttx_path, tables, suffix)