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

Add serif variant selection for Eszet (#1881)

Browse source
This commit is contained in:
be5invis 2023-07-30 13:07:55 -07:00
parent ac12a6d85b
commit 4ed9905394
3 changed files with 112 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changes/26.0.0.md
View file

@ -1,6 +1,7 @@
* \[**Breaking**\] Add separate variant selector for lowercase Thorn (#1854).
* \[**Breaking**\] Drop `tailed-top-left-serifed` variant of `n` as it duplicates with `tailed-motion-serifed` (#1859).
* \[**Breaking**\] Disunified the variant selector for Greek Delta and Greek Lambda, and added selectable serif variants for Lambda (#1866).
* \[**Breaking**\] Add serif variant selection for Eszet (#1881).
* \[**Breaking**\] Add a separate variant selector for lowercase Greek Chi.
* Add Characters:
- COMBINING DOUBLED CIRCUMFLEX ACCENT (`U+1AB0`) (#1879).

55
font-src/glyphs/letter/latin-ext/eszet.ptl
View file

@ -8,14 +8,28 @@ glyph-module
glyph-block Letter-Latin-Lower-Eszet : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared-Shapes : FlatHookDepth PalatalHook CyrDescender
glyph-block-import Letter-Shared-Shapes : FlatHookDepth PalatalHook CyrDescender SerifFrame
glyph-block-import Letter-Latin-S : AdviceSArchDepth
define NO-TAIL 0
define DESCENDING 1
define TAILED 2
define [Traditional fFlathook slab tail] : glyph-proc
define SERIF-NONE 0
define SERIF-BOT 1
define SERIF-MID 2
define SERIF-DUAL 3
define [EszetSerifs df fTraditional slab] : begin
local sf : SerifFrame.fromDf [DivFrame 1] XH 0
local lb : if fTraditional sf.lb.full sf.lb.outer
return : match slab
[Just SERIF-BOT] : composite-proc lb
[Just SERIF-MID] : composite-proc sf.lt.outer
[Just SERIF-DUAL] : composite-proc lb sf.lt.outer
__ : no-shape
define [Traditional fFlathook] : function [slab tail] : glyph-proc
include : MarkSet.bp
local l : SB * 1
local xHook : [mix SB RightSB 0.75] + HalfStroke * HVContrast
@ -50,7 +64,7 @@ glyph-block Letter-Latin-Lower-Eszet : begin
corner tl (tm - Stroke) [heading Upward]
corner (RightSB - HalfStroke * 1.2 - OX) t [heading Upward]
if slab : include : HSerif.lb SB 0 SideJut
include : EszetSerifs [DivFrame 1] true slab
include : match tail
[Just DESCENDING] : VBar.l l Descender 0
[Just TAILED] : PalatalHook.lExt l 0
@ -84,7 +98,7 @@ glyph-block Letter-Latin-Lower-Eszet : begin
flat xMiddleBot 0 [heading Leftward]
curl xFinal 0 [heading Leftward]
if slab : include : HSerif.lb SB 0 SideJut
include : EszetSerifs [DivFrame 1] false slab
include : match tail
[Just DESCENDING] : VBar.l SB Descender 0
[Just TAILED] : PalatalHook.lExt SB 0
@ -127,25 +141,30 @@ glyph-block Letter-Latin-Lower-Eszet : begin
flat ([Math.max (sEndX + 0.1 + TanSlope * swInner) : Math.min (RightSB - innerSmoothB) [mix sEndX RightSB 0.375]] + CorrectionOMidX * swInner / 2 + TanSlope * swInner ) 0
curl sEndX 0 [heading Leftward]
if slab : include : HSerif.lb SB 0 SideJut
include : EszetSerifs [DivFrame 1] false slab
include : match tail
[Just DESCENDING] : VBar.l SB Descender 0 swOuter
[Just TAILED] : PalatalHook.lExt SB 0 (sw -- swOuter)
__ : glyph-proc
__ : no-shape
define EszetConfig : SuffixCfg.weave
object # body
traditional : Traditional false
traditionalFlatHook : Traditional true
sulzbacher Sulzbacher
longSSLig LongSSLig
object # terminal
'' NO-TAIL
'descending' DESCENDING
'tailed' TAILED
object # serifs
serifless 0
bottomSerifed 1
middleSerifed 2
dualSerifed 3
create-glyph 'eszet.traditional' : Traditional false SLAB NO-TAIL
create-glyph 'eszet.traditionalDescending' : Traditional false false DESCENDING
create-glyph 'eszet.traditionalTailed' : Traditional false false TAILED
create-glyph 'eszet.traditionalFlatHook' : Traditional true SLAB NO-TAIL
create-glyph 'eszet.traditionalFlatHookDescending' : Traditional true false DESCENDING
create-glyph 'eszet.traditionalFlatHookTailed' : Traditional true false TAILED
create-glyph 'eszet.sulzbacher' : Sulzbacher SLAB NO-TAIL
create-glyph 'eszet.sulzbacherDescending' : Sulzbacher false DESCENDING
create-glyph 'eszet.sulzbacherTailed' : Sulzbacher false TAILED
create-glyph 'eszet.longSSLig' : LongSSLig SLAB NO-TAIL
create-glyph 'eszet.longSSLigDescending' : LongSSLig false DESCENDING
create-glyph 'eszet.longSSLigTailed' : LongSSLig false TAILED
foreach { suffix { Base tail serif } } [pairs-of EszetConfig] : do
create-glyph "eszet.\(suffix)" : Base serif tail
select-variant 'eszet' 0xDF

96
params/variants.toml
View file

@ -4065,6 +4065,9 @@ rank = 4
descriptionAffix = "ligature of long-S (`ſ`) and `s`"
selectorAffix.eszet = "longSSLig"
[prime.eszet.variants-buildup.stages.terminal."*"]
next = "serifs"
[prime.eszet.variants-buildup.stages.terminal.non-descending]
rank = 1
keyAffix = ""
@ -4080,6 +4083,29 @@ rank = 3
descriptionAffix = "terminal containing tail"
selectorAffix.eszet = "tailed"
[prime.eszet.variants-buildup.stages.serifs.serifless]
rank = 1
desceiptioAffix = "serifs"
descriptionJoiner = "without"
selectorAffix.eszet = "serifless"
[prime.eszet.variants-buildup.stages.serifs.bottom-serifed]
enableIf = [{terminal = "non-descending"}]
rank = 2
descriptionAffix = "serif at bottom"
selectorAffix.eszet = "bottomSerifed"
[prime.eszet.variants-buildup.stages.serifs.middle-serifed]
rank = 3
descriptionAffix = "serif at middle"
selectorAffix.eszet = "middleSerifed"
[prime.eszet.variants-buildup.stages.serifs.dual-serifed]
enableIf = [{terminal = "non-descending"}]
rank = 4
descriptionAffix = "serif at middle and bottom"
selectorAffix.eszet = "dualSerifed"
[prime.lower-eth]
@ -6685,7 +6711,7 @@ k = "straight-serifless"
l = "serifed"
u = "toothed-serifless"
y = "straight-serifless"
eszet = "sulzbacher"
eszet = "sulzbacher-serifless"
[default.italic]
a = "single-storey-tailed"
@ -6698,7 +6724,7 @@ k = "cursive-serifless"
l = "tailed-serifed"
u = "tailed-serifless"
y = "cursive-serifless"
eszet = "sulzbacher-tailed"
eszet = "sulzbacher-tailed-serifless"
long-s = "flat-hook-tailed"
cyrl-ef = "cursive"
cyrl-yeri = "round"
@ -6771,6 +6797,7 @@ n = "straight-serifed"
r = "serifed"
u = "toothed-serifed"
y = "straight-turn-serifed"
eszet = "sulzbacher-bottom-serifed"
lower-lambda = "straight-turn"
[composite.slab.italic]
@ -6790,6 +6817,7 @@ w = "straight-motion-serifed"
x = "cursive"
y = "cursive-motion-serifed"
z = "cursive"
eszet = "sulzbacher-tailed-serifless"
latn-phi = "serifed"
long-s = "flat-hook-tailed"
cyrl-ze = "unilateral-inward-serifed"
@ -6822,7 +6850,7 @@ l = "zshaped"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "flat-hook-middle-serifed"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-lambda = "straight-turn"
lower-iota = "flat-tailed"
cyrl-capital-zhe = "straight"
@ -6864,6 +6892,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-capital-ka = "straight-serifed"
cyrl-ka = "straight-serifed"
cyrl-em = "flat-bottom-serifed"
@ -6903,7 +6932,7 @@ x = "straight-serifed"
y = "straight-turn-serifless"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-lambda = "straight-turn"
cyrl-capital-zhe = "straight"
cyrl-zhe = "straight"
@ -6936,6 +6965,7 @@ v = "straight-serifed"
w = "straight-flat-top-serifed"
u = "toothed-serifed"
y = "straight-turn-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-capital-ka = "straight-serifed"
cyrl-ka = "straight-serifed"
cyrl-capital-u = "straight-turn-serifed"
@ -6962,7 +6992,7 @@ k = "symmetric-touching-serifless"
l = "serifed"
u = "toothed-serifless"
y = "straight-turn-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
long-s = "flat-hook-serifless"
lower-alpha = "tailed-barred"
lower-lambda = "straight-turn"
@ -6994,7 +7024,7 @@ g = "single-storey-serifless"
i = "tailed-serifed"
k = "cursive-serifless"
l = "tailed"
eszet = "longs-s-lig-descending"
eszet = "longs-s-lig-descending-serifless"
long-s = "flat-hook-descending"
lower-iota = "tailed-serifed"
@ -7012,6 +7042,7 @@ u = "toothed-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-bottom-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-capital-ka = "symmetric-touching-serifed"
cyrl-ka = "symmetric-touching-serifed"
cyrl-em = "slanted-sides-hanging-serifed"
@ -7025,6 +7056,7 @@ g = "single-storey-serifed"
k = "cursive-serifed"
x = "straight-motion-serifed"
y = "straight-turn-motion-serifed"
eszet = "longs-s-lig-descending-serifless"
cyrl-ka = "symmetric-touching-top-left-serifed"
@ -7049,7 +7081,7 @@ t = "flat-hook"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "flat-hook-middle-serifed"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-lambda = "straight-turn"
cyrl-capital-zhe = "straight"
cyrl-zhe = "straight"
@ -7089,6 +7121,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-capital-ka = "straight-serifed"
cyrl-ka = "straight-serifed"
cyrl-capital-u = "straight-turn-serifed"
@ -7118,7 +7151,7 @@ r = "corner-hooked-serifed"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "bent-hook-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-iota = "tailed-serifed"
lower-lambda = "straight-turn"
lower-mu = "toothed-serifless"
@ -7157,6 +7190,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "bent-hook-bottom-serifed"
eszet = "longs-s-lig-bottom-serifed"
lower-mu = "toothed-serifed"
cyrl-em = "slanted-sides-hanging-serifed"
cyrl-capital-u = "straight-turn-serifed"
@ -7182,7 +7216,7 @@ r = "hookless-serifless"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "flat-hook-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-iota = "tailed-serifed"
lower-lambda = "straight-turn"
cyrl-em = "flat-bottom-serifless"
@ -7217,6 +7251,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-bottom-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-em = "flat-bottom-serifed"
cyrl-capital-u = "straight-turn-serifed"
seven = "bend-serifed"
@ -7246,7 +7281,7 @@ r = "corner-hooked-serifless"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "flat-hook-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-lambda = "straight-turn"
cyrl-capital-u = "straight-turn-serifless"
zero = "slashed"
@ -7279,6 +7314,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-bottom-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-capital-u = "straight-turn-serifed"
seven = "curly-serifed"
@ -7318,7 +7354,7 @@ x = "curly-serifless"
y = "curly-serifless"
z = "curly-serifless"
long-s = "bent-hook-middle-serifed"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
capital-delta = "curly"
lower-delta = "flat-top"
capital-lambda = "curly-serifless"
@ -7379,6 +7415,7 @@ x = "curly-serifed"
y = "curly-serifed"
z = "curly-serifed"
long-s = "bent-hook-double-serifed"
eszet = "longs-s-lig-bottom-serifed"
capital-lambda = "curly-base-serifed"
lower-mu = "toothed-serifed"
lower-chi = "curly-serifed"
@ -7420,7 +7457,7 @@ r = "hookless-serifless"
u = "toothed-serifless"
w = "straight-flat-top-serifless"
y = "straight-turn-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
long-s = "flat-hook-middle-serifed"
lower-alpha = "tailed-barred"
lower-lambda = "straight-turn"
@ -7462,6 +7499,7 @@ w = "straight-flat-top-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-em = "flat-bottom-serifed"
cyrl-capital-u = "straight-turn-serifed"
seven = "bend-serifed"
@ -7494,7 +7532,7 @@ l = "hooky"
t = "flat-hook"
y = "cursive-flat-hook-serifless"
long-s = "flat-hook-middle-serifed"
eszet = "sulzbacher"
eszet = "sulzbacher-serifless"
cyrl-capital-u = "cursive-flat-hook-serifless"
one = "base"
four = "closed"
@ -7522,6 +7560,7 @@ x = "straight-serifed"
y = "cursive-flat-hook-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "sulzbacher-bottom-serifed"
cyrl-capital-u = "cursive-flat-hook-serifed"
micro-sign = "toothless-rounded-serifed"
@ -7573,7 +7612,7 @@ q = "earless-corner-straight-serifless"
r = "earless-corner-serifless"
u = "toothless-corner-serifless"
y = "straight-turn-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-alpha = "barred-earless-corner"
capital-gamma = "bottom-serifed"
lower-iota = "tailed-serifed"
@ -7608,7 +7647,7 @@ d = "tailed-serifless"
f = "tailed"
u = "tailed-serifless"
long-s = "bent-hook-tailed"
eszet = "longs-s-lig-tailed"
eszet = "longs-s-lig-tailed-serifless"
lower-alpha = "tailed-barred-earless-corner"
lower-mu = "tailed-serifless"
micro-sign = "tailed-serifless"
@ -7628,6 +7667,7 @@ q = "earless-corner-straight-serifed"
u = "toothless-corner-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
eszet = "longs-s-lig-bottom-serifed"
lower-mu = "toothless-corner-serifed"
capital-gamma = "serifed"
cyrl-capital-ka = "symmetric-touching-serifed"
@ -7642,6 +7682,7 @@ d = "tailed-serifed"
u = "tailed-serifed"
x = "straight-motion-serifed"
y = "straight-turn-motion-serifed"
eszet = "longs-s-lig-tailed-serifless"
lower-mu = "tailed-serifed"
cyrl-ka = "symmetric-touching-top-left-serifed"
micro-sign = "tailed-serifed"
@ -7667,7 +7708,7 @@ l = "hooky"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "flat-hook-middle-serifed"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-iota = "tailed"
cyrl-em = "flat-bottom-serifless"
cyrl-capital-u = "straight-turn-serifless"
@ -7701,6 +7742,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "longs-s-lig-bottom-serifed"
cyrl-em = "flat-bottom-serifed"
cyrl-capital-u = "straight-turn-serifed"
seven = "bend-serifed"
@ -7803,7 +7845,7 @@ t = "flat-hook"
u = "toothed-serifless"
w = "straight-flat-top-serifless"
y = "straight-turn-serifless"
eszet = "traditional-flat-hook"
eszet = "traditional-flat-hook-middle-serifed"
long-s = "flat-hook-double-serifed"
lower-lambda = "straight-turn"
cyrl-capital-u = "straight-turn-serifless"
@ -7840,6 +7882,7 @@ x = "cursive"
y = "cursive-serifless"
z = "cursive"
long-s = "flat-hook-diagonal-tailed-middle-serifed"
eszet = "traditional-flat-hook-middle-serifed"
ampersand = "closed"
[composite.ss15.slab-override.design]
@ -7848,6 +7891,7 @@ k = "straight-serifed"
u = "toothed-serifed"
w = "straight-flat-top-serifless"
y = "straight-turn-serifed"
eszet = "traditional-flat-hook-dual-serifed"
cyrl-capital-u = "straight-turn-serifed"
[composite.ss15.slab-override.italic]
@ -7856,6 +7900,7 @@ g = "single-storey-serifed"
k = "diagonal-tailed-cursive-top-left-serifed"
w = "cursive-serifed"
y = "cursive-motion-serifed"
long-s = "flat-hook-diagonal-tailed-middle-serifed"
@ -7892,7 +7937,7 @@ u = "toothed-serifed"
y = "straight-turn-serifless"
long-s = "flat-hook-middle-serifed"
lower-thorn = "motion-serifed"
eszet = "longs-s-lig"
eszet = "longs-s-lig-middle-serifed"
capital-gamma = "serifed"
lower-mu = "toothed-bottom-right-serifed"
cyrl-capital-ze = "bilateral-inward-serifed"
@ -7931,6 +7976,7 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed"
eszet = "longs-s-lig-dual-serifed"
lower-thorn = "serifed"
lower-mu = "toothed-serifed"
cyrl-ka = "symmetric-connected-serifed"
@ -7964,7 +8010,7 @@ g = "double-storey"
r = "hookless-serifed"
t = "flat-hook"
y = "straight-turn-serifless"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-thorn = "motion-serifed"
lower-lambda = "straight-turn"
cyrl-capital-u = "straight-turn-serifless"
@ -8009,11 +8055,12 @@ x = "cursive"
y = "cursive-serifless"
z = "cursive"
long-s = "bent-hook-descending"
eszet = "longs-s-lig-descending"
eszet = "longs-s-lig-descending-serifless"
[composite.ss17.slab-override.design]
capital-u = "toothed-serifed"
y = "straight-turn-serifed"
eszet = "longs-s-lig-bottom-serifed"
lower-thorn = "serifed"
cyrl-capital-u = "straight-turn-serifed"
micro-sign = "tailed-serifed"
@ -8027,6 +8074,7 @@ w = "cursive-serifed"
m = "tailed-top-left-serifed"
n = "tailed-motion-serifed"
y = "cursive-motion-serifed"
eszet = "longs-s-lig-descending-serifless"
@ -8049,7 +8097,7 @@ q = "earless-corner-straight-serifless"
u = "toothed-serifless"
y = "straight-turn-serifless"
long-s = "flat-hook-middle-serifed-xh"
eszet = "longs-s-lig"
eszet = "longs-s-lig-serifless"
lower-alpha = "tailed-barred"
lower-lambda = "straight-turn"
cyrl-capital-u = "straight-turn-serifless"
@ -8070,7 +8118,7 @@ micro-sign = "tailed-serifless"
[composite.ss18.italic]
f = "extended-crossbar-at-x-height"
long-s = "flat-hook-descending-middle-serifed-xh"
eszet = "longs-s-lig-descending"
eszet = "longs-s-lig-descending-serifless"
[composite.ss18.slab-override.design]
capital-g = "toothless-rounded-serifed-hooked"
@ -8087,10 +8135,14 @@ x = "straight-serifed"
y = "straight-turn-serifed"
z = "straight-serifed"
long-s = "flat-hook-double-serifed-xh"
eszet = "longs-s-lig-bottom-serifed"
cyrl-capital-u = "straight-turn-serifed"
seven = "bend-serifed"
micro-sign = "tailed-serifed"
[composite.ss18.slab-override.italic]
eszet = "longs-s-lig-descending-serifless"
[composite.ss20]