Skip to content

Commit

Permalink
Optimize auto-serif behavior of four characters.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmcwilliams403
jmcwilliams403 committed Oct 16, 2024
1 parent 2386643 commit 0a70f55
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 117 deletions.
4 changes: 2 additions & 2 deletions packages/font-glyphs/src/letter/greek/lower-epsilon.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,8 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
include : Base df XH Slabs SHook SmallArchDepthA SmallArchDepthB


select-variant 'AeVolapuk' 0xA79A (follow -- 'a/single')
select-variant 'aeVolapuk' 0xA79B (follow -- 'a/single')
select-variant 'AeVolapuk' 0xA79A (follow -- [conditional-follow SLAB 'a/single/autoSerifed/slab' 'a/single/autoSerifed/sans'])
select-variant 'aeVolapuk' 0xA79B (follow -- [conditional-follow SLAB 'a/single/autoSerifed/slab' 'a/single/autoSerifed/sans'])
select-variant 'UeVolapuk' 0xA79E (follow -- 'u')
select-variant 'ueVolapuk' 0xA79F (follow -- 'u')

Expand Down
26 changes: 11 additions & 15 deletions packages/font-glyphs/src/letter/greek/upper-gamma.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,18 @@ glyph-block Letter-Greek-Upper-Gamma: begin
bottomSerifed { SLAB-BOTTOM false }
serifed { SLAB-ALL true }

foreach { suffix { slabType doSM } } [Object.entries GammaConfig] : do
foreach { suffix { slabType doST } } [Object.entries GammaConfig] : do
create-glyph "grek/Gamma.\(suffix)" : glyph-proc
include : MarkSet.capital
include : GammaShape CAP 0 slabType

create-glyph "grek/Digamma.\(suffix)" : glyph-proc
include : MarkSet.capital
include : GammaShape CAP 0 slabType

local yBar : CAP * DesignParameters.upperEBarPos
include : HBar.m GammaBarLeft (RightSB - [xMidBarShrink doSM]) yBar
if doSM : include : tagged 'serifRM'
VSerif.dr (RightSB - [xMidBarShrink doSM]) (yBar + HalfStroke) [mix Stroke VJut 0.5]
include : HBar.m GammaBarLeft (RightSB - [xMidBarShrink doST]) yBar
if doST : include : tagged 'serifRM'
VSerif.dr (RightSB - [xMidBarShrink doST]) (yBar + HalfStroke) [mix Stroke VJut 0.5]

create-glyph "cyrl/GheDescender.\(suffix)" : glyph-proc
include [refer-glyph "grek/Gamma.\(suffix)"] AS_BASE ALSO_METRICS
Expand Down Expand Up @@ -140,18 +139,15 @@ glyph-block Letter-Greek-Upper-Gamma: begin
select-variant 'cyrl/ge' 0x491
select-variant 'cyrl/gheMidHook' 0x495 (follow -- 'cyrl/ghe.upright')

create-glyph "grek/digamma.serifless" : glyph-proc
select-variant 'grek/Digamma' 0x3DC (follow -- 'grek/Gamma')

create-glyph 'grek/digamma' 0x3DD : glyph-proc
include : MarkSet.p
include : GammaShape XH Descender SLAB-NONE
include : HBar.m GammaBarLeft (RightSB - [xMidBarShrink SLAB]) [mix 0 XH DesignParameters.upperEBarPos]

create-glyph "grek/digamma.topRightSerifed" : glyph-proc
include [refer-glyph "grek/digamma.serifless"] AS_BASE ALSO_METRICS
include : tagged 'serifRM'
VSerif.dr (RightSB - [xMidBarShrink SLAB]) ([mix 0 XH DesignParameters.upperEBarPos] + HalfStroke) [mix Stroke VJut 0.5]

select-variant 'grek/Digamma' 0x3DC
select-variant 'grek/digamma' 0x3DD
local yBar : mix 0 XH DesignParameters.upperEBarPos
include : HBar.m GammaBarLeft (RightSB - [xMidBarShrink SLAB]) yBar
if SLAB : include : tagged 'serifRM'
VSerif.dr (RightSB - [xMidBarShrink SLAB]) (yBar + HalfStroke) [mix Stroke VJut 0.5]

define [GhaynOverlayBar top] : LetterBarOverlay.l GammaBarLeft (top * (1 - OverlayPos))

