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

Cleanup of overlays

Browse source
This commit is contained in:
be5invis 2023-07-01 23:01:50 -07:00
parent 53235e9f9a
commit 994a46706a
15 changed files with 112 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
font-src/glyphs/auto-build/accents.ptl
View file

@ -68,7 +68,7 @@ glyph-block AutoBuild-Accents : begin
local foundDecompositions {.}
local goalCodes : range 0x0000 0xFFFF
local goalCodes : range 0x0000 0x1FFFF
foreach code goalCodes : if [not : glyphStore.queryByUnicode code] : do
local parts { }
local allFound true

2
font-src/glyphs/auto-build/composite.ptl
View file

@ -1393,7 +1393,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
list 0x23E8 { 'one.lnum' 'zero.lnum' } 'capital'
createPhoneticLigatures ToLetter 'thSlash' 1 2 stdShrink 1 : list
list 0x1D7A { 't/phoneticLeft1' 'h' 'wideSlashOver' } 'b'
list 0x1D7A { 't/phoneticLeft1' 'h' 'wideSlash' } 'b'
glyph-block Autobuild-Double-Emotions : begin
glyph-block-import CommonShapes

3
font-src/glyphs/letter/latin-ext/long-s.ptl
View file

@ -244,9 +244,6 @@ glyph-block Letter-Latin-Long-S : begin
x2 -- x2
y2 -- y2
derive-composites "eshDblBar" 0x1DF0B "esh" "dblBarOver"
derive-composites "eshCurlyTailDblBar" 0x1DF0C "eshCurlyTail" "dblBarOver"
create-glyph "iFishHook" 0x27F : glyph-proc
include : MarkSet.p
local balance : IBalance2 : DivFrame 1

2
font-src/glyphs/letter/latin/k.ptl
View file

@ -580,8 +580,6 @@ glyph-block Letter-Latin-K : begin
select-variant 'grek/KaiSymbol' 0x3CF
derive-composites 'currency/kipSign' 0x20AD 'K' 'longBarOver'
glyph-block-import Letter-Blackboard : BBS BBD BBBarLeft
define [BBKLegShape top left right] : begin
local kDiag : DiagCorDs (top / 2) (right - left) BBD

6
font-src/glyphs/letter/latin/lower-g.ptl
View file

@ -50,7 +50,7 @@ glyph-block Letter-Latin-Lower-G : begin
corner gm XH
set-base-anchor 'overlay' Middle [mix (Descender + O) groundy 0.5]
set-base-anchor 'strikeOnBowl' Middle (XH / 2)
set-base-anchor 'strike' Middle (XH / 2)
create-forked-glyph 'gBar.doubleStorey' : OverlayW obwDoubleStorey
@ -80,7 +80,7 @@ glyph-block Letter-Latin-Lower-G : begin
corner gm XH
set-base-anchor 'overlay' Middle [mix (Descender + O) groundy 0.5]
set-base-anchor 'strikeOnBowl' Middle (XH / 2)
set-base-anchor 'strike' Middle (XH / 2)
create-forked-glyph 'gBar.openDoubleStorey' : OverlayW obwDoubleStorey
@ -158,7 +158,7 @@ glyph-block Letter-Latin-Lower-G : begin
create-glyph "g.\(suffix)" : glyph-proc
include : MarkSet.p
set-base-anchor 'overlay' Middle (XH / 2)
set-base-anchor 'strikeOnBowl' Middle (XH / 2)
set-base-anchor 'strike' Middle (XH / 2)
define df : DivFrame 1
include : bodyShape df XH
include : hookShape df (XH - hookStart)

2
font-src/glyphs/letter/latin/lower-m.ptl
View file

@ -287,7 +287,7 @@ glyph-block Letter-Latin-Lower-M : begin
CreateAccentedComposition 'mTildeOver' 0x1D6F 'm' 'tildeOverWideDivM'
derive-composites 'currency/millSign' 0x20A5 'm' 'slashOver'
derive-composites 'currency/millSign' 0x20A5 'm' 'shortSlash'
glyph-block-import Letter-Blackboard : BBS BBD BBBarLeft
create-glyph 'mathbb/m' 0x1D55E : glyph-proc

2
font-src/glyphs/letter/latin/lower-p.ptl
View file

