8 files changed, 23 insertions, 2 deletions
diff --git a/src/features/ccmp.fea b/src/features/ccmp.fea
index 6a47ca0b9..7d339544f 100644
--- a/src/features/ccmp.fea
+++ b/src/features/ccmp.fea
@@ -382,7 +382,7 @@ lookup ccmp03 {
   sub H caroncomb by uni021E;
   sub h caroncomb by uni021F;
   sub A dotaccentcomb by uni0226;
-  sub a dotaccentcomb by uni0227;
+  sub a dotaccentcomb by adotaccent;
   sub E cedillacomb by uni0228;
   sub e cedillacomb by uni0229;
   sub O dieresiscomb macroncomb by uni022A;
diff --git a/src/features/cv05-l-tail.fea b/src/features/cv05-l-tail.fea
index b6189f2a2..8959f48e9 100644
--- a/src/features/cv05-l-tail.fea
+++ b/src/features/cv05-l-tail.fea
@@ -9,6 +9,8 @@ sub lacute by lacute.ss02;
 sub lcommaaccent by lcommaaccent.ss02;
 sub lcaron by lcaron.ss02;
 sub ldotbelow by ldotbelow.ss02;
+sub ldotbelow.ss07 by ldotbelow.ss02.ss07;
 sub ldotbelowmacron by ldotbelowmacron.ss02;
+sub ldotbelowmacron.ss07 by ldotbelowmacron.ss02.ss07;
 sub llinebelow by llinebelow.ss02;
 sub lcircumflexbelow by lcircumflexbelow.ss02;
diff --git a/src/features/cv06-u.fea b/src/features/cv06-u.fea
index b6a51d256..3a8bd7393 100644
--- a/src/features/cv06-u.fea
+++ b/src/features/cv06-u.fea
@@ -9,17 +9,25 @@ sub ucircumflex by ucircumflex.1;
 sub ucircumflexbelow by ucircumflexbelow.1;
 sub udblgrave by udblgrave.1;
 sub udieresis by udieresis.1;
+sub udieresis.ss07 by udieresis.1.ss07;
 sub udieresisacute by udieresisacute.1;
+sub udieresisacute.ss07 by udieresisacute.1.ss07;
 sub udieresisbelow by udieresisbelow.1;
+sub udieresisbelow.ss07 by udieresisbelow.1.ss07;
 sub udieresiscaron by udieresiscaron.1;
+sub udieresiscaron.ss07 by udieresiscaron.1.ss07;
 sub udieresisgrave by udieresisgrave.1;
+sub udieresisgrave.ss07 by udieresisgrave.1.ss07;
 sub udieresismacron by udieresismacron.1;
+sub udieresismacron.ss07 by udieresismacron.1.ss07;
 sub udotbelow by udotbelow.1;
+sub udotbelow.ss07 by udotbelow.1.ss07;
 sub ugrave by ugrave.1;
 sub uhookabove by uhookabove.1;
 sub uhorn by uhorn.1;
 sub uhornacute by uhornacute.1;
 sub uhorndotbelow by uhorndotbelow.1;
+sub uhorndotbelow.ss07 by uhorndotbelow.1.ss07;
 sub uhorngrave by uhorngrave.1;
 sub uhornhookabove by uhornhookabove.1;
 sub uhorntilde by uhorntilde.1;
@@ -27,6 +35,7 @@ sub uhungarumlaut by uhungarumlaut.1;
 sub uinvertedbreve by uinvertedbreve.1;
 sub umacron by umacron.1;
 sub umacrondieresis by umacrondieresis.1;
+sub umacrondieresis.ss07 by umacrondieresis.1.ss07;
 sub uogonek by uogonek.1;
 sub uring by uring.1;
 sub utilde by utilde.1;
diff --git a/src/features/cv08-i-serif.fea b/src/features/cv08-i-serif.fea
index 0afb5254f..81b71afae 100644
--- a/src/features/cv08-i-serif.fea
+++ b/src/features/cv08-i-serif.fea
@@ -1,6 +1,7 @@
 # Note: don't use cvParameters here since this file is included in salt
 sub I by I.1;
 sub Idieresis by Idieresis.1;
+sub Idieresis.ss07 by Idieresis.1.ss07;
 sub Idieresisacute by Idieresisacute.1;
 sub Istroke by Istroke.1;
 sub Itildebelow by Itildebelow.1;
@@ -31,3 +32,4 @@ sub uni1FDA by uni1FDA.1;
 sub uni1FDB by uni1FDB.1;
 sub afii10055 by afii10055.1;
 sub Yi-cy by Yi-cy.1;
+sub Yi-cy.ss07 by Yi-cy.1.ss07;
diff --git a/src/features/cv10-g-spur.fea b/src/features/cv10-g-spur.fea
index 9064be805..36f758464 100644
--- a/src/features/cv10-g-spur.fea
+++ b/src/features/cv10-g-spur.fea
@@ -5,6 +5,7 @@ sub Ghook by Ghook.1;
 sub Gcircumflex by Gcircumflex.1;
 sub Gbreve by Gbreve.1;
 sub Gdotaccent by Gdotaccent.1;
+sub Gdotaccent.ss07 by Gdotaccent.1.ss07;
 sub Gcommaaccent by Gcommaaccent.1;
 sub Gcaron by Gcaron.1;
 sub Gacute by Gacute.1;
diff --git a/src/features/cv11-single-storey-a.fea b/src/features/cv11-single-storey-a.fea
index 85e3f628a..df4034c1e 100644
--- a/src/features/cv11-single-storey-a.fea
+++ b/src/features/cv11-single-storey-a.fea
@@ -17,8 +17,11 @@ sub acircumflexhookabove by acircumflexhookabove.1;
 sub acircumflextilde by acircumflextilde.1;
 sub adblgrave by adblgrave.1;
 sub adieresis by adieresis.1;
+sub adieresis.ss07 by adieresis.1.ss07;
 sub adieresismacron by adieresismacron.1;
-sub uni0227 by uni0227.1;
+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 adotmacron by adotmacron.1;
 sub agrave by agrave.1;
diff --git a/src/features/cv12-compact-f.fea b/src/features/cv12-compact-f.fea
index a5a5aa6c4..a475ca4e2 100644
--- a/src/features/cv12-compact-f.fea
+++ b/src/features/cv12-compact-f.fea
@@ -2,4 +2,5 @@
 
 sub f by f.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 1dd88b8b5..913f31b3e 100644
--- a/src/features/cv13-compact-t.fea
+++ b/src/features/cv13-compact-t.fea
@@ -6,7 +6,10 @@ sub tcedilla by tcedilla.1;
 sub tcaron by tcaron.1;
 sub tcommaaccent by tcommaaccent.1;
 sub tdotaccent by tdotaccent.1;
+sub tdotaccent.ss07 by tdotaccent.1.ss07;
 sub tdotbelow by tdotbelow.1;
+sub tdotbelow.ss07 by tdotbelow.1.ss07;
 sub tlinebelow by tlinebelow.1;
 sub tcircumflexbelow by tcircumflexbelow.1;
 sub tdieresis by tdieresis.1;
+sub tdieresis.ss07 by tdieresis.1.ss07;