Cleanup

font-src/glyphs/common/shapes.ptl

@@ -300,14 +300,14 @@ glyph-block CommonShapes : begin
 		export : define [mtAsymmetric x y l r _sw] : begin
 			local sw : fallback _sw Stroke
 			return : dispiro
-				flat (x + r - TanSlope * (sw * DesignParameters.serifShiftX)) y [widths sw 0]
+				flat (x + r - TanSlope * (sw * DesignParameters.serifShiftX)) y [widths.lhs sw]
 				curl (x - l - TanSlope * (sw * DesignParameters.serifShiftX)) y
 
 		export : define [mb x y length _sw] : mbAsymmetric x y length length _sw
 		export : define [mbAsymmetric x y l r _sw] : begin
 			local sw : fallback _sw Stroke
 			return : dispiro
-				flat (x + r + TanSlope * (sw * DesignParameters.serifShiftX)) y [widths 0 sw]
+				flat (x + r + TanSlope * (sw * DesignParameters.serifShiftX)) y [widths.rhs sw]
 				curl (x - l + TanSlope * (sw * DesignParameters.serifShiftX)) y
 
 	glyph-block-export VSerif
@@ -395,7 +395,7 @@ glyph-block CommonShapes : begin
 	glyph-block-export FlatSlashShape
 	define [FlatSlashShape middlex middle fine kx ky] : glyph-proc
 		include : dispiro
-			flat (middlex - LongJut * [fallback kx 0.8]) (middle - LongJut * [fallback ky 0.4]) [widths fine fine]
+			flat (middlex - LongJut * [fallback kx 0.8]) (middle - LongJut * [fallback ky 0.4]) [widths.center : 2 * fine]
 			curl (middlex + LongJut * [fallback kx 0.8]) (middle + LongJut * [fallback ky 0.4])
 
 	# Spiro shapes

font-src/glyphs/letter/greek/lower-alpha.ptl

@@ -23,12 +23,12 @@ glyph-block Letter-Greek-Lower-Alpha : begin
 			widths.rhs fine
 			g4   (RightSB - OX * 1.75) XH [heading Downward]
 			bezControls k1 k2 k3 1 6
-			g4.left.mid (middle + CorrectionOMidS) O [widths 0 Stroke]
+			g4.left.mid (middle + CorrectionOMidS) O [widths.rhs Stroke]
 			archv
 			flat (SB + OX * 2) SmallArchDepthB
 			curl (SB + OX * 2) (XH - SmallArchDepthA)
 			arcvh
-			g4.right.mid (middle - CorrectionOMidS) (XH - O) [widths 0 Stroke]
+			g4.right.mid (middle - CorrectionOMidS) (XH - O) [widths.rhs Stroke]
 			bezControls (1 - k3) 0 (1 - k1) (1 - k2) 6
 			g4   (RightSB - OX * 2) 0 [widths.heading 0 fine Downward]
 

font-src/glyphs/letter/greek/lower-delta.ptl

@@ -33,7 +33,7 @@ glyph-block Letter-Greek-Lower-Delta : begin
 			flat (SB + OX) SmallArchDepthB
 			curl (SB + OX) (yRingTop - SmallArchDepthA)
 			arcvh
-			g4   xOTLeft (yRingTop - (Stroke - fine) / 2) [widths 0 fine]
+			g4   xOTLeft (yRingTop - (Stroke - fine) / 2) [widths.rhs fine]
 
 	create-glyph 'grek/delta.flatTop' : glyph-proc
 		include : MarkSet.b

font-src/glyphs/letter/greek/upper-omega.ptl

@@ -18,7 +18,7 @@ glyph-block Letter-Greek-Upper-Omega : begin
 		include : dispiro
 			g4   x1 (yattach - fine) [widths.heading 0 fine Leftward]
 			archv
-			flat SB (yattach - Stroke + adb) [widths 0 Stroke]
+			flat SB (yattach - Stroke + adb) [widths.rhs Stroke]
 			curl SB (top - ada)
 			arcvh
 			g4   (Middle - CorrectionOMidS) (top - O)

font-src/glyphs/letter/latin-ext/eszet.ptl

@@ -210,6 +210,6 @@ glyph-block Letter-Latin-Upper-Eszet : begin
 		include : dispiro
 			widths.rhs
 			g4 rightTopX (CAP - Stroke)
-			g4 xMiddle (ymiddleCap + Stroke) [widths Stroke 0]
+			g4 xMiddle (ymiddleCap + Stroke) [widths.lhs Stroke]
 
 		if SLAB : include : HSerif.lb SB 0 SideJut

font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl

@@ -231,7 +231,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin
 			local fine : 0.375 * OverlayStroke
 			local { subDf shift } : SubDfAndShift 1 [DivFrame para.diversityM 3] OX
 			include : dispiro
