cleanup

Author: jmcwilliams403

packages/font-glyphs/src/letter/latin/x.ptl

@@ -51,7 +51,7 @@ glyph-block Letter-Latin-X : begin
 		include : HalfXStrand stb slab xLeft yLeft xMid yMid turn pStraight tension _sw (-0.001)
 		include : HalfXStrand stb slab xRight yRight xMid yMid turn pStraight tension _sw (-0.001)
 
-	define [XChanceryStrand sign fSlab _leftX leftY _rightX rightY fHalf _sw] : begin
+	define [XChanceryStrand sign fSlab leftX leftY rightX rightY fHalf _sw] : begin
 		local sw : fallback _sw Stroke
 		local blendK1X : StrokeWidthBlend 0.58 0.65
 		local blendK1Y   0.2
@@ -63,20 +63,28 @@ glyph-block Letter-Latin-X : begin
 
 		local fine : [AdviceStroke 3] * (sw / Stroke)
 
-		local leftX  : _leftX  - [if fSlab SideJut 0]
-		local rightX : _rightX + [if fSlab SideJut 0]
+		local leftXExt  : leftX  - SideJut
+		local rightXExt : rightX + SideJut
 
 		return : dispiro
 			if fHalf
 				flat [mix leftX rightX 0.5] [mix leftY rightY 0.5] [widths.center fine]
 				list
-					straight.right.start leftX  (leftY - sign * sw / 2) [widths.center sw]
+					if fSlab
+						begin
+							flat (leftX + TINY) (leftY - sign * sw / 2) [widths.center sw]
+							curl leftXExt (leftY - sign * sw / 2) [widths.center sw]
+						straight.right.start leftX  (leftY - sign * sw / 2) [widths.center sw]
 					alsoThruThem {{blendK1X blendK1Y} {blendK2X blendK2Y}}
 					flat [mix leftX rightX pStraightX] [mix leftY rightY pStraightY] [widths.center : mix sw fine 0.5]
 					corner [mix leftX rightX 0.5] [mix leftY rightY 0.5] [widths.center fine]
 			curl [mix leftX rightX (1 - pStraightX)] [mix leftY rightY (1 - pStraightY)] [widths.center : mix sw fine 0.5]
 			alsoThruThem {{(1 - blendK2X) (1 - blendK2Y)} {(1 - blendK1X) (1 - blendK1Y)}}
-			straight.right.end   rightX (rightY + sign * sw / 2) [widths.center sw]
+			if fSlab
+				begin
+					flat (rightX - TINY) (rightY + sign * sw / 2) [widths.center sw]
+					curl rightXExt (rightY + sign * sw / 2) [widths.center sw]
+				straight.right.end   rightX (rightY + sign * sw / 2) [widths.center sw]
 
 	glyph-block-export XCursiveHalfShape
 	define [XCursiveHalfShape] : with-params [
@@ -199,7 +207,7 @@ glyph-block Letter-Latin-X : begin
 		cursive                         { STROKE-CURSIVE  STROKE-CURSIVE  null                     false }
 		semiChanceryStraightSerifless   { STROKE-STRAIGHT STROKE-CHANCERY null                     false }
 		semiChanceryCurlySerifless      { STROKE-CURLY    STROKE-CHANCERY null                     false }
-		chancery                        { STROKE-CHANCERY STROKE-CHANCERY null                     SLAB  }
+		chancery                        { STROKE-CHANCERY STROKE-CHANCERY null                     false }
 		straightSerifed                 { STROKE-STRAIGHT STROKE-STRAIGHT XSerifs.Full             true  }
 		curlySerifed                    { STROKE-CURLY    STROKE-CURLY    XSerifs.Full             true  }
 		semiChanceryStraightSerifed     { STROKE-STRAIGHT STROKE-CHANCERY XSerifs.SemiChancery     true  }