Merge branch 'master' into releases

.prettierrc.yaml

@@ -0,0 +1,4 @@
+# .prettierrc
+printWidth: 100
+useTabs: true
+tabWidth: 4

bddy.js

@@ -49,7 +49,7 @@ function deItalizedNameOf(set) {
 		.join("-");
 }
 
-module.exports = function(ctx, the, argv, bddy) {
+module.exports = function(ctx, the) {
 	the.file(`out/ttf/${PREFIX}-*-*-*.ttf`).def(async function(target) {
 		const { $1: family, $2: region, $3: style } = target;
 		const [_, $1, $2] = await this.need(
@@ -167,7 +167,10 @@ module.exports = function(ctx, the, argv, bddy) {
 	the.file(`build/kanji0/*.ttf`).def(async function(target) {
 		const [_, $1] = await this.need(target.dir, `build/shs/${target.name}.otd`);
 		const tmpOTD = `${target.dir}/${target.name}.otd`;
-		await runBuildTask.call(this, "make/kanji/build.js", { main: $1, o: tmpOTD });
+		await runBuildTask.call(this, "make/kanji/build.js", {
+			main: $1,
+			o: tmpOTD
+		});
 		await this.run("otfccbuild", tmpOTD, "-o", target, "-q");
 		await this.rm(tmpOTD);
 	});
@@ -274,12 +277,9 @@ module.exports = function(ctx, the, argv, bddy) {
 			`*.ttf`
 		);
 	});
-	the.virt("start").def(async function(target) {
-		await this.need(
-			`out/sarasa-gothic-ttc-${version}.7z`,
-			`out/sarasa-gothic-ttf-${version}.7z`
-		);
-	});
+
+	ctx.want(`out/sarasa-gothic-ttc-${version}.7z`);
+	ctx.want(`out/sarasa-gothic-ttf-${version}.7z`);
 
 	// cleanup
 	the.virt("clean").def(async function(target) {

config.json

@@ -2,7 +2,7 @@
 	"prefix": "sarasa",
 	"CVT_PADDING": 300,
 
-	"familyOrder": ["gothic", "ui", "mono"],
+	"familyOrder": ["gothic", "ui", "mono", "term"],
 	"families": {
 		"gothic": {
 			"isMono": false,
@@ -34,6 +34,16 @@
 				"zh_TW": "等距更紗黑體",
 				"ja_JP": "更紗等幅ゴシック"
 			}
+		},
+		"term": {
+			"isMono": true,
+			"latinGroup": "iosevka-term",
+			"naming": {
+				"en_US": "Sarasa Term",
+				"zh_CN": "Sarasa Term",
+				"zh_TW": "Sarasa Term",
+				"ja_JP": "Sarasa Term"
+			}
 		}
 	},
 

hint/bddy.js

@@ -13,7 +13,7 @@ const CONFIG_PATH = __dirname + "/source/fonts.json";
 const os = require("os");
 const jHint = os.cpus().length * 2;
 
-module.exports = function(ctx, forany, argv, bddy) {
+module.exports = function(ctx, forany, the, argv, bddy) {
 	const config = JSON.parse(fs.readFileSync(CONFIG_PATH, "utf-8"));
 	const stylegroups = sg.stylegroupsOf(config);
 	sg.initParamfiles(stylegroups, config);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sarasa-gothic",
-	"version": "0.4.0",
+	"version": "0.5.0",
 	"main": "./run",
 	"dependencies": {
 		"caryll-iddb": "^0.1.2",
@@ -19,7 +19,7 @@
 		"scc-config": "^0.9.3",
 		"which": "^1.2.14",
 		"yargs": "^9.0.0",
-		"bddy": "^0.8.0",
+		"bddy": "^0.9.0",
 		"colors": "^1.1.2"
 	},
 	"engines": {