-				flat (shift + subDf.leftSB + OX + fine) [mix XH 0 1.05] [widths fine fine]
+				flat (shift + subDf.leftSB + OX + fine) [mix XH 0 1.05] [widths.center : 2 * fine]
 				curl (shift + subDf.rightSB - OX - fine) [mix 0 XH 1.05]
 
 		create-glyph "rightHalfBarOverlay" : glyph-proc

font-src/glyphs/letter/latin-ext/rams-horn.ptl

@@ -18,7 +18,7 @@ glyph-block Letter-Latin-Rams-Horn : begin
 			widths.center
 			g4 (SB + [HSwToV HalfStroke] + O) top [heading Downward]
 			quadControls 1 0.7 16
-			g4 (Middle + d - hf) (bottom + d * (1 - TanSlope * 0.5)) [widths hf hf]
+			g4 (Middle + d - hf) (bottom + d * (1 - TanSlope * 0.5)) [widths.center : 2 * hf]
 			arcvh
 			g4 (Middle + CorrectionOMidX * hf * 2) (bottom + hf)
 			archv

font-src/glyphs/letter/latin/k.ptl

@@ -71,7 +71,7 @@ glyph-block Letter-Latin-K : begin
 					dispiro
 						widths.rhs stroke
 						flat (kshRightTop - Ok) top
-						curl (kshLeft + stroke) attach [widths 0 fine]
+						curl (kshLeft + stroke) attach [widths.rhs fine]
 
 
 			set-base-anchor 'legOverlay' [mix kshLeft kshRightBot : StrokeWidthBlend 0.5 0.65] [mix attach2 0 : StrokeWidthBlend 0.5 0.7]

font-src/glyphs/letter/latin/lower-g.ptl

@@ -32,7 +32,7 @@ glyph-block Letter-Latin-Lower-G : begin
 		include : dispiro
 			g4.left.start [mix SB RightSB 0.4] gtipy [widths 0 (Stroke * CThin)]
 			g4 ([mix SB RightSB 0.0575] + Stroke * 0.85) [mix groundy gtipy 0.5] [widths.rhs (Stroke * [mix CThin 1 0.5])]
-			flat [mix SB RightSB 0.435] groundy [widths 0 Stroke]
+			flat [mix SB RightSB 0.435] groundy [widths.rhs Stroke]
 			curl [mix RightSB SB 0.435] groundy
 			archv 4
 			g4 grightx [mix (Descender + O) groundy (1.06 * SmallArchDepthA / (SmallArchDepthA + SmallArchDepthB))]
@@ -66,7 +66,7 @@ glyph-block Letter-Latin-Lower-G : begin
 		include : dispiro
 			g4.left.start [mix SB RightSB 0.4] gtipy [widths 0 (Stroke * CThin)]
 			g4 ([mix SB RightSB 0.0575] + Stroke * 0.85) [mix groundy gtipy 0.5] [widths.rhs (Stroke * [mix CThin 1 0.5])]
-			flat [mix SB RightSB 0.435] groundy [widths 0 Stroke]
+			flat [mix SB RightSB 0.435] groundy [widths.rhs Stroke]
 			curl [mix RightSB SB 0.435] groundy
 			archv 4
 			g4 grightx [mix (Descender + O) groundy (1.06 * SmallArchDepthA / (SmallArchDepthA + SmallArchDepthB))]

font-src/glyphs/letter/latin/o.ptl

@@ -110,14 +110,14 @@ glyph-block Letter-Latin-O : begin
 		local fine : 0.5 * OverlayStroke
 		include [refer-glyph 'O'] AS_BASE
 		include : dispiro
-			flat (SB + O + fine) [mix CAP 0 1.05] [widths fine fine]
+			flat (SB + O + fine) [mix CAP 0 1.05] [widths.center : 2 * fine]
 			curl (RightSB - O - fine) [mix 0 CAP 1.05]
 
 	create-glyph 'oSlash' 0xF8 : glyph-proc
 		local fine : 0.5 * OverlayStroke
 		include [refer-glyph 'o'] AS_BASE
 		include : dispiro
-			flat (SB + O + fine) [mix XH 0 1.05] [widths fine fine]
+			flat (SB + O + fine) [mix XH 0 1.05] [widths.center : 2 * fine]
 			curl (RightSB - O - fine) [mix 0 XH 1.05]
 
 	create-glyph 'oSlashSideways' 0x1D13 : glyph-proc
@@ -126,7 +126,7 @@ glyph-block Letter-Latin-O : begin
 			local fine : 0.5 * OverlayStroke
 			include : OShape (Width - SB / 2) (SB / 2) (XH * 0.1) (XH * 0.9) nothing nothing nothing
 			include : dispiro
-				flat (SB + O + fine) [mix Width 0 1.05] [widths fine fine]
+				flat (SB + O + fine) [mix Width 0 1.05] [widths.center : 2 * fine]
 				curl (XH - SB - O - fine) [mix 0 Width 1.05]
 
 	create-glyph 'Obar' 0x19F : glyph-proc

font-src/glyphs/letter/latin/s.ptl

