Skip to content

Commit 4de3647

Browse files
be5invisbe5invis
committed
Merge branch 'dev'
2 parents 654a358 + 79c43de commit 4de3647

340 files changed

Lines changed: 225 additions & 11 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
"HC": ["en_US", "zh_HK"],
239239
"CL": ["en_US", "zh_TW"]
240240
},
241-
"copyright": "Copyright 2015-2020, Renzhi Li (a.k.a. Belleve Invis, belleve@typeof.net). Portions Copyright © 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions Copyright 2017-2020 Rasmus Andersson.",
241+
"copyright": "Copyright 2015-2020, Renzhi Li (a.k.a. Belleve Invis, belleve@typeof.net). Portions Copyright © 2014-2019 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions Copyright 2017-2020 Rasmus Andersson. Portions Copyright 2017, 2018 MoneMizuno.",
242242
"shsSourceMap": {
243243
"defaultRegion": "SourceHanSans",
244244
"region": {
@@ -261,6 +261,15 @@
261261
"regular": "Regular",
262262
"semibold": "Medium",
263263
"bold": "Bold"
264+
},
265+
"classicalRegion": "cl",
266+
"classicalOverridePrefix":"GenneGothic",
267+
"classicalOverrideSuffix": {
268+
"extralight": "ExtraLight-subset",
269+
"light": "Light-subset",
270+
"regular": "Regular-subset",
271+
"semibold": "Medium-subset",
272+
"bold": "Bold-subset"
264273
}
265274
}
266275
}

‎hinting-params/bold.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,42 @@
1212
"CANONICAL_STEM_WIDTH": 0.097,
1313
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
1414
}
15+
},
16+
{
17+
"hintPlugin": "@chlorophytum/hm-ideograph",
18+
"hintOptions": {
19+
"groupName": "Hiragana",
20+
"unicodeRanges": [
21+
[12353, 12438],
22+
[12447, 12447],
23+
[110608, 110847],
24+
[110848, 110895]
25+
],
26+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
27+
"trackScripts": ["kana"],
28+
"SLOPE_FUZZ": 0.06,
29+
"SLOPE_FUZZ_NEG": 0.06,
30+
"CANONICAL_STEM_WIDTH": 0.097,
31+
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
32+
}
33+
},
34+
{
35+
"hintPlugin": "@chlorophytum/hm-ideograph",
36+
"hintOptions": {
37+
"groupName": "Katakana",
38+
"unicodeRanges": [
39+
[12449, 12538],
40+
[12543, 12543],
41+
[12784, 12799],
42+
[110896, 110959]
43+
],
44+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
45+
"trackScripts": ["kana"],
46+
"SLOPE_FUZZ": 0.06,
47+
"SLOPE_FUZZ_NEG": 0.06,
48+
"CANONICAL_STEM_WIDTH": 0.097,
49+
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
50+
}
1551
}
1652
]
1753
}

‎hinting-params/extralight.json‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,41 @@
88
"passes": [
99
{
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
11-
"hintOptions":{ "CANONICAL_STEM_WIDTH": 0.029 }
11+
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.029 }
12+
},
13+
{
14+
"hintPlugin": "@chlorophytum/hm-ideograph",
15+
"hintOptions": {
16+
"groupName": "Hiragana",
17+
"unicodeRanges": [
18+
[12353, 12438],
19+
[12447, 12447],
20+
[110608, 110847],
21+
[110848, 110895]
22+
],
23+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
24+
"trackScripts": ["kana"],
25+
"SLOPE_FUZZ": 0.06,
26+
"SLOPE_FUZZ_NEG": 0.06,
27+
"CANONICAL_STEM_WIDTH": 0.029
28+
}
29+
},
30+
{
31+
"hintPlugin": "@chlorophytum/hm-ideograph",
32+
"hintOptions": {
33+
"groupName": "Katakana",
34+
"unicodeRanges": [
35+
[12449, 12538],
36+
[12543, 12543],
37+
[12784, 12799],
38+
[110896, 110959]
39+
],
40+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
41+
"trackScripts": ["kana"],
42+
"SLOPE_FUZZ": 0.06,
43+
"SLOPE_FUZZ_NEG": 0.06,
44+
"CANONICAL_STEM_WIDTH": 0.029
45+
}
1246
}
1347
]
1448
}

