From 6268b4556ed291bab5f64b6c7ded1b2765d3d011 Mon Sep 17 00:00:00 2001
From: John McWilliams <37010132+jmcwilliams403@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:56:57 -0400
Subject: [PATCH] Make `ss20` use curly variants for `7`. (#2397)

---
 changes/30.3.1.md    |  1 +
 params/variants.toml | 95 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/changes/30.3.1.md b/changes/30.3.1.md
index 4d1bd80c0..d89b08c3e 100644
--- a/changes/30.3.1.md
+++ b/changes/30.3.1.md
@@ -3,3 +3,4 @@
 * Fix leaning mark anchors for `U+0195`, `U+019E`, `U+01A6`, and `U+0220`.
 * Optimize glyph shape for `U+01A6`.
 * Make Aile and Etoile use {`six`|`nine`}.`closed-contour` by default.
+* Make `ss20` use `seven`.`curly-serifless` by default.
diff --git a/params/variants.toml b/params/variants.toml
index f6987be9c..7d9b6d501 100644
--- a/params/variants.toml
+++ b/params/variants.toml
@@ -8329,6 +8329,7 @@ e = "flat-crossbar"
 f = "flat-hook-serifless"
 g = "double-storey"
 i = "hooky"
+j = "serifed"
 k = "straight-serifless"
 l = "zshaped"
 u = "toothed-serifless"
@@ -8356,6 +8357,7 @@ one = "base"
 two = "straight-neck-serifless"
 four = "closed-serifless"
 six = "closed-contour"
+seven = "straight-serifless"
 nine = "closed-contour"
 asterisk = "hex-mid"
 underscore = "low"
@@ -8403,6 +8405,7 @@ cyrl-ef = "split-serifed"
 cyrl-e = "unilateral-serifed"
 two = "straight-neck-serifed"
 four = "closed-serifed"
+seven = "straight-serifed"
 micro-sign = "toothed-serifed"
 
 
@@ -8428,6 +8431,7 @@ d = "toothed-top-serifed"
 e = "flat-crossbar"
 f = "flat-hook-serifed"
 i = "serifed"
+j = "serifed"
 k = "straight-serifless"
 l = "serifed"
 r = "serifed"
@@ -8512,6 +8516,8 @@ description = "Consolas Style"
 [composite.ss03.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-touching-serifless"
 capital-m = "slanted-sides-hanging-serifless"
 a = "double-storey-serifless"
@@ -8519,6 +8525,8 @@ b = "toothless-corner-serifless"
 d = "toothed-serifless"
 f = "flat-hook-serifless"
 g = "double-storey"
+i = "serifed"
+j = "serifed"
 k = "symmetric-touching-serifless"
 l = "serifed"
 u = "toothed-serifless"
@@ -8541,6 +8549,7 @@ one = "base"
 two = "straight-neck-serifless"
 four = "closed-serifless"
 six = "closed-contour"
+seven = "straight-serifless"
 nine = "closed-contour"
 asterisk = "hex-mid"
 underscore = "low"
@@ -8557,6 +8566,7 @@ micro-sign = "tailed-serifless"
 a = "single-storey-serifless"
 f = "flat-hook-tailed"
 g = "single-storey-serifless"
+i = "tailed-serifed"
 k = "cursive-serifless"
 l = "tailed"
 long-s = "flat-hook-descending"
@@ -8590,6 +8600,7 @@ cyrl-u = "straight-turn-serifed"
 cyrl-ef = "serifed"
 two = "straight-neck-serifed"
 four = "closed-serifed"
+seven = "straight-serifed"
 micro-sign = "tailed-serifed"
 
 [composite.ss03.slab-override.italic]
@@ -8616,6 +8627,8 @@ description = "Menlo Style"
 [composite.ss04.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-m = "hanging-serifless"
 capital-q = "straight"
 a = "double-storey-serifless"
@@ -8651,6 +8664,7 @@ one = "base"
 two = "straight-neck-serifless"
 four = "closed-serifless"
 six = "closed-contour"
+seven = "straight-serifless"
 eight = "two-circles"
 nine = "closed-contour"
 tittle = "square"
@@ -8663,6 +8677,7 @@ brace = "straight"
 guillemet = "straight"
 number-sign = "slanted"
 ampersand = "upper-open"
+at = "threefold"
 percent = "rings-continuous-slash"
 bar = "force-upright"
 micro-sign = "tailed-serifless"
@@ -8704,6 +8719,7 @@ cyrl-ef = "serifed"
 cyrl-e = "unilateral-serifed"
 two = "straight-neck-serifed"
 four = "closed-serifed"
+seven = "straight-serifed"
 micro-sign = "tailed-serifed"
 
 
@@ -8715,6 +8731,8 @@ description = "Fira Mono Style"
 [composite.ss05.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-touching-serifless"
 capital-m = "slanted-sides-hanging-serifless"
 a = "double-storey-tailed"
@@ -8723,6 +8741,7 @@ e = "flat-crossbar"
 f = "serifless"
 g = "double-storey-open"
 i = "serifed"
+j = "serifed"
 k = "symmetric-touching-serifless"
 l = "serifed-semi-tailed"
 r = "corner-hooked-serifed"
@@ -8744,7 +8763,9 @@ cyrl-yery = "corner"
 zero = "oval-dotted"
 one = "base"
 two = "straight-neck-serifless"
+four = "semi-open-serifless"
 six = "closed-contour"
+seven = "straight-serifless"
 eight = "crossing-asymmetric"
 nine = "open-contour"
 asterisk = "penta-low"
@@ -8794,6 +8815,8 @@ cyrl-u = "straight-turn-serifed"
 cyrl-ef = "split-serifed"
 cyrl-e = "unilateral-serifed"
 two = "straight-neck-serifed"
+four = "semi-open-serifed"
+seven = "straight-serifed"
 micro-sign = "toothed-serifed"
 
 
@@ -8805,11 +8828,14 @@ description = "Liberation Mono Style"
 [composite.ss06.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 a = "double-storey-tailed"
 d = "toothed-serifless"
 e = "flat-crossbar"
 f = "flat-hook-serifless"
 i = "serifed"
+j = "serifed"
 k = "straight-serifless"
 l = "serifed-flat-tailed"
 r = "hookless-serifless"
@@ -8895,6 +8921,8 @@ description = "Monaco Style"
 [composite.ss07.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-touching-serifless"
 capital-w = "straight-flat-top-serifless"
 a = "single-storey-earless-corner-serifless"
@@ -8904,6 +8932,7 @@ e = "flat-crossbar"
 f = "serifless"
 g = "single-storey-earless-corner"
 i = "zshaped"
+j = "serifed"
 k = "symmetric-touching-serifless"
 l = "zshaped"
 q = "earless-corner-straight-serifless"
@@ -9001,6 +9030,7 @@ e = "flat-crossbar"
 f = "serifless"
 g = "double-storey"
 i = "serifed"
+j = "serifed"
 k = "curly-serifless"
 l = "zshaped"
 u = "toothed-serifless"
@@ -9040,6 +9070,7 @@ brace = "straight"
 guillemet = "straight"
 number-sign = "slanted"
 ampersand = "upper-open"
+at = "threefold"
 dollar = "open"
 cent = "open"
 percent = "dots"
@@ -9114,12 +9145,15 @@ description = "Source Code Pro Style"
 [composite.ss09.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 a = "double-storey-serifless"
 d = "toothed-serifless"
 e = "flat-crossbar"
 f = "serifless"
 g = "double-storey"
 i = "hooky"
+j = "serifed"
 k = "straight-serifless"
 l = "serifed-semi-tailed"
 r = "hookless-serifless"
@@ -9148,8 +9182,10 @@ nine = "closed-contour"
 asterisk = "penta-low"
 guillemet = "straight"
 number-sign = "slanted"
+at = "threefold"
 dollar = "open"
 cent = "through-cap"
+percent = "rings-segmented-slash"
 bar = "force-upright"
 micro-sign = "tailed-serifless"
 
@@ -9203,10 +9239,12 @@ tag = "ss10"
 description = "Envy Code R Style"
 
 [composite.ss10.design]
+capital-i = "serifed"
 capital-j = "serifless"
 capital-k = "symmetric-touching-serifless"
 capital-q = "crossing"
 capital-w = "straight-vertical-sides-serifless"
+a = "double-storey-toothless-corner"
 f = "flat-hook-serifless"
 g = "single-storey-flat-hook-serifless"
 i = "hooky"
@@ -9224,16 +9262,21 @@ lower-lambda = "straight"
 lower-tau = "flat-tailed"
 one = "base-flat-top-serif"
 four = "closed-serifless"
+six = "straight-bar"
+seven = "straight-serifless"
 eight = "two-circles"
+nine = "straight-bar"
 tittle = "square"
 underscore = "low"
 guillemet = "straight"
+at = "threefold"
 dollar = "through-cap"
 percent = "rings-continuous-slash"
 pilcrow = "low"
 micro-sign = "toothless-rounded-serifless"
 
 [composite.ss10.italic]
+a = "single-storey-tailed"
 i = "serifed-flat-tailed"
 j = "serifed"
 l = "serifed-flat-tailed"
@@ -9255,6 +9298,7 @@ eszet = "sulzbacher-bottom-serifed"
 cyrl-capital-u = "straight-serifed"
 cyrl-u = "straight-serifed"
 four = "closed-serifed"
+seven = "straight-serifed"
 micro-sign = "toothless-rounded-serifed"
 
 [composite.ss10.slab-override.italic]
@@ -9280,6 +9324,7 @@ two = "straight-neck-serifless"
 three = "flat-top-serifless"
 four = "closed-serifless"
 six = "closed-contour"
+seven = "straight-serifless"
 eight = "two-circles"
 nine = "closed-contour"
 tilde = "high"
@@ -9287,6 +9332,7 @@ asterisk = "hex-high"
 caret = "high"
 brace = "straight"
 guillemet = "straight"
+at = "threefold"
 dollar = "through-cap"
 cent = "through-cap"
 percent = "rings-continuous-slash"
@@ -9295,6 +9341,7 @@ percent = "rings-continuous-slash"
 two = "straight-neck-serifed"
 three = "flat-top-serifed"
 four = "closed-serifed"
+seven = "straight-serifed"
 
 
 
@@ -9305,6 +9352,8 @@ description = "Ubuntu Mono Style"
 [composite.ss12.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hookless"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-touching-serifless"
 capital-m = "slanted-sides-hanging-serifless"
 a = "double-storey-toothless-corner"
@@ -9313,6 +9362,7 @@ d = "toothless-corner-serifless"
 f = "serifless"
 g = "single-storey-earless-corner"
 i = "serifed-semi-tailed"
+j = "serifed"
 k = "symmetric-touching-serifless"
 l = "serifed-semi-tailed"
 m = "earless-corner-double-arch-short-leg-serifless"
@@ -9353,6 +9403,7 @@ underscore = "low"
 brace = "straight"
 guillemet = "straight"
 number-sign = "slanted"
+at = "threefold"
 dollar = "open"
 cent = "open"
 percent = "rings-continuous-slash"
@@ -9431,12 +9482,15 @@ description = "Lucida Style"
 [composite.ss13.design]
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-touching-serifless"
 a = "double-storey-tailed"
 d = "toothed-serifless"
 e = "flat-crossbar"
 f = "serifless"
 i = "hooky"
+j = "serifed"
 k = "symmetric-touching-serifless"
 l = "hooky"
 r = "corner-hooked-serifless"
@@ -9468,6 +9522,7 @@ diacritic-dot = "square"
 paren = "large-contour"
 guillemet = "straight"
 number-sign = "slanted"
+at = "threefold"
 cent = "through-cap"
 percent = "rings-continuous-slash"
 pilcrow = "low"
@@ -9519,11 +9574,13 @@ description = "JetBrains Mono Style"
 
 [composite.ss14.design]
 capital-g = "toothless-rounded-serifless-hooked"
+capital-i = "serifed"
 capital-j = "serifless"
 capital-k = "symmetric-connected-serifless"
 capital-m = "hanging-serifless"
 capital-q = "straight"
 capital-w = "straight-flat-top-serifless"
+a = "double-storey-serifless"
 d = "toothed-serifless"
 f = "flat-hook-serifless"
 g = "single-storey-flat-hook-serifless"
@@ -9535,6 +9592,7 @@ t = "flat-hook"
 u = "toothless-rounded-serifless"
 w = "straight-flat-top-serifless"
 long-s = "flat-hook-serifless"
+eszet = "sulzbacher-serifless"
 lower-eth = "straight-bar"
 lower-alpha = "barred"
 lower-delta = "flat-top"
@@ -9552,13 +9610,16 @@ two = "straight-neck-serifless"
 three = "flat-top-serifless"
 four = "semi-open-non-crossing-serifless"
 five = "upright-flat-serifless"
+six = "straight-bar"
 seven = "straight-serifed"
 eight = "two-circles"
+nine = "straight-bar"
 asterisk = "penta-low"
 paren = "flat-arc"
 guillemet = "straight"
 number-sign = "slanted"
 ampersand = "upper-open"
+at = "threefold"
 percent = "rings-continuous-slash"
 question = "corner-flat-hooked"
 pilcrow = "low"
@@ -9568,9 +9629,11 @@ lig-equal-chain = "without-notch"
 lig-hyphen-chain = "without-notch"
 
 [composite.ss14.italic]
+a = "single-storey-tailed"
 f = "flat-hook-tailed"
 y = "cursive-flat-hook-serifless"
 long-s = "flat-hook-tailed"
+eszet = "sulzbacher-tailed-serifless"
 lower-alpha = "barred-tailed"
 cyrl-u = "cursive-flat-hook-serifless"
 
@@ -9580,6 +9643,7 @@ capital-j = "serifed"
 capital-k = "symmetric-connected-serifed"
 capital-m = "hanging-serifed"
 capital-w = "straight-flat-top-serifed"
+a = "double-storey-serifed"
 d = "toothed-serifed"
 f = "flat-hook-serifed"
 g = "single-storey-flat-hook-serifed"
@@ -9589,6 +9653,7 @@ w = "straight-flat-top-serifed"
 y = "straight-serifed"
 z = "straight-serifed"
 long-s = "flat-hook-bottom-serifed"
+eszet = "sulzbacher-bottom-serifed"
 lower-alpha = "barred-double-serifed"
 lower-mu = "toothed-serifed"
 cyrl-em = "hanging-serifed"
@@ -9601,6 +9666,7 @@ five = "upright-flat-serifed"
 micro-sign = "toothed-serifed"
 
 [composite.ss14.slab-override.italic]
+a = "single-storey-tailed"
 f = "flat-hook-tailed"
 g = "single-storey-flat-hook-serifless"
 k = "symmetric-connected-top-left-serifed"
@@ -9609,6 +9675,7 @@ w = "straight-flat-top-motion-serifed"
 x = "straight-motion-serifed"
 y = "cursive-flat-hook-motion-serifed"
 long-s = "flat-hook-tailed"
+eszet = "sulzbacher-tailed-serifless"
 lower-alpha = "barred-tailed"
 lower-mu = "toothed-motion-serifed"
 cyrl-u = "cursive-flat-hook-motion-serifed"
@@ -9621,6 +9688,8 @@ tag = "ss15"
 description = "IBM Plex Mono Style"
 
 [composite.ss15.design]
+capital-i = "serifed"
+capital-j = "serifed"
 capital-m = "hanging-serifless"
 a = "double-storey-tailed"
 d = "toothed-serifless"
@@ -9666,6 +9735,8 @@ brace = "curly-flat-boundary"
 guillemet = "straight"
 number-sign = "slanted-open"
 ampersand = "upper-open"
+at = "threefold"
+percent = "rings-segmented-slash"
 question = "corner"
 pilcrow = "low"
 micro-sign = "toothed-serifless"
@@ -9737,6 +9808,8 @@ description = "PT Mono Style"
 capital-c = "bilateral-inward-serifed"
 capital-d = "more-rounded-serifless"
 capital-g = "toothless-corner-inward-serifed-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-connected-serifless"
 capital-l = "motion-serifed"
 capital-m = "hanging-serifless"
@@ -9751,6 +9824,7 @@ f = "serifed"
 g = "single-storey-earless-corner"
 h = "straight-top-left-serifed"
 i = "serifed"
+j = "serifed"
 k = "straight-top-left-and-bottom-right-serifed"
 l = "serifed-semi-tailed"
 n = "straight-top-left-serifed"
@@ -9787,6 +9861,7 @@ two = "straight-neck-serifless"
 three = "flat-top-serifless"
 four = "closed-serifless"
 six = "open-contour"
+seven = "straight-serifless"
 eight = "crossing-asymmetric"
 nine = "open-contour"
 asterisk = "turn-hex-high"
@@ -9795,6 +9870,7 @@ paren = "large-contour"
 brace = "straight"
 guillemet = "straight"
 number-sign = "slanted"
+at = "threefold"
 percent = "rings-continuous-slash"
 pilcrow = "low"
 micro-sign = "toothed-bottom-right-serifed"
@@ -9831,6 +9907,7 @@ cyrl-ya = "straight-serifed"
 two = "straight-neck-serifed"
 three = "flat-top-serifed"
 four = "closed-serifed"
+seven = "straight-serifed"
 micro-sign = "toothed-serifed"
 
 
@@ -9846,6 +9923,8 @@ capital-d = "standard-unilateral-serifed"
 capital-e = "top-left-serifed"
 capital-f = "top-left-serifed"
 capital-g = "toothless-corner-inward-serifed-capped"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "straight-bottom-right-serifed"
 capital-l = "motion-serifed"
 capital-p = "closed-motion-serifed"
@@ -9860,6 +9939,7 @@ f = "serifed"
 g = "double-storey"
 h = "straight-serifless"
 i = "serifed"
+j = "serifed"
 k = "straight-serifless"
 l = "serifed"
 m = "serifless"
@@ -9892,6 +9972,7 @@ cyrl-e = "serifless"
 cyrl-capital-ya = "straight-motion-serifed"
 cyrl-ya = "straight-serifless"
 one = "base"
+four = "semi-open-serifless"
 five = "oblique-arched-serifless"
 six = "closed-contour"
 seven = "straight-serifed"
@@ -9905,9 +9986,10 @@ brace = "curly-flat-boundary"
 guillemet = "straight"
 number-sign = "slanted"
 ampersand = "upper-open"
-at = "fourfold"
+at = "fourfold-solid-inner"
 dollar = "interrupted"
 cent = "bar-interrupted-cap"
+percent = "rings-segmented-slash"
 pilcrow = "low"
 partial-derivative = "straight-bar"
 micro-sign = "tailed-serifless"
@@ -9975,6 +10057,7 @@ cyrl-u = "straight-turn-serifed"
 cyrl-e = "unilateral-inward-serifed"
 cyrl-capital-ya = "straight-serifed"
 cyrl-ya = "straight-serifed"
+four = "semi-open-serifed"
 five = "oblique-arched-serifed"
 micro-sign = "tailed-serifed"
 
@@ -10007,6 +10090,8 @@ description = "Input Mono Style"
 
 [composite.ss18.design]
 capital-g = "toothless-rounded-serifless-hooked"
+capital-i = "serifed"
+capital-j = "serifed"
 capital-k = "symmetric-connected-serifless"
 capital-m = "hanging-serifless"
 a = "double-storey-tailed"
@@ -10015,6 +10100,7 @@ d = "toothed-serifless"
 f = "serifless-crossbar-at-x-height"
 g = "double-storey"
 i = "serifed"
+j = "serifed"
 k = "symmetric-connected-serifless"
 l = "serifed"
 q = "earless-corner-straight-serifless"
@@ -10043,6 +10129,7 @@ asterisk = "hex-mid"
 underscore = "low"
 guillemet = "straight"
 number-sign = "slanted"
+at = "threefold"
 cent = "through-cap"
 percent = "rings-continuous-slash"
 question = "corner"
@@ -10119,8 +10206,12 @@ cyrl-capital-u = "curly-serifless"
 cyrl-u = "curly-serifless"
 cyrl-capital-ya = "curly-serifless"
 cyrl-ya = "curly-serifless"
+two = "curly-neck-serifless"
 six = "open-contour"
+seven = "curly-serifless"
 nine = "open-contour"
+brace = "curly"
+guillemet = "curly"
 
 [composite.ss20.italic]
 k = "cursive-serifless"
@@ -10149,6 +10240,8 @@ cyrl-capital-u = "curly-turn-serifed"
 cyrl-u = "curly-turn-serifed"
 cyrl-capital-ya = "curly-serifed"
 cyrl-ya = "curly-serifed"
+two = "curly-neck-serifed"
+seven = "curly-serifed"
 
 [composite.ss20.slab-override.italic]
 k = "diagonal-tailed-cursive-top-left-serifed"