Cleanup of #2710 .

This commit is contained in:
John McWilliams 2025-03-18 08:09:56 -04:00
parent 87849ca75e
commit 2f36e60b0d
4 changed files with 37 additions and 17 deletions

View file

@ -139,10 +139,10 @@ glyph-block Letter-Latin-W : begin
define [WSerifs df top bodyType slabType dim] : glyph-proc
local oSlabPos : match bodyType
[Just FORM-CURLY] : O * 2
[Just FORM-VERTICAL] : O * 2
[Just FORM-CYRL-OMEGA] : O * 2
__ 0
[Just FORM-CURLY] 0
[Just FORM-VERTICAL] 0
[Just FORM-CYRL-OMEGA] 0
__ : O * 2
local sf : SerifFrame top 0 df.leftSB df.rightSB (hSplit -- 3)
local sfm : SerifFrame top 0 (df.leftSB + oSlabPos) (df.rightSB - oSlabPos) (hSplit -- 3)
@ -204,7 +204,7 @@ glyph-block Letter-Latin-W : begin
include : tagged 'strokeUp1' : difference
dispiro
flat (dim.xRight1 - shiftT) dim.wMidHeight [widths.center.heading dim.fineInnerCrTop Downward]
curl (dim.xBot1 + shiftB) 0 [widths.center.heading dim.fineOuterCr Downward]
curl (dim.xBot1 + shiftB) 0 [widths.center.heading dim.fineOuterCr Downward]
match bodyType
[Just FORM-CYRL-OMEGA] : spiro-outline
corner df.width (dim.wMidHeight + 1)
@ -226,10 +226,10 @@ glyph-block Letter-Latin-W : begin
flat (dim.xLeft2 - [HSwToV : 0.5 * dim.strokeOuter]) dim.wMidHeight [widths.lhs.heading dim.strokeOuter Downward]
curl (dim.xLeft2 - [HSwToV : 0.5 * dim.strokeOuter]) (dim.wMidHeight * (1 - dim.curlyStraightSegLength)) [heading Downward]
quadControls 0 0.3 6 unimportant
g4 (dim.xBot2 - shiftB) 0 [widths.center.heading dim.fineOuterCr Downward]
g4 (dim.xBot2 - shiftB) 0 [widths.center.heading dim.fineOuterCr Downward]
_ : dispiro
flat (dim.xLeft2 + shiftT) dim.wMidHeight [widths.center.heading dim.fineInnerCrTop Downward]
curl (dim.xBot2 - shiftB) 0 [widths.center.heading dim.fineOuterCr Downward]
curl (dim.xBot2 - shiftB) 0 [widths.center.heading dim.fineOuterCr Downward]
if (dim.wMidHeightExt > dim.wMidHeight) : include : tagged 'strokeExtension' : VBar.m df.middle dim.wMidHeight dim.wMidHeightExt (dim.fineInnerCrTop + [VSwToH : shiftT * 2])
@ -333,7 +333,7 @@ glyph-block Letter-Latin-W : begin
include : dispiro
widths.rhs fine
flat (df.width - x1) (top - TailY - 0.5 * fine - O) [heading Downward]
curl (df.width - x1) y3 [heading Downward]
curl (df.width - x1) y3 [heading Downward]
arch.rhs 0 (sw -- fine) (swAfter -- mfine)
flat (df.middle - [HSwToV : mfine - fine / 2]) y3 [widths.heading 0 mfine Upward]
curl (df.middle - [HSwToV : mfine - fine / 2]) y4 [heading Upward]
@ -368,7 +368,8 @@ glyph-block Letter-Latin-W : begin
roundedVerticalSides { WRounded WHookTopRounded FORM-CURLY MIDH-OTHER para.advanceScaleMM para.advanceScaleM }
roundedVerticalSidesFlatTop { WRounded WHookTopRounded FORM-CURLY MIDH-TOP para.advanceScaleMM para.advanceScaleM }
curly { WShapeImpl WHooktopShape FORM-CURLY MIDH-OTHER para.advanceScaleM para.advanceScaleM }
curlyFlatTop { WShapeImpl WHooktopShape FORM-CURLY MIDH-TOP para.advanceScaleM para.advanceScaleM }
curlyAlmostFlatTop { WShapeImpl WHooktopShape FORM-CURLY MIDH-ALMOST-TOP para.advanceScaleMM para.advanceScaleM }
curlyFlatTop { WShapeImpl WHooktopShape FORM-CURLY MIDH-TOP para.advanceScaleMM para.advanceScaleM }
cursive { WCursiveImpl WHookTopCursive FORM-CURSIVE MIDH-OTHER para.advanceScaleM para.advanceScaleM }
cyrlOmega { WShapeImpl WHooktopShape FORM-CYRL-OMEGA MIDH-OTHER para.advanceScaleMM para.advanceScaleM }