From 54cfd5343980fd198c77a7e2189b2b62f6bfb148 Mon Sep 17 00:00:00 2001 From: be5invis Date: Sun, 26 Jan 2025 14:57:17 -0800 Subject: [PATCH] Change advs to adws for less potential confusion --- .../font-glyphs/src/auto-build/composite.ptl | 14 ++--- .../src/auto-build/transformed.ptl | 8 +-- .../src/letter-like/fraktur/common.ptl | 4 +- .../src/letter/armenian/eh-liun-hiun.ptl | 2 +- .../font-glyphs/src/letter/armenian/feh.ptl | 4 +- .../src/letter/armenian/shared.ptl | 2 +- .../src/letter/cyrillic/big-yus.ptl | 8 +-- .../font-glyphs/src/letter/cyrillic/che.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/de.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/dje.ptl | 2 +- .../src/letter/cyrillic/dzzhe-zhwe.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/e.ptl | 6 +-- .../font-glyphs/src/letter/cyrillic/el.ptl | 10 ++-- .../src/letter/cyrillic/iotified-a.ptl | 12 ++--- .../font-glyphs/src/letter/cyrillic/lje.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/omega.ptl | 6 +-- .../src/letter/cyrillic/small-yus.ptl | 6 +-- .../src/letter/cyrillic/te-midhook.ptl | 6 +-- .../font-glyphs/src/letter/cyrillic/tje.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/tse.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/tshe.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/yat.ptl | 2 +- .../font-glyphs/src/letter/cyrillic/yeri.ptl | 8 +-- .../font-glyphs/src/letter/cyrillic/yu.ptl | 6 +-- .../font-glyphs/src/letter/cyrillic/zhe.ptl | 12 ++--- .../src/letter/greek/lower-epsilon.ptl | 8 +-- .../src/letter/greek/lower-omega.ptl | 2 +- packages/font-glyphs/src/letter/greek/phi.ptl | 10 ++-- packages/font-glyphs/src/letter/greek/psi.ptl | 4 +- .../font-glyphs/src/letter/latin-ext/gha.ptl | 4 +- .../src/letter/latin-ext/hwair.ptl | 6 +-- .../src/letter/latin-ext/lower-ae-oe.ptl | 2 +- .../src/letter/latin-ext/sakha-yat.ptl | 2 +- .../src/letter/latin-ext/upper-aa-ao.ptl | 16 +++--- .../src/letter/latin-ext/upper-ae-oe.ptl | 10 ++-- packages/font-glyphs/src/letter/latin/k.ptl | 2 +- .../font-glyphs/src/letter/latin/lower-a.ptl | 2 +- .../font-glyphs/src/letter/latin/lower-d.ptl | 4 +- .../font-glyphs/src/letter/latin/lower-e.ptl | 6 +-- .../font-glyphs/src/letter/latin/lower-f.ptl | 4 +- .../font-glyphs/src/letter/latin/lower-g.ptl | 2 +- .../font-glyphs/src/letter/latin/lower-il.ptl | 54 +++++++++---------- .../font-glyphs/src/letter/latin/lower-j.ptl | 14 ++--- .../font-glyphs/src/letter/latin/lower-m.ptl | 8 +-- .../font-glyphs/src/letter/latin/lower-r.ptl | 8 +-- .../font-glyphs/src/letter/latin/lower-t.ptl | 22 ++++---- packages/font-glyphs/src/letter/latin/o.ptl | 24 ++++----- packages/font-glyphs/src/letter/latin/s.ptl | 6 +-- .../font-glyphs/src/letter/latin/upper-h.ptl | 6 +-- .../font-glyphs/src/letter/latin/upper-i.ptl | 8 +-- .../font-glyphs/src/letter/latin/upper-j.ptl | 8 +-- .../font-glyphs/src/letter/latin/upper-m.ptl | 36 ++++++------- .../font-glyphs/src/letter/latin/upper-t.ptl | 30 +++++------ packages/font-glyphs/src/letter/latin/w.ptl | 52 +++++++++--------- packages/font-glyphs/src/letter/latin/x.ptl | 6 +-- packages/font-glyphs/src/letter/shared.ptl | 20 +++---- packages/font-glyphs/src/marks/above.ptl | 8 +-- packages/font-glyphs/src/marks/overlay.ptl | 16 +++--- packages/font-glyphs/src/meta/aesthetics.ptl | 44 +++++++-------- packages/font-glyphs/src/symbol/letter.ptl | 2 +- .../src/symbol/math/large-operators.ptl | 4 +- .../font-glyphs/src/symbol/math/logicals.ptl | 4 +- .../src/symbol/pictograph/faces.ptl | 6 +-- .../font-glyphs/src/symbol/punctuation/at.ptl | 6 +-- .../src/symbol/punctuation/percentages.ptl | 4 +- 65 files changed, 306 insertions(+), 306 deletions(-) diff --git a/packages/font-glyphs/src/auto-build/composite.ptl b/packages/font-glyphs/src/auto-build/composite.ptl index 2413ece7cd..53cf83a97b 100644 --- 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.ptl b/packages/font-glyphs/src/auto-build/transformed.ptl index 1b77131705..c068a905b1 100644 --- 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 index 74efc37356..22cbcc7ed2 100644 --- 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 index e9d107ec1a..fbb6b810b5 100644 --- 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 index c177b6f846..835a4c7cfc 100644 --- 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 index 77653849da..4e7bb5a9e2 100644 --- 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 index 209db8b4fe..d8329f618c 100644 --- 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 index 983827badc..2aed85012f 100644 --- a/packages/font-glyphs/src/letter/cyrillic/che.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/che.ptl @@ -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 index 3aa4731bb7..c3cce58104 100644 --- 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 index c187ba01ae..824b3af4b5 100644 --- 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 index 13ab84d064..81cbeefadc 100644 --- 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 index ee1631ce37..035f7a7cd7 100644 --- 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 index 90ee318024..7a53ef671f 100644 --- 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 index 6467599833..dbe80a50b2 100644 --- 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 index 3c9db3a246..c653feac0e 100644 --- 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 index 6f5833361c..64a726811f 100644 --- 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 index b9f9659373..8693b69861 100644 --- 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 index 5f8d7fa0a9..eb362c4400 100644 --- 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 index 7b43040ebc..ce556041f3 100644 --- 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 index 0273e640c8..63ac39dfd2 100644 --- 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 index 560723f9d4..6cc39902b5 100644 --- 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 diff --git a/packages/font-glyphs/src/letter/cyrillic/yat.ptl b/packages/font-glyphs/src/letter/cyrillic/yat.ptl index 3ed38346f2..8169891882 100644 --- a/packages/font-glyphs/src/letter/cyrillic/yat.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yat.ptl @@ -51,7 +51,7 @@ glyph-block Letter-Cyrillic-Yat : begin define divSub : (df.width - gap - sw) / Width define dfSub : DivFrame divSub 2 - local shift : Width * (df.advs - divSub) + local shift : Width * (df.adws - divSub) include : with-transform [ApparentTranslate shift 0] YatShape dfSub Yeri top pBar -- pBar diff --git a/packages/font-glyphs/src/letter/cyrillic/yeri.ptl b/packages/font-glyphs/src/letter/cyrillic/yeri.ptl index 6c0d116d51..7548749767 100644 --- a/packages/font-glyphs/src/letter/cyrillic/yeri.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yeri.ptl @@ -213,10 +213,10 @@ glyph-block Letter-Cyrillic-Yeri : begin include : VerticalHook.l xLeftBarLeftEdge (top - TailY - 0.5 * stroke) (xTopBarLeftEnd - xLeftBarLeftEdge - 0.5 * stroke) (-TailY) stroke define [CyrYeryShape LeftHalf df top fBackYer fTail] : glyph-proc - local sw : if fBackYer [AdviceStroke 3.25 df.advs] df.mvs + local sw : if fBackYer [AdviceStroke 3.25 df.adws] df.mvs local jut : [Math.min 1 : Math.sqrt : sw / Stroke] * Jut - local xm : mix (df.rightSB - [HSwToV sw]) (df.middle + [HSwToV : 0.5 * sw]) : if (fBackYer && df.advs > 1) 0.625 0.75 + local xm : mix (df.rightSB - [HSwToV sw]) (df.middle + [HSwToV : 0.5 * sw]) : if (fBackYer && df.adws > 1) 0.625 0.75 include : if fBackYer CyrBackYerShape LeftHalf @@ -409,8 +409,8 @@ glyph-block Letter-Cyrillic-Yeri : 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 if SLAB : begin include : HSerif.mt df.middle CAP Jut df.mvs diff --git a/packages/font-glyphs/src/letter/cyrillic/yu.ptl b/packages/font-glyphs/src/letter/cyrillic/yu.ptl index 90977862b2..12959c919c 100644 --- a/packages/font-glyphs/src/letter/cyrillic/yu.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yu.ptl @@ -22,9 +22,9 @@ glyph-block Letter-Cyrillic-Yu : 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] - OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.advs) (adb * 0.7 * df.advs) + OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.adws) (adb * 0.7 * df.adws) include : if (slabType === SLAB-BULGARIAN) Iotified.ascender df xtop (shift + subDf.leftSB + [HSwToV : 0.5 * df.mvs]) (top / 2) @@ -36,7 +36,7 @@ glyph-block Letter-Cyrillic-Yu : begin local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - include : OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.advs) (adb * 0.7 * df.advs) + include : OShape top 0 subDf.leftSB subDf.rightSB df.mvs (ada * 0.7 * df.adws) (adb * 0.7 * df.adws) local useItalicShape : slabType !== SLAB-ALL && para.isItalic local slabTop : if useItalicShape SLAB-NONE SLAB-FULL diff --git a/packages/font-glyphs/src/letter/cyrillic/zhe.ptl b/packages/font-glyphs/src/letter/cyrillic/zhe.ptl index 82b5be739b..e1188fd766 100644 --- a/packages/font-glyphs/src/letter/cyrillic/zhe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/zhe.ptl @@ -11,10 +11,10 @@ glyph-block Letter-Cyrillic-Zhe : begin glyph-block-export Zhe define Zhe : namespace - define [ZheSw df] : AdviceStroke 3.3 df.advs - define [ZheSw2 df] : AdviceStroke 4.0 df.advs - define [ZheSw3 df] : AdviceStroke 3.7 df.advs - define [Overshoot fSlab df] : if fSlab 0 : O * 3 * df.advs + define [ZheSw df] : AdviceStroke 3.3 df.adws + define [ZheSw2 df] : AdviceStroke 4.0 df.adws + define [ZheSw3 df] : AdviceStroke 3.7 df.adws + define [Overshoot fSlab df] : if fSlab 0 : O * 3 * df.adws define [CenterBar fSlab df bot top midTop] : glyph-proc define fine : ZheSw df @@ -80,7 +80,7 @@ glyph-block Letter-Cyrillic-Zhe : begin export : define [CurlyLegs fSlab fHalf df bot top] : begin define fine : ZheSw df define fine2 : ZheSw3 df - define overshoot : if fSlab 0 : 2 * O * df.advs + define overshoot : if fSlab 0 : 2 * O * df.adws define attach1X : df.middle - [HSwToV : 0.5 * fine] define attach1Y : mix bot top : if fSlab 0.325 0.375 @@ -152,7 +152,7 @@ glyph-block Letter-Cyrillic-Zhe : begin export : define [CursiveLegs fSlab fHalf df bot top] : begin define fine : ZheSw df - define fine2 : AdviceStroke 4.2 df.advs + define fine2 : AdviceStroke 4.2 df.adws define midX : mix df.leftSB (df.middle - [HSwToV : 0.5 * fine]) 0.4 define midY : mix bot top 0.5 define overshoot : Overshoot fSlab df diff --git a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl index d79bd54969..1b9fbd50e9 100644 --- a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl @@ -309,8 +309,8 @@ glyph-block Letter-Greek-Lower-Epsilon : begin right -- df.rightSB ybegin -- [YSmoothMidR (midy + stroke / 2) 0] yend -- (CAP / 2) - ada -- (ArchDepthA * 0.6 * df.advs) - adb -- (ArchDepthB * 0.6 * df.advs) + ada -- (ArchDepthA * 0.6 * df.adws) + adb -- (ArchDepthB * 0.6 * df.adws) sw -- stroke include : ze.AutoStartSerifL local sf2 : [SerifFrame.fromDf df (CAP / 2) 0].slice 1 2 @@ -333,8 +333,8 @@ glyph-block Letter-Greek-Lower-Epsilon : begin right -- df.rightSB ybegin -- [YSmoothMidR (midy + stroke / 2) 0] 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 -- stroke include : ze.AutoStartSerifL local sf2 : [SerifFrame.fromDf df (XH / 2) 0].slice 1 2 diff --git a/packages/font-glyphs/src/letter/greek/lower-omega.ptl b/packages/font-glyphs/src/letter/greek/lower-omega.ptl index 64ce1bb6d1..61de64f0da 100644 --- a/packages/font-glyphs/src/letter/greek/lower-omega.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-omega.ptl @@ -9,7 +9,7 @@ glyph-block Letter-Greek-Lower-Omega : begin glyph-block-import Common-Derivatives define [LowerOmegaShape df top p1 p2] : glyph-proc - local fine : AdviceStroke 3 df.advs + local fine : AdviceStroke 3 df.adws local mfine : fine * CThin local x0 : mix df.leftSB df.rightSB 0.1 local y0 : top - O diff --git a/packages/font-glyphs/src/letter/greek/phi.ptl b/packages/font-glyphs/src/letter/greek/phi.ptl index 28c9dfa36e..1c9f4e3981 100644 --- a/packages/font-glyphs/src/letter/greek/phi.ptl +++ b/packages/font-glyphs/src/letter/greek/phi.ptl @@ -60,8 +60,8 @@ glyph-block Letter-Greek-Phi : begin define [CursiveBar df y1 y2 y3 y4 sw] : glyph-proc local hd : FlatHookDepth df - local xCrossLeft : mix 0 df.leftSB : mix 1 df.advs 2 - local xCrossRight : mix df.width df.rightSB : mix 1 df.advs 2 + local xCrossLeft : mix 0 df.leftSB : mix 1 df.adws 2 + local xCrossRight : mix df.width df.rightSB : mix 1 df.adws 2 local xBarLeft : df.middle - [HSwToV : 0.5 * sw] local xBarRight : df.middle + [HSwToV : 0.5 * sw] @@ -83,7 +83,7 @@ glyph-block Letter-Greek-Phi : begin define [DiagonalTailCursiveBar df y1 y2 y3 y4 sw] : glyph-proc local hd : FlatHookDepth df - local xCrossRight : mix df.width df.rightSB : mix 1 df.advs 2 + local xCrossRight : mix df.width df.rightSB : mix 1 df.adws 2 local xBarLeft : df.middle - [HSwToV : 0.5 * sw] include : dispiro @@ -184,9 +184,9 @@ glyph-block Letter-Greek-Phi : begin cursive { CursiveBar nothing nothing } diagonalTailedCursive { DiagonalTailCursiveBar nothing nothing } - foreach { suffix { { Bowl barSw advs } { Bar sMT sMB } } } [Object.entries CyrlLowerEfConfig] : do + foreach { suffix { { Bowl barSw adws } { Bar sMT sMB } } } [Object.entries CyrlLowerEfConfig] : do create-glyph "cyrl/ef.\(suffix)" : glyph-proc - local df : include : DivFrame advs 3 + local df : include : DivFrame adws 3 include : df.markSet.bp include : Bowl true df 0 XH df.smallArchDepthA df.smallArchDepthB local vs : fallback barSw df.mvs diff --git a/packages/font-glyphs/src/letter/greek/psi.ptl b/packages/font-glyphs/src/letter/greek/psi.ptl index 37040e691f..7a93ad40bf 100644 --- a/packages/font-glyphs/src/letter/greek/psi.ptl +++ b/packages/font-glyphs/src/letter/greek/psi.ptl @@ -14,11 +14,11 @@ glyph-block Letter-Greek-Psi : begin include : dispiro widths.lhs df.mvs flat df.leftSB y3 [heading Downward] - curl df.leftSB (y2 + (ArchDepthB * df.advs)) + curl df.leftSB (y2 + (ArchDepthB * df.adws)) arcvh g4 df.middle y2 [heading Rightward] archv - flat df.rightSB (y2 + (ArchDepthA * df.advs)) + flat df.rightSB (y2 + (ArchDepthA * df.adws)) curl df.rightSB y3 [heading Upward] include : VBar.m df.middle y2 y4 df.mvs include : VBar.m df.middle y1 (y2 + HalfStroke) diff --git a/packages/font-glyphs/src/letter/latin-ext/gha.ptl b/packages/font-glyphs/src/letter/latin-ext/gha.ptl index 58e821159f..62ce15b0b3 100644 --- a/packages/font-glyphs/src/letter/latin-ext/gha.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/gha.ptl @@ -21,8 +21,8 @@ glyph-block Letter-Latin-Gha : begin local divSub : (df.width - gap - df.mvs) / Width local subDf : DivFrame divSub 2 - local ada : _ada * 0.7 * df.advs - local adb : _adb * 0.7 * df.advs + local ada : _ada * 0.7 * df.adws + local adb : _adb * 0.7 * df.adws include : OShape top 0 subDf.leftSB subDf.rightSB df.mvs ada adb include : match terminal [Just TERMINAL-NORMAL] : VBar.r (df.rightSB - O) bot top df.mvs diff --git a/packages/font-glyphs/src/letter/latin-ext/hwair.ptl b/packages/font-glyphs/src/letter/latin-ext/hwair.ptl index 9dd0d5b525..6246bf205a 100644 --- a/packages/font-glyphs/src/letter/latin-ext/hwair.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/hwair.ptl @@ -23,13 +23,13 @@ glyph-block Letter-Latin-Hwair : begin include : LeaningAnchor.Above.VBar.l df.leftSB include : VBar.l df.leftSB 0 Ascender df.mvs include : dispiro - nShoulder.knots (df.leftSB + [HSwToV df.mvs]) (df.middle + [HSwToV : 0.5 * df.mvs]) (df.mvs * 0.4) nothing (XH * 0.51) (SmallArchDepthA * 0.6 * df.advs) (SmallArchDepthB * 0.6 * df.advs) df.mvs + nShoulder.knots (df.leftSB + [HSwToV df.mvs]) (df.middle + [HSwToV : 0.5 * df.mvs]) (df.mvs * 0.4) nothing (XH * 0.51) (SmallArchDepthA * 0.6 * df.adws) (SmallArchDepthB * 0.6 * df.adws) df.mvs flat (df.middle + [HSwToV : 0.5 * df.mvs]) (XH * 0.5) [heading Downward] - curl (df.middle + [HSwToV : 0.5 * df.mvs]) (SmallArchDepthB * 0.6 * df.advs) + curl (df.middle + [HSwToV : 0.5 * df.mvs]) (SmallArchDepthB * 0.6 * df.adws) arcvh g4 [mix (df.middle - [HSwToV : 0.5 * df.mvs]) df.rightSB 0.5] O [widths.heading df.mvs 0 Rightward] archv - flat df.rightSB (SmallArchDepthA * 0.6 * df.advs) + flat df.rightSB (SmallArchDepthA * 0.6 * df.adws) curl df.rightSB XH [heading Upward] do "slabs" diff --git a/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl index 7ded4cc329..e9781ea3b0 100644 --- a/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl @@ -279,7 +279,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin local stroke1f : if (stroke1 == 3) 4 stroke1 local lf : XLetterForm df top bot stroke1f stroke2 turn tension sw -- df.mvs - swCursiveEnd -- [AdviceStroke 3 df.advs] + swCursiveEnd -- [AdviceStroke 3 df.adws] swCursiveCoEnd -- df.mvs swCursiveMid -- df.mvs include : WithSerifOverflowMask fMaskBase top bot df.leftSB df.rightSB : lf.base fMaskBase diff --git a/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl b/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl index 48db2ea2b1..dd7b9e4e92 100644 --- a/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl @@ -15,7 +15,7 @@ glyph-block Letter-Latin-Sakha-Yat : begin left -- (df.middle - [HSwToV : 0.5 * df.mvs]) right -- df.rightSB stroke -- df.mvs - jut -- [Math.min Jut : Jut * 0.75 * df.advs] + jut -- [Math.min Jut : Jut * 0.75 * df.adws] local fEnoughSpaceForFullSerifs : df.width > 7 * para.refJut if [not fEnoughSpaceForFullSerifs] : eject-contour 'serifYeriLB' diff --git a/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl index abeeeb066f..dc2aee9a35 100644 --- a/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl @@ -33,43 +33,43 @@ glyph-block Letter-Latin-Upper-AA-AO : begin AA { 0xA732 para.advanceScaleMM 'capital' CAP } smcpAA { null para.advanceScaleM 'e' XH } - foreach { prefix { code advs mk height } } [Object.entries ALetters] : do + foreach { prefix { code adws mk height } } [Object.entries ALetters] : do foreach { suffix { bodyShape slabKind } } [Object.entries AConfig] : do define skLeft : maskOffBits slabKind SLAB-RIGHT define skRight : maskOffBits slabKind SLAB-LEFT create-glyph "\(prefix)/Left.\(suffix)" : glyph-proc - define df : include : DivFrame advs 3.5 + define df : include : DivFrame adws 3.5 include : df.markSet.(mk) set-base-anchor 'cvDecompose' 0 0 include : AHalfShape 0 df height bodyShape skLeft create-glyph "\(prefix)/LeftMask.\(suffix)" : glyph-proc - define df : include : DivFrame advs 3.5 + define df : include : DivFrame adws 3.5 include : df.markSet.(mk) set-base-anchor 'cvDecompose' 0 0 include : AHalfShapeMask 0 df height bodyShape skLeft create-glyph "\(prefix)/Right.\(suffix)" : glyph-proc - define df : DivFrame advs 3.5 + define df : DivFrame adws 3.5 set-width 0 include : df.markSet.(mk) set-mark-anchor 'cvDecompose' 0 0 0 0 include : AHalfShape 1 df height bodyShape skRight create-glyph "\(prefix)/RightMask.\(suffix)" : glyph-proc - define df : DivFrame advs 3.5 + define df : DivFrame adws 3.5 set-width 0 include : df.markSet.(mk) set-mark-anchor 'cvDecompose' 0 0 0 0 include : AHalfShapeMask 1 df height bodyShape skRight create-glyph "\(prefix)/AU/Left.\(suffix)" : glyph-proc - define df : include : DivFrame advs 3.5 + define df : include : DivFrame adws 3.5 local { subDf shift } : SubDfAndShift 1 df include : AShape.LetterBottomRightRemoved subDf bodyShape slabKind CAP df.mvs create-glyph "\(prefix)/AU/LeftMask.\(suffix)" : glyph-proc - define df : include : DivFrame advs 3.5 + define df : include : DivFrame adws 3.5 local { subDf shift } : SubDfAndShift 1 df include : union MaskAbove : [AShape.BarPos bodyShape slabKind CAP] - df.mvs @@ -84,7 +84,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin derive-multi-part-glyphs prefix code list "\(prefix)/Left" "\(prefix)/LeftMask" "\(prefix)/Right" "\(prefix)/RightMask" function [srcs gr] : glyph-proc - define df : DivFrame advs 3.5 + define df : DivFrame adws 3.5 define topSerifGap : Math.max (0.1 * (df.rightSB - df.leftSB)) : AdviceStroke 6 define { left leftMask right rightMask } srcs diff --git a/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl index c621f53d65..64f61d9139 100644 --- a/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl @@ -19,10 +19,10 @@ glyph-block Letter-Latin-Upper-AE-OE : begin define SLAB-E-ALL 2 define SLAB-E-CAPPED 3 - define [AESW df top] : Math.min df.mvs : AdviceStroke2 3 3 top df.advs + define [AESW df top] : Math.min df.mvs : AdviceStroke2 3 3 top df.adws define [AEAHalfCurly df top eleft sw] : glyph-proc - define fine : AdviceStroke2 3 4 top df.advs + define fine : AdviceStroke2 3 4 top df.adws # A half include : dispiro @@ -55,7 +55,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin define vxStartL : df.leftSB * StraightSbShrink define vxEndL : df.middle - [HSwToV : 0.75 * sw] define dgCor : DiagCor top (df.width / 2) 0 (sw * 2) - define midSW : dgCor * [Math.min [mix sw fine pInktrap] [AdviceStroke 3 df.advs]] + define midSW : dgCor * [Math.min [mix sw fine pInktrap] [AdviceStroke 3 df.adws]] include : dispiro widths.rhs (sw * dgCor) @@ -87,7 +87,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin straight.right.end eleft top [heading Rightward] define [AEAHalfSerifs df top slabKind] : glyph-proc - define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.advs + define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.adws define eleft : df.middle - [HSwToV : 0.25 * sw] match slabKind ([Just SLAB-A-BASE] || [Just SLAB-A-TRI]) : begin @@ -213,7 +213,7 @@ glyph-block Letter-Latin-Upper-AE-OE : begin define [OEShape top df slabKind] : glyph-proc define eBarPos DesignParameters.upperEBarPos - define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.advs + define sw : Math.min df.mvs : AdviceStroke2 3 3 top df.adws define eleft : df.middle - [HSwToV : sw * [if SLAB (1 / 3) (1 / 4)]] define swVJut : Math.min sw : (df.rightSB - eleft - [HSwToV sw]) * (4 / 5) diff --git a/packages/font-glyphs/src/letter/latin/k.ptl b/packages/font-glyphs/src/letter/latin/k.ptl index ab3ec9ed69..91799a28a8 100644 --- a/packages/font-glyphs/src/letter/latin/k.ptl +++ b/packages/font-glyphs/src/letter/latin/k.ptl @@ -450,7 +450,7 @@ glyph-block Letter-Latin-K : begin define [BashkirKaShape df top] : glyph-proc local left : if SLAB [mix df.leftSB df.rightSB 0.35] - [HSwToV : 0.5 * df.mvs] - mix df.leftSB df.rightSB : if (df.advs > 1) 0.25 0.2 + mix df.leftSB df.rightSB : if (df.adws > 1) 0.25 0.2 local leftNB : left - [KBalance SLAB straightBar] local xTopBarLeftEnd : mix 0 df.leftSB : if SLAB 0.25 0.375 local sw : AdviceStroke 3 diff --git a/packages/font-glyphs/src/letter/latin/lower-a.ptl b/packages/font-glyphs/src/letter/latin/lower-a.ptl index 6540298011..8c0b63cd69 100644 --- a/packages/font-glyphs/src/letter/latin/lower-a.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-a.ptl @@ -16,7 +16,7 @@ glyph-block Letter-Latin-Lower-A : begin glyph-block-export DoubleStorey define DoubleStorey : namespace - define [ADoubleStoreyStroke df] : AdviceStroke2 2 3 XH df.advs + define [ADoubleStoreyStroke df] : AdviceStroke2 2 3 XH df.adws define [ADoubleStoreySmoothA df] : begin local sw : ADoubleStoreyStroke df return : df.archDepthAOf (ArchDepth * [StrokeWidthBlend 0.9 0.81 sw]) sw diff --git a/packages/font-glyphs/src/letter/latin/lower-d.ptl b/packages/font-glyphs/src/letter/latin/lower-d.ptl index f6d48de073..b2132da0bf 100644 --- a/packages/font-glyphs/src/letter/latin/lower-d.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-d.ptl @@ -136,8 +136,8 @@ glyph-block Letter-Latin-Lower-D : begin right -- dfHalf.rightSB ybegin -- Ascender 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 if topSerif : include : topSerif dfHalf Ascender diff --git a/packages/font-glyphs/src/letter/latin/lower-e.ptl b/packages/font-glyphs/src/letter/latin/lower-e.ptl index f1d5a3e7cd..6e30981175 100644 --- a/packages/font-glyphs/src/letter/latin/lower-e.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-e.ptl @@ -130,10 +130,10 @@ glyph-block Letter-Latin-Lower-E : begin include : Body subDf top stroke -- stroke barpos -- barpos - ada -- (ada * 0.7 * df.advs) - adb -- (adb * 0.7 * df.advs) + ada -- (ada * 0.7 * df.adws) + adb -- (adb * 0.7 * df.adws) tailSlab -- tailSlab - define shift : Width * (df.advs - divSub) + define shift : Width * (df.adws - divSub) if fDesc : begin local desc : (-LongVJut) + QuarterStroke include : ExtendBelowBaseAnchors desc diff --git a/packages/font-glyphs/src/letter/latin/lower-f.ptl b/packages/font-glyphs/src/letter/latin/lower-f.ptl index 5cb00563e9..02a9dd4721 100644 --- a/packages/font-glyphs/src/letter/latin/lower-f.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-f.ptl @@ -24,8 +24,8 @@ glyph-block Letter-Latin-Lower-F : begin set-base-anchor 'palatalHookPos' r 0 define [NarrowBottomSerif df] : glyph-proc - include : HSerif.mb df.middle 0 (LongJut * df.advs) - set-base-anchor 'palatalHookPos' (df.middle + LongJut * df.advs + HalfStroke * TanSlope) 0 + include : HSerif.mb df.middle 0 (LongJut * df.adws) + set-base-anchor 'palatalHookPos' (df.middle + LongJut * df.adws + HalfStroke * TanSlope) 0 define [StdFShapeT sink df offset barleft sw] : sink widths.lhs sw diff --git a/packages/font-glyphs/src/letter/latin/lower-g.ptl b/packages/font-glyphs/src/letter/latin/lower-g.ptl index 2ce805eb4a..a5360eb6eb 100644 --- a/packages/font-glyphs/src/letter/latin/lower-g.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-g.ptl @@ -104,7 +104,7 @@ glyph-block Letter-Latin-Lower-G : begin flat (df.rightSB - hd.x) Descender curl xTerminal Descender export : define [CrossedHook df y0] : begin - local fine : AdviceStroke 3.5 df.advs + local fine : AdviceStroke 3.5 df.adws return : dispiro widths.rhs df.mvs flat df.rightSB y0 [heading Downward] diff --git a/packages/font-glyphs/src/letter/latin/lower-il.ptl b/packages/font-glyphs/src/letter/latin/lower-il.ptl index 94c6409429..eec830214f 100644 --- a/packages/font-glyphs/src/letter/latin/lower-il.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-il.ptl @@ -18,7 +18,7 @@ glyph-block Letter-Latin-Lower-I : begin ########################################################################################### # Implementations - define [TailedDotlessIShift df] : (1 - df.advs) * 0.2 + define [TailedDotlessIShift df] : (1 - df.adws) * 0.2 define XMiddle : namespace define [FlatTailedImpl df addTopSerif] : df.middle - [if addTopSerif 0 : IBalance2 df] @@ -51,14 +51,14 @@ glyph-block Letter-Latin-Lower-I : begin export : define [HookyBottom df top xMiddle] : glyph-proc include : VBar.m xMiddle 0 top df.mvs - include : tagged 'serifRB' : HSerif.rb xMiddle 0 (LongJut * df.advs) Stroke df.mvs - set-base-anchor 'trailing' (xMiddle + LongJut * df.advs) 0 + include : tagged 'serifRB' : HSerif.rb xMiddle 0 (LongJut * df.adws) Stroke df.mvs + set-base-anchor 'trailing' (xMiddle + LongJut * df.adws) 0 export : define [Serifed df top xMiddle] : glyph-proc include : VBar.m xMiddle 0 top df.mvs include : tagged 'serifB' - HSerif.mb df.middle 0 (LongJut * df.advs) - set-base-anchor 'trailing' (df.middle + LongJut * df.advs) 0 + HSerif.mb df.middle 0 (LongJut * df.adws) + set-base-anchor 'trailing' (df.middle + LongJut * df.adws) 0 export : define [Tailed df top xMiddle] : glyph-proc local fine : AdviceStroke 3 @@ -66,8 +66,8 @@ glyph-block Letter-Latin-Lower-I : begin local left : xMiddle - [HSwToV : 0.5 * df.mvs] local right : mix df.leftSB df.rightSB (1.1 - shift) local rightTerm : Math.max right (left + [HSwToV : df.mvs + 1.1 * fine]) (left + [HSwToV df.mvs] + HookX) - local middle : mix left right (0.55 * df.advs) - local hookDepth : Math.max (df.mvs * 0.9) (Hook * [StrokeWidthBlend 0.85 1] * df.advs) + local middle : mix left right (0.55 * df.adws) + local hookDepth : Math.max (df.mvs * 0.9) (Hook * [StrokeWidthBlend 0.85 1] * df.adws) include : dispiro widths.lhs df.mvs flat left top [heading Downward] @@ -80,7 +80,7 @@ glyph-block Letter-Latin-Lower-I : begin set-base-anchor 'palatalHookMask' [mix left rightTerm 0.5] (HalfStroke + O) export : define [FlatTailed df top xMiddle] : glyph-proc - local tailLength : LongJut * 1.05 * [mix 1 df.advs 0.75] + local tailLength : LongJut * 1.05 * [mix 1 df.adws 0.75] local hd : FlatHookDepth df define xFinal : xMiddle + [Math.max tailLength : hd.x - [HSwToV : 0.5 * df.mvs] + 1] + 0.5 * df.mvs * TanSlope @@ -95,10 +95,10 @@ glyph-block Letter-Latin-Lower-I : begin set-base-anchor 'trailing' xFinal 0 export : define [SemiTailed df top xMiddle] : glyph-proc - local tailLength : LongJut * 1.05 * [mix 1 df.advs 0.75] - local hookScaleX : mix 1 df.advs 0.5 - local hookScaleY : mix 1 df.advs 1.25 - local x0 : mix (0.5 * df.mvs) (0.5 * df.mvs + (Hook - df.mvs + 1) * 0.85 * df.advs + [IBalance2 df]) hookScaleX + local tailLength : LongJut * 1.05 * [mix 1 df.adws 0.75] + local hookScaleX : mix 1 df.adws 0.5 + local hookScaleY : mix 1 df.adws 1.25 + local x0 : mix (0.5 * df.mvs) (0.5 * df.mvs + (Hook - df.mvs + 1) * 0.85 * df.adws + [IBalance2 df]) hookScaleX local x1 : mix (0.5 * df.mvs) ([Math.max tailLength : Hook - 0.5 * df.mvs + 1] + [IBalance2 df]) hookScaleX include : dispiro widths.center df.mvs @@ -132,13 +132,13 @@ glyph-block Letter-Latin-Lower-I : begin curl xMiddle Hook arcvh flat (xMiddle + Hook - 0.5 * df.mvs) (0.5 * df.mvs) - curl [Math.max df.rightSB : xMiddle + [Math.max HookX : LongJut * 1.05 * df.advs]] (0.5 * df.mvs) [heading Rightward] + curl [Math.max df.rightSB : xMiddle + [Math.max HookX : LongJut * 1.05 * df.adws]] (0.5 * df.mvs) [heading Rightward] define Serifs : namespace - export : define [Hooky df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.advs) Stroke df.mvs - export : define [HookyShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut (LongJut * df.advs) 0.5] Stroke df.mvs - export : define [Serifed df top xMiddle] : HSerif.lt xMiddle top ((LongJut * df.advs) - (xMiddle - df.middle)) Stroke df.mvs - export : define [SerifedShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut ((LongJut * df.advs) - (xMiddle - df.middle)) 0.5] Stroke df.mvs + export : define [Hooky df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.adws) Stroke df.mvs + export : define [HookyShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut (LongJut * df.adws) 0.5] Stroke df.mvs + export : define [Serifed df top xMiddle] : HSerif.lt xMiddle top ((LongJut * df.adws) - (xMiddle - df.middle)) Stroke df.mvs + export : define [SerifedShort df top xMiddle] : HSerif.lt xMiddle top [mix Jut ((LongJut * df.adws) - (xMiddle - df.middle)) 0.5] Stroke df.mvs define [calcPhoneticHookPos g] : begin local attach : if g.baseAnchors.trailing @@ -195,11 +195,11 @@ glyph-block Letter-Latin-Lower-I : begin 'tau/semiTailed' { Body.SemiTailed null Marks.Serifless XMiddle.FlatTailed 1 Stroke } 'tau/shortTailed' { Body.ShortTailed null Marks.Serifless XMiddle.Center 1 Stroke } - do : foreach { suffix { Body Serif Marks xMiddleTMono advs y0R } } [Object.entries SmallILConfig] : begin + do : foreach { suffix { Body Serif Marks xMiddleTMono adws y0R } } [Object.entries SmallILConfig] : begin define xMiddleT : if para.isQuasiProportional XMiddle.Center xMiddleTMono create-glyph "dotlessi.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.e local xMiddle : xMiddleT df include : Body df XH xMiddle @@ -207,7 +207,7 @@ glyph-block Letter-Latin-Lower-I : begin if Serif : include : tagged 'serifLT' : Serif df XH xMiddle create-glyph "latn/Iota.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital local xMiddle : xMiddleT df include : Body df CAP xMiddle @@ -215,7 +215,7 @@ glyph-block Letter-Latin-Lower-I : begin if Serif : include : tagged 'serifLT' : Serif df CAP xMiddle create-glyph "l.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.b local xMiddle : xMiddleT df include : Body df Ascender xMiddle @@ -223,13 +223,13 @@ glyph-block Letter-Latin-Lower-I : begin if Serif : include : tagged 'serifLT' : Serif df Ascender xMiddle create-glyph "lDotBase.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include [refer-glyph "l.\(suffix)"] AS_BASE include : Translate (-DotRadius / 2) 0 set-base-anchor 'cvDecompose' [Math.max (df.middle + HalfStroke + DotRadius) (df.rightSB - DotRadius)] [mix y0R Ascender 0.5] create-glyph "lRTail.\(suffix)" : glyph-proc - local df : DivFrame advs + local df : DivFrame adws include [refer-glyph "l.\(suffix)"] AS_BASE ALSO_METRICS include : RetroflexHook.mExt [xMiddleT df] 0 @@ -266,12 +266,12 @@ glyph-block Letter-Latin-Lower-I : begin maskOut -- [MaskAbove maskY] create-glyph "lHighBar.\(suffix)" : glyph-proc - local df : DivFrame advs + local df : DivFrame adws include [refer-glyph "l.\(suffix)"] AS_BASE ALSO_METRICS include : LetterBarOverlay.m.in [xMiddleT df] XH (Ascender - [if Serif Stroke 0]) create-glyph "grek/tau.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.e local xMiddle : xMiddleT df include : Body df XH xMiddle @@ -280,14 +280,14 @@ glyph-block Letter-Latin-Lower-I : begin currentGlyph.deleteBaseAnchor 'trailing' create-glyph "cyrl/Twe/middle.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : Body df CAP [XMiddle.Center df] include : Marks df CAP [XMiddle.Center df] currentGlyph.deleteBaseAnchor 'trailing' set-mark-anchor 'cvDecompose' (df.width / 2) CAP create-glyph "cyrl/twe/middle.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : Body df XH [XMiddle.Center df] include : Marks df XH [XMiddle.Center df] currentGlyph.deleteBaseAnchor 'trailing' diff --git a/packages/font-glyphs/src/letter/latin/lower-j.ptl b/packages/font-glyphs/src/letter/latin/lower-j.ptl index 69811efda3..5c1e301b89 100644 --- a/packages/font-glyphs/src/letter/latin/lower-j.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-j.ptl @@ -22,7 +22,7 @@ glyph-block Letter-Latin-Lower-J : begin bar - hd.x - [Math.max (Stroke / 3) (df.width / 6)] crossLeft - OX * 2 - if serif : include : HSerif.lt barCenter top (LongJut * df.advs) + if serif : include : HSerif.lt barCenter top (LongJut * df.adws) include : dispiro widths.lhs flat terminal Descender @@ -38,8 +38,8 @@ glyph-block Letter-Latin-Lower-J : begin export : define [StraightSerifless df] : begin df.middle export : define [StraightSerifed df] : df.middle + [IBalance2 df] export : define [BentHook df] : df.middle + JBalance - export : define [FlatHookSerifless df] : df.middle + 0.25 * JBalance * df.advs * [mix 1 df.advs 2] - export : define [FlatHookSerifed df] : df.middle + JBalance * df.advs + export : define [FlatHookSerifless df] : df.middle + 0.25 * JBalance * df.adws * [mix 1 df.adws 2] + export : define [FlatHookSerifed df] : df.middle + JBalance * df.adws define Body : namespace export : define [BentHook df top xMiddle] : glyph-proc @@ -59,7 +59,7 @@ glyph-block Letter-Latin-Lower-J : begin export : define [FlatHook df top xMiddle] : glyph-proc local dfHook : DivFrame para.advanceScaleI - local crossLeft : df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.advs 2]) + local crossLeft : df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.adws 2]) include : FlatHookDotlessJShape df dfHook top crossLeft -- crossLeft barCenter -- xMiddle @@ -75,7 +75,7 @@ glyph-block Letter-Latin-Lower-J : begin define Serifs : namespace export : define [None df top xMiddle] : no-shape - export : define [Long df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.advs) + export : define [Long df top xMiddle] : HSerif.lt xMiddle top (LongJut * df.adws) export : define [Short df top xMiddle] : HSerif.lt xMiddle top Jut define Marks : namespace @@ -108,8 +108,8 @@ glyph-block Letter-Latin-Lower-J : begin 'diagonalTailedSerifed' { "DiagonalTailed" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed } 'diagonalTailedShortSerifed' { "DiagonalTailed" Serifs.Short XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed } - foreach { suffix { shapeId Serif xMiddleT Marks advs } } [Object.entries JConfig] : do - local df : DivFrame advs + foreach { suffix { shapeId Serif xMiddleT Marks adws } } [Object.entries JConfig] : do + local df : DivFrame adws local xMiddle : xMiddleT df create-glyph "dotlessj.\(suffix)" : glyph-proc diff --git a/packages/font-glyphs/src/letter/latin/lower-m.ptl b/packages/font-glyphs/src/letter/latin/lower-m.ptl index 4f8d6c0b18..02ee7af5e8 100644 --- a/packages/font-glyphs/src/letter/latin/lower-m.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-m.ptl @@ -13,7 +13,7 @@ glyph-block Letter-Latin-Lower-M : begin 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 [SmallMSmooth df] : df.adws * (0.5 * SmallArchDepth + 0.375 * Stroke) define [SmallMShoulderSpiro] : with-params [left right top bottom width fine df coBottom] : glyph-proc local fix : TanSlope * [HSwToV Stroke] * width / Stroke local sm : [SmallMSmooth df] + fix / 2 @@ -264,7 +264,7 @@ glyph-block Letter-Latin-Lower-M : begin local df : include : DivFrame para.advanceScaleMM 3.25 include : df.markSet.e - local fine : AdviceStroke 4.5 df.advs + local fine : AdviceStroke 4.5 df.adws local rinner : XH * 0.15 - fine * 0.75 local gap : (df.rightSB - df.leftSB - 3 * [HSwToV df.mvs] - [HSwToV fine]) / 3 local m1 : df.rightSB - [HSwToV df.mvs] @@ -290,8 +290,8 @@ glyph-block Letter-Latin-Lower-M : begin right -- df.rightSB ybegin -- (XH / 2) yend -- (XH / 2) - ada -- (SmallArchDepthA * 0.5 * df.advs) - adb -- (SmallArchDepthB * 0.5 * df.advs) + ada -- (SmallArchDepthA * 0.5 * df.adws) + adb -- (SmallArchDepthB * 0.5 * df.adws) 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-r.ptl b/packages/font-glyphs/src/letter/latin/lower-r.ptl index 3d09b3ee35..ca31abe62d 100644 --- a/packages/font-glyphs/src/letter/latin/lower-r.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-r.ptl @@ -32,8 +32,8 @@ glyph-block Letter-Latin-Lower-R : begin local { rBalanceMultiplier rHookMultiplier rHookSwMultiplier rSerifLeftExtender hookSuperness } : match mode [Just rStraight] { 1 1 0 0 2.35 } [Just rSerifed] { (4 / 3) (2 / 3) (1 / 4) (1 / 3) 2.35 } - [Just rNarrow] { (2 * (df.advs - 0.5)) 1 0 0 2.35 } - [Just rNarrowSerifed] { (2 * (df.advs - 0.5)) 1 0 0 2.35 } + [Just rNarrow] { (2 * (df.adws - 0.5)) 1 0 0 2.35 } + [Just rNarrowSerifed] { (2 * (df.adws - 0.5)) 1 0 0 2.35 } [Just rCornerHooked] { (5 / 8) 1 0 0 2.35 } [Just rCornerHookedSerifed] { (4 / 3) (2 / 3) (1 / 4) (1 / 3) 2.35 } [Just rEarless] { 1 1 0 0 2.35 } @@ -57,7 +57,7 @@ glyph-block Letter-Latin-Lower-R : begin export : local xArchMiddle : match mode [Just rStraight] : mix (xBar - fine) rHookX (0.54 + 2 * TanSlope * strokeBar / Width) [Just rSerifed] : mix (xBar - fine) rHookX (0.59 + 2 * TanSlope * strokeBar / Width) - ([Just rNarrow] || [Just rNarrowSerifed]) : mix df.width rHookX : Math.max 1.01 (5 / 4 * [mix 1 dfR.advs 2]) + ([Just rNarrow] || [Just rNarrowSerifed]) : mix df.width rHookX : Math.max 1.01 (5 / 4 * [mix 1 dfR.adws 2]) ([Just rCornerHooked] || [Just rCornerHookedSerifed]) : rHookX - [HSwToV : 0.5 * strokeBar] [Just rEarless] : mix (xBar - [HSwToV strokeBar]) rHookX 0.5 local mixpin : match mode @@ -68,7 +68,7 @@ glyph-block Letter-Latin-Lower-R : begin export : local skew : Math.max 0 : (xArchMiddle - rmiddlein) / stroke - TanSlope export : local rHookY : RHook * rHookMultiplier + stroke * rHookSwMultiplier export : local rHookXN : match mode - [Just rNarrowSerifed] : mix df.width rHookX df.advs + [Just rNarrowSerifed] : mix df.width rHookX df.adws [Just rNarrow] : xArchMiddle + TINY __ rHookX diff --git a/packages/font-glyphs/src/letter/latin/lower-t.ptl b/packages/font-glyphs/src/letter/latin/lower-t.ptl index 35e1936282..98263fe358 100644 --- a/packages/font-glyphs/src/letter/latin/lower-t.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-t.ptl @@ -20,8 +20,8 @@ glyph-block Letter-Latin-Lower-T : begin define SYM-PR-BALANCED 3 define dfNarrowT : DivFrame para.advanceScaleF - define [xSmallTBarLeftT df] : df.middle - (df.advs ** 2) * TBalance - [HSwToV HalfStroke] - define [xSmallTCrossRefT df] : [xSmallTBarLeftT df] + df.advs * TBalance2 + [HSwToV HalfStroke] + define [xSmallTBarLeftT df] : df.middle - (df.adws ** 2) * TBalance - [HSwToV HalfStroke] + define [xSmallTCrossRefT df] : [xSmallTBarLeftT df] + df.adws * TBalance2 + [HSwToV HalfStroke] define yCrossBar XH define yShortNeck1 : Math.max [mix XH Ascender 0.5] ([mix XH Ascender 0.875] - Stroke * 0.125) @@ -34,8 +34,8 @@ glyph-block Letter-Latin-Lower-T : begin ([Just SYM-PR-LEFT] || [Just SYM-PR-BALANCED]) : df.middle - [HSwToV HalfStroke] define [xCrossBarPos df sym] : match sym - ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.advs])} - __ {([xSmallTCrossRefT df] - LongJut * [Math.sqrt df.advs]) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.advs])} + ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.adws])} + __ {([xSmallTCrossRefT df] - LongJut * [Math.sqrt df.adws]) ([xSmallTCrossRefT df] + LongJut * [Math.sqrt df.adws])} define [XHookTerminal df sym] : match sym [Just SYM-LEFT] df.rightSB @@ -80,7 +80,7 @@ glyph-block Letter-Latin-Lower-T : begin define DiagonalTailed : namespace define [HookShape df sym top bot sw] : begin local xMid : [BarLeftPos df sym] + [HSwToV HalfStroke] - local hookDepth : [if (sym === SYM-LEFT) 1.375 1] * [DiagTail.StdDepth [DivFrame : Math.sqrt df.advs] sw] - [HSwToV HalfStroke] + local hookDepth : [if (sym === SYM-LEFT) 1.375 1] * [DiagTail.StdDepth [DivFrame : Math.sqrt df.adws] sw] - [HSwToV HalfStroke] return : dispiro flat xMid top [widths.center.heading sw Downward] DiagTail.R xMid bot hookDepth sw @@ -106,12 +106,12 @@ glyph-block Letter-Latin-Lower-T : begin define Flat : namespace export : define [xCrossBarPos df sym] : match sym - ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) [mix df.width df.rightSB : mix 1 df.advs 2]} - __ {[mix 0 df.leftSB [mix 1 df.advs 2]] [mix df.width df.rightSB : mix 1 df.advs 2]} + ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) [mix df.width df.rightSB : mix 1 df.adws 2]} + __ {[mix 0 df.leftSB [mix 1 df.adws 2]] [mix df.width df.rightSB : mix 1 df.adws 2]} - define [CrossLeft df] : mix 0 df.leftSB [mix 1 df.advs 2] - define [CrossRight df] : mix df.width df.rightSB [mix 1 df.advs 2] + define [CrossLeft df] : mix 0 df.leftSB [mix 1 df.adws 2] + define [CrossRight df] : mix df.width df.rightSB [mix 1 df.adws 2] define NORMAL 0 define RETROFLEX 1 @@ -178,8 +178,8 @@ glyph-block Letter-Latin-Lower-T : begin __ : df.middle - [HSwToV HalfStroke] define [xCrossBarPos df sym] : match sym - ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) (df.middle + LongJut * [Math.sqrt df.advs])} - __ {(df.middle - LongJut * [Math.sqrt df.advs]) (df.middle + LongJut * [Math.sqrt df.advs])} + ([Just SYM-LEFT] || [Just SYM-PR-LEFT]) {([BarLeftPos df sym] + TanSlope * Stroke) (df.middle + LongJut * [Math.sqrt df.adws])} + __ {(df.middle - LongJut * [Math.sqrt df.adws]) (df.middle + LongJut * [Math.sqrt df.adws])} export : define [Body df sym top bot] : glyph-proc local xLeft : BarLeftPos df sym diff --git a/packages/font-glyphs/src/letter/latin/o.ptl b/packages/font-glyphs/src/letter/latin/o.ptl index fcfa052bc8..11c5ad0b8d 100644 --- a/packages/font-glyphs/src/letter/latin/o.ptl +++ b/packages/font-glyphs/src/letter/latin/o.ptl @@ -180,8 +180,8 @@ glyph-block Letter-Latin-O : begin include : df.markSet.capital local dist : df.rightSB - df.leftSB local gap : Math.max (dist / 4) : HSwToV df.mvs - local ada : ArchDepthA * df.advs - local adb : ArchDepthB * df.advs + local ada : ArchDepthA * df.adws + local adb : ArchDepthB * df.adws include : OShapeFlatTB CAP 0 df.leftSB df.rightSB df.mvs ada adb gap include : VBar.m df.middle (df.mvs / 2) (CAP - df.mvs / 2) df.mvs set-base-anchor 'trailing' Middle 0 @@ -192,16 +192,16 @@ glyph-block Letter-Latin-O : begin local dist : df.rightSB - df.leftSB local gap : Math.max (dist / 4) : HSwToV df.mvs local gapInner : Math.max (dist / 8) : HSwToV df.mvs - local ada : ArchDepthA * df.advs - local adb : ArchDepthB * df.advs + local ada : ArchDepthA * df.adws + local adb : ArchDepthB * df.adws local innerDist : dist - [HSwToV : 5 * df.mvs] local arcXL : df.leftSB + innerDist * (1 / 4) + [HSwToV : 1 * df.mvs] local arcXR : df.leftSB + innerDist * (3 / 4) + [HSwToV : 4 * df.mvs] local heightGap : Math.min (df.mvs + (CAP - df.mvs * 4) / 5) (innerDist / 4 + df.mvs) local heightInner : CAP - 2 * heightGap local smInner : clamp (df.mvs * 1.5) (heightInner / 2 - TINY) (ArchDepth * heightInner / CAP) - local adaInner : [ArchDepthAOf smInner : arcXR - arcXL + df.leftSB * 2] * df.advs - local adbInner : [ArchDepthBOf smInner : arcXR - arcXL + df.leftSB * 2] * df.advs + local adaInner : [ArchDepthAOf smInner : arcXR - arcXL + df.leftSB * 2] * df.adws + local adbInner : [ArchDepthBOf smInner : arcXR - arcXL + df.leftSB * 2] * df.adws include : OShapeFlatTB CAP 0 df.leftSB df.rightSB df.mvs ada adb gap include : OShapeFlatTB (CAP - heightGap) (0 + heightGap) arcXL arcXR df.mvs adaInner adbInner gapInner include : VBar.m df.middle (df.mvs / 2) (CAP - df.mvs / 2) df.mvs @@ -213,8 +213,8 @@ glyph-block Letter-Latin-O : begin local gap : Math.max (dist / 4) : HSwToV df.mvs local gapInner1 : Math.max (dist / 6) : HSwToV df.mvs local gapInner2 : Math.max (dist / 12) : HSwToV df.mvs - local ada : ArchDepthA * df.advs - local adb : ArchDepthB * df.advs + local ada : ArchDepthA * df.adws + local adb : ArchDepthB * df.adws local innerDist : dist - [HSwToV : 7 * df.mvs] local arcXL1 : df.leftSB + innerDist * (1 / 6) + [HSwToV : 1 * df.mvs] local arcXR1 : df.leftSB + innerDist * (5 / 6) + [HSwToV : 6 * df.mvs] @@ -224,11 +224,11 @@ glyph-block Letter-Latin-O : begin local heightInner1 : CAP - 2 * heightGap local heightInner2 : CAP - 4 * heightGap local smInner1 : clamp (df.mvs * 1.5) (heightInner1 / 2 - TINY) (ArchDepth * heightInner1 / CAP) - local adaInner1 : [ArchDepthAOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.advs - local adbInner1 : [ArchDepthBOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.advs + local adaInner1 : [ArchDepthAOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.adws + local adbInner1 : [ArchDepthBOf smInner1 : arcXR1 - arcXL1 + df.leftSB * 2] * df.adws local smInner2 : clamp (df.mvs * 1.5) (heightInner2 / 2 - TINY) (ArchDepth * heightInner2 / CAP) - local adaInner2 : [ArchDepthAOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.advs - local adbInner2 : [ArchDepthBOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.advs + local adaInner2 : [ArchDepthAOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.adws + local adbInner2 : [ArchDepthBOf smInner2 : arcXR2 - arcXL2 + df.leftSB * 2] * df.adws include : OShapeFlatTB CAP 0 df.leftSB df.rightSB df.mvs ada adb gap include : OShapeFlatTB (CAP - heightGap) (0 + heightGap) arcXL1 arcXR1 df.mvs adaInner1 adbInner1 gapInner1 include : OShapeFlatTB (CAP - 2 * heightGap) (0 + 2 * heightGap) arcXL2 arcXR2 df.mvs adaInner2 adbInner2 gapInner2 diff --git a/packages/font-glyphs/src/letter/latin/s.ptl b/packages/font-glyphs/src/letter/latin/s.ptl index 57f0b74991..b21c505fd5 100644 --- a/packages/font-glyphs/src/letter/latin/s.ptl +++ b/packages/font-glyphs/src/letter/latin/s.ptl @@ -246,7 +246,7 @@ glyph-block Letter-Latin-S : begin create-glyph "s.\(suffix)" : glyph-proc local df : include DfLower include : df.markSet.e - local sw : AdviceStroke2 2 3 XH df.advs + local sw : AdviceStroke2 2 3 XH df.adws include : SmallSStrokeImpl df doTS doBS sw EssLower include : SAutoSlabStart df doTS XH sw Hook include : SAutoSlabEnd df doBS 0 sw Hook @@ -313,7 +313,7 @@ glyph-block Letter-Latin-S : begin if [not doBS] : create-glyph "sCurlyTail.\(suffix)" : glyph-proc local df : include DfLower include : df.markSet.e - local sw : AdviceStroke2 2 3 XH df.advs + local sw : AdviceStroke2 2 3 XH df.adws include : SmallSStrokeImpl df doTS CURLY-TAIL sw EssLower include : SAutoSlabStart df doTS XH sw Hook @@ -329,7 +329,7 @@ glyph-block Letter-Latin-S : begin local df : include : DivFrame para.advanceScaleF 2 include : df.markSet.bp local subDf : DivFrame (5 / 6) 2 - local sw : AdviceStroke2 2 3 (Ascender - Descender) subDf.advs + local sw : AdviceStroke2 2 3 (Ascender - Descender) subDf.adws local shift : 0.5 * (df.width - subDf.width) include : with-transform [ApparentTranslate shift 0] SStrokeImpl subDf Ascender Descender doTS doBS sw EssLower diff --git a/packages/font-glyphs/src/letter/latin/upper-h.ptl b/packages/font-glyphs/src/letter/latin/upper-h.ptl index 25aeb0b164..578e714f93 100644 --- a/packages/font-glyphs/src/letter/latin/upper-h.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-h.ptl @@ -76,7 +76,7 @@ glyph-block Letter-Latin-Upper-H : begin local sw : AdviceStroke 2.75 local xm : Math.min (Width - df.leftSB) : if SLAB [mix df.leftSB df.rightSB 0.625] + [HSwToV : 0.25 * df.mvs] - 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 : Body df.leftSB xm top sw @@ -95,8 +95,8 @@ glyph-block Letter-Latin-Upper-H : begin right -- df.rightSB ybegin -- top yend -- yend - 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 include : HSerifs slabType top 0 df.leftSB (df.middle + [HSwToV : 0.5 * df.mvs]) df.mvs diff --git a/packages/font-glyphs/src/letter/latin/upper-i.ptl b/packages/font-glyphs/src/letter/latin/upper-i.ptl index ecb4b85211..bceeaa441e 100644 --- a/packages/font-glyphs/src/letter/latin/upper-i.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-i.ptl @@ -20,7 +20,7 @@ glyph-block Letter-Latin-Upper-I : begin include : HSerif.mt df.middle top jut set-base-anchor 'trailing' (df.middle + jut) bot - define [ISerifShape df top bot jut] : ISerifShapeImpl df top bot (jut * df.advs) + define [ISerifShape df top bot jut] : ISerifShapeImpl df top bot (jut * df.adws) define UpperIConfig : object 'straight' { para.advanceScaleI ISeriflessShape LongJut } @@ -28,9 +28,9 @@ glyph-block Letter-Latin-Upper-I : begin 'serifed' { para.advanceScaleI ISerifShape LongJut } 'shortSerifed' { para.advanceScaleI ISerifShape MidJutCenter } - foreach { suffix { advs Body jut } } [Object.entries UpperIConfig] : do + foreach { suffix { adws Body jut } } [Object.entries UpperIConfig] : do create-glyph "I.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital include : Body df CAP 0 jut @@ -45,7 +45,7 @@ glyph-block Letter-Latin-Upper-I : begin include : ApparentTranslate 0 (0.5 * SB) create-glyph "ILonga.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital local top : CAP + Ascender - XH include : ExtendAboveBaseAnchors top diff --git a/packages/font-glyphs/src/letter/latin/upper-j.ptl b/packages/font-glyphs/src/letter/latin/upper-j.ptl index 8e71e0aa06..6fd572e4ca 100644 --- a/packages/font-glyphs/src/letter/latin/upper-j.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-j.ptl @@ -94,16 +94,16 @@ glyph-block Letter-Latin-Upper-J : begin set-width df.width include : df.markSet.[if (top > XH) 'capDesc' 'p'] include : FlatHookDotlessJShape df dfHook top - crossLeft -- (df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.advs 2])) - barCenter -- (df.middle + 0.25 * JBalance * df.advs * [mix 1 df.advs 2]) + crossLeft -- (df.middle - (dfHook.middle - [mix 0 dfHook.leftSB : mix 1 dfHook.adws 2])) + barCenter -- (df.middle + 0.25 * JBalance * df.adws * [mix 1 df.adws 2]) serif -- false define [JDescendingFlatHookSerifedBase df dfHook top] : glyph-proc set-width df.width include : df.markSet.[if (top > XH) 'capDesc' 'p'] include : FlatHookDotlessJShape df df top - crossLeft -- [mix 0 SB : mix 1 df.advs 2] - barCenter -- (df.middle + JBalance * df.advs) + crossLeft -- [mix 0 SB : mix 1 df.adws 2] + barCenter -- (df.middle + JBalance * df.adws) serif -- true define [JLeftwardSerif df x top] : HSerif.lt x top LongJut diff --git a/packages/font-glyphs/src/letter/latin/upper-m.ptl b/packages/font-glyphs/src/letter/latin/upper-m.ptl index 10e01f9bef..19763e5db1 100644 --- a/packages/font-glyphs/src/letter/latin/upper-m.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-m.ptl @@ -26,7 +26,7 @@ glyph-block Letter-Latin-Upper-M : begin define SLAB-FULL 4 glyph-block-export MShape - define [MShape] : with-params [top df form slabType slanted [kMidHang df.advs]] : glyph-proc + define [MShape] : with-params [top df form slabType slanted [kMidHang df.adws]] : glyph-proc local sidesSlope : if slanted 0.04 0 local xLeftTop : df.leftSB + top * sidesSlope local xRightTop : df.rightSB - top * sidesSlope @@ -37,17 +37,17 @@ glyph-block Letter-Latin-Upper-M : begin __ false local swSideBot : match form - [Just FORM-SAN-SMALL] : AdviceStroke 2.5 df.advs - [Just FORM-SAN] : AdviceStroke 2.5 df.advs - [Just FORM-TURN-W] : AdviceStroke 2.5 df.advs - [Just FORM-HANGING] : AdviceStroke 2.5 df.advs - __ : AdviceStroke 2.75 df.advs + [Just FORM-SAN-SMALL] : AdviceStroke 2.5 df.adws + [Just FORM-SAN] : AdviceStroke 2.5 df.adws + [Just FORM-TURN-W] : AdviceStroke 2.5 df.adws + [Just FORM-HANGING] : AdviceStroke 2.5 df.adws + __ : AdviceStroke 2.75 df.adws local swSideTop : match form - [Just FORM-SAN-SMALL] : AdviceStroke 3 df.advs - [Just FORM-SAN] : AdviceStroke 3 df.advs - [Just FORM-TURN-W] : AdviceStroke 3 df.advs - __ : AdviceStroke 4 df.advs - local swMiddle : AdviceStroke 4.5 df.advs + [Just FORM-SAN-SMALL] : AdviceStroke 3 df.adws + [Just FORM-SAN] : AdviceStroke 3 df.adws + [Just FORM-TURN-W] : AdviceStroke 3 df.adws + __ : AdviceStroke 4 df.adws + local swMiddle : AdviceStroke 4.5 df.adws local middleY : match form [Just FORM-SAN-SMALL] : top * 0.55 [Just FORM-SAN] : top * 0.55 @@ -58,7 +58,7 @@ glyph-block Letter-Latin-Upper-M : begin [Just FORM-FLAT] 0.75 __ 0.5 local kMidBotStrokeShrink : match form - [Just FORM-FLAT] : mix 1 df.advs (-0.5) + [Just FORM-FLAT] : mix 1 df.adws (-0.5) __ 1 local swMiddleShrunk (kMidBotStrokeShrink * swMiddle) @@ -99,13 +99,13 @@ glyph-block Letter-Latin-Upper-M : begin local xTopBarRightEnd : mix df.width df.rightSB : if vSlab 0.25 0.375 local swSideBot : match form - [Just FORM-SAN-SMALL] : AdviceStroke 2.5 subDf.advs - [Just FORM-SAN] : AdviceStroke 2.5 subDf.advs - [Just FORM-TURN-W] : AdviceStroke 2.5 subDf.advs - [Just FORM-HANGING] : AdviceStroke 2.5 subDf.advs - __ : AdviceStroke 2.75 subDf.advs + [Just FORM-SAN-SMALL] : AdviceStroke 2.5 subDf.adws + [Just FORM-SAN] : AdviceStroke 2.5 subDf.adws + [Just FORM-TURN-W] : AdviceStroke 2.5 subDf.adws + [Just FORM-HANGING] : AdviceStroke 2.5 subDf.adws + __ : AdviceStroke 2.75 subDf.adws - include : MShape top subDf form slabType slanted (kMidHang -- df.advs) + include : MShape top subDf form slabType slanted (kMidHang -- df.adws) include : HBar.t xTopRight xTopBarRightEnd top swSideBot if vSlab : include : VSerif.dr xTopBarRightEnd top VJut (VJutStroke * swSideBot / Stroke) diff --git a/packages/font-glyphs/src/letter/latin/upper-t.ptl b/packages/font-glyphs/src/letter/latin/upper-t.ptl index ce34c84db5..f5824c14c0 100644 --- a/packages/font-glyphs/src/letter/latin/upper-t.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-t.ptl @@ -46,8 +46,8 @@ glyph-block Letter-Latin-Upper-T : begin right -- df.rightSB ybegin -- top yend -- (top / 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 if doTopSerifs : begin @@ -86,15 +86,15 @@ glyph-block Letter-Latin-Upper-T : begin motionSerifed { para.advanceScaleT true false } serifed { para.advanceScaleT true true } - foreach { suffix { advs doST doSB } } [Object.entries TConfig] : do + foreach { suffix { adws doST doSB } } [Object.entries TConfig] : do create-glyph "T.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital set-base-anchor 'bottomRight' (df.middle + [HSwToV HalfStroke]) 0 include : TShape df CAP doST doSB create-glyph "cyrl/TeDescender.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital set-base-anchor 'bottomRight' (df.middle + [HSwToV HalfStroke]) 0 include : TShape df CAP doST doSB @@ -104,44 +104,44 @@ glyph-block Letter-Latin-Upper-T : begin jut -- [if doSB MidJutCenter Jut] create-glyph "TStroke.\(suffix)" : glyph-proc - local df : DivFrame advs + local df : DivFrame adws include [refer-glyph "T.\(suffix)"] AS_BASE ALSO_METRICS include : LetterBarOverlay.m.in df.middle 0 CAP 0.45 create-glyph "Thookleft.\(suffix)" : glyph-proc - local df : DivFrame advs + local df : DivFrame adws include [refer-glyph "T.\(suffix)"] AS_BASE ALSO_METRICS eject-contour 'serifLT' eject-contour 'strokeLT' include : LeftHook (df.leftSB + LeftHook.extension) CAP df.middle create-glyph "smcpT.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.e set-base-anchor 'bottomRight' (df.middle + [HSwToV HalfStroke]) 0 include : TShape df XH doST doSB create-glyph "cyrl/Twe/upper.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital include : TweUpperShape df CAP doST doSB set-base-anchor 'cvDecompose' (df.width / 2) CAP create-glyph "cyrl/twe/upper.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.e include : TweUpperShape df XH doST doSB set-base-anchor 'cvDecompose' (df.width / 2) XH create-glyph "currency/tengeSign.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.capital local gap : Math.max (CAP * 0.1) : AdviceStroke2 2 6 CAP include : HBar.t [TLeftX df] [TRightX df] CAP OverlayStroke include : TShape df (CAP - gap - OverlayStroke) doST doSB create-glyph "cyrl/teDescender.upright.\(suffix)" : glyph-proc - local df : include : DivFrame advs + local df : include : DivFrame adws include : df.markSet.e include : TShape df XH doST doSB include : CyrDescender.rSideJut @@ -150,18 +150,18 @@ glyph-block Letter-Latin-Upper-T : begin jut -- [if doSB MidJutCenter Jut] create-glyph "TRTailBR.\(suffix)" : glyph-proc - local df : DivFrame advs + local df : DivFrame adws include [refer-glyph "T.\(suffix)"] AS_BASE ALSO_METRICS include : df.markSet.capital include : RetroflexHook.mExt df.middle 0 create-glyph "cyrl/TjeKomi.\(suffix)" : glyph-proc - local df : include : DivFrame advs 3 + local df : include : DivFrame adws 3 include : df.markSet.capital include : TjeShape df CAP doST create-glyph "cyrl/tjeKomi.upright.\(suffix)" : glyph-proc - local df : include : DivFrame advs 3 + local df : include : DivFrame adws 3 include : df.markSet.e include : TjeShape df XH doST diff --git a/packages/font-glyphs/src/letter/latin/w.ptl b/packages/font-glyphs/src/letter/latin/w.ptl index e0b9062d5b..50a0c5c7da 100644 --- a/packages/font-glyphs/src/letter/latin/w.ptl +++ b/packages/font-glyphs/src/letter/latin/w.ptl @@ -49,37 +49,37 @@ glyph-block Letter-Latin-W : begin define [WDim df top bodyType] : begin local strokeOuter : match bodyType - [Just FORM-CURLY] : AdviceStroke CwOuterStrokeCurly : Math.sqrt df.advs - [Just FORM-STRAIGHT] : AdviceStroke CwOuterStrokeStraight1 : Math.sqrt df.advs - [Just FORM-FLAT-TOP] : AdviceStroke CwOuterStrokeStraight2 : Math.sqrt df.advs - [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.advs - [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.advs - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.advs + [Just FORM-CURLY] : AdviceStroke CwOuterStrokeCurly : Math.sqrt df.adws + [Just FORM-STRAIGHT] : AdviceStroke CwOuterStrokeStraight1 : Math.sqrt df.adws + [Just FORM-FLAT-TOP] : AdviceStroke CwOuterStrokeStraight2 : Math.sqrt df.adws + [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.adws + [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.adws + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.adws local fineOuter : match bodyType - [Just FORM-CURLY] : AdviceStroke CwFineOuter df.advs - [Just FORM-STRAIGHT] : AdviceStroke CwFineOuterStraight : Math.sqrt df.advs - [Just FORM-FLAT-TOP] : AdviceStroke CwFineOuterStraight : Math.sqrt df.advs - [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.advs - [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.advs - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.advs + [Just FORM-CURLY] : AdviceStroke CwFineOuter df.adws + [Just FORM-STRAIGHT] : AdviceStroke CwFineOuterStraight : Math.sqrt df.adws + [Just FORM-FLAT-TOP] : AdviceStroke CwFineOuterStraight : Math.sqrt df.adws + [Just FORM-DOUBLE-V] : AdviceStroke CwDoubleV : Math.sqrt df.adws + [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.adws + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.adws local fineInner : match bodyType - [Just FORM-CURLY] : AdviceStroke CwFineInner df.advs - [Just FORM-STRAIGHT] : AdviceStroke CwFineInnerStraight : Math.sqrt df.advs - [Just FORM-FLAT-TOP] : AdviceStroke CwFineInnerStraight : Math.sqrt df.advs - [Just FORM-DOUBLE-V] : AdviceStroke CwFineInnerDoubleV : Math.sqrt df.advs - [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.advs - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.advs + [Just FORM-CURLY] : AdviceStroke CwFineInner df.adws + [Just FORM-STRAIGHT] : AdviceStroke CwFineInnerStraight : Math.sqrt df.adws + [Just FORM-FLAT-TOP] : AdviceStroke CwFineInnerStraight : Math.sqrt df.adws + [Just FORM-DOUBLE-V] : AdviceStroke CwFineInnerDoubleV : Math.sqrt df.adws + [Just FORM-ASYMMETRIC] : AdviceStroke CwDoubleV : Math.sqrt df.adws + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega : Math.sqrt df.adws local fineHeight : (fineOuter + fineInner) / 2 local wCo : match bodyType - [Just FORM-CURLY] : AdviceStroke CwWCoCurly df.advs - [Just FORM-STRAIGHT] : AdviceStroke CwWCoStraight df.advs - [Just FORM-FLAT-TOP] : AdviceStroke CwWCoStraight df.advs - [Just FORM-DOUBLE-V] : AdviceStroke CwWCoDoubleV df.advs - [Just FORM-ASYMMETRIC] : AdviceStroke CwWCoDoubleV df.advs - [Just FORM-CYRL-OMEGA] : AdviceStroke CwWCoDoubleV df.advs + [Just FORM-CURLY] : AdviceStroke CwWCoCurly df.adws + [Just FORM-STRAIGHT] : AdviceStroke CwWCoStraight df.adws + [Just FORM-FLAT-TOP] : AdviceStroke CwWCoStraight df.adws + [Just FORM-DOUBLE-V] : AdviceStroke CwWCoDoubleV df.adws + [Just FORM-ASYMMETRIC] : AdviceStroke CwWCoDoubleV df.adws + [Just FORM-CYRL-OMEGA] : AdviceStroke CwWCoDoubleV df.adws local wCo2 : match bodyType - [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega df.advs + [Just FORM-CYRL-OMEGA] : AdviceStroke CwCyrlOmega df.adws _ wCo local kWCoShrink CThin @@ -266,7 +266,7 @@ glyph-block Letter-Latin-W : begin widths.rhs flat df.rightSB (top - TailY - HalfStroke - O) [heading Downward] curl df.rightSB [Math.min (0.8 * top) (top - TailY - HalfStroke - TINY)] [heading Downward] - straight.down.end df.rightSB 0 [widths.rhs.heading [AdviceStroke 4 df.advs] Downward] + straight.down.end df.rightSB 0 [widths.rhs.heading [AdviceStroke 4 df.adws] Downward] include : VerticalHook.r df.rightSB (top - TailY - HalfStroke - O) TailX (-TailY) diff --git a/packages/font-glyphs/src/letter/latin/x.ptl b/packages/font-glyphs/src/letter/latin/x.ptl index 41da4e7d4e..aa9db5bc02 100644 --- a/packages/font-glyphs/src/letter/latin/x.ptl +++ b/packages/font-glyphs/src/letter/latin/x.ptl @@ -87,8 +87,8 @@ glyph-block Letter-Latin-X : begin ] : glyph-proc local ada : ArchDepthAOf (ArchDepth * 0.8) (Width / 2) local adb : ArchDepthBOf (ArchDepth * 0.8) (Width / 2) - local advs : (right - left) / (RightSB - Middle) - local divHook : Math.min advs 1 + local adws : (right - left) / (RightSB - Middle) + local divHook : Math.min adws 1 local fineMid : 0.55 * swMid local xMidBarRightEdge : left + [HSwToV swMid] / 2 @@ -111,7 +111,7 @@ glyph-block Letter-Latin-X : begin flat (xMidBarRightEdge - [HSwToV fineMid]) ([mix bottom top 0.5] - O) [widths.lhs fineMid] curl (xMidBarRightEdge - [HSwToV fineMid]) (bottom + [Math.min adb (swMid + rIn)]) arcvh - flat (xMidBarRightEdge + advs * (0.5 * swMid + rIn) + 0.25 * TanSlope * (0.5 * swMid + rIn)) bottom [widths.lhs.heading swCoEnd Rightward] + flat (xMidBarRightEdge + adws * (0.5 * swMid + rIn) + 0.25 * TanSlope * (0.5 * swMid + rIn)) bottom [widths.lhs.heading swCoEnd Rightward] curl right bottom dispiro flat (xMidBarRightEdge - [HSwToV : 0.5 * fineMid]) ([mix bottom top 0.5] - O) [widths.center fineMid] diff --git a/packages/font-glyphs/src/letter/shared.ptl b/packages/font-glyphs/src/letter/shared.ptl index 2a04d679a6..fe6047d5c3 100644 --- a/packages/font-glyphs/src/letter/shared.ptl +++ b/packages/font-glyphs/src/letter/shared.ptl @@ -473,8 +473,8 @@ glyph-block Letter-Shared-Shapes : begin glyph-block-export FlatHookDepth define [FlatHookDepth df s] : object - x : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.advs] HVContrast] - y : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.advs] 1] + x : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.adws] HVContrast] + y : [fallback s 1] * [FlatHookDepthImpl [Math.min 1 : Math.sqrt df.adws] 1] define [FlatHookDepthImpl sHook sStroke] : begin define kFlathook : 15 / 16 return : Math.max @@ -616,7 +616,7 @@ glyph-block Letter-Shared-Shapes : begin export : define DefaultAngle 40 export : define [StdDepth df sw] : Math.max (0.5 * sw) - df.advs * para.unitWidthScalar * [Math.hypot HookX Hook] - 0.25 * sw + df.adws * para.unitWidthScalar * [Math.hypot HookX Hook] - 0.25 * sw export : define [DefaultInnerRadius] : Math.max (XH / 32) (0.5 * [AdviceStroke2 24 32 XH]) @@ -686,14 +686,14 @@ glyph-block Letter-Shared-Shapes : begin return : Math.min jut : 0.5 * ink + [Math.max (Stroke * TanSlope) (0.375 * gap)] class CSerifFrame - public [new top bot left right swRef swSerif advs hSplit fForceSymmetric] : begin + public [new top bot left right swRef swSerif adws hSplit fForceSymmetric] : begin set this.top top set this.bot bot set this.left left set this.right right set this.swRef swRef set this.swSerif swSerif - set this.advs advs + set this.adws adws set this.hSplit hSplit set this.fForceSymmetric fForceSymmetric @@ -702,7 +702,7 @@ glyph-block Letter-Shared-Shapes : begin local jutFS MidJutSide - local jut : mix [HSwToV : 0.5 * swRef] Jut : Math.min 1 : advs * 2.25 / hSplit + local jut : mix [HSwToV : 0.5 * swRef] Jut : Math.min 1 : adws * 2.25 / hSplit local sideJut : jut - 0.5 * ink local jutIn : if fForceSymmetric jut : JutIn left right jut swRef hSplit @@ -763,7 +763,7 @@ glyph-block Letter-Shared-Shapes : begin local gap : (this.right - this.left - this.hSplit * ink) / (this.hSplit - 1) local l1 : this.left + (ink + gap) * l local r1 : this.left + (ink + gap) * r + ink - return : new CSerifFrame this.top this.bot l1 r1 this.swRef this.swSerif this.advs (r - l + 1) + return : new CSerifFrame this.top this.bot l1 r1 this.swRef this.swSerif this.adws (r - l + 1) glyph-block-export SerifFrame define flex-params [SerifFrame] : begin @@ -773,15 +773,15 @@ glyph-block Letter-Shared-Shapes : begin local-parameter : right local-parameter : swRef -- Stroke local-parameter : swSerif -- swRef - local-parameter : advs -- 1 + local-parameter : adws -- 1 local-parameter : hSplit -- 2 local-parameter : fForceSymmetric -- false - return : new CSerifFrame top bot left right swRef swSerif advs hSplit fForceSymmetric + return : new CSerifFrame top bot left right swRef swSerif adws hSplit fForceSymmetric define SerifFrame.fromDf : function [] : with-params [df top bot [swSerif df.mvs] [fForceSymmetric false]] : begin return : SerifFrame top bot df.leftSB df.rightSB swRef -- df.mvs - advs -- df.advs + adws -- df.adws hSplit -- [Math.max 2 df.hPack] swSerif -- swSerif fForceSymmetric -- fForceSymmetric diff --git a/packages/font-glyphs/src/marks/above.ptl b/packages/font-glyphs/src/marks/above.ptl index c1870d1696..5eeea6afd4 100644 --- a/packages/font-glyphs/src/marks/above.ptl +++ b/packages/font-glyphs/src/marks/above.ptl @@ -158,8 +158,8 @@ glyph-block Mark-Above : begin create-glyph 'asciiGrave/body/straight' : glyph-proc local df : include : DivFrame para.advanceScaleF include : dispiro - flat (df.middle + HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] - curl (df.middle - markExtend * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] + flat (df.middle + HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.adws]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] + curl (df.middle - markExtend * asciiMarkZoomX * [Math.sqrt df.adws]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] create-glyph 'acuteAbove' 0x301 : glyph-proc set-width 0 @@ -171,8 +171,8 @@ glyph-block Mark-Above : begin create-glyph 'latin1acute' 0xB4 : glyph-proc local df : include : DivFrame para.advanceScaleF include : dispiro - flat (df.middle - HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] - curl (df.middle + markExtend * asciiMarkZoomX * [Math.sqrt df.advs]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] + flat (df.middle - HalfStroke * 1.1 * asciiMarkZoomX * [Math.sqrt df.adws]) [mix aboveMarkMid aboveMarkBot asciiMarkZoomY] [widths.center : Stroke * 0.9] + curl (df.middle + markExtend * asciiMarkZoomX * [Math.sqrt df.adws]) [mix aboveMarkMid aboveMarkTop asciiMarkZoomY] [widths.center : Stroke * 1.1] glyph-block-export CaretCaronWidth CaretCaronMidSw CaretCaronTerminalSw define CaretCaronWidth : 2 * markExtend + markStress diff --git a/packages/font-glyphs/src/marks/overlay.ptl b/packages/font-glyphs/src/marks/overlay.ptl index 96f29751e4..0fba85b111 100644 --- a/packages/font-glyphs/src/marks/overlay.ptl +++ b/packages/font-glyphs/src/marks/overlay.ptl @@ -425,10 +425,10 @@ glyph-block Mark-Overlay : begin do "Inner dots" glyph-block-export InnerDot - define [InnerDot x y kHeight fRound kdr _space _advs] : begin + define [InnerDot x y kHeight fRound kdr _space _adws] : begin local space : fallback _space : InnerDot.spaceOfDf [DivFrame 1] - local advs : fallback _advs 4 - local halfDotWidth : kdr * [Math.max (DotRadius / 8) : Math.min DotRadius (space / advs)] + local adws : fallback _adws 4 + local halfDotWidth : kdr * [Math.max (DotRadius / 8) : Math.min DotRadius (space / adws)] local halfDotHeight : kdr * [Math.max (DotRadius / 8) : Math.min DotRadius (halfDotWidth * kHeight)] if fRound @@ -450,12 +450,12 @@ glyph-block Mark-Overlay : begin define [InnerDot2 kHeight fRound kdr] : glyph-proc local space : InnerDot.spaceOfDf [DivFrame 1] - local advs : StrokeWidthBlend 7 5 - local halfDotWidth : kdr * [Math.min DotRadius (space / advs)] - local kHeight2 : advs / 4 * kHeight + local adws : StrokeWidthBlend 7 5 + local halfDotWidth : kdr * [Math.min DotRadius (space / adws)] + local kHeight2 : adws / 4 * kHeight local offset : (0.5 * space - 2 * halfDotWidth) / 3 + halfDotWidth - include : InnerDot (-offset) 0 kHeight2 fRound kdr space advs - include : InnerDot offset 0 kHeight2 fRound kdr space advs + include : InnerDot (-offset) 0 kHeight2 fRound kdr space adws + include : InnerDot offset 0 kHeight2 fRound kdr space adws foreach { suffix { DrawAt kdr } } [Object.entries DotVariants] : do create-glyph "innerDot.\(suffix)" : glyph-proc diff --git a/packages/font-glyphs/src/meta/aesthetics.ptl b/packages/font-glyphs/src/meta/aesthetics.ptl index 333c9ad3fd..92f9ed557e 100644 --- a/packages/font-glyphs/src/meta/aesthetics.ptl +++ b/packages/font-glyphs/src/meta/aesthetics.ptl @@ -86,11 +86,11 @@ export : define [calculateMetrics para] : begin local adjustedFillRate : StrokeWeightControlSigmoid nonAdjustedFillRate local strokeWidthScalar : Math.min 1 : mul * adjustedFillRate / nonAdjustedFillRate return : para.stroke * strokeWidthScalar - define [AdviceStroke crowdedness advs mul] : begin - local spaceH : Width * [fallback advs 1] - SB * 2 + define [AdviceStroke crowdedness adws mul] : begin + local spaceH : Width * [fallback adws 1] - SB * 2 return : AdviceStrokeInSpace spaceH HVContrast crowdedness [fallback mul 1] - define [AdviceStroke2 crwX crwY refH advs] : begin - local spaceH : Width * [fallback advs 1] - SB * 2 + define [AdviceStroke2 crwX crwY refH adws] : begin + local spaceH : Width * [fallback adws 1] - SB * 2 local spaceV refH return : Math.min AdviceStrokeInSpace spaceH HVContrast crwX 1 @@ -119,8 +119,8 @@ export : define [calculateMetrics para] : begin define SLAB para.slab - define [IBalance df] : df.advs * df.advs * [fallback para.ibalance (LongJut * 0.04)] # Serifed - define [IBalance2 df] : df.advs * [fallback para.ibalance2 (LongJut * 0.14)] # Hooky, Tailed + define [IBalance df] : df.adws * df.adws * [fallback para.ibalance (LongJut * 0.04)] # Serifed + define [IBalance2 df] : df.adws * [fallback para.ibalance2 (LongJut * 0.14)] # Hooky, Tailed define JBalance : fallback para.jbalance 0 define JBalance2 : fallback para.jbalance2 (QuarterStroke + LongJut * 0.04) define TBalance : fallback para.tbalance JBalance @@ -421,31 +421,31 @@ export : define DesignParameters : object export : define [GenDivFrame metrics] : begin # Implementation class of a division frame, used to model a letter's core X-direction structure class CDivFrame - # _advs: scale factor of advance width + # _adws: scale factor of advance width # _hPack: number of horizontal divisions # _sbMul: scale factor of sidebearings # _mvs: desired stroke width # _ox: overshoot correction - public [new _advs _hPack _sbMul _mvs _ox] : begin + public [new _adws _hPack _sbMul _mvs _ox] : begin local ox : fallback _ox 0 - local advs : fallback _advs 1 + local adws : fallback _adws 1 local hPack : Math.max 1 [fallback _hPack 0] local mvs : fallback _mvs - if _hPack [metrics.AdviceStroke _hPack advs] metrics.Stroke + if _hPack [metrics.AdviceStroke _hPack adws] metrics.Stroke local sbMul : fallback _sbMul - Math.min 1 : (metrics.Width * advs - hPack * mvs) / (2 * hPack * metrics.SB) + Math.min 1 : (metrics.Width * adws - hPack * mvs) / (2 * hPack * metrics.SB) - set this.params : object advs hPack sbMul mvs ox - set this.advs advs + set this.params : object adws hPack sbMul mvs ox + set this.adws adws set this.hPack hPack - set this.width : metrics.Width * advs - set this.middle : metrics.Middle * advs + set this.width : metrics.Width * adws + set this.middle : metrics.Middle * adws set this.sb : metrics.SB * sbMul set this.leftSB : metrics.SB * sbMul - set this.rightSB : metrics.Width * advs - metrics.SB * sbMul + set this.rightSB : metrics.Width * adws - metrics.SB * sbMul set this.mvs mvs set this.shoulderFine : metrics.ShoulderFine * (mvs / metrics.Stroke) - set this.markSet : MarksetDiv advs sbMul metrics + set this.markSet : MarksetDiv adws sbMul metrics # No-overshoot metrics -- used for arch depth calculation set this.ox ox @@ -497,12 +497,12 @@ export : define [GenDivFrame metrics] : begin set g.divFrameParams this.params return this - public [adviceStroke c] : metrics.AdviceStroke c this.advs - public [adviceStroke2 c d h] : metrics.AdviceStroke2 c d h this.advs + public [adviceStroke c] : metrics.AdviceStroke c this.adws + public [adviceStroke2 c d h] : metrics.AdviceStroke2 c d h this.adws # Factory function for CDivFrame - define [F _advs _hPack _sbMul _mvs _ox] : begin - return : new CDivFrame _advs _hPack _sbMul _mvs _ox + define [F _adws _hPack _sbMul _mvs _ox] : begin + return : new CDivFrame _adws _hPack _sbMul _mvs _ox set F.fromParams : lambda [params] : begin - return : new CDivFrame params.advs params.hPack params.sbMul params.mvs params.ox + return : new CDivFrame params.adws params.hPack params.sbMul params.mvs params.ox return F diff --git a/packages/font-glyphs/src/symbol/letter.ptl b/packages/font-glyphs/src/symbol/letter.ptl index cdc2b9f1fe..61170d65a8 100644 --- a/packages/font-glyphs/src/symbol/letter.ptl +++ b/packages/font-glyphs/src/symbol/letter.ptl @@ -115,7 +115,7 @@ glyph-block Symbol-Currency : begin define pY 0.8 local archTop : mix 0 XH pY - local sw : Math.min df.mvs : AdviceStroke2 3 2 archTop df.advs + local sw : Math.min df.mvs : AdviceStroke2 3 2 archTop df.adws local ada : df.archDepthAOf SmallArchDepth sw local adb : df.archDepthBOf SmallArchDepth sw diff --git a/packages/font-glyphs/src/symbol/math/large-operators.ptl b/packages/font-glyphs/src/symbol/math/large-operators.ptl index 4d2971a6d5..2fa4de5e76 100644 --- a/packages/font-glyphs/src/symbol/math/large-operators.ptl +++ b/packages/font-glyphs/src/symbol/math/large-operators.ptl @@ -66,8 +66,8 @@ glyph-block Symbol-Math-Large-Operators : for-width-kinds WideWidth1 set-width df.width include : UShape df BgOpTop BgOpBot stroke -- OperatorStroke - ada -- [ArchDepthAOf (ArchDepth * [Math.sqrt df.advs]) (df.width)] - adb -- [ArchDepthBOf (ArchDepth * [Math.sqrt df.advs]) (df.width)] + ada -- [ArchDepthAOf (ArchDepth * [Math.sqrt df.adws]) (df.width)] + adb -- [ArchDepthBOf (ArchDepth * [Math.sqrt df.adws]) (df.width)] turned [MangleName 'Cap'] [MangleUnicode 0x22C2] [MangleName 'Cup'] df.middle SymbolMid diff --git a/packages/font-glyphs/src/symbol/math/logicals.ptl b/packages/font-glyphs/src/symbol/math/logicals.ptl index 680316cac1..90d0df93a0 100644 --- a/packages/font-glyphs/src/symbol/math/logicals.ptl +++ b/packages/font-glyphs/src/symbol/math/logicals.ptl @@ -118,7 +118,7 @@ glyph-block Symbol-Math-Logicals : begin create-glyph 'turnedTautologyTautology' 0x27DA : glyph-proc local df : include : DivFrame para.advanceScaleMM 4 local vs : df.mvs * OperatorStroke / Stroke - local innerSB : Math.min (SB * [Math.min 1 : df.advs / 1.5]) df.leftSB + local innerSB : Math.min (SB * [Math.min 1 : df.adws / 1.5]) df.leftSB local l : Math.max (df.middle - innerSB - vs / 2) : mix df.middle df.leftSB (1 / 3) local r : Math.min (df.middle + innerSB + vs / 2) : mix df.middle df.rightSB (1 / 3) local t : mix SymbolMid top (1 / 3) @@ -133,7 +133,7 @@ glyph-block Symbol-Math-Logicals : begin create-glyph 'dashvvdash' 0x27DB : glyph-proc local df : include : DivFrame para.advanceScaleMM 4 local vs : df.mvs * OperatorStroke / Stroke - local innerSB : Math.min (SB * [Math.min 1 : df.advs / 1.5]) df.leftSB + local innerSB : Math.min (SB * [Math.min 1 : df.adws / 1.5]) df.leftSB local l : Math.max (df.middle - innerSB - vs / 2) : mix df.middle df.leftSB (1 / 3) local r : Math.min (df.middle + innerSB + vs / 2) : mix df.middle df.rightSB (1 / 3) include : VBar.m l top bot vs diff --git a/packages/font-glyphs/src/symbol/pictograph/faces.ptl b/packages/font-glyphs/src/symbol/pictograph/faces.ptl index 784915de94..c9dea000f0 100644 --- a/packages/font-glyphs/src/symbol/pictograph/faces.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/faces.ptl @@ -17,7 +17,7 @@ glyph-block Symbol-Pictograph-Faces : begin width : Math.min (right - left) (top - bottom) midX : mix left right 0.5 - local advs : (scaffold.width + SB * 2) / Width + local adws : (scaffold.width + SB * 2) / Width set scaffold.left : scaffold.midX - scaffold.width / 2 set scaffold.right : scaffold.midX + scaffold.width / 2 @@ -25,8 +25,8 @@ glyph-block Symbol-Pictograph-Faces : begin set scaffold.smb : ArchDepthBOf (SmallArchDepth * mosaicWidthScalar * scale) (mosaicWidth * scale) set scaffold.rda : ArchDepthAOf ((top - bottom) / 2) (mosaicWidth * scale) set scaffold.rdb : ArchDepthBOf ((top - bottom) / 2) (mosaicWidth * scale) - set scaffold.stroke : AdviceStroke 5 advs - set scaffold.fine : AdviceStroke (6 * [Math.sqrt (mosaicWidthScalar * scale)]) advs + set scaffold.stroke : AdviceStroke 5 adws + set scaffold.fine : AdviceStroke (6 * [Math.sqrt (mosaicWidthScalar * scale)]) adws define eyeYPos 0.625 define noseYPos 0.5 diff --git a/packages/font-glyphs/src/symbol/punctuation/at.ptl b/packages/font-glyphs/src/symbol/punctuation/at.ptl index c1b2832d7a..0be93f522f 100644 --- a/packages/font-glyphs/src/symbol/punctuation/at.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/at.ptl @@ -53,15 +53,15 @@ glyph-block Symbol-Punctuation-At : begin local otop : mix bot top 0.75 local obot : mix top bot 0.8 - local sw : AdviceStroke [if fSolidInner 3.25 4] df.advs - local swh : AdviceStroke [if fSolidInner 3.25 3.75] df.advs + local sw : AdviceStroke [if fSolidInner 3.25 4] df.adws + local swh : AdviceStroke [if fSolidInner 3.25 3.75] df.adws local kM12 : if fSolidInner 0.40 (1 / 3) local kM12Sw : if fSolidInner 0.25 0.5 local m1 : [mix (df.leftSB + [HSwToV (sw / 2)]) (df.rightSB - [HSwToV (sw / 2)]) kM12 ] - [HSwToV (sw * kM12Sw)] local m2 : [mix (df.leftSB + [HSwToV (sw / 2)]) (df.rightSB - [HSwToV (sw / 2)]) (1 - kM12)] + [HSwToV (sw * kM12Sw)] - local ad : ArchDepth * [Math.sqrt df.advs] + local ad : ArchDepth * [Math.sqrt df.adws] local ada : ArchDepthAOf ad df.width local adb : ArchDepthBOf ad df.width diff --git a/packages/font-glyphs/src/symbol/punctuation/percentages.ptl b/packages/font-glyphs/src/symbol/punctuation/percentages.ptl index 6812aaa7fb..5815cee627 100644 --- a/packages/font-glyphs/src/symbol/punctuation/percentages.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/percentages.ptl @@ -40,7 +40,7 @@ glyph-block Symbol-Punctuation-Percentages : begin define df : include : DivFrame para.advanceScaleM define slopeDf : DivFrame 1 - define refSw : AdviceStroke 4 df.advs + define refSw : AdviceStroke 4 df.adws include : PercentBarShape slopeDf refSw local dotwidth : refSw * 1.5 @@ -55,7 +55,7 @@ glyph-block Symbol-Punctuation-Percentages : begin define df : include : DivFrame para.advanceScaleM define slopeDf : DivFrame : Math.min 1 : para.advanceScaleM * 0.8 - define refSw : AdviceStroke 5 df.advs + define refSw : AdviceStroke 5 df.adws include : PercentBarShape slopeDf refSw local dotwidth : refSw * 1.5