From fd2e61bbdfcda14bcd04909fbc9de66e8a68914f Mon Sep 17 00:00:00 2001
From: kekee000 <kekee000@126com>
Date: Tue, 25 Nov 2014 22:43:09 +0800
Subject: [PATCH] adjust setting

---
 index.html                            | 31 +++++++++++++++++----------
 src/fonteditor/dialog/setting-glyf.js | 11 +++++-----
 src/fonteditor/widget/loader.js       |  2 +-
 src/fonteditor/widget/ttfmanager.js   | 16 ++++++++++++++
 src/ttf/ttf.js                        | 28 ++++++++++++------------
 5 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/index.html b/index.html
index c8000a5..5f707d6 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,6 @@
     <section class="navbar navbar-inverse" role="navigation">
         <button data-action="new" type="button" class="btn btn-primary btn-sm" title="新建ttf字体文件">新建</button>
         <button data-action="open" type="button" class="btn btn-primary btn-sm" title="打开ttf,woff,eot格式字体文件">打开</button>
-        <button data-action="import" type="button" class="btn btn-primary btn-sm" title="导入ttf,woff,svg,eot格式字体文件">导入</button>
 
         <div class="btn-group">
             <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -21,19 +20,32 @@
 
             <ul class="dropdown-menu" role="menu">
                 <li data-action="add-new"><a>新字形</a></li>
+                <li data-action="import"  title="导入ttf,woff,svg,eot格式字体文件"><a>从文件中导入</a></li>
                 <li data-action="add-online"><a>在线字体</a></li>
-                <li data-action="add-url"><a>线上地址</a></li>
+                <li data-action="add-url"><a>字体URL</a></li>
             </ul>
         </div>
 
         <a id="export-btn" href="#" data-action="export" data-type="ttf" class="btn btn-success btn-sm">导出ttf</a>
         <a id="export-btn-woff" href="#" data-action="export" data-type="woff" class="btn btn-success btn-sm">导出woff</a>
-        <a id="export-btn-svg" href="#" data-action="export" data-type="svg" class="btn btn-success btn-sm">导出svg</a>
-        <a id="export-btn-eot" href="#" data-action="export" data-type="eot" class="btn btn-success btn-sm">导出eot</a>
-        <a id="export-btn-zip" href="#" data-action="export" data-type="zip" class="btn btn-success btn-sm">导出zip</a>
+        <a id="export-btn-zip" href="#" data-action="export" data-type="zip" class="btn btn-success btn-sm" title="包含ttf,woff,eot,svg等格式">导出zip</a>
 
         <button data-action="save" type="button" class="btn btn-warning btn-sm">保存项目</button>
 
+        <div class="btn-group">
+
+            <button type="button" class="btn btn-info btn-sm dropdown-toggle" data-toggle="dropdown">
+                调整字形
+                <span class="caret"></span>
+            </button>
+
+            <ul class="dropdown-menu" role="menu">
+                <li><a data-action="setting-glyf">字形信息</a></li>
+                <li><a data-action="setting-adjust-pos">调整位置</a></li>
+                <li><a data-action="setting-adjust-glyf">缩放字形</a></li>
+            </ul>
+        </div>
+
         <div class="btn-group">
 
             <button type="button" class="btn btn-info btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -44,10 +56,7 @@
             <ul class="dropdown-menu" role="menu">
                 <li><a data-action="setting-unicode">代码点</a></li>
                 <li><a data-action="setting-name">字体信息</a></li>
-                <li><a data-action="setting-glyf">字形信息</a></li>
-                <li><a data-action="setting-adjust-pos">调整位置</a></li>
-                <li><a data-action="setting-adjust-glyf">缩放字形</a></li>
-                <li><a data-action="setting-metrics">调整字体度量</a></li>
+                <li><a data-action="setting-metrics">字体度量</a></li>
                 <li><a data-action="setting-editor">编辑器</a></li>
             </ul>
         </div>
@@ -62,8 +71,8 @@
             <ul class="dropdown-menu" role="menu">
                 <li><a data-format="ttf" data-action="preview">ttf字体</a></li>
                 <li><a data-format="woff" data-action="preview">woff字体</a></li>
-                <li><a data-format="svg" data-action="preview">svg字体</a></li>
-                <li><a data-format="eot" data-action="preview">eot字体</a></li>
+                <li><a data-format="svg" data-action="preview" title="仅支持Safari">svg字体</a></li>
+                <li><a data-format="eot" data-action="preview" title="仅支持IE">eot字体</a></li>
             </ul>
         </div>
         <a class="i-github forkme" href="https://github.com/kekee000/fonteditor" target="_blank">Fork me on Github</a>
