From 6df11151d944a0de996b3e002ab6770e04fd7002 Mon Sep 17 00:00:00 2001
From: jmcwilliams403 <jmcwilliams403@gmail.com>
Date: Fri, 23 Aug 2024 13:12:22 -0400
Subject: [PATCH] Cleanup `f`/`t`/`long-s` variants for SS features.

---
 changes/31.4.0.md    |  3 ++
 params/variants.toml | 82 ++++++++++++++++++++++++++------------------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/changes/31.4.0.md b/changes/31.4.0.md
index 753132a9f6..bf3b5f0b6c 100644
--- a/changes/31.4.0.md
+++ b/changes/31.4.0.md
@@ -2,3 +2,6 @@
   - OCR HOOK (`U+2440`) .. OCR BOW TIE (`U+2445`) (#2465).
 * Add slanted dollar and cent sign (#2408).
 * Add round-top capital A (#2472).
+* Fix `cv41` application to `ss01`, `ss02`, `ss04`, `ss06`, and `ss15`.
+* Fix `cv54` application to `ss01`, `ss03`, `ss04`, `ss06`, `ss07`, `ss09`, `ss12`, `ss14`, `ss15`, `ss17`, and `ss18`.
+* Fix `cv62` application to `ss01`, `ss02`, `ss04`, `ss07`, `ss09`, `ss13`, `ss15`, `ss16`, and `ss18`.
diff --git a/params/variants.toml b/params/variants.toml
index 7611037415..ed932dae24 100644
--- a/params/variants.toml
+++ b/params/variants.toml
@@ -8894,15 +8894,16 @@ capital-j = "serifless"
 a = "double-storey-serifless"
 d = "toothed-serifless"
 e = "flat-crossbar"
-f = "flat-hook-serifless"
+f = "flat-hook-serifless-crossbar-at-x-height"
 g = "double-storey"
 i = "hooky"
 j = "serifed"
 k = "straight-serifless"
 l = "zshaped"
+t = "bent-hook-short-neck"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
-long-s = "flat-hook-middle-serifed"
+long-s = "flat-hook-middle-serifed-xh"
 eszet = "longs-s-lig-serifless"
 lower-eth = "straight-bar"
 lower-iota = "tailed"
@@ -8950,7 +8951,7 @@ a = "double-storey-serifed"
 b = "toothed-serifed"
 c = "unilateral-serifed"
 d = "toothed-serifed"
-f = "flat-hook-serifed"
+f = "flat-hook-serifed-crossbar-at-x-height"
 h = "straight-serifed"
 i = "zshaped"
 k = "straight-serifed"
@@ -8965,7 +8966,7 @@ w = "straight-serifed"
 x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
-long-s = "flat-hook-double-serifed"
+long-s = "flat-hook-double-serifed-xh"
 eszet = "longs-s-lig-bottom-serifed"
 lower-iota = "tailed-serifed"
 lower-mu = "toothed-serifed"
@@ -9004,7 +9005,7 @@ a = "double-storey-serifless"
 c = "unilateral-serifed"
 d = "toothed-top-serifed"
 e = "flat-crossbar"
-f = "flat-hook-serifed"
+f = "flat-hook-serifed-crossbar-at-x-height"
 i = "serifed"
 j = "serifed"
 k = "straight-serifless"
@@ -9015,7 +9016,7 @@ w = "straight-flat-top-serifless"
 x = "straight-serifed"
 y = "straight-turn-serifless"
 z = "straight-serifed"
-long-s = "flat-hook-double-serifed"
+long-s = "flat-hook-double-serifed-xh"
 eszet = "longs-s-lig-serifless"
 lower-eth = "straight-bar"
 lower-iota = "serifed-flat-tailed"
@@ -9108,6 +9109,7 @@ i = "serifed"
 j = "serifed"
 k = "symmetric-touching-serifless"
 l = "serifed"
+t = "bent-hook-short-neck"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
@@ -9227,16 +9229,16 @@ capital-q = "straight"
 a = "double-storey-serifless"
 e = "flat-crossbar"
 d = "toothed-serifless"
-f = "flat-hook-serifless"
+f = "flat-hook-serifless-crossbar-at-x-height"
 i = "serifed"
 j = "flat-hook-serifed"
 k = "straight-serifless"
 l = "serifed-flat-tailed"
-t = "flat-hook"
+t = "flat-hook-short-neck"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
-long-s = "flat-hook-middle-serifed"
+long-s = "flat-hook-middle-serifed-xh"
 eszet = "longs-s-lig-serifless"
 lower-eth = "straight-bar"
 lower-iota = "serifed-flat-tailed"
@@ -9287,7 +9289,7 @@ a = "double-storey-serifed"
 b = "toothed-serifed"
 c = "unilateral-serifed"
 d = "toothed-serifed"
-f = "flat-hook-serifed"
+f = "flat-hook-serifed-crossbar-at-x-height"
 g = "single-storey-serifed"
 h = "straight-serifed"
 k = "straight-serifed"
@@ -9303,7 +9305,7 @@ x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
 capital-eszet = "rounded-serifed"
-long-s = "flat-hook-double-serifed"
+long-s = "flat-hook-double-serifed-xh"
 eszet = "longs-s-lig-bottom-serifed"
 lower-mu = "tailed-serifed"
 lower-psi = "flat-top-serifed"
@@ -9345,6 +9347,7 @@ j = "serifed"
 k = "symmetric-touching-serifless"
 l = "serifed-semi-tailed"
 r = "corner-hooked-serifed"
+t = "bent-hook-short-neck"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
@@ -9440,12 +9443,13 @@ capital-j = "serifed"
 a = "double-storey-tailed"
 d = "toothed-serifless"
 e = "flat-crossbar"
-f = "flat-hook-serifless"
+f = "flat-hook-serifless-crossbar-at-x-height"
 i = "serifed"
 j = "serifed"
 k = "straight-serifless"
 l = "serifed-flat-tailed"
 r = "hookless-serifless"
+t = "bent-hook-short-neck"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
@@ -9490,7 +9494,7 @@ capital-g = "toothless-corner-serifed-hooked"
 b = "toothed-serifed"
 c = "unilateral-serifed"
 d = "toothed-serifed"
-f = "flat-hook-serifed"
+f = "flat-hook-serifed-crossbar-at-x-height"
 g = "single-storey-serifed"
 h = "straight-serifed"
 k = "straight-serifed"
@@ -9547,10 +9551,11 @@ k = "symmetric-touching-serifless"
 l = "zshaped"
 q = "earless-corner-straight-serifless"
 r = "corner-hooked-serifless"
+t = "bent-hook-short-neck"
 u = "toothed-serifless"
 w = "straight-flat-top-serifless"
 y = "straight-turn-serifless"
-long-s = "flat-hook-serifless"
+long-s = "bent-hook-middle-serifed"
 eszet = "longs-s-lig-serifless"
 lower-iota = "zshaped"
 lower-lambda = "straight-turn"
@@ -9602,7 +9607,7 @@ w = "straight-flat-top-serifed"
 x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
-long-s = "flat-hook-bottom-serifed"
+long-s = "bent-hook-double-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 lower-mu = "toothed-serifed"
 cyrl-a = "double-storey-serifed"
@@ -9693,6 +9698,8 @@ percent = "dots"
 micro-sign = "toothed-serifless"
 lig-ltgteq = "slanted"
 lig-neq = "slightly-slanted-dotted"
+lig-double-arrow-bar = "with-notch"
+lig-single-arrow-bar = "with-notch"
 
 [composite.ss08.italic]
 g = "single-storey-serifless"
@@ -9774,11 +9781,12 @@ j = "serifed"
 k = "straight-serifless"
 l = "serifed-semi-tailed"
 r = "hookless-serifless"
+t = "bent-hook-short-neck"
 u = "toothed-serifless"
 w = "straight-flat-top-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
-long-s = "flat-hook-middle-serifed"
+long-s = "bent-hook-middle-serifed"
 eszet = "longs-s-lig-serifless"
 lower-lambda = "straight-turn"
 lower-tau = "short-tailed"
@@ -9830,7 +9838,7 @@ x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
 capital-eszet = "rounded-serifed"
-long-s = "flat-hook-double-serifed"
+long-s = "bent-hook-double-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 cyrl-a = "double-storey-serifed"
 cyrl-ve = "standard-bilateral-serifed"
@@ -9883,7 +9891,6 @@ w = "rounded-vertical-sides-serifless"
 y = "cursive-flat-hook-serifless"
 long-s = "flat-hook-middle-serifed"
 eszet = "sulzbacher-serifless"
-lower-eth = "straight-bar"
 lower-delta = "flat-top"
 lower-iota = "serifed-flat-tailed"
 lower-lambda = "straight"
@@ -10011,6 +10018,7 @@ n = "earless-corner-straight-serifless"
 p = "earless-corner-serifless"
 q = "earless-corner-straight-serifless"
 r = "earless-corner-serifless"
+t = "bent-hook-short-neck"
 u = "toothless-corner-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
@@ -10147,7 +10155,7 @@ r = "corner-hooked-serifless"
 t = "bent-hook-short-neck2"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
-long-s = "flat-hook-middle-serifed"
+long-s = "bent-hook-middle-serifed"
 eszet = "longs-s-lig-serifless"
 lower-iota = "tailed"
 lower-lambda = "straight-turn"
@@ -10205,7 +10213,7 @@ w = "straight-serifed"
 x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
-long-s = "flat-hook-double-serifed"
+long-s = "bent-hook-double-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 lower-iota = "tailed-serifed"
 lower-mu = "toothed-serifed"
@@ -10242,7 +10250,7 @@ i = "serifed"
 j = "flat-hook-serifed"
 k = "symmetric-connected-serifless"
 l = "serifed-flat-tailed"
-t = "flat-hook"
+t = "flat-hook-short-neck"
 u = "toothless-rounded-serifless"
 w = "straight-flat-top-serifless"
 y = "straight-serifless"
@@ -10365,20 +10373,20 @@ capital-j = "serifed"
 capital-m = "hanging-serifless"
 a = "double-storey-tailed"
 d = "toothed-serifless"
-f = "flat-hook-serifed"
+f = "flat-hook-serifed-crossbar-at-x-height"
 g = "double-storey"
 i = "serifed"
 j = "flat-hook-serifed"
 k = "straight-serifless"
 l = "serifed"
 r = "hookless-serifed"
-t = "flat-hook"
+t = "flat-hook-short-neck"
 u = "toothed-serifless"
 w = "straight-flat-top-serifless"
 x = "straight-serifless"
 y = "straight-turn-serifless"
 capital-eszet = "corner-serifless"
-long-s = "flat-hook-double-serifed"
+long-s = "flat-hook-double-serifed-xh"
 eszet = "traditional-flat-hook-serifless"
 lower-delta = "flat-top"
 lower-iota = "serifed-flat-tailed"
@@ -10418,20 +10426,20 @@ micro-sign = "toothed-serifless"
 
 [composite.ss15.italic]
 a = "single-storey-tailed"
-f = "flat-hook-diagonal-tailed"
+f = "flat-hook-diagonal-tailed-crossbar-at-x-height"
 g = "single-storey-serifless"
 i = "serifed-diagonal-tailed"
 j = "diagonal-tailed-serifed"
 k = "diagonal-tailed-cursive-serifless"
 l = "serifed-diagonal-tailed"
 r = "hookless-top-serifed"
-t = "diagonal-tailed"
+t = "diagonal-tailed-short-neck"
 v = "cursive-serifed"
 w = "cursive-serifless"
 x = "cursive"
 y = "cursive-serifless"
 z = "cursive"
-long-s = "flat-hook-diagonal-tailed-middle-serifed"
+long-s = "flat-hook-diagonal-tailed-middle-serifed-xh"
 lower-iota = "serifed-diagonal-tailed"
 lower-tau = "diagonal-tailed"
 cyrl-a = "single-storey-tailed"
@@ -10514,7 +10522,7 @@ t = "bent-hook-short-neck2"
 u = "toothed-serifed"
 y = "straight-turn-serifless"
 capital-eszet = "rounded-serifless"
-long-s = "flat-hook-middle-serifed"
+long-s = "bent-hook-middle-serifed"
 eszet = "longs-s-lig-middle-serifed"
 lower-thorn = "motion-serifed"
 capital-gamma = "serifed"
@@ -10561,6 +10569,7 @@ capital-d = "more-rounded-bilateral-serifed"
 capital-k = "symmetric-connected-serifed"
 capital-l = "serifed"
 capital-m = "hanging-serifed"
+a = "double-storey-hook-inward-serifed-serifed"
 h = "straight-serifed"
 k = "straight-serifed"
 m = "serifed"
@@ -10574,10 +10583,11 @@ x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
 capital-eszet = "rounded-serifed"
-long-s = "flat-hook-double-serifed"
+long-s = "bent-hook-double-serifed"
 eszet = "longs-s-lig-dual-serifed"
 lower-thorn = "serifed"
 lower-mu = "toothed-serifed"
+cyrl-a = "double-storey-hook-inward-serifed-serifed"
 cyrl-ve = "standard-bilateral-serifed"
 cyrl-ka = "symmetric-connected-serifed"
 cyrl-em = "hanging-serifed"
@@ -10628,7 +10638,7 @@ m = "serifless"
 n = "straight-serifless"
 r = "hookless-serifed"
 s = "serifless"
-t = "flat-hook"
+t = "flat-hook-short-neck"
 v = "straight-serifless"
 w = "straight-serifless"
 x = "straight-serifless"
@@ -10718,6 +10728,7 @@ capital-r = "straight-serifed"
 capital-s = "bilateral-inward-serifed"
 capital-u = "toothed-serifed"
 capital-z = "straight-serifed"
+a = "double-storey-hook-inward-serifed-tailed"
 b = "toothed-serifed"
 c = "unilateral-inward-serifed"
 h = "straight-serifed"
@@ -10734,6 +10745,7 @@ capital-eszet = "corner-serifed"
 long-s = "bent-hook-bottom-serifed"
 eszet = "longs-s-lig-bottom-serifed"
 capital-thorn = "serifed"
+cyrl-a = "double-storey-hook-inward-serifed-tailed"
 cyrl-ze = "unilateral-inward-serifed"
 cyrl-capital-ka = "symmetric-connected-serifed"
 cyrl-ka = "symmetric-connected-serifed"
@@ -10749,6 +10761,7 @@ micro-sign = "tailed-serifed"
 
 [composite.ss17.slab-override.italic]
 capital-u = "toothed-motion-serifed"
+a = "single-storey-tailed"
 b = "toothless-corner-serifed"
 h = "tailed-motion-serifed"
 k = "cursive-top-left-and-bottom-right-serifed"
@@ -10762,6 +10775,7 @@ y = "cursive-motion-serifed"
 z = "cursive"
 long-s = "bent-hook-descending"
 eszet = "longs-s-lig-descending-serifless"
+cyrl-a = "single-storey-tailed"
 cyrl-ze = "unilateral-bottom-inward-serifed"
 cyrl-ka = "symmetric-connected-top-left-and-bottom-right-serifed"
 cyrl-u = "cursive-motion-serifed"
@@ -10792,7 +10806,7 @@ l = "serifed"
 q = "earless-corner-straight-serifless"
 u = "toothed-serifless"
 y = "straight-turn-serifless"
-long-s = "flat-hook-middle-serifed-xh"
+long-s = "bent-hook-middle-serifed-xh"
 eszet = "longs-s-lig-serifless"
 lower-alpha = "barred-tailed"
 lower-gamma = "straight"
@@ -10829,7 +10843,7 @@ micro-sign = "tailed-serifless"
 
 [composite.ss18.italic]
 f = "extended-crossbar-at-x-height"
-long-s = "flat-hook-descending-middle-serifed-xh"
+long-s = "bent-hook-descending-middle-serifed-xh"
 eszet = "longs-s-lig-descending-serifless"
 
 [composite.ss18.slab-override.design]
@@ -10845,7 +10859,7 @@ u = "toothed-serifed"
 x = "straight-serifed"
 y = "straight-turn-serifed"
 z = "straight-serifed"
-long-s = "flat-hook-double-serifed-xh"
+long-s = "bent-hook-double-serifed-xh"
 eszet = "longs-s-lig-bottom-serifed"
 lower-alpha = "barred-tailed-serifed"
 lower-upsilon = "straight-serifed"
@@ -10867,7 +10881,7 @@ k = "symmetric-connected-top-left-and-bottom-right-serifed"
 u = "toothed-motion-serifed"
 x = "straight-bilateral-motion-serifed"
 y = "straight-turn-motion-serifed"
-long-s = "flat-hook-descending-middle-serifed-xh"
+long-s = "bent-hook-descending-middle-serifed-xh"
 eszet = "longs-s-lig-descending-serifless"
 lower-alpha = "barred-tailed"
 cyrl-ve = "standard-unilateral-serifed"