14 files changed, 47 insertions, 98 deletions
diff --git a/src/features/cv01-one.fea b/src/features/cv01-one.fea
index 860915d97..9e08f6662 100644
--- a/src/features/cv01-one.fea
+++ b/src/features/cv01-one.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Alternate one"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub one by one.ss01;
 sub one.tf by one.tf.ss01;
 sub one.squared by one.ss01.squared;
diff --git a/src/features/cv02-four.fea b/src/features/cv02-four.fea
index 6e2b3bd71..3dd6ede87 100644
--- a/src/features/cv02-four.fea
+++ b/src/features/cv02-four.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Open four"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub four by four.ss01;
 sub four.tf by four.tf.ss01;
 sub four.squared by four.ss01.squared;
diff --git a/src/features/cv03-six.fea b/src/features/cv03-six.fea
index 1e26b2e2e..579f72561 100644
--- a/src/features/cv03-six.fea
+++ b/src/features/cv03-six.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Open six"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub six by six.ss01;
 sub six.tf by six.tf.ss01;
 sub six.squared by six.ss01.squared;
diff --git a/src/features/cv04-nine.fea b/src/features/cv04-nine.fea
index f24b3352e..4fea8a344 100644
--- a/src/features/cv04-nine.fea
+++ b/src/features/cv04-nine.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Open nine"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub nine by nine.ss01;
 sub nine.tf by nine.tf.ss01;
 sub nine.squared by nine.ss01.squared;
diff --git a/src/features/cv05-l-tail.fea b/src/features/cv05-l-tail.fea
index 38da8fcdd..b6189f2a2 100644
--- a/src/features/cv05-l-tail.fea
+++ b/src/features/cv05-l-tail.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Lower-case L with tail"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub l by l.ss02;
 sub lslash by lslash.ss02;
 sub lbar by lbar.ss02;
diff --git a/src/features/cv06-u.fea b/src/features/cv06-u.fea
index 172af4493..b6a51d256 100644
--- a/src/features/cv06-u.fea
+++ b/src/features/cv06-u.fea
@@ -1,2 +1,34 @@
-cvParameters { FeatUILabelNameID { name "Simplified u"; }; };
-sub u by upsilon;
+# Note: don't use cvParameters here since this file is included in salt
+
+sub u by u.1;
+sub uacute by uacute.1;
+sub ubar by ubar.1;
+sub ubreve by ubreve.1;
+sub ucaron by ucaron.1;
+sub ucircumflex by ucircumflex.1;
+sub ucircumflexbelow by ucircumflexbelow.1;
+sub udblgrave by udblgrave.1;
+sub udieresis by udieresis.1;
+sub udieresisacute by udieresisacute.1;
+sub udieresisbelow by udieresisbelow.1;
+sub udieresiscaron by udieresiscaron.1;
+sub udieresisgrave by udieresisgrave.1;
+sub udieresismacron by udieresismacron.1;
+sub udotbelow by udotbelow.1;
+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 uhorngrave by uhorngrave.1;
+sub uhornhookabove by uhornhookabove.1;
+sub uhorntilde by uhorntilde.1;
+sub uhungarumlaut by uhungarumlaut.1;
+sub uinvertedbreve by uinvertedbreve.1;
+sub umacron by umacron.1;
+sub umacrondieresis by umacrondieresis.1;
+sub uogonek by uogonek.1;
+sub uring by uring.1;
+sub utilde by utilde.1;
+sub utildeacute by utildeacute.1;
+sub utildebelow by utildebelow.1;
diff --git a/src/features/cv07-germandbls.fea b/src/features/cv07-germandbls.fea
index 64556ae2d..e3d51dc75 100644
--- a/src/features/cv07-germandbls.fea
+++ b/src/features/cv07-germandbls.fea
@@ -1,2 +1,3 @@
-cvParameters { FeatUILabelNameID { name "Alternate German double s"; }; };
+# Note: don't use cvParameters here since this file is included in salt
+
 sub germandbls by germandbls.1;
diff --git a/src/features/cv08-i-serif.fea b/src/features/cv08-i-serif.fea
index cc46a307f..0afb5254f 100644
--- a/src/features/cv08-i-serif.fea
+++ b/src/features/cv08-i-serif.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Upper-case i with serif"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub I by I.1;
 sub Idieresis by Idieresis.1;
 sub Idieresisacute by Idieresisacute.1;
diff --git a/src/features/cv09-three.fea b/src/features/cv09-three.fea
index 9b65faee5..731a01562 100644
--- a/src/features/cv09-three.fea
+++ b/src/features/cv09-three.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Flat-top three"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub three by three.1;
 sub three.tf by three.1.tf;
 sub three.squared by three.1.squared;
