From 20fbd2f986ff8bdf2def355efdb614331bf11d1a Mon Sep 17 00:00:00 2001
From: be5invis <belleve@typeof.net>
Date: Sun, 19 Jul 2020 11:41:19 -0700
Subject: [PATCH] Add a slightly-curly tailed `u` (#636).

---
 changes/3.4.0.md                 |  4 ++--
 font-src/glyphs/letter-latin.ptl | 41 ++++++++++++++++++++++----------
 params/parameters.toml           |  2 --
 params/variants.toml             |  6 +++++
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/changes/3.4.0.md b/changes/3.4.0.md
index a9e39d1249..8c49bb0200 100644
--- a/changes/3.4.0.md
+++ b/changes/3.4.0.md
@@ -1,3 +1,3 @@
- * Add a slightly-curly tailed `a` (#631).
+ * Add a slightly-curly tailed `a` and `u` (#631, #636).
  * Add triangle operators, bowtie operators and diagonal ellipsis.
- * Refine the crossbar width of `7` in `v-seven-crossbar` variant (#634).
\ No newline at end of file
+ * Refine the crossbar width of `7` in `v-seven-crossbar` variant (#634).
diff --git a/font-src/glyphs/letter-latin.ptl b/font-src/glyphs/letter-latin.ptl
index 8c80e35691..bcab76f8be 100644
--- a/font-src/glyphs/letter-latin.ptl
+++ b/font-src/glyphs/letter-latin.ptl
@@ -39,6 +39,15 @@ glyph-block Letter-Shared : begin
 			if [not sel] : assign-unicode unicode
 			include [f src sel] AS_BASE ALSO_METRICS
 
+glyph-block Letter-Shared-Shapes : begin
+	glyph-block-import CommonShapes
+
+	glyph-block-export RightwardTailedBar
+	define [RightwardTailedBar low high] : dispiro
+		flat RightSB high [widths.rhs.heading Stroke Downward]
+		curl RightSB (low + Hook * 0.5 + Stroke + O * 2)
+		g4   (RightSB + Hook * 0.25) (low + Stroke * 0.75 + O * 2)
+
 glyph-block Letter-Latin-Upper-I : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Overmarks
@@ -949,6 +958,7 @@ glyph-block Letter-Latin-Upper-A : begin
 glyph-block Letter-Latin-Lower-A : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Overmarks
+	glyph-block-import Letter-Shared-Shapes : RightwardTailedBar
 
 	sketch # a.doublestorey
 		set-width Width
@@ -1003,10 +1013,7 @@ glyph-block Letter-Latin-Lower-A : begin
 		include MarkSet.e
 		set-base-anchor 'trailing' (RightSB - markHalfStroke) 0
 		include : OBarRightShape
-		include : dispiro
-			flat RightSB XH [widths.rhs.heading Stroke Downward]
-			curl RightSB (Hook * 0.5 + Stroke + O * 2)
-			g4   (RightSB + Hook * 0.25) (Stroke * 0.75 + O * 2)
+		include : RightwardTailedBar 0 XH
 		save 'a.singlestoreyTailed'
 
 	select-variant 'a' 'a'
@@ -3929,22 +3936,32 @@ glyph-block Letter-Latin-Upper-U : begin
 glyph-block Letter-Latin-Lower-U : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Overmarks
+	glyph-block-import Letter-Shared-Shapes : RightwardTailedBar
 
 	sketch # u
 		set-width Width
 		include MarkSet.e
 		set-base-anchor 'trailing' (RightSB - markHalfStroke) 0
-		include : refer-glyph "n"
-		eject-contour 'serifRB'
-		eject-contour 'serifLB'
-		currentGlyph.reTagContour 'serifLT' 'serifRB'
+		include : nShoulder
+			left -- (SB + Stroke * HVContrast)
+			right -- RightSB
+			fine -- ShoulderFine
 		include : FlipAround Middle (XH / 2)
 
-		if SLAB : begin
-			include : LeftwardTopSerif (RightSB - Stroke * HVContrast) XH SideJut
-			include : LeftwardTopSerif SB XH SideJut
+		branch
+			include : VBarRight RightSB 0 XH
+			if SLAB : begin
+				include : LeftwardTopSerif (RightSB - Stroke * HVContrast) XH SideJut
+				include : LeftwardTopSerif SB XH SideJut
+				include : RightwardBottomSerif RightSB 0 SideJut
+			save 'u.withBar'
 
-		save 'u.withBar'
+		branch
+			include : RightwardTailedBar 0 XH
+			if SLAB : begin
+				include : LeftwardTopSerif (RightSB - Stroke * HVContrast) XH SideJut
+				include : LeftwardTopSerif SB XH SideJut
+			save 'u.tailed'
 
 	create-glyph 'upsilon' 0x3C5 : glyph-construction
 		include MarkSet.e
diff --git a/params/parameters.toml b/params/parameters.toml
index 74824e6358..ed0da67513 100644
--- a/params/parameters.toml
+++ b/params/parameters.toml
@@ -65,8 +65,6 @@ verbose = true
 ###### Slab variant
 [slab]
 slab = true
-onebalance = 10
-overshootx = -16
 
 ###### Spacings
 # Terminal variant
diff --git a/params/variants.toml b/params/variants.toml
index ac7714dfca..8c7d866595 100644
--- a/params/variants.toml
+++ b/params/variants.toml
@@ -389,6 +389,12 @@ sampler = "u"
 description = "Normal `u` without right bar, like a smaller uppercase `U`"
 variant.u = "withoutBar"
 
+[simple.v-u-tailed]
+tag = "VXBT"
+sampler = "u"
+description = "`u` with right bar and a slightly curly tail"
+variant.u = "tailed"
+
 [simple.v-v-straight]
 tag = "cv71"
 sampler = 'vV'