js-xls-rails 0.5.0 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e52ed40aeb2c846ad73d0768f4991f6787bcb29e
-  data.tar.gz: 31a8c821c07e70e54098e846a770a0651ba1209e
+  metadata.gz: 92c7ac66d0955c7a92d4aaea434b283a4fac8171
+  data.tar.gz: 3a053528aeb1d0fca9665a906a8201dd23895db2
 SHA512:
-  metadata.gz: 848731767864e368d3d3b6f267aae3317db16d4a5a18222acfad33b250443903fe07b7f9dc523bf917f54e137fc1c6b12e683a4fc7523e12a7834e9839b015af
-  data.tar.gz: 0fb9156551c66343a4aaed33379176f17c93dd601a470834b886f13d836e24e4ab21d4de7c9b6da3482259998cf8bbe36ae2b97fee9e8b976f4d80cbc03ee84e
+  metadata.gz: 1967ca1d89c011d4677adb481e93382c06510124d239c67e55e8f30289a806d5806b649be57a566d7d175ce9b56f820e10da71a096624a62d214d71b343b79c4
+  data.tar.gz: f4f7741e282d3bd7446f6f64ee314a0e9cdc7dcc81bb43dc5c892034295a0fa34bb5d4fa3572ae3243e175e90633b00f2512f7d89b428ed8e8379eaf3a2fe5b0

data/lib/js-xls-rails/version.rb

@@ -1,5 +1,5 @@
 module Jsxls
   module Rails
-    VERSION = "0.5.0"
+    VERSION = "0.6.9"
   end
 end

data/vendor/assets/javascripts/xls.js