diff --git a/src/features/cv10-g-spur.fea b/src/features/cv10-g-spur.fea
index 3eb0c005f..9064be805 100644
--- a/src/features/cv10-g-spur.fea
+++ b/src/features/cv10-g-spur.fea
@@ -1,4 +1,4 @@
-cvParameters { FeatUILabelNameID { name "Capital G with spur"; }; };
+# Note: don't use cvParameters here since this file is included in salt
 sub G by G.1;
 sub Gbar by Gbar.1;
 sub Ghook by Ghook.1;
diff --git a/src/features/cv11-single-storey-a.fea b/src/features/cv11-single-storey-a.fea
index ab46b8091..85e3f628a 100644
--- a/src/features/cv11-single-storey-a.fea
+++ b/src/features/cv11-single-storey-a.fea
@@ -1,5 +1,4 @@
-# Note: don't use cvParameters here since this file is
-# included for both salt and cv11
+# Note: don't use cvParameters here since this file is included in salt
 
 sub a by a.1;
 sub aacute by aacute.1;
diff --git a/src/features/cv12-compact-f.fea b/src/features/cv12-compact-f.fea
index cc0d10073..a5a5aa6c4 100644
--- a/src/features/cv12-compact-f.fea
+++ b/src/features/cv12-compact-f.fea
@@ -1,5 +1,4 @@
-# Note: don't use cvParameters here since this file is
-# included for both salt and cvXX
+# Note: don't use cvParameters here since this file is included in salt
 
 sub f by f.1;
 sub fdotaccent by fdotaccent.1;
diff --git a/src/features/cv13-compact-t.fea b/src/features/cv13-compact-t.fea
index 3a8bd12cf..1dd88b8b5 100644
--- a/src/features/cv13-compact-t.fea
+++ b/src/features/cv13-compact-t.fea
@@ -1,5 +1,4 @@
-# Note: don't use cvParameters here since this file is
-# included for both salt and cvXX
+# Note: don't use cvParameters here since this file is included in salt
 
 sub t by t.1;
 sub tpalatalhook by tpalatalhook.1;
diff --git a/src/features/salt.fea b/src/features/salt.fea
deleted file mode 100644
index 1d1c6f01f..000000000
--- a/src/features/salt.fea
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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;
-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;
-
-sub l by l.ss02;
-sub lslash by lslash.ss02;
-sub lbar by lbar.ss02;
-sub lmidtilde by lmidtilde.ss02;
-sub lbelt by lbelt.ss02;
-sub ldot by ldot.ss02;
-sub lacute by lacute.ss02;
-sub lcommaaccent by lcommaaccent.ss02;
-sub lcaron by lcaron.ss02;
-sub ldotbelow by ldotbelow.ss02;
-sub ldotbelowmacron by ldotbelowmacron.ss02;
-sub llinebelow by llinebelow.ss02;
-sub lcircumflexbelow by lcircumflexbelow.ss02;
-
-sub G by G.1;
-sub Gbar by Gbar.1;
-sub Ghook by Ghook.1;
-sub Gcircumflex by Gcircumflex.1;
-sub Gbreve by Gbreve.1;
-sub Gdotaccent by Gdotaccent.1;
-sub Gcommaaccent by Gcommaaccent.1;
-sub Gcaron by Gcaron.1;
-sub Gacute by Gacute.1;
-sub Gmacron by Gmacron.1;
-
-sub I by I.1;
-sub Idieresis by Idieresis.1;
-sub Idieresisacute by Idieresisacute.1;
-sub Istroke by Istroke.1;
-sub Itildebelow by Itildebelow.1;
-sub Igrave by Igrave.1;
-sub Iacute by Iacute.1;
-sub Icircumflex by Icircumflex.1;
-sub Itilde by Itilde.1;
-sub Imacron by Imacron.1;
-sub Ibreve by Ibreve.1;
-sub Iogonek by Iogonek.1;
-sub Idotaccent by Idotaccent.1;
-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 uni1F38 by uni1F38.1;
-sub uni1F39 by uni1F39.1;
-sub uni1F3A by uni1F3A.1;
-sub uni1F3B by uni1F3B.1;
-sub uni1F3C by uni1F3C.1;
-sub uni1F3D by uni1F3D.1;
-sub uni1F3E by uni1F3E.1;
-sub uni1F3F by uni1F3F.1;
-sub uni1FD8 by uni1FD8.1;
-sub uni1FD9 by uni1FD9.1;
-sub uni1FDA by uni1FDA.1;
-sub uni1FDB by uni1FDB.1;
-sub afii10055 by afii10055.1;
-sub Yi-cy by Yi-cy.1;
-
-sub u by upsilon;