From 4de75a08a5471b517ff46d04d2eaff3efb879687 Mon Sep 17 00:00:00 2001
From: be5invis <belleve@typeof.net>
Date: Sun, 24 Sep 2023 14:03:02 -0700
Subject: [PATCH] More cleanup (#2006)

---
 params/variants.toml | 72 ++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/params/variants.toml b/params/variants.toml
index 3dcee8555..6b889e230 100644
--- a/params/variants.toml
+++ b/params/variants.toml
@@ -7238,6 +7238,7 @@ cyrl-yery = "cursive"
 micro-sign = "tailed-motion-serifed"
 
 
+
 [composite.ss01]
 tag = "ss01"
 description = "Andale Mono Style"
@@ -7261,7 +7262,6 @@ u = "toothed-serifless"
 y = "straight-turn-serifless"
 long-s = "flat-hook-middle-serifed"
 eszet = "longs-s-lig-serifless"
-lower-eth = "straight-bar"
 lower-lambda = "straight-turn"
 lower-iota = "tailed"
 lower-pi = "tailless"
@@ -7271,6 +7271,7 @@ cyrl-zhe = "straight"
 cyrl-capital-ka = "straight-serifless"
 cyrl-ka = "straight-serifless"
 cyrl-em = "flat-bottom-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 cyrl-ef = "split-serifless"
 zero = "dotted"
@@ -7288,6 +7289,7 @@ brace = "straight"
 number-sign = "slanted"
 at = "fourfold"
 percent = "rings-continuous-slash"
+lower-eth = "straight-bar"
 micro-sign = "toothed-serifless"
 guillemet = "straight"
 
@@ -7318,6 +7320,7 @@ lower-mu = "tailed-serifed"
 cyrl-capital-ka = "straight-serifed"
 cyrl-ka = "straight-serifed"
 cyrl-em = "flat-bottom-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 seven = "straight-serifed"
@@ -7357,13 +7360,13 @@ y = "straight-turn-serifless"
 z = "straight-serifed"
 long-s = "flat-hook-double-serifed"
 eszet = "longs-s-lig-serifless"
-lower-eth = "straight-bar"
 lower-lambda = "straight-turn"
 cyrl-capital-zhe = "straight"
 cyrl-zhe = "straight"
 cyrl-capital-ze = "unilateral-serifed"
 cyrl-capital-ka = "straight-serifless"
 cyrl-ka = "straight-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 cyrl-ef = "split-serifless"
 one = "base"
@@ -7378,6 +7381,7 @@ brace = "straight"
 at = "fourfold"
 percent = "rings-continuous-slash"
 partial-derivative = "straight-bar"
+lower-eth = "straight-bar"
 micro-sign = "toothed-serifless"
 punctuation-dot = "square"
 diacritic-dot = "square"
@@ -7401,6 +7405,7 @@ lower-mu = "tailed-serifed"
 cyrl-ze = "unilateral-serifed"
 cyrl-capital-ka = "straight-serifed"
 cyrl-ka = "straight-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 micro-sign = "toothed-serifed"
@@ -7427,9 +7432,8 @@ k = "symmetric-touching-serifless"
 l = "serifed"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
-long-s = "flat-hook-serifless"
 eszet = "longs-s-lig-serifless"
-lower-eth = "straight-bar"
+long-s = "flat-hook-serifless"
 lower-alpha = "barred-tailed"
 lower-iota = "tailed-serifed"
 lower-lambda = "straight-turn"
@@ -7439,6 +7443,7 @@ cyrl-zhe = "symmetric-touching"
 cyrl-capital-ka = "symmetric-touching-serifless"
 cyrl-ka = "symmetric-touching-serifless"
 cyrl-em = "slanted-sides-hanging-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 one = "base"
 two = "straight-neck"
@@ -7452,6 +7457,7 @@ brace = "straight"
 number-sign = "slanted"
 at = "fourfold"
 question = "corner-flat-hooked"
+lower-eth = "straight-bar"
 micro-sign = "tailed-serifless"
 guillemet = "straight"
 
@@ -7483,6 +7489,7 @@ eszet = "longs-s-lig-bottom-serifed"
 cyrl-capital-ka = "symmetric-touching-serifed"
 cyrl-ka = "symmetric-touching-serifed"
 cyrl-em = "slanted-sides-hanging-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 micro-sign = "tailed-serifed"
 
@@ -7498,7 +7505,6 @@ y = "straight-turn-motion-serifed"
 long-s = "flat-hook-descending"
 eszet = "longs-s-lig-descending-serifless"
 cyrl-ka = "symmetric-touching-top-left-serifed"
-cyrl-u = "straight-turn-motion-serifed"
 micro-sign = "tailed-motion-serifed"
 
 
@@ -7525,12 +7531,12 @@ u = "toothed-serifless"
 y = "straight-turn-serifless"
 long-s = "flat-hook-middle-serifed"
 eszet = "longs-s-lig-serifless"
-lower-eth = "straight-bar"
 lower-lambda = "straight-turn"
 cyrl-capital-zhe = "straight"
 cyrl-zhe = "straight"
 cyrl-capital-ka = "straight-serifless"
 cyrl-ka = "straight-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 one = "base"
 two = "straight-neck"
@@ -7545,6 +7551,7 @@ number-sign = "slanted"
 ampersand = "upper-open"
 percent = "rings-continuous-slash"
 bar = "force-upright"
+lower-eth = "straight-bar"
 micro-sign = "tailed-serifless"
 punctuation-dot = "square"
 diacritic-dot = "square"
@@ -7573,6 +7580,7 @@ eszet = "longs-s-lig-bottom-serifed"
 lower-mu = "tailed-serifed"
 cyrl-capital-ka = "straight-serifed"
 cyrl-ka = "straight-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 micro-sign = "tailed-serifed"
 
@@ -7606,6 +7614,7 @@ lower-lambda = "straight-turn"
 lower-mu = "toothed-serifless"
 lower-tau = "tailed"
 cyrl-em = "slanted-sides-hanging-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 cyrl-ef = "split-serifless"
 zero = "oval-dotted"
@@ -7649,6 +7658,7 @@ long-s = "bent-hook-bottom-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 lower-mu = "toothed-serifed"
 cyrl-em = "slanted-sides-hanging-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 micro-sign = "toothed-serifed"
@@ -7678,6 +7688,7 @@ eszet = "longs-s-lig-serifless"
 lower-iota = "tailed-serifed"
 lower-lambda = "straight-turn"
 cyrl-em = "flat-bottom-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 zero = "dotted"
 one = "base"
@@ -7717,6 +7728,7 @@ long-s = "flat-hook-bottom-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 lower-mu = "tailed-serifed"
 cyrl-em = "flat-bottom-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 seven = "bend-serifed"
 micro-sign = "toothed-serifed"
@@ -7748,6 +7760,7 @@ y = "straight-turn-serifless"
 long-s = "flat-hook-serifless"
 eszet = "longs-s-lig-serifless"
 lower-lambda = "straight-turn"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 zero = "slashed"
 one = "base"
@@ -7786,6 +7799,7 @@ z = "straight-serifed"
 long-s = "flat-hook-bottom-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 lower-mu = "tailed-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 seven = "curly-serifed"
 micro-sign = "toothed-serifed"
@@ -7838,9 +7852,9 @@ lower-chi = "curly-serifless"
 cyrl-capital-zhe = "curly"
 cyrl-zhe = "curly"
 cyrl-capital-ka = "curly-serifless"
-cyrl-ka = "curly-serifless"
 cyrl-capital-u = "curly-serifless"
 cyrl-u = "curly-serifless"
+cyrl-ka = "curly-serifless"
 cyrl-capital-ya = "curly-serifless"
 cyrl-ya = "curly-serifless"
 zero = "diamond-reverse-slashed-split"
@@ -7897,9 +7911,9 @@ capital-lambda = "curly-base-serifed"
 lower-mu = "toothed-serifed"
 lower-chi = "curly-serifed"
 cyrl-capital-ka = "curly-serifed"
-cyrl-ka = "curly-serifed"
 cyrl-capital-u = "curly-serifed"
 cyrl-u = "curly-serifed"
+cyrl-ka = "curly-serifed"
 cyrl-capital-ya = "curly-serifed"
 cyrl-ya = "curly-serifed"
 seven = "bend-serifed"
@@ -7915,7 +7929,6 @@ x = "curly-motion-serifed"
 y = "curly-motion-serifed"
 lower-mu = "toothed-motion-serifed"
 cyrl-ka = "curly-top-left-serifed"
-cyrl-u = "curly-motion-serifed"
 micro-sign = "toothed-motion-serifed"
 
 
@@ -7946,6 +7959,7 @@ long-s = "flat-hook-middle-serifed"
 lower-alpha = "barred-tailed"
 lower-lambda = "straight-turn"
 cyrl-em = "flat-bottom-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 cyrl-ef = "split-serifless"
 zero = "oval-dotted"
@@ -7988,6 +8002,7 @@ z = "straight-serifed"
 long-s = "flat-hook-double-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 cyrl-em = "flat-bottom-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 seven = "bend-serifed"
@@ -8003,7 +8018,6 @@ u = "toothed-motion-serifed"
 w = "straight-flat-top-motion-serifed"
 x = "straight-motion-serifed"
 y = "straight-turn-motion-serifed"
-cyrl-u = "straight-turn-motion-serifed"
 micro-sign = "tailed-motion-serifed"
 
 
@@ -8133,6 +8147,7 @@ cyrl-zhe = "symmetric-touching"
 cyrl-capital-ka = "symmetric-touching-serifless"
 cyrl-ka = "symmetric-touching-serifless"
 cyrl-em = "slanted-sides-hanging-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 zero = "oval-dotted"
 one = "base"
@@ -8161,8 +8176,8 @@ long-s = "bent-hook-tailed"
 eszet = "longs-s-lig-tailed-serifless"
 lower-alpha = "barred-earless-corner-tailed"
 lower-mu = "tailed-serifless"
-cyrl-zhe = "cursive"
 micro-sign = "tailed-serifless"
+cyrl-zhe = "cursive"
 
 [composite.ss12.slab-override.design]
 capital-d = "more-rounded-bilateral-serifed"
@@ -8187,6 +8202,7 @@ capital-gamma = "serifed"
 cyrl-capital-ka = "symmetric-touching-serifed"
 cyrl-ka = "symmetric-touching-serifed"
 cyrl-em = "slanted-sides-hanging-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 seven = "bend-serifed"
 micro-sign = "toothless-corner-serifed"
@@ -8204,7 +8220,6 @@ eszet = "longs-s-lig-tailed-serifless"
 lower-alpha = "barred-earless-corner-tailed"
 lower-mu = "tailed-motion-serifed"
 cyrl-ka = "symmetric-touching-top-left-serifed"
-cyrl-u = "straight-turn-motion-serifed"
 micro-sign = "tailed-motion-serifed"
 
 
@@ -8235,6 +8250,7 @@ lower-mu = "toothed-serifless"
 lower-pi = "tailless"
 lower-tau = "tailless"
 cyrl-em = "flat-bottom-serifless"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 zero = "oval-unslashed"
 one = "base"
@@ -8275,6 +8291,7 @@ eszet = "longs-s-lig-bottom-serifed"
 lower-iota = "tailed-serifed"
 lower-mu = "toothed-serifed"
 cyrl-em = "flat-bottom-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 seven = "bend-serifed"
 micro-sign = "toothed-serifed"
@@ -8303,14 +8320,11 @@ t = "flat-hook"
 u = "toothless-rounded-serifless"
 w = "straight-flat-top-serifless"
 long-s = "flat-hook-serifless"
-lower-eth = "straight-bar"
 lower-alpha = "barred"
 lower-delta = "flat-top"
 lower-lambda = "straight"
 lower-mu = "toothed-serifless"
 lower-xi = "rounded"
-cyrl-capital-u = "straight-serifless"
-cyrl-u = "straight-serifless"
 zero = "dotted"
 one = "base"
 two = "straight-neck"
@@ -8324,6 +8338,7 @@ pilcrow = "low"
 number-sign = "slanted"
 ampersand = "upper-open"
 percent = "rings-continuous-slash"
+lower-eth = "straight-bar"
 micro-sign = "toothed-serifless"
 lig-ltgteq = "slanted"
 question = "corner-flat-hooked"
@@ -8336,7 +8351,6 @@ a = "single-storey-serifless"
 f = "flat-hook-tailed"
 y = "cursive-flat-hook-serifless"
 long-s = "flat-hook-tailed"
-cyrl-u = "cursive-flat-hook-serifless"
 
 [composite.ss14.slab-override.design]
 capital-g = "toothless-rounded-serifed-hooked"
@@ -8354,8 +8368,6 @@ z = "straight-serifed"
 long-s = "flat-hook-bottom-serifed"
 lower-alpha = "barred-serifed"
 lower-mu = "toothed-serifed"
-cyrl-capital-u = "straight-serifed"
-cyrl-u = "straight-serifed"
 micro-sign = "toothed-serifed"
 
 [composite.ss14.slab-override.italic]
@@ -8368,7 +8380,6 @@ x = "straight-motion-serifed"
 y = "cursive-flat-hook-motion-serifed"
 long-s = "flat-hook-tailed"
 lower-mu = "toothed-motion-serifed"
-cyrl-u = "cursive-flat-hook-motion-serifed"
 micro-sign = "toothed-motion-serifed"
 
 
@@ -8396,6 +8407,8 @@ long-s = "flat-hook-double-serifed"
 lower-lambda = "straight-turn"
 cyrl-capital-ka = "symmetric-connected-bottom-right-serifed"
 cyrl-ka = "symmetric-connected-bottom-right-serifed"
+cyrl-capital-u = "straight-turn-serifless"
+cyrl-u = "straight-turn-serifless"
 cyrl-ef = "split-serifless"
 cyrl-capital-ya = "straight-motion-serifed"
 cyrl-ya = "straight-motion-serifed"
@@ -8452,6 +8465,8 @@ y = "straight-turn-serifed"
 eszet = "traditional-flat-hook-dual-serifed"
 cyrl-capital-ka = "symmetric-connected-serifed"
 cyrl-ka = "symmetric-connected-serifed"
+cyrl-capital-u = "straight-turn-serifed"
+cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 cyrl-capital-ya = "straight-serifed"
 cyrl-ya = "straight-serifed"
@@ -8505,13 +8520,13 @@ y = "straight-turn-serifless"
 long-s = "flat-hook-middle-serifed"
 lower-thorn = "motion-serifed"
 eszet = "longs-s-lig-middle-serifed"
-lower-eth = "straight-bar"
 capital-gamma = "serifed"
 lower-lambda = "straight-turn"
 lower-mu = "toothed-bottom-right-serifed"
 cyrl-capital-ze = "bilateral-inward-serifed"
 cyrl-ze = "unilateral-inward-serifed"
 cyrl-ka = "symmetric-connected-bottom-right-serifed"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 cyrl-ef = "split-top-serifed"
 zero = "slashed"
@@ -8529,6 +8544,7 @@ paren = "large-contour"
 brace = "straight"
 number-sign = "slanted"
 percent = "rings-continuous-slash"
+lower-eth = "straight-bar"
 micro-sign = "toothed-bottom-right-serifed"
 guillemet = "straight"
 
@@ -8551,6 +8567,7 @@ eszet = "longs-s-lig-dual-serifed"
 lower-thorn = "serifed"
 lower-mu = "toothed-serifed"
 cyrl-ka = "symmetric-connected-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 micro-sign = "toothed-serifed"
@@ -8582,11 +8599,12 @@ r = "hookless-serifed"
 t = "flat-hook"
 y = "straight-turn-serifless"
 eszet = "longs-s-lig-serifless"
-lower-eth = "straight-bar"
 lower-thorn = "motion-serifed"
 lower-lambda = "straight-turn"
 cyrl-capital-ze = "unilateral-inward-serifed"
 cyrl-capital-ka = "symmetric-connected-bottom-right-serifed"
+cyrl-capital-u = "straight-turn-serifless"
+cyrl-u = "straight-turn-serifless"
 cyrl-capital-ya = "straight-motion-serifed"
 one = "base"
 four = "semi-open"
@@ -8603,6 +8621,7 @@ at = "fourfold"
 dollar = "interrupted"
 cent = "bar-interrupted"
 partial-derivative = "straight-bar"
+lower-eth = "straight-bar"
 micro-sign = "tailed-serifless"
 punctuation-dot = "square"
 diacritic-dot = "square"
@@ -8640,6 +8659,8 @@ capital-u = "toothed-serifed"
 y = "straight-turn-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 lower-thorn = "serifed"
+cyrl-capital-u = "straight-turn-serifed"
+cyrl-u = "straight-turn-serifed"
 micro-sign = "tailed-serifed"
 
 [composite.ss17.slab-override.italic]
@@ -8680,6 +8701,7 @@ long-s = "flat-hook-middle-serifed-xh"
 eszet = "longs-s-lig-serifless"
 lower-alpha = "barred-tailed"
 lower-lambda = "straight-turn"
+cyrl-capital-u = "straight-turn-serifless"
 cyrl-u = "straight-turn-serifless"
 zero = "dotted"
 one = "base"
@@ -8714,6 +8736,7 @@ y = "straight-turn-serifed"
 z = "straight-serifed"
 long-s = "flat-hook-double-serifed-xh"
 eszet = "longs-s-lig-bottom-serifed"
+cyrl-capital-u = "straight-turn-serifed"
 cyrl-u = "straight-turn-serifed"
 seven = "bend-serifed"
 micro-sign = "tailed-serifed"
@@ -8726,7 +8749,6 @@ x = "straight-motion-serifed"
 y = "straight-turn-motion-serifed"
 long-s = "flat-hook-descending-middle-serifed-xh"
 eszet = "longs-s-lig-descending-serifless"
-cyrl-u = "straight-turn-motion-serifed"
 micro-sign = "tailed-motion-serifed"
 
 
@@ -8754,8 +8776,8 @@ capital-delta = "curly"
 capital-lambda = "curly-serifless"
 lower-lambda = "curly"
 lower-chi = "curly-serifless"
-cyrl-capital-u = "curly-turn-serifless"
-cyrl-u = "curly-turn-serifless"
+cyrl-capital-u = "curly-serifless"
+cyrl-u = "curly-serifless"
 cyrl-capital-ya = "curly-serifless"
 cyrl-ya = "curly-serifless"
 six = "open-contour"
@@ -8764,7 +8786,6 @@ nine = "open-contour"
 [composite.ss20.italic]
 k = "cursive-serifless"
 y = "cursive-serifless"
-cyrl-u = "cursive-serifless"
 
 [composite.ss20.slab-override.design]
 capital-a = "curly-base-serifed"
@@ -8797,4 +8818,3 @@ x = "cursive"
 y = "cursive-motion-serifed"
 z = "cursive"
 lower-lambda = "curly"
-cyrl-u = "cursive-motion-serifed"