From 538894f115180831131942e0b3fe232a7f20b86b Mon Sep 17 00:00:00 2001
From: vyv03354 <VYV03354@nifty.ne.jp>
Date: Mon, 18 Mar 2013 22:06:29 +0900
Subject: [PATCH] Always separate the last segment of the format 4 'cmap'
 subtable

---
 src/fonts.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index 5489cee0d..f2c75bb6f 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -2647,8 +2647,8 @@ var Font = (function FontClosure() {
     }
     var bmpLength = i + 1;
 
-    var trailingRangesCount = ranges[bmpLength - 1][1] < 0xFFFF ? 1 : 0;
-    var segCount = bmpLength + trailingRangesCount;
+    if (ranges[i][1] === 0xFFFF) { ranges[i][1] = 0xFFFE; }
+    var segCount = bmpLength + 1;
     var segCount2 = segCount * 2;
     var searchRange = getMaxPower2(segCount) * 2;
     var searchEntry = Math.log(segCount) / Math.log(2);
@@ -2693,12 +2693,10 @@ var Font = (function FontClosure() {
       }
     }
 
-    if (trailingRangesCount > 0) {
-      endCount += '\xFF\xFF';
-      startCount += '\xFF\xFF';
-      idDeltas += '\x00\x01';
-      idRangeOffsets += '\x00\x00';
-    }
+    endCount += '\xFF\xFF';
+    startCount += '\xFF\xFF';
+    idDeltas += '\x00\x01';
+    idRangeOffsets += '\x00\x00';
 
     var format314 = '\x00\x00' + // language
                     string16(segCount2) +