Merge branch 'dev' into dev

be5invis · Jan 27, 2025 · f56fb3e · f56fb3e
2 parents 46ae90d + 3a2b7a3
commit f56fb3e
Show file tree

Hide file tree

Showing 76 changed files with 360 additions and 374 deletions.
diff --git a/packages/font-glyphs/src/auto-build/composite.ptl b/packages/font-glyphs/src/auto-build/composite.ptl
@@ -1529,8 +1529,8 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
 	glyph-block-import Autobuild-Enclosure-Shared : CollectJobs CreateDerivedFontFromJobs EnsureComponentGlyphT applyRelations
 	glyph-block-import Autobuild-Transformed-Shared : ToSuperscript ToSubscript
 
-	define [createPhoneticLigatures tfm prefix advs mockNParts _shrink kKern demands] : begin
-		local ww0 : Width * advs
+	define [createPhoneticLigatures tfm prefix adws mockNParts _shrink kKern demands] : begin
+		local ww0 : Width * adws
 		local wwM : ww0 / [fallback tfm.crowdAdjScale 1]
 		local jobs : CollectJobs DECOMPOSABLE NOT-CENTERED ALLOW-PROPORTIONAL prefix "" demands
 		local shrink : clamp 0 1 _shrink
@@ -1548,10 +1548,10 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
 			if [query-glyph gni] : return gni
 			create-glyph gni : glyph-proc
 				set-width aw
-				if mak : include : [DivFrame advs].markSet.(mak)
+				if mak : include : [DivFrame adws].markSet.(mak)
 				set-base-anchor 'enclosureInner' markPlacement 0
 				set-base-anchor 'slash' (aw / 2) (Ascender / 2)
-				include : tfm advs
+				include : tfm adws
 			return gni
 
 		define [LigaturePartImpl thinFont compress markDist maskPos] : lambda [gidPart] : begin
@@ -1566,7 +1566,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
 				include : Scale compress 1
 				include : Regizmo
 				set-mark-anchor 'enclosureInner' 0 0 markDist 0
-				include : tfm advs
+				include : tfm adws
 			return gni
 
 		define [LigatureImpl job decomposable] : if [not : query-glyph gn] : begin
@@ -1675,8 +1675,8 @@ glyph-block Autobuild-Double-Emotions : begin
 	glyph-block-import Recursive-Build : Thinner
 	glyph-block-import Autobuild-Enclosure-Shared : CollectJobs CreateDerivedFontFromJobs EnsureComponentGlyphT applyRelations
 
-	define [createDoubleEmotions prefix advs _shrink1 _shrink2 wadj1 wadj2 demands] : for-width-kinds WideWidth2
-		define CWidth : if FMosaicWide MosaicWidth (Width * advs)
+	define [createDoubleEmotions prefix adws _shrink1 _shrink2 wadj1 wadj2 demands] : for-width-kinds WideWidth2
+		define CWidth : if FMosaicWide MosaicWidth (Width * adws)
 		define shrink1 : if FMosaicWide 1 _shrink1
 		define shrink2 : if FMosaicWide 1 _shrink2
 		define kern : SB * shrink1 + SB * shrink2 + HalfStroke * [mix shrink1 shrink2 0.5] - OX * 2

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/auto-build/transformed.ptl b/packages/font-glyphs/src/auto-build/transformed.ptl
@@ -80,8 +80,8 @@ glyph-block Autobuild-Transformed-Shared : begin
 					[query-glyph origDstName].tryBecomeMirrorOf [query-glyph relDstName] rs
 
 	glyph-block-export ToSuperscript
-	define [ToSuperscript advs] : glyph-proc
-		local df : DivFrame advs
+	define [ToSuperscript adws] : glyph-proc
+		local df : DivFrame adws
 		include [Ungizmo] true
 		include [Translate (-df.middle) (-CAP)] true
 		include [Scale ToSuperscript.crowdAdjScale] true
