From c48bc20aa22c9db50a0698652c05a52c808c7306 Mon Sep 17 00:00:00 2001 From: be5invis Date: Mon, 29 Jun 2020 23:31:41 -0700 Subject: [PATCH] Move font building related files to font-src --- .gitignore | 10 +++++----- {gen => font-src/gen}/build-font.js | 0 {gen => font-src/gen}/build-glyphs.ptl | 0 {gen => font-src/gen}/empty-font.js | 0 {gen => font-src/gen}/finalize/autoref.js | 0 {gen => font-src/gen}/finalize/gc.js | 0 {gen => font-src/gen}/finalize/index.js | 0 {gen => font-src/gen}/kits/boole-kit.ptl | 0 {gen => font-src/gen}/kits/spiro-kit.ptl | 0 {glyphs => font-src/glyphs}/autobuild-accents.ptl | 0 .../glyphs}/autobuild-composite.ptl | 0 .../glyphs}/autobuild-transformed.ptl | 0 {glyphs => font-src/glyphs}/common-shapes.ptl | 0 {glyphs => font-src/glyphs}/letter-cyrillic.ptl | 0 {glyphs => font-src/glyphs}/letter-greek.ptl | 0 {glyphs => font-src/glyphs}/letter-latin.ptl | 0 {glyphs => font-src/glyphs}/numbers.ptl | 0 {glyphs => font-src/glyphs}/overmarks.ptl | 0 {glyphs => font-src/glyphs}/space.ptl | 0 {glyphs => font-src/glyphs}/symbol-arrow.ptl | 0 {glyphs => font-src/glyphs}/symbol-braille.ptl | 0 {glyphs => font-src/glyphs}/symbol-geometric.ptl | 0 {glyphs => font-src/glyphs}/symbol-letter.ptl | 0 {glyphs => font-src/glyphs}/symbol-math.ptl | 0 {glyphs => font-src/glyphs}/symbol-mosaic.ptl | 0 {glyphs => font-src/glyphs}/symbol-other.ptl | 0 {glyphs => font-src/glyphs}/symbol-punctuation.ptl | 0 {gen => font-src}/index.js | 10 +++++----- {meta => font-src/meta}/aesthetics.ptl | 0 {meta => font-src/meta}/macros.ptl | 0 {meta => font-src/meta}/naming.ptl | 0 {otl => font-src/otl}/compat-ligature.ptl | 0 {otl => font-src/otl}/gpos-mark-mkmk.ptl | 0 {otl => font-src/otl}/gsub-ccmp.ptl | 0 {otl => font-src/otl}/gsub-cv-ss.ptl | 0 {otl => font-src/otl}/gsub-ligation.ptl | 0 {otl => font-src/otl}/gsub-locl.ptl | 0 {otl => font-src/otl}/gsub-pairing.ptl | 0 {otl => font-src/otl}/gsub-thousands.ptl | 0 {otl => font-src/otl}/index.ptl | 0 {otl => font-src/otl}/table-util.ptl | 0 {support => font-src/support}/anchor.js | 0 {support => font-src/support}/curve-util.js | 0 {support => font-src/support}/glyph.js | 0 {support => font-src/support}/gr.js | 0 {support => font-src/support}/ligation-data.js | 0 {support => font-src/support}/mask-bit.js | 0 .../support}/monotonic-interpolate.js | 0 {support => font-src/support}/parameters.js | 0 {support => font-src/support}/point.js | 0 {support => font-src/support}/spiro-expand.js | 0 {support => font-src/support}/transform.js | 0 {support => font-src/support}/utils.js | 0 {support => font-src/support}/variant-data.js | 0 package.json | 2 +- verdafile.js | 14 +++++++------- 56 files changed, 18 insertions(+), 18 deletions(-) rename {gen => font-src/gen}/build-font.js (100%) rename {gen => font-src/gen}/build-glyphs.ptl (100%) rename {gen => font-src/gen}/empty-font.js (100%) rename {gen => font-src/gen}/finalize/autoref.js (100%) rename {gen => font-src/gen}/finalize/gc.js (100%) rename {gen => font-src/gen}/finalize/index.js (100%) rename {gen => font-src/gen}/kits/boole-kit.ptl (100%) rename {gen => font-src/gen}/kits/spiro-kit.ptl (100%) rename {glyphs => font-src/glyphs}/autobuild-accents.ptl (100%) rename {glyphs => font-src/glyphs}/autobuild-composite.ptl (100%) rename {glyphs => font-src/glyphs}/autobuild-transformed.ptl (100%) rename {glyphs => font-src/glyphs}/common-shapes.ptl (100%) rename {glyphs => font-src/glyphs}/letter-cyrillic.ptl (100%) rename {glyphs => font-src/glyphs}/letter-greek.ptl (100%) rename {glyphs => font-src/glyphs}/letter-latin.ptl (100%) rename {glyphs => font-src/glyphs}/numbers.ptl (100%) rename {glyphs => font-src/glyphs}/overmarks.ptl (100%) rename {glyphs => font-src/glyphs}/space.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-arrow.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-braille.ptl (100%) mode change 100755 => 100644 rename {glyphs => font-src/glyphs}/symbol-geometric.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-letter.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-math.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-mosaic.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-other.ptl (100%) rename {glyphs => font-src/glyphs}/symbol-punctuation.ptl (100%) rename {gen => font-src}/index.js (92%) rename {meta => font-src/meta}/aesthetics.ptl (100%) rename {meta => font-src/meta}/macros.ptl (100%) rename {meta => font-src/meta}/naming.ptl (100%) rename {otl => font-src/otl}/compat-ligature.ptl (100%) rename {otl => font-src/otl}/gpos-mark-mkmk.ptl (100%) rename {otl => font-src/otl}/gsub-ccmp.ptl (100%) rename {otl => font-src/otl}/gsub-cv-ss.ptl (100%) rename {otl => font-src/otl}/gsub-ligation.ptl (100%) rename {otl => font-src/otl}/gsub-locl.ptl (100%) rename {otl => font-src/otl}/gsub-pairing.ptl (100%) rename {otl => font-src/otl}/gsub-thousands.ptl (100%) rename {otl => font-src/otl}/index.ptl (100%) rename {otl => font-src/otl}/table-util.ptl (100%) rename {support => font-src/support}/anchor.js (100%) rename {support => font-src/support}/curve-util.js (100%) rename {support => font-src/support}/glyph.js (100%) rename {support => font-src/support}/gr.js (100%) rename {support => font-src/support}/ligation-data.js (100%) rename {support => font-src/support}/mask-bit.js (100%) rename {support => font-src/support}/monotonic-interpolate.js (100%) rename {support => font-src/support}/parameters.js (100%) rename {support => font-src/support}/point.js (100%) rename {support => font-src/support}/spiro-expand.js (100%) rename {support => font-src/support}/transform.js (100%) rename {support => font-src/support}/utils.js (100%) rename {support => font-src/support}/variant-data.js (100%) diff --git a/.gitignore b/.gitignore index 550518bf3..79e9083a1 100644 --- a/.gitignore +++ b/.gitignore @@ -44,11 +44,11 @@ snapshot/iosevka* snapshot/index.css # Generated scripts -gen/build-glyphs.js -gen/kits/*.js -meta/*.js -otl/*.js -glyphs/*.js +font-src/gen/build-glyphs.js +font-src/gen/kits/*.js +font-src/meta/*.js +font-src/otl/*.js +font-src/glyphs/*.js package-lock.json private.toml diff --git a/gen/build-font.js b/font-src/gen/build-font.js similarity index 100% rename from gen/build-font.js rename to font-src/gen/build-font.js diff --git a/gen/build-glyphs.ptl b/font-src/gen/build-glyphs.ptl similarity index 100% rename from gen/build-glyphs.ptl rename to font-src/gen/build-glyphs.ptl diff --git a/gen/empty-font.js b/font-src/gen/empty-font.js similarity index 100% rename from gen/empty-font.js rename to font-src/gen/empty-font.js diff --git a/gen/finalize/autoref.js b/font-src/gen/finalize/autoref.js similarity index 100% rename from gen/finalize/autoref.js rename to font-src/gen/finalize/autoref.js diff --git a/gen/finalize/gc.js b/font-src/gen/finalize/gc.js similarity index 100% rename from gen/finalize/gc.js rename to font-src/gen/finalize/gc.js diff --git a/gen/finalize/index.js b/font-src/gen/finalize/index.js similarity index 100% rename from gen/finalize/index.js rename to font-src/gen/finalize/index.js diff --git a/gen/kits/boole-kit.ptl b/font-src/gen/kits/boole-kit.ptl similarity index 100% rename from gen/kits/boole-kit.ptl rename to font-src/gen/kits/boole-kit.ptl diff --git a/gen/kits/spiro-kit.ptl b/font-src/gen/kits/spiro-kit.ptl similarity index 100% rename from gen/kits/spiro-kit.ptl rename to font-src/gen/kits/spiro-kit.ptl diff --git a/glyphs/autobuild-accents.ptl b/font-src/glyphs/autobuild-accents.ptl similarity index 100% rename from glyphs/autobuild-accents.ptl rename to font-src/glyphs/autobuild-accents.ptl diff --git a/glyphs/autobuild-composite.ptl b/font-src/glyphs/autobuild-composite.ptl similarity index 100% rename from glyphs/autobuild-composite.ptl rename to font-src/glyphs/autobuild-composite.ptl diff --git a/glyphs/autobuild-transformed.ptl b/font-src/glyphs/autobuild-transformed.ptl similarity index 100% rename from glyphs/autobuild-transformed.ptl rename to font-src/glyphs/autobuild-transformed.ptl diff --git a/glyphs/common-shapes.ptl b/font-src/glyphs/common-shapes.ptl similarity index 100% rename from glyphs/common-shapes.ptl rename to font-src/glyphs/common-shapes.ptl diff --git a/glyphs/letter-cyrillic.ptl b/font-src/glyphs/letter-cyrillic.ptl similarity index 100% rename from glyphs/letter-cyrillic.ptl rename to font-src/glyphs/letter-cyrillic.ptl diff --git a/glyphs/letter-greek.ptl b/font-src/glyphs/letter-greek.ptl similarity index 100% rename from glyphs/letter-greek.ptl rename to font-src/glyphs/letter-greek.ptl diff --git a/glyphs/letter-latin.ptl b/font-src/glyphs/letter-latin.ptl similarity index 100% rename from glyphs/letter-latin.ptl rename to font-src/glyphs/letter-latin.ptl diff --git a/glyphs/numbers.ptl b/font-src/glyphs/numbers.ptl similarity index 100% rename from glyphs/numbers.ptl rename to font-src/glyphs/numbers.ptl diff --git a/glyphs/overmarks.ptl b/font-src/glyphs/overmarks.ptl similarity index 100% rename from glyphs/overmarks.ptl rename to font-src/glyphs/overmarks.ptl diff --git a/glyphs/space.ptl b/font-src/glyphs/space.ptl similarity index 100% rename from glyphs/space.ptl rename to font-src/glyphs/space.ptl diff --git a/glyphs/symbol-arrow.ptl b/font-src/glyphs/symbol-arrow.ptl similarity index 100% rename from glyphs/symbol-arrow.ptl rename to font-src/glyphs/symbol-arrow.ptl diff --git a/glyphs/symbol-braille.ptl b/font-src/glyphs/symbol-braille.ptl old mode 100755 new mode 100644 similarity index 100% rename from glyphs/symbol-braille.ptl rename to font-src/glyphs/symbol-braille.ptl diff --git a/glyphs/symbol-geometric.ptl b/font-src/glyphs/symbol-geometric.ptl similarity index 100% rename from glyphs/symbol-geometric.ptl rename to font-src/glyphs/symbol-geometric.ptl diff --git a/glyphs/symbol-letter.ptl b/font-src/glyphs/symbol-letter.ptl similarity index 100% rename from glyphs/symbol-letter.ptl rename to font-src/glyphs/symbol-letter.ptl diff --git a/glyphs/symbol-math.ptl b/font-src/glyphs/symbol-math.ptl similarity index 100% rename from glyphs/symbol-math.ptl rename to font-src/glyphs/symbol-math.ptl diff --git a/glyphs/symbol-mosaic.ptl b/font-src/glyphs/symbol-mosaic.ptl similarity index 100% rename from glyphs/symbol-mosaic.ptl rename to font-src/glyphs/symbol-mosaic.ptl diff --git a/glyphs/symbol-other.ptl b/font-src/glyphs/symbol-other.ptl similarity index 100% rename from glyphs/symbol-other.ptl rename to font-src/glyphs/symbol-other.ptl diff --git a/glyphs/symbol-punctuation.ptl b/font-src/glyphs/symbol-punctuation.ptl similarity index 100% rename from glyphs/symbol-punctuation.ptl rename to font-src/glyphs/symbol-punctuation.ptl diff --git a/gen/index.js b/font-src/index.js similarity index 92% rename from gen/index.js rename to font-src/index.js index 9b9a5b6b2..4e8f4339e 100644 --- a/gen/index.js +++ b/font-src/index.js @@ -3,11 +3,11 @@ const fs = require("fs-extra"); const path = require("path"); -const BuildFont = require("./build-font.js"); -const Parameters = require("../support/parameters"); -const FormVariantData = require("../support/variant-data"); -const FormLigationData = require("../support/ligation-data"); -const { AnyCv, CvDecompose } = require("../support/gr"); +const BuildFont = require("./gen/build-font.js"); +const Parameters = require("./support/parameters"); +const FormVariantData = require("./support/variant-data"); +const FormLigationData = require("./support/ligation-data"); +const { AnyCv, CvDecompose } = require("./support/gr"); const Toml = require("@iarna/toml"); module.exports = async function main(argv) { diff --git a/meta/aesthetics.ptl b/font-src/meta/aesthetics.ptl similarity index 100% rename from meta/aesthetics.ptl rename to font-src/meta/aesthetics.ptl diff --git a/meta/macros.ptl b/font-src/meta/macros.ptl similarity index 100% rename from meta/macros.ptl rename to font-src/meta/macros.ptl diff --git a/meta/naming.ptl b/font-src/meta/naming.ptl similarity index 100% rename from meta/naming.ptl rename to font-src/meta/naming.ptl diff --git a/otl/compat-ligature.ptl b/font-src/otl/compat-ligature.ptl similarity index 100% rename from otl/compat-ligature.ptl rename to font-src/otl/compat-ligature.ptl diff --git a/otl/gpos-mark-mkmk.ptl b/font-src/otl/gpos-mark-mkmk.ptl similarity index 100% rename from otl/gpos-mark-mkmk.ptl rename to font-src/otl/gpos-mark-mkmk.ptl diff --git a/otl/gsub-ccmp.ptl b/font-src/otl/gsub-ccmp.ptl similarity index 100% rename from otl/gsub-ccmp.ptl rename to font-src/otl/gsub-ccmp.ptl diff --git a/otl/gsub-cv-ss.ptl b/font-src/otl/gsub-cv-ss.ptl similarity index 100% rename from otl/gsub-cv-ss.ptl rename to font-src/otl/gsub-cv-ss.ptl diff --git a/otl/gsub-ligation.ptl b/font-src/otl/gsub-ligation.ptl similarity index 100% rename from otl/gsub-ligation.ptl rename to font-src/otl/gsub-ligation.ptl diff --git a/otl/gsub-locl.ptl b/font-src/otl/gsub-locl.ptl similarity index 100% rename from otl/gsub-locl.ptl rename to font-src/otl/gsub-locl.ptl diff --git a/otl/gsub-pairing.ptl b/font-src/otl/gsub-pairing.ptl similarity index 100% rename from otl/gsub-pairing.ptl rename to font-src/otl/gsub-pairing.ptl diff --git a/otl/gsub-thousands.ptl b/font-src/otl/gsub-thousands.ptl similarity index 100% rename from otl/gsub-thousands.ptl rename to font-src/otl/gsub-thousands.ptl diff --git a/otl/index.ptl b/font-src/otl/index.ptl similarity index 100% rename from otl/index.ptl rename to font-src/otl/index.ptl diff --git a/otl/table-util.ptl b/font-src/otl/table-util.ptl similarity index 100% rename from otl/table-util.ptl rename to font-src/otl/table-util.ptl diff --git a/support/anchor.js b/font-src/support/anchor.js similarity index 100% rename from support/anchor.js rename to font-src/support/anchor.js diff --git a/support/curve-util.js b/font-src/support/curve-util.js similarity index 100% rename from support/curve-util.js rename to font-src/support/curve-util.js diff --git a/support/glyph.js b/font-src/support/glyph.js similarity index 100% rename from support/glyph.js rename to font-src/support/glyph.js diff --git a/support/gr.js b/font-src/support/gr.js similarity index 100% rename from support/gr.js rename to font-src/support/gr.js diff --git a/support/ligation-data.js b/font-src/support/ligation-data.js similarity index 100% rename from support/ligation-data.js rename to font-src/support/ligation-data.js diff --git a/support/mask-bit.js b/font-src/support/mask-bit.js similarity index 100% rename from support/mask-bit.js rename to font-src/support/mask-bit.js diff --git a/support/monotonic-interpolate.js b/font-src/support/monotonic-interpolate.js similarity index 100% rename from support/monotonic-interpolate.js rename to font-src/support/monotonic-interpolate.js diff --git a/support/parameters.js b/font-src/support/parameters.js similarity index 100% rename from support/parameters.js rename to font-src/support/parameters.js diff --git a/support/point.js b/font-src/support/point.js similarity index 100% rename from support/point.js rename to font-src/support/point.js diff --git a/support/spiro-expand.js b/font-src/support/spiro-expand.js similarity index 100% rename from support/spiro-expand.js rename to font-src/support/spiro-expand.js diff --git a/support/transform.js b/font-src/support/transform.js similarity index 100% rename from support/transform.js rename to font-src/support/transform.js diff --git a/support/utils.js b/font-src/support/utils.js similarity index 100% rename from support/utils.js rename to font-src/support/utils.js diff --git a/support/variant-data.js b/font-src/support/variant-data.js similarity index 100% rename from support/variant-data.js rename to font-src/support/variant-data.js diff --git a/package.json b/package.json index ba4eea6d1..e91fd55c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iosevka", "version": "3.2.2", - "main": "./generate.js", + "main": "./font-src/index.js", "scripts": { "build": "verda -f verdafile.js", "install": "node utility/check-env" diff --git a/verdafile.js b/verdafile.js index 157767c57..b51b5ac52 100644 --- a/verdafile.js +++ b/verdafile.js @@ -400,7 +400,7 @@ const BuildRawTtf = file.make( const charmap = output.dir + "/" + fn + ".charmap"; await target.need(Scripts, Parameters, de`${output.dir}`); const otdPath = `${output.dir}/${output.name}.otd`; - await node("gen/index", { o: otdPath, oCharMap: charmap, ...fi }); + await node("font-src/index", { o: otdPath, oCharMap: charmap, ...fi }); await optimizedOtfcc(otdPath, output.full); await rm(otdPath); } @@ -833,11 +833,11 @@ const UtilScriptFiles = computed("util-script-files", async target => { }); const ScriptFiles = computed.group("script-files", async (target, ext) => { const ss = await target.need( - ScriptsUnder(ext, `gen`), - ScriptsUnder(ext, `glyphs`), - ScriptsUnder(ext, `meta`), - ScriptsUnder(ext, `otl`), - ScriptsUnder(ext, `support`) + ScriptsUnder(ext, `font-src/gen`), + ScriptsUnder(ext, `font-src/glyphs`), + ScriptsUnder(ext, `font-src/meta`), + ScriptsUnder(ext, `font-src/otl`), + ScriptsUnder(ext, `font-src/support`) ); return ss.reduce((a, b) => [...a, ...b]); }); @@ -846,7 +846,7 @@ const JavaScriptFromPtl = computed("scripts-js-from-ptl", async target => { return ptl.map(x => x.replace(/\.ptl$/g, ".js")); }); -const ScriptJS = file.glob(`{gen|glyphs|meta|otl|support}/**/*.js`, async (target, path) => { +const ScriptJS = file.glob(`font-src/*/**/*.js`, async (target, path) => { const [jsFromPtl] = await target.need(JavaScriptFromPtl); if (jsFromPtl.indexOf(path.full) >= 0) { const ptl = path.full.replace(/\.js$/g, ".ptl");