Move DToothlessRise/DMBlend definitions to aesthetics.ptl.

be5invis · Jan 26, 2025 · 2621ae3 · 2621ae3
1 parent b3022f1
commit 2621ae3
Show file tree

Hide file tree

Showing 23 changed files with 58 additions and 72 deletions.
diff --git a/packages/font-glyphs/src/auto-build/transformed-jobs-data.ptl b/packages/font-glyphs/src/auto-build/transformed-jobs-data.ptl
@@ -98,7 +98,7 @@ export : define Superscript : list
 	list 0x1DB2 'latn/phi'
 	list 0x1DB3 'sRTail'
 	list 0x1DB4 'esh'
-	list 0x1DB5 'tLTail'
+	list 0x1DB5 'tPalatalHook'
 	list 0x1DB6 'uBar'
 	list 0x1DB7 'latn/upsilon'
 	list 0x1DB8 'smcpU'

diff --git a/packages/font-glyphs/src/letter/cyrillic/che.ptl b/packages/font-glyphs/src/letter/cyrillic/che.ptl
@@ -10,7 +10,7 @@ glyph-block Letter-Cyrillic-Che : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	glyph-block-import Letter-Shared : CreateSelectorVariants DefineSelectorGlyph CreateTurnedLetter
-	glyph-block-import Letter-Shared-Shapes : cheBowl SerifFrame RightwardTailedBar DToothlessRise
+	glyph-block-import Letter-Shared-Shapes : cheBowl SerifFrame RightwardTailedBar
 	glyph-block-import Letter-Shared-Shapes : TopHook CyrDescender BottomExtension
 	glyph-block-import Letter-Latin-Lower-M : EarlessCornerDoubleArchSmallMShape
 

diff --git a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl
@@ -16,7 +16,7 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
 	glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd
 	glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif
 	glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight
-	glyph-block-import Letter-Shared-Shapes : DToothlessRise RetroflexHook CyrDescender
+	glyph-block-import Letter-Shared-Shapes : RetroflexHook CyrDescender
 	glyph-block-import Letter-Shared-Shapes : UpwardHookShape RhoticHookShape
 
 	define SLAB-NONE       0

diff --git a/packages/font-glyphs/src/letter/latin/c.ptl b/packages/font-glyphs/src/letter/latin/c.ptl
@@ -10,8 +10,7 @@ glyph-block Letter-Latin-C : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors ExtendBelowBaseAnchors LeaningAnchor
 	glyph-block-import Letter-Shared : CreateAccentedComposition CreateDependentComposite CreateTurnedLetter
-	glyph-block-import Letter-Shared-Shapes : SerifFrame CurlyTail DToothlessRise
-	glyph-block-import Letter-Shared-Shapes : SerifedArcStart SerifedArcEnd
+	glyph-block-import Letter-Shared-Shapes : SerifFrame CurlyTail SerifedArcStart SerifedArcEnd
 	glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd
 	glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif
 	glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook RetroflexHook TopHook
@@ -300,10 +299,13 @@ glyph-block Letter-Latin-C : begin
 	link-reduced-variant 'c/sansSerif' 'c' MathSansSerif
 	link-reduced-variant 'c/turnDescBase' 'c' (follow -- 'cHookTop')
 	select-variant 'revc' 0x2184 (follow -- 'c')
+
 	select-variant 'c/centKernelStd' (follow -- 'c')
 	select-variant 'c/centKernelCap' (follow -- 'c')
+
 	alias 'cyrl/es' 0x441 'c'
 	alias 'grek/lunateSmallSigma' 0x3F2 'c.serifless'
+
 	select-variant 'turncSideways' 0x1D12 (follow -- 'c')
 	select-variant 'cyrl/esWide' 0x1C83 (follow -- 'c')
 
@@ -323,6 +325,7 @@ glyph-block Letter-Latin-C : begin
 	CreateTurnedLetter 'turnC' 0x186 'C' HalfAdvance (CAP / 2)
 	CreateTurnedLetter 'turnc' 0x254 'c' HalfAdvance (XH / 2)
 	CreateTurnedLetter 'turnSmcpC' 0x1D10 'smcpC' HalfAdvance (XH / 2)