@@ -91,8 +91,8 @@ glyph-block Autobuild-Transformed-Shared : begin
 	set ToSuperscript.crowdAdjScale 0.7
 
 	glyph-block-export ToSubscript
-	define [ToSubscript advs] : glyph-proc
-		local df : DivFrame advs
+	define [ToSubscript adws] : glyph-proc
+		local df : DivFrame adws
 		include [Ungizmo] true
 		include [Translate (-df.middle) 0] true
 		include [Scale ToSubscript.crowdAdjScale] true

diff --git a/packages/font-glyphs/src/letter-like/fraktur/common.ptl b/packages/font-glyphs/src/letter-like/fraktur/common.ptl
@@ -188,10 +188,10 @@ glyph-block LetterLike-Fraktur-Common : begin
 	define PHexBot : 1 - PHexTop
 
 	glyph-block-export UpperDf
-	define [UpperDf advs m] : DivFrame [fallback advs 1] [fallback m 2] [Math.max 1 : DecoSizeX / SB]
+	define [UpperDf adws m] : DivFrame [fallback adws 1] [fallback m 2] [Math.max 1 : DecoSizeX / SB]
 
 	glyph-block-export LowerDf
-	define [LowerDf advs m] : DivFrame [fallback advs 1] [fallback m 2] [Math.max 1 : (1.75 * DecoSizeX - 0.5 * S.thick) / SB]
+	define [LowerDf adws m] : DivFrame [fallback adws 1] [fallback m 2] [Math.max 1 : (1.75 * DecoSizeX - 0.5 * S.thick) / SB]
 
 	glyph-block-export RBDecoration
 	define [RBDecoration cx cy limy] : lift-@ : list

diff --git a/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl b/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl
@@ -52,7 +52,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
 			local df : include : DivFrame : if SLAB para.advanceScaleI para.advanceScaleII
 			include : df.markSet.p
 			local xMiddle : df.middle - [IBalance2 df]
-			local longJut : if (df.advs < 1) (jut * [if SLAB 1.5 1]) LongJut
+			local longJut : if (df.adws < 1) (jut * [if SLAB 1.5 1]) LongJut
 			include : VBar.m xMiddle Descender XH df.mvs
 			include : HBar.b xMiddle (xMiddle + longJut) Descender df.mvs
 			if SLAB : include : HSerif.lt xMiddle XH Jut df.mvs

diff --git a/packages/font-glyphs/src/letter/armenian/feh.ptl b/packages/font-glyphs/src/letter/armenian/feh.ptl
@@ -32,7 +32,7 @@ glyph-block Letter-Armenian-Feh : begin
 	create-glyph 'armn/Feh' 0x556 : glyph-proc
 		local df : include : DivFrame para.advanceScaleM 3
 		include : df.markSet.capital
-		local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.advs
+		local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.adws
 		local ada : df.archDepthAOf ArchDepth sw
 		local adb : df.archDepthBOf ArchDepth sw
 		include : FehBody df CAP 0 sw Hook ada adb
@@ -44,7 +44,7 @@ glyph-block Letter-Armenian-Feh : begin
 	create-glyph 'armn/feh' 0x586 : glyph-proc
 		local df : include : DivFrame para.advanceScaleM 3
 		include : df.markSet.bp
-		local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.advs
+		local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.adws
 		local ada : df.archDepthAOf SmallArchDepth sw
 		local adb : df.archDepthBOf SmallArchDepth sw
 		include : FehBody df Ascender 0 sw Hook ada adb

diff --git a/packages/font-glyphs/src/letter/armenian/shared.ptl b/packages/font-glyphs/src/letter/armenian/shared.ptl
@@ -28,7 +28,7 @@ glyph-block Letter-Armenian-Shared-Shapes : begin
 			--                df.leftSB
 		define right : match hPos
 			[Just JUT.RIGHT] (df.rightSB + (jut * [if SLAB 1.5 1]) - [HSwToV : 0.5 * df.mvs])
