diff --git a/.gitignore b/.gitignore index 808393ab9..15e0c4c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,9 @@ font-src/meta/**/*.mjs font-src/otl/**/*.mjs font-src/glyphs/**/*.mjs +packages/font-glyphs/src/**/*.mjs +packages/font-otl/src/**/*.mjs + private.toml private-build-plans.toml private.mk diff --git a/CHANGELOG.md b/CHANGELOG.md index c80456de2..bcea8a32f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,6 @@ ## Modifications since last major version -### 28.0.0-beta.2 - -* Fix broken TTCs in beta.1 (#2108). - - -### 28.0.0-beta.1 +### 28.0.0 * \[**BREAKING**\] The filenames and package filenames are changed. - They will now use PascalCase instead of kebab-case. diff --git a/changes/28.0.0-beta.2.md b/changes/28.0.0-beta.2.md deleted file mode 100644 index 839fac685..000000000 --- a/changes/28.0.0-beta.2.md +++ /dev/null @@ -1 +0,0 @@ -* Fix broken TTCs in beta.1 (#2108). diff --git a/changes/28.0.0-beta.1.md b/changes/28.0.0.md similarity index 100% rename from changes/28.0.0-beta.1.md rename to changes/28.0.0.md diff --git a/doc/PACKAGE-LIST.md b/doc/PACKAGE-LIST.md index 11aaf476c..71495cf6b 100644 --- a/doc/PACKAGE-LIST.md +++ b/doc/PACKAGE-LIST.md @@ -1,7 +1,7 @@ -# Package list of Release 28.0.0-beta.2 +# Package list of Release 28.0.0 ## Prebuilt Packages Iosevka provides a large variety of variants. Prebuilt variants are listed below. For all Monospace variants' packages, it will contain three _spacing variants_. You can either download the package containing all the spacing variants (recommended), or cherry-pick the variant with specific spacing. @@ -22,146 +22,146 @@ Iosevka provides various packaging formats, here is the list of them: - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - + + - - + +
📦 Iosevka — Monospace, DefaultSuper TTCTTC 
📦 Iosevka — Monospace, DefaultSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ IosevkaDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka TermTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka FixedFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Slab — Monospace, Slab-serifSuper TTCTTC 
    ├ IosevkaDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka TermTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka FixedFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Slab — Monospace, Slab-serifSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SlabDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SlabTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SlabFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Curly — Monospace, Curly StyleSuper TTCTTC 
    ├ Iosevka SlabDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SlabTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SlabFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Curly — Monospace, Curly StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka CurlyDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term CurlyTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed CurlyFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Curly Slab — Monospace, Curly Style, Slab-serifSuper TTCTTC 
    ├ Iosevka CurlyDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term CurlyTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed CurlyFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Curly Slab — Monospace, Curly Style, Slab-serifSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka Curly SlabDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term Curly SlabTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed Curly SlabFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS01 — Monospace, Andale Mono StyleSuper TTCTTC 
    ├ Iosevka Curly SlabDefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term Curly SlabTerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed Curly SlabFixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS01 — Monospace, Andale Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS01DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS01TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS01FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS02 — Monospace, Anonymous Pro StyleSuper TTCTTC 
    ├ Iosevka SS01DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS01TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS01FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS02 — Monospace, Anonymous Pro StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS02DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS02TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS02FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS03 — Monospace, Consolas StyleSuper TTCTTC 
    ├ Iosevka SS02DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS02TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS02FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS03 — Monospace, Consolas StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS03DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS03TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS03FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS04 — Monospace, Menlo StyleSuper TTCTTC 
    ├ Iosevka SS03DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS03TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS03FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS04 — Monospace, Menlo StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS04DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS04TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS04FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS05 — Monospace, Fira Mono StyleSuper TTCTTC 
    ├ Iosevka SS04DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS04TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS04FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS05 — Monospace, Fira Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS05DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS05TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS05FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS06 — Monospace, Liberation Mono StyleSuper TTCTTC 
    ├ Iosevka SS05DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS05TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS05FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS06 — Monospace, Liberation Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS06DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS06TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS06FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS07 — Monospace, Monaco StyleSuper TTCTTC 
    ├ Iosevka SS06DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS06TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS06FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS07 — Monospace, Monaco StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS07DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS07TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS07FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS08 — Monospace, Pragmata Pro StyleSuper TTCTTC 
    ├ Iosevka SS07DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS07TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS07FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS08 — Monospace, Pragmata Pro StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS08DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS08TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS08FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS09 — Monospace, Source Code Pro StyleSuper TTCTTC 
    ├ Iosevka SS08DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS08TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS08FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS09 — Monospace, Source Code Pro StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS09DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS09TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS09FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS10 — Monospace, Envy Code R StyleSuper TTCTTC 
    ├ Iosevka SS09DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS09TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS09FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS10 — Monospace, Envy Code R StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS10DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS10TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS10FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS11 — Monospace, X Windows Fixed StyleSuper TTCTTC 
    ├ Iosevka SS10DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS10TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS10FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS11 — Monospace, X Windows Fixed StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS11DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS11TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS11FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS12 — Monospace, Ubuntu Mono StyleSuper TTCTTC 
    ├ Iosevka SS11DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS11TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS11FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS12 — Monospace, Ubuntu Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS12DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS12TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS12FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS13 — Monospace, Lucida StyleSuper TTCTTC 
    ├ Iosevka SS12DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS12TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS12FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS13 — Monospace, Lucida StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS13DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS13TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS13FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS14 — Monospace, JetBrains Mono StyleSuper TTCTTC 
    ├ Iosevka SS13DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS13TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS13FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS14 — Monospace, JetBrains Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS14DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS14TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS14FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS15 — Monospace, IBM Plex Mono StyleSuper TTCTTC 
    ├ Iosevka SS14DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS14TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS14FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS15 — Monospace, IBM Plex Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS15DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS15TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS15FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS16 — Monospace, PT Mono StyleSuper TTCTTC 
    ├ Iosevka SS15DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS15TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS15FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS16 — Monospace, PT Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS16DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS16TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS16FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS17 — Monospace, Recursive Mono StyleSuper TTCTTC 
    ├ Iosevka SS16DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS16TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS16FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS17 — Monospace, Recursive Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS17DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS17TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS17FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS18 — Monospace, Input Mono StyleSuper TTCTTC 
    ├ Iosevka SS17DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS17TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS17FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka SS18 — Monospace, Input Mono StyleSuper TTCTTC 
  └ Sub-packagesSpacingLigaturesDownloads
    ├ Iosevka SS18DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS18TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS18FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka SS18DefaultYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    ├ Iosevka Term SS18TerminalYesSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka Fixed SS18FixedNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Aile — Quasi-proportional, Sans-serif 
  └ Sub-packagesSpacingLigaturesDownloads
    └ Iosevka AileDefaultNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka AileDefaultNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
📦 Iosevka Etoile — Quasi-proportional, Slab-serif 
  └ Sub-packagesSpacingLigaturesDownloads
    └ Iosevka EtoileDefaultNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
    └ Iosevka EtoileDefaultNoSuper TTCTTCTTF (Unhinted)WebFont (Unhinted)
