Skip to content

Commit 60d6633

Browse files
jmcwilliams403jmcwilliams403
authored
Move DToothlessRise/DMBlend definitions to aesthetics.ptl. (#2658)
1 parent b3022f1 commit 60d6633

23 files changed

+58
-72
lines changed

‎packages/font-glyphs/src/auto-build/transformed-jobs-data.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export : define Superscript : list
9898
list 0x1DB2 'latn/phi'
9999
list 0x1DB3 'sRTail'
100100
list 0x1DB4 'esh'
101-
list 0x1DB5 'tLTail'
101+
list 0x1DB5 'tPalatalHook'
102102
list 0x1DB6 'uBar'
103103
list 0x1DB7 'latn/upsilon'
104104
list 0x1DB8 'smcpU'

‎packages/font-glyphs/src/letter/cyrillic/che.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ glyph-block Letter-Cyrillic-Che : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : LeaningAnchor
1212
glyph-block-import Letter-Shared : CreateSelectorVariants DefineSelectorGlyph CreateTurnedLetter
13-
glyph-block-import Letter-Shared-Shapes : cheBowl SerifFrame RightwardTailedBar DToothlessRise
13+
glyph-block-import Letter-Shared-Shapes : cheBowl SerifFrame RightwardTailedBar
1414
glyph-block-import Letter-Shared-Shapes : TopHook CyrDescender BottomExtension
1515
glyph-block-import Letter-Latin-Lower-M : EarlessCornerDoubleArchSmallMShape
1616

‎packages/font-glyphs/src/letter/greek/lower-epsilon.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
1616
glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd
1717
glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif
1818
glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight
19-
glyph-block-import Letter-Shared-Shapes : DToothlessRise RetroflexHook CyrDescender
19+
glyph-block-import Letter-Shared-Shapes : RetroflexHook CyrDescender
2020
glyph-block-import Letter-Shared-Shapes : UpwardHookShape RhoticHookShape
2121

2222
define SLAB-NONE 0

‎packages/font-glyphs/src/letter/latin/c.ptl

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ glyph-block Letter-Latin-C : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors ExtendBelowBaseAnchors LeaningAnchor
1212
glyph-block-import Letter-Shared : CreateAccentedComposition CreateDependentComposite CreateTurnedLetter
13-
glyph-block-import Letter-Shared-Shapes : SerifFrame CurlyTail DToothlessRise
14-
glyph-block-import Letter-Shared-Shapes : SerifedArcStart SerifedArcEnd
13+
glyph-block-import Letter-Shared-Shapes : SerifFrame CurlyTail SerifedArcStart SerifedArcEnd
1514
glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd
1615
glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif
1716
glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook RetroflexHook TopHook
@@ -300,10 +299,13 @@ glyph-block Letter-Latin-C : begin
300299
link-reduced-variant 'c/sansSerif' 'c' MathSansSerif
301300
link-reduced-variant 'c/turnDescBase' 'c' (follow -- 'cHookTop')
302301
select-variant 'revc' 0x2184 (follow -- 'c')
302+
303303
select-variant 'c/centKernelStd' (follow -- 'c')
304304
select-variant 'c/centKernelCap' (follow -- 'c')
305+
305306
alias 'cyrl/es' 0x441 'c'
306307
alias 'grek/lunateSmallSigma' 0x3F2 'c.serifless'
308+
307309
select-variant 'turncSideways' 0x1D12 (follow -- 'c')
308310
select-variant 'cyrl/esWide' 0x1C83 (follow -- 'c')
309311

@@ -323,6 +325,7 @@ glyph-block Letter-Latin-C : begin
323325
CreateTurnedLetter 'turnC' 0x186 'C' HalfAdvance (CAP / 2)
324326
CreateTurnedLetter 'turnc' 0x254 'c' HalfAdvance (XH / 2)
325327
CreateTurnedLetter 'turnSmcpC' 0x1D10 'smcpC' HalfAdvance (XH / 2)
328+
326329
alias 'grek/revLunateSigma' 0x3FD 'revC'
327330
alias 'grek/revLunateSmallSigma' 0x37B 'revc.serifless'
328331

‎packages/font-glyphs/src/letter/latin/lower-a.ptl

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ glyph-block Letter-Latin-Lower-A : begin
1111
glyph-block-import Mark-Shared-Metrics : markHalfStroke
1212
glyph-block-import Letter-Shared : CreateAccentedComposition CreateTurnedLetter
1313
glyph-block-import Letter-Shared-Shapes : SerifFrame OBarLeft OBarRight ArcStartSerif
14-
glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend
15-
glyph-block-import Letter-Shared-Shapes : RetroflexHook InwardSlabArcStart
14+
glyph-block-import Letter-Shared-Shapes : RightwardTailedBar RetroflexHook
15+
glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart
1616

1717
glyph-block-export DoubleStorey
1818
define DoubleStorey : namespace

‎packages/font-glyphs/src/letter/latin/lower-b.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ glyph-block Letter-Latin-Lower-B : begin
99
glyph-block-import CommonShapes
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : LeaningAnchor
12-
glyph-block-import Letter-Shared-Shapes : OBarLeft DToothlessRise DMBlend TopHook
12+
glyph-block-import Letter-Shared-Shapes : OBarLeft TopHook
1313
glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook
1414

1515
define [ToothedBody yTop] : union

‎packages/font-glyphs/src/letter/latin/lower-d.ptl

+11-12
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ glyph-block Letter-Latin-Lower-D : begin
1111
glyph-block-import Mark-Shared-Metrics : markExtend
1212
glyph-block-import Mark-Adjustment : LeaningAnchor
1313
glyph-block-import Letter-Shared : CreateCommaCaronComposition
14-
glyph-block-import Letter-Shared-Shapes : OBarRight RightwardTailedBar DToothlessRise DMBlend
15-
glyph-block-import Letter-Shared-Shapes : CurlyTail LetterBarOverlay SerifFrame
16-
glyph-block-import Letter-Shared-Shapes : UpwardHookShape PalatalHook RetroflexHook TopHook
14+
glyph-block-import Letter-Shared-Shapes : OBarRight RightwardTailedBar CurlyTail
15+
glyph-block-import Letter-Shared-Shapes : LetterBarOverlay SerifFrame UpwardHookShape
16+
glyph-block-import Letter-Shared-Shapes : PalatalHook RetroflexHook TopHook
1717

1818
define [ToothedBody df yTop] : union
1919
OBarRight.shape
@@ -136,8 +136,8 @@ glyph-block Letter-Latin-Lower-D : begin
136136
right -- dfHalf.rightSB
137137
ybegin -- Ascender
138138
yend -- (XH / 2)
139-
ada -- [dfHalf.archDepthAOf SmallArchDepth df.mvs]
140-
adb -- [dfHalf.archDepthBOf SmallArchDepth df.mvs]
139+
ada -- (SmallArchDepthA * 0.6 * df.advs)
140+
adb -- (SmallArchDepthB * 0.6 * df.advs)
141141
sw -- df.mvs
142142

143143
if topSerif : include : topSerif dfHalf Ascender
@@ -146,17 +146,15 @@ glyph-block Letter-Latin-Lower-D : begin
146146
include sf2.rt.full
147147

148148
select-variant 'd' 'd'
149-
select-variant 'dCaronBase' (follow -- 'd')
150-
select-variant 'dStroke' 0x111 (follow -- 'd')
151-
select-variant 'latn/de' 0x18C (follow -- 'd')
152-
alias 'cyrl/deKomi' 0x501 'd'
153149
link-reduced-variant 'd/sansSerif' 'd' MathSansSerif
154150
link-reduced-variant 'd/phoneticLeft' 'd'
155-
link-reduced-variant 'd/hookBottomBase' 'd'
151+
select-variant 'dCaronBase' (follow -- 'd')
156152

153+
select-variant 'dStroke' 0x111 (follow -- 'd')
154+
select-variant 'latn/de' 0x18C (follow -- 'd')
157155
select-variant 'dHookTop' 0x257
158-
link-reduced-variant 'dHookTop/hookBottomBase' 'dHookTop'
159156

157+
alias 'cyrl/deKomi' 0x501 'd'
160158
select-variant 'cyrl/djeKomi' 0x503
161159

162160
link-reduced-variant 'd/descBase' 'd'
@@ -165,11 +163,13 @@ glyph-block Letter-Latin-Lower-D : begin
165163
x -- (RightSB + SideJut)
166164
y -- 0
167165

166+
link-reduced-variant 'd/hookBottomBase' 'd'
168167
derive-glyphs 'dHookBottom' 0x256 "d/hookBottomBase" : function [src gr] : glyph-proc
169168
include [refer-glyph src] AS_BASE ALSO_METRICS
170169
include : RetroflexHook.rExt RightSB 0
171170
include : LeaningAnchor.Below.VBar.r RightSB
172171

172+
link-reduced-variant 'dHookTop/hookBottomBase' 'dHookTop'
173173
derive-glyphs 'dHookTopBottom' 0x1D91 "dHookTop/hookBottomBase" : function [src gr] : glyph-proc
174174
include [refer-glyph src] AS_BASE ALSO_METRICS
175175
include : RetroflexHook.rExt RightSB 0
@@ -215,7 +215,6 @@ glyph-block Letter-Latin-Lower-D : begin
215215

216216
select-variant 'dCurlyTail' 0x221
217217

218-
219218
glyph-block-import Letter-Blackboard : BBS BBD BBBarRight
220219
create-glyph 'mathbb/d' 0x1D555 : glyph-proc
221220
include : MarkSet.b

‎packages/font-glyphs/src/letter/latin/lower-e.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ glyph-block Letter-Latin-Lower-E : begin
222222
include : RetroflexHook.r
223223
x -- RightSB
224224
y -- 0
225-
yAttach -- AHook
225+
yAttach -- DToothlessRise
226226

227227
create-glyph "Schwa.\(suffix)" : glyph-proc
228228
include : MarkSet.capital

‎packages/font-glyphs/src/letter/latin/lower-g.ptl

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ glyph-block Letter-Latin-Lower-G : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor
1212
glyph-block-import Letter-Shared : CreateTurnedLetter
13-
glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight DToothlessRise DMBlend
14-
glyph-block-import Letter-Shared-Shapes : FlatHookDepth CurlyTail PalatalHook TopHook
13+
glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight FlatHookDepth
14+
glyph-block-import Letter-Shared-Shapes : CurlyTail PalatalHook TopHook
1515

1616
define [OverlayW bw] : glyph-proc
1717
define l : mix 0 SB 0.3

‎packages/font-glyphs/src/letter/latin/lower-m.ptl

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ glyph-block Letter-Latin-Lower-M : begin
99
glyph-block-import CommonShapes
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : LeaningAnchor
12-
glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder
13-
glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend MidHook
14-
glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook EngHook UpwardHookShape
15-
glyph-block-import Letter-Shared-Shapes : SerifFrame
12+
glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder RightwardTailedBar
13+
glyph-block-import Letter-Shared-Shapes : MidHook CyrDescender PalatalHook EngHook
14+
glyph-block-import Letter-Shared-Shapes : UpwardHookShape SerifFrame
1615

1716
define [SmallMSmooth df] : df.advs * (0.5 * SmallArchDepth + 0.375 * Stroke)
1817
define [SmallMShoulderSpiro] : with-params [left right top bottom width fine df coBottom] : glyph-proc
@@ -291,8 +290,8 @@ glyph-block Letter-Latin-Lower-M : begin
291290
right -- df.rightSB
292291
ybegin -- (XH / 2)
293292
yend -- (XH / 2)
294-
ada -- (SmallArchDepthA * 0.6 * df.advs)
295-
adb -- (SmallArchDepthB * 0.6 * df.advs)
293+
ada -- (SmallArchDepthA * 0.5 * df.advs)
294+
adb -- (SmallArchDepthB * 0.5 * df.advs)
296295
sw -- subDf.mvs
297296
include : Serifs subDf XH 0 0 (XH / 2) true false
298297
if SLAB : begin

‎packages/font-glyphs/src/letter/latin/lower-n.ptl

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ glyph-block Letter-Latin-Lower-N : begin
1111
glyph-block-import Mark-Shared-Metrics : markHalfStroke
1212
glyph-block-import Mark-Adjustment : LeaningAnchor
1313
glyph-block-import Letter-Shared : CreateAccentedComposition
14-
glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder
15-
glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend MidHook
16-
glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook RetroflexHook EngHook
17-
glyph-block-import Letter-Shared-Shapes : SerifFrame
14+
glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder RightwardTailedBar
15+
glyph-block-import Letter-Shared-Shapes : MidHook CyrDescender PalatalHook RetroflexHook
16+
glyph-block-import Letter-Shared-Shapes : EngHook SerifFrame
1817

1918
define [AdjustTrailingAnchor] : glyph-proc
2019
define trAnchor currentGlyph.baseAnchors.trailing
@@ -216,7 +215,7 @@ glyph-block Letter-Latin-Lower-N : begin
216215
include : MarkSet.p
217216
include : Body XH SB RightSB 0 Stroke
218217
local fine : AdviceStroke 3.5
219-
local rinner : (-Descender - 2 * fine) / 3
218+
local rinner : ((-Descender) - 2 * fine) / 3
220219
local m1 : RightSB - [HSwToV Stroke]
221220
local x2 : mix RightSB m1 0.25
222221
local y2 : Descender + O

‎packages/font-glyphs/src/letter/latin/lower-p.ptl

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ glyph-block Letter-Latin-Lower-P : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor
1212
glyph-block-import Letter-Shared-Shapes : OBarLeft LetterBarOverlay
13-
glyph-block-import Letter-Shared-Shapes : DToothlessRise DMBlend
1413
glyph-block-import Letter-Shared-Shapes : TopHook PalatalHook SerifFrame
1514

1615

‎packages/font-glyphs/src/letter/latin/lower-q.ptl

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ glyph-block Letter-Latin-Lower-Q : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Shared-Metrics : markHalfStroke
1212
glyph-block-import Mark-Adjustment : LeaningAnchor
13-
glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight RightwardTailedBar DToothlessRise
14-
glyph-block-import Letter-Shared-Shapes : DMBlend DiagTail
15-
glyph-block-import Letter-Shared-Shapes : TopHook RetroflexHook
13+
glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight RightwardTailedBar
14+
glyph-block-import Letter-Shared-Shapes : DiagTail TopHook RetroflexHook
1615

1716
define TERMINAL-NORMAL 0
1817
define TERMINAL-TAILED 1

‎packages/font-glyphs/src/letter/latin/lower-r.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ glyph-block Letter-Latin-Lower-R : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : LeaningAnchor
1212
glyph-block-import Letter-Shared : CreateAccentedComposition
13-
glyph-block-import Letter-Shared-Shapes : DToothlessRise DMBlend PalatalHook RetroflexHook
13+
glyph-block-import Letter-Shared-Shapes : PalatalHook RetroflexHook
1414
glyph-block-import Letter-Blackboard : BBS BBD BBBarRight
1515

1616
local dfN : DivFrame 1

‎packages/font-glyphs/src/letter/latin/lower-t.ptl

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ glyph-block Letter-Latin-Lower-T : begin
1010
glyph-block-import Mark-Adjustment : LeaningAnchor
1111
glyph-block-import Letter-Shared : CreateAccentedComposition CreateCommaCaronComposition CreateTurnedLetter
1212
glyph-block-import Letter-Shared-Shapes : CurlyTail FlatHookDepth ConnectedCedilla SerifedArcEnd
13-
glyph-block-import Letter-Shared-Shapes : DiagTail DToothlessRise
14-
glyph-block-import Letter-Shared-Shapes : TopHook PalatalHook
13+
glyph-block-import Letter-Shared-Shapes : DiagTail TopHook PalatalHook
1514
glyph-block-import Letter-Latin-S : SAutoSlabEnd AdviceSArchDepth
1615
glyph-block-import Letter-Blackboard : BBS BBD
1716

@@ -252,7 +251,7 @@ glyph-block Letter-Latin-Lower-T : begin
252251
difference [Style.Body df sym top 0] [MaskAbove XH]
253252
TopHook.toRight.mBarInner attach.x XH Ascender
254253

255-
create-glyph "tLTail.\(suffix)" : glyph-proc
254+
create-glyph "tPalatalHook.\(suffix)" : glyph-proc
256255
set-width df.width
257256
include : df.markSet.bp
258257
include : Style.Body df sym top 0
@@ -304,7 +303,7 @@ glyph-block Letter-Latin-Lower-T : begin
304303
CreateAccentedComposition 'tComma' 0x21B 't' 'commaBelow'
305304

306305
select-variant "tHookTop" 0x1AD
307-
select-variant 'tLTail' 0x1AB
306+
select-variant 'tPalatalHook' 0x1AB (follow -- 't')
308307
select-variant 'tRTail' 0x288
309308
select-variant 'tCurlyTail' 0x236
310309

‎packages/font-glyphs/src/letter/latin/s.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ glyph-block Letter-Latin-S : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Letter-Shared : CreateAccentedComposition CreateDependentComposite
1212
glyph-block-import Letter-Blackboard : BBS BBD
13-
glyph-block-import Letter-Shared-Shapes : DToothlessRise FlatHookDepth
13+
glyph-block-import Letter-Shared-Shapes : FlatHookDepth
1414
glyph-block-import Letter-Shared-Shapes : ArcStartSerifWidth ArcStartSerifDepth
1515
glyph-block-import Letter-Shared-Shapes : SerifedArcStart SerifedArcEnd
1616
glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd

‎packages/font-glyphs/src/letter/latin/u.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ glyph-block Letter-Latin-U : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : LeaningAnchor
1212
glyph-block-import Letter-Shared : CreateAccentedComposition SetGrekUpperTonos
13-
glyph-block-import Letter-Shared-Shapes : uBowl RightwardTailedBar DToothlessRise SerifFrame
13+
glyph-block-import Letter-Shared-Shapes : uBowl RightwardTailedBar SerifFrame
1414
glyph-block-import Letter-Shared-Shapes : CyrDescender CyrTailDescender RetroflexHook TopHook
1515

1616
define [UArcT] : with-params [sink df top bottom [stroke Stroke] [ada ArchDepthA] [adb ArchDepthB] [offset 0]] : sink

‎packages/font-glyphs/src/letter/latin/upper-g.ptl

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ glyph-block Letter-Latin-Upper-G : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor
1212
glyph-block-import Letter-Shared : CreateTurnedLetter
13-
glyph-block-import Letter-Shared-Shapes : DToothlessRise
1413
glyph-block-import Letter-Shared-Shapes : SerifedArcStart InwardSlabArcStart TopHook
1514
glyph-block-import Letter-Shared-Shapes : ArcStartSerif LetterBarOverlay SerifFrame
1615

@@ -27,8 +26,8 @@ glyph-block Letter-Latin-Upper-G : begin
2726
define SLAB-INWARD 2
2827
define SLAB-HOOK-TOP 10
2928

30-
define [GShape toothShape slabShape crossBarShape top ada adb _yBarOverride] : glyph-proc
31-
local yBar : fallback _yBarOverride (top * 0.52 + QuarterStroke)
29+
define [GShape toothShape slabShape crossBarShape top ada adb yBarOverride] : glyph-proc
30+
local yBar : fallback yBarOverride (top * 0.52 + QuarterStroke)
3231
local fine ShoulderFine
3332

3433
local knots : match slabShape

‎packages/font-glyphs/src/letter/shared.ptl

-4
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ glyph-block Letter-Shared-Shapes : begin
160160
flat (x + hookTurn) (high - overshoot) [heading Rightward]
161161
curl (x + hookDepth + sw * TanSlope) (high - overshoot)
162162

163-
glyph-block-export DToothlessRise DMBlend
164-
define DToothlessRise : Hook * 0.25 + Stroke / 16
165-
define DMBlend 0.80
166-
167163
glyph-block-export CurlyTail
168164
define CurlyTail : namespace
169165
define [normalBlender before _after args] : begin

‎packages/font-glyphs/src/meta/aesthetics.ptl

+5-2
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ export : define [calculateMetrics para] : begin
150150
define SideJut : Jut - [HSwToV HalfStroke]
151151
define VJutStroke : AdviceStroke 3.5
152152

153+
define DToothlessRise : Hook * 0.25 + Stroke / 16
154+
define DMBlend 0.80
155+
153156
define [StrokeWidthBlend min max sw] : linreg para.canonicalStrokeWidthMin min para.canonicalStrokeWidthMax max [fallback sw Stroke]
154157

155158
define SmoothAdjust : StrokeWidthBlend 80 144
@@ -179,7 +182,6 @@ export : define [calculateMetrics para] : begin
179182
define SmallArchDepthA : SmallArchDepth - TanSlope * SmoothAdjust
180183
define SmallArchDepthB : SmallArchDepth + TanSlope * SmoothAdjust
181184

182-
183185
define CorrectionOMidX : TanSlope * 0.9 * [StrokeWidthBlend 1.3 0.9]
184186
define CorrectionOMidS : Stroke * CorrectionOMidX
185187

@@ -208,7 +210,8 @@ export : define [calculateMetrics para] : begin
208210
CorrectionOMidS compositeBaseAnchors AdviceStroke AdviceStroke2 AdviceStrokeInSpace
209211
OverlayStroke OperatorStroke GeometryStroke ShoulderFine AdviceGlottalStopArchDepth
210212
StrokeWidthBlend ArchDepthAOf ArchDepthBOf SmoothAdjust SideJut MidJutSide MidJutCenter
211-
YSmoothMidR YSmoothMidL HSwToV VSwToH NarrowUnicodeT WideUnicodeT VERY-FAR TINY]
213+
YSmoothMidR YSmoothMidL DToothlessRise DMBlend HSwToV VSwToH NarrowUnicodeT WideUnicodeT
214+
VERY-FAR TINY]
212215

213216
export : define [setFontMetrics para metrics fm] : begin
214217
define [object CAP Descender XH Width SymbolMid] metrics

‎packages/font-glyphs/src/meta/macros.ptl

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ define-macro glyph-block : syntax-rules
389389
CorrectionOMidS compositeBaseAnchors AdviceStroke AdviceStroke2 AdviceStrokeInSpace
390390
OverlayStroke OperatorStroke GeometryStroke ShoulderFine AdviceGlottalStopArchDepth
391391
StrokeWidthBlend ArchDepthAOf ArchDepthBOf SmoothAdjust SideJut MidJutSide
392-
MidJutCenter YSmoothMidR YSmoothMidL HSwToV VSwToH NarrowUnicodeT WideUnicodeT
393-
VERY-FAR TINY]
392+
MidJutCenter YSmoothMidR YSmoothMidL DToothlessRise DMBlend HSwToV VSwToH
393+
NarrowUnicodeT WideUnicodeT VERY-FAR TINY]
394394

395395
define spiroFnImports `[g4 g2 corner flat curl virt close end straight g2c cg2 flatc ccurl
396396
widths disable-contrast heading unimportant important alsoThru alsoThruThem bezControls

0 commit comments

Comments
 (0)