Skip to content

Commit 3a2b7a3

Browse files
be5invisbe5invis
authored
Change advs to adws for less potential confusion (#2659)
1 parent 60d6633 commit 3a2b7a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+306
-306
lines changed

‎packages/font-glyphs/src/auto-build/composite.ptl

+7-7
Original file line numberDiff line numberDiff line change
@@ -1529,8 +1529,8 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
15291529
glyph-block-import Autobuild-Enclosure-Shared : CollectJobs CreateDerivedFontFromJobs EnsureComponentGlyphT applyRelations
15301530
glyph-block-import Autobuild-Transformed-Shared : ToSuperscript ToSubscript
15311531

1532-
define [createPhoneticLigatures tfm prefix advs mockNParts _shrink kKern demands] : begin
1533-
local ww0 : Width * advs
1532+
define [createPhoneticLigatures tfm prefix adws mockNParts _shrink kKern demands] : begin
1533+
local ww0 : Width * adws
15341534
local wwM : ww0 / [fallback tfm.crowdAdjScale 1]
15351535
local jobs : CollectJobs DECOMPOSABLE NOT-CENTERED ALLOW-PROPORTIONAL prefix "" demands
15361536
local shrink : clamp 0 1 _shrink
@@ -1548,10 +1548,10 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
15481548
if [query-glyph gni] : return gni
15491549
create-glyph gni : glyph-proc
15501550
set-width aw
1551-
if mak : include : [DivFrame advs].markSet.(mak)
1551+
if mak : include : [DivFrame adws].markSet.(mak)
15521552
set-base-anchor 'enclosureInner' markPlacement 0
15531553
set-base-anchor 'slash' (aw / 2) (Ascender / 2)
1554-
include : tfm advs
1554+
include : tfm adws
15551555
return gni
15561556

15571557
define [LigaturePartImpl thinFont compress markDist maskPos] : lambda [gidPart] : begin
@@ -1566,7 +1566,7 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin
15661566
include : Scale compress 1
15671567
include : Regizmo
15681568
set-mark-anchor 'enclosureInner' 0 0 markDist 0
1569-
include : tfm advs
1569+
include : tfm adws
15701570
return gni
15711571

15721572
define [LigatureImpl job decomposable] : if [not : query-glyph gn] : begin
@@ -1675,8 +1675,8 @@ glyph-block Autobuild-Double-Emotions : begin
16751675
glyph-block-import Recursive-Build : Thinner
16761676
glyph-block-import Autobuild-Enclosure-Shared : CollectJobs CreateDerivedFontFromJobs EnsureComponentGlyphT applyRelations
16771677

1678-
define [createDoubleEmotions prefix advs _shrink1 _shrink2 wadj1 wadj2 demands] : for-width-kinds WideWidth2
1679-
define CWidth : if FMosaicWide MosaicWidth (Width * advs)
1678+
define [createDoubleEmotions prefix adws _shrink1 _shrink2 wadj1 wadj2 demands] : for-width-kinds WideWidth2
1679+
define CWidth : if FMosaicWide MosaicWidth (Width * adws)
16801680
define shrink1 : if FMosaicWide 1 _shrink1
16811681
define shrink2 : if FMosaicWide 1 _shrink2
16821682
define kern : SB * shrink1 + SB * shrink2 + HalfStroke * [mix shrink1 shrink2 0.5] - OX * 2

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ glyph-block Autobuild-Transformed-Shared : begin
8080
[query-glyph origDstName].tryBecomeMirrorOf [query-glyph relDstName] rs
8181

8282
glyph-block-export ToSuperscript
83-
define [ToSuperscript advs] : glyph-proc
84-
local df : DivFrame advs
83+
define [ToSuperscript adws] : glyph-proc
84+
local df : DivFrame adws
8585
include [Ungizmo] true
8686
include [Translate (-df.middle) (-CAP)] true
8787
include [Scale ToSuperscript.crowdAdjScale] true
@@ -91,8 +91,8 @@ glyph-block Autobuild-Transformed-Shared : begin
9191
set ToSuperscript.crowdAdjScale 0.7
9292

9393
glyph-block-export ToSubscript
94-
define [ToSubscript advs] : glyph-proc
95-
local df : DivFrame advs
94+
define [ToSubscript adws] : glyph-proc
95+
local df : DivFrame adws
9696
include [Ungizmo] true
9797
include [Translate (-df.middle) 0] true
9898
include [Scale ToSubscript.crowdAdjScale] true

‎packages/font-glyphs/src/letter-like/fraktur/common.ptl

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ glyph-block LetterLike-Fraktur-Common : begin
188188
define PHexBot : 1 - PHexTop
189189

190190
glyph-block-export UpperDf
191-
define [UpperDf advs m] : DivFrame [fallback advs 1] [fallback m 2] [Math.max 1 : DecoSizeX / SB]
191+
define [UpperDf adws m] : DivFrame [fallback adws 1] [fallback m 2] [Math.max 1 : DecoSizeX / SB]
192192

193193
glyph-block-export LowerDf
194-
define [LowerDf advs m] : DivFrame [fallback advs 1] [fallback m 2] [Math.max 1 : (1.75 * DecoSizeX - 0.5 * S.thick) / SB]
194+
define [LowerDf adws m] : DivFrame [fallback adws 1] [fallback m 2] [Math.max 1 : (1.75 * DecoSizeX - 0.5 * S.thick) / SB]
195195

196196
glyph-block-export RBDecoration
197197
define [RBDecoration cx cy limy] : lift-@ : list

‎packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
5252
local df : include : DivFrame : if SLAB para.advanceScaleI para.advanceScaleII
5353
include : df.markSet.p
5454
local xMiddle : df.middle - [IBalance2 df]
55-
local longJut : if (df.advs < 1) (jut * [if SLAB 1.5 1]) LongJut
55+
local longJut : if (df.adws < 1) (jut * [if SLAB 1.5 1]) LongJut
5656
include : VBar.m xMiddle Descender XH df.mvs
5757
include : HBar.b xMiddle (xMiddle + longJut) Descender df.mvs
5858
if SLAB : include : HSerif.lt xMiddle XH Jut df.mvs

‎packages/font-glyphs/src/letter/armenian/feh.ptl

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ glyph-block Letter-Armenian-Feh : begin
3232
create-glyph 'armn/Feh' 0x556 : glyph-proc
3333
local df : include : DivFrame para.advanceScaleM 3
3434
include : df.markSet.capital
35-
local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.advs
35+
local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.adws
3636
local ada : df.archDepthAOf ArchDepth sw
3737
local adb : df.archDepthBOf ArchDepth sw
3838
include : FehBody df CAP 0 sw Hook ada adb
@@ -44,7 +44,7 @@ glyph-block Letter-Armenian-Feh : begin
4444
create-glyph 'armn/feh' 0x586 : glyph-proc
4545
local df : include : DivFrame para.advanceScaleM 3
4646
include : df.markSet.bp
47-
local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.advs
47+
local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.adws
4848
local ada : df.archDepthAOf SmallArchDepth sw
4949
local adb : df.archDepthBOf SmallArchDepth sw
5050
include : FehBody df Ascender 0 sw Hook ada adb

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ glyph-block Letter-Armenian-Shared-Shapes : begin
2828
-- df.leftSB
2929
define right : match hPos
3030
[Just JUT.RIGHT] (df.rightSB + (jut * [if SLAB 1.5 1]) - [HSwToV : 0.5 * df.mvs])
31-
[Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.advs)
31+
[Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.adws)
3232
[Just JUT.LEFT] df.leftSB
3333
-- df.rightSB
3434

‎packages/font-glyphs/src/letter/cyrillic/big-yus.ptl

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
1111
glyph-block-import Letter-Cyrillic-Iotified-A : Iotified
1212

1313
define [BigYusLegMaskShape df top yp _fine] : begin
14-
local fine : fallback _fine : AdviceStroke 3.3 df.advs
14+
local fine : fallback _fine : AdviceStroke 3.3 df.adws
1515
local midx : mix df.leftSB df.middle 0.3
1616
local yb : top * yp
1717
return : spiro-outline
@@ -21,7 +21,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
2121
corner midx yb
2222

2323
define [CyrBigYusShape df top yp _fine] : glyph-proc
24-
local fine : fallback _fine : AdviceStroke 3.3 df.advs
24+
local fine : fallback _fine : AdviceStroke 3.3 df.adws
2525
local cor HVContrast
2626
local midx : mix df.leftSB df.middle 0.3
2727
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
6565
include : tagged 'serifMB' sf.mb.full
6666

6767
define [CyrBlendedYusShape df top yp yp2 _fine] : glyph-proc
68-
local fine : fallback _fine : AdviceStroke 3.3 df.advs
68+
local fine : fallback _fine : AdviceStroke 3.3 df.adws
6969
include : CyrBigYusShape df top yp fine
7070
eject-contour 'barM'
7171

@@ -101,7 +101,7 @@ glyph-block Letter-Cyrillic-BigYus : begin
101101
define dfSub : DivFrame divSub 3
102102
include : CyrBigYusShape dfSub top yp df.mvs
103103
eject-contour 'serifRB'
104-
include : Translate (Width * (df.advs - divSub)) 0
104+
include : Translate (Width * (df.adws - divSub)) 0
105105

106106
include : Iotified.outer df top
107107
hBarRight -- [mix df.leftSB df.rightSB (2 / 3)]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ glyph-block Letter-Cyrillic-Che : begin
102102
define [CyrTcheShape] : with-params [df top pyBar bodyType slabType [teSerifs SLAB] [sw : AdviceStroke 2.75] [yBarOffset DToothlessRise]] : glyph-proc
103103
local bar : top * [fallback pyBar 0.5] + yBarOffset
104104

105-
local left : [mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
105+
local left : [mix df.leftSB df.rightSB : if (df.adws > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
106106
local right : df.rightSB - OX
107107

108108
include : tagged 'strokeR' : match bodyType

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ glyph-block Letter-Cyrillic-De : begin
6363
local sw : fallback _sw Stroke
6464
local xm : if SLAB
6565
[mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * sw]
66-
mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4)
66+
mix df.leftSB df.rightSB : if (df.adws > 1) (2 / 3) (3 / 4)
6767
local xTopRight : mix df.leftSB xm : StrokeWidthBlend 0.95 0.96
6868
local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375
6969

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Dje : begin
1414
include : df.markSet.capital
1515

1616
local sw : AdviceStroke 2.75
17-
local left : [mix df.leftSB df.rightSB : if (df.advs <= 1) 0.2 : if SLAB 0.3 0.25] + OX
17+
local left : [mix df.leftSB df.rightSB : if (df.adws <= 1) 0.2 : if SLAB 0.3 0.25] + OX
1818
local right : df.rightSB - OX
1919

2020
local xTopBarLeft : df.leftSB - SideJut

‎packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Dzzhe-Zhwe : begin
1414
local subDf : df.slice 4 keeps _o
1515
local subDfFullShift : (df.rightSB - subDf.rightSB) / (4 - keeps)
1616
local shift : pShift * subDfFullShift
17-
local sw : AdviceStroke 3.3 [df.slice 4 3 _o].advs
17+
local sw : AdviceStroke 3.3 [df.slice 4 3 _o].adws
1818
return : object subDf shift sw
1919

2020
do "de subglyph"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ glyph-block Letter-Cyrillic-E : begin
4747
define dfSub : DivFrame divSub 2
4848

4949
local lf : CLetterForm dfSub sty styBot top 0
50-
ada -- (ada * 0.7 * df.advs)
51-
adb -- (adb * 0.7 * df.advs)
50+
ada -- (ada * 0.7 * df.adws)
51+
adb -- (adb * 0.7 * df.adws)
5252
sw -- df.mvs
53-
include : with-transform [ApparentTranslate (Width * (df.advs - divSub)) 0] : lf.full
53+
include : with-transform [ApparentTranslate (Width * (df.adws - divSub)) 0] : lf.full
5454

5555
include : Iotified.full df top
5656
hBarRight -- [mix df.leftSB df.rightSB (3 / 4)]

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ glyph-block Letter-Cyrillic-El : begin
5959
local sw : fallback _sw Stroke
6060
local xm : if SLAB
6161
[mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * sw]
62-
mix df.leftSB df.rightSB : if (df.advs > 1) (2 / 3) (3 / 4)
62+
mix df.leftSB df.rightSB : if (df.adws > 1) (2 / 3) (3 / 4)
6363
local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375
6464

6565
include : CyrElShape df.leftSB xm top bodyType slabType sw
@@ -160,8 +160,8 @@ glyph-block Letter-Cyrillic-El : begin
160160
right -- df.rightSB
161161
ybegin -- CAP
162162
yend -- (CAP / 2)
163-
ada -- (SmallArchDepthA * 0.6 * df.advs)
164-
adb -- (SmallArchDepthB * 0.6 * df.advs)
163+
ada -- (SmallArchDepthA * 0.6 * df.adws)
164+
adb -- (SmallArchDepthB * 0.6 * df.adws)
165165
sw -- df.mvs
166166
local sf2 : [SerifFrame.fromDf df (CAP / 2) 0].slice 1 2
167167
if SLAB : include sf2.rt.full
@@ -177,8 +177,8 @@ glyph-block Letter-Cyrillic-El : begin
177177
right -- df.rightSB
178178
ybegin -- XH
179179
yend -- (XH / 2)
180-
ada -- (SmallArchDepthA * 0.6 * df.advs)
181-
adb -- (SmallArchDepthB * 0.6 * df.advs)
180+
ada -- (SmallArchDepthA * 0.6 * df.adws)
181+
adb -- (SmallArchDepthB * 0.6 * df.adws)
182182
sw -- df.mvs
183183
local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 1 2
184184
if SLAB : include sf2.rt.full

‎packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl

+6-6
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
111111
local divSub : (df.width - gap - df.mvs) / Width
112112
local subDf : DivFrame divSub 2 (df.leftSB / SB) df.mvs 0
113113

114-
local shift : Width * (df.advs - divSub)
114+
local shift : Width * (df.adws - divSub)
115115
local xIotifiedBarRight : df.leftSB + [HSwToV df.mvs]
116116
local botGap : Math.max ((df.rightSB - df.leftSB) * 0.08) [AdviceStroke 6]
117117
include : difference
@@ -137,7 +137,7 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
137137
local divSub : (df.width - gap - df.mvs) / Width
138138
local subDf : DivFrame divSub 2
139139

140-
local shift : Width * (df.advs - divSub)
140+
local shift : Width * (df.adws - divSub)
141141
include : with-transform [ApparentTranslate shift 0]
142142
body subDf hookStyle df.mvs
143143

@@ -155,7 +155,7 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
155155
local divSub : (df.width - gap - df.mvs) / Width
156156
local subDf : DivFrame divSub 2
157157

158-
local shift : Width * (df.advs - divSub)
158+
local shift : Width * (df.adws - divSub)
159159
include : with-transform [ApparentTranslate shift 0]
160160
body subDf XH bar df.mvs
161161

@@ -179,12 +179,12 @@ glyph-block Letter-Cyrillic-Iotified-A : begin
179179
local divSub : (df.width - gap - df.mvs) / Width
180180
local subDf : DivFrame divSub 2
181181

182-
local shift : Width * (df.advs - divSub)
182+
local shift : Width * (df.adws - divSub)
183183
include : with-transform [ApparentTranslate shift 0]
184184
body subDf XH
185185
stroke -- df.mvs
186-
ada -- (SmallArchDepthA * 0.7 * df.advs)
187-
adb -- (SmallArchDepthB * 0.7 * df.advs)
186+
ada -- (SmallArchDepthA * 0.7 * df.adws)
187+
adb -- (SmallArchDepthB * 0.7 * df.adws)
188188

189189
include : Iotified.full df XH (shift + subDf.leftSB + [HSwToV : 0.5 * df.mvs]) (XH / 2)
190190

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ glyph-block Letter-Cyrillic-Lje : begin
1717
local r : rightSB - 0
1818
local middle : df.width / 2
1919
local xTopLeft : mix l r 0.025
20-
local jut : Math.min Jut : Jut * 0.75 * df.advs
20+
local jut : Math.min Jut : Jut * 0.75 * df.adws
2121
include : LegShape
2222
ztop -- [Point.fromXY Point.Type.Corner xTopLeft top]
2323
zbot -- [Point.fromXY Point.Type.Corner [mix l 0 [if SLAB 1 0.75]] 0]

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ glyph-block Letter-Cyrillic-Omega : begin
1111
glyph-block-import Letter-Cyrillic-Te-Comb
1212

1313
define [CyrlOmegaShape df top p1 p2] : glyph-proc
14-
local fine : AdviceStroke 3 df.advs
14+
local fine : AdviceStroke 3 df.adws
1515
local mfine : fine * CThin
1616

1717
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
5050

5151
create-glyph 'cyrl/BroadOmega' 0xA64C : glyph-proc
5252
define df : include : DivFrame para.advanceScaleMM 3
53-
include : [DivFrame df.advs].markSet.capital
53+
include : [DivFrame df.adws].markSet.capital
5454
include : CyrlOmegaShape df CAP 0.30 0.31
5555

5656
create-glyph 'cyrl/broadOmega' 0xA64D : glyph-proc
5757
define df : include : DivFrame para.advanceScaleM 3
58-
include : [DivFrame df.advs].markSet.e
58+
include : [DivFrame df.adws].markSet.e
5959
include : CyrlOmegaShape df XH 0.30 0.31

‎packages/font-glyphs/src/letter/cyrillic/small-yus.ptl

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin
1313
glyph-block-import Letter-Cyrillic-Iotified-A : Iotified
1414

1515
define [CyrSmallYusShape df top straightBar _fine] : glyph-proc
16-
local fine : fallback _fine : AdviceStroke 3.3 df.advs
16+
local fine : fallback _fine : AdviceStroke 3.3 df.adws
1717
include : LambdaShape
1818
df -- df
1919
fBarStraight -- straightBar
@@ -33,7 +33,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin
3333
include : tagged 'serifMB' sf.mb.full
3434

3535
define [CyrClosedSmallYusShape df top straightBar _fine] : glyph-proc
36-
local fine : fallback _fine : AdviceStroke 2.75 df.advs
36+
local fine : fallback _fine : AdviceStroke 2.75 df.adws
3737
include : DeltaShape
3838
df -- df
3939
top -- top
@@ -86,7 +86,7 @@ glyph-block Letter-Cyrillic-SmallYus : begin
8686
include : CyrClosedSmallYusShape dfSub top straightBar df.mvs
8787
include : CyrSmallYusShape dfSub top straightBar df.mvs
8888
eject-contour 'serifRB'
89-
include : Translate (Width * (df.advs - divSub)) 0
89+
include : Translate (Width * (df.adws - divSub)) 0
9090

9191
include : Iotified.A df top
9292
hBarRight -- [mix df.leftSB df.rightSB (2 / 3)]

‎packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ glyph-block Letter-Cyrillic-Te-MidHook : begin
3737
MaskLeft : mix (left + [HSwToV sw]) (df.rightSB - [HSwToV sw]) 0.625
3838
HSerif.mb (left + [HSwToV : 0.5 * sw]) 0 Jut
3939

40-
foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do
40+
foreach { suffix { adws doST doSB } } [Object.entries TConfig] : do
4141
create-glyph "cyrl/TeMidHook.\(suffix)" : glyph-proc
42-
local df : include : DivFrame advs
42+
local df : include : DivFrame adws
4343
include : df.markSet.capDesc
4444
include : Shape df CAP 1 doST doSB
4545

4646
create-glyph "cyrl/teMidHook.upright.\(suffix)" : glyph-proc
47-
local df : include : DivFrame advs
47+
local df : include : DivFrame adws
4848
include : df.markSet.p
4949
include : Shape df XH (HBarPos ** 0.3) doST doSB
5050

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ glyph-block Letter-Cyrillic-Tje : begin
4141
eject-contour 'serifYeriLT'
4242
eject-contour 'serifYeriLB'
4343

44-
foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do
44+
foreach { suffix { adws doST doSB } } [Object.entries TConfig] : do
4545
create-glyph "cyrl/Tje/leftHalf.\(suffix)" : glyph-proc
4646
local df : include : DivFrame para.advanceScaleT 3
4747
include : df.markSet.capital

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ glyph-block Letter-Cyrillic-Tse : begin
4444

4545
define [CyrTeTseShape df top teSerifs] : glyph-proc
4646
local sw : AdviceStroke 2.75
47-
local left : [mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
47+
local left : [mix df.leftSB df.rightSB : if (df.adws > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
4848
local right : df.rightSB - OX
4949

5050
local xTopBarLeft : df.leftSB - SideJut

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ glyph-block Letter-Cyrillic-Tshe : begin
1414
include : df.markSet.capital
1515

1616
local sw : AdviceStroke 2.75
17-
local left : [mix df.leftSB df.rightSB : if (df.advs <= 1) 0.2 : if SLAB 0.3 0.25] + OX
17+
local left : [mix df.leftSB df.rightSB : if (df.adws <= 1) 0.2 : if SLAB 0.3 0.25] + OX
1818
local right : df.rightSB - OX
1919

2020
local xTopBarLeft : SB - SideJut

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ glyph-block Letter-Cyrillic-Yat : begin
5151
define divSub : (df.width - gap - sw) / Width
5252
define dfSub : DivFrame divSub 2
5353

54-
local shift : Width * (df.advs - divSub)
54+
local shift : Width * (df.adws - divSub)
5555
include : with-transform [ApparentTranslate shift 0]
5656
YatShape dfSub Yeri top
5757
pBar -- pBar

0 commit comments

Comments
 (0)