Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions packages/font-glyphs/src/letter/latin/lower-e.ptl
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,23 @@ glyph-block Letter-Latin-Lower-E : begin
define SLAB-CLASSICAL 1
define SLAB-INWARD 2

define [SmallESerifedTerminalShape df top stroke hook tailSlab isStart] : match tailSlab
[Just SLAB-CLASSICAL] : SerifedArcEnd.LtrLhs df.rightSB 0 stroke hook
[Just SLAB-INWARD] : InwardSlabArcEnd.LtrLhs df.rightSB 0 stroke hook
__ : list
hookend 0 (sw -- stroke) (suppressSwash -- isStart)
g4 (df.rightSB - [if (!isStart && para.isItalic && (para.slopeAngle > 0)) 0 0.5] * OX) [SmallEHook top stroke hook (!isStart && para.isItalic && (para.slopeAngle > 0))]

define [RevSmallESerifedTerminalShape df top stroke hook tailSlab isStart] : match tailSlab
[Just SLAB-CLASSICAL] : SerifedArcEnd.RtlRhs df.leftSB 0 stroke hook
[Just SLAB-INWARD] : InwardSlabArcEnd.RtlRhs df.leftSB 0 stroke hook
__ : list
hookend 0 (sw -- stroke) (suppressSwash -- isStart)
g4 (df.leftSB + [if (!isStart && para.isItalic && (para.slopeAngle < 0)) 0 0.5] * OX) [SmallEHook top stroke hook (!isStart && para.isItalic && (para.slopeAngle < 0))]
define [SmallESerifedTerminalShape df top stroke hook tailSlab isStart] : begin
local doSwash : !isStart && para.isItalic && (para.slopeAngle > 0)
return : match tailSlab
[Just SLAB-CLASSICAL] : SerifedArcEnd.LtrLhs df.rightSB 0 stroke hook
[Just SLAB-INWARD] : InwardSlabArcEnd.LtrLhs df.rightSB 0 stroke hook
__ : list
hookend 0 (sw -- stroke) (suppressSwash -- isStart)
g4 (df.rightSB - [if doSwash 0 0.5] * OX) [SmallEHook top stroke hook doSwash]

define [RevSmallESerifedTerminalShape df top stroke hook tailSlab isStart] : begin
local doSwash : !isStart && para.isItalic && (para.slopeAngle < 0)
return : match tailSlab
[Just SLAB-CLASSICAL] : SerifedArcEnd.RtlRhs df.leftSB 0 stroke hook
[Just SLAB-INWARD] : InwardSlabArcEnd.RtlRhs df.leftSB 0 stroke hook
__ : list
hookend 0 (sw -- stroke) (suppressSwash -- isStart)
g4 (df.leftSB + [if doSwash 0 0.5] * OX) [SmallEHook top stroke hook doSwash]

define [SmallETerminalSerif df top stroke hook tailSlab isStart] : match tailSlab
[Just SLAB-CLASSICAL] : ArcEndSerif.R df.rightSB 0 stroke hook
Expand Down Expand Up @@ -128,10 +132,10 @@ glyph-block Letter-Latin-Lower-E : begin
local adb2 : ArchDepthBOf : (1 - DesignParameters.eBarPos) * SmallArchDepth
local path : include : dispiro
widths.lhs stroke
[if para.isItalic g2 flat] xStart yBarBottom
virt [mix xStart df.rightSB (0.475 + 0.1 * TanSlope)] yBarBottom
[if para.isItalic g2 flat] xStart yBarBottom
[if para.isItalic virt curl] [mix xStart df.rightSB (0.475 + 0.1 * TanSlope)] yBarBottom [if para.isItalic null [heading Rightward]]
archv
g4 (df.rightSB - OX - 0.5 * extraCurliness) [YSmoothMidR top yBarBottom ada2 adb2]
g4 ((df.rightSB - OX) - 0.5 * (df.width / HalfUPM) * extraCurliness) [YSmoothMidR top yBarBottom ada2 adb2]
arch.lhs top (sw -- stroke)
flatside.ld df.leftSB 0 top ada adb
SmallESerifedTerminalShape df top stroke hook tailSlab cw
Expand Down Expand Up @@ -163,9 +167,9 @@ glyph-block Letter-Latin-Lower-E : begin
local adb2 : ArchDepthBOf : (1 - DesignParameters.eBarPos) * SmallArchDepth
include : dispiro
widths.rhs stroke
[if para.isItalic g2 flat] xStart (yBarBottom + (2/3) * extraCurliness)
[if para.isItalic g2.left.mid curl] [mix xStart df.leftSB (0.475 - 0.1 * TanSlope)] (yBarBottom - (1/3) * extraCurliness) [if (para.isItalic && (para.slopeAngle < 0)) null [heading Leftward]]
if (para.isItalic && (para.slopeAngle < 0)) {} { [archv] }
[if para.isItalic g2 flat] xStart (yBarBottom + (2/3) * extraCurliness)
[if para.isItalic g2.left.mid curl] [mix xStart df.leftSB (0.475 - 0.1 * TanSlope)] (yBarBottom - (1/3) * extraCurliness) [heading Leftward]
archv
g4 (df.leftSB + OX) [YSmoothMidL top yBarBottom ada2 adb2]
arch.rhs top (sw -- stroke)
flatside.rd df.rightSB 0 top ada adb
Expand Down