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

Some renames

Browse source
This commit is contained in:
be5invis 2024-08-05 19:41:57 -07:00
parent e0534f71f5
commit 15a0c47ebc
17 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/font-glyphs/src/letter-like/fraktur/lower-agq.ptl
View file

@ -12,7 +12,7 @@ glyph-block LetterLike-Fraktur-Lower-AQ : begin
define [LeftHalfShape mode box] : fraktur-stroke S
corner box.right [post@slope SlopeB]
corner [box.xp PHexTop] box.top
g2.down.mid (box.left - OX) [mix@ 0.5]
g2.down.mid (box.left - OX) [pre@mix@post 0.5]
corner [box.xp PHexBot] box.bot
corner box.right [pre@slope SlopeA]

2
packages/font-glyphs/src/letter-like/fraktur/lower-bopvw.ptl
View file

@ -12,7 +12,7 @@ glyph-block LetterLike-Fraktur-Lower-BOPVW : begin
define [ORightShape mode profile oBox] : fraktur-stroke profile
corner oBox.left [post@slope SlopeA]
[cg2.sr SlopeB].start [oBox.xp PHexTop] oBox.top
g2.down.mid (oBox.right - OX) [mix@ 0.5]
g2.down.mid (oBox.right - OX) [pre@mix@post 0.5]
[g2c.sl SlopeA].start [oBox.xp PHexBot] oBox.bot
corner oBox.left [pre@slope SlopeB]
match mode

8
packages/font-glyphs/src/letter-like/fraktur/lower-fkrt.ptl
View file

@ -39,7 +39,7 @@ glyph-block LetterLike-Fraktur-Lower-F : begin
corner (post@ <-> DecoSizeX) (post@ <-> DecoSizeY)
corner (box.xMid - 0.75 * TBalance) box.top
corner pre@ [post@slope SlopeB]
corner [mix@ PHexBot] box.bottom
corner [pre@mix@post PHexBot] box.bottom
corner [box.xp 0.875] [pre@slope SlopeA]
include : fraktur-stroke F
@ -49,12 +49,12 @@ glyph-block LetterLike-Fraktur-Lower-F : begin
include : fraktur-stroke F
g2.up.start [centerStroke.first 1].x xBox.top
arch.rhs (sw -- F.thick) (blendPost -- {}) [mix xBox.top box.top 0.75] 0.7
g2 box.right [mix@ 0.5]
g2 [mix@ 0.25] xBox.top
g2 box.right [pre@mix@post 0.5]
g2 [pre@mix@post 0.25] xBox.top
define [RTBottom box p] : list
corner pre@ [post@slope SlopeB]
corner [mix@ PHexBot] box.bottom
corner [pre@mix@post PHexBot] box.bottom
corner [box.xp p] [pre@slope SlopeA]
create-glyph "frak/r" 0x1D52F : glyph-proc

2
packages/font-glyphs/src/letter-like/fraktur/lower-hy.ptl
View file

@ -18,7 +18,7 @@ glyph-block LetterLike-Fraktur-Lower-HY : begin
define [RightHalfShape mode box] : fraktur-stroke S
corner box.left [post@slope SlopeA]
[cg2.sr SlopeB].start [box.xp PHexTop] box.top
straight.down.mid box.right [mix@ 0.5]
straight.down.mid box.right [pre@mix@post 0.5]
corner [box.xp PHexTop] box.bottom
create-glyph "frak/h" 0x1D525 : glyph-proc

4
packages/font-glyphs/src/letter-like/fraktur/lower-s.ptl
View file

@ -12,9 +12,9 @@ glyph-block LetterLike-Fraktur-Lower-S : begin
define [HalfS box] : fraktur-stroke S
corner box.right box.top
~~~ [g2 [mix@ 0.5] (pre@ <-> 0.5 * FHook)]
~~~ [g2 [pre@mix@post 0.5] (pre@ <-> 0.5 * FHook)]
corner [box.xp : 0.5 * PHexTop] pre@
~~~ [g2.down.mid box.left [mix@ 0.5]]
~~~ [g2.down.mid box.left [pre@mix@post 0.5]]
corner pre@ [post@slope SlopeA]
corner box.xMid box.yMid

4
packages/font-glyphs/src/letter-like/fraktur/lower-z.ptl
View file

