Add Fraktur J (#2440)
This commit is contained in:
Belleve
GitHub
parent
882fd09744
commit
6dff364caf
7 changed files with 235 additions and 193 deletions
|
|
@ -5,3 +5,4 @@
|
||||||
- BLACK-LETTER CAPITAL R (`U+211C`) (#714).
|
- BLACK-LETTER CAPITAL R (`U+211C`) (#714).
|
||||||
- BLACK-LETTER CAPITAL Z (`U+2128`) (#714).
|
- BLACK-LETTER CAPITAL Z (`U+2128`) (#714).
|
||||||
- BLACK-LETTER CAPITAL C (`U+212D`) (#714).
|
- BLACK-LETTER CAPITAL C (`U+212D`) (#714).
|
||||||
|
- MATHEMATICAL FRAKTUR CAPITAL J (`U+1D50D`) (#444).
|
||||||
|
|
|
||||||
|
|
@ -55,30 +55,42 @@ glyph-block CommonShapes : begin
|
||||||
define [MaskLeft x] : Rect VERY-FAR (-VERY-FAR) (-VERY-FAR) x
|
define [MaskLeft x] : Rect VERY-FAR (-VERY-FAR) (-VERY-FAR) x
|
||||||
glyph-block-export MaskRight
|
glyph-block-export MaskRight
|
||||||
define [MaskRight x] : Rect VERY-FAR (-VERY-FAR) x VERY-FAR
|
define [MaskRight x] : Rect VERY-FAR (-VERY-FAR) x VERY-FAR
|
||||||
|
|
||||||
glyph-block-export MaskAboveLine
|
glyph-block-export MaskAboveLine
|
||||||
define [MaskAboveLine x1 y1 x2 y2] : spiro-outline
|
define [MaskAboveLine x1 y1 x2 y2 _ext] : begin
|
||||||
corner x1 (+VERY-FAR)
|
local ext : fallback _ext 0
|
||||||
corner x1 y1
|
return : spiro-outline
|
||||||
corner x2 y2
|
corner [mix x1 x2 (-ext)] (+VERY-FAR)
|
||||||
corner x2 (+VERY-FAR)
|
corner [mix x1 x2 (-ext)] [mix y1 y2 (-ext)]
|
||||||
|
corner [mix x1 x2 (1 + ext)] [mix y1 y2 (1 + ext)]
|
||||||
|
corner [mix x1 x2 (1 + ext)] (+VERY-FAR)
|
||||||
|
|
||||||
glyph-block-export MaskBelowLine
|
glyph-block-export MaskBelowLine
|
||||||
define [MaskBelowLine x1 y1 x2 y2] : spiro-outline
|
define [MaskBelowLine x1 y1 x2 y2 _ext] : begin
|
||||||
corner x1 (-VERY-FAR)
|
local ext : fallback _ext 0
|
||||||
corner x1 y1
|
return : spiro-outline
|
||||||
corner x2 y2
|
corner [mix x1 x2 (-ext)] (-VERY-FAR)
|
||||||
corner x2 (-VERY-FAR)
|
corner [mix x1 x2 (-ext)] [mix y1 y2 (-ext)]
|
||||||
|
corner [mix x1 x2 (1 + ext)] [mix y1 y2 (1 + ext)]
|
||||||
|
corner [mix x1 x2 (1 + ext)] (-VERY-FAR)
|
||||||
|
|
||||||
glyph-block-export MaskLeftLine
|
glyph-block-export MaskLeftLine
|
||||||
define [MaskLeftLine x1 y1 x2 y2] : spiro-outline
|
define [MaskLeftLine x1 y1 x2 y2 _ext] : begin
|
||||||
corner (-VERY-FAR) y1
|
local ext : fallback _ext 0
|
||||||
corner x1 y1
|
spiro-outline
|
||||||
corner x2 y2
|
corner (-VERY-FAR) [mix y1 y2 (-ext)]
|
||||||
corner (-VERY-FAR) y2
|
corner [mix x1 x2 (-ext)] [mix y1 y2 (-ext)]
|
||||||
|
corner [mix x2 x2 (1 + ext)] [mix y1 y2 (1 + ext)]
|
||||||
|
corner (-VERY-FAR) [mix y1 y2 (1 + ext)]
|
||||||
|
|
||||||
glyph-block-export MaskRightLine
|
glyph-block-export MaskRightLine
|
||||||
define [MaskRightLine x1 y1 x2 y2] : spiro-outline
|
define [MaskRightLine x1 y1 x2 y2 _ext] : begin
|
||||||
corner (+VERY-FAR) y1
|
local ext : fallback _ext 0
|
||||||
corner x1 y1
|
spiro-outline
|
||||||
corner x2 y2
|
corner (+VERY-FAR) [mix y1 y2 (-ext)]
|
||||||
corner (+VERY-FAR) y2
|
corner [mix x1 x2 (-ext)] [mix y1 y2 (-ext)]
|
||||||
|
corner [mix x2 x2 (1 + ext)] [mix y1 y2 (1 + ext)]
|
||||||
|
corner (+VERY-FAR) [mix y1 y2 (1 + ext)]
|
||||||
|
|
||||||
glyph-block-export HalfRectTriangle
|
glyph-block-export HalfRectTriangle
|
||||||
define [HalfRectTriangle x1 y1 x2 y2] : spiro-outline
|
define [HalfRectTriangle x1 y1 x2 y2] : spiro-outline
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ $$include '../meta/macros.ptl'
|
||||||
import [mix fallback] from "@iosevka/util"
|
import [mix fallback] from "@iosevka/util"
|
||||||
import [SpiroPenGeometry] from "@iosevka/geometry"
|
import [SpiroPenGeometry] from "@iosevka/geometry"
|
||||||
import [Vec2] from "@iosevka/geometry/point"
|
import [Vec2] from "@iosevka/geometry/point"
|
||||||
|
import [Interpolator] from "@iosevka/geometry/spiro-control"
|
||||||
|
|
||||||
glyph-module
|
glyph-module
|
||||||
|
|
||||||
|
|
@ -71,86 +72,66 @@ glyph-block LetterLike-Fraktur-Shared : begin
|
||||||
public [connT otherProfile y] : y + otherProfile.thick - this.thick
|
public [connT otherProfile y] : y + otherProfile.thick - this.thick
|
||||||
|
|
||||||
# Stroke widths
|
# Stroke widths
|
||||||
define frakThin : 1.0 * [AdviceStroke 8]
|
define frakThin : 1.0 * [AdviceStroke 12]
|
||||||
define frakThick : 1.0 * Stroke
|
define frakThick : 1.0 * Stroke
|
||||||
define frakFine : 1.0 * [AdviceStroke 4] # For decoration
|
define frakFine : 1.0 * [AdviceStroke 4] # For decoration
|
||||||
|
|
||||||
glyph-block-export S
|
glyph-block-export S
|
||||||
define S : new FrakturProfile frakThick (0.5 * frakThin)
|
define S : new FrakturProfile frakThick (0.875 * frakThin)
|
||||||
|
|
||||||
glyph-block-export F
|
glyph-block-export F
|
||||||
define F : new FrakturProfile frakFine (0.5 * frakThin)
|
define F : new FrakturProfile frakFine (0.875 * frakThin)
|
||||||
|
|
||||||
glyph-block-export T
|
glyph-block-export T
|
||||||
define T : new FrakturProfile frakThin (0.5 * frakThin)
|
define T : new FrakturProfile frakThin (0.875 * frakThin)
|
||||||
|
|
||||||
|
# Key metrics
|
||||||
|
glyph-block-export DecoSizeX DecoSizeY FHook Wave.DepthY Wave.DepthX LbFootRise
|
||||||
|
define DecoSizeX : 0.15 * (RightSB - SB)
|
||||||
|
define DecoSizeY : 0.08 * (RightSB - SB)
|
||||||
|
define FHook : 0.4 * SHook - 0.25 * S.thick
|
||||||
|
define LbFootRise : 0.375 * SHook + 0.375 * S.thick
|
||||||
|
|
||||||
|
glyph-block-export SlopeA SlopeB
|
||||||
|
define SlopeA : DecoSizeY / DecoSizeX
|
||||||
|
define SlopeB 1.0
|
||||||
|
|
||||||
|
# Wave blenders
|
||||||
|
glyph-block-export Wave
|
||||||
|
define Wave : namespace
|
||||||
|
export : define DepthY : 0.4 * SHook - 0.25 * S.thick
|
||||||
|
export : define DepthX : 0.375 * SHook + 0.125 * S.thick
|
||||||
|
|
||||||
|
export : define [vc waveDepth] : Interpolator vcWaveBlender [object waveDepth]
|
||||||
|
define [vcWaveBlender before after args] : begin
|
||||||
|
local [object waveDepth] args
|
||||||
|
return : list
|
||||||
|
g2 (before.x + 0.5 * waveDepth) [mix before.y after.y 0.375]
|
||||||
|
g2 (after.x - 0.5 * waveDepth) [mix before.y after.y 0.625]
|
||||||
|
|
||||||
|
export : define [h] : Interpolator hWaveBlender [object h]
|
||||||
|
define [hWaveBlender before after] : begin
|
||||||
|
return : list
|
||||||
|
g2 [mix before.x after.x 0.375] after.y
|
||||||
|
g2 [mix before.x after.x 0.625] before.y
|
||||||
|
|
||||||
glyph-block LetterLike-Fraktur : begin
|
glyph-block LetterLike-Fraktur : begin
|
||||||
glyph-block-import CommonShapes
|
glyph-block-import CommonShapes
|
||||||
glyph-block-import LetterLike-Fraktur-Shared : S F T fraktur-stroke
|
glyph-block-import LetterLike-Fraktur-Shared : S F T fraktur-stroke
|
||||||
|
glyph-block-import LetterLike-Fraktur-Shared : DecoSizeX DecoSizeY SlopeA SlopeB
|
||||||
define DecoSizeX : 0.15 * (RightSB - SB)
|
glyph-block-import LetterLike-Fraktur-Shared : Wave LbFootRise FHook
|
||||||
define DecoSizeY : 0.08 * (RightSB - SB)
|
|
||||||
define FHook : 0.4 * SHook - 0.25 * S.thick
|
|
||||||
define WaveDepth : 0.4 * SHook - 0.25 * S.thick
|
|
||||||
define WaveDepthX : 0.375 * SHook + 0.5 * S.thick
|
|
||||||
define LbFootRise : 0.375 * SHook + 0.375 * S.thick
|
|
||||||
|
|
||||||
define flex-params [HWave] : begin
|
|
||||||
local-parameter pen
|
|
||||||
local-parameter w
|
|
||||||
local-parameter l
|
|
||||||
local-parameter r
|
|
||||||
local-parameter b
|
|
||||||
local-parameter t
|
|
||||||
|
|
||||||
return : fraktur-stroke pen
|
|
||||||
g2 l b
|
|
||||||
g2 (l + TINY) (b + TINY)
|
|
||||||
g2 [mix l r 0.375] [if w (b + w) t]
|
|
||||||
g2 [mix l r 0.625] [if w (t - w) b]
|
|
||||||
g2 (r - TINY) (t - TINY)
|
|
||||||
g2 r t
|
|
||||||
|
|
||||||
define flex-params [VWave] : begin
|
|
||||||
local-parameter pen
|
|
||||||
local-parameter w
|
|
||||||
local-parameter l
|
|
||||||
local-parameter r
|
|
||||||
local-parameter b
|
|
||||||
local-parameter t
|
|
||||||
|
|
||||||
return : fraktur-stroke pen
|
|
||||||
g2 r t
|
|
||||||
g2 (r - TINY) (t - TINY)
|
|
||||||
g2 [if w (r - w) l] [mix b t 0.625]
|
|
||||||
g2 [if w (l + w) r] [mix b t 0.375]
|
|
||||||
g2 (l + TINY) (b + TINY)
|
|
||||||
g2 l b
|
|
||||||
|
|
||||||
define flex-params [VCWave] : begin
|
|
||||||
local-parameter pen
|
|
||||||
local-parameter w
|
|
||||||
local-parameter x
|
|
||||||
local-parameter b
|
|
||||||
local-parameter t
|
|
||||||
|
|
||||||
return : fraktur-stroke pen
|
|
||||||
g2 x t
|
|
||||||
g2 (x - TINY) (t - TINY)
|
|
||||||
g2 [pen.xl (x - 0.5 * w)] [mix b t 0.625]
|
|
||||||
g2 [pen.xr (x + 0.5 * w)] [mix b t 0.375]
|
|
||||||
g2 (x + TINY) (b + TINY)
|
|
||||||
g2 x b
|
|
||||||
|
|
||||||
create-glyph "frak/C" 0x212D : glyph-proc
|
create-glyph "frak/C" 0x212D : glyph-proc
|
||||||
include : MarkSet.capital
|
include : MarkSet.capital
|
||||||
|
|
||||||
|
local xCenter : [mix SB RightSB 0.5] + 0.75 * F.thick
|
||||||
|
|
||||||
# Top-right stroke
|
# Top-right stroke
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
g2 [S.xr RightSB] [S.yt CAP]
|
g2 [S.xr RightSB] [S.yt CAP]
|
||||||
g2.left.mid ([S.xp SB RightSB 0.75] + 0.5 * DecoSizeX) ([S.yt CAP] - 0.5 * FHook)
|
g2.left.mid [mix (xCenter + DecoSizeX) [S.xr RightSB] 0.5] ([S.yt CAP] - 0.5 * FHook)
|
||||||
corner ([S.xp SB RightSB 0.5] + DecoSizeX) [S.yt CAP]
|
corner (xCenter + DecoSizeX) [S.yt CAP]
|
||||||
corner [S.xp SB RightSB 0.5] ([S.yt CAP] - DecoSizeX)
|
corner xCenter ([S.yt CAP] - DecoSizeX)
|
||||||
|
|
||||||
# Left and bottom stroke
|
# Left and bottom stroke
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
|
|
@ -164,13 +145,13 @@ glyph-block LetterLike-Fraktur : begin
|
||||||
include : fraktur-stroke T
|
include : fraktur-stroke T
|
||||||
g4.ru.start [T.connR S : S.xp SB RightSB 0.1] [T.connT S : [S.yt CAP] - 0.1 * ArchDepthA]
|
g4.ru.start [T.connR S : S.xp SB RightSB 0.1] [T.connT S : [S.yt CAP] - 0.1 * ArchDepthA]
|
||||||
~~~ [arch.lhs [T.yt CAP] 0.6 (sw -- T.thick) (blendPre -- null) (blendPost -- null)]
|
~~~ [arch.lhs [T.yt CAP] 0.6 (sw -- T.thick) (blendPre -- null) (blendPost -- null)]
|
||||||
g4.ld.end [S.xp SB RightSB 0.5] ([S.yt CAP] - DecoSizeX)
|
g4.ld.end [T.connL S xCenter] [T.connB S : [S.yt CAP] - DecoSizeX]
|
||||||
|
|
||||||
# Inner decoration
|
# Inner decoration
|
||||||
include : VCWave F (WaveDepthX + 0.625 * S.thick)
|
include : fraktur-stroke F
|
||||||
x -- [F.connL S : S.xp SB RightSB 0.5]
|
g2.ld.start [F.connL S xCenter] [F.connB S : [S.yt CAP] - DecoSizeX]
|
||||||
t -- [F.connB S : [S.yt CAP] - DecoSizeX]
|
~~~ [Wave.vc (-Wave.DepthX)]
|
||||||
b -- (CAP * 0.375)
|
g2.ld.end [F.connL S xCenter] (CAP * 0.375)
|
||||||
|
|
||||||
create-glyph "frak/H" 0x210C : glyph-proc
|
create-glyph "frak/H" 0x210C : glyph-proc
|
||||||
include : MarkSet.capDesc
|
include : MarkSet.capDesc
|
||||||
|
|
@ -180,49 +161,66 @@ glyph-block LetterLike-Fraktur : begin
|
||||||
local ada : 0.6 * ArchDepthA
|
local ada : 0.6 * ArchDepthA
|
||||||
local adb : 0.6 * ArchDepthB
|
local adb : 0.6 * ArchDepthB
|
||||||
|
|
||||||
|
local xMidStrokeTop : S.xp xLeftStem RightSB 0.625
|
||||||
|
local yMidStrokeTop : S.yt (XH - FHook)
|
||||||
|
local xMidStrokeStart : S.xl xLeftStem
|
||||||
|
local yMidStrokeStart : yMidStrokeTop - SlopeA * (xMidStrokeTop - xMidStrokeStart)
|
||||||
|
|
||||||
# Top and left stroke
|
# Top and left stroke
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
g2 [S.xr RightSB] ([S.yt CAP] - FHook)
|
g2 [S.xr RightSB] ([S.yt CAP] - FHook)
|
||||||
~~~ [arch.rhs [S.yt CAP] (sw -- S.thick) (blendPre -- null) (blendPost -- null)]
|
~~~ [arch.rhs [S.yt CAP] (sw -- S.thick) (blendPre -- null) (blendPost -- null)]
|
||||||
corner [S.xl xLeftStem] ([S.yt CAP] - adb)
|
corner [S.xl xLeftStem] ([S.yt CAP] - adb)
|
||||||
curl [S.xl xLeftStem] [Math.min [S.yt (XH - FHook)] [S.yp 0 CAP 0.5]]
|
curl [S.xl xLeftStem] [Math.min [S.yt (XH - FHook)] [S.yp 0 CAP 0.5]]
|
||||||
corner [S.xl xExt] ([S.yb 0] + LbFootRise)
|
corner [S.xl xExt] [Math.min yMidStrokeStart ([S.yb 0] + LbFootRise)]
|
||||||
g2c.right.end (Middle - DecoSizeX) [S.yb 0]
|
g2c.right.end (Middle - DecoSizeX) [S.yb 0]
|
||||||
corner Middle ([S.yb 0] + DecoSizeY)
|
corner Middle ([S.yb 0] + DecoSizeY)
|
||||||
|
|
||||||
# Middle and right stroke
|
# Middle and right stroke
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
g2 [S.xl xLeftStem] ([S.yt (XH - FHook)] - FHook)
|
g2 xMidStrokeStart yMidStrokeStart
|
||||||
corner [S.xp xLeftStem RightSB 0.625] [S.yt (XH - FHook)]
|
corner xMidStrokeTop yMidStrokeTop
|
||||||
g2.down.mid [S.xr RightSB] [S.yp Descender(XH - FHook) 0.75]
|
g2.down.mid [S.xr RightSB] [S.yp Descender(XH - FHook) 0.75]
|
||||||
~~~ [alsoThru.g2 0.5 0.5]
|
~~~ [alsoThru.g2 0.5 0.5]
|
||||||
g2.down.mid [S.xp xLeftStem RightSB 0.75] [S.yp Descender(XH - FHook) 0.25]
|
g2.down.mid [S.xp xLeftStem RightSB 0.75] [S.yp Descender(XH - FHook) 0.25]
|
||||||
g2 [S.xr RightSB] [S.yb Descender]
|
g2 [S.xr RightSB] [S.yb Descender]
|
||||||
|
|
||||||
|
define [IJTopStroke] : glyph-proc
|
||||||
|
include : fraktur-stroke S
|
||||||
|
g2.ld.start [S.xr RightSB] [S.yt CAP]
|
||||||
|
~~~ [Wave.h]
|
||||||
|
g2.ld.mid [S.xl SB] [S.yt (CAP - Wave.DepthY)]
|
||||||
|
include : fraktur-stroke F
|
||||||
|
g2.ld.start [F.connL S : S.xl SB] [F.connB S : S.yt (CAP - Wave.DepthY)]
|
||||||
|
~~~ [Wave.vc (-Wave.DepthX)]
|
||||||
|
g2.ld.end [F.connL S : S.xl SB] (CAP * 0.625 - 2 * S.thick)
|
||||||
|
|
||||||
create-glyph "frak/I" 0x2111 : glyph-proc
|
create-glyph "frak/I" 0x2111 : glyph-proc
|
||||||
include : MarkSet.capital
|
include : MarkSet.capital
|
||||||
|
include : IJTopStroke
|
||||||
# Top Stroke
|
|
||||||
include : HWave S
|
|
||||||
l -- [S.xl SB]
|
|
||||||
r -- [S.xr RightSB]
|
|
||||||
b -- [S.yt (CAP - WaveDepth)]
|
|
||||||
t -- [S.yt CAP]
|
|
||||||
|
|
||||||
# Deocration at top-left
|
|
||||||
include : VCWave F WaveDepthX
|
|
||||||
x -- [F.connL S : S.xl SB]
|
|
||||||
b -- (CAP * 0.625)
|
|
||||||
t -- [F.connB S : S.yt (CAP - WaveDepth)]
|
|
||||||
|
|
||||||
# Main stroke
|
# Main stroke
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
g2.ld.start [S.xr RightSB] [S.yt CAP]
|
g2.ld.start [S.xr RightSB] [S.yt CAP]
|
||||||
g4 [S.xp SB RightSB 0.75] [S.yp ArchDepthA CAP 0.625]
|
g4 [S.xp SB RightSB 0.75] [S.yp ArchDepthA CAP 0.625]
|
||||||
g2 [S.xr RightSB] [S.yb ArchDepthA]
|
g4 [S.xr RightSB] [S.yb ArchDepthA]
|
||||||
~~~ [hookend [S.yb 0] (sw -- S.thick)]
|
~~~ [hookend [S.yb 0] (sw -- S.thick)]
|
||||||
g2 [S.xl SB] [S.yb SHook]
|
g2 [S.xl SB] [S.yb SHook]
|
||||||
|
|
||||||
|
create-glyph "frak/J" 0x1D50D : glyph-proc
|
||||||
|
include : MarkSet.capDesc
|
||||||
|
|
||||||
|
include : IJTopStroke
|
||||||
|
|
||||||
|
# Main stroke
|
||||||
|
local mainStrokeTop : S.yt (CAP - 1.5 * Wave.DepthY - 2 * S.thick)
|
||||||
|
include : fraktur-stroke S
|
||||||
|
g4 [S.xr RightSB] (mainStrokeTop - FHook)
|
||||||
|
~~~ [hookstart mainStrokeTop (sw -- S.thick)]
|
||||||
|
g4 [S.xr : mix SB RightSB 0.6] (mainStrokeTop - 0.6 * ArchDepthA)
|
||||||
|
g4 [S.xr RightSB] [S.yb (Descender + ArchDepthA)]
|
||||||
|
~~~ [hookend [S.yb Descender] (sw -- S.thick)]
|
||||||
|
g2 [S.xl SB] [S.yb (Descender + SHook)]
|
||||||
|
|
||||||
create-glyph "frak/R" 0x211C : glyph-proc
|
create-glyph "frak/R" 0x211C : glyph-proc
|
||||||
include : MarkSet.capital
|
include : MarkSet.capital
|
||||||
|
|
||||||
|
|
@ -233,21 +231,26 @@ glyph-block LetterLike-Fraktur : begin
|
||||||
local adb : 0.6 * ArchDepthB
|
local adb : 0.6 * ArchDepthB
|
||||||
|
|
||||||
# Deocration at top-left
|
# Deocration at top-left
|
||||||
include : VCWave F WaveDepthX
|
include : fraktur-stroke F
|
||||||
x -- [F.connL S : S.xl xExt]
|
g2.ld.start [F.connL S : S.xl xExt] [F.connB S : S.yt (CAP - ltHook)]
|
||||||
b -- (CAP * 0.625)
|
~~~ [Wave.vc (-Wave.DepthX)]
|
||||||
t -- [F.connB S : S.yt (CAP - ltHook)]
|
g2.ld.end [F.connL S : S.xl xExt] (CAP * 0.625 - 2 * S.thick)
|
||||||
|
|
||||||
local xMidStrokeL : S.xl xLeftStem
|
local xMidStrokeL : S.xl xLeftStem
|
||||||
local xMidStrokeR : S.xp xLeftStem RightSB 0.625
|
local xMidStrokeR : S.xp xLeftStem RightSB 0.625
|
||||||
local yMidStrokeL : S.yp 0 CAP 0.48
|
|
||||||
local yMidStrokeR : S.yp 0 CAP 0.55
|
local yMidStrokeR : S.yp 0 CAP 0.55
|
||||||
|
local yMidStrokeL : yMidStrokeR - SlopeA * (xMidStrokeR - xMidStrokeL)
|
||||||
|
|
||||||
|
local xArchStart xMidStrokeL
|
||||||
|
local xArchTop xMidStrokeR
|
||||||
|
local yArchTop : S.yt CAP
|
||||||
|
local yArchStart : yArchTop - SlopeA * (xArchTop - xArchStart)
|
||||||
|
|
||||||
# Left stroke
|
# Left stroke
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
g2.ru.start [S.xl xExt] [S.yt (CAP - ltHook)]
|
g2.ru.start [S.xl xExt] [S.yt (CAP - ltHook)]
|
||||||
~~~ [arch.rhs [S.yt CAP] 0.6 (blendPre -- null)]
|
~~~ [arch.rhs [S.yt CAP] 0.6 (blendPre -- null)]
|
||||||
flat [S.xl xLeftStem] ([S.yb CAP] - adb)
|
flat [S.xl xLeftStem] [Math.max ([S.yb CAP] - ada) yArchStart]
|
||||||
curl [S.xl xLeftStem] yMidStrokeL
|
curl [S.xl xLeftStem] yMidStrokeL
|
||||||
corner [S.xl xExt] ([S.yb 0] + LbFootRise)
|
corner [S.xl xExt] ([S.yb 0] + LbFootRise)
|
||||||
g2c.right.end (Middle - DecoSizeX) [S.yb 0]
|
g2c.right.end (Middle - DecoSizeX) [S.yb 0]
|
||||||
|
|
@ -255,9 +258,9 @@ glyph-block LetterLike-Fraktur : begin
|
||||||
|
|
||||||
# Top-right arch
|
# Top-right arch
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
flat [S.xl xLeftStem] ([S.yb CAP] - adb)
|
flat xArchStart yArchStart
|
||||||
corner [S.xp xLeftStem RightSB 0.75] [S.yt CAP]
|
corner xArchTop yArchTop
|
||||||
g2.down.mid [S.xr RightSB] [mix yMidStrokeR [S.yt CAP] 0.5]
|
g2.down.mid [S.xr RightSB] [mix yMidStrokeR yArchTop 0.5]
|
||||||
flat xMidStrokeR yMidStrokeR
|
flat xMidStrokeR yMidStrokeR
|
||||||
curl xMidStrokeL yMidStrokeL
|
curl xMidStrokeL yMidStrokeL
|
||||||
|
|
||||||
|
|
@ -269,7 +272,7 @@ glyph-block LetterLike-Fraktur : begin
|
||||||
# Leg
|
# Leg
|
||||||
include : fraktur-stroke S
|
include : fraktur-stroke S
|
||||||
g2 xLegStart yLegStart
|
g2 xLegStart yLegStart
|
||||||
g2 [mix xLegStart xMidStrokeR 0.001] [mix yLegStart yMidStrokeR 0.001]
|
g2 (xLegStart + TINY) (yLegStart + SlopeA * TINY)
|
||||||
flat [mix xLegStart xLegEnd 0.75] (yLegStart - adb)
|
flat [mix xLegStart xLegEnd 0.75] (yLegStart - adb)
|
||||||
curl [mix xLegStart xLegEnd 0.75] (yLegEnd + ada)
|
curl [mix xLegStart xLegEnd 0.75] (yLegEnd + ada)
|
||||||
corner xLegEnd yLegEnd
|
corner xLegEnd yLegEnd
|
||||||
|
|
@ -279,17 +282,21 @@ glyph-block LetterLike-Fraktur : begin
|
||||||
include : MarkSet.capital
|
include : MarkSet.capital
|
||||||
|
|
||||||
# Top Stroke
|
# Top Stroke
|
||||||
include : HWave S
|
include : fraktur-stroke S
|
||||||
l -- [S.xl SB]
|
g2.ld.start [S.xr RightSB] [S.yt CAP]
|
||||||
r -- [S.xr RightSB]
|
~~~ [Wave.h]
|
||||||
b -- [S.yt (CAP - WaveDepth)]
|
g2.ld.mid [S.xl SB] [S.yt (CAP - Wave.DepthY)]
|
||||||
t -- [S.yt CAP]
|
|
||||||
|
|
||||||
# Bottom Stroke
|
# Bottom Stroke
|
||||||
include : fraktur-stroke S
|
local diag : list
|
||||||
corner [S.xr RightSB] [S.yt CAP]
|
corner [S.xr RightSB] [S.yt CAP]
|
||||||
cg2.ru.start [S.xp SB RightSB 0.166] [S.yp 0 CAP 0.5]
|
corner [S.xp SB RightSB 0.166] [S.yp 0 CAP 0.5]
|
||||||
|
include : fraktur-stroke S diag
|
||||||
|
include : difference
|
||||||
|
fraktur-stroke S
|
||||||
|
g2.ru.start [S.xp SB RightSB 0.166] [S.yp 0 CAP 0.5]
|
||||||
~~~ [arch.rhs [S.yp 0 CAP 0.55] 0.375 (sw -- S.thick)]
|
~~~ [arch.rhs [S.yp 0 CAP 0.55] 0.375 (sw -- S.thick)]
|
||||||
g2.down.mid [S.xr RightSB] [S.yb ArchDepthA]
|
g2.down.mid [S.xr RightSB] [S.yb ArchDepthA]
|
||||||
~~~ [hookend [S.yb 0] (sw -- S.thick)]
|
~~~ [hookend [S.yb 0] (sw -- S.thick)]
|
||||||
g2 [S.xl SB] [S.yb SHook]
|
g2 [S.xl SB] [S.yb SHook]
|
||||||
|
MaskAboveLine diag.0.x diag.0.y diag.1.x diag.1.y 4
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,8 @@ define-macro glyph-block : syntax-rules
|
||||||
NarrowUnicodeT WideUnicodeT VERY-FAR TINY]
|
NarrowUnicodeT WideUnicodeT VERY-FAR TINY]
|
||||||
define spiroFnImports `[g4 g2 corner flat curl close end straight g2c cg2 flatc ccurl widths
|
define spiroFnImports `[g4 g2 corner flat curl close end straight g2c cg2 flatc ccurl widths
|
||||||
disable-contrast heading unimportant important alsoThru alsoThruThem bezControls
|
disable-contrast heading unimportant important alsoThru alsoThruThem bezControls
|
||||||
quadControls archv arcvh dispiro spiro-outline spiro-collect]
|
quadControls archv arcvh dispiro spiro-outline spiro-collect same-x same-y same-x-post
|
||||||
|
same-y-post]
|
||||||
define booleFnImports `[union intersection difference]
|
define booleFnImports `[union intersection difference]
|
||||||
|
|
||||||
dirty `[$GlyphBlocks$.push : lambda [$Capture_Ext$] : begin \\
|
dirty `[$GlyphBlocks$.push : lambda [$Capture_Ext$] : begin \\
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ glyph-block Digits-Zero : begin
|
||||||
local pcy 0.1
|
local pcy 0.1
|
||||||
|
|
||||||
return : sink
|
return : sink
|
||||||
g2.right.mid.r mxb (b + O) [widths.lhs fine]
|
g2.right.mid.post mxb (b + O) [widths.lhs fine]
|
||||||
alsoThru.g2 pcx pcy
|
alsoThru.g2 pcx pcy
|
||||||
flat [mix mxb r p1] [mix b myr p2] [widths.lhs sw1]
|
flat [mix mxb r p1] [mix b myr p2] [widths.lhs sw1]
|
||||||
curl [mix mxb r (1 - p4)] [mix b myr (1 - p3)] [widths.lhs sw2]
|
curl [mix mxb r (1 - p4)] [mix b myr (1 - p3)] [widths.lhs sw2]
|
||||||
|
|
@ -65,7 +65,7 @@ glyph-block Digits-Zero : begin
|
||||||
flat [mix l mxb p4] [mix myl b p3] [widths.lhs sw2]
|
flat [mix l mxb p4] [mix myl b p3] [widths.lhs sw2]
|
||||||
curl [mix l mxb (1 - p1)] [mix myl b (1 - p2)] [widths.lhs sw1]
|
curl [mix l mxb (1 - p1)] [mix myl b (1 - p2)] [widths.lhs sw1]
|
||||||
alsoThru.g2 (1 - pcx) (1 - pcy)
|
alsoThru.g2 (1 - pcx) (1 - pcy)
|
||||||
g2.right.mid.l mxb (b + O) [widths.lhs fine]
|
g2.right.mid.pre mxb (b + O) [widths.lhs fine]
|
||||||
close
|
close
|
||||||
|
|
||||||
define [ZeroShapeBase shapeT] : namespace
|
define [ZeroShapeBase shapeT] : namespace
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
import { DiSpiroGeometry, SpiroGeometry } from "@iosevka/geometry";
|
import { DiSpiroGeometry, SpiroGeometry } from "@iosevka/geometry";
|
||||||
import {
|
import {
|
||||||
BiKnotCollector,
|
BiKnotCollector,
|
||||||
UserControlKnot,
|
|
||||||
Interpolator,
|
Interpolator,
|
||||||
TerminateInstruction,
|
TerminateInstruction,
|
||||||
|
UserControlKnot,
|
||||||
} from "@iosevka/geometry/spiro-control";
|
} from "@iosevka/geometry/spiro-control";
|
||||||
import { bez3, fallback, mix } from "@iosevka/util";
|
import { bez3, fallback, mix } from "@iosevka/util";
|
||||||
|
|
||||||
|
|
@ -73,8 +73,25 @@ class DiSpiroProxy {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SetupBuilders(bindings) {
|
/// The builder for directed knot pairs
|
||||||
const { Stroke, Superness, Contrast, CorrectionOMidX, TINY } = bindings;
|
class DirectedKnotPairBuilder {
|
||||||
|
constructor(bindings, prevKnotType, nextKnotType, deltaX, deltaY) {
|
||||||
|
const { TINY } = bindings;
|
||||||
|
this.start = DirPairImpl(prevKnotType, nextKnotType, deltaX, deltaY, 0, TINY);
|
||||||
|
this.mid = DirPairImpl(prevKnotType, nextKnotType, deltaX, deltaY, -0.5 * TINY, 0.5 * TINY);
|
||||||
|
this.end = DirPairImpl(prevKnotType, nextKnotType, deltaX, deltaY, -TINY, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function DirPairImpl(prevKnotType, nextKnotType, dirX, dirY, distPre, distPost) {
|
||||||
|
const fnPre = (x, y, af) => prevKnotType(x + dirX * distPre, y + dirY * distPre, af);
|
||||||
|
const fnPost = (x, y, af) => nextKnotType(x + dirX * distPost, y + dirY * distPost, af);
|
||||||
|
let buildFn = (x, y, af) => [fnPre(x, y, af), fnPost(x, y, af)];
|
||||||
|
buildFn.pre = fnPre;
|
||||||
|
buildFn.post = fnPost;
|
||||||
|
return buildFn;
|
||||||
|
}
|
||||||
|
|
||||||
function KnotType(type) {
|
function KnotType(type) {
|
||||||
return (x, y, f) => {
|
return (x, y, f) => {
|
||||||
if (!isFinite(x)) throw new TypeError("NaN detected for X");
|
if (!isFinite(x)) throw new TypeError("NaN detected for X");
|
||||||
|
|
@ -82,6 +99,11 @@ export function SetupBuilders(bindings) {
|
||||||
return new UserControlKnot(type, x, y, f);
|
return new UserControlKnot(type, x, y, f);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetupBuilders(bindings) {
|
||||||
|
const { Stroke, Superness } = bindings;
|
||||||
|
|
||||||
|
// Simple knot types
|
||||||
const g4 = KnotType("g4");
|
const g4 = KnotType("g4");
|
||||||
const g2 = KnotType("g2");
|
const g2 = KnotType("g2");
|
||||||
const corner = KnotType("corner");
|
const corner = KnotType("corner");
|
||||||
|
|
@ -90,28 +112,15 @@ export function SetupBuilders(bindings) {
|
||||||
const close = f => new TerminateInstruction("close", f);
|
const close = f => new TerminateInstruction("close", f);
|
||||||
const end = f => new TerminateInstruction("end", f);
|
const end = f => new TerminateInstruction("end", f);
|
||||||
|
|
||||||
|
// Pair knots
|
||||||
const straight = { l: flat, r: curl };
|
const straight = { l: flat, r: curl };
|
||||||
const g2c = { l: g2, r: corner };
|
const g2c = { l: g2, r: corner };
|
||||||
const cg2 = { l: corner, r: g2 };
|
const cg2 = { l: corner, r: g2 };
|
||||||
const flatc = { l: flat, r: corner };
|
const flatc = { l: flat, r: corner };
|
||||||
const ccurl = { l: corner, r: curl };
|
const ccurl = { l: corner, r: curl };
|
||||||
|
|
||||||
|
// Add the directed/heading knot builders
|
||||||
{
|
{
|
||||||
let directions = [
|
|
||||||
{ name: "up", x: 0, y: 1 },
|
|
||||||
{ name: "down", x: 0, y: -1 },
|
|
||||||
{ name: "left", x: -1, y: 0 },
|
|
||||||
{ name: "right", x: 1, y: 0 },
|
|
||||||
{ name: "ru", x: 1, y: 1 },
|
|
||||||
{ name: "rd", x: 1, y: -1 },
|
|
||||||
{ name: "lu", x: -1, y: 1 },
|
|
||||||
{ name: "ld", x: -1, y: -1 },
|
|
||||||
];
|
|
||||||
let adhesions = [
|
|
||||||
{ name: "start", l: 0, r: TINY },
|
|
||||||
{ name: "mid", l: -0.5 * TINY, r: 0.5 * TINY },
|
|
||||||
{ name: "end", l: -TINY, r: 0 },
|
|
||||||
];
|
|
||||||
let knotTypes = [
|
let knotTypes = [
|
||||||
[g4, g4, g4],
|
[g4, g4, g4],
|
||||||
[g2, g2, g2],
|
[g2, g2, g2],
|
||||||
|
|
@ -122,17 +131,29 @@ export function SetupBuilders(bindings) {
|
||||||
[flatc, flat, corner],
|
[flatc, flat, corner],
|
||||||
[ccurl, corner, curl],
|
[ccurl, corner, curl],
|
||||||
];
|
];
|
||||||
for (const [sink, kl, kr] of knotTypes) {
|
let directions = [
|
||||||
for (const d of directions) {
|
// Straights
|
||||||
sink[d.name] = {};
|
{ name: "up", x: 0, y: 1 },
|
||||||
for (const a of adhesions) {
|
{ name: "down", x: 0, y: -1 },
|
||||||
sink[d.name][a.name] = (x, y, af) => [
|
{ name: "left", x: -1, y: 0 },
|
||||||
kl(x + d.x * a.l, y + d.y * a.l, af),
|
{ name: "right", x: 1, y: 0 },
|
||||||
kr(x + d.x * a.r, y + d.y * a.r, af),
|
{ name: "u", x: 0, y: 1 },
|
||||||
|
{ name: "d", x: 0, y: -1 },
|
||||||
|
{ name: "l", x: -1, y: 0 },
|
||||||
|
{ name: "r", x: 1, y: 0 },
|
||||||
|
|
||||||
|
// Diagonals
|
||||||
|
{ name: "ru", x: 1, y: 1 },
|
||||||
|
{ name: "rd", x: 1, y: -1 },
|
||||||
|
{ name: "lu", x: -1, y: 1 },
|
||||||
|
{ name: "ld", x: -1, y: -1 },
|
||||||
];
|
];
|
||||||
sink[d.name][a.name].l = (x, y, af) => kl(x + d.x * a.l, y + d.y * a.l, af);
|
for (const [sink, kl, kr] of knotTypes) {
|
||||||
sink[d.name][a.name].r = (x, y, af) => kr(x + d.x * a.r, y + d.y * a.r, af);
|
sink.sl = s => new DirectedKnotPairBuilder(bindings, kl, kr, -1, s);
|
||||||
}
|
sink.sr = s => new DirectedKnotPairBuilder(bindings, kl, kr, 1, s);
|
||||||
|
sink.dir = (dx, dy) => new DirectedKnotPairBuilder(bindings, kl, kr, dx, dy);
|
||||||
|
for (const d of directions) {
|
||||||
|
sink[d.name] = new DirectedKnotPairBuilder(bindings, kl, kr, d.x, d.y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,3 @@
|
||||||
import * as Format from "@iosevka/util/formatter";
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
export class BiKnotCollector {
|
export class BiKnotCollector {
|
||||||
constructor(contrast) {
|
constructor(contrast) {
|
||||||
this.contrast = contrast; // stroke contrast
|
this.contrast = contrast; // stroke contrast
|
||||||
|
|
@ -206,6 +202,7 @@ export class UserControlKnot {
|
||||||
if (this.af) this.af.call(ctx);
|
if (this.af) this.af.call(ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class TerminateInstruction {
|
export class TerminateInstruction {
|
||||||
constructor(type, af) {
|
constructor(type, af) {
|
||||||
this.type = type;
|
this.type = type;
|
||||||
|
|
@ -216,6 +213,9 @@ export class TerminateInstruction {
|
||||||
// if (this.af) this.af.call(ctx);
|
// if (this.af) this.af.call(ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
export class InterpolatorBase {
|
export class InterpolatorBase {
|
||||||
constructor(blender) {
|
constructor(blender) {
|
||||||
this.type = "interpolate";
|
this.type = "interpolate";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue