version bump 0.9.2: more bugfixes

- decode sheet name for XLSX and XLML (fixes #203 h/t @rocketmonkeys) - XFExt (fixes #298 h/t @aetna-softwares @aimcom @baharudinafif) - handle truly empty `<is>` elements (fixes #506 h/t @asksahil) - pin version numbers for dependencies (fixes #469 h/t @nhtera) - sed usage fix (see #572 h/t @liryna) - fix hex2RGB substr indices (fixes #294 h/t @kamorahul) - removed stale typescript files (see #442) - reworked shift formula regex (fixed #551 h/t @SheetJSDev) - README note on webpack codepage suppression (fixes #438 h/t @rusty1s) - README note on WTF (fixes #487 h/t @livesoftware)
2017-03-13 02:46:37 -04:00 · 2017-03-13 02:46:37 -04:00 · 456ab63dc4
commit 456ab63dc4
parent 8cd9e81569
29 changed files with 421 additions and 530 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
 node_modules
+*.tgz
 misc/coverage.html
 misc/prof.js
 v8.log
--- a/.npmignore
+++ b/.npmignore
@ -4,6 +4,7 @@ demos/
 index.html
 misc/
 node_modules
+*.tgz
 tmp
 *.txt
 *.[cC][sS][vV]
@ -20,6 +21,7 @@ tmp
 *.htm
 *.html
 *.sheetjs
+*.exe
 .gitignore
 .jshintrc
 CONTRIBUTING.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,18 @@ but not limited to API changes and file location changes.  Minor behavioral
 changes may not be included if they are not expected to break existing code.


+## 0.9.2 (2017-03-13)
+
+* Removed stale TypeScript definition files.  Flowtype comments are used in the
+  `xlsx.flow.js` source and stripped to produce `xlsx.js`.
+* sed usage reworked to support GNU sed in-place form.  BSD sed seems to work,
+  but the build script has not been tested on other sed variants:
+
+```bash
+$ sed -i.ext  [...] # GNU
+$ sed -i .ext [...] # bsd
+```
+
 ## 0.9.0 (2017-03-09)

 * Removed ods.js source.  The xlsx.js source absorbed the ODS logic and exposes
--- a/README.md
+++ b/README.md
@ -5,36 +5,68 @@ implementation from official specifications, related documents, and test files.
 Emphasis on parsing and writing robustness, cross-format feature compatibility
 with a unified JS representation, and ES3/ES5 browser compatibility back to IE6.

-File format support for known spreadsheet data formats:
+[**In-Browser Demo**](http://oss.sheetjs.com/js-xlsx)

-| Format                                                       | Read  | Write |
-|:-------------------------------------------------------------|:-----:|:-----:|
-| **Excel Worksheet/Workbook Formats**                         |:-----:|:-----:|
-| Excel 2007+ XML Formats (XLSX/XLSM)                          |  :o:  |  :o:  |
-| Excel 2007+ Binary Format (XLSB BIFF12)                      |  :o:  |  :o:  |
-| Excel 2003-2004 XML Format (XML "SpreadsheetML")             |  :o:  |       |
-| Excel 97-2004 (XLS BIFF8)                                    |  :o:  |       |
-| Excel 5.0/95 (XLS BIFF5)                                     |  :o:  |       |
-| Excel 4.0 (XLS/XLW BIFF4)                                    |  :o:  |       |
-| Excel 3.0 (XLS BIFF3)                                        |  :o:  |       |
-| Excel 2.0/2.1 (XLS BIFF2)                                    |  :o:  |  :o:  |
-| **Excel Supported Text Formats**                             |:-----:|:-----:|
-| Delimiter-Separated Values (CSV/TSV/DSV)                     |       |  :o:  |
-| **Other Workbook/Worksheet Formats**                         |:-----:|:-----:|
-| OpenDocument Spreadsheet (ODS)                               |  :o:  |  :o:  |
-| Flat XML ODF Spreadsheet (FODS)                              |  :o:  |  :o:  |
-| Uniform Office Format Spreadsheet (标文通 UOS1/UOS2)         |  :o:  |       |
-| **Other Common Spreadsheet Output Formats**                  |:-----:|:-----:|
-| HTML Tables                                                  |  :o:  |       |
+[**Source Code**](http://git.io/xlsx)
+
+[**Commercial Support**](http://sheetjs.com/reinforcements)
+
+[**File format support for known spreadsheet data formats:**](#file-formats)

 ![circo graph of format support](formats.png)

-Demo: <http://oss.sheetjs.com/js-xlsx>

-Source: <http://git.io/xlsx>

-Paid support available through the [reinforcements program](http://sheetjs.com/reinforcements)
+## Table of Contents

+<!-- toc -->
+
+- [Installation](#installation)
+  * [JS Ecosystem Demos](#js-ecosystem-demos)
+  * [Optional Modules](#optional-modules)
+  * [ECMAScript 5 Compatibility](#ecmascript-5-compatibility)
+- [Parsing Workbooks](#parsing-workbooks)
+- [Working with the Workbook](#working-with-the-workbook)
+- [Writing Workbooks](#writing-workbooks)
+- [Interface](#interface)
+  * [Parsing functions](#parsing-functions)
+  * [Writing functions](#writing-functions)
+  * [Utilities](#utilities)
+- [Workbook / Worksheet / Cell Object Description](#workbook--worksheet--cell-object-description)
+  * [General Structures](#general-structures)
+  * [Cell Object](#cell-object)
+  * [Data Types](#data-types)
+  * [Formulae](#formulae)
+  * [Worksheet Object](#worksheet-object)
+  * [Workbook Object](#workbook-object)
+- [Parsing Options](#parsing-options)
+  * [Input Type](#input-type)
+  * [Guessing File Type](#guessing-file-type)
+- [Writing Options](#writing-options)
+  * [Supported Output Formats](#supported-output-formats)
+  * [Output Type](#output-type)
+- [Utility Functions](#utility-functions)
+  * [Formulae Output](#formulae-output)
+  * [CSV and general DSV Output](#csv-and-general-dsv-output)
+  * [JSON](#json)
+- [File Formats](#file-formats)
+  * [Excel 2007+ XML (XLSX/XLSM)](#excel-2007-xml-xlsxxlsm)
+  * [Excel 2.0-95 (BIFF2/BIFF3/BIFF4/BIFF5)](#excel-20-95-biff2biff3biff4biff5)
+  * [Excel 97-2004 Binary (BIFF8)](#excel-97-2004-binary-biff8)
+  * [Excel 2003-2004 (SpreadsheetML)](#excel-2003-2004-spreadsheetml)
+  * [Excel 2007+ Binary (XLSB, BIFF12)](#excel-2007-binary-xlsb-biff12)
+  * [OpenDocument Spreadsheet (ODS/FODS) and Uniform Office Spreadsheet (UOS1/2)](#opendocument-spreadsheet-odsfods-and-uniform-office-spreadsheet-uos12)
+  * [Comma-Separated Values](#comma-separated-values)
+  * [HTML](#html)
+- [Testing](#testing)
+  * [Tested Environments](#tested-environments)
+  * [Test Files](#test-files)
+- [Contributing](#contributing)
+- [License](#license)
+- [References](#references)
+- [Badges](#badges)
+
+<!-- tocstop -->

 ## Installation

@ -83,6 +115,17 @@ An appropriate version for each dependency is included in the dist/ directory.

 The complete single-file version is generated at `dist/xlsx.full.min.js`

+Webpack and browserify builds include optional modules by default.  Webpack can
+be configured to remove support with `resolve.alias`:
+
+```js
+  /* uncomment the lines below to remove support */
+  resolve: {
+    alias: { "./dist/cpexcel.js": "" } // <-- omit international support
+  }
+```
+
+
 ### ECMAScript 5 Compatibility

 Since xlsx.js uses ES5 functions like `Array#forEach`, older browsers require
@ -143,10 +186,10 @@ oReq.send();
 ```js
 /* processing array buffers, only required for readAsArrayBuffer */
 function fixdata(data) {
-	var o = "", l = 0, w = 10240;
-	for(; l<data.byteLength/w; ++l) o+=String.fromCharCode.apply(null,new Uint8Array(data.slice(l*w,l*w+w)));
-	o+=String.fromCharCode.apply(null, new Uint8Array(data.slice(l*w)));
-	return o;
+  var o = "", l = 0, w = 10240;
+  for(; l<data.byteLength/w; ++l) o+=String.fromCharCode.apply(null,new Uint8Array(data.slice(l*w,l*w+w)));
+  o+=String.fromCharCode.apply(null, new Uint8Array(data.slice(l*w)));
+  return o;
 }

 var rABS = true; // true: readAsBinaryString ; false: readAsArrayBuffer
@ -528,6 +571,7 @@ The exported `read` and `readFile` functions accept an options argument:
 | bookSheets  | false   | If true, only parse enough to get the sheet names    |
 | bookVBA     | false   | If true, expose vbaProject.bin to `vbaraw` field **  |
 | password    | ""      | If defined and file is encrypted, use password **    |
+| WTF         | false   | If true, throw errors on unexpected file features ** |

 - `cellFormula` option only applies to formats that require extra processing to
  parse formulae (XLS/XLSB).
@ -545,6 +589,9 @@ The exported `read` and `readFile` functions accept an options argument:
 - `cellDates` currently does not convert numerical dates to JS dates.
 - Currently only XOR encryption is supported.  Unsupported error will be thrown
  for files employing other encryption methods.
+- WTF is mainly for development.  By default, the parser will suppress read
+  errors on single worksheets, allowing you to read from the worksheets that do
+  parse properly. Setting `WTF:1` forces those errors to be thrown.

 The defaults are enumerated in bits/84\_defaults.js

@ -754,8 +801,37 @@ Example showing the effect of `raw`:

 ## File Formats

-Despite the fact that the name of the library is `xlsx`, it supports numerous
-non-XLSX file formats:
+Despite the library name `xlsx`, it supports numerous spreadsheet file formats:
+
+| Format                                                       | Read  | Write |
+|:-------------------------------------------------------------|:-----:|:-----:|
+| **Excel Worksheet/Workbook Formats**                         |:-----:|:-----:|
+| Excel 2007+ XML Formats (XLSX/XLSM)                          |  :o:  |  :o:  |
+| Excel 2007+ Binary Format (XLSB BIFF12)                      |  :o:  |  :o:  |
+| Excel 2003-2004 XML Format (XML "SpreadsheetML")             |  :o:  |       |
+| Excel 97-2004 (XLS BIFF8)                                    |  :o:  |       |
+| Excel 5.0/95 (XLS BIFF5)                                     |  :o:  |       |
+| Excel 4.0 (XLS/XLW BIFF4)                                    |  :o:  |       |
+| Excel 3.0 (XLS BIFF3)                                        |  :o:  |       |
+| Excel 2.0/2.1 (XLS BIFF2)                                    |  :o:  |  :o:  |
+| **Excel Supported Text Formats**                             |:-----:|:-----:|
+| Delimiter-Separated Values (CSV/TSV/DSV)                     |       |  :o:  |
+| **Other Workbook/Worksheet Formats**                         |:-----:|:-----:|
+| OpenDocument Spreadsheet (ODS)                               |  :o:  |  :o:  |
+| Flat XML ODF Spreadsheet (FODS)                              |  :o:  |  :o:  |
+| Uniform Office Format Spreadsheet (标文通 UOS1/UOS2)         |  :o:  |       |
+| **Other Common Spreadsheet Output Formats**                  |:-----:|:-----:|
+| HTML Tables                                                  |  :o:  |       |
+
+### Excel 2007+ XML (XLSX/XLSM)
+
+XLSX and XLSM files are ZIP containers containing a series of XML files in
+accordance with the Open Packaging Conventions (OPC).  The XLSM filetype, almost
+identical to XLSX, is used for files containing macros.
+
+The format is standardized in ECMA-376 and later in ISO/IEC 29500.  Excel does
+not follow the specification, and there are additional documents discussing how
+Excel deviates from the specification.

 ### Excel 2.0-95 (BIFF2/BIFF3/BIFF4/BIFF5)

@ -816,26 +892,6 @@ Excel HTML worksheets include special metadata encoded in styles.  For example,
 `mso-number-format` is a localized string containing the number format.  Despite
 the metadata the output is valid HTML, although it does accept bare `&` symbols.

-## Tested Environments
-
- - NodeJS 0.8, 0.9, 0.10, 0.11, 0.12, 4.x, 5.x, 6.x, 7.x
- - IE 6/7/8/9/10/11 (IE6-9 browsers require shims for interacting with client)
- - Chrome 24+
- - Safari 6+
- - FF 18+
-
-Tests utilize the mocha testing framework.  Travis-CI and Sauce Labs links:
-
- - <https://travis-ci.org/SheetJS/js-xlsx> for XLSX module in nodejs
- - <https://travis-ci.org/SheetJS/SheetJS.github.io> for XLS\* modules
- - <https://saucelabs.com/u/sheetjs> for XLS\* modules using Sauce Labs
-
-## Test Files
-
-Test files are housed in [another repo](https://github.com/SheetJS/test_files).
-
-Running `make init` will refresh the `test_files` submodule and get the files.
-
 ## Testing

 `make test` will run the node-based tests.  By default it runs tests on files in
@ -865,9 +921,9 @@ $ make lint        # JSHint and JSCS checks
 $ make flow        # make lint + Flow checking
 ```

-To run the in-browser tests, clone
-[The oss.sheetjs.com repo](https://github.com/SheetJS/SheetJS.github.io) and
-replace the xlsx.js file (then fire up the browser and go to `stress.html`):
+To run the in-browser tests, clone the repo for
+[oss.sheetjs.com](https://github.com/SheetJS/SheetJS.github.io) and replace
+the xlsx.js file (then fire up the browser and go to `stress.html`):

 ```bash
 $ cp xlsx.js ../SheetJS.github.io
@ -875,6 +931,26 @@ $ cd ../SheetJS.github.io
 $ simplehttpserver # or "python -mSimpleHTTPServer" or "serve"
 $ open -a Chromium.app http://localhost:8000/stress.html
 ```
+### Tested Environments
+
+ - NodeJS 0.8, 0.9, 0.10, 0.11, 0.12, 4.x, 5.x, 6.x, 7.x
+ - IE 6/7/8/9/10/11 (IE6-9 browsers require shims for interacting with client)
+ - Chrome 24+
+ - Safari 6+
+ - FF 18+
+
+Tests utilize the mocha testing framework.  Travis-CI and Sauce Labs links:
+
+ - <https://travis-ci.org/SheetJS/js-xlsx> for XLSX module in nodejs
+ - <https://travis-ci.org/SheetJS/SheetJS.github.io> for XLS\* modules
+ - <https://saucelabs.com/u/sheetjs> for XLS\* modules using Sauce Labs
+
+### Test Files
+
+Test files are housed in [another repo](https://github.com/SheetJS/test_files).
+
+Running `make init` will refresh the `test_files` submodule and get the files.
+


 ## Contributing
--- a/bits/01_version.js
+++ b/bits/01_version.js
@ -1 +1 @@
-XLSX.version = '0.9.1';
+XLSX.version = '0.9.2';
--- a/bits/30_ctype.js
+++ b/bits/30_ctype.js
@ -193,7 +193,6 @@ function parse_ct(data/*:?string*/, opts) {
 			case '<Default': ctext[y.Extension] = y.ContentType; break;
 			case '<Override':
 				if(ct[ct2type[y.ContentType]] !== undefined) ct[ct2type[y.ContentType]].push(y.PartName);
-				else if(opts.WTF) console.error(y);
 				break;
 		}
 	});
--- a/bits/34_extprops.js
+++ b/bits/34_extprops.js
@ -70,7 +70,7 @@ function write_ext_props(cp, opts)/*:string*/ {

 	/* TODO: HeadingPairs, TitlesOfParts */
 	o[o.length] = (W('HeadingPairs', W('vt:vector', W('vt:variant', '<vt:lpstr>Worksheets</vt:lpstr>')+W('vt:variant', W('vt:i4', String(cp.Worksheets))), {size:2, baseType:"variant"})));
-	o[o.length] = (W('TitlesOfParts', W('vt:vector', cp.SheetNames.map(function(s) { return "<vt:lpstr>" + s + "</vt:lpstr>"; }).join(""), {size: cp.Worksheets, baseType:"lpstr"})));
+	o[o.length] = (W('TitlesOfParts', W('vt:vector', cp.SheetNames.map(function(s) { return "<vt:lpstr>" + escapexml(s) + "</vt:lpstr>"; }).join(""), {size: cp.Worksheets, baseType:"lpstr"})));
 	if(o.length>2){ o[o.length] = ('</Properties>'); o[1]=o[1].replace("/>",">"); }
 	return o.join("");
 }
--- a/bits/39_xlsbiff.js
+++ b/bits/39_xlsbiff.js
@ -34,7 +34,6 @@ function parse_XTI(blob, length) {
 function parse_RkRec(blob, length) {
 	var ixfe = blob.read_shift(2);
 	var RK = parse_RkNumber(blob);
-	//console.log("::", ixfe, RK,";;");
 	return [ixfe, RK];
 }

--- a/bits/45_styutils.js
+++ b/bits/45_styutils.js
@ -1,6 +1,6 @@
 function hex2RGB(h) {
 	var o = h.substr(h[0]==="#"?1:0,6);
-	return [parseInt(o.substr(0,2),16),parseInt(o.substr(0,2),16),parseInt(o.substr(0,2),16)];
+	return [parseInt(o.substr(0,2),16),parseInt(o.substr(2,2),16),parseInt(o.substr(4,2),16)];
 }
 function rgb2Hex(rgb) {
 	for(var i=0,o=1; i!=3; ++i) o = o*256 + (rgb[i]>255?255:rgb[i]<0?0:rgb[i]);
--- a/bits/50_styxls.js
+++ b/bits/50_styxls.js
@ -68,10 +68,15 @@ function update_xfext(xf, xfext) {
 		switch(xfe[0]) { /* 2.5.108 extPropData */
 			case 0x04: break; /* foreground color */
 			case 0x05: break; /* background color */
-			case 0x07: case 0x08: case 0x09: case 0x0a: break;
+			case 0x06: break; /* gradient fill */
+			case 0x07: break; /* top cell border color */
+			case 0x08: break; /* bottom cell border color */
+			case 0x09: break; /* left cell border color */
+			case 0x0a: break; /* right cell border color */
+			case 0x0b: break; /* diagonal cell border color */
 			case 0x0d: break; /* text color */
 			case 0x0e: break; /* font scheme */
-			default: throw "bafuq" + xfe[0].toString(16);
+			case 0x0f: break; /* indentation level */
 		}
 	});
 }
--- a/bits/61_fcommon.js
+++ b/bits/61_fcommon.js
@ -16,9 +16,10 @@ var rc_to_a1 = (function(){
 	};
 })();

-/* TODO actually parse the formula */
+/* no defined name can collide with a valid cell address A1:XFD1048576 ... except LOG10! */
+var crefregex = /(^|[^._A-Z0-9])([$]?)([A-Z]{1,2}|[A-W][A-Z]{2}|X[A-E][A-Z]|XF[A-D])([$]?)([1-9]\d{0,5}|10[0-3]\d{4}|104[0-7]\d{3}|1048[0-4]\d{2}|10485[0-6]\d|104857[0-6])(?![_.\(A-Za-z0-9])/g;
 function shift_formula_str(f/*:string*/, delta/*:Cell*/)/*:string*/ {
-	return f.replace(/(^|[^A-Z0-9])([$]?)([A-Z]+)([$]?)(\d+)/g, function($0, $1, $2, $3, $4, $5, off, str) {
+	return f.replace(crefregex, function($0, $1, $2, $3, $4, $5, off, str) {
 		return $1+($2=="$" ? $2+$3 : encode_col(decode_col($3)+delta.c))+($4=="$" ? $4+$5 : encode_row(decode_row($5) + delta.r));
 	});
 }
--- a/bits/67_wsxml.js
+++ b/bits/67_wsxml.js
@ -265,7 +265,7 @@ return function parse_ws_xml_data(sdata, s, opts, guess) {
 				case 'inlineStr':
 					cref = d.match(isregex);
 					p.t = 's';
-					if(cref != null) { if((sstr = parse_si(cref[1]))) p.v = sstr.t; } else p.v = "";
+					if(cref != null && (sstr = parse_si(cref[1]))) p.v = sstr.t; else p.v = "";
 					break; // inline string
 				case 'b': p.v = parsexmlbool(p.v); break;
 				case 'd':
--- a/bits/72_wbxml.js
+++ b/bits/72_wbxml.js
@ -41,7 +41,7 @@ function parse_wb_xml(data, opts)/*:WorkbookFile*/ {
 			/* 18.2.20 sheets CT_Sheets 1 */
 			case '<sheets>': case '</sheets>': break; // aggregate sheet
 			/* 18.2.19   sheet CT_Sheet + */
-			case '<sheet': delete y[0]; y.name = utf8read(y.name); wb.Sheets.push(y); break;
+			case '<sheet': delete y[0]; y.name = unescapexml(utf8read(y.name)); wb.Sheets.push(y); break;
 			case '</sheet>': break;

 			/* 18.2.15 functionGroups CT_FunctionGroups ? */
@ -140,7 +140,7 @@ function write_wb_xml(wb/*:Workbook*/, opts/*:?WriteOpts*/)/*:string*/ {
 	o[o.length] = (writextag('workbookPr', null, {date1904:safe1904(wb)}));
 	o[o.length] = "<sheets>";
 	for(var i = 0; i != wb.SheetNames.length; ++i)
-		o[o.length] = (writextag('sheet',null,{name:wb.SheetNames[i].substr(0,31), sheetId:""+(i+1), "r:id":"rId"+(i+1)}));
+		o[o.length] = (writextag('sheet',null,{name:escapexml(wb.SheetNames[i].substr(0,31)), sheetId:""+(i+1), "r:id":"rId"+(i+1)}));
 	o[o.length] = "</sheets>";
 	if(o.length>2){ o[o.length] = '</workbook>'; o[1]=o[1].replace("/>",">"); }
 	return o.join("");
--- a/bits/75_xlml.js
+++ b/bits/75_xlml.js
@ -237,7 +237,7 @@ function parse_xlml_xml(d, opts)/*:Workbook*/ {
 				r = c = 0;
 				state.push([Rn[3], false]);
 				tmp = xlml_parsexmltag(Rn[0]);
-				sheetname = tmp.Name;
+				sheetname = unescapexml(tmp.Name);
 				cursheet = {};
 				mergecells = [];
 			}
--- a/dist/xlsx.core.min.js
+++ b/dist/xlsx.core.min.js
--- a/dist/xlsx.core.min.map
+++ b/dist/xlsx.core.min.map
--- a/dist/xlsx.full.min.js
+++ b/dist/xlsx.full.min.js
--- a/dist/xlsx.full.min.map
+++ b/dist/xlsx.full.min.map
--- a/dist/xlsx.js
+++ b/dist/xlsx.js
@ -5,7 +5,7 @@
 /*exported XLSX */
 var XLSX = {};
 (function make_xlsx(XLSX){
-XLSX.version = '0.9.1';
+XLSX.version = '0.9.2';
 var current_codepage = 1200, current_cptable;
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
 	if(typeof cptable === 'undefined') cptable = require('./dist/cpexcel.js');
@ -92,7 +92,7 @@ function s2a(s) {
 var bconcat = function(bufs) { return [].concat.apply([], bufs); };

 var chr0 = /\u0000/g, chr1 = /[\u0001-\u0006]/;
-/* ssf.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* ssf.js (C) 2013-present SheetJS -- http://sheetjs.com */
 /*jshint -W041 */
 var SSF = {};
 var make_ssf = function make_ssf(SSF){
@ -106,7 +106,7 @@ function pad0r1(v,d){var t=""+Math.round(v); return t.length>=d?t:fill('0',d-t.l
 function pad0r2(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
 var p2_32 = Math.pow(2,32);
 function pad0r(v,d){if(v>p2_32||v<-p2_32) return pad0r1(v,d); var i = Math.round(v); return pad0r2(i,d); }
-function isgeneral(s, i) { return s.length >= 7 + i && (s.charCodeAt(i)|32) === 103 && (s.charCodeAt(i+1)|32) === 101 && (s.charCodeAt(i+2)|32) === 110 && (s.charCodeAt(i+3)|32) === 101 && (s.charCodeAt(i+4)|32) === 114 && (s.charCodeAt(i+5)|32) === 97 && (s.charCodeAt(i+6)|32) === 108; }
+function isgeneral(s, i) { i = i || 0; return s.length >= 7 + i && (s.charCodeAt(i)|32) === 103 && (s.charCodeAt(i+1)|32) === 101 && (s.charCodeAt(i+2)|32) === 110 && (s.charCodeAt(i+3)|32) === 101 && (s.charCodeAt(i+4)|32) === 114 && (s.charCodeAt(i+5)|32) === 97 && (s.charCodeAt(i+6)|32) === 108; }
 /* Options */
 var opts_fmt = [
 	["date1904", 0],
@ -118,36 +118,36 @@ function fixopts(o){
 }
 SSF.opts = opts_fmt;
 var table_fmt = {
-	0:  'General',
-	1:  '0',
-	2:  '0.00',
-	3:  '#,##0',
-	4:  '#,##0.00',
-	9:  '0%',
-	10: '0.00%',
-	11: '0.00E+00',
-	12: '# ?/?',
-	13: '# ??/??',
-	14: 'm/d/yy',
-	15: 'd-mmm-yy',
-	16: 'd-mmm',
-	17: 'mmm-yy',
-	18: 'h:mm AM/PM',
-	19: 'h:mm:ss AM/PM',
-	20: 'h:mm',
-	21: 'h:mm:ss',
-	22: 'm/d/yy h:mm',
-	37: '#,##0 ;(#,##0)',
-	38: '#,##0 ;[Red](#,##0)',
-	39: '#,##0.00;(#,##0.00)',
-	40: '#,##0.00;[Red](#,##0.00)',
-	45: 'mm:ss',
-	46: '[h]:mm:ss',
-	47: 'mmss.0',
-	48: '##0.0E+0',
-	49: '@',
-	56: '"上午/下午 "hh"時"mm"分"ss"秒 "',
-	65535: 'General'
+0:  'General',
+1:  '0',
+2:  '0.00',
+3:  '#,##0',
+4:  '#,##0.00',
+9:  '0%',
+10: '0.00%',
+11: '0.00E+00',
+12: '# ?/?',
+13: '# ??/??',
+14: 'm/d/yy',
+15: 'd-mmm-yy',
+16: 'd-mmm',
+17: 'mmm-yy',
+18: 'h:mm AM/PM',
+19: 'h:mm:ss AM/PM',
+20: 'h:mm',
+21: 'h:mm:ss',
+22: 'm/d/yy h:mm',
+37: '#,##0 ;(#,##0)',
+38: '#,##0 ;[Red](#,##0)',
+39: '#,##0.00;(#,##0.00)',
+40: '#,##0.00;[Red](#,##0.00)',
+45: 'mm:ss',
+46: '[h]:mm:ss',
+47: 'mmss.0',
+48: '##0.0E+0',
+49: '@',
+56: '"上午/下午 "hh"時"mm"分"ss"秒 "',
+65535: 'General'
 };
 var days = [
 	['Sun', 'Sunday'],
@ -253,8 +253,8 @@ function parse_date_code(v,opts,b2) {
 	else if(date === 0) {dout = b2 ? [1317,8,29] : [1900,1,0]; dow=6;}
 	else {
 		if(date > 60) --date;
-		/* 1 = Jan 1 1900 */
-		var d = new Date(1900,0,1);
+		/* 1 = Jan 1 1900 in Gregorian */
+		var d = new Date(1900, 0, 1);
 		d.setDate(d.getDate() + date - 1);
 		dout = [d.getFullYear(), d.getMonth()+1,d.getDate()];
 		dow = d.getDay();
@ -316,7 +316,7 @@ function write_date(type, fmt, val, ss0) {
 		}
 		switch(fmt) {
 			case 's': case 'ss': case '.0': case '.00': case '.000':
-				if(ss0 >= 2) tt = ss0 === 3 ? 1000 : 100;
+if(ss0 >= 2) tt = ss0 === 3 ? 1000 : 100;
 				else tt = ss0 === 1 ? 10 : 1;
 				ss = Math.round((tt)*(val.S + val.u));
 				if(ss >= 60*tt) ss = 0;
@ -366,23 +366,23 @@ function write_num_exp(fmt, val){
 		o = (val/Math.pow(10,ee)).toPrecision(idx+1+(period+ee)%period);
 		if(o.indexOf("e") === -1) {
 			var fakee = Math.floor(Math.log(Math.abs(val))*Math.LOG10E);
-			if(o.indexOf(".") === -1) o = o[0] + "." + o.substr(1) + "E+" + (fakee - o.length+ee);
+			if(o.indexOf(".") === -1) o = o.charAt(0) + "." + o.substr(1) + "E+" + (fakee - o.length+ee);
 			else o += "E+" + (fakee - ee);
 			while(o.substr(0,2) === "0.") {
-				o = o[0] + o.substr(2,period) + "." + o.substr(2+period);
+				o = o.charAt(0) + o.substr(2,period) + "." + o.substr(2+period);
 				o = o.replace(/^0+([1-9])/,"$1").replace(/^0+\./,"0.");
 			}
 			o = o.replace(/\+-/,"-");
 		}
 		o = o.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/,function($$,$1,$2,$3) { return $1 + $2 + $3.substr(0,(period+ee)%period) + "." + $3.substr(ee) + "E"; });
 	} else o = val.toExponential(idx);
-	if(fmt.match(/E\+00$/) && o.match(/e[+-]\d$/)) o = o.substr(0,o.length-1) + "0" + o[o.length-1];
+	if(fmt.match(/E\+00$/) && o.match(/e[+-]\d$/)) o = o.substr(0,o.length-1) + "0" + o.charAt(o.length-1);
 	if(fmt.match(/E\-/) && o.match(/e\+/)) o = o.replace(/e\+/,"e");
 	return o.replace("e","E");
 }
 var frac1 = /# (\?+)( ?)\/( ?)(\d+)/;
 function write_num_f1(r, aval, sign) {
-	var den = parseInt(r[4]), rr = Math.round(aval * den), base = Math.floor(rr/den);
+	var den = parseInt(r[4],10), rr = Math.round(aval * den), base = Math.floor(rr/den);
 	var myn = (rr - base*den), myd = den;
 	return sign + (base === 0 ? "" : ""+base) + " " + (myn === 0 ? fill(" ", r[1].length + 1 + r[4].length) : pad_(myn,r[1].length) + r[2] + "/" + r[3] + pad0(myd,r[4].length));
 }
@ -415,39 +415,40 @@ function write_num_flt(type, fmt, val) {
 	if(fmt.indexOf('%') !== -1) return write_num_pct(type, fmt, val);
 	if(fmt.indexOf('E') !== -1) return write_num_exp(fmt, val);
 	if(fmt.charCodeAt(0) === 36) return "$"+write_num_flt(type,fmt.substr(fmt[1]==' '?2:1),val);
-	var o, oo;
+	var o;
 	var r, ri, ff, aval = Math.abs(val), sign = val < 0 ? "-" : "";
 	if(fmt.match(/^00+$/)) return sign + pad0r(aval,fmt.length);
 	if(fmt.match(/^[#?]+$/)) {
 		o = pad0r(val,0); if(o === "0") o = "";
 		return o.length > fmt.length ? o : hashq(fmt.substr(0,fmt.length-o.length)) + o;
 	}
-	if((r = fmt.match(frac1)) !== null) return write_num_f1(r, aval, sign);
-	if(fmt.match(/^#+0+$/) !== null) return sign + pad0r(aval,fmt.length - fmt.indexOf("0"));
-	if((r = fmt.match(dec1)) !== null) {
+	if((r = fmt.match(frac1))) return write_num_f1(r, aval, sign);
+	if(fmt.match(/^#+0+$/)) return sign + pad0r(aval,fmt.length - fmt.indexOf("0"));
+	if((r = fmt.match(dec1))) {
+		// $FlowIgnore
 		o = rnd(val, r[1].length).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
 		return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,".");
 	}
 	fmt = fmt.replace(/^#+([0.])/, "$1");
-	if((r = fmt.match(/^(0*)\.(#*)$/)) !== null) {
+	if((r = fmt.match(/^(0*)\.(#*)$/))) {
 		return sign + rnd(aval, r[2].length).replace(/\.(\d*[1-9])0*$/,".$1").replace(/^(-?\d*)$/,"$1.").replace(/^0\./,r[1].length?"0.":".");
 	}
-	if((r = fmt.match(/^#,##0(\.?)$/)) !== null) return sign + commaify(pad0r(aval,0));
-	if((r = fmt.match(/^#,##0\.([#0]*0)$/)) !== null) {
+	if((r = fmt.match(/^#,##0(\.?)$/))) return sign + commaify(pad0r(aval,0));
+	if((r = fmt.match(/^#,##0\.([#0]*0)$/))) {
 		return val < 0 ? "-" + write_num_flt(type, fmt, -val) : commaify(""+(Math.floor(val))) + "." + pad0(dec(val, r[1].length),r[1].length);
 	}
-	if((r = fmt.match(/^#,#*,#0/)) !== null) return write_num_flt(type,fmt.replace(/^#,#*,/,""),val);
-	if((r = fmt.match(/^([0#]+)(\\?-([0#]+))+$/)) !== null) {
+	if((r = fmt.match(/^#,#*,#0/))) return write_num_flt(type,fmt.replace(/^#,#*,/,""),val);
+	if((r = fmt.match(/^([0#]+)(\\?-([0#]+))+$/))) {
 		o = _strrev(write_num_flt(type, fmt.replace(/[\\-]/g,""), val));
 		ri = 0;
 		return _strrev(_strrev(fmt.replace(/\\/g,"")).replace(/[0#]/g,function(x){return ri<o.length?o[ri++]:x==='0'?'0':"";}));
 	}
-	if(fmt.match(phone) !== null) {
+	if(fmt.match(phone)) {
 		o = write_num_flt(type, "##########", val);
 		return "(" + o.substr(0,3) + ") " + o.substr(3, 3) + "-" + o.substr(6);
 	}
 	var oa = "";
-	if((r = fmt.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/)) !== null) {
+	if((r = fmt.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))) {
 		ri = Math.min(r[4].length,7);
 		ff = frac(aval, Math.pow(10,ri)-1, false);
 		o = "" + sign;
@ -459,23 +460,23 @@ function write_num_flt(type, fmt, val) {
 		o += oa;
 		return o;
 	}
-	if((r = fmt.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/)) !== null) {
+	if((r = fmt.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))) {
 		ri = Math.min(Math.max(r[1].length, r[4].length),7);
 		ff = frac(aval, Math.pow(10,ri)-1, true);
 		return sign + (ff[0]||(ff[1] ? "" : "0")) + " " + (ff[1] ? pad_(ff[1],ri) + r[2] + "/" + r[3] + rpad_(ff[2],ri): fill(" ", 2*ri+1 + r[2].length + r[3].length));
 	}
-	if((r = fmt.match(/^[#0?]+$/)) !== null) {
+	if((r = fmt.match(/^[#0?]+$/))) {
 		o = pad0r(val, 0);
 		if(fmt.length <= o.length) return o;
 		return hashq(fmt.substr(0,fmt.length-o.length)) + o;
 	}
-  if((r = fmt.match(/^([#0?]+)\.([#0]+)$/)) !== null) {
+	if((r = fmt.match(/^([#0?]+)\.([#0]+)$/))) {
 		o = "" + val.toFixed(Math.min(r[2].length,10)).replace(/([^0])0+$/,"$1");
 		ri = o.indexOf(".");
 		var lres = fmt.indexOf(".") - ri, rres = fmt.length - o.length - lres;
 		return hashq(fmt.substr(0,lres) + o + fmt.substr(fmt.length-rres));
 	}
-	if((r = fmt.match(/^00,000\.([#0]*0)$/)) !== null) {
+	if((r = fmt.match(/^00,000\.([#0]*0)$/))) {
 		ri = dec(val, r[1].length);
 		return val < 0 ? "-" + write_num_flt(type, fmt, -val) : commaify(flr(val)).replace(/^\d,\d{3}$/,"0$&").replace(/^\d*$/,function($$) { return "00," + ($$.length < 3 ? pad0(0,3-$$.length) : "") + $$; }) + "." + pad0(ri,r[1].length);
 	}
@ -504,13 +505,13 @@ function write_num_exp2(fmt, val){
 		o = (val/Math.pow(10,ee)).toPrecision(idx+1+(period+ee)%period);
 		if(!o.match(/[Ee]/)) {
 			var fakee = Math.floor(Math.log(Math.abs(val))*Math.LOG10E);
-			if(o.indexOf(".") === -1) o = o[0] + "." + o.substr(1) + "E+" + (fakee - o.length+ee);
+			if(o.indexOf(".") === -1) o = o.charAt(0) + "." + o.substr(1) + "E+" + (fakee - o.length+ee);
 			else o += "E+" + (fakee - ee);
 			o = o.replace(/\+-/,"-");
 		}
 		o = o.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/,function($$,$1,$2,$3) { return $1 + $2 + $3.substr(0,(period+ee)%period) + "." + $3.substr(ee) + "E"; });
 	} else o = val.toExponential(idx);
-	if(fmt.match(/E\+00$/) && o.match(/e[+-]\d$/)) o = o.substr(0,o.length-1) + "0" + o[o.length-1];
+	if(fmt.match(/E\+00$/) && o.match(/e[+-]\d$/)) o = o.substr(0,o.length-1) + "0" + o.charAt(o.length-1);
 	if(fmt.match(/E\-/) && o.match(/e\+/)) o = o.replace(/e\+/,"e");
 	return o.replace("e","E");
 }
@ -531,32 +532,33 @@ function write_num_int(type, fmt, val) {
 		o = (""+val); if(val === 0) o = "";
 		return o.length > fmt.length ? o : hashq(fmt.substr(0,fmt.length-o.length)) + o;
 	}
-	if((r = fmt.match(frac1)) !== null) return write_num_f2(r, aval, sign);
-	if(fmt.match(/^#+0+$/) !== null) return sign + pad0(aval,fmt.length - fmt.indexOf("0"));
-	if((r = fmt.match(dec1)) !== null) {
+	if((r = fmt.match(frac1))) return write_num_f2(r, aval, sign);
+	if(fmt.match(/^#+0+$/)) return sign + pad0(aval,fmt.length - fmt.indexOf("0"));
+	if((r = fmt.match(dec1))) {
+		// $FlowIgnore
 		o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
 		return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,".");
 	}
 	fmt = fmt.replace(/^#+([0.])/, "$1");
-	if((r = fmt.match(/^(0*)\.(#*)$/)) !== null) {
+	if((r = fmt.match(/^(0*)\.(#*)$/))) {
 		return sign + (""+aval).replace(/\.(\d*[1-9])0*$/,".$1").replace(/^(-?\d*)$/,"$1.").replace(/^0\./,r[1].length?"0.":".");
 	}
-	if((r = fmt.match(/^#,##0(\.?)$/)) !== null) return sign + commaify((""+aval));
-	if((r = fmt.match(/^#,##0\.([#0]*0)$/)) !== null) {
+	if((r = fmt.match(/^#,##0(\.?)$/))) return sign + commaify((""+aval));
+	if((r = fmt.match(/^#,##0\.([#0]*0)$/))) {
 		return val < 0 ? "-" + write_num_int(type, fmt, -val) : commaify((""+val)) + "." + fill('0',r[1].length);
 	}
-	if((r = fmt.match(/^#,#*,#0/)) !== null) return write_num_int(type,fmt.replace(/^#,#*,/,""),val);
-	if((r = fmt.match(/^([0#]+)(\\?-([0#]+))+$/)) !== null) {
+	if((r = fmt.match(/^#,#*,#0/))) return write_num_int(type,fmt.replace(/^#,#*,/,""),val);
+	if((r = fmt.match(/^([0#]+)(\\?-([0#]+))+$/))) {
 		o = _strrev(write_num_int(type, fmt.replace(/[\\-]/g,""), val));
 		ri = 0;
 		return _strrev(_strrev(fmt.replace(/\\/g,"")).replace(/[0#]/g,function(x){return ri<o.length?o[ri++]:x==='0'?'0':"";}));
 	}
-	if(fmt.match(phone) !== null) {
+	if(fmt.match(phone)) {
 		o = write_num_int(type, "##########", val);
 		return "(" + o.substr(0,3) + ") " + o.substr(3, 3) + "-" + o.substr(6);
 	}
 	var oa = "";
-	if((r = fmt.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/)) !== null) {
+	if((r = fmt.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))) {
 		ri = Math.min(r[4].length,7);
 		ff = frac(aval, Math.pow(10,ri)-1, false);
 		o = "" + sign;
@ -568,23 +570,23 @@ function write_num_int(type, fmt, val) {
 		o += oa;
 		return o;
 	}
-	if((r = fmt.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/)) !== null) {
+	if((r = fmt.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))) {
 		ri = Math.min(Math.max(r[1].length, r[4].length),7);
 		ff = frac(aval, Math.pow(10,ri)-1, true);
 		return sign + (ff[0]||(ff[1] ? "" : "0")) + " " + (ff[1] ? pad_(ff[1],ri) + r[2] + "/" + r[3] + rpad_(ff[2],ri): fill(" ", 2*ri+1 + r[2].length + r[3].length));
 	}
-	if((r = fmt.match(/^[#0?]+$/)) !== null) {
+	if((r = fmt.match(/^[#0?]+$/))) {
 		o = "" + val;
 		if(fmt.length <= o.length) return o;
 		return hashq(fmt.substr(0,fmt.length-o.length)) + o;
 	}
-	if((r = fmt.match(/^([#0]+)\.([#0]+)$/)) !== null) {
+	if((r = fmt.match(/^([#0]+)\.([#0]+)$/))) {
 		o = "" + val.toFixed(Math.min(r[2].length,10)).replace(/([^0])0+$/,"$1");
 		ri = o.indexOf(".");
 		var lres = fmt.indexOf(".") - ri, rres = fmt.length - o.length - lres;
 		return hashq(fmt.substr(0,lres) + o + fmt.substr(fmt.length-rres));
 	}
-	if((r = fmt.match(/^00,000\.([#0]*0)$/)) !== null) {
+	if((r = fmt.match(/^00,000\.([#0]*0)$/))) {
 		return val < 0 ? "-" + write_num_int(type, fmt, -val) : commaify(""+val).replace(/^\d,\d{3}$/,"0$&").replace(/^\d*$/,function($$) { return "00," + ($$.length < 3 ? pad0(0,3-$$.length) : "") + $$; }) + "." + pad0(0,r[1].length);
 	}
 	switch(fmt) {
@ -619,7 +621,7 @@ function eval_fmt(fmt, v, opts, flen) {
 	var hr='H';
 	/* Tokenize */
 	while(i < fmt.length) {
-		switch((c = fmt[i])) {
+		switch((c = fmt.charAt(i))) {
 			case 'G': /* General */
 				if(!isgeneral(fmt, i)) throw new Error('unrecognized character ' + c + ' in ' +fmt);
 				out[out.length] = {t:'G', v:'General'}; i+=7; break;
@ -633,7 +635,7 @@ function eval_fmt(fmt, v, opts, flen) {
 				out[out.length] = {t:'T', v:v}; ++i; break;
 			case 'B': case 'b':
 				if(fmt[i+1] === "1" || fmt[i+1] === "2") {
-          if(dt==null) { dt=parse_date_code(v, opts, fmt[i+1] === "2"); if(dt==null) return ""; }
+					if(dt==null) { dt=parse_date_code(v, opts, fmt[i+1] === "2"); if(dt==null) return ""; }
 					out[out.length] = {t:'X', v:fmt.substr(i,2)}; lst = c; i+=2; break;
 				}
 				/* falls through */
@ -650,15 +652,15 @@ function eval_fmt(fmt, v, opts, flen) {
 			case 'A':
 				q={t:c, v:"A"};
 				if(dt==null) dt=parse_date_code(v, opts);
-        if(fmt.substr(i, 3) === "A/P") { if(dt!=null) q.v = dt.H >= 12 ? "P" : "A"; q.t = 'T'; hr='h';i+=3;}
-        else if(fmt.substr(i,5) === "AM/PM") { if(dt!=null) q.v = dt.H >= 12 ? "PM" : "AM"; q.t = 'T'; i+=5; hr='h'; }
+				if(fmt.substr(i, 3) === "A/P") { if(dt!=null) q.v = dt.H >= 12 ? "P" : "A"; q.t = 'T'; hr='h';i+=3;}
+				else if(fmt.substr(i,5) === "AM/PM") { if(dt!=null) q.v = dt.H >= 12 ? "PM" : "AM"; q.t = 'T'; i+=5; hr='h'; }
 				else { q.t = "t"; ++i; }
 				if(dt==null && q.t === 'T') return "";
 				out[out.length] = q; lst = c; break;
 			case '[':
 				o = c;
 				while(fmt[i++] !== ']' && i < fmt.length) o += fmt[i];
-				if(o.slice(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
+				if(o.substr(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
 				if(o.match(abstime)) {
 					if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; }
 					out[out.length] = {t:'Z', v:o.toLowerCase()};
@ -709,12 +711,12 @@ function eval_fmt(fmt, v, opts, flen) {
 	switch(bt) {
 		case 0: break;
 		case 1:
-			if(dt.u >= 0.5) { dt.u = 0; ++dt.S; }
+if(dt.u >= 0.5) { dt.u = 0; ++dt.S; }
 			if(dt.S >=  60) { dt.S = 0; ++dt.M; }
 			if(dt.M >=  60) { dt.M = 0; ++dt.H; }
 			break;
 		case 2:
-			if(dt.u >= 0.5) { dt.u = 0; ++dt.S; }
+if(dt.u >= 0.5) { dt.u = 0; ++dt.S; }
 			if(dt.S >=  60) { dt.S = 0; ++dt.M; }
 			break;
 	}
@ -723,9 +725,9 @@ function eval_fmt(fmt, v, opts, flen) {
 	for(i=0; i < out.length; ++i) {
 		switch(out[i].t) {
 			case 't': case 'T': case ' ': case 'D': break;
-			case 'X': out[i] = undefined; break;
+			case 'X': out[i].v = ""; out[i].t = ";"; break;
 			case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'b': case 'Z':
-				out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
+out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
 				out[i].t = 't'; break;
 			case 'n': case '(': case '?':
 				jj = i+1;
@ -736,7 +738,7 @@ function eval_fmt(fmt, v, opts, flen) {
 					c === 't' && (out[jj].v === '/' || '$€'.indexOf(out[jj].v) > -1 || out[jj].v === ' ' && out[jj+1] != null && out[jj+1].t == '?')
 				)) {
 					out[i].v += out[jj].v;
-					out[jj] = undefined; ++jj;
+					out[jj] = {v:"", t:";"}; ++jj;
 				}
 				nstr += out[i].v;
 				i = jj-1; break;
@ -819,7 +821,7 @@ function choose_fmt(f, v) {
 	var fmt = split_fmt(f);
 	var l = fmt.length, lat = fmt[l-1].indexOf("@");
 	if(l<4 && lat>-1) --l;
-	if(fmt.length > 4) throw "cannot find right format for |" + fmt + "|";
+	if(fmt.length > 4) throw new Error("cannot find right format for |" + fmt.join("|") + "|");
 	if(typeof v !== "number") return [4, fmt.length === 4 || lat>-1?fmt[fmt.length-1]:"@"];
 	switch(fmt.length) {
 		case 1: fmt = lat>-1 ? ["General", "General", "General", fmt[0]] : [fmt[0], fmt[0], fmt[0], "@"]; break;
@ -841,7 +843,7 @@ function format(fmt,v,o) {
 	var sfmt = "";
 	switch(typeof fmt) {
 		case "string": sfmt = fmt; break;
-		case "number": sfmt = (o.table != null ? o.table : table_fmt)[fmt]; break;
+		case "number": sfmt = (o.table != null ? (o.table) : table_fmt)[fmt]; break;
 	}
 	if(isgeneral(sfmt,0)) return general_fmt(v, o);
 	var f = choose_fmt(sfmt, v);
@ -1425,12 +1427,12 @@ function parsexmltag(tag, skip_root) {
 		q = cc.substr(0,c); v = cc.substring(c+2, cc.length-1);
 		for(j=0;j!=q.length;++j) if(q.charCodeAt(j) === 58) break;
 		if(j===q.length) {
-			//if(q.indexOf("_") > 0) q = q.substr(0, q.indexOf("_")); // from ods
+			if(q.indexOf("_") > 0) q = q.substr(0, q.indexOf("_")); // from ods
 			z[q] = v;
 		}
 		else {
 			var k = (j===5 && q.substr(0,5)==="xmlns"?"xmlns":"")+q.substr(j+1);
-			//if(z[k] && q.substr(j-3,3) == "ext") continue; // from ods
+			if(z[k] && q.substr(j-3,3) == "ext") continue; // from ods
 			z[k] = v;
 		}
 	}
@ -1517,17 +1519,18 @@ if(has_buf) {
 	};
 	var corpus = "foo bar baz\u00e2\u0098\u0083\u00f0\u009f\u008d\u00a3";
 	if(utf8read(corpus) == utf8readb(corpus)) utf8read = utf8readb;
+	// $FlowIgnore
 	var utf8readc = function utf8readc(data) { return Buffer(data, 'binary').toString('utf8'); };
 	if(utf8read(corpus) == utf8readc(corpus)) utf8read = utf8readc;
 }

 // matches <foo>...</foo> extracts content
 var matchtag = (function() {
-	var mtcache = {};
+	var mtcache = ({});
 	return function matchtag(f,g) {
 		var t = f+"|"+(g||"");
-		if(mtcache[t] !== undefined) return mtcache[t];
-		return (mtcache[t] = new RegExp('<(?:\\w+:)?'+f+'(?: xml:space="preserve")?(?:[^>]*)>([^\u2603]*)</(?:\\w+:)?'+f+'>',(g||"")));
+		if(mtcache[t]) return mtcache[t];
+		return (mtcache[t] = new RegExp('<(?:\\w+:)?'+f+'(?: xml:space="preserve")?(?:[^>]*)>([^\u2603]*)</(?:\\w+:)?'+f+'>',((g||""))));
 	};
 })();

@ -1720,7 +1723,7 @@ function ReadShift(size, t) {
 		case 2: oI = (t === 'i' ? __readInt16LE : __readUInt16LE)(this, this.l); this.l += 2; return oI;
 		case 4:
 			if(t === 'i' || (this[this.l+3] & 0x80)===0) { oI = __readInt32LE(this, this.l); this.l += 4; return oI; }
-			else { oR = __readUInt32LE(this, this.l); this.l += 4; return oR; } break;
+			else { oR = __readUInt32LE(this, this.l); this.l += 4; } return oR;
 		case 8: if(t === 'f') { oR = __double(this, this.l); this.l += 8; return oR; }
 		/* falls through */
 		case 16: o = __hexlify(this, this.l, size); break;
@ -1733,14 +1736,14 @@ var __writeUInt32LE = function(b, val, idx) { b[idx] = (val & 0xFF); b[idx+1] =
 var __writeInt32LE  = function(b, val, idx) { b[idx] = (val & 0xFF); b[idx+1] = ((val >> 8) & 0xFF); b[idx+2] = ((val >> 16) & 0xFF); b[idx+3] = ((val >> 24) & 0xFF); };

 function WriteShift(t, val, f) {
-	var size, i;
+	var size = 0, i = 0;
 	if(f === 'dbcs') {
-		for(i = 0; i != val.length; ++i) __writeUInt16LE(this, val.charCodeAt(i), this.l + 2 * i);
+for(i = 0; i != val.length; ++i) __writeUInt16LE(this, val.charCodeAt(i), this.l + 2 * i);
 		size = 2 * val.length;
 	} else if(f === 'sbcs') {
-		for(i = 0; i != val.length; ++i) this[this.l + i] = val.charCodeAt(i) & 0xFF;
+for(i = 0; i != val.length; ++i) this[this.l + i] = val.charCodeAt(i) & 0xFF;
 		size = val.length;
-	} else switch(t) {
+	} else  switch(t) {
 		case  1: size = 1; this[this.l] = val&0xFF; break;
 		case  2: size = 2; this[this.l] = val&0xFF; val >>>= 8; this[this.l+1] = val&0xFF; break;
 		case  3: size = 3; this[this.l] = val&0xFF; val >>>= 8; this[this.l+1] = val&0xFF; val >>>= 8; this[this.l+2] = val&0xFF; break;
@ -1797,7 +1800,7 @@ function recordhopper(data, cb, opts) {
 function buf_array() {
 	var bufs = [], blksz = 2048;
 	var newblk = function ba_newblk(sz) {
-		var o = new_buf(sz);
+		var o = (new_buf(sz));
 		prep_blob(o, 0);
 		return o;
 	};
@ -1890,6 +1893,7 @@ function encode_range_xls(r, opts) {
 	return encode_cell_xls(r.s) + ":" + encode_cell_xls(r.e);
 }
 var OFFCRYPTO = {};
+
 var make_offcrypto = function(O, _crypto) {
 	var crypto;
 	if(typeof _crypto !== 'undefined') crypto = _crypto;
@ -1906,7 +1910,8 @@ var make_offcrypto = function(O, _crypto) {
 			j = (j + S[i] + (key[i%key.length]).charCodeAt(0))&255;
 			t = S[i]; S[i] = S[j]; S[j] = t;
 		}
-		i = j = 0; out = Buffer(data.length);
+		// $FlowIgnore
+		i = j = 0; var out = Buffer(data.length);
 		for(c = 0; c != data.length; ++c) {
 			i = (i + 1)&255;
 			j = (j + S[i])%256;
@ -2561,7 +2566,6 @@ function parse_ct(data, opts) {
 			case '<Default': ctext[y.Extension] = y.ContentType; break;
 			case '<Override':
 				if(ct[ct2type[y.ContentType]] !== undefined) ct[ct2type[y.ContentType]].push(y.PartName);
-				else if(opts.WTF) console.error(y);
 				break;
 		}
 	});
@ -2888,7 +2892,7 @@ function write_ext_props(cp, opts) {

 	/* TODO: HeadingPairs, TitlesOfParts */
 	o[o.length] = (W('HeadingPairs', W('vt:vector', W('vt:variant', '<vt:lpstr>Worksheets</vt:lpstr>')+W('vt:variant', W('vt:i4', String(cp.Worksheets))), {size:2, baseType:"variant"})));
-	o[o.length] = (W('TitlesOfParts', W('vt:vector', cp.SheetNames.map(function(s) { return "<vt:lpstr>" + s + "</vt:lpstr>"; }).join(""), {size: cp.Worksheets, baseType:"lpstr"})));
+	o[o.length] = (W('TitlesOfParts', W('vt:vector', cp.SheetNames.map(function(s) { return "<vt:lpstr>" + escapexml(s) + "</vt:lpstr>"; }).join(""), {size: cp.Worksheets, baseType:"lpstr"})));
 	if(o.length>2){ o[o.length] = ('</Properties>'); o[1]=o[1].replace("/>",">"); }
 	return o.join("");
 }
@ -2950,6 +2954,7 @@ function write_cust_props(cp, opts) {
 	if(!cp) return o.join("");
 	var pid = 1;
 	keys(cp).forEach(function custprop(k) { ++pid;
+		// $FlowIgnore
 		o[o.length] = (writextag('property', write_vt(cp[k]), {
 			'fmtid': '{D5CDD505-2E9C-101B-9397-08002B2CF9AE}',
 			'pid': pid,
@ -3449,7 +3454,6 @@ function parse_XTI(blob, length) {
 function parse_RkRec(blob, length) {
 	var ixfe = blob.read_shift(2);
 	var RK = parse_RkNumber(blob);
-	//console.log("::", ixfe, RK,";;");
 	return [ixfe, RK];
 }

@ -3607,7 +3611,7 @@ function parse_BoundSheet8(blob, length, opts) {
 function parse_SST(blob, length) {
 	var cnt = blob.read_shift(4);
 	var ucnt = blob.read_shift(4);
-	var strs = [];
+	var strs = ([]);
 	for(var i = 0; i != ucnt; ++i) {
 		strs.push(parse_XLUnicodeRichExtendedString(blob));
 	}
@ -4524,6 +4528,7 @@ var parse_rs = (function parse_rs_factory() {

 /* 18.4.8 si CT_Rst */
 var sitregex = /<(?:\w+:)?t[^>]*>([^<]*)<\/(?:\w+:)?t>/g, sirregex = /<(?:\w+:)?r>/;
+var sirphregex = /<(?:\w+:)?rPh.*?>(.*?)<\/(?:\w+:)?rPh>/g;
 function parse_si(x, opts) {
 	var html = opts ? opts.cellHTML : true;
 	var z = {};
@ -4539,7 +4544,7 @@ function parse_si(x, opts) {
 	/* 18.4.4 r CT_RElt (Rich Text Run) */
 	else if((y = x.match(sirregex))) {
 		z.r = utf8read(x);
-		z.t = utf8read(unescapexml((x.replace(/<rPh.*?>(.*?)<\/rPh>/g, '').match(sitregex)||[]).join("").replace(tagregex,"")));
+		z.t = utf8read(unescapexml((x.replace(sirphregex, '').match(sitregex)||[]).join("").replace(tagregex,"")));
 		if(html) z.h = parse_rs(z.r);
 	}
 	/* 18.4.3 phoneticPr CT_PhoneticPr (TODO: needed for Asian support) */
@ -4599,7 +4604,7 @@ function parse_BrtBeginSst(data, length) {

 /* [MS-XLSB] 2.1.7.45 Shared Strings */
 function parse_sst_bin(data, opts) {
-	var s = [];
+	var s = ([]);
 	var pass = false;
 	recordhopper(data, function hopper_sst(val, R, RT) {
 		switch(R.n) {
@ -4818,7 +4823,7 @@ function parse_FilePass(blob, length, opts) {

 function hex2RGB(h) {
 	var o = h.substr(h[0]==="#"?1:0,6);
-	return [parseInt(o.substr(0,2),16),parseInt(o.substr(0,2),16),parseInt(o.substr(0,2),16)];
+	return [parseInt(o.substr(0,2),16),parseInt(o.substr(2,2),16),parseInt(o.substr(4,2),16)];
 }
 function rgb2Hex(rgb) {
 	for(var i=0,o=1; i!=3; ++i) o = o*256 + (rgb[i]>255?255:rgb[i]<0?0:rgb[i]);
@ -4974,7 +4979,7 @@ function parse_numFmts(t, opts) {
 function write_numFmts(NF, opts) {
 	var o = ["<numFmts>"];
 	[[5,8],[23,26],[41,44],[63,66],[164,392]].forEach(function(r) {
-		for(var i = r[0]; i <= r[1]; ++i) if(NF[i] !== undefined) o[o.length] = (writextag('numFmt',null,{numFmtId:i,formatCode:escapexml(NF[i])}));
+		for(var i = r[0]; i <= r[1]; ++i) if(NF[i]) o[o.length] = (writextag('numFmt',null,{numFmtId:i,formatCode:escapexml(NF[i])}));
 	});
 	if(o.length === 1) return "";
 	o[o.length] = ("</numFmts>");
@ -5064,7 +5069,7 @@ RELS.STY = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/

 function write_sty_xml(wb, opts) {
 	var o = [XML_HEADER, STYLES_XML_ROOT], w;
-	if((w = write_numFmts(wb.SSF)) != null) o[o.length] = w;
+	if(wb.SSF && (w = write_numFmts(wb.SSF)) != null) o[o.length] = w;
 	o[o.length] = ('<fonts count="1"><font><sz val="12"/><color theme="1"/><name val="Calibri"/><family val="2"/><scheme val="minor"/></font></fonts>');
 	o[o.length] = ('<fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills>');
 	o[o.length] = ('<borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders>');
@ -5560,10 +5565,15 @@ function update_xfext(xf, xfext) {
 		switch(xfe[0]) { /* 2.5.108 extPropData */
 			case 0x04: break; /* foreground color */
 			case 0x05: break; /* background color */
-			case 0x07: case 0x08: case 0x09: case 0x0a: break;
+			case 0x06: break; /* gradient fill */
+			case 0x07: break; /* top cell border color */
+			case 0x08: break; /* bottom cell border color */
+			case 0x09: break; /* left cell border color */
+			case 0x0a: break; /* right cell border color */
+			case 0x0b: break; /* diagonal cell border color */
 			case 0x0d: break; /* text color */
 			case 0x0e: break; /* font scheme */
-			default: throw "bafuq" + xfe[0].toString(16);
+			case 0x0f: break; /* indentation level */
 		}
 	});
 }
@ -5756,9 +5766,10 @@ var rc_to_a1 = (function(){
 	};
 })();

-/* TODO actually parse the formula */
+/* no defined name can collide with a valid cell address A1:XFD1048576 ... except LOG10! */
+var crefregex = /(^|[^._A-Z0-9])([$]?)([A-Z]{1,2}|[A-W][A-Z]{2}|X[A-E][A-Z]|XF[A-D])([$]?)([1-9]\d{0,5}|10[0-3]\d{4}|104[0-7]\d{3}|1048[0-4]\d{2}|10485[0-6]\d|104857[0-6])(?![_.\(A-Za-z0-9])/g;
 function shift_formula_str(f, delta) {
-	return f.replace(/(^|[^A-Z0-9])([$]?)([A-Z]+)([$]?)(\d+)/g, function($0, $1, $2, $3, $4, $5, off, str) {
+	return f.replace(crefregex, function($0, $1, $2, $3, $4, $5, off, str) {
 		return $1+($2=="$" ? $2+$3 : encode_col(decode_col($3)+delta.c))+($4=="$" ? $4+$5 : encode_row(decode_row($5) + delta.r));
 	});
 }
@ -6097,6 +6108,7 @@ function parse_PtgExtraArray(blob, length, opts) {
 		rows = 1 + blob.read_shift(2); //DRw
 	}
 	if(opts.biff >= 2 && opts.biff < 8) { --rows; if(--cols == 0) cols = 0x100; }
+	// $FlowIgnore
 	for(var i = 0, o=[]; i != rows && (o[i] = []); ++i)
 		for(var j = 0; j != cols; ++j) o[i][j] = parse_SerAr(blob, opts.biff);
 	return o;