@ -18,11 +18,11 @@ glyph-block LetterLike-Fraktur-Lower-Z : begin
corner box.left (post@ <+> DecoSizeY)
corner (box.left + DecoSizeX) [post@slope SlopeA]
[cg2.sr SlopeB].start [box.xp PHexTop] box.top
~~~ [g2.down.mid box.right [mix@ 0.45]]
~~~ [g2.down.mid box.right [pre@mix@post 0.45]]
[g2c.sl SlopeA].end [box.xp 0.375] [box.yp 0.55]
local lowerLoop : include : fraktur-stroke S
[cg2.sr SlopeA].start [upperLoop.last].x [upperLoop.last].y
g2.down.mid (box.right - OX) [mix@ 0.5]
g2.down.mid (box.right - OX) [pre@mix@post 0.5]
hookend (sw -- S.thick) box.bottom
g2 box.left (pre@ <+> SHook)

4
packages/font-glyphs/src/letter-like/fraktur/upper-au.ptl
View file

@ -22,7 +22,7 @@ glyph-block LetterLike-Fraktur-Upper-A : begin
~~~ [Wave.vc Wave.DepthX]
g2.ru.mid aBox.left (post@ <-> DecoSizeY) [change-pen S]
arch.rhs (sw -- S.thick) (blendPre -- null) aBox.top 0.4
straight.down.mid [aBox.xp 0.5] [mix@ 0.375]
straight.down.mid [aBox.xp 0.5] [pre@mix@post 0.375]
[flatc.sl SlopeA].end (aBox.left - 0.25 * DecoSizeX) [post@slope SlopeB]
corner [aBox.xp PHexBot] aBox.bot
corner aBox.right [pre@slope SlopeA]
@ -42,7 +42,7 @@ glyph-block LetterLike-Fraktur-Upper-A : begin
include : fraktur-stroke S
LTDecoration.g2 [mix uDeco.left uBody.left 0.5] uBody.top nothing
g2.down.mid uBody.left [mix@ 0.45]
g2.down.mid uBody.left [pre@mix@post 0.45]
corner uDeco.left [post@slope SlopeB]
corner [uDeco.xp PHexBot] uDeco.bot
corner uDeco.right [pre@slope SlopeA]

14
packages/font-glyphs/src/letter-like/fraktur/upper-bvw.ptl
View file

@ -25,11 +25,11 @@ glyph-block LetterLike-Fraktur-Upper-BVW : begin
arch.rhs (sw -- S.thick) (blendPre -- null) deco.top 0.4
match mode
[Just "P"] : list
flat body.left [mix@ 0.375]
flat body.left [pre@mix@post 0.375]
virt pre@ body.bot
curl body.left Descender
_ : list
straight.down.mid body.left [mix@ 0.375]
straight.down.mid body.left [pre@mix@post 0.375]
corner deco.left [post@slope SlopeB]
virt [body.xp : pRight * PHexBot] body.bot
@ -45,12 +45,12 @@ glyph-block LetterLike-Fraktur-Upper-BVW : begin
fraktur-stroke S
corner [leftStroke.last].x [leftStroke.last].y
corner [body.xp PHexBot] body.bot
decor@ : g2.up.mid (body.right - OX) [mix@ 0.5]
decor@ : g2.up.mid (body.right - OX) [pre@mix@post 0.5]
corner [body.xp 0.625] [body.yp 0.55]
fraktur-stroke S
corner deco.left [post@slope SlopeA]
corner [body.xp PHexTop] body.top
decor@ : g2.down.mid body.right [mix@ 0.5]
decor@ : g2.down.mid body.right [pre@mix@post 0.5]
corner [body.xp 0.625] [body.yp 0.55]
corner deco.left [pre@slope : 0.5 * SlopeA]
@ -71,7 +71,7 @@ glyph-block LetterLike-Fraktur-Upper-BVW : begin
~~~ [Wave.vDistAfter : 1.5 * Wave.DepthX]
[g2c.sr SlopeA].end (body.right + 0.25 * DecoSizeX) ([body.yp 0.75] + S.thick)
~~~ [curl [pre@tang-in 1] [pre@tang-in SlopeB]]
g2 (pre@ <-> Wave.DepthX) [mix@ 0.5]
g2 (pre@ <-> Wave.DepthX) [pre@mix@post 0.5]
arch.rhs (sw -- S.thick) (blendPre -- {}) body.top
corner (body.left - S.thick) (pre@ <-> ArchDepthA)
intersection [leftStroke.withPen CutMaskLeft] [MaskAbove body.yMid]
@ -90,7 +90,7 @@ glyph-block LetterLike-Fraktur-Upper-BVW : begin
~~~ [Wave.vDistAfter : 1.5 * Wave.DepthX]
[g2c.sr SlopeA].end (body.right + 0.25 * DecoSizeX) ([body.yp 0.75] + S.thick)
~~~ [curl [pre@tang-in 1] [pre@tang-in SlopeB]]
g2 (pre@ <-> Wave.DepthX) [mix@ 0.5]
g2 (pre@ <-> Wave.DepthX) [pre@mix@post 0.5]
arch.rhs (sw -- S.thick) (blendPre -- {}) body.top
corner (body.left - S.thick) (pre@ <-> ArchDepthA)
@ -111,7 +111,7 @@ glyph-block LetterLike-Fraktur-Upper-BVW : begin
~~~ [Wave.vDistAfter : 0.75 * Wave.DepthX]
[g2c.sr SlopeA].end (body.right + 0.5 * DecoSizeX) ([body.yp 0.75] + S.thick)
~~~ [curl [pre@tang-in 1] [pre@tang-in SlopeB]]
g2 (pre@ <-> 0.75 * Wave.DepthX) [mix@ 0.5]
g2 (pre@ <-> 0.75 * Wave.DepthX) [pre@mix@post 0.5]
arch.rhs (sw -- M.thick) (blendPre -- {}) body.top
corner body.xMid (body.top - 0.5 * Wave.DepthY)
~~~ [arch.rhs (sw -- M.thick) (blendPre -- {}) (blendPost -- {}) body.top]

