From a5e34a31e83fe483882c1e28cda4f27f62f66796 Mon Sep 17 00:00:00 2001
From: kekee000 <kekee000@gmail.com>
Date: Mon, 29 Sep 2014 19:42:46 +0800
Subject: [PATCH] modify glyf writer

---
 demo/js/ttfparse.js         |   7 ++++++-
 font/baiduHealth-ascii.ttf  | Bin 0 -> 5040 bytes
 src/ttf/table/cmap.js       |  13 ++++++++++++-
 src/ttf/table/glyfwriter.js |  37 ++++++++++++++++++++----------------
 src/ttf/ttfwriter.js        |   2 +-
 5 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 font/baiduHealth-ascii.ttf

diff --git a/demo/js/ttfparse.js b/demo/js/ttfparse.js
index 6e3f1fc..086c7d4 100644
--- a/demo/js/ttfparse.js
+++ b/demo/js/ttfparse.js
@@ -17,7 +17,12 @@ define(
             var file = e.target.files[0];
             var reader = new FileReader();
             reader.onload = function(e) {
-                var ttf = new ttfreader().read(e.target.result);
+
+                var ttfReader = new ttfreader();
+                ttfReader.read(e.target.result);
+                var ttfData = ttfReader.resolve();
+                console.log(ttfData);
+
             }
 
             reader.onerror = function(e) {
diff --git a/font/baiduHealth-ascii.ttf b/font/baiduHealth-ascii.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..dab31b9cd2ea04f2de3c9273ec865c0fa215e591
GIT binary patch
literal 5040
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

literal 0
HcmV?d00001

diff --git a/src/ttf/table/cmap.js b/src/ttf/table/cmap.js
index f8ba54c..3d8adf8 100644
--- a/src/ttf/table/cmap.js
+++ b/src/ttf/table/cmap.js
@@ -26,7 +26,18 @@ define(
             var i;
 
             // 双字节编码，非紧凑排列
-            if(subTable.format == 4) {
+            if (subTable.format == 0) {
+                var format4 = subTable;
+                // 跳过format字段
+                format4.length = reader.readUint16();
+                format4.language = reader.readUint16();
+                var glyphIdArray = [];
+                for (var i = 0, l = format4.length - 6; i < l; i++) {
+                    glyphIdArray.push(reader.readUint8());
+                }
+                format4.glyphIdArray = glyphIdArray;
+            }
+            else if(subTable.format == 4) {
                 var format4 = subTable;
                 // 跳过format字段
                 format4.length = reader.readUint16();
diff --git a/src/ttf/table/glyfwriter.js b/src/ttf/table/glyfwriter.js
index 6b4f73f..4e1b94a 100644
--- a/src/ttf/table/glyfwriter.js
+++ b/src/ttf/table/glyfwriter.js
@@ -50,14 +50,15 @@ define(
          * @return {number} 大小
          */
         function sizeofCompound(glyf) {
-            var size = 10;
+            var size = 10, t;
             glyf.glyfs.forEach(function(g) {
+                t = g.transform;
                 // flags + glyfIndex
                 size += 4;
 
                 // a, b, c, d, e
                 // xy values or points
-                if(g.e >= -0xFF && g.e <= 0xFF && g.f >= 0xFF && g.f <= 0xFF) {
+                if(t.e >= -0xFF && t.e <= 0xFF && t.f >= 0xFF && t.f <= 0xFF) {
                     size += 2;
                 }
                 else {
@@ -65,12 +66,12 @@ define(
                 }
 
                 // scale
-                if (g.a != 1 || g.d != 1) {
-                    size += g.a == g.d ? 2 : 4;
+                if (t.a != 1 || t.d != 1) {
+                    size += t.a == t.d ? 2 : 4;
                 }
 
                 // 01 , 10
-                if (g.b || g.c) {
+                if (t.b || t.c) {
                     size += 4;
                 }
             });
@@ -230,7 +231,7 @@ define(
                     }
 
                     // header
-                    writer.writeUint16(glyf.compound ? -1 : glyf.contours.length);
+                    writer.writeInt16(glyf.compound ? -1 : glyf.contours.length);
                     writer.writeInt16(glyf.xMin);
                     writer.writeInt16(glyf.yMin);
                     writer.writeInt16(glyf.xMax);
@@ -239,9 +240,10 @@ define(
                     // 复合图元
                     if (glyf.compound) {
                         
-                        for (var i = 0, l = glyf.glyfs; i < l; i++) {
+                        for (var i = 0, l = glyf.glyfs.length; i < l; i++) {
 
-                            var flags = componentFlag.ARGS_ARE_XY_VALUES; // xy values
+                            var flags = componentFlag.ARGS_ARE_XY_VALUES
+                                + componentFlag.ROUND_XY_TO_GRID; // xy values
 
                             // more components
                             if (i < l - 1) {
@@ -257,15 +259,16 @@ define(
                             // overlap compound
                             flags += g.overlapCompound ? componentFlag.OVERLAP_COMPOUND : 0;
 
-                            var a = g.a;
-                            var b = g.b;
-                            var c = g.c;
-                            var d = g.d;
-                            var e = g.e;
-                            var f = g.f;
+                            var transform = g.transform;
+                            var a = transform.a;
+                            var b = transform.b;
+                            var c = transform.c;
+                            var d = transform.d;
+                            var e = transform.e;
+                            var f = transform.f;
 
                             // xy values or points
-                            if(e < -0xFF || e > 0xFF || f < 0xFF || f > 0xFF) {
+                            if(e < -0xFF || e > 0xFF || f < -0xFF || f > 0xFF) {
                                 flags += componentFlag.ARG_1_AND_2_ARE_WORDS;
                             }
 
@@ -281,7 +284,8 @@ define(
                                 }
                             }
 
-                            writer.writeUint16(e);
+                            writer.writeUint16(flags);
+                            writer.writeUint16(g.glyphIndex);
 
                             if (componentFlag.ARG_1_AND_2_ARE_WORDS & flags) {
                                 writer.writeInt16(e);
@@ -404,6 +408,7 @@ define(
 
                 // 设置其他表的信息
                 var xMin = 16384, yMin = 16384, xMax = -16384, yMax = -16384;
+
                 ttf.glyf.forEach(function(glyf) {
                     if (glyf.xMin < xMin) {
                         xMin = glyf.xMin;
diff --git a/src/ttf/ttfwriter.js b/src/ttf/ttfwriter.js
index ed6c91b..f7456a4 100644
--- a/src/ttf/ttfwriter.js
+++ b/src/ttf/ttfwriter.js
@@ -79,7 +79,7 @@ define(
             glyfTbl.offset = 0;
             ttf.glyfReaded = glyfTbl.read(glyfReader, ttf);
 
-            console.log(ttf.glyfReaded);
+            //console.log(ttf.glyfReaded);
 
             // var ttfSize = 20 + tableList.length * 16;
             // ttf.tables = [];