Skip to content

Commit d7f4527

Browse files
be5invisbe5invis
committed
Merge branch 'dev'
2 parents 961cfcc + fc1e2cf commit d7f4527

333 files changed

Lines changed: 91 additions & 52 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.

‎hinting-params/bold.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
1111
"hintOptions": {
1212
"CANONICAL_STEM_WIDTH": 0.097,
13-
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
13+
"STEM_SIDE_MIN_DIST_DESCENT": 0.072,
14+
"SLOPE_FUZZ_POS": 0.16,
15+
"SLOPE_FUZZ_POST": 0.27
1416
}
1517
},
1618
{
@@ -26,6 +28,8 @@
2628
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
2729
"trackScripts": ["kana"],
2830
"SLOPE_FUZZ": 0.175,
31+
"SLOPE_FUZZ_POS": 0.175,
32+
"SLOPE_FUZZ_POST": 0.175,
2933
"SLOPE_FUZZ_NEG": 0.175,
3034
"CANONICAL_STEM_WIDTH": 0.097,
3135
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
@@ -43,8 +47,10 @@
4347
],
4448
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
4549
"trackScripts": ["kana"],
46-
"SLOPE_FUZZ": 0.06,
47-
"SLOPE_FUZZ_NEG": 0.06,
50+
"SLOPE_FUZZ": 0.03,
51+
"SLOPE_FUZZ_POS": 0.03,
52+
"SLOPE_FUZZ_POST": 0.03,
53+
"SLOPE_FUZZ_NEG": 0.03,
4854
"CANONICAL_STEM_WIDTH": 0.097,
4955
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
5056
}

‎hinting-params/extralight.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
"passes": [
99
{
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
11-
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.029 }
11+
"hintOptions": {
12+
"CANONICAL_STEM_WIDTH": 0.029,
13+
"SLOPE_FUZZ_POS": 0.16,
14+
"SLOPE_FUZZ_POST": 0.27
15+
}
1216
},
1317
{
1418
"hintPlugin": "@chlorophytum/hm-ideograph",
@@ -23,6 +27,8 @@
2327
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
2428
"trackScripts": ["kana"],
2529
"SLOPE_FUZZ": 0.175,
30+
"SLOPE_FUZZ_POS": 0.175,
31+
"SLOPE_FUZZ_POST": 0.175,
2632
"SLOPE_FUZZ_NEG": 0.175,
2733
"CANONICAL_STEM_WIDTH": 0.029
2834
}
@@ -39,8 +45,10 @@
3945
],
4046
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
4147
"trackScripts": ["kana"],
42-
"SLOPE_FUZZ": 0.06,
43-
"SLOPE_FUZZ_NEG": 0.06,
48+
"SLOPE_FUZZ": 0.03,
49+
"SLOPE_FUZZ_POS": 0.03,
50+
"SLOPE_FUZZ_POST": 0.03,
51+
"SLOPE_FUZZ_NEG": 0.03,
4452
"CANONICAL_STEM_WIDTH": 0.029
4553
}
4654
}

‎hinting-params/light.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
"passes": [
99
{
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
11-
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.04 }
11+
"hintOptions": {
12+
"CANONICAL_STEM_WIDTH": 0.04,
13+
"SLOPE_FUZZ_POS": 0.16,
14+
"SLOPE_FUZZ_POST": 0.27
15+
}
1216
},
1317
{
1418
"hintPlugin": "@chlorophytum/hm-ideograph",
@@ -23,6 +27,8 @@
2327
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
2428
"trackScripts": ["kana"],
2529
"SLOPE_FUZZ": 0.175,
30+
"SLOPE_FUZZ_POS": 0.175,
31+
"SLOPE_FUZZ_POST": 0.175,
2632
"SLOPE_FUZZ_NEG": 0.175,
2733
"CANONICAL_STEM_WIDTH": 0.04
2834
}
@@ -39,8 +45,10 @@
3945
],
4046
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
4147
"trackScripts": ["kana"],
42-
"SLOPE_FUZZ": 0.06,
43-
"SLOPE_FUZZ_NEG": 0.06,
48+
"SLOPE_FUZZ": 0.03,
49+
"SLOPE_FUZZ_POS": 0.03,
50+
"SLOPE_FUZZ_POST": 0.03,
51+
"SLOPE_FUZZ_NEG": 0.03,
4452
"CANONICAL_STEM_WIDTH": 0.04
4553
}
4654
}

‎hinting-params/regular.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
"passes": [
99
{
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
11-
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.067 }
11+
"hintOptions": {
12+
"CANONICAL_STEM_WIDTH": 0.067,
13+
"SLOPE_FUZZ_POS": 0.16,
14+
"SLOPE_FUZZ_POST": 0.27
15+
}
1216
},
1317
{
1418
"hintPlugin": "@chlorophytum/hm-ideograph",
@@ -23,6 +27,8 @@
2327
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
2428
"trackScripts": ["kana"],
2529
"SLOPE_FUZZ": 0.175,
30+
"SLOPE_FUZZ_POS": 0.175,
31+
"SLOPE_FUZZ_POST": 0.175,
2632
"SLOPE_FUZZ_NEG": 0.175
2733
}
2834
},
@@ -38,8 +44,10 @@
3844
],
3945
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
4046
"trackScripts": ["kana"],
41-
"SLOPE_FUZZ": 0.06,
42-
"SLOPE_FUZZ_NEG": 0.06
47+
"SLOPE_FUZZ": 0.03,
48+
"SLOPE_FUZZ_POS": 0.03,
49+
"SLOPE_FUZZ_POST": 0.03,
50+
"SLOPE_FUZZ_NEG": 0.03
4351
}
4452
}
4553
]

