Cleanup
This commit is contained in:
parent
35b33dec28
commit
625cf4b157
2 changed files with 20 additions and 37 deletions
|
@ -41,8 +41,7 @@ glyph-block Letter-Latin-Ezh : begin
|
|||
define [CurisveStart top bot ezhLeft ezhRight yMidBar] : glyph-proc
|
||||
define hookTerminalWidth : AdviceStroke 3.5
|
||||
define xDiagWidth : 1 * Stroke
|
||||
define yFootHeight : Math.max (0.15 * (top - bot)) (Stroke * 0.625)
|
||||
define kFoot : 1 + 0.5 * Stroke / yFootHeight
|
||||
define yFootHeight : [Math.max (0.15 * (top - bot)) (Stroke * 0.625)] + 0.4 * Stroke
|
||||
define yHookDepth : Hook + Stroke * 0.25
|
||||
define yHookStraightDepth : Math.min (yHookDepth - Stroke * 1.1) (yHookDepth / 3 - Stroke / 4)
|
||||
define xHookDepth : Math.max (0.25 * (RightSB - SB)) (hookTerminalWidth * 1.5)
|
||||
|
@ -56,7 +55,7 @@ glyph-block Letter-Latin-Ezh : begin
|
|||
corner (-Width) bot
|
||||
corner (-Width) (2 * top)
|
||||
corner (ezhRight - xDiagWidth) (2 * top)
|
||||
corner (ezhRight - xDiagWidth) (top - kFoot * yFootHeight)
|
||||
corner (ezhRight - xDiagWidth) (top - yFootHeight)
|
||||
corner (ezhLeft + xDiagWidth) yMidBar
|
||||
corner (ezhLeft + xDiagWidth) bot
|
||||
dispiro
|
||||
|
@ -67,10 +66,10 @@ glyph-block Letter-Latin-Ezh : begin
|
|||
flat [mix (SB + xMockTailDepth) ezhRight kTop] (top - kTop * yTailDepth)
|
||||
curl [mix (SB + xMockTailDepth) ezhRight 4] (top - 4 * yTailDepth)
|
||||
|
||||
include : VBar.r ezhRight top (top - kFoot * yFootHeight) (xDiagWidth / HVContrast)
|
||||
include : VBar.r ezhRight top (top - yFootHeight) (xDiagWidth / HVContrast)
|
||||
include : dispiro
|
||||
corner ezhRight (top - kFoot * yFootHeight) [widths.rhs (Stroke / HVContrast)]
|
||||
corner ezhLeft yMidBar [widths.lhs (Stroke / HVContrast)]
|
||||
corner ezhRight (top - yFootHeight) [widths.rhs (Stroke / HVContrast)]
|
||||
corner ezhLeft yMidBar [widths.lhs (Stroke / HVContrast)]
|
||||
|
||||
glyph-block-export EzhShape
|
||||
define flex-params [EzhShape] : glyph-proc
|
||||
|
@ -222,15 +221,12 @@ glyph-block Letter-Latin-Ezh : begin
|
|||
local yMidBar : RevEzhShape.yMidBar top bot pyBar
|
||||
local ezhRight : mix SB RightSB pRight
|
||||
local ezhLeft : mix SB RightSB pLeft
|
||||
|
||||
include : HBar.t ezhLeft RightSB top
|
||||
|
||||
include : spiro-outline
|
||||
corner ezhRight yMidBar
|
||||
corner (ezhRight - Stroke * cor) (yMidBar - HalfStroke)
|
||||
corner (ezhRight - Stroke * cor) yMidBar
|
||||
corner ezhLeft (top - Stroke)
|
||||
corner (ezhLeft + Stroke * cor) (top - Stroke)
|
||||
|
||||
include : dispiro
|
||||
corner ezhLeft (top - Stroke) [widths.lhs (Stroke / HVContrast)]
|
||||
corner ezhRight yMidBar [widths.rhs (Stroke / HVContrast)]
|
||||
|
||||
include : dispiro
|
||||
widths.lhs
|
||||
flat ezhRight yMidBar [heading Leftward]
|
||||
|
|
|
@ -54,11 +54,9 @@ glyph-block Letter-Latin-Z : begin
|
|||
define [SmallZBaseShape mode] : glyph-proc
|
||||
local cor : 1.2 * HVContrast
|
||||
include : tagged 'strokeTop' : HBar.t SB RightSB XH
|
||||
include : spiro-outline
|
||||
corner SB [if (mode === MODE-ZSWASH) 0 Stroke]
|
||||
corner (RightSB - Stroke * cor) (XH - Stroke)
|
||||
corner RightSB (XH - Stroke)
|
||||
corner (SB + Stroke * cor) [if (mode === MODE-ZSWASH) 0 Stroke]
|
||||
include : dispiro
|
||||
corner SB [if (mode === MODE-ZSWASH) 0 Stroke] [widths.rhs (Stroke / HVContrast)]
|
||||
corner RightSB (XH - Stroke) [widths.lhs (Stroke / HVContrast)]
|
||||
if [DisplayBottomStroke mode] : include : tagged 'strokeBottom' : HBar.b SB RightSB 0
|
||||
set-base-anchor "trailing" RightSB 0
|
||||
|
||||
|
@ -71,7 +69,7 @@ glyph-block Letter-Latin-Z : begin
|
|||
define [ZCursiveShapeImpl top mode] : glyph-proc
|
||||
define hookTerminalWidth : AdviceStroke 3.5
|
||||
define xDiagWidth : 1 * Stroke
|
||||
define yFootHeight : Math.max (0.15 * top) (Stroke * 0.625)
|
||||
define yFootHeight : [Math.max (0.15 * top) (Stroke * 0.625)] + 0.7 * Stroke
|
||||
define kFoot : 1 + 0.5 * Stroke / yFootHeight
|
||||
define yHookDepth : Hook + Stroke * 0.25
|
||||
define yHookStraightDepth : Math.min (yHookDepth - Stroke * 1.1) (yHookDepth / 3 - Stroke / 4)
|
||||
|
@ -96,23 +94,12 @@ glyph-block Letter-Latin-Z : begin
|
|||
flat [mix (SB + xMockTailDepth) RightSB kTop] (top - kTop * yTailDepth)
|
||||
curl RightSB (top - yTailDepth)
|
||||
|
||||
include : match mode
|
||||
[Just MODE-ZSWASH] : spiro-outline
|
||||
corner SB 0
|
||||
corner (RightSB - xDiagWidth) (top - yFootHeight)
|
||||
corner (RightSB - xDiagWidth) top
|
||||
corner RightSB top
|
||||
corner RightSB (top - kFoot * yFootHeight)
|
||||
corner (SB + xDiagWidth) 0
|
||||
__ : spiro-outline
|
||||
corner SB 0
|
||||
corner SB (kFoot * yFootHeight)
|
||||
corner (RightSB - xDiagWidth) (top - yFootHeight)
|
||||
corner (RightSB - xDiagWidth) top
|
||||
corner RightSB top
|
||||
corner RightSB (top - kFoot * yFootHeight)
|
||||
corner (SB + xDiagWidth) yFootHeight
|
||||
corner (SB + xDiagWidth) 0
|
||||
include : dispiro
|
||||
corner RightSB (top - yFootHeight) [widths.rhs (Stroke / HVContrast)]
|
||||
corner SB [if (mode == MODE-ZSWASH) 0 yFootHeight] [widths.lhs (Stroke / HVContrast)]
|
||||
|
||||
include : VBar.r RightSB top (top - yFootHeight) (xDiagWidth / HVContrast)
|
||||
if (mode != MODE-ZSWASH) : include : VBar.l SB 0 yFootHeight (xDiagWidth / HVContrast)
|
||||
|
||||
include : tagged 'strokeBottom' : match mode
|
||||
[Just MODE-RTAIL] : intersection
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue