Rename variants of g since motion serifs doesn't make sense here

changes/7.0.0.md

@@ -1,6 +1,6 @@
  * \[**Breaking**\] Variant tags are reordered.
  * \[**Breaking**\] Variant names of certain letters are renamed and reorganized, including:
-   - `a`.
+   - `a` and `g`.
    - Upper Gamma (`grek-upper-gamma`).
    - `K`, `k`, Cyrillic Ka (`К` and `к`).
    - Cyrillic Ze (`З` and `з`).

font-src/glyphs/letter/cyrillic/de.ptl

@@ -56,5 +56,3 @@ glyph-block Letter-Cyrillic-De : begin
 			curl (RightSB - OX) (XH - SmallSmoothB)
 			quadcontrols 0 0.8
 			g4 (SB + Stroke * 1.1) CAP
-
-	alias 'cyrl/de.BGR' null 'g.singleStorey'

font-src/glyphs/letter/latin/lower-g.ptl

@@ -77,23 +77,19 @@ glyph-block Letter-Latin-Lower-G : begin
 		g4 (SB + offset) (Descender + SHook)
 		if (sink == spiro-outline) {[corner SB XH]} {}
 
-	create-glyph 'g.singleStorey' : glyph-proc
+	create-glyph 'g.singleStoreySerifless' : glyph-proc
 		include : MarkSet.p
 		set-base-anchor 'overlay' Middle (XH / 2)
 		include : OBarRightShape
 		include : SmallGSingleStoreyShapeHookT dispiro 0 Stroke
-		if SLAB : include : tagged 'serifRT' : RightwardTopSerif RightSB XH SideJut
 
-	create-glyph 'g.singleStoreyMotionSerifed' : glyph-proc
+	create-glyph 'g.singleStoreySerifed' : glyph-proc
 		include : MarkSet.p
 		set-base-anchor 'overlay' Middle (XH / 2)
 		include : OBarRightShape
 		include : SmallGSingleStoreyShapeHookT dispiro 0 Stroke
 		include : tagged 'serifRT' : RightwardTopSerif RightSB XH SideJut
 
-	alias 'scriptg' 0x261 'g.singleStorey'
-	alias 'cyrl/de.SRB' null 'g.singleStorey'
-
 	create-glyph 'g.singleStoreyEarlessCorner' : glyph-proc
 		include : MarkSet.p
 		set-base-anchor 'overlay' Middle (XH / 2)
@@ -129,14 +125,13 @@ glyph-block Letter-Latin-Lower-G : begin
 			flat (df.rightSB - hd.x) Descender
 			curl xTerminal Descender [heading Leftward]
 
-	create-glyph 'g.singleStoreyFlatHook' : glyph-proc
+	create-glyph 'g.singleStoreyFlatHookSerifless' : glyph-proc
 		include : MarkSet.p
 		set-base-anchor 'overlay' Middle (XH / 2)
 		include : OBarRightShape
 		include : SmallGSingleStoreyFlatHookShape [DivFrame 1] XH
-		if SLAB : include : tagged 'serifRT' : RightwardTopSerif RightSB XH SideJut
 
-	create-glyph 'g.singleStoreyMotionSerifedFlatHook' : glyph-proc
+	create-glyph 'g.singleStoreyFlatHookSerifed' : glyph-proc
 		include : MarkSet.p
 		set-base-anchor 'overlay' Middle (XH / 2)
 		include : OBarRightShape
@@ -160,6 +155,10 @@ glyph-block Letter-Latin-Lower-G : begin
 	select-variant 'g' 'g'
 	turned 'turng' 0x1D77 'g' Middle [mix Descender XH 0.5]
 
+	alias 'scriptg' 0x261 : if SLAB 'g.singleStoreySerifed' 'g.singleStoreySerifless'
+	alias 'cyrl/de.SRB' null 'scriptg'
+	alias 'cyrl/de.BGR' null 'scriptg'
+
 	glyph-block-import Letter-Blackboard : BBS BBD BBBarRight
 	create-glyph 'mathbb/g' 0x1D558 : glyph-proc
 		include : MarkSet.p
@@ -192,12 +191,12 @@ glyph-block Letter-Latin-Lower-G : begin
 
 		derive 'doubleStorey'                       bwDoubleStorey
 		derive 'openDoubleStorey'                   bwDoubleStorey
-		derive 'singleStorey'                       bwSingleStorey
+		derive 'singleStoreySerifless'              bwSingleStorey
-		derive 'singleStoreyMotionSerifed'          bwSingleStorey
+		derive 'singleStoreySerifed'                bwSingleStorey
 		derive 'singleStoreyEarlessCorner'          bwSingleStorey
 		derive 'singleStoreyEarlessRounded'         bwSingleStorey
-		derive 'singleStoreyFlatHook'               bwSingleStorey
+		derive 'singleStoreyFlatHookSerifless'      bwSingleStorey
-		derive 'singleStoreyMotionSerifedFlatHook'  bwSingleStorey
+		derive 'singleStoreyFlatHookSerifed'        bwSingleStorey
 		derive 'singleStoreyEarlessCornerFlatHook'  bwSingleStorey
 		derive 'singleStoreyEarlessRoundedFlatHook' bwSingleStorey
 

params/variants.toml

@@ -1760,46 +1760,46 @@ rank = 2
 description = "Open Double-storey `g`, like Trebuchet MS or Fira Code"
 selector.g = "openDoubleStorey"
 
-[prime.g.variants.single-storey]
+[prime.g.variants.single-storey-serifless]
 rank = 3
