Fix assignment of k in ss20 (#1102).

changes/7.0.2.md

@@ -1,3 +1,4 @@
  * Fix Aile's long-S at Italic (#1098).
  * Fix assignment of capital Gamma in `ss14` (#1099).
  * Fix rounding errors found in certain Extended glyphs (#1100).
+ * Fix assignment of `k` in `ss20` (#1102).

font-src/support/variant-data.js

@@ -159,12 +159,10 @@ class Composite {
 		const ans = [];
 		const cfg = Object.assign(
 			{},
-			this.decomposeSlabOverride(this.design, this.slabOverride.design, para),
-			para.isItalic
-				? this.decomposeSlabOverride(this.italic, this.slabOverride.italic, para)
-				: para.isOblique
-				? this.decomposeSlabOverride(this.oblique, this.slabOverride.oblique, para)
-				: this.decomposeSlabOverride(this.upright, this.slabOverride.upright, para)
+			this.design,
+			this.decomposeSlope(this, para),
+			!para.slab ? {} : this.slabOverride.design,
+			!para.slab ? {} : this.decomposeSlope(this.slabOverride, para)
 		);
 		for (const [k, v] of Object.entries(cfg)) {
 			const pv = selTree.get(k, v);
@@ -173,9 +171,8 @@ class Composite {
 		}
 		return ans;
 	}
-	decomposeSlabOverride(d, sd, para) {
-		if (para.slab) return Object.assign({}, d, sd);
-		else return d;
+	decomposeSlope(base, para) {
+		return para.isItalic ? base.italic : para.isOblique ? base.oblique : base.upright;
 	}
 	resolve(para, selTree, catalog, vs) {
 		if (this.inherits) {

params/variants.toml

@@ -7266,9 +7266,11 @@ capital-w = "curly"
 capital-x = "curly-serifless"
 capital-y = "curly-serifless"
 capital-z = "curly-serifless"
+k = "curly-serifless"
 v = "curly"
 w = "curly"
 x = "curly-serifless"
+y = "curly"
 z = "curly-serifless"
 turn-v = "curly"
 lower-lambda = "curly"
@@ -7276,10 +7278,6 @@ cyrl-capital-u = "curly"
 six = "open-contour"
 nine = "open-contour"
 
-[composite.ss20.upright-oblique]
-k = "curly-serifless"
-y = "curly"
-
 [composite.ss20.italic]
 k = "cursive-serifless"
 y = "cursive"