4
packages/font-glyphs/src/letter-like/fraktur/upper-ceg.ptl
View file

@ -26,7 +26,7 @@ glyph-block LetterLike-Fraktur-Upper-CEG : begin
# Top-right stroke
include : fraktur-stroke S
g2 right top
g2.left.mid [mix@ 0.5] (top - 0.5 * FHook)
g2.left.mid [pre@mix@post 0.5] (top - 0.5 * FHook)
corner (post@ <+> deco) top
corner xCenter (top - deco)
@ -64,7 +64,7 @@ glyph-block LetterLike-Fraktur-Upper-CEG : begin
flat right (pre@ <+> ArchDepthA)
decor@ : curl pre@ (post@ <-> 0.5 * ArchDepthB)
decor@@ : g2 [post@tang-out 1] [post@tang-out SlopeB]
decor@ : corner [mix@rev PHexTop] [post@slope SlopeA]
decor@ : corner [post@mix@pre PHexTop] [post@slope SlopeA]
decor@ : corner xCenter [mix waveTop waveBot 0.5]
return : object xCenter waveTop waveBot

6
packages/font-glyphs/src/letter-like/fraktur/upper-doq.ptl
View file

@ -18,7 +18,7 @@ glyph-block LetterLike-Fraktur-DOQ : begin
local box : S.box CAP 0 df.leftSB df.rightSB
local frame : include : fraktur-stroke S
cg2.ru.start (box.left - 0.25 * DecoSizeX) box.bottom
~~~ [g2.right.mid [mix@ (1/3)] (pre@ <+> Wave.DepthY - O)]
~~~ [g2.right.mid [pre@mix@post (1/3)] (pre@ <+> Wave.DepthY - O)]
g2 [box.xp 0.625] (pre@ <+> O)
~~~ ~~~ ~~~ [archv]
~~~ ~~~ [straight.up.mid (box.right - OX) [box.yp 0.5]]
@ -38,7 +38,7 @@ glyph-block LetterLike-Fraktur-DOQ : begin
define [FrakOShape box] : fraktur-stroke S
cg2.ru.start (box.left - 0.25 * DecoSizeX) box.bottom
~~~ [g2.right.mid [mix@ (1/3)] (pre@ <+> Wave.DepthY - O)]
~~~ [g2.right.mid [pre@mix@post (1/3)] (pre@ <+> Wave.DepthY - O)]
g2 [box.xp 0.625] (pre@ <+> O)
~~~ ~~~ ~~~ [archv]
~~~ ~~~ [straight.up.mid (box.right - OX) [box.yp 0.5]]
@ -46,7 +46,7 @@ glyph-block LetterLike-Fraktur-DOQ : begin
~~~ ~~~ [corner [box.xp 0.25] (box.top - FHook)]
~~~ ~~~ [corner (pre@ <-> DecoSizeX) (pre@ <+> DecoSizeY)]
~~~ ~~~ ~~~ [Wave.vc (0.75 * -Wave.DepthX)]
~~~ [corner [mix@rev (1/3)] (post@ <+> Wave.DepthY - O)]
~~~ [corner [post@mix@pre (1/3)] (post@ <+> Wave.DepthY - O)]
create-glyph "frak/O" 0x1D512 : glyph-proc
local df : include : UpperDf 1

