Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@be5invis
be5invis committed Jul 11, 2020
2 parents 654a358 + 79c43de commit 4de3647
Show file tree
Hide file tree
Showing 340 changed files with 225 additions and 11 deletions.
11 changes: 10 additions & 1 deletion config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
"HC": ["en_US", "zh_HK"],
"CL": ["en_US", "zh_TW"]
},
"copyright": "Copyright 2015-2020, Renzhi Li (a.k.a. Belleve Invis, [email protected]). Portions Copyright © 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Portions Copyright 2017-2020 Rasmus Andersson.",
"copyright": "Copyright 2015-2020, Renzhi Li (a.k.a. Belleve Invis, [email protected]). 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.",
"shsSourceMap": {
"defaultRegion": "SourceHanSans",
"region": {
Expand All @@ -261,6 +261,15 @@
"regular": "Regular",
"semibold": "Medium",
"bold": "Bold"
},
"classicalRegion": "cl",
"classicalOverridePrefix":"GenneGothic",
"classicalOverrideSuffix": {
"extralight": "ExtraLight-subset",
"light": "Light-subset",
"regular": "Regular-subset",
"semibold": "Medium-subset",
"bold": "Bold-subset"
}
}
}
36 changes: 36 additions & 0 deletions hinting-params/bold.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,42 @@
"CANONICAL_STEM_WIDTH": 0.097,
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Hiragana",
"unicodeRanges": [
[12353, 12438],
[12447, 12447],
[110608, 110847],
[110848, 110895]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.097,
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Katakana",
"unicodeRanges": [
[12449, 12538],
[12543, 12543],
[12784, 12799],
[110896, 110959]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.097,
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
}
}
]
}
Expand Down
36 changes: 35 additions & 1 deletion hinting-params/extralight.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,41 @@
"passes": [
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions":{ "CANONICAL_STEM_WIDTH": 0.029 }
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.029 }
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Hiragana",
"unicodeRanges": [
[12353, 12438],
[12447, 12447],
[110608, 110847],
[110848, 110895]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.029
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Katakana",
"unicodeRanges": [
[12449, 12538],
[12543, 12543],
[12784, 12799],
[110896, 110959]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.029
}
}
]
}
Expand Down
34 changes: 34 additions & 0 deletions hinting-params/light.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,40 @@
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.04 }
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Hiragana",
"unicodeRanges": [
[12353, 12438],
[12447, 12447],
[110608, 110847],
[110848, 110895]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.04
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Katakana",
"unicodeRanges": [
[12449, 12538],
[12543, 12543],
[12784, 12799],
[110896, 110959]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.04
}
}
]
}
Expand Down
32 changes: 32 additions & 0 deletions hinting-params/regular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,38 @@
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": { "CANONICAL_STEM_WIDTH": 0.067 }
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Hiragana",
"unicodeRanges": [
[12353, 12438],
[12447, 12447],
[110608, 110847],
[110848, 110895]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Katakana",
"unicodeRanges": [
[12449, 12538],
[12543, 12543],
[12784, 12799],
[110896, 110959]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06
}
}
]
}
Expand Down
36 changes: 36 additions & 0 deletions hinting-params/semibold.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,42 @@
"CANONICAL_STEM_WIDTH": 0.072,
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Hiragana",
"unicodeRanges": [
[12353, 12438],
[12447, 12447],
[110608, 110847],
[110848, 110895]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.072,
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
}
},
{
"hintPlugin": "@chlorophytum/hm-ideograph",
"hintOptions": {
"groupName": "Katakana",
"unicodeRanges": [
[12449, 12538],
[12543, 12543],
[12784, 12799],
[110896, 110959]
],
"trackFeatures": ["vert", "palt", "pkna", "hkna", "vkna"],
"trackScripts": ["kana"],
"SLOPE_FUZZ": 0.06,
"SLOPE_FUZZ_NEG": 0.06,
"CANONICAL_STEM_WIDTH": 0.072,
"STEM_SIDE_MIN_DIST_DESCENT": 0.072
}
}
]
}
Expand Down
10 changes: 9 additions & 1 deletion make/kanji/build.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";

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

Expand All @@ -18,6 +18,14 @@ async function pass(ctx, config, argv) {
a.GSUB = null;
a.GPOS = null;
}
if (argv.classicalOverride) {
const b = await ctx.run(introduce, "b", {
from: argv.classicalOverride,
prefix: "b",
ignoreHints: true
});
await ctx.run(merge.above, "a", "a", "b", { mergeOTL: true });
}
gc(ctx.items.a);
await ctx.run(build, "a", { to: config.o, optimize: true });
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sarasa-gothic",
"version": "0.12.9",
"version": "0.12.10",
"main": "./run",
"dependencies": {
"@chlorophytum/cli": "^0.8.0",
Expand Down
Loading

0 comments on commit 4de3647

Please sign in to comment.