mikeslab/Iosevka
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Cleanup of #2294 . (#2295)

Browse source 
* Schwa & Rev-e italic tail refinement.

* Use `InwardSlabArcEnd`.

* fix heavy.

* Cleanup.

* minor fixup.

* Drop unneeded variant selection entries in `variants.toml`.

* Sync `RevSmallEShape` metrics with `SmallEShape`.

* Hopefully a final fixup
This commit is contained in:
John McWilliams 2024-04-15 20:46:50 -04:00 • committed by GitHub
parent c8b9e608a3
commit c65f9659bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

38
packages/font-glyphs/src/letter/latin/lower-e.ptl
View file

@ -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
@ -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
@ -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
@ -89,7 +89,7 @@ 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]
arcvh
@ -116,7 +116,7 @@ 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]
arcvh
@ -125,7 +125,7 @@ glyph-block Letter-Latin-Lower-E : begin
flat (df.rightSB - OX) (top - [df.archDepthB 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]
@ -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')
@ -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')

4
params/variants.toml
View file

@ -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"