@ -52,7 +52,7 @@ glyph-block Letter-Latin-Lower-P : begin
include : Body
include : Serifs
set-base-anchor 'overlayOnExtension' (SB + 0.5 * Stroke * HVContrast) yOverlay
set-base-anchor 'overlay' Middle (XH / 2)
set-base-anchor 'strike' Middle (XH / 2)
create-glyph "pPalatalHook.\(suffix)" : glyph-proc
include [refer-glyph "p.\(suffix)"] AS_BASE ALSO_METRICS

6
font-src/glyphs/letter/latin/lower-y.ptl
View file

@ -258,7 +258,7 @@ glyph-block Letter-Latin-Lower-Y : begin
define Shapes : GenNonCursiveShape straightBar bottomShape slabKind
create-glyph "y.\(suffix)" : glyph-proc
include : MarkSet.p
set-base-anchor 'overlay' Middle (XH / 2)
set-base-anchor 'strike' Middle (XH / 2)
set-base-anchor 'yBelowDot' (RightSB - 0.5 * DotRadius) (Descender + AccentStackOffset + DotRadius)
include : Shapes.SmallYShape XH Descender
@ -274,13 +274,13 @@ glyph-block Letter-Latin-Lower-Y : begin
create-glyph "yHookTop.\(suffix)" : glyph-proc
include : MarkSet.p
set-base-anchor 'overlay' Middle (XH / 2)
set-base-anchor 'strike' Middle (XH / 2)
set-base-anchor 'yBelowDot' (RightSB - 0.5 * DotRadius) (Descender + AccentStackOffset + DotRadius)
include : Shapes.SmallYHookTopShape XH Descender
create-glyph "yCap.\(suffix)" : glyph-proc
include : MarkSet.capital
set-base-anchor 'overlay' Middle (XH / 2 - Descender)
set-base-anchor 'strike' Middle (XH / 2 - Descender)
include : Shapes.SmallYShape CAP 0
define Cursive : namespace

4
font-src/glyphs/letter/latin/u.ptl
View file

@ -305,8 +305,8 @@ glyph-block Letter-Latin-U : begin
include : FlipAround Middle (XH / 2)
CreateAccentedComposition 'uDieresis' 0xFC 'u' 'dieresisAbove'
CreateAccentedComposition 'uLongBarOver' 0x289 'u' 'longBarOver'
CreateAccentedComposition 'smcpUStroke' 0x1D7E 'smcpU' 'longBarOver'
CreateAccentedComposition 'uLongBarOver' 0x289 'u' 'hStrike'
CreateAccentedComposition 'smcpUStroke' 0x1D7E 'smcpU' 'hStrike'
# Sideways dieresis for U+1D1E
derive-glyphs "uDieresisSidewaysMark" null "dieresisAboveAlwaysUpright" : function [gns] : glyph-proc

12
font-src/glyphs/letter/latin/upper-b.ptl
View file

@ -49,15 +49,19 @@ glyph-block Letter-Latin-Upper-B : begin
flat (curvleft + CorrectionOMidX * stroke) offset
curl (barleft - O) offset [heading Leftward]
return : object bowl
define [BShape] : with-params [top [stroke : AdviceStroke2 2 3 top] [barPos BBarPos] [topArcShift 0] [topArcInnerShift 0] [serifTop false] [serifBot false]] : glyph-proc
include : BShapeArcsT dispiro top
include : VBar.l SB 0 top stroke
local dims : include : BShapeArcsT dispiro top
offset -- 0
stroke -- stroke
barPos -- barPos
topArcShift -- topArcShift
topArcInnerShift -- topArcInnerShift
include : VBar.l SB 0 top stroke
set-base-anchor 'strike' Middle (dims.bowl - 0.5 * stroke)
local sf : SerifFrame.fromDf [DivFrame 1] top 0
if serifTop : include sf.lt.outer
@ -163,8 +167,8 @@ glyph-block Letter-Latin-Upper-B : begin
select-variant 'smcpB' 0x299
alias 'cyrl/ve.upright' null 'smcpB'
derive-composites 'BBar' null 'B' 'longBarOver'
derive-composites 'smcpBBar' 0x1D03 'smcpB' 'longBarOver'
derive-composites 'BBar' null 'B' 'hStrike'
derive-composites 'smcpBBar' 0x1D03 'smcpB' 'hStrike'
create-glyph 'mathbb/B' 0x1D539 : glyph-proc
include : MarkSet.capital

