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

Add slab variant for Latin Epsilon and Cyrillic Ze (#843).

Browse source
This commit is contained in:
be5invis 2021-01-27 02:17:26 -08:00
parent 92f217ae34
commit 15bbce13aa
4 changed files with 121 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
font-src/glyphs/auto-build/transformed.ptl
View file

@ -257,7 +257,7 @@ glyph-block Autobuild-Transformed : begin
list 0x1D9C 'c'
list 0x1D9D 'cCurlyTail'
list 0x1D9E 'eth'
list 0x1D9F 'revLatinEpsilon'
list 0x1D9F 'latn/revSmallEpsilon'
list 0x1DA0 'f'
list 0x1DA1 'turnf'
list 0x1DA2 'scriptg'
@ -596,7 +596,7 @@ glyph-block Autobuild-Rhotic : begin
glyph-block-import Recursive-Build : Widen
glyph-block-import Letter-Latin-Rhotic : ErTail
if [not recursive] : let [thinfont : Widen {'schwa' 'revLatinEpsilon'} 0.85 1] : begin
if [not recursive] : let [thinfont : Widen {'schwa' 'latn/revSmallEpsilon'} 0.85 1] : begin
create-glyph 'er' 0x25A : glyph-proc # er
include : MarkSet.e
include : thinfont.queryByName 'schwa'
@ -604,5 +604,5 @@ glyph-block Autobuild-Rhotic : begin
create-glyph 'revlatinepsiloner' 0x25D : glyph-proc # revlatinepsiloner
include : MarkSet.e
include : thinfont.queryByName 'revLatinEpsilon'
include : thinfont.queryByName 'latn/revSmallEpsilon'
include : ErTail (Width * 0.85 - SB - markFine * HVContrast * 1.25)

129
font-src/glyphs/letter/greek/lower-epsilon.ptl
View file

@ -8,6 +8,14 @@ glyph-module
glyph-block Letter-Greek-Lower-Epsilon : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared-Shapes : SerifedArcStart_RtlLhs SerifedArcStart_LtrRhs
glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart_RtlLhs InwardSlabArcStart_LtrRhs
glyph-block-import Letter-Shared-Shapes : ArcStartSerifL ArcStartSerifR DToothlessRise
glyph-block-import Letter-Shared-Shapes : ArcStartInwardSerifL ArcStartInwardSerifR
define SLAB-NONE 0
define SLAB-CLASSICAL 1
define SLAB-INWARD 2
define StdBlend 0.65
@ -15,22 +23,26 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
local stroke : AdviceStroke2 2 3 (top - bot)
local midx : mix SB RightSB blend
local midy : mix bot top OverlayPos
local sma : top - [mix (midy + stroke / 2) (top - O - stroke) (SmoothB / (SmoothA + SmoothB))] - TanSlope * HVContrast * stroke
local smb : [mix (stroke + O) (midy - stroke / 2) (SmoothB / (SmoothA + SmoothB))] + TanSlope * HVContrast * stroke
local topHeight : top - bot
local midyHeight : midy - bot
local sma : topHeight - [mix (midyHeight + stroke / 2) (topHeight - O - stroke) (SmoothB / (SmoothA + SmoothB))] - TanSlope * HVContrast * stroke
local smb : [mix (stroke + O) (midyHeight - stroke / 2) (SmoothB / (SmoothA + SmoothB))] + TanSlope * HVContrast * stroke
local fine : stroke * CThin
return : object stroke midx midy sma smb fine
define [SmallEpsilonUpperShape top bot blend hook] : begin
define [SmallEpsilonUpperShape slabType top bot blend hook] : begin
define [object stroke midx midy sma smb fine] : SmallEpsilonShapeDim top bot blend
return : dispiro
g4 (RightSB + O) (top - hook) [widths.lhs]
hookstart (top - O)
match slabType
[Just SLAB-CLASSICAL] : SerifedArcStart_RtlLhs RightSB Middle top stroke hook
[Just SLAB-INWARD] : InwardSlabArcStart_RtlLhs RightSB Middle top stroke hook
__ : list [g4 (RightSB + O) (top - hook) [widths.lhs]] [hookstart (top - O)]
g4 (SB + (OX - O)) (top - sma)
arcvh
flat Middle (midy - (fine - stroke / 2)) [widths.heading fine 0 Rightward]
curl midx (midy - (fine - stroke / 2)) [heading Rightward]
define [SmallEpsilonLowerShape top bot blend hook] : begin
define [SmallEpsilonLowerShape slabType top bot blend hook] : begin
define [object stroke midx midy sma smb fine] : SmallEpsilonShapeDim top bot blend
return : dispiro
flat midx (midy + (fine - stroke / 2)) [widths.heading fine 0 Leftward]
@ -40,72 +52,97 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
hookend (bot + O)
g4 (RightSB - O) (bot + hook)
define [SmallEpsilonShape top bot blend hook] : union
SmallEpsilonUpperShape top bot blend hook
SmallEpsilonLowerShape top bot blend hook
define [SmallEpsilonShape slabType top bot blend hook] : union
SmallEpsilonUpperShape slabType top bot blend hook
SmallEpsilonLowerShape slabType top bot blend hook
create-glyph 'grek/epsilon' 0x3B5 : glyph-proc
include : MarkSet.e
include : SmallEpsilonShape XH 0 StdBlend SHook
alias 'latinepsilon' 0x25B 'grek/epsilon'
turned 'turnepsilon' 0x1D08 'grek/epsilon' Middle (XH / 2)
create-glyph 'latinEpsilon' 0x190 : glyph-proc
include : MarkSet.capital
include : SmallEpsilonShape CAP 0 StdBlend Hook
define [AutoStartSerifR sty top] : match sty
[Just SLAB-CLASSICAL] : ArcStartSerifR RightSB top Stroke Hook
[Just SLAB-INWARD] : ArcStartInwardSerifR RightSB top Stroke Hook
__ : glyph-proc
define [CyrZeShapeDim top bot blend] : begin
local stroke : AdviceStroke2 2 3 (top - bot)
local midx : mix RightSB SB blend
local midy : mix bot top OverlayPos
local smb : top - [mix (midy + stroke / 2) (top - O - stroke) (SmoothA / (SmoothA + SmoothB))] + TanSlope * HVContrast * stroke
local sma : [mix (stroke + O) (midy - stroke / 2) (SmoothA / (SmoothA + SmoothB))] - TanSlope * HVContrast * stroke
local topHeight : top - bot
local midyHeight : midy - bot
local smb : topHeight - [mix (midyHeight + stroke / 2) (topHeight - O - stroke) (SmoothA / (SmoothA + SmoothB))] + TanSlope * HVContrast * stroke
local sma : [mix (stroke + O) (midyHeight - stroke / 2) (SmoothA / (SmoothA + SmoothB))] - TanSlope * HVContrast * stroke
local fine : stroke * CThin
return : object stroke midx midy sma smb fine
define [CyrZeUpperShape top bot blend hook] : begin
define [CyrZeUpperShape slabType top bot blend hook] : begin
define [object stroke midx midy sma smb fine] : CyrZeShapeDim top bot blend
return : dispiro
widths.rhs
g4 (SB - O) (top - hook)
hookstart (top - O)
match slabType
[Just SLAB-CLASSICAL] : SerifedArcStart_LtrRhs SB Middle top stroke hook
[Just SLAB-INWARD] : InwardSlabArcStart_LtrRhs SB Middle top stroke hook
__ : list [g4 (SB - O) (top - hook) : widths.rhs] [hookstart (top - O)]
g4 (RightSB - (OX - O)) (top - smb)
arcvh
flat Middle (midy - (fine - stroke / 2)) [widths.heading 0 fine Leftward]
curl midx (midy - (fine - stroke / 2)) [heading Leftward]
define [CyrZeLowerShape top bot blend hook] : begin
define [CyrZeLowerShape slabType top bot blend hook] : begin
define [object stroke midx midy sma smb fine] : CyrZeShapeDim top bot blend
return : dispiro
widths.lhs
g4 (SB + O) (bot + hook)
g4 (SB + O) (bot + hook) [widths.lhs]
hookstart (bot + O)
g4 (RightSB - (OX - O) - O * 2) (bot + sma)
arcvh
flat Middle (midy + (fine - stroke / 2)) [widths.heading fine 0 Leftward]
curl midx (midy + (fine - stroke / 2)) [heading Leftward]
define [CyrZeShape top bot blend hook] : union
CyrZeUpperShape top bot blend hook
CyrZeLowerShape top bot blend hook
define [CyrZeShape slabType top bot blend hook] : union
CyrZeUpperShape slabType top bot blend hook
CyrZeLowerShape slabType top bot blend hook
create-glyph 'cyrl/Ze' 0x417 : glyph-proc
include : MarkSet.capital
include : CyrZeShape CAP 0 StdBlend Hook
define [AutoStartSerifL sty top] : match sty
[Just SLAB-CLASSICAL] : ArcStartSerifL SB top Stroke Hook
[Just SLAB-INWARD] : ArcStartInwardSerifL SB top Stroke Hook
__ : glyph-proc
create-glyph 'cyrl/ze.BGR' : glyph-proc
include : MarkSet.p
include : CyrZeShape CAP 0 StdBlend Hook
include : Upright
include : Translate 0 (XH - CAP)
include : Italify
define EpsilonConfig : object
serifless { SLAB-NONE }
unilateralSerifed { SLAB-CLASSICAL }
unilateralInwardSerifed { SLAB-INWARD }
create-glyph 'revLatinEpsilon' 0x25C : glyph-proc
include : MarkSet.e
include : CyrZeShape XH 0 StdBlend SHook
foreach { suffix { slabType } } [Object.entries EpsilonConfig] : do
create-glyph "latn/Epsilon.\(suffix)" : glyph-proc
include : MarkSet.capital
include : SmallEpsilonShape slabType CAP 0 StdBlend Hook
include : AutoStartSerifR slabType CAP
alias 'cyrl/ze' 0x437 'revLatinEpsilon'
create-glyph "latn/epsilon.\(suffix)" : glyph-proc
include : MarkSet.e
include : SmallEpsilonShape slabType XH 0 StdBlend SHook
include : AutoStartSerifR slabType XH
create-glyph "cyrl/Ze.\(suffix)" : glyph-proc
include : MarkSet.capital
include : CyrZeShape slabType CAP 0 StdBlend Hook
include : AutoStartSerifL slabType CAP
create-glyph "cyrl/ze.\(suffix)" : glyph-proc
include : MarkSet.e
include : CyrZeShape slabType XH 0 StdBlend SHook
include : AutoStartSerifL slabType XH
create-glyph "cyrl/ze.BGR.\(suffix)" : glyph-proc
include : MarkSet.p
include : CyrZeShape slabType XH Descender StdBlend SHook
include : AutoStartSerifL slabType XH
alias 'grek/epsilon' 0x3B5 'latn/epsilon.serifless'
select-variant 'latn/Epsilon' 0x190
select-variant 'latn/epsilon' 0x25B
turned 'turnepsilon' 0x1D08 'grek/epsilon' Middle (XH / 2)
select-variant 'cyrl/Ze' 0x417
select-variant 'cyrl/ze' 0x437
select-variant 'cyrl/ze.BGR' (follow -- 'cyrl/ze')
alias 'latn/revSmallEpsilon' 0x25C 'cyrl/ze'
create-glyph 'voicedlaryngenalspirant' 0x1D24 : glyph-proc
include : MarkSet.b
@ -115,6 +152,6 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
local dimUpper : CyrZeShapeDim CAP midGap blend
local dimLower : SmallEpsilonShapeDim (CAP - midGap) 0 blend
include : union
CyrZeUpperShape CAP midGap blend Hook
SmallEpsilonLowerShape (CAP - midGap) 0 blend Hook
CyrZeUpperShape SLAB-NONE CAP midGap blend Hook
SmallEpsilonLowerShape SLAB-NONE (CAP - midGap) 0 blend Hook
Rect (dimUpper.midy + dimUpper.stroke / 2) (dimLower.midy - dimLower.stroke / 2) (Middle - strokeV / 2 * HVContrast) (Middle + strokeV / 2 * HVContrast)

15
font-src/glyphs/letter/shared.ptl
View file

@ -246,6 +246,21 @@ glyph-block Letter-Shared-Shapes : begin
cy + hook - O * 2
widths.lhs.heading fine Upward
glyph-block-export InwardSlabArcStart_RtlLhs
define [InwardSlabArcStart_RtlLhs sx cx cy sw hook] : begin
return : list
g4 sx (cy - DToothlessRise) [widths.lhs sw]
g4 (cx - CorrectionOMidX * sw) (cy - O)
archv
glyph-block-export InwardSlabArcStart_LtrRhs
define [InwardSlabArcStart_LtrRhs sx cx cy sw hook] : begin
return : list
g4 sx (cy - DToothlessRise) [widths.rhs sw]
g4 (cx - CorrectionOMidX * sw) (cy - O)
archv
glyph-block-export ArcStartSerifWidth
define [ArcStartSerifWidth stroke] : Math.max (stroke * 0.875) [AdviceStroke 3.5]

20
params/variants.toml
View file

@ -75,26 +75,36 @@ tag = "cv03"
rank = 1
description = "Serifless `C`"
selector.C = "serifless"
selector.'latn/Epsilon' = 'serifless'
selector.'cyrl/Ze' = 'serifless'
[prime.capital-c.variants.unilateral-serifed]
rank = 2
description = "Serifed `C`"
selector.C = "unilateralSerifed"
selector.'latn/Epsilon' = 'unilateralSerifed'
selector.'cyrl/Ze' = 'unilateralSerifed'
[prime.capital-c.variants.bilateral-serifed]
rank = 3
description = "Serifed `C` at both ends"
selector.C = "bilateralSerifed"
selector.'latn/Epsilon' = 'unilateralSerifed'
selector.'cyrl/Ze' = 'unilateralSerifed'
[prime.capital-c.variants.unilateral-inward-serifed]
rank = 4
description = "`c` with inward serif at top"
selector.C = "unilateralInwardSerifed"
selector.'latn/Epsilon' = 'unilateralInwardSerifed'
selector.'cyrl/Ze' = 'unilateralInwardSerifed'
[prime.capital-c.variants.bilateral-inward-serifed]
rank = 5
description = "`c` with inward serif at top and bottom"
selector.C = "bilateralInwardSerifed"
selector.'latn/Epsilon' = 'unilateralInwardSerifed'
selector.'cyrl/Ze' = 'unilateralInwardSerifed'
[prime.capital-d]
@ -1127,30 +1137,40 @@ rank = 1
description = "Serifless `c`"
selector.c = "serifless"
selector.cCurlyTail = "serifless"
selector.'latn/epsilon' = 'serifless'
selector.'cyrl/ze' = 'serifless'
[prime.c.variants.unilateral-serifed]
rank = 2
description = "Serifed `c`"
selector.c = "unilateralSerifed"
selector.cCurlyTail = "unilateralSerifed"
selector.'latn/epsilon' = 'unilateralSerifed'
selector.'cyrl/ze' = 'unilateralSerifed'
[prime.c.variants.bilateral-serifed]
rank = 3
description = "Serifed `c` at both ends"
selector.c = "bilateralSerifed"
selector.cCurlyTail = "unilateralSerifed"
selector.'latn/epsilon' = 'unilateralSerifed'
selector.'cyrl/ze' = 'unilateralSerifed'
[prime.c.variants.unilateral-inward-serifed]
rank = 4
description = "`c` with inward serif at top"
selector.c = "unilateralInwardSerifed"
selector.cCurlyTail = "unilateralInwardSerifed"
selector.'latn/epsilon' = 'unilateralInwardSerifed'
selector.'cyrl/ze' = 'unilateralInwardSerifed'
[prime.c.variants.bilateral-inward-serifed]
rank = 5
description = "`c` with inward serif at top and bottom"
selector.c = "bilateralInwardSerifed"
selector.cCurlyTail = "unilateralInwardSerifed"
selector.'latn/epsilon' = 'unilateralInwardSerifed'
selector.'cyrl/ze' = 'unilateralInwardSerifed'