Merge branch 'dev'

be5invis · Aug 8, 2020 · d7f4527 · d7f4527
2 parents 961cfcc + fc1e2cf
commit d7f4527
Show file tree

Hide file tree

Showing 333 changed files with 91 additions and 52 deletions.
diff --git a/hinting-params/bold.json b/hinting-params/bold.json
@@ -10,7 +10,9 @@
 				"hintPlugin": "@chlorophytum/hm-ideograph",
 				"hintOptions": {
 					"CANONICAL_STEM_WIDTH": 0.097,
-					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
+					"STEM_SIDE_MIN_DIST_DESCENT": 0.072,
+					"SLOPE_FUZZ_POS": 0.16,
+					"SLOPE_FUZZ_POST": 0.27
 				}
 			},
 			{
@@ -26,6 +28,8 @@
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
 					"SLOPE_FUZZ": 0.175,
+					"SLOPE_FUZZ_POS": 0.175,
+					"SLOPE_FUZZ_POST": 0.175,
 					"SLOPE_FUZZ_NEG": 0.175,
 					"CANONICAL_STEM_WIDTH": 0.097,
 					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
@@ -43,8 +47,10 @@
 					],
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
-					"SLOPE_FUZZ": 0.06,
-					"SLOPE_FUZZ_NEG": 0.06,
+					"SLOPE_FUZZ": 0.03,
+					"SLOPE_FUZZ_POS": 0.03,
+					"SLOPE_FUZZ_POST": 0.03,
+					"SLOPE_FUZZ_NEG": 0.03,
 					"CANONICAL_STEM_WIDTH": 0.097,
 					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
 				}

diff --git a/hinting-params/extralight.json b/hinting-params/extralight.json
@@ -8,7 +8,11 @@
 		"passes": [
 			{
 				"hintPlugin": "@chlorophytum/hm-ideograph",
-				"hintOptions": { "CANONICAL_STEM_WIDTH": 0.029 }
+				"hintOptions": {
+					"CANONICAL_STEM_WIDTH": 0.029,
+					"SLOPE_FUZZ_POS": 0.16,
+					"SLOPE_FUZZ_POST": 0.27
+				}
 			},
 			{
 				"hintPlugin": "@chlorophytum/hm-ideograph",
@@ -23,6 +27,8 @@
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
 					"SLOPE_FUZZ": 0.175,
+					"SLOPE_FUZZ_POS": 0.175,
+					"SLOPE_FUZZ_POST": 0.175,
 					"SLOPE_FUZZ_NEG": 0.175,
 					"CANONICAL_STEM_WIDTH": 0.029
 				}
@@ -39,8 +45,10 @@
 					],
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
-					"SLOPE_FUZZ": 0.06,
-					"SLOPE_FUZZ_NEG": 0.06,
+					"SLOPE_FUZZ": 0.03,
+					"SLOPE_FUZZ_POS": 0.03,
+					"SLOPE_FUZZ_POST": 0.03,
+					"SLOPE_FUZZ_NEG": 0.03,
 					"CANONICAL_STEM_WIDTH": 0.029
 				}
 			}

diff --git a/hinting-params/light.json b/hinting-params/light.json
@@ -8,7 +8,11 @@
 		"passes": [
 			{
 				"hintPlugin": "@chlorophytum/hm-ideograph",
-				"hintOptions": { "CANONICAL_STEM_WIDTH": 0.04 }
+				"hintOptions": {
+					"CANONICAL_STEM_WIDTH": 0.04,
+					"SLOPE_FUZZ_POS": 0.16,
+					"SLOPE_FUZZ_POST": 0.27
+				}
 			},
 			{
 				"hintPlugin": "@chlorophytum/hm-ideograph",
@@ -23,6 +27,8 @@
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
 					"SLOPE_FUZZ": 0.175,
+					"SLOPE_FUZZ_POS": 0.175,
+					"SLOPE_FUZZ_POST": 0.175,
 					"SLOPE_FUZZ_NEG": 0.175,
 					"CANONICAL_STEM_WIDTH": 0.04
 				}
@@ -39,8 +45,10 @@
 					],
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
-					"SLOPE_FUZZ": 0.06,
-					"SLOPE_FUZZ_NEG": 0.06,
+					"SLOPE_FUZZ": 0.03,
+					"SLOPE_FUZZ_POS": 0.03,
+					"SLOPE_FUZZ_POST": 0.03,
+					"SLOPE_FUZZ_NEG": 0.03,
 					"CANONICAL_STEM_WIDTH": 0.04
 				}
 			}

diff --git a/hinting-params/regular.json b/hinting-params/regular.json
@@ -8,7 +8,11 @@
 		"passes": [
 			{
 				"hintPlugin": "@chlorophytum/hm-ideograph",
-				"hintOptions": { "CANONICAL_STEM_WIDTH": 0.067 }
+				"hintOptions": {
+					"CANONICAL_STEM_WIDTH": 0.067,
+					"SLOPE_FUZZ_POS": 0.16,
+					"SLOPE_FUZZ_POST": 0.27
+				}
 			},
 			{
 				"hintPlugin": "@chlorophytum/hm-ideograph",
@@ -23,6 +27,8 @@
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
 					"SLOPE_FUZZ": 0.175,
+					"SLOPE_FUZZ_POS": 0.175,
+					"SLOPE_FUZZ_POST": 0.175,
 					"SLOPE_FUZZ_NEG": 0.175
 				}
 			},
@@ -38,8 +44,10 @@
 					],
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
-					"SLOPE_FUZZ": 0.06,
-					"SLOPE_FUZZ_NEG": 0.06
+					"SLOPE_FUZZ": 0.03,
+					"SLOPE_FUZZ_POS": 0.03,
+					"SLOPE_FUZZ_POST": 0.03,
+					"SLOPE_FUZZ_NEG": 0.03
 				}
 			}
 		]

