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

Add untagged variant selector for cyrl-capital-ef. (#2155)

Browse source
This commit is contained in:
John McWilliams 2024-01-09 12:04:51 -05:00 • committed by GitHub
parent 922eabaafb
commit a23af205b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changes/28.0.5.md
View file

@ -1,3 +1,4 @@
* Add untagged variant selector for Cyrillic Capital Ef (`Ф`) for style-driven variation.
* Fix leaning marks of Turned/Reversed Sans-Serif Capital L.
* Fix leaning marks of Cyrillic Tall Te.
* Fix leaning marks of Greek Lower Mu/Rho.

73
packages/font-glyphs/src/letter/greek/upper-phi.ptl
View file

@ -71,42 +71,55 @@ glyph-block Letter-Greek-Upper-Phi : begin
define [MtSerif df y] : tagged 'serifMT' : HSerif.lt df.middle y Jut
define [MbSerif df y] : tagged 'serifMB' : HSerif.mb df.middle y Jut
define [GrekCapitalPhiImpl fFlatTB df] : glyph-proc
local y1 : mix [if SLAB Stroke 0] [if SLAB (CAP - Stroke) CAP] 0.125
local y2 : mix [if SLAB Stroke 0] [if SLAB (CAP - Stroke) CAP] 0.875
include : VarPhiRing fFlatTB df y1 y2
include : StraightBar df 0 y1 y2 CAP
define CyrlCapitalEfConfig : SuffixCfg.weave
object # bowl
"" VarPhiRing
splitBowl CyrlEfSplitRing
object # serifs
serifless false
serifed true
if SLAB : begin
include : tagged 'serifMT' : HSerif.mt df.middle CAP MidJutSide
include : tagged 'serifMB' : HSerif.mb df.middle 0 MidJutSide
foreach { suffix { Bowl Serifs } } [Object.entries CyrlCapitalEfConfig] : do
define [GrekCapitalPhiImpl fFlatTB df slab] : glyph-proc
local y1 : mix [if slab Stroke 0] [if slab (CAP - Stroke) CAP] 0.125
local y2 : mix [if slab Stroke 0] [if slab (CAP - Stroke) CAP] 0.875
include : Bowl fFlatTB df y1 y2
include : StraightBar df 0 y1 y2 CAP
create-glyph 'grek/Phi' 0x3A6 : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.capital
include : GrekCapitalPhiImpl 0 df
if slab : begin
include : tagged 'serifMT' : HSerif.mt df.middle CAP MidJutSide
include : tagged 'serifMB' : HSerif.mb df.middle 0 MidJutSide
create-glyph 'cyrl/Ef' 0x424 : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.capital
include : GrekCapitalPhiImpl 1 df
create-glyph "grek/Phi.\(suffix)" : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.capital
include : GrekCapitalPhiImpl 0 df Serifs
create-glyph 'cyrl/Ef.BGR' : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.capital
create-glyph "cyrl/Ef.\(suffix)" : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.capital
include : GrekCapitalPhiImpl 1 df Serifs
local top : CAP + LongJut - HalfStroke
local bot : 0 - LongJut + HalfStroke
create-glyph "cyrl/Ef.BGR.\(suffix)" : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.capital
include : ExtendAboveBaseAnchors top
include : ExtendBelowBaseAnchors bot
local top : CAP + LongJut - HalfStroke
local bot : 0 - LongJut + HalfStroke
include : VarPhiRing 0 df 0 CAP
include : StraightBar df bot 0 CAP top
include : ExtendAboveBaseAnchors top
include : ExtendBelowBaseAnchors bot
if SLAB : begin
include : tagged 'serifMT' : HSerif.mt df.middle top MidJutSide
include : tagged 'serifMB' : HSerif.mb df.middle bot MidJutSide
include : VarPhiRing 0 df 0 CAP
include : StraightBar df bot 0 CAP top
if Serifs : begin
include : tagged 'serifMT' : HSerif.mt df.middle top MidJutSide
include : tagged 'serifMB' : HSerif.mb df.middle bot MidJutSide
select-variant 'grek/Phi' 0x3A6
select-variant 'cyrl/Ef' 0x424
select-variant 'cyrl/Ef.BGR'
create-glyph 'grek/varphi' 0x3D5 : glyph-proc
local df : include : DivFrame para.diversityM 3
@ -123,7 +136,7 @@ glyph-block Letter-Greek-Upper-Phi : begin
include : tagged 'serifMT' : HSerif.mt df.middle Ascender Jut
include : tagged 'serifMB' : HSerif.mb df.middle Descender Jut
define CyrlEfConfig : SuffixCfg.weave
define CyrlLowerEfConfig : SuffixCfg.weave
object # bowl
"" VarPhiRing
splitBowl CyrlEfSplitRing
@ -133,7 +146,7 @@ glyph-block Letter-Greek-Upper-Phi : begin
serifed { StraightBar MtSerif MbSerif }
cursive { CursiveBar nothing nothing }
foreach { suffix { Bowl { Bar sMT sMB } } } [Object.entries CyrlEfConfig] : do
foreach { suffix { Bowl { Bar sMT sMB } } } [Object.entries CyrlLowerEfConfig] : do
create-glyph "cyrl/ef.\(suffix)" : glyph-proc
local df : include : DivFrame para.diversityM 3
include : df.markSet.bp

31
params/variants.toml
View file

@ -5832,6 +5832,35 @@ selectorAffix."cyrl/u" = "serifed"
[prime.cyrl-capital-ef]
# No tags and sampler -- for style-driven variation
[prime.cyrl-capital-ef.variants.serifless]
rank = 1
selector."grek/Phi" = "serifless"
selector."cyrl/Ef" = "serifless"
selector."cyrl/Ef.BGR" = "serifless"
[prime.cyrl-capital-ef.variants.serifed]
rank = 2
selector."grek/Phi" = "serifed"
selector."cyrl/Ef" = "serifed"
selector."cyrl/Ef.BGR" = "serifed"
[prime.cyrl-capital-ef.variants.split-serifless]
rank = 3
selector."grek/Phi" = "serifless"
selector."cyrl/Ef" = "splitBowlSerifless"
selector."cyrl/Ef.BGR" = "serifless"
[prime.cyrl-capital-ef.variants.split-serifed]
rank = 4
selector."grek/Phi" = "serifed"
selector."cyrl/Ef" = "splitBowlSerifed"
selector."cyrl/Ef.BGR" = "serifed"
[prime.cyrl-ef]
sampler = "ф"
samplerExplain = "Cyrillic Lower Ef"
@ -7560,6 +7589,7 @@ cyrl-en = "serifless"
cyrl-er = "eared-serifless"
cyrl-capital-u = "straight-serifless"
cyrl-u = "straight-serifless"
cyrl-capital-ef = "serifless"
cyrl-ef = "serifless"
cyrl-che = "standard"
cyrl-capital-yeri = "corner"
@ -7699,6 +7729,7 @@ cyrl-en = "serifed"
cyrl-er = "eared-serifed"
cyrl-capital-u = "straight-turn-serifed"
cyrl-u = "straight-turn-serifed"
cyrl-capital-ef = "serifed"
cyrl-ef = "serifed"
cyrl-capital-ya = "straight-serifed"
cyrl-ya = "straight-serifed"