From b64cb362721002f34f9988567a9341aeb0de7e11 Mon Sep 17 00:00:00 2001 From: be5invis Date: Sat, 29 Apr 2023 22:44:18 -0700 Subject: [PATCH] Cleanup --- font-src/glyphs/index.ptl | 2 +- font-src/glyphs/letter/cyrillic/el.ptl | 4 ++-- font-src/meta/aesthetics.ptl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/font-src/glyphs/index.ptl b/font-src/glyphs/index.ptl index f4bdc7d0e..d19758360 100644 --- a/font-src/glyphs/index.ptl +++ b/font-src/glyphs/index.ptl @@ -9,7 +9,7 @@ import [DesignParameters] from"../meta/aesthetics.mjs" extern isFinite import [mix linreg clamp fallback] from"../support/utils.mjs" -import [calculateMetrics setFontMetrics MarksetDiv GenDivFrame] from"../meta/aesthetics.mjs" +import [calculateMetrics setFontMetrics GenDivFrame] from"../meta/aesthetics.mjs" $$include '../meta/macros.ptl' diff --git a/font-src/glyphs/letter/cyrillic/el.ptl b/font-src/glyphs/letter/cyrillic/el.ptl index e9e8432a5..328196a21 100644 --- a/font-src/glyphs/letter/cyrillic/el.ptl +++ b/font-src/glyphs/letter/cyrillic/el.ptl @@ -105,7 +105,7 @@ glyph-block Letter-Cyrillic-El : begin create-glyph 'cyrl/LjeKomi' 0x508 : glyph-proc local df : DivFrame para.diversityM 3 set-width df.width - include : df.MarkSet.capital + include : df.markSet.capital local xm : df.middle + 0.5 * df.mvs * HVContrast include : CyrElShape df.leftSB xm CAP BODY-NONE [if SLAB SLAB-ALL SLAB-NONE] df.mvs @@ -123,7 +123,7 @@ glyph-block Letter-Cyrillic-El : begin create-glyph 'cyrl/ljeKomi' 0x509 : glyph-proc local df : DivFrame para.diversityM 3 set-width df.width - include : df.MarkSet.e + include : df.markSet.e local xm : df.middle + 0.5 * df.mvs * HVContrast include : CyrElShape df.leftSB xm XH BODY-NONE [if SLAB [if para.isItalic SLAB-LOWER SLAB-ALL] SLAB-NONE] df.mvs diff --git a/font-src/meta/aesthetics.ptl b/font-src/meta/aesthetics.ptl index bf1e4c896..0fb8e92b7 100644 --- a/font-src/meta/aesthetics.ptl +++ b/font-src/meta/aesthetics.ptl @@ -306,7 +306,7 @@ export : define [compositeBaseAnchors] : begin set baseAnchorSink.(k) : new Anchor a.baseAnchors.(k).x a.baseAnchors.(k).y a.baseAnchors.(k).type a.baseAnchors.(k).mbx a.baseAnchors.(k).mby return : new CMarkSet null baseAnchorSink -export : define [MarksetDiv p sbMul me] : begin +define [MarksetDiv p sbMul me] : begin define width : p * me.Width define middle : p * me.Middle define rightSB : me.Width * p - me.SB