‎hinting-params/semibold.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"hintPlugin": "@chlorophytum/hm-ideograph",
1111
"hintOptions": {
1212
"CANONICAL_STEM_WIDTH": 0.072,
13-
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
13+
"STEM_SIDE_MIN_DIST_DESCENT": 0.072,
14+
"SLOPE_FUZZ_POS": 0.16,
15+
"SLOPE_FUZZ_POST": 0.27
1416
}
1517
},
1618
{
@@ -26,6 +28,8 @@
2628
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
2729
"trackScripts": ["kana"],
2830
"SLOPE_FUZZ": 0.175,
31+
"SLOPE_FUZZ_POS": 0.175,
32+
"SLOPE_FUZZ_POST": 0.175,
2933
"SLOPE_FUZZ_NEG": 0.175,
3034
"CANONICAL_STEM_WIDTH": 0.072,
3135
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
@@ -43,8 +47,10 @@
4347
],
4448
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
4549
"trackScripts": ["kana"],
46-
"SLOPE_FUZZ": 0.06,
47-
"SLOPE_FUZZ_NEG": 0.06,
50+
"SLOPE_FUZZ": 0.03,
51+
"SLOPE_FUZZ_POS": 0.03,
52+
"SLOPE_FUZZ_POST": 0.03,
53+
"SLOPE_FUZZ_NEG": 0.03,
4854
"CANONICAL_STEM_WIDTH": 0.072,
4955
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
5056
}

‎make/pass1/build.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,12 @@ async function pass(ctx, config, argv) {
6969
await ctx.run(
7070
nameFont,
7171
"a",
72+
!!argv.mono,
7273
globalConfig.nameTupleSelector[argv.subfamily],
7374
ENCODINGS[argv.subfamily],
7475
{
7576
en_US: {
76-
copyright: globalConfig.version,
77+
copyright: globalConfig.copyright,
7778
version: `Version ${packageConfig.version}`,
7879
family: globalConfig.families[argv.family].naming.en_US + " " + argv.subfamily,
7980
style: globalConfig.styles[argv.style].name

‎make/pass1/metadata.js‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@ const langIDMap = {
5555

5656
function createNameTuple(nameTable, langID, family, style, localizedStyle) {
5757
const compat = compatibilityName(family, style);
58-
if (!compat.standardFour) {
59-
nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_FAMILY, family));
60-
nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_STYLE, style));
61-
}
58+
nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_FAMILY, family));
59+
nameTable.push(nameEntry(WINDOWS, UNICODE, langID, PREFERRED_STYLE, style));
6260
nameTable.push(nameEntry(WINDOWS, UNICODE, langID, FAMILY, compat.family));
6361
const compatStyle = compat.standardFour ? localizedStyle : compat.style;
6462
nameTable.push(nameEntry(WINDOWS, UNICODE, langID, STYLE, compatStyle));
@@ -77,7 +75,7 @@ function createNameTuple(nameTable, langID, family, style, localizedStyle) {
7775
}
7876
}
7977

80-
async function nameFont(ctx, demand, selectorList, encodings, namings) {
78+
async function nameFont(ctx, demand, fMono, selectorList, encodings, namings) {
8179
const font = this.items[demand];
8280
const nameTable = [];
8381
const defaultNg = namings.en_US;
@@ -121,6 +119,19 @@ async function nameFont(ctx, demand, selectorList, encodings, namings) {
121119
cp850: true,
122120
ascii: true
123121
};
122+
// Set Panose bits
123+
font.OS_2.panose = [
124+
2,
125+
0,
126+
(1 + font.OS_2.usWeightClass / 100) | 0,
127+
fMono ? 9 : 0,
128+
0,
129+
0,
130+
0,
131+
0,
132+
0,
133+
0
134+
];
124135
}
125136

126137
exports.nameFont = nameFont;

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"name": "sarasa-gothic",
3-
"version": "0.12.11",
3+
"version": "0.12.12",
44
"main": "./run",
55
"dependencies": {
6-
"@chlorophytum/cli": "^0.8.0",
7-
"@chlorophytum/final-hint-format-hltt": "^0.8.0",
8-
"@chlorophytum/font-format-ttf": "^0.8.0",
9-
"@chlorophytum/hint-store-provider-file": "^0.8.0",
10-
"@chlorophytum/hm-combine": "^0.8.0",
11-
"@chlorophytum/hm-ideograph": "^0.9.0",
6+
"@chlorophytum/cli": "^0.10.0",
7+
"@chlorophytum/final-hint-format-hltt": "^0.10.0",
8+
"@chlorophytum/font-format-ttf": "^0.10.0",
9+
"@chlorophytum/hint-store-provider-file": "^0.10.0",
10+
"@chlorophytum/hm-combine": "^0.10.0",
11+
"@chlorophytum/hm-ideograph": "^0.10.1",
1212
"colors": "^1.4.0",
13-
"fs-extra": "^8.1.0",
13+
"fs-extra": "^9.0.1",
1414
"megaminx": "^0.9.0",
1515
"otfcc-ttcize": "^0.10.2",
16-
"verda": "^1.0.0-10",
16+
"verda": "^1.1.0",
1717
"which": "^2.0.2",
18-
"yargs": "^15.3.0"
18+
"yargs": "^15.4.1"
1919
},
2020
"engines": {
2121
"node": ">=12.0.0"
@@ -25,8 +25,8 @@
2525
"build": "verda -f verdafile.js"
2626
},
2727
"devDependencies": {
28-
"eslint": "^6.8.0",
29-
"eslint-config-prettier": "^6.10.0",
28+
"eslint": "^7.6.0",
29+
"eslint-config-prettier": "^6.11.0",
3030
"prettier": "^2.0.5"
3131
}
3232
}

0 commit comments

Comments
 (0)