@@ -67,7 +67,7 @@ glyph-block Letter-Latin-S : begin
 
 			g4   SB (top - archDepth)
 			alsoThru.g2 0.5 0.5 [widths.center ess]
-			g4   (RightSB - SOBot) (bot + archDepth) [widths 0 stroke]
+			g4   (RightSB - SOBot) (bot + archDepth) [widths.rhs stroke]
 
 			match sb
 				[Just SLAB-CLASSICAL] : SerifedArcEnd.RtlRhs SB Middle bot stroke Hook
@@ -93,7 +93,7 @@ glyph-block Letter-Latin-S : begin
 					hookstart (CAP - O) (sw -- stroke) (swItalicAdj -- Stroke)
 			g4   RightSB (CAP - archDepth)
 			alsoThru.g2 0.5 0.5 [widths.center ess]
-			g4   (SB + SOBot) archDepth [widths stroke 0]
+			g4   (SB + SOBot) archDepth [widths.lhs stroke]
 			match sb
 				[Just SLAB-CLASSICAL] : SerifedArcEnd.LtrLhs RightSB Middle 0 stroke Hook
 				[Just SLAB-INWARD] : list
@@ -121,7 +121,7 @@ glyph-block Letter-Latin-S : begin
 
 			g4   (SB - OX) (XH - archDepth)
 			alsoThru.g2 0.5 0.5 [widths.center ess]
-			g4   (RightSB + OX - SOBot) (archDepth) [widths 0 stroke]
+			g4   (RightSB + OX - SOBot) (archDepth) [widths.rhs stroke]
 
 			match sb
 				[Just CURLY-TAIL] : list
@@ -171,9 +171,9 @@ glyph-block Letter-Latin-S : begin
 					hookstart (top - O) (sw -- stroke) (swItalicAdj -- Stroke)
 			g4   SB (top - archDepth)
 			alsoThru.g2 0.5 0.5 [widths.center ess]
-			g4   (RightSB - SOBot) (archDepth) [widths 0 stroke]
+			g4   (RightSB - SOBot) (archDepth) [widths.rhs stroke]
 			arcvh
-			flat (Middle - CorrectionOMidS) 0 [widths 0 Stroke]
+			flat (Middle - CorrectionOMidS) 0 [widths.rhs Stroke]
 			curl SB 0
 
 	define [RevSmallSStroke st sb stroke ess] : begin
@@ -190,7 +190,7 @@ glyph-block Letter-Latin-S : begin
 					hookstart (XH - O) (sw -- stroke) (swItalicAdj -- Stroke)
 			g4   (RightSB + OX) (XH - archDepth)
 			alsoThru.g2 0.5 0.5 [widths.center ess]
-			g4   (SB - OX + SOBot) (archDepth) [widths stroke 0]
+			g4   (SB - OX + SOBot) (archDepth) [widths.lhs stroke]
 			match sb
 				[Just SLAB-CLASSICAL] : SerifedArcEnd.LtrLhs RightSB Middle 0 stroke SHook
 				[Just SLAB-INWARD] : list
@@ -314,7 +314,7 @@ glyph-block Letter-Latin-S : begin
 				widths.lhs [AdviceStroke 4.5]
 				g4 start.x start.y
 				alsoThru 0.15 0.6 important
-				flat (RightSB - 1) Descender [widths sw 0]
+				flat (RightSB - 1) Descender [widths.lhs sw]
 				curl RightSB Descender
 
 		if [not doBS] : create-glyph "sSwash.\(suffix)" : glyph-proc
@@ -326,7 +326,7 @@ glyph-block Letter-Latin-S : begin
 				widths.lhs [AdviceStroke 4.5]
 				g4 start.x start.y
 				alsoThru 0.15 0.6 important
-				flat (RightSB - 1) Descender [widths sw 0]
+				flat (RightSB - 1) Descender [widths.lhs sw]
 				curl RightSB Descender
 
 		create-glyph "sCurlyTail.\(suffix)" : glyph-proc

font-src/glyphs/letter/latin/upper-l.ptl

@@ -92,7 +92,7 @@ glyph-block Letter-Latin-Upper-L : begin
 		local fine : 0.5 * OverlayStroke
 		local middle : mix Stroke top 0.5
 		return : dispiro
-			flat [mix 0 SB 0.5] (middle - LongJut * 0.4) [widths fine fine]
+			flat [mix 0 SB 0.5] (middle - LongJut * 0.4) [widths.center : 2 * fine]
 			curl (1.6 * LongJut + [mix 0 SB 0.5]) (middle + LongJut * 0.4)
 
 	derive-glyphs 'LSlash' 0x141 'L' : lambda [src gr] : glyph-proc

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

@@ -24,7 +24,7 @@ glyph-block Letter-Latin-X : begin
 			local leftx2 : _leftx + ([HSwToV hst] + [Math.max (-SideJut) sbCor]) * [if (rightx > _leftx) 1 (-1)]
 			include : dispiro
 				corner leftx2 lefty [widths.heading hst hst [if (lefty < righty) Upward Downward]]
