From a03ee9ff6ecaea5a61078d93bc9009511b6fb033 Mon Sep 17 00:00:00 2001
From: John McWilliams <37010132+jmcwilliams403@users.noreply.github.com>
Date: Sat, 5 Oct 2024 14:49:20 -0400
Subject: [PATCH] Optimize rounded variants for Capital Eszett. (#2532)

---
 changes/31.8.1.md                                   |  1 +
 packages/font-glyphs/src/letter/latin-ext/eszet.ptl | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 changes/31.8.1.md

diff --git a/changes/31.8.1.md b/changes/31.8.1.md
new file mode 100644
index 000000000..32acc33d7
--- /dev/null
+++ b/changes/31.8.1.md
@@ -0,0 +1 @@
+* Optimize glyphs for `rounded-serifless` and `rounded-serifed` variants for Capital Eszett (`ẞ`).
diff --git a/packages/font-glyphs/src/letter/latin-ext/eszet.ptl b/packages/font-glyphs/src/letter/latin-ext/eszet.ptl
index fad043c37..b04d3ef69 100644
--- a/packages/font-glyphs/src/letter/latin-ext/eszet.ptl
+++ b/packages/font-glyphs/src/letter/latin-ext/eszet.ptl
@@ -199,9 +199,9 @@ glyph-block Letter-Latin-Upper-Eszet : begin
 		define xFinal : Math.max
 			mix (SB + [HSwToV Stroke]) RightSB 0.1
 			mix SB RightSB 0.3
-		define xMiddle : RightSB - ymiddle / 2 - Stroke * 0.75
-		define xMiddleBot : RightSB - ymiddle / 2 - HalfStroke
-		define rightTopX : RightSB + O * 2
+		define xMiddle : Math.max xFinal (SB + [HSwToV : 1.2 * Stroke]) (RightSB - ymiddle / 2 - Stroke * 0.75)
+		define xMiddleBot : Math.max xMiddle (xFinal + TINY + TanSlope * Stroke)
+		define rightTopX : RightSB + O
 
 		include : dispiro
 			widths.lhs
@@ -211,16 +211,16 @@ glyph-block Letter-Latin-Upper-Eszet : begin
 			curl SB 0 [heading Downward]
 		include : dispiro
 			widths.rhs
-			g4   xMiddle ymiddleCap
+			g4   xMiddle ymiddleCap [heading Rightward]
 			archv
-			g4   (RightSB - O) [mix 0 ymiddleCap 0.5]
+			g4   (RightSB - O * 2) [YSmoothMidR ymiddleCap 0]
 			arcvh
 			flat xMiddleBot 0
 			curl xFinal 0 [heading Leftward]
 		include : dispiro
 			widths.rhs
 			g4 rightTopX (CAP - ArchDepthB)
-			g4 xMiddle ymiddleCap [widths Stroke 0]
+			g4 xMiddle ymiddleCap [widths.lhs Stroke]
 
 		include : CapitalEszetSerifs slab