10 files changed, 76 insertions, 217 deletions
diff --git a/src/features/cv01-one.fea b/src/features/cv01-one.fea
index 9e08f6662..f7f44ab0c 100644
--- a/src/features/cv01-one.fea
+++ b/src/features/cv01-one.fea
@@ -3,3 +3,7 @@ sub one by one.ss01;
 sub one.tf by one.tf.ss01;
 sub one.squared by one.ss01.squared;
 sub one.circled by one.ss01.circled;
+sub one.numr by one.numr.ss01;
+sub one.dnom by one.dnom.ss01;
+sub one.sups by one.sups.ss01;
+sub one.subs by one.subs.ss01;
diff --git a/src/features/cv02-four.fea b/src/features/cv02-four.fea
index 3dd6ede87..f6400af31 100644
--- a/src/features/cv02-four.fea
+++ b/src/features/cv02-four.fea
@@ -3,3 +3,7 @@ sub four by four.ss01;
 sub four.tf by four.tf.ss01;
 sub four.squared by four.ss01.squared;
 sub four.circled by four.ss01.circled;
+sub four.dnom by four.dnom.ss01;
+sub four.numr by four.numr.ss01;
+sub four.sups by four.sups.ss01;
+sub four.subs by four.subs.ss01;
diff --git a/src/features/cv03-six.fea b/src/features/cv03-six.fea
index 579f72561..620614701 100644
--- a/src/features/cv03-six.fea
+++ b/src/features/cv03-six.fea
@@ -3,3 +3,7 @@ sub six by six.ss01;
 sub six.tf by six.tf.ss01;
 sub six.squared by six.ss01.squared;
 sub six.circled by six.ss01.circled;
+sub six.dnom by six.dnom.ss01;
+sub six.numr by six.numr.ss01;
+sub six.sups by six.sups.ss01;
+sub six.subs by six.subs.ss01;
diff --git a/src/features/cv04-nine.fea b/src/features/cv04-nine.fea
index 4fea8a344..5e4c9e608 100644
--- a/src/features/cv04-nine.fea
+++ b/src/features/cv04-nine.fea
@@ -3,3 +3,7 @@ sub nine by nine.ss01;
 sub nine.tf by nine.tf.ss01;
 sub nine.squared by nine.ss01.squared;
 sub nine.circled by nine.ss01.circled;
+sub nine.dnom by nine.dnom.ss01;
+sub nine.numr by nine.numr.ss01;
+sub nine.sups by nine.sups.ss01;
+sub nine.subs by nine.subs.ss01;
diff --git a/src/features/cv09-three.fea b/src/features/cv09-three.fea
index 731a01562..674127371 100644
--- a/src/features/cv09-three.fea
+++ b/src/features/cv09-three.fea
@@ -3,3 +3,7 @@ sub three by three.1;
 sub three.tf by three.1.tf;
 sub three.squared by three.1.squared;
 sub three.circled by three.1.circled;
+sub three.dnom by three.dnom.ss01;
+sub three.numr by three.numr.ss01;
+sub three.sups by three.sups.ss01;
+sub three.subs by three.subs.ss01;
diff --git a/src/features/frac.fea b/src/features/frac.fea
index 8db3c6634..7673d4ef4 100644
--- a/src/features/frac.fea
+++ b/src/features/frac.fea
@@ -1,197 +1,49 @@
 @figures = [
-    zero
-    one
-    two
-    three
-    four
-    five
-    six
-    seven
-    eight
-    nine
+  zero
+  one
+  two
+  three
+  four
+  five
+  six
+  seven
+  eight
+  nine
 ];
 @numerators = [
-    zero.frac
-    one.frac
-    two.frac
-    three.frac
-    four.frac
-    five.frac
-    six.frac
-    seven.frac
-    eight.frac
-    nine.frac
-];
-@numerators2 = [
-    zero.numr
-    one.numr
-    two.numr
-    three.numr
-    four.numr
-    five.numr
-    six.numr
-    seven.numr
-    eight.numr
-    nine.numr
+  zero.numr
+  one.numr
+  two.numr
+  three.numr
+  four.numr
+  five.numr
+  six.numr
+  seven.numr
+  eight.numr
+  nine.numr
 ];
 @denominators = [
-    zero.dnomf
-    one.dnomf
-    two.dnomf
-    three.dnomf
-    four.dnomf
-    five.dnomf
-    six.dnomf
-    seven.dnomf
-    eight.dnomf
-    nine.dnomf
-];
-@denominators2 = [
-    zero.dnom
-    one.dnom
-    two.dnom
-    three.dnom
-    four.dnom
-    five.dnom
-    six.dnom
-    seven.dnom
-    eight.dnom
-    nine.dnom
+  zero.dnom
+  one.dnom
+  two.dnom
+  three.dnom
+  four.dnom
+  five.dnom
+  six.dnom
+  seven.dnom
+  eight.dnom
+  nine.dnom
 ];