-				corner rightx righty [widths hse hse]
+				corner rightx righty [widths.center : 2 * hse]
 
 		: else : begin
 			local height : Math.abs (lefty - righty)

font-src/glyphs/letter/shared.ptl

@@ -312,8 +312,8 @@ glyph-block Letter-Shared-Shapes : begin
 				arcvh
 				g4   (mt) (top - O) [widths.heading sw 0 {.y (-1) .x (-skew)}]
 				archv
-				flat (left + (sw - fine) * HVContrast) (top - ada) [widths fine 0]
-				curl (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths fine 0]
+				flat (left + (sw - fine) * HVContrast) (top - ada) [widths.lhs fine]
+				curl (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths.lhs fine]
 
 		export : define [rounded] : with-params [
 				[top XH] [left SB] [right RightSB] [yTerminal CAP] [sw Stroke] [fine ShoulderFine]
@@ -333,8 +333,8 @@ glyph-block Letter-Shared-Shapes : begin
 				arcvh
 				g4   (mt) (top - O) [widths.heading sw 0 {.y (-1) .x (-skew)}]
 				archv
-				flat (left + (sw - fine) * HVContrast) (top - ada + 0.01) [widths fine 0]
-				curl (left + (sw - fine) * HVContrast) (top - ada) [widths fine 0]
+				flat (left + (sw - fine) * HVContrast) (top - ada + 0.01) [widths.lhs fine]
+				curl (left + (sw - fine) * HVContrast) (top - ada) [widths.lhs fine]
 
 		export : define [toothlessTop] : with-params [
 				[top XH] [left SB] [right RightSB] [rise SHook] [sw Stroke]
@@ -345,8 +345,8 @@ glyph-block Letter-Shared-Shapes : begin
 			local mt : [mix left right 0.5] - CorrectionOMidX * sw
 			local mb : [mix left right 0.5] + (skew + kSkewShift * TanSlope) * sw
 			return : dispiro
-				flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths fine 0]
-				curl (left + (sw - fine) * HVContrast) (0 + adb) [widths fine 0]
+				flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths.lhs fine]
+				curl (left + (sw - fine) * HVContrast) (0 + adb) [widths.lhs fine]
 				arcvh
 				g4   (mb) O [widths.heading sw 0 {.y (1) .x (-skew)}]
 				archv
@@ -365,8 +365,8 @@ glyph-block Letter-Shared-Shapes : begin
 			local mt : [mix left right 0.5] - CorrectionOMidX * sw
 			local mb : [mix left right 0.5] + (skew + kSkewShift * TanSlope) * sw
 			return : dispiro
-				flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths fine 0]
-				curl (left + (sw - fine) * HVContrast) (0 + adb) [widths fine 0]
+				flat (left + (sw - fine) * HVContrast) (top - ada - 0.01) [widths.lhs fine]
+				curl (left + (sw - fine) * HVContrast) (0 + adb) [widths.lhs fine]
 				arcvh
 				g4   (mb) O [widths.heading sw 0 {.y (1) .x (-skew)}]
 				archv

font-src/glyphs/marks/above.ptl

@@ -144,8 +144,8 @@ glyph-block Mark-Above : begin
 		set-width 0
 		include : StdAnchors.medium
 		include : dispiro
-			flat (markMiddle + markStress) aboveMarkBot [widths markFine markFine]
-			curl (markMiddle - 0.875 * markExtend) aboveMarkTop [widths markStress markStress]
+			flat (markMiddle + markStress) aboveMarkBot [widths.center : 2 * markFine]
+			curl (markMiddle - 0.875 * markExtend) aboveMarkTop [widths.center : 2 * markStress]
 
 	create-glyph 'asciiGrave/body/straight' : glyph-proc
 		local df : DivFrame para.diversityF
@@ -158,8 +158,8 @@ glyph-block Mark-Above : begin
 		set-width 0
 		include : StdAnchors.medium
 		include : dispiro
-			flat (markMiddle - markStress) aboveMarkBot [widths markFine markFine]
-			curl (markMiddle + 0.875 * markExtend) aboveMarkTop [widths markStress markStress]
+			flat (markMiddle - markStress) aboveMarkBot [widths.center : 2 * markFine]
+			curl (markMiddle + 0.875 * markExtend) aboveMarkTop [widths.center : 2 * markStress]
 
 	create-glyph 'latin1acute' 0xB4 : glyph-proc
 		local df : DivFrame para.diversityF
@@ -466,21 +466,21 @@ glyph-block Mark-Above : begin
 		local rightEnd (markMiddle + markExtend * 1.5)
 
 		include : dispiro
-			flat leftEnd aboveMarkMid [widths markHalfStroke markHalfStroke]
+			flat leftEnd aboveMarkMid [widths.center : 2 * markHalfStroke]
 			curl rightEnd aboveMarkMid
 
 	create-glyph 'overlineAbove' 0x305 : glyph-proc
 		set-width 0
 		include : StdAnchors.impl 'above' 0 2
 		include : dispiro
