r0.15.4

Author: be5invis

config.json

@@ -3,8 +3,8 @@
 	"familyOrder": ["gothic", "ui", "mono", "mono-slab", "term", "term-slab", "fixed", "fixed-slab"],
 	"families": {
 		"gothic": {
-			"isMono": false,
 			"isTNUM": true,
+			"isGothic": true,
 			"latinGroup": "Inter",
 			"naming": {
 				"en_US": "Sarasa Gothic",
@@ -16,9 +16,8 @@
 			}
 		},
 		"ui": {
-			"isPWID": true,
 			"isTNUM": true,
-			"isMono": false,
+			"isPWID": true,
 			"latinGroup": "Inter",
 			"naming": {
 				"en_US": "Sarasa UI",
@@ -31,7 +30,6 @@
 		},
 		"mono": {
 			"isMono": true,
-			"isType": true,
 			"latinGroup": "iosevka",
 			"naming": {
 				"en_US": "Sarasa Mono",
@@ -44,8 +42,8 @@
 		},
 		"term": {
 			"isMono": true,
-			"latinGroup": "iosevka-term",
 			"isTerm": true,
+			"latinGroup": "iosevka-term",
 			"naming": {
 				"en_US": "Sarasa Term",
 				"zh_CN": "Sarasa Term",
@@ -57,8 +55,8 @@
 		},
 		"fixed": {
 			"isMono": true,
-			"latinGroup": "iosevka-fixed",
 			"isTerm": true,
+			"latinGroup": "iosevka-fixed",
 			"naming": {
 				"en_US": "Sarasa Fixed",
 				"zh_CN": "Sarasa Fixed",

make/common/unicode-kind.js

@@ -24,7 +24,7 @@ exports.isKorean = c =>
 	(c >= 0xa960 && c <= 0xa97f) ||
 	(c >= 0xd7b0 && c <= 0xd7ff);
 
-exports.isWS = function (c, _isType = false, isTerm = false) {
+exports.isWS = function (c) {
 	return c >= 0x20a0 && c < 0x3000 && !(c >= 0x2e3a && c <= 0x2e3b);
 };
 

make/punct/as.js

@@ -23,7 +23,7 @@ module.exports = async function makeFont(ctx, config, argv) {
 			!isWestern(c - 0) &&
 			!isKorean(c - 0) &&
 			!isLongDash(c - 0, argv.term) &&
-			!isWS(c - 0, argv.type, argv.term)
+			!isWS(c - 0)
 	);
 
 	if (argv.pwid) {
@@ -33,7 +33,11 @@ module.exports = async function makeFont(ctx, config, argv) {
 		await ctx.run(manip.glyph, "b", unlinkRefsOfSymbols, argv.term);
 		transferMonoGeometry(ctx.items.a, ctx.items.b);
 		await ctx.run(manip.glyph, "a", populatePwidOfMono);
-		await ctx.run(manip.glyph, "a", sanitizeSymbols, argv.type);
+	}
+	if (!argv.pwid) {
+		await ctx.run(manip.glyph, "a", sanitizeSymbols, argv.goth, !argv.pwid && !argv.term);
+	}
+	if (argv.mono) {
 		removeDashCcmp(ctx.items.a, argv.mono);
 	}
 	removeUnusedFeatures(ctx.items.a, "AS", argv.mono);

make/punct/common.js

@@ -32,27 +32,33 @@ sanitizers.half = function (glyph) {
 	glyph.advanceWidth = targetW;
 	return glyph;
 };
-sanitizers.halfLeft = function (glyph, gid) {
+sanitizers.halfLeft = function (glyph, gid, isGothic) {
 	const g1 = sanitizers.half.call(this, this.find.glyph$(this.find.gname.subst("pwid", gid)));
 	Object.assign(glyph, g1);
 	deleteGPOS(this.font, gid);
+	if (isGothic) glyph.advanceWidth = this.em;
 	return glyph;
 };
-sanitizers.halfRight = function (glyph, gid) {
+sanitizers.halfRight = function (glyph, gid, isGothic) {
 	const g1 = sanitizers.half.call(this, this.find.glyph$(this.find.gname.subst("pwid", gid)));
 	Object.assign(glyph, g1);
 	deleteGPOS(this.font, gid);
+	if (isGothic) {
+		glyph.advanceWidth = this.em;
+		for (let c of glyph.contours) for (let z of c) z.x += this.em / 2;
+	}
 	return glyph;
 };
 
 function HalfCompN(n, forceFullWidth, forceHalfWidth) {
-	return function (glyph, gid, isType = false) {
+	return function (glyph, gid, isGothic, isType) {
 		const g1 = this.find.glyph$(this.find.gname.subst("fwid", gid));
 		Object.assign(glyph, g1);
 		const targetW = Math.min(
 			this.em * n,
 			Math.ceil(glyph.advanceWidth / this.em) *
-				(this.em * (forceHalfWidth ? 1 / 2 : isType || forceFullWidth ? 1 : 1 / 2))
+				(this.em *
+					(forceHalfWidth ? 1 / 2 : isGothic || isType || forceFullWidth ? 1 : 1 / 2))
 		);
 		if (glyph.contours) {
 			for (let c of glyph.contours) for (let z of c) z.x *= targetW / glyph.advanceWidth;
@@ -83,7 +89,7 @@ const sanitizerTypes = {
 	"\u2e3b": "halfComp3"
 };
 
-exports.sanitizeSymbols = async function sanitizeSymbols(isType) {
+exports.sanitizeSymbols = async function sanitizeSymbols(isGothic, isType) {
 	let san = new Map();
 	for (let c in this.font.cmap) {
 		if (!this.font.cmap[c]) continue;
@@ -94,7 +100,7 @@ exports.sanitizeSymbols = async function sanitizeSymbols(isType) {
 		let sanitizer = sanitizers[san.has(g) ? san.get(g) : "auto"];
 		const glyph = this.font.glyf[g];
 		if (!glyph) continue;
-		sanitizer.call(this, glyph, g, isType);
+		sanitizer.call(this, glyph, g, isGothic, isType);
 	}
 };
 

make/punct/ws.js

@@ -26,14 +26,14 @@ module.exports = async function makeFont(ctx, config, argv) {
 			!isWestern(c - 0) &&
 			!isKorean(c - 0) &&
 			!isLongDash(c - 0, argv.term) &&
-			isWS(c - 0, argv.type, argv.term)
+			isWS(c - 0)
 	);
 
 	if (argv.pwid) {
 		await ctx.run(manip.glyph, "a", toPWID);
 	}
 	if (argv.mono) {
-		await ctx.run(manip.glyph, "a", sanitizeSymbols, argv.type);
+		await ctx.run(manip.glyph, "a", sanitizeSymbols, argv.goth, !argv.pwid && !argv.term);
 	}
 	removeUnusedFeatures(ctx.items.a, "WS", argv.mono);
 	gc(ctx.items.a);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sarasa-gothic",
-	"version": "0.15.3",
+	"version": "0.15.4",
 	"main": "./run",
 	"dependencies": {
 		"@chlorophytum/cli": "^0.20.0",