diff --git a/hinting-params/semibold.json b/hinting-params/semibold.json
@@ -10,7 +10,9 @@
 				"hintPlugin": "@chlorophytum/hm-ideograph",
 				"hintOptions": {
 					"CANONICAL_STEM_WIDTH": 0.072,
-					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
+					"STEM_SIDE_MIN_DIST_DESCENT": 0.072,
+					"SLOPE_FUZZ_POS": 0.16,
+					"SLOPE_FUZZ_POST": 0.27
 				}
 			},
 			{
@@ -26,6 +28,8 @@
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
 					"SLOPE_FUZZ": 0.175,
+					"SLOPE_FUZZ_POS": 0.175,
+					"SLOPE_FUZZ_POST": 0.175,
 					"SLOPE_FUZZ_NEG": 0.175,
 					"CANONICAL_STEM_WIDTH": 0.072,
 					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
@@ -43,8 +47,10 @@
 					],
 					"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
 					"trackScripts": ["kana"],
-					"SLOPE_FUZZ": 0.06,
-					"SLOPE_FUZZ_NEG": 0.06,
+					"SLOPE_FUZZ": 0.03,
+					"SLOPE_FUZZ_POS": 0.03,
+					"SLOPE_FUZZ_POST": 0.03,
+					"SLOPE_FUZZ_NEG": 0.03,
 					"CANONICAL_STEM_WIDTH": 0.072,
 					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
 				}

diff --git a/make/pass1/build.js b/make/pass1/build.js
@@ -69,11 +69,12 @@ async function pass(ctx, config, argv) {
 	await ctx.run(
 		nameFont,
 		"a",
+		!!argv.mono,
 		globalConfig.nameTupleSelector[argv.subfamily],
 		ENCODINGS[argv.subfamily],
 		{
 			en_US: {
-				copyright: globalConfig.version,
+				copyright: globalConfig.copyright,
 				version: `Version ${packageConfig.version}`,
 				family: globalConfig.families[argv.family].naming.en_US + " " + argv.subfamily,
 				style: globalConfig.styles[argv.style].name

diff --git a/make/pass1/metadata.js b/make/pass1/metadata.js
@@ -55,10 +55,8 @@ const langIDMap = {
 
 function createNameTuple(nameTable, langID, family, style, localizedStyle) {
 	const compat = compatibilityName(family, style);
-	if (!compat.standardFour) {
-		nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_FAMILY, family));
-		nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_STYLE, style));
-	}
+	nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_FAMILY, family));
+	nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_STYLE, style));
 	nameTable.push(nameEntry(WINDOWS, UNICODE, langID, FAMILY, compat.family));
 	const compatStyle = compat.standardFour ? localizedStyle : compat.style;
 	nameTable.push(nameEntry(WINDOWS, UNICODE, langID, STYLE, compatStyle));
@@ -77,7 +75,7 @@ function createNameTuple(nameTable, langID, family, style, localizedStyle) {
 	}
 }
 
-async function nameFont(ctx, demand, selectorList, encodings, namings) {
+async function nameFont(ctx, demand, fMono, selectorList, encodings, namings) {
 	const font = this.items[demand];
 	const nameTable = [];
 	const defaultNg = namings.en_US;
@@ -121,6 +119,19 @@ async function nameFont(ctx, demand, selectorList, encodings, namings) {
 		cp850: true,
 		ascii: true
 	};
+	// Set Panose bits
+	font.OS_2.panose = [
+		2,
+		0,
+		(1 + font.OS_2.usWeightClass / 100) | 0,
+		fMono ? 9 : 0,
+		0,
+		0,
+		0,
+		0,
+		0,
+		0
+	];
 }
 
 exports.nameFont = nameFont;

diff --git a/package.json b/package.json
@@ -1,21 +1,21 @@
 {
 	"name": "sarasa-gothic",
-	"version": "0.12.11",
+	"version": "0.12.12",
 	"main": "./run",
 	"dependencies": {
-		"@chlorophytum/cli": "^0.8.0",
-		"@chlorophytum/final-hint-format-hltt": "^0.8.0",
-		"@chlorophytum/font-format-ttf": "^0.8.0",
-		"@chlorophytum/hint-store-provider-file": "^0.8.0",
-		"@chlorophytum/hm-combine": "^0.8.0",
-		"@chlorophytum/hm-ideograph": "^0.9.0",
+		"@chlorophytum/cli": "^0.10.0",
+		"@chlorophytum/final-hint-format-hltt": "^0.10.0",
+		"@chlorophytum/font-format-ttf": "^0.10.0",
+		"@chlorophytum/hint-store-provider-file": "^0.10.0",
+		"@chlorophytum/hm-combine": "^0.10.0",
+		"@chlorophytum/hm-ideograph": "^0.10.1",
 		"colors": "^1.4.0",
-		"fs-extra": "^8.1.0",
+		"fs-extra": "^9.0.1",
 		"megaminx": "^0.9.0",
 		"otfcc-ttcize": "^0.10.2",
-		"verda": "^1.0.0-10",
+		"verda": "^1.1.0",
 		"which": "^2.0.2",
-		"yargs": "^15.3.0"
+		"yargs": "^15.4.1"
 	},
 	"engines": {
 		"node": ">=12.0.0"
@@ -25,8 +25,8 @@
 		"build": "verda -f verdafile.js"
 	},
 	"devDependencies": {
-		"eslint": "^6.8.0",
-		"eslint-config-prettier": "^6.10.0",
+		"eslint": "^7.6.0",
+		"eslint-config-prettier": "^6.11.0",
 		"prettier": "^2.0.5"
 	}
 }