-			flat (0 - Width) aboveMarkMid [widths markHalfStroke markHalfStroke]
+			flat (0 - Width) aboveMarkMid [widths.center : 2 * markHalfStroke]
 			curl 0           aboveMarkMid
 
 	create-glyph 'sbRsbOverlineAbove' : glyph-proc
 		set-width 0
 		include : StdAnchors.impl 'above' 0 1.5
 		include : dispiro
-			flat (SB - Width)      aboveMarkMid [widths markHalfStroke markHalfStroke]
+			flat (SB - Width)      aboveMarkMid [widths.center : 2 * markHalfStroke]
 			curl (RightSB - Width) aboveMarkMid
 
 	create-glyph 'dblOverlineAbove' 0x33F : glyph-proc
@@ -552,11 +552,11 @@ glyph-block Mark-Above : begin
 		local m1 : markMiddle - markExtend * 0.85
 		local m2 : markMiddle + markExtend * 0.85
 		include : dispiro
-			flat (m1 + markStress) aboveMarkBot [widths markFine markFine]
-			curl (m1 - markExtend) aboveMarkTop [widths markStress markStress]
+			flat (m1 + markStress) aboveMarkBot [widths.center : 2 * markFine]
+			curl (m1 - markExtend) aboveMarkTop [widths.center : 2 * markStress]
 		include : dispiro
-			flat (m2 + markStress) aboveMarkBot [widths markFine markFine]
-			curl (m2 - markExtend) aboveMarkTop [widths markStress markStress]
+			flat (m2 + markStress) aboveMarkBot [widths.center : 2 * markFine]
+			curl (m2 - markExtend) aboveMarkTop [widths.center : 2 * markStress]
 
 	create-glyph 'doubleAcuteAbove' 0x30B : glyph-proc
 		set-width 0
@@ -565,11 +565,11 @@ glyph-block Mark-Above : begin
 		local m1 : markMiddle - markExtend * 0.85
 		local m2 : markMiddle + markExtend * 0.85
 		include : dispiro
-			flat (m1 - markStress) aboveMarkBot [widths markFine markFine]
-			curl (m1 + markExtend) aboveMarkTop [widths markStress markStress]
+			flat (m1 - markStress) aboveMarkBot [widths.center : 2 * markFine]
+			curl (m1 + markExtend) aboveMarkTop [widths.center : 2 * markStress]
 		include : dispiro
-			flat (m2 - markStress) aboveMarkBot [widths markFine markFine]
-			curl (m2 + markExtend) aboveMarkTop [widths markStress markStress]
+			flat (m2 - markStress) aboveMarkBot [widths.center : 2 * markFine]
+			curl (m2 + markExtend) aboveMarkTop [widths.center : 2 * markStress]
 
 	create-glyph 'tripleAcuteAbove' 0x1ACB : glyph-proc
 		set-width 0
@@ -582,14 +582,14 @@ glyph-block Mark-Above : begin
 		local m2   markMiddle
 		local m3 : markMiddle + markExtend * 1.275
 		include : dispiro
-			flat (m1 - markStress) aboveMarkBot [widths fine fine]
-			curl (m1 + markExtend) aboveMarkTop [widths stress stress]
+			flat (m1 - markStress) aboveMarkBot [widths.center : 2 * fine]
+			curl (m1 + markExtend) aboveMarkTop [widths.center : 2 * stress]
 		include : dispiro
-			flat (m2 - markStress) aboveMarkBot [widths fine fine]
-			curl (m2 + markExtend) aboveMarkTop [widths stress stress]
+			flat (m2 - markStress) aboveMarkBot [widths.center : 2 * fine]
+			curl (m2 + markExtend) aboveMarkTop [widths.center : 2 * stress]
 		include : dispiro
-			flat (m3 - markStress) aboveMarkBot [widths fine fine]
-			curl (m3 + markExtend) aboveMarkTop [widths stress stress]
+			flat (m3 - markStress) aboveMarkBot [widths.center : 2 * fine]
+			curl (m3 + markExtend) aboveMarkTop [widths.center : 2 * stress]
 
 	create-glyph 'commaAbove.round' : glyph-proc
 		set-width 0
@@ -752,8 +752,8 @@ glyph-block Mark-Above : begin
 		include : StdAnchors.medium
 
 		include : dispiro
-			flat (markMiddle + markStress) (aboveMarkBot - markFine * 0.5) [widths markFine markFine]
-			curl (markMiddle - markExtend * 0.5) (aboveMarkTop + markStress * 0.25) [widths markStress markStress]
+			flat (markMiddle + markStress) (aboveMarkBot - markFine * 0.5) [widths.center : 2 * markFine]
+			curl (markMiddle - markExtend * 0.5) (aboveMarkTop + markStress * 0.25) [widths.center : 2 * markStress]
 
 	create-glyph 'variaGrekUpperTonos' : glyph-proc
 		set-width 0