Expand Down
2 changes: 1 addition & 1 deletion packages/font-glyphs/src/letter/latin/lower-g.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ glyph-block Letter-Latin-Lower-G : begin
link-reduced-variant 'g/sansSerif' 'g' MathSansSerif
CreateTurnedLetter 'turng' 0x1D77 'g' HalfAdvance [mix Descender XH 0.5]
select-variant "gBar" 0x1E5 (follow -- 'g')
select-variant 'g/single' null (shapeFrom -- 'g')
select-variant 'g/single' null (shapeFrom -- 'g') (follow -- [conditional-follow SLAB 'g/single/autoSerifed/slab' 'g/single/autoSerifed/sans'])

select-variant 'g/hookTopBase' null (shapeFrom -- 'g')

Expand Down
98 changes: 53 additions & 45 deletions packages/font-glyphs/src/letter/latin/upper-h.ptl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ glyph-block Letter-Latin-Upper-H : begin
define SLAB-ALL 4
define SLAB-ALL-BGR 5
define SLAB-TAILED-CYRILLIC-BGR 6
define SLAB-SMALL-HETA 7

define [HSerifs slabType t b l r sw] : begin
local sf : SerifFrame t b l r (swRef -- [fallback sw Stroke])
Expand All @@ -36,6 +37,7 @@ glyph-block Letter-Latin-Upper-H : begin
[Just SLAB-ALL] : composite-proc sf.lt.full sf.rt.full sf.lb.full sf.rb.full
[Just SLAB-ALL-BGR] : composite-proc sf.lt.outer sf.rt.inner sf.lb.full sf.rb.full
[Just SLAB-TAILED-CYRILLIC-BGR] : composite-proc sf.lt.outer sf.rt.inner sf.lb.full
[Just SLAB-SMALL-HETA] : NeedSlab SLAB : begin sf.lt.outer

define [HShape l r top _sw] : glyph-proc
local sw : fallback _sw Stroke
Expand All @@ -45,10 +47,25 @@ glyph-block Letter-Latin-Upper-H : begin

define [HTurned l r top _sw] : glyph-proc
local sw : fallback _sw Stroke
include : LeaningAnchor.Below.VBar.r r
include : tagged 'strokeL' : VBar.l l (top * HBarPos - sw / 2) top sw
include : tagged 'strokeR' : VBar.r r 0 top sw
include : HBar.m (l - O) (r + O) (top * HBarPos) sw

define [HLeftHalf l r top _sw] : glyph-proc
local sw : fallback _sw Stroke
include : LeaningAnchor.Above.VBar.l l
include : LeaningAnchor.Below.VBar.l l
include : tagged 'strokeL' : VBar.l l 0 top sw
include : HBar.m (l - O) (r + O) (top * HBarPos) sw

define [HRightHalf l r top _sw] : glyph-proc
local sw : fallback _sw Stroke
include : LeaningAnchor.Above.VBar.r r
include : LeaningAnchor.Below.VBar.r r
include : tagged 'strokeR' : VBar.r r 0 top sw
include : HBar.m (l - O) (r + O) (top * HBarPos) sw

define [TailedHShape l r top _sw] : glyph-proc
local sw : fallback _sw Stroke
include : tagged 'strokeL' : VBar.l l 0 top sw
Expand Down Expand Up @@ -94,22 +111,22 @@ glyph-block Letter-Latin-Upper-H : begin
Math.min OverlayStroke (0.625 * (yt - yb))

