Fix alignment of the suit part of Playing Cards glyphs under quasi-Proportional (#2529).

Author: be5invis

changes/31.8.0.md

@@ -8,3 +8,4 @@
 * Optimize glyph for Cyrillic Capital Ef (`Ф`) under Bulgarian locale (`'BGR '`) under slab.
 * Fix seam in glyphs of Cyrillic Capital/Small Letter Zhwe (`U+A684`..`U+A685`).
 * Fix broken shape of certain power and playback symbols under quasi-proportional (#2528).
+* Fix alignment of the suit part of Playing Cards glyphs under quasi-Proportional (#2529).

packages/font-glyphs/src/auto-build/composite.ptl

@@ -922,42 +922,41 @@ glyph-block AutoBuild-Enclosure : begin
 			list null    { 'markBaseSpace' 'markBaseSpace' } WideWidth1
 			list 0x1F1A9 { 'L' 'O' 'S' 'S' 'L' 'E' 'S' 'S' } WideWidth1
 
-	do "Single-digit playing cards"
+	do "Playing cards"
+		# Here we always construct the two-digit cards to ensure that all digit and suit glyphs
+		# are aligned across all cards.
 		local compositions : list
-			list null    {'markBaseSpace' 'markBaseSpace'} WideWidth1
-			list 0x1F0A1 {'A' 'spadeSuit'} WideWidth4
-			list 0x1F0AB {'J/noDescend' 'spadeSuit'} WideWidth4
-			list 0x1F0AC {'C' 'spadeSuit'} WideWidth4
-			list 0x1F0AD {'Q' 'spadeSuit'} WideWidth4
-			list 0x1F0AE {'K' 'spadeSuit'} WideWidth4
-			list 0x1F0B1 {'A' 'whiteHeartSuit'} WideWidth4
-			list 0x1F0BB {'J/noDescend' 'whiteHeartSuit'} WideWidth4
-			list 0x1F0BC {'C' 'whiteHeartSuit'} WideWidth4
-			list 0x1F0BD {'Q' 'whiteHeartSuit'} WideWidth4
-			list 0x1F0BE {'K' 'whiteHeartSuit'} WideWidth4
-			list 0x1F0C1 {'A' 'whiteDiamondSuit'} WideWidth4
-			list 0x1F0CB {'J/noDescend' 'whiteDiamondSuit'} WideWidth4
-			list 0x1F0CC {'C' 'whiteDiamondSuit'} WideWidth4
-			list 0x1F0CD {'Q' 'whiteDiamondSuit'} WideWidth4
-			list 0x1F0CE {'K' 'whiteDiamondSuit'} WideWidth4
-			list 0x1F0D1 {'A' 'clubSuit'} WideWidth4
-			list 0x1F0DB {'J/noDescend' 'clubSuit'} WideWidth4
-			list 0x1F0DC {'C' 'clubSuit'} WideWidth4
-			list 0x1F0DD {'Q' 'clubSuit'} WideWidth4
-			list 0x1F0DE {'K' 'clubSuit'} WideWidth4
-		foreach [j : range 2 till 9] : compositions.push : list (0x1F0A0 + j) [[digitGlyphNames j].concat {'spadeSuit'}] WideWidth4
-		foreach [j : range 2 till 9] : compositions.push : list (0x1F0B0 + j) [[digitGlyphNames j].concat {'whiteHeartSuit'}] WideWidth4
-		foreach [j : range 2 till 9] : compositions.push : list (0x1F0C0 + j) [[digitGlyphNames j].concat {'whiteDiamondSuit'}] WideWidth4
-		foreach [j : range 2 till 9] : compositions.push : list (0x1F0D0 + j) [[digitGlyphNames j].concat {'clubSuit'}] WideWidth4
-		createPlayingCardGlyphs 1 compositions
-
-	do "Double-digit playing cards"
-		createPlayingCardGlyphs 2 : list
-			list null    { 'markBaseSpace' 'markBaseSpace' } WideWidth1
-			list 0x1F0AA { 'one.lnum' 'zero.lnum' 'spadeSuit' 'zwsp' } WideWidth4
-			list 0x1F0BA { 'one.lnum' 'zero.lnum' 'whiteHeartSuit' 'zwsp' } WideWidth4
-			list 0x1F0CA { 'one.lnum' 'zero.lnum' 'whiteDiamondSuit' 'zwsp' } WideWidth4
-			list 0x1F0DA { 'one.lnum' 'zero.lnum' 'clubSuit' 'zwsp' } WideWidth4
+			list null    { 'markBaseSpace' 'markBaseSpace' 'markBaseSpace'    'zwsp' } WideWidth1
+			list 0x1F0A1 { 'A'             'markBaseSpace' 'spadeSuit'        'zwsp' } WideWidth4
+			list 0x1F0AB { 'J/noDescend'   'markBaseSpace' 'spadeSuit'        'zwsp' } WideWidth4
+			list 0x1F0AC { 'C'             'markBaseSpace' 'spadeSuit'        'zwsp' } WideWidth4
+			list 0x1F0AD { 'Q'             'markBaseSpace' 'spadeSuit'        'zwsp' } WideWidth4
+			list 0x1F0AE { 'K'             'markBaseSpace' 'spadeSuit'        'zwsp' } WideWidth4
+			list 0x1F0B1 { 'A'             'markBaseSpace' 'whiteHeartSuit'   'zwsp' } WideWidth4
+			list 0x1F0BB { 'J/noDescend'   'markBaseSpace' 'whiteHeartSuit'   'zwsp' } WideWidth4
+			list 0x1F0BC { 'C'             'markBaseSpace' 'whiteHeartSuit'   'zwsp' } WideWidth4
+			list 0x1F0BD { 'Q'             'markBaseSpace' 'whiteHeartSuit'   'zwsp' } WideWidth4
+			list 0x1F0BE { 'K'             'markBaseSpace' 'whiteHeartSuit'   'zwsp' } WideWidth4
+			list 0x1F0C1 { 'A'             'markBaseSpace' 'whiteDiamondSuit' 'zwsp' } WideWidth4
+			list 0x1F0CB { 'J/noDescend'   'markBaseSpace' 'whiteDiamondSuit' 'zwsp' } WideWidth4
+			list 0x1F0CC { 'C'             'markBaseSpace' 'whiteDiamondSuit' 'zwsp' } WideWidth4
+			list 0x1F0CD { 'Q'             'markBaseSpace' 'whiteDiamondSuit' 'zwsp' } WideWidth4
+			list 0x1F0CE { 'K'             'markBaseSpace' 'whiteDiamondSuit' 'zwsp' } WideWidth4
+			list 0x1F0D1 { 'A'             'markBaseSpace' 'clubSuit'         'zwsp' } WideWidth4
+			list 0x1F0DB { 'J/noDescend'   'markBaseSpace' 'clubSuit'         'zwsp' } WideWidth4
+			list 0x1F0DC { 'C'             'markBaseSpace' 'clubSuit'         'zwsp' } WideWidth4
+			list 0x1F0DD { 'Q'             'markBaseSpace' 'clubSuit'         'zwsp' } WideWidth4
+			list 0x1F0DE { 'K'             'markBaseSpace' 'clubSuit'         'zwsp' } WideWidth4
+			list 0x1F0AA { 'one.lnum'      'zero.lnum'     'spadeSuit'        'zwsp' } WideWidth4
+			list 0x1F0BA { 'one.lnum'      'zero.lnum'     'whiteHeartSuit'   'zwsp' } WideWidth4
+			list 0x1F0CA { 'one.lnum'      'zero.lnum'     'whiteDiamondSuit' 'zwsp' } WideWidth4
+			list 0x1F0DA { 'one.lnum'      'zero.lnum'     'clubSuit'         'zwsp' } WideWidth4
+		foreach [j : range 2 till 9] : begin
+			compositions.push : list (0x1F0A0 + j) [[digitGlyphNames j].concat {'markBaseSpace' 'spadeSuit'        'zwsp'}] WideWidth4
+			compositions.push : list (0x1F0B0 + j) [[digitGlyphNames j].concat {'markBaseSpace' 'whiteHeartSuit'   'zwsp'}] WideWidth4
+			compositions.push : list (0x1F0C0 + j) [[digitGlyphNames j].concat {'markBaseSpace' 'whiteDiamondSuit' 'zwsp'}] WideWidth4
+			compositions.push : list (0x1F0D0 + j) [[digitGlyphNames j].concat {'markBaseSpace' 'clubSuit'         'zwsp'}] WideWidth4
+		createPlayingCardGlyphs 2 compositions
 
 	do "Single-digit trump cards"
 		createTrumpCardGlyphs 1 : list