-@subscripts = [
-    zero.subs
-    one.subs
-    two.subs
-    three.subs
-    four.subs
-    five.subs
-    six.subs
-    seven.subs
-    eight.subs
-    nine.subs
-];
-
-lookup FractionBar {
-    ignore sub slash @figures @figures @figures @figures @figures @figures @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures @figures @figures @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures @figures @figures @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures @figures @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures @figures @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures @figures slash;
-    ignore sub slash @figures @figures @figures slash';
-    ignore sub slash' @figures @figures @figures slash;
-    ignore sub slash @figures @figures slash';
-    ignore sub slash' @figures @figures slash;
-    ignore sub slash @figures slash';
-    ignore sub slash' @figures slash;
-    sub @figures slash' @figures by fraction;
-} FractionBar;
-
-lookup Numerator1 {
-    sub @figures' fraction by @numerators;
-} Numerator1;
-
-lookup Numerator2 {
-    sub @figures'
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator2;
-
-lookup Numerator3 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator3;
-
-lookup Numerator4 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator4;
-
-lookup Numerator5 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator5;
-
-lookup Numerator6 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator6;
-
-lookup Numerator7 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator7;
-
-lookup Numerator8 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator8;
-
-lookup Numerator9 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator9;
 
-lookup Numerator10 {
-    sub @figures'
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-        [@numerators @numerators2]
-    fraction by @numerators;
-} Numerator10;
+lookup FRAC {
+  sub slash by fraction;
+} FRAC;
 
-lookup Denominator {
-    sub [fraction @denominators @denominators2 onefraction] @figures' by @denominators;
-    sub [fraction @denominators @denominators2 onefraction] @subscripts' by @denominators;
-} Denominator;
+lookup UP {
+  sub @figures by @numerators;
+} UP;
 
-sub @figures space' [@numerators @numerators2] by thinspace;
+lookup DOWN {
+  sub fraction @numerators' by @denominators;
+  sub @denominators @numerators' by @denominators;
+} DOWN;
diff --git a/src/features/ss01-alt-digits.fea b/src/features/ss01-alt-digits.fea
deleted file mode 100644
index 2f1ea6d77..000000000
--- a/src/features/ss01-alt-digits.fea
+++ /dev/null
@@ -1,17 +0,0 @@
-featureNames { name "Open digits"; };
-sub three by three.1;
-sub three.tf by three.1.tf;
-sub three.squared by three.1.squared;
-sub three.circled by three.1.circled;
-sub four by four.ss01;
-sub four.tf by four.tf.ss01;
-sub four.squared by four.ss01.squared;
-sub four.circled by four.ss01.circled;
-sub six by six.ss01;
-sub six.tf by six.tf.ss01;
-sub six.squared by six.ss01.squared;
-sub six.circled by six.ss01.circled;
-sub nine by nine.ss01;
-sub nine.tf by nine.tf.ss01;
-sub nine.squared by nine.ss01.squared;
-sub nine.circled by nine.ss01.circled;
diff --git a/src/features/subs.fea b/src/features/subs.fea
index 83ce816c1..bb2e45c89 100644
--- a/src/features/subs.fea
+++ b/src/features/subs.fea
@@ -9,7 +9,7 @@ sub h by h.subs;
 sub i by i.subs;
 sub j by j.subs;
 sub k by k.subs;
-sub [l l.ss02] by l.subs;
+sub l by l.subs;
 sub m by m.subs;
 sub n by n.subs;
 sub o by o.subs;
@@ -25,15 +25,15 @@ sub x by x.subs;
 sub y by y.subs;
 sub z by z.subs;
 sub [zero zero.slash zero.tf zero.tf.slash] by zero.subs;
-sub [one one.ss01 one.tf one.tf.ss01] by one.subs;
+sub [one one.tf] by one.subs;
 sub [two two.tf] by two.subs;
-sub [three three.1 three.tf three.1.tf] by three.subs;
-sub [four four.ss01 four.tf four.tf.ss01] by four.subs;
+sub [three three.tf] by three.subs;
+sub [four four.tf] by four.subs;
 sub [five five.tf] by five.subs;
-sub [six six.ss01 six.tf six.tf.ss01] by six.subs;
+sub [six six.tf] by six.subs;
 sub [seven seven.tf] by seven.subs;
 sub [eight eight.tf] by eight.subs;
-sub [nine nine.ss01 nine.tf nine.tf.ss01] by nine.subs;
+sub [nine nine.tf] by nine.subs;
 sub [parenleft parenleft.case] by parenleft.subs;
 sub [parenright parenright.case] by parenright.subs;
 sub [bracketleft bracketleft.case] by bracketleft.subs;
diff --git a/src/features/sups.fea b/src/features/sups.fea
index a11d147b6..a32e5e86e 100644
--- a/src/features/sups.fea
+++ b/src/features/sups.fea
@@ -9,7 +9,7 @@ sub h by h.sups;
 sub i by i.sups;
 sub j by j.sups;
 sub k by k.sups;
-sub [l l.ss02] by l.sups;
+sub l by l.sups;
 sub m by m.sups;
 sub n by n.sups;
 sub o by o.sups;
@@ -25,15 +25,15 @@ sub x by x.sups;
 sub y by y.sups;
 sub z by z.sups;
 sub [zero zero.slash zero.tf zero.tf.slash] by zero.sups;
-sub [one one.ss01 one.tf one.tf.ss01] by one.sups;
+sub [one one.tf] by one.sups;
 sub [two two.tf] by two.sups;
-sub [three three.1 three.tf three.1.tf] by three.sups;
-sub [four four.ss01 four.tf four.tf.ss01] by four.sups;
+sub [three three.tf] by three.sups;
+sub [four four.tf] by four.sups;
 sub [five five.tf] by five.sups;
-sub [six six.ss01 six.tf six.tf.ss01] by six.sups;
+sub [six six.tf] by six.sups;
 sub [seven seven.tf] by seven.sups;
 sub [eight eight.tf] by eight.sups;
-sub [nine nine.ss01 nine.tf nine.tf.ss01] by nine.sups;
+sub [nine nine.tf] by nine.sups;
 sub [parenleft parenleft.case] by parenleft.sups;
 sub [parenright parenright.case] by parenright.sups;
 sub [bracketleft bracketleft.case] by bracketleft.sups;
diff --git a/src/features/zero.fea b/src/features/zero.fea
index d06339d71..ab5bed69a 100644
--- a/src/features/zero.fea
+++ b/src/features/zero.fea
@@ -2,3 +2,7 @@ sub zero by zero.slash;
 sub zero.tf by zero.tf.slash;
 sub zero.circled by zero.slash.circled;
 sub zero.squared by zero.slash.squared;
+sub zero.sups by zero.sups.slash;
+sub zero.subs by zero.subs.slash;
+sub zero.numr by zero.numr.slash;
+sub zero.dnom by zero.dnom.slash;