define HConfig : object
serifless { HShape HTurned SLAB-NONE }
tailedSerifless { TailedHShape HTurned SLAB-NONE }
topLeftSerifed { HShape HTurned SLAB-TOP-LEFT }
tailedTopLeftSerifed { TailedHShape HTurned SLAB-TOP-LEFT }
topLeftBottomRightSerifed { HShape HTurned SLAB-TOP-LEFT-BOTTOM-RIGHT }
serifed { HShape HTurned SLAB-ALL }
tailedSerifed { TailedHShape HTurned SLAB-TAILED-CYRILLIC }
serifedExceptBottomRight { HShape HTurned SLAB-TAILED-CYRILLIC }
serifedBGR { HShape HTurned SLAB-ALL-BGR }
tailedSerifedBGR { TailedHShape HTurned SLAB-TAILED-CYRILLIC-BGR }
serifless { HShape HTurned HLeftHalf HRightHalf SLAB-NONE }
tailedSerifless { TailedHShape HTurned HLeftHalf HRightHalf SLAB-NONE }
topLeftSerifed { HShape HTurned HLeftHalf HRightHalf SLAB-TOP-LEFT }
tailedTopLeftSerifed { TailedHShape HTurned HLeftHalf HRightHalf SLAB-TOP-LEFT }
topLeftBottomRightSerifed { HShape HTurned HLeftHalf HRightHalf SLAB-TOP-LEFT-BOTTOM-RIGHT }
serifed { HShape HTurned HLeftHalf HRightHalf SLAB-ALL }
tailedSerifed { TailedHShape HTurned HLeftHalf HRightHalf SLAB-TAILED-CYRILLIC }
serifedExceptBottomRight { HShape HTurned HLeftHalf HRightHalf SLAB-TAILED-CYRILLIC }
serifedBGR { HShape HTurned HLeftHalf HRightHalf SLAB-ALL-BGR }
tailedSerifedBGR { TailedHShape HTurned HLeftHalf HRightHalf SLAB-TAILED-CYRILLIC-BGR }

define EnGheGheConfig : object
serifless false
topRightSerifed true

foreach { suffix { Body TurnedBody slabType } } [Object.entries HConfig] : do
foreach { suffix { Body TurnedBody LeftHalfBody RightHalfBody slabType } } [Object.entries HConfig] : do
create-glyph "H.\(suffix)" : glyph-proc
include : MarkSet.capital
include : Body SB RightSB CAP
Expand All @@ -121,7 +138,6 @@ glyph-block Letter-Latin-Upper-H : begin

create-glyph "HTurned.\(suffix)" : glyph-proc
include : MarkSet.capital
include : LeaningAnchor.Below.VBar.r RightSB
include : TurnedBody SB RightSB CAP
include : HSerifs slabType CAP 0 SB RightSB
eject-contour 'serifLB'
Expand All @@ -133,40 +149,28 @@ glyph-block Letter-Latin-Upper-H : begin

create-glyph "leftHalfH.\(suffix)" : glyph-proc
include : MarkSet.capital
include : LeaningAnchor.Above.VBar.l SB
include : LeaningAnchor.Below.VBar.l SB
include : Body SB RightSB CAP
eject-contour 'strokeR'
include : LeftHalfBody SB RightSB CAP
include : HSerifs slabType CAP 0 SB RightSB
eject-contour 'serifRT'
eject-contour 'serifRB'

create-glyph "rightHalfH.\(suffix)" : glyph-proc
include : MarkSet.capital
include : LeaningAnchor.Above.VBar.r RightSB
include : LeaningAnchor.Below.VBar.r RightSB
include : Body SB RightSB CAP
eject-contour 'strokeL'
include : RightHalfBody SB RightSB CAP
include : HSerifs slabType CAP 0 SB RightSB
eject-contour 'serifLT'
eject-contour 'serifLB'

create-glyph "leftHalfSmcpH.\(suffix)" : glyph-proc
include : MarkSet.e
include : LeaningAnchor.Above.VBar.l SB
include : LeaningAnchor.Below.VBar.l SB
include : Body SB RightSB XH
eject-contour 'strokeR'
include : LeftHalfBody SB RightSB XH
include : HSerifs slabType XH 0 SB RightSB
eject-contour 'serifRT'
eject-contour 'serifRB'

create-glyph "rightHalfSmcpH.\(suffix)" : glyph-proc
include : MarkSet.e
include : LeaningAnchor.Above.VBar.r RightSB
include : LeaningAnchor.Below.VBar.r RightSB
include : Body SB RightSB XH
eject-contour 'strokeL'
include : RightHalfBody SB RightSB XH
include : HSerifs slabType XH 0 SB RightSB
eject-contour 'serifLT'
eject-contour 'serifLB'
Expand Down Expand Up @@ -236,7 +240,6 @@ glyph-block Letter-Latin-Upper-H : begin
include : HSerifs slabType XH 0 df.leftSB xm df.mvs
include : MidHook.m df XH