diff --git a/src/fonteditor/dialog/setting-glyf.js b/src/fonteditor/dialog/setting-glyf.js
index 087b01e..770a5c1 100644
--- a/src/fonteditor/dialog/setting-glyf.js
+++ b/src/fonteditor/dialog/setting-glyf.js
@@ -10,7 +10,7 @@ define(
     function(require) {
 
         var string = require('ttf/util/string');
-        var unicodeREG = /^(?:\$[A-F0-9]+)(?:\,\$[A-F0-9]+)*$/i;
+        var unicodeREG = /^(?:\$[A-F0-9]+)(?:\,\$[A-F0-9]+)*$/gi;
 
         var tpl = ''
             + '<div class="form-inline">'
@@ -51,11 +51,12 @@ define(
             },
 
             set: function(setting) {
-                $('#setting-glyf-name').on('focus', function(e) {
-                    var val = $('#setting-glyf-unicode').val();
-                    if (val.match(unicodeREG)) {
+                $('#setting-glyf-unicode').on('blur', function(e) {
+                    var val = $(this).val();
+                    var ctlGlyfName = $('#setting-glyf-name');
+                    if (!ctlGlyfName.val() && val.match(unicodeREG)) {
                         val = Number('0x' + val.split(',')[0].slice(1));
-                        this.value = string.getUnicodeName(val);
+                        ctlGlyfName.val(string.getUnicodeName(val));
                     }
                 });
                 this.setFields(setting || {});
diff --git a/src/fonteditor/widget/loader.js b/src/fonteditor/widget/loader.js
index 10f1206..da3888f 100644
--- a/src/fonteditor/widget/loader.js
+++ b/src/fonteditor/widget/loader.js
@@ -180,7 +180,7 @@ define(
                         loadSVGFile(file, options);
                     }
                 }
-                else if (options.type == 'ttf' || options.type == 'woff' || options.type == 'eot'){
+                else if (options.type == 'ttf' || options.type == 'woff' || options.type == 'eot') {
                     if (file instanceof ArrayBuffer) {
                         loadSFNTBinary(file, options);
                     }
diff --git a/src/fonteditor/widget/ttfmanager.js b/src/fonteditor/widget/ttfmanager.js
index 5b9153a..041abf9 100644
--- a/src/fonteditor/widget/ttfmanager.js
+++ b/src/fonteditor/widget/ttfmanager.js
@@ -12,6 +12,7 @@ define(
         var lang = require('common/lang');
         var History = require('editor/widget/History'); 
         var TTF = require('ttf/ttf');
+        var string = require('ttf/util/string');
 
         /**
          * 清除glyf编辑状态
@@ -94,8 +95,23 @@ define(
          * @return {this}
          */
         Manager.prototype.insertGlyf = function(glyf, beforeIndex) {
+            var glyfList = this.ttf.getGlyf();
+            var unicode = 0x20;
 
+            // 找到unicode的最大值
+            for (var i = glyfList.length - 1; i > 0 ; i--) {
+                var g = glyfList[i];
+                if (g.unicode && g.unicode.length) {
+                    var u = Math.max.apply(null, g.unicode);
+                    unicode = Math.max(u, unicode);
+                }
+            }
+
+            unicode++;
+            glyf.unicode = [unicode];
+            glyf.name = string.getUnicodeName(unicode);
             glyf.modify = 'new';
+
             this.ttf.insertGlyf(glyf, beforeIndex);
             this.fireChange(true);
 
diff --git a/src/ttf/ttf.js b/src/ttf/ttf.js
index bf1f503..f6c2bd4 100644
--- a/src/ttf/ttf.js
+++ b/src/ttf/ttf.js
@@ -297,26 +297,19 @@ define(
             var glyfList = this.getGlyf(indexList);
             var changed = false;
 
-            // 左右边轴
-            if (undefined !== setting.leftSideBearing || undefined !== setting.rightSideBearing) {
+            // 左边轴
+            if (undefined !== setting.leftSideBearing) {
 
                 changed = true;
 
                 glyfList.forEach(function(g) {
 
-                    // 设置左边轴
-                    if (undefined !== setting.leftSideBearing && g.leftSideBearing != setting.leftSideBearing) {
+                    if (g.leftSideBearing != setting.leftSideBearing) {
 
                         var offset = setting.leftSideBearing - g.leftSideBearing;
                         g.leftSideBearing = g.xMin = setting.leftSideBearing;
                         g.xMax += offset;
-
-                        if (undefined !== setting.rightSideBearing) {
-                            g.advanceWidth = g.xMax + offset;
-                        }
-                        else {
-                            g.advanceWidth += offset;
-                        }
+                        g.advanceWidth += offset;
 
                         if (g.contours && g.contours.length) {
                             g.contours.forEach(function(contour) {
@@ -324,13 +317,20 @@ define(
                             });
                         }
                     }
-                    else if (undefined !== setting.rightSideBearing) {
-                        g.advanceWidth = g.xMax + setting.rightSideBearing;
-                    }
 
                 });
             }
 
+            // 右边轴
+            if (undefined !== setting.rightSideBearing) {
+
+                changed = true;
+
+                glyfList.forEach(function(g) {
+                    g.advanceWidth = g.xMax + setting.rightSideBearing;
+                });
+            }
+
             // 基线高度
             if (undefined !== setting.verticalAlign) {