Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup of #2294 . #2295

Merged
merged 9 commits into from
Apr 16, 2024
Merged

Cleanup of #2294 . #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b238805
Schwa & Rev-e italic tail refinement.
jmcwilliams403 Apr 14, 2024
ef22aec
Use `InwardSlabArcEnd`.
jmcwilliams403 Apr 14, 2024
f231cf7
fix heavy.
jmcwilliams403 Apr 14, 2024
1839c06
Merge branch 'dev' into schwa
jmcwilliams403 Apr 15, 2024
718b057
Cleanup.
jmcwilliams403 Apr 15, 2024
c339558
minor fixup.
jmcwilliams403 Apr 15, 2024
290a5de
Drop unneeded variant selection entries in `variants.toml`.
jmcwilliams403 Apr 15, 2024
74af5e5
Sync `RevSmallEShape` metrics with `SmallEShape`.
jmcwilliams403 Apr 15, 2024
f2eab48
Hopefully a final fixup
jmcwilliams403 Apr 15, 2024
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
54 changes: 27 additions & 27 deletions packages/font-glyphs/src/letter/latin/lower-e.ptl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ glyph-block Letter-Latin-Lower-E : begin
glyph-block-import Mark-Adjustment : ExtendBelowBaseAnchors
glyph-block-import Letter-Latin-C : CConfig

define [HookHeight top] : Math.min Hook (AHook / XH * top)
define [HookHeightFull top stroke noItalicAdj] : Math.min Hook (AHook / XH * top)

define [HookHeightTight top stroke noItalicAdj] : Math.min [HookHeight top]
define [HookHeight top stroke noItalicAdj] : Math.min [HookHeightFull top stroke noItalicAdj]
if (para.isItalic && !noItalicAdj) top (stroke / 2 + (top - stroke * 3) / 4)

define SLAB-NONE 0
Expand All @@ -27,16 +27,16 @@ glyph-block Letter-Latin-Lower-E : begin

define [SmallESerifedTerminalShape df top stroke tailSlab schwaTail] : match tailSlab
[Just SLAB-CLASSICAL] : begin
SerifedArcEnd.LtrLhs df.rightSB df.middle 0 stroke [HookHeight top]
SerifedArcEnd.LtrLhs df.rightSB df.middle 0 stroke [HookHeightFull top stroke schwaTail]
[Just SLAB-INWARD] : begin
InwardSlabArcEnd.LtrLhs df.rightSB df.middle 0 stroke [HookHeight top]
InwardSlabArcEnd.LtrLhs df.rightSB df.middle 0 stroke [HookHeightFull top stroke schwaTail]
__ : list
hookend O (sw -- stroke) (noSwash -- schwaTail)
g4 (df.rightSB - [if (para.isItalic && !schwaTail) 0 0.5] * OX) [HookHeightTight top stroke schwaTail]
g4 (df.rightSB - [if (para.isItalic && !schwaTail) 0 0.5] * OX) [HookHeight top stroke schwaTail]

define [SmallETerminalSerif df top stroke tailSlab schwaTail] : match tailSlab
[Just SLAB-CLASSICAL] : ArcEndSerif.R df.rightSB 0 stroke [HookHeight top]
[Just SLAB-INWARD] : ArcEndSerif.InwardR df.rightSB 0 stroke [HookHeight top]
[Just SLAB-CLASSICAL] : ArcEndSerif.R df.rightSB 0 stroke [HookHeightFull top stroke schwaTail]
[Just SLAB-INWARD] : ArcEndSerif.InwardR df.rightSB 0 stroke [HookHeightFull top stroke schwaTail]
__ : no-shape

