Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Win compatibility #47

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Win compatibility #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6bdf7
Win compatibility
Feb 23, 2017
f39ea7e
Bugfix
Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 76 additions & 29 deletions src/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,76 @@
const which = require('which').sync;
const isLinux = require('./helpers.js').isLinux();

const FontFaceException = require('./exception.js');

const commands = {};
const check = [
'fontforge',
];
let missing = [];

check.forEach(cmd => {
try {
commands[cmd] = which(cmd);
} catch (e) {
missing = [...missing, cmd];
}
});

if (missing.length) {
const installCmd = isLinux ? 'sudo apt-get install' : 'brew install';

throw new FontFaceException(
'We are missing some required font packages.\n' +
'That can be installed with:\n' +
`${installCmd} ${missing.join(' ')}`);
}

module.exports = commands;
'use strict';

var which = require('which').sync;
var exec = require('child_process').execSync;
var isLinux = require('./helpers.js').isLinux();
var isWindows = require('./helpers.js').isWindows();


var FontFaceException = require('./exception.js');

var commands = {};
var done = false;

module.exports = function() {

if (done) {
return commands;
}
done = true;

var check = {
fontforge: {},
ttf2eot: {}
};

if (isLinux) {
check.ttf2svg = {};
} else {
check['batik-ttf2svg'] = {};
}

var missing = [];

for (var cmd in check) {
if (check.hasOwnProperty(cmd)) {


try {
if (isWindows) {
commands[cmd] = '"' + which(cmd) + '"';
}
else {
commands[cmd] = which(cmd);
}
} catch(e) {
missing.push(cmd);
}
}
}

if (missing.length) {
if (isLinux) {
var errNPM = [], errAPT = [];
missing.forEach(function(cmd){
if (cmd.indexOf("ttf2") != -1) {
errNPM.push(cmd);
} else{
errAPT.push(cmd);
}
});

throw new FontFaceException(
'We are missing some required font packages.\n' +
'That can be installed with:\n' +
(errAPT.length ? 'sudo apt-get install ' + errAPT.join(' ') + '\n' : '') +
(errAPT.length && errNPM.length ? 'and' : '') +
(errNPM.length ? 'sudo npm install -g ' + errNPM.join(' ') : ''));
} else {
throw new FontFaceException(
'We are missing some required font packages.\n' +
'That can be installed with:\n' +
'brew install ' + missing.join(' '));
}
}
return commands;
}()
75 changes: 43 additions & 32 deletions src/configure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,48 @@
const path = require('path');
const fs = require('fs');
const merge = require('./helpers.js').merge;
const fontforge = require('./fontforge.js');
'use strict';

module.exports = options => {
const _ = {
source: options.source,
dest_dir: options.dest,
collate: options.collate || false,
};
var path = require('path');
var fs = require('fs');
var merge = require('./helpers.js').merge;
var fontforge = require('./fontforge.js');

_.extension = path.extname(_.source);
_.basename = path.basename(_.source, _.extension);
_.dest_dir = _.collate ? path.join(_.dest_dir, _.basename) : _.dest_dir;
_.target = path.join(_.dest_dir, _.basename);
_.config_file = `${_.source.replace(_.extension, '')}.json`;
_.ttf = [_.target, '.ttf'].join('');
_.eot = [_.target, '.eot'].join('');
_.svg = [_.target, '.svg'].join('');
_.woff = [_.target, '.woff'].join('');
_.woff2 = [_.target, '.woff2'].join('');
_.css = [_.target, '.css'].join('');
_.css_fontpath = '';
_.name = fontforge.getName(_.source);
_.weight = fontforge.getWeight(_.source);
_.style = fontforge.getStyle(_.source);
_.embed = [];
var resolve = require('path').resolve
var isWindows = require('./helpers.js').isWindows()

if (fs.existsSync(_.config_file)) {
merge(_, JSON.parse(fs.readFileSync(_.config_file)));
}
module.exports = function(options) {

const _ = {
source: options.source,
dest_dir: options.dest,
collate: options.collate || false,
css_fontpath : options.css_fontpath
};

_.extension = path.extname(_.source);
_.basename = path.basename(_.source, _.extension);
_.dest_dir = _.collate ? path.join(_.dest_dir, _.basename) : _.dest_dir;
_.target = path.join(_.dest_dir, _.basename);
if (isWindows) {
_.target = _.target.replace(/\\/g,'/');
_.target = resolve(_.target);
}
_.config_file = _.source.replace(_.extension, '') + '.json';
_.ttf = [_.target, '.ttf'].join('');
_.eot = [_.target, '.eot'].join('');
_.svg = [_.target, '.svg'].join('');
_.woff = [_.target, '.woff'].join('');
_.woff2 = [_.target, '.woff2'].join('');
_.css = [_.target, '.css'].join('');
_.css_fontpath = '';
_.name = fontforge.getName(_.source);
_.weight = fontforge.getWeight(_.source);
_.style = fontforge.getStyle(_.source);
_.embed = [];

if (fs.existsSync(_.config_file)) {
merge(_, JSON.parse(fs.readFileSync(_.config_file)));
}

merge(_, options);
merge(_, options);

return _;
};
return _;
}
42 changes: 23 additions & 19 deletions src/encode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
const fs = require('fs');
const path = require('path');
const { removeNewLines } = require('./helpers');
'use strict';

