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

Fix broken shape in condensed (#954)

Browse source
This commit is contained in:
be5invis 2021-04-16 17:33:54 -07:00
parent ee2570bdfc
commit ea0d2edc06
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,35 +155,36 @@ glyph-block Letter-Latin-K : begin
define slabStartX : kshRight - (Stroke * 0.325 - TanSlope) * HVContrast define slabStartX : kshRight - (Stroke * 0.325 - TanSlope) * HVContrast
return : object arcStartX arcStartY arcFine arcRightX arcRightY arcRightSlope arcTopX arcTopY arcStroke arcTopSlope arcBottomX arcBottomY arcTerminalX arcTerminalY arcTerminalFine kshRight slabStartX return : object arcStartX arcStartY arcFine arcRightX arcRightY arcRightSlope arcTopX arcTopY arcStroke arcTopSlope arcBottomX arcBottomY arcTerminalX arcTerminalY arcTerminalFine kshLeft kshRight slabStartX
define [KCursiveLoopAndLegShapeImpl tailed top slabLeft slab] : glyph-proc define [KCursiveLoopAndLegShapeImpl tailed top slabLeft slab] : glyph-proc
define dim : KCursiveLoopAndLegDimen top true slabLeft slab define dim : KCursiveLoopAndLegDimen top true slabLeft slab
include : dispiro include : dispiro
g4.up.start dim.arcStartX dim.arcStartY [widths.heading 0 dim.arcFine Upward] g4.up.start dim.arcStartX dim.arcStartY [widths.heading 0 dim.arcFine Upward]
arcvh 8 2.0 arcvh 8 2.0
g4.right.mid dim.arcTopX dim.arcTopY g4 dim.arcTopX dim.arcTopY
widths.rhs.heading dim.arcStroke {.y (+1) .x dim.arcTopSlope} widths.rhs.heading dim.arcStroke {.y (+1) .x dim.arcTopSlope}
archv archv 8 2.0
g4.down.mid dim.arcRightX (dim.arcRightY - 0.5 * dim.arcRightSlope * dim.arcStroke * HVContrast) g4.down.mid dim.arcRightX (dim.arcRightY - 0.5 * dim.arcRightSlope * dim.arcStroke * HVContrast)
heading {.y dim.arcRightSlope .x HVContrast} heading {.y dim.arcRightSlope .x HVContrast}
arcvh arcvh
g4 dim.arcBottomX (dim.arcBottomY - dim.arcStroke) [widths.rhs.heading dim.arcTerminalFine Leftward] g4 dim.arcBottomX (dim.arcBottomY - dim.arcStroke) [widths.rhs.heading dim.arcTerminalFine Leftward]
g4 dim.arcStartX (dim.arcTerminalY - dim.arcStroke) [widths.rhs.heading dim.arcStroke Leftward] g4 dim.arcStartX (dim.arcTerminalY - dim.arcStroke) [widths.rhs.heading dim.arcStroke Leftward]
define swDiagTail Stroke define swDiagTail : AdviceStroke 2 (1 - (dim.kshLeft - SB) / Width)
define swDiagTailAdj : swDiagTail / [mix 1 HVContrast 0.375] define swDiagTailAdj : swDiagTail / [mix 1 HVContrast 0.375]
define xDTGap : 0.10 * (RightSB - SB) - 0.125 * swDiagTail define xDTGap : 0.10 * (RightSB - SB) - (0.125 + [clamp 0 0.375 (0.5 * (Width / UPM * 2 - 1))]) * swDiagTail
define xDTStart : dim.arcTerminalX + 0.75 * swDiagTail * HVContrast + xDTGap define xDTStart : dim.arcTerminalX + swDiagTail * HVContrast + xDTGap
define xDTEnd : dim.kshRight - 0.8 * Hook - 0.5 * swDiagTail * HVContrast + xDTGap * 0.625 define xDTEnd : dim.kshRight - 0.8 * Hook - 0.25 * swDiagTail * HVContrast + xDTGap * 0.625
define tailAngle : Math.min 75 (50 + [Math.atan2 (swDiagTail / 2) Hook] / Math.PI * 180) define tailAngle : Math.min 85 (50 + [Math.atan2 (0.75 * swDiagTail) Hook] / Math.PI * 180)
define dtInnerRadius : [clamp 0.125 1 : mix 1 (Width / UPM * 2) 3] * [DiagonalTailInnerRadius]
include : difference include : difference
if tailed if tailed
then : dispiro then : dispiro
flat xDTStart dim.arcTerminalY [widths.center swDiagTailAdj] flat xDTStart dim.arcTerminalY [widths.center swDiagTailAdj]
curl (xDTEnd + 0.125 * [DiagonalTailInnerRadius]) (0.9 * swDiagTail + 0.5 *[DiagonalTailInnerRadius]) curl (xDTEnd + 0.125 * dtInnerRadius) (0.9 * swDiagTail + 0.5 * dtInnerRadius)
DiagonalTailF 1 [DivFrame 1] xDTEnd 0 [DiagonalTailInnerRadius] tailAngle (Hook + swDiagTail / 4) swDiagTail DiagonalTailF 1 [DivFrame 1] xDTEnd 0 dtInnerRadius tailAngle (Hook + swDiagTail / 4) swDiagTail
else : intersection else : intersection
Rect XH 0 0 [if slab (dim.slabStartX + SideJut) (Width * 2)] Rect XH 0 0 [if slab (dim.slabStartX + SideJut) (Width * 2)]
dispiro dispiro

20
params/shape-width.toml
View file

@ -74,11 +74,11 @@ smallsmooth = 1.023
width = 456 width = 456
[shapeWidth.multiplies.blend.456] [shapeWidth.multiplies.blend.456]
contrast = 1 contrast = 1
stroke = 0.975 stroke = 0.949
sb = 0.853 sb = 0.791
jut = 0.933 jut = 0.961
refJut = 0.933 refJut = 0.961
longjut = 0.933 longjut = 0.961
rhook = 1 rhook = 1
rbalance = 0.931 rbalance = 0.931
tbalance = 0.953 tbalance = 0.953
@ -89,11 +89,11 @@ smallsmooth = 0.975
width = 416 width = 416
[shapeWidth.multiplies.blend.416] [shapeWidth.multiplies.blend.416]
contrast = 1 contrast = 1
stroke = 0.952 stroke = 0.900
sb = 0.727 sb = 0.625
jut = 0.870 jut = 0.925
refJut = 0.870 refJut = 0.925
longjut = 0.870 longjut = 0.925
rhook = 1 rhook = 1
rbalance = 0.868 rbalance = 0.868
tbalance = 0.909 tbalance = 0.909