2
font-src/glyphs/letter/latin/upper-r.ptl
View file

@ -154,7 +154,7 @@ glyph-block Letter-Latin-Upper-R : begin
include : tagged 'strokeR' : RightwardTailedBar (Width - SB * mul) 0 top
define [StrikeAnchor] : glyph-proc
set-base-anchor 'strikeOnBowl' Middle [mix [PBarPosY CAP Stroke : RBarPos CAP SLAB] CAP 0.5]
set-base-anchor 'strike' Middle [mix [PBarPosY CAP Stroke : RBarPos CAP SLAB] CAP 0.5]
define RConfig : SuffixCfg.weave
object # Leg shape

100
font-src/glyphs/marks/overlay.ptl
View file

@ -98,6 +98,7 @@ glyph-block Mark-Overlay : begin
rightEnd -- markMiddle + Width / 2 * para.diversityM
hs -- OverlayStroke / 2
# Overlay on stems
create-glyph 'barOver' 0x335 : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
@ -110,33 +111,6 @@ glyph-block Mark-Overlay : begin
include : HOverlayBar (markMiddle - LongJut * 0.75) (markMiddle + LongJut * 0.75) (XH / 2 + 0.5 * gap)
include : HOverlayBar (markMiddle - LongJut * 0.75) (markMiddle + LongJut * 0.75) (XH / 2 - 0.5 * gap)
create-glyph 'longBarOver' 0xE001 : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
include : HOverlayBar ([mix 0 SB 0.5] - Width) ([mix Width RightSB 0.5] - Width) (XH / 2)
create-glyph 'strikeThrough' 0x0336 : glyph-proc
set-width 0
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : HOverlayBar (0 - Width) (0) (XH / 2)
create-glyph 'longObliqueStrike' : glyph-proc
set-width 0
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
widths.center OverlayStroke
flat ([mix 0 SB 0.5] - Width) (0.4 * XH)
curl ([mix Width RightSB 0.5] - Width) (0.6 * XH)
create-glyph 'longObliqueStrikeOnBowl' : glyph-proc
set-width 0
set-mark-anchor 'strikeOnBowl' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
widths.center OverlayStroke
flat ([mix 0 SB 0.5] - Width) (0.4 * XH)
curl ([mix Width RightSB 0.5] - Width) (0.6 * XH)
create-glyph 'shortSlashOver' 0xE000 : glyph-proc
set-width 0
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
@ -147,6 +121,51 @@ glyph-block Mark-Overlay : begin
set-mark-anchor 'overlay' markMiddle (XH / 2) markMiddle (XH / 2)
include : FlatSlashShape markMiddle (XH / 2) (0.5 * OverlayStroke) (0.75) (-0.3)
# Slash on entire letter on blank (bowl)
create-glyph 'hStrike' : glyph-proc
set-width 0
set-mark-anchor 'strike' markMiddle (XH / 2) markMiddle (XH / 2)
include : HOverlayBar ([mix 0 SB 0.5] - Width) ([mix Width RightSB 0.5] - Width) (XH / 2)
create-glyph 'strikeThrough' 0x0336 : glyph-proc
set-width 0
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : HOverlayBar (0 - Width) (0) (XH / 2)
create-glyph 'oblStrike' : glyph-proc
set-width 0
set-mark-anchor 'strike' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
widths.center OverlayStroke
flat ([mix 0 SB 0.5] - Width) (0.4 * XH)
curl ([mix Width RightSB 0.5] - Width) (0.6 * XH)
# Slashes
create-glyph 'shortSlash' 0x337 : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
flat (SB - O * 3 + fine - Width) (XH * (-0.1)) [widths fine fine]
curl (RightSB + O * 3 - fine - Width) (XH * 1.1)
create-glyph 'longSlash' 0x338 : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
flat (SB - O * 3 + fine - Width) (XH * 0.5 - CAP * 0.6) [widths fine fine]
curl (RightSB + O * 3 - fine - Width) (XH * 0.5 + CAP * 0.6)
create-glyph 'wideSlash' : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
flat (SB + O * 3 + fine - Width) (XH * (-0.1)) [widths fine fine]
curl (RightSB - O * 3 - fine - Width) (XH * 1.1)
# Arrow overlays
create-glyph 'arrSlashOver' : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
@ -203,30 +222,7 @@ glyph-block Mark-Overlay : begin
flat (Middle - Width - dx) (XH / 2 + gap) [widths fine fine]
curl (Middle - Width + dx) (XH / 2 + gap)
create-glyph 'slashOver' 0x337 : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
flat (SB - O * 3 + fine - Width) (XH * (-0.1)) [widths fine fine]
curl (RightSB + O * 3 - fine - Width) (XH * 1.1)
create-glyph 'longSlashOver' 0x338 : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
flat (SB - O * 3 + fine - Width) (XH * 0.5 - CAP * 0.6) [widths fine fine]
curl (RightSB + O * 3 - fine - Width) (XH * 0.5 + CAP * 0.6)
create-glyph 'wideSlashOver' : glyph-proc
set-width 0
local fine : 0.375 * OverlayStroke
set-mark-anchor 'slash' markMiddle (XH / 2) markMiddle (XH / 2)
include : dispiro
flat (SB + O * 3 + fine - Width) (XH * (-0.1)) [widths fine fine]
curl (RightSB - O * 3 - fine - Width) (XH * 1.1)
# Half-XH marks for spacing modifiers
create-glyph 'leftTackOver' : glyph-proc
set-width 0
set-mark-anchor 'overlay' 0 0 0 0
@ -241,7 +237,6 @@ glyph-block Mark-Overlay : begin
include : VBar.m (-markExtend) (-XH / 4) (XH / 4) MarkStroke
include : HBar.m (-markExtend) (markExtend) 0 MarkStroke
# Half-XH marks for spacing modifiers
create-glyph 'upTackOver' : glyph-proc
set-width 0
set-mark-anchor 'overlay' 0 0 0 0
@ -298,6 +293,7 @@ glyph-block Mark-Overlay : begin
include : WithTransform [ApparentTranslate (-markMiddle) (-aboveMarkMid)]
refer-glyph 'leftHalfCircleAbove'
# Inner dots
glyph-block-export InnerDot
define [InnerDot x y kHeight fRound kdr _space _div] : begin
local space : fallback _space : InnerDot.spaceOfDf [DivFrame 1]