-			[Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.advs)
+			[Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.adws)
 			[Just JUT.LEFT]   df.leftSB
 			--                df.rightSB
 

diff --git a/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl b/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl
@@ -11,7 +11,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
 	glyph-block-import Letter-Cyrillic-Iotified-A : Iotified
 
 	define [BigYusLegMaskShape df top yp _fine] : begin
-		local fine : fallback _fine : AdviceStroke 3.3 df.advs
+		local fine : fallback _fine : AdviceStroke 3.3 df.adws
 		local midx : mix df.leftSB df.middle 0.3
 		local yb : top * yp
 		return : spiro-outline
@@ -21,7 +21,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
 			corner midx yb
 
 	define [CyrBigYusShape df top yp _fine] : glyph-proc
-		local fine : fallback _fine : AdviceStroke 3.3 df.advs
+		local fine : fallback _fine : AdviceStroke 3.3 df.adws
 		local cor HVContrast
 		local midx : mix df.leftSB df.middle 0.3
 		local midx2 : Math.min (df.middle - fine * cor) [mix df.leftSB df.middle 0.75]
@@ -65,7 +65,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
 				include : tagged 'serifMB' sf.mb.full
 
 	define [CyrBlendedYusShape df top yp yp2 _fine] : glyph-proc
-		local fine : fallback _fine : AdviceStroke 3.3 df.advs
+		local fine : fallback _fine : AdviceStroke 3.3 df.adws
 		include : CyrBigYusShape df top yp fine
 		eject-contour 'barM'
 
@@ -101,7 +101,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
 		define dfSub : DivFrame divSub 3
 		include : CyrBigYusShape dfSub top yp df.mvs
 		eject-contour 'serifRB'
-		include : Translate (Width * (df.advs - divSub)) 0
+		include : Translate (Width * (df.adws - divSub)) 0
 
 		include : Iotified.outer df top
 			hBarRight -- [mix df.leftSB df.rightSB (2 / 3)]

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
 
@@ -102,7 +102,7 @@ glyph-block Letter-Cyrillic-Che : begin
 	define [CyrTcheShape] : with-params [df top pyBar bodyType slabType [teSerifs SLAB] [sw : AdviceStroke 2.75] [yBarOffset DToothlessRise]] : glyph-proc
 		local bar : top * [fallback pyBar 0.5] + yBarOffset
 
