github/fonteditor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add export preserve name

Browse Source
This commit is contained in:
kekee000 2015-06-08 19:29:06 +08:00
parent e259a34600
commit bc7903e43d
10 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fonteditor/dialog/setting-glyf.js
View File

@ -22,7 +22,7 @@ define(
$('#setting-glyf-unicode').on('blur', function (e) {
var val = $(this).val();
var ctlGlyfName = $('#setting-glyf-name');
if (val.match(unicodeREG)) {
if (!ctlGlyfName.val() && val.match(unicodeREG)) {
val = Number('0x' + val.split(',')[0].slice(1));
ctlGlyfName.val(string.getUnicodeName(val));
}

1
src/fonteditor/i18n/en-us/dialog.js
View File

@ -51,6 +51,7 @@ define(
dialog_import_and_export: 'Import and Export',
dialog_combine_svg_single_glyph: 'Combine svg to Single Glyph',
dialog_save_with_glyf_name: 'save glyph name when exporting font',
dialog_onlinefont: 'Online Font',

1
src/fonteditor/i18n/zh-cn/dialog.js
View File

@ -51,6 +51,7 @@ define(
dialog_import_and_export: '导入和导出',
dialog_combine_svg_single_glyph: '导入svg文件时合并成单个字形',
dialog_save_with_glyf_name: '保存字体时同时保存字形命名',
dialog_onlinefont: '在线字体',

1
src/fonteditor/setting/ie.js
View File

@ -17,6 +17,7 @@ define(
// 导出
'export': {
saveWithGlyfName: true // 导出字体时保存字形的名字
}
};

12
src/fonteditor/template/dialog/setting-ie.tpl
View File

@ -8,6 +8,18 @@
</div>
</div>
</div>
<div class="form-inline">
<div class="form-group">
<div class="input-group input-group-sm">
<span class="input-group-addon">${lang.dialog_save_with_glyf_name}</span>
<span class="form-control">
<input data-field="export.saveWithGlyfName" type="checkbox">
</span>
</div>
</div>
</div>
<div class="form-inline">
<div class="input-group input-group-sm">
<span class="input-group-addon">${lang.dialog_savesetting}</span>

2
src/fonteditor/template/dialog/setting-ie.tpl.js
View File

@ -1 +1 @@
define(function () {return '<div class="form-inline">\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">${lang.dialog_combine_svg_single_glyph}</span>\r\n <span class="form-control">\r\n <input data-field="import.combinePath" type="checkbox">\r\n </span>\r\n </div>\r\n </div>\r\n</div>\r\n<div class="form-inline">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">${lang.dialog_savesetting}</span>\r\n <span class="form-control"><input data-field="saveSetting" type="checkbox"></span>\r\n </div> <a href="#" id="setting-ie-default">${lang.dialog_resetsetting}</a>\r\n </div>\r\n';});
define(function () {return '<div class="form-inline">\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">${lang.dialog_combine_svg_single_glyph}</span>\r\n <span class="form-control">\r\n <input data-field="import.combinePath" type="checkbox">\r\n </span>\r\n </div>\r\n </div>\r\n</div>\r\n\r\n<div class="form-inline">\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">${lang.dialog_save_with_glyf_name}</span>\r\n <span class="form-control">\r\n <input data-field="export.saveWithGlyfName" type="checkbox">\r\n </span>\r\n </div>\r\n </div>\r\n</div>\r\n\r\n<div class="form-inline">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">${lang.dialog_savesetting}</span>\r\n <span class="form-control"><input data-field="saveSetting" type="checkbox"></span>\r\n </div> <a href="#" id="setting-ie-default">${lang.dialog_resetsetting}</a>\r\n </div>\r\n';});

4
src/fonteditor/widget/exporter.js
View File

@ -7,7 +7,7 @@
define(
function (require) {
var TTFWriter = require('ttf/ttfwriter');
var writettf = require('./util/writettf');
var ttf2woff = require('ttf/ttf2woff');
var ttf2eot = require('ttf/ttf2eot');
var ttf2svg = require('ttf/ttf2svg');
@ -43,7 +43,7 @@ define(
buffer = ttf2svg(ttf);
}
else {
buffer = new TTFWriter().write(ttf);
buffer = writettf(ttf);
options.type = 'ttf';
}

4
src/fonteditor/widget/previewer.js
View File

@ -7,7 +7,7 @@
define(
function (require) {
var TTFWriter = require('ttf/ttfwriter');
var writettf = require('./util/writettf');
var ttf2woff = require('ttf/ttf2woff');
var ttf2eot = require('ttf/ttf2eot');
var ttf2svg = require('ttf/ttf2svg');
@ -47,7 +47,7 @@ define(
fontData = svg2base64(ttf2svg(ttf));
}
else {
buffer = new TTFWriter().write(ttf);
buffer = writettf(ttf);
fontData = ttf2base64(buffer);
}

36
src/fonteditor/widget/util/writettf.js Normal file
View File

@ -0,0 +1,36 @@
/**
* @file 根据选项生成ttf
* @author mengke01(kekee000@gmail.com)
*/
define(
function (require) {
var TTFWriter = require('ttf/ttfwriter');
var program = require('../program');
/**
* 写ttf buffer
* @param {Object} ttfObject ttf对象
* @param {Object} options 参数选项
* @return {ArrayBuffer} 数据缓冲
*/
function writeTTF(ttfObject, options) {
options = options || {};
var exportSetting = program.setting.get('ie');
// 强制设置post表信息
ttfObject.post = ttfObject.post || {};
if (exportSetting && exportSetting.export.saveWithGlyfName) {
ttfObject.post.format = 2;
}
else {
ttfObject.post.format = 3;
}
return new TTFWriter().write(ttfObject);
}
return writeTTF;
}
);

2
src/ttf/data/empty.js
View File

@ -113,7 +113,7 @@ define(
"maxMemType42": 0,
"minMemType1": 0,
"maxMemType1": 1,
"format": 3
"format": 2
},
"maxp": {
"version": 1.0,