7
font-src/meta/aesthetics.ptl
View file

@ -339,12 +339,19 @@ define [MarksetDiv p sbMul me] : begin
MarkBottomRight zone
begin markTieAbove
begin markTieBelow
# Overlay on stems
set a.baseAnchors.overlay : new Anchor
* [mix a.baseAnchors.below.x a.baseAnchors.above.x me.OverlayPos]
* [mix a.baseAnchors.below.y a.baseAnchors.above.y me.OverlayPos]
# Slash over entire letter
set a.baseAnchors.slash : new Anchor
* [mix a.baseAnchors.below.x a.baseAnchors.above.x 0.5]
* [mix a.baseAnchors.below.y a.baseAnchors.above.y 0.5]
# Horizontal or near-horizontal strike on letter counter or bowl
set a.baseAnchors.strike : new Anchor
* [mix a.baseAnchors.below.x a.baseAnchors.above.x 0.5]
* [mix a.baseAnchors.below.y a.baseAnchors.above.y 0.5]
return a
return : object

65
font-src/meta/unicode-knowledge.ptl
View file

@ -114,18 +114,18 @@ export : define decompOverrides : object
0x197 { 'I' 'barOver' }
0x19A { 'l' 'barOver' }
0x1BB { 'two.lnum' 'longBarOver' }
0x23A { 'A' 'longSlashOver' }
0x23B { 'C' 'longSlashOver' }
0x23C { 'c' 'slashOver' }
0x23E { 'T' 'longSlashOver' }
0x244 { 'U' 'longBarOver' }
0x246 { 'E' 'longSlashOver' }
0x247 { 'e' 'slashOver' }
0x1BB { 'two.lnum' 'hStrike' }
0x23A { 'A' 'longSlash' }
0x23B { 'C' 'longSlash' }
0x23C { 'c' 'shortSlash' }
0x23E { 'T' 'longSlash' }
0x244 { 'U' 'hStrike' }
0x246 { 'E' 'longSlash' }
0x247 { 'e' 'shortSlash' }
0x248 { 'J' 'barOver' }
0x249 { 'j' 'barOver' }
0x24D { 'r' 'barOver' }
0x24F { 'y' 'longBarOver' }
0x24F { 'y' 'hStrike' }
0x386 { 'grek/Alpha' 'tonosGrekUpperTonos' }
0x388 { 'grek/Epsilon' 'tonosGrekUpperTonos' }
@ -148,8 +148,8 @@ export : define decompOverrides : object
0x47D { 'cyrl/broadOmega' 'cyrlPsiliAbove' 'cyrlPokrytieAbove' }
0x1D7C { 'latn/iota' 'barOver' }
0x1D7D { 'p' 'longBarOver' }
0x1D7F { 'latn/upsilon' 'longBarOver' }
0x1D7D { 'p' 'hStrike' }
0x1D7F { 'latn/upsilon' 'hStrike' }
0x1E9C { 'longs' 'shortSlashOver' }
0x1EDA { 'OHorn' 'acuteAbove' }
@ -168,28 +168,33 @@ export : define decompOverrides : object
0x1FE2 { 'grek/upsilon' 'dialytikaVariaAbove' }
0x1FE3 { 'grek/upsilon' 'dialytikaOxiaAbove' }
0x2c61 { 'l' 'dblBarOver' }
0x2c65 { 'a' 'slashOver' }
0x2c66 { 't' 'longSlashOver' }
0x20AD { 'K' 'hStrike' }
0xA74A { 'O' 'longBarOver' }
0xA74B { 'o' 'longBarOver' }
0xA7B8 { 'U' 'longSlashOver' }
0xA7B9 { 'u' 'slashOver' }
0x2c61 { 'l' 'dblBarOver' }
0x2c65 { 'a' 'shortSlash' }
0x2c66 { 't' 'longSlash' }
0xA74A { 'O' 'hStrike' }
0xA74B { 'o' 'hStrike' }
0xA7B8 { 'U' 'longSlash' }
0xA7B9 { 'u' 'shortSlash' }
0xA7BB { 'a' 'EgyptologicalYodAbove' }
0xA7BD { 'i' 'EgyptologicalYodAbove' }
0xA7BF { 'u' 'EgyptologicalYodAbove' }
0xA7A0 { 'G' 'longObliqueStrike' }
0xA7A1 { 'g' 'longObliqueStrikeOnBowl' }
0xA7A2 { 'K' 'longObliqueStrike' }
0xA7A3 { 'k' 'longObliqueStrike' }
0xA7A4 { 'N' 'longObliqueStrike' }
0xA7A5 { 'n' 'longObliqueStrike' }
0xA7A6 { 'R' 'longObliqueStrikeOnBowl' }
0xA7A7 { 'r' 'longObliqueStrike' }
0xA7A8 { 'S' 'longObliqueStrike' }
0xA7A9 { 's' 'longObliqueStrike' }
0xA7A0 { 'G' 'oblStrike' }
0xA7A1 { 'g' 'oblStrike' }
0xA7A2 { 'K' 'oblStrike' }
0xA7A3 { 'k' 'oblStrike' }
0xA7A4 { 'N' 'oblStrike' }
0xA7A5 { 'n' 'oblStrike' }
0xA7A6 { 'R' 'oblStrike' }
0xA7A7 { 'r' 'oblStrike' }
0xA7A8 { 'S' 'oblStrike' }
0xA7A9 { 's' 'oblStrike' }
0xAB30 { 'scripta' 'longBarOver' }
0xAB3F { 'turnc' 'slashOver' }
0xAB30 { 'scripta' 'hStrike' }
0xAB3F { 'turnc' 'shortSlash' }
0x1DF0B { 'esh' 'dblBarOver' }
0x1DF0C { 'eshCurlyTail' 'dblBarOver' }

2
font-src/otl/gpos-mark-mkmk.ptl
View file

@ -7,7 +7,7 @@ define MarkClasses {
'above' 'tieAbove' 'topLeft' 'topRight' 'grekUpperTonos' 'aboveBraceL' 'aboveBraceR'
'below' 'tieBelow' 'bottomLeft' 'bottomRight' 'trailing' 'lf' 'belowBraceL' 'belowBraceR'
'overlay' 'slash' 'strikeOnBowl'
'overlay' 'slash' 'strike'
'cvDecompose' 'enclosureInner' 'enclosureInnerFirstHalf' 'enclosureInnerSecondHalf'
'fracBuildUp'
}