diff --git a/font-src/gen/meta/empty-font.mjs b/font-src/gen/meta/empty-font.mjs deleted file mode 100644 index 9222f9592..000000000 --- a/font-src/gen/meta/empty-font.mjs +++ /dev/null @@ -1,17 +0,0 @@ -import { Ot } from "ot-builder"; - -export function CreateEmptyFont(argv) { - let font = { - head: new Ot.Head.Table(), - hhea: new Ot.MetricHead.Hhea(), - os2: new Ot.Os2.Table(4), - post: new Ot.Post.Table(argv.featureControl.exportGlyphNames ? 2 : 3, 0), - maxp: Ot.Maxp.Table.TrueType(), - name: new Ot.Name.Table() - }; - if (process.env.SOURCE_DATE_EPOCH) { - font.head.created = new Date(process.env.SOURCE_DATE_EPOCH * 1000); - font.head.modified = new Date(process.env.SOURCE_DATE_EPOCH * 1000); - } - return font; -} diff --git a/font-src/merge-cache.mjs b/font-src/merge-cache.mjs deleted file mode 100644 index 7276b0006..000000000 --- a/font-src/merge-cache.mjs +++ /dev/null @@ -1,5 +0,0 @@ -import * as Caching from "./gen/caching/index.mjs"; - -export default (async function main(argv) { - await Caching.merge(argv.base, argv.diff, argv.version, argv.freshAgeKey); -}); diff --git a/images/button-release.dark.svg b/images/button-release.dark.svg index 16ae39c2f..d9d39af6e 100644 --- a/images/button-release.dark.svg +++ b/images/button-release.dark.svg @@ -1,5 +1,5 @@ - + @@ -10,11 +10,8 @@ - - - - + @@ -23,19 +20,12 @@ - + - - - - - - - \ No newline at end of file diff --git a/images/button-release.light.svg b/images/button-release.light.svg index 5a3f0a9bc..6aa51cc26 100644 --- a/images/button-release.light.svg +++ b/images/button-release.light.svg @@ -1,5 +1,5 @@ - + @@ -10,11 +10,8 @@ - - - - + @@ -23,19 +20,12 @@ - + - - - - - - - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 5205f5388..2dc7d9852 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,36 +1,31 @@ { - "name": "iosevka", - "version": "28.0.0-beta.2", + "name": "@iosevka/monorepo", + "version": "28.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "iosevka", - "version": "28.0.0-beta.2", + "name": "@iosevka/monorepo", + "version": "28.0.0", + "workspaces": [ + "packages/*", + "tools/*" + ], "dependencies": { "@iarna/toml": "^2.2.5", - "@msgpack/msgpack": "^2.8.0", "deep-equal": "^2.2.3", - "harfbuzzjs": "^0.3.3", - "ot-builder": "^1.7.3", "otb-ttc-bundle": "^1.7.3", "semver": "^7.5.4", - "spiro": "^3.0.0", - "toposort": "^2.0.2", - "typo-geom": "^0.13.1", "uuid": "^9.0.1", - "wawoff2": "^2.0.1" + "verda": "^1.11.1", + "which": "^4.0.0" }, "devDependencies": { - "@unicode/unicode-15.0.0": "^1.5.2", - "cldr": "^7.5.0", "eslint": "^8.55.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.0", "patel": "^0.39.0", - "prettier": "^3.1.0", - "verda": "^1.11.1", - "which": "^4.0.0" + "prettier": "^3.1.0" }, "engines": { "node": ">=16.0.0" @@ -48,8 +43,7 @@ "node_modules/@assemblyscript/loader": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz", - "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==", - "dev": true + "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", @@ -145,6 +139,58 @@ "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==" }, + "node_modules/@iosevka/amend-readme": { + "resolved": "tools/amend-readme", + "link": true + }, + "node_modules/@iosevka/data-export": { + "resolved": "tools/data-export", + "link": true + }, + "node_modules/@iosevka/font": { + "resolved": "packages/font", + "link": true + }, + "node_modules/@iosevka/font-glyphs": { + "resolved": "packages/font-glyphs", + "link": true + }, + "node_modules/@iosevka/font-kits": { + "resolved": "packages/font-kits", + "link": true + }, + "node_modules/@iosevka/font-otl": { + "resolved": "packages/font-otl", + "link": true + }, + "node_modules/@iosevka/generate-samples": { + "resolved": "tools/generate-samples", + "link": true + }, + "node_modules/@iosevka/geometry": { + "resolved": "packages/geometry", + "link": true + }, + "node_modules/@iosevka/geometry-cache": { + "resolved": "packages/geometry-cache", + "link": true + }, + "node_modules/@iosevka/glyph": { + "resolved": "packages/glyph", + "link": true + }, + "node_modules/@iosevka/misc": { + "resolved": "tools/misc", + "link": true + }, + "node_modules/@iosevka/param": { + "resolved": "packages/param", + "link": true + }, + "node_modules/@iosevka/util": { + "resolved": "packages/util", + "link": true + }, "node_modules/@msgpack/msgpack": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz", @@ -714,14 +760,12 @@ "node_modules/@unicode/unicode-15.0.0": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@unicode/unicode-15.0.0/-/unicode-15.0.0-1.5.2.tgz", - "integrity": "sha512-PepMvMxf9j4sp4bZn7W9JJoMxynHk66ZPCsx6n3v47T5vmM+qfIy0z1MMU+EDmRZr2cvs1aT9ZwUEMRPVXR23g==", - "dev": true + "integrity": "sha512-PepMvMxf9j4sp4bZn7W9JJoMxynHk66ZPCsx6n3v47T5vmM+qfIy0z1MMU+EDmRZr2cvs1aT9ZwUEMRPVXR23g==" }, "node_modules/@xmldom/xmldom": { "version": "0.8.10", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "dev": true, "engines": { "node": ">=10.0.0" } @@ -781,7 +825,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -933,7 +976,6 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -985,7 +1027,6 @@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz", "integrity": "sha512-nG8PYH+/4xB+8zkV4G844EtfvZ5tTiLFoX3dZ4nhF4t3OCKIb9UvaFyNmeZO2zOSmRWzBoTD+napN6hiL+EgcA==", - "dev": true, "dependencies": { "traverse": ">=0.3.0 <0.4" }, @@ -1012,7 +1053,6 @@ "version": "7.5.0", "resolved": "https://registry.npmjs.org/cldr/-/cldr-7.5.0.tgz", "integrity": "sha512-2qy3ASYFbNToTujNnk5Y8ak++B4TH/G+S8AEOrN1xUFZhxhmqWDPUGnOFGyId61vD2Trf+yE65wVzIcdE/bpPg==", - "dev": true, "dependencies": { "@xmldom/xmldom": "^0.8.0", "escodegen": "^2.0.0", @@ -1029,7 +1069,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, "dependencies": { "restore-cursor": "^3.1.0" }, @@ -1208,8 +1247,7 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/es-abstract": { "version": "1.22.3", @@ -1327,7 +1365,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } @@ -1348,7 +1385,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dev": true, "dependencies": { "esprima": "^4.0.1", "estraverse": "^5.2.0", @@ -1752,7 +1788,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -1812,7 +1847,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, "engines": { "node": ">=4.0" } @@ -1821,7 +1855,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1829,14 +1862,12 @@ "node_modules/eventemitter-asyncresource": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz", - "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==", - "dev": true + "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==" }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", @@ -1919,7 +1950,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -1973,7 +2003,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -2084,8 +2113,7 @@ "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/graphemer": { "version": "1.4.0", @@ -2165,7 +2193,6 @@ "version": "0.0.4", "resolved": "https://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz", "integrity": "sha512-xyD4XgslstNAs72ENaoFvgMwtv8xhiDtC2AtzCG+8yF7W/Knxxm9BX+e2s25mm+HxMKh0rBmXVOEGF3zNImXvA==", - "dev": true, "dependencies": { "traverse": ">=0.2.4" }, @@ -2188,7 +2215,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==", - "dev": true, "dependencies": { "@assemblyscript/loader": "^0.10.1", "base64-js": "^1.2.0", @@ -2198,8 +2224,7 @@ "node_modules/hdr-histogram-percentiles-obj": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz", - "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==", - "dev": true + "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==" }, "node_modules/iconv-lite": { "version": "0.6.3", @@ -2379,7 +2404,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -2556,7 +2580,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", - "dev": true, "engines": { "node": ">=16" } @@ -2607,7 +2630,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, "dependencies": { "universalify": "^2.0.0" }, @@ -2661,14 +2683,12 @@ "node_modules/lru-cache": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz", - "integrity": "sha512-dVmQmXPBlTgFw77hm60ud//l2bCuDKkqC2on1EBoM7s9Urm9IQDrnujwZ93NFnAq0dVZ0HBXTS7PwEG+YE7+EQ==", - "dev": true + "integrity": "sha512-dVmQmXPBlTgFw77hm60ud//l2bCuDKkqC2on1EBoM7s9Urm9IQDrnujwZ93NFnAq0dVZ0HBXTS7PwEG+YE7+EQ==" }, "node_modules/memoizeasync": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.1.0.tgz", "integrity": "sha512-HMfzdLqClZo8HMyuM9B6TqnXCNhw82iVWRLqd2cAdXi063v2iJB4mQfWFeKVByN8VUwhmDZ8NMhryBwKrPRf8Q==", - "dev": true, "dependencies": { "lru-cache": "2.5.0", "passerror": "1.1.1" @@ -2678,7 +2698,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, "engines": { "node": ">=6" } @@ -2720,7 +2739,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -2735,14 +2753,12 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, "optional": true }, "node_modules/node-gyp-build": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz", "integrity": "sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==", - "dev": true, "optional": true, "bin": { "node-gyp-build": "bin.js", @@ -2857,7 +2873,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -2947,8 +2962,7 @@ "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "node_modules/parent-module": { "version": "1.0.1", @@ -2966,7 +2980,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz", "integrity": "sha512-PwrEQJBkJMxnxG+tdraz95vTstYnCRqiURNbGtg/vZHLgcAODc9hbiD5ZumGUoh3bpw0F0qKLje7Vd2Fd5Lx3g==", - "dev": true, "engines": { "node": "*" } @@ -3039,7 +3052,6 @@ "version": "0.10.0", "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", "integrity": "sha512-qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow==", - "dev": true, "bin": { "pegjs": "bin/pegjs" }, @@ -3051,7 +3063,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", - "dev": true, "dependencies": { "eventemitter-asyncresource": "^1.0.0", "hdr-histogram-js": "^2.0.1", @@ -3134,7 +3145,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3169,7 +3179,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -3276,7 +3285,6 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz", "integrity": "sha512-b/ptP11hETwYWpeilHXXQiV5UJNJl7ZWWooKRE5eBIYWoom6dZ0SluCIdCtKycsMtZgKWE01/qAw6jblw1YVhg==", - "dev": true, "engines": { "node": ">=4.1" } @@ -3310,7 +3318,6 @@ "version": "0.3.5", "resolved": "https://registry.npmjs.org/seq/-/seq-0.3.5.tgz", "integrity": "sha512-sisY2Ln1fj43KBkRtXkesnRHYNdswIkIibvNe/0UKm2GZxjMbqmccpiatoKr/k2qX5VKiLU8xm+tz/74LAho4g==", - "dev": true, "dependencies": { "chainsaw": ">=0.0.7 <0.1", "hashish": ">=0.0.2 <0.1" @@ -3383,14 +3390,12 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "optional": true, "engines": { "node": ">=0.10.0" @@ -3419,7 +3424,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -3478,7 +3482,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -3551,7 +3554,6 @@ "version": "0.3.9", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==", - "dev": true, "engines": { "node": "*" } @@ -3692,14 +3694,12 @@ "node_modules/unicoderegexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/unicoderegexp/-/unicoderegexp-0.4.1.tgz", - "integrity": "sha512-ydh8D5mdd2ldTS25GtZJEgLciuF0Qf2n3rwPhonELk3HioX201ClYGvZMc1bCmx6nblZiADQwbMWekeIqs51qw==", - "dev": true + "integrity": "sha512-ydh8D5mdd2ldTS25GtZJEgLciuF0Qf2n3rwPhonELk3HioX201ClYGvZMc1bCmx6nblZiADQwbMWekeIqs51qw==" }, "node_modules/universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, "engines": { "node": ">= 10.0.0" } @@ -3729,7 +3729,6 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/verda/-/verda-1.11.1.tgz", "integrity": "sha512-CJiuHqTFSm7qe4TccjZMI6iT+TJ2JpN7A2NEgYHk/EA8EKh6bVf5ITM7XnLF8v2qL5Hy/Bt2C6zpuNyDoVPDYQ==", - "dev": true, "dependencies": { "chalk": "^4.1.2", "cli-cursor": "^3.1.0", @@ -3752,7 +3751,6 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -3765,14 +3763,12 @@ "node_modules/verda/node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/verda/node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -3787,7 +3783,6 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -3805,7 +3800,6 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, "engines": { "node": ">=12" } @@ -3826,7 +3820,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", - "dev": true, "dependencies": { "isexe": "^3.1.1" }, @@ -3897,7 +3890,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -3920,7 +3912,6 @@ "version": "0.0.33", "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.33.tgz", "integrity": "sha512-NNXnzrkDrAzalLhIUc01jO2mOzXGXh1JwPgkihcLLzw98c0WgYDmmjSh1Kl3wzaxSVWMuA+fe0WTWOBDWCBmNA==", - "dev": true, "engines": { "node": ">=0.6.0" } @@ -3929,7 +3920,6 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, "engines": { "node": ">=10" } @@ -3977,6 +3967,128 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "packages/font": { + "name": "@iosevka/font", + "version": "28.0.0", + "dependencies": { + "@iarna/toml": "^2.2.5", + "@iosevka/font-glyphs": "28.0.0", + "@iosevka/font-otl": "28.0.0", + "@iosevka/geometry": "28.0.0", + "@iosevka/geometry-cache": "28.0.0", + "@iosevka/glyph": "28.0.0", + "@iosevka/param": "28.0.0", + "@iosevka/util": "28.0.0", + "harfbuzzjs": "^0.3.3", + "ot-builder": "^1.7.3", + "semver": "^7.5.4", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } + }, + "packages/font-glyphs": { + "name": "@iosevka/font-glyphs", + "version": "28.0.0", + "dependencies": { + "@iosevka/font-kits": "28.0.0", + "@iosevka/geometry": "28.0.0", + "@iosevka/geometry-cache": "28.0.0", + "@iosevka/glyph": "28.0.0", + "@iosevka/util": "28.0.0", + "typo-geom": "^0.13.1" + } + }, + "packages/font-kits": { + "name": "@iosevka/font-kits", + "version": "28.0.0", + "dependencies": { + "@iosevka/geometry": "28.0.0", + "@iosevka/glyph": "28.0.0", + "@iosevka/util": "28.0.0", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } + }, + "packages/font-otl": { + "name": "@iosevka/font-otl", + "version": "28.0.0", + "dependencies": { + "@iosevka/font-glyphs": "28.0.0", + "@iosevka/glyph": "28.0.0", + "toposort": "^2.0.2" + } + }, + "packages/geometry": { + "name": "@iosevka/geometry", + "version": "28.0.0", + "dependencies": { + "@iosevka/util": "28.0.0", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } + }, + "packages/geometry-cache": { + "name": "@iosevka/geometry-cache", + "version": "28.0.0", + "dependencies": { + "@msgpack/msgpack": "^2.8.0" + } + }, + "packages/glyph": { + "name": "@iosevka/glyph", + "version": "28.0.0", + "dependencies": { + "@iosevka/geometry": "28.0.0", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } + }, + "packages/param": { + "name": "@iosevka/param", + "version": "28.0.0", + "dependencies": { + "@iosevka/util": "28.0.0" + } + }, + "packages/util": { + "name": "@iosevka/util", + "version": "28.0.0" + }, + "tools/amend-readme": { + "name": "@iosevka/amend-readme", + "version": "28.0.0", + "dependencies": { + "@iarna/toml": "^2.2.5", + "@iosevka/param": "28.0.0", + "@unicode/unicode-15.0.0": "^1.5.2" + } + }, + "tools/data-export": { + "name": "@iosevka/data-export", + "version": "28.0.0", + "dependencies": { + "@iarna/toml": "^2.2.5", + "@iosevka/param": "28.0.0", + "@unicode/unicode-15.0.0": "^1.5.2", + "cldr": "^7.5.0" + } + }, + "tools/generate-samples": { + "name": "@iosevka/generate-samples", + "version": "28.0.0", + "dependencies": { + "@iosevka/data-export": "28.0.0" + } + }, + "tools/misc": { + "name": "@iosevka/misc", + "version": "28.0.0", + "dependencies": { + "@iosevka/util": "28.0.0", + "semver": "^7.5.4", + "wawoff2": "^2.0.1" + } } } } diff --git a/package.json b/package.json index 60f80a777..66cc13abd 100644 --- a/package.json +++ b/package.json @@ -1,37 +1,31 @@ { - "name": "iosevka", - "version": "28.0.0-beta.2", - "main": "./font-src/index.js", + "name": "@iosevka/monorepo", + "version": "28.0.0", + "workspaces": [ + "packages/*", + "tools/*" + ], "scripts": { "build": "verda -f verdafile.mjs", - "bump-ver": "node utility/update-package-json-version/index.mjs && npm install && node utility/generate-ttfa-ranges/index.mjs", + "bump-ver": "node tools/misc/src/update-package-json-version.mjs && npm install && node tools/misc/src/generate-ttfa-ranges.mjs", "clean": "verda -f verdafile.mjs clean", "lint": "eslint . --ext .mjs" }, "dependencies": { - "@iarna/toml": "^2.2.5", - "@msgpack/msgpack": "^2.8.0", - "deep-equal": "^2.2.3", - "harfbuzzjs": "^0.3.3", - "ot-builder": "^1.7.3", "otb-ttc-bundle": "^1.7.3", + "@iarna/toml": "^2.2.5", + "deep-equal": "^2.2.3", "semver": "^7.5.4", - "spiro": "^3.0.0", - "toposort": "^2.0.2", - "typo-geom": "^0.13.1", "uuid": "^9.0.1", - "wawoff2": "^2.0.1" + "verda": "^1.11.1", + "which": "^4.0.0" }, "devDependencies": { - "@unicode/unicode-15.0.0": "^1.5.2", - "cldr": "^7.5.0", "eslint": "^8.55.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.0", "patel": "^0.39.0", - "prettier": "^3.1.0", - "verda": "^1.11.1", - "which": "^4.0.0" + "prettier": "^3.1.0" }, "engines": { "node": ">=16.0.0" diff --git a/packages/font-glyphs/package.json b/packages/font-glyphs/package.json new file mode 100644 index 000000000..02cb9997e --- /dev/null +++ b/packages/font-glyphs/package.json @@ -0,0 +1,18 @@ +{ + "name": "@iosevka/font-glyphs", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs", + "./aesthetics": "./src/meta/aesthetics.mjs", + "./unicode-knowledge": "./src/meta/unicode-knowledge.mjs" + }, + "dependencies": { + "@iosevka/font-kits": "28.0.0", + "@iosevka/geometry": "28.0.0", + "@iosevka/geometry-cache": "28.0.0", + "@iosevka/glyph": "28.0.0", + "@iosevka/util": "28.0.0", + "typo-geom": "^0.13.1" + } +} diff --git a/font-src/glyphs/auto-build/accents.ptl b/packages/font-glyphs/src/auto-build/accents.ptl similarity index 97% rename from font-src/glyphs/auto-build/accents.ptl rename to packages/font-glyphs/src/auto-build/accents.ptl index 9158a705a..fb1fb083c 100644 --- a/font-src/glyphs/auto-build/accents.ptl +++ b/packages/font-glyphs/src/auto-build/accents.ptl @@ -1,9 +1,9 @@ ###### Automatic builds -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [Dotless AnyDerivingCv DotlessOrNot getGrTree CvDecompose LeaningMark LeaningMarkSpacer] from"../../support/gr.mjs" -import [fallback ArrayUtil MatchUtil constant] from"../../support/utils.mjs" -import as UnicodeKnowledge from"../../meta/unicode-knowledge.mjs" +import [Dotless AnyDerivingCv DotlessOrNot getGrTree CvDecompose LeaningMark LeaningMarkSpacer] from "@iosevka/glyph/relation" +import [fallback ArrayUtil MatchUtil constant] from "@iosevka/util" +import as UnicodeKnowledge from "../meta/unicode-knowledge.mjs" extern Map extern Set diff --git a/font-src/glyphs/auto-build/composite.ptl b/packages/font-glyphs/src/auto-build/composite.ptl similarity index 99% rename from font-src/glyphs/auto-build/composite.ptl rename to packages/font-glyphs/src/auto-build/composite.ptl index e05a49081..99b49be26 100644 --- a/font-src/glyphs/auto-build/composite.ptl +++ b/packages/font-glyphs/src/auto-build/composite.ptl @@ -1,10 +1,10 @@ ###### Automatic builds -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [getGrMesh AnyCv CvDecompose Joining hashCv] from"../../support/gr.mjs" -import [hashGeometry] from"../../support/geometry/index.mjs" -import [Transform] from"../../support/geometry/transform.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [getGrMesh AnyCv CvDecompose Joining hashCv] from "@iosevka/glyph/relation" +import [hashGeometry] from "@iosevka/geometry" +import [Transform] from "@iosevka/geometry/transform" extern Map extern Set diff --git a/font-src/glyphs/auto-build/mark-doppelganger.ptl b/packages/font-glyphs/src/auto-build/mark-doppelganger.ptl similarity index 90% rename from font-src/glyphs/auto-build/mark-doppelganger.ptl rename to packages/font-glyphs/src/auto-build/mark-doppelganger.ptl index 4288b92e0..888d9af29 100644 --- a/font-src/glyphs/auto-build/mark-doppelganger.ptl +++ b/packages/font-glyphs/src/auto-build/mark-doppelganger.ptl @@ -1,10 +1,11 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [TieMark AnyDerivingCv ScheduleLeaningMark LeaningMark LeaningMarkSpacer] from"../../support/gr.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Box] from "@iosevka/geometry/box" +import [TieMark AnyDerivingCv ScheduleLeaningMark LeaningMark LeaningMarkSpacer] from "@iosevka/glyph/relation" + +import [DesignParameters] from "../meta/aesthetics.mjs" extern Set diff --git a/font-src/glyphs/auto-build/recursive-build.ptl b/packages/font-glyphs/src/auto-build/recursive-build.ptl similarity index 96% rename from font-src/glyphs/auto-build/recursive-build.ptl rename to packages/font-glyphs/src/auto-build/recursive-build.ptl index e4d36ad7b..0a6c95bdc 100644 --- a/font-src/glyphs/auto-build/recursive-build.ptl +++ b/packages/font-glyphs/src/auto-build/recursive-build.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [clamp fallback] from"../../support/utils.mjs" +import [clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/auto-build/transformed.ptl b/packages/font-glyphs/src/auto-build/transformed.ptl similarity index 98% rename from font-src/glyphs/auto-build/transformed.ptl rename to packages/font-glyphs/src/auto-build/transformed.ptl index d19688a1b..f6f78366e 100644 --- a/font-src/glyphs/auto-build/transformed.ptl +++ b/packages/font-glyphs/src/auto-build/transformed.ptl @@ -1,11 +1,11 @@ ###### Automatic builds -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [linreg clamp mix fallback] from"../../support/utils.mjs" -import [getGrTree IsSuperscript IsSubscript] from"../../support/gr.mjs" -import [AnyCv DotlessOrNot CvDecompose MathSansSerif Texture] from"../../support/gr.mjs" -import [NumeratorForm DenominatorForm] from"../../support/gr.mjs" -import [Transform] from"../../support/geometry/transform.mjs" +import [linreg clamp mix fallback] from "@iosevka/util" +import [getGrTree IsSuperscript IsSubscript] from "@iosevka/glyph/relation" +import [AnyCv DotlessOrNot CvDecompose MathSansSerif Texture] from "@iosevka/glyph/relation" +import [NumeratorForm DenominatorForm] from "@iosevka/glyph/relation" +import [Transform] from "@iosevka/geometry/transform" extern Map extern Set diff --git a/font-src/glyphs/common/derivatives.ptl b/packages/font-glyphs/src/common/derivatives.ptl similarity index 98% rename from font-src/glyphs/common/derivatives.ptl rename to packages/font-glyphs/src/common/derivatives.ptl index ebc6510bf..7969dc6ef 100644 --- a/font-src/glyphs/common/derivatives.ptl +++ b/packages/font-glyphs/src/common/derivatives.ptl @@ -1,7 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [Cv AnyCv AnyDerivingCv Dotless SvInheritableRelations PseudoCvDecompose getGrMesh] from"../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Cv AnyCv AnyDerivingCv Dotless SvInheritableRelations PseudoCvDecompose getGrMesh] from "@iosevka/glyph/relation" extern Map diff --git a/font-src/glyphs/common/shapes.ptl b/packages/font-glyphs/src/common/shapes.ptl similarity index 98% rename from font-src/glyphs/common/shapes.ptl rename to packages/font-glyphs/src/common/shapes.ptl index c048c29e7..326c09b60 100644 --- a/font-src/glyphs/common/shapes.ptl +++ b/packages/font-glyphs/src/common/shapes.ptl @@ -1,10 +1,9 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [Transform] from"../../support/geometry/transform.mjs" - -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [Radical] from"../../support/gr.mjs" -import [Interpolator] from"../../support/geometry/spiro-control.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Transform] from "@iosevka/geometry/transform" +import [Interpolator] from "@iosevka/geometry/spiro-control" +import [Radical] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/index.ptl b/packages/font-glyphs/src/index.ptl similarity index 88% rename from font-src/glyphs/index.ptl rename to packages/font-glyphs/src/index.ptl index 504bedb88..493261ca0 100644 --- a/font-src/glyphs/index.ptl +++ b/packages/font-glyphs/src/index.ptl @@ -1,17 +1,15 @@ -import [Glyph] from"../support/glyph/index.mjs" -import [GlyphStore] from"../support/glyph-store.mjs" -import [GlyphBlock GlyphBuildExecutor] from"../support/glyph-block.mjs" -import as Gr from"../support/gr.mjs" -import as SpiroKit from"../kits/spiro-kit.mjs" -import as BooleKit from"../kits/boole-kit.mjs" -import [DesignParameters] from"../meta/aesthetics.mjs" +import [Glyph] from "@iosevka/glyph" +import [GlyphStore] from "@iosevka/glyph/store" +import [GlyphBlock GlyphBuildExecutor] from "@iosevka/glyph/block" +import as Gr from "@iosevka/glyph/relation" +import as SpiroKit from "@iosevka/font-kits/spiro-kit" +import as BooleKit from "@iosevka/font-kits/boole-kit" +import [DesignParameters calculateMetrics setFontMetrics GenDivFrame] from "./meta/aesthetics.mjs" +import [$NamedParameterPair$] from "@iosevka/util" extern isFinite -import [$NamedParameterPair$] from"../support/utils.mjs" -import [calculateMetrics setFontMetrics GenDivFrame] from"../meta/aesthetics.mjs" - -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' export : define [buildGlyphs para recursive] : begin # Execution and dependency management diff --git a/font-src/glyphs/letter/cyrillic.ptl b/packages/font-glyphs/src/letter/cyrillic.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic.ptl rename to packages/font-glyphs/src/letter/cyrillic.ptl index 4448b870c..522bb8c78 100644 --- a/font-src/glyphs/letter/cyrillic.ptl +++ b/packages/font-glyphs/src/letter/cyrillic.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/letter/cyrillic/abk-ha.ptl b/packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl similarity index 92% rename from font-src/glyphs/letter/cyrillic/abk-ha.ptl rename to packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl index 80309dead..46a6d1a42 100644 --- a/font-src/glyphs/letter/cyrillic/abk-ha.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/abk-ha.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/big-yus.ptl b/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic/big-yus.ptl rename to packages/font-glyphs/src/letter/cyrillic/big-yus.ptl index c07f53767..66eded66b 100644 --- a/font-src/glyphs/letter/cyrillic/big-yus.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/big-yus.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/che.ptl b/packages/font-glyphs/src/letter/cyrillic/che.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic/che.ptl rename to packages/font-glyphs/src/letter/cyrillic/che.ptl index f5931f295..cc5d9655b 100644 --- a/font-src/glyphs/letter/cyrillic/che.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/che.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/dche.ptl b/packages/font-glyphs/src/letter/cyrillic/dche.ptl similarity index 94% rename from font-src/glyphs/letter/cyrillic/dche.ptl rename to packages/font-glyphs/src/letter/cyrillic/dche.ptl index 7dc62e721..529108862 100644 --- a/font-src/glyphs/letter/cyrillic/dche.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dche.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/de.ptl b/packages/font-glyphs/src/letter/cyrillic/de.ptl similarity index 98% rename from font-src/glyphs/letter/cyrillic/de.ptl rename to packages/font-glyphs/src/letter/cyrillic/de.ptl index 602dd549f..d7d040701 100644 --- a/font-src/glyphs/letter/cyrillic/de.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/de.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/dje.ptl b/packages/font-glyphs/src/letter/cyrillic/dje.ptl similarity index 92% rename from font-src/glyphs/letter/cyrillic/dje.ptl rename to packages/font-glyphs/src/letter/cyrillic/dje.ptl index 300e4f300..f27797edd 100644 --- a/font-src/glyphs/letter/cyrillic/dje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dje.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/djerv.ptl b/packages/font-glyphs/src/letter/cyrillic/djerv.ptl similarity index 92% rename from font-src/glyphs/letter/cyrillic/djerv.ptl rename to packages/font-glyphs/src/letter/cyrillic/djerv.ptl index 62fc8f24e..1000e1664 100644 --- a/font-src/glyphs/letter/cyrillic/djerv.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/djerv.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/dzhe.ptl b/packages/font-glyphs/src/letter/cyrillic/dzhe.ptl similarity index 91% rename from font-src/glyphs/letter/cyrillic/dzhe.ptl rename to packages/font-glyphs/src/letter/cyrillic/dzhe.ptl index 406c4b694..c9349035c 100644 --- a/font-src/glyphs/letter/cyrillic/dzhe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dzhe.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/dzzhe-zhwe.ptl b/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl similarity index 98% rename from font-src/glyphs/letter/cyrillic/dzzhe-zhwe.ptl rename to packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl index cfce393f4..4415e02c9 100644 --- a/font-src/glyphs/letter/cyrillic/dzzhe-zhwe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/dzzhe-zhwe.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/e.ptl b/packages/font-glyphs/src/letter/cyrillic/e.ptl similarity index 96% rename from font-src/glyphs/letter/cyrillic/e.ptl rename to packages/font-glyphs/src/letter/cyrillic/e.ptl index b591a6924..64f4b7ec3 100644 --- a/font-src/glyphs/letter/cyrillic/e.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/e.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/el.ptl b/packages/font-glyphs/src/letter/cyrillic/el.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic/el.ptl rename to packages/font-glyphs/src/letter/cyrillic/el.ptl index a37ed6d92..19a241706 100644 --- a/font-src/glyphs/letter/cyrillic/el.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/el.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Point] from"../../../support/geometry/point.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Point] from "@iosevka/geometry/point" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/fita.ptl b/packages/font-glyphs/src/letter/cyrillic/fita.ptl similarity index 93% rename from font-src/glyphs/letter/cyrillic/fita.ptl rename to packages/font-glyphs/src/letter/cyrillic/fita.ptl index 73d37fe03..e7fb2e19f 100644 --- a/font-src/glyphs/letter/cyrillic/fita.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/fita.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/iotified-a.ptl b/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic/iotified-a.ptl rename to packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl index b49268f84..c0ef4b355 100644 --- a/font-src/glyphs/letter/cyrillic/iotified-a.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/iotified-a.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [bitOr] from"../../../support/util/mask-bit.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [bitOr] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/lje.ptl b/packages/font-glyphs/src/letter/cyrillic/lje.ptl similarity index 89% rename from font-src/glyphs/letter/cyrillic/lje.ptl rename to packages/font-glyphs/src/letter/cyrillic/lje.ptl index f187c8e0b..f0fc7865c 100644 --- a/font-src/glyphs/letter/cyrillic/lje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/lje.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Point] from"../../../support/geometry/point.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Point] from "@iosevka/geometry/point" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/lower-be.ptl b/packages/font-glyphs/src/letter/cyrillic/lower-be.ptl similarity index 89% rename from font-src/glyphs/letter/cyrillic/lower-be.ptl rename to packages/font-glyphs/src/letter/cyrillic/lower-be.ptl index 933c7b701..cf528a1a6 100644 --- a/font-src/glyphs/letter/cyrillic/lower-be.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/lower-be.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/lower-uk.ptl b/packages/font-glyphs/src/letter/cyrillic/lower-uk.ptl similarity index 91% rename from font-src/glyphs/letter/cyrillic/lower-uk.ptl rename to packages/font-glyphs/src/letter/cyrillic/lower-uk.ptl index 4c290ca64..7208aefda 100644 --- a/font-src/glyphs/letter/cyrillic/lower-uk.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/lower-uk.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/multiocular-o.ptl b/packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl similarity index 94% rename from font-src/glyphs/letter/cyrillic/multiocular-o.ptl rename to packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl index f89268ebf..bb5443f25 100644 --- a/font-src/glyphs/letter/cyrillic/multiocular-o.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/multiocular-o.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/nje.ptl b/packages/font-glyphs/src/letter/cyrillic/nje.ptl similarity index 95% rename from font-src/glyphs/letter/cyrillic/nje.ptl rename to packages/font-glyphs/src/letter/cyrillic/nje.ptl index d8e1e2c04..7f479c408 100644 --- a/font-src/glyphs/letter/cyrillic/nje.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/nje.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DependentSelector] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DependentSelector] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/omega.ptl b/packages/font-glyphs/src/letter/cyrillic/omega.ptl similarity index 95% rename from font-src/glyphs/letter/cyrillic/omega.ptl rename to packages/font-glyphs/src/letter/cyrillic/omega.ptl index 6d45b1484..44ffa31a8 100644 --- a/font-src/glyphs/letter/cyrillic/omega.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/omega.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/orthography.ptl b/packages/font-glyphs/src/letter/cyrillic/orthography.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic/orthography.ptl rename to packages/font-glyphs/src/letter/cyrillic/orthography.ptl index b18f09867..368f62fef 100644 --- a/font-src/glyphs/letter/cyrillic/orthography.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/orthography.ptl @@ -1,4 +1,4 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' glyph-module diff --git a/font-src/glyphs/letter/cyrillic/sha.ptl b/packages/font-glyphs/src/letter/cyrillic/sha.ptl similarity index 95% rename from font-src/glyphs/letter/cyrillic/sha.ptl rename to packages/font-glyphs/src/letter/cyrillic/sha.ptl index dac482e36..841b2dbf8 100644 --- a/font-src/glyphs/letter/cyrillic/sha.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/sha.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/small-yus.ptl b/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl similarity index 97% rename from font-src/glyphs/letter/cyrillic/small-yus.ptl rename to packages/font-glyphs/src/letter/cyrillic/small-yus.ptl index 8721bfc18..2936b9675 100644 --- a/font-src/glyphs/letter/cyrillic/small-yus.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/small-yus.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/te-comb.ptl b/packages/font-glyphs/src/letter/cyrillic/te-comb.ptl similarity index 89% rename from font-src/glyphs/letter/cyrillic/te-comb.ptl rename to packages/font-glyphs/src/letter/cyrillic/te-comb.ptl index e54dc59ad..206fabdc1 100644 --- a/font-src/glyphs/letter/cyrillic/te-comb.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/te-comb.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/te-midhook.ptl b/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl similarity index 94% rename from font-src/glyphs/letter/cyrillic/te-midhook.ptl rename to packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl index 8af719e13..dc4bc7258 100644 --- a/font-src/glyphs/letter/cyrillic/te-midhook.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/te-midhook.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/tse.ptl b/packages/font-glyphs/src/letter/cyrillic/tse.ptl similarity index 96% rename from font-src/glyphs/letter/cyrillic/tse.ptl rename to packages/font-glyphs/src/letter/cyrillic/tse.ptl index 875ff30b5..d0db466c5 100644 --- a/font-src/glyphs/letter/cyrillic/tse.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/tse.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/tshe.ptl b/packages/font-glyphs/src/letter/cyrillic/tshe.ptl similarity index 91% rename from font-src/glyphs/letter/cyrillic/tshe.ptl rename to packages/font-glyphs/src/letter/cyrillic/tshe.ptl index 44b37a1f5..6923d7b28 100644 --- a/font-src/glyphs/letter/cyrillic/tshe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/tshe.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/yat.ptl b/packages/font-glyphs/src/letter/cyrillic/yat.ptl similarity index 96% rename from font-src/glyphs/letter/cyrillic/yat.ptl rename to packages/font-glyphs/src/letter/cyrillic/yat.ptl index 882a0a150..57d2129f8 100644 --- a/font-src/glyphs/letter/cyrillic/yat.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yat.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DependentSelector] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DependentSelector] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/yeri.ptl b/packages/font-glyphs/src/letter/cyrillic/yeri.ptl similarity index 99% rename from font-src/glyphs/letter/cyrillic/yeri.ptl rename to packages/font-glyphs/src/letter/cyrillic/yeri.ptl index 86b2f05c5..98cc080e5 100644 --- a/font-src/glyphs/letter/cyrillic/yeri.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yeri.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/yu.ptl b/packages/font-glyphs/src/letter/cyrillic/yu.ptl similarity index 95% rename from font-src/glyphs/letter/cyrillic/yu.ptl rename to packages/font-glyphs/src/letter/cyrillic/yu.ptl index a4b50ecb5..e0d8fc129 100644 --- a/font-src/glyphs/letter/cyrillic/yu.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/yu.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix barMixL linreg clamp fallback] from"../../../support/utils.mjs" +import [mix barMixL linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/cyrillic/zhe.ptl b/packages/font-glyphs/src/letter/cyrillic/zhe.ptl similarity index 98% rename from font-src/glyphs/letter/cyrillic/zhe.ptl rename to packages/font-glyphs/src/letter/cyrillic/zhe.ptl index a38bce41f..2ee61cf97 100644 --- a/font-src/glyphs/letter/cyrillic/zhe.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/zhe.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek.ptl b/packages/font-glyphs/src/letter/greek.ptl similarity index 97% rename from font-src/glyphs/letter/greek.ptl rename to packages/font-glyphs/src/letter/greek.ptl index f7425a022..e48c8acc4 100644 --- a/font-src/glyphs/letter/greek.ptl +++ b/packages/font-glyphs/src/letter/greek.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/letter/greek/lower-delta.ptl b/packages/font-glyphs/src/letter/greek/lower-delta.ptl similarity index 95% rename from font-src/glyphs/letter/greek/lower-delta.ptl rename to packages/font-glyphs/src/letter/greek/lower-delta.ptl index 9157cb7eb..42516191a 100644 --- a/font-src/glyphs/letter/greek/lower-delta.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-delta.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl similarity index 99% rename from font-src/glyphs/letter/greek/lower-epsilon.ptl rename to packages/font-glyphs/src/letter/greek/lower-epsilon.ptl index ca634dcf6..e639efd52 100644 --- a/font-src/glyphs/letter/greek/lower-epsilon.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' extern isFinite -import [mix linreg clamp fallback SuffixCfg] from"../../../support/utils.mjs" +import [mix linreg clamp fallback SuffixCfg] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-gamma.ptl b/packages/font-glyphs/src/letter/greek/lower-gamma.ptl similarity index 93% rename from font-src/glyphs/letter/greek/lower-gamma.ptl rename to packages/font-glyphs/src/letter/greek/lower-gamma.ptl index 664191d2f..14f2eb4ab 100644 --- a/font-src/glyphs/letter/greek/lower-gamma.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-gamma.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-kappa-symbol.ptl b/packages/font-glyphs/src/letter/greek/lower-kappa-symbol.ptl similarity index 94% rename from font-src/glyphs/letter/greek/lower-kappa-symbol.ptl rename to packages/font-glyphs/src/letter/greek/lower-kappa-symbol.ptl index 1172e975f..3805c6222 100644 --- a/font-src/glyphs/letter/greek/lower-kappa-symbol.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-kappa-symbol.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-lunate-epsilon.ptl similarity index 91% rename from font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl rename to packages/font-glyphs/src/letter/greek/lower-lunate-epsilon.ptl index 8d5882225..eb4f99687 100644 --- a/font-src/glyphs/letter/greek/lower-lunate-epsilon.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-lunate-epsilon.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-nu.ptl b/packages/font-glyphs/src/letter/greek/lower-nu.ptl similarity index 84% rename from font-src/glyphs/letter/greek/lower-nu.ptl rename to packages/font-glyphs/src/letter/greek/lower-nu.ptl index cbba2fad5..a704db66e 100644 --- a/font-src/glyphs/letter/greek/lower-nu.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-nu.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-omega.ptl b/packages/font-glyphs/src/letter/greek/lower-omega.ptl similarity index 96% rename from font-src/glyphs/letter/greek/lower-omega.ptl rename to packages/font-glyphs/src/letter/greek/lower-omega.ptl index 8a7094b87..0e1fbff40 100644 --- a/font-src/glyphs/letter/greek/lower-omega.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-omega.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-phi.ptl b/packages/font-glyphs/src/letter/greek/lower-phi.ptl similarity index 90% rename from font-src/glyphs/letter/greek/lower-phi.ptl rename to packages/font-glyphs/src/letter/greek/lower-phi.ptl index 522f3ed9a..fd80e39c2 100644 --- a/font-src/glyphs/letter/greek/lower-phi.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-phi.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-rho.ptl b/packages/font-glyphs/src/letter/greek/lower-rho.ptl similarity index 86% rename from font-src/glyphs/letter/greek/lower-rho.ptl rename to packages/font-glyphs/src/letter/greek/lower-rho.ptl index 03c288b40..c4da40774 100644 --- a/font-src/glyphs/letter/greek/lower-rho.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-rho.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-sigma-final.ptl b/packages/font-glyphs/src/letter/greek/lower-sigma-final.ptl similarity index 91% rename from font-src/glyphs/letter/greek/lower-sigma-final.ptl rename to packages/font-glyphs/src/letter/greek/lower-sigma-final.ptl index 3ed99f0c1..26645b76b 100644 --- a/font-src/glyphs/letter/greek/lower-sigma-final.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-sigma-final.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-sigma.ptl b/packages/font-glyphs/src/letter/greek/lower-sigma.ptl similarity index 81% rename from font-src/glyphs/letter/greek/lower-sigma.ptl rename to packages/font-glyphs/src/letter/greek/lower-sigma.ptl index b6a190ac7..34318f5a2 100644 --- a/font-src/glyphs/letter/greek/lower-sigma.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-sigma.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-theta.ptl b/packages/font-glyphs/src/letter/greek/lower-theta.ptl similarity index 90% rename from font-src/glyphs/letter/greek/lower-theta.ptl rename to packages/font-glyphs/src/letter/greek/lower-theta.ptl index aa51fe774..78fc3aa20 100644 --- a/font-src/glyphs/letter/greek/lower-theta.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-theta.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-upsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-upsilon.ptl similarity index 83% rename from font-src/glyphs/letter/greek/lower-upsilon.ptl rename to packages/font-glyphs/src/letter/greek/lower-upsilon.ptl index efabd90c7..b77cf35bc 100644 --- a/font-src/glyphs/letter/greek/lower-upsilon.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-upsilon.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-xi.ptl b/packages/font-glyphs/src/letter/greek/lower-xi.ptl similarity index 94% rename from font-src/glyphs/letter/greek/lower-xi.ptl rename to packages/font-glyphs/src/letter/greek/lower-xi.ptl index f2834649b..2b872f6f1 100644 --- a/font-src/glyphs/letter/greek/lower-xi.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-xi.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/lower-zeta.ptl b/packages/font-glyphs/src/letter/greek/lower-zeta.ptl similarity index 91% rename from font-src/glyphs/letter/greek/lower-zeta.ptl rename to packages/font-glyphs/src/letter/greek/lower-zeta.ptl index 7c4e3afaf..82a0ee9e7 100644 --- a/font-src/glyphs/letter/greek/lower-zeta.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-zeta.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix] from"../../../support/utils.mjs" +import [mix] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/greek/pi.ptl b/packages/font-glyphs/src/letter/greek/pi.ptl similarity index 95% rename from font-src/glyphs/letter/greek/pi.ptl rename to packages/font-glyphs/src/letter/greek/pi.ptl index 5d8f1f11f..0bf49c1df 100644 --- a/font-src/glyphs/letter/greek/pi.ptl +++ b/packages/font-glyphs/src/letter/greek/pi.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/psi.ptl b/packages/font-glyphs/src/letter/greek/psi.ptl similarity index 91% rename from font-src/glyphs/letter/greek/psi.ptl rename to packages/font-glyphs/src/letter/greek/psi.ptl index 6e4791ce7..825bd3f6f 100644 --- a/font-src/glyphs/letter/greek/psi.ptl +++ b/packages/font-glyphs/src/letter/greek/psi.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/qoppa.ptl b/packages/font-glyphs/src/letter/greek/qoppa.ptl similarity index 92% rename from font-src/glyphs/letter/greek/qoppa.ptl rename to packages/font-glyphs/src/letter/greek/qoppa.ptl index 7b8edca72..0c71a8188 100644 --- a/font-src/glyphs/letter/greek/qoppa.ptl +++ b/packages/font-glyphs/src/letter/greek/qoppa.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/sampi.ptl b/packages/font-glyphs/src/letter/greek/sampi.ptl similarity index 94% rename from font-src/glyphs/letter/greek/sampi.ptl rename to packages/font-glyphs/src/letter/greek/sampi.ptl index b844b2c9c..f72c46a08 100644 --- a/font-src/glyphs/letter/greek/sampi.ptl +++ b/packages/font-glyphs/src/letter/greek/sampi.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/upper-gamma.ptl b/packages/font-glyphs/src/letter/greek/upper-gamma.ptl similarity index 96% rename from font-src/glyphs/letter/greek/upper-gamma.ptl rename to packages/font-glyphs/src/letter/greek/upper-gamma.ptl index 3cc68123e..479cdc220 100644 --- a/font-src/glyphs/letter/greek/upper-gamma.ptl +++ b/packages/font-glyphs/src/letter/greek/upper-gamma.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/upper-omega.ptl b/packages/font-glyphs/src/letter/greek/upper-omega.ptl similarity index 89% rename from font-src/glyphs/letter/greek/upper-omega.ptl rename to packages/font-glyphs/src/letter/greek/upper-omega.ptl index 5aebe5b21..a56ae8cdf 100644 --- a/font-src/glyphs/letter/greek/upper-omega.ptl +++ b/packages/font-glyphs/src/letter/greek/upper-omega.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/upper-phi.ptl b/packages/font-glyphs/src/letter/greek/upper-phi.ptl similarity index 96% rename from font-src/glyphs/letter/greek/upper-phi.ptl rename to packages/font-glyphs/src/letter/greek/upper-phi.ptl index 7b4ab8922..f2b55143a 100644 --- a/font-src/glyphs/letter/greek/upper-phi.ptl +++ b/packages/font-glyphs/src/letter/greek/upper-phi.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback SuffixCfg] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback SuffixCfg] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/upper-sigma.ptl b/packages/font-glyphs/src/letter/greek/upper-sigma.ptl similarity index 87% rename from font-src/glyphs/letter/greek/upper-sigma.ptl rename to packages/font-glyphs/src/letter/greek/upper-sigma.ptl index d190aec35..9a31cc43e 100644 --- a/font-src/glyphs/letter/greek/upper-sigma.ptl +++ b/packages/font-glyphs/src/letter/greek/upper-sigma.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/upper-theta.ptl b/packages/font-glyphs/src/letter/greek/upper-theta.ptl similarity index 81% rename from font-src/glyphs/letter/greek/upper-theta.ptl rename to packages/font-glyphs/src/letter/greek/upper-theta.ptl index 1042f155e..ec8061c7e 100644 --- a/font-src/glyphs/letter/greek/upper-theta.ptl +++ b/packages/font-glyphs/src/letter/greek/upper-theta.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/greek/upper-xi.ptl b/packages/font-glyphs/src/letter/greek/upper-xi.ptl similarity index 83% rename from font-src/glyphs/letter/greek/upper-xi.ptl rename to packages/font-glyphs/src/letter/greek/upper-xi.ptl index 941a8b8ca..c6d869d05 100644 --- a/font-src/glyphs/letter/greek/upper-xi.ptl +++ b/packages/font-glyphs/src/letter/greek/upper-xi.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl b/packages/font-glyphs/src/letter/latin-ext/bidental-percussive.ptl similarity index 80% rename from font-src/glyphs/letter/latin-ext/bidental-percussive.ptl rename to packages/font-glyphs/src/letter/latin-ext/bidental-percussive.ptl index 136c8782f..4d3e34282 100644 --- a/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/bidental-percussive.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/egyptological.ptl b/packages/font-glyphs/src/letter/latin-ext/egyptological.ptl similarity index 96% rename from font-src/glyphs/letter/latin-ext/egyptological.ptl rename to packages/font-glyphs/src/letter/latin-ext/egyptological.ptl index cee126aa2..318e0927e 100644 --- a/font-src/glyphs/letter/latin-ext/egyptological.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/egyptological.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/eszet.ptl b/packages/font-glyphs/src/letter/latin-ext/eszet.ptl similarity index 97% rename from font-src/glyphs/letter/latin-ext/eszet.ptl rename to packages/font-glyphs/src/letter/latin-ext/eszet.ptl index 4b27cc447..e577f5535 100644 --- a/font-src/glyphs/letter/latin-ext/eszet.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/eszet.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" -import [maskBits] from"../../../support/util/mask-bit.mjs" +import [maskBits] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/eth.ptl b/packages/font-glyphs/src/letter/latin-ext/eth.ptl similarity index 96% rename from font-src/glyphs/letter/latin-ext/eth.ptl rename to packages/font-glyphs/src/letter/latin-ext/eth.ptl index c9c9ef5c0..7ff4280a4 100644 --- a/font-src/glyphs/letter/latin-ext/eth.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/eth.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/ezh.ptl b/packages/font-glyphs/src/letter/latin-ext/ezh.ptl similarity index 98% rename from font-src/glyphs/letter/latin-ext/ezh.ptl rename to packages/font-glyphs/src/letter/latin-ext/ezh.ptl index 058f3c28e..a56f0a26a 100644 --- a/font-src/glyphs/letter/latin-ext/ezh.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/ezh.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/f-ligatures.ptl b/packages/font-glyphs/src/letter/latin-ext/f-ligatures.ptl similarity index 95% rename from font-src/glyphs/letter/latin-ext/f-ligatures.ptl rename to packages/font-glyphs/src/letter/latin-ext/f-ligatures.ptl index ff0cd9007..81afe53d7 100644 --- a/font-src/glyphs/letter/latin-ext/f-ligatures.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/f-ligatures.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/flattened-open-a.ptl b/packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl similarity index 87% rename from font-src/glyphs/letter/latin-ext/flattened-open-a.ptl rename to packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl index b2a38e06d..441b97027 100644 --- a/font-src/glyphs/letter/latin-ext/flattened-open-a.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/flattened-open-a.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/gha.ptl b/packages/font-glyphs/src/letter/latin-ext/gha.ptl similarity index 92% rename from font-src/glyphs/letter/latin-ext/gha.ptl rename to packages/font-glyphs/src/letter/latin-ext/gha.ptl index ddd6629cf..c41b2c15d 100644 --- a/font-src/glyphs/letter/latin-ext/gha.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/gha.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/glottal-stop.ptl b/packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl similarity index 95% rename from font-src/glyphs/letter/latin-ext/glottal-stop.ptl rename to packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl index ed652cb0f..60410a59b 100644 --- a/font-src/glyphs/letter/latin-ext/glottal-stop.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/hwair.ptl b/packages/font-glyphs/src/letter/latin-ext/hwair.ptl similarity index 93% rename from font-src/glyphs/letter/latin-ext/hwair.ptl rename to packages/font-glyphs/src/letter/latin-ext/hwair.ptl index c9a443a8c..968d7d12a 100644 --- a/font-src/glyphs/letter/latin-ext/hwair.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/hwair.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/insular-g.ptl b/packages/font-glyphs/src/letter/latin-ext/insular-g.ptl similarity index 96% rename from font-src/glyphs/letter/latin-ext/insular-g.ptl rename to packages/font-glyphs/src/letter/latin-ext/insular-g.ptl index 3597cc5c0..39044356c 100644 --- a/font-src/glyphs/letter/latin-ext/insular-g.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/insular-g.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix] from"../../../support/utils.mjs" +import [mix] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/insular-t.ptl b/packages/font-glyphs/src/letter/latin-ext/insular-t.ptl similarity index 90% rename from font-src/glyphs/letter/latin-ext/insular-t.ptl rename to packages/font-glyphs/src/letter/latin-ext/insular-t.ptl index b2718775c..26e1cd313 100644 --- a/font-src/glyphs/letter/latin-ext/insular-t.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/insular-t.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix] from"../../../support/utils.mjs" +import [mix] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/long-s.ptl b/packages/font-glyphs/src/letter/latin-ext/long-s.ptl similarity index 98% rename from font-src/glyphs/letter/latin-ext/long-s.ptl rename to packages/font-glyphs/src/letter/latin-ext/long-s.ptl index 9d5684c65..d9cab861f 100644 --- a/font-src/glyphs/letter/latin-ext/long-s.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/long-s.ptl @@ -1,8 +1,8 @@ -$$include "../../../meta/macros.ptl" +$$include "../../meta/macros.ptl" -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" -import [maskBit maskBits] from"../../../support/util/mask-bit.mjs" +import [maskBit maskBits] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl similarity index 99% rename from font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl rename to packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl index 471cab1cd..6ac67c776 100644 --- a/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/lower-db-qp.ptl b/packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl similarity index 93% rename from font-src/glyphs/letter/latin-ext/lower-db-qp.ptl rename to packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl index 03743755f..060a49122 100644 --- a/font-src/glyphs/letter/latin-ext/lower-db-qp.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/lower-db-qp.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/middle-welsh-v.ptl b/packages/font-glyphs/src/letter/latin-ext/middle-welsh-v.ptl similarity index 88% rename from font-src/glyphs/letter/latin-ext/middle-welsh-v.ptl rename to packages/font-glyphs/src/letter/latin-ext/middle-welsh-v.ptl index c0f7eff16..3a6eeb098 100644 --- a/font-src/glyphs/letter/latin-ext/middle-welsh-v.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/middle-welsh-v.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/orthography.ptl b/packages/font-glyphs/src/letter/latin-ext/orthography.ptl similarity index 83% rename from font-src/glyphs/letter/latin-ext/orthography.ptl rename to packages/font-glyphs/src/letter/latin-ext/orthography.ptl index 8847ebe80..13c3b21a3 100644 --- a/font-src/glyphs/letter/latin-ext/orthography.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/orthography.ptl @@ -1,4 +1,4 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' glyph-module diff --git a/font-src/glyphs/letter/latin-ext/ou.ptl b/packages/font-glyphs/src/letter/latin-ext/ou.ptl similarity index 92% rename from font-src/glyphs/letter/latin-ext/ou.ptl rename to packages/font-glyphs/src/letter/latin-ext/ou.ptl index be084b26e..7c9bf3594 100644 --- a/font-src/glyphs/letter/latin-ext/ou.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/ou.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/rams-horn.ptl b/packages/font-glyphs/src/letter/latin-ext/rams-horn.ptl similarity index 96% rename from font-src/glyphs/letter/latin-ext/rams-horn.ptl rename to packages/font-glyphs/src/letter/latin-ext/rams-horn.ptl index 1e81eff9b..90ea3885e 100644 --- a/font-src/glyphs/letter/latin-ext/rams-horn.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/rams-horn.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/rhotic.ptl b/packages/font-glyphs/src/letter/latin-ext/rhotic.ptl similarity index 89% rename from font-src/glyphs/letter/latin-ext/rhotic.ptl rename to packages/font-glyphs/src/letter/latin-ext/rhotic.ptl index 2b4f9b267..0e854cd70 100644 --- a/font-src/glyphs/letter/latin-ext/rhotic.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/rhotic.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [IsSuperscript IsSubscript] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [IsSuperscript IsSubscript] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/sakha-yat.ptl b/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl similarity index 89% rename from font-src/glyphs/letter/latin-ext/sakha-yat.ptl rename to packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl index d54ad3cca..9bdd70074 100644 --- a/font-src/glyphs/letter/latin-ext/sakha-yat.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/sakha-yat.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/thorn.ptl b/packages/font-glyphs/src/letter/latin-ext/thorn.ptl similarity index 96% rename from font-src/glyphs/letter/latin-ext/thorn.ptl rename to packages/font-glyphs/src/letter/latin-ext/thorn.ptl index 81375e902..2b1473c0a 100644 --- a/font-src/glyphs/letter/latin-ext/thorn.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/thorn.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/upper-aa-ao.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl similarity index 96% rename from font-src/glyphs/letter/latin-ext/upper-aa-ao.ptl rename to packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl index 366280259..db54b1faa 100644 --- a/font-src/glyphs/letter/latin-ext/upper-aa-ao.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [maskOffBits] from"../../../support/util/mask-bit.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [maskOffBits] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl similarity index 98% rename from font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl rename to packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl index 6d97f185f..d7f7398e9 100644 --- a/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-ae-oe.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/wynn.ptl b/packages/font-glyphs/src/letter/latin-ext/wynn.ptl similarity index 93% rename from font-src/glyphs/letter/latin-ext/wynn.ptl rename to packages/font-glyphs/src/letter/latin-ext/wynn.ptl index 4594d4994..89484954e 100644 --- a/font-src/glyphs/letter/latin-ext/wynn.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/wynn.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin-ext/yogh.ptl b/packages/font-glyphs/src/letter/latin-ext/yogh.ptl similarity index 95% rename from font-src/glyphs/letter/latin-ext/yogh.ptl rename to packages/font-glyphs/src/letter/latin-ext/yogh.ptl index d7f2024e0..76f10c24a 100644 --- a/font-src/glyphs/letter/latin-ext/yogh.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/yogh.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin.ptl b/packages/font-glyphs/src/letter/latin.ptl similarity index 98% rename from font-src/glyphs/letter/latin.ptl rename to packages/font-glyphs/src/letter/latin.ptl index 112e6b91c..3acbe4362 100644 --- a/font-src/glyphs/letter/latin.ptl +++ b/packages/font-glyphs/src/letter/latin.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/letter/latin/c.ptl b/packages/font-glyphs/src/letter/latin/c.ptl similarity index 98% rename from font-src/glyphs/letter/latin/c.ptl rename to packages/font-glyphs/src/letter/latin/c.ptl index fe361033f..88d8db2a8 100644 --- a/font-src/glyphs/letter/latin/c.ptl +++ b/packages/font-glyphs/src/letter/latin/c.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DependentSelector MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DependentSelector MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/k.ptl b/packages/font-glyphs/src/letter/latin/k.ptl similarity index 99% rename from font-src/glyphs/letter/latin/k.ptl rename to packages/font-glyphs/src/letter/latin/k.ptl index c102f1891..a5581d9a5 100644 --- a/font-src/glyphs/letter/latin/k.ptl +++ b/packages/font-glyphs/src/letter/latin/k.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix clamp fallback linreg SuffixCfg] from"../../../support/utils.mjs" -import [Dotless MathSansSerif HintClass] from"../../../support/gr.mjs" -import [maskBit] from"../../../support/util/mask-bit.mjs" +import [mix clamp fallback linreg SuffixCfg] from "@iosevka/util" +import [Dotless MathSansSerif HintClass] from "@iosevka/glyph/relation" +import [maskBit] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-a.ptl b/packages/font-glyphs/src/letter/latin/lower-a.ptl similarity index 98% rename from font-src/glyphs/letter/latin/lower-a.ptl rename to packages/font-glyphs/src/letter/latin/lower-a.ptl index 2b9e2e599..95b6bcab4 100644 --- a/font-src/glyphs/letter/latin/lower-a.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-a.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-b.ptl b/packages/font-glyphs/src/letter/latin/lower-b.ptl similarity index 95% rename from font-src/glyphs/letter/latin/lower-b.ptl rename to packages/font-glyphs/src/letter/latin/lower-b.ptl index f12020dc8..e8d5b7cc3 100644 --- a/font-src/glyphs/letter/latin/lower-b.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-b.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-d.ptl b/packages/font-glyphs/src/letter/latin/lower-d.ptl similarity index 97% rename from font-src/glyphs/letter/latin/lower-d.ptl rename to packages/font-glyphs/src/letter/latin/lower-d.ptl index b661c4905..1c9a3806f 100644 --- a/font-src/glyphs/letter/latin/lower-d.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-d.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix clamp fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix clamp fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-e.ptl b/packages/font-glyphs/src/letter/latin/lower-e.ptl similarity index 98% rename from font-src/glyphs/letter/latin/lower-e.ptl rename to packages/font-glyphs/src/letter/latin/lower-e.ptl index 2fc89d33f..16473e268 100644 --- a/font-src/glyphs/letter/latin/lower-e.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-e.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DependentSelector] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DependentSelector] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-f.ptl b/packages/font-glyphs/src/letter/latin/lower-f.ptl similarity index 98% rename from font-src/glyphs/letter/latin/lower-f.ptl rename to packages/font-glyphs/src/letter/latin/lower-f.ptl index 8cdaf17da..9ca6af429 100644 --- a/font-src/glyphs/letter/latin/lower-f.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-f.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-g.ptl b/packages/font-glyphs/src/letter/latin/lower-g.ptl similarity index 98% rename from font-src/glyphs/letter/latin/lower-g.ptl rename to packages/font-glyphs/src/letter/latin/lower-g.ptl index be1809e7e..f992b2074 100644 --- a/font-src/glyphs/letter/latin/lower-g.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-g.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-h.ptl b/packages/font-glyphs/src/letter/latin/lower-h.ptl similarity index 97% rename from font-src/glyphs/letter/latin/lower-h.ptl rename to packages/font-glyphs/src/letter/latin/lower-h.ptl index 2bc2b46c1..7637f234f 100644 --- a/font-src/glyphs/letter/latin/lower-h.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-h.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [ScheduleLeaningMark MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [ScheduleLeaningMark MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-il.ptl b/packages/font-glyphs/src/letter/latin/lower-il.ptl similarity index 99% rename from font-src/glyphs/letter/latin/lower-il.ptl rename to packages/font-glyphs/src/letter/latin/lower-il.ptl index 0fceb180f..bbb6e69e2 100644 --- a/font-src/glyphs/letter/latin/lower-il.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-il.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Dotless MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Dotless MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-j.ptl b/packages/font-glyphs/src/letter/latin/lower-j.ptl similarity index 97% rename from font-src/glyphs/letter/latin/lower-j.ptl rename to packages/font-glyphs/src/letter/latin/lower-j.ptl index 03fab7652..031ab2b99 100644 --- a/font-src/glyphs/letter/latin/lower-j.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-j.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Dotless MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Dotless MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-m.ptl b/packages/font-glyphs/src/letter/latin/lower-m.ptl similarity index 99% rename from font-src/glyphs/letter/latin/lower-m.ptl rename to packages/font-glyphs/src/letter/latin/lower-m.ptl index ae83758a8..6547af18d 100644 --- a/font-src/glyphs/letter/latin/lower-m.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-m.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-n.ptl b/packages/font-glyphs/src/letter/latin/lower-n.ptl similarity index 98% rename from font-src/glyphs/letter/latin/lower-n.ptl rename to packages/font-glyphs/src/letter/latin/lower-n.ptl index df38fcb47..44d06651d 100644 --- a/font-src/glyphs/letter/latin/lower-n.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-n.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix clamp fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif Joining] from"../../../support/gr.mjs" +import [mix clamp fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif Joining] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-p.ptl b/packages/font-glyphs/src/letter/latin/lower-p.ptl similarity index 96% rename from font-src/glyphs/letter/latin/lower-p.ptl rename to packages/font-glyphs/src/letter/latin/lower-p.ptl index 2fc5506de..ec93ea116 100644 --- a/font-src/glyphs/letter/latin/lower-p.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-p.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-q.ptl b/packages/font-glyphs/src/letter/latin/lower-q.ptl similarity index 96% rename from font-src/glyphs/letter/latin/lower-q.ptl rename to packages/font-glyphs/src/letter/latin/lower-q.ptl index 2c6b91216..cafed0473 100644 --- a/font-src/glyphs/letter/latin/lower-q.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-q.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-r.ptl b/packages/font-glyphs/src/letter/latin/lower-r.ptl similarity index 98% rename from font-src/glyphs/letter/latin/lower-r.ptl rename to packages/font-glyphs/src/letter/latin/lower-r.ptl index 49591a829..b739414e5 100644 --- a/font-src/glyphs/letter/latin/lower-r.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-r.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-t.ptl b/packages/font-glyphs/src/letter/latin/lower-t.ptl similarity index 99% rename from font-src/glyphs/letter/latin/lower-t.ptl rename to packages/font-glyphs/src/letter/latin/lower-t.ptl index b330be8cd..96c6e0f57 100644 --- a/font-src/glyphs/letter/latin/lower-t.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-t.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix clamp SuffixCfg] from"../../../support/utils.mjs" +import [mix clamp SuffixCfg] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin/lower-y.ptl b/packages/font-glyphs/src/letter/latin/lower-y.ptl similarity index 99% rename from font-src/glyphs/letter/latin/lower-y.ptl rename to packages/font-glyphs/src/letter/latin/lower-y.ptl index ff5756028..a4fdc94b9 100644 --- a/font-src/glyphs/letter/latin/lower-y.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-y.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg fallback SuffixCfg] from"../../../support/utils.mjs" -import [LowerYDotAtBelow Dotless CvDecompose MathSansSerif OgonekTrY] from"../../../support/gr.mjs" +import [mix linreg fallback SuffixCfg] from "@iosevka/util" +import [LowerYDotAtBelow Dotless CvDecompose MathSansSerif OgonekTrY] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/o.ptl b/packages/font-glyphs/src/letter/latin/o.ptl similarity index 99% rename from font-src/glyphs/letter/latin/o.ptl rename to packages/font-glyphs/src/letter/latin/o.ptl index 24ec8f2ba..1a7549d38 100644 --- a/font-src/glyphs/letter/latin/o.ptl +++ b/packages/font-glyphs/src/letter/latin/o.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin/s.ptl b/packages/font-glyphs/src/letter/latin/s.ptl similarity index 99% rename from font-src/glyphs/letter/latin/s.ptl rename to packages/font-glyphs/src/letter/latin/s.ptl index 8db17bfee..a2083ea8c 100644 --- a/font-src/glyphs/letter/latin/s.ptl +++ b/packages/font-glyphs/src/letter/latin/s.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DependentSelector MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DependentSelector MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/u.ptl b/packages/font-glyphs/src/letter/latin/u.ptl similarity index 98% rename from font-src/glyphs/letter/latin/u.ptl rename to packages/font-glyphs/src/letter/latin/u.ptl index 9554b7b22..b5e2f2587 100644 --- a/font-src/glyphs/letter/latin/u.ptl +++ b/packages/font-glyphs/src/letter/latin/u.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-a.ptl b/packages/font-glyphs/src/letter/latin/upper-a.ptl similarity index 97% rename from font-src/glyphs/letter/latin/upper-a.ptl rename to packages/font-glyphs/src/letter/latin/upper-a.ptl index e07ad206c..c2c0b6c13 100644 --- a/font-src/glyphs/letter/latin/upper-a.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-a.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" -import [maskBits bitOr] from"../../../support/util/mask-bit.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" +import [maskBits bitOr] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-b.ptl b/packages/font-glyphs/src/letter/latin/upper-b.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-b.ptl rename to packages/font-glyphs/src/letter/latin/upper-b.ptl index fc6a049a9..33eea28b9 100644 --- a/font-src/glyphs/letter/latin/upper-b.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-b.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-d.ptl b/packages/font-glyphs/src/letter/latin/upper-d.ptl similarity index 96% rename from font-src/glyphs/letter/latin/upper-d.ptl rename to packages/font-glyphs/src/letter/latin/upper-d.ptl index 0912c31e7..fda5997c9 100644 --- a/font-src/glyphs/letter/latin/upper-d.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-d.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix clamp fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix clamp fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-e.ptl b/packages/font-glyphs/src/letter/latin/upper-e.ptl similarity index 95% rename from font-src/glyphs/letter/latin/upper-e.ptl rename to packages/font-glyphs/src/letter/latin/upper-e.ptl index 77f807cbd..3887c1652 100644 --- a/font-src/glyphs/letter/latin/upper-e.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-e.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-f.ptl b/packages/font-glyphs/src/letter/latin/upper-f.ptl similarity index 95% rename from font-src/glyphs/letter/latin/upper-f.ptl rename to packages/font-glyphs/src/letter/latin/upper-f.ptl index 560661d94..438188219 100644 --- a/font-src/glyphs/letter/latin/upper-f.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-f.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-g.ptl b/packages/font-glyphs/src/letter/latin/upper-g.ptl similarity index 97% rename from font-src/glyphs/letter/latin/upper-g.ptl rename to packages/font-glyphs/src/letter/latin/upper-g.ptl index 52b5135aa..43ed9a626 100644 --- a/font-src/glyphs/letter/latin/upper-g.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-g.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-h.ptl b/packages/font-glyphs/src/letter/latin/upper-h.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-h.ptl rename to packages/font-glyphs/src/letter/latin/upper-h.ptl index 4fb931c98..b4a3318ab 100644 --- a/font-src/glyphs/letter/latin/upper-h.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-h.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-i.ptl b/packages/font-glyphs/src/letter/latin/upper-i.ptl similarity index 94% rename from font-src/glyphs/letter/latin/upper-i.ptl rename to packages/font-glyphs/src/letter/latin/upper-i.ptl index e8d62d913..fb5608c84 100644 --- a/font-src/glyphs/letter/latin/upper-i.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-i.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-j.ptl b/packages/font-glyphs/src/letter/latin/upper-j.ptl similarity index 97% rename from font-src/glyphs/letter/latin/upper-j.ptl rename to packages/font-glyphs/src/letter/latin/upper-j.ptl index 4bf5547bc..ee13ad8ee 100644 --- a/font-src/glyphs/letter/latin/upper-j.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-j.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-l.ptl b/packages/font-glyphs/src/letter/latin/upper-l.ptl similarity index 96% rename from font-src/glyphs/letter/latin/upper-l.ptl rename to packages/font-glyphs/src/letter/latin/upper-l.ptl index 13b831a60..e7e638707 100644 --- a/font-src/glyphs/letter/latin/upper-l.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-l.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-m.ptl b/packages/font-glyphs/src/letter/latin/upper-m.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-m.ptl rename to packages/font-glyphs/src/letter/latin/upper-m.ptl index c2104cb77..0c75e0b8a 100644 --- a/font-src/glyphs/letter/latin/upper-m.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-m.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-n.ptl b/packages/font-glyphs/src/letter/latin/upper-n.ptl similarity index 97% rename from font-src/glyphs/letter/latin/upper-n.ptl rename to packages/font-glyphs/src/letter/latin/upper-n.ptl index e8586e09e..31eb8bea6 100644 --- a/font-src/glyphs/letter/latin/upper-n.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-n.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-p.ptl b/packages/font-glyphs/src/letter/latin/upper-p.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-p.ptl rename to packages/font-glyphs/src/letter/latin/upper-p.ptl index abfaeafbd..43e7393dd 100644 --- a/font-src/glyphs/letter/latin/upper-p.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-p.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-q.ptl b/packages/font-glyphs/src/letter/latin/upper-q.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-q.ptl rename to packages/font-glyphs/src/letter/latin/upper-q.ptl index bfb5f8f0b..6666ea2c9 100644 --- a/font-src/glyphs/letter/latin/upper-q.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-q.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-r.ptl b/packages/font-glyphs/src/letter/latin/upper-r.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-r.ptl rename to packages/font-glyphs/src/letter/latin/upper-r.ptl index 44ebec52c..0dec8137d 100644 --- a/font-src/glyphs/letter/latin/upper-r.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-r.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-t.ptl b/packages/font-glyphs/src/letter/latin/upper-t.ptl similarity index 98% rename from font-src/glyphs/letter/latin/upper-t.ptl rename to packages/font-glyphs/src/letter/latin/upper-t.ptl index bb1ad7848..58dc89af5 100644 --- a/font-src/glyphs/letter/latin/upper-t.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-t.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/upper-y.ptl b/packages/font-glyphs/src/letter/latin/upper-y.ptl similarity index 97% rename from font-src/glyphs/letter/latin/upper-y.ptl rename to packages/font-glyphs/src/letter/latin/upper-y.ptl index 719053233..72f8c4f3e 100644 --- a/font-src/glyphs/letter/latin/upper-y.ptl +++ b/packages/font-glyphs/src/letter/latin/upper-y.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/v.ptl b/packages/font-glyphs/src/letter/latin/v.ptl similarity index 98% rename from font-src/glyphs/letter/latin/v.ptl rename to packages/font-glyphs/src/letter/latin/v.ptl index 10c12a167..64716d846 100644 --- a/font-src/glyphs/letter/latin/v.ptl +++ b/packages/font-glyphs/src/letter/latin/v.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/w.ptl b/packages/font-glyphs/src/letter/latin/w.ptl similarity index 99% rename from font-src/glyphs/letter/latin/w.ptl rename to packages/font-glyphs/src/letter/latin/w.ptl index e21b03953..1b9d23964 100644 --- a/font-src/glyphs/letter/latin/w.ptl +++ b/packages/font-glyphs/src/letter/latin/w.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/x.ptl b/packages/font-glyphs/src/letter/latin/x.ptl similarity index 98% rename from font-src/glyphs/letter/latin/x.ptl rename to packages/font-glyphs/src/letter/latin/x.ptl index b8083ecad..2867168b5 100644 --- a/font-src/glyphs/letter/latin/x.ptl +++ b/packages/font-glyphs/src/letter/latin/x.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [MathSansSerif] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/latin/z.ptl b/packages/font-glyphs/src/letter/latin/z.ptl similarity index 98% rename from font-src/glyphs/letter/latin/z.ptl rename to packages/font-glyphs/src/letter/latin/z.ptl index 1cdb01620..9202f83be 100644 --- a/font-src/glyphs/letter/latin/z.ptl +++ b/packages/font-glyphs/src/letter/latin/z.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix SuffixCfg fallback] from"../../../support/utils.mjs" -import [CvDecompose MathSansSerif] from"../../../support/gr.mjs" +import [mix SuffixCfg fallback] from "@iosevka/util" +import [CvDecompose MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/letter/shared.ptl b/packages/font-glyphs/src/letter/shared.ptl similarity index 99% rename from font-src/glyphs/letter/shared.ptl rename to packages/font-glyphs/src/letter/shared.ptl index 1fe516099..8b24b2b2c 100644 --- a/font-src/glyphs/letter/shared.ptl +++ b/packages/font-glyphs/src/letter/shared.ptl @@ -1,8 +1,8 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix clamp fallback] from"../../support/utils.mjs" -import [Dotless CvDecompose RightDependentTrigger RightDependentLink DependentSelector] from"../../support/gr.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" +import [mix clamp fallback] from "@iosevka/util" +import [Dotless CvDecompose RightDependentTrigger RightDependentLink DependentSelector] from "@iosevka/glyph/relation" +import [DesignParameters] from "../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/marks/above.ptl b/packages/font-glyphs/src/marks/above.ptl similarity index 99% rename from font-src/glyphs/marks/above.ptl rename to packages/font-glyphs/src/marks/above.ptl index 830d6cfa8..87238aa90 100644 --- a/font-src/glyphs/marks/above.ptl +++ b/packages/font-glyphs/src/marks/above.ptl @@ -1,12 +1,12 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [OffsetCurve BezToContoursSink GEOMETRY_PRECISION] from"../../support/geometry/curve-util.mjs" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [ScheduleLeaningMark] from"../../support/gr.mjs" -import [Box] from"../../support/geometry/box.mjs" -import [Point] from"../../support/geometry/point.mjs" +import [OffsetCurve BezToContoursSink GEOMETRY_PRECISION] from "@iosevka/geometry/curve-util" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../meta/aesthetics.mjs" +import [ScheduleLeaningMark] from "@iosevka/glyph/relation" +import [Box] from "@iosevka/geometry/box" +import [Point] from "@iosevka/geometry/point" glyph-module diff --git a/font-src/glyphs/marks/adjust.ptl b/packages/font-glyphs/src/marks/adjust.ptl similarity index 95% rename from font-src/glyphs/marks/adjust.ptl rename to packages/font-glyphs/src/marks/adjust.ptl index 43ed0b211..4de010441 100644 --- a/font-src/glyphs/marks/adjust.ptl +++ b/packages/font-glyphs/src/marks/adjust.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix fallback] from"../../support/utils.mjs" +import [mix fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/marks/below.ptl b/packages/font-glyphs/src/marks/below.ptl similarity index 97% rename from font-src/glyphs/marks/below.ptl rename to packages/font-glyphs/src/marks/below.ptl index 2ec1caa20..8e8cc66dd 100644 --- a/font-src/glyphs/marks/below.ptl +++ b/packages/font-glyphs/src/marks/below.ptl @@ -1,10 +1,9 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [ScheduleLeaningMark] from"../../support/gr.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [ScheduleLeaningMark] from "@iosevka/glyph/relation" +import [Box] from "@iosevka/geometry/box" glyph-module diff --git a/font-src/glyphs/marks/composite.ptl b/packages/font-glyphs/src/marks/composite.ptl similarity index 96% rename from font-src/glyphs/marks/composite.ptl rename to packages/font-glyphs/src/marks/composite.ptl index be3ae8f95..94ba86c3a 100644 --- a/font-src/glyphs/marks/composite.ptl +++ b/packages/font-glyphs/src/marks/composite.ptl @@ -1,9 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/marks/horn-and-angle.ptl b/packages/font-glyphs/src/marks/horn-and-angle.ptl similarity index 97% rename from font-src/glyphs/marks/horn-and-angle.ptl rename to packages/font-glyphs/src/marks/horn-and-angle.ptl index f77d37f30..ab44411aa 100644 --- a/font-src/glyphs/marks/horn-and-angle.ptl +++ b/packages/font-glyphs/src/marks/horn-and-angle.ptl @@ -1,9 +1,8 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/marks/index.ptl b/packages/font-glyphs/src/marks/index.ptl similarity index 91% rename from font-src/glyphs/marks/index.ptl rename to packages/font-glyphs/src/marks/index.ptl index 091a32abf..9ccce2064 100644 --- a/font-src/glyphs/marks/index.ptl +++ b/packages/font-glyphs/src/marks/index.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' glyph-module diff --git a/font-src/glyphs/marks/overlay.ptl b/packages/font-glyphs/src/marks/overlay.ptl similarity index 98% rename from font-src/glyphs/marks/overlay.ptl rename to packages/font-glyphs/src/marks/overlay.ptl index 29df4c481..d794cbca1 100644 --- a/font-src/glyphs/marks/overlay.ptl +++ b/packages/font-glyphs/src/marks/overlay.ptl @@ -1,9 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/marks/shared-metrics.ptl b/packages/font-glyphs/src/marks/shared-metrics.ptl similarity index 82% rename from font-src/glyphs/marks/shared-metrics.ptl rename to packages/font-glyphs/src/marks/shared-metrics.ptl index 42e8b3361..5eda903a5 100644 --- a/font-src/glyphs/marks/shared-metrics.ptl +++ b/packages/font-glyphs/src/marks/shared-metrics.ptl @@ -1,9 +1,9 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../meta/aesthetics.mjs" +import [Box] from "@iosevka/geometry/box" glyph-module diff --git a/font-src/glyphs/marks/tie.ptl b/packages/font-glyphs/src/marks/tie.ptl similarity index 94% rename from font-src/glyphs/marks/tie.ptl rename to packages/font-glyphs/src/marks/tie.ptl index bbbd19a8b..2b04c5d01 100644 --- a/font-src/glyphs/marks/tie.ptl +++ b/packages/font-glyphs/src/marks/tie.ptl @@ -1,10 +1,8 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' import [Arcs Quadify ShapeConv] from "typo-geom" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" -import [TieMark TieGlyph] from"../../support/gr.mjs" -import [Box] from"../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [TieMark TieGlyph] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/meta/aesthetics.ptl b/packages/font-glyphs/src/meta/aesthetics.ptl similarity index 98% rename from font-src/meta/aesthetics.ptl rename to packages/font-glyphs/src/meta/aesthetics.ptl index 726b251c2..cc7585100 100644 --- a/font-src/meta/aesthetics.ptl +++ b/packages/font-glyphs/src/meta/aesthetics.ptl @@ -1,7 +1,7 @@ -import [Point] from"../support/geometry/point.mjs" -import [Transform] from"../support/geometry/transform.mjs" -import [Anchor] from"../support/geometry/anchor.mjs" -import [mix linreg clamp fallback] from"../support/utils.mjs" +import [Point] from "@iosevka/geometry/point" +import [Transform] from "@iosevka/geometry/transform" +import [Anchor] from "@iosevka/geometry/anchor" +import [mix linreg clamp fallback] from "@iosevka/util" # Parameter generation export : define [calculateMetrics para] : begin diff --git a/font-src/meta/macros.ptl b/packages/font-glyphs/src/meta/macros.ptl similarity index 100% rename from font-src/meta/macros.ptl rename to packages/font-glyphs/src/meta/macros.ptl diff --git a/font-src/meta/unicode-knowledge.ptl b/packages/font-glyphs/src/meta/unicode-knowledge.ptl similarity index 100% rename from font-src/meta/unicode-knowledge.ptl rename to packages/font-glyphs/src/meta/unicode-knowledge.ptl diff --git a/font-src/glyphs/number/0.ptl b/packages/font-glyphs/src/number/0.ptl similarity index 98% rename from font-src/glyphs/number/0.ptl rename to packages/font-glyphs/src/number/0.ptl index fdd723333..b7218ad6a 100644 --- a/font-src/glyphs/number/0.ptl +++ b/packages/font-glyphs/src/number/0.ptl @@ -1,7 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix clamp fallback SuffixCfg] from"../../support/utils.mjs" -import [VS01 Zero] from"../../support/gr.mjs" +import [mix clamp fallback SuffixCfg] from "@iosevka/util" +import [VS01 Zero] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/number/1.ptl b/packages/font-glyphs/src/number/1.ptl similarity index 95% rename from font-src/glyphs/number/1.ptl rename to packages/font-glyphs/src/number/1.ptl index 1c8a14d5c..4daa85585 100644 --- a/font-src/glyphs/number/1.ptl +++ b/packages/font-glyphs/src/number/1.ptl @@ -1,7 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [MathSansSerif] from"../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/number/2.ptl b/packages/font-glyphs/src/number/2.ptl similarity index 96% rename from font-src/glyphs/number/2.ptl rename to packages/font-glyphs/src/number/2.ptl index fce14d8f9..73bbb7621 100644 --- a/font-src/glyphs/number/2.ptl +++ b/packages/font-glyphs/src/number/2.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/3.ptl b/packages/font-glyphs/src/number/3.ptl similarity index 95% rename from font-src/glyphs/number/3.ptl rename to packages/font-glyphs/src/number/3.ptl index 6bcbf3d05..bea7731ba 100644 --- a/font-src/glyphs/number/3.ptl +++ b/packages/font-glyphs/src/number/3.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/4.ptl b/packages/font-glyphs/src/number/4.ptl similarity index 97% rename from font-src/glyphs/number/4.ptl rename to packages/font-glyphs/src/number/4.ptl index 60cfbff2a..2c6b4fe3d 100644 --- a/font-src/glyphs/number/4.ptl +++ b/packages/font-glyphs/src/number/4.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/5.ptl b/packages/font-glyphs/src/number/5.ptl similarity index 97% rename from font-src/glyphs/number/5.ptl rename to packages/font-glyphs/src/number/5.ptl index 09815ee58..429457111 100644 --- a/font-src/glyphs/number/5.ptl +++ b/packages/font-glyphs/src/number/5.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback SuffixCfg] from"../../support/utils.mjs" +import [mix linreg clamp fallback SuffixCfg] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/6.ptl b/packages/font-glyphs/src/number/6.ptl similarity index 97% rename from font-src/glyphs/number/6.ptl rename to packages/font-glyphs/src/number/6.ptl index a5b9e1f1c..6f6947cbb 100644 --- a/font-src/glyphs/number/6.ptl +++ b/packages/font-glyphs/src/number/6.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/7.ptl b/packages/font-glyphs/src/number/7.ptl similarity index 96% rename from font-src/glyphs/number/7.ptl rename to packages/font-glyphs/src/number/7.ptl index dc002d3c7..acafa1621 100644 --- a/font-src/glyphs/number/7.ptl +++ b/packages/font-glyphs/src/number/7.ptl @@ -1,7 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix fallback SuffixCfg] from"../../support/utils.mjs" -import [MathSansSerif] from"../../support/gr.mjs" +import [mix fallback SuffixCfg] from "@iosevka/util" +import [MathSansSerif] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/number/8.ptl b/packages/font-glyphs/src/number/8.ptl similarity index 98% rename from font-src/glyphs/number/8.ptl rename to packages/font-glyphs/src/number/8.ptl index b4fccdb67..49010b329 100644 --- a/font-src/glyphs/number/8.ptl +++ b/packages/font-glyphs/src/number/8.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/9.ptl b/packages/font-glyphs/src/number/9.ptl similarity index 94% rename from font-src/glyphs/number/9.ptl rename to packages/font-glyphs/src/number/9.ptl index 9154db82c..d38291d9c 100644 --- a/font-src/glyphs/number/9.ptl +++ b/packages/font-glyphs/src/number/9.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/number/index.ptl b/packages/font-glyphs/src/number/index.ptl similarity index 91% rename from font-src/glyphs/number/index.ptl rename to packages/font-glyphs/src/number/index.ptl index d68b095ef..a99f9cab7 100644 --- a/font-src/glyphs/number/index.ptl +++ b/packages/font-glyphs/src/number/index.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' glyph-module diff --git a/font-src/glyphs/number/shared.ptl b/packages/font-glyphs/src/number/shared.ptl similarity index 86% rename from font-src/glyphs/number/shared.ptl rename to packages/font-glyphs/src/number/shared.ptl index 0d0db8962..acc7fafd2 100644 --- a/font-src/glyphs/number/shared.ptl +++ b/packages/font-glyphs/src/number/shared.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/space/index.ptl b/packages/font-glyphs/src/space/index.ptl similarity index 93% rename from font-src/glyphs/space/index.ptl rename to packages/font-glyphs/src/space/index.ptl index da1fff033..d61794e97 100644 --- a/font-src/glyphs/space/index.ptl +++ b/packages/font-glyphs/src/space/index.ptl @@ -1,7 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [Joining] from"../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Joining] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/arrow.ptl b/packages/font-glyphs/src/symbol/arrow.ptl similarity index 99% rename from font-src/glyphs/symbol/arrow.ptl rename to packages/font-glyphs/src/symbol/arrow.ptl index 71bbdd471..fdda40cff 100644 --- a/font-src/glyphs/symbol/arrow.ptl +++ b/packages/font-glyphs/src/symbol/arrow.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/braille.ptl b/packages/font-glyphs/src/symbol/braille.ptl similarity index 92% rename from font-src/glyphs/symbol/braille.ptl rename to packages/font-glyphs/src/symbol/braille.ptl index 531979f75..edd7c143f 100644 --- a/font-src/glyphs/symbol/braille.ptl +++ b/packages/font-glyphs/src/symbol/braille.ptl @@ -1,8 +1,8 @@ ###### Braille symbols -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [maskBit maskBits popCountByte] from"../../support/util/mask-bit.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [maskBit maskBits popCountByte] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/symbol/enclosure.ptl b/packages/font-glyphs/src/symbol/enclosure.ptl similarity index 66% rename from font-src/glyphs/symbol/enclosure.ptl rename to packages/font-glyphs/src/symbol/enclosure.ptl index d795f35a0..9cd30da37 100644 --- a/font-src/glyphs/symbol/enclosure.ptl +++ b/packages/font-glyphs/src/symbol/enclosure.ptl @@ -1,7 +1,7 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric.ptl b/packages/font-glyphs/src/symbol/geometric.ptl similarity index 93% rename from font-src/glyphs/symbol/geometric.ptl rename to packages/font-glyphs/src/symbol/geometric.ptl index 5164d46ff..519601074 100644 --- a/font-src/glyphs/symbol/geometric.ptl +++ b/packages/font-glyphs/src/symbol/geometric.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/symbol/geometric/ballot-box.ptl b/packages/font-glyphs/src/symbol/geometric/ballot-box.ptl similarity index 90% rename from font-src/glyphs/symbol/geometric/ballot-box.ptl rename to packages/font-glyphs/src/symbol/geometric/ballot-box.ptl index d8150a0de..b4f4e675e 100644 --- a/font-src/glyphs/symbol/geometric/ballot-box.ptl +++ b/packages/font-glyphs/src/symbol/geometric/ballot-box.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/corner-shape.ptl b/packages/font-glyphs/src/symbol/geometric/corner-shape.ptl similarity index 97% rename from font-src/glyphs/symbol/geometric/corner-shape.ptl rename to packages/font-glyphs/src/symbol/geometric/corner-shape.ptl index 3c426fdd1..37561b825 100644 --- a/font-src/glyphs/symbol/geometric/corner-shape.ptl +++ b/packages/font-glyphs/src/symbol/geometric/corner-shape.ptl @@ -1,4 +1,4 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' glyph-module diff --git a/font-src/glyphs/symbol/geometric/dotted.ptl b/packages/font-glyphs/src/symbol/geometric/dotted.ptl similarity index 95% rename from font-src/glyphs/symbol/geometric/dotted.ptl rename to packages/font-glyphs/src/symbol/geometric/dotted.ptl index ab32d6415..a4b70636c 100644 --- a/font-src/glyphs/symbol/geometric/dotted.ptl +++ b/packages/font-glyphs/src/symbol/geometric/dotted.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/masked.ptl b/packages/font-glyphs/src/symbol/geometric/masked.ptl similarity index 98% rename from font-src/glyphs/symbol/geometric/masked.ptl rename to packages/font-glyphs/src/symbol/geometric/masked.ptl index ab6e556b9..915f9b2af 100644 --- a/font-src/glyphs/symbol/geometric/masked.ptl +++ b/packages/font-glyphs/src/symbol/geometric/masked.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/plain.ptl b/packages/font-glyphs/src/symbol/geometric/plain.ptl similarity index 99% rename from font-src/glyphs/symbol/geometric/plain.ptl rename to packages/font-glyphs/src/symbol/geometric/plain.ptl index ba283ffc8..41fc230bb 100644 --- a/font-src/glyphs/symbol/geometric/plain.ptl +++ b/packages/font-glyphs/src/symbol/geometric/plain.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/rounded.ptl b/packages/font-glyphs/src/symbol/geometric/rounded.ptl similarity index 92% rename from font-src/glyphs/symbol/geometric/rounded.ptl rename to packages/font-glyphs/src/symbol/geometric/rounded.ptl index bde249b5c..872f109c2 100644 --- a/font-src/glyphs/symbol/geometric/rounded.ptl +++ b/packages/font-glyphs/src/symbol/geometric/rounded.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/shaded.ptl b/packages/font-glyphs/src/symbol/geometric/shaded.ptl similarity index 97% rename from font-src/glyphs/symbol/geometric/shaded.ptl rename to packages/font-glyphs/src/symbol/geometric/shaded.ptl index 1494aefe5..575c0ebc9 100644 --- a/font-src/glyphs/symbol/geometric/shaded.ptl +++ b/packages/font-glyphs/src/symbol/geometric/shaded.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/shared.ptl b/packages/font-glyphs/src/symbol/geometric/shared.ptl similarity index 94% rename from font-src/glyphs/symbol/geometric/shared.ptl rename to packages/font-glyphs/src/symbol/geometric/shared.ptl index dde40c368..d61cb0cb8 100644 --- a/font-src/glyphs/symbol/geometric/shared.ptl +++ b/packages/font-glyphs/src/symbol/geometric/shared.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/stars.ptl b/packages/font-glyphs/src/symbol/geometric/stars.ptl similarity index 98% rename from font-src/glyphs/symbol/geometric/stars.ptl rename to packages/font-glyphs/src/symbol/geometric/stars.ptl index b3b47afb6..1cbe9d552 100644 --- a/font-src/glyphs/symbol/geometric/stars.ptl +++ b/packages/font-glyphs/src/symbol/geometric/stars.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/geometric/sun-and-gear.ptl b/packages/font-glyphs/src/symbol/geometric/sun-and-gear.ptl similarity index 91% rename from font-src/glyphs/symbol/geometric/sun-and-gear.ptl rename to packages/font-glyphs/src/symbol/geometric/sun-and-gear.ptl index ac08781a3..de23a04f5 100644 --- a/font-src/glyphs/symbol/geometric/sun-and-gear.ptl +++ b/packages/font-glyphs/src/symbol/geometric/sun-and-gear.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/letter.ptl b/packages/font-glyphs/src/symbol/letter.ptl similarity index 98% rename from font-src/glyphs/symbol/letter.ptl rename to packages/font-glyphs/src/symbol/letter.ptl index 2126b4e9e..4154aafb3 100644 --- a/font-src/glyphs/symbol/letter.ptl +++ b/packages/font-glyphs/src/symbol/letter.ptl @@ -1,10 +1,10 @@ ###### Letter-like symbols -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [Box] from"../../support/geometry/box.mjs" -import [mix linreg clamp fallback] from"../../support/utils.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" +import [Box] from "@iosevka/geometry/box" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/ligation.ptl b/packages/font-glyphs/src/symbol/ligation.ptl similarity index 98% rename from font-src/glyphs/symbol/ligation.ptl rename to packages/font-glyphs/src/symbol/ligation.ptl index 0ed316921..216d46c17 100644 --- a/font-src/glyphs/symbol/ligation.ptl +++ b/packages/font-glyphs/src/symbol/ligation.ptl @@ -1,9 +1,9 @@ ###### Other symbols -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix clamp fallback] from"../../support/utils.mjs" -import [Joining NeqLigationSlashDotted] from"../../support/gr.mjs" -import [DesignParameters] from"../../meta/aesthetics.mjs" +import [mix clamp fallback] from "@iosevka/util" +import [Joining NeqLigationSlashDotted] from "@iosevka/glyph/relation" +import [DesignParameters] from "../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/math.ptl b/packages/font-glyphs/src/symbol/math.ptl similarity index 95% rename from font-src/glyphs/symbol/math.ptl rename to packages/font-glyphs/src/symbol/math.ptl index 7af2636ac..5ba730531 100644 --- a/font-src/glyphs/symbol/math.ptl +++ b/packages/font-glyphs/src/symbol/math.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/symbol/math/apl.ptl b/packages/font-glyphs/src/symbol/math/apl.ptl similarity index 97% rename from font-src/glyphs/symbol/math/apl.ptl rename to packages/font-glyphs/src/symbol/math/apl.ptl index a40e2b1e0..66e775473 100644 --- a/font-src/glyphs/symbol/math/apl.ptl +++ b/packages/font-glyphs/src/symbol/math/apl.ptl @@ -1,9 +1,9 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" -import [Point] from"../../../support/geometry/point.mjs" -import [AplForm] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" +import [Point] from "@iosevka/geometry/point" +import [AplForm] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/math/arith.ptl b/packages/font-glyphs/src/symbol/math/arith.ptl similarity index 99% rename from font-src/glyphs/symbol/math/arith.ptl rename to packages/font-glyphs/src/symbol/math/arith.ptl index a7935bb92..15cbb430e 100644 --- a/font-src/glyphs/symbol/math/arith.ptl +++ b/packages/font-glyphs/src/symbol/math/arith.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/boxed.ptl b/packages/font-glyphs/src/symbol/math/boxed.ptl similarity index 87% rename from font-src/glyphs/symbol/math/boxed.ptl rename to packages/font-glyphs/src/symbol/math/boxed.ptl index 603b48165..bf4832197 100644 --- a/font-src/glyphs/symbol/math/boxed.ptl +++ b/packages/font-glyphs/src/symbol/math/boxed.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/circled.ptl b/packages/font-glyphs/src/symbol/math/circled.ptl similarity index 97% rename from font-src/glyphs/symbol/math/circled.ptl rename to packages/font-glyphs/src/symbol/math/circled.ptl index 9aa74b411..3103ccf27 100644 --- a/font-src/glyphs/symbol/math/circled.ptl +++ b/packages/font-glyphs/src/symbol/math/circled.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/complement.ptl b/packages/font-glyphs/src/symbol/math/complement.ptl similarity index 73% rename from font-src/glyphs/symbol/math/complement.ptl rename to packages/font-glyphs/src/symbol/math/complement.ptl index cebde46f7..712d28f16 100644 --- a/font-src/glyphs/symbol/math/complement.ptl +++ b/packages/font-glyphs/src/symbol/math/complement.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/dots-and-colons.ptl b/packages/font-glyphs/src/symbol/math/dots-and-colons.ptl similarity index 95% rename from font-src/glyphs/symbol/math/dots-and-colons.ptl rename to packages/font-glyphs/src/symbol/math/dots-and-colons.ptl index 2d92794c0..4e6e70d01 100644 --- a/font-src/glyphs/symbol/math/dots-and-colons.ptl +++ b/packages/font-glyphs/src/symbol/math/dots-and-colons.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/frame.ptl b/packages/font-glyphs/src/symbol/math/frame.ptl similarity index 96% rename from font-src/glyphs/symbol/math/frame.ptl rename to packages/font-glyphs/src/symbol/math/frame.ptl index 8fe6b3a3c..a4d605b2e 100644 --- a/font-src/glyphs/symbol/math/frame.ptl +++ b/packages/font-glyphs/src/symbol/math/frame.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/geometry.ptl b/packages/font-glyphs/src/symbol/math/geometry.ptl similarity index 97% rename from font-src/glyphs/symbol/math/geometry.ptl rename to packages/font-glyphs/src/symbol/math/geometry.ptl index 87fad7640..e95f3c5c4 100644 --- a/font-src/glyphs/symbol/math/geometry.ptl +++ b/packages/font-glyphs/src/symbol/math/geometry.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/integrals.ptl b/packages/font-glyphs/src/symbol/math/integrals.ptl similarity index 98% rename from font-src/glyphs/symbol/math/integrals.ptl rename to packages/font-glyphs/src/symbol/math/integrals.ptl index bf12f80ab..69ffbd842 100644 --- a/font-src/glyphs/symbol/math/integrals.ptl +++ b/packages/font-glyphs/src/symbol/math/integrals.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/large-operators.ptl b/packages/font-glyphs/src/symbol/math/large-operators.ptl similarity index 95% rename from font-src/glyphs/symbol/math/large-operators.ptl rename to packages/font-glyphs/src/symbol/math/large-operators.ptl index 3100c8645..321f88e10 100644 --- a/font-src/glyphs/symbol/math/large-operators.ptl +++ b/packages/font-glyphs/src/symbol/math/large-operators.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module @@ -68,4 +68,4 @@ glyph-block Symbol-Math-Large-Operators : for-width-kinds WideWidth1 ada -- [ArchDepthAOf (ArchDepth * [Math.sqrt df.div]) (df.width)] adb -- [ArchDepthBOf (ArchDepth * [Math.sqrt df.div]) (df.width)] - turned [MangleName 'Cap'] [MangleUnicode 0x22C2] [MangleName 'Cup'] df.middle SymbolMid \ No newline at end of file + turned [MangleName 'Cap'] [MangleUnicode 0x22C2] [MangleName 'Cup'] df.middle SymbolMid diff --git a/font-src/glyphs/symbol/math/letter-like.ptl b/packages/font-glyphs/src/symbol/math/letter-like.ptl similarity index 92% rename from font-src/glyphs/symbol/math/letter-like.ptl rename to packages/font-glyphs/src/symbol/math/letter-like.ptl index 00f6ee3eb..5fb711baa 100644 --- a/font-src/glyphs/symbol/math/letter-like.ptl +++ b/packages/font-glyphs/src/symbol/math/letter-like.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/logicals.ptl b/packages/font-glyphs/src/symbol/math/logicals.ptl similarity index 97% rename from font-src/glyphs/symbol/math/logicals.ptl rename to packages/font-glyphs/src/symbol/math/logicals.ptl index 80d08b0d7..1b951c782 100644 --- a/font-src/glyphs/symbol/math/logicals.ptl +++ b/packages/font-glyphs/src/symbol/math/logicals.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/negation.ptl b/packages/font-glyphs/src/symbol/math/negation.ptl similarity index 94% rename from font-src/glyphs/symbol/math/negation.ptl rename to packages/font-glyphs/src/symbol/math/negation.ptl index 20b47338a..270d2fd0e 100644 --- a/font-src/glyphs/symbol/math/negation.ptl +++ b/packages/font-glyphs/src/symbol/math/negation.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/not-glyph-fn.ptl b/packages/font-glyphs/src/symbol/math/not-glyph-fn.ptl similarity index 94% rename from font-src/glyphs/symbol/math/not-glyph-fn.ptl rename to packages/font-glyphs/src/symbol/math/not-glyph-fn.ptl index 36fe263cb..583a377ef 100644 --- a/font-src/glyphs/symbol/math/not-glyph-fn.ptl +++ b/packages/font-glyphs/src/symbol/math/not-glyph-fn.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/other.ptl b/packages/font-glyphs/src/symbol/math/other.ptl similarity index 94% rename from font-src/glyphs/symbol/math/other.ptl rename to packages/font-glyphs/src/symbol/math/other.ptl index 2ab56a31c..8bd27190d 100644 --- a/font-src/glyphs/symbol/math/other.ptl +++ b/packages/font-glyphs/src/symbol/math/other.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/math/relation.ptl b/packages/font-glyphs/src/symbol/math/relation.ptl similarity index 99% rename from font-src/glyphs/symbol/math/relation.ptl rename to packages/font-glyphs/src/symbol/math/relation.ptl index bd899e2c1..c28df7102 100644 --- a/font-src/glyphs/symbol/math/relation.ptl +++ b/packages/font-glyphs/src/symbol/math/relation.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Box] from"../../../support/geometry/box.mjs" -import [Joining] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Box] from "@iosevka/geometry/box" +import [Joining] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/math/v-and-cup.ptl b/packages/font-glyphs/src/symbol/math/v-and-cup.ptl similarity index 98% rename from font-src/glyphs/symbol/math/v-and-cup.ptl rename to packages/font-glyphs/src/symbol/math/v-and-cup.ptl index a415b5ee2..a848bd3b7 100644 --- a/font-src/glyphs/symbol/math/v-and-cup.ptl +++ b/packages/font-glyphs/src/symbol/math/v-and-cup.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/mosaic.ptl b/packages/font-glyphs/src/symbol/mosaic.ptl similarity index 99% rename from font-src/glyphs/symbol/mosaic.ptl rename to packages/font-glyphs/src/symbol/mosaic.ptl index 113d6969c..322484409 100644 --- a/font-src/glyphs/symbol/mosaic.ptl +++ b/packages/font-glyphs/src/symbol/mosaic.ptl @@ -1,7 +1,7 @@ ###### Teletext symbols -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph.ptl b/packages/font-glyphs/src/symbol/pictograph.ptl similarity index 96% rename from font-src/glyphs/symbol/pictograph.ptl rename to packages/font-glyphs/src/symbol/pictograph.ptl index 7f783c8ee..691bc1d87 100644 --- a/font-src/glyphs/symbol/pictograph.ptl +++ b/packages/font-glyphs/src/symbol/pictograph.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/symbol/pictograph/astronomy.ptl b/packages/font-glyphs/src/symbol/pictograph/astronomy.ptl similarity index 92% rename from font-src/glyphs/symbol/pictograph/astronomy.ptl rename to packages/font-glyphs/src/symbol/pictograph/astronomy.ptl index a14779617..790faa781 100644 --- a/font-src/glyphs/symbol/pictograph/astronomy.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/astronomy.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/atom.ptl b/packages/font-glyphs/src/symbol/pictograph/atom.ptl similarity index 90% rename from font-src/glyphs/symbol/pictograph/atom.ptl rename to packages/font-glyphs/src/symbol/pictograph/atom.ptl index 494d287c6..86c3f58ca 100644 --- a/font-src/glyphs/symbol/pictograph/atom.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/atom.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/bolt-symbol.ptl b/packages/font-glyphs/src/symbol/pictograph/bolt-symbol.ptl similarity index 85% rename from font-src/glyphs/symbol/pictograph/bolt-symbol.ptl rename to packages/font-glyphs/src/symbol/pictograph/bolt-symbol.ptl index 73f127e07..5332f30f8 100644 --- a/font-src/glyphs/symbol/pictograph/bolt-symbol.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/bolt-symbol.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/checking-marks.ptl b/packages/font-glyphs/src/symbol/pictograph/checking-marks.ptl similarity index 96% rename from font-src/glyphs/symbol/pictograph/checking-marks.ptl rename to packages/font-glyphs/src/symbol/pictograph/checking-marks.ptl index c075b83e5..f447b51c3 100644 --- a/font-src/glyphs/symbol/pictograph/checking-marks.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/checking-marks.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/clock.ptl b/packages/font-glyphs/src/symbol/pictograph/clock.ptl similarity index 89% rename from font-src/glyphs/symbol/pictograph/clock.ptl rename to packages/font-glyphs/src/symbol/pictograph/clock.ptl index f0ac4c7f2..46c9ab93b 100644 --- a/font-src/glyphs/symbol/pictograph/clock.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/clock.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/cross.ptl b/packages/font-glyphs/src/symbol/pictograph/cross.ptl similarity index 92% rename from font-src/glyphs/symbol/pictograph/cross.ptl rename to packages/font-glyphs/src/symbol/pictograph/cross.ptl index b3704aec9..17a166490 100644 --- a/font-src/glyphs/symbol/pictograph/cross.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/cross.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/faces.ptl b/packages/font-glyphs/src/symbol/pictograph/faces.ptl similarity index 96% rename from font-src/glyphs/symbol/pictograph/faces.ptl rename to packages/font-glyphs/src/symbol/pictograph/faces.ptl index 229c73f9d..2fd9dacb8 100644 --- a/font-src/glyphs/symbol/pictograph/faces.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/faces.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/flags.ptl b/packages/font-glyphs/src/symbol/pictograph/flags.ptl similarity index 94% rename from font-src/glyphs/symbol/pictograph/flags.ptl rename to packages/font-glyphs/src/symbol/pictograph/flags.ptl index 7ea357860..16d1c77da 100644 --- a/font-src/glyphs/symbol/pictograph/flags.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/flags.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/heart.ptl b/packages/font-glyphs/src/symbol/pictograph/heart.ptl similarity index 88% rename from font-src/glyphs/symbol/pictograph/heart.ptl rename to packages/font-glyphs/src/symbol/pictograph/heart.ptl index f1f5e655e..872013d32 100644 --- a/font-src/glyphs/symbol/pictograph/heart.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/heart.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Box] from"../../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Box] from "@iosevka/geometry/box" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/i-ching.ptl b/packages/font-glyphs/src/symbol/pictograph/i-ching.ptl similarity index 94% rename from font-src/glyphs/symbol/pictograph/i-ching.ptl rename to packages/font-glyphs/src/symbol/pictograph/i-ching.ptl index bd3343949..0f754a9e3 100644 --- a/font-src/glyphs/symbol/pictograph/i-ching.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/i-ching.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [maskBit] from"../../../support/util/mask-bit.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [maskBit] from "@iosevka/util/mask-bit" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/iec-power-and-playback.ptl b/packages/font-glyphs/src/symbol/pictograph/iec-power-and-playback.ptl similarity index 98% rename from font-src/glyphs/symbol/pictograph/iec-power-and-playback.ptl rename to packages/font-glyphs/src/symbol/pictograph/iec-power-and-playback.ptl index 6b8852c11..2bbc61d2b 100644 --- a/font-src/glyphs/symbol/pictograph/iec-power-and-playback.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/iec-power-and-playback.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/kome.ptl b/packages/font-glyphs/src/symbol/pictograph/kome.ptl similarity index 91% rename from font-src/glyphs/symbol/pictograph/kome.ptl rename to packages/font-glyphs/src/symbol/pictograph/kome.ptl index 8f8f21452..8be0fd009 100644 --- a/font-src/glyphs/symbol/pictograph/kome.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/kome.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/metric-marks.ptl b/packages/font-glyphs/src/symbol/pictograph/metric-marks.ptl similarity index 96% rename from font-src/glyphs/symbol/pictograph/metric-marks.ptl rename to packages/font-glyphs/src/symbol/pictograph/metric-marks.ptl index f6c2bb013..3a5bbe3fd 100644 --- a/font-src/glyphs/symbol/pictograph/metric-marks.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/metric-marks.ptl @@ -1,6 +1,6 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/musical.ptl b/packages/font-glyphs/src/symbol/pictograph/musical.ptl similarity index 97% rename from font-src/glyphs/symbol/pictograph/musical.ptl rename to packages/font-glyphs/src/symbol/pictograph/musical.ptl index e79c1c318..fcb280572 100644 --- a/font-src/glyphs/symbol/pictograph/musical.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/musical.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Transform] from"../../../support/geometry/transform.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Transform] from "@iosevka/geometry/transform" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/powerline-and-gui.ptl b/packages/font-glyphs/src/symbol/pictograph/powerline-and-gui.ptl similarity index 99% rename from font-src/glyphs/symbol/pictograph/powerline-and-gui.ptl rename to packages/font-glyphs/src/symbol/pictograph/powerline-and-gui.ptl index d3c968001..7f020facf 100644 --- a/font-src/glyphs/symbol/pictograph/powerline-and-gui.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/powerline-and-gui.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Box] from"../../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Box] from "@iosevka/geometry/box" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/stick-figure.ptl b/packages/font-glyphs/src/symbol/pictograph/stick-figure.ptl similarity index 96% rename from font-src/glyphs/symbol/pictograph/stick-figure.ptl rename to packages/font-glyphs/src/symbol/pictograph/stick-figure.ptl index e90a0562b..19c4dd4ad 100644 --- a/font-src/glyphs/symbol/pictograph/stick-figure.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/stick-figure.ptl @@ -1,8 +1,8 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Box] from"../../../support/geometry/box.mjs" -import [Transform] from"../../../support/geometry/transform.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Box] from "@iosevka/geometry/box" +import [Transform] from "@iosevka/geometry/transform" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/suit.ptl b/packages/font-glyphs/src/symbol/pictograph/suit.ptl similarity index 95% rename from font-src/glyphs/symbol/pictograph/suit.ptl rename to packages/font-glyphs/src/symbol/pictograph/suit.ptl index 79b7b476a..1330da310 100644 --- a/font-src/glyphs/symbol/pictograph/suit.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/suit.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Box] from"../../../support/geometry/box.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Box] from "@iosevka/geometry/box" glyph-module diff --git a/font-src/glyphs/symbol/pictograph/telephone-recorder.ptl b/packages/font-glyphs/src/symbol/pictograph/telephone-recorder.ptl similarity index 81% rename from font-src/glyphs/symbol/pictograph/telephone-recorder.ptl rename to packages/font-glyphs/src/symbol/pictograph/telephone-recorder.ptl index 4103e33e2..5ea1f6195 100644 --- a/font-src/glyphs/symbol/pictograph/telephone-recorder.ptl +++ b/packages/font-glyphs/src/symbol/pictograph/telephone-recorder.ptl @@ -1,7 +1,7 @@ -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/punctuation.ptl b/packages/font-glyphs/src/symbol/punctuation.ptl similarity index 97% rename from font-src/glyphs/symbol/punctuation.ptl rename to packages/font-glyphs/src/symbol/punctuation.ptl index 8fa3e6478..a3efd895d 100644 --- a/font-src/glyphs/symbol/punctuation.ptl +++ b/packages/font-glyphs/src/symbol/punctuation.ptl @@ -1,4 +1,4 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' export : define [apply] : begin define $$Capture$$ this diff --git a/font-src/glyphs/symbol/punctuation/ampersand.ptl b/packages/font-glyphs/src/symbol/punctuation/ampersand.ptl similarity index 99% rename from font-src/glyphs/symbol/punctuation/ampersand.ptl rename to packages/font-glyphs/src/symbol/punctuation/ampersand.ptl index de92beab0..a9d6b4c07 100644 --- a/font-src/glyphs/symbol/punctuation/ampersand.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/ampersand.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ascii-marks.ptl b/packages/font-glyphs/src/symbol/punctuation/ascii-marks.ptl similarity index 96% rename from font-src/glyphs/symbol/punctuation/ascii-marks.ptl rename to packages/font-glyphs/src/symbol/punctuation/ascii-marks.ptl index 935ed3c9f..9ece5e7c9 100644 --- a/font-src/glyphs/symbol/punctuation/ascii-marks.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/ascii-marks.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/asterisk.ptl b/packages/font-glyphs/src/symbol/punctuation/asterisk.ptl similarity index 97% rename from font-src/glyphs/symbol/punctuation/asterisk.ptl rename to packages/font-glyphs/src/symbol/punctuation/asterisk.ptl index 08a9cb412..5f60e2c8e 100644 --- a/font-src/glyphs/symbol/punctuation/asterisk.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/asterisk.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/at.ptl b/packages/font-glyphs/src/symbol/punctuation/at.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/at.ptl rename to packages/font-glyphs/src/symbol/punctuation/at.ptl index c8dd3e1c3..5fb25d8b4 100644 --- a/font-src/glyphs/symbol/punctuation/at.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/at.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/bar.ptl b/packages/font-glyphs/src/symbol/punctuation/bar.ptl similarity index 94% rename from font-src/glyphs/symbol/punctuation/bar.ptl rename to packages/font-glyphs/src/symbol/punctuation/bar.ptl index cbb8bc47a..489f5c50a 100644 --- a/font-src/glyphs/symbol/punctuation/bar.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/bar.ptl @@ -1,9 +1,9 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Joining] from"../../../support/gr.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Joining] from "@iosevka/glyph/relation" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/brackets.ptl b/packages/font-glyphs/src/symbol/punctuation/brackets.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/brackets.ptl rename to packages/font-glyphs/src/symbol/punctuation/brackets.ptl index 03ef9b1b3..b879822d4 100644 --- a/font-src/glyphs/symbol/punctuation/brackets.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/brackets.ptl @@ -1,9 +1,9 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Joining] from"../../../support/gr.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Joining] from "@iosevka/glyph/relation" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/bullets.ptl b/packages/font-glyphs/src/symbol/punctuation/bullets.ptl similarity index 89% rename from font-src/glyphs/symbol/punctuation/bullets.ptl rename to packages/font-glyphs/src/symbol/punctuation/bullets.ptl index 7f32b48ba..c7b129425 100644 --- a/font-src/glyphs/symbol/punctuation/bullets.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/bullets.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/caret.ptl b/packages/font-glyphs/src/symbol/punctuation/caret.ptl similarity index 75% rename from font-src/glyphs/symbol/punctuation/caret.ptl rename to packages/font-glyphs/src/symbol/punctuation/caret.ptl index b98ad2453..ccfe621b2 100644 --- a/font-src/glyphs/symbol/punctuation/caret.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/caret.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/daggers.ptl b/packages/font-glyphs/src/symbol/punctuation/daggers.ptl similarity index 91% rename from font-src/glyphs/symbol/punctuation/daggers.ptl rename to packages/font-glyphs/src/symbol/punctuation/daggers.ptl index fefdf7515..7e3ece0ca 100644 --- a/font-src/glyphs/symbol/punctuation/daggers.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/daggers.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/dashes.ptl b/packages/font-glyphs/src/symbol/punctuation/dashes.ptl similarity index 95% rename from font-src/glyphs/symbol/punctuation/dashes.ptl rename to packages/font-glyphs/src/symbol/punctuation/dashes.ptl index 465a8b55a..49fc035a7 100644 --- a/font-src/glyphs/symbol/punctuation/dashes.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/dashes.ptl @@ -1,8 +1,8 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Joining] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Joining] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ellipsis.ptl b/packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/ellipsis.ptl rename to packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl index af2210586..cec5da656 100644 --- a/font-src/glyphs/symbol/punctuation/ellipsis.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/ellipsis.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/emotion.ptl b/packages/font-glyphs/src/symbol/punctuation/emotion.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/emotion.ptl rename to packages/font-glyphs/src/symbol/punctuation/emotion.ptl index 52db5a3ef..79e0090a7 100644 --- a/font-src/glyphs/symbol/punctuation/emotion.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/emotion.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/guillemet.ptl b/packages/font-glyphs/src/symbol/punctuation/guillemet.ptl similarity index 95% rename from font-src/glyphs/symbol/punctuation/guillemet.ptl rename to packages/font-glyphs/src/symbol/punctuation/guillemet.ptl index c98d9aa87..732a8e8fd 100644 --- a/font-src/glyphs/symbol/punctuation/guillemet.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/guillemet.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/interpuncts.ptl b/packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl similarity index 87% rename from font-src/glyphs/symbol/punctuation/interpuncts.ptl rename to packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl index a70edbfbd..67ce45845 100644 --- a/font-src/glyphs/symbol/punctuation/interpuncts.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/interpuncts.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/joiners.ptl b/packages/font-glyphs/src/symbol/punctuation/joiners.ptl similarity index 91% rename from font-src/glyphs/symbol/punctuation/joiners.ptl rename to packages/font-glyphs/src/symbol/punctuation/joiners.ptl index e30cae90b..179f0f625 100644 --- a/font-src/glyphs/symbol/punctuation/joiners.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/joiners.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ligation-variants.ptl b/packages/font-glyphs/src/symbol/punctuation/ligation-variants.ptl similarity index 91% rename from font-src/glyphs/symbol/punctuation/ligation-variants.ptl rename to packages/font-glyphs/src/symbol/punctuation/ligation-variants.ptl index eed86c4e2..6672eb49a 100644 --- a/font-src/glyphs/symbol/punctuation/ligation-variants.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/ligation-variants.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/other-phonetic.ptl b/packages/font-glyphs/src/symbol/punctuation/other-phonetic.ptl similarity index 97% rename from font-src/glyphs/symbol/punctuation/other-phonetic.ptl rename to packages/font-glyphs/src/symbol/punctuation/other-phonetic.ptl index 30c721d36..9a3a911b6 100644 --- a/font-src/glyphs/symbol/punctuation/other-phonetic.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/other-phonetic.ptl @@ -1,8 +1,8 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Joining] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Joining] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/percentages.ptl b/packages/font-glyphs/src/symbol/punctuation/percentages.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/percentages.ptl rename to packages/font-glyphs/src/symbol/punctuation/percentages.ptl index 411955d49..b06bc8bcd 100644 --- a/font-src/glyphs/symbol/punctuation/percentages.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/percentages.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/pilcrow.ptl b/packages/font-glyphs/src/symbol/punctuation/pilcrow.ptl similarity index 96% rename from font-src/glyphs/symbol/punctuation/pilcrow.ptl rename to packages/font-glyphs/src/symbol/punctuation/pilcrow.ptl index 9b5fd0d5f..4891ef83f 100644 --- a/font-src/glyphs/symbol/punctuation/pilcrow.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/pilcrow.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl b/packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl rename to packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl index 4a261eff5..8acc6a3c3 100644 --- a/font-src/glyphs/symbol/punctuation/quotes-and-primes.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/quotes-and-primes.ptl @@ -1,8 +1,8 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DependentSelector] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DependentSelector] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/section.ptl b/packages/font-glyphs/src/symbol/punctuation/section.ptl similarity index 91% rename from font-src/glyphs/symbol/punctuation/section.ptl rename to packages/font-glyphs/src/symbol/punctuation/section.ptl index 3faf789e3..ea0cf3dd0 100644 --- a/font-src/glyphs/symbol/punctuation/section.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/section.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl b/packages/font-glyphs/src/symbol/punctuation/slashes-and-number-sign.ptl similarity index 97% rename from font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl rename to packages/font-glyphs/src/symbol/punctuation/slashes-and-number-sign.ptl index 1710a5eee..4c38138e7 100644 --- a/font-src/glyphs/symbol/punctuation/slashes-and-number-sign.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/slashes-and-number-sign.ptl @@ -1,8 +1,8 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [Joining] from"../../../support/gr.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [Joining] from "@iosevka/glyph/relation" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/small.ptl b/packages/font-glyphs/src/symbol/punctuation/small.ptl similarity index 98% rename from font-src/glyphs/symbol/punctuation/small.ptl rename to packages/font-glyphs/src/symbol/punctuation/small.ptl index 98e26974a..31dfe1356 100644 --- a/font-src/glyphs/symbol/punctuation/small.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/small.ptl @@ -1,8 +1,8 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" -import [DesignParameters] from"../../../meta/aesthetics.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" +import [DesignParameters] from "../../meta/aesthetics.mjs" glyph-module diff --git a/font-src/glyphs/symbol/punctuation/ties.ptl b/packages/font-glyphs/src/symbol/punctuation/ties.ptl similarity index 86% rename from font-src/glyphs/symbol/punctuation/ties.ptl rename to packages/font-glyphs/src/symbol/punctuation/ties.ptl index d1525f1c1..f3532b741 100644 --- a/font-src/glyphs/symbol/punctuation/ties.ptl +++ b/packages/font-glyphs/src/symbol/punctuation/ties.ptl @@ -1,7 +1,7 @@ ### Punctuation symbols -$$include '../../../meta/macros.ptl' +$$include '../../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/font-src/glyphs/symbol/shared.ptl b/packages/font-glyphs/src/symbol/shared.ptl similarity index 93% rename from font-src/glyphs/symbol/shared.ptl rename to packages/font-glyphs/src/symbol/shared.ptl index 02af0648b..6a9e4c5d3 100644 --- a/font-src/glyphs/symbol/shared.ptl +++ b/packages/font-glyphs/src/symbol/shared.ptl @@ -1,6 +1,6 @@ -$$include '../../meta/macros.ptl' +$$include '../meta/macros.ptl' -import [mix linreg clamp fallback] from"../../support/utils.mjs" +import [mix linreg clamp fallback] from "@iosevka/util" glyph-module diff --git a/packages/font-kits/package.json b/packages/font-kits/package.json new file mode 100644 index 000000000..6e0b5c13d --- /dev/null +++ b/packages/font-kits/package.json @@ -0,0 +1,16 @@ +{ + "name": "@iosevka/font-kits", + "version": "28.0.0", + "private": true, + "exports": { + "./boole-kit": "./src/boole-kit.mjs", + "./spiro-kit": "./src/spiro-kit.mjs" + }, + "dependencies": { + "@iosevka/geometry": "28.0.0", + "@iosevka/glyph": "28.0.0", + "@iosevka/util": "28.0.0", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } +} diff --git a/font-src/kits/boole-kit.mjs b/packages/font-kits/src/boole-kit.mjs similarity index 90% rename from font-src/kits/boole-kit.mjs rename to packages/font-kits/src/boole-kit.mjs index fbee9f0d9..584148c28 100644 --- a/font-src/kits/boole-kit.mjs +++ b/packages/font-kits/src/boole-kit.mjs @@ -1,8 +1,7 @@ +import { BooleanGeometry, TransformedGeometry } from "@iosevka/geometry"; +import { Glyph } from "@iosevka/glyph"; import * as TypoGeom from "typo-geom"; -import { BooleanGeometry, TransformedGeometry } from "../support/geometry/index.mjs"; -import { Glyph } from "../support/glyph/index.mjs"; - /////////////////////////////////////////////////////////////////////////////////////////////////// class BooleImpl { constructor(bindings, operator, operands) { diff --git a/font-src/kits/spiro-kit.mjs b/packages/font-kits/src/spiro-kit.mjs similarity index 97% rename from font-src/kits/spiro-kit.mjs rename to packages/font-kits/src/spiro-kit.mjs index 8919e8266..ff6dcb04b 100644 --- a/font-src/kits/spiro-kit.mjs +++ b/packages/font-kits/src/spiro-kit.mjs @@ -1,11 +1,11 @@ -import { DiSpiroGeometry, SpiroGeometry } from "../support/geometry/index.mjs"; +import { DiSpiroGeometry, SpiroGeometry } from "@iosevka/geometry"; import { BiKnotCollector, ControlKnot, Interpolator, TerminateInstruction -} from "../support/geometry/spiro-control.mjs"; -import { bez3, fallback, mix } from "../support/utils.mjs"; +} from "@iosevka/geometry/spiro-control"; +import { bez3, fallback, mix } from "@iosevka/util"; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -233,8 +233,8 @@ export function SetupBuilders(bindings) { args.raf && args.raf.blend && rt !== void 0 ? args.raf.blend(rt) : args.raf - ? args.raf - : unimportant + ? args.raf + : unimportant ) ); } @@ -250,8 +250,8 @@ export function SetupBuilders(bindings) { args.raf && args.raf.blend && rt !== void 0 ? args.raf.blend(rt) : args.raf - ? args.raf - : unimportant + ? args.raf + : unimportant ) ); } diff --git a/packages/font-otl/package.json b/packages/font-otl/package.json new file mode 100644 index 000000000..119d36e62 --- /dev/null +++ b/packages/font-otl/package.json @@ -0,0 +1,13 @@ +{ + "name": "@iosevka/font-otl", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs" + }, + "dependencies": { + "@iosevka/font-glyphs": "28.0.0", + "@iosevka/glyph": "28.0.0", + "toposort": "^2.0.2" + } +} diff --git a/font-src/otl/gpos-mark-mkmk.ptl b/packages/font-otl/src/gpos-mark-mkmk.ptl similarity index 100% rename from font-src/otl/gpos-mark-mkmk.ptl rename to packages/font-otl/src/gpos-mark-mkmk.ptl diff --git a/font-src/otl/gsub-ccmp.ptl b/packages/font-otl/src/gsub-ccmp.ptl similarity index 98% rename from font-src/otl/gsub-ccmp.ptl rename to packages/font-otl/src/gsub-ccmp.ptl index 570eb16be..11516598a 100644 --- a/font-src/otl/gsub-ccmp.ptl +++ b/packages/font-otl/src/gsub-ccmp.ptl @@ -1,8 +1,8 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' -import [UkMapToLookup UkMap2ToLookup] from"./table-util.mjs" -import [Dotless TieMark TieGlyph OgonekTrY IsSuperscript IsSubscript LeaningMark LeaningMarkSpacer] from"../support/gr.mjs" -import as UnicodeKnowledge from"../meta/unicode-knowledge.mjs" +import [UkMapToLookup UkMap2ToLookup] from "./table-util.mjs" +import [Dotless TieMark TieGlyph OgonekTrY IsSuperscript IsSubscript LeaningMark LeaningMarkSpacer] from "@iosevka/glyph/relation" +import as UnicodeKnowledge from "@iosevka/font-glyphs/unicode-knowledge" extern Set diff --git a/font-src/otl/gsub-cv-ss.ptl b/packages/font-otl/src/gsub-cv-ss.ptl similarity index 98% rename from font-src/otl/gsub-cv-ss.ptl rename to packages/font-otl/src/gsub-cv-ss.ptl index a093e0a04..d0936aa4b 100644 --- a/font-src/otl/gsub-cv-ss.ptl +++ b/packages/font-otl/src/gsub-cv-ss.ptl @@ -1,6 +1,6 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' -import [AnyCv CvDecompose] from"../support/gr.mjs" +import [AnyCv CvDecompose] from "@iosevka/glyph/relation" extern Map extern Set diff --git a/font-src/otl/gsub-frac.ptl b/packages/font-otl/src/gsub-frac.ptl similarity index 92% rename from font-src/otl/gsub-frac.ptl rename to packages/font-otl/src/gsub-frac.ptl index b5d928354..9e5c899bc 100644 --- a/font-src/otl/gsub-frac.ptl +++ b/packages/font-otl/src/gsub-frac.ptl @@ -1,6 +1,6 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' -import [NumeratorForm DenominatorForm] from"../support/gr.mjs" +import [NumeratorForm DenominatorForm] from "@iosevka/glyph/relation" # Name-driven feature pairs export : define [buildFrac gsub glyphStore] : begin diff --git a/font-src/otl/gsub-gr.ptl b/packages/font-otl/src/gsub-gr.ptl similarity index 100% rename from font-src/otl/gsub-gr.ptl rename to packages/font-otl/src/gsub-gr.ptl diff --git a/font-src/otl/gsub-ligation.ptl b/packages/font-otl/src/gsub-ligation.ptl similarity index 99% rename from font-src/otl/gsub-ligation.ptl rename to packages/font-otl/src/gsub-ligation.ptl index 4bd083f95..11beeafba 100644 --- a/font-src/otl/gsub-ligation.ptl +++ b/packages/font-otl/src/gsub-ligation.ptl @@ -1,4 +1,4 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' extern Map extern Set diff --git a/font-src/otl/gsub-locl.ptl b/packages/font-otl/src/gsub-locl.ptl similarity index 97% rename from font-src/otl/gsub-locl.ptl rename to packages/font-otl/src/gsub-locl.ptl index 3c8f5965b..c51877696 100644 --- a/font-src/otl/gsub-locl.ptl +++ b/packages/font-otl/src/gsub-locl.ptl @@ -1,6 +1,6 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' -import [CvDecompose] from"../support/gr.mjs" +import [CvDecompose] from "@iosevka/glyph/relation" extern Set diff --git a/font-src/otl/gsub-texture.ptl b/packages/font-otl/src/gsub-texture.ptl similarity index 97% rename from font-src/otl/gsub-texture.ptl rename to packages/font-otl/src/gsub-texture.ptl index 2a74d84b6..f5286c1bd 100644 --- a/font-src/otl/gsub-texture.ptl +++ b/packages/font-otl/src/gsub-texture.ptl @@ -1,8 +1,8 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' extern Set -import [Texture CvDecompose] from"../support/gr.mjs" +import [Texture CvDecompose] from "@iosevka/glyph/relation" # Name-driven feature pairs export : define [buildGsubTexture gsub glyphStore markGlyphs cvs] : begin diff --git a/font-src/otl/gsub-thousands.ptl b/packages/font-otl/src/gsub-thousands.ptl similarity index 95% rename from font-src/otl/gsub-thousands.ptl rename to packages/font-otl/src/gsub-thousands.ptl index a1cb1d53d..9e327f0c3 100644 --- a/font-src/otl/gsub-thousands.ptl +++ b/packages/font-otl/src/gsub-thousands.ptl @@ -1,6 +1,6 @@ -$$include '../meta/macros.ptl' +$$include './meta/macros.ptl' -import [QueryRelatedGlyphs] from"./table-util.mjs" +import [QueryRelatedGlyphs] from "./table-util.mjs" export : define [buildGsubThousands gsub para] : begin local rec : gsub.beginBlock diff --git a/font-src/otl/index.ptl b/packages/font-otl/src/index.ptl similarity index 84% rename from font-src/otl/index.ptl rename to packages/font-otl/src/index.ptl index 155528f9a..9e898ef85 100644 --- a/font-src/otl/index.ptl +++ b/packages/font-otl/src/index.ptl @@ -1,17 +1,16 @@ -import as toposort from 'toposort' -import as Gr from"../support/gr.mjs" +import as Gr from "@iosevka/glyph/relation" -import [CreateEmptyTable] from"./table-util.mjs" +import [CreateEmptyTable] from "./table-util.mjs" -import [buildLigations] from"./gsub-ligation.mjs" -import [buildCCMP buildCCMPPostCvSs] from"./gsub-ccmp.mjs" -import [buildGrFeature] from"./gsub-gr.mjs" -import [buildFrac] from"./gsub-frac.mjs" -import [buildCVSS] from"./gsub-cv-ss.mjs" -import [buildLOCL] from"./gsub-locl.mjs" -import [buildGsubThousands] from"./gsub-thousands.mjs" -import [buildGsubTexture] from"./gsub-texture.mjs" -import [buildMarkMkmk] from"./gpos-mark-mkmk.mjs" +import [buildLigations] from "./gsub-ligation.mjs" +import [buildCCMP buildCCMPPostCvSs] from "./gsub-ccmp.mjs" +import [buildGrFeature] from "./gsub-gr.mjs" +import [buildFrac] from "./gsub-frac.mjs" +import [buildCVSS] from "./gsub-cv-ss.mjs" +import [buildLOCL] from "./gsub-locl.mjs" +import [buildGsubThousands] from "./gsub-thousands.mjs" +import [buildGsubTexture] from "./gsub-texture.mjs" +import [buildMarkMkmk] from "./gpos-mark-mkmk.mjs" define GDEF_SIMPLE 1 define GDEF_LIGATURE 2 diff --git a/packages/font-otl/src/meta/macros.ptl b/packages/font-otl/src/meta/macros.ptl new file mode 100644 index 000000000..c42deafee --- /dev/null +++ b/packages/font-otl/src/meta/macros.ptl @@ -0,0 +1,8 @@ +### Autoarg macro +define-operator "--" 890 'right' : syntax-rules + `(@l -- @r) [atom l] : dirty `[new $NamedParameterPair$ @{".quote" [formOf l]} @r] + `(@{".quote" l} -- @r) : dirty `[new $NamedParameterPair$ @l @r] + +### Arbitrary pair operator +define-operator "~>" 880 'right' : syntax-rules + `(@l ~> @r) `{.left @l .right @r} diff --git a/font-src/otl/table-util.ptl b/packages/font-otl/src/table-util.ptl similarity index 99% rename from font-src/otl/table-util.ptl rename to packages/font-otl/src/table-util.ptl index e88087745..9974baf81 100644 --- a/font-src/otl/table-util.ptl +++ b/packages/font-otl/src/table-util.ptl @@ -1,5 +1,5 @@ import toposort from 'toposort' -import [AnyCv] from"../support/gr.mjs" +import [AnyCv] from "@iosevka/glyph/relation" extern Map extern Set diff --git a/packages/font/package.json b/packages/font/package.json new file mode 100644 index 000000000..800b235cf --- /dev/null +++ b/packages/font/package.json @@ -0,0 +1,26 @@ +{ + "name": "@iosevka/font", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs", + "./anchor": "./src/anchor.mjs", + "./point": "./src/point.mjs", + "./transform": "./src/transform.mjs" + }, + "dependencies": { + "@iarna/toml": "^2.2.5", + "@iosevka/font-glyphs": "28.0.0", + "@iosevka/font-otl": "28.0.0", + "@iosevka/geometry": "28.0.0", + "@iosevka/geometry-cache": "28.0.0", + "@iosevka/glyph": "28.0.0", + "@iosevka/param": "28.0.0", + "@iosevka/util": "28.0.0", + "harfbuzzjs": "^0.3.3", + "ot-builder": "^1.7.3", + "semver": "^7.5.4", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } +} diff --git a/font-src/derive-spacing.mjs b/packages/font/src/derive-spacing.mjs similarity index 95% rename from font-src/derive-spacing.mjs rename to packages/font/src/derive-spacing.mjs index b8be486d0..4197cf150 100644 --- a/font-src/derive-spacing.mjs +++ b/packages/font/src/derive-spacing.mjs @@ -5,8 +5,8 @@ import url from "url"; import * as Toml from "@iarna/toml"; import { CliProc, Ot } from "ot-builder"; -import { assignFontNames, createNamingDictFromArgv } from "./gen/meta/naming.mjs"; -import { readTTF, saveTTF } from "./support/font-io/font-io.mjs"; +import { readTTF, saveTTF } from "./font-io/index.mjs"; +import { assignFontNames, createNamingDictFromArgv } from "./naming/index.mjs"; const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); diff --git a/font-src/gen/finalize/gc.mjs b/packages/font/src/finalize/gc.mjs similarity index 98% rename from font-src/gen/finalize/gc.mjs rename to packages/font/src/finalize/gc.mjs index 71e2a57e6..063b9e152 100644 --- a/font-src/gen/finalize/gc.mjs +++ b/packages/font/src/finalize/gc.mjs @@ -1,6 +1,6 @@ -import * as Geometry from "../../support/geometry/index.mjs"; -import { Transform } from "../../support/geometry/transform.mjs"; -import { Radical, VS01 } from "../../support/gr.mjs"; +import * as Geometry from "@iosevka/geometry"; +import { Transform } from "@iosevka/geometry/transform"; +import { Radical, VS01 } from "@iosevka/glyph/relation"; export function gcFont(glyphStore, excludedChars, otl) { const daGsub = markSweepOtlLookups(otl.GSUB); diff --git a/font-src/gen/finalize/glyphs.mjs b/packages/font/src/finalize/glyphs.mjs similarity index 97% rename from font-src/gen/finalize/glyphs.mjs rename to packages/font/src/finalize/glyphs.mjs index 7b5ab3eeb..5fe6edd1c 100644 --- a/font-src/gen/finalize/glyphs.mjs +++ b/packages/font/src/finalize/glyphs.mjs @@ -1,10 +1,9 @@ +import * as Geom from "@iosevka/geometry"; +import * as CurveUtil from "@iosevka/geometry/curve-util"; +import { Point } from "@iosevka/geometry/point"; +import { Transform } from "@iosevka/geometry/transform"; import * as TypoGeom from "typo-geom"; -import * as CurveUtil from "../../support/geometry/curve-util.mjs"; -import * as Geom from "../../support/geometry/index.mjs"; -import { Point } from "../../support/geometry/point.mjs"; -import { Transform } from "../../support/geometry/transform.mjs"; - /////////////////////////////////////////////////////////////////////////////////////////////////// export function finalizeGlyphs(cache, para, glyphStore) { diff --git a/font-src/gen/finalize/index.mjs b/packages/font/src/finalize/index.mjs similarity index 96% rename from font-src/gen/finalize/index.mjs rename to packages/font/src/finalize/index.mjs index d734ea022..dc68812ae 100644 --- a/font-src/gen/finalize/index.mjs +++ b/packages/font/src/finalize/index.mjs @@ -1,4 +1,4 @@ -import { Nwid, Wwid } from "../../support/gr.mjs"; +import { Nwid, Wwid } from "@iosevka/glyph/relation"; import { gcFont } from "./gc.mjs"; import { finalizeGlyphs } from "./glyphs.mjs"; diff --git a/font-src/support/font-io/font-io.mjs b/packages/font/src/font-io/index.mjs similarity index 52% rename from font-src/support/font-io/font-io.mjs rename to packages/font/src/font-io/index.mjs index 054b09351..286136d07 100644 --- a/font-src/support/font-io/font-io.mjs +++ b/packages/font/src/font-io/index.mjs @@ -2,6 +2,24 @@ import fs from "fs"; import { FontIo, Ot } from "ot-builder"; +export function CreateEmptyFont(argv) { + let font = { + head: new Ot.Head.Table(), + hhea: new Ot.MetricHead.Hhea(), + os2: new Ot.Os2.Table(4), + post: new Ot.Post.Table(argv.featureControl.exportGlyphNames ? 2 : 3, 0), + maxp: Ot.Maxp.Table.TrueType(), + name: new Ot.Name.Table() + }; + if (process.env.SOURCE_DATE_EPOCH) { + font.head.created = new Date(process.env.SOURCE_DATE_EPOCH * 1000); + font.head.modified = new Date(process.env.SOURCE_DATE_EPOCH * 1000); + } + return font; +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// + export async function readTTF(input) { const buf = await fs.promises.readFile(input); return parseTTF(buf); diff --git a/font-src/gen/build-font.mjs b/packages/font/src/font.mjs similarity index 78% rename from font-src/gen/build-font.mjs rename to packages/font/src/font.mjs index 5f67bae35..df6c8b15f 100644 --- a/font-src/gen/build-font.mjs +++ b/packages/font/src/font.mjs @@ -1,11 +1,11 @@ -import { buildGlyphs } from "../glyphs/index.mjs"; -import { copyFontMetrics } from "../meta/aesthetics.mjs"; -import { buildOtl } from "../otl/index.mjs"; +import { buildGlyphs } from "@iosevka/font-glyphs"; +import { copyFontMetrics } from "@iosevka/font-glyphs/aesthetics"; +import { buildOtl } from "@iosevka/font-otl"; +import * as Caching from "@iosevka/geometry-cache"; -import * as Caching from "./caching/index.mjs"; import { finalizeFont } from "./finalize/index.mjs"; -import { CreateEmptyFont } from "./meta/empty-font.mjs"; -import { assignFontNames } from "./meta/naming.mjs"; +import { CreateEmptyFont } from "./font-io/index.mjs"; +import { assignFontNames } from "./naming/index.mjs"; import { convertOtd } from "./otd-conv/index.mjs"; import { generateTtfaControls } from "./ttfa-controls/index.mjs"; diff --git a/font-src/generated/ttfa-ranges.mjs b/packages/font/src/generated/ttfa-ranges.mjs similarity index 100% rename from font-src/generated/ttfa-ranges.mjs rename to packages/font/src/generated/ttfa-ranges.mjs diff --git a/font-src/gen/hb-compat-ligature/index.mjs b/packages/font/src/hb-compat-ligature/index.mjs similarity index 97% rename from font-src/gen/hb-compat-ligature/index.mjs rename to packages/font/src/hb-compat-ligature/index.mjs index 4095b54df..1ce887e54 100644 --- a/font-src/gen/hb-compat-ligature/index.mjs +++ b/packages/font/src/hb-compat-ligature/index.mjs @@ -1,6 +1,6 @@ import { Ot } from "ot-builder"; -import { buildTTF } from "../../support/font-io/font-io.mjs"; +import { buildTTF } from "../font-io/index.mjs"; export async function buildCompatLigatures(para, font) { // We need to fix the glyph order before building the TTF diff --git a/font-src/index.mjs b/packages/font/src/index.mjs similarity index 67% rename from font-src/index.mjs rename to packages/font/src/index.mjs index 0b89328af..4f73e65aa 100644 --- a/font-src/index.mjs +++ b/packages/font/src/index.mjs @@ -1,26 +1,23 @@ import fs from "fs"; import path from "path"; -import url from "url"; import zlib from "zlib"; import * as Toml from "@iarna/toml"; +import { createGrDisplaySheet } from "@iosevka/glyph/relation"; +import * as Parameters from "@iosevka/param"; +import { applyLigationData } from "@iosevka/param/ligation"; +import { applyMetricOverride } from "@iosevka/param/metric-override"; +import * as VariantData from "@iosevka/param/variant"; import { encode } from "@msgpack/msgpack"; -import { buildFont } from "./gen/build-font.mjs"; -import { buildCompatLigatures } from "./gen/hb-compat-ligature/index.mjs"; -import { createNamingDictFromArgv } from "./gen/meta/naming.mjs"; -import { saveTTF } from "./support/font-io/font-io.mjs"; -import { createGrDisplaySheet } from "./support/gr.mjs"; -import { applyLigationData } from "./support/ligation-data.mjs"; -import { applyMetricOverride } from "./support/metric-override.mjs"; -import * as Parameters from "./support/parameters.mjs"; -import * as VariantData from "./support/variant-data.mjs"; - -const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); +import { saveTTF } from "./font-io/index.mjs"; +import { buildFont } from "./font.mjs"; +import { buildCompatLigatures } from "./hb-compat-ligature/index.mjs"; +import { createNamingDictFromArgv } from "./naming/index.mjs"; export default main; async function main(argv) { - const paraT = await getParameters(); + const paraT = await getParameters(argv); const para = paraT(argv); const { font, glyphStore, cacheUpdated, ttfaControls } = await buildFont(argv, para); if (argv.oCharMap) { @@ -39,14 +36,14 @@ async function main(argv) { /////////////////////////////////////////////////////////////////////////////////////////////////// // Parameter preparation -async function getParameters() { - const PARAMETERS_TOML = path.resolve(__dirname, "../params/parameters.toml"); - const WEIGHTS_TOML = path.resolve(__dirname, "../params/shape-weight.toml"); - const WIDTHS_TOML = path.resolve(__dirname, "../params/shape-width.toml"); - const SLOPES_TOML = path.resolve(__dirname, "../params/shape-slope.toml"); - const PRIVATE_TOML = path.resolve(__dirname, "../params/private-parameters.toml"); - const VARIANTS_TOML = path.resolve(__dirname, "../params/variants.toml"); - const LIGATIONS_TOML = path.resolve(__dirname, "../params/ligation-set.toml"); +async function getParameters(argv) { + const PARAMETERS_TOML = path.resolve(argv.paramsDir, "./parameters.toml"); + const WEIGHTS_TOML = path.resolve(argv.paramsDir, "./shape-weight.toml"); + const WIDTHS_TOML = path.resolve(argv.paramsDir, "./shape-width.toml"); + const SLOPES_TOML = path.resolve(argv.paramsDir, "./shape-slope.toml"); + const PRIVATE_TOML = path.resolve(argv.paramsDir, "./private-parameters.toml"); + const VARIANTS_TOML = path.resolve(argv.paramsDir, "./variants.toml"); + const LIGATIONS_TOML = path.resolve(argv.paramsDir, "./ligation-set.toml"); const parametersData = Object.assign( {}, await tryParseToml(PARAMETERS_TOML), diff --git a/packages/font/src/merge-cache.mjs b/packages/font/src/merge-cache.mjs new file mode 100644 index 000000000..c1a469d51 --- /dev/null +++ b/packages/font/src/merge-cache.mjs @@ -0,0 +1,5 @@ +import * as Caching from "@iosevka/geometry-cache"; + +export default async function main(argv) { + await Caching.merge(argv.base, argv.diff, argv.version, argv.freshAgeKey); +} diff --git a/font-src/gen/meta/naming.mjs b/packages/font/src/naming/index.mjs similarity index 100% rename from font-src/gen/meta/naming.mjs rename to packages/font/src/naming/index.mjs diff --git a/font-src/gen/otd-conv/glyph-name.mjs b/packages/font/src/otd-conv/glyph-name.mjs similarity index 99% rename from font-src/gen/otd-conv/glyph-name.mjs rename to packages/font/src/otd-conv/glyph-name.mjs index 4b6ac5357..06427d0ab 100644 --- a/font-src/gen/otd-conv/glyph-name.mjs +++ b/packages/font/src/otd-conv/glyph-name.mjs @@ -1,4 +1,4 @@ -import { Joining, AnyCv, TieMark, Nwid, Wwid, VS01, CvDecompose } from "../../support/gr.mjs"; +import { Joining, AnyCv, TieMark, Nwid, Wwid, VS01, CvDecompose } from "@iosevka/glyph/relation"; const ApplePostNames = new Map([ /* spell-checker: disable */ diff --git a/font-src/gen/otd-conv/glyphs.mjs b/packages/font/src/otd-conv/glyphs.mjs similarity index 97% rename from font-src/gen/otd-conv/glyphs.mjs rename to packages/font/src/otd-conv/glyphs.mjs index b288a2ba7..10395c66c 100644 --- a/font-src/gen/otd-conv/glyphs.mjs +++ b/packages/font/src/otd-conv/glyphs.mjs @@ -1,8 +1,7 @@ +import { Point } from "@iosevka/geometry/point"; +import * as Gr from "@iosevka/glyph/relation"; import { Ot } from "ot-builder"; -import { Point } from "../../support/geometry/point.mjs"; -import * as Gr from "../../support/gr.mjs"; - import * as GlyphName from "./glyph-name.mjs"; function byRank([gna, a], [gnb, b]) { diff --git a/font-src/gen/otd-conv/index.mjs b/packages/font/src/otd-conv/index.mjs similarity index 100% rename from font-src/gen/otd-conv/index.mjs rename to packages/font/src/otd-conv/index.mjs diff --git a/font-src/gen/otd-conv/layout.mjs b/packages/font/src/otd-conv/layout.mjs similarity index 99% rename from font-src/gen/otd-conv/layout.mjs rename to packages/font/src/otd-conv/layout.mjs index 8c0fd06d5..0621e3b7f 100644 --- a/font-src/gen/otd-conv/layout.mjs +++ b/packages/font/src/otd-conv/layout.mjs @@ -1,7 +1,6 @@ +import { Vec2 } from "@iosevka/geometry/point"; import { Ot } from "ot-builder"; -import { Vec2 } from "../../support/geometry/point.mjs"; - export function convertGsub(table, glyphs) { return ConvertGsubGposImpl(GsubHandlers, Ot.Gsub.Table, table, glyphs); } diff --git a/font-src/gen/ttfa-controls/index.mjs b/packages/font/src/ttfa-controls/index.mjs similarity index 94% rename from font-src/gen/ttfa-controls/index.mjs rename to packages/font/src/ttfa-controls/index.mjs index fdda564cd..7840fd759 100644 --- a/font-src/gen/ttfa-controls/index.mjs +++ b/packages/font/src/ttfa-controls/index.mjs @@ -1,6 +1,7 @@ -import ttfaRanges from "../../generated/ttfa-ranges.mjs"; -import * as Gr from "../../support/gr.mjs"; -import { ArrayUtil } from "../../support/utils.mjs"; +import * as Gr from "@iosevka/glyph/relation"; +import { ArrayUtil } from "@iosevka/util"; + +import ttfaRanges from "../generated/ttfa-ranges.mjs"; export async function generateTtfaControls(gsOrig, gsTtf) { let ttfaControls = [`# Machine generated. Do not modify.`]; diff --git a/packages/geometry-cache/package.json b/packages/geometry-cache/package.json new file mode 100644 index 000000000..7b77f2958 --- /dev/null +++ b/packages/geometry-cache/package.json @@ -0,0 +1,11 @@ +{ + "name": "@iosevka/geometry-cache", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs" + }, + "dependencies": { + "@msgpack/msgpack": "^2.8.0" + } +} diff --git a/font-src/gen/caching/index.mjs b/packages/geometry-cache/src/index.mjs similarity index 100% rename from font-src/gen/caching/index.mjs rename to packages/geometry-cache/src/index.mjs diff --git a/packages/geometry/package.json b/packages/geometry/package.json new file mode 100644 index 000000000..adf5baa2e --- /dev/null +++ b/packages/geometry/package.json @@ -0,0 +1,19 @@ +{ + "name": "@iosevka/geometry", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs", + "./anchor": "./src/anchor.mjs", + "./box": "./src/box.mjs", + "./curve-util": "./src/curve-util.mjs", + "./point": "./src/point.mjs", + "./transform": "./src/transform.mjs", + "./spiro-control": "./src/spiro-control.mjs" + }, + "dependencies": { + "@iosevka/util": "28.0.0", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } +} diff --git a/font-src/support/geometry/anchor.mjs b/packages/geometry/src/anchor.mjs similarity index 100% rename from font-src/support/geometry/anchor.mjs rename to packages/geometry/src/anchor.mjs diff --git a/font-src/support/geometry/box.mjs b/packages/geometry/src/box.mjs similarity index 96% rename from font-src/support/geometry/box.mjs rename to packages/geometry/src/box.mjs index 701612598..7e1e9b180 100644 --- a/font-src/support/geometry/box.mjs +++ b/packages/geometry/src/box.mjs @@ -1,4 +1,4 @@ -import { mix } from "../utils.mjs"; +import { mix } from "@iosevka/util"; export class Box { constructor(t, b, l, r) { diff --git a/font-src/support/geometry/curve-util.mjs b/packages/geometry/src/curve-util.mjs similarity index 100% rename from font-src/support/geometry/curve-util.mjs rename to packages/geometry/src/curve-util.mjs diff --git a/font-src/support/geometry/index.mjs b/packages/geometry/src/index.mjs similarity index 99% rename from font-src/support/geometry/index.mjs rename to packages/geometry/src/index.mjs index d414fa004..8a0d9c8c9 100644 --- a/font-src/support/geometry/index.mjs +++ b/packages/geometry/src/index.mjs @@ -1,10 +1,9 @@ import crypto from "crypto"; +import * as Format from "@iosevka/util/formatter"; import * as SpiroJs from "spiro"; import * as TypoGeom from "typo-geom"; -import * as Format from "../util/formatter.mjs"; - import * as CurveUtil from "./curve-util.mjs"; import { Point } from "./point.mjs"; import { SpiroExpander } from "./spiro-expand.mjs"; diff --git a/font-src/support/geometry/point.mjs b/packages/geometry/src/point.mjs similarity index 97% rename from font-src/support/geometry/point.mjs rename to packages/geometry/src/point.mjs index 4fb61d42e..706816da5 100644 --- a/font-src/support/geometry/point.mjs +++ b/packages/geometry/src/point.mjs @@ -1,4 +1,4 @@ -import { mix } from "../utils.mjs"; +import { mix } from "@iosevka/util"; export class Vec2 { constructor(x, y) { diff --git a/font-src/support/geometry/spiro-control.mjs b/packages/geometry/src/spiro-control.mjs similarity index 98% rename from font-src/support/geometry/spiro-control.mjs rename to packages/geometry/src/spiro-control.mjs index 55e3f79f8..24df788ab 100644 --- a/font-src/support/geometry/spiro-control.mjs +++ b/packages/geometry/src/spiro-control.mjs @@ -1,4 +1,4 @@ -import * as Format from "../util/formatter.mjs"; +import * as Format from "@iosevka/util/formatter"; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/font-src/support/geometry/spiro-expand.mjs b/packages/geometry/src/spiro-expand.mjs similarity index 99% rename from font-src/support/geometry/spiro-expand.mjs rename to packages/geometry/src/spiro-expand.mjs index d1451a4d2..7a4198882 100644 --- a/font-src/support/geometry/spiro-expand.mjs +++ b/packages/geometry/src/spiro-expand.mjs @@ -1,7 +1,6 @@ +import { linreg, mix } from "@iosevka/util"; import * as SpiroJs from "spiro"; -import { linreg, mix } from "../utils.mjs"; - import { Vec2 } from "./point.mjs"; import { ControlKnot } from "./spiro-control.mjs"; diff --git a/font-src/support/geometry/transform.mjs b/packages/geometry/src/transform.mjs similarity index 100% rename from font-src/support/geometry/transform.mjs rename to packages/geometry/src/transform.mjs diff --git a/packages/glyph/package.json b/packages/glyph/package.json new file mode 100644 index 000000000..9d476b6a5 --- /dev/null +++ b/packages/glyph/package.json @@ -0,0 +1,16 @@ +{ + "name": "@iosevka/glyph", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/glyph.mjs", + "./store": "./src/store.mjs", + "./block": "./src/block.mjs", + "./relation": "./src/relation.mjs" + }, + "dependencies": { + "@iosevka/geometry": "28.0.0", + "spiro": "^3.0.0", + "typo-geom": "^0.13.1" + } +} diff --git a/font-src/support/glyph-block.mjs b/packages/glyph/src/block.mjs similarity index 100% rename from font-src/support/glyph-block.mjs rename to packages/glyph/src/block.mjs diff --git a/font-src/support/glyph/index.mjs b/packages/glyph/src/glyph.mjs similarity index 96% rename from font-src/support/glyph/index.mjs rename to packages/glyph/src/glyph.mjs index da52941d8..f756b2538 100644 --- a/font-src/support/glyph/index.mjs +++ b/packages/glyph/src/glyph.mjs @@ -1,9 +1,9 @@ import * as util from "util"; -import { Anchor } from "../geometry/anchor.mjs"; -import * as Geom from "../geometry/index.mjs"; -import { Point, Vec2 } from "../geometry/point.mjs"; -import { Transform } from "../geometry/transform.mjs"; +import * as Geom from "@iosevka/geometry"; +import { Anchor } from "@iosevka/geometry/anchor"; +import { Point, Vec2 } from "@iosevka/geometry/point"; +import { Transform } from "@iosevka/geometry/transform"; export class Glyph { constructor(identifier) { diff --git a/font-src/support/gr.mjs b/packages/glyph/src/relation.mjs similarity index 100% rename from font-src/support/gr.mjs rename to packages/glyph/src/relation.mjs diff --git a/font-src/support/glyph-store.mjs b/packages/glyph/src/store.mjs similarity index 100% rename from font-src/support/glyph-store.mjs rename to packages/glyph/src/store.mjs diff --git a/packages/param/package.json b/packages/param/package.json new file mode 100644 index 000000000..4748ff001 --- /dev/null +++ b/packages/param/package.json @@ -0,0 +1,14 @@ +{ + "name": "@iosevka/param", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs", + "./variant": "./src/variant.mjs", + "./ligation": "./src/ligation.mjs", + "./metric-override": "./src/metric-override.mjs" + }, + "dependencies": { + "@iosevka/util": "28.0.0" + } +} diff --git a/font-src/support/parameters.mjs b/packages/param/src/index.mjs similarity index 97% rename from font-src/support/parameters.mjs rename to packages/param/src/index.mjs index bfd1c7990..cf602cf3b 100644 --- a/font-src/support/parameters.mjs +++ b/packages/param/src/index.mjs @@ -1,4 +1,4 @@ -import { monotonicInterpolate } from "./util/monotonic-interpolate.mjs"; +import { monotonicInterpolate } from "@iosevka/util/monotonic-interpolate"; export function init(data, argv) { let para = {}; diff --git a/font-src/support/ligation-data.mjs b/packages/param/src/ligation.mjs similarity index 97% rename from font-src/support/ligation-data.mjs rename to packages/param/src/ligation.mjs index aa00b5221..e8f43e51e 100644 --- a/font-src/support/ligation-data.mjs +++ b/packages/param/src/ligation.mjs @@ -1,4 +1,4 @@ -import * as Parameters from "./parameters.mjs"; +import * as Parameters from "./index.mjs"; export function applyLigationData(data, para, argv) { const defaultBuildup = {}; diff --git a/font-src/support/metric-override.mjs b/packages/param/src/metric-override.mjs similarity index 98% rename from font-src/support/metric-override.mjs rename to packages/param/src/metric-override.mjs index ff6620edd..e69726f35 100644 --- a/font-src/support/metric-override.mjs +++ b/packages/param/src/metric-override.mjs @@ -1,4 +1,4 @@ -import { monotonicInterpolate } from "./util/monotonic-interpolate.mjs"; +import { monotonicInterpolate } from "@iosevka/util/monotonic-interpolate"; export function applyMetricOverride(para, mo, argv) { const bindings = initBindings(para, argv); diff --git a/font-src/support/variant-data.mjs b/packages/param/src/variant.mjs similarity index 99% rename from font-src/support/variant-data.mjs rename to packages/param/src/variant.mjs index a866bd290..c2be464b3 100644 --- a/font-src/support/variant-data.mjs +++ b/packages/param/src/variant.mjs @@ -1,4 +1,4 @@ -import { joinCamel } from "./utils.mjs"; +import { joinCamel } from "@iosevka/util"; export function apply(data, para, argv) { const parsed = parse(data, argv); diff --git a/packages/util/package.json b/packages/util/package.json new file mode 100644 index 000000000..97a3161c8 --- /dev/null +++ b/packages/util/package.json @@ -0,0 +1,11 @@ +{ + "name": "@iosevka/util", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs", + "./formatter": "./src/formatter.mjs", + "./mask-bit": "./src/mask-bit.mjs", + "./monotonic-interpolate": "./src/monotonic-interpolate.mjs" + } +} diff --git a/font-src/support/util/formatter.mjs b/packages/util/src/formatter.mjs similarity index 100% rename from font-src/support/util/formatter.mjs rename to packages/util/src/formatter.mjs diff --git a/font-src/support/utils.mjs b/packages/util/src/index.mjs similarity index 100% rename from font-src/support/utils.mjs rename to packages/util/src/index.mjs diff --git a/font-src/support/util/mask-bit.mjs b/packages/util/src/mask-bit.mjs similarity index 100% rename from font-src/support/util/mask-bit.mjs rename to packages/util/src/mask-bit.mjs diff --git a/font-src/support/util/monotonic-interpolate.mjs b/packages/util/src/monotonic-interpolate.mjs similarity index 100% rename from font-src/support/util/monotonic-interpolate.mjs rename to packages/util/src/monotonic-interpolate.mjs diff --git a/tools/amend-readme/package.json b/tools/amend-readme/package.json new file mode 100644 index 000000000..d865440b5 --- /dev/null +++ b/tools/amend-readme/package.json @@ -0,0 +1,13 @@ +{ + "name": "@iosevka/amend-readme", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs" + }, + "dependencies": { + "@iarna/toml": "^2.2.5", + "@iosevka/param": "28.0.0", + "@unicode/unicode-15.0.0": "^1.5.2" + } +} diff --git a/utility/amend-readme/fragments/description-cheery-picking-styles.md b/tools/amend-readme/src/fragments/description-cheery-picking-styles.md similarity index 100% rename from utility/amend-readme/fragments/description-cheery-picking-styles.md rename to tools/amend-readme/src/fragments/description-cheery-picking-styles.md diff --git a/utility/amend-readme/fragments/description-cherry-picking-ligation-sets.md b/tools/amend-readme/src/fragments/description-cherry-picking-ligation-sets.md similarity index 100% rename from utility/amend-readme/fragments/description-cherry-picking-ligation-sets.md rename to tools/amend-readme/src/fragments/description-cherry-picking-ligation-sets.md diff --git a/utility/amend-readme/fragments/description-predefined-ligation-sets.md b/tools/amend-readme/src/fragments/description-predefined-ligation-sets.md similarity index 100% rename from utility/amend-readme/fragments/description-predefined-ligation-sets.md rename to tools/amend-readme/src/fragments/description-predefined-ligation-sets.md diff --git a/utility/amend-readme/fragments/description-stylistic-sets.md b/tools/amend-readme/src/fragments/description-stylistic-sets.md similarity index 100% rename from utility/amend-readme/fragments/description-stylistic-sets.md rename to tools/amend-readme/src/fragments/description-stylistic-sets.md diff --git a/utility/amend-readme/fragments/packages-desc.md b/tools/amend-readme/src/fragments/packages-desc.md similarity index 100% rename from utility/amend-readme/fragments/packages-desc.md rename to tools/amend-readme/src/fragments/packages-desc.md diff --git a/utility/amend-readme/generate-change-log.mjs b/tools/amend-readme/src/generate-change-log.mjs similarity index 74% rename from utility/amend-readme/generate-change-log.mjs rename to tools/amend-readme/src/generate-change-log.mjs index d825e077a..2870194da 100644 --- a/utility/amend-readme/generate-change-log.mjs +++ b/tools/amend-readme/src/generate-change-log.mjs @@ -7,13 +7,16 @@ import semver from "semver"; import { MdCol } from "./md-format-tools.mjs"; const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); +const ChangesFileDir = path.join(__dirname, "../../../changes"); + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// CHANGE LIST -const ChangeFileDir = path.join(__dirname, "../../changes"); async function GenerateChangeList(argv, out) { - const changeFiles = await fs.promises.readdir(ChangeFileDir); + const changeFiles = await fs.promises.readdir(ChangesFileDir); const fragments = new Map(); for (const file of changeFiles) { - const filePath = path.join(ChangeFileDir, file); + const filePath = path.join(ChangesFileDir, file); const fileParts = path.parse(filePath); if (fileParts.ext !== ".md") continue; if (!semver.valid(fileParts.name) || semver.lt(argv.version, fileParts.name)) continue; @@ -26,8 +29,8 @@ async function GenerateChangeList(argv, out) { out.log(notes.trimEnd() + "\n"); } } -export default (async function main(argv) { +export default async function main(argv) { const out = new MdCol(); await GenerateChangeList(argv, out); await fs.promises.writeFile(argv.outputPath, out.data); -}); +} diff --git a/utility/amend-readme/generate-release-note.mjs b/tools/amend-readme/src/generate-release-note.mjs similarity index 87% rename from utility/amend-readme/generate-release-note.mjs rename to tools/amend-readme/src/generate-release-note.mjs index c991c44db..f206363c0 100644 --- a/utility/amend-readme/generate-release-note.mjs +++ b/tools/amend-readme/src/generate-release-note.mjs @@ -7,17 +7,16 @@ import SemVer from "semver"; import { MdCol } from "./md-format-tools.mjs"; const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); - -const ChangeFileDir = path.join(__dirname, "../../changes"); +const ChangesFileDir = path.join(__dirname, "../../../changes"); /////////////////////////////////////////////////////////////////////////////////////////////////// -// CHANGE LIST +// RELEASE NOTE async function GenerateChangeList(argv, out) { - const changeFiles = await fs.promises.readdir(ChangeFileDir); + const changeFiles = await fs.promises.readdir(ChangesFileDir); const fragments = new Map(); for (const file of changeFiles) { - const filePath = path.join(ChangeFileDir, file); + const filePath = path.join(ChangesFileDir, file); const fileParts = path.parse(filePath); if (fileParts.ext !== ".md") continue; if (!SemVer.valid(fileParts.name) || SemVer.lt(argv.version, fileParts.name)) continue; @@ -35,7 +34,7 @@ async function GenerateChangeList(argv, out) { out.log(notes.trimEnd() + "\n"); } } -export default (async function main(argv) { +export default async function main(argv) { const out = new MdCol("Release-Note"); let baseUrl = `https://github.com/be5invis/Iosevka/blob/v${argv.version}/doc`; await GenerateChangeList(argv, out); @@ -50,4 +49,4 @@ export default (async function main(argv) { `` ); await fs.promises.writeFile(argv.outputPath, out.data); -}); +} diff --git a/utility/amend-readme/index.mjs b/tools/amend-readme/src/index.mjs similarity index 66% rename from utility/amend-readme/index.mjs rename to tools/amend-readme/src/index.mjs index 1d52d6382..00c123099 100644 --- a/utility/amend-readme/index.mjs +++ b/tools/amend-readme/src/index.mjs @@ -20,20 +20,23 @@ export default main; async function main(argv) { let readme = await fs.promises.readFile(argv.mdFilePath, "utf-8"); const dirs = { - projectRoot: path.resolve(__dirname, "../../"), images: path.posix.relative(path.dirname(argv.mdFilePath), "images"), fragments: path.resolve(__dirname, "fragments") }; - readme = (await processSsOt(dirs)).apply(readme); - readme = (await processCherryPickingStyles(dirs)).apply(readme); - readme = (await processSsStyles(dirs)).apply(readme); - readme = (await processCvOt(dirs)).apply(readme); - readme = (await processLigSetCherryPicking(dirs)).apply(readme); - readme = (await processLigSetPreDef(dirs)).apply(readme); - readme = (await processLigSetOt(dirs, 1, g => !isLanguageSpecificLigTag(g.tag))).apply(readme); - readme = (await processLigSetOt(dirs, 2, g => isLanguageSpecificLigTag(g.tag))).apply(readme); + readme = (await processSsOt(argv, dirs)).apply(readme); + readme = (await processCherryPickingStyles(argv, dirs)).apply(readme); + readme = (await processSsStyles(argv, dirs)).apply(readme); + readme = (await processCvOt(argv, dirs)).apply(readme); + readme = (await processLigSetCherryPicking(argv, dirs)).apply(readme); + readme = (await processLigSetPreDef(argv, dirs)).apply(readme); + readme = (await processLigSetOt(argv, dirs, 1, g => !isLanguageSpecificLigTag(g.tag))).apply( + readme + ); + readme = (await processLigSetOt(argv, dirs, 2, g => isLanguageSpecificLigTag(g.tag))).apply( + readme + ); readme = (await processLangList(argv)).apply(readme); - readme = (await processPrivateBuildPlans(dirs)).apply(readme); + readme = (await processPrivateBuildPlans(argv, dirs)).apply(readme); readme = (await processCvInfluences(argv)).apply(readme); readme = (await processPackageList(argv, dirs)).apply(readme); await fs.promises.writeFile(argv.mdFilePath, readme); diff --git a/utility/amend-readme/license-year.mjs b/tools/amend-readme/src/license-year.mjs similarity index 100% rename from utility/amend-readme/license-year.mjs rename to tools/amend-readme/src/license-year.mjs diff --git a/utility/amend-readme/md-format-tools.mjs b/tools/amend-readme/src/md-format-tools.mjs similarity index 100% rename from utility/amend-readme/md-format-tools.mjs rename to tools/amend-readme/src/md-format-tools.mjs diff --git a/utility/amend-readme/sections/cherry-picking-styles.mjs b/tools/amend-readme/src/sections/cherry-picking-styles.mjs similarity index 94% rename from utility/amend-readme/sections/cherry-picking-styles.mjs rename to tools/amend-readme/src/sections/cherry-picking-styles.mjs index f61f32da8..78abf2643 100644 --- a/utility/amend-readme/sections/cherry-picking-styles.mjs +++ b/tools/amend-readme/src/sections/cherry-picking-styles.mjs @@ -1,13 +1,14 @@ import fs from "fs"; import path from "path"; -import { parseVariantsData } from "../../export-data/variants-data.mjs"; +import { parseVariantsData } from "@iosevka/data-export/variants-data"; + import { ImgX, MdCol } from "../md-format-tools.mjs"; import { sampleImageCountEmOfCv } from "./cv-ot.mjs"; -export default async function processCherryPickingStyles(dirs) { - const variantsData = await parseVariantsData(); +export default async function processCherryPickingStyles(argv, dirs) { + const variantsData = await parseVariantsData(argv); const md = new MdCol("Section-Cherry-Picking-Styles"); const headerPath = path.resolve(dirs.fragments, "description-cheery-picking-styles.md"); md.log(await fs.promises.readFile(headerPath, "utf-8")); diff --git a/utility/amend-readme/sections/cv-influences.mjs b/tools/amend-readme/src/sections/cv-influences.mjs similarity index 95% rename from utility/amend-readme/sections/cv-influences.mjs rename to tools/amend-readme/src/sections/cv-influences.mjs index 93dc15c9d..ebe56346d 100644 --- a/utility/amend-readme/sections/cv-influences.mjs +++ b/tools/amend-readme/src/sections/cv-influences.mjs @@ -1,4 +1,5 @@ -import { getCharMapAndSupportedLanguageList } from "../../export-data/supported-languages.mjs"; +import { getCharMapAndSupportedLanguageList } from "@iosevka/data-export/supported-languages"; + import { MdCol } from "../md-format-tools.mjs"; export default async function processCvInfluences(argv) { diff --git a/utility/amend-readme/sections/cv-ot.mjs b/tools/amend-readme/src/sections/cv-ot.mjs similarity index 91% rename from utility/amend-readme/sections/cv-ot.mjs rename to tools/amend-readme/src/sections/cv-ot.mjs index c61b59379..9f32076d2 100644 --- a/utility/amend-readme/sections/cv-ot.mjs +++ b/tools/amend-readme/src/sections/cv-ot.mjs @@ -1,8 +1,9 @@ -import { parseVariantsData } from "../../export-data/variants-data.mjs"; +import { parseVariantsData } from "@iosevka/data-export/variants-data"; + import { ImgX, MdCol } from "../md-format-tools.mjs"; -export default async function processCvOt(dirs) { - const variantsData = await parseVariantsData(); +export default async function processCvOt(argv, dirs) { + const variantsData = await parseVariantsData(argv); const md = new MdCol("Section-OT-Character-Variants"); const TableColumns = 12; md.log(``); diff --git a/utility/amend-readme/sections/lang-list.mjs b/tools/amend-readme/src/sections/lang-list.mjs similarity index 80% rename from utility/amend-readme/sections/lang-list.mjs rename to tools/amend-readme/src/sections/lang-list.mjs index 527e4e3e3..228814f43 100644 --- a/utility/amend-readme/sections/lang-list.mjs +++ b/tools/amend-readme/src/sections/lang-list.mjs @@ -1,4 +1,5 @@ -import { getCharMapAndSupportedLanguageList } from "../../export-data/supported-languages.mjs"; +import { getCharMapAndSupportedLanguageList } from "@iosevka/data-export/supported-languages"; + import { MdCol } from "../md-format-tools.mjs"; export default async function processLangList(argv) { diff --git a/utility/amend-readme/sections/lig-set-cherry-picking.mjs b/tools/amend-readme/src/sections/lig-set-cherry-picking.mjs similarity index 68% rename from utility/amend-readme/sections/lig-set-cherry-picking.mjs rename to tools/amend-readme/src/sections/lig-set-cherry-picking.mjs index 06ce37ea2..78bbfd199 100644 --- a/utility/amend-readme/sections/lig-set-cherry-picking.mjs +++ b/tools/amend-readme/src/sections/lig-set-cherry-picking.mjs @@ -1,11 +1,12 @@ import fs from "fs"; import path from "path"; -import { parseLigationData } from "../../export-data/ligation-data.mjs"; +import { parseLigationData } from "@iosevka/data-export/ligation-data"; + import { MdCol } from "../md-format-tools.mjs"; -export default async function processLigSetCherryPicking(dirs) { - const ligData = await parseLigationData(); +export default async function processLigSetCherryPicking(argv, dirs) { + const ligData = await parseLigationData(argv); const md = new MdCol("Section-Cherry-Picking-Ligation-Sets"); const headerPath = path.resolve(dirs.fragments, "description-cherry-picking-ligation-sets.md"); md.log(await fs.promises.readFile(headerPath, "utf-8")); diff --git a/utility/amend-readme/sections/lig-set-ot.mjs b/tools/amend-readme/src/sections/lig-set-ot.mjs similarity index 78% rename from utility/amend-readme/sections/lig-set-ot.mjs rename to tools/amend-readme/src/sections/lig-set-ot.mjs index ea50a2fae..51c1b6f29 100644 --- a/utility/amend-readme/sections/lig-set-ot.mjs +++ b/tools/amend-readme/src/sections/lig-set-ot.mjs @@ -1,8 +1,9 @@ -import { parseLigationData } from "../../export-data/ligation-data.mjs"; +import { parseLigationData } from "@iosevka/data-export/ligation-data"; + import { ImgX, MdCol } from "../md-format-tools.mjs"; -export default async function processLigSetOt(dirs, index, fn) { - const ligData = await parseLigationData(); +export default async function processLigSetOt(argv, dirs, index, fn) { + const ligData = await parseLigationData(argv); const md = new MdCol(`Section-OT-Ligation-Tags-${index}`); md.log(`
`); for (const ls of ligData.sets) { diff --git a/utility/amend-readme/sections/lig-set-pre-def.mjs b/tools/amend-readme/src/sections/lig-set-pre-def.mjs similarity index 74% rename from utility/amend-readme/sections/lig-set-pre-def.mjs rename to tools/amend-readme/src/sections/lig-set-pre-def.mjs index 0d26e71e7..4f4bfa104 100644 --- a/utility/amend-readme/sections/lig-set-pre-def.mjs +++ b/tools/amend-readme/src/sections/lig-set-pre-def.mjs @@ -1,11 +1,12 @@ import fs from "fs"; import path from "path"; -import { parseLigationData } from "../../export-data/ligation-data.mjs"; +import { parseLigationData } from "@iosevka/data-export/ligation-data"; + import { MdCol } from "../md-format-tools.mjs"; -export default async function processLigSetPreDef(dirs) { - const ligData = await parseLigationData(); +export default async function processLigSetPreDef(argv, dirs) { + const ligData = await parseLigationData(argv); const md = new MdCol("Section-Predefined-Ligation-Sets"); const headerPath = path.resolve(dirs.fragments, "description-predefined-ligation-sets.md"); md.log(await fs.promises.readFile(headerPath, "utf-8")); diff --git a/utility/amend-readme/sections/package-list.mjs b/tools/amend-readme/src/sections/package-list.mjs similarity index 100% rename from utility/amend-readme/sections/package-list.mjs rename to tools/amend-readme/src/sections/package-list.mjs diff --git a/utility/amend-readme/sections/private-build-plans.mjs b/tools/amend-readme/src/sections/private-build-plans.mjs similarity index 68% rename from utility/amend-readme/sections/private-build-plans.mjs rename to tools/amend-readme/src/sections/private-build-plans.mjs index dbfacb9f3..2c77f7162 100644 --- a/utility/amend-readme/sections/private-build-plans.mjs +++ b/tools/amend-readme/src/sections/private-build-plans.mjs @@ -3,9 +3,9 @@ import path from "path"; import { MdCol } from "../md-format-tools.mjs"; -export default async function processPrivateBuildPlans(dirs) { +export default async function processPrivateBuildPlans(argv, dirs) { const md = new MdCol("Section-Private-Build-Plan-Sample"); - const tomlPath = path.resolve(dirs.projectRoot, "private-build-plans.sample.toml"); + const tomlPath = path.resolve(argv.projectRoot, "private-build-plans.sample.toml"); const toml = await fs.promises.readFile(tomlPath, "utf-8"); md.log("```toml\n" + toml + "```"); return md; diff --git a/utility/amend-readme/sections/ss-ot.mjs b/tools/amend-readme/src/sections/ss-ot.mjs similarity index 75% rename from utility/amend-readme/sections/ss-ot.mjs rename to tools/amend-readme/src/sections/ss-ot.mjs index 76d90ed18..28b4d55ee 100644 --- a/utility/amend-readme/sections/ss-ot.mjs +++ b/tools/amend-readme/src/sections/ss-ot.mjs @@ -1,8 +1,9 @@ -import { parseVariantsData } from "../../export-data/variants-data.mjs"; +import { parseVariantsData } from "@iosevka/data-export/variants-data"; + import { ImgX, MdCol } from "../md-format-tools.mjs"; -export default async function processSsOt(dirs) { - const variantsData = await parseVariantsData(); +export default async function processSsOt(argv, dirs) { + const variantsData = await parseVariantsData(argv); const md = new MdCol("Section-OT-Stylistic-Sets"); md.log(`
`); for (const ss of variantsData.composites) { diff --git a/utility/amend-readme/sections/ss-styles.mjs b/tools/amend-readme/src/sections/ss-styles.mjs similarity index 74% rename from utility/amend-readme/sections/ss-styles.mjs rename to tools/amend-readme/src/sections/ss-styles.mjs index 414c3265c..ee0b938a3 100644 --- a/utility/amend-readme/sections/ss-styles.mjs +++ b/tools/amend-readme/src/sections/ss-styles.mjs @@ -1,11 +1,12 @@ import fs from "fs"; import path from "path"; -import { parseVariantsData } from "../../export-data/variants-data.mjs"; +import { parseVariantsData } from "@iosevka/data-export/variants-data"; + import { MdCol } from "../md-format-tools.mjs"; -export default async function processSsStyles(dirs) { - const variantsData = await parseVariantsData(); +export default async function processSsStyles(argv, dirs) { + const variantsData = await parseVariantsData(argv); const md = new MdCol("Section-Stylistic-Sets"); const headerPath = path.resolve(dirs.fragments, "description-stylistic-sets.md"); md.log(await fs.promises.readFile(headerPath, "utf-8")); diff --git a/tools/data-export/package.json b/tools/data-export/package.json new file mode 100644 index 000000000..04b8253c9 --- /dev/null +++ b/tools/data-export/package.json @@ -0,0 +1,17 @@ +{ + "name": "@iosevka/data-export", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs", + "./ligation-data": "./src/ligation-data.mjs", + "./variants-data": "./src/variants-data.mjs", + "./supported-languages": "./src/supported-languages.mjs" + }, + "dependencies": { + "@iarna/toml": "^2.2.5", + "@iosevka/param": "28.0.0", + "@unicode/unicode-15.0.0": "^1.5.2", + "cldr": "^7.5.0" + } +} diff --git a/utility/export-data/coverage-export/block-data.mjs b/tools/data-export/src/coverage-export/block-data.mjs similarity index 100% rename from utility/export-data/coverage-export/block-data.mjs rename to tools/data-export/src/coverage-export/block-data.mjs diff --git a/utility/export-data/coverage-export/gather-coverage-data.mjs b/tools/data-export/src/coverage-export/gather-coverage-data.mjs similarity index 100% rename from utility/export-data/coverage-export/gather-coverage-data.mjs rename to tools/data-export/src/coverage-export/gather-coverage-data.mjs diff --git a/utility/export-data/index.mjs b/tools/data-export/src/index.mjs similarity index 59% rename from utility/export-data/index.mjs rename to tools/data-export/src/index.mjs index 199fdd598..b8d1e6eb4 100644 --- a/utility/export-data/index.mjs +++ b/tools/data-export/src/index.mjs @@ -1,6 +1,4 @@ import fs from "fs"; -import path from "path"; -import url from "url"; import { parseLigationData } from "./ligation-data.mjs"; import { getCharMapAndSupportedLanguageList } from "./supported-languages.mjs"; @@ -8,14 +6,8 @@ import { parseVariantsData } from "./variants-data.mjs"; export default main; async function main(argv) { - const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); - const packageJson = JSON.parse( - await fs.promises.readFile(path.join(__dirname, "../../package.json")) - ); - const version = packageJson.version; - - const variantsData = await parseVariantsData(); - const ligationData = await parseLigationData(); + const variantsData = await parseVariantsData(argv); + const ligationData = await parseLigationData(argv); const cl = await getCharMapAndSupportedLanguageList( argv.charMapPath, argv.charMapItalicPath, @@ -25,7 +17,7 @@ async function main(argv) { argv.exportPathMeta, JSON.stringify( { - version, + version: argv.version, variantsData, ligationData: { cherry: ligationData.cherry, @@ -37,5 +29,8 @@ async function main(argv) { 2 ) ); - await fs.promises.writeFile(argv.exportPathCov, JSON.stringify({ version, ...cl }, null, 2)); + await fs.promises.writeFile( + argv.exportPathCov, + JSON.stringify({ version: argv.version, ...cl }, null, 2) + ); } diff --git a/utility/export-data/ligation-data.mjs b/tools/data-export/src/ligation-data.mjs similarity index 88% rename from utility/export-data/ligation-data.mjs rename to tools/data-export/src/ligation-data.mjs index 2c8906557..d6f25a084 100644 --- a/utility/export-data/ligation-data.mjs +++ b/tools/data-export/src/ligation-data.mjs @@ -1,10 +1,8 @@ import fs from "fs"; import path from "path"; -import url from "url"; import * as toml from "@iarna/toml"; - -import { createBuildup } from "../../font-src/support/ligation-data.mjs"; +import { createBuildup } from "@iosevka/param/ligation"; const ligationSamplesNarrow = [ [ @@ -126,10 +124,9 @@ function buildLigationSet(ligData, getKey) { return ligationSets; } -export async function parseLigationData() { - const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); +export async function parseLigationData(argv) { const ligToml = await fs.promises.readFile( - path.join(__dirname, "../../params/ligation-set.toml"), + path.join(argv.paramsDir, "ligation-set.toml"), "utf8" ); const ligData = toml.parse(ligToml); diff --git a/utility/export-data/supported-languages.mjs b/tools/data-export/src/supported-languages.mjs similarity index 100% rename from utility/export-data/supported-languages.mjs rename to tools/data-export/src/supported-languages.mjs diff --git a/utility/export-data/variants-data.mjs b/tools/data-export/src/variants-data.mjs similarity index 93% rename from utility/export-data/variants-data.mjs rename to tools/data-export/src/variants-data.mjs index bc298e8e9..f483d2432 100644 --- a/utility/export-data/variants-data.mjs +++ b/tools/data-export/src/variants-data.mjs @@ -1,10 +1,8 @@ import fs from "fs"; import path from "path"; -import url from "url"; import * as toml from "@iarna/toml"; - -import * as VariantDataParser from "../../font-src/support/variant-data.mjs"; +import * as VariantDataParser from "@iosevka/param/variant"; function getCvData(parsed) { const samplerGroups = new Map(); @@ -140,10 +138,10 @@ function uniqueHotChars(cfgDefault, cfgSS) { } return Array.from(s); } -export async function parseVariantsData(fileName) { - const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); + +export async function parseVariantsData(argv) { const variantsToml = await fs.promises.readFile( - path.join(__dirname, "../../params/", fileName || "variants.toml"), + path.join(argv.paramsDir, argv.paramsFileName || "variants.toml"), "utf8" ); const varDatRaw = toml.parse(variantsToml); diff --git a/tools/generate-samples/package.json b/tools/generate-samples/package.json new file mode 100644 index 000000000..779b5a189 --- /dev/null +++ b/tools/generate-samples/package.json @@ -0,0 +1,11 @@ +{ + "name": "@iosevka/generate-samples", + "version": "28.0.0", + "private": true, + "exports": { + ".": "./src/index.mjs" + }, + "dependencies": { + "@iosevka/data-export": "28.0.0" + } +} diff --git a/utility/generate-samples/index.mjs b/tools/generate-samples/src/index.mjs similarity index 91% rename from utility/generate-samples/index.mjs rename to tools/generate-samples/src/index.mjs index 9f7204814..b1a101820 100644 --- a/utility/generate-samples/index.mjs +++ b/tools/generate-samples/src/index.mjs @@ -1,9 +1,9 @@ import fs from "fs"; import path from "path"; -import { parseLigationData } from "../export-data/ligation-data.mjs"; -import { getCharMapAndSupportedLanguageList } from "../export-data/supported-languages.mjs"; -import { parseVariantsData } from "../export-data/variants-data.mjs"; +import { parseLigationData } from "@iosevka/data-export/ligation-data"; +import { getCharMapAndSupportedLanguageList } from "@iosevka/data-export/supported-languages"; +import { parseVariantsData } from "@iosevka/data-export/variants-data"; import Button from "./templates/button.mjs"; import CharGrid from "./templates/char-grid.mjs"; @@ -38,8 +38,8 @@ class Generator { } async function main(argv) { - const variantsData = await parseVariantsData(); - const ligationData = await parseLigationData(); + const variantsData = await parseVariantsData(argv); + const ligationData = await parseLigationData(argv); const tasks = new Generator( argv.outputDir, argv.fontGroups.map(fg => path.resolve(process.cwd(), "dist", fg, "TTF", "*.ttf")) diff --git a/utility/generate-samples/templates/button.mjs b/tools/generate-samples/src/templates/button.mjs similarity index 100% rename from utility/generate-samples/templates/button.mjs rename to tools/generate-samples/src/templates/button.mjs diff --git a/utility/generate-samples/templates/char-grid.mjs b/tools/generate-samples/src/templates/char-grid.mjs similarity index 100% rename from utility/generate-samples/templates/char-grid.mjs rename to tools/generate-samples/src/templates/char-grid.mjs diff --git a/utility/generate-samples/templates/character-variant.mjs b/tools/generate-samples/src/templates/character-variant.mjs similarity index 100% rename from utility/generate-samples/templates/character-variant.mjs rename to tools/generate-samples/src/templates/character-variant.mjs diff --git a/utility/generate-samples/templates/grand-title.mjs b/tools/generate-samples/src/templates/grand-title.mjs similarity index 100% rename from utility/generate-samples/templates/grand-title.mjs rename to tools/generate-samples/src/templates/grand-title.mjs diff --git a/utility/generate-samples/templates/languages.mjs b/tools/generate-samples/src/templates/languages.mjs similarity index 100% rename from utility/generate-samples/templates/languages.mjs rename to tools/generate-samples/src/templates/languages.mjs diff --git a/utility/generate-samples/templates/ligation-set.mjs b/tools/generate-samples/src/templates/ligation-set.mjs similarity index 100% rename from utility/generate-samples/templates/ligation-set.mjs rename to tools/generate-samples/src/templates/ligation-set.mjs diff --git a/utility/generate-samples/templates/matrix.mjs b/tools/generate-samples/src/templates/matrix.mjs similarity index 100% rename from utility/generate-samples/templates/matrix.mjs rename to tools/generate-samples/src/templates/matrix.mjs diff --git a/utility/generate-samples/templates/package-sample.mjs b/tools/generate-samples/src/templates/package-sample.mjs similarity index 100% rename from utility/generate-samples/templates/package-sample.mjs rename to tools/generate-samples/src/templates/package-sample.mjs diff --git a/utility/generate-samples/templates/stylistic-set.mjs b/tools/generate-samples/src/templates/stylistic-set.mjs similarity index 100% rename from utility/generate-samples/templates/stylistic-set.mjs rename to tools/generate-samples/src/templates/stylistic-set.mjs diff --git a/utility/generate-samples/templates/weights.mjs b/tools/generate-samples/src/templates/weights.mjs similarity index 100% rename from utility/generate-samples/templates/weights.mjs rename to tools/generate-samples/src/templates/weights.mjs diff --git a/utility/generate-samples/themes/index.mjs b/tools/generate-samples/src/themes/index.mjs similarity index 100% rename from utility/generate-samples/themes/index.mjs rename to tools/generate-samples/src/themes/index.mjs diff --git a/utility/export-tokenized-sample-code.mjs b/tools/generate-samples/src/tokenized-sample-code.mjs similarity index 86% rename from utility/export-tokenized-sample-code.mjs rename to tools/generate-samples/src/tokenized-sample-code.mjs index f2c7408be..d14c237c1 100644 --- a/utility/export-tokenized-sample-code.mjs +++ b/tools/generate-samples/src/tokenized-sample-code.mjs @@ -1,6 +1,6 @@ import fs from "node:fs"; -import { ssStrings } from "./generate-samples/templates/package-sample.mjs"; +import { ssStrings } from "./templates/package-sample.mjs"; export default main; diff --git a/tools/misc/package.json b/tools/misc/package.json new file mode 100644 index 000000000..b1e4be81d --- /dev/null +++ b/tools/misc/package.json @@ -0,0 +1,10 @@ +{ + "name": "@iosevka/misc", + "version": "28.0.0", + "private": true, + "dependencies": { + "semver": "^7.5.4", + "wawoff2": "^2.0.1", + "@iosevka/util": "28.0.0" + } +} diff --git a/utility/copy-char-name-to-markdown.mjs b/tools/misc/src/copy-char-name-to-markdown.mjs similarity index 100% rename from utility/copy-char-name-to-markdown.mjs rename to tools/misc/src/copy-char-name-to-markdown.mjs diff --git a/utility/create-sha-file.mjs b/tools/misc/src/create-sha-file.mjs similarity index 100% rename from utility/create-sha-file.mjs rename to tools/misc/src/create-sha-file.mjs diff --git a/utility/generate-ttfa-ranges/index.mjs b/tools/misc/src/generate-ttfa-ranges.mjs similarity index 97% rename from utility/generate-ttfa-ranges/index.mjs rename to tools/misc/src/generate-ttfa-ranges.mjs index 8daa1b939..7cb3e6c9b 100644 --- a/utility/generate-ttfa-ranges/index.mjs +++ b/tools/misc/src/generate-ttfa-ranges.mjs @@ -2,7 +2,7 @@ import fs from "fs"; import path from "path"; import url from "url"; -import { ArrayUtil } from "../../font-src/support/utils.mjs"; +import { ArrayUtil } from "@iosevka/util"; const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); @@ -49,7 +49,7 @@ async function main() { } await fs.promises.writeFile( - path.resolve(__dirname, "../../font-src/generated/ttfa-ranges.mjs"), + path.resolve(__dirname, "../../../packages/font/src/generated/ttfa-ranges.mjs"), `/* eslint-disable */\n` + `// Machine generated. Do not modify。\n` + `export default ` + diff --git a/utility/make-webfont-css.mjs b/tools/misc/src/make-webfont-css.mjs similarity index 100% rename from utility/make-webfont-css.mjs rename to tools/misc/src/make-webfont-css.mjs diff --git a/utility/ttf-to-woff2.mjs b/tools/misc/src/ttf-to-woff2.mjs similarity index 79% rename from utility/ttf-to-woff2.mjs rename to tools/misc/src/ttf-to-woff2.mjs index 0c897a807..6c842916f 100644 --- a/utility/ttf-to-woff2.mjs +++ b/tools/misc/src/ttf-to-woff2.mjs @@ -2,8 +2,8 @@ import fs from "fs"; import * as wawoff from "wawoff2"; -export default (async function (from, to) { +export default async function (from, to) { const input = await fs.promises.readFile(from); const out = await wawoff.compress(input); await fs.promises.writeFile(to, out); -}); +} diff --git a/tools/misc/src/update-package-json-version.mjs b/tools/misc/src/update-package-json-version.mjs new file mode 100644 index 000000000..db94b74b1 --- /dev/null +++ b/tools/misc/src/update-package-json-version.mjs @@ -0,0 +1,91 @@ +import fs from "fs"; +import path from "path"; +import url from "url"; + +import semver from "semver"; + +const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); + +const ChangeFileDir = path.join(__dirname, "../../../changes"); +const PackageJsonPath = path.join(__dirname, "../../../package.json"); +const PACKAGES_DIR = path.join(__dirname, "../../../packages"); +const TOOLS_DIR = path.join(__dirname, "../../../tools"); + +setTimeout( + () => + main().catch(e => { + console.error(e); + process.exit(1); + }), + 0 +); + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +async function main() { + const version = await GetLatestVersion(); + await updateMainJsonVersion(version); + + const packages = await collectPackages(); + await updateSubPackagesVersion(packages, version); +} + +async function GetLatestVersion() { + const changeFiles = await fs.promises.readdir(ChangeFileDir); + const versions = new Set(); + for (const file of changeFiles) { + const filePath = path.join(ChangeFileDir, file); + const fileParts = path.parse(filePath); + if (fileParts.ext !== ".md") continue; + if (!semver.valid(fileParts.name)) continue; + versions.add(fileParts.name); + } + const sortedVersions = Array.from(versions).sort((a, b) => semver.compare(b, a)); + return sortedVersions[0]; +} + +async function updateMainJsonVersion(version) { + const packageJson = JSON.parse(await fs.promises.readFile(PackageJsonPath)); + packageJson.version = version; + await fs.promises.writeFile(PackageJsonPath, JSON.stringify(packageJson, null, " ") + "\n"); +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +async function collectPackages() { + const packages = new Map(); + for (const dir of [PACKAGES_DIR, TOOLS_DIR]) { + for (const packageItem of await fs.promises.readdir(dir)) { + const pkgPath = path.join(dir, packageItem); + const jsonPath = path.resolve(pkgPath, "package.json"); + const stat = await fs.promises.stat(pkgPath); + if (stat.isDirectory() && (await exists(jsonPath))) { + const packageJson = JSON.parse(await fs.promises.readFile(jsonPath, "utf-8")); + packages.set(packageJson.name, jsonPath); + } + } + } + return packages; +} + +async function exists(fileName) { + try { + await fs.promises.access(fileName); + return true; + } catch (e) { + return false; + } +} + +async function updateSubPackagesVersion(internalPackages, version) { + for (const [pkgName, pkgJsonPath] of internalPackages) { + const packageJson = JSON.parse(await fs.promises.readFile(pkgJsonPath)); + packageJson.version = version; + if (packageJson.dependencies) { + for (const [depName, depVersion] of Object.entries(packageJson.dependencies)) { + if (internalPackages.has(depName)) packageJson.dependencies[depName] = version; + } + } + await fs.promises.writeFile(pkgJsonPath, JSON.stringify(packageJson, null, " ") + "\n"); + } +} diff --git a/utility/dump-cv-list.mjs b/utility/dump-cv-list.mjs deleted file mode 100644 index a5f9efa6d..000000000 --- a/utility/dump-cv-list.mjs +++ /dev/null @@ -1,18 +0,0 @@ -import { parseVariantsData } from "./export-data/variants-data.mjs"; - -main().catch(e => { - console.error(e); - process.exit(1); -}); - -async function main() { - const selector = process.argv[2]; - const variantsData = await parseVariantsData(); - - for (const item of variantsData.primes) { - if (item.key !== selector) continue; - for (const v of item.variants) { - console.log(v.rank, v.key, "|", v.description); - } - } -} diff --git a/utility/transpose-variant-tensor.mjs b/utility/transpose-variant-tensor.mjs deleted file mode 100644 index 8b080a8ed..000000000 --- a/utility/transpose-variant-tensor.mjs +++ /dev/null @@ -1,102 +0,0 @@ -import * as fs from "fs"; -import * as path from "path"; -import * as url from "url"; - -import * as Toml from "@iarna/toml"; - -const __filename = url.fileURLToPath(import.meta.url); -const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); - -main().catch(e => { - console.error(e); - process.exit(1); -}); - -async function main() { - const paramsTomlPath = path.join(__dirname, "../params", "variants.toml"); - const tomlText = await fs.promises.readFile(paramsTomlPath, "utf8"); - const tomlData = Toml.parse(tomlText); - - const selector = process.argv[2]; - const vd = tomlData.prime[selector]; - - const dimensions = (process.argv.length - 3) / 2; - const variantsPerDimension = process.argv.slice(3, 3 + dimensions).map(x => parseInt(x, 10)); - - const idMap = Array.from(Array(dimensions).keys()); - const transposedMap = process.argv - .slice(3 + dimensions, 3 + 2 * dimensions) - .map(x => parseInt(x, 10) - 1); - - let rankToDimensionMapOrig = []; - populateRankToDimensionMap(rankToDimensionMapOrig, variantsPerDimension, idMap, 0, []); - - let rankToDimensionMapTransposed = []; - populateRankToDimensionMap( - rankToDimensionMapTransposed, - variantsPerDimension, - transposedMap, - 0, - [] - ); - - const revMap = reverseMap(rankToDimensionMapTransposed); - - let rankedVariants = []; - let variants1 = {}; - - for (const [k, v] of Object.entries(vd.variants)) { - const rank = v.rank; - if (rank) { - v.rank = revMap.get(rankToDimensionMapOrig[rank - 1]); - if (!isFinite(v.rank)) throw new Error("Invalid rank"); - rankedVariants.push([v.rank, k, v]); - } else { - variants1[k] = v; - } - } - rankedVariants.sort((a, b) => a[0] - b[0]); - for (const [rank, k, v] of rankedVariants) { - variants1[k] = v; - } - - for (const [k, v] of Object.entries(variants1)) { - console.log(`[prime.${selector}.variants.${k}]`); - for (const [k1, v1] of Object.entries(v)) { - if (k1 === "selector") continue; - console.log(`${k1} = ${JSON.stringify(v1)}`); - } - - for (const [selector, glyphSuffix] of Object.entries(v.selector)) { - if (/^\w+$/.test(selector)) { - console.log(`selector.${selector} = ${JSON.stringify(glyphSuffix)}`); - } else { - console.log( - `selector.${JSON.stringify(selector)} = ${JSON.stringify(glyphSuffix)}` - ); - } - } - console.log(``); - } -} - -function populateRankToDimensionMap(sink, variantsPerDimension, mapping, iDimension, acc) { - if (iDimension === variantsPerDimension.length) { - sink.push(acc.join(",")); - return; - } - const nVariants = variantsPerDimension[mapping[iDimension]]; - for (let iVariant = 0; iVariant < nVariants; iVariant++) { - let acc1 = [...acc]; - acc1[mapping[iDimension]] = iVariant; - populateRankToDimensionMap(sink, variantsPerDimension, mapping, iDimension + 1, acc1); - } -} - -function reverseMap(a) { - const m = new Map(); - for (const [i, x] of a.entries()) { - m.set(x, i + 1); - } - return m; -} diff --git a/utility/update-package-json-version/index.mjs b/utility/update-package-json-version/index.mjs deleted file mode 100644 index e1dba3bd5..000000000 --- a/utility/update-package-json-version/index.mjs +++ /dev/null @@ -1,41 +0,0 @@ -import fs from "fs"; -import path from "path"; -import url from "url"; - -import semver from "semver"; - -const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); - -const ChangeFileDir = path.join(__dirname, "../../changes"); -const PackageJsonPath = path.join(__dirname, "../../package.json"); - -setTimeout( - () => - main().catch(e => { - console.error(e); - process.exit(1); - }), - 0 -); - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -async function main() { - const version = await GetLatestVersion(); - const packageJson = JSON.parse(await fs.promises.readFile(PackageJsonPath)); - packageJson.version = version; - await fs.promises.writeFile(PackageJsonPath, JSON.stringify(packageJson, null, " ") + "\n"); -} -async function GetLatestVersion() { - const changeFiles = await fs.promises.readdir(ChangeFileDir); - const versions = new Set(); - for (const file of changeFiles) { - const filePath = path.join(ChangeFileDir, file); - const fileParts = path.parse(filePath); - if (fileParts.ext !== ".md") continue; - if (!semver.valid(fileParts.name)) continue; - versions.add(fileParts.name); - } - const sortedVersions = Array.from(versions).sort((a, b) => semver.compare(b, a)); - return sortedVersions[0]; -} diff --git a/verdafile.mjs b/verdafile.mjs index 417eabc4c..a4fddb23b 100644 --- a/verdafile.mjs +++ b/verdafile.mjs @@ -413,7 +413,7 @@ const DistUnhintedTTF = file.make( ); echo.action(echo.hl.command(`Hint TTF`), out.full); - await silently.node(`font-src/derive-spacing.mjs`, { + await silently.node(`packages/font/src/derive-spacing.mjs`, { i: deriveFrom.full, o: out.full, oNoGc: noGcTtfPath.full, @@ -435,9 +435,10 @@ const DistUnhintedTTF = file.make( ); echo.action(echo.hl.command(`Create TTF`), out.full); - const { cacheUpdated } = await silently.node("font-src/index.mjs", { + const { cacheUpdated } = await silently.node("packages/font/src/index.mjs", { o: out.full, ...(fi.buildCharMap ? { oCharMap: charMapPath.full } : {}), + paramsDir: Path.resolve("params"), oTtfaControls: ttfaControlsPath.full, cacheFreshAgeKey: ageKey, iCache: cachePath, @@ -449,7 +450,7 @@ const DistUnhintedTTF = file.make( if (cacheUpdated) { const lock = build.locks.alloc(cacheFileName); await lock.acquire(); - await silently.node(`font-src/merge-cache.mjs`, { + await silently.node(`packages/font/src/merge-cache.mjs`, { base: cachePath, diff: cacheDiffPath, version: fi.menu.version, @@ -507,7 +508,7 @@ const DistHintedTTF = file.make( ); echo.action(echo.hl.command(`Create TTF`), out.full); - await silently.node(`font-src/derive-spacing.mjs`, { + await silently.node(`packages/font/src/derive-spacing.mjs`, { i: deriveFrom.full, oNoGc: noGcTtfPath.full, o: out.full, @@ -548,7 +549,7 @@ const DistWoff2 = file.make( const [from] = await target.need(Ctor(group, f), de`${out.dir}`); echo.action(echo.hl.command("Create WOFF2"), out.full, echo.hl.operator("<-"), from.full); - await silently.node(`utility/ttf-to-woff2.mjs`, from.full, out.full); + await silently.node(`tools/misc/src/ttf-to-woff2.mjs`, from.full, out.full); } ); @@ -599,7 +600,14 @@ async function createWebFontCssImpl(target, output, gr, formats, unhinted) { const [bp, ts] = await target.need(BuildPlanOf(gr), GroupFontsOf(gr)); const hs = await target.need(...ts.map(FontInfoOf)); echo.action(echo.hl.command(`Create WebFont CSS`), output, echo.hl.operator("<-"), gr); - await silently.node("utility/make-webfont-css.mjs", output, bp.family, hs, formats, unhinted); + await silently.node( + "tools/misc/src/make-webfont-css.mjs", + output, + bp.family, + hs, + formats, + unhinted + ); } // Content files @@ -876,16 +884,19 @@ const PagesDir = oracle(`pages-dir-path`, async t => { }); const PagesDataExport = task(`pages:data-export`, async t => { + const [version] = await t.need(Version); const [pagesDir] = await t.need(PagesDir, Version, Parameters, UtilScripts); const [cm, cmi, cmo] = await t.need( BuildCM("Iosevka", "Iosevka-Regular"), BuildCM("Iosevka", "Iosevka-Italic"), BuildCM("Iosevka", "Iosevka-Oblique") ); - await node(`utility/export-tokenized-sample-code.mjs`, { + await node(`tools/generate-samples/src/tokenized-sample-code.mjs`, { output: Path.resolve(pagesDir, "shared/tokenized-sample-code/alphabet.txt.json") }); - await node(`utility/export-data/index.mjs`, { + await node(`tools/data-export/src/index.mjs`, { + version, + paramsDir: Path.resolve("params"), charMapPath: cm.full, charMapItalicPath: cmi.full, charMapObliquePath: cmo.full, @@ -947,8 +958,10 @@ const AmendReadmeFor = task.make( BuildCM("Iosevka", "Iosevka-Italic"), BuildCM("Iosevka", "Iosevka-Oblique") ); - return node(`utility/amend-readme/index.mjs`, { + return node(`tools/amend-readme/src/index.mjs`, { version, + projectRoot: Path.resolve("."), + paramsDir: Path.resolve("params"), mdFilePath: f, releasePackagesJsonPath: rpFiles.full, charMapPath: cm.full, @@ -982,7 +995,7 @@ const ReleaseNotePackagesFile = file(`${BUILD}/release-packages.json`, async (t, await FS.promises.writeFile(out.full, JSON.stringify(releaseNoteGroups, null, " ")); }); const AmendLicenseYear = task("amend-readme:license-year", async target => { - return node(`utility/amend-readme/license-year.mjs`, { + return node(`tools/amend-readme/src/license-year.mjs`, { path: "LICENSE.md" }); }); @@ -1010,8 +1023,9 @@ const SampleImagesPre = task(`sample-images:pre`, async target => { BuildCM("Iosevka", "Iosevka-Italic"), BuildCM("Iosevka", "Iosevka-Oblique") ); - return await node("utility/generate-samples/index.mjs", { + return await node("tools/generate-samples/src/index.mjs", { version, + paramsDir: Path.resolve("params"), outputDir: IMAGE_TASKS, packageSnapshotTasks: await PackageSnapshotConfig(target), fontGroups: fontGroups, @@ -1061,7 +1075,7 @@ const ReleaseNotesFile = file.make( await t.need(Version, UtilScripts, de(ARCHIVE_DIR)); const [changeFiles] = await t.need(ChangeFileList()); await t.need(changeFiles.map(fu)); - await node("utility/amend-readme/generate-release-note.mjs", { + await node("tools/amend-readme/src/generate-release-note.mjs", { version, outputPath: out.full }); @@ -1076,7 +1090,7 @@ const ChangeLogMd = file(`CHANGELOG.md`, async (t, out) => { await t.need(UtilScripts, de(ARCHIVE_DIR)); const [changeFiles] = await t.need(ChangeFileList()); await t.need(changeFiles.map(fu)); - await node("utility/amend-readme/generate-change-log.mjs", { version, outputPath: out.full }); + await node("tools/amend-readme/src/generate-change-log.mjs", { version, outputPath: out.full }); }); const ChangeFileList = oracle.make( () => `release:change-file-list`, @@ -1104,7 +1118,7 @@ const Release = task(`release`, async target => { }); const ReleaseArchives = task(`release:archives`, async target => { - const [version, collectPlans] = await target.need(Version, CollectPlans); + const [version, collectPlans] = await target.need(Version, CollectPlans, UtilScriptFiles); let goals = []; for (const [cgr, plan] of Object.entries(collectPlans)) { if (!plan.inRelease) continue; @@ -1120,28 +1134,27 @@ const ReleaseArchives = task(`release:archives`, async target => { } const [archiveFiles] = await target.need(goals); // Create hash of packages - await target.need(fu`utility/create-sha-file.mjs`); - await node("utility/create-sha-file.mjs", "doc/packages-sha.txt", archiveFiles); + await node("tools/misc/src/create-sha-file.mjs", "doc/packages-sha.txt", archiveFiles); }); /////////////////////////////////////////////////////////// ////// Script Building ////// /////////////////////////////////////////////////////////// -const MARCOS = [fu`font-src/meta/macros.ptl`]; +const MARCOS = [ + fu`packages/font-glyphs/src/meta/macros.ptl`, + fu`packages/font-otl/src/meta/macros.ptl` +]; const ScriptsUnder = oracle.make( (ext, dir) => `${ext}-scripts-under::${dir}`, (target, ext, dir) => FileList({ under: dir, pattern: `**/*.${ext}` })(target) ); const UtilScriptFiles = computed("util-script-files", async target => { - const [mjs, md] = await target.need( - ScriptsUnder("mjs", "utility"), - ScriptsUnder("md", "utility") - ); + const [mjs, md] = await target.need(ScriptsUnder("mjs", "tools"), ScriptsUnder("md", "tools")); return [...mjs, ...md]; }); const ScriptFiles = computed.group("script-files", async (target, ext) => { - const [ss] = await target.need(ScriptsUnder(ext, `font-src`)); + const [ss] = await target.need(ScriptsUnder(ext, `packages`)); return ss; }); const JavaScriptFromPtl = computed("scripts-js-from-ptl", async target => {