Fix broken curly variants of x and X (#824).

be5invis · Jan 24, 2021 · f9abd89 · f9abd89
1 parent a6f9ea7
commit f9abd89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/changes/5.0.0-beta.2.md b/changes/5.0.0-beta.2.md
@@ -0,0 +1 @@
+ * Fix broken curly variants of `x` and `X` (#824).
diff --git a/font-src/glyphs/letter/latin/x.ptl b/font-src/glyphs/letter/latin/x.ptl
@@ -45,52 +45,52 @@ glyph-block Letter-Latin-X : begin
 		include : HalfXStrand stb slab _leftx lefty middlex middley turn pStraight tension
 		include : HalfXStrand stb slab _rightx righty middlex middley turn pStraight tension
 
-	define [UpperXBase] : union
-		XStrand true SLAB SB 0 RightSB CAP 0.1 0.4 0.28
-		XStrand true SLAB SB CAP RightSB 0 0.1 0.4 0.28
+	define [UpperXBase fStraight] : union
+		XStrand fStraight SLAB SB 0 RightSB CAP 0.1 0.4 0.28
+		XStrand fStraight SLAB SB CAP RightSB 0 0.1 0.4 0.28
 
 	define [XMotionSerifs top] : glyph-proc
 		include : tagged 'serifLT' : LeftwardTopSerif SB top SideJut
 
 	create-glyph 'X.straight' : glyph-proc
 		include : MarkSet.capital
-		include : WithAIHSerifsMask CAP 0 SB RightSB : UpperXBase
+		include : WithAIHSerifsMask CAP 0 SB RightSB : UpperXBase true
 		include : AIHSerifs CAP
 	create-glyph 'X.curly' : glyph-proc
 		include : MarkSet.capital
-		include : WithAIHSerifsMask CAP 0 SB RightSB : UpperXBase
+		include : WithAIHSerifsMask CAP 0 SB RightSB : UpperXBase false
 		include : AIHSerifs CAP
 	create-glyph 'X.straightMotionSerifed' : glyph-proc
 		include : MarkSet.capital
-		include : UpperXBase
+		include : UpperXBase true
 		include : XMotionSerifs CAP
 	create-glyph 'X.curlyMotionSerifed' : glyph-proc
 		include : MarkSet.capital
-		include : UpperXBase
+		include : UpperXBase false
 		include : XMotionSerifs CAP
 
-	define [LowerXBase] : begin
+	define [LowerXBase fStraight] : begin
 		local turn    : if SLAB 0.1  0.1
 		local tension : if SLAB 0.24 0.24
 		union
-			XStrand true SLAB SB 0 RightSB XH turn 0.4 tension
-			XStrand true SLAB SB XH RightSB 0 turn 0.4 tension
+			XStrand fStraight SLAB SB 0 RightSB XH turn 0.4 tension
+			XStrand fStraight SLAB SB XH RightSB 0 turn 0.4 tension
 
 	create-glyph 'x.straight' : glyph-proc
 		include : MarkSet.e
-		include : WithAIHSerifsMask XH 0 SB RightSB : LowerXBase
+		include : WithAIHSerifsMask XH 0 SB RightSB : LowerXBase true
 		include : AIHSerifs XH
 	create-glyph 'x.curly' : glyph-proc
 		include : MarkSet.e
-		include : WithAIHSerifsMask XH 0 SB RightSB : LowerXBase
+		include : WithAIHSerifsMask XH 0 SB RightSB : LowerXBase false
 		include : AIHSerifs XH
 	create-glyph 'x.straightMotionSerifed' : glyph-proc
 		include : MarkSet.e
-		include : LowerXBase
+		include : LowerXBase true
 		include : XMotionSerifs XH
 	create-glyph 'x.curlyMotionSerifed' : glyph-proc
 		include : MarkSet.e
-		include : LowerXBase
+		include : LowerXBase false
 		include : XMotionSerifs XH
 
 	define [ChiBase] : union