From 6683fc9f82a9d96e045c7fdf02386d5c31d4dd76 Mon Sep 17 00:00:00 2001
From: cynthiaxzhu <71056836+cynthiaxzhu@users.noreply.github.com>
Date: Thu, 12 Dec 2024 12:00:02 -0500
Subject: [PATCH] Fix issues with character variants and stylistic sets

---
 src/features/cv05-l-tail.fea          | 3 +++
 src/features/cv08-i-serif.fea         | 3 +++
 src/features/cv10-g-spur.fea          | 2 ++
 src/features/cv11-single-storey-a.fea | 6 ++++++
 src/features/cv12-compact-f.fea       | 1 +
 src/features/cv13-compact-t.fea       | 2 ++
 6 files changed, 17 insertions(+)

diff --git a/src/features/cv05-l-tail.fea b/src/features/cv05-l-tail.fea
index 8959f48e93..e1ff4a5a98 100644
--- a/src/features/cv05-l-tail.fea
+++ b/src/features/cv05-l-tail.fea
@@ -5,8 +5,11 @@ sub lbar by lbar.ss02;
 sub lmidtilde by lmidtilde.ss02;
 sub lbelt by lbelt.ss02;
 sub ldot by ldot.ss02;
+sub ldot.ss07 by ldot.ss02.ss07;
 sub lacute by lacute.ss02;
 sub lcommaaccent by lcommaaccent.ss02;
+sub lcommaaccent.ss03 by lcommaaccent.ss02.ss03;
+sub lcommaaccent.ss07 by lcommaaccent.ss02.ss07;
 sub lcaron by lcaron.ss02;
 sub ldotbelow by ldotbelow.ss02;
 sub ldotbelow.ss07 by ldotbelow.ss02.ss07;
diff --git a/src/features/cv08-i-serif.fea b/src/features/cv08-i-serif.fea
index 81b71afae4..ee40598f59 100644
--- a/src/features/cv08-i-serif.fea
+++ b/src/features/cv08-i-serif.fea
@@ -3,6 +3,7 @@ sub I by I.1;
 sub Idieresis by Idieresis.1;
 sub Idieresis.ss07 by Idieresis.1.ss07;
 sub Idieresisacute by Idieresisacute.1;
+sub Idieresisacute.ss07 by Idieresisacute.1.ss07;
 sub Istroke by Istroke.1;
 sub Itildebelow by Itildebelow.1;
 sub Igrave by Igrave.1;
@@ -13,11 +14,13 @@ sub Imacron by Imacron.1;
 sub Ibreve by Ibreve.1;
 sub Iogonek by Iogonek.1;
 sub Idotaccent by Idotaccent.1;
+sub Idotaccent.ss07 by Idotaccent.1.ss07;
 sub Icaron by Icaron.1;
 sub Idblgrave by Idblgrave.1;
 sub Iinvertedbreve by Iinvertedbreve.1;
 sub Ihookabove by Ihookabove.1;
 sub Idotbelow by Idotbelow.1;
+sub Idotbelow.ss07 by Idotbelow.1.ss07;
 sub uni1F38 by uni1F38.1;
 sub uni1F39 by uni1F39.1;
 sub uni1F3A by uni1F3A.1;
diff --git a/src/features/cv10-g-spur.fea b/src/features/cv10-g-spur.fea
index 36f758464a..948f0a92f7 100644
--- a/src/features/cv10-g-spur.fea
+++ b/src/features/cv10-g-spur.fea
@@ -7,6 +7,8 @@ sub Gbreve by Gbreve.1;
 sub Gdotaccent by Gdotaccent.1;
 sub Gdotaccent.ss07 by Gdotaccent.1.ss07;
 sub Gcommaaccent by Gcommaaccent.1;
+sub Gcommaaccent.ss03 by Gcommaaccent.1.ss03;
+sub Gcommaaccent.ss07 by Gcommaaccent.1.ss07;
 sub Gcaron by Gcaron.1;
 sub Gacute by Gacute.1;
 sub Gmacron by Gmacron.1;
diff --git a/src/features/cv11-single-storey-a.fea b/src/features/cv11-single-storey-a.fea
index 8735d77492..4eb7a14204 100644
--- a/src/features/cv11-single-storey-a.fea
+++ b/src/features/cv11-single-storey-a.fea
@@ -5,6 +5,7 @@ sub aacute by aacute.1;
 sub abreve by abreve.1;
 sub abreveacute by abreveacute.1;
 sub abrevedotbelow by abrevedotbelow.1;
+sub abrevedotbelow.ss07 by abrevedotbelow.1.ss07;
 sub abrevegrave by abrevegrave.1;
 sub abrevehookabove by abrevehookabove.1;
 sub abrevetilde by abrevetilde.1;
@@ -12,6 +13,7 @@ sub acaron by acaron.1;
 sub acircumflex by acircumflex.1;
 sub acircumflexacute by acircumflexacute.1;
 sub acircumflexdotbelow by acircumflexdotbelow.1;
+sub acircumflexdotbelow.ss07 by acircumflexdotbelow.1.ss07;
 sub acircumflexgrave by acircumflexgrave.1;
 sub acircumflexhookabove by acircumflexhookabove.1;
 sub acircumflextilde by acircumflextilde.1;
@@ -23,6 +25,7 @@ sub adieresismacron.ss07 by adieresismacron.1.ss07;
 sub adotaccent by adotaccent.1;
 sub adotaccent.ss07 by adotaccent.1.ss07;
 sub adotbelow by adotbelow.1;
+sub adotbelow.ss07 by adotbelow.1.ss07;
 sub adotmacron by adotmacron.1;
 sub agrave by agrave.1;
 sub ahookabove by ahookabove.1;
@@ -34,6 +37,9 @@ sub aring by aring.1;
 sub aringacute by aringacute.1;
 sub aringbelow by aringbelow.1;
 sub atilde by atilde.1;
+sub aturn by aturn.1;
 sub acyrillic by a.1;  # acyrillic is just a reference to /a
+sub abrevecyrillic by abreve.1;  # reference to /abreve
+sub adieresiscyrillic by adieresis.1;  # reference to /adieresis
 sub a.sups by a.1.sups;
 sub a.subs by a.1.subs;
diff --git a/src/features/cv12-compact-f.fea b/src/features/cv12-compact-f.fea
index a475ca4e27..6830a4ab98 100644
--- a/src/features/cv12-compact-f.fea
+++ b/src/features/cv12-compact-f.fea
@@ -1,6 +1,7 @@
 # Note: don't use cvParameters here since this file is included in salt
 
 sub f by f.1;
+sub f.i by f.i.1;
 sub fdotaccent by fdotaccent.1;
 sub fdotaccent.ss07 by fdotaccent.1.ss07;
 sub feng by feng.1;
diff --git a/src/features/cv13-compact-t.fea b/src/features/cv13-compact-t.fea
index 913f31b3e0..c92dfc9b62 100644
--- a/src/features/cv13-compact-t.fea
+++ b/src/features/cv13-compact-t.fea
@@ -5,6 +5,8 @@ sub tpalatalhook by tpalatalhook.1;
 sub tcedilla by tcedilla.1;
 sub tcaron by tcaron.1;
 sub tcommaaccent by tcommaaccent.1;
+sub tcommaaccent.ss03 by tcommaaccent.1.ss03;
+sub tcommaaccent.ss07 by tcommaaccent.1.ss07;
 sub tdotaccent by tdotaccent.1;
 sub tdotaccent.ss07 by tdotaccent.1.ss07;
 sub tdotbelow by tdotbelow.1;