From 299ae2fb0b829f3b5fa14ee27e72257180179470 Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Fri, 17 Aug 2018 11:51:05 +0700 Subject: [PATCH] Fix tests --- Tests/feaLib/data/multiple_feature_blocks.ttx | 2 +- Tests/feaLib/data/spec4h1.fea | 17 ++++++------- Tests/feaLib/data/spec4h1.ttx | 12 ++++----- Tests/feaLib/data/spec4h2.fea | 4 +-- Tests/feaLib/data/spec4h2.ttx | 25 ++++++------------- 5 files changed, 23 insertions(+), 37 deletions(-) diff --git a/Tests/feaLib/data/multiple_feature_blocks.ttx b/Tests/feaLib/data/multiple_feature_blocks.ttx index 4f9a38960..73380c8ad 100644 --- a/Tests/feaLib/data/multiple_feature_blocks.ttx +++ b/Tests/feaLib/data/multiple_feature_blocks.ttx @@ -22,7 +22,7 @@ - + diff --git a/Tests/feaLib/data/spec4h1.fea b/Tests/feaLib/data/spec4h1.fea index b43e13b0d..3ea3b0ea4 100644 --- a/Tests/feaLib/data/spec4h1.fea +++ b/Tests/feaLib/data/spec4h1.fea @@ -33,8 +33,8 @@ feature liga { sub c s by c_s; # The rules above will be placed in a lookup that is registered - # for all the specified languages for the script latn, but not any - # other scripts. + # for only the dflt language for this script, and not any other + # languages. language DEU; # script latn; (stays the same) @@ -43,16 +43,15 @@ feature liga { sub c k by c_k; # The rules above will be placed in a lookup that is registered - # only under the script latn, language DEU. + # only under the script latn, language DEU, along with the lookup + # registered for the dflt language for this script. language TRK; - # This will inherit both the top level default rules - the rules - # defined before the first 'script' statement, and the - # script-level default rules for 'latn': all the lookups of this - # feature defined after the 'script latn' statement, and before - # the language DEU statement. If TRK were not named here, it - # would not inherit the default rules for the script latn. + # This will inherit only the lookup defined for the dflt language + # for this script. + # If this statement were not here, the language would only inherit + # the lookup at the start of this feature before script latn. } liga; # TODO(sascha): Uncomment once we support 'pos' statements. diff --git a/Tests/feaLib/data/spec4h1.ttx b/Tests/feaLib/data/spec4h1.ttx index 0e42fc56e..4d3931cc9 100644 --- a/Tests/feaLib/data/spec4h1.ttx +++ b/Tests/feaLib/data/spec4h1.ttx @@ -65,18 +65,16 @@ - - - - + + + - - - + + diff --git a/Tests/feaLib/data/spec4h2.fea b/Tests/feaLib/data/spec4h2.fea index 038480486..e90999899 100644 --- a/Tests/feaLib/data/spec4h2.fea +++ b/Tests/feaLib/data/spec4h2.fea @@ -9,7 +9,7 @@ languagesystem cyrl SRB; languagesystem grek dflt; feature liga { - # start of default rules that are applied under all language systems. + # start of default rules that are applied to unspecified languages below lookup HAS_I { sub f f i by f_f_i; sub f i by f_i; @@ -20,7 +20,7 @@ feature liga { sub f f by f_f; } NO_I; - # end of default rules that are applied under all language systems. + # end of default rules that are applied to unspecified languages below script latn; language dflt; diff --git a/Tests/feaLib/data/spec4h2.ttx b/Tests/feaLib/data/spec4h2.ttx index 266c4870d..8005c2f69 100644 --- a/Tests/feaLib/data/spec4h2.ttx +++ b/Tests/feaLib/data/spec4h2.ttx @@ -19,11 +19,6 @@