‎hinting-params/light.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,40 @@
99
{
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
1111
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.04 }
12+
},
13+
{
14+
"hintPlugin": "@chlorophytum/hm-ideograph",
15+
"hintOptions": {
16+
"groupName": "Hiragana",
17+
"unicodeRanges": [
18+
[12353, 12438],
19+
[12447, 12447],
20+
[110608, 110847],
21+
[110848, 110895]
22+
],
23+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
24+
"trackScripts": ["kana"],
25+
"SLOPE_FUZZ": 0.06,
26+
"SLOPE_FUZZ_NEG": 0.06,
27+
"CANONICAL_STEM_WIDTH": 0.04
28+
}
29+
},
30+
{
31+
"hintPlugin": "@chlorophytum/hm-ideograph",
32+
"hintOptions": {
33+
"groupName": "Katakana",
34+
"unicodeRanges": [
35+
[12449, 12538],
36+
[12543, 12543],
37+
[12784, 12799],
38+
[110896, 110959]
39+
],
40+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
41+
"trackScripts": ["kana"],
42+
"SLOPE_FUZZ": 0.06,
43+
"SLOPE_FUZZ_NEG": 0.06,
44+
"CANONICAL_STEM_WIDTH": 0.04
45+
}
1246
}
1347
]
1448
}

‎hinting-params/regular.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,38 @@
99
{
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
1111
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.067 }
12+
},
13+
{
14+
"hintPlugin": "@chlorophytum/hm-ideograph",
15+
"hintOptions": {
16+
"groupName": "Hiragana",
17+
"unicodeRanges": [
18+
[12353, 12438],
19+
[12447, 12447],
20+
[110608, 110847],
21+
[110848, 110895]
22+
],
23+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
24+
"trackScripts": ["kana"],
25+
"SLOPE_FUZZ": 0.06,
26+
"SLOPE_FUZZ_NEG": 0.06
27+
}
28+
},
29+
{
30+
"hintPlugin": "@chlorophytum/hm-ideograph",
31+
"hintOptions": {
32+
"groupName": "Katakana",
33+
"unicodeRanges": [
34+
[12449, 12538],
35+
[12543, 12543],
36+
[12784, 12799],
37+
[110896, 110959]
38+
],
39+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
40+
"trackScripts": ["kana"],
41+
"SLOPE_FUZZ": 0.06,
42+
"SLOPE_FUZZ_NEG": 0.06
43+
}
1244
}
1345
]
1446
}

‎hinting-params/semibold.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,42 @@
1212
"CANONICAL_STEM_WIDTH": 0.072,
1313
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
1414
}
15+
},
16+
{
17+
"hintPlugin": "@chlorophytum/hm-ideograph",
18+
"hintOptions": {
19+
"groupName": "Hiragana",
20+
"unicodeRanges": [
21+
[12353, 12438],
22+
[12447, 12447],
23+
[110608, 110847],
24+
[110848, 110895]
25+
],
26+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
27+
"trackScripts": ["kana"],
28+
"SLOPE_FUZZ": 0.06,
29+
"SLOPE_FUZZ_NEG": 0.06,
30+
"CANONICAL_STEM_WIDTH": 0.072,
31+
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
32+
}
33+
},
34+
{
35+
"hintPlugin": "@chlorophytum/hm-ideograph",
36+
"hintOptions": {
37+
"groupName": "Katakana",
38+
"unicodeRanges": [
39+
[12449, 12538],
40+
[12543, 12543],
41+
[12784, 12799],
42+
[110896, 110959]
43+
],
44+
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
45+
"trackScripts": ["kana"],
46+
"SLOPE_FUZZ": 0.06,
47+
"SLOPE_FUZZ_NEG": 0.06,
48+
"CANONICAL_STEM_WIDTH": 0.072,
49+
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
50+
}
1551
}
1652
]
1753
}

‎make/kanji/build.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const { introduce, build } = require("megaminx");
3+
const { introduce, build, merge } = require("megaminx");
44
const { isIdeograph, filterUnicodeRange } = require("../common/unicode-kind");
55
const gc = require("../common/gc");
66

@@ -18,6 +18,14 @@ async function pass(ctx, config, argv) {
1818
a.GSUB = null;
1919
a.GPOS = null;
2020
}
21+
if (argv.classicalOverride) {
22+
const b = await ctx.run(introduce, "b", {
23+
from: argv.classicalOverride,
24+
prefix: "b",
25+
ignoreHints: true
26+
});
27+
await ctx.run(merge.above, "a", "a", "b", { mergeOTL: true });
28+
}
2129
gc(ctx.items.a);
2230
await ctx.run(build, "a", { to: config.o, optimize: true });
2331
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sarasa-gothic",
3-
"version": "0.12.9",
3+
"version": "0.12.10",
44
"main": "./run",
55
"dependencies": {
66
"@chlorophytum/cli": "^0.8.0",

0 commit comments

Comments
 (0)