-description = "Single-storey `g`"
+description = "Single-storey `g` without serifs"
-selector.g = "singleStorey"
+selector.g = "singleStoreySerifless"
+
+[prime.g.variants.single-storey-serifed]
+rank = 4
+description = "Single-storey `g` with serif at top right"
+selector.g = "singleStoreySerifed"
 
 [prime.g.variants.earless-corner]
-rank = 4
+rank = 5
 description = "Earless (cornered top-right) single-storey `g`"
 selector.g = "singleStoreyEarlessCorner"
 
 [prime.g.variants.earless-rounded]
-rank = 5
+rank = 6
 description = "Earless (rounded top-right) single-storey `g`"
 selector.g = "singleStoreyEarlessRounded"
 
-[prime.g.variants.single-storey-motion-serifed]
+[prime.g.variants.single-storey-flat-hook-serifless]
-rank = 6
-description = "Single-storey `g` with motion serifs"
-selector.g = "singleStoreyMotionSerifed"
-
-[prime.g.variants.single-storey-flat-hook]
 rank = 7
-description = "Single-storey `g` with flat terminal hook"
+description = "Single-storey `g` with flat terminal hook and without serifs"
-selector.g = "singleStoreyFlatHook"
+selector.g = "singleStoreyFlatHookSerifless"
+
+[prime.g.variants.single-storey-flat-hook-serifed]
+rank = 8
+description = "Single-storey `g` with top-right serif and flat terminal hook"
+selector.g = "singleStoreyFlatHookSerifed"
 
 [prime.g.variants.single-storey-earless-corner-flat-hook]
-rank = 8
+rank = 9
 description = "Earless (cornered top-right) single-storey `g` with flat terminal hook"
 selector.g = "singleStoreyEarlessCornerFlatHook"
 
 [prime.g.variants.single-storey-earless-rounded-flat-hook]
-rank = 9
+rank = 10
 description = "Earless (rounded top-right) single-storey `g` with flat terminal hook"
 selector.g = "singleStoreyEarlessRoundedFlatHook"
 
-[prime.g.variants.single-storey-motion-serifed-flat-hook]
-rank = 10
-description = "Single-storey `g` with motion serifs and flat terminal hook"
-selector.g = "singleStoreyMotionSerifedFlatHook"
-
 
 
 [prime.h]
@@ -4973,7 +4973,7 @@ capital-z = "straight-serifless"
 # Lowers
 b = "toothed"
 c = "serifless"
-g = "single-storey"
+g = "single-storey-serifless"
 p = "eared"
 q = "straight"
 r = "serifless"
@@ -5088,6 +5088,7 @@ capital-y = "straight-serifed"
 capital-z = "straight-serifed"
 a = "double-storey-serifed"
 c = "unilateral-serifed"
+g = "single-storey-serifed"
 s = "bilateral-serifed"
 x = "straight-serifed"
 z = "straight-serifed"
@@ -5193,7 +5194,6 @@ a = "double-storey-serifless"
 d = "toothed-top-serifed"
 e = "flat-crossbar"
 f = "flat-hook-serifed"
-g = "single-storey"
 i = "serifed"
 j = "serifed"
 k = "straight-serifless"
@@ -5497,7 +5497,7 @@ nine = "closed-contour"
 g = "double-storey"
 
 [composite.ss08.italic]
-g = "single-storey"
+g = "single-storey-serifless"
 
 [composite.ss08.slab-override.design]
 capital-a = "curly-base-serifed"
@@ -5507,6 +5507,9 @@ capital-y = "curly-serifed"
 a = "double-storey-serifed"
 k = "curly-serifed"
 
+[composite.ss08.slab-override.italic]
+g = "single-storey-serifed"
+
 
 
 [composite.ss09]
@@ -5544,7 +5547,7 @@ dollar = "open"
 
 [composite.ss09.italic]
 a = "single-storey-serifless"
-g = "single-storey"
+g = "single-storey-serifless"
 i = "serifed-tailed"
 
 [composite.ss09.slab-override.design]
@@ -5557,6 +5560,7 @@ k = "straight-serifed"
 
 [composite.ss09.slab-override.italic]
 a = "single-storey-serifed"
+g = "single-storey-serifed"
 
 
 
@@ -5726,7 +5730,7 @@ a = "double-storey-serifless"
 d = "toothed-serifless"
 e = "flat-crossbar"
 f = "flat-hook"
-g = "single-storey-flat-hook"
+g = "single-storey-flat-hook-serifless"
 i = "serifed"
 j = "flat-hook-serifed"
 k = "symmetric-connected-serifless"
@@ -5765,6 +5769,7 @@ capital-g = "toothless-rounded-serifed-hooked"
 capital-k = "symmetric-connected-serifed"
 a = "double-storey-serifed"
 d = "toothed-serifed"
+g = "single-storey-flat-hook-serifed"
 k = "symmetric-connected-serifed"
 cyrl-capital-ka = "symmetric-connected-serifed"
 cyrl-ka = "symmetric-connected-serifed"
@@ -5940,7 +5945,7 @@ cent = "bar-interrupted"
 a = "single-storey-tailed"
 e = "rounded"
 f = "tailed"
-g = "single-storey"
+g = "single-storey-serifless"
 i = "serifed-flat-tailed"
 l = "serifed-flat-tailed"
 m = "tailed"
@@ -5953,6 +5958,9 @@ x = "cursive"
 y = "cursive"
 z = "cursive"
 
+[composite.ss17.slab-override.italic]
+g = "single-storey-serifed"
+
 
 
 [composite.ss20]