@@ -765,8 +765,8 @@ glyph-block Mark-Above : begin
 		include : StdAnchors.medium
 
 		include : dispiro
-			flat (markMiddle - markStress) (aboveMarkBot - markFine * 0.5) [widths markFine markFine]
-			curl (markMiddle + markExtend * 0.5) (aboveMarkTop + markStress * 0.25) [widths markStress markStress]
+			flat (markMiddle - markStress) (aboveMarkBot - markFine * 0.5) [widths.center : 2 * markFine]
+			curl (markMiddle + markExtend * 0.5) (aboveMarkTop + markStress * 0.25) [widths.center : 2 * markStress]
 
 	create-glyph 'oxiaGrekUpperTonos' : glyph-proc
 		set-width 0
@@ -810,10 +810,10 @@ glyph-block Mark-Above : begin
 		include : StdAnchors.mediumWide
 
 		include : dispiro
-			flat (markMiddle - markExtend) aboveMarkTop [widths markFine markFine]
+			flat (markMiddle - markExtend) aboveMarkTop [widths.center : 2 * markFine]
 			curl (markMiddle + markExtend) aboveMarkBot
 		include : dispiro
-			flat (markMiddle - markExtend) aboveMarkBot [widths markFine markFine]
+			flat (markMiddle - markExtend) aboveMarkBot [widths.center : 2 * markFine]
 			curl (markMiddle + markExtend) aboveMarkTop
 
 	create-glyph 'lessAbove' 0x1DFE : glyph-proc

font-src/glyphs/marks/overlay.ptl

@@ -189,7 +189,7 @@ glyph-block Mark-Overlay : begin
 		local fine : 0.375 * OverlayStroke
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (SB - O * 3 + fine - Width) (XH * (-0.1)) [widths fine fine]
+			flat (SB - O * 3 + fine - Width) (XH * (-0.1)) [widths.center : 2 * fine]
 			curl (RightSB + O * 3 - fine - Width) (XH * 1.1)
 
 	create-glyph 'longSlash' 0x338 : glyph-proc
@@ -197,7 +197,7 @@ glyph-block Mark-Overlay : begin
 		local fine : 0.375 * OverlayStroke
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (SB - O * 3 + fine - Width) (XH * 0.5 - CAP * 0.6) [widths fine fine]
+			flat (SB - O * 3 + fine - Width) (XH * 0.5 - CAP * 0.6) [widths.center : 2 * fine]
 			curl (RightSB + O * 3 - fine - Width) (XH * 0.5 + CAP * 0.6)
 
 	create-glyph 'wideSlash' : glyph-proc
@@ -205,7 +205,7 @@ glyph-block Mark-Overlay : begin
 		local fine : 0.375 * OverlayStroke
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (SB + O * 3 + fine - Width) (XH * (-0.1)) [widths fine fine]
+			flat (SB + O * 3 + fine - Width) (XH * (-0.1)) [widths.center : 2 * fine]
 			curl (RightSB - O * 3 - fine - Width) (XH * 1.1)
 
 	# Arrow overlays
@@ -216,7 +216,7 @@ glyph-block Mark-Overlay : begin
 		local dy : Width * 0.4
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (Middle - dx - Width) (XH / 2 - dy) [widths fine fine]
+			flat (Middle - dx - Width) (XH / 2 - dy) [widths.center : 2 * fine]
 			curl (Middle + dx - Width) (XH / 2 + dy)
 
 	create-glyph 'arrVStrokeOver' : glyph-proc
@@ -226,7 +226,7 @@ glyph-block Mark-Overlay : begin
 		local dy : Width * 0.3
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (Middle - dx - Width) (XH / 2 - dy) [widths fine fine]
+			flat (Middle - dx - Width) (XH / 2 - dy) [widths.center : 2 * fine]
 			curl (Middle + dx - Width) (XH / 2 + dy)
 
 	create-glyph 'arrDblVStrokeOver' : glyph-proc
@@ -237,10 +237,10 @@ glyph-block Mark-Overlay : begin
 		local gap : Math.max (fine * 2) (Width / 10)
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (Middle - dx - Width - gap) (XH / 2 - dy) [widths fine fine]
+			flat (Middle - dx - Width - gap) (XH / 2 - dy) [widths.center : 2 * fine]
 			curl (Middle + dx - Width - gap) (XH / 2 + dy)
 		include : dispiro
-			flat (Middle - dx - Width + gap) (XH / 2 - dy) [widths fine fine]
+			flat (Middle - dx - Width + gap) (XH / 2 - dy) [widths.center : 2 * fine]
 			curl (Middle + dx - Width + gap) (XH / 2 + dy)
 
 	create-glyph 'arrHStrokeOver' : glyph-proc