var fs = require('fs');
var path = require('path');
var removeNewLines = require('./helpers').removeNewLines;

// Encode font file to data:uri and *remove* source file.
function encode(fontFile) {
const dataUri = fs.readFileSync(fontFile, 'base64'); // Convert to data:uri
const type = path.extname(fontFile).substring(1);
const fontUrl = `'data:application/x-font-${type};charset=utf-8;base64,${dataUri}'`;
module.exports = function (fontFile) {
var dataUri, type, fontUrl;

// Convert to data:uri
dataUri = fs.readFileSync(fontFile, 'base64');
type = path.extname(fontFile).substring(1);
fontUrl = '\'data:application/x-font-' + type + ';charset=utf-8;base64,' + dataUri + '\'';

// Remove source file
fs.unlinkSync(fontFile);
// Remove source file
fs.unlinkSync(fontFile);

return fontUrl;
return fontUrl;
}

function svg(fontFile) {
const dataUri = removeNewLines(fs.readFileSync(fontFile));
const fontUrl = `'data:image/svg+xml;charset=utf8,${dataUri}'`;
module.exports.svg = function(fontFile) {
var dataUri, fontUrl;

// Remove source file
fs.unlinkSync(fontFile);
dataUri = removeNewLines(fs.readFileSync(fontFile));
fontUrl = '\'data:image/svg+xml;charset=utf8,' + dataUri + '\'';

return fontUrl;
}
// Remove source file
fs.unlinkSync(fontFile);

module.exports = encode;
module.exports.svg = svg;
return fontUrl;
}
8 changes: 5 additions & 3 deletions src/exception.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = function FontFaceException(message) {
this.message = message;
this.name = 'FontFaceException';
'use strict';

module.exports = function(message) {
this.message = message;
this.name = "FontFaceException";
};
59 changes: 32 additions & 27 deletions src/fontfacegen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,39 @@
const path = require('path');
const mkdirp = require('mkdirp').sync;
const configure = require('./configure.js');
const ttf = require('./ttf.js');
const ttf2woff = require('./ttf2woff.js');
const ttf2woff2 = require('./ttf2woff2.js');
const ttf2eot = require('./ttf2eot.js');
const ttf2svg = require('./ttf2svg.js');
const stylesheets = require('./stylesheets.js');
'use strict';

module.exports = options => {
const config = configure(options);
var

mkdirp(config.dest_dir);
path = require('path'),
mkdirp = require('mkdirp').sync,
configure = require('./configure.js'),
ttf = require('./ttf.js'),
ttf2woff = require('./ttf2woff.js'),
ttf2woff2 = require('./ttf2woff2.js'),
ttf2eot = require('./ttf2eot.js'),
ttf2svg = require('./ttf2svg.js'),
stylesheets = require('./stylesheets.js');

if (config.css) {
mkdirp(path.dirname(config.css));
}
module.exports = function(options) {
var config = configure(options);

mkdirp(config.dest_dir);

if (config.less) {
mkdirp(path.dirname(config.less));
}
if (config.css) {
mkdirp(path.dirname(config.css));
}

if (config.scss) {
mkdirp(path.dirname(config.scss));
}
if (config.less) {
mkdirp(path.dirname(config.less));
}

ttf(config.source, config.ttf, config.name, config); // TODO: better options handling
ttf2eot(config.ttf, config.eot);
ttf2svg(config.ttf, config.svg);
ttf2woff(config.ttf, config.woff);
ttf2woff2(config.ttf, config.woff2);
stylesheets(config);
if (config.scss) {
config.scss = config.scss + '/' + config.basename + '.scss';
mkdirp(path.dirname(config.scss));
}

ttf(config.source, config.ttf, config.name);
ttf2eot(config.ttf, config.eot);
ttf2svg(config.ttf, config.svg, config.name);
ttf2woff(config.ttf, config.woff);
ttf2woff2(config.ttf, config.woff2);
stylesheets(config);
};
Loading