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

Merge branch 'develop' of https://github.com/ecomfe/fonteditor into develop

Browse Source
This commit is contained in:
kekee000 2015-01-13 00:05:27 +08:00
commit be9811fbf3
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index.html
View File

@ -5,15 +5,6 @@
<title>FontEditor字体编辑器</title>
<link rel="stylesheet" type="text/css" href="./dep/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="./css/main.css">
<script>
var _hmt = _hmt || [];
/baidu.com$/.test(location.hostname) && (function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65ce30cdeda584c416e39648915689f7";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>
@ -130,6 +121,7 @@
</div>
</div>
</div>
<form id="font-form" style="width:0px;height:0px;overflow:hidden;"><input id="font-import" type="file" multiple="multiple"></form>
<script src="./dep/esl.js"></script>
@ -149,6 +141,15 @@
define('jquery', window.jQuery);
require(['fonteditor/main'])
</script>
<form id="font-form" style="width:0px;height:0px;overflow:hidden;"><input id="font-import" type="file" multiple="multiple"></form>
<script>
var _hmt = _hmt || [];
/baidu.com$/.test(location.hostname) && (function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65ce30cdeda584c416e39648915689f7";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</body>
</html>

28
src/ttf/ttf.js
View File

@ -641,20 +641,20 @@ define(
* @return {Object} 度量信息
*/
TTF.prototype.calcMetrics = function () {
var usWinAscent = -16384;
var usWinDescent = 16384;
var ascent = -16384;
var descent = 16384;
var uX = 0x78;
var uH = 0x48;
var sxHeight;
var sCapHeight;
this.ttf.glyf.forEach(function (g) {
if (g.yMax > usWinAscent) {
usWinAscent = g.yMax;
if (g.yMax > ascent) {
ascent = g.yMax;
}
if (g.yMin < usWinDescent) {
usWinDescent = g.yMin;
if (g.yMin < descent) {
descent = g.yMin;
}
if (g.unicode) {
@ -667,20 +667,20 @@ define(
}
});
usWinAscent = Math.round(usWinAscent);
usWinDescent = Math.round(usWinDescent);
ascent = Math.round(ascent);
descent = Math.round(descent);
return {
// 此处非必须自动设置
ascent: usWinAscent,
descent: usWinDescent,
sTypoAscender: usWinAscent,
sTypoDescender: usWinDescent,
ascent: ascent,
descent: descent,
sTypoAscender: ascent,
sTypoDescender: descent,
// 自动设置项目
usWinAscent: usWinAscent,
usWinDescent: -usWinDescent,
usWinAscent: ascent,
usWinDescent: -descent,
sxHeight: sxHeight || 0,
sCapHeight: sCapHeight || 0
};