@@ -249,7 +249,7 @@ glyph-block Mark-Overlay : begin
 		local dx : Width * 0.3
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (Middle - Width - dx) (XH / 2) [widths fine fine]
+			flat (Middle - Width - dx) (XH / 2) [widths.center : 2 * fine]
 			curl (Middle - Width + dx) (XH / 2)
 
 	create-glyph 'arrDblHStrokeOver' : glyph-proc
@@ -259,10 +259,10 @@ glyph-block Mark-Overlay : begin
 		local gap : Math.max (fine * 2) (Width / 10)
 		set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
 		include : dispiro
-			flat (Middle - Width - dx) (XH / 2 - gap) [widths fine fine]
+			flat (Middle - Width - dx) (XH / 2 - gap) [widths.center : 2 * fine]
 			curl (Middle - Width + dx) (XH / 2 - gap)
 		include : dispiro
-			flat (Middle - Width - dx) (XH / 2 + gap) [widths fine fine]
+			flat (Middle - Width - dx) (XH / 2 + gap) [widths.center : 2 * fine]
 			curl (Middle - Width + dx) (XH / 2 + gap)
 
 	define [ArrowRingOverlay kr c] :  glyph-proc

font-src/glyphs/number/1.ptl

@@ -17,7 +17,7 @@ glyph-block Digits-One : begin
 			define topSW : AdviceStroke 3.5
 			include : VBar.m (Middle + balance) 0 top
 			include : dispiro
-				flat (Middle - [HSwToV HalfStroke] + balance) top [widths topSW 0]
+				flat (Middle - [HSwToV HalfStroke] + balance) top [widths.lhs topSW]
 				curl (Middle - Stroke / 8 * HVContrast - HookX * 1.25 + balance) (top - Stroke / 8 - Hook * pTopSerif * (top / CAP))
 
 		export : define [FlatSerifed top balance pTopSerif] : glyph-proc

font-src/glyphs/symbol/punctuation/asterisk.ptl

@@ -33,8 +33,8 @@ glyph-block Symbol-Punctuation-Asterisk : begin
 				local s : Math.sin ((2 * j / sides + rot) * Math.PI)
 				local c : Math.cos ((2 * j / sides + rot) * Math.PI)
 				include : dispiro
-					flat Middle SymbolMid [widths fine fine]
-					curl (Middle + radius * s) (SymbolMid + radius * c) [widths final final]
+					flat Middle SymbolMid [widths.center : 2 * fine]
+					curl (Middle + radius * s) (SymbolMid + radius * c) [widths.center : 2 * final]
 
 		if high : create-glyph (name + '.' + high) : composite-proc
 			refer-glyph (name + '.' + sMid)

font-src/glyphs/symbol/punctuation/at.ptl

@@ -41,9 +41,9 @@ glyph-block Symbol-Punctuation-At : begin
 				flat RightSB (obot + ada)
 				curl RightSB (top - ArchDepthB)
 				arcvh
-				g4   [ArchXAdjust.top Middle sw] (top - O) [widths Stroke 0]
+				g4   [ArchXAdjust.top Middle sw] (top - O) [widths.lhs Stroke]
 				archv
-				flat SB (top - ArchDepthA) [widths sw 0]
+				flat SB (top - ArchDepthA) [widths.lhs sw]
 				curl SB (bot + ArchDepthB)
 				arcvh
 				flat [ArchXAdjust.bot Middle sw] (bot + O) [widths Stroke 0 ]
@@ -94,9 +94,9 @@ glyph-block Symbol-Punctuation-At : begin
 				flat df.rightSB (obot + [Math.max adaInner (sw * 1.5)])
 				curl df.rightSB (top - adb)
 				arcvh
-				g4   [ArchXAdjust.top df.middle sw] (top - O) [widths swh 0]
+				g4   [ArchXAdjust.top df.middle sw] (top - O) [widths.lhs swh]
 				archv
-				flat df.leftSB (top - ada) [widths sw 0]
+				flat df.leftSB (top - ada) [widths.lhs sw]
 				curl df.leftSB (bot + adb)
 				arcvh
 				flat [ArchXAdjust.bot df.middle sw] (bot + O) [widths swh 0 ]

font-src/glyphs/symbol/punctuation/brackets.ptl

@@ -300,7 +300,7 @@ glyph-block Symbol-Punctuation-Brackets : begin
 				curl (xIns - flatLengthIn) (top - hs) [heading Leftward]
 				archv.superness (2.2 + pFlatIn)
 				g4.down.mid m1 (top - radius1) [heading Downward]
-				alsoThru 0.5 0.5 [widths (ess / 2) (ess / 2)]
+				alsoThru 0.5 0.5 [widths.center ess]
 				g4.down.mid m2 (SymbolMid + radius2) [widths.center.heading sw Downward]
 				arcvh
 				flat (xOus + flatLengthOut) (SymbolMid + (sw - fine) / 2) [widths.center.heading fine Leftward]
