Merge branch 'dev'

be5invis · Jun 7, 2020 · 83d564e · 83d564e
2 parents f5a1bf7 + 00185b8
commit 83d564e
Show file tree

Hide file tree

Showing 331 changed files with 73 additions and 39 deletions.
diff --git a/hinting-params/bold.json b/hinting-params/bold.json
@@ -2,10 +2,17 @@
 	"fontFormat": "@chlorophytum/font-format-ttf",
 	"finalFormat": "@chlorophytum/final-hint-format-hltt",
 	"hintStoreProvider": "@chlorophytum/hint-store-provider-file",
-	"hintPasses": [
-		{
-			"plugin": "@chlorophytum/hm-ideograph",
-			"options": { "CANONICAL_STEM_WIDTH": 0.097, "STEM_SIDE_MIN_DIST_DESCENT": 0.072 }
-		}
-	]
+
+	"hintPlugin": "@chlorophytum/hm-combine",
+	"hintOptions": {
+		"passes": [
+			{
+				"hintPlugin": "@chlorophytum/hm-ideograph",
+				"hintOptions": {
+					"CANONICAL_STEM_WIDTH": 0.097,
+					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
+				}
+			}
+		]
+	}
 }
diff --git a/hinting-params/extralight.json b/hinting-params/extralight.json
@@ -2,10 +2,14 @@
 	"fontFormat": "@chlorophytum/font-format-ttf",
 	"finalFormat": "@chlorophytum/final-hint-format-hltt",
 	"hintStoreProvider": "@chlorophytum/hint-store-provider-file",
-	"hintPasses": [
-		{
-			"plugin": "@chlorophytum/hm-ideograph",
-			"options": { "CANONICAL_STEM_WIDTH": 0.029 }
-		}
-	]
+
+	"hintPlugin": "@chlorophytum/hm-combine",
+	"hintOptions": {
+		"passes": [
+			{
+				"hintPlugin": "@chlorophytum/hm-ideograph",
+				"hintOptions":{ "CANONICAL_STEM_WIDTH": 0.029 }
+			}
+		]
+	}
 }
diff --git a/hinting-params/light.json b/hinting-params/light.json
@@ -2,10 +2,14 @@
 	"fontFormat": "@chlorophytum/font-format-ttf",
 	"finalFormat": "@chlorophytum/final-hint-format-hltt",
 	"hintStoreProvider": "@chlorophytum/hint-store-provider-file",
-	"hintPasses": [
-		{
-			"plugin": "@chlorophytum/hm-ideograph",
-			"options": { "CANONICAL_STEM_WIDTH": 0.04 }
-		}
-	]
+
+	"hintPlugin": "@chlorophytum/hm-combine",
+	"hintOptions": {
+		"passes": [
+			{
+				"hintPlugin": "@chlorophytum/hm-ideograph",
+				"hintOptions": { "CANONICAL_STEM_WIDTH": 0.04 }
+			}
+		]
+	}
 }
diff --git a/hinting-params/regular.json b/hinting-params/regular.json
@@ -2,10 +2,14 @@
 	"fontFormat": "@chlorophytum/font-format-ttf",
 	"finalFormat": "@chlorophytum/final-hint-format-hltt",
 	"hintStoreProvider": "@chlorophytum/hint-store-provider-file",
-	"hintPasses": [
-		{
-			"plugin": "@chlorophytum/hm-ideograph",
-			"options": { "CANONICAL_STEM_WIDTH": 0.067 }
-		}
-	]
+
+	"hintPlugin": "@chlorophytum/hm-combine",
+	"hintOptions": {
+		"passes": [
+			{
+				"hintPlugin": "@chlorophytum/hm-ideograph",
+				"hintOptions": { "CANONICAL_STEM_WIDTH": 0.067 }
+			}
+		]
+	}
 }
diff --git a/hinting-params/semibold.json b/hinting-params/semibold.json
@@ -2,10 +2,17 @@
 	"fontFormat": "@chlorophytum/font-format-ttf",
 	"finalFormat": "@chlorophytum/final-hint-format-hltt",
 	"hintStoreProvider": "@chlorophytum/hint-store-provider-file",
-	"hintPasses": [
-		{
-			"plugin": "@chlorophytum/hm-ideograph",
-			"options": { "CANONICAL_STEM_WIDTH": 0.072, "STEM_SIDE_MIN_DIST_DESCENT": 0.072 }
-		}
-	]
+
+	"hintPlugin": "@chlorophytum/hm-combine",
+	"hintOptions": {
+		"passes": [
+			{
+				"hintPlugin": "@chlorophytum/hm-ideograph",
+				"hintOptions": {
+					"CANONICAL_STEM_WIDTH": 0.072,
+					"STEM_SIDE_MIN_DIST_DESCENT": 0.072
+				}
+			}
+		]
+	}
 }
diff --git a/package.json b/package.json
@@ -1,17 +1,18 @@
 {
 	"name": "sarasa-gothic",
-	"version": "0.12.6",
+	"version": "0.12.7",
 	"main": "./run",
 	"dependencies": {
-		"@chlorophytum/cli": "^0.7.0",
-		"@chlorophytum/final-hint-format-hltt": "^0.7.0",
-		"@chlorophytum/font-format-ttf": "^0.7.0",
-		"@chlorophytum/hint-store-provider-file": "^0.7.0",
-		"@chlorophytum/hm-ideograph": "^0.8.1",
+		"@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",
 		"colors": "^1.4.0",
 		"fs-extra": "^8.1.0",
 		"megaminx": "^0.9.0",
-		"otfcc-ttcize": "^0.10.0",
+		"otfcc-ttcize": "^0.10.1",
 		"verda": "^1.0.0-10",
 		"which": "^2.0.2",
 		"yargs": "^15.3.0"