From c6eee3535e047275bd63d4219df14c8b360be5cf Mon Sep 17 00:00:00 2001
From: John McWilliams <37010132+jmcwilliams403@users.noreply.github.com>
Date: Wed, 26 Feb 2025 22:39:00 -0500
Subject: [PATCH] Make Cyrillic Capital Uk slightly wider under QP. (#2694)

---
 changes/33.0.0.md                                 | 1 +
 packages/font-glyphs/src/auto-build/composite.ptl | 6 +++---
 packages/font-glyphs/src/letter/latin/o.ptl       | 5 -----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/changes/33.0.0.md b/changes/33.0.0.md
index 949ad9a8e..d2933ae3f 100644
--- a/changes/33.0.0.md
+++ b/changes/33.0.0.md
@@ -37,6 +37,7 @@
   - LATIN CAPITAL LETTER REVERSED HALF H (`U+A7F5`).
   - LATIN SMALL LETTER REVERSED HALF H (`U+A7F6`).
 * Make certain characters slightly wider under Quasi-Proportional. Affected characters:
+  - CYRILLIC CAPITAL LETTER UK (`U+0478`).
   - LATIN SMALL LIGATURE FF (`U+FB00`) ... LATIN SMALL LIGATURE FFL (`U+FB04`).
 * Add Characters:
   - OBSERVER EYE SYMBOL (`U+23FF`).
diff --git a/packages/font-glyphs/src/auto-build/composite.ptl b/packages/font-glyphs/src/auto-build/composite.ptl
index 0efb3ef06..1d96d49db 100644
--- a/packages/font-glyphs/src/auto-build/composite.ptl
+++ b/packages/font-glyphs/src/auto-build/composite.ptl
@@ -1463,7 +1463,7 @@ glyph-block Autobuild-Ligatures : begin
 		list 0x1F1 { 'D' 'Z' }
 		list 0x1F2 { 'D' 'z' }
 		list 0x1F3 { 'd' 'z' }
-		list 0x478 { 'cyrl/Uk/O' 'cyrl/u' }
+		list 0x478 { 'cyrl/O' 'cyrl/u' }
 		list 0x479 { 'cyrl/uk/o' 'cyrl/u' }
 		list 0x20A7 { 'P' 't' }
 		list 0x20A8 { 'R' 's' }
@@ -1618,7 +1618,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
 	define [ToLetter] : glyph-proc
 
 	define stdShrink : clamp 0.625 0.9 : StrokeWidthBlend 0.625 0.9
-	createPhoneticLigatures ToLetter 'phonetic1' (para.advanceScaleF * para.advanceScaleMM) 2 stdShrink 1 : list
+	createPhoneticLigatures ToLetter 'phonetic1' [Math.max 1 : para.advanceScaleF * para.advanceScaleMM] 2 stdShrink 1 : list
 		list 0xFB00  { 'f'               'f'                     } null
 		list 0xFB01  { 'f/compLigLeft1'  'dotlessi/compLigRight' } null
 		list 0xFB02  { 'f/compLigLeft2'  'l/compLigRight'        } null
@@ -1642,7 +1642,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
 		list 0xFB05  { 'longs/compLigLeft' 't/compLigRight'                 } null
 		list 0xFB06  { 's/compLigLeft'     't/compLigRight'                 } null
 
-	createPhoneticLigatures ToLetter 'phonetic3' (para.advanceScaleF * [mix 1 para.advanceScaleMM 2]) 3 stdShrink 1 : list
+	createPhoneticLigatures ToLetter 'phonetic3' [Math.max 1 : para.advanceScaleF * [mix 1 para.advanceScaleMM 2]] 3 stdShrink 1 : list
 		list 0xFB03  { 'f/compLigLeft1' 'f/compLigLeft1' 'dotlessi/compLigRight' } null
 		list 0xFB04  { 'f/compLigLeft3' 'f/compLigLeft2' 'l/compLigRight'        } null
 
diff --git a/packages/font-glyphs/src/letter/latin/o.ptl b/packages/font-glyphs/src/letter/latin/o.ptl
index 11c5ad0b8..48483ba5e 100644
--- a/packages/font-glyphs/src/letter/latin/o.ptl
+++ b/packages/font-glyphs/src/letter/latin/o.ptl
@@ -37,11 +37,6 @@ glyph-block Letter-Latin-O : begin
 	alias 'cyrl/O' 0x41E 'O'
 	alias 'cyrl/o' 0x43E 'o'
 
-	create-glyph 'cyrl/Uk/O' : glyph-proc
-		local df : include : DivFrame para.advanceScaleF 2
-		include : df.markSet.capital
-		include : OShape CAP 0 df.leftSB df.rightSB df.mvs df.archDepthA df.archDepthB
-
 	create-glyph 'cyrl/uk/o' : glyph-proc
 		local df : include : DivFrame para.advanceScaleF 2
 		include : df.markSet.e