+
 	alias 'grek/revLunateSigma' 0x3FD 'revC'
 	alias 'grek/revLunateSmallSigma' 0x37B 'revc.serifless'
 

diff --git a/packages/font-glyphs/src/letter/latin/lower-a.ptl b/packages/font-glyphs/src/letter/latin/lower-a.ptl
@@ -11,8 +11,8 @@ glyph-block Letter-Latin-Lower-A : begin
 	glyph-block-import Mark-Shared-Metrics : markHalfStroke
 	glyph-block-import Letter-Shared : CreateAccentedComposition CreateTurnedLetter
 	glyph-block-import Letter-Shared-Shapes : SerifFrame OBarLeft OBarRight ArcStartSerif
-	glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend
-	glyph-block-import Letter-Shared-Shapes : RetroflexHook InwardSlabArcStart
+	glyph-block-import Letter-Shared-Shapes : RightwardTailedBar RetroflexHook
+	glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart
 
 	glyph-block-export DoubleStorey
 	define DoubleStorey : namespace

diff --git a/packages/font-glyphs/src/letter/latin/lower-b.ptl b/packages/font-glyphs/src/letter/latin/lower-b.ptl
@@ -9,7 +9,7 @@ glyph-block Letter-Latin-Lower-B : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : LeaningAnchor
-	glyph-block-import Letter-Shared-Shapes : OBarLeft DToothlessRise DMBlend TopHook
+	glyph-block-import Letter-Shared-Shapes : OBarLeft TopHook
 	glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook
 
 	define [ToothedBody yTop] : union

diff --git a/packages/font-glyphs/src/letter/latin/lower-d.ptl b/packages/font-glyphs/src/letter/latin/lower-d.ptl
@@ -11,9 +11,9 @@ glyph-block Letter-Latin-Lower-D : begin
 	glyph-block-import Mark-Shared-Metrics : markExtend
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	glyph-block-import Letter-Shared : CreateCommaCaronComposition
-	glyph-block-import Letter-Shared-Shapes : OBarRight RightwardTailedBar DToothlessRise DMBlend
-	glyph-block-import Letter-Shared-Shapes : CurlyTail LetterBarOverlay SerifFrame
-	glyph-block-import Letter-Shared-Shapes : UpwardHookShape PalatalHook RetroflexHook TopHook
+	glyph-block-import Letter-Shared-Shapes : OBarRight RightwardTailedBar CurlyTail
+	glyph-block-import Letter-Shared-Shapes : LetterBarOverlay SerifFrame UpwardHookShape
+	glyph-block-import Letter-Shared-Shapes : PalatalHook RetroflexHook TopHook
 
 	define [ToothedBody df yTop] : union
 		OBarRight.shape
@@ -136,8 +136,8 @@ glyph-block Letter-Latin-Lower-D : begin
 				right  -- dfHalf.rightSB
 				ybegin -- Ascender
 				yend   -- (XH / 2)
-				ada    -- [dfHalf.archDepthAOf SmallArchDepth df.mvs]
-				adb    -- [dfHalf.archDepthBOf SmallArchDepth df.mvs]
+				ada    -- (SmallArchDepthA * 0.6 * df.advs)
+				adb    -- (SmallArchDepthB * 0.6 * df.advs)
 				sw     -- df.mvs
 
 			if topSerif : include : topSerif dfHalf Ascender
@@ -146,17 +146,15 @@ glyph-block Letter-Latin-Lower-D : begin
 				include sf2.rt.full
 
 	select-variant 'd' 'd'
-	select-variant 'dCaronBase' (follow -- 'd')
-	select-variant 'dStroke' 0x111 (follow -- 'd')
-	select-variant 'latn/de' 0x18C (follow -- 'd')
-	alias 'cyrl/deKomi' 0x501 'd'
 	link-reduced-variant 'd/sansSerif' 'd' MathSansSerif
 	link-reduced-variant 'd/phoneticLeft' 'd'
-	link-reduced-variant 'd/hookBottomBase' 'd'
+	select-variant 'dCaronBase' (follow -- 'd')
 
+	select-variant 'dStroke' 0x111 (follow -- 'd')
+	select-variant 'latn/de' 0x18C (follow -- 'd')
 	select-variant 'dHookTop' 0x257
-	link-reduced-variant 'dHookTop/hookBottomBase' 'dHookTop'
 
+	alias 'cyrl/deKomi' 0x501 'd'
 	select-variant 'cyrl/djeKomi' 0x503
 
 	link-reduced-variant 'd/descBase' 'd'
@@ -165,11 +163,13 @@ glyph-block Letter-Latin-Lower-D : begin
 		x -- (RightSB + SideJut)
 		y -- 0
 
+	link-reduced-variant 'd/hookBottomBase' 'd'
 	derive-glyphs 'dHookBottom' 0x256 "d/hookBottomBase" : function [src gr] : glyph-proc
 		include [refer-glyph src] AS_BASE ALSO_METRICS
 		include : RetroflexHook.rExt RightSB 0
 		include : LeaningAnchor.Below.VBar.r RightSB
 
+	link-reduced-variant 'dHookTop/hookBottomBase' 'dHookTop'
 	derive-glyphs 'dHookTopBottom' 0x1D91 "dHookTop/hookBottomBase" : function [src gr] : glyph-proc
 		include [refer-glyph src] AS_BASE ALSO_METRICS
 		include : RetroflexHook.rExt RightSB 0
@@ -215,7 +215,6 @@ glyph-block Letter-Latin-Lower-D : begin
 
 	select-variant 'dCurlyTail' 0x221
 
-
 	glyph-block-import Letter-Blackboard : BBS BBD BBBarRight
 	create-glyph 'mathbb/d' 0x1D555 : glyph-proc
 		include : MarkSet.b

diff --git a/packages/font-glyphs/src/letter/latin/lower-e.ptl b/packages/font-glyphs/src/letter/latin/lower-e.ptl
@@ -222,7 +222,7 @@ glyph-block Letter-Latin-Lower-E : begin
 			include : RetroflexHook.r
 				x -- RightSB
 				y -- 0
-				yAttach -- AHook
+				yAttach -- DToothlessRise
 
 		create-glyph "Schwa.\(suffix)" : glyph-proc
 			include : MarkSet.capital

diff --git a/packages/font-glyphs/src/letter/latin/lower-g.ptl b/packages/font-glyphs/src/letter/latin/lower-g.ptl
@@ -10,8 +10,8 @@ glyph-block Letter-Latin-Lower-G : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor
 	glyph-block-import Letter-Shared : CreateTurnedLetter
-	glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight DToothlessRise DMBlend
-	glyph-block-import Letter-Shared-Shapes : FlatHookDepth CurlyTail PalatalHook TopHook
+	glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight FlatHookDepth
+	glyph-block-import Letter-Shared-Shapes : CurlyTail PalatalHook TopHook
 
 	define [OverlayW bw] : glyph-proc
 		define l : mix 0 SB 0.3

diff --git a/packages/font-glyphs/src/letter/latin/lower-m.ptl b/packages/font-glyphs/src/letter/latin/lower-m.ptl
@@ -9,10 +9,9 @@ glyph-block Letter-Latin-Lower-M : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : LeaningAnchor
-	glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder
-	glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend MidHook
-	glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook EngHook UpwardHookShape
-	glyph-block-import Letter-Shared-Shapes : SerifFrame
+	glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder RightwardTailedBar
+	glyph-block-import Letter-Shared-Shapes : MidHook CyrDescender PalatalHook EngHook
+	glyph-block-import Letter-Shared-Shapes : UpwardHookShape SerifFrame
 
 	define [SmallMSmooth df] : df.advs * (0.5 * SmallArchDepth + 0.375 * Stroke)
 	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
 						right  -- df.rightSB
 						ybegin -- (XH / 2)
 						yend   -- (XH / 2)
-						ada    -- (SmallArchDepthA * 0.6 * df.advs)
-						adb    -- (SmallArchDepthB * 0.6 * df.advs)
+						ada    -- (SmallArchDepthA * 0.5 * df.advs)
+						adb    -- (SmallArchDepthB * 0.5 * df.advs)
 						sw     -- subDf.mvs
 					include : Serifs subDf XH 0 0 (XH / 2) true false
 					if SLAB : begin

diff --git a/packages/font-glyphs/src/letter/latin/lower-n.ptl b/packages/font-glyphs/src/letter/latin/lower-n.ptl
@@ -11,10 +11,9 @@ glyph-block Letter-Latin-Lower-N : begin
 	glyph-block-import Mark-Shared-Metrics : markHalfStroke
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	glyph-block-import Letter-Shared : CreateAccentedComposition
-	glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder
-	glyph-block-import Letter-Shared-Shapes : RightwardTailedBar DToothlessRise DMBlend MidHook
-	glyph-block-import Letter-Shared-Shapes : CyrDescender PalatalHook RetroflexHook EngHook
-	glyph-block-import Letter-Shared-Shapes : SerifFrame
+	glyph-block-import Letter-Shared-Shapes : CurlyTail nShoulder RightwardTailedBar
+	glyph-block-import Letter-Shared-Shapes : MidHook CyrDescender PalatalHook RetroflexHook
+	glyph-block-import Letter-Shared-Shapes : EngHook SerifFrame
 
 	define [AdjustTrailingAnchor] : glyph-proc
 		define trAnchor currentGlyph.baseAnchors.trailing
@@ -216,7 +215,7 @@ glyph-block Letter-Latin-Lower-N : begin
 			include : MarkSet.p
 			include : Body XH SB RightSB 0 Stroke
 			local fine : AdviceStroke 3.5
-			local rinner : (-Descender - 2 * fine) / 3
+			local rinner : ((-Descender) - 2 * fine) / 3
 			local m1 : RightSB - [HSwToV Stroke]
 			local x2 : mix RightSB m1 0.25
 			local y2 : Descender + O

diff --git a/packages/font-glyphs/src/letter/latin/lower-p.ptl b/packages/font-glyphs/src/letter/latin/lower-p.ptl
@@ -10,7 +10,6 @@ glyph-block Letter-Latin-Lower-P : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor
 	glyph-block-import Letter-Shared-Shapes : OBarLeft LetterBarOverlay
-	glyph-block-import Letter-Shared-Shapes : DToothlessRise DMBlend
 	glyph-block-import Letter-Shared-Shapes : TopHook PalatalHook SerifFrame
 
 

diff --git a/packages/font-glyphs/src/letter/latin/lower-q.ptl b/packages/font-glyphs/src/letter/latin/lower-q.ptl
@@ -10,9 +10,8 @@ glyph-block Letter-Latin-Lower-Q : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Shared-Metrics : markHalfStroke
 	glyph-block-import Mark-Adjustment : LeaningAnchor
-	glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight RightwardTailedBar DToothlessRise
-	glyph-block-import Letter-Shared-Shapes : DMBlend DiagTail
-	glyph-block-import Letter-Shared-Shapes : TopHook RetroflexHook
+	glyph-block-import Letter-Shared-Shapes : OBarLeft OBarRight RightwardTailedBar
+	glyph-block-import Letter-Shared-Shapes : DiagTail TopHook RetroflexHook
 
 	define TERMINAL-NORMAL  0
 	define TERMINAL-TAILED  1

diff --git a/packages/font-glyphs/src/letter/latin/lower-r.ptl b/packages/font-glyphs/src/letter/latin/lower-r.ptl
@@ -10,7 +10,7 @@ glyph-block Letter-Latin-Lower-R : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	glyph-block-import Letter-Shared : CreateAccentedComposition
-	glyph-block-import Letter-Shared-Shapes : DToothlessRise DMBlend PalatalHook RetroflexHook
+	glyph-block-import Letter-Shared-Shapes : PalatalHook RetroflexHook
 	glyph-block-import Letter-Blackboard : BBS BBD BBBarRight
 
 	local dfN : DivFrame 1

diff --git a/packages/font-glyphs/src/letter/latin/lower-t.ptl b/packages/font-glyphs/src/letter/latin/lower-t.ptl
@@ -10,8 +10,7 @@ glyph-block Letter-Latin-Lower-T : begin
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	glyph-block-import Letter-Shared : CreateAccentedComposition CreateCommaCaronComposition CreateTurnedLetter
 	glyph-block-import Letter-Shared-Shapes : CurlyTail FlatHookDepth ConnectedCedilla SerifedArcEnd
-	glyph-block-import Letter-Shared-Shapes : DiagTail DToothlessRise
-	glyph-block-import Letter-Shared-Shapes : TopHook PalatalHook
+	glyph-block-import Letter-Shared-Shapes : DiagTail TopHook PalatalHook
 	glyph-block-import Letter-Latin-S : SAutoSlabEnd AdviceSArchDepth
 	glyph-block-import Letter-Blackboard : BBS BBD
 
@@ -252,7 +251,7 @@ glyph-block Letter-Latin-Lower-T : begin
 				difference [Style.Body df sym top 0] [MaskAbove XH]
 				TopHook.toRight.mBarInner attach.x XH Ascender
 
-		create-glyph "tLTail.\(suffix)" : glyph-proc
+		create-glyph "tPalatalHook.\(suffix)" : glyph-proc
 			set-width df.width
 			include : df.markSet.bp
 			include : Style.Body df sym top 0
@@ -304,7 +303,7 @@ glyph-block Letter-Latin-Lower-T : begin
 	CreateAccentedComposition 'tComma' 0x21B 't' 'commaBelow'
 
 	select-variant "tHookTop" 0x1AD
-	select-variant 'tLTail' 0x1AB
+	select-variant 'tPalatalHook' 0x1AB (follow -- 't')
 	select-variant 'tRTail' 0x288
 	select-variant 'tCurlyTail' 0x236
 

diff --git a/packages/font-glyphs/src/letter/latin/s.ptl b/packages/font-glyphs/src/letter/latin/s.ptl
@@ -10,7 +10,7 @@ glyph-block Letter-Latin-S : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Letter-Shared : CreateAccentedComposition CreateDependentComposite
 	glyph-block-import Letter-Blackboard : BBS BBD
-	glyph-block-import Letter-Shared-Shapes : DToothlessRise FlatHookDepth
+	glyph-block-import Letter-Shared-Shapes : FlatHookDepth
 	glyph-block-import Letter-Shared-Shapes : ArcStartSerifWidth ArcStartSerifDepth
 	glyph-block-import Letter-Shared-Shapes : SerifedArcStart SerifedArcEnd
 	glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd

diff --git a/packages/font-glyphs/src/letter/latin/u.ptl b/packages/font-glyphs/src/letter/latin/u.ptl
@@ -10,7 +10,7 @@ glyph-block Letter-Latin-U : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : LeaningAnchor
 	glyph-block-import Letter-Shared : CreateAccentedComposition SetGrekUpperTonos
-	glyph-block-import Letter-Shared-Shapes : uBowl RightwardTailedBar DToothlessRise SerifFrame
+	glyph-block-import Letter-Shared-Shapes : uBowl RightwardTailedBar SerifFrame
 	glyph-block-import Letter-Shared-Shapes : CyrDescender CyrTailDescender RetroflexHook TopHook
 
 	define [UArcT] : with-params [sink df top bottom [stroke Stroke] [ada ArchDepthA] [adb ArchDepthB] [offset 0]] : sink

diff --git a/packages/font-glyphs/src/letter/latin/upper-g.ptl b/packages/font-glyphs/src/letter/latin/upper-g.ptl
@@ -10,7 +10,6 @@ glyph-block Letter-Latin-Upper-G : begin
 	glyph-block-import Common-Derivatives
 	glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor
 	glyph-block-import Letter-Shared : CreateTurnedLetter
-	glyph-block-import Letter-Shared-Shapes : DToothlessRise
 	glyph-block-import Letter-Shared-Shapes : SerifedArcStart InwardSlabArcStart TopHook
 	glyph-block-import Letter-Shared-Shapes : ArcStartSerif LetterBarOverlay SerifFrame
 
@@ -27,8 +26,8 @@ glyph-block Letter-Latin-Upper-G : begin
 	define SLAB-INWARD        2
 	define SLAB-HOOK-TOP     10
 