glyph-block-export SmallEShape
Expand All @@ -49,10 +49,10 @@ glyph-block Letter-Latin-Lower-E : begin
flat (df.rightSB - OX) barbottom [heading Upward]
curl (df.rightSB - OX) (top - [df.archDepthB SmallArchDepth])
arcvh
g4 (df.middle - CorrectionOMidS) (top - O)
g4 (df.middle - CorrectionOMidS) (top - O)
archv
flat (df.leftSB + OX) (top - [df.archDepthA SmallArchDepth])
curl (df.leftSB + OX) (0 + [df.archDepthB SmallArchDepth])
curl (df.leftSB + OX) (0 + [df.archDepthB SmallArchDepth])
SmallESerifedTerminalShape df top stroke tailSlab schwaTail

include : SmallETerminalSerif df top stroke tailSlab schwaTail
Expand All @@ -61,20 +61,20 @@ glyph-block Letter-Latin-Lower-E : begin

glyph-block-export RevSmallEShape
define [RevSmallEShape] : with-params [df top stroke barpos] : glyph-proc
local barbottom (top * [fallback barpos DesignParameters.eBarPos] - HalfStroke)
local barbottom : top * [fallback barpos DesignParameters.eBarPos] - (stroke / 2)

include : HBar.b (df.leftSB + (stroke / 2)) (df.rightSB - (stroke / 2)) barbottom stroke
include : HBar.b (df.leftSB + (stroke / 2) + OX) (df.rightSB - (stroke / 2) - OX) barbottom stroke
include : dispiro
widths.rhs stroke
flat (df.leftSB + OX) barbottom [heading Upward]
curl (df.leftSB + OX) (top - [df.archDepthA SmallArchDepth])
arcvh
g4 df.middle (top - O)
g4 (df.middle - CorrectionOMidS) (top - O)
archv
flat (df.rightSB - OX) (top - [df.archDepthB SmallArchDepth])
curl (df.rightSB - OX) [df.archDepthA SmallArchDepth]
curl (df.rightSB - OX) (0 + [df.archDepthA SmallArchDepth])
hookend O (sw -- stroke)
g4 (df.leftSB + 0.5 * OX) [HookHeightTight top stroke true]
g4 (df.leftSB + 0.5 * OX) [HookHeight top stroke true]

glyph-block-export SmallERoundedShape
define [SmallERoundedShape] : with-params [df top stroke barpos tailSlab schwaTail] : glyph-proc
Expand All @@ -89,14 +89,14 @@ glyph-block Letter-Latin-Lower-E : begin
widths.lhs stroke
[if para.isItalic g2 flat] xStart (barbottom - pfIt * [StrokeWidthBlend 2 3] * O)
if para.isItalic [alsoThru.g2 0.5 0.8] [list]
[if para.isItalic g2 curl] [mix (xStart + pfIt * 0.25 * [HSwToV stroke]) df.rightSB pBarRight] (barbottom + pfIt * [StrokeWidthBlend 0.25 1] * O)
[if para.isItalic g2 curl] [mix (xStart + pfIt * [HSwToV : 0.25 * stroke]) df.rightSB pBarRight] (barbottom + pfIt * [StrokeWidthBlend 0.25 1] * O)
if para.isItalic {} [archv]
g4 (df.rightSB - OX) [mix barbottom top pArcRight]
g4 (df.rightSB - OX) [mix barbottom top pArcRight]
arcvh
g4 (df.middle - CorrectionOMidS) (top - O)
g4 (df.middle - CorrectionOMidS) (top - O)
archv
flat (df.leftSB + OX) (top - [df.archDepthA SmallArchDepth])
curl (df.leftSB + OX) (0 + [df.archDepthB SmallArchDepth])
curl (df.leftSB + OX) (0 + [df.archDepthB SmallArchDepth])
SmallESerifedTerminalShape df top stroke tailSlab schwaTail