-		local left : [mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
+		local left : [mix df.leftSB df.rightSB : if (df.adws > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
 		local right : df.rightSB - OX
 
 		include : tagged 'strokeR' : match bodyType

diff --git a/packages/font-glyphs/src/letter/cyrillic/de.ptl b/packages/font-glyphs/src/letter/cyrillic/de.ptl
@@ -63,7 +63,7 @@ glyph-block Letter-Cyrillic-De : begin
 		local sw : fallback _sw Stroke
 		local xm : if SLAB
 			[mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * sw]
-			mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4)
+			mix df.leftSB df.rightSB : if (df.adws > 1) (2 / 3) (3 / 4)
 		local xTopRight : mix df.leftSB xm : StrokeWidthBlend 0.95 0.96
 		local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375
 

diff --git a/packages/font-glyphs/src/letter/cyrillic/dje.ptl b/packages/font-glyphs/src/letter/cyrillic/dje.ptl
@@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Dje : begin
 		include : df.markSet.capital
 
 		local sw : AdviceStroke 2.75
-		local left : [mix df.leftSB df.rightSB : if (df.advs <= 1) 0.2 : if SLAB 0.3 0.25] + OX
+		local left : [mix df.leftSB df.rightSB : if (df.adws <= 1) 0.2 : if SLAB 0.3 0.25] + OX
 		local right : df.rightSB - OX
 
 		local xTopBarLeft : df.leftSB - SideJut

diff --git a/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl b/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl
@@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Dzzhe-Zhwe : begin
 		local subDf : df.slice 4 keeps _o
 		local subDfFullShift : (df.rightSB - subDf.rightSB) / (4 - keeps)
 		local shift : pShift * subDfFullShift
-		local sw : AdviceStroke 3.3 [df.slice 4 3 _o].advs
+		local sw : AdviceStroke 3.3 [df.slice 4 3 _o].adws
 		return : object subDf shift sw
 
 	do "de subglyph"

diff --git a/packages/font-glyphs/src/letter/cyrillic/e.ptl b/packages/font-glyphs/src/letter/cyrillic/e.ptl
@@ -47,10 +47,10 @@ glyph-block Letter-Cyrillic-E : begin
 			define dfSub : DivFrame divSub 2
 
 			local lf : CLetterForm dfSub sty styBot top 0
-				ada -- (ada * 0.7 * df.advs)
-				adb -- (adb * 0.7 * df.advs)
+				ada -- (ada * 0.7 * df.adws)
+				adb -- (adb * 0.7 * df.adws)
 				sw  -- df.mvs
-			include : with-transform [ApparentTranslate (Width * (df.advs - divSub)) 0] : lf.full
+			include : with-transform [ApparentTranslate (Width * (df.adws - divSub)) 0] : lf.full
 
 			include : Iotified.full df top
 				hBarRight -- [mix df.leftSB df.rightSB (3 / 4)]

diff --git a/packages/font-glyphs/src/letter/cyrillic/el.ptl b/packages/font-glyphs/src/letter/cyrillic/el.ptl
@@ -59,7 +59,7 @@ glyph-block Letter-Cyrillic-El : begin
 		local sw : fallback _sw Stroke
 		local xm : if SLAB
 			[mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * sw]
-			mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4)
+			mix df.leftSB df.rightSB : if (df.adws > 1) (2 / 3) (3 / 4)
 		local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375
 
 		include : CyrElShape df.leftSB xm top bodyType slabType sw
@@ -160,8 +160,8 @@ glyph-block Letter-Cyrillic-El : begin
 			right  -- df.rightSB
 			ybegin -- CAP
 			yend   -- (CAP / 2)
-			ada    -- (SmallArchDepthA * 0.6 * df.advs)
-			adb    -- (SmallArchDepthB * 0.6 * df.advs)
+			ada    -- (SmallArchDepthA * 0.6 * df.adws)
+			adb    -- (SmallArchDepthB * 0.6 * df.adws)
 			sw     -- df.mvs
 		local sf2 : [SerifFrame.fromDf df (CAP / 2) 0].slice 1 2
 		if SLAB : include sf2.rt.full
@@ -177,8 +177,8 @@ glyph-block Letter-Cyrillic-El : begin
 			right  -- df.rightSB
 			ybegin -- XH
 			yend   -- (XH / 2)
-			ada    -- (SmallArchDepthA * 0.6 * df.advs)
-			adb    -- (SmallArchDepthB * 0.6 * df.advs)
+			ada    -- (SmallArchDepthA * 0.6 * df.adws)
+			adb    -- (SmallArchDepthB * 0.6 * df.adws)
 			sw     -- df.mvs
 		local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 1 2
 		if SLAB : include sf2.rt.full
diff --git a/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl b/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl
@@ -111,7 +111,7 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
 				local divSub : (df.width - gap - df.mvs) / Width
 				local subDf : DivFrame divSub 2 (df.leftSB / SB) df.mvs 0
 
-				local shift : Width * (df.advs - divSub)
+				local shift : Width * (df.adws - divSub)
 				local xIotifiedBarRight : df.leftSB + [HSwToV df.mvs]
 				local botGap : Math.max ((df.rightSB - df.leftSB) * 0.08) [AdviceStroke 6]
 				include : difference
@@ -137,7 +137,7 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
 				local divSub : (df.width - gap - df.mvs) / Width
 				local subDf : DivFrame divSub 2
 
-				local shift : Width * (df.advs - divSub)
+				local shift : Width * (df.adws - divSub)
 				include : with-transform [ApparentTranslate shift 0]
 					body subDf hookStyle df.mvs
 
@@ -155,7 +155,7 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
 				local divSub : (df.width - gap - df.mvs) / Width
 				local subDf : DivFrame divSub 2
 
-				local shift : Width * (df.advs - divSub)
+				local shift : Width * (df.adws - divSub)
 				include : with-transform [ApparentTranslate shift 0]
 					body subDf XH bar df.mvs
 
@@ -179,12 +179,12 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
 				local divSub : (df.width - gap - df.mvs) / Width
 				local subDf : DivFrame divSub 2
 
-				local shift : Width * (df.advs - divSub)
+				local shift : Width * (df.adws - divSub)
 				include : with-transform [ApparentTranslate shift 0]
 					body subDf XH
 						stroke -- df.mvs
-						ada -- (SmallArchDepthA * 0.7 * df.advs)
-						adb -- (SmallArchDepthB * 0.7 * df.advs)
+						ada -- (SmallArchDepthA * 0.7 * df.adws)
+						adb -- (SmallArchDepthB * 0.7 * df.adws)
 
 				include : Iotified.full df XH (shift + subDf.leftSB + [HSwToV : 0.5 * df.mvs]) (XH / 2)
 

diff --git a/packages/font-glyphs/src/letter/cyrillic/lje.ptl b/packages/font-glyphs/src/letter/cyrillic/lje.ptl
@@ -17,7 +17,7 @@ glyph-block Letter-Cyrillic-Lje : begin
 		local r : rightSB - 0
 		local middle : df.width / 2
 		local xTopLeft : mix l r 0.025
-		local jut : Math.min Jut : Jut * 0.75 * df.advs
+		local jut : Math.min Jut : Jut * 0.75 * df.adws
 		include : LegShape
 			ztop -- [Point.fromXY Point.Type.Corner xTopLeft top]
 			zbot -- [Point.fromXY Point.Type.Corner [mix l 0 [if SLAB 1 0.75]] 0]

diff --git a/packages/font-glyphs/src/letter/cyrillic/omega.ptl b/packages/font-glyphs/src/letter/cyrillic/omega.ptl
@@ -11,7 +11,7 @@ glyph-block Letter-Cyrillic-Omega : begin
 	glyph-block-import Letter-Cyrillic-Te-Comb
 
 	define [CyrlOmegaShape df top p1 p2] : glyph-proc
-		local fine : AdviceStroke 3 df.advs
+		local fine : AdviceStroke 3 df.adws
 		local mfine : fine * CThin
 
 		local minHookDepth : Math.min (0.625 * (df.middle - df.leftSB - [HSwToV fine])) ((1 / 3) * (df.rightSB - df.leftSB))
@@ -50,10 +50,10 @@ glyph-block Letter-Cyrillic-Omega : begin
 
 	create-glyph 'cyrl/BroadOmega' 0xA64C : glyph-proc
 		define df : include : DivFrame para.advanceScaleMM 3
-		include : [DivFrame df.advs].markSet.capital
+		include : [DivFrame df.adws].markSet.capital
 		include : CyrlOmegaShape df CAP 0.30 0.31
 
 	create-glyph 'cyrl/broadOmega' 0xA64D : glyph-proc
 		define df : include : DivFrame para.advanceScaleM 3
-		include : [DivFrame df.advs].markSet.e
+		include : [DivFrame df.adws].markSet.e
 		include : CyrlOmegaShape df XH 0.30 0.31
diff --git a/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl b/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl
@@ -13,7 +13,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin
 	glyph-block-import Letter-Cyrillic-Iotified-A : Iotified
 
 	define [CyrSmallYusShape df top straightBar _fine] : glyph-proc
-		local fine : fallback _fine : AdviceStroke 3.3 df.advs
+		local fine : fallback _fine : AdviceStroke 3.3 df.adws
 		include : LambdaShape
 			df -- df
 			fBarStraight -- straightBar
@@ -33,7 +33,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin
 				include : tagged 'serifMB' sf.mb.full
 
 	define [CyrClosedSmallYusShape df top straightBar _fine] : glyph-proc
-		local fine : fallback _fine : AdviceStroke 2.75 df.advs
+		local fine : fallback _fine : AdviceStroke 2.75 df.adws
 		include : DeltaShape
 			df -- df
 			top -- top
@@ -86,7 +86,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin
 			include : CyrClosedSmallYusShape dfSub top straightBar df.mvs
 			include : CyrSmallYusShape dfSub top straightBar df.mvs
 		eject-contour 'serifRB'
-		include : Translate (Width * (df.advs - divSub)) 0
+		include : Translate (Width * (df.adws - divSub)) 0
 
 		include : Iotified.A df top
 			hBarRight -- [mix df.leftSB df.rightSB (2 / 3)]

diff --git a/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl b/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl
@@ -37,14 +37,14 @@ glyph-block Letter-Cyrillic-Te-MidHook : begin
 				MaskLeft : mix (left + [HSwToV sw]) (df.rightSB - [HSwToV sw]) 0.625
 				HSerif.mb (left + [HSwToV : 0.5 * sw]) 0 Jut
 
-	foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do
+	foreach { suffix { adws doST doSB } } [Object.entries TConfig] : do
 		create-glyph "cyrl/TeMidHook.\(suffix)" : glyph-proc
-			local df : include : DivFrame advs
+			local df : include : DivFrame adws
 			include : df.markSet.capDesc
 			include : Shape df CAP 1 doST doSB
 
 		create-glyph "cyrl/teMidHook.upright.\(suffix)" : glyph-proc
-			local df : include : DivFrame advs
+			local df : include : DivFrame adws
 			include : df.markSet.p
 			include : Shape df XH (HBarPos ** 0.3) doST doSB
 

diff --git a/packages/font-glyphs/src/letter/cyrillic/tje.ptl b/packages/font-glyphs/src/letter/cyrillic/tje.ptl
@@ -41,7 +41,7 @@ glyph-block Letter-Cyrillic-Tje : begin
 		eject-contour 'serifYeriLT'
 		eject-contour 'serifYeriLB'
 
-	foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do
+	foreach { suffix { adws doST doSB } } [Object.entries TConfig] : do
 		create-glyph "cyrl/Tje/leftHalf.\(suffix)" : glyph-proc
 			local df : include : DivFrame para.advanceScaleT 3
 			include : df.markSet.capital

diff --git a/packages/font-glyphs/src/letter/cyrillic/tse.ptl b/packages/font-glyphs/src/letter/cyrillic/tse.ptl
@@ -44,7 +44,7 @@ glyph-block Letter-Cyrillic-Tse : begin
 
 	define [CyrTeTseShape df top teSerifs] : glyph-proc
 		local sw : AdviceStroke 2.75
-		local left : [mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
+		local left : [mix df.leftSB df.rightSB : if (df.adws > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
 		local right : df.rightSB - OX
 
 		local xTopBarLeft : df.leftSB - SideJut

diff --git a/packages/font-glyphs/src/letter/cyrillic/tshe.ptl b/packages/font-glyphs/src/letter/cyrillic/tshe.ptl
@@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Tshe : begin
 		include : df.markSet.capital
 
 		local sw : AdviceStroke 2.75
-		local left : [mix df.leftSB df.rightSB : if (df.advs <= 1) 0.2 : if SLAB 0.3 0.25] + OX
+		local left : [mix df.leftSB df.rightSB : if (df.adws <= 1) 0.2 : if SLAB 0.3 0.25] + OX
 		local right : df.rightSB - OX
 
 		local xTopBarLeft : SB - SideJut