-	define [GShape toothShape slabShape crossBarShape top ada adb _yBarOverride] : glyph-proc
-		local yBar : fallback _yBarOverride (top * 0.52 + QuarterStroke)
+	define [GShape toothShape slabShape crossBarShape top ada adb yBarOverride] : glyph-proc
+		local yBar : fallback yBarOverride (top * 0.52 + QuarterStroke)
 		local fine ShoulderFine
 
 		local knots : match slabShape

diff --git a/packages/font-glyphs/src/letter/shared.ptl b/packages/font-glyphs/src/letter/shared.ptl
@@ -160,10 +160,6 @@ glyph-block Letter-Shared-Shapes : begin
 			flat (x + hookTurn)  (high - overshoot) [heading Rightward]
 			curl (x + hookDepth + sw * TanSlope) (high - overshoot)
 
-	glyph-block-export DToothlessRise DMBlend
-	define DToothlessRise : Hook * 0.25 + Stroke / 16
-	define DMBlend          0.80
-
 	glyph-block-export CurlyTail
 	define CurlyTail : namespace
 		define [normalBlender before _after args] : begin

diff --git a/packages/font-glyphs/src/meta/aesthetics.ptl b/packages/font-glyphs/src/meta/aesthetics.ptl
@@ -150,6 +150,9 @@ export : define [calculateMetrics para] : begin
 	define SideJut : Jut - [HSwToV HalfStroke]
 	define VJutStroke : AdviceStroke 3.5
 
+	define DToothlessRise : Hook * 0.25 + Stroke / 16
+	define DMBlend          0.80
+
 	define [StrokeWidthBlend min max sw] : linreg para.canonicalStrokeWidthMin min para.canonicalStrokeWidthMax max [fallback sw Stroke]
 
 	define SmoothAdjust : StrokeWidthBlend 80 144
@@ -179,7 +182,6 @@ export : define [calculateMetrics para] : begin
 	define SmallArchDepthA : SmallArchDepth - TanSlope * SmoothAdjust
 	define SmallArchDepthB : SmallArchDepth + TanSlope * SmoothAdjust
 
-
 	define CorrectionOMidX : TanSlope * 0.9 * [StrokeWidthBlend 1.3 0.9]
 	define CorrectionOMidS : Stroke * CorrectionOMidX
 
@@ -208,7 +210,8 @@ export : define [calculateMetrics para] : begin
 		CorrectionOMidS compositeBaseAnchors AdviceStroke AdviceStroke2 AdviceStrokeInSpace
 		OverlayStroke OperatorStroke GeometryStroke ShoulderFine AdviceGlottalStopArchDepth
 		StrokeWidthBlend ArchDepthAOf ArchDepthBOf SmoothAdjust SideJut MidJutSide MidJutCenter
-		YSmoothMidR YSmoothMidL HSwToV VSwToH NarrowUnicodeT WideUnicodeT VERY-FAR TINY]
+		YSmoothMidR YSmoothMidL DToothlessRise DMBlend HSwToV VSwToH NarrowUnicodeT WideUnicodeT
+		VERY-FAR TINY]
 
 export : define [setFontMetrics para metrics fm] : begin
 	define [object CAP Descender XH Width SymbolMid] metrics

diff --git a/packages/font-glyphs/src/meta/macros.ptl b/packages/font-glyphs/src/meta/macros.ptl
@@ -389,8 +389,8 @@ define-macro glyph-block : syntax-rules
 			CorrectionOMidS compositeBaseAnchors AdviceStroke AdviceStroke2 AdviceStrokeInSpace
 			OverlayStroke OperatorStroke GeometryStroke ShoulderFine AdviceGlottalStopArchDepth
 			StrokeWidthBlend ArchDepthAOf ArchDepthBOf SmoothAdjust SideJut MidJutSide
-			MidJutCenter YSmoothMidR YSmoothMidL HSwToV VSwToH NarrowUnicodeT WideUnicodeT
-			VERY-FAR TINY]
+			MidJutCenter YSmoothMidR YSmoothMidL DToothlessRise DMBlend HSwToV VSwToH
+			NarrowUnicodeT WideUnicodeT VERY-FAR TINY]
 
 		define spiroFnImports `[g4 g2 corner flat curl virt close end straight g2c cg2 flatc ccurl
 			widths disable-contrast heading unimportant important alsoThru alsoThruThem bezControls