@loaders.gl/excel 4.0.0-alpha.5 → 4.0.0-alpha.7

package/dist/dist.min.js

@@ -68,7 +68,7 @@
   // ../../node_modules/xlsx/dist/cpexcel.js
   var require_cpexcel = __commonJS({
     "../../node_modules/xlsx/dist/cpexcel.js"(exports, module) {
-      var cptable2 = { version: "1.14.0" };
+      var cptable2 = { version: "1.15.0" };
       cptable2[437] = function() {
         var d = "\0
\x07\b	\n\v\f\r !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7F\xC7\xFC\xE9\xE2\xE4\xE0\xE5\xE7\xEA\xEB\xE8\xEF\xEE\xEC\xC4\xC5\xC9\xE6\xC6\xF4\xF6\xF2\xFB\xF9\xFF\xD6\xDC\xA2\xA3\xA5\u20A7\u0192\xE1\xED\xF3\xFA\xF1\xD1\xAA\xBA\xBF\u2310\xAC\xBD\xBC\xA1\xAB\xBB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\xDF\u0393\u03C0\u03A3\u03C3\xB5\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u03C6\u03B5\u2229\u2261\xB1\u2265\u2264\u2320\u2321\xF7\u2248\xB0\u2219\xB7\u221A\u207F\xB2\u25A0\xA0", D = [], e = {};
         for (var i = 0; i != d.length; ++i) {
@@ -3131,6 +3131,15 @@
         }
         return { "enc": e, "dec": D };
       }();
+      cptable2[28591] = function() {
+        var d = "\0
\x07\b	\n\v\f\r !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF", D = [], e = {};
+        for (var i = 0; i != d.length; ++i) {
+          if (d.charCodeAt(i) !== 65533)
+            e[d.charAt(i)] = i;
+          D[i] = d.charAt(i);
+        }
+        return { "enc": e, "dec": D };
+      }();
       if (typeof module !== "undefined" && module.exports && typeof DO_NOT_EXPORT_CODEPAGE === "undefined")
         module.exports = cptable2;
       (function(root, factory) {
@@ -3894,7 +3903,7 @@
           module.exports = e();
         else if (typeof define == "function" && define.amd && typeof DO_NOT_EXPORT_JSZIP == "undefined") {
           JSZipSync = e();
-          define([], e);
+          define("j", [], e);
         } else {
           var f;
           typeof globalThis != "undefined" ? f = globalThis : typeof window != "undefined" ? f = window : typeof global != "undefined" ? f = global : typeof $ != "undefined" && $.global ? f = $.global : typeof self != "undefined" && (f = self), f.JSZipSync = e();
@@ -9544,7 +9553,7 @@
     "../../node_modules/xlsx/xlsx.js"(exports, module) {
       var XLSX = {};
       function make_xlsx_lib(XLSX2) {
-        XLSX2.version = "0.17.0";
+        XLSX2.version = "0.17.5";
         var current_codepage = 1200, current_ansi = 1252;
         if (typeof module !== "undefined" && typeof __require !== "undefined") {
           if (typeof cptable === "undefined") {
@@ -11705,7 +11714,8 @@
                   break;
                 fat_addrs.push(q2);
               }
-              sleuth_fat(__readInt32LE(sector, ssz - 4), cnt - 1, sectors, ssz, fat_addrs);
+              if (cnt >= 1)
+                sleuth_fat(__readInt32LE(sector, ssz - 4), cnt - 1, sectors, ssz, fat_addrs);
             }
           }
           function get_sector_list(sectors, start, fat_addrs, ssz, chkd) {
@@ -13059,8 +13069,10 @@
         }
         function fuzzynum(s) {
           var v = Number(s);
-          if (!isNaN(v))
+          if (isFinite(v))
             return v;
+          if (!isNaN(v))
+            return NaN;
           if (!/\d/.test(s))
             return v;
           var wt = 1;
@@ -13141,11 +13153,11 @@
         }
         function safegetzipfile(zip, file) {
           var k = zip.FullPaths || keys(zip.files);
-          var f = file.toLowerCase(), g = f.replace(/\//g, "\\");
+          var f = file.toLowerCase().replace(/[\/]/g, "\\"), g = f.replace(/\\/g, "/");
           for (var i2 = 0; i2 < k.length; ++i2) {
-            var n = k[i2].toLowerCase();
+            var n = k[i2].replace(/^Root Entry[\/]/, "").toLowerCase();
             if (f == n || g == n)
-              return zip.files[k[i2]];
+              return zip.files ? zip.files[k[i2]] : zip.FileIndex[i2];
           }
           return null;
         }
@@ -14070,7 +14082,7 @@
             for (cntbyte = 1; cntbyte < 4 && tmpbyte & 128; ++cntbyte)
               length += ((tmpbyte = data.read_shift(1)) & 127) << 7 * cntbyte;
             tgt = data.l + length;
-            var d = (R.f || parsenoop)(data, length, opts);
+            var d = R.f && R.f(data, length, opts);
             data.l = tgt;
             if (cb(d, R.n, RT))
               return;
@@ -14331,11 +14343,12 @@
             idx = 10 * idx + cc;
           }
           o.s.r = --idx;
-          if (i2 === len || range.charCodeAt(++i2) === 58) {
+          if (i2 === len || cc != 10) {
             o.e.c = o.s.c;
             o.e.r = o.s.r;
             return o;
           }
+          ++i2;
           for (idx = 0; i2 != len; ++i2) {
             if ((cc = range.charCodeAt(i2) - 64) < 1 || cc > 26)
               break;
@@ -14370,6 +14383,8 @@
             return cell.w;
           if (cell.t == "d" && !cell.z && o && o.dateNF)
             cell.z = o.dateNF;
+          if (cell.t == "e")
+            return BErr[cell.v] || cell.v;
           if (v == void 0)
             return safe_format_cell(cell, cell.v);
           return safe_format_cell(cell, v);
@@ -14436,7 +14451,10 @@
                 if (cell.v === null) {
                   if (cell.f)
                     cell.t = "n";
-                  else if (!o.sheetStubs)
+                  else if (o.nullError) {
+                    cell.t = "e";
+                    cell.v = 0;
+                  } else if (!o.sheetStubs)
                     continue;
                   else
                     cell.t = "z";
@@ -14563,6 +14581,19 @@
           o.write_shift(1, 0);
           return o;
         }
+        function parse_XLSBShortCell(data) {
+          var iStyleRef = data.read_shift(2);
+          iStyleRef += data.read_shift(1) << 16;
+          data.l++;
+          return { c: -1, iStyleRef };
+        }
+        function write_XLSBShortCell(cell, o) {
+          if (o == null)
+            o = new_buf(4);
+          o.write_shift(3, cell.iStyleRef || cell.s);
+          o.write_shift(1, 0);
+          return o;
+        }
         var parse_XLSBCodeName = parse_XLWideString;
         var write_XLSBCodeName = write_XLWideString;
         function parse_XLNullableWideString(data) {
@@ -14786,7 +14817,10 @@
           27: { n: "ContentStatus", t: VT_STRING },
           28: { n: "Language", t: VT_STRING },
           29: { n: "Version", t: VT_STRING },
-          255: {}
+          255: {},
+          2147483648: { n: "Locale", t: VT_UI4 },
+          2147483651: { n: "Behavior", t: VT_UI4 },
+          1919054434: {}
         };
         var SummaryPIDSI = {
           1: { n: "CodePage", t: VT_I2 },
@@ -14808,18 +14842,11 @@
           17: { n: "Thumbnail", t: VT_CF },
           18: { n: "Application", t: VT_STRING },
           19: { n: "DocSecurity", t: VT_I4 },
-          255: {}
-        };
-        var SpecialProperties = {
+          255: {},
           2147483648: { n: "Locale", t: VT_UI4 },
           2147483651: { n: "Behavior", t: VT_UI4 },
           1919054434: {}
         };
-        (function() {
-          for (var y in SpecialProperties)
-            if (Object.prototype.hasOwnProperty.call(SpecialProperties, y))
-              DocSummaryPIDDSI[y] = SummaryPIDSI[y] = SpecialProperties[y];
-        })();
         var DocSummaryRE = evert_key(DocSummaryPIDDSI, "n");
         var SummaryRE = evert_key(SummaryPIDSI, "n");
         var CountryEnum = {
@@ -15276,7 +15303,8 @@
               rel.Type = y.Type;
               rel.Target = y.Target;
               rel.Id = y.Id;
-              rel.TargetMode = y.TargetMode;
+              if (y.TargetMode)
+                rel.TargetMode = y.TargetMode;
               var canonictarget = y.TargetMode === "External" ? y.Target : resolve_path(y.Target, currentFilePath);
               rels[canonictarget] = rel;
               hash[y.Id] = rel;
@@ -15381,7 +15409,7 @@
           return o.join("");
         }
         var write_meta_ods = function() {
-          var payload = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xlink="http://www.w3.org/1999/xlink" office:version="1.2"><office:meta><meta:generator>SheetJS ' + XLSX2.version + "</meta:generator></office:meta></office:document-meta>";
+          var payload = '<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xlink="http://www.w3.org/1999/xlink" office:version="1.2"><office:meta><meta:generator>SheetJS ' + XLSX2.version + "</meta:generator></office:meta></office:document-meta>";
           return function wmo() {
             return payload;
           };
@@ -15849,6 +15877,17 @@
             throw new Error("VtUnalignedString must have positive length");
           return parse_VtStringBase(blob, t, 0);
         }
+        function parse_VtVecLpwstrValue(blob) {
+          var length = blob.read_shift(4);
+          var ret = [];
+          for (var i2 = 0; i2 != length; ++i2) {
+            var start = blob.l;
+            ret[i2] = blob.read_shift(0, "lpwstr").replace(chr0, "");
+            if (blob.l - start & 2)
+              blob.l += 2;
+          }
+          return ret;
+        }
         function parse_VtVecUnalignedLpstrValue(blob) {
           var length = blob.read_shift(4);
           var ret = [];
@@ -15856,24 +15895,21 @@
             ret[i2] = blob.read_shift(0, "lpstr-cp").replace(chr0, "");
           return ret;
         }
-        function parse_VtVecUnalignedLpstr(blob) {
-          return parse_VtVecUnalignedLpstrValue(blob);
-        }
         function parse_VtHeadingPair(blob) {
+          var start = blob.l;
           var headingString = parse_TypedPropertyValue(blob, VT_USTR);
+          if (blob[blob.l] == 0 && blob[blob.l + 1] == 0 && blob.l - start & 2)
+            blob.l += 2;
           var headerParts = parse_TypedPropertyValue(blob, VT_I4);
           return [headingString, headerParts];
         }
         function parse_VtVecHeadingPairValue(blob) {
           var cElements = blob.read_shift(4);
           var out = [];
-          for (var i2 = 0; i2 != cElements / 2; ++i2)
+          for (var i2 = 0; i2 < cElements / 2; ++i2)
             out.push(parse_VtHeadingPair(blob));
           return out;
         }
-        function parse_VtVecHeadingPair(blob) {
-          return parse_VtVecHeadingPairValue(blob);
-        }
         function parse_dictionary(blob, CodePage) {
           var cnt = blob.read_shift(4);
           var dict = {};
@@ -15906,7 +15942,7 @@
           var t = blob.read_shift(2), ret, opts = _opts || {};
           blob.l += 2;
           if (type !== VT_VARIANT) {
-            if (t !== type && VT_CUSTOM.indexOf(type) === -1)
+            if (t !== type && VT_CUSTOM.indexOf(type) === -1 && !((type & 65534) == 4126 && (t & 65534) == 4126))
               throw new Error("Expected type " + type + " saw " + t);
           }
           switch (type === VT_VARIANT ? t : type) {
@@ -15938,9 +15974,10 @@
             case 81:
               return parse_VtUnalignedString(blob, t).replace(chr0, "");
             case 4108:
-              return parse_VtVecHeadingPair(blob);
+              return parse_VtVecHeadingPairValue(blob);
             case 4126:
-              return parse_VtVecUnalignedLpstr(blob);
+            case 4127:
+              return t == 4127 ? parse_VtVecLpwstrValue(blob) : parse_VtVecUnalignedLpstrValue(blob);
             default:
               throw new Error("TypedPropertyValue unrecognized type " + type + " " + t);
           }
@@ -16316,7 +16353,7 @@
         function write_Bes(v, t, o) {
           if (!o)
             o = new_buf(2);
-          o.write_shift(1, +v);
+          o.write_shift(1, t == "e" ? +v : +!!v);
           o.write_shift(1, t == "e" ? 1 : 0);
           return o;
         }
@@ -16442,19 +16479,22 @@
           return url;
         }
         function parse_FileMoniker(blob) {
-          blob.l += 2;
+          var cAnti = blob.read_shift(2);
+          var preamble = "";
+          while (cAnti-- > 0)
+            preamble += "../";
           var ansiPath = blob.read_shift(0, "lpstr-ansi");
           blob.l += 2;
           if (blob.read_shift(2) != 57005)
             throw new Error("Bad FileMoniker");
           var sz = blob.read_shift(4);
           if (sz === 0)
-            return ansiPath.replace(/\\/g, "/");
+            return preamble + ansiPath.replace(/\\/g, "/");
           var bytes = blob.read_shift(4);
           if (blob.read_shift(2) != 3)
             throw new Error("Bad FileMoniker");
           var unicodePath = blob.read_shift(bytes >> 1, "utf16le").replace(chr0, "");
-          return unicodePath;
+          return preamble + unicodePath;
         }
         function parse_HyperlinkMoniker(blob, length) {
           var clsid = blob.read_shift(16);
@@ -16473,6 +16513,15 @@
           var o = len > 0 ? blob.read_shift(len, "utf16le").replace(chr0, "") : "";
           return o;
         }
+        function write_HyperlinkString(str, o) {
+          if (!o)
+            o = new_buf(6 + str.length * 2);
+          o.write_shift(4, 1 + str.length);
+          for (var i2 = 0; i2 < str.length; ++i2)
+            o.write_shift(2, str.charCodeAt(i2));
+          o.write_shift(2, 0);
+          return o;
+        }
         function parse_Hyperlink(blob, length) {
           var end = blob.l + length;
           var sVer = blob.read_shift(4);
@@ -16501,6 +16550,8 @@
             target += "#" + Loc;
           if (!target)
             target = "#" + Loc;
+          if (flags & 2 && target.charAt(0) == "/" && target.charAt(1) != "/")
+            target = "file://" + target;
           var out = { Target: target };
           if (guid)
             out.guid = guid;
@@ -16513,7 +16564,10 @@
         function write_Hyperlink(hl) {
           var out = new_buf(512), i2 = 0;
           var Target = hl.Target;
-          var F = Target.indexOf("#") > -1 ? 31 : 23;
+          if (Target.slice(0, 7) == "file://")
+            Target = Target.slice(7);
+          var hashidx = Target.indexOf("#");
+          var F = hashidx > -1 ? 31 : 23;
           switch (Target.charAt(0)) {
             case "#":
               F = 28;
@@ -16529,18 +16583,18 @@
             out.write_shift(4, data[i2]);
           if (F == 28) {
             Target = Target.slice(1);
-            out.write_shift(4, Target.length + 1);
-            for (i2 = 0; i2 < Target.length; ++i2)
-              out.write_shift(2, Target.charCodeAt(i2));
-            out.write_shift(2, 0);
+            write_HyperlinkString(Target, out);
           } else if (F & 2) {
             data = "e0 c9 ea 79 f9 ba ce 11 8c 82 00 aa 00 4b a9 0b".split(" ");
             for (i2 = 0; i2 < data.length; ++i2)
               out.write_shift(1, parseInt(data[i2], 16));
-            out.write_shift(4, 2 * (Target.length + 1));
-            for (i2 = 0; i2 < Target.length; ++i2)
-              out.write_shift(2, Target.charCodeAt(i2));
+            var Pretarget = hashidx > -1 ? Target.slice(0, hashidx) : Target;
+            out.write_shift(4, 2 * (Pretarget.length + 1));
+            for (i2 = 0; i2 < Pretarget.length; ++i2)
+              out.write_shift(2, Pretarget.charCodeAt(i2));
             out.write_shift(2, 0);
+            if (F & 8)
+              write_HyperlinkString(hashidx > -1 ? Target.slice(hashidx + 1) : "", out);
           } else {
             data = "03 03 00 00 00 00 00 00 c0 00 00 00 00 00 00 46".split(" ");
             for (i2 = 0; i2 < data.length; ++i2)
@@ -16549,9 +16603,9 @@
             while (Target.slice(P * 3, P * 3 + 3) == "../" || Target.slice(P * 3, P * 3 + 3) == "..\\")
               ++P;
             out.write_shift(2, P);
-            out.write_shift(4, Target.length + 1);
-            for (i2 = 0; i2 < Target.length; ++i2)
-              out.write_shift(1, Target.charCodeAt(i2) & 255);
+            out.write_shift(4, Target.length - 3 * P + 1);
+            for (i2 = 0; i2 < Target.length - 3 * P; ++i2)
+              out.write_shift(1, Target.charCodeAt(i2 + 3 * P) & 255);
             out.write_shift(1, 0);
             out.write_shift(2, 65535);
             out.write_shift(2, 57005);
@@ -16798,7 +16852,7 @@
         }
         function parse_WsBool(blob, length, opts) {
           var flags = opts && opts.biff == 8 || length == 2 ? blob.read_shift(2) : (blob.l += length, 0);
-          return { fDialog: flags & 16 };
+          return { fDialog: flags & 16, fBelow: flags & 64, fRight: flags & 128 };
         }
         function parse_BoundSheet8(blob, length, opts) {
           var pos = blob.read_shift(4);
@@ -17001,6 +17055,8 @@
           return o;
         }
         function parse_Label(blob, length, opts) {
+          if (opts.biffguess && opts.biff == 2)
+            opts.biff = 5;
           var target = blob.l + length;
           var cell = parse_XLSCell(blob, 6);
           if (opts.biff == 2)
@@ -17147,7 +17203,10 @@
             o.write_shift(2, data.numFmtId || 0);
             o.write_shift(2, ixfeP << 4);
           }
-          o.write_shift(4, 0);
+          var f = 0;
+          if (data.numFmtId > 0 && b5)
+            f |= 1024;
+          o.write_shift(4, f);
           o.write_shift(4, 0);
           if (!b5)
             o.write_shift(4, 0);
@@ -17174,7 +17233,7 @@
         }
         function parse_BoolErr(blob, length, opts) {
           var cell = parse_XLSCell(blob, 6);
-          if (opts.biff == 2)
+          if (opts.biff == 2 || length == 9)
             ++blob.l;
           var val = parse_Bes(blob, 2);
           cell.val = val;
@@ -17187,7 +17246,9 @@
           write_Bes(v, t, o);
           return o;
         }
-        function parse_Number(blob) {
+        function parse_Number(blob, length, opts) {
+          if (opts.biffguess && opts.biff == 2)
+            opts.biff = 5;
           var cell = parse_XLSCell(blob, 6);
           var xnum = parse_Xnum(blob, 8);
           cell.val = xnum;
@@ -17532,6 +17593,21 @@
             o.level = flags >> 8 & 7;
           return o;
         }
+        function write_ColInfo(col, idx) {
+          var o = new_buf(12);
+          o.write_shift(2, idx);
+          o.write_shift(2, idx);
+          o.write_shift(2, col.width * 256);
+          o.write_shift(2, 0);
+          var f = 0;
+          if (col.hidden)
+            f |= 1;
+          o.write_shift(1, f);
+          f = col.level || 0;
+          o.write_shift(1, f);
+          o.write_shift(2, 0);
+          return o;
+        }
         function parse_Setup(blob, length) {
           var o = {};
           if (length < 32)
@@ -17572,6 +17648,8 @@
           return o;
         }
         function parse_BIFF2STR(blob, length, opts) {
+          if (opts.biffguess && opts.biff == 5)
+            opts.biff = 2;
           var cell = parse_XLSCell(blob, 6);
           ++blob.l;
           var str = parse_XLUnicodeString2(blob, length - 7, opts);
@@ -17698,6 +17776,11 @@
             87: 1252,
             88: 1252,
             89: 1252,
+            108: 863,
+            134: 737,
+            135: 852,
+            136: 857,
+            204: 1257,
             255: 16969
           };
           var dbf_reverse_map = evert({
@@ -17747,10 +17830,11 @@
             }
             prep_blob(d, 0);
             var ft = d.read_shift(1);
-            var memo = false;
+            var memo = !!(ft & 136);
             var vfp = false, l7 = false;
             switch (ft) {
               case 2:
+                break;
               case 3:
                 break;
               case 48:
@@ -17759,24 +17843,21 @@
                 break;
               case 49:
                 vfp = true;
+                memo = true;
                 break;
               case 131:
-                memo = true;
                 break;
               case 139:
-                memo = true;
                 break;
               case 140:
-                memo = true;
                 l7 = true;
                 break;
               case 245:
-                memo = true;
                 break;
               default:
                 throw new Error("DBF Unsupported Version: " + ft.toString(16));
             }
-            var nrow = 0, fpos = 0;
+            var nrow = 0, fpos = 521;
             if (ft == 2)
               nrow = d.read_shift(2);
             d.l += 3;
@@ -17787,7 +17868,7 @@
             if (ft != 2)
               fpos = d.read_shift(2);
             var rlen = d.read_shift(2);
-            var current_cp = 1252;
+            var current_cp = opts.codepage || 1252;
             if (ft != 2) {
               d.l += 16;
               d.read_shift(1);
@@ -17799,8 +17880,9 @@
             if (l7)
               d.l += 36;
             var fields = [], field = {};
-            var hend = fpos - 10 - (vfp ? 264 : 0), ww = l7 ? 32 : 11;
-            while (ft == 2 ? d.l < d.length && d[d.l] != 13 : d.l < hend) {
+            var hend = Math.min(d.length, ft == 2 ? 521 : fpos - 10 - (vfp ? 264 : 0));
+            var ww = l7 ? 32 : 11;
+            while (d.l < hend && d[d.l] != 13) {
               field = {};
               field.name = cptable.utils.decode(current_cp, d.slice(d.l, d.l + ww)).replace(/[\u0000\r\n].*$/g, "");
               d.l += ww;
@@ -17825,6 +17907,9 @@
                   if (opts.WTF)
                     console.log("Skipping " + field.name + ":" + field.type);
                   break;
+                case "+":
+                case "0":
+                case "@":
                 case "C":
                 case "D":
                 case "F":
@@ -17835,9 +17920,6 @@
                 case "O":
                 case "T":
                 case "Y":
-                case "0":
-                case "@":
-                case "+":
                   break;
                 default:
                   throw new Error("Unknown Field Type: " + field.type);
@@ -17845,13 +17927,9 @@
             }
             if (d[d.l] !== 13)
               d.l = fpos - 1;
-            else if (ft == 2)
-              d.l = 521;
-            if (ft != 2) {
-              if (d.read_shift(1) !== 13)
-                throw new Error("DBF Terminator not found " + d.l + " " + d[d.l]);
-              d.l = fpos;
-            }
+            if (d.read_shift(1) !== 13)
+              throw new Error("DBF Terminator not found " + d.l + " " + d[d.l]);
+            d.l = fpos;
             var R = 0, C = 0;
             out[0] = [];
             for (C = 0; C != fields.length; ++C)
@@ -17871,8 +17949,8 @@
                 var s = cptable.utils.decode(current_cp, dd);
                 switch (fields[C].type) {
                   case "C":
-                    out[R][C] = cptable.utils.decode(current_cp, dd);
-                    out[R][C] = out[R][C].trim();
+                    if (s.trim().length)
+                      out[R][C] = s.replace(/\s+$/, "");
                     break;
                   case "D":
                     if (s.length === 8)
@@ -17888,7 +17966,7 @@
                     out[R][C] = l7 ? dd.read_shift(-4, "i") ^ 2147483648 : dd.read_shift(4, "i");
                     break;
                   case "L":
-                    switch (s.toUpperCase()) {
+                    switch (s.trim().toUpperCase()) {
                       case "Y":
                       case "T":
                         out[R][C] = true;
@@ -17897,9 +17975,8 @@
                       case "F":
                         out[R][C] = false;
                         break;
-                      case " ":
+                      case "":
                       case "?":
-                        out[R][C] = false;
                         break;
                       default:
                         throw new Error("DBF Unrecognized L:|" + s + "|");
@@ -17911,7 +17988,9 @@
                     out[R][C] = "##MEMO##" + (l7 ? parseInt(s.trim(), 10) : dd.read_shift(4));
                     break;
                   case "N":
-                    out[R][C] = +s.replace(/\u0000/g, "").trim();
+                    s = s.replace(/\u0000/g, "").trim();
+                    if (s && s != ".")
+                      out[R][C] = +s || 0;
                     break;
                   case "@":
                     out[R][C] = new Date(dd.read_shift(-8, "f") - 621356832e5);
@@ -18159,7 +18238,7 @@
             S: 169,
             c: 170,
             R: 174,
-            B: 180,
+            "B ": 180,
             0: 176,
             1: 177,
             2: 178,
@@ -18206,7 +18285,7 @@
               case "binary":
                 return sylk_to_aoa_str(d, opts);
               case "buffer":
-                return sylk_to_aoa_str(d.toString("binary"), opts);
+                return sylk_to_aoa_str(has_buf && Buffer.isBuffer(d) ? d.toString("binary") : a2s(d), opts);
               case "array":
                 return sylk_to_aoa_str(cc2str(d), opts);
             }
@@ -18237,14 +18316,18 @@
                     break;
                   case "O":
                     break;
+                  case "W":
+                    break;
                   case "P":
                     if (record[1].charAt(0) == "P")
                       formats.push(rstr.slice(3).replace(/;;/g, ";"));
                     break;
                   case "C":
-                    var C_seen_K = false, C_seen_X = false;
+                    var C_seen_K = false, C_seen_X = false, C_seen_S = false, C_seen_E = false, _R = -1, _C = -1;
                     for (rj = 1; rj < record.length; ++rj)
                       switch (record[rj].charAt(0)) {
+                        case "A":
+                          break;
                         case "X":
                           C = parseInt(record[rj].slice(1)) - 1;
                           C_seen_X = true;
@@ -18276,17 +18359,41 @@
                           C_seen_K = true;
                           break;
                         case "E":
+                          C_seen_E = true;
                           var formula = rc_to_a1(record[rj].slice(1), { r: R, c: C });
                           arr[R][C] = [arr[R][C], formula];
                           break;
+                        case "S":
+                          C_seen_S = true;
+                          arr[R][C] = [arr[R][C], "S5S"];
+                          break;
+                        case "G":
+                          break;
+                        case "R":
+                          _R = parseInt(record[rj].slice(1)) - 1;
+                          break;
+                        case "C":
+                          _C = parseInt(record[rj].slice(1)) - 1;
+                          break;
                         default:
                           if (opts && opts.WTF)
                             throw new Error("SYLK bad record " + rstr);
                       }
                     if (C_seen_K) {
-                      arr[R][C] = val;
+                      if (arr[R][C] && arr[R][C].length == 2)
+                        arr[R][C][0] = val;
+                      else
+                        arr[R][C] = val;
                       next_cell_format = null;
                     }
+                    if (C_seen_S) {
+                      if (C_seen_E)
+                        throw new Error("SYLK shared formula cannot have own formula");
+                      var shrbase = _R > -1 && arr[_R][_C];
+                      if (!shrbase || !shrbase[1])
+                        throw new Error("SYLK shared formula cannot find base");
+                      arr[R][C][1] = shift_formula_str(shrbase[1], { r: R - _R, c: C - _C });
+                    }
                     break;
                   case "F":
                     var F_seen = 0;
@@ -18401,9 +18508,9 @@
               if (col.hidden)
                 rec += "0";
               else {
-                if (typeof col.width == "number")
+                if (typeof col.width == "number" && !col.wpx)
                   col.wpx = width2px(col.width);
-                if (typeof col.wpx == "number")
+                if (typeof col.wpx == "number" && !col.wch)
                   col.wch = px2char(col.wpx);
                 if (typeof col.wch == "number")
                   rec += Math.round(col.wch);
@@ -18462,7 +18569,7 @@
               case "binary":
                 return dif_to_aoa_str(d, opts);
               case "buffer":
-                return dif_to_aoa_str(d.toString("binary"), opts);
+                return dif_to_aoa_str(has_buf && Buffer.isBuffer(d) ? d.toString("binary") : a2s(d), opts);
               case "array":
                 return dif_to_aoa_str(cc2str(d), opts);
             }
@@ -18481,7 +18588,10 @@
               var metadata = records[ri].trim().split(",");
               var type = metadata[0], value = metadata[1];
               ++ri;
-              var data = records[ri].trim();
+              var data = records[ri] || "";
+              while ((data.match(/["]/g) || []).length & 1 && ri < records.length - 1)
+                data += "\n" + records[++ri];
+              data = data.trim();
               switch (+type) {
                 case -1:
                   if (data === "BOT") {
@@ -18506,6 +18616,9 @@
                   break;
                 case 1:
                   data = data.slice(1, data.length - 1);
+                  data = data.replace(/""/g, '"');
+                  if (DIF_XL && data && data.match(/^=".*"$/))
+                    data = data.slice(2, -1);
                   arr[R][C++] = data !== "" ? data : null;
                   break;
               }
@@ -18725,12 +18838,12 @@
           function set_text_arr(data, arr, R, C, o) {
             if (o.raw)
               arr[R][C] = data;
-            else if (data === "TRUE")
+            else if (data === "") {
+            } else if (data === "TRUE")
               arr[R][C] = true;
             else if (data === "FALSE")
               arr[R][C] = false;
-            else if (data === "") {
-            } else if (!isNaN(fuzzynum(data)))
+            else if (!isNaN(fuzzynum(data)))
               arr[R][C] = fuzzynum(data);
             else if (!isNaN(fuzzydate(data).getDate()))
               arr[R][C] = parseDate(data);
@@ -18770,12 +18883,14 @@
           var guess_seps = {
             44: ",",
             9: "	",
-            59: ";"
+            59: ";",
+            124: "|"
           };
           var guess_sep_weights = {
             44: 3,
             9: 2,
-            59: 1
+            59: 1,
+            124: 0
           };
           function guess_sep(str) {
             var cnt = {}, instr = false, end = 0, cc = 0;
@@ -18800,7 +18915,7 @@
             cc.sort(function(a, b) {
               return a[0] - b[0] || guess_sep_weights[a[1]] - guess_sep_weights[b[1]];
             });
-            return guess_seps[cc.pop()[1]];
+            return guess_seps[cc.pop()[1]] || 44;
           }
           function dsv_to_sheet_str(str, opts) {
             var o = opts || {};
@@ -18816,11 +18931,14 @@
               } else if (str.charCodeAt(5) == 13 || str.charCodeAt(5) == 10) {
                 sep = str.charAt(4);
                 str = str.slice(6);
-              }
-            } else
+              } else
+                sep = guess_sep(str.slice(0, 1024));
+            } else if (o && o.FS)
+              sep = o.FS;
+            else
               sep = guess_sep(str.slice(0, 1024));
             var R = 0, C = 0, v = 0;
-            var start = 0, end = 0, sepcc = sep.charCodeAt(0), instr = false, cc = 0;
+            var start = 0, end = 0, sepcc = sep.charCodeAt(0), instr = false, cc = 0, startcc = str.charCodeAt(0);
             str = str.replace(/\r\n/mg, "\n");
             var _re = o.dateNF != null ? dateNF_regex(o.dateNF) : null;
             function finish_cell() {
@@ -18888,6 +19006,7 @@
               } else
                 ws[encode_cell({ c: C, r: R })] = cell;
               start = end + 1;
+              startcc = str.charCodeAt(start);
               if (range.e.c < C)
                 range.e.c = C;
               if (range.e.r < R)
@@ -18905,7 +19024,8 @@
               for (; end < str.length; ++end)
                 switch (cc = str.charCodeAt(end)) {
                   case 34:
-                    instr = !instr;
+                    if (startcc === 34)
+                      instr = !instr;
                     break;
                   case sepcc:
                   case 10:
@@ -18924,6 +19044,8 @@
           function prn_to_sheet_str(str, opts) {
             if (!(opts && opts.PRN))
               return dsv_to_sheet_str(str, opts);
+            if (opts.FS)
+              return dsv_to_sheet_str(str, opts);
             if (str.slice(0, 4) == "sep=")
               return dsv_to_sheet_str(str, opts);
             if (str.indexOf("	") >= 0 || str.indexOf(",") >= 0 || str.indexOf(";") >= 0)
@@ -18945,7 +19067,7 @@
                 else if (opts.codepage && typeof cptable !== "undefined")
                   str = cptable.utils.decode(opts.codepage, d);
                 else
-                  str = d.toString("binary");
+                  str = has_buf && Buffer.isBuffer(d) ? d.toString("binary") : a2s(d);
                 break;
               case "array":
                 str = cc2str(d);
@@ -18958,8 +19080,10 @@
             }
             if (bytes[0] == 239 && bytes[1] == 187 && bytes[2] == 191)
               str = utf8read(str.slice(3));
+            else if (opts.type != "string" && opts.codepage == 65001)
+              str = utf8read(str);
             else if (opts.type == "binary" && typeof cptable !== "undefined" && opts.codepage)
-              str = cptable.utils.decode(opts.codepage, cptable.utils.encode(1252, str));
+              str = cptable.utils.decode(opts.codepage, cptable.utils.encode(28591, str));
             if (str.slice(0, 19) == "socialcalc:version:")
               return ETH.to_sheet(opts.type == "string" ? str : utf8read(str), opts);
             return prn_to_sheet_str(str, opts);
@@ -19017,12 +19141,12 @@
             var Enum = opts.Enum || WK1Enum;
             while (data.l < data.length) {
               var RT = data.read_shift(2);
-              var R = Enum[RT] || Enum[255];
+              var R = Enum[RT] || Enum[65535];
               var length = data.read_shift(2);
               var tgt = data.l + length;
-              var d = (R.f || parsenoop)(data, length, opts);
+              var d = R.f && R.f(data, length, opts);
               data.l = tgt;
-              if (cb(d, R.n, RT))
+              if (cb(d, R, RT))
                 return;
             }
           }
@@ -19044,22 +19168,19 @@
             var o = opts || {};
             if (DENSE != null && o.dense == null)
               o.dense = DENSE;
-            var s = o.dense ? [] : {}, n = "Sheet1", sidx = 0;
-            var sheets = {}, snames = [n];
+            var s = o.dense ? [] : {}, n = "Sheet1", next_n = "", sidx = 0;
+            var sheets = {}, snames = [], realnames = [];
             var refguess = { s: { r: 0, c: 0 }, e: { r: 0, c: 0 } };
             var sheetRows = o.sheetRows || 0;
-            if (d[2] == 2)
+            if (d[2] == 0) {
+              if (d[3] == 8 || d[3] == 9) {
+                if (d.length >= 16 && d[14] == 5 && d[15] === 108)
+                  throw new Error("Unsupported Works 3 for Mac file");
+              }
+            }
+            if (d[2] == 2) {
               o.Enum = WK1Enum;
-            else if (d[2] == 26)
-              o.Enum = WK3Enum;
-            else if (d[2] == 14) {
-              o.Enum = WK3Enum;
-              o.qpro = true;
-              d.l = 0;
-            } else
-              throw new Error("Unrecognized LOTUS BOF " + d[2]);
-            lotushopper(d, function(val, Rn, RT) {
-              if (d[2] == 2)
+              lotushopper(d, function(val, R, RT) {
                 switch (RT) {
                   case 0:
                     o.vers = val;
@@ -19069,13 +19190,20 @@
                   case 6:
                     refguess = val;
                     break;
+                  case 204:
+                    if (val)
+                      next_n = val;
+                    break;
+                  case 222:
+                    next_n = val;
+                    break;
                   case 15:
+                  case 51:
                     if (!o.qpro)
                       val[1].v = val[1].v.slice(1);
                   case 13:
                   case 14:
                   case 16:
-                  case 51:
                     if (RT == 14 && (val[2] & 112) == 112 && (val[2] & 15) > 1 && (val[2] & 15) < 15) {
                       val[1].z = o.dateNF || SSF._table[14];
                       if (o.cellDates) {
@@ -19083,6 +19211,28 @@
                         val[1].v = numdate(val[1].v);
                       }
                     }
+                    if (o.qpro) {
+                      if (val[3] > sidx) {
+                        s["!ref"] = encode_range(refguess);
+                        sheets[n] = s;
+                        snames.push(n);
+                        s = o.dense ? [] : {};
+                        refguess = { s: { r: 0, c: 0 }, e: { r: 0, c: 0 } };
+                        sidx = val[3];
+                        n = next_n || "Sheet" + (sidx + 1);
+                        next_n = "";
+                      }
+                    }
+                    var tmpcell = o.dense ? (s[val[0].r] || [])[val[0].c] : s[encode_cell(val[0])];
+                    if (tmpcell) {
+                      tmpcell.t = val[1].t;
+                      tmpcell.v = val[1].v;
+                      if (val[1].z != null)
+                        tmpcell.z = val[1].z;
+                      if (val[1].f != null)
+                        tmpcell.f = val[1].f;
+                      break;
+                    }
                     if (o.dense) {
                       if (!s[val[0].r])
                         s[val[0].r] = [];
@@ -19090,9 +19240,20 @@
                     } else
                       s[encode_cell(val[0])] = val[1];
                     break;
+                  default:
                 }
-              else
+              }, o);
+            } else if (d[2] == 26 || d[2] == 14) {
+              o.Enum = WK3Enum;
+              if (d[2] == 14) {
+                o.qpro = true;
+                d.l = 0;
+              }
+              lotushopper(d, function(val, R, RT) {
                 switch (RT) {
+                  case 204:
+                    n = val;
+                    break;
                   case 22:
                     val[1].v = val[1].v.slice(1);
                   case 23:
@@ -19104,11 +19265,11 @@
                     if (val[3] > sidx) {
                       s["!ref"] = encode_range(refguess);
                       sheets[n] = s;
+                      snames.push(n);
                       s = o.dense ? [] : {};
                       refguess = { s: { r: 0, c: 0 }, e: { r: 0, c: 0 } };
                       sidx = val[3];
                       n = "Sheet" + (sidx + 1);
-                      snames.push(n);
                     }
                     if (sheetRows > 0 && val[0].r >= sheetRows)
                       break;
@@ -19123,29 +19284,187 @@
                     if (refguess.e.r < val[0].r)
                       refguess.e.r = val[0].r;
                     break;
+                  case 27:
+                    if (val[14e3])
+                      realnames[val[14e3][0]] = val[14e3][1];
+                    break;
+                  case 1537:
+                    realnames[val[0]] = val[1];
+                    if (val[0] == sidx)
+                      n = val[1];
+                    break;
                   default:
                     break;
                 }
-            }, o);
+              }, o);
+            } else
+              throw new Error("Unrecognized LOTUS BOF " + d[2]);
             s["!ref"] = encode_range(refguess);
-            sheets[n] = s;
-            return { SheetNames: snames, Sheets: sheets };
+            sheets[next_n || n] = s;
+            snames.push(next_n || n);
+            if (!realnames.length)
+              return { SheetNames: snames, Sheets: sheets };
+            var osheets = {}, rnames = [];
+            for (var i2 = 0; i2 < realnames.length; ++i2)
+              if (sheets[snames[i2]]) {
+                rnames.push(realnames[i2] || snames[i2]);
+                osheets[realnames[i2]] = sheets[realnames[i2]] || sheets[snames[i2]];
+              } else {
+                rnames.push(realnames[i2]);
+                osheets[realnames[i2]] = { "!ref": "A1" };
+              }
+            return { SheetNames: rnames, Sheets: osheets };
           }
-          function parse_RANGE(blob) {
+          function sheet_to_wk1(ws, opts) {
+            var o = opts || {};
+            if (+o.codepage >= 0)
+              set_cp(+o.codepage);
+            if (o.type == "string")
+              throw new Error("Cannot write WK1 to JS string");
+            var ba = buf_array();
+            var range = safe_decode_range(ws["!ref"]);
+            var dense = Array.isArray(ws);
+            var cols = [];
+            write_biff_rec(ba, 0, write_BOF_WK1(1030));
+            write_biff_rec(ba, 6, write_RANGE(range));
+            var max_R = Math.min(range.e.r, 8191);
+            for (var R = range.s.r; R <= max_R; ++R) {
+              var rr = encode_row(R);
+              for (var C = range.s.c; C <= range.e.c; ++C) {
+                if (R === range.s.r)
+                  cols[C] = encode_col(C);
+                var ref = cols[C] + rr;
+                var cell = dense ? (ws[R] || [])[C] : ws[ref];
+                if (!cell || cell.t == "z")
+                  continue;
+                if (cell.t == "n") {
+                  if ((cell.v | 0) == cell.v && cell.v >= -32768 && cell.v <= 32767)
+                    write_biff_rec(ba, 13, write_INTEGER(R, C, cell.v));
+                  else
+                    write_biff_rec(ba, 14, write_NUMBER(R, C, cell.v));
+                } else {
+                  var str = format_cell(cell);
+                  write_biff_rec(ba, 15, write_LABEL(R, C, str.slice(0, 239)));
+                }
+              }
+            }
+            write_biff_rec(ba, 1);
+            return ba.end();
+          }
+          function book_to_wk3(wb, opts) {
+            var o = opts || {};
+            if (+o.codepage >= 0)
+              set_cp(+o.codepage);
+            if (o.type == "string")
+              throw new Error("Cannot write WK3 to JS string");
+            var ba = buf_array();
+            write_biff_rec(ba, 0, write_BOF_WK3(wb));
+            for (var i2 = 0, cnt = 0; i2 < wb.SheetNames.length; ++i2)
+              if ((wb.Sheets[wb.SheetNames[i2]] || {})["!ref"])
+                write_biff_rec(ba, 27, write_XFORMAT_SHEETNAME(wb.SheetNames[i2], cnt++));
+            var wsidx = 0;
+            for (i2 = 0; i2 < wb.SheetNames.length; ++i2) {
+              var ws = wb.Sheets[wb.SheetNames[i2]];
+              if (!ws || !ws["!ref"])
+                continue;
+              var range = safe_decode_range(ws["!ref"]);
+              var dense = Array.isArray(ws);
+              var cols = [];
+              var max_R = Math.min(range.e.r, 8191);
+              for (var R = range.s.r; R <= max_R; ++R) {
+                var rr = encode_row(R);
+                for (var C = range.s.c; C <= range.e.c; ++C) {
+                  if (R === range.s.r)
+                    cols[C] = encode_col(C);
+                  var ref = cols[C] + rr;
+                  var cell = dense ? (ws[R] || [])[C] : ws[ref];
+                  if (!cell || cell.t == "z")
+                    continue;
+                  if (cell.t == "n") {
+                    write_biff_rec(ba, 23, write_NUMBER_17(R, C, wsidx, cell.v));
+                  } else {
+                    var str = format_cell(cell);
+                    write_biff_rec(ba, 22, write_LABEL_16(R, C, wsidx, str.slice(0, 239)));
+                  }
+                }
+              }
+              ++wsidx;
+            }
+            write_biff_rec(ba, 1);
+            return ba.end();
+          }
+          function write_BOF_WK1(v) {
+            var out = new_buf(2);
+            out.write_shift(2, v);
+            return out;
+          }
+          function write_BOF_WK3(wb) {
+            var out = new_buf(26);
+            out.write_shift(2, 4096);
+            out.write_shift(2, 4);
+            out.write_shift(4, 0);
+            var rows = 0, cols = 0, wscnt = 0;
+            for (var i2 = 0; i2 < wb.SheetNames.length; ++i2) {
+              var name = wb.SheetNames[i2];
+              var ws = wb.Sheets[name];
+              if (!ws || !ws["!ref"])
+                continue;
+              ++wscnt;
+              var range = decode_range(ws["!ref"]);
+              if (rows < range.e.r)
+                rows = range.e.r;
+              if (cols < range.e.c)
+                cols = range.e.c;
+            }
+            if (rows > 8191)
+              rows = 8191;
+            out.write_shift(2, rows);
+            out.write_shift(1, wscnt);
+            out.write_shift(1, cols);
+            out.write_shift(2, 0);
+            out.write_shift(2, 0);
+            out.write_shift(1, 1);
+            out.write_shift(1, 2);
+            out.write_shift(4, 0);
+            out.write_shift(4, 0);
+            return out;
+          }
+          function parse_RANGE(blob, length, opts) {
             var o = { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } };
+            if (length == 8 && opts.qpro) {
+              o.s.c = blob.read_shift(1);
+              blob.l++;
+              o.s.r = blob.read_shift(2);
+              o.e.c = blob.read_shift(1);
+              blob.l++;
+              o.e.r = blob.read_shift(2);
+              return o;
+            }
             o.s.c = blob.read_shift(2);
             o.s.r = blob.read_shift(2);
+            if (length == 12 && opts.qpro)
+              blob.l += 2;
             o.e.c = blob.read_shift(2);
             o.e.r = blob.read_shift(2);
+            if (length == 12 && opts.qpro)
+              blob.l += 2;
             if (o.s.c == 65535)
               o.s.c = o.e.c = o.s.r = o.e.r = 0;
             return o;
           }
+          function write_RANGE(range) {
+            var out = new_buf(8);
+            out.write_shift(2, range.s.c);
+            out.write_shift(2, range.s.r);
+            out.write_shift(2, range.e.c);
+            out.write_shift(2, range.e.r);
+            return out;
+          }
           function parse_cell(blob, length, opts) {
-            var o = [{ c: 0, r: 0 }, { t: "n", v: 0 }, 0];
+            var o = [{ c: 0, r: 0 }, { t: "n", v: 0 }, 0, 0];
             if (opts.qpro && opts.vers != 20768) {
               o[0].c = blob.read_shift(1);
-              blob.l++;
+              o[3] = blob.read_shift(1);
               o[0].r = blob.read_shift(2);
               blob.l += 2;
             } else {
@@ -19170,16 +19489,45 @@
             o[1].v = blob.read_shift(tgt - blob.l, "cstr");
             return o;
           }
+          function write_LABEL(R, C, s) {
+            var o = new_buf(7 + s.length);
+            o.write_shift(1, 255);
+            o.write_shift(2, C);
+            o.write_shift(2, R);
+            o.write_shift(1, 39);
+            for (var i2 = 0; i2 < o.length; ++i2) {
+              var cc = s.charCodeAt(i2);
+              o.write_shift(1, cc >= 128 ? 95 : cc);
+            }
+            o.write_shift(1, 0);
+            return o;
+          }
           function parse_INTEGER(blob, length, opts) {
             var o = parse_cell(blob, length, opts);
             o[1].v = blob.read_shift(2, "i");
             return o;
           }
+          function write_INTEGER(R, C, v) {
+            var o = new_buf(7);
+            o.write_shift(1, 255);
+            o.write_shift(2, C);
+            o.write_shift(2, R);
+            o.write_shift(2, v, "i");
+            return o;
+          }
           function parse_NUMBER(blob, length, opts) {
             var o = parse_cell(blob, length, opts);
             o[1].v = blob.read_shift(8, "f");
             return o;
           }
+          function write_NUMBER(R, C, v) {
+            var o = new_buf(13);
+            o.write_shift(1, 255);
+            o.write_shift(2, C);
+            o.write_shift(2, R);
+            o.write_shift(8, v, "f");
+            return o;
+          }
           function parse_FORMULA(blob, length, opts) {
             var tgt = blob.l + length;
             var o = parse_cell(blob, length, opts);
@@ -19188,10 +19536,192 @@
               blob.l = tgt;
             else {
               var flen = blob.read_shift(2);
+              wk1_fmla_to_csf(blob.slice(blob.l, blob.l + flen), o);
               blob.l += flen;
             }
             return o;
           }
+          function wk1_parse_rc(B, V, col) {
+            var rel = V & 32768;
+            V &= ~32768;
+            V = (rel ? B : 0) + (V >= 8192 ? V - 16384 : V);
+            return (rel ? "" : "$") + (col ? encode_col(V) : encode_row(V));
+          }
+          var oprec = [
+            8,
+            8,
+            8,
+            8,
+            8,
+            8,
+            8,
+            8,
+            6,
+            4,
+            4,
+            5,
+            5,
+            7,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            1,
+            1,
+            2,
+            6,
+            8,
+            8,
+            8,
+            8,
+            8,
+            8,
+            8,
+            8
+          ];
+          var FuncTab = {
+            51: ["FALSE", 0],
+            52: ["TRUE", 0],
+            70: ["LEN", 1],
+            80: ["SUM", 69],
+            81: ["AVERAGEA", 69],
+            82: ["COUNTA", 69],
+            83: ["MINA", 69],
+            84: ["MAXA", 69],
+            111: ["T", 1]
+          };
+          var BinOpTab = [
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "+",
+            "-",
+            "*",
+            "/",
+            "^",
+            "=",
+            "<>",
+            "<=",
+            ">=",
+            "<",
+            ">",
+            "",
+            "",
+            "",
+            "",
+            "&",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+          ];
+          function wk1_fmla_to_csf(blob, o) {
+            prep_blob(blob, 0);
+            var out = [], argc = 0, R = "", C = "", argL = "", argR = "";
+            while (blob.l < blob.length) {
+              var cc = blob[blob.l++];
+              switch (cc) {
+                case 0:
+                  out.push(blob.read_shift(8, "f"));
+                  break;
+                case 1:
+                  {
+                    C = wk1_parse_rc(o[0].c, blob.read_shift(2), true);
+                    R = wk1_parse_rc(o[0].r, blob.read_shift(2), false);
+                    out.push(C + R);
+                  }
+                  break;
+                case 2:
+                  {
+                    var c = wk1_parse_rc(o[0].c, blob.read_shift(2), true);
+                    var r = wk1_parse_rc(o[0].r, blob.read_shift(2), false);
+                    C = wk1_parse_rc(o[0].c, blob.read_shift(2), true);
+                    R = wk1_parse_rc(o[0].r, blob.read_shift(2), false);
+                    out.push(c + r + ":" + C + R);
+                  }
+                  break;
+                case 3:
+                  if (blob.l < blob.length) {
+                    console.error("WK1 premature formula end");
+                    return;
+                  }
+                  break;
+                case 4:
+                  out.push("(" + out.pop() + ")");
+                  break;
+                case 5:
+                  out.push(blob.read_shift(2));
+                  break;
+                case 6:
+                  {
+                    var Z = "";
+                    while (cc = blob[blob.l++])
+                      Z += String.fromCharCode(cc);
+                    out.push('"' + Z.replace(/"/g, '""') + '"');
+                    break;
+                  }
+                  break;
+                case 8:
+                  out.push("-" + out.pop());
+                  break;
+                case 23:
+                  out.push("+" + out.pop());
+                  break;
+                case 22:
+                  out.push("NOT(" + out.pop() + ")");
+                  break;
+                case 20:
+                case 21:
+                  {
+                    argR = out.pop();
+                    argL = out.pop();
+                    out.push(["AND", "OR"][cc - 20] + "(" + argL + "," + argR + ")");
+                  }
+                  break;
+                default:
+                  if (cc < 32 && BinOpTab[cc]) {
+                    argR = out.pop();
+                    argL = out.pop();
+                    out.push(argL + BinOpTab[cc] + argR);
+                  } else if (FuncTab[cc]) {
+                    argc = FuncTab[cc][1];
+                    if (argc == 69)
+                      argc = blob[blob.l++];
+                    if (argc > out.length) {
+                      console.error("WK1 bad formula parse 0x" + cc.toString(16) + ":|" + out.join("|") + "|");
+                      return;
+                    }
+                    var args = out.slice(-argc);
+                    out.length -= argc;
+                    out.push(FuncTab[cc][0] + "(" + args.join(",") + ")");
+                  } else if (cc <= 7)
+                    return console.error("WK1 invalid opcode " + cc.toString(16));
+                  else if (cc <= 24)
+                    return console.error("WK1 unsupported op " + cc.toString(16));
+                  else if (cc <= 30)
+                    return console.error("WK1 invalid opcode " + cc.toString(16));
+                  else if (cc <= 115)
+                    return console.error("WK1 unsupported function opcode " + cc.toString(16));
+                  else
+                    return console.error("WK1 unrecognized opcode " + cc.toString(16));
+              }
+            }
+            if (out.length == 1)
+              o[1].f = "" + out[0];
+            else
+              console.error("WK1 bad formula parse |" + out.join("|") + "|");
+          }
           function parse_cell_3(blob) {
             var o = [{ c: 0, r: 0 }, { t: "n", v: 0 }, 0];
             o[0].r = blob.read_shift(2);
@@ -19205,29 +19735,49 @@
             o[1].v = blob.read_shift(length - 4, "cstr");
             return o;
           }
+          function write_LABEL_16(R, C, wsidx, s) {
+            var o = new_buf(6 + s.length);
+            o.write_shift(2, R);
+            o.write_shift(1, wsidx);
+            o.write_shift(1, C);
+            o.write_shift(1, 39);
+            for (var i2 = 0; i2 < s.length; ++i2) {
+              var cc = s.charCodeAt(i2);
+              o.write_shift(1, cc >= 128 ? 95 : cc);
+            }
+            o.write_shift(1, 0);
+            return o;
+          }
           function parse_NUMBER_18(blob, length) {
             var o = parse_cell_3(blob, length);
             o[1].v = blob.read_shift(2);
             var v = o[1].v >> 1;
             if (o[1].v & 1) {
               switch (v & 7) {
+                case 0:
+                  v = (v >> 3) * 5e3;
+                  break;
                 case 1:
                   v = (v >> 3) * 500;
                   break;
                 case 2:
                   v = (v >> 3) / 20;
                   break;
+                case 3:
+                  v = (v >> 3) / 200;
+                  break;
                 case 4:
                   v = (v >> 3) / 2e3;
                   break;
+                case 5:
+                  v = (v >> 3) / 2e4;
+                  break;
                 case 6:
                   v = (v >> 3) / 16;
                   break;
                 case 7:
                   v = (v >> 3) / 64;
                   break;
-                default:
-                  throw "unknown NUMBER_18 encoding " + (v & 7);
               }
             }
             o[1].v = v;
@@ -19239,12 +19789,54 @@
             var v2 = blob.read_shift(4);
             var e = blob.read_shift(2);
             if (e == 65535) {
-              o[1].v = 0;
+              if (v1 === 0 && v2 === 3221225472) {
+                o[1].t = "e";
+                o[1].v = 15;
+              } else if (v1 === 0 && v2 === 3489660928) {
+                o[1].t = "e";
+                o[1].v = 42;
+              } else
+                o[1].v = 0;
               return o;
             }
             var s = e & 32768;
             e = (e & 32767) - 16446;
-            o[1].v = (s * 2 - 1) * ((e > 0 ? v2 << e : v2 >>> -e) + (e > -32 ? v1 << e + 32 : v1 >>> -(e + 32)));
+            o[1].v = (1 - s * 2) * (v2 * Math.pow(2, e + 32) + v1 * Math.pow(2, e));
+            return o;
+          }
+          function write_NUMBER_17(R, C, wsidx, v) {
+            var o = new_buf(14);
+            o.write_shift(2, R);
+            o.write_shift(1, wsidx);
+            o.write_shift(1, C);
+            if (v == 0) {
+              o.write_shift(4, 0);
+              o.write_shift(4, 0);
+              o.write_shift(2, 65535);
+              return o;
+            }
+            var s = 0, e = 0, v1 = 0, v2 = 0;
+            if (v < 0) {
+              s = 1;
+              v = -v;
+            }
+            e = Math.log2(v) | 0;
+            v /= Math.pow(2, e - 31);
+            v2 = v >>> 0;
+            if ((v2 & 2147483648) == 0) {
+              v /= 2;
+              ++e;
+              v2 = v >>> 0;
+            }
+            v -= v2;
+            v2 |= 2147483648;
+            v2 >>>= 0;
+            v *= Math.pow(2, 32);
+            v1 = v >>> 0;
+            o.write_shift(4, v1);
+            o.write_shift(4, v2);
+            e += 16383 + (s ? 32768 : 0);
+            o.write_shift(2, e);
             return o;
           }
           function parse_FORMULA_19(blob, length) {
@@ -19269,6 +19861,55 @@
             blob.l += length - 10;
             return o;
           }
+          function parse_SHEETNAMECS(blob, length) {
+            return blob[blob.l + length - 1] == 0 ? blob.read_shift(length, "cstr") : "";
+          }
+          function parse_SHEETNAMELP(blob, length) {
+            var len = blob[blob.l++];
+            if (len > length - 1)
+              len = length - 1;
+            var o = "";
+            while (o.length < len)
+              o += String.fromCharCode(blob[blob.l++]);
+            return o;
+          }
+          function parse_SHEETINFOQP(blob, length, opts) {
+            if (!opts.qpro || length < 21)
+              return;
+            var id = blob.read_shift(1);
+            blob.l += 17;
+            var len = blob.read_shift(1);
+            blob.l += 2;
+            var nm = blob.read_shift(length - 21, "cstr");
+            return [id, nm];
+          }
+          function parse_XFORMAT(blob, length) {
+            var o = {}, tgt = blob.l + length;
+            while (blob.l < tgt) {
+              var dt = blob.read_shift(2);
+              if (dt == 14e3) {
+                o[dt] = [0, ""];
+                o[dt][0] = blob.read_shift(2);
+                while (blob[blob.l]) {
+                  o[dt][1] += String.fromCharCode(blob[blob.l]);
+                  blob.l++;
+                }
+                blob.l++;
+              }
+            }
+            return o;
+          }
+          function write_XFORMAT_SHEETNAME(name, wsidx) {
+            var out = new_buf(5 + name.length);
+            out.write_shift(2, 14e3);
+            out.write_shift(2, wsidx);
+            for (var i2 = 0; i2 < name.length; ++i2) {
+              var cc = name.charCodeAt(i2);
+              out[out.l++] = cc > 127 ? 95 : cc;
+            }
+            out[out.l++] = 0;
+            return out;
+          }
           var WK1Enum = {
             0: { n: "BOF", f: parseuint16 },
             1: { n: "EOF" },
@@ -19327,44 +19968,142 @@
             72: { n: "ACOMM" },
             73: { n: "AMACRO" },
             74: { n: "PARSE" },
-            255: { n: "", f: parsenoop }
+            102: { n: "PRANGES??" },
+            103: { n: "RRANGES??" },
+            104: { n: "FNAME??" },
+            105: { n: "MRANGES??" },
+            204: { n: "SHEETNAMECS", f: parse_SHEETNAMECS },
+            222: { n: "SHEETNAMELP", f: parse_SHEETNAMELP },
+            65535: { n: "" }
           };
           var WK3Enum = {
             0: { n: "BOF" },
             1: { n: "EOF" },
-            3: { n: "??" },
-            4: { n: "??" },
-            5: { n: "??" },
-            6: { n: "??" },
-            7: { n: "??" },
-            9: { n: "??" },
-            10: { n: "??" },
-            11: { n: "??" },
-            12: { n: "??" },
-            14: { n: "??" },
-            15: { n: "??" },
-            16: { n: "??" },
-            17: { n: "??" },
-            18: { n: "??" },
+            2: { n: "PASSWORD" },
+            3: { n: "CALCSET" },
+            4: { n: "WINDOWSET" },
+            5: { n: "SHEETCELLPTR" },
+            6: { n: "SHEETLAYOUT" },
+            7: { n: "COLUMNWIDTH" },
+            8: { n: "HIDDENCOLUMN" },
+            9: { n: "USERRANGE" },
+            10: { n: "SYSTEMRANGE" },
+            11: { n: "ZEROFORCE" },
+            12: { n: "SORTKEYDIR" },
+            13: { n: "FILESEAL" },
+            14: { n: "DATAFILLNUMS" },
+            15: { n: "PRINTMAIN" },
+            16: { n: "PRINTSTRING" },
+            17: { n: "GRAPHMAIN" },
+            18: { n: "GRAPHSTRING" },
             19: { n: "??" },
-            21: { n: "??" },
+            20: { n: "ERRCELL" },
+            21: { n: "NACELL" },
             22: { n: "LABEL16", f: parse_LABEL_16 },
             23: { n: "NUMBER17", f: parse_NUMBER_17 },
             24: { n: "NUMBER18", f: parse_NUMBER_18 },
             25: { n: "FORMULA19", f: parse_FORMULA_19 },
-            26: { n: "??" },
-            27: { n: "??" },
-            28: { n: "??" },
-            29: { n: "??" },
-            30: { n: "??" },
-            31: { n: "??" },
-            33: { n: "??" },
+            26: { n: "FORMULA1A" },
+            27: { n: "XFORMAT", f: parse_XFORMAT },
+            28: { n: "DTLABELMISC" },
+            29: { n: "DTLABELCELL" },
+            30: { n: "GRAPHWINDOW" },
+            31: { n: "CPA" },
+            32: { n: "LPLAUTO" },
+            33: { n: "QUERY" },
+            34: { n: "HIDDENSHEET" },
+            35: { n: "??" },
             37: { n: "NUMBER25", f: parse_NUMBER_25 },
+            38: { n: "??" },
             39: { n: "NUMBER27", f: parse_NUMBER_27 },
             40: { n: "FORMULA28", f: parse_FORMULA_28 },
-            255: { n: "", f: parsenoop }
+            142: { n: "??" },
+            147: { n: "??" },
+            150: { n: "??" },
+            151: { n: "??" },
+            152: { n: "??" },
+            153: { n: "??" },
+            154: { n: "??" },
+            155: { n: "??" },
+            156: { n: "??" },
+            163: { n: "??" },
+            174: { n: "??" },
+            175: { n: "??" },
+            176: { n: "??" },
+            177: { n: "??" },
+            184: { n: "??" },
+            185: { n: "??" },
+            186: { n: "??" },
+            187: { n: "??" },
+            188: { n: "??" },
+            195: { n: "??" },
+            201: { n: "??" },
+            204: { n: "SHEETNAMECS", f: parse_SHEETNAMECS },
+            205: { n: "??" },
+            206: { n: "??" },
+            207: { n: "??" },
+            208: { n: "??" },
+            256: { n: "??" },
+            259: { n: "??" },
+            260: { n: "??" },
+            261: { n: "??" },
+            262: { n: "??" },
+            263: { n: "??" },
+            265: { n: "??" },
+            266: { n: "??" },
+            267: { n: "??" },
+            268: { n: "??" },
+            270: { n: "??" },
+            271: { n: "??" },
+            384: { n: "??" },
+            389: { n: "??" },
+            390: { n: "??" },
+            393: { n: "??" },
+            396: { n: "??" },
+            512: { n: "??" },
+            514: { n: "??" },
+            513: { n: "??" },
+            516: { n: "??" },
+            517: { n: "??" },
+            640: { n: "??" },
+            641: { n: "??" },
+            642: { n: "??" },
+            643: { n: "??" },
+            644: { n: "??" },
+            645: { n: "??" },
+            646: { n: "??" },
+            647: { n: "??" },
+            648: { n: "??" },
+            658: { n: "??" },
+            659: { n: "??" },
+            660: { n: "??" },
+            661: { n: "??" },
+            662: { n: "??" },
+            665: { n: "??" },
+            666: { n: "??" },
+            768: { n: "??" },
+            772: { n: "??" },
+            1537: { n: "SHEETINFOQP", f: parse_SHEETINFOQP },
+            1600: { n: "??" },
+            1602: { n: "??" },
+            1793: { n: "??" },
+            1794: { n: "??" },
+            1795: { n: "??" },
+            1796: { n: "??" },
+            1920: { n: "??" },
+            2048: { n: "??" },
+            2049: { n: "??" },
+            2052: { n: "??" },
+            2688: { n: "??" },
+            10998: { n: "??" },
+            12849: { n: "??" },
+            28233: { n: "??" },
+            28484: { n: "??" },
+            65535: { n: "" }
           };
           return {
+            sheet_to_wk1,
+            book_to_wk3,
             to_workbook: lotus_to_workbook
           };
         }();
@@ -20029,7 +20768,7 @@
               case "binary":
                 return rtf_to_sheet_str(d, opts);
               case "buffer":
-                return rtf_to_sheet_str(d.toString("binary"), opts);
+                return rtf_to_sheet_str(has_buf && Buffer.isBuffer(d) ? d.toString("binary") : a2s(d), opts);
               case "array":
                 return rtf_to_sheet_str(cc2str(d), opts);
             }
@@ -20038,9 +20777,38 @@
           function rtf_to_sheet_str(str, opts) {
             var o = opts || {};
             var ws = o.dense ? [] : {};
-            var range = { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } };
-            if (!str.match(/\\trowd/))
+            var rows = str.match(/\\trowd.*?\\row\b/g);
+            if (!rows.length)
               throw new Error("RTF missing table");
+            var range = { s: { c: 0, r: 0 }, e: { c: 0, r: rows.length - 1 } };
+            rows.forEach(function(rowtf, R) {
+              if (Array.isArray(ws))
+                ws[R] = [];
+              var rtfre = /\\\w+\b/g;
+              var last_index = 0;
+              var res;
+              var C = -1;
+              while (res = rtfre.exec(rowtf)) {
+                switch (res[0]) {
+                  case "\\cell":
+                    var data = rowtf.slice(last_index, rtfre.lastIndex - res[0].length);
+                    if (data[0] == " ")
+                      data = data.slice(1);
+                    ++C;
+                    if (data.length) {
+                      var cell = { v: data, t: "s" };
+                      if (Array.isArray(ws))
+                        ws[R][C] = cell;
+                      else
+                        ws[encode_cell({ r: R, c: C })] = cell;
+                    }
+                    break;
+                }
+                last_index = rtfre.lastIndex;
+              }
+              if (C > range.e.c)
+                range.e.c = C;
+            });
             ws["!ref"] = encode_range(range);
             return ws;
           }
@@ -20552,7 +21320,7 @@
                   if (font.color.index == 81)
                     icv = XLSIcv[1];
                   if (!icv)
-                    throw new Error(x);
+                    icv = XLSIcv[1];
                   font.color.rgb = icv[0].toString(16) + icv[1].toString(16) + icv[2].toString(16);
                 } else if (y.theme) {
                   font.color.theme = parseInt(y.theme, 10);
@@ -20666,7 +21434,7 @@
                 for (i2 = 0; i2 < cellXF_bool.length; ++i2)
                   if (xf[cellXF_bool[i2]])
                     xf[cellXF_bool[i2]] = parsexmlbool(xf[cellXF_bool[i2]]);
-                if (xf.numFmtId > 392) {
+                if (styles.NumberFmt && xf.numFmtId > 392) {
                   for (i2 = 392; i2 > 60; --i2)
                     if (styles.NumberFmt[xf.numFmtId] == styles.NumberFmt[i2]) {
                       xf.numFmtId = i2;
@@ -21429,7 +22197,7 @@
           var dwThemeVersion = blob.read_shift(4);
           if (dwThemeVersion === 124226)
             return;
-          if (!opts.cellStyles || !jszip) {
+          if (!opts.cellStyles) {
             blob.l = end;
             return;
           }
@@ -21437,7 +22205,7 @@
           blob.l = end;
           var zip;
           try {
-            zip = new jszip(data);
+            zip = zip_read(data, { type: "array" });
           } catch (e) {
             return;
           }
@@ -21778,7 +22546,7 @@
               comment.r = rt.r;
               if (rt.r == "<t></t>")
                 rt.t = rt.h = "";
-              comment.t = rt.t.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+              comment.t = (rt.t || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
               if (opts.cellHTML)
                 comment.h = rt.h;
               commentList.push(comment);
@@ -22755,7 +23523,8 @@
           }
         }
         function get_ixti(supbooks, ixti, opts) {
-          return formula_quote_sheet_name(get_ixti_raw(supbooks, ixti, opts), opts);
+          var ixtiraw = get_ixti_raw(supbooks, ixti, opts);
+          return ixtiraw == "#REF" ? ixtiraw : formula_quote_sheet_name(ixtiraw, opts);
         }
         function stringify_formula(formula, range, cell, supbooks, opts) {
           var biff = opts && opts.biff || 8;
@@ -22924,7 +23693,7 @@
                   else if (supbooks[0] && supbooks[0][nameidx])
                     o += supbooks[0][nameidx].Name;
                   else {
-                    var ixtidata = get_ixti_raw(supbooks, bookidx, opts).split(";;");
+                    var ixtidata = (get_ixti_raw(supbooks, bookidx, opts) || "").split(";;");
                     if (ixtidata[nameidx - 1])
                       o = ixtidata[nameidx - 1];
                     else
@@ -24537,6 +25306,9 @@
             p.width = col.width;
           if (col.hidden)
             p.hidden = true;
+          if (col.level != null) {
+            p.outlineLevel = p.level = col.level;
+          }
           return p;
         }
         function default_margins(margins, mode) {
@@ -24591,11 +25363,11 @@
             if (opts.WTF)
               throw e;
           }
-          if (p.t === "z")
+          if (p.t === "z" && !opts.cellStyles)
             return;
           if (p.t === "d" && typeof p.v === "string")
             p.v = parseDate(p.v);
-          if (!opts || opts.cellText !== false)
+          if ((!opts || opts.cellText !== false) && p.t !== "z")
             try {
               if (SSF._table[fmtid] == null)
                 SSF.load(SSFImplicit[fmtid] || "General", fmtid);
@@ -24665,6 +25437,7 @@
         var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
         var marginregex = /<(?:\w:)?pageMargins[^>]*\/>/g;
         var sheetprregex = /<(?:\w:)?sheetPr\b(?:[^>a-z][^>]*)?\/>/;
+        var sheetprregex2 = /<(?:\w:)?sheetPr[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetPr)>/;
         var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
         function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
           if (!data)
@@ -24685,6 +25458,8 @@
           var sheetPr = data1.match(sheetprregex);
           if (sheetPr)
             parse_ws_xml_sheetpr(sheetPr[0], s, wb, idx);
+          else if (sheetPr = data1.match(sheetprregex2))
+            parse_ws_xml_sheetpr2(sheetPr[0], sheetPr[1] || "", s, wb, idx, styles, themes);
           var ridx = (data1.match(/<(?:\w*:)?dimension/) || { index: -1 }).index;
           if (ridx > 0) {
             var ref = data1.slice(ridx, ridx + 50).match(dimregex);
@@ -24755,6 +25530,9 @@
           if (data.codeName)
             wb.Sheets[idx].CodeName = unescapexml(utf8read(data.codeName));
         }
+        function parse_ws_xml_sheetpr2(sheetPr, body, s, wb, idx, styles, themes) {
+          parse_ws_xml_sheetpr(sheetPr.slice(0, sheetPr.indexOf(">")), s, wb, idx);
+        }
         function write_ws_xml_sheetpr(ws, wb, idx, opts, o) {
           var needed = false;
           var props = {}, payload = null;
@@ -24818,9 +25596,9 @@
             if (rel) {
               val.Target = rel.Target;
               if (val.location)
-                val.Target += "#" + val.location;
+                val.Target += "#" + unescapexml(val.location);
             } else {
-              val.Target = "#" + val.location;
+              val.Target = "#" + unescapexml(val.location);
               rel = { Target: val.Target, TargetMode: "Internal" };
             }
             val.Rel = rel;
@@ -24865,6 +25643,8 @@
             if (coll.hidden)
               coll.hidden = parsexmlbool(coll.hidden);
             var colm = parseInt(coll.min, 10) - 1, colM = parseInt(coll.max, 10) - 1;
+            if (coll.outlineLevel)
+              coll.level = +coll.outlineLevel || 0;
             delete coll.min;
             delete coll.max;
             coll.width = +coll.width;
@@ -24990,6 +25770,8 @@
                 delete cell.t;
                 break;
               }
+              if (cell.v.length > 32767)
+                throw new Error("Text length must not exceed 32767 characters");
               if (opts && opts.bookSST) {
                 v = writetag("v", "" + get_sst_id(opts.Strings, cell.v, opts.revStrings));
                 o.t = "s";
@@ -25033,11 +25815,47 @@
               var xlen = x.length;
               if (xlen === 0)
                 continue;
-              for (ri = 0; ri < xlen; ++ri)
-                if (x.charCodeAt(ri) === 62)
-                  break;
-              ++ri;
-              tag = parsexmltag(x.slice(0, ri), true);
+              var rstarti = 0;
+              outa:
+                for (ri = 0; ri < xlen; ++ri)
+                  switch (x[ri]) {
+                    case ">":
+                      if (x[ri - 1] != "/") {
+                        ++ri;
+                        break outa;
+                      }
+                      if (opts && opts.cellStyles) {
+                        tag = parsexmltag(x.slice(rstarti, ri), true);
+                        tagr = tag.r != null ? parseInt(tag.r, 10) : tagr + 1;
+                        tagc = -1;
+                        if (opts.sheetRows && opts.sheetRows < tagr)
+                          continue;
+                        rowobj = {};
+                        rowrite = false;
+                        if (tag.ht) {
+                          rowrite = true;
+                          rowobj.hpt = parseFloat(tag.ht);
+                          rowobj.hpx = pt2px(rowobj.hpt);
+                        }
+                        if (tag.hidden == "1") {
+                          rowrite = true;
+                          rowobj.hidden = true;
+                        }
+                        if (tag.outlineLevel != null) {
+                          rowrite = true;
+                          rowobj.level = +tag.outlineLevel;
+                        }
+                        if (rowrite)
+                          rows[tagr - 1] = rowobj;
+                      }
+                      break;
+                    case "<":
+                      rstarti = ri;
+                      break;
+                  }
+              if (rstarti >= ri)
+                break;
+              tag = parsexmltag(x.slice(rstarti, ri), true);
               tagr = tag.r != null ? parseInt(tag.r, 10) : tagr + 1;
               tagc = -1;
               if (opts.sheetRows && opts.sheetRows < tagr)
@@ -25338,7 +26156,7 @@
             o[o.length] = "</sheetData>";
             o[sidx] = o[sidx].replace("/>", ">");
           }
-          if (ws["!protect"] != null)
+          if (ws["!protect"])
             o[o.length] = write_ws_xml_protection(ws["!protect"]);
           if (ws["!autofilter"] != null)
             o[o.length] = write_ws_xml_autofilter(ws["!autofilter"], ws, wb, idx);
@@ -25461,14 +26279,26 @@
         }
         function parse_BrtWsProp(data, length) {
           var z = {};
-          data.l += 19;
+          var f = data[data.l];
+          ++data.l;
+          z.above = !(f & 64);
+          z.left = !(f & 128);
+          data.l += 18;
           z.name = parse_XLSBCodeName(data, length - 19);
           return z;
         }
-        function write_BrtWsProp(str, o) {
+        function write_BrtWsProp(str, outl, o) {
           if (o == null)
             o = new_buf(84 + 4 * str.length);
-          for (var i2 = 0; i2 < 3; ++i2)
+          var f = 192;
+          if (outl) {
+            if (outl.above)
+              f &= ~64;
+            if (outl.left)
+              f &= ~128;
+          }
+          o.write_shift(1, f);
+          for (var i2 = 1; i2 < 3; ++i2)
             o.write_shift(1, 0);
           write_BrtColor({ auto: 1 }, o);
           o.write_shift(-4, -1);
@@ -25485,6 +26315,15 @@
             o = new_buf(8);
           return write_XLSBCell(ncell, o);
         }
+        function parse_BrtShortBlank(data) {
+          var cell = parse_XLSBShortCell(data);
+          return [cell];
+        }
+        function write_BrtShortBlank(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(4);
+          return write_XLSBShortCell(ncell, o);
+        }
         function parse_BrtCellBool(data) {
           var cell = parse_XLSBCell(data);
           var fBool = data.read_shift(1);
@@ -25497,11 +26336,44 @@
           o.write_shift(1, cell.v ? 1 : 0);
           return o;
         }
+        function parse_BrtShortBool(data) {
+          var cell = parse_XLSBShortCell(data);
+          var fBool = data.read_shift(1);
+          return [cell, fBool, "b"];
+        }
+        function write_BrtShortBool(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(5);
+          write_XLSBShortCell(ncell, o);
+          o.write_shift(1, cell.v ? 1 : 0);
+          return o;
+        }
         function parse_BrtCellError(data) {
           var cell = parse_XLSBCell(data);
           var bError = data.read_shift(1);
           return [cell, bError, "e"];
         }
+        function write_BrtCellError(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(9);
+          write_XLSBCell(ncell, o);
+          o.write_shift(1, cell.v);
+          return o;
+        }
+        function parse_BrtShortError(data) {
+          var cell = parse_XLSBShortCell(data);
+          var bError = data.read_shift(1);
+          return [cell, bError, "e"];
+        }
+        function write_BrtShortError(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(8);
+          write_XLSBShortCell(ncell, o);
+          o.write_shift(1, cell.v);
+          o.write_shift(2, 0);
+          o.write_shift(1, 0);
+          return o;
+        }
         function parse_BrtCellIsst(data) {
           var cell = parse_XLSBCell(data);
           var isst = data.read_shift(4);
@@ -25514,6 +26386,18 @@
           o.write_shift(4, ncell.v);
           return o;
         }
+        function parse_BrtShortIsst(data) {
+          var cell = parse_XLSBShortCell(data);
+          var isst = data.read_shift(4);
+          return [cell, isst, "s"];
+        }
+        function write_BrtShortIsst(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(8);
+          write_XLSBShortCell(ncell, o);
+          o.write_shift(4, ncell.v);
+          return o;
+        }
         function parse_BrtCellReal(data) {
           var cell = parse_XLSBCell(data);
           var value = parse_Xnum(data);
@@ -25526,6 +26410,18 @@
           write_Xnum(cell.v, o);
           return o;
         }
+        function parse_BrtShortReal(data) {
+          var cell = parse_XLSBShortCell(data);
+          var value = parse_Xnum(data);
+          return [cell, value, "n"];
+        }
+        function write_BrtShortReal(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(12);
+          write_XLSBShortCell(ncell, o);
+          write_Xnum(cell.v, o);
+          return o;
+        }
         function parse_BrtCellRk(data) {
           var cell = parse_XLSBCell(data);
           var value = parse_RkNumber(data);
@@ -25538,6 +26434,18 @@
           write_RkNumber(cell.v, o);
           return o;
         }
+        function parse_BrtShortRk(data) {
+          var cell = parse_XLSBShortCell(data);
+          var value = parse_RkNumber(data);
+          return [cell, value, "n"];
+        }
+        function write_BrtShortRk(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(8);
+          write_XLSBShortCell(ncell, o);
+          write_RkNumber(cell.v, o);
+          return o;
+        }
         function parse_BrtCellSt(data) {
           var cell = parse_XLSBCell(data);
           var value = parse_XLWideString(data);
@@ -25550,6 +26458,18 @@
           write_XLWideString(cell.v, o);
           return o.length > o.l ? o.slice(0, o.l) : o;
         }
+        function parse_BrtShortSt(data) {
+          var cell = parse_XLSBShortCell(data);
+          var value = parse_XLWideString(data);
+          return [cell, value, "str"];
+        }
+        function write_BrtShortSt(cell, ncell, o) {
+          if (o == null)
+            o = new_buf(8 + 4 * cell.v.length);
+          write_XLSBShortCell(ncell, o);
+          write_XLWideString(cell.v, o);
+          return o.length > o.l ? o.slice(0, o.l) : o;
+        }
         function parse_BrtFmlaBool(data, length, opts) {
           var end = data.l + length;
           var cell = parse_XLSBCell(data);
@@ -25799,6 +26719,7 @@
           }
           var colinfo = [], rowinfo = [];
           var seencol = false;
+          XLSBRecordEnum[16] = { n: "BrtShortReal", f: parse_BrtShortReal };
           recordhopper(data, function ws_parse(val, R_n, RT) {
             if (end)
               return;
@@ -25828,6 +26749,12 @@
               case 9:
               case 10:
               case 11:
+              case 13:
+              case 14:
+              case 15:
+              case 16:
+              case 17:
+              case 18:
                 p = { t: val[2] };
                 switch (val[2]) {
                   case "n":
@@ -25853,7 +26780,7 @@
                 }
                 if (cf = styles.CellXf[val[0].iStyleRef])
                   safe_format(p, cf.numFmtId, null, opts, themes, styles);
-                C = val[0].c;
+                C = val[0].c == -1 ? C + 1 : val[0].c;
                 if (opts.dense) {
                   if (!s[R])
                     s[R] = [];
@@ -25891,10 +26818,11 @@
                 }
                 break;
               case 1:
+              case 12:
                 if (!opts.sheetStubs || pass)
                   break;
                 p = { t: "z", v: void 0 };
-                C = val[0].c;
+                C = val[0].c == -1 ? C + 1 : val[0].c;
                 if (opts.dense) {
                   if (!s[R])
                     s[R] = [];
@@ -25977,6 +26905,8 @@
                   wb.Sheets[idx] = {};
                 if (val.name)
                   wb.Sheets[idx].CodeName = val.name;
+                if (val.above || val.left)
+                  s["!outline"] = { above: val.above, left: val.left };
                 break;
               case 137:
                 if (!wb.Views)
@@ -25993,6 +26923,7 @@
                 break;
               case 151:
                 break;
+              case 152:
               case 175:
               case 644:
               case 625:
@@ -26032,7 +26963,6 @@
               case 680:
               case 1104:
               case 1024:
-              case 152:
               case 663:
               case 535:
               case 678:
@@ -26094,9 +27024,9 @@
             s["!rows"] = rowinfo;
           return s;
         }
-        function write_ws_bin_cell(ba, cell, R, C, opts, ws) {
+        function write_ws_bin_cell(ba, cell, R, C, opts, ws, last_seen) {
           if (cell.v === void 0)
-            return;
+            return false;
           var vv = "";
           switch (cell.t) {
             case "b":
@@ -26129,27 +27059,51 @@
                 vv = get_sst_id(opts.Strings, cell.v, opts.revStrings);
                 o.t = "s";
                 o.v = vv;
-                write_record(ba, "BrtCellIsst", write_BrtCellIsst(cell, o));
+                if (last_seen)
+                  write_record(ba, "BrtShortIsst", write_BrtShortIsst(cell, o));
+                else
+                  write_record(ba, "BrtCellIsst", write_BrtCellIsst(cell, o));
               } else {
                 o.t = "str";
-                write_record(ba, "BrtCellSt", write_BrtCellSt(cell, o));
+                if (last_seen)
+                  write_record(ba, "BrtShortSt", write_BrtShortSt(cell, o));
+                else
+                  write_record(ba, "BrtCellSt", write_BrtCellSt(cell, o));
               }
-              return;
+              return true;
             case "n":
-              if (cell.v == (cell.v | 0) && cell.v > -1e3 && cell.v < 1e3)
-                write_record(ba, "BrtCellRk", write_BrtCellRk(cell, o));
-              else
-                write_record(ba, "BrtCellReal", write_BrtCellReal(cell, o));
-              return;
+              if (cell.v == (cell.v | 0) && cell.v > -1e3 && cell.v < 1e3) {
+                if (last_seen)
+                  write_record(ba, "BrtShortRk", write_BrtShortRk(cell, o));
+                else
+                  write_record(ba, "BrtCellRk", write_BrtCellRk(cell, o));
+              } else {
+                if (last_seen)
+                  write_record(ba, "BrtShortReal", write_BrtShortReal(cell, o));
+                else
+                  write_record(ba, "BrtCellReal", write_BrtCellReal(cell, o));
+              }
+              return true;
             case "b":
               o.t = "b";
-              write_record(ba, "BrtCellBool", write_BrtCellBool(cell, o));
-              return;
+              if (last_seen)
+                write_record(ba, "BrtShortBool", write_BrtShortBool(cell, o));
+              else
+                write_record(ba, "BrtCellBool", write_BrtCellBool(cell, o));
+              return true;
             case "e":
               o.t = "e";
-              break;
+              if (last_seen)
+                write_record(ba, "BrtShortError", write_BrtShortError(cell, o));
+              else
+                write_record(ba, "BrtCellError", write_BrtCellError(cell, o));
+              return true;
           }
-          write_record(ba, "BrtCellBlank", write_BrtCellBlank(cell, o));
+          if (last_seen)
+            write_record(ba, "BrtShortBlank", write_BrtShortBlank(cell, o));
+          else
+            write_record(ba, "BrtCellBlank", write_BrtCellBlank(cell, o));
+          return true;
         }
         function write_CELLTABLE(ba, ws, idx, opts) {
           var range = safe_decode_range(ws["!ref"] || "A1"), ref, rr = "", cols = [];
@@ -26161,15 +27115,18 @@
           for (var R = range.s.r; R <= cap; ++R) {
             rr = encode_row(R);
             write_row_header(ba, ws, range, R);
+            var last_seen = false;
             if (R <= range.e.r)
               for (var C = range.s.c; C <= range.e.c; ++C) {
                 if (R === range.s.r)
                   cols[C] = encode_col(C);
                 ref = cols[C] + rr;
                 var cell = dense ? (ws[R] || [])[C] : ws[ref];
-                if (!cell)
+                if (!cell) {
+                  last_seen = false;
                   continue;
-                write_ws_bin_cell(ba, cell, R, C, opts, ws);
+                }
+                last_seen = write_ws_bin_cell(ba, cell, R, C, opts, ws, last_seen);
               }
           }
           write_record(ba, "BrtEndSheetData");
@@ -26279,8 +27236,8 @@
           ws["!links"] = [];
           ws["!comments"] = [];
           write_record(ba, "BrtBeginSheet");
-          if (wb.vbaraw)
-            write_record(ba, "BrtWsProp", write_BrtWsProp(c));
+          if (wb.vbaraw || ws["!outline"])
+            write_record(ba, "BrtWsProp", write_BrtWsProp(c, ws["!outline"]));
           write_record(ba, "BrtWsDim", write_BrtWsDim(r));
           write_WSVIEWS2(ba, ws, wb.Workbook);
           write_WSFMTINFO(ba, ws);
@@ -26945,6 +27902,7 @@
           var supbooks = [[]];
           supbooks.SheetNames = [];
           supbooks.XTI = [];
+          XLSBRecordEnum[16] = { n: "BrtFRTArchID$", f: parse_BrtFRTArchID$ };
           recordhopper(data, function hopper_wb(val, R_n, RT) {
             switch (RT) {
               case 156:
@@ -26984,12 +27942,16 @@
                 break;
               case 361:
                 break;
+              case 2071:
+              case 158:
+              case 143:
+              case 664:
+              case 353:
+                break;
               case 3072:
               case 3073:
-              case 2071:
               case 534:
               case 677:
-              case 158:
               case 157:
               case 610:
               case 2050:
@@ -27060,7 +28022,6 @@
           write_XLWideString(XLSX2.version, o);
           write_XLWideString(XLSX2.version, o);
           write_XLWideString("7262", o);
-          o.length = o.l;
           return o.length > o.l ? o.slice(0, o.l) : o;
         }
         function write_BrtBookView(idx, o) {
@@ -27420,6 +28381,12 @@
               str = utf8read(str);
           }
           var opening = str.slice(0, 1024).toLowerCase(), ishtml = false;
+          opening = opening.replace(/".*?"/g, "");
+          if ((opening.indexOf(">") & 1023) > Math.min(opening.indexOf(",") & 1023, opening.indexOf(";") & 1023)) {
+            var _o = dup(opts);
+            _o.type = "string";
+            return PRN.to_workbook(str, _o);
+          }
           if (opening.indexOf("<?xml") == -1)
             ["html", "table", "head", "meta", "script", "style", "div"].forEach(function(tag) {
               if (opening.indexOf("<" + tag) >= 0)
@@ -27482,7 +28449,7 @@
                       cursheet[encode_col(c) + encode_row(r)] = cell;
                   }
                   if (cell.HRef) {
-                    cell.l = { Target: cell.HRef };
+                    cell.l = { Target: unescapexml(cell.HRef) };
                     if (cell.HRefScreenTip)
                       cell.l.Tooltip = cell.HRefScreenTip;
                     delete cell.HRef;
@@ -27800,6 +28767,8 @@
                 } else if (Rn[0].charAt(Rn[0].length - 2) !== "/")
                   state.push([Rn[3], true]);
                 break;
+              case "null":
+                break;
               default:
                 if (state.length == 0 && Rn[3] == "document")
                   return parse_fods(str, opts);
@@ -28033,6 +29002,8 @@
                         break;
                       case "print":
                         break;
+                      case "printerrors":
+                        break;
                       case "panes":
                         break;
                       case "scale":
@@ -28112,6 +29083,9 @@
                       case "allowsizerows":
                         break;
                       case "nosummaryrowsbelowdetail":
+                        if (!cursheet["!outline"])
+                          cursheet["!outline"] = {};
+                        cursheet["!outline"].above = true;
                         break;
                       case "tabcolorindex":
                         break;
@@ -28120,6 +29094,9 @@
                       case "showpagelayoutzoom":
                         break;
                       case "nosummarycolumnsrightdetail":
+                        if (!cursheet["!outline"])
+                          cursheet["!outline"] = {};
+                        cursheet["!outline"].left = true;
                         break;
                       case "blackandwhite":
                         break;
@@ -28933,7 +29910,7 @@
                 } else
                   p.w = SSF._general(p.v);
               } else
-                p.w = SSF.format(fmtid, p.v, { date1904: !!date1904 });
+                p.w = SSF.format(fmtid, p.v, { date1904: !!date1904, dateNF: opts && opts.dateNF });
             } catch (e) {
               if (opts.WTF)
                 throw e;
@@ -28966,7 +29943,6 @@
           var arrayf = [];
           var temp_val;
           var country;
-          var cell_valid = true;
           var XFs = [];
           var palette = [];
           var Workbook = { Sheets: [], WBProps: { date1904: false }, Views: [{}] }, wsprops = {};
@@ -28995,8 +29971,6 @@
             if (file_depth > 1)
               return;
             if (options2.sheetRows && cell.r >= options2.sheetRows)
-              cell_valid = false;
-            if (!cell_valid)
               return;
             if (options2.cellStyles && line.XF && line.XF.data)
               process_cell_style(cell, line, options2);
@@ -29177,6 +30151,10 @@
                 case "WsBool":
                   if (val.fDialog)
                     out["!type"] = "dialog";
+                  if (!val.fBelow)
+                    (out["!outline"] || (out["!outline"] = {})).above = true;
+                  if (!val.fRight)
+                    (out["!outline"] || (out["!outline"] = {})).left = true;
                   break;
                 case "XF":
                   XFs.push(val);
@@ -29301,17 +30279,22 @@
                         2: 2,
                         7: 2
                       }[val.BIFFVer] || 8;
+                    opts.biffguess = val.BIFFVer == 0;
+                    if (val.BIFFVer == 0 && val.dt == 4096) {
+                      opts.biff = 5;
+                      seen_codepage = true;
+                      set_cp(opts.codepage = 28591);
+                    }
                     if (opts.biff == 8 && val.BIFFVer == 0 && val.dt == 16)
                       opts.biff = 2;
                     if (file_depth++)
                       break;
-                    cell_valid = true;
                     out = options.dense ? [] : {};
                     if (opts.biff < 8 && !seen_codepage) {
                       seen_codepage = true;
                       set_cp(opts.codepage = options.codepage || 1252);
                     }
-                    if (opts.biff < 5) {
+                    if (opts.biff < 5 || val.BIFFVer == 0 && val.dt == 4096) {
                       if (cur_sheet === "")
                         cur_sheet = "Sheet1";
                       range = { s: { r: 0, c: 0 }, e: { r: 0, c: 0 } };
@@ -29344,7 +30327,7 @@
                     }
                     temp_val = { ixfe: val.ixfe, XF: XFs[val.ixfe] || {}, v: val.val, t: "n" };
                     if (BIFF2Fmt > 0)
-                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                     safe_format_xf(temp_val, options, wb.opts.Date1904);
                     addcell({ c: val.c, r: val.r }, temp_val, options);
                   }
@@ -29353,7 +30336,7 @@
                   {
                     temp_val = { ixfe: val.ixfe, XF: XFs[val.ixfe], v: val.val, t: val.t };
                     if (BIFF2Fmt > 0)
-                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                     safe_format_xf(temp_val, options, wb.opts.Date1904);
                     addcell({ c: val.c, r: val.r }, temp_val, options);
                   }
@@ -29362,7 +30345,7 @@
                   {
                     temp_val = { ixfe: val.ixfe, XF: XFs[val.ixfe], v: val.rknum, t: "n" };
                     if (BIFF2Fmt > 0)
-                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                     safe_format_xf(temp_val, options, wb.opts.Date1904);
                     addcell({ c: val.c, r: val.r }, temp_val, options);
                   }
@@ -29373,7 +30356,7 @@
                       var ixfe = val.rkrec[j - val.c][0];
                       temp_val = { ixfe, XF: XFs[ixfe], v: val.rkrec[j - val.c][1], t: "n" };
                       if (BIFF2Fmt > 0)
-                        temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                        temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                       safe_format_xf(temp_val, options, wb.opts.Date1904);
                       addcell({ c: j, r: val.r }, temp_val, options);
                     }
@@ -29400,7 +30383,7 @@
                         temp_val.f = "" + stringify_formula(val.formula, range, val.cell, supbooks, opts);
                     }
                     if (BIFF2Fmt > 0)
-                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                     safe_format_xf(temp_val, options, wb.opts.Date1904);
                     addcell(val.cell, temp_val, options);
                     last_formula = val;
@@ -29416,7 +30399,7 @@
                         temp_val.f = "" + stringify_formula(last_formula.formula, range, last_formula.cell, supbooks, opts);
                       }
                       if (BIFF2Fmt > 0)
-                        temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                        temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                       safe_format_xf(temp_val, options, wb.opts.Date1904);
                       addcell(last_formula.cell, temp_val, options);
                       last_formula = null;
@@ -29441,8 +30424,6 @@
                   break;
                 case "ShrFmla":
                   {
-                    if (!cell_valid)
-                      break;
                     if (!options.cellFormula)
                       break;
                     if (last_cell) {
@@ -29460,7 +30441,7 @@
                     temp_val.h = sst[val.isst].h;
                   temp_val.XF = XFs[temp_val.ixfe];
                   if (BIFF2Fmt > 0)
-                    temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                    temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                   safe_format_xf(temp_val, options, wb.opts.Date1904);
                   addcell({ c: val.c, r: val.r }, temp_val, options);
                   break;
@@ -29468,7 +30449,7 @@
                   if (options.sheetStubs) {
                     temp_val = { ixfe: val.ixfe, XF: XFs[val.ixfe], t: "z" };
                     if (BIFF2Fmt > 0)
-                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                      temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                     safe_format_xf(temp_val, options, wb.opts.Date1904);
                     addcell({ c: val.c, r: val.r }, temp_val, options);
                   }
@@ -29479,7 +30460,7 @@
                       var _ixfe = val.ixfe[_j - val.c];
                       temp_val = { ixfe: _ixfe, XF: XFs[_ixfe], t: "z" };
                       if (BIFF2Fmt > 0)
-                        temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                        temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                       safe_format_xf(temp_val, options, wb.opts.Date1904);
                       addcell({ c: _j, r: val.r }, temp_val, options);
                     }
@@ -29491,7 +30472,7 @@
                   temp_val = make_cell(val.val, val.ixfe, "s");
                   temp_val.XF = XFs[temp_val.ixfe];
                   if (BIFF2Fmt > 0)
-                    temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 31];
+                    temp_val.z = BIFF2FmtTable[temp_val.ixfe >> 8 & 63];
                   safe_format_xf(temp_val, options, wb.opts.Date1904);
                   addcell({ c: val.c, r: val.r }, temp_val, options);
                   break;
@@ -29604,7 +30585,7 @@
                         if (!opts.cellStyles)
                           break;
                         while (val.e >= val.s) {
-                          colinfo[val.e--] = { width: val.w / 256 };
+                          colinfo[val.e--] = { width: val.w / 256, level: val.level || 0, hidden: !!(val.flags & 1) };
                           if (!seencol) {
                             seencol = true;
                             find_mdw_colw(val.w / 256);
@@ -29639,6 +30620,8 @@
                         default_margins(out["!margins"] = {});
                       out["!margins"][Rn.slice(0, -6).toLowerCase()] = val;
                       break;
+                    case "Selection":
+                      break;
                     case "Setup":
                       if (!out["!margins"])
                         default_margins(out["!margins"] = {});
@@ -29691,8 +30674,6 @@
                       break;
                     case "QsiSXTag":
                       break;
-                    case "Selection":
-                      break;
                     case "Feat":
                       break;
                     case "FeatHdr":
@@ -30034,6 +31015,8 @@
                             case "BIFF3XF":
                             case "BIFF4XF":
                               break;
+                            case "BIFF2XFINDEX":
+                              break;
                             case "BIFF4FMTCNT":
                             case "BIFF2ROW":
                             case "BIFF2WINDOW2":
@@ -30084,11 +31067,16 @@
           });
           if (!options.bookSheets)
             wb.Sheets = Sheets;
+          if (!wb.SheetNames.length && Preamble["!ref"]) {
+            wb.SheetNames.push("Sheet1");
+            if (wb.Sheets)
+              wb.Sheets["Sheet1"] = Preamble;
+          } else
+            wb.Preamble = Preamble;
           if (wb.Sheets)
             FilterDatabases.forEach(function(r, i2) {
               wb.Sheets[wb.SheetNames[i2]]["!autofilter"] = r;
             });
-          wb.Preamble = Preamble;
           wb.Strings = sst;
           wb.SSF = SSF.get_table();
           if (opts.enc)
@@ -30208,6 +31196,8 @@
               WorkbookP = WK_.to_workbook(_data.content, (options.type = T, options));
             else if ((_data = CFB.find(cfb, "NativeContent_MAIN")) && _data.content)
               WorkbookP = WK_.to_workbook(_data.content, (options.type = T, options));
+            else if ((_data = CFB.find(cfb, "MN0")) && _data.content)
+              throw new Error("Unsupported Works 4 for Mac file");
             else
               throw new Error("Cannot find Workbook stream");
             if (options.bookVBA && cfb.FullPaths && CFB.find(cfb, "/_VBA_PROJECT_CUR/VBA/dir"))
@@ -30262,7 +31252,13 @@
           9: { n: "BrtFmlaNum", f: parse_BrtFmlaNum },
           10: { n: "BrtFmlaBool", f: parse_BrtFmlaBool },
           11: { n: "BrtFmlaError", f: parse_BrtFmlaError },
-          16: { n: "BrtFRTArchID$", f: parse_BrtFRTArchID$ },
+          12: { n: "BrtShortBlank", f: parse_BrtShortBlank },
+          13: { n: "BrtShortRk", f: parse_BrtShortRk },
+          14: { n: "BrtShortError", f: parse_BrtShortError },
+          15: { n: "BrtShortBool", f: parse_BrtShortBool },
+          16: { n: "BrtShortReal", f: parse_BrtShortReal },
+          17: { n: "BrtShortSt", f: parse_BrtShortSt },
+          18: { n: "BrtShortIsst", f: parse_BrtShortIsst },
           19: { n: "BrtSSTItem", f: parse_RichStr },
           20: { n: "BrtPCDIMissing" },
           21: { n: "BrtPCDINumber" },
@@ -31085,11 +32081,9 @@
           65535: { n: "" }
         };
         var XLSBRE = evert_key(XLSBRecordEnum, "n");
+        XLSBRE["BrtFRTArchID$"] = 16;
         var XLSRecordEnum = {
-          3: { n: "BIFF2NUM", f: parse_BIFF2NUM },
-          4: { n: "BIFF2STR", f: parse_BIFF2STR },
           6: { n: "Formula", f: parse_Formula },
-          9: { n: "BOF", f: parse_BOF },
           10: { n: "EOF", f: parsenoop2 },
           12: { n: "CalcCount", f: parseuint16 },
           13: { n: "CalcMode", f: parseuint16 },
@@ -31110,7 +32104,6 @@
           29: { n: "Selection" },
           34: { n: "Date1904", f: parsebool },
           35: { n: "ExternName", f: parse_ExternName },
-          36: { n: "COLWIDTH" },
           38: { n: "LeftMargin", f: parse_Xnum },
           39: { n: "RightMargin", f: parse_Xnum },
           40: { n: "TopMargin", f: parse_Xnum },
@@ -31280,7 +32273,6 @@
           515: { n: "Number", f: parse_Number },
           516: { n: "Label", f: parse_Label },
           517: { n: "BoolErr", f: parse_BoolErr },
-          518: { n: "Formula", f: parse_Formula },
           519: { n: "String", f: parse_String },
           520: { n: "Row", f: parse_Row },
           523: { n: "Index" },
@@ -31290,7 +32282,6 @@
           574: { n: "Window2", f: parse_Window2 },
           638: { n: "RK", f: parse_RK },
           659: { n: "Style" },
-          1030: { n: "Formula", f: parse_Formula },
           1048: { n: "BigName" },
           1054: { n: "Format", f: parse_Format },
           1084: { n: "ContinueBigName" },
@@ -31446,21 +32437,27 @@
           4199: { n: "BopPopCustom" },
           4200: { n: "Fbi2" },
           0: { n: "Dimensions", f: parse_Dimensions },
+          1: { n: "BIFF2BLANK" },
           2: { n: "BIFF2INT", f: parse_BIFF2INT },
+          3: { n: "BIFF2NUM", f: parse_BIFF2NUM },
+          4: { n: "BIFF2STR", f: parse_BIFF2STR },
           5: { n: "BoolErr", f: parse_BoolErr },
           7: { n: "String", f: parse_BIFF2STRING },
           8: { n: "BIFF2ROW" },
+          9: { n: "BOF", f: parse_BOF },
           11: { n: "Index" },
           22: { n: "ExternCount", f: parseuint16 },
           30: { n: "BIFF2FORMAT", f: parse_BIFF2Format },
           31: { n: "BIFF2FMTCNT" },
           32: { n: "BIFF2COLINFO" },
           33: { n: "Array", f: parse_Array },
+          36: { n: "COLWIDTH" },
           37: { n: "DefaultRowHeight", f: parse_DefaultRowHeight },
           50: { n: "BIFF2FONTXTRA", f: parse_BIFF2FONTXTRA },
-          52: { n: "DDEObjName" },
           62: { n: "BIFF2WINDOW2" },
+          52: { n: "DDEObjName" },
           67: { n: "BIFF2XF" },
+          68: { n: "BIFF2XFINDEX", f: parseuint16 },
           69: { n: "BIFF2FONTCLR" },
           86: { n: "BIFF4FMTCNT" },
           126: { n: "RK" },
@@ -31484,11 +32481,13 @@
           234: { n: "TabIdConf" },
           354: { n: "XL5Modify" },
           421: { n: "FileSharing2" },
+          518: { n: "Formula", f: parse_Formula },
           521: { n: "BOF", f: parse_BOF },
           536: { n: "Lbl", f: parse_Lbl },
           547: { n: "ExternName", f: parse_ExternName },
           561: { n: "Font" },
           579: { n: "BIFF3XF" },
+          1030: { n: "Formula", f: parse_Formula },
           1033: { n: "BOF", f: parse_BOF },
           1091: { n: "BIFF4XF" },
           2157: { n: "FeatInfo" },
@@ -31511,7 +32510,7 @@
         };
         var XLSRE = evert_key(XLSRecordEnum, "n");
         function write_biff_rec(ba, type, payload, length) {
-          var t = +type || +XLSRE[type];
+          var t = typeof type == "number" ? type : +type || +XLSRE[type];
           if (isNaN(t))
             return;
           var len = length || (payload || []).length || 0;
@@ -31564,13 +32563,7 @@
         function write_BIFF2BERR(r, c, val, t) {
           var out = new_buf(9);
           write_BIFF2Cell(out, r, c);
-          if (t == "e") {
-            out.write_shift(1, val);
-            out.write_shift(1, 1);
-          } else {
-            out.write_shift(1, val ? 1 : 0);
-            out.write_shift(1, 0);
-          }
+          write_Bes(val, t || "b", out);
           return out;
         }
         function write_BIFF2LABEL(r, c, val) {
@@ -31597,7 +32590,7 @@
                 return;
               case "s":
               case "str":
-                write_biff_rec(ba, 4, write_BIFF2LABEL(R, C, cell.v));
+                write_biff_rec(ba, 4, write_BIFF2LABEL(R, C, (cell.v || "").slice(0, 255)));
                 return;
             }
           write_biff_rec(ba, 1, write_BIFF2Cell(null, R, C));
@@ -31636,7 +32629,7 @@
               idx = i2;
           if (idx == 0 && !!o.sheet && wb.SheetNames[0] != o.sheet)
             throw new Error("Sheet not found: " + o.sheet);
-          write_biff_rec(ba, 9, write_BOF(wb, 16, o));
+          write_biff_rec(ba, o.biff == 4 ? 1033 : o.biff == 3 ? 521 : 9, write_BOF(wb, 16, o));
           write_ws_biff2(ba, wb.Sheets[wb.SheetNames[idx]], idx, o, wb);
           write_biff_rec(ba, 10);
           return ba.end();
@@ -31698,6 +32691,16 @@
           }
           delete ws["!links"];
         }
+        function write_ws_cols_biff8(ba, cols, ws) {
+          if (!cols)
+            return;
+          var cnt = 0;
+          cols.forEach(function(col, idx) {
+            if (++cnt <= 256 && col) {
+              write_biff_rec(ba, "ColInfo", write_ColInfo(col_obj_w(idx, col), idx));
+            }
+          });
+        }
         function write_ws_biff8_cell(ba, cell, R, C, opts) {
           var os = 16 + get_cell_style(opts.cellXfs, cell, opts);
           if (cell.v == null && !cell.bf) {
@@ -31723,7 +32726,7 @@
                   var isst = get_sst_id(opts.Strings, cell.v, opts.revStrings);
                   write_biff_rec(ba, "LabelSst", write_LabelSst(R, C, isst, os, opts));
                 } else
-                  write_biff_rec(ba, "Label", write_Label(R, C, cell.v, os, opts));
+                  write_biff_rec(ba, "Label", write_Label(R, C, (cell.v || "").slice(0, 255), os, opts));
                 break;
               default:
                 write_biff_rec(ba, "Blank", write_XLSCell(R, C, os));
@@ -31758,6 +32761,8 @@
           write_biff_rec(ba, "Guts", write_Guts([0, 0]));
           write_biff_rec(ba, "HCenter", writebool(false));
           write_biff_rec(ba, "VCenter", writebool(false));
+          if (b8)
+            write_ws_cols_biff8(ba, ws["!cols"], ws);
           write_biff_rec(ba, 512, write_Dimensions(range, opts));
           if (b8)
             ws["!links"] = [];
@@ -31895,6 +32900,15 @@
           return __toBuffer([bufs]);
         }
         function write_biff_buf(wb, opts) {
+          for (var i2 = 0; i2 <= wb.SheetNames.length; ++i2) {
+            var ws = wb.Sheets[wb.SheetNames[i2]];
+            if (!ws || !ws["!ref"])
+              continue;
+            var range = decode_range(ws["!ref"]);
+            if (range.e.c > 255) {
+              console.error("Worksheet '" + wb.SheetNames[i2] + "' extends beyond column IV (255).  Data may be lost.");
+            }
+          }
           var o = opts || {};
           switch (o.biff || 2) {
             case 8:
@@ -31956,7 +32970,7 @@
                 CS = tag.colspan ? +tag.colspan : 1;
                 if ((RS = +tag.rowspan) > 1 || CS > 1)
                   merges.push({ s: { r: R, c: C }, e: { r: R + (RS || 1) - 1, c: C + CS - 1 } });
-                var _t = tag.t || "";
+                var _t = tag.t || tag["data-t"] || "";
                 if (!m.length) {
                   C += CS;
                   continue;
@@ -32001,7 +33015,16 @@
             return ws;
           }
           function html_to_book(str, opts) {
-            return sheet_to_workbook(html_to_sheet(str, opts), opts);
+            var mtch = str.match(/<table.*?>[\s\S]*?<\/table>/gi);
+            if (!mtch || mtch.length == 0)
+              throw new Error("Invalid HTML: could not find <table>");
+            if (mtch.length == 1)
+              return sheet_to_workbook(html_to_sheet(mtch[0], opts), opts);
+            var wb = utils2.book_new();
+            mtch.forEach(function(s, idx) {
+              utils2.book_append_sheet(wb, html_to_sheet(s, opts), "Sheet" + (idx + 1));
+            });
+            return wb;
           }
           function make_html_row(ws, r, R, o) {
             var M = ws["!merges"] || [];
@@ -32031,15 +33054,18 @@
                 sp.rowspan = RS;
               if (CS > 1)
                 sp.colspan = CS;
-              sp.t = cell && cell.t || "z";
               if (o.editable)
                 w = '<span contenteditable="true">' + w + "</span>";
-              sp.id = (o.id || "sjs") + "-" + coord;
-              if (sp.t != "z") {
-                sp.v = cell.v;
+              else if (cell) {
+                sp["data-t"] = cell && cell.t || "z";
+                if (cell.v != null)
+                  sp["data-v"] = cell.v;
                 if (cell.z != null)
-                  sp.z = cell.z;
+                  sp["data-z"] = cell.z;
+                if (cell.l && (cell.l.Target || "#").charAt(0) != "#")
+                  w = '<a href="' + cell.l.Target + '">' + w + "</a>";
               }
+              sp.id = (o.id || "sjs") + "-" + coord;
               oo.push(writextag("td", w, sp));
             }
             var preamble = "<tr>";
@@ -32117,8 +33143,8 @@
               var elt = elts[_C];
               if (opts.display && is_dom_element_hidden(elt))
                 continue;
-              var v = elt.hasAttribute("v") ? elt.getAttribute("v") : htmldecode(elt.innerHTML);
-              var z = elt.getAttribute("z");
+              var v = elt.hasAttribute("data-v") ? elt.getAttribute("data-v") : elt.hasAttribute("v") ? elt.getAttribute("v") : htmldecode(elt.innerHTML);
+              var z = elt.getAttribute("data-z") || elt.getAttribute("z");
               for (midx = 0; midx < merges.length; ++midx) {
                 var m = merges[midx];
                 if (m.s.c == C + or_C && m.s.r < R + or_R && R + or_R <= m.e.r) {
@@ -32130,7 +33156,7 @@
               if ((RS = +elt.getAttribute("rowspan") || 1) > 1 || CS > 1)
                 merges.push({ s: { r: R + or_R, c: C + or_C }, e: { r: R + or_R + (RS || 1) - 1, c: C + or_C + (CS || 1) - 1 } });
               var o = { t: "s", v };
-              var _t = elt.getAttribute("t") || "";
+              var _t = elt.getAttribute("data-t") || elt.getAttribute("t") || "";
               if (v != null) {
                 if (v.length == 0)
                   o.t = _t || "z";
@@ -32150,6 +33176,17 @@
               }
               if (o.z === void 0 && z != null)
                 o.z = z;
+              var l = "", Aelts = elt.getElementsByTagName("A");
+              if (Aelts && Aelts.length) {
+                for (var Aelti = 0; Aelti < Aelts.length; ++Aelti)
+                  if (Aelts[Aelti].hasAttribute("href")) {
+                    l = Aelts[Aelti].getAttribute("href");
+                    if (l.charAt(0) != "#")
+                      break;
+                  }
+              }
+              if (l && l.charAt(0) != "#")
+                o.l = { Target: l };
               if (opts.dense) {
                 if (!ws[R + or_R])
                   ws[R + or_R] = [];
@@ -32343,6 +33380,9 @@
                     C += colpeat - 1;
                   } else if (Rn[1] !== "/") {
                     ++C;
+                    textp = "";
+                    textpidx = 0;
+                    textR = [];
                     colpeat = 1;
                     var rptR = rowpeat ? R + rowpeat - 1 : R;
                     if (C > range.e.c)
@@ -32413,6 +33453,11 @@
                       case "time":
                         q.t = "n";
                         q.v = parse_isodur(ctag["time-value"]) / 86400;
+                        if (opts.cellDates) {
+                          q.t = "d";
+                          q.v = numdate(q.v);
+                        }
+                        q.z = "HH:MM:SS";
                         break;
                       case "number":
                         q.t = "n";
@@ -32840,12 +33885,13 @@
                     atag = parsexmltag(Rn[0], false);
                     if (!atag.href)
                       break;
-                    atag.Target = atag.href;
+                    atag.Target = unescapexml(atag.href);
                     delete atag.href;
                     if (atag.Target.charAt(0) == "#" && atag.Target.indexOf(".") > -1) {
                       _Ref = ods_to_csf_3D(atag.Target.slice(1));
                       atag.Target = "#" + _Ref[0] + "!" + _Ref[1];
-                    }
+                    } else if (atag.Target.match(/^\.\.[\\\/]/))
+                      atag.Target = atag.Target.slice(3);
                   }
                   break;
                 case "table-protection":
@@ -32886,13 +33932,12 @@
         }();
         function parse_ods(zip, opts) {
           opts = opts || {};
-          var ods = !!safegetzipfile(zip, "objectdata");
-          if (ods)
+          if (safegetzipfile(zip, "META-INF/manifest.xml"))
             parse_manifest(getzipdata(zip, "META-INF/manifest.xml"), opts);
           var content = getzipstr(zip, "content.xml");
           if (!content)
-            throw new Error("Missing content.xml in " + (ods ? "ODS" : "UOF") + " file");
-          var wb = parse_content_xml(ods ? content : utf8read(content), opts);
+            throw new Error("Missing content.xml in ODS / UOF file");
+          var wb = parse_content_xml(utf8read(content), opts);
           if (safegetzipfile(zip, "meta.xml"))
             wb.Props = parse_core_props(getzipdata(zip, "meta.xml"));
           return wb;
@@ -32901,6 +33946,16 @@
           return parse_content_xml(data, opts);
         }
         var write_styles_ods = function() {
+          var master_styles = [
+            "<office:master-styles>",
+            '<style:master-page style:name="mp1" style:page-layout-name="mp1">',
+            "<style:header/>",
+            '<style:header-left style:display="false"/>',
+            "<style:footer/>",
+            '<style:footer-left style:display="false"/>',
+            "</style:master-page>",
+            "</office:master-styles>"
+          ].join("");
           var payload = "<office:document-styles " + wxt_helper({
             "xmlns:office": "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
             "xmlns:table": "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
@@ -32914,7 +33969,7 @@
             "xmlns:svg": "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
             "xmlns:of": "urn:oasis:names:tc:opendocument:xmlns:of:1.2",
             "office:version": "1.2"
-          }) + "></office:document-styles>";
+          }) + ">" + master_styles + "</office:document-styles>";
           return function wso() {
             return XML_HEADER + payload;
           };
@@ -32923,20 +33978,28 @@
           var write_text_p = function(text) {
             return escapexml(text).replace(/  +/g, function($$) {
               return '<text:s text:c="' + $$.length + '"/>';
-            }).replace(/\t/g, "<text:tab/>").replace(/\n/g, "<text:line-break/>").replace(/^ /, "<text:s/>").replace(/ $/, "<text:s/>");
+            }).replace(/\t/g, "<text:tab/>").replace(/\n/g, "</text:p><text:p>").replace(/^ /, "<text:s/>").replace(/ $/, "<text:s/>");
           };
           var null_cell_xml = "          <table:table-cell />\n";
           var covered_cell_xml = "          <table:covered-table-cell/>\n";
           var write_ws2 = function(ws, wb, i2) {
             var o = [];
             o.push('      <table:table table:name="' + escapexml(wb.SheetNames[i2]) + '" table:style-name="ta1">\n');
-            var R = 0, C = 0, range = decode_range(ws["!ref"]);
+            var R = 0, C = 0, range = decode_range(ws["!ref"] || "A1");
             var marr = ws["!merges"] || [], mi = 0;
             var dense = Array.isArray(ws);
-            for (R = 0; R < range.s.r; ++R)
-              o.push("        <table:table-row></table:table-row>\n");
+            if (ws["!cols"]) {
+              for (C = 0; C <= range.e.c; ++C)
+                o.push("        <table:table-column" + (ws["!cols"][C] ? ' table:style-name="co' + ws["!cols"][C].ods + '"' : "") + "></table:table-column>\n");
+            }
+            var H = "", ROWS = ws["!rows"] || [];
+            for (R = 0; R < range.s.r; ++R) {
+              H = ROWS[R] ? ' table:style-name="ro' + ROWS[R].ods + '"' : "";
+              o.push("        <table:table-row" + H + "></table:table-row>\n");
+            }
             for (; R <= range.e.r; ++R) {
-              o.push("        <table:table-row>\n");
+              H = ROWS[R] ? ' table:style-name="ro' + ROWS[R].ods + '"' : "";
+              o.push("        <table:table-row" + H + ">\n");
               for (C = 0; C < range.s.c; ++C)
                 o.push(null_cell_xml);
               for (; C <= range.e.c; ++C) {
@@ -33005,7 +34068,9 @@
                 if (cell.l && cell.l.Target) {
                   var _tgt = cell.l.Target;
                   _tgt = _tgt.charAt(0) == "#" ? "#" + csf_to_ods_3D(_tgt.slice(1)) : _tgt;
-                  text_p = writextag("text:a", text_p, { "xlink:href": _tgt });
+                  if (_tgt.charAt(0) != "#" && !_tgt.match(/^\w+:/))
+                    _tgt = "../" + _tgt;
+                  text_p = writextag("text:a", text_p, { "xlink:href": _tgt.replace(/&/g, "&amp;") });
                 }
                 o.push("          " + writextag("table:table-cell", writextag("text:p", text_p, {}), ct) + "\n");
               }
@@ -33014,7 +34079,7 @@
             o.push("      </table:table>\n");
             return o.join("");
           };
-          var write_automatic_styles_ods = function(o) {
+          var write_automatic_styles_ods = function(o, wb) {
             o.push(" <office:automatic-styles>\n");
             o.push('  <number:date-style style:name="N37" number:automatic-order="true">\n');
             o.push('   <number:month number:style="long"/>\n');
@@ -33023,7 +34088,47 @@
             o.push("   <number:text>/</number:text>\n");
             o.push("   <number:year/>\n");
             o.push("  </number:date-style>\n");
-            o.push('  <style:style style:name="ta1" style:family="table">\n');
+            var cidx = 0;
+            wb.SheetNames.map(function(n) {
+              return wb.Sheets[n];
+            }).forEach(function(ws) {
+              if (!ws)
+                return;
+              if (ws["!cols"]) {
+                for (var C = 0; C < ws["!cols"].length; ++C)
+                  if (ws["!cols"][C]) {
+                    var colobj = ws["!cols"][C];
+                    if (colobj.width == null && colobj.wpx == null && colobj.wch == null)
+                      continue;
+                    process_col(colobj);
+                    colobj.ods = cidx;
+                    var w = ws["!cols"][C].wpx + "px";
+                    o.push('  <style:style style:name="co' + cidx + '" style:family="table-column">\n');
+                    o.push('   <style:table-column-properties fo:break-before="auto" style:column-width="' + w + '"/>\n');
+                    o.push("  </style:style>\n");
+                    ++cidx;
+                  }
+              }
+            });
+            var ridx = 0;
+            wb.SheetNames.map(function(n) {
+              return wb.Sheets[n];
+            }).forEach(function(ws) {
+              if (!ws)
+                return;
+              if (ws["!rows"]) {
+                for (var R = 0; R < ws["!rows"].length; ++R)
+                  if (ws["!rows"][R]) {
+                    ws["!rows"][R].ods = ridx;
+                    var h = ws["!rows"][R].hpx + "px";
+                    o.push('  <style:style style:name="ro' + ridx + '" style:family="table-row">\n');
+                    o.push('   <style:table-row-properties fo:break-before="auto" style:row-height="' + h + '"/>\n');
+                    o.push("  </style:style>\n");
+                    ++ridx;
+                  }
+              }
+            });
+            o.push('  <style:style style:name="ta1" style:family="table" style:master-page-name="mp1">\n');
             o.push('   <style:table-properties table:display="true" style:writing-mode="lr-tb"/>\n');
             o.push("  </style:style>\n");
             o.push('  <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N37"/>\n');
@@ -33074,11 +34179,12 @@
               "xmlns:config": "urn:oasis:names:tc:opendocument:xmlns:config:1.0",
               "office:mimetype": "application/vnd.oasis.opendocument.spreadsheet"
             });
-            if (opts.bookType == "fods")
+            if (opts.bookType == "fods") {
               o.push("<office:document" + attr + fods + ">\n");
-            else
+              o.push(write_meta_ods().replace(/office:document-meta/g, "office:meta"));
+            } else
               o.push("<office:document-content" + attr + ">\n");
-            write_automatic_styles_ods(o);
+            write_automatic_styles_ods(o, wb);
             o.push("  <office:body>\n");
             o.push("    <office:spreadsheet>\n");
             for (var i2 = 0; i2 != wb.SheetNames.length; ++i2)
@@ -33110,7 +34216,7 @@
           manifest.push([f, "text/xml"]);
           rdf.push([f, "StylesFile"]);
           f = "meta.xml";
-          zip_add_file(zip, f, write_meta_ods());
+          zip_add_file(zip, f, XML_HEADER + write_meta_ods());
           manifest.push([f, "text/xml"]);
           rdf.push([f, "MetadataFile"]);
           f = "manifest.rdf";
@@ -33143,6 +34249,7 @@
         var write_txt_str = write_obj_str({ from_sheet: sheet_to_txt });
         var write_dbf_buf = write_obj_str(typeof DBF !== "undefined" ? DBF : {});
         var write_eth_str = write_obj_str(typeof ETH !== "undefined" ? ETH : {});
+        var write_wk1_buf = write_obj_str(typeof WK_ !== "undefined" ? { from_sheet: WK_.sheet_to_wk1 } : {});
         function fix_opts_func(defaults) {
           return function fix_opts(opts) {
             for (var i2 = 0; i2 != defaults.length; ++i2) {
@@ -33264,6 +34371,13 @@
             return parse_ods(zip, opts);
           if (safegetzipfile(zip, "Index/Document.iwa"))
             throw new Error("Unsupported NUMBERS file");
+          if (!safegetzipfile(zip, "[Content_Types].xml")) {
+            if (safegetzipfile(zip, "index.xml.gz"))
+              throw new Error("Unsupported NUMBERS 08 file");
+            if (safegetzipfile(zip, "index.xml"))
+              throw new Error("Unsupported NUMBERS 09 file");
+            throw new Error("Unsupported ZIP file");
+          }
           var entries = zipentries(zip);
           var dir = parse_ct(getzipstr(zip, "[Content_Types].xml"));
           var xlsb = false;
@@ -33420,8 +34534,18 @@
             SSF: SSF.get_table()
           };
           if (opts && opts.bookFiles) {
-            out.keys = entries;
-            out.files = zip.files;
+            if (zip.files) {
+              out.keys = entries;
+              out.files = zip.files;
+            } else {
+              out.keys = [];
+              out.files = {};
+              zip.FullPaths.forEach(function(p, idx) {
+                p = p.replace(/^Root Entry[\/]/, "");
+                out.keys.push(p);
+                out.files[p] = zip.FileIndex[idx];
+              });
+            }
           }
           if (opts && opts.bookVBA) {
             if (dir.vba.length > 0)
@@ -33690,10 +34814,10 @@
         }
         function readSync(data, opts) {
           reset_cp();
+          var o = opts || {};
           if (typeof ArrayBuffer !== "undefined" && data instanceof ArrayBuffer)
-            return readSync(new Uint8Array(data), opts);
+            return readSync(new Uint8Array(data), (o = dup(o), o.type = "array", o));
           var d = data, n = [0, 0, 0, 0], str = false;
-          var o = opts || {};
           if (o.cellStyles) {
             o.cellNF = true;
             o.sheetStubs = true;
@@ -33728,12 +34852,14 @@
                 return read_cfb(CFB.read(d, o), o);
               break;
             case 9:
-              if (n[1] <= 4)
+              if (n[1] <= 8)
                 return parse_xlscfb(d, o);
               break;
             case 60:
               return parse_xlml(d, o);
             case 73:
+              if (n[1] === 73 && n[2] === 42 && n[3] === 0)
+                throw new Error("TIFF Image File is not a spreadsheet");
               if (n[1] === 68)
                 return read_wb_ID(d, o);
               break;
@@ -33748,11 +34874,16 @@
             case 255:
               if (n[1] === 254) {
                 return read_utf16(d, o);
-              }
+              } else if (n[1] === 0 && n[2] === 2 && n[3] === 0)
+                return WK_.to_workbook(d, o);
               break;
             case 0:
-              if (n[1] === 0 && n[2] >= 2 && n[3] === 0)
-                return WK_.to_workbook(d, o);
+              if (n[1] === 0) {
+                if (n[2] >= 2 && n[3] === 0)
+                  return WK_.to_workbook(d, o);
+                if (n[2] === 0 && (n[3] === 8 || n[3] === 9))
+                  return WK_.to_workbook(d, o);
+              }
               break;
             case 3:
             case 131:
@@ -33767,6 +34898,10 @@
             case 13:
             case 32:
               return read_plaintext_raw(d, o);
+            case 137:
+              if (n[1] === 80 && n[2] === 78 && n[3] === 71)
+                throw new Error("PNG Image File is not a spreadsheet");
+              break;
           }
           if (DBF.versions.indexOf(n[0]) > -1 && n[2] <= 12 && n[3] <= 31)
             return DBF.to_workbook(d, o);
@@ -33796,7 +34931,7 @@
           return CFB.write(cfb, o);
         }
         function write_zip_type(wb, opts) {
-          var o = opts || {};
+          var o = dup(opts || {});
           var z = write_zip(wb, o);
           var oopts = {};
           if (o.compression)
@@ -33897,7 +35032,7 @@
         function writeSync(wb, opts) {
           reset_cp();
           check_wb(wb);
-          var o = opts || {};
+          var o = dup(opts || {});
           if (o.cellStyles) {
             o.cellNF = true;
             o.sheetStubs = true;
@@ -33934,6 +35069,10 @@
               return write_string_type(write_eth_str(wb, o), o);
             case "fods":
               return write_string_type(write_ods(wb, o), o);
+            case "wk1":
+              return write_binary_type(write_wk1_buf(wb, o), o);
+            case "wk3":
+              return write_binary_type(WK_.book_to_wk3(wb, o), o);
             case "biff2":
               if (!o.biff)
                 o.biff = 2;
@@ -34029,7 +35168,7 @@
                     break;
                   continue;
                 case "e":
-                  v = void 0;
+                  v = v == 0 ? null : void 0;
                   break;
                 case "s":
                 case "d":
@@ -34041,7 +35180,9 @@
               }
               if (hdr[C] != null) {
                 if (v == null) {
-                  if (defval !== void 0)
+                  if (val.t == "e" && v === null)
+                    row[hdr[C]] = null;
+                  else if (defval !== void 0)
                     row[hdr[C]] = defval;
                   else if (raw && v === null)
                     row[hdr[C]] = null;
@@ -34300,6 +35441,9 @@
                     v = datenum(v);
                   }
                   z = o.dateNF || SSF._table[14];
+                } else if (v === null && o.nullError) {
+                  t = "e";
+                  v = 0;
                 }
                 if (!cell)
                   ws[ref] = cell = { t, v };
@@ -34471,7 +35615,12 @@
         })(utils2);
         if (has_buf && typeof __require != "undefined")
           (function() {
-            var Readable = require_stream().Readable;
+            var strmod = require_stream();
+            if (!strmod)
+              return;
+            var Readable = strmod.Readable;
+            if (!Readable)
+              return;
             var write_csv_stream = function(sheet, opts) {
               var stream = Readable();
               var o = opts == null ? {} : opts;
@@ -34642,18 +35791,23 @@
       else if (typeof module !== "undefined" && module.exports)
         make_xlsx_lib(module.exports);
       else if (typeof define === "function" && define.amd)
-        define(function() {
+        define("xlsx", function() {
           if (!XLSX.version)
             make_xlsx_lib(XLSX);
           return XLSX;
         });
       else
         make_xlsx_lib(XLSX);
+      if (typeof window !== "undefined" && !window.XLSX)
+        try {
+          window.XLSX = XLSX;
+        } catch (e) {
+        }
     }
   });
 
   // src/lib/parse-excel.ts
-  async function parseExcel(arrayBuffer, options) {
+  function parseExcel(arrayBuffer, options) {
     const dataUrl = "dummy";
     const workbook = (0, import_xlsx.read)(arrayBuffer, {
       type: "array"
@@ -34685,19 +35839,20 @@
   var src_exports = {};
   __export(src_exports, {
     ExcelLoader: () => ExcelLoader2,
-    ExcelWorkerLoader: () => ExcelLoader,
-    _typecheckLoader: () => _typecheckLoader
+    ExcelWorkerLoader: () => ExcelLoader
   });
-  var ExcelLoader2, _typecheckLoader;
+  var ExcelLoader2;
   var init_src = __esm({
     "src/index.ts"() {
       init_excel_loader();
       init_parse_excel();
       ExcelLoader2 = {
         ...ExcelLoader,
-        parse: (arrayBuffer, options) => parseExcel(arrayBuffer, options)
+        async parse(arrayBuffer, options) {
+          const data = parseExcel(arrayBuffer, options);
+          return { shape: "object-row-table", data };
+        }
       };
-      _typecheckLoader = ExcelLoader2;
     }
   });
 
@@ -34711,4 +35866,6 @@
   });
   require_bundle();
 })();
+/*! cpexcel.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/*! cputils.js (C) 2013-present SheetJS -- http://sheetjs.com */
 /*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */