Move font building related files to font-src

This commit is contained in:
be5invis 2020-06-29 23:31:41 -07:00
parent 9a2f862631
commit c48bc20aa2
56 changed files with 18 additions and 18 deletions

10
.gitignore vendored
View file

@ -44,11 +44,11 @@ snapshot/iosevka*
snapshot/index.css snapshot/index.css
# Generated scripts # Generated scripts
gen/build-glyphs.js font-src/gen/build-glyphs.js
gen/kits/*.js font-src/gen/kits/*.js
meta/*.js font-src/meta/*.js
otl/*.js font-src/otl/*.js
glyphs/*.js font-src/glyphs/*.js
package-lock.json package-lock.json
private.toml private.toml

View file

View file

@ -3,11 +3,11 @@
const fs = require("fs-extra"); const fs = require("fs-extra");
const path = require("path"); const path = require("path");
const BuildFont = require("./build-font.js"); const BuildFont = require("./gen/build-font.js");
const Parameters = require("../support/parameters"); const Parameters = require("./support/parameters");
const FormVariantData = require("../support/variant-data"); const FormVariantData = require("./support/variant-data");
const FormLigationData = require("../support/ligation-data"); const FormLigationData = require("./support/ligation-data");
const { AnyCv, CvDecompose } = require("../support/gr"); const { AnyCv, CvDecompose } = require("./support/gr");
const Toml = require("@iarna/toml"); const Toml = require("@iarna/toml");
module.exports = async function main(argv) { module.exports = async function main(argv) {

View file

@ -1,7 +1,7 @@
{ {
"name": "iosevka", "name": "iosevka",
"version": "3.2.2", "version": "3.2.2",
"main": "./generate.js", "main": "./font-src/index.js",
"scripts": { "scripts": {
"build": "verda -f verdafile.js", "build": "verda -f verdafile.js",
"install": "node utility/check-env" "install": "node utility/check-env"

View file

@ -400,7 +400,7 @@ const BuildRawTtf = file.make(
const charmap = output.dir + "/" + fn + ".charmap"; const charmap = output.dir + "/" + fn + ".charmap";
await target.need(Scripts, Parameters, de`${output.dir}`); await target.need(Scripts, Parameters, de`${output.dir}`);
const otdPath = `${output.dir}/${output.name}.otd`; 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 optimizedOtfcc(otdPath, output.full);
await rm(otdPath); 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 ScriptFiles = computed.group("script-files", async (target, ext) => {
const ss = await target.need( const ss = await target.need(
ScriptsUnder(ext, `gen`), ScriptsUnder(ext, `font-src/gen`),
ScriptsUnder(ext, `glyphs`), ScriptsUnder(ext, `font-src/glyphs`),
ScriptsUnder(ext, `meta`), ScriptsUnder(ext, `font-src/meta`),
ScriptsUnder(ext, `otl`), ScriptsUnder(ext, `font-src/otl`),
ScriptsUnder(ext, `support`) ScriptsUnder(ext, `font-src/support`)
); );
return ss.reduce((a, b) => [...a, ...b]); 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")); 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); const [jsFromPtl] = await target.need(JavaScriptFromPtl);
if (jsFromPtl.indexOf(path.full) >= 0) { if (jsFromPtl.indexOf(path.full) >= 0) {
const ptl = path.full.replace(/\.js$/g, ".ptl"); const ptl = path.full.replace(/\.js$/g, ".ptl");