From ef203af85a87f955da2bb06c2ce9c2ef195d0c6d Mon Sep 17 00:00:00 2001 From: be5invis Date: Thu, 15 Jul 2021 21:14:08 -0700 Subject: [PATCH] Organize support files and simplify imports --- font-src/gen/finalize/glyphs.js | 8 ++--- font-src/gen/otd-conv/glyphs.js | 2 +- font-src/glyphs/common/derivatives.ptl | 3 -- font-src/glyphs/common/shapes.ptl | 4 +-- font-src/glyphs/index.ptl | 4 +-- font-src/glyphs/letter/cyrillic/abk-ha.ptl | 2 -- font-src/glyphs/letter/cyrillic/big-yus.ptl | 2 -- font-src/glyphs/letter/cyrillic/che.ptl | 2 -- font-src/glyphs/letter/cyrillic/de.ptl | 2 -- font-src/glyphs/letter/cyrillic/dje.ptl | 2 -- font-src/glyphs/letter/cyrillic/dzhe.ptl | 2 -- font-src/glyphs/letter/cyrillic/el.ptl | 3 +- font-src/glyphs/letter/cyrillic/fita.ptl | 2 -- font-src/glyphs/letter/cyrillic/i.ptl | 2 -- font-src/glyphs/letter/cyrillic/lje.ptl | 3 +- font-src/glyphs/letter/cyrillic/lower-be.ptl | 2 -- font-src/glyphs/letter/cyrillic/nje.ptl | 2 -- font-src/glyphs/letter/cyrillic/omega.ptl | 2 -- font-src/glyphs/letter/cyrillic/sha.ptl | 2 -- font-src/glyphs/letter/cyrillic/small-yus.ptl | 2 -- font-src/glyphs/letter/cyrillic/te-comb.ptl | 2 -- font-src/glyphs/letter/cyrillic/tse.ptl | 2 -- font-src/glyphs/letter/cyrillic/tshe.ptl | 2 -- font-src/glyphs/letter/cyrillic/yat.ptl | 2 -- font-src/glyphs/letter/cyrillic/yeri.ptl | 2 -- font-src/glyphs/letter/cyrillic/yu.ptl | 2 -- font-src/glyphs/letter/cyrillic/zhe.ptl | 2 -- font-src/glyphs/letter/greek/lower-alpha.ptl | 1 - font-src/glyphs/letter/greek/lower-delta.ptl | 1 - .../glyphs/letter/greek/lower-epsilon.ptl | 1 - font-src/glyphs/letter/greek/lower-gamma.ptl | 1 - .../letter/greek/lower-kappa-symbol.ptl | 1 - .../letter/greek/lower-lunate-epsilon.ptl | 2 -- font-src/glyphs/letter/greek/lower-mu.ptl | 1 - font-src/glyphs/letter/greek/lower-nu.ptl | 1 - font-src/glyphs/letter/greek/lower-omega.ptl | 1 - font-src/glyphs/letter/greek/lower-phi.ptl | 1 - font-src/glyphs/letter/greek/lower-tau.ptl | 1 - .../letter/latin-ext/bidental-percussive.ptl | 1 - .../glyphs/letter/latin-ext/egyptological.ptl | 1 - font-src/glyphs/letter/latin-ext/eszet.ptl | 1 - font-src/glyphs/letter/latin-ext/eth.ptl | 1 - font-src/glyphs/letter/latin-ext/ezh.ptl | 1 - .../glyphs/letter/latin-ext/f-ligatures.ptl | 1 - font-src/glyphs/letter/latin-ext/gha.ptl | 1 - .../glyphs/letter/latin-ext/glottal-stop.ptl | 1 - font-src/glyphs/letter/latin-ext/hwair.ptl | 1 - font-src/glyphs/letter/latin-ext/ij.ptl | 1 - font-src/glyphs/letter/latin-ext/long-s.ptl | 1 - .../glyphs/letter/latin-ext/lower-ae-oe.ptl | 1 - font-src/glyphs/letter/latin-ext/ou.ptl | 1 - .../glyphs/letter/latin-ext/rams-horn.ptl | 1 - font-src/glyphs/letter/latin-ext/rhotic.ptl | 1 - font-src/glyphs/letter/latin-ext/thorn.ptl | 1 - .../glyphs/letter/latin-ext/upper-ae-oe.ptl | 1 - font-src/glyphs/letter/latin-ext/wynn.ptl | 1 - font-src/glyphs/letter/latin-ext/yogh.ptl | 1 - font-src/glyphs/letter/latin/c.ptl | 1 - font-src/glyphs/letter/latin/k.ptl | 3 +- font-src/glyphs/letter/latin/lower-a.ptl | 1 - font-src/glyphs/letter/latin/lower-b.ptl | 1 - font-src/glyphs/letter/latin/lower-d.ptl | 1 - font-src/glyphs/letter/latin/lower-e.ptl | 1 - font-src/glyphs/letter/latin/lower-f.ptl | 1 - font-src/glyphs/letter/latin/lower-g.ptl | 1 - font-src/glyphs/letter/latin/lower-h.ptl | 1 - font-src/glyphs/letter/latin/lower-i.ptl | 1 - font-src/glyphs/letter/latin/lower-j.ptl | 1 - font-src/glyphs/letter/latin/lower-l.ptl | 1 - font-src/glyphs/letter/latin/lower-m.ptl | 1 - font-src/glyphs/letter/latin/lower-n.ptl | 1 - font-src/glyphs/letter/latin/lower-p.ptl | 1 - font-src/glyphs/letter/latin/lower-q.ptl | 1 - font-src/glyphs/letter/latin/lower-r.ptl | 1 - font-src/glyphs/letter/latin/lower-t.ptl | 1 - font-src/glyphs/letter/latin/lower-y.ptl | 1 - font-src/glyphs/letter/latin/o.ptl | 1 - font-src/glyphs/letter/latin/s.ptl | 1 - font-src/glyphs/letter/latin/u.ptl | 1 - font-src/glyphs/letter/latin/upper-a.ptl | 1 - font-src/glyphs/letter/latin/upper-b.ptl | 1 - font-src/glyphs/letter/latin/upper-d.ptl | 1 - font-src/glyphs/letter/latin/upper-e.ptl | 1 - font-src/glyphs/letter/latin/upper-f.ptl | 1 - font-src/glyphs/letter/latin/upper-g.ptl | 1 - font-src/glyphs/letter/latin/upper-h.ptl | 1 - font-src/glyphs/letter/latin/upper-i.ptl | 1 - font-src/glyphs/letter/latin/upper-j.ptl | 1 - font-src/glyphs/letter/latin/upper-l.ptl | 1 - font-src/glyphs/letter/latin/upper-m.ptl | 1 - font-src/glyphs/letter/latin/upper-n.ptl | 1 - font-src/glyphs/letter/latin/upper-p.ptl | 1 - font-src/glyphs/letter/latin/upper-q.ptl | 1 - font-src/glyphs/letter/latin/upper-r.ptl | 1 - font-src/glyphs/letter/latin/upper-t.ptl | 1 - font-src/glyphs/letter/latin/upper-y.ptl | 1 - font-src/glyphs/letter/latin/v.ptl | 1 - font-src/glyphs/letter/latin/w.ptl | 1 - font-src/glyphs/letter/latin/x.ptl | 1 - font-src/glyphs/letter/latin/z.ptl | 1 - font-src/glyphs/marks/index.ptl | 4 +-- font-src/glyphs/number/0.ptl | 1 - font-src/glyphs/number/1.ptl | 1 - font-src/glyphs/number/2.ptl | 1 - font-src/glyphs/number/3.ptl | 1 - font-src/glyphs/number/4.ptl | 1 - font-src/glyphs/number/5.ptl | 1 - font-src/glyphs/number/6.ptl | 1 - font-src/glyphs/number/7.ptl | 1 - font-src/glyphs/number/8.ptl | 1 - font-src/glyphs/number/9.ptl | 1 - font-src/glyphs/number/index.ptl | 1 - font-src/glyphs/number/shared.ptl | 1 - font-src/glyphs/symbol/arrow.ptl | 2 -- font-src/glyphs/symbol/braille.ptl | 3 +- font-src/glyphs/symbol/math/apl.ptl | 2 +- font-src/glyphs/symbol/math/arith.ptl | 2 -- font-src/glyphs/symbol/math/boxed.ptl | 2 -- font-src/glyphs/symbol/math/circled.ptl | 2 -- font-src/glyphs/symbol/math/complement.ptl | 2 -- .../glyphs/symbol/math/dots-and-colons.ptl | 2 -- font-src/glyphs/symbol/math/frame.ptl | 2 -- font-src/glyphs/symbol/math/geometry.ptl | 2 -- font-src/glyphs/symbol/math/integrals.ptl | 2 -- .../glyphs/symbol/math/large-operators.ptl | 2 -- font-src/glyphs/symbol/math/letter-like.ptl | 2 -- font-src/glyphs/symbol/math/logicals.ptl | 2 -- font-src/glyphs/symbol/math/negation.ptl | 2 -- font-src/glyphs/symbol/math/not-glyph-fn.ptl | 2 -- font-src/glyphs/symbol/math/other.ptl | 2 -- font-src/glyphs/symbol/math/relation.ptl | 4 +-- font-src/glyphs/symbol/math/v-and-cup.ptl | 2 -- font-src/glyphs/symbol/pictograph/atom.ptl | 3 -- font-src/glyphs/symbol/pictograph/heart.ptl | 2 +- font-src/glyphs/symbol/pictograph/i-ching.ptl | 2 +- font-src/glyphs/symbol/pictograph/kome.ptl | 3 -- .../glyphs/symbol/pictograph/metric-marks.ptl | 3 -- font-src/glyphs/symbol/pictograph/musical.ptl | 2 +- font-src/glyphs/symbol/pictograph/suit.ptl | 2 +- .../glyphs/symbol/punctuation/ampersand.ptl | 1 - .../glyphs/symbol/punctuation/ascii-marks.ptl | 1 - .../glyphs/symbol/punctuation/asterisk.ptl | 1 - font-src/glyphs/symbol/punctuation/at.ptl | 1 - .../glyphs/symbol/punctuation/bullets.ptl | 1 - .../glyphs/symbol/punctuation/daggers.ptl | 1 - font-src/glyphs/symbol/punctuation/dashes.ptl | 1 - .../glyphs/symbol/punctuation/ellipsis.ptl | 1 - .../glyphs/symbol/punctuation/emotion.ptl | 1 - .../glyphs/symbol/punctuation/guillemet.ptl | 1 - .../glyphs/symbol/punctuation/interpuncts.ptl | 1 - .../glyphs/symbol/punctuation/joiners.ptl | 1 - .../symbol/punctuation/ligation-variants.ptl | 1 - .../symbol/punctuation/other-phonetic.ptl | 1 - .../glyphs/symbol/punctuation/paragraph.ptl | 1 - .../glyphs/symbol/punctuation/percentages.ptl | 1 - .../symbol/punctuation/quotes-and-primes.ptl | 1 - .../glyphs/symbol/punctuation/section.ptl | 1 - .../punctuation/slashes-and-number-sign.ptl | 1 - font-src/glyphs/symbol/punctuation/ties.ptl | 1 - font-src/glyphs/symbol/shared.ptl | 2 -- font-src/kits/spiro-kit.js | 10 +++--- font-src/meta/aesthetics.ptl | 34 +++++++++---------- font-src/meta/macros.ptl | 20 +++++------ font-src/otl/compat-ligature.ptl | 2 +- font-src/otl/index.ptl | 3 +- font-src/support/{ => geometry}/anchor.js | 0 font-src/support/{ => geometry}/box.js | 2 +- font-src/support/{ => geometry}/curve-util.js | 0 .../{geometry.js => geometry/index.js} | 2 +- font-src/support/{ => geometry}/point.js | 0 .../support/{ => geometry}/spiro-expand.js | 4 +-- font-src/support/{ => geometry}/transform.js | 0 font-src/support/{glyph.js => glyph/index.js} | 8 ++--- font-src/support/parameters.js | 2 +- font-src/support/{ => util}/formatter.js | 0 font-src/support/{ => util}/mask-bit.js | 0 .../{ => util}/monotonic-interpolate.js | 0 font-src/support/utils.js | 4 --- 178 files changed, 61 insertions(+), 269 deletions(-) rename font-src/support/{ => geometry}/anchor.js (100%) rename font-src/support/{ => geometry}/box.js (96%) rename font-src/support/{ => geometry}/curve-util.js (100%) rename font-src/support/{geometry.js => geometry/index.js} (99%) rename font-src/support/{ => geometry}/point.js (100%) rename font-src/support/{ => geometry}/spiro-expand.js (98%) rename font-src/support/{ => geometry}/transform.js (100%) rename font-src/support/{glyph.js => glyph/index.js} (96%) rename font-src/support/{ => util}/formatter.js (100%) rename font-src/support/{ => util}/mask-bit.js (100%) rename font-src/support/{ => util}/monotonic-interpolate.js (100%) diff --git a/font-src/gen/finalize/glyphs.js b/font-src/gen/finalize/glyphs.js index 4447f700d..5d6284bcf 100644 --- a/font-src/gen/finalize/glyphs.js +++ b/font-src/gen/finalize/glyphs.js @@ -1,10 +1,10 @@ "use strict"; const TypoGeom = require("typo-geom"); -const Geom = require("../../support/geometry"); -const Point = require("../../support/point"); -const Transform = require("../../support/transform"); -const CurveUtil = require("../../support/curve-util"); +const Geom = require("../../support/geometry/index"); +const Point = require("../../support/geometry/point"); +const Transform = require("../../support/geometry/transform"); +const CurveUtil = require("../../support/geometry/curve-util"); module.exports = finalizeGlyphs; function finalizeGlyphs(cache, para, glyphStore) { diff --git a/font-src/gen/otd-conv/glyphs.js b/font-src/gen/otd-conv/glyphs.js index f33e5f1c0..ec8d2ac5f 100644 --- a/font-src/gen/otd-conv/glyphs.js +++ b/font-src/gen/otd-conv/glyphs.js @@ -1,5 +1,5 @@ const { Ot } = require("ot-builder"); -const Point = require("../../support/point"); +const Point = require("../../support/geometry/point"); const Gr = require("../../support/gr"); const { byCode, bySpacing, byGr, byBuildOrder } = require("./glyph-name"); diff --git a/font-src/glyphs/common/derivatives.ptl b/font-src/glyphs/common/derivatives.ptl index db4e984c7..ea4630b9d 100644 --- a/font-src/glyphs/common/derivatives.ptl +++ b/font-src/glyphs/common/derivatives.ptl @@ -1,10 +1,7 @@ $$include '../../meta/macros.ptl' -import '../../support/transform' as Transform - import [mix linreg clamp fallback] from '../../support/utils' import [Cv AnyCv AnyDerivingCv Dotless SvInheritableRelations CvDecompose] from '../../support/gr' -import [DesignParameters] from '../../meta/aesthetics' extern Map diff --git a/font-src/glyphs/common/shapes.ptl b/font-src/glyphs/common/shapes.ptl index 1dafa5f7a..c0e16806a 100644 --- a/font-src/glyphs/common/shapes.ptl +++ b/font-src/glyphs/common/shapes.ptl @@ -1,11 +1,9 @@ $$include '../../meta/macros.ptl' -import '../../support/transform' as Transform +import '../../support/geometry/transform' as Transform import [mix linreg clamp fallback] from '../../support/utils' import [Radical] from '../../support/gr' -import [DesignParameters] from '../../meta/aesthetics' -import '../../support/point' as Point glyph-module diff --git a/font-src/glyphs/index.ptl b/font-src/glyphs/index.ptl index 44e8d95d5..37fdfffb5 100644 --- a/font-src/glyphs/index.ptl +++ b/font-src/glyphs/index.ptl @@ -1,8 +1,6 @@ -import '../support/glyph' as Glyph +import '../support/glyph/index' as Glyph import '../support/glyph-store' as GlyphStore import '../support/glyph-block' as GlyphBlock -import '../support/point' as Point -import '../support/anchor' as Anchor import '../support/gr' as Gr import '../kits/spiro-kit' as SpiroKit import '../kits/boole-kit' as BooleKit diff --git a/font-src/glyphs/letter/cyrillic/abk-ha.ptl b/font-src/glyphs/letter/cyrillic/abk-ha.ptl index 6b5574358..c9d52af69 100644 --- a/font-src/glyphs/letter/cyrillic/abk-ha.ptl +++ b/font-src/glyphs/letter/cyrillic/abk-ha.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/big-yus.ptl b/font-src/glyphs/letter/cyrillic/big-yus.ptl index 26ce739fb..c9a6e8ad4 100644 --- a/font-src/glyphs/letter/cyrillic/big-yus.ptl +++ b/font-src/glyphs/letter/cyrillic/big-yus.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/che.ptl b/font-src/glyphs/letter/cyrillic/che.ptl index e0e2286b5..188eb2587 100644 --- a/font-src/glyphs/letter/cyrillic/che.ptl +++ b/font-src/glyphs/letter/cyrillic/che.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/de.ptl b/font-src/glyphs/letter/cyrillic/de.ptl index 93cb0542c..7de5e7b1d 100644 --- a/font-src/glyphs/letter/cyrillic/de.ptl +++ b/font-src/glyphs/letter/cyrillic/de.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/dje.ptl b/font-src/glyphs/letter/cyrillic/dje.ptl index fef2a577c..7253b481c 100644 --- a/font-src/glyphs/letter/cyrillic/dje.ptl +++ b/font-src/glyphs/letter/cyrillic/dje.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/dzhe.ptl b/font-src/glyphs/letter/cyrillic/dzhe.ptl index b6c6351dd..ca973fc33 100644 --- a/font-src/glyphs/letter/cyrillic/dzhe.ptl +++ b/font-src/glyphs/letter/cyrillic/dzhe.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/el.ptl b/font-src/glyphs/letter/cyrillic/el.ptl index b058b0124..871ac9437 100644 --- a/font-src/glyphs/letter/cyrillic/el.ptl +++ b/font-src/glyphs/letter/cyrillic/el.ptl @@ -1,8 +1,7 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point +import '../../../support/geometry/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/fita.ptl b/font-src/glyphs/letter/cyrillic/fita.ptl index ac86666f9..e17e369a9 100644 --- a/font-src/glyphs/letter/cyrillic/fita.ptl +++ b/font-src/glyphs/letter/cyrillic/fita.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/i.ptl b/font-src/glyphs/letter/cyrillic/i.ptl index c93b9aad4..896ddbc75 100644 --- a/font-src/glyphs/letter/cyrillic/i.ptl +++ b/font-src/glyphs/letter/cyrillic/i.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/lje.ptl b/font-src/glyphs/letter/cyrillic/lje.ptl index 7ff568831..3c7c54085 100644 --- a/font-src/glyphs/letter/cyrillic/lje.ptl +++ b/font-src/glyphs/letter/cyrillic/lje.ptl @@ -1,8 +1,7 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point +import '../../../support/geometry/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/lower-be.ptl b/font-src/glyphs/letter/cyrillic/lower-be.ptl index 6cf6e1eac..7bfc5e910 100644 --- a/font-src/glyphs/letter/cyrillic/lower-be.ptl +++ b/font-src/glyphs/letter/cyrillic/lower-be.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/nje.ptl b/font-src/glyphs/letter/cyrillic/nje.ptl index 7c5dcddae..ee24ac026 100644 --- a/font-src/glyphs/letter/cyrillic/nje.ptl +++ b/font-src/glyphs/letter/cyrillic/nje.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point import [DollarShrinkKernel DollarShorterBar CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/omega.ptl b/font-src/glyphs/letter/cyrillic/omega.ptl index 63691c98d..2e42fabe9 100644 --- a/font-src/glyphs/letter/cyrillic/omega.ptl +++ b/font-src/glyphs/letter/cyrillic/omega.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/sha.ptl b/font-src/glyphs/letter/cyrillic/sha.ptl index 8570e6e1c..2bc40c49b 100644 --- a/font-src/glyphs/letter/cyrillic/sha.ptl +++ b/font-src/glyphs/letter/cyrillic/sha.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/small-yus.ptl b/font-src/glyphs/letter/cyrillic/small-yus.ptl index e5a5f3d86..9bf590b20 100644 --- a/font-src/glyphs/letter/cyrillic/small-yus.ptl +++ b/font-src/glyphs/letter/cyrillic/small-yus.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/te-comb.ptl b/font-src/glyphs/letter/cyrillic/te-comb.ptl index 17b93fbed..97b6e6e84 100644 --- a/font-src/glyphs/letter/cyrillic/te-comb.ptl +++ b/font-src/glyphs/letter/cyrillic/te-comb.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/tse.ptl b/font-src/glyphs/letter/cyrillic/tse.ptl index c8908aa4c..b22cc4f9a 100644 --- a/font-src/glyphs/letter/cyrillic/tse.ptl +++ b/font-src/glyphs/letter/cyrillic/tse.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/tshe.ptl b/font-src/glyphs/letter/cyrillic/tshe.ptl index 7148885f9..aae6847c1 100644 --- a/font-src/glyphs/letter/cyrillic/tshe.ptl +++ b/font-src/glyphs/letter/cyrillic/tshe.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/yat.ptl b/font-src/glyphs/letter/cyrillic/yat.ptl index fa81a50ff..bb83d30e8 100644 --- a/font-src/glyphs/letter/cyrillic/yat.ptl +++ b/font-src/glyphs/letter/cyrillic/yat.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/yeri.ptl b/font-src/glyphs/letter/cyrillic/yeri.ptl index 55adeda47..d085921e7 100644 --- a/font-src/glyphs/letter/cyrillic/yeri.ptl +++ b/font-src/glyphs/letter/cyrillic/yeri.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/yu.ptl b/font-src/glyphs/letter/cyrillic/yu.ptl index e5a4663ac..d13ac5d24 100644 --- a/font-src/glyphs/letter/cyrillic/yu.ptl +++ b/font-src/glyphs/letter/cyrillic/yu.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/cyrillic/zhe.ptl b/font-src/glyphs/letter/cyrillic/zhe.ptl index 0f9c764a4..b02b0943c 100644 --- a/font-src/glyphs/letter/cyrillic/zhe.ptl +++ b/font-src/glyphs/letter/cyrillic/zhe.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/letter/greek/lower-alpha.ptl b/font-src/glyphs/letter/greek/lower-alpha.ptl index 280ecd244..668a73bef 100644 --- a/font-src/glyphs/letter/greek/lower-alpha.ptl +++ b/font-src/glyphs/letter/greek/lower-alpha.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-delta.ptl b/font-src/glyphs/letter/greek/lower-delta.ptl index 03df0e858..102c48fd3 100644 --- a/font-src/glyphs/letter/greek/lower-delta.ptl +++ b/font-src/glyphs/letter/greek/lower-delta.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-epsilon.ptl b/font-src/glyphs/letter/greek/lower-epsilon.ptl index b42c9c156..389606b1f 100644 --- a/font-src/glyphs/letter/greek/lower-epsilon.ptl +++ b/font-src/glyphs/letter/greek/lower-epsilon.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-gamma.ptl b/font-src/glyphs/letter/greek/lower-gamma.ptl index 95f18cf63..1a0c69792 100644 --- a/font-src/glyphs/letter/greek/lower-gamma.ptl +++ b/font-src/glyphs/letter/greek/lower-gamma.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-kappa-symbol.ptl b/font-src/glyphs/letter/greek/lower-kappa-symbol.ptl index b6531e92c..61d2976fa 100644 --- a/font-src/glyphs/letter/greek/lower-kappa-symbol.ptl +++ b/font-src/glyphs/letter/greek/lower-kappa-symbol.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl b/font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl index 070754af2..160b4eb72 100644 --- a/font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl +++ b/font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module @@ -9,7 +8,6 @@ glyph-block Letter-Greek-Lower-Rho : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - create-glyph 'grek/lowerLunateEpsilon' 0x3F5 : glyph-proc include : MarkSet.e include : dispiro [widths.lhs] diff --git a/font-src/glyphs/letter/greek/lower-mu.ptl b/font-src/glyphs/letter/greek/lower-mu.ptl index 4d17e3e52..4e7ea3ab5 100644 --- a/font-src/glyphs/letter/greek/lower-mu.ptl +++ b/font-src/glyphs/letter/greek/lower-mu.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-nu.ptl b/font-src/glyphs/letter/greek/lower-nu.ptl index 368403e4d..208893437 100644 --- a/font-src/glyphs/letter/greek/lower-nu.ptl +++ b/font-src/glyphs/letter/greek/lower-nu.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-omega.ptl b/font-src/glyphs/letter/greek/lower-omega.ptl index 5e23db7a5..0da9d83f2 100644 --- a/font-src/glyphs/letter/greek/lower-omega.ptl +++ b/font-src/glyphs/letter/greek/lower-omega.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-phi.ptl b/font-src/glyphs/letter/greek/lower-phi.ptl index dc2442f03..6d971578f 100644 --- a/font-src/glyphs/letter/greek/lower-phi.ptl +++ b/font-src/glyphs/letter/greek/lower-phi.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix barmixL linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/letter/greek/lower-tau.ptl b/font-src/glyphs/letter/greek/lower-tau.ptl index 5c3cecbba..5e0beba8f 100644 --- a/font-src/glyphs/letter/greek/lower-tau.ptl +++ b/font-src/glyphs/letter/greek/lower-tau.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl b/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl index 865c5321a..e11657df7 100644 --- a/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl +++ b/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/egyptological.ptl b/font-src/glyphs/letter/latin-ext/egyptological.ptl index 3d1454842..20ed91b5a 100644 --- a/font-src/glyphs/letter/latin-ext/egyptological.ptl +++ b/font-src/glyphs/letter/latin-ext/egyptological.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/eszet.ptl b/font-src/glyphs/letter/latin-ext/eszet.ptl index 74d4802c1..8546a7c05 100644 --- a/font-src/glyphs/letter/latin-ext/eszet.ptl +++ b/font-src/glyphs/letter/latin-ext/eszet.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/eth.ptl b/font-src/glyphs/letter/latin-ext/eth.ptl index 30670d101..3504efd7b 100644 --- a/font-src/glyphs/letter/latin-ext/eth.ptl +++ b/font-src/glyphs/letter/latin-ext/eth.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/ezh.ptl b/font-src/glyphs/letter/latin-ext/ezh.ptl index 0dbf2460b..304e3b67c 100644 --- a/font-src/glyphs/letter/latin-ext/ezh.ptl +++ b/font-src/glyphs/letter/latin-ext/ezh.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/f-ligatures.ptl b/font-src/glyphs/letter/latin-ext/f-ligatures.ptl index 9ebff9d43..fd774bc45 100644 --- a/font-src/glyphs/letter/latin-ext/f-ligatures.ptl +++ b/font-src/glyphs/letter/latin-ext/f-ligatures.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/gha.ptl b/font-src/glyphs/letter/latin-ext/gha.ptl index c8afda57e..ad138dd12 100644 --- a/font-src/glyphs/letter/latin-ext/gha.ptl +++ b/font-src/glyphs/letter/latin-ext/gha.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/glottal-stop.ptl b/font-src/glyphs/letter/latin-ext/glottal-stop.ptl index 79856dc0c..459a8d6d9 100644 --- a/font-src/glyphs/letter/latin-ext/glottal-stop.ptl +++ b/font-src/glyphs/letter/latin-ext/glottal-stop.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/hwair.ptl b/font-src/glyphs/letter/latin-ext/hwair.ptl index da6ba124b..871c2a968 100644 --- a/font-src/glyphs/letter/latin-ext/hwair.ptl +++ b/font-src/glyphs/letter/latin-ext/hwair.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/ij.ptl b/font-src/glyphs/letter/latin-ext/ij.ptl index 4b10b81b7..8fcf4bf72 100644 --- a/font-src/glyphs/letter/latin-ext/ij.ptl +++ b/font-src/glyphs/letter/latin-ext/ij.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/long-s.ptl b/font-src/glyphs/letter/latin-ext/long-s.ptl index 5bbe6b685..e4a32ae0a 100644 --- a/font-src/glyphs/letter/latin-ext/long-s.ptl +++ b/font-src/glyphs/letter/latin-ext/long-s.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl b/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl index 27e19d571..d533e49b6 100644 --- a/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl +++ b/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose RequireCcmpDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/ou.ptl b/font-src/glyphs/letter/latin-ext/ou.ptl index 90bfe4223..ababcf8f9 100644 --- a/font-src/glyphs/letter/latin-ext/ou.ptl +++ b/font-src/glyphs/letter/latin-ext/ou.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/rams-horn.ptl b/font-src/glyphs/letter/latin-ext/rams-horn.ptl index c54151bf4..9b0d233d5 100644 --- a/font-src/glyphs/letter/latin-ext/rams-horn.ptl +++ b/font-src/glyphs/letter/latin-ext/rams-horn.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/rhotic.ptl b/font-src/glyphs/letter/latin-ext/rhotic.ptl index 8cab3acc4..f88788c25 100644 --- a/font-src/glyphs/letter/latin-ext/rhotic.ptl +++ b/font-src/glyphs/letter/latin-ext/rhotic.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/thorn.ptl b/font-src/glyphs/letter/latin-ext/thorn.ptl index 74d6bd238..e91a57e7b 100644 --- a/font-src/glyphs/letter/latin-ext/thorn.ptl +++ b/font-src/glyphs/letter/latin-ext/thorn.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl b/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl index 52ff3ea72..c71230df5 100644 --- a/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl +++ b/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose RequireCcmpDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/wynn.ptl b/font-src/glyphs/letter/latin-ext/wynn.ptl index fe3b6b7b3..45231e90c 100644 --- a/font-src/glyphs/letter/latin-ext/wynn.ptl +++ b/font-src/glyphs/letter/latin-ext/wynn.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/yogh.ptl b/font-src/glyphs/letter/latin-ext/yogh.ptl index 102d96c59..5797c2744 100644 --- a/font-src/glyphs/letter/latin-ext/yogh.ptl +++ b/font-src/glyphs/letter/latin-ext/yogh.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/c.ptl b/font-src/glyphs/letter/latin/c.ptl index ba1c45921..fc7285665 100644 --- a/font-src/glyphs/letter/latin/c.ptl +++ b/font-src/glyphs/letter/latin/c.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/k.ptl b/font-src/glyphs/letter/latin/k.ptl index 7bc9c9cf5..57617f3e8 100644 --- a/font-src/glyphs/letter/latin/k.ptl +++ b/font-src/glyphs/letter/latin/k.ptl @@ -1,9 +1,8 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" -import [maskBit maskBits popCountByte] from '../../../support/mask-bit' +import [maskBit maskBits popCountByte] from '../../../support/util/mask-bit' glyph-module diff --git a/font-src/glyphs/letter/latin/lower-a.ptl b/font-src/glyphs/letter/latin/lower-a.ptl index 2872b3f41..c4c8c587c 100644 --- a/font-src/glyphs/letter/latin/lower-a.ptl +++ b/font-src/glyphs/letter/latin/lower-a.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-b.ptl b/font-src/glyphs/letter/latin/lower-b.ptl index 72405544f..eebc1cb90 100644 --- a/font-src/glyphs/letter/latin/lower-b.ptl +++ b/font-src/glyphs/letter/latin/lower-b.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-d.ptl b/font-src/glyphs/letter/latin/lower-d.ptl index 99e2ded28..a78e809b5 100644 --- a/font-src/glyphs/letter/latin/lower-d.ptl +++ b/font-src/glyphs/letter/latin/lower-d.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-e.ptl b/font-src/glyphs/letter/latin/lower-e.ptl index 5b30c6a88..1cbdcafd9 100644 --- a/font-src/glyphs/letter/latin/lower-e.ptl +++ b/font-src/glyphs/letter/latin/lower-e.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-f.ptl b/font-src/glyphs/letter/latin/lower-f.ptl index e04110d6b..20187e45f 100644 --- a/font-src/glyphs/letter/latin/lower-f.ptl +++ b/font-src/glyphs/letter/latin/lower-f.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-g.ptl b/font-src/glyphs/letter/latin/lower-g.ptl index 8a770f420..e5031b80b 100644 --- a/font-src/glyphs/letter/latin/lower-g.ptl +++ b/font-src/glyphs/letter/latin/lower-g.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-h.ptl b/font-src/glyphs/letter/latin/lower-h.ptl index 154b266e1..2d3efb3b0 100644 --- a/font-src/glyphs/letter/latin/lower-h.ptl +++ b/font-src/glyphs/letter/latin/lower-h.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-i.ptl b/font-src/glyphs/letter/latin/lower-i.ptl index 4acbc1008..9f9835cbd 100644 --- a/font-src/glyphs/letter/latin/lower-i.ptl +++ b/font-src/glyphs/letter/latin/lower-i.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-j.ptl b/font-src/glyphs/letter/latin/lower-j.ptl index 5a2bb8507..4b9a85fa0 100644 --- a/font-src/glyphs/letter/latin/lower-j.ptl +++ b/font-src/glyphs/letter/latin/lower-j.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-l.ptl b/font-src/glyphs/letter/latin/lower-l.ptl index 4fb0d52fe..4f7d2d366 100644 --- a/font-src/glyphs/letter/latin/lower-l.ptl +++ b/font-src/glyphs/letter/latin/lower-l.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-m.ptl b/font-src/glyphs/letter/latin/lower-m.ptl index f6695a587..d26d86a78 100644 --- a/font-src/glyphs/letter/latin/lower-m.ptl +++ b/font-src/glyphs/letter/latin/lower-m.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-n.ptl b/font-src/glyphs/letter/latin/lower-n.ptl index 63ac2b4af..9fd539057 100644 --- a/font-src/glyphs/letter/latin/lower-n.ptl +++ b/font-src/glyphs/letter/latin/lower-n.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-p.ptl b/font-src/glyphs/letter/latin/lower-p.ptl index 1f601542a..08439f51c 100644 --- a/font-src/glyphs/letter/latin/lower-p.ptl +++ b/font-src/glyphs/letter/latin/lower-p.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-q.ptl b/font-src/glyphs/letter/latin/lower-q.ptl index d49c5a542..f74a3a61d 100644 --- a/font-src/glyphs/letter/latin/lower-q.ptl +++ b/font-src/glyphs/letter/latin/lower-q.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-r.ptl b/font-src/glyphs/letter/latin/lower-r.ptl index 606aade9b..d4c5b7a39 100644 --- a/font-src/glyphs/letter/latin/lower-r.ptl +++ b/font-src/glyphs/letter/latin/lower-r.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-t.ptl b/font-src/glyphs/letter/latin/lower-t.ptl index ed9cc4cdf..2e8d53b7c 100644 --- a/font-src/glyphs/letter/latin/lower-t.ptl +++ b/font-src/glyphs/letter/latin/lower-t.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-y.ptl b/font-src/glyphs/letter/latin/lower-y.ptl index 9df27c5a7..ca37cac5d 100644 --- a/font-src/glyphs/letter/latin/lower-y.ptl +++ b/font-src/glyphs/letter/latin/lower-y.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [LowerYDotAtBelow Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/o.ptl b/font-src/glyphs/letter/latin/o.ptl index 09287cb98..aaeb6c76b 100644 --- a/font-src/glyphs/letter/latin/o.ptl +++ b/font-src/glyphs/letter/latin/o.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/s.ptl b/font-src/glyphs/letter/latin/s.ptl index 61c76b2f8..e6040c7b0 100644 --- a/font-src/glyphs/letter/latin/s.ptl +++ b/font-src/glyphs/letter/latin/s.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [DollarShrinkKernel DollarShorterBar CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/u.ptl b/font-src/glyphs/letter/latin/u.ptl index d49dc9ca6..4fa569d29 100644 --- a/font-src/glyphs/letter/latin/u.ptl +++ b/font-src/glyphs/letter/latin/u.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-a.ptl b/font-src/glyphs/letter/latin/upper-a.ptl index f6e8bb883..134989d4b 100644 --- a/font-src/glyphs/letter/latin/upper-a.ptl +++ b/font-src/glyphs/letter/latin/upper-a.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-b.ptl b/font-src/glyphs/letter/latin/upper-b.ptl index a84bda7d0..bdf4d0aec 100644 --- a/font-src/glyphs/letter/latin/upper-b.ptl +++ b/font-src/glyphs/letter/latin/upper-b.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-d.ptl b/font-src/glyphs/letter/latin/upper-d.ptl index 6760b5078..fd8fcef86 100644 --- a/font-src/glyphs/letter/latin/upper-d.ptl +++ b/font-src/glyphs/letter/latin/upper-d.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-e.ptl b/font-src/glyphs/letter/latin/upper-e.ptl index 2272324ab..fa0387ede 100644 --- a/font-src/glyphs/letter/latin/upper-e.ptl +++ b/font-src/glyphs/letter/latin/upper-e.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-f.ptl b/font-src/glyphs/letter/latin/upper-f.ptl index 8638e9929..8eae29ee5 100644 --- a/font-src/glyphs/letter/latin/upper-f.ptl +++ b/font-src/glyphs/letter/latin/upper-f.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-g.ptl b/font-src/glyphs/letter/latin/upper-g.ptl index 970049b31..7cd49a64b 100644 --- a/font-src/glyphs/letter/latin/upper-g.ptl +++ b/font-src/glyphs/letter/latin/upper-g.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-h.ptl b/font-src/glyphs/letter/latin/upper-h.ptl index 22463b12e..1474d5526 100644 --- a/font-src/glyphs/letter/latin/upper-h.ptl +++ b/font-src/glyphs/letter/latin/upper-h.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-i.ptl b/font-src/glyphs/letter/latin/upper-i.ptl index 0916350ff..6127c3e1c 100644 --- a/font-src/glyphs/letter/latin/upper-i.ptl +++ b/font-src/glyphs/letter/latin/upper-i.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-j.ptl b/font-src/glyphs/letter/latin/upper-j.ptl index d39cd6d65..629352c40 100644 --- a/font-src/glyphs/letter/latin/upper-j.ptl +++ b/font-src/glyphs/letter/latin/upper-j.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-l.ptl b/font-src/glyphs/letter/latin/upper-l.ptl index 286d1e7b6..a9eb8cd75 100644 --- a/font-src/glyphs/letter/latin/upper-l.ptl +++ b/font-src/glyphs/letter/latin/upper-l.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-m.ptl b/font-src/glyphs/letter/latin/upper-m.ptl index 32dbf49a5..032293cd1 100644 --- a/font-src/glyphs/letter/latin/upper-m.ptl +++ b/font-src/glyphs/letter/latin/upper-m.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-n.ptl b/font-src/glyphs/letter/latin/upper-n.ptl index de98f7f04..f23954386 100644 --- a/font-src/glyphs/letter/latin/upper-n.ptl +++ b/font-src/glyphs/letter/latin/upper-n.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-p.ptl b/font-src/glyphs/letter/latin/upper-p.ptl index 8a13f06ad..69d2618cb 100644 --- a/font-src/glyphs/letter/latin/upper-p.ptl +++ b/font-src/glyphs/letter/latin/upper-p.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-q.ptl b/font-src/glyphs/letter/latin/upper-q.ptl index c2b24cd4a..6707642cd 100644 --- a/font-src/glyphs/letter/latin/upper-q.ptl +++ b/font-src/glyphs/letter/latin/upper-q.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-r.ptl b/font-src/glyphs/letter/latin/upper-r.ptl index 923cdd7ed..7ad52a6df 100644 --- a/font-src/glyphs/letter/latin/upper-r.ptl +++ b/font-src/glyphs/letter/latin/upper-r.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-t.ptl b/font-src/glyphs/letter/latin/upper-t.ptl index 7d93c8637..9e21ea763 100644 --- a/font-src/glyphs/letter/latin/upper-t.ptl +++ b/font-src/glyphs/letter/latin/upper-t.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-y.ptl b/font-src/glyphs/letter/latin/upper-y.ptl index 30ac7636c..d21c07154 100644 --- a/font-src/glyphs/letter/latin/upper-y.ptl +++ b/font-src/glyphs/letter/latin/upper-y.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/v.ptl b/font-src/glyphs/letter/latin/v.ptl index b6d503cf6..ff45acd23 100644 --- a/font-src/glyphs/letter/latin/v.ptl +++ b/font-src/glyphs/letter/latin/v.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/w.ptl b/font-src/glyphs/letter/latin/w.ptl index b912373fa..83b3fa6fc 100644 --- a/font-src/glyphs/letter/latin/w.ptl +++ b/font-src/glyphs/letter/latin/w.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/x.ptl b/font-src/glyphs/letter/latin/x.ptl index 4f5e0b464..d9993db35 100644 --- a/font-src/glyphs/letter/latin/x.ptl +++ b/font-src/glyphs/letter/latin/x.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [Dotless CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/letter/latin/z.ptl b/font-src/glyphs/letter/latin/z.ptl index 3c1192002..662066310 100644 --- a/font-src/glyphs/letter/latin/z.ptl +++ b/font-src/glyphs/letter/latin/z.ptl @@ -1,7 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' import [CvDecompose MathSansSerif] from "../../../support/gr" glyph-module diff --git a/font-src/glyphs/marks/index.ptl b/font-src/glyphs/marks/index.ptl index 264448266..e52aa5916 100644 --- a/font-src/glyphs/marks/index.ptl +++ b/font-src/glyphs/marks/index.ptl @@ -1,11 +1,11 @@ $$include '../../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [OffsetCurve BezToContoursSink GEOMETRY_PRECISION] from '../../support/curve-util' +import [OffsetCurve BezToContoursSink GEOMETRY_PRECISION] from '../../support/geometry/curve-util' import [mix linreg clamp fallback] from '../../support/utils' import [DesignParameters] from '../../meta/aesthetics' import [TieMark TieGlyph] from "../../support/gr" -import [Box] from '../../support/box' +import [Box] from '../../support/geometry/box' glyph-module diff --git a/font-src/glyphs/number/0.ptl b/font-src/glyphs/number/0.ptl index c12a8b726..1f15863b5 100644 --- a/font-src/glyphs/number/0.ptl +++ b/font-src/glyphs/number/0.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/1.ptl b/font-src/glyphs/number/1.ptl index afa18c2ee..5ed73077b 100644 --- a/font-src/glyphs/number/1.ptl +++ b/font-src/glyphs/number/1.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/2.ptl b/font-src/glyphs/number/2.ptl index 825340cb4..a364d5d5e 100644 --- a/font-src/glyphs/number/2.ptl +++ b/font-src/glyphs/number/2.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/3.ptl b/font-src/glyphs/number/3.ptl index 712ae68ca..640ef2ec3 100644 --- a/font-src/glyphs/number/3.ptl +++ b/font-src/glyphs/number/3.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/4.ptl b/font-src/glyphs/number/4.ptl index c19ce43ec..04a59e6ff 100644 --- a/font-src/glyphs/number/4.ptl +++ b/font-src/glyphs/number/4.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/5.ptl b/font-src/glyphs/number/5.ptl index fc2951322..ecf8fa7db 100644 --- a/font-src/glyphs/number/5.ptl +++ b/font-src/glyphs/number/5.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/6.ptl b/font-src/glyphs/number/6.ptl index cb267ba25..1814f283f 100644 --- a/font-src/glyphs/number/6.ptl +++ b/font-src/glyphs/number/6.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/7.ptl b/font-src/glyphs/number/7.ptl index d605b6da8..cf345d038 100644 --- a/font-src/glyphs/number/7.ptl +++ b/font-src/glyphs/number/7.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/8.ptl b/font-src/glyphs/number/8.ptl index f1fa9405d..4ca88b19b 100644 --- a/font-src/glyphs/number/8.ptl +++ b/font-src/glyphs/number/8.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/9.ptl b/font-src/glyphs/number/9.ptl index 1ea9eba5d..cc2a3e65c 100644 --- a/font-src/glyphs/number/9.ptl +++ b/font-src/glyphs/number/9.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/index.ptl b/font-src/glyphs/number/index.ptl index 9bb8edfb2..0bff0e382 100644 --- a/font-src/glyphs/number/index.ptl +++ b/font-src/glyphs/number/index.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/number/shared.ptl b/font-src/glyphs/number/shared.ptl index 908794ce7..65905d629 100644 --- a/font-src/glyphs/number/shared.ptl +++ b/font-src/glyphs/number/shared.ptl @@ -1,7 +1,6 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' import [AnyCv getGrMesh] from "../../support/gr" glyph-module diff --git a/font-src/glyphs/symbol/arrow.ptl b/font-src/glyphs/symbol/arrow.ptl index f34234442..b321e95c3 100644 --- a/font-src/glyphs/symbol/arrow.ptl +++ b/font-src/glyphs/symbol/arrow.ptl @@ -1,8 +1,6 @@ $$include '../../meta/macros.ptl' -import '../../support/transform' as Transform import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/braille.ptl b/font-src/glyphs/symbol/braille.ptl index e57f3ed3b..356c28e64 100644 --- a/font-src/glyphs/symbol/braille.ptl +++ b/font-src/glyphs/symbol/braille.ptl @@ -2,8 +2,7 @@ $$include '../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' -import [maskBit maskBits popCountByte] from '../../support/mask-bit' +import [maskBit maskBits popCountByte] from '../../support/util/mask-bit' glyph-module diff --git a/font-src/glyphs/symbol/math/apl.ptl b/font-src/glyphs/symbol/math/apl.ptl index 7a91f2465..ceb6a00ad 100644 --- a/font-src/glyphs/symbol/math/apl.ptl +++ b/font-src/glyphs/symbol/math/apl.ptl @@ -2,7 +2,7 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point +import '../../../support/geometry/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/arith.ptl b/font-src/glyphs/symbol/math/arith.ptl index 9d3f1fd25..ffd61618e 100644 --- a/font-src/glyphs/symbol/math/arith.ptl +++ b/font-src/glyphs/symbol/math/arith.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/boxed.ptl b/font-src/glyphs/symbol/math/boxed.ptl index e1adabbce..edadb2fbb 100644 --- a/font-src/glyphs/symbol/math/boxed.ptl +++ b/font-src/glyphs/symbol/math/boxed.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/circled.ptl b/font-src/glyphs/symbol/math/circled.ptl index a69094447..6fed69c2d 100644 --- a/font-src/glyphs/symbol/math/circled.ptl +++ b/font-src/glyphs/symbol/math/circled.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/complement.ptl b/font-src/glyphs/symbol/math/complement.ptl index 0b7299917..57774b154 100644 --- a/font-src/glyphs/symbol/math/complement.ptl +++ b/font-src/glyphs/symbol/math/complement.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/dots-and-colons.ptl b/font-src/glyphs/symbol/math/dots-and-colons.ptl index be071ec04..33da3507a 100644 --- a/font-src/glyphs/symbol/math/dots-and-colons.ptl +++ b/font-src/glyphs/symbol/math/dots-and-colons.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/frame.ptl b/font-src/glyphs/symbol/math/frame.ptl index 95d99158a..bf7823543 100644 --- a/font-src/glyphs/symbol/math/frame.ptl +++ b/font-src/glyphs/symbol/math/frame.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/geometry.ptl b/font-src/glyphs/symbol/math/geometry.ptl index 84a26a5b1..3a0a801a7 100644 --- a/font-src/glyphs/symbol/math/geometry.ptl +++ b/font-src/glyphs/symbol/math/geometry.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/integrals.ptl b/font-src/glyphs/symbol/math/integrals.ptl index c47ccdbef..ac9af45f9 100644 --- a/font-src/glyphs/symbol/math/integrals.ptl +++ b/font-src/glyphs/symbol/math/integrals.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/large-operators.ptl b/font-src/glyphs/symbol/math/large-operators.ptl index bbf2885e2..c4babecc4 100644 --- a/font-src/glyphs/symbol/math/large-operators.ptl +++ b/font-src/glyphs/symbol/math/large-operators.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/letter-like.ptl b/font-src/glyphs/symbol/math/letter-like.ptl index e490fc16f..7d31fb53d 100644 --- a/font-src/glyphs/symbol/math/letter-like.ptl +++ b/font-src/glyphs/symbol/math/letter-like.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/logicals.ptl b/font-src/glyphs/symbol/math/logicals.ptl index 0b6fda780..865204504 100644 --- a/font-src/glyphs/symbol/math/logicals.ptl +++ b/font-src/glyphs/symbol/math/logicals.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/negation.ptl b/font-src/glyphs/symbol/math/negation.ptl index 05d8fa9f6..d86eb1c18 100644 --- a/font-src/glyphs/symbol/math/negation.ptl +++ b/font-src/glyphs/symbol/math/negation.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/not-glyph-fn.ptl b/font-src/glyphs/symbol/math/not-glyph-fn.ptl index a8f7764c4..52beaed2a 100644 --- a/font-src/glyphs/symbol/math/not-glyph-fn.ptl +++ b/font-src/glyphs/symbol/math/not-glyph-fn.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/other.ptl b/font-src/glyphs/symbol/math/other.ptl index ad2512edb..a45c9a57d 100644 --- a/font-src/glyphs/symbol/math/other.ptl +++ b/font-src/glyphs/symbol/math/other.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/relation.ptl b/font-src/glyphs/symbol/math/relation.ptl index b54b2eac3..3516d2184 100644 --- a/font-src/glyphs/symbol/math/relation.ptl +++ b/font-src/glyphs/symbol/math/relation.ptl @@ -1,10 +1,8 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [Box] from '../../../support/box' +import [Box] from '../../../support/geometry/box' import [Joining] from '../../../support/gr' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/math/v-and-cup.ptl b/font-src/glyphs/symbol/math/v-and-cup.ptl index 1918b43ba..1393f08d1 100644 --- a/font-src/glyphs/symbol/math/v-and-cup.ptl +++ b/font-src/glyphs/symbol/math/v-and-cup.ptl @@ -1,8 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/point' as Point glyph-module diff --git a/font-src/glyphs/symbol/pictograph/atom.ptl b/font-src/glyphs/symbol/pictograph/atom.ptl index 6cb1d9f06..baac7069d 100644 --- a/font-src/glyphs/symbol/pictograph/atom.ptl +++ b/font-src/glyphs/symbol/pictograph/atom.ptl @@ -1,9 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/transform' as Transform -import [maskBit] from '../../../support/mask-bit' glyph-module diff --git a/font-src/glyphs/symbol/pictograph/heart.ptl b/font-src/glyphs/symbol/pictograph/heart.ptl index 87ad4e1e2..ad2d7b378 100644 --- a/font-src/glyphs/symbol/pictograph/heart.ptl +++ b/font-src/glyphs/symbol/pictograph/heart.ptl @@ -1,7 +1,7 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [Box] from "../../../support/box" +import [Box] from "../../../support/geometry/box" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/i-ching.ptl b/font-src/glyphs/symbol/pictograph/i-ching.ptl index 12e477c22..b0dfe0480 100644 --- a/font-src/glyphs/symbol/pictograph/i-ching.ptl +++ b/font-src/glyphs/symbol/pictograph/i-ching.ptl @@ -1,7 +1,7 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [maskBit] from '../../../support/mask-bit' +import [maskBit] from '../../../support/util/mask-bit' glyph-module diff --git a/font-src/glyphs/symbol/pictograph/kome.ptl b/font-src/glyphs/symbol/pictograph/kome.ptl index 8c01a1100..6dd9b15ed 100644 --- a/font-src/glyphs/symbol/pictograph/kome.ptl +++ b/font-src/glyphs/symbol/pictograph/kome.ptl @@ -1,9 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/transform' as Transform -import [maskBit] from '../../../support/mask-bit' glyph-module diff --git a/font-src/glyphs/symbol/pictograph/metric-marks.ptl b/font-src/glyphs/symbol/pictograph/metric-marks.ptl index 56a666ae2..c8938e115 100644 --- a/font-src/glyphs/symbol/pictograph/metric-marks.ptl +++ b/font-src/glyphs/symbol/pictograph/metric-marks.ptl @@ -1,9 +1,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' -import '../../../support/transform' as Transform -import [maskBit] from '../../../support/mask-bit' glyph-module diff --git a/font-src/glyphs/symbol/pictograph/musical.ptl b/font-src/glyphs/symbol/pictograph/musical.ptl index e1ea4c976..a886984a1 100644 --- a/font-src/glyphs/symbol/pictograph/musical.ptl +++ b/font-src/glyphs/symbol/pictograph/musical.ptl @@ -1,7 +1,7 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import '../../../support/transform' as Transform +import '../../../support/geometry/transform' as Transform glyph-module diff --git a/font-src/glyphs/symbol/pictograph/suit.ptl b/font-src/glyphs/symbol/pictograph/suit.ptl index 0578b168b..5834f8f97 100644 --- a/font-src/glyphs/symbol/pictograph/suit.ptl +++ b/font-src/glyphs/symbol/pictograph/suit.ptl @@ -1,7 +1,7 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [Box] from "../../../support/box" +import [Box] from "../../../support/geometry/box" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ampersand.ptl b/font-src/glyphs/symbol/punctuation/ampersand.ptl index d70b4bf59..4800424f2 100644 --- a/font-src/glyphs/symbol/punctuation/ampersand.ptl +++ b/font-src/glyphs/symbol/punctuation/ampersand.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ascii-marks.ptl b/font-src/glyphs/symbol/punctuation/ascii-marks.ptl index d9c539978..e1589b7be 100644 --- a/font-src/glyphs/symbol/punctuation/ascii-marks.ptl +++ b/font-src/glyphs/symbol/punctuation/ascii-marks.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/asterisk.ptl b/font-src/glyphs/symbol/punctuation/asterisk.ptl index b3bc8249f..2c6a66823 100644 --- a/font-src/glyphs/symbol/punctuation/asterisk.ptl +++ b/font-src/glyphs/symbol/punctuation/asterisk.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/at.ptl b/font-src/glyphs/symbol/punctuation/at.ptl index 343b7f483..f548f6ab0 100644 --- a/font-src/glyphs/symbol/punctuation/at.ptl +++ b/font-src/glyphs/symbol/punctuation/at.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/bullets.ptl b/font-src/glyphs/symbol/punctuation/bullets.ptl index 018619ef5..dfebb52b7 100644 --- a/font-src/glyphs/symbol/punctuation/bullets.ptl +++ b/font-src/glyphs/symbol/punctuation/bullets.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/daggers.ptl b/font-src/glyphs/symbol/punctuation/daggers.ptl index 567385bf2..8be46011f 100644 --- a/font-src/glyphs/symbol/punctuation/daggers.ptl +++ b/font-src/glyphs/symbol/punctuation/daggers.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/dashes.ptl b/font-src/glyphs/symbol/punctuation/dashes.ptl index ee790298d..ac7c95323 100644 --- a/font-src/glyphs/symbol/punctuation/dashes.ptl +++ b/font-src/glyphs/symbol/punctuation/dashes.ptl @@ -3,7 +3,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' import [Joining] from '../../../support/gr' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ellipsis.ptl b/font-src/glyphs/symbol/punctuation/ellipsis.ptl index d7ea222bb..e2d3cab1e 100644 --- a/font-src/glyphs/symbol/punctuation/ellipsis.ptl +++ b/font-src/glyphs/symbol/punctuation/ellipsis.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/emotion.ptl b/font-src/glyphs/symbol/punctuation/emotion.ptl index 7db7722a8..5ad053785 100644 --- a/font-src/glyphs/symbol/punctuation/emotion.ptl +++ b/font-src/glyphs/symbol/punctuation/emotion.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/guillemet.ptl b/font-src/glyphs/symbol/punctuation/guillemet.ptl index 514f08fca..8bf182df7 100644 --- a/font-src/glyphs/symbol/punctuation/guillemet.ptl +++ b/font-src/glyphs/symbol/punctuation/guillemet.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/interpuncts.ptl b/font-src/glyphs/symbol/punctuation/interpuncts.ptl index e2764245d..b712d7528 100644 --- a/font-src/glyphs/symbol/punctuation/interpuncts.ptl +++ b/font-src/glyphs/symbol/punctuation/interpuncts.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/joiners.ptl b/font-src/glyphs/symbol/punctuation/joiners.ptl index 8e0cc6b48..9baaedc9d 100644 --- a/font-src/glyphs/symbol/punctuation/joiners.ptl +++ b/font-src/glyphs/symbol/punctuation/joiners.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ligation-variants.ptl b/font-src/glyphs/symbol/punctuation/ligation-variants.ptl index f5c316d61..315529ffa 100644 --- a/font-src/glyphs/symbol/punctuation/ligation-variants.ptl +++ b/font-src/glyphs/symbol/punctuation/ligation-variants.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/other-phonetic.ptl b/font-src/glyphs/symbol/punctuation/other-phonetic.ptl index 87fa3dbf7..f707e0766 100644 --- a/font-src/glyphs/symbol/punctuation/other-phonetic.ptl +++ b/font-src/glyphs/symbol/punctuation/other-phonetic.ptl @@ -3,7 +3,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' import [Joining] from '../../../support/gr' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/paragraph.ptl b/font-src/glyphs/symbol/punctuation/paragraph.ptl index e45c78613..731a56656 100644 --- a/font-src/glyphs/symbol/punctuation/paragraph.ptl +++ b/font-src/glyphs/symbol/punctuation/paragraph.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/percentages.ptl b/font-src/glyphs/symbol/punctuation/percentages.ptl index e1338295e..d9c9fca50 100644 --- a/font-src/glyphs/symbol/punctuation/percentages.ptl +++ b/font-src/glyphs/symbol/punctuation/percentages.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl b/font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl index 4b4fbf15b..3d27ed881 100644 --- a/font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl +++ b/font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/section.ptl b/font-src/glyphs/symbol/punctuation/section.ptl index 517cda474..f25ec18b7 100644 --- a/font-src/glyphs/symbol/punctuation/section.ptl +++ b/font-src/glyphs/symbol/punctuation/section.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl b/font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl index 851521613..260ee43cf 100644 --- a/font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl +++ b/font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl @@ -3,7 +3,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' import [Joining] from '../../../support/gr' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ties.ptl b/font-src/glyphs/symbol/punctuation/ties.ptl index 2e2bff224..b772a2077 100644 --- a/font-src/glyphs/symbol/punctuation/ties.ptl +++ b/font-src/glyphs/symbol/punctuation/ties.ptl @@ -2,7 +2,6 @@ $$include '../../../meta/macros.ptl' import [mix linreg clamp fallback] from '../../../support/utils' -import [DesignParameters] from '../../../meta/aesthetics' glyph-module diff --git a/font-src/glyphs/symbol/shared.ptl b/font-src/glyphs/symbol/shared.ptl index 194fc87d2..88de1e24a 100644 --- a/font-src/glyphs/symbol/shared.ptl +++ b/font-src/glyphs/symbol/shared.ptl @@ -1,8 +1,6 @@ $$include '../../meta/macros.ptl' -import '../../support/transform' as Transform import [mix linreg clamp fallback] from '../../support/utils' -import [DesignParameters] from '../../meta/aesthetics' glyph-module diff --git a/font-src/kits/spiro-kit.js b/font-src/kits/spiro-kit.js index 9563bd6ae..af834d017 100644 --- a/font-src/kits/spiro-kit.js +++ b/font-src/kits/spiro-kit.js @@ -1,11 +1,9 @@ "use strict"; -const SpiroJs = require("spiro"); -const CurveUtil = require("../support/curve-util"); -const Transform = require("../support/transform"); -const { BiKnotCollector } = require("../support/spiro-expand"); -const { fallback, mix, bez2, bez3 } = require("../support/utils"); -const { SpiroGeometry, DiSpiroGeometry, CombineGeometry } = require("../support/geometry"); +const CurveUtil = require("../support/geometry/curve-util"); +const { BiKnotCollector } = require("../support/geometry/spiro-expand"); +const { fallback, mix, bez3 } = require("../support/utils"); +const { SpiroGeometry, DiSpiroGeometry } = require("../support/geometry/index"); exports.SetupBuilders = function (bindings) { const { Contrast, GlobalTransform, Stroke, Superness } = bindings; diff --git a/font-src/meta/aesthetics.ptl b/font-src/meta/aesthetics.ptl index d632ce43c..8346c23da 100644 --- a/font-src/meta/aesthetics.ptl +++ b/font-src/meta/aesthetics.ptl @@ -1,7 +1,7 @@ -import '../support/point' as Point -import '../support/transform' as Transform +import '../support/geometry/point' as Point +import '../support/geometry/transform' as Transform +import '../support/geometry/anchor' as Anchor import [mix linreg clamp fallback] from '../support/utils' -import '../support/anchor' as Anchor # Parameter generation export : define [calculateMetrics para] : begin @@ -193,20 +193,20 @@ export : define [calculateMetrics para] : begin return : 0.5 * HVContrast * (stroke - fine) / stroke + dir * TanSlope return [object - UPM HalfUPM Width SB CAP XH Descender Contrast SymbolMid ParenTop ParenBot OperTop OperBot - TackTop TackBot PlusTop PlusBot PictTop PictBot BgOpTop BgOpBot Italify Upright Scale - Translate ApparentTranslate Rotate GlobalTransform TanSlope HVContrast Upward Downward - Rightward Leftward UpwardT DownwardT LeftwardT RightwardT O OX OXHook Hook AHook SHook RHook - JHook FHook HookX Smooth SmallSmooth Stroke DotSize PeriodSize HBarPos OverlayPos - LongJut Jut VJut Accent AccentX AccentBaseOffset AccentStackOffset CThin CThinB SLAB - TailAdjX TailAdjY IBalance IBalance2 JBalance JBalance2 TBalance - TBalance2 RBalance RBalance2 FBalance OneBalance WideWidth0 WideWidth1 WideWidth2 WideWidth3 - WideWidth4 Ess EssQuestion HalfStroke RightSB Middle DotRadius PeriodRadius - SideJut SmoothA SmoothB SmallSmoothA SmallSmoothB CorrectionOMidX CorrectionOMidS - compositeBaseAnchors AdviceStroke AdviceStroke2 MVertStroke MVertStrokeD OverlayStroke - OperatorStroke GeometryStroke ShoulderFine _SuperXY adviceSSmooth adviceGlottalStopSmooth - shoulderMidSlope StrokeWidthBlend SmoothAOf SmoothBOf SmoothAdjust MidJutSide MidJutCenter - YSmoothMidR YSmoothMidL] + DesignParameters UPM HalfUPM Width SB CAP XH Descender Contrast SymbolMid ParenTop ParenBot + OperTop OperBot TackTop TackBot PlusTop PlusBot PictTop PictBot BgOpTop BgOpBot Italify + Upright Scale Translate ApparentTranslate Rotate GlobalTransform TanSlope HVContrast Upward + Downward Rightward Leftward UpwardT DownwardT LeftwardT RightwardT O OX OXHook Hook AHook + SHook RHook JHook FHook HookX Smooth SmallSmooth Stroke DotSize PeriodSize HBarPos + OverlayPos LongJut Jut VJut Accent AccentX AccentBaseOffset AccentStackOffset CThin CThinB + SLAB TailAdjX TailAdjY IBalance IBalance2 JBalance JBalance2 TBalance TBalance2 RBalance + RBalance2 FBalance OneBalance WideWidth0 WideWidth1 WideWidth2 WideWidth3 WideWidth4 Ess + EssQuestion HalfStroke RightSB Middle DotRadius PeriodRadius SideJut SmoothA SmoothB + SmallSmoothA SmallSmoothB CorrectionOMidX CorrectionOMidS compositeBaseAnchors AdviceStroke + AdviceStroke2 MVertStroke MVertStrokeD OverlayStroke OperatorStroke GeometryStroke + ShoulderFine _SuperXY adviceSSmooth adviceGlottalStopSmooth shoulderMidSlope + StrokeWidthBlend SmoothAOf SmoothBOf SmoothAdjust MidJutSide MidJutCenter YSmoothMidR + YSmoothMidL] export : define [setFontMetrics para metrics fm] : begin define [object CAP Descender XH Width] metrics diff --git a/font-src/meta/macros.ptl b/font-src/meta/macros.ptl index f86f31c79..adfc06ae5 100644 --- a/font-src/meta/macros.ptl +++ b/font-src/meta/macros.ptl @@ -206,16 +206,16 @@ define-macro glyph-block : syntax-rules SpiroFns BooleFns MarkSet AS_BASE ALSO_METRICS pickHash buildGlyphs tagged DivFrame fontMetrics $assignUnicodeImpl$] - define metricImports `[UPM HalfUPM Width SB CAP XH Descender Contrast SymbolMid ParenTop - ParenBot OperTop OperBot TackTop TackBot PlusTop PlusBot PictTop PictBot BgOpTop BgOpBot - Italify Upright Scale Translate ApparentTranslate Rotate GlobalTransform TanSlope - HVContrast Upward Downward Rightward Leftward UpwardT DownwardT LeftwardT RightwardT - O OX OXHook Hook AHook SHook RHook JHook FHook HookX Smooth SmallSmooth Stroke DotSize - PeriodSize HBarPos OverlayPos LongJut Jut VJut Accent AccentX AccentBaseOffset - AccentStackOffset CThin CThinB SLAB TailAdjX TailAdjY IBalance IBalance2 JBalance - JBalance2 TBalance TBalance2 RBalance RBalance2 FBalance OneBalance WideWidth0 - WideWidth1 WideWidth2 WideWidth3 WideWidth4 Ess EssQuestion HalfStroke RightSB - Middle DotRadius PeriodRadius SideJut SmoothA SmoothB SmallSmoothA SmallSmoothB + define metricImports `[DesignParameters UPM HalfUPM Width SB CAP XH Descender Contrast + SymbolMid ParenTop ParenBot OperTop OperBot TackTop TackBot PlusTop PlusBot PictTop + PictBot BgOpTop BgOpBot Italify Upright Scale Translate ApparentTranslate Rotate + GlobalTransform TanSlope HVContrast Upward Downward Rightward Leftward UpwardT + DownwardT LeftwardT RightwardT O OX OXHook Hook AHook SHook RHook JHook FHook HookX + Smooth SmallSmooth Stroke DotSize PeriodSize HBarPos OverlayPos LongJut Jut VJut Accent + AccentX AccentBaseOffset AccentStackOffset CThin CThinB SLAB TailAdjX TailAdjY IBalance + IBalance2 JBalance JBalance2 TBalance TBalance2 RBalance RBalance2 FBalance OneBalance + WideWidth0 WideWidth1 WideWidth2 WideWidth3 WideWidth4 Ess EssQuestion HalfStroke + RightSB Middle DotRadius PeriodRadius SideJut SmoothA SmoothB SmallSmoothA SmallSmoothB CorrectionOMidX CorrectionOMidS AdviceStroke AdviceStroke2 MVertStroke OverlayStroke OperatorStroke GeometryStroke ShoulderFine _SuperXY adviceSSmooth adviceGlottalStopSmooth shoulderMidSlope StrokeWidthBlend SmoothAOf SmoothBOf diff --git a/font-src/otl/compat-ligature.ptl b/font-src/otl/compat-ligature.ptl index 523387e12..07bf0c3b9 100644 --- a/font-src/otl/compat-ligature.ptl +++ b/font-src/otl/compat-ligature.ptl @@ -1,5 +1,5 @@ import '../support/glyph' as Glyph -import '../support/transform' as Transform +import '../support/geometry/transform' as Transform define GDEF_SIMPLE 1 define GDEF_LIGATURE 2 diff --git a/font-src/otl/index.ptl b/font-src/otl/index.ptl index 46707272c..51ec9e05b 100644 --- a/font-src/otl/index.ptl +++ b/font-src/otl/index.ptl @@ -1,6 +1,5 @@ import 'toposort' as toposort -import '../support/glyph' as Glyph -import '../support/transform' as Transform +import '../support/glyph/index' as Glyph import '../support/gr' as Gr import [CreateEmptyTable finalizeTable MoveBackUtilityLookups] from "./table-util" diff --git a/font-src/support/anchor.js b/font-src/support/geometry/anchor.js similarity index 100% rename from font-src/support/anchor.js rename to font-src/support/geometry/anchor.js diff --git a/font-src/support/box.js b/font-src/support/geometry/box.js similarity index 96% rename from font-src/support/box.js rename to font-src/support/geometry/box.js index d01754c75..daeaccac9 100644 --- a/font-src/support/box.js +++ b/font-src/support/geometry/box.js @@ -1,6 +1,6 @@ "use strict"; -const { mix } = require("./utils"); +const { mix } = require("../utils"); class Box { constructor(t, b, l, r) { diff --git a/font-src/support/curve-util.js b/font-src/support/geometry/curve-util.js similarity index 100% rename from font-src/support/curve-util.js rename to font-src/support/geometry/curve-util.js diff --git a/font-src/support/geometry.js b/font-src/support/geometry/index.js similarity index 99% rename from font-src/support/geometry.js rename to font-src/support/geometry/index.js index 39e1ceb25..3d300cdf4 100644 --- a/font-src/support/geometry.js +++ b/font-src/support/geometry/index.js @@ -8,7 +8,7 @@ const Point = require("./point"); const Transform = require("./transform"); const CurveUtil = require("./curve-util"); const { SpiroExpander } = require("./spiro-expand"); -const Format = require("./formatter"); +const Format = require("../util/formatter"); class GeometryBase { asContours() { diff --git a/font-src/support/point.js b/font-src/support/geometry/point.js similarity index 100% rename from font-src/support/point.js rename to font-src/support/geometry/point.js diff --git a/font-src/support/spiro-expand.js b/font-src/support/geometry/spiro-expand.js similarity index 98% rename from font-src/support/spiro-expand.js rename to font-src/support/geometry/spiro-expand.js index 839ccaa40..ddabdd7c4 100644 --- a/font-src/support/spiro-expand.js +++ b/font-src/support/geometry/spiro-expand.js @@ -2,8 +2,8 @@ const SpiroJs = require("spiro"); -const { linreg } = require("./utils"); -const Format = require("./formatter"); +const { linreg } = require("../utils"); +const Format = require("../util/formatter"); class BiKnot { constructor(type, x, y, d1, d2) { diff --git a/font-src/support/transform.js b/font-src/support/geometry/transform.js similarity index 100% rename from font-src/support/transform.js rename to font-src/support/geometry/transform.js diff --git a/font-src/support/glyph.js b/font-src/support/glyph/index.js similarity index 96% rename from font-src/support/glyph.js rename to font-src/support/glyph/index.js index 0d9a47205..984bc4ca9 100644 --- a/font-src/support/glyph.js +++ b/font-src/support/glyph/index.js @@ -1,9 +1,9 @@ "use strict"; -const Transform = require("./transform"); -const Point = require("./point"); -const Anchor = require("./anchor"); -const Geom = require("./geometry"); +const Transform = require("../geometry/transform"); +const Point = require("../geometry/point"); +const Anchor = require("../geometry/anchor"); +const Geom = require("../geometry"); module.exports = class Glyph { constructor(_identifier) { diff --git a/font-src/support/parameters.js b/font-src/support/parameters.js index 65098227b..dcaa64000 100644 --- a/font-src/support/parameters.js +++ b/font-src/support/parameters.js @@ -1,6 +1,6 @@ "use strict"; -const monotonicInterpolate = require("./monotonic-interpolate"); +const monotonicInterpolate = require("./util/monotonic-interpolate"); exports.init = initPara; function initPara(data, argv) { diff --git a/font-src/support/formatter.js b/font-src/support/util/formatter.js similarity index 100% rename from font-src/support/formatter.js rename to font-src/support/util/formatter.js diff --git a/font-src/support/mask-bit.js b/font-src/support/util/mask-bit.js similarity index 100% rename from font-src/support/mask-bit.js rename to font-src/support/util/mask-bit.js diff --git a/font-src/support/monotonic-interpolate.js b/font-src/support/util/monotonic-interpolate.js similarity index 100% rename from font-src/support/monotonic-interpolate.js rename to font-src/support/util/monotonic-interpolate.js diff --git a/font-src/support/utils.js b/font-src/support/utils.js index 355b59dbe..d0cf2d06e 100644 --- a/font-src/support/utils.js +++ b/font-src/support/utils.js @@ -3,9 +3,6 @@ function mix(a, b, p) { return a + (b - a) * p; } -function ratio(l, r, m) { - return l === r ? 0 : (m - l) / (r - l); -} function barmixL(l, r, b, p) { return l > r ? barmixL(r, l, b, p) : l + b + p * (r - l - b * 3); } @@ -38,7 +35,6 @@ function bez3(a, b, c, d, t) { } exports.mix = mix; -exports.ratio = ratio; exports.barmixL = barmixL; exports.barmixM = barmixM; exports.barmixR = barMixR;