@@ -1,8 +1,9 @@
-/* xls.js (C) 2013 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
 /* vim: set ts=2: */
 /*jshint eqnull:true, funcscope:true */
 var XLS = {};
 (function(XLS){
+XLS.version = '0.6.9';
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
 	if(typeof cptable === 'undefined') var cptable = require('codepage');
 	var current_codepage = 1252, current_cptable = cptable[1252];
@@ -12,41 +13,8 @@ function reset_cp() {
 }
 function _getchar(x) { return String.fromCharCode(x); }
 
-/* Buffer.concat was added in the 0.8 series, so this is for older versions */
-if(typeof Buffer !== "undefined" && !Buffer.concat)
-Buffer.concat = function(list, length) {
-	if (!Array.isArray(list)) {
-		throw new TypeError('Usage: Buffer.concat(list, [length])');
-	}
-
-	if (list.length === 0) {
-		return new Buffer(0);
-	} else if (list.length === 1) {
-		return list[0];
-	}
-	var i, buf;
-	if (typeof length !== 'number') {
-		length = 0;
-		for (i = 0; i < list.length; i++) {
-			buf = list[i];
-			length += buf.length;
-		}
-	}
-
-	var buffer = new Buffer(length);
-	var pos = 0;
-	for (i = 0; i < list.length; i++) {
-		buf = list[i];
-		buf.copy(buffer, pos);
-		pos += buf.length;
-	}
-	return buffer;
-};
-
-var Buffers = Array;
-
 function readIEEE754(buf, idx, isLE, nl, ml) {
-	if(isLE === undefined) isLE = true;
+	if(typeof isLE === 'undefined') isLE = true;
 	if(!nl) nl = 8;
 	if(!ml && nl === 8) ml = 52;
 	var e, m, el = nl * 8 - ml - 1, eMax = (1 << el) - 1, eBias = eMax >> 1;
@@ -111,6 +79,7 @@ function s2a(s) {
 	return w;
 }
 
+var __toBuffer;
 if(typeof Buffer !== "undefined") {
 	Buffer.prototype.hexlify= function() { return this.toString('hex'); };
 	Buffer.prototype.utf16le= function(s,e){return this.toString('utf16le',s,e).replace(/\u0000/,'').replace(/[\u0001-\u0006]/,'!');};
@@ -122,7 +91,6 @@ if(typeof Buffer !== "undefined") {
 		if(len === 0) return "";
 		if(typeof current_cptable === "undefined") return this.utf8(i+4,i+4+len-1);
 		var t = Array(this.slice(i+4,i+4+len-1));
-		//1console.log("start", this.l, len, t);
 		var c, j = i+4, o = "", cc;
 		for(;j!=i+4+len;++j) {
 			c = this.readUInt8(j);
@@ -134,27 +102,33 @@ if(typeof Buffer !== "undefined") {
 			if(typeof cc === 'undefined') throw "Unrecognized character " + c.toString(16);
 			if(c === 0) break;
 			o += cc;
-		//1console.log(cc, cc.charCodeAt(0), o, this.l);
 		}
 		return o;
 	};
+	__toBuffer = function(bufs) { return Buffer.concat(bufs[0]); };
+} else {
+	__toBuffer = function(bufs) {
+		var x = [];
+		for(var i = 0; i != bufs[0].length; ++i) { x = x.concat(bufs[0][i]); }
+		return x;
+	};
 }
 
-Array.prototype.readUInt8 = function(idx) { return this[idx]; };
-Array.prototype.readUInt16LE = function(idx) { return this[idx+1]*(1<<8)+this[idx]; };
-Array.prototype.readInt16LE = function(idx) { var u = this.readUInt16LE(idx); if(!(u & 0x8000)) return u; return (0xffff - u + 1) * -1; };
-Array.prototype.readUInt32LE = function(idx) { return this[idx+3]*(1<<24)+this[idx+2]*(1<<16)+this[idx+1]*(1<<8)+this[idx]; };
-Array.prototype.readInt32LE = function(idx) { var u = this.readUInt32LE(idx); if(!(u & 0x80000000)) return u; return (0xffffffff - u + 1) * -1; };
-Array.prototype.readDoubleLE = function(idx) { return readIEEE754(this, idx||0);};
+var __readUInt8 = function(b, idx) { return b.readUInt8 ? b.readUInt8(idx) : b[idx]; };
+var __readUInt16LE = function(b, idx) { return b.readUInt16LE ? b.readUInt16LE(idx) : b[idx+1]*(1<<8)+b[idx]; };
+var __readInt16LE = function(b, idx) { var u = __readUInt16LE(b,idx); if(!(u & 0x8000)) return u; return (0xffff - u + 1) * -1; };
+var __readUInt32LE = function(b, idx) { return b.readUInt32LE ? b.readUInt32LE(idx) : b[idx+3]*(1<<24)+b[idx+2]*(1<<16)+b[idx+1]*(1<<8)+b[idx]; };
+var __readInt32LE = function(b, idx) { if(b.readInt32LE) return b.readInt32LE(idx); var u = __readUInt32LE(b,idx); if(!(u & 0x80000000)) return u; return (0xffffffff - u + 1) * -1; };
+var __readDoubleLE = function(b, idx) { return b.readDoubleLE ? b.readDoubleLE(idx) : readIEEE754(b, idx||0);};
 
-Array.prototype.hexlify = function() { return this.map(function(x){return (x<16?"0":"") + x.toString(16);}).join(""); };
+var __hexlify = function(b) { return b.map(function(x){return (x<16?"0":"") + x.toString(16);}).join(""); };
 
-Array.prototype.utf16le = function(s,e) { var str = ""; for(var i=s; i<e; i+=2) str += String.fromCharCode(this.readUInt16LE(i)); return str.replace(/\u0000/,'').replace(/[\u0001-\u0006]/,'!'); };
+var __utf16le = function(b,s,e) { if(b.utf16le) return b.utf16le(s,e); var str = ""; for(var i=s; i<e; i+=2) str += String.fromCharCode(__readUInt16LE(b,i)); return str.replace(/\u0000/,'').replace(/[\u0001-\u0006]/,'!'); };
 
-Array.prototype.utf8 = function(s,e) { var str = ""; for(var i=s; i<e; i++) str += String.fromCharCode(this.readUInt8(i)); return str; };
+var __utf8 = function(b,s,e) { if(b.utf8) return b.utf8(s,e); var str = ""; for(var i=s; i<e; i++) str += String.fromCharCode(__readUInt8(b,i)); return str; };
 
-Array.prototype.lpstr = function(i) { var len = this.readUInt32LE(i); return len > 0 ? this.utf8(i+4,i+4+len-1) : "";};
-Array.prototype.lpwstr = function(i) { var len = 2*this.readUInt32LE(i); return this.utf8(i+4,i+4+len-1);};
+var __lpstr = function(b,i) { if(b.lpstr) return b.lpstr(i); var len = __readUInt32LE(b,i); return len > 0 ? __utf8(b, i+4,i+4+len-1) : "";};
+var __lpwstr = function(b,i) { if(b.lpwstr) return b.lpwstr(i); var len = 2*__readUInt32LE(b,i); return __utf8(b, i+4,i+4+len-1);};
 
 function bconcat(bufs) { return (typeof Buffer !== 'undefined') ? Buffer.concat(bufs) : [].concat.apply([], bufs); }
 
@@ -162,69 +136,64 @@ function ReadShift(size, t) {
 	var o, w, vv, i, loc; t = t || 'u';
 	if(size === 'ieee754') { size = 8; t = 'f'; }
 	switch(size) {
-		case 1: o = this.readUInt8(this.l); break;
-		case 2: o=t==='u'?this.readUInt16LE(this.l):this.readInt16LE(this.l);break;
-		case 4: o = this.readUInt32LE(this.l); break;
-		case 8: if(t === 'f') { o = this.readDoubleLE(this.l); break; }
+		case 1: o = __readUInt8(this, this.l); break;
+		case 2: o=(t==='u' ? __readUInt16LE : __readInt16LE)(this, this.l); break;
+		case 4: o = __readUInt32LE(this, this.l); break;
+		case 8: if(t === 'f') { o = __readDoubleLE(this, this.l); break; }
 		/* falls through */
 		case 16: o = this.toString('hex', this.l,this.l+size); break;
 
-		case 'utf8': size = t; o = this.utf8(this.l, this.l + size); break;
-		case 'utf16le': size = 2*t; o = this.utf16le(this.l, this.l + size); break;
+		case 'utf8': size = t; o = __utf8(this, this.l, this.l + size); break;
+		case 'utf16le': size=2*t; o = __utf16le(this, this.l, this.l + size); break;
 
 		/* [MS-OLEDS] 2.1.4 LengthPrefixedAnsiString */
-		case 'lpstr': o = this.lpstr(this.l); size = 5 + o.length; break;
+		case 'lpstr': o = __lpstr(this, this.l); size = 5 + o.length; break;
 
-		case 'lpwstr': o = this.lpwstr(this.l); size = 5 + o.length; if(o[o.length-1] == '\u0000') size += 2; break;
+		case 'lpwstr': o = __lpwstr(this, this.l); size = 5 + o.length; if(o[o.length-1] == '\u0000') size += 2; break;
 
 		/* sbcs and dbcs support continue records in the SST way TODO codepages */
 		/* TODO: DBCS http://msdn.microsoft.com/en-us/library/cc194788.aspx */
 		case 'dbcs': size = 2*t; o = ""; loc = this.l;
 			for(i = 0; i != t; ++i) {
 				if(this.lens && this.lens.indexOf(loc) !== -1) {
-					w = this.readUInt8(loc);
+					w = __readUInt8(this, loc);
 					this.l = loc + 1;
 					vv = ReadShift.call(this, w ? 'dbcs' : 'sbcs', t-i);
 					return o + vv;
 				}
-				o += _getchar(this.readUInt16LE(loc));
+				o += _getchar(__readUInt16LE(this, loc));
 				loc+=2;
 			} break;
 
 		case 'sbcs': size = t; o = ""; loc = this.l;
 			for(i = 0; i != t; ++i) {
 				if(this.lens && this.lens.indexOf(loc) !== -1) {
-					w = this.readUInt8(loc);
+					w = __readUInt8(this, loc);
 					this.l = loc + 1;
 					vv = ReadShift.call(this, w ? 'dbcs' : 'sbcs', t-i);
 					return o + vv;
 				}
-				o += _getchar(this.readUInt8(loc));
+				o += _getchar(__readUInt8(this, loc));
 				loc+=1;
 			} break;
 
 		case 'cstr': size = 0; o = "";
-			while((w=this.readUInt8(this.l + size++))!==0) o+= _getchar(w);
+			while((w=__readUInt8(this, this.l + size++))!==0) o+= _getchar(w);
 			break;
 		case 'wstr': size = 0; o = "";
-			while((w=this.readUInt16LE(this.l +size))!==0){o+= _getchar(w);size+=2;}
+			while((w=__readUInt16LE(this,this.l +size))!==0){o+= _getchar(w);size+=2;}
 			size+=2; break;
 	}
 	this.l+=size; return o;
 }
 
 function CheckField(hexstr, fld) {
-	var m = this.slice(this.l, this.l+hexstr.length/2).hexlify('hex');
+	var b = this.slice(this.l, this.l+hexstr.length/2);
+	var m = b.hexlify ? b.hexlify() : __hexlify(b);
 	if(m !== hexstr) throw (fld||"") + 'Expected ' + hexstr + ' saw ' + m;
 	this.l += hexstr.length/2;
 }
 
-function WarnField(hexstr, fld) {
-	var m = this.slice(this.l, this.l+hexstr.length/2).hexlify('hex');
-	if(m !== hexstr) console.error((fld||"") + 'Expected ' + hexstr +' saw ' + m);
-	this.l += hexstr.length/2;
-}
-
 function prep_blob(blob, pos) {
 	blob.read_shift = ReadShift.bind(blob);
 	blob.chk = CheckField;
@@ -233,14 +202,14 @@ function prep_blob(blob, pos) {
 	return [read, chk];
 }
 
-/* ssf.js (C) 2013 SheetJS -- http://sheetjs.com */
+/* ssf.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
 var SSF = {};
 var make_ssf = function(SSF){
-String.prototype.reverse=function(){return this.split("").reverse().join("");};
-var _strrev = function(x) { return String(x).reverse(); };
+var _strrev = function(x) { return String(x).split("").reverse().join("");};
 function fill(c,l) { return new Array(l+1).join(c); }
 function pad(v,d,c){var t=String(v);return t.length>=d?t:(fill(c||0,d-t.length)+t);}
 function rpad(v,d,c){var t=String(v);return t.length>=d?t:(t+fill(c||0,d-t.length));}
+SSF.version = '0.5.8';
 /* Options */
 var opts_fmt = {};
 function fixopts(o){for(var y in opts_fmt) if(o[y]===undefined) o[y]=opts_fmt[y];}
@@ -249,6 +218,7 @@ opts_fmt.date1904 = 0;
 opts_fmt.output = "";
 opts_fmt.mode = "";
 var table_fmt = {
+	0:  'General',
 	1:  '0',
 	2:  '0.00',
 	3:  '#,##0',
@@ -275,7 +245,9 @@ var table_fmt = {
 	46: '[h]:mm:ss',
 	47: 'mmss.0',
 	48: '##0.0E+0',
-	49: '@'
+	49: '@',
+	56: '"上午/下午 "hh"時"mm"分"ss"秒 "',
+	65535: 'General'
 };
 var days = [
 	['Sun', 'Sunday'],
@@ -305,12 +277,12 @@ var frac = function frac(x, D, mixed) {
 	var B = x * sgn;
 	var P_2 = 0, P_1 = 1, P = 0;
 	var Q_2 = 1, Q_1 = 0, Q = 0;
-	var A = B|0;
+	var A = Math.floor(B);
 	while(Q_1 < D) {
-		A = B|0;
+		A = Math.floor(B);
 		P = A * P_1 + P_2;
 		Q = A * Q_1 + Q_2;
-		if((B - A) < 0.0000000001) break;
+		if((B - A) < 0.0000000005) break;
 		B = 1 / (B - A);
 		P_2 = P_1; P_1 = P;
 		Q_2 = Q_1; Q_1 = Q;
@@ -318,6 +290,7 @@ var frac = function frac(x, D, mixed) {
 	if(Q > D) { Q = Q_1; P = P_1; }
 	if(Q > D) { Q = Q_2; P = P_2; }
 	if(!mixed) return [0, sgn * P, Q];
+	if(Q===0) throw "Unexpected state: "+P+" "+P_1+" "+P_2+" "+Q+" "+Q_1+" "+Q_2;
 	var q = Math.floor(sgn * P/Q);
 	return [q, sgn*P - q*Q, Q];
 };
@@ -331,25 +304,26 @@ var general_fmt = function(v) {
 		else if(V >= 0.0001 && V < 0.001) o = v.toPrecision(6);
 		else if(V >= Math.pow(10,10) && V < Math.pow(10,11)) o = v.toFixed(10).substr(0,12);
 		else if(V > Math.pow(10,-9) && V < Math.pow(10,11)) {
-			o = v.toFixed(12).replace(/(\.[0-9]*[1-9])0*$/,"$1").replace(/\.$/,""); 
+			o = v.toFixed(12).replace(/(\.[0-9]*[1-9])0*$/,"$1").replace(/\.$/,"");
 			if(o.length > 11+(v<0?1:0)) o = v.toPrecision(10);
 			if(o.length > 11+(v<0?1:0)) o = v.toExponential(5);
 		}
 		else {
 			o = v.toFixed(11).replace(/(\.[0-9]*[1-9])0*$/,"$1");
-			if(o.length > 11 + (v<0?1:0)) o = v.toPrecision(6); 
+			if(o.length > 11 + (v<0?1:0)) o = v.toPrecision(6);
 		}
 		o = o.replace(/(\.[0-9]*[1-9])0+e/,"$1e").replace(/\.0*e/,"e");
 		return o.replace("e","E").replace(/\.0*$/,"").replace(/\.([0-9]*[^0])0*$/,".$1").replace(/(E[+-])([0-9])$/,"$1"+"0"+"$2");
 	}
 	if(typeof v === 'string') return v;
-	throw "unsupported value in General format: " + v;
+	throw new Error("unsupported value in General format: " + v);
 };
 SSF._general = general_fmt;
 var parse_date_code = function parse_date_code(v,opts) {
-	var date = Math.floor(v), time = Math.round(86400 * (v - date)), dow=0;
+	var date = Math.floor(v), time = Math.floor(86400 * (v - date)+1e-6), dow=0;
 	var dout=[], out={D:date, T:time, u:86400*(v-date)-time}; fixopts(opts = (opts||{}));
 	if(opts.date1904) date += 1462;
+	if(date > 2958465) return null;
 	if(date === 60) {dout = [1900,2,29]; dow=3;}
 	else if(date === 0) {dout = [1900,1,0]; dow=6;}
 	else {
@@ -359,7 +333,7 @@ var parse_date_code = function parse_date_code(v,opts) {
 		d.setDate(d.getDate() + date - 1);
 		dout = [d.getFullYear(), d.getMonth()+1,d.getDate()];
 		dow = d.getDay();
-		if(opts.mode === 'excel' && date < 60) dow = (dow + 6) % 7;
+		if(/* opts.mode === 'excel' && */ date < 60) dow = (dow + 6) % 7;
 	}
 	out.y = dout[0]; out.m = dout[1]; out.d = dout[2];
 	out.S = time % 60; time = Math.floor(time / 60);
@@ -369,61 +343,63 @@ var parse_date_code = function parse_date_code(v,opts) {
 	return out;
 };
 SSF.parse_date_code = parse_date_code;
+/*jshint -W086 */
 var write_date = function(type, fmt, val) {
 	if(val < 0) return "";
+	var o;
 	switch(type) {
 		case 'y': switch(fmt) { /* year */
 			case 'y': case 'yy': return pad(val.y % 100,2);
-			default: return val.y;
-		} break;
+			default: return pad(val.y % 10000,4);
+		}
 		case 'm': switch(fmt) { /* month */
 			case 'm': return val.m;
 			case 'mm': return pad(val.m,2);
 			case 'mmm': return months[val.m-1][1];
-			case 'mmmm': return months[val.m-1][2];
 			case 'mmmmm': return months[val.m-1][0];
-			default: throw 'bad month format: ' + fmt;
-		} break;
+			default: return months[val.m-1][2];
+		}
 		case 'd': switch(fmt) { /* day */
 			case 'd': return val.d;
 			case 'dd': return pad(val.d,2);
 			case 'ddd': return days[val.q][0];
-			case 'dddd': return days[val.q][1];
-			default: throw 'bad day format: ' + fmt;
-		} break;
+			default: return days[val.q][1];
+		}
 		case 'h': switch(fmt) { /* 12-hour */
 			case 'h': return 1+(val.H+11)%12;
 			case 'hh': return pad(1+(val.H+11)%12, 2);
 			default: throw 'bad hour format: ' + fmt;
-		} break;
+		}
 		case 'H': switch(fmt) { /* 24-hour */
 			case 'h': return val.H;
 			case 'hh': return pad(val.H, 2);
 			default: throw 'bad hour format: ' + fmt;
-		} break;
+		}
 		case 'M': switch(fmt) { /* minutes */
 			case 'm': return val.M;
 			case 'mm': return pad(val.M, 2);
 			default: throw 'bad minute format: ' + fmt;
-		} break;
+		}
 		case 's': switch(fmt) { /* seconds */
-			case 's': return val.S;
-			case 'ss': return pad(val.S, 2);
-			case 'ss.0': return pad(val.S,2) + "." + Math.round(10*val.u);
+			case 's': return Math.round(val.S+val.u);
+			case 'ss': return pad(Math.round(val.S+val.u), 2);
+			case 'ss.0': o = pad(Math.round(10*(val.S+val.u)),3); return o.substr(0,2)+"." + o.substr(2);
+			case 'ss.00': o = pad(Math.round(100*(val.S+val.u)),4); return o.substr(0,2)+"." + o.substr(2);
+			case 'ss.000': o = pad(Math.round(1000*(val.S+val.u)),5); return o.substr(0,2)+"." + o.substr(2);
 			default: throw 'bad second format: ' + fmt;
-		} break;
+		}
 		case 'Z': switch(fmt) {
-			case '[h]': return val.D*24+val.H;
+			case '[h]': case '[hh]': o = val.D*24+val.H; break;
+			case '[m]': case '[mm]': o = (val.D*24+val.H)*60+val.M; break;
+			case '[s]': case '[ss]': o = ((val.D*24+val.H)*60+val.M)*60+Math.round(val.S+val.u); break;
 			default: throw 'bad abstime format: ' + fmt;
-		} break;
+		} return fmt.length === 3 ? o : pad(o, 2);
 		/* TODO: handle the ECMA spec format ee -> yy */
 		case 'e': { return val.y; } break;
-		case 'A': return (val.h>=12 ? 'P' : 'A') + fmt.substr(1);
-		default: throw 'bad format type ' + type + ' in ' + fmt;
 	}
 };
-String.prototype.reverse = function() { return this.split("").reverse().join(""); };
-var commaify = function(s) { return s.reverse().replace(/.../g,"$&,").reverse().replace(/^,/,""); };
+/*jshint +W086 */
+var commaify = function(s) { return _strrev(_strrev(s).replace(/.../g,"$&,")).replace(/^,/,""); };
 var write_num = function(type, fmt, val) {
 	if(type === '(') {
 		var ffmt = fmt.replace(/\( */,"").replace(/ \)/,"").replace(/\)/,"");
@@ -435,37 +411,60 @@ var write_num = function(type, fmt, val) {
 	if(mul !== 0) return write_num(type, fmt, val * Math.pow(10,2*mul)) + fill("%",mul);
 	if(fmt.indexOf("E") > -1) {
 		var idx = fmt.indexOf("E") - fmt.indexOf(".") - 1;
-		if(fmt == '##0.0E+0') {
-			var ee = Number(val.toExponential(0).substr(3))%3;
-			o = (val/Math.pow(10,ee%3)).toPrecision(idx+1+(ee%3)).replace(/^([+-]?)([0-9]*)\.([0-9]*)[Ee]/,function($$,$1,$2,$3) { return $1 + $2 + $3.substr(0,ee) + "." + $3.substr(ee) + "E"; });
+		if(fmt.match(/^#+0.0E\+0$/)) {
+			var period = fmt.indexOf("."); if(period === -1) period=fmt.indexOf('E');
+			var ee = (Number(val.toExponential(0).substr(2+(val<0))))%period;
+			if(ee < 0) ee += period;
+			o = (val/Math.pow(10,ee)).toPrecision(idx+1+(period+ee)%period);
+			if(!o.match(/[Ee]/)) {
+				var fakee = (Number(val.toExponential(0).substr(2+(val<0))));
+				if(o.indexOf(".") === -1) o = o[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.replace(/^0+([1-9])/,"$1").replace(/^0+\./,"0.");
+				}
+				o = o.replace(/\+-/,"-");
+			}
+			o = o.replace(/^([+-]?)([0-9]*)\.([0-9]*)[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[+-][0-9]$/)) o = o.substr(0,o.length-1) + "0" + o[o.length-1];
 		if(fmt.match(/E\-/) && o.match(/e\+/)) o = o.replace(/e\+/,"e");
 		return o.replace("e","E");
 	}
 	if(fmt[0] === "$") return "$"+write_num(type,fmt.substr(fmt[1]==' '?2:1),val);
-	var r, ff, aval = val < 0 ? -val : val, sign = val < 0 ? "-" : "";
-	if((r = fmt.match(/# (\?+) \/ (\d+)/))) {
-		var den = Number(r[2]), rnd = Math.round(aval * den), base = Math.floor(rnd/den);
+	var r, rr, ff, aval = val < 0 ? -val : val, sign = val < 0 ? "-" : "";
+	if((r = fmt.match(/# (\?+)([ ]?)\/([ ]?)(\d+)/))) {
+		var den = Number(r[4]), rnd = Math.round(aval * den), base = Math.floor(rnd/den);
 		var myn = (rnd - base*den), myd = den;
-		return sign + (base?base:"") + " " + (myn === 0 ? fill(" ", r[1].length + 1 + r[2].length) : pad(myn,r[1].length," ") + "/" + pad(myd,r[2].length));
+		return sign + (base?base:"") + " " + (myn === 0 ? fill(" ", r[1].length + 1 + r[4].length) : pad(myn,r[1].length," ") + r[2] + "/" + r[3] + pad(myd,r[4].length));
+	}
+	if(fmt.match(/^#+0+$/)) fmt = fmt.replace(/#/g,"");
+	if(fmt.match(/^00+$/)) return (val<0?"-":"")+pad(Math.round(aval),fmt.length);
+	if(fmt.match(/^[#?]+$/)) return String(Math.round(val)).replace(/^0$/,"");
+	if((r = fmt.match(/^#*0+\.(0+)/))) {
+		o = Math.round(val * Math.pow(10,r[1].length));
+		return String(o/Math.pow(10,r[1].length)).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.([0-9]*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
+	}
+	if((r = fmt.match(/^(0*)\.(#*)$/))) {
+		o = Math.round(val*Math.pow(10,r[2].length));
+		return String(o * Math.pow(10,-r[2].length)).replace(/\.(\d*[1-9])0*$/,".$1").replace(/^([-]?\d*)$/,"$1.").replace(/^0\./,r[1].length?"0.":".");
+	}
+	if((r = fmt.match(/^#,##0([.]?)$/))) return sign + commaify(String(Math.round(aval)));
+	if((r = fmt.match(/^#,##0\.([#0]*0)$/))) {
+		rr = Math.round((val-Math.floor(val))*Math.pow(10,r[1].length));
+		return val < 0 ? "-" + write_num(type, fmt, -val) : commaify(String(Math.floor(val))) + "." + pad(rr,r[1].length,0);
+	}
+	if((r = fmt.match(/^# ([?]+)([ ]?)\/([ ]?)([?]+)/))) {
+		rr = Math.min(Math.max(r[1].length, r[4].length),7);
+		ff = frac(aval, Math.pow(10,rr)-1, true);
+		return sign + (ff[0]||(ff[1] ? "" : "0")) + " " + (ff[1] ? pad(ff[1],rr," ") + r[2] + "/" + r[3] + rpad(ff[2],rr," "): fill(" ", 2*rr+1 + r[2].length + r[3].length));
 	}
-	if(fmt.match(/^00*$/)) return (val<0?"-":"")+pad(Math.round(Math.abs(val)), fmt.length);
-	if(fmt.match(/^####*$/)) return "dafuq";
 	switch(fmt) {
-		case "0": return Math.round(val);
-		case "0.0": o = Math.round(val*10);
-			return String(o/10).replace(/^([^\.]+)$/,"$1.0").replace(/\.$/,".0");
-		case "0.00": o = Math.round(val*100);
-			return String(o/100).replace(/^([^\.]+)$/,"$1.00").replace(/\.$/,".00").replace(/\.([0-9])$/,".$1"+"0");
-		case "0.000": o = Math.round(val*1000);
-			return String(o/1000).replace(/^([^\.]+)$/,"$1.000").replace(/\.$/,".000").replace(/\.([0-9])$/,".$1"+"00").replace(/\.([0-9][0-9])$/,".$1"+"0");
-		case "#,##0": return sign + commaify(String(Math.round(aval)));
-		case "#,##0.0": r = Math.round((val-Math.floor(val))*10); return val < 0 ? "-" + write_num(type, fmt, -val) : commaify(String(Math.floor(val))) + "." + r;
-		case "#,##0.00": r = Math.round((val-Math.floor(val))*100); return val < 0 ? "-" + write_num(type, fmt, -val) : commaify(String(Math.floor(val))) + "." + (r < 10 ? "0"+r:r);
-		case "# ? / ?": ff = frac(aval, 9, true); return sign + (ff[0]||"") + " " + (ff[1] === 0 ? "   " : ff[1] + "/" + ff[2]);
-		case "# ?? / ??": ff = frac(aval, 99, true); return sign + (ff[0]||"") + " " + (ff[1] ? pad(ff[1],2," ") + "/" + rpad(ff[2],2," ") : "     ");
-		case "# ??? / ???": ff = frac(aval, 999, true); return sign + (ff[0]||"") + " " + (ff[1] ? pad(ff[1],3," ") + "/" + rpad(ff[2],3," ") : "       ");
+		case "0": case "#0": return Math.round(val);
+		case "#.##": o = Math.round(val*100);
+			return String(o/100).replace(/^([^\.]+)$/,"$1.").replace(/^0\.$/,".");
+		case "#,###": var x = commaify(String(Math.round(aval))); return x !== "0" ? sign + x : "";
 		default:
 	}
 	throw new Error("unsupported format |" + fmt + "|");
@@ -482,7 +481,7 @@ function split_fmt(fmt) {
 		j = i+1;
 	}
 	out.push(fmt.slice(j));
-	if(in_str !=-1) throw "Format |" + fmt + "| unterminated string at " + in_str;
+	if(in_str !=-1) throw new Error("Format |" + fmt + "| unterminated string at " + in_str);
 	return out;
 }
 SSF._split = split_fmt;
@@ -493,6 +492,10 @@ function eval_fmt(fmt, v, opts, flen) {
 	/* Tokenize */
 	while(i < fmt.length) {
 		switch((c = fmt[i])) {
+			case 'G': /* General */
+				if(fmt.substr(i, i+6).toLowerCase() !== "general")
+					throw new Error('unrecognized character ' + fmt[i] + ' in ' +fmt);
+				out.push({t:'G',v:'General'}); i+=7; break;
 			case '"': /* Literal text */
 				for(o="";fmt[++i] !== '"' && i < fmt.length;) o += fmt[i];
 				out.push({t:'t', v:o}); ++i; break;
@@ -502,28 +505,39 @@ function eval_fmt(fmt, v, opts, flen) {
 			case '@': /* Text Placeholder */
 				out.push({t:'T', v:v}); ++i; break;
 			/* Dates */
+			case 'M': case 'D': case 'Y': case 'H': case 'S': case 'E':
+				c = c.toLowerCase();
+				/* falls through */
 			case 'm': case 'd': case 'y': case 'h': case 's': case 'e':
 				if(v < 0) return "";
 				if(!dt) dt = parse_date_code(v, opts);
-				o = fmt[i]; while(fmt[++i] === c) o+=c;
+				if(!dt) return "";
+				o = fmt[i]; while((fmt[++i]||"").toLowerCase() === c) o+=c;
 				if(c === 's' && fmt[i] === '.' && fmt[i+1] === '0') { o+='.'; while(fmt[++i] === '0') o+= '0'; }
 				if(c === 'm' && lst.toLowerCase() === 'h') c = 'M'; /* m = minute */
 				if(c === 'h') c = hr;
+				o = o.toLowerCase();
 				q={t:c, v:o}; out.push(q); lst = c; break;
 			case 'A':
 				if(!dt) dt = parse_date_code(v, opts);
+				if(!dt) return "";
 				q={t:c,v:"A"};
 				if(fmt.substr(i, 3) === "A/P") {q.v = dt.H >= 12 ? "P" : "A"; q.t = 'T'; hr='h';i+=3;}
 				else if(fmt.substr(i,5) === "AM/PM") { q.v = dt.H >= 12 ? "PM" : "AM"; q.t = 'T'; i+=5; hr='h'; }
-				else q.t = "t";
+				else { q.t = "t"; i++; }
 				out.push(q); lst = c; break;
 			case '[': /* TODO: Fix this -- ignore all conditionals and formatting */
 				o = c;
-				while(fmt[i++] !== ']') o += fmt[i];
-				if(o == "[h]") out.push({t:'Z', v:o});
+				while(fmt[i++] !== ']' && i < fmt.length) o += fmt[i];
+				if(o.substr(-1) !== ']') throw 'unterminated "[" block: |' + o + '|';
+				if(o.match(/\[[HhMmSs]*\]/)) {
+					if(!dt) dt = parse_date_code(v, opts);
+					if(!dt) return "";
+					out.push({t:'Z', v:o.toLowerCase()});
+				} else { o=""; }
 				break;
 			/* Numbers */
-			case '0': case '#':
+			case '0': case '#': case '.':
 				o = c; while("0#?.,E+-%".indexOf(c=fmt[++i]) > -1) o += c;
 				out.push({t:'n', v:o}); break;
 			case '?':
@@ -536,7 +550,7 @@ function eval_fmt(fmt, v, opts, flen) {
 				out.push({t:'D', v:o}); break;
 			case ' ': out.push({t:c,v:c}); ++i; break;
 			default:
-				if("$-+/():!^&'~{}<>=".indexOf(c) === -1)
+				if(",$-+/():!^&'~{}<>=€".indexOf(c) === -1)
 					throw 'unrecognized character ' + fmt[i] + ' in ' + fmt;
 				out.push({t:'t', v:c}); ++i; break;
 		}
@@ -554,45 +568,48 @@ function eval_fmt(fmt, v, opts, flen) {
 	/* replace fields */
 	for(i=0; i < out.length; ++i) {
 		switch(out[i].t) {
-			case 't': case 'T': case ' ': break;
-			case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'A': case 'e': case 'Z':
+			case 't': case 'T': case ' ': case 'D': break;
+			case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'Z':
 				out[i].v = write_date(out[i].t, out[i].v, dt);
 				out[i].t = 't'; break;
-			case 'n': case '(':
+			case 'n': case '(': case '?':
 				var jj = i+1;
-				while(out[jj] && ("? D".indexOf(out[jj].t) > -1 || out[i].t == '(' && (out[jj].t == ')' || out[jj].t == 'n') || out[jj].t == 't' && (out[jj].v == '/' || out[jj].v == '$' || (out[jj].v == ' ' && (out[jj+1]||{}).t == '?')))) {
-					if(out[jj].v!==' ') out[i].v += ' ' + out[jj].v;
+				while(out[jj] && ("?D".indexOf(out[jj].t) > -1 || (" t".indexOf(out[jj].t) > -1 && "?t".indexOf((out[jj+1]||{}).t)>-1 && (out[jj+1].t == '?' || out[jj+1].v == '/')) || out[i].t == '(' && (out[jj].t == ')' || out[jj].t == 'n') || out[jj].t == 't' && (out[jj].v == '/' || '$€'.indexOf(out[jj].v) > -1 || (out[jj].v == ' ' && (out[jj+1]||{}).t == '?')))) {
+					out[i].v += out[jj].v;
 					delete out[jj]; ++jj;
 				}
-				out[i].v = write_num(out[i].t, out[i].v, v);
+				out[i].v = write_num(out[i].t, out[i].v, (flen >1 && v < 0 && i>0 && out[i-1].v == "-" ? -v:v));
 				out[i].t = 't';
-				i = jj; break;
-			default: throw "unrecognized type " + out[i].t;
+				i = jj-1; break;
+			case 'G': out[i].t = 't'; out[i].v = general_fmt(v,opts); break;
 		}
 	}
-
 	return out.map(function(x){return x.v;}).join("");
 }
 SSF._eval = eval_fmt;
 function choose_fmt(fmt, v, o) {
-	if(typeof fmt === 'number') fmt = table_fmt[fmt];
+	if(typeof fmt === 'number') fmt = ((o&&o.table) ? o.table : table_fmt)[fmt];
 	if(typeof fmt === "string") fmt = split_fmt(fmt);
 	var l = fmt.length;
+	if(l<4 && fmt[l-1].indexOf("@")>-1) --l;
 	switch(fmt.length) {
-		case 1: fmt = [fmt[0], fmt[0], fmt[0], "@"]; break;
-		case 2: fmt = [fmt[0], fmt[fmt[1] === "@"?0:1], fmt[0], "@"]; break;
+		case 1: fmt = fmt[0].indexOf("@")>-1 ? ["General", "General", "General", fmt[0]] : [fmt[0], fmt[0], fmt[0], "@"]; break;
+		case 2: fmt = fmt[1].indexOf("@")>-1 ? [fmt[0], fmt[0], fmt[0], fmt[1]] : [fmt[0], fmt[1], fmt[0], "@"]; break;
+		case 3: fmt = fmt[2].indexOf("@")>-1 ? [fmt[0], fmt[1], fmt[0], fmt[2]] : [fmt[0], fmt[1], fmt[2], "@"]; break;
 		case 4: break;
 		default: throw "cannot find right format for |" + fmt + "|";
 	}
 	if(typeof v !== "number") return [fmt.length, fmt[3]];
 	return [l, v > 0 ? fmt[0] : v < 0 ? fmt[1] : fmt[2]];
 }
-
 var format = function format(fmt,v,o) {
 	fixopts(o = (o||{}));
-	if(fmt === 0) return general_fmt(v, o);
-	if(typeof fmt === 'number') fmt = table_fmt[fmt];
+	if(typeof fmt === "string" && fmt.toLowerCase() === "general") return general_fmt(v, o);
+	if(typeof fmt === 'number') fmt = (o.table || table_fmt)[fmt];
 	var f = choose_fmt(fmt, v, o);
+	if(f[1].toLowerCase() === "general") return general_fmt(v,o);
+	if(v === true) v = "TRUE"; if(v === false) v = "FALSE";
+	if(v === "" || typeof v === "undefined") return "";
 	return eval_fmt(f[1], v, o, f[0]);
 };
 
@@ -600,6 +617,8 @@ SSF._choose = choose_fmt;
 SSF._table = table_fmt;
 SSF.load = function(fmt, idx) { table_fmt[idx] = fmt; };
 SSF.format = format;
+SSF.get_table = function() { return table_fmt; };
+SSF.load_table = function(tbl) { for(var i=0; i!=0x0188; ++i) if(tbl[i]) SSF.load(tbl[i], i); };
 };
 make_ssf(SSF);
 /* [MS-OLEPS] v20130118 */
@@ -746,7 +765,7 @@ function parse_VtStringBase(blob, stringType, pad) {
 	else return parse_VtStringBase(blob, blob.read_shift(2), pad);
 }
 
-function parse_VtString(blob, t, pad) { return parse_VtStringBase(blob, t, 4); }
+function parse_VtString(blob, t, pad) { return parse_VtStringBase(blob, t, pad === false ? null : 4); }
 function parse_VtUnalignedString(blob, t) { if(!t) throw new Error("dafuq?"); return parse_VtStringBase(blob, t, 0); }
 
 /* [MS-OSHARED] 2.3.3.1.9 VtVecUnalignedLpstrValue */
@@ -802,7 +821,7 @@ function parse_dictionary(blob,CodePage) {
 function parse_BLOB(blob) {
 	var size = blob.read_shift(4);
 	var bytes = blob.slice(blob.l,blob.l+size);
-	if(blob.l % 4) blob.l += (4 - (blob.l % 4)) % 4;
+	if(size % 4 > 0) blob.l += (4 - (size % 4)) % 4;
 	return bytes;
 }
 
@@ -828,14 +847,14 @@ function parse_VtVector(blob, cb) {
 }
 
 /* [MS-OLEPS] 2.15 TypedPropertyValue */
-function parse_TypedPropertyValue(blob, type) {
+function parse_TypedPropertyValue(blob, type, _opts) {
 	var read = ReadShift.bind(blob), chk = CheckField.bind(blob);
-	var t = read(2), ret;
+	var t = read(2), ret, opts = _opts||{};
 	read(2);
 	if(type !== VT_VARIANT)
 	if(t !== type && VT_CUSTOM.indexOf(type)===-1) throw new Error('Expected type ' + type + ' saw ' + t);
 	switch(type === VT_VARIANT ? t : type) {
-		case VT_I2: ret = read(2, 'i'); read(2); return ret;
+		case VT_I2: ret = read(2, 'i'); if(!opts.raw) read(2); return ret;
 		case VT_I4: ret = read(4, 'i'); return ret;
 		case VT_BOOL: return read(4) !== 0x0;
 		case VT_UI4: ret = read(4); return ret;
@@ -844,7 +863,7 @@ function parse_TypedPropertyValue(blob, type) {
 		case VT_FILETIME: return parse_FILETIME(blob);
 		case VT_BLOB: return parse_BLOB(blob);
 		case VT_CF: return parse_ClipboardData(blob);
-		case VT_STRING: return parse_VtString(blob, t, 4).replace(/\u0000/g,'');
+		case VT_STRING: return parse_VtString(blob, t, !opts.raw && 4).replace(/\u0000/g,'');
 		case VT_USTR: return parse_VtUnalignedString(blob, t, 4).replace(/\u0000/g,'');
 		case VT_VECTOR | VT_VARIANT: return parse_VtVecHeadingPair(blob);
 		case VT_VECTOR | VT_LPSTR: return parse_VtVecUnalignedLpstr(blob);
@@ -880,16 +899,25 @@ function parse_PropertySet(blob, PIDSI) {
 	var PropH = {};
 	for(i = 0; i != NumProps; ++i) {
 		if(blob.l !== Props[i][1]) {
-			throw new Error("Read Error: Expected address " + Props[i][1] + ' at ' + blob.l + ' :' + i);
+			var fail = true;
+			if(i>0 && PIDSI) switch(PIDSI[Props[i-1][0]].t) {
+				case VT_I2: if(blob.l +2 === Props[i][1]) { blob.l+=2; fail = false; } break;
+				case VT_STRING: if(blob.l <= Props[i][1]) { blob.l=Props[i][1]; fail = false; } break;
+				case VT_VECTOR | VT_VARIANT: if(blob.l <= Props[i][1]) { blob.l=Props[i][1]; fail = false; } break;
+			}
+			if(!PIDSI && blob.l <= Props[i][1]) { fail=false; blob.l = Props[i][1]; }
+			if(fail) throw new Error("Read Error: Expected address " + Props[i][1] + ' at ' + blob.l + ' :' + i);
 		}
 		if(PIDSI) {
 			var piddsi = PIDSI[Props[i][0]];
-			PropH[piddsi.n] = parse_TypedPropertyValue(blob, piddsi.t);
+			PropH[piddsi.n] = parse_TypedPropertyValue(blob, piddsi.t, {raw:true});
 			if(piddsi.n == "CodePage") switch(PropH[piddsi.n]) {
 				/* TODO: Generate files under every codepage */
 				case 10000: break; // OSX Roman
 				case 1252: break; // Windows Latin
 
+				case 0: PropH[piddsi.n] = 1252; break; // Unknown -> default
+
 				case 874: // SB Windows Thai
 				case 1250: // SB Windows Central Europe
 				case 1251: // SB Windows Cyrillic
@@ -971,14 +999,16 @@ function parse_PropertySetStream(file, PIDSI) {
 	rval.FMTID = FMTID0;
 	//rval.PSet0 = PSet0;
 	if(NumSets === 1) return rval;
-	var PSet1 = parse_PropertySet(blob, null);
+	if(blob.l !== Offset1) throw "Length mismatch 2: " + blob.l + " !== " + Offset1;
+	var PSet1;
+	try { PSet1 = parse_PropertySet(blob, null); } catch(e) { }
 	for(y in PSet1) rval[y] = PSet1[y];
 	rval.FMTID = [FMTID0, FMTID1]; // TODO: verify FMTID0/1
 	return rval;
 }
 /* [MS-CFB] v20130118 */
-if(typeof module !== "undefined" && typeof require !== 'undefined') CFB = require('cfb');
-else var CFB = (function(){
+/*if(typeof module !== "undefined" && typeof require !== 'undefined') CFB = require('cfb');
+else*/ var CFB = (function(){
 var exports = {};
 function parse(file) {
 
@@ -1004,7 +1034,6 @@ var fat_addrs = []; // locations of FAT sectors
 var blob = file.slice(0,512);
 prep_blob(blob);
 var read = ReadShift.bind(blob), chk = CheckField.bind(blob);
-//var wrn = WarnField.bind(blob);
 var j = 0, q;
 
 // header signature 8
@@ -1014,7 +1043,6 @@ chk(HEADER_SIGNATURE, 'Header Signature: ');
 chk(HEADER_CLSID, 'CLSID: ');
 
 // minor version 2
-//wrn(HEADER_MINOR_VERSION, 'Minor Version: ');
 read(2);
 
 // major version 3
@@ -1100,10 +1128,10 @@ function sleuth_fat(idx, cnt) {
 	if(idx !== FREESECT) {
 		var sector = sectors[idx];
 		for(var i = 0; i != ssz/4-1; ++i) {
-			if((q = sector.readUInt32LE(i*4)) === ENDOFCHAIN) break;
+			if((q = __readUInt32LE(sector,i*4)) === ENDOFCHAIN) break;
 			fat_addrs.push(q);
 		}
-		sleuth_fat(sector.readUInt32LE(ssz-4),cnt - 1);
+		sleuth_fat(__readUInt32LE(sector,ssz-4),cnt - 1);
 	}
 }
 sleuth_fat(difat_start, ndfs);
@@ -1117,7 +1145,7 @@ function get_buffer(byte_addr, bytes) {
 }
 
 function get_buffer_u32(byte_addr) {
-	return get_buffer(byte_addr,4).readUInt32LE(0);
+	return __readUInt32LE(get_buffer(byte_addr,4), 0);
 }
 
 function get_next_sector(idx) { return get_buffer_u32(idx); }
@@ -1130,7 +1158,7 @@ for(i=0; i != sectors.length; ++i) {
 	if(chkd[k]) continue;
 	for(j=k; j<=MAXREGSECT; buf.push(j),j=get_next_sector(j)) chkd[j] = true;
 	sector_list[k] = {nodes: buf};
-	sector_list[k].data = Buffers(buf.map(get_sector)).toBuffer();
+	sector_list[k].data = __toBuffer(Array(buf.map(get_sector)));
 }
 sector_list[dir_start].name = "!Directory";
 if(nmfs > 0 && minifat_start !== ENDOFCHAIN) sector_list[minifat_start].name = "!MiniFAT";
@@ -1147,7 +1175,7 @@ function read_directory(idx) {
 		read = ReadShift.bind(blob);
 		var namelen = read(2);
 		if(namelen === 0) return;
-		var name = blob.utf16le(0,namelen-(Paths.length?2:0)); // OLE
+		var name = __utf16le(blob,0,namelen-(Paths.length?2:0)); // OLE
 		Paths.push(name);
 		var o = { name: name };
 		o.type = EntryTypes[read(1)];
@@ -1181,12 +1209,12 @@ function read_directory(idx) {
 		}
 		if(o.ctime) {
 			var ct = blob.slice(blob.l-24, blob.l-16);
-			var c2 = (ct.readUInt32LE(4)/1e7)*Math.pow(2,32)+ct.readUInt32LE(0)/1e7;
+			var c2 = (__readUInt32LE(ct,4)/1e7)*Math.pow(2,32)+__readUInt32LE(ct,0)/1e7;
 			o.ct = new Date((c2 - 11644473600)*1000);
 		}
 		if(o.mtime) {
 			var mt = blob.slice(blob.l-16, blob.l-8);
-			var m2 = (mt.readUInt32LE(4)/1e7)*Math.pow(2,32)+mt.readUInt32LE(0)/1e7;
+			var m2 = (__readUInt32LE(mt,4)/1e7)*Math.pow(2,32)+__readUInt32LE(mt,0)/1e7;
 			o.mt = new Date((m2 - 11644473600)*1000);
 		}
 		files[name] = o;
@@ -1248,16 +1276,16 @@ var rval = {
 	find: find_path
 };
 
-//for(var name in files) {
-//	switch(name) {
-//		/* [MS-OSHARED] 2.3.3.2.2 Document Summary Information Property Set */
-//		case '!DocumentSummaryInformation':
-//			rval.DocSummary = parse_PropertySetStream(files[name], DocSummaryPIDDSI); break;
-//		/* [MS-OSHARED] 2.3.3.2.1 Summary Information Property Set*/
-//		case '!SummaryInformation':
-//			rval.Summary = parse_PropertySetStream(files[name], SummaryPIDSI); break;
-//	}
-//}
+for(var name in files) {
+	switch(name) {
+		/* [MS-OSHARED] 2.3.3.2.2 Document Summary Information Property Set */
+		case '!DocumentSummaryInformation':
+			try { rval.DocSummary = parse_PropertySetStream(files[name], DocSummaryPIDDSI); } catch(e) { } break;
+		/* [MS-OSHARED] 2.3.3.2.1 Summary Information Property Set*/
+		case '!SummaryInformation':
+			try { rval.Summary = parse_PropertySetStream(files[name], SummaryPIDSI); } catch(e) { } break;
+	}
+}
 
 return rval;
 } // parse
@@ -1304,10 +1332,6 @@ return exports;
 }
 
 if(typeof require !== 'undefined' && typeof exports !== 'undefined') {
-	Buffers = Array;
-	Buffers.prototype.toBuffer = function() {
-		return Buffer.concat(this[0]);
-	};
 	var fs = require('fs');
 	//exports.read = CFB.read;
 	//exports.parse = CFB.parse;
@@ -1319,13 +1343,6 @@ if(typeof require !== 'undefined' && typeof exports !== 'undefined') {
 	};
 	if(typeof module !== 'undefined' && require.main === module)
 		exports.main(process.argv.slice(2));
-} else {
-	Buffers = Array;
-	Buffers.prototype.toBuffer = function() {
-		var x = [];
-		for(var i = 0; i != this[0].length; ++i) { x = x.concat(this[0][i]); }
-		return x;
-	};
 }
 
 /* sections refer to MS-XLS unless otherwise stated */
@@ -1382,13 +1399,16 @@ function parse_XLUnicodeRichExtendedString(blob) {
 	var fHighByte = flags & 0x1, fExtSt = flags & 0x4, fRichSt = flags & 0x8;
 	var width = 1 + (flags & 0x1); // 0x0 -> utf8, 0x1 -> dbcs
 	var cRun, cbExtRst;
+	var z = {};
 	if(fRichSt) cRun = read_shift(2);
 	if(fExtSt) cbExtRst = read_shift(4);
 	var encoding = (flags & 0x1) ? 'dbcs' : 'sbcs';
 	var msg = cch === 0 ? "" : read_shift(encoding, cch);
 	if(fRichSt) blob.l += 4 * cRun; //TODO: parse this
 	if(fExtSt) blob.l += cbExtRst; //TODO: parse this
-	return msg;
+	z.t = msg;
+	if(!fRichSt) { z.raw = "<t>" + z.t + "</t>"; z.r = z.t; }
+	return z;
 }
 
 /* 2.5.296 XLUnicodeStringNoCch */
@@ -1396,7 +1416,7 @@ function parse_XLUnicodeStringNoCch(blob, cch) {
 	var read = blob.read_shift.bind(blob);
 	var fHighByte = read(1);
 	var retval;
-	if(fHighByte===0) { retval = blob.utf8(blob.l, blob.l+cch); blob.l += cch; }
+	if(fHighByte===0) { retval = __utf8(blob,blob.l, blob.l+cch); blob.l += cch; }
 	else { retval = blob.read_shift('dbcs', cch); }
 	return retval;
 }
@@ -1451,7 +1471,7 @@ function parse_RkNumber(blob) {
 	var fX100 = b[0] & 1, fInt = b[0] & 2;
 	blob.l+=4;
 	b[0] &= ~3;
-	var RK = fInt === 0 ? [0,0,0,0,b[0],b[1],b[2],b[3]].readDoubleLE(0) : b.readInt32LE(0)>>2;
+	var RK = fInt === 0 ? __readDoubleLE([0,0,0,0,b[0],b[1],b[2],b[3]],0) : __readInt32LE(b,0)>>2;
 	return fX100 ? RK/100 : RK;
 }
 
@@ -1628,6 +1648,14 @@ function parse_LabelSst(blob, length) {
 	return cell;
 }
 
+/* 2.4.148 */
+function parse_Label(blob, length) {
+	var cell = parse_Cell(blob, 6);
+	var str = parse_XLUnicodeString(blob, length-6);
+	cell.val = str;
+	return cell;
+}
+
 /* 2.4.126 Number Formats */
 function parse_Format(blob, length) {
 	var ifmt = blob.read_shift(2);
@@ -1674,7 +1702,7 @@ function parse_XF(blob, length) {
 	o.ifnt = read(2); o.ifmt = read(2); o.flags = read(2);
 	o.fStyle = (o.flags >> 2) & 0x01;
 	length -= 6;
-	o.data = o.fStyle ? parse_StyleXF(blob, length) : parse_CellXF(blob, length); 
+	o.data = o.fStyle ? parse_StyleXF(blob, length) : parse_CellXF(blob, length);
 	return o;
 }
 
@@ -1734,7 +1762,7 @@ function parse_ExternName(blob, length, opts) {
 	};
 	if(opts.sbcch === 0x3A01) body = parse_AddinUdf(blob, length-2);
 	//else throw new Error("unsupported SupBook cch: " + opts.sbcch);
-	o.body = blob.read_shift(length-2);
+	o.body = body || blob.read_shift(length-2);
 	return o;
 }
 
@@ -1792,6 +1820,21 @@ function parse_MTRSettings(blob, length) {
 	return [fMTREnabled, fUserSetThreadCount, cUserThreadCount];
 }
 
+/* 2.5.186 */
+function parse_NoteSh(blob, length) {
+	var row = blob.read_shift(2), col = blob.read_shift(2);
+	var flags = blob.read_shift(2), idObj = blob.read_shift(2);
+	var stAuthor = parse_XLUnicodeString(blob);
+	blob.read_shift(1);
+	return stAuthor;
+}
+
+/* 2.4.179 */
+function parse_Note(blob, length) {
+	/* TODO: Support revisions */
+	return parse_NoteSh(blob, length);
+}
+
 var parse_Backup = parsebool; /* 2.4.14 */
 var parse_Blank = parse_Cell; /* 2.4.20 Just the cell */
 var parse_BottomMargin = parse_Xnum; /* 2.4.27 */
@@ -1847,7 +1890,6 @@ var parse_WriteProtect = parsenoop; /* 2.4.350 empty record */
 /* ---- */
 var parse_VerticalPageBreaks = parsenoop;
 var parse_HorizontalPageBreaks = parsenoop;
-var parse_Note = parsenoop;
 var parse_Selection = parsenoop;
 var parse_Continue = parsenoop;
 var parse_Pane = parsenoop;
@@ -1967,7 +2009,6 @@ var parse_CodeName = parse_XLUnicodeString;
 var parse_SXFDBType = parsenoop;
 var parse_ObNoMacros = parsenoop;
 var parse_Dv = parsenoop;
-var parse_Label = parsenoop;
 var parse_Index = parsenoop;
 var parse_Table = parsenoop;
 var parse_Window2 = parsenoop;
@@ -2292,8 +2333,8 @@ function parse_PtgArray(blob, length) {
 
 /* 2.5.198.33 */
 function parse_PtgAttrBaxcel(blob, length) {
-	bitSemi = blob[blob.l+1] & 0x01; /* 1 = volatile */
-	bitBaxcel = 1;
+	var bitSemi = blob[blob.l+1] & 0x01; /* 1 = volatile */
+	var bitBaxcel = 1;
 	blob.l += 4;
 	return [bitSemi, bitBaxcel];
 }
@@ -2310,21 +2351,21 @@ function parse_PtgAttrChoose(blob, length) {
 
 /* 2.5.198.35 */
 function parse_PtgAttrGoto(blob, length) {
-	bitGoto = (blob[blob.l+1] & 0xFF) ? 1 : 0;
+	var bitGoto = (blob[blob.l+1] & 0xFF) ? 1 : 0;
 	blob.l += 2;
 	return [bitGoto, blob.read_shift(2)];
 }
 
 /* 2.5.198.36 */
 function parse_PtgAttrIf(blob, length) {
-	bitIf = (blob[blob.l+1] & 0xFF) ? 1 : 0;
+	var bitIf = (blob[blob.l+1] & 0xFF) ? 1 : 0;
 	blob.l += 2;
 	return [bitIf, blob.read_shift(2)];
 }
 
 /* 2.5.198.37 */
 function parse_PtgAttrSemi(blob, length) {
-	bitSemi = (blob[blob.l+1] & 0xFF) ? 1 : 0;
+	var bitSemi = (blob[blob.l+1] & 0xFF) ? 1 : 0;
 	blob.l += 4;
 	return [bitSemi];
 }
@@ -2654,7 +2695,7 @@ function parse_Formula(blob, length) {
 /* 2.5.133 */
 function parse_FormulaValue(blob) {
 	var b;
-	if(blob.readUInt16LE(blob.l + 6) !== 0xFFFF) return parse_Xnum(blob);
+	if(__readUInt16LE(blob,blob.l + 6) !== 0xFFFF) return parse_Xnum(blob);
 	switch(blob[blob.l]) {
 		case 0x00: blob.l += 8; return "String";
 		case 0x01: b = blob[blob.l+2] === 0x1; blob.l += 8; return b;
@@ -4486,6 +4527,23 @@ var RecordEnum = {
 	0x0000: {}
 };
 
+function fixopts(opts) {
+	var defaults = [
+		['cellNF', false], /* emit cell number format string as .z */
+		['cellFormula', true], /* emit formulae as .f */
+
+		['sheetRows', 0, 'n'], /* read n rows (0 = read all rows) */
+
+		['bookSheets', false], /* only try to get sheet names (no Sheets) */
+		['bookProps', false], /* only try to get properties (no Sheets) */
+
+		['WTF', false] /* WTF mode (throws errors) */
+	];
+	defaults.forEach(function(d) {
+		if(typeof opts[d[0]] === 'undefined') opts[d[0]] = d[1];
+		if(d[2] === 'n') opts[d[0]] = Number(opts[d[0]]);
+	});
+}
 /* [MS-OLEDS] 2.3.8 CompObjStream */
 function parse_compobj(obj) {
 	var v = {};
@@ -4493,12 +4551,12 @@ function parse_compobj(obj) {
 
 	/* [MS-OLEDS] 2.3.7 CompObjHeader -- All fields MUST be ignored */
 	var l = 28, m;
-	m = o.lpstr(l);
-	l += 4 + o.readUInt32LE(l);
+	m = __lpstr(o, l);
+	l += 4 + __readUInt32LE(o,l);
 	v.UserType = m;
 
 	/* [MS-OLEDS] 2.3.1 ClipboardFormatOrAnsiString */
-	m = o.readUInt32LE(l); l+= 4;
+	m = __readUInt32LE(o,l); l+= 4;
 	switch(m) {
 		case 0x00000000: break;
 		case 0xffffffff: case 0xfffffffe: l+=4; break;
@@ -4507,14 +4565,15 @@ function parse_compobj(obj) {
 			l += m;
 	}
 
-	m = o.lpstr(l); l += m.length === 0 ? 0 : 5 + m.length; v.Reserved1 = m;
+	m = __lpstr(o, l); l += m.length === 0 ? 0 : 5 + m.length; v.Reserved1 = m;
 
-	if((m = o.readUInt32LE(l)) !== 0x71b2e9f4) return v;
+	if((m = __readUInt32LE(o,l)) !== 0x71b2e9f4) return v;
 	throw "Unsupported Unicode Extension";
 }
 
-
-function parse_xlscfb(cfb) {
+function parse_xlscfb(cfb, options) {
+if(!options) options = {};
+fixopts(options);
 reset_cp();
 var CompObj = cfb.find('!CompObj');
 var Summary = cfb.find('!SummaryInformation');
@@ -4529,12 +4588,12 @@ function slurp(R, blob, length, opts) {
 	var l = length;
 	var bufs = [blob.slice(blob.l,blob.l+l)];
 	blob.l += length;
-	var next = (RecordEnum[blob.readUInt16LE(blob.l)]);
+	var next = (RecordEnum[__readUInt16LE(blob,blob.l)]);
 	while(next && next.n === 'Continue') {
-		l = blob.readUInt16LE(blob.l+2);
+		l = __readUInt16LE(blob,blob.l+2);
 		bufs.push(blob.slice(blob.l+4,blob.l+4+l));
 		blob.l += 4+l;
-		next = (RecordEnum[blob.readUInt16LE(blob.l)]);
+		next = (RecordEnum[__readUInt16LE(blob, blob.l)]);
 	}
 	var b = bconcat(bufs);
 	prep_blob(b);
@@ -4544,7 +4603,7 @@ function slurp(R, blob, length, opts) {
 }
 
 // 2.3.2
-function parse_workbook(blob) {
+function parse_workbook(blob, options) {
 	var wb = {opts:{}};
 	var Sheets = {};
 	var out = [];
@@ -4560,11 +4619,13 @@ function parse_workbook(blob) {
 	var lastcell, last_cell;
 	var shared_formulae = {};
 	var temp_val;
+	var cell_valid = true;
 	var XFs = []; /* XF records */
-	function addline(cell, line) {
+	function addline(cell, line, options) {
 		lastcell = cell;
 		last_cell = encode_cell(cell);
-		out[last_cell] = line;
+		if(options.sheetRows && lastcell.r >= options.sheetRows) cell_valid = false;
+		else out[last_cell] = line;
 	}
 	var opts = {
 		enc: false, // encrypted
@@ -4590,6 +4651,9 @@ function parse_workbook(blob) {
 		var length = (blob.l === blob.length ? 0 : read(2)), y;
 		var R = RecordEnum[RecordType];
 		if(R && R.f) {
+			if(options.bookSheets) {
+				if(last_Rn === 'BoundSheet8' && R.n !== 'BoundSheet8') break;
+			}
 			last_Rn = R.n;
 			if(R.r === 2 || R.r == 12) {
 				var rt = read(2); length -= 2;
@@ -4745,39 +4809,72 @@ function parse_workbook(blob) {
 				} break;
 				case 'BOF': {
 					if(file_depth++) break;
+					cell_valid = true;
 					out = {};
 					cur_sheet = (Directory[s] || {name:""}).name;
 					lst.push([R.n, s, val, Directory[s]]);
 				} break;
 				case 'Number': {
 					temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.val, t:'n'};
-					addline({c:val.c, r:val.r}, temp_val);
+					if(temp_val.XF) try {
+						temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+						if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+					} catch(e) { if(opts.WTF) throw e; }
+					addline({c:val.c, r:val.r}, temp_val, options);
 				} break;
 				case 'BoolErr': {
 					temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.val, t:val.t};
-					addline({c:val.c, r:val.r}, temp_val);
+					if(temp_val.XF) try {
+						temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+						if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+					} catch(e) { if(opts.WTF) throw e; }
+					addline({c:val.c, r:val.r}, temp_val, options);
 				} break;
 				case 'RK': {
-					temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.rknum, t:'n'}; 
-					addline({c:val.c, r:val.r}, temp_val);
+					temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.rknum, t:'n'};
+					if(temp_val.XF) try {
+						temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+						if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+					} catch(e) { if(opts.WTF) throw e; }
+					addline({c:val.c, r:val.r}, temp_val, options);
 				} break;
 				case 'MulRk': {
 					for(var j = val.c; j <= val.C; ++j) {
 						var ixfe = val.rkrec[j-val.c][0];
-						addline({c:j, r:val.r}, {ixfe: ixfe, XF: XFs[ixfe], v:val.rkrec[j-val.c][1], t:'n'});
+						temp_val= {ixfe:ixfe, XF:XFs[ixfe], v:val.rkrec[j-val.c][1], t:'n'};
+						if(temp_val.XF) try {
+							temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+							if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+						} catch(e) { if(opts.WTF) throw e; }
+						addline({c:j, r:val.r}, temp_val, options);
 					}
 				} break;
 				case 'Formula': {
 					switch(val.val) {
 						case 'String': last_formula = val; break;
 						case 'Array Formula': throw "Array Formula unsupported";
-						default: addline(val.cell, {v:val.val, f:stringify_formula(val.formula, range, val.cell, supbooks), ixfe: val.cell.ixfe, XF:XFs[val.cell.ixfe], t:'n'}); // TODO: infer type from formula
+						default: // TODO: infer type from formula
+							temp_val = {v:val.val, ixfe:val.cell.ixfe, t:'n'};
+							temp_val.XF = XFs[temp_val.ixfe];
+							if(options.cellFormula) temp_val.f = stringify_formula(val.formula,range,val.cell,supbooks);
+							if(temp_val.XF) try {
+								temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+								if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+							} catch(e) { if(opts.WTF) throw e; }
+							addline(val.cell, temp_val, options);
 					}
 				} break;
 				case 'String': {
 					if(last_formula) {
 						last_formula.val = val;
-						addline(last_formula.cell, {v:last_formula.val, f:stringify_formula(last_formula.formula, range, last_formula.cell, supbooks), ixfe: last_formula.cell.ixfe, t:'s'});
+						temp_val = {v:last_formula.val, ixfe:last_formula.cell.ixfe, t:'s'};
+						temp_val.XF = XFs[temp_val.ixfe];
+						if(options.cellFormula) temp_val.f = stringify_formula(last_formula.formula, range, last_formula.cell, supbooks);
+						if(temp_val.XF) try {
+							temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+							if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+						} catch(e) { if(opts.WTF) throw e; }
+						addline(last_formula.cell, temp_val, options);
 						last_formula = null;
 					}
 				} break;
@@ -4785,11 +4882,27 @@ function parse_workbook(blob) {
 					/* console.error(val); */
 				} break;
 				case 'ShrFmla': {
-					out[last_cell].f = stringify_formula(val[0], range, lastcell, supbooks);
+					if(!cell_valid) break;
+					if(options.cellFormula) out[last_cell].f = stringify_formula(val[0], range, lastcell, supbooks);
 					shared_formulae[last_cell] = val[0];
 				} break;
 				case 'LabelSst': {
-					addline({c:val.c, r:val.r}, {v:JSON.stringify(sst[val.isst]), ixfe:val.ixfe, t:'s'});
+					temp_val={v:sst[val.isst].t, ixfe:val.ixfe, t:'s'};
+					temp_val.XF = XFs[temp_val.ixfe];
+					if(temp_val.XF) try {
+						temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+						if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+					} catch(e) { if(opts.WTF) throw e; }
+					addline({c:val.c, r:val.r}, temp_val, options);
+				} break;
+				case 'Label': {
+					/* Some writers erroneously write Label */
+					temp_val = {v:val.val, ixfe:val.ixfe, XF:XFs[val.ixfe], t:'s'};
+					if(temp_val.XF) try {
+						temp_val.w=SSF.format(temp_val.XF.ifmt||0, temp_val.v);
+						if(options.cellNF) temp_val.z = SSF._table[temp_val.XF.ifmt||0];
+					} catch(e) { if(opts.WTF) throw e; }
+					addline({c:val.c, r:val.r}, temp_val, options);
 				} break;
 				case 'Dimensions': {
 					range = val;
@@ -4824,7 +4937,6 @@ function parse_workbook(blob) {
 				case 'GUIDTypeLib': {
 
 				} break;
-				case 'Note': break;
 
 				case 'MergeCells': break;
 
@@ -4856,6 +4968,7 @@ function parse_workbook(blob) {
 				case 'CondFmt': case 'CF': case 'CF12': case 'CFEx': break;
 
 				/* Comments */
+				case 'Note': break;
 				case 'NameCmt': break;
 
 				/* Chart */
@@ -4873,7 +4986,7 @@ function parse_workbook(blob) {
 				case 'DataFormat': case 'SerToCrt': case 'FontX': break;
 				case 'CatSerRange': case 'AxcExt': case 'SerFmt': break;
 				case 'ShtProps': break;
-				case 'DefaultText': case 'Text': case 'Label': case 'CatLab': break;
+				case 'DefaultText': case 'Text': case 'CatLab': break;
 				case 'DataLabExtContents': break;
 				case 'Legend': case 'LegendException': break;
 				case 'Pie': case 'Scatter': break;
@@ -4948,90 +5061,93 @@ function parse_workbook(blob) {
 	//lst.filter(function(x) { return x[0] === 'Formula';}).forEach(function(x){console.log(x[2].cell,x[2].formula);});
 	wb.Directory=sheetnamesraw;
 	wb.SheetNames=sheetnamesraw;
-	wb.Sheets=Sheets;
+	if(!options.bookSheets) wb.Sheets=Sheets;
 	wb.Preamble=Preamble;
 	wb.Strings = sst;
+	wb.SSF = SSF.get_table();
 	if(opts.enc) wb.Encryption = opts.enc;
 	return wb;
 }
-if(Workbook) WorkbookP = parse_workbook(Workbook.content);
-else throw new Error("Cannot find Workbook stream");
 if(CompObj) CompObjP = parse_compobj(CompObj);
-
+if(options.bookProps && !options.bookSheets) WorkbookP = {};
+else {
+	if(Workbook) WorkbookP = parse_workbook(Workbook.content, options);
+	else throw new Error("Cannot find Workbook stream");
+}
+
+var props = {};
+for(var y in cfb.Summary) props[y] = cfb.Summary[y];
+for(y in cfb.DocSummary) props[y] = cfb.DocSummary[y];
+WorkbookP.Props = WorkbookP.Custprops = props; /* TODO: split up properties */
+if(options.bookFiles) WorkbookP.cfb = cfb;
+WorkbookP.CompObjP = CompObjP;
 return WorkbookP;
 }
 
-function sheet_to_row_object_array(sheet){
-	var val, rowObject, range, columnHeaders, emptyRow, C;
-	var outSheet = [];
-	if (sheet["!ref"]) {
-		range = decode_range(sheet["!ref"]);
-
-		columnHeaders = {};
-		for (C = range.s.c; C <= range.e.c; ++C) {
-			val = sheet[encode_cell({
-				c: C,
-				r: range.s.r
-			})];
-			if(val){
-				switch(val.t) {
-					case 's': case 'str': columnHeaders[C] = JSON.parse(val.v); break;
-					case 'n': columnHeaders[C] = val.v; break;
-				}
-			}
-		}
+function format_cell(cell, v) {
+	if(!cell) return "";
+	if(typeof cell.w !== 'undefined') return cell.w;
+	if(typeof v === 'undefined') v = cell.v;
+	if(!cell.XF) return v;
+	try { cell.w = SSF.format(cell.XF.ifmt||0, v); } catch(e) { return v; }
+	return cell.w;
+}
 
-		for (var R = range.s.r + 1; R <= range.e.r; ++R) {
-			emptyRow = true;
-			//Row number is recorded in the prototype
-			//so that it doesn't appear when stringified.
-			rowObject = Object.create({ __rowNum__ : R });
-			for (C = range.s.c; C <= range.e.c; ++C) {
-				val = sheet[encode_cell({
-					c: C,
-					r: R
-				})];
-				var v = (val || {}).v;
-				if(val !== undefined) switch(val.t){
-					case 's': case 'str':
-						if(v !== undefined) v = JSON.parse(v);
-					/* falls through */
-					case 'b': case 'n':
-						if(v !== undefined) {
-							rowObject[columnHeaders[C]] = v;
-							emptyRow = false;
-						}
-						break;
-					case 'e': break; /* throw */
-					default: throw 'unrecognized type ' + val.t;
-				}
+function sheet_to_row_object_array(sheet, opts){
+	var val, row, r, hdr = {}, isempty, R, C, v;
+	var out = [];
+	opts = opts || {};
+	if(!sheet || !sheet["!ref"]) return out;
+	r = utils.decode_range(sheet["!ref"]);
+	for(R=r.s.r, C = r.s.c; C <= r.e.c; ++C) {
+		val = sheet[utils.encode_cell({c:C,r:R})];
+		if(!val) continue;
+		hdr[C] = format_cell(val);
+	}
+
+	for (R = r.s.r + 1; R <= r.e.r; ++R) {
+		isempty = true;
+		/* row index available as __rowNum__ */
+		row = Object.create({ __rowNum__ : R });
+		for (C = r.s.c; C <= r.e.c; ++C) {
+			val = sheet[utils.encode_cell({c: C,r: R})];
+			if(!val || !val.t) continue;
+			v = (val || {}).v;
+			switch(val.t){
+				case 'e': continue; /* TODO: emit error text? */
+				case 's': case 'str': break;
+				case 'b': case 'n': break;
+				default: throw 'unrecognized type ' + val.t;
 			}
-			if(!emptyRow) {
-				outSheet.push(rowObject);
+			if(typeof v !== 'undefined') {
+				row[hdr[C]] = opts.raw ? v||val.v : format_cell(val, v);
+				isempty = false;
 			}
 		}
+		if(!isempty) out.push(row);
 	}
-	return outSheet;
-}
-
-function sheet_to_csv(sheet) {
-	var out = "";
-	if(sheet["!ref"]) {
-		var r = utils.decode_range(sheet["!ref"]);
-		for(var R = r.s.r; R <= r.e.r; ++R) {
-			var row = [];
-			for(var C = r.s.c; C <= r.e.c; ++C) {
-				var val = sheet[utils.encode_cell({c:C,r:R})];
-				if(!val) { row.push(""); continue; }
-				var fmt = 0;
-				if(val.XF) {
-					//console.log(val.XF, SSF._table[val.XF.ifmt], val.v)
-					val.v = SSF.format(val.XF.ifmt||0, val.v);
-				}
-				row.push(String(val.v).replace(/\\n/g,"\n").replace(/\\t/g,"\t").replace(/\\\\/g,"\\").replace(/\\\"/g,"\"\""));
+	return out;
+}
+
+function sheet_to_csv(sheet, opts) {
+	var out = "", txt = "";
+	opts = opts || {};
+	if(!sheet || !sheet["!ref"]) return out;
+	var r = utils.decode_range(sheet["!ref"]);
+	var fs = opts.FS||",", rs = opts.RS||"\n";
+
+	for(var R = r.s.r; R <= r.e.r; ++R) {
+		var row = [];
+		for(var C = r.s.c; C <= r.e.c; ++C) {
+			var val = sheet[utils.encode_cell({c:C,r:R})];
+			if(!val) { row.push(""); continue; }
+			txt = String(format_cell(val));
+			if(txt.indexOf(fs) !== -1 || txt.indexOf(rs) !== -1 || txt.indexOf("\"") !== -1){
+				txt = "\""+txt.replace(/"/g, '""') +"\"";
 			}
-			out += row.join(",") + "\n";
+			row.push(txt);
 		}
+		out += row.join(fs) + (rs);
 	}
 	return out;
 }
@@ -5043,7 +5159,8 @@ function get_formulae(ws) {
 		var x = ws[y];
 		var val = "";
 		if(x.f) val = x.f;
-		else if(typeof x.v === 'number') val = x.v;
+		else if(typeof x.w !== 'undefined') val = "'" + x.w;
+		else if(typeof x.v === 'undefined') continue;
 		else val = x.v;
 		cmds.push(y + "=" + val);
 	}
@@ -5063,13 +5180,14 @@ var utils = {
 	sheet_to_csv: sheet_to_csv,
 	make_csv: sheet_to_csv,
 	get_formulae: get_formulae,
+	format_cell: format_cell,
 	sheet_to_row_object_array: sheet_to_row_object_array
 };
 
 function xlsread(f, options) {
-	return parse_xlscfb(CFB.read(f, options));
+	return parse_xlscfb(CFB.read(f, options), options);
 }
-var readFile = function(f) { return parse_xlscfb(CFB.read(f, {type:'file'})); };
+var readFile = function(f,o){return parse_xlscfb(CFB.read(f,{type:'file'}),o);};
 function decode_row(rowstr) { return Number(unfix_row(rowstr)) - 1; }
 function encode_row(row) { return "" + (row + 1); }
 function fix_row(cstr) { return cstr.replace(/([A-Z]|^)([0-9]+)$/,"$1$$$2"); }
@@ -5121,13 +5239,5 @@ XLS.read = xlsread;
 XLS.readFile = readFile;
 XLS.utils = utils;
 XLS.CFB = CFB;
-if(typeof module !== 'undefined' && require.main === module ) {
-	var wb = readFile(process.argv[2] || 'Book1.xls');
-	var target_sheet = process.argv[3] || '';
-	if(target_sheet === '') target_sheet = wb.Directory[0];
-	var ws = wb.Sheets[target_sheet];
-	console.log(target_sheet);
-	console.log(make_csv(ws));
-	//console.log(get_formulae(ws));
-}
+XLS.SSF = SSF;
 })(typeof exports !== 'undefined' ? exports : XLS);