update default underline position
This commit is contained in:
be5invis
parent
8341aa08b5
commit
279ba1715e
|
|
@ -108,5 +108,5 @@ maxMemType42 = 0
|
|||
minMemType1 = 0
|
||||
minMemType42 = 0
|
||||
postoints = 65411
|
||||
underlinePosition = 50
|
||||
underlineThickness = 0
|
||||
underlinePosition = -50
|
||||
underlineThickness = 50
|
||||
170
generator.js
170
generator.js
|
|
@ -1,13 +1,13 @@
|
|||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
var fs = require("fs");
|
||||
var path = require("path");
|
||||
|
||||
//var TTFWriter = require('node-sfnt').TTFWriter;
|
||||
var argv = require('yargs').argv;
|
||||
var buildGlyphs = require('./buildglyphs.js');
|
||||
var parameters = require('./parameters');
|
||||
var toml = require('toml');
|
||||
// var TTFWriter = require('node-sfnt').TTFWriter;
|
||||
var argv = require("yargs").argv;
|
||||
var buildGlyphs = require("./buildglyphs.js");
|
||||
var parameters = require("./parameters");
|
||||
var toml = require("toml");
|
||||
|
||||
var Glyph = require('./support/glyph');
|
||||
var Glyph = require("./support/glyph");
|
||||
|
||||
function hasv(obj) {
|
||||
if (!obj) return false;
|
||||
|
|
@ -17,93 +17,99 @@ function hasv(obj) {
|
|||
|
||||
// Font building
|
||||
var font = function () {
|
||||
var parametersData = toml.parse(fs.readFileSync(path.join(path.dirname(require.main.filename), 'parameters.toml'), 'utf-8'));
|
||||
var emptyFont = toml.parse(fs.readFileSync(path.join(path.dirname(require.main.filename), 'emptyfont.toml'), 'utf-8'));
|
||||
var parametersData = toml.parse(fs.readFileSync(path.join(path.dirname(require.main.filename), "parameters.toml"), "utf-8"));
|
||||
var emptyFont = toml.parse(fs.readFileSync(path.join(path.dirname(require.main.filename), "emptyfont.toml"), "utf-8"));
|
||||
var para = parameters.build(parametersData, argv._);
|
||||
var fontUniqueName = para.family + ' ' + para.style + ' ' + para.version + ' (' + para.codename + ')'
|
||||
var fontUniqueName = para.family + " " + para.style + " " + para.version + " (" + para.codename + ")";
|
||||
|
||||
console.log(' Start building font ' + fontUniqueName);
|
||||
console.log(" Start building font " + fontUniqueName);
|
||||
var font = buildGlyphs.build.call(emptyFont, para);
|
||||
console.log(' ' + fontUniqueName + " Successfully built.");
|
||||
console.log(" " + fontUniqueName + " Successfully built.");
|
||||
font.parameters = para;
|
||||
font.glyf = font.glyf.sort(function (a, b) {
|
||||
var pri1 = a.cmpPriority || 0;
|
||||
var pri2 = b.cmpPriority || 0;
|
||||
return (pri2 !== pri1 ? pri2 - pri1 : a.contours.length !== b.contours.length ? a.contours.length - b.contours.length : (a.unicode && b.unicode && a.unicode[0] !== b.unicode[0]) ? a.unicode[0] - b.unicode[0] : (a.name < b.name) ? (-1) : (a.name > b.name) ? 1 : 0);
|
||||
})
|
||||
});
|
||||
return font;
|
||||
} ();
|
||||
}();
|
||||
|
||||
if (argv.charmap) (function () {
|
||||
console.log(' Writing character map -> ' + argv.charmap);
|
||||
fs.writeFileSync(argv.charmap, JSON.stringify(font.glyf.map(function (glyph) {
|
||||
return [
|
||||
glyph.name,
|
||||
glyph.unicode,
|
||||
glyph.advanceWidth === 0 ? hasv(glyph.anchors) ? 1 : (glyph.contours && glyph.contours.length) ? 2 : 0 : 0
|
||||
]
|
||||
})), 'utf8');
|
||||
})();
|
||||
if (argv.charmap) {
|
||||
(function () {
|
||||
console.log(" Writing character map -> " + argv.charmap);
|
||||
fs.writeFileSync(argv.charmap, JSON.stringify(font.glyf.map(function (glyph) {
|
||||
return [
|
||||
glyph.name,
|
||||
glyph.unicode,
|
||||
glyph.advanceWidth === 0 ? hasv(glyph.anchors) ? 1 : (glyph.contours && glyph.contours.length) ? 2 : 0 : 0
|
||||
];
|
||||
})), "utf8");
|
||||
})();
|
||||
}
|
||||
|
||||
if (argv.svg) (function () {
|
||||
console.log(' Writing outline as SVG -> ' + argv.svg);
|
||||
if (argv.svg) {
|
||||
(function () {
|
||||
console.log(" Writing outline as SVG -> " + argv.svg);
|
||||
|
||||
var foundNaN = false;
|
||||
var glyfname = '';
|
||||
function mix(a, b, p) { return a + (b - a) * p };
|
||||
var foundNaN = false;
|
||||
var glyfname = "";
|
||||
function mix(a, b, p) { return a + (b - a) * p; }
|
||||
|
||||
function toSVGPath(glyph) {
|
||||
var buf = '';
|
||||
foundNaN = false;
|
||||
glyfname = glyph.name;
|
||||
if (glyph.contours) for (var j = 0; j < glyph.contours.length; j++) {
|
||||
buf += Glyph.contourToSVGPath(glyph.contours[j], false);
|
||||
}
|
||||
return buf;
|
||||
}
|
||||
var svg = '<?xml version="1.0" encoding="utf-8"?>'
|
||||
+ '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >'
|
||||
+ '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">'
|
||||
+ '<defs><font id="' + font.name.postScriptName + '">';
|
||||
|
||||
var skew = (argv.uprightify ? 1 : 0) * Math.tan((font.post.italicAngle || 0) / 180 * Math.PI);
|
||||
var scale = (argv.upm || 1000) / 1000;
|
||||
|
||||
svg += '<font-face font-family="' + font.name.fontFamily
|
||||
+ '" font-weight="' + font.OS_2.usWeightClass
|
||||
+ '" font-stretch="normal" units-per-em="'
|
||||
+ (1000 * scale) + '"/>';
|
||||
|
||||
for (var j = 0; j < font.glyf.length; j++) {
|
||||
var g = font.glyf[j];
|
||||
if (g.contours) {
|
||||
for (var k = 0; k < g.contours.length; k++) {
|
||||
var contour = g.contours[k];
|
||||
for (var p = 0; p < contour.length; p++) {
|
||||
contour[p].x += contour[p].y * skew;
|
||||
contour[p].x *= scale;
|
||||
contour[p].y *= scale;
|
||||
}
|
||||
function toSVGPath(glyph) {
|
||||
var buf = "";
|
||||
foundNaN = false;
|
||||
glyfname = glyph.name;
|
||||
if (glyph.contours) for (var j = 0; j < glyph.contours.length; j++) {
|
||||
buf += Glyph.contourToSVGPath(glyph.contours[j], false);
|
||||
}
|
||||
g.advanceWidth *= scale;
|
||||
Glyph.prototype.cleanup.call(g, 0.25);
|
||||
return buf;
|
||||
}
|
||||
var gd = '<' + (j === 0 ? 'missing-glyph' : 'glyph')
|
||||
+ ' glyph-name="' + g.name
|
||||
+ '" horiz-adv-x="' + g.advanceWidth + '" '
|
||||
+ (g.unicode && g.unicode.length ? 'unicode="&#x' + g.unicode[0].toString(16) + ';"' : '')
|
||||
+ ' d="' + toSVGPath(g) + '" />\n';
|
||||
svg += gd;
|
||||
}
|
||||
svg += '</font></defs></svg>';
|
||||
fs.writeFileSync(argv.svg, svg, 'utf-8');
|
||||
})();
|
||||
var svg = '<?xml version="1.0" encoding="utf-8"?>'
|
||||
+ '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >'
|
||||
+ '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">'
|
||||
+ '<defs><font id="' + font.name.postScriptName + '">';
|
||||
|
||||
if (argv.meta) (function () {
|
||||
console.log(' Writing metadata as JSON -> ' + argv.meta);
|
||||
if (argv.svg) {
|
||||
font.glyf = null;
|
||||
font.glyfMap = null;
|
||||
}
|
||||
fs.writeFileSync(argv.meta, JSON.stringify(font));
|
||||
})();
|
||||
var skew = (argv.uprightify ? 1 : 0) * Math.tan((font.post.italicAngle || 0) / 180 * Math.PI);
|
||||
var scale = (argv.upm || 1000) / 1000;
|
||||
|
||||
svg += '<font-face font-family="' + font.name.fontFamily
|
||||
+ '" font-weight="' + font.OS_2.usWeightClass
|
||||
+ '" font-stretch="normal" units-per-em="'
|
||||
+ (1000 * scale) + '"/>';
|
||||
|
||||
for (var j = 0; j < font.glyf.length; j++) {
|
||||
var g = font.glyf[j];
|
||||
if (g.contours) {
|
||||
for (var k = 0; k < g.contours.length; k++) {
|
||||
var contour = g.contours[k];
|
||||
for (var p = 0; p < contour.length; p++) {
|
||||
contour[p].x += contour[p].y * skew;
|
||||
contour[p].x *= scale;
|
||||
contour[p].y *= scale;
|
||||
}
|
||||
}
|
||||
g.advanceWidth *= scale;
|
||||
Glyph.prototype.cleanup.call(g, 0.25);
|
||||
}
|
||||
var gd = "<" + (j === 0 ? "missing-glyph" : "glyph")
|
||||
+ ' glyph-name="' + g.name
|
||||
+ '" horiz-adv-x="' + g.advanceWidth + '" '
|
||||
+ (g.unicode && g.unicode.length ? 'unicode="&#x' + g.unicode[0].toString(16) + ';"' : "")
|
||||
+ ' d="' + toSVGPath(g) + '" />\n';
|
||||
svg += gd;
|
||||
}
|
||||
svg += "</font></defs></svg>";
|
||||
fs.writeFileSync(argv.svg, svg, "utf-8");
|
||||
})();
|
||||
}
|
||||
|
||||
if (argv.meta) {
|
||||
(function () {
|
||||
console.log(" Writing metadata as JSON -> " + argv.meta);
|
||||
if (argv.svg) {
|
||||
font.glyf = null;
|
||||
font.glyfMap = null;
|
||||
}
|
||||
fs.writeFileSync(argv.meta, JSON.stringify(font));
|
||||
})();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user