Skip to content

Commit 0061c11

Browse files
committed
- add descent config and tweak all fonts for better alignment
- bump version
1 parent a5ffdd1 commit 0061c11

Some content is hidden

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

49 files changed

+886
-766
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Change Logs
22

3-
## v0.2.3 (upcoming)
3+
## v0.2.3
44

55
- upgrade `jsdom` from `15.0.0` to `20.0.0`
66
- upgrade `svgo` from `1.2.2` to `2.8.0'
77
- rebuild after module upgrade
8+
- add `descent` config and tweak all fonts for better alignment
89

910

1011
## v0.2.2

bin/makefont.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22
// Generated by LiveScript 1.6.0
3-
var fs, fsExtra, stylus, uglifycss, path, svg2ttf, jsdom, progress, colors, svgo, yargs, ref$, offsetY, ascent, argv, config, mapfile, dist, srcdir, size, map, progressBar, optimize, svgs, bar, local, lc, glyphs, handle;
3+
var fs, fsExtra, stylus, uglifycss, path, svg2ttf, jsdom, progress, colors, svgo, yargs, ref$, offsetY, ascent, argv, config, mapfile, dist, srcdir, descent, size, map, progressBar, optimize, svgs, bar, local, lc, glyphs, handle;
44
console.log("initializing...");
55
fs = require('fs');
66
fsExtra = require('fs-extra');
@@ -30,6 +30,10 @@ argv = yargs.option('map', {
3030
alias: 'a',
3131
description: "ascent. tweak box vertical position based on desired font family. negative toward down, postive toward up. default 700",
3232
type: 'number'
33+
}).option('descent', {
34+
alias: 'e',
35+
description: "descent. tweak box vertical position based on desired font family. negative toward down, postive toward up. default 700",
36+
type: 'number'
3337
}).option('offset-y', {
3438
alias: 'y',
3539
description: "adjust glyph vertical position. negative toward down, positive toward up. default -130",
@@ -48,18 +52,22 @@ srcdir = argv.i || 'src/svg';
4852
if (fs.existsSync(path.join(srcdir, 'config.json'))) {
4953
config = JSON.parse(fs.readFileSync(path.join(srcdir, 'config.json')).toString());
5054
ascent = config["ascent"];
55+
descent = config["descent"];
5156
offsetY = config["offset-y"];
5257
size = config["units-per-em"];
5358
}
5459
size = argv.u || size || 900;
5560
ascent = argv.a != null
5661
? +argv.a
57-
: ascent != null ? ascent : 700;
62+
: ascent != null ? ascent : 800;
63+
descent = argv.e != null
64+
? +argv.e
65+
: descent != null ? descent : 100;
5866
offsetY = argv.y != null
5967
? +argv.y
6068
: offsetY != null
6169
? offsetY
62-
: -130;
70+
: -100;
6371
map = mapfile
6472
? JSON.parse(fs.readFileSync(mapfile).toString())
6573
: {};
@@ -159,7 +167,7 @@ handle(svgs).then(function(){
159167
return "<view id=\"" + name + "\" viewBox=\"" + size * i + " 0 " + size + " " + size + "\">\n</view>\n<g transform=\"translate(" + size * i + ",0)\"><path d=\"" + path + "\"/></g>";
160168
}).join('\n');
161169
console.log("generating SVG font...");
162-
fontSvg = "<?xml version=\"1.0\"?>\n<!-- While we use it to generate TTF file, SVG Font is deprecated. Don't use this in browser -->\n<svg xmlns=\"http://www.w3.org/2000/svg\">\n<defs>\n<font id=\"ldi\">\n <font-face units-per-em=\"" + size + "\" ascent=\"" + ascent + "\" descent=\"" + (size - ascent) + "\"/>\n <missing-glyph horiz-adv-x=\"" + size + "\"/>\n " + glyphTags + "\n</font>\n</defs>\n</svg>";
170+
fontSvg = "<?xml version=\"1.0\"?>\n<!-- While we use it to generate TTF file, SVG Font is deprecated. Don't use this in browser -->\n<svg xmlns=\"http://www.w3.org/2000/svg\">\n<defs>\n<font id=\"ldi\">\n <font-face units-per-em=\"" + size + "\" ascent=\"" + ascent + "\" descent=\"" + descent + "\"/>\n <missing-glyph horiz-adv-x=\"" + size + "\"/>\n " + glyphTags + "\n</font>\n</defs>\n</svg>";
163171
iconSvg = "<?xml version=\"1.0\"?>\n<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n " + glyphViews + "\n</svg>";
164172
fsExtra.ensureDirSync(dist);
165173
fs.writeFileSync(path.join(dist, "ldif.font.svg"), fontSvg);

build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ echo "#!/usr/bin/env node" > bin/server.js
1717
chmod 755 bin/server.js
1818

1919
echo "Generating 'line-16-light' Font File..."
20-
./bin/makefont.js -u 800 -m src/unicode.json -i src/vector-files/line-16/light-svg -a 700 -y -130 -d dist/line-16-light
20+
./bin/makefont.js -u 800 -m src/unicode.json -i src/vector-files/line-16/light-svg -a 700 -y -100 -e 100 -d dist/line-16-light
2121

2222
echo "Generating 'line-24-bold' Font File..."
23-
./bin/makefont.js -u 1200 -m src/unicode.json -i src/vector-files/line-24/bold-svg -a 1100 -y -200 -d dist/line-24-bold
23+
./bin/makefont.js -u 1200 -m src/unicode.json -i src/vector-files/line-24/bold-svg -a 1050 -y -150 -e 150 -d dist/line-24-bold
2424

2525
echo "Generating 'legacy' Font File..."
26-
./bin/makefont.js -u 90 -m src/unicode.json -i src/vector-files/legacy/svg -a 80 -y -13 -d dist/legacy
26+
./bin/makefont.js -u 90 -m src/unicode.json -i src/vector-files/legacy/svg -a 80 -y -10 -e 10 -d dist/legacy
2727

2828
echo "Make 'line' the default icon set..."
2929
cp dist/line-24-bold/* dist

dist/index.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ldif.font.svg

Lines changed: 99 additions & 99 deletions
Loading

dist/ldif.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/ldif.ttf

-8 Bytes
Binary file not shown.

dist/ldif.woff2

-32 Bytes
Binary file not shown.

dist/legacy/index.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)