@@ -311,7 +311,7 @@ glyph-block Symbol-Punctuation-Brackets : begin
 				curl (xIns - flatLengthIn) (bot + hs) [heading Leftward]
 				archv.superness (2.2 + pFlatIn)
 				g4.up.mid m1 (bot + radius1) [heading Upward]
-				alsoThru 0.5 0.5 [widths (ess / 2) (ess / 2)]
+				alsoThru 0.5 0.5 [widths.center ess]
 				g4.up.mid m2 (SymbolMid - radius2) [widths.center.heading sw Upward]
 				arcvh
 				flat (xOus + flatLengthOut) (SymbolMid - (sw - fine) / 2) [widths.center.heading fine Leftward]

font-src/glyphs/symbol/punctuation/section.ptl

@@ -20,7 +20,7 @@ glyph-block Symbol-Punctuation-ParagraphAndSection : begin
 				g4 (RightSB - offset) (top - Hook)
 				hookstart (top - offset)
 				g4 (SB + offset) (top - ada)
-				alsoThru 0.5 0.5 [widths HalfStroke HalfStroke]
+				alsoThru 0.5 0.5 [widths.center : 2 * HalfStroke]
 				g4 (RightSB - offset) (sBot + ada) [widths.rhs]
 				arcvh
 				flat (Middle + CorrectionOMidS) (sBot + offset + O)

font-src/kits/spiro-kit.mjs

@@ -120,49 +120,72 @@ export function SetupBuilders(bindings) {
 	}
 
 	function widths(l, r) {
+		if (!isFinite(l)) throw new TypeError("NaN detected for left width");
+		if (!isFinite(r)) throw new TypeError("NaN detected for right width");
 		return function () {
-			if (!isFinite(l)) throw new TypeError("NaN detected for left width");
-			if (!isFinite(r)) throw new TypeError("NaN detected for right width");
-
 			if (this.setWidth) this.setWidth(l, r);
 		};
 	}
 	widths.lhs = function (w) {
-		return widths(fallback(w, Stroke), 0);
+		w = fallback(w, Stroke);
+		if (!isFinite(w)) throw new TypeError("NaN detected for left width");
+		return widths(w, 0);
 	};
 	widths.rhs = function (w) {
-		return widths(0, fallback(w, Stroke));
+		w = fallback(w, Stroke);
+		if (!isFinite(w)) throw new TypeError("NaN detected for left width");
+		return widths(0, w);
 	};
 	widths.center = function (w) {
-		return widths(fallback(w, Stroke) / 2, fallback(w, Stroke) / 2);
+		w = fallback(w, Stroke);
+		if (!isFinite(w)) throw new TypeError("NaN detected for left width");
+		return widths(w / 2, w / 2);
 	};
 
 	function heading(d) {
+		if (!isFinite(d.x) || !isFinite(d.y))
+			throw new TypeError("NaN detected for heading directions");
 		return function () {
 			if (this.headsTo) this.headsTo(d);
 		};
 	}
 	widths.heading = function (l, r, d) {
+		if (!isFinite(l)) throw new TypeError("NaN detected for left width");
+		if (!isFinite(r)) throw new TypeError("NaN detected for left width");
+		if (!isFinite(d.x) || !isFinite(d.y))
+			throw new TypeError("NaN detected for heading directions");
 		return function () {
 			if (this.setWidth) this.setWidth(l, r);
 			if (this.headsTo) this.headsTo(d);
 		};
 	};
 	widths.lhs.heading = function (w, d) {
+		w = fallback(w, Stroke);
+		if (!isFinite(w)) throw new TypeError("NaN detected for left width");
+		if (!isFinite(d.x) || !isFinite(d.y))
+			throw new TypeError("NaN detected for heading directions");
 		return function () {
-			if (this.setWidth) this.setWidth(fallback(w, Stroke), 0);
+			if (this.setWidth) this.setWidth(w, 0);
 			if (this.headsTo) this.headsTo(d);
 		};
 	};
 	widths.rhs.heading = function (w, d) {
+		w = fallback(w, Stroke);
+		if (!isFinite(w)) throw new TypeError("NaN detected for left width");
+		if (!isFinite(d.x) || !isFinite(d.y))
+			throw new TypeError("NaN detected for heading directions");
 		return function () {
-			if (this.setWidth) this.setWidth(0, fallback(w, Stroke));
+			if (this.setWidth) this.setWidth(0, w);
 			if (this.headsTo) this.headsTo(d);
 		};
 	};
 	widths.center.heading = function (w, d) {
+		w = fallback(w, Stroke);
+		if (!isFinite(w)) throw new TypeError("NaN detected for left width");
+		if (!isFinite(d.x) || !isFinite(d.y))
+			throw new TypeError("NaN detected for heading directions");
 		return function () {
-			if (this.setWidth) this.setWidth(fallback(w, Stroke) / 2, fallback(w, Stroke) / 2);
+			if (this.setWidth) this.setWidth(w / 2, w / 2);
 			if (this.headsTo) this.headsTo(d);
 		};
 	};