select-variant 'H' 'H'
link-reduced-variant 'H/sansSerif' 'H' MathSansSerif
select-variant 'H/descBase' (shapeFrom -- 'H')
Expand All @@ -247,15 +250,20 @@ glyph-block Letter-Latin-Upper-H : begin
select-variant 'cyrl/En/descBase' (shapeFrom -- 'H')
select-variant 'leftHalfH' 0x2C75
select-variant 'rightHalfH' 0xA7F5
select-variant 'grek/Heta' 0x370 (shapeFrom -- 'leftHalfH')

select-variant 'smcpH' 0x29C (follow -- 'H')
select-variant 'leftHalfSmcpH' 0x2C76 (follow -- 'leftHalfH')
select-variant 'rightHalfSmcpH' 0xA7F6 (follow -- 'rightHalfH')
select-variant 'cyrl/en' 0x43D (shapeFrom -- 'smcpH')
select-variant 'cyrl/en/descBase' (shapeFrom -- 'smcpH')
select-variant 'cyrl/en.BGR' (shapeFrom -- 'smcpH')
select-variant 'grek/heta' 0x371 (shapeFrom -- 'leftHalfSmcpH')

alias 'grek/Heta' 0x370 'leftHalfH'

create-glyph 'grek/heta' 0x371 : glyph-proc
include : MarkSet.e
include : LeftHalfBody SB RightSB XH
include : HSerifs SLAB-SMALL-HETA XH 0 SB RightSB

derive-composites 'HDescender' 0x2C67 'H/descBase' [CyrDescender.rSideJut RightSB 0]

Expand All @@ -280,18 +288,6 @@ glyph-block Letter-Latin-Upper-H : begin
select-variant 'cyrl/NjeKomi' 0x050A
select-variant 'cyrl/njeKomi' 0x050B

create-glyph 'mathbb/H' 0x210D : glyph-proc
include : MarkSet.capital
include : VBar.l SB 0 CAP BBS
include : VBar.r RightSB 0 CAP BBS
include : VBar.l (SB + BBD) 0 CAP BBS
include : VBar.r (RightSB - BBD) 0 CAP BBS
include : HBar.m (SB + BBD) (RightSB - BBD) (CAP * HBarPos) BBS
include : HBar.t SB (SB + BBD) CAP BBS
include : HBar.t (RightSB - BBD) RightSB CAP BBS
include : HBar.b SB (SB + BBD) 0 BBS
include : HBar.b (RightSB - BBD) RightSB 0 BBS

derive-glyphs 'HCedilla' 0x1E28 'H' : lambda [src gr] : glyph-proc
local shift : Width + SB - Middle + [HSwToV HalfStroke]
include [refer-glyph 'cedillaBelow']
Expand All @@ -317,12 +313,24 @@ glyph-block Letter-Latin-Upper-H : begin
derive-glyphs 'cyrl/EnHook' 0x4C7 'cyrl/En/descBase' DProcCapitalHeng
derive-glyphs 'cyrl/enHook' 0x4C8 'cyrl/en/descBase' DProcSmallHeng

derive-glyphs 'cyrl/EnLHook' 0x528 'cyrl/En' : lambda [src srl] : glyph-proc
derive-glyphs 'cyrl/EnHookLeft' 0x528 'cyrl/En' : lambda [src srl] : glyph-proc
include [refer-glyph src] AS_BASE ALSO_METRICS
eject-contour 'serifLB'
include : PalatalHook.lExt SB 0

derive-glyphs 'cyrl/enLHook' 0x529 'cyrl/en' : lambda [src srl] : glyph-proc
derive-glyphs 'cyrl/enHookLeft' 0x529 'cyrl/en' : lambda [src srl] : glyph-proc
include [refer-glyph src] AS_BASE ALSO_METRICS
eject-contour 'serifLB'
include : PalatalHook.lExt SB 0

create-glyph 'mathbb/H' 0x210D : glyph-proc
include : MarkSet.capital
include : VBar.l SB 0 CAP BBS
include : VBar.r RightSB 0 CAP BBS
include : VBar.l (SB + BBD) 0 CAP BBS
include : VBar.r (RightSB - BBD) 0 CAP BBS
include : HBar.m (SB + BBD) (RightSB - BBD) (CAP * HBarPos) BBS
include : HBar.t SB (SB + BBD) CAP BBS
include : HBar.t (RightSB - BBD) RightSB CAP BBS
include : HBar.b SB (SB + BBD) 0 BBS
include : HBar.b (RightSB - BBD) RightSB 0 BBS
Loading

0 comments on commit 0a70f55

Please sign in to comment.