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

Refine shape of flat 5 (#2030).

Browse source
This commit is contained in:
be5invis 2023-10-10 21:03:18 -07:00
parent 77f69d9aff
commit 18ddcad7da
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changes/27.2.1.md
View file

@ -1 +1,2 @@
* Refine shape of flat `5` (#2030).
* Fix `ss02`, `ss04`, `ss06`, `ss13`, `ss17`'s application on `i` and `j` (#2033). * Fix `ss02`, `ss04`, `ss06`, `ss13`, `ss17`'s application on `i` and `j` (#2033).

24
font-src/glyphs/number/5.ptl
View file

@ -35,12 +35,12 @@ glyph-block Digits-Five : begin
define [FiveShape] : with-params [ define [FiveShape] : with-params [
top bp pBarPosSwAdj [sw Stroke] [bbd 0] [obl 0] [zt 0] top bp pBarPosSwAdj [sw Stroke] [bbd 0] [obl 0] [zt 0]
[bottomShape FiveArcStroke] [bottomShape FiveArcStroke] [pXLeft 0.025]
] : glyph-proc ] : glyph-proc
local t1 : (top * bp + sw * pBarPosSwAdj) * 0.8 local t1 : (top * bp + sw * pBarPosSwAdj) * 0.8
local t2 : (top * bp + sw * pBarPosSwAdj) * 1.0 local t2 : (top * bp + sw * pBarPosSwAdj) * 1.0
local xLeft : [mix SB RightSB 0.025] + zt local xLeft : [mix SB RightSB pXLeft] + zt
local xright : [mix RightSB SB 0.05] - (OX - O) local xRight : [mix RightSB SB 0.05] - (OX - O)
local kGap : 0.144 - 0.1 * sw / t2 local kGap : 0.144 - 0.1 * sw / t2
@ -52,7 +52,7 @@ glyph-block Digits-Five : begin
local oblCor : Math.hypot 1 obl local oblCor : Math.hypot 1 obl
local xVBar : firstKnot.x - oblCor * [HSwToV sw] local xVBar : firstKnot.x - oblCor * [HSwToV sw]
local xVBarOffset : (top - firstKnot.y) * obl local xVBarOffset : (top - firstKnot.y) * obl
include : HBar.t [if zt SB (xVBar + xVBarOffset)] xright top sw include : HBar.t [if zt SB (xVBar + xVBarOffset)] xRight top sw
include : union include : union
intersection [Rect (firstKnot.y + sw) firstKnot.y 0 Width] : dispiro intersection [Rect (firstKnot.y + sw) firstKnot.y 0 Width] : dispiro
flat xVBar firstKnot.y [widths.rhs.heading (sw) Upward] flat xVBar firstKnot.y [widths.rhs.heading (sw) Upward]
@ -67,33 +67,33 @@ glyph-block Digits-Five : begin
Rect (t2 / 2 + t2 * kGap) (t2 / 2 - t2 * kGap) 0 Middle Rect (t2 / 2 + t2 * kGap) (t2 / 2 - t2 * kGap) 0 Middle
if (!bbd && SLAB) : include : VSerif.dr xright top [Math.min VJut ((top - t2) * 0.8)] if (!bbd && SLAB) : include : VSerif.dr xRight top [Math.min VJut ((top - t2) * 0.8)]
define FiveConfig : SuffixCfg.weave define FiveConfig : SuffixCfg.weave
object # upper-left-bar object # upper-left-bar
"upright" 0 "upright" 0
"oblique" (1 / 12) "oblique" (1 / 12)
object # middle object # middle
"arched" { FiveArcStroke DesignParameters.fiveBarPos 0 } "arched" { FiveArcStroke DesignParameters.fiveBarPos 0 0.025 }
"flat" { FiveFlatStroke (7 / 8 * DesignParameters.fiveBarPos) (1/3) } "flat" { FiveFlatStroke (7 / 8 * DesignParameters.fiveBarPos) (1/3) 0.05 }
foreach { suffix { obl { bottomShape pBarPos pBarPosSwAdj } } } [pairs-of FiveConfig] : do foreach { suffix { obl { bottomShape pBarPos pBarPosSwAdj pXLeft } } } [pairs-of FiveConfig] : do
create-glyph "five.lnum.\(suffix)" : glyph-proc create-glyph "five.lnum.\(suffix)" : glyph-proc
include : MarkSet.capital include : MarkSet.capital
include : FiveShape CAP pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (obl -- obl) include : FiveShape CAP pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (obl -- obl) (pXLeft -- pXLeft)
create-glyph "five.onum.\(suffix)" : glyph-proc create-glyph "five.onum.\(suffix)" : glyph-proc
include : OnumMarks.p include : OnumMarks.p
include : FiveShape CAP pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (obl -- obl) include : FiveShape CAP pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (obl -- obl) (pXLeft -- pXLeft)
include : ShiftDown include : ShiftDown
create-glyph "zhuangToneFive.\(suffix)" : glyph-proc create-glyph "zhuangToneFive.\(suffix)" : glyph-proc
include : MarkSet.capital include : MarkSet.capital
include : FiveShape CAP pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (zt -- ((RightSB - SB) * 0.05)) include : FiveShape CAP pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (zt -- ((RightSB - SB) * 0.05)) (pXLeft -- pXLeft)
create-glyph "zhuangtonefive.\(suffix)" : glyph-proc create-glyph "zhuangtonefive.\(suffix)" : glyph-proc
include : MarkSet.e include : MarkSet.e
include : FiveShape XH pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (zt -- ((RightSB - SB) * 0.05)) include : FiveShape XH pBarPos pBarPosSwAdj (bottomShape -- bottomShape) (zt -- ((RightSB - SB) * 0.05)) (pXLeft -- pXLeft)
select-variant 'five.lnum' [CodeLnum '5'] (follow -- 'five') select-variant 'five.lnum' [CodeLnum '5'] (follow -- 'five')
select-variant 'five.onum' [CodeOnum '5'] (follow -- 'five') select-variant 'five.onum' [CodeOnum '5'] (follow -- 'five')