6
packages/font-glyphs/src/letter-like/fraktur/upper-hkry.ptl
View file

@ -26,7 +26,7 @@ glyph-block LetterLike-Fraktur-Upper-HKR : begin
local c : include : fraktur-stroke S
flat box.left [post@slope SlopeA]
corner [box.xp PHexTop] box.top
g2.down.mid box.right [mix@ 0.5]
g2.down.mid box.right [pre@mix@post 0.5]
flat [box.xp 0.625] [box.yp 0.55]
curl box.left [pre@slope SlopeA]
@ -37,7 +37,7 @@ glyph-block LetterLike-Fraktur-Upper-HKR : begin
# Leg
include : fraktur-stroke S
[g2.sr SlopeA].start xLegStart yLegStart
flat [mix@ 0.75] (pre@ <-> 0.6 * ArchDepthB)
flat [pre@mix@post 0.75] (pre@ <-> 0.6 * ArchDepthB)
decor@ : curl pre@ (post@ <+> 2 * DecoSizeY)
corner (box.right + 0.5 * DecoSizeX) box.bot
corner (pre@ <+> DecoSizeX) (pre@ <+> DecoSizeY)
@ -85,7 +85,7 @@ glyph-block LetterLike-Fraktur-Upper-HKR : begin
g2.ru.mid deco.left (post@ <-> DecoSizeY) [change-pen S]
arch.rhs (blendPre -- {}) body.top 0.625
flat body.left (body.top - 0.6 * ArchDepthA)
curl (pre@ <+> 0) [min@ yConnB [mix@ 0.5]]
curl (pre@ <+> 0) [min@ yConnB [pre@mix@post 0.5]]
corner deco.left (post@ <+> 2 * DecoSizeY)
g2c.right.end (post@ <-> DecoSizeX) [S.yb 0]
corner [body.xp : 0.5 * pRight] (pre@ <+> DecoSizeY)

2
packages/font-glyphs/src/letter-like/fraktur/upper-l.ptl
View file

@ -20,7 +20,7 @@ glyph-block LetterLike-Fraktur-Upper-L : begin
g2 lBox.right (post@ <-> SHook)
hookstart (sw -- S.thick) lBox.top
g2 [lBox.xp 0.125] (pre@ <-> ArchDepthA)
~~~ [g2.down.mid (pre@ <+> 1.5 * Wave.DepthX) [mix@ 0.5]]
~~~ [g2.down.mid (pre@ <+> 1.5 * Wave.DepthX) [pre@mix@post 0.5]]
g2c.ld.end lBox.left lBox.bottom
~~~ [g2 [pre@tang-out 1] [pre@tang-out 1]]
~~~ ~~~ [Wave.h (-O)]

10
packages/font-glyphs/src/letter-like/fraktur/upper-mnp.ptl
View file

@ -47,10 +47,10 @@ glyph-block LetterLike-Fraktur-Upper-MNP : begin
local rightStroke : include : fraktur-stroke M
corner (post@ <+> DecoSizeX) (post@ <+> DecoSizeY)
corner (body.right + 0.25 * DecoSizeX) body.bottom
~~~ [straight.up.mid (pre@ <-> Wave.DepthX) [mix@ 0.5]]
~~~ [straight.up.mid (pre@ <-> Wave.DepthX) [pre@mix@post 0.5]]
corner (pre@ <+> 0.25 * DecoSizeX) ([body.yp 0.75] + S.thick)
~~~ [curl [pre@tang-in 1] [pre@tang-in SlopeB]]
g2 (pre@ <-> 0.75 * Wave.DepthX) [mix@ 0.5]
g2 (pre@ <-> 0.75 * Wave.DepthX) [pre@mix@post 0.5]
arch.rhs (sw -- M.thick) (blendPre -- {}) body.top
corner (body.xMid - 0.25 * Wave.DepthX) (body.top - 0.5 * Wave.DepthY)
~~~ [arch.rhs (sw -- M.thick) (blendPre -- {}) (blendPost -- {}) body.top]
@ -59,7 +59,7 @@ glyph-block LetterLike-Fraktur-Upper-MNP : begin
local middleStroke : include : fraktur-stroke M
corner (post@ <-> DecoSizeX) (post@ <+> DecoSizeY)
corner deco.xMid deco.bot
flat post@ [mix@ 0.5]
flat post@ [pre@mix@post 0.5]
# flat post@ (pre@ <+> ArchDepthB)
flat post@ ([body.yp 0.75] + S.thick)
curl (body.xMid - 0.25 * Wave.DepthX) (body.top - 0.5 * Wave.DepthY)
@ -77,10 +77,10 @@ glyph-block LetterLike-Fraktur-Upper-MNP : begin
fraktur-stroke S
corner (post@ <+> DecoSizeX) (post@ <+> DecoSizeY)
corner (body.right + 0.25 * DecoSizeX) body.bottom
~~~ [straight.up.mid (pre@ <-> Wave.DepthX) [mix@ 0.5]]
~~~ [straight.up.mid (pre@ <-> Wave.DepthX) [pre@mix@post 0.5]]
corner pre@ ([body.yp 0.75] + S.thick)
~~~ [curl [pre@tang-in 1] [pre@tang-in SlopeB]]
g2 (pre@ <-> Wave.DepthX) [mix@ 0.5]
g2 (pre@ <-> Wave.DepthX) [pre@mix@post 0.5]
arch.rhs (sw -- S.thick) (blendPre -- {}) body.top
corner (body.left - S.thick) (pre@ <-> ArchDepthA)
leftStroke.maskLeft

4
packages/font-glyphs/src/letter-like/fraktur/upper-s.ptl
View file

@ -19,13 +19,13 @@ glyph-block LetterLike-Fraktur-S : begin
include : fraktur-stroke S
g2.ld.start box.right box.top
~~~ [g2.left.mid [mix@ : 1/3] (pre@ <-> 0.75 * Wave.DepthY - O)]
~~~ [g2.left.mid [pre@mix@post : 1/3] (pre@ <-> 0.75 * Wave.DepthY - O)]
g2.left.mid [box.xp 0.375] (pre@ <-> O)
~~~ [archv]
flat box.left (box.top - SmallArchDepthA * (CAP / XH))
curl box.left (box.bot + SmallArchDepthB * (CAP / XH))
~~~ [arch.lhs (sw -- S.thick) box.bottom]
~~~ [g2.up.mid (box.right - OX) [mix@ 0.5]]
~~~ [g2.up.mid (box.right - OX) [pre@mix@post 0.5]]
~~~ ~~~ [arcvh]
~~~ [g2.left.mid [box.xp 0.625] (box.yMid + 0.25 * Wave.DepthY - O)]
~~~ ~~~ [g2.left.mid [box.xp 0.3] (box.yMid - 0.25 * Wave.DepthY + O) [change-pen T]]

2
packages/font-glyphs/src/letter-like/fraktur/x.ptl
View file

@ -15,7 +15,7 @@ glyph-block LetterLike-Fraktur-X : begin
include : fraktur-stroke pen
corner (post@ <-> DecoSizeX) (post@ <-> DecoSizeY)
corner box.left box.top
straight.down.mid box.xMid [mix@ 0.5]
straight.down.mid box.xMid [pre@mix@post 0.5]
corner box.left box.bot
corner (pre@ <-> DecoSizeX) (pre@ <+> DecoSizeY)

2
packages/font-glyphs/src/meta/macros.ptl
View file

@ -294,7 +294,7 @@ define-macro glyph-block : syntax-rules
define booleFnImports `[union intersection difference with-knockout]
define drvCoordImports `[pre@ post@ mix@ mix@rev pre@slope post@slope min@ max@
define drvCoordImports `[pre@ post@ pre@mix@post post@mix@pre pre@slope post@slope min@ max@
decor@ decor@@ decor@@@ pre@tang-in post@tang-in pre@tang-out post@tang-out]
dirty `[$GlyphBlocks$.push : lambda [$Capture_Ext$] : begin \\

8
packages/font-kits/src/derived-coordinates.mjs
View file

@ -25,10 +25,10 @@ export function SetupBuilders(_bindings) {
"pre@tang-in": s => new CDeltaPre(-TINY * s),
"post@tang-in": s => new CDeltaPost(-TINY * s),
// mix@: mix between pre and post point's X or Y coordinates
// usage [mix@ proportion] or [mix@ proportion delta]
"mix@": (p, delta) => new CMixCoord(p, delta),
"mix@rev": (p, delta) => new CMixCoord(1 - p, delta),
// pre@mix@post: mix between pre and post point's X or Y coordinates
// usage [pre@mix@post proportion] or [pre@mix@post proportion delta]
"pre@mix@post": (p, delta) => new CMixCoord(p, delta),
"post@mix@pre": (p, delta) => new CMixCoord(1 - p, delta),
// pre@slope, post@slope: Get the coordiante using the pre/post point's coordinate and a
// slope. An optional delta can be added to the result. See the definitions for more