3 files changed, 11 insertions, 34 deletions
diff --git a/src/features/cv11-single-storey-a.fea b/src/features/cv11-single-storey-a.fea
index ad98b28f9..ab46b8091 100644
--- a/src/features/cv11-single-storey-a.fea
+++ b/src/features/cv11-single-storey-a.fea
@@ -1,4 +1,6 @@
-cvParameters { FeatUILabelNameID { name "Single-storey a"; }; };
+# Note: don't use cvParameters here since this file is
+# included for both salt and cv11
+
 sub a by a.1;
 sub aacute by aacute.1;
 sub abreve by abreve.1;
diff --git a/src/features/dlig.fea b/src/features/dlig.fea
index 5d08c246a..37352a4f1 100644
--- a/src/features/dlig.fea
+++ b/src/features/dlig.fea
@@ -1,6 +1,11 @@
 # Discretionary Ligatures
 # https://docs.microsoft.com/en-us/typography/opentype/spec/features_ae#dlig
 
+# Set IgnoreMarks to skip over marks in lookups.
+# For example, if we have /f/acutecomb/i, treat lookup as /f/i
+# https://learn.microsoft.com/en-us/typography/opentype/spec/chapter2#lookup-table
+lookupflag IgnoreMarks;
+
 sub exclam question by interrobang;
 sub question exclam by interrobang;
 sub exclamdown questiondown by invertedinterrobang;
diff --git a/src/features/salt.fea b/src/features/salt.fea
index 2f27744f6..19a890e3a 100644
--- a/src/features/salt.fea
+++ b/src/features/salt.fea
@@ -1,3 +1,6 @@
+# Common code for roman and italic.
+# Note that roman has a.1 which italic does not.
+
 sub one by one.ss01;
 sub one.tf by one.tf.ss01;
 sub three by three.1;
@@ -17,39 +20,6 @@ sub nine.tf by nine.tf.ss01;
 sub nine.squared by nine.ss01.squared;
 sub nine.circled by nine.ss01.circled;
 
-sub a by a.1;
-sub aacute by aacute.1;
-sub abreve by abreve.1;
-sub abreveacute by abreveacute.1;
-sub abrevedotbelow by abrevedotbelow.1;
-sub abrevegrave by abrevegrave.1;
-sub abrevehookabove by abrevehookabove.1;
-sub abrevetilde by abrevetilde.1;
-sub acaron by acaron.1;
-sub acircumflex by acircumflex.1;
-sub acircumflexacute by acircumflexacute.1;
-sub acircumflexdotbelow by acircumflexdotbelow.1;
-sub acircumflexgrave by acircumflexgrave.1;
-sub acircumflexhookabove by acircumflexhookabove.1;
-sub acircumflextilde by acircumflextilde.1;
-sub adblgrave by adblgrave.1;
-sub adieresis by adieresis.1;
-sub adieresismacron by adieresismacron.1;
-sub uni0227 by uni0227.1;
-sub adotbelow by adotbelow.1;
-sub adotmacron by adotmacron.1;
-sub agrave by agrave.1;
-sub ahookabove by ahookabove.1;
-sub ainvertedbreve by ainvertedbreve.1;
-sub amacron by amacron.1;
-sub aogonek by aogonek.1;
-sub arighthalfring by arighthalfring.1;
-sub aring by aring.1;
-sub aringacute by aringacute.1;
-sub aringbelow by aringbelow.1;
-sub atilde by atilde.1;
-sub acyrillic by a.1;  # acyrillic is just a reference to /a
-
 sub l by l.ss02;
 sub lslash by lslash.ss02;
 sub lbar by lbar.ss02;