include : SmallETerminalSerif df top stroke tailSlab schwaTail
Expand All @@ -116,16 +116,16 @@ glyph-block Letter-Latin-Lower-E : begin
widths.rhs stroke
[if para.isItalic g2 flat] xStart (barbottom - pfIt * [StrokeWidthBlend 2 3] * O)
if para.isItalic [alsoThru.g2 0.5 0.8] [list]
[if para.isItalic g2 curl] [mix (xStart - pfIt * 0.25 * [HSwToV stroke]) df.leftSB pBarRight] (barbottom + pfIt * [StrokeWidthBlend 0.25 1] * O)
[if para.isItalic g2 curl] [mix (xStart - pfIt * [HSwToV : 0.25 * stroke]) df.leftSB pBarRight] (barbottom + pfIt * [StrokeWidthBlend 0.25 1] * O)
if para.isItalic {} [archv]
g4 (df.leftSB + OX) [mix barbottom top pArcRight]
g4 (df.leftSB + OX) [mix barbottom top pArcRight]
arcvh
g4 (df.middle - CorrectionOMidS) (top - O)
g4 (df.middle - CorrectionOMidS) (top - O)
archv
flat (df.rightSB - OX) (top - [df.archDepthB SmallArchDepth])
curl (df.rightSB - OX) (0 + [df.archDepthA SmallArchDepth])
curl (df.rightSB - OX) (0 + [df.archDepthA SmallArchDepth])
hookend O (sw -- stroke)
g4 (df.leftSB + 0.5 * OX) [HookHeightTight top stroke true]
g4 (df.leftSB + 0.5 * OX) [HookHeight top stroke true]

define [AbkCheShape] : with-params [fDesc Body df top tailSlab] : glyph-proc
local gap : (df.width - 2 * df.leftSB - 2.5 * df.mvs) * 0.375 - [HSwToV : 0.25 * df.mvs]
Expand Down Expand Up @@ -261,8 +261,8 @@ glyph-block Letter-Latin-Lower-E : begin
set-mark-anchor 'cvDecompose' 0 0
include : AbkCheShape 1 Body abkCheDf XH (tailSlab -- styBot)

select-variant "Schwa.\(suffix)" (follow -- "CTopSerifOnly")
select-variant "schwa.\(suffix)" (follow -- "cTopSerifOnly")
select-variant "Schwa.\(suffix)" (follow -- 'CTopSerifOnly')
select-variant "schwa.\(suffix)" (follow -- 'cTopSerifOnly')
select-variant "cyrl/abk/Che.\(suffix)" (follow -- 'CBottomSerifOnly')
select-variant "cyrl/abk/che.\(suffix)" (follow -- 'cBottomSerifOnly')
select-variant "cyrl/abk/CheDescender.\(suffix)" (follow -- 'CBottomSerifOnly')
Expand All @@ -280,10 +280,10 @@ glyph-block Letter-Latin-Lower-E : begin

select-variant 'eBar' 0xAB33 (follow -- 'e')

CreateSelectorVariants "Schwa" 0x18F [Object.keys SmallEConfig]
CreateSelectorVariants 'Schwa' 0x18F [Object.keys SmallEConfig] (follow -- 'e')
alias 'cyrl/Schwa' 0x4D8 'Schwa'

CreateSelectorVariants "schwa" 0x259 [Object.keys SmallEConfig]
CreateSelectorVariants 'schwa' 0x259 [Object.keys SmallEConfig] (follow -- 'e')
alias 'cyrl/schwa' 0x4D9 'schwa'

CreateSelectorVariants 'cyrl/abk/Che' 0x4BC [Object.keys SmallEConfig] (follow -- 'e')
Expand Down
4 changes: 0 additions & 4 deletions params/variants.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1983,15 +1983,11 @@ tagKind = "letter"
rank = 1
description = "`e` with flat crossbar"
selector.e = "flatCrossbar"
selector.Schwa = "flatCrossbar"
selector.schwa = "flatCrossbar"

[prime.e.variants.rounded]
rank = 2
description = "`e` with more rounded shape"
selector.e = "rounded"
selector.Schwa = "rounded"
selector.schwa = "rounded"



Expand Down