From 77144253b6421f15ec2e18a772b6beab0d7b45ee Mon Sep 17 00:00:00 2001 From: Miguel Sousa Date: Mon, 6 Mar 2017 01:21:03 -0800 Subject: [PATCH] =?UTF-8?q?[varLib=20tests]=20Add=20composite=20glyph=20?= =?UTF-8?q?=E2=80=98atilde=E2=80=99=20to=20TestFamily2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TestFamily2-Master0.ttx | 41 +++++++++++-------- .../TestFamily2-Master1.ttx | 41 +++++++++++-------- .../glyphs/atilde.glif | 9 ++++ .../glyphs/contents.plist | 2 + .../TestFamily2-Master0.ufo/lib.plist | 1 + .../glyphs/atilde.glif | 9 ++++ .../glyphs/contents.plist | 2 + .../TestFamily2-Master1.ufo/lib.plist | 1 + Tests/varLib/data/test_results/Build3.ttx | 20 +++++++-- 9 files changed, 90 insertions(+), 36 deletions(-) create mode 100644 Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/atilde.glif create mode 100644 Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/atilde.glif diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master0.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master0.ttx index 88a5bc800..13d48e74b 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master0.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master0.ttx @@ -1,5 +1,5 @@ - + @@ -14,24 +14,25 @@ - - - - - - + + + + + + + - + - - + + @@ -60,17 +61,17 @@ - + - + - - + + @@ -78,7 +79,7 @@ - + @@ -86,7 +87,7 @@ - + @@ -142,6 +143,7 @@ + @@ -166,6 +168,7 @@ + @@ -181,6 +184,7 @@ + @@ -433,6 +437,11 @@ + + + + + diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master1.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master1.ttx index ef1542a26..92157bb50 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master1.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master1.ttx @@ -1,5 +1,5 @@ - + @@ -14,24 +14,25 @@ - - - - - - + + + + + + + - + - - + + @@ -60,17 +61,17 @@ - + - + - - + + @@ -78,7 +79,7 @@ - + @@ -86,7 +87,7 @@ - + @@ -142,6 +143,7 @@ + @@ -166,6 +168,7 @@ + @@ -181,6 +184,7 @@ + @@ -433,6 +437,11 @@ + + + + + diff --git a/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/atilde.glif b/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/atilde.glif new file mode 100644 index 000000000..37411a1b6 --- /dev/null +++ b/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/atilde.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/contents.plist b/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/contents.plist index 0ecdd9312..2c5ee6b76 100644 --- a/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/contents.plist +++ b/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/contents.plist @@ -14,6 +14,8 @@ a.alt.glif ampersand ampersand.glif + atilde + atilde.glif circledotted circledotted.glif d diff --git a/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/lib.plist b/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/lib.plist index 0d8e6bbe1..54eab2b65 100644 --- a/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/lib.plist +++ b/Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/lib.plist @@ -15,6 +15,7 @@ f_t a.alt A.sc + atilde ampersand circledotted tildecmb diff --git a/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/atilde.glif b/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/atilde.glif new file mode 100644 index 000000000..b53079dd3 --- /dev/null +++ b/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/atilde.glif @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/contents.plist b/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/contents.plist index 0ecdd9312..2c5ee6b76 100644 --- a/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/contents.plist +++ b/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/contents.plist @@ -14,6 +14,8 @@ a.alt.glif ampersand ampersand.glif + atilde + atilde.glif circledotted circledotted.glif d diff --git a/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/lib.plist b/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/lib.plist index 0d8e6bbe1..54eab2b65 100644 --- a/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/lib.plist +++ b/Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/lib.plist @@ -15,6 +15,7 @@ f_t a.alt A.sc + atilde ampersand circledotted tildecmb diff --git a/Tests/varLib/data/test_results/Build3.ttx b/Tests/varLib/data/test_results/Build3.ttx index b6819b9bb..0a4db8ede 100644 --- a/Tests/varLib/data/test_results/Build3.ttx +++ b/Tests/varLib/data/test_results/Build3.ttx @@ -43,7 +43,7 @@ - + @@ -58,12 +58,13 @@ - - - + + + + @@ -481,6 +482,17 @@ + + + + + + + + + + +