diff --git a/Makefile b/Makefile
index 797e3cf..4542254 100644
--- a/Makefile
+++ b/Makefile
@@ -57,11 +57,11 @@ dist: dist-deps $(TARGET) bower.json ## Prepare JS files for distribution
<$(TARGET) sed "s/require('stream')/{}/g;s/require('....*')/undefined/g" > dist/$(TARGET)
cp LICENSE dist/
uglifyjs shim.js $(UGLIFYOPTS) -o dist/shim.min.js --preamble "$$(head -n 1 bits/00_header.js)"
- uglifyjs $(DISTHDR) dist/$(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).min.js --source-map dist/$(LIB).min.map --preamble "$$(head -n 1 bits/00_header.js)"
+ uglifyjs $(DISTHDR) dist/$(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).min.js --source-map --preamble "$$(head -n 1 bits/00_header.js)"
misc/strip_sourcemap.sh dist/$(LIB).min.js
- uglifyjs $(DISTHDR) $(REQS) dist/$(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).core.min.js --source-map dist/$(LIB).core.min.map --preamble "$$(head -n 1 bits/00_header.js)"
+ uglifyjs $(DISTHDR) $(REQS) dist/$(TARGET) $(UGLIFYOPTS) -o dist/$(LIB).core.min.js --source-map --preamble "$$(head -n 1 bits/00_header.js)"
misc/strip_sourcemap.sh dist/$(LIB).core.min.js
- uglifyjs $(DISTHDR) $(REQS) $(ADDONS) dist/$(TARGET) $(AUXTARGETS) $(UGLIFYOPTS) -o dist/$(LIB).full.min.js --source-map dist/$(LIB).full.min.map --preamble "$$(head -n 1 bits/00_header.js)"
+ uglifyjs $(DISTHDR) $(REQS) $(ADDONS) dist/$(TARGET) $(AUXTARGETS) $(UGLIFYOPTS) -o dist/$(LIB).full.min.js --source-map --preamble "$$(head -n 1 bits/00_header.js)"
misc/strip_sourcemap.sh dist/$(LIB).full.min.js
cat <(head -n 1 bits/00_header.js) shim.js $(DISTHDR) $(REQS) dist/$(TARGET) > dist/$(LIB).extendscript.js
diff --git a/README.md b/README.md
index 3b784a6..aa6b8f7 100644
--- a/README.md
+++ b/README.md
@@ -926,6 +926,7 @@ Cell objects are plain JS objects with keys and values following the convention:
| `z` | number format string associated with the cell (if requested) |
| `l` | cell hyperlink object (`.Target` holds link, `.Tooltip` is tooltip) |
| `s` | the style/theme of the cell (if applicable) |
+| `p` | set to truthy value to remove the lock for a password protected cell |
Built-in export utilities (such as the CSV exporter) will use the `w` text if it
is available. To change a value, be sure to delete `cell.w` (or set it to
@@ -935,6 +936,8 @@ text from the number format (`cell.z`) and the raw value if possible.
The actual array formula is stored in the `f` field of the first cell in the
array range. Other cells in the range will omit the `f` field.
+When protecting a sheet with ws["!protect"] use cell.p to unlock the cell
+
#### Data Types
The raw value is stored in the `v` value property, interpreted based on the `t`
diff --git a/bits/47_styxml.js b/bits/47_styxml.js
index 034d996..857dc2e 100644
--- a/bits/47_styxml.js
+++ b/bits/47_styxml.js
@@ -1,421 +1,652 @@
/* 18.8.5 borders CT_Borders */
function parse_borders(t, styles, themes, opts) {
- styles.Borders = [];
- var border = {}/*, sub_border = {}*/;
- var pass = false;
- t[0].match(tagregex).forEach(function(x) {
- var y = parsexmltag(x);
- switch(strip_ns(y[0])) {
- case '': case '': break;
+ styles.Borders = [];
+ var border = {} /*, sub_border = {}*/ ;
+ var pass = false;
+ t[0].match(tagregex).forEach(function (x) {
+ var y = parsexmltag(x);
+ switch (strip_ns(y[0])) {
+ case '':
+ case '':
+ break;
- /* 18.8.4 border CT_Border */
- case '': case '':
- border = {};
- if (y.diagonalUp) { border.diagonalUp = y.diagonalUp; }
- if (y.diagonalDown) { border.diagonalDown = y.diagonalDown; }
- styles.Borders.push(border);
- break;
- case '': break;
+ /* 18.8.4 border CT_Border */
+ case '':
+ case '':
+ border = {};
+ if (y.diagonalUp) {
+ border.diagonalUp = y.diagonalUp;
+ }
+ if (y.diagonalDown) {
+ border.diagonalDown = y.diagonalDown;
+ }
+ styles.Borders.push(border);
+ break;
+ case '':
+ break;
- /* note: not in spec, appears to be CT_BorderPr */
- case '': break;
- case '': break;
- case '': break;
+ /* note: not in spec, appears to be CT_BorderPr */
+ case '':
+ break;
+ case '':
+ break;
+ case '':
+ break;
- /* note: not in spec, appears to be CT_BorderPr */
- case '': break;
- case '': break;
- case '': break;
+ /* note: not in spec, appears to be CT_BorderPr */
+ case '':
+ break;
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.43 top CT_BorderPr */
- case '': break;
- case '': break;
- case '': break;
+ /* 18.8.43 top CT_BorderPr */
+ case '':
+ break;
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.6 bottom CT_BorderPr */
- case '': break;
- case '': break;
- case '': break;
+ /* 18.8.6 bottom CT_BorderPr */
+ case '':
+ break;
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.13 diagonal CT_BorderPr */
- case '': case '': break;
- case '': break;
+ /* 18.8.13 diagonal CT_BorderPr */
+ case '':
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.25 horizontal CT_BorderPr */
- case '': case '': break;
- case '': break;
+ /* 18.8.25 horizontal CT_BorderPr */
+ case '':
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.44 vertical CT_BorderPr */
- case '': case '': break;
- case '': break;
+ /* 18.8.44 vertical CT_BorderPr */
+ case '':
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.37 start CT_BorderPr */
- case '': case '': break;
- case '': break;
+ /* 18.8.37 start CT_BorderPr */
+ case '':
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.16 end CT_BorderPr */
- case '': case '': break;
- case '': break;
+ /* 18.8.16 end CT_BorderPr */
+ case '':
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.? color CT_Color */
- case '': break;
- case '': case '': break;
+ /* 18.8.? color CT_Color */
+ case '':
+ break;
+ case '':
+ case '':
+ break;
- /* 18.2.10 extLst CT_ExtensionList ? */
- case '': case '': break;
- case '': pass = false; break;
- default: if(opts && opts.WTF) {
- if(!pass) throw new Error('unrecognized ' + y[0] + ' in borders');
- }
- }
- });
+ /* 18.2.10 extLst CT_ExtensionList ? */
+ case '':
+ case '':
+ break;
+ case '':
+ pass = false;
+ break;
+ default:
+ if (opts && opts.WTF) {
+ if (!pass) throw new Error('unrecognized ' + y[0] + ' in borders');
+ }
+ }
+ });
}
/* 18.8.21 fills CT_Fills */
function parse_fills(t, styles, themes, opts) {
- styles.Fills = [];
- var fill = {};
- var pass = false;
- t[0].match(tagregex).forEach(function(x) {
- var y = parsexmltag(x);
- switch(strip_ns(y[0])) {
- case '': case '': break;
+ styles.Fills = [];
+ var fill = {};
+ var pass = false;
+ t[0].match(tagregex).forEach(function (x) {
+ var y = parsexmltag(x);
+ switch (strip_ns(y[0])) {
+ case '':
+ case '':
+ break;
- /* 18.8.20 fill CT_Fill */
- case '': case '':
- fill = {}; styles.Fills.push(fill); break;
- case '': break;
+ /* 18.8.20 fill CT_Fill */
+ case '':
+ case '':
+ fill = {};
+ styles.Fills.push(fill);
+ break;
+ case '':
+ break;
- /* 18.8.24 gradientFill CT_GradientFill */
- case '': break;
- case '': styles.Fills.push(fill); fill = {}; break;
+ /* 18.8.24 gradientFill CT_GradientFill */
+ case '':
+ break;
+ case '':
+ styles.Fills.push(fill);
+ fill = {};
+ break;
- /* 18.8.32 patternFill CT_PatternFill */
- case '':
- if(y.patternType) fill.patternType = y.patternType;
- break;
- case '': case '': break;
+ /* 18.8.32 patternFill CT_PatternFill */
+ case '':
+ if (y.patternType) fill.patternType = y.patternType;
+ break;
+ case '':
+ case '':
+ break;
- /* 18.8.3 bgColor CT_Color */
- case '': case '': break;
+ /* 18.8.3 bgColor CT_Color */
+ case '':
+ case '':
+ break;
- /* 18.8.19 fgColor CT_Color */
- case '': case '': break;
+ /* 18.8.19 fgColor CT_Color */
+ case '':
+ case '':
+ break;
- /* 18.8.38 stop CT_GradientStop */
- case '': break;
- case '': break;
+ /* 18.8.38 stop CT_GradientStop */
+ case '':
+ break;
+ case '':
+ break;
- /* 18.8.? color CT_Color */
- case '': break;
- case '': break;
+ /* 18.8.? color CT_Color */
+ case '':
+ break;
+ case '':
+ break;
- /* 18.2.10 extLst CT_ExtensionList ? */
- case '': case '': break;
- case '': pass = false; break;
- default: if(opts && opts.WTF) {
- if(!pass) throw new Error('unrecognized ' + y[0] + ' in fills');
- }
- }
- });
+ /* 18.2.10 extLst CT_ExtensionList ? */
+ case '':
+ case '':
+ break;
+ case '':
+ pass = false;
+ break;
+ default:
+ if (opts && opts.WTF) {
+ if (!pass) throw new Error('unrecognized ' + y[0] + ' in fills');
+ }
+ }
+ });
}
/* 18.8.23 fonts CT_Fonts */
function parse_fonts(t, styles, themes, opts) {
- styles.Fonts = [];
- var font = {};
- var pass = false;
- t[0].match(tagregex).forEach(function(x) {
- var y = parsexmltag(x);
- switch(strip_ns(y[0])) {
- case '': case '': break;
+ styles.Fonts = [];
+ var font = {};
+ var pass = false;
+ t[0].match(tagregex).forEach(function (x) {
+ var y = parsexmltag(x);
+ switch (strip_ns(y[0])) {
+ case '':
+ case '':
+ break;
- /* 18.8.22 font CT_Font */
- case '': break;
- case '': case '':
- styles.Fonts.push(font);
- font = {};
- break;
+ /* 18.8.22 font CT_Font */
+ case '':
+ break;
+ case '':
+ case '':
+ styles.Fonts.push(font);
+ font = {};
+ break;
- /* 18.8.29 name CT_FontName */
- case '': case '': break;
+ /* 18.8.29 name CT_FontName */
+ case '':
+ case '':
+ break;
- /* 18.8.2 b CT_BooleanProperty */
- case '': font.bold = 1; break;
+ /* 18.8.2 b CT_BooleanProperty */
+ case '':
+ font.bold = 1;
+ break;
- /* 18.8.26 i CT_BooleanProperty */
- case '': font.italic = 1; break;
+ /* 18.8.26 i CT_BooleanProperty */
+ case '':
+ font.italic = 1;
+ break;
- /* 18.4.13 u CT_UnderlineProperty */
- case '': font.underline = 1; break;
+ /* 18.4.13 u CT_UnderlineProperty */
+ case '':
+ font.underline = 1;
+ break;
- /* 18.4.10 strike CT_BooleanProperty */
- case '': font.strike = 1; break;
+ /* 18.4.10 strike CT_BooleanProperty */
+ case '':
+ font.strike = 1;
+ break;
- /* 18.4.2 outline CT_BooleanProperty */
- case '': font.outline = 1; break;
+ /* 18.4.2 outline CT_BooleanProperty */
+ case '':
+ font.outline = 1;
+ break;
- /* 18.8.36 shadow CT_BooleanProperty */
- case '': font.shadow = 1; break;
+ /* 18.8.36 shadow CT_BooleanProperty */
+ case '':
+ font.shadow = 1;
+ break;
- /* 18.8.12 condense CT_BooleanProperty */
- case '': font.condense = 1; break;
+ /* 18.8.12 condense CT_BooleanProperty */
+ case '':
+ font.condense = 1;
+ break;
- /* 18.8.17 extend CT_BooleanProperty */
- case '': font.extend = 1; break;
+ /* 18.8.17 extend CT_BooleanProperty */
+ case '':
+ font.extend = 1;
+ break;
- /* 18.4.11 sz CT_FontSize */
- case '': case '': break;
+ /* 18.4.11 sz CT_FontSize */
+ case '':
+ case '':
+ break;
- /* 18.4.14 vertAlign CT_VerticalAlignFontProperty */
- case '': case '': break;
+ /* 18.4.14 vertAlign CT_VerticalAlignFontProperty */
+ case '':
+ case '':
+ break;
- /* 18.8.18 family CT_FontFamily */
- case '': case '': break;
+ /* 18.8.18 family CT_FontFamily */
+ case '':
+ case '':
+ break;
- /* 18.8.35 scheme CT_FontScheme */
- case '': case '': break;
+ /* 18.8.35 scheme CT_FontScheme */
+ case '':
+ case '':
+ break;
- /* 18.4.1 charset CT_IntProperty */
- case '': case '': break;
+ break;
+ case '':
+ case '':
+ break;
- /* 18.2.10 extLst CT_ExtensionList ? */
- case '': case '': break;
- case '': pass = false; break;
- default: if(opts && opts.WTF) {
- if(!pass) throw new Error('unrecognized ' + y[0] + ' in fonts');
- }
- }
- });
+ /* 18.2.10 extLst CT_ExtensionList ? */
+ case '':
+ case '':
+ break;
+ case '':
+ pass = false;
+ break;
+ default:
+ if (opts && opts.WTF) {
+ if (!pass) throw new Error('unrecognized ' + y[0] + ' in fonts');
+ }
+ }
+ });
}
/* 18.8.31 numFmts CT_NumFmts */
function parse_numFmts(t, styles, opts) {
- styles.NumberFmt = [];
- var k/*Array*/ = (keys(SSF._table)/*:any*/);
- for(var i=0; i < k.length; ++i) styles.NumberFmt[k[i]] = SSF._table[k[i]];
- var m = t[0].match(tagregex);
- if(!m) return;
- for(i=0; i < m.length; ++i) {
- var y = parsexmltag(m[i]);
- switch(strip_ns(y[0])) {
- case '': case '': case '': break;
- case '0) {
- if(j > 0x188) {
- for(j = 0x188; j > 0x3c; --j) if(styles.NumberFmt[j] == null) break;
- styles.NumberFmt[j] = f;
- }
- SSF.load(f,j);
- }
- } break;
- case '': break;
- default: if(opts.WTF) throw new Error('unrecognized ' + y[0] + ' in numFmts');
- }
- }
+ styles.NumberFmt = [];
+ var k /*Array*/ = (keys(SSF._table) /*:any*/ );
+ for (var i = 0; i < k.length; ++i) styles.NumberFmt[k[i]] = SSF._table[k[i]];
+ var m = t[0].match(tagregex);
+ if (!m) return;
+ for (i = 0; i < m.length; ++i) {
+ var y = parsexmltag(m[i]);
+ switch (strip_ns(y[0])) {
+ case '':
+ case '':
+ case '':
+ break;
+ case ' 0) {
+ if (j > 0x188) {
+ for (j = 0x188; j > 0x3c; --j)
+ if (styles.NumberFmt[j] == null) break;
+ styles.NumberFmt[j] = f;
+ }
+ SSF.load(f, j);
+ }
+ }
+ break;
+ case '':
+ break;
+ default:
+ if (opts.WTF) throw new Error('unrecognized ' + y[0] + ' in numFmts');
+ }
+ }
}
-function write_numFmts(NF/*:{[n:number|string]:string}*//*::, opts*/) {
- var o = [""];
- [[5,8],[23,26],[41,44],[/*63*/50,/*66],[164,*/392]].forEach(function(r) {
- for(var i = r[0]; i <= r[1]; ++i) if(NF[i] != null) o[o.length] = (writextag('numFmt',null,{numFmtId:i,formatCode:escapexml(NF[i])}));
- });
- if(o.length === 1) return "";
- o[o.length] = ("");
- o[0] = writextag('numFmts', null, { count:o.length-2 }).replace("/>", ">");
- return o.join("");
+function write_numFmts(NF /*:{[n:number|string]:string}*/ /*::, opts*/ ) {
+ var o = [""];
+ [
+ [5, 8],
+ [23, 26],
+ [41, 44],
+ [ /*63*/ 50, /*66],[164,*/ 392]
+ ].forEach(function (r) {
+ for (var i = r[0]; i <= r[1]; ++i)
+ if (NF[i] != null) o[o.length] = (writextag('numFmt', null, {
+ numFmtId: i,
+ formatCode: escapexml(NF[i])
+ }));
+ });
+ if (o.length === 1) return "";
+ o[o.length] = ("");
+ o[0] = writextag('numFmts', null, {
+ count: o.length - 2
+ }).replace("/>", ">");
+ return o.join("");
}
/* 18.8.10 cellXfs CT_CellXfs */
-var cellXF_uint = [ "numFmtId", "fillId", "fontId", "borderId", "xfId" ];
-var cellXF_bool = [ "applyAlignment", "applyBorder", "applyFill", "applyFont", "applyNumberFormat", "applyProtection", "pivotButton", "quotePrefix" ];
+var cellXF_uint = ["numFmtId", "fillId", "fontId", "borderId", "xfId"];
+var cellXF_bool = ["applyAlignment", "applyBorder", "applyFill", "applyFont", "applyNumberFormat", "applyProtection", "pivotButton", "quotePrefix"];
+
function parse_cellXfs(t, styles, opts) {
- styles.CellXf = [];
- var xf;
- var pass = false;
- t[0].match(tagregex).forEach(function(x) {
- var y = parsexmltag(x), i = 0;
- switch(strip_ns(y[0])) {
- case '': case '': case '': break;
+ styles.CellXf = [];
+ var xf;
+ var pass = false;
+ t[0].match(tagregex).forEach(function (x) {
+ var y = parsexmltag(x),
+ i = 0;
+ switch (strip_ns(y[0])) {
+ case '':
+ case '':
+ case '':
+ break;
- /* 18.8.45 xf CT_Xf */
- case '':
- xf = y;
- delete xf[0];
- for(i = 0; i < cellXF_uint.length; ++i) if(xf[cellXF_uint[i]])
- xf[cellXF_uint[i]] = parseInt(xf[cellXF_uint[i]], 10);
- for(i = 0; i < cellXF_bool.length; ++i) if(xf[cellXF_bool[i]])
- xf[cellXF_bool[i]] = parsexmlbool(xf[cellXF_bool[i]]);
- if(xf.numFmtId > 0x188) {
- for(i = 0x188; i > 0x3c; --i) if(styles.NumberFmt[xf.numFmtId] == styles.NumberFmt[i]) { xf.numFmtId = i; break; }
- }
- styles.CellXf.push(xf); break;
- case '': break;
+ /* 18.8.45 xf CT_Xf */
+ case '':
+ xf = y;
+ delete xf[0];
+ for (i = 0; i < cellXF_uint.length; ++i)
+ if (xf[cellXF_uint[i]])
+ xf[cellXF_uint[i]] = parseInt(xf[cellXF_uint[i]], 10);
+ for (i = 0; i < cellXF_bool.length; ++i)
+ if (xf[cellXF_bool[i]])
+ xf[cellXF_bool[i]] = parsexmlbool(xf[cellXF_bool[i]]);
+ if (xf.numFmtId > 0x188) {
+ for (i = 0x188; i > 0x3c; --i)
+ if (styles.NumberFmt[xf.numFmtId] == styles.NumberFmt[i]) {
+ xf.numFmtId = i;
+ break;
+ }
+ }
+ styles.CellXf.push(xf);
+ break;
+ case '':
+ break;
- /* 18.8.1 alignment CT_CellAlignment */
- case '':
- var alignment = {};
- if(y.vertical) alignment.vertical = y.vertical;
- if(y.horizontal) alignment.horizontal = y.horizontal;
- if(y.textRotation != null) alignment.textRotation = y.textRotation;
- if(y.indent) alignment.indent = y.indent;
- if(y.wrapText) alignment.wrapText = y.wrapText;
- xf.alignment = alignment;
- break;
- case '': break;
+ /* 18.8.1 alignment CT_CellAlignment */
+ case '':
+ var alignment = {};
+ if (y.vertical) alignment.vertical = y.vertical;
+ if (y.horizontal) alignment.horizontal = y.horizontal;
+ if (y.textRotation != null) alignment.textRotation = y.textRotation;
+ if (y.indent) alignment.indent = y.indent;
+ if (y.wrapText) alignment.wrapText = y.wrapText;
+ xf.alignment = alignment;
+ break;
+ case '':
+ break;
- /* 18.8.33 protection CT_CellProtection */
- case '': case '': break;
+ /* 18.8.33 protection CT_CellProtection */
+ case '':
+ case '':
+ break;
- /* 18.2.10 extLst CT_ExtensionList ? */
- case '': case '': break;
- case '': pass = false; break;
- default: if(opts && opts.WTF) {
- if(!pass) throw new Error('unrecognized ' + y[0] + ' in cellXfs');
- }
- }
- });
+ /* 18.2.10 extLst CT_ExtensionList ? */
+ case '':
+ case '':
+ break;
+ case '':
+ pass = false;
+ break;
+ default:
+ if (opts && opts.WTF) {
+ if (!pass) throw new Error('unrecognized ' + y[0] + ' in cellXfs');
+ }
+ }
+ });
}
-function write_cellXfs(cellXfs)/*:string*/ {
- var o/*:Array*/ = [];
- o[o.length] = (writextag('cellXfs',null));
- cellXfs.forEach(function(c) { o[o.length] = (writextag('xf', null, c)); });
- o[o.length] = ("");
- if(o.length === 2) return "";
- o[0] = writextag('cellXfs',null, {count:o.length-2}).replace("/>",">");
- return o.join("");
+function write_cellXfs(cellXfs) /*:string*/ {
+ var o /*:Array*/ = [];
+ o[o.length] = (writextag('cellXfs', null));
+ cellXfs.forEach(function (c) {
+ var other;
+ if (c.applyProtection) {
+ other = writextag('protection', null, {
+ locked: 0
+ });
+ }
+ o[o.length] = (writextag('xf', other, c));
+ });
+ o[o.length] = ("");
+ if (o.length === 2) return "";
+ o[0] = writextag('cellXfs', null, {
+ count: o.length - 2
+ }).replace("/>", ">");
+ return o.join("");
}
/* 18.8 Styles CT_Stylesheet*/
-var parse_sty_xml= (function make_pstyx() {
-var numFmtRegex = /<(?:\w+:)?numFmts([^>]*)>[\S\s]*?<\/(?:\w+:)?numFmts>/;
-var cellXfRegex = /<(?:\w+:)?cellXfs([^>]*)>[\S\s]*?<\/(?:\w+:)?cellXfs>/;
-var fillsRegex = /<(?:\w+:)?fills([^>]*)>[\S\s]*?<\/(?:\w+:)?fills>/;
-var fontsRegex = /<(?:\w+:)?fonts([^>]*)>[\S\s]*?<\/(?:\w+:)?fonts>/;
-var bordersRegex = /<(?:\w+:)?borders([^>]*)>[\S\s]*?<\/(?:\w+:)?borders>/;
+var parse_sty_xml = (function make_pstyx() {
+ var numFmtRegex = /<(?:\w+:)?numFmts([^>]*)>[\S\s]*?<\/(?:\w+:)?numFmts>/;
+ var cellXfRegex = /<(?:\w+:)?cellXfs([^>]*)>[\S\s]*?<\/(?:\w+:)?cellXfs>/;
+ var fillsRegex = /<(?:\w+:)?fills([^>]*)>[\S\s]*?<\/(?:\w+:)?fills>/;
+ var fontsRegex = /<(?:\w+:)?fonts([^>]*)>[\S\s]*?<\/(?:\w+:)?fonts>/;
+ var bordersRegex = /<(?:\w+:)?borders([^>]*)>[\S\s]*?<\/(?:\w+:)?borders>/;
-return function parse_sty_xml(data, themes, opts) {
- var styles = {};
- if(!data) return styles;
- data = data.replace(//mg,"").replace(//gm,"");
- /* 18.8.39 styleSheet CT_Stylesheet */
- var t;
+ return function parse_sty_xml(data, themes, opts) {
+ var styles = {};
+ if (!data) return styles;
+ data = data.replace(//mg, "").replace(//gm, "");
+ /* 18.8.39 styleSheet CT_Stylesheet */
+ var t;
- /* 18.8.31 numFmts CT_NumFmts ? */
- if((t=data.match(numFmtRegex))) parse_numFmts(t, styles, opts);
+ /* 18.8.31 numFmts CT_NumFmts ? */
+ if ((t = data.match(numFmtRegex))) parse_numFmts(t, styles, opts);
- /* 18.8.23 fonts CT_Fonts ? */
- if((t=data.match(fontsRegex))) parse_fonts(t, styles, themes, opts);
+ /* 18.8.23 fonts CT_Fonts ? */
+ if ((t = data.match(fontsRegex))) parse_fonts(t, styles, themes, opts);
- /* 18.8.21 fills CT_Fills ? */
- if((t=data.match(fillsRegex))) parse_fills(t, styles, themes, opts);
+ /* 18.8.21 fills CT_Fills ? */
+ if ((t = data.match(fillsRegex))) parse_fills(t, styles, themes, opts);
- /* 18.8.5 borders CT_Borders ? */
- if((t=data.match(bordersRegex))) parse_borders(t, styles, themes, opts);
+ /* 18.8.5 borders CT_Borders ? */
+ if ((t = data.match(bordersRegex))) parse_borders(t, styles, themes, opts);
- /* 18.8.9 cellStyleXfs CT_CellStyleXfs ? */
+ /* 18.8.9 cellStyleXfs CT_CellStyleXfs ? */
- /* 18.8.10 cellXfs CT_CellXfs ? */
- if((t=data.match(cellXfRegex))) parse_cellXfs(t, styles, opts);
+ /* 18.8.10 cellXfs CT_CellXfs ? */
+ if ((t = data.match(cellXfRegex))) parse_cellXfs(t, styles, opts);
- /* 18.8.8 cellStyles CT_CellStyles ? */
- /* 18.8.15 dxfs CT_Dxfs ? */
- /* 18.8.42 tableStyles CT_TableStyles ? */
- /* 18.8.11 colors CT_Colors ? */
- /* 18.2.10 extLst CT_ExtensionList ? */
+ /* 18.8.8 cellStyles CT_CellStyles ? */
+ /* 18.8.15 dxfs CT_Dxfs ? */
+ /* 18.8.42 tableStyles CT_TableStyles ? */
+ /* 18.8.11 colors CT_Colors ? */
+ /* 18.2.10 extLst CT_ExtensionList ? */
- return styles;
-};
+ return styles;
+ };
})();
var STYLES_XML_ROOT = writextag('styleSheet', null, {
- 'xmlns': XMLNS.main[0],
- 'xmlns:vt': XMLNS.vt
+ 'xmlns': XMLNS.main[0],
+ 'xmlns:vt': XMLNS.vt
});
RELS.STY = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";
-function write_sty_xml(wb/*:Workbook*/, opts)/*:string*/ {
- var o = [XML_HEADER, STYLES_XML_ROOT], w;
- if(wb.SSF && (w = write_numFmts(wb.SSF)) != null) o[o.length] = w;
- o[o.length] = ('');
- o[o.length] = ('');
- o[o.length] = ('');
- o[o.length] = ('');
- if((w = write_cellXfs(opts.cellXfs))) o[o.length] = (w);
- o[o.length] = ('');
- o[o.length] = ('');
- o[o.length] = ('');
+function write_sty_xml(wb /*:Workbook*/ , opts) /*:string*/ {
+ var o = [XML_HEADER, STYLES_XML_ROOT],
+ w;
+ if (wb.SSF && (w = write_numFmts(wb.SSF)) != null) o[o.length] = w;
+ o[o.length] = ('');
+ o[o.length] = ('');
+ o[o.length] = ('');
+ o[o.length] = ('');
+ if ((w = write_cellXfs(opts.cellXfs))) o[o.length] = (w);
+ o[o.length] = ('');
+ o[o.length] = ('');
+ o[o.length] = ('');
- if(o.length>2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); }
- return o.join("");
-}
+ if (o.length > 2) {
+ o[o.length] = ('');
+ o[1] = o[1].replace("/>", ">");
+ }
+ return o.join("");
+}
\ No newline at end of file
diff --git a/bits/66_wscommon.js b/bits/66_wscommon.js
index 38b2db5..5a41a73 100644
--- a/bits/66_wscommon.js
+++ b/bits/66_wscommon.js
@@ -2,130 +2,175 @@ var strs = {}; // shared strings
var _ssfopts = {}; // spreadsheet formatting options
RELS.WS = [
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet",
- "http://purl.oclc.org/ooxml/officeDocument/relationships/worksheet"
+ "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet",
+ "http://purl.oclc.org/ooxml/officeDocument/relationships/worksheet"
];
/*global Map */
var browser_has_Map = typeof Map !== 'undefined';
-function get_sst_id(sst/*:SST*/, str/*:string*/, rev)/*:number*/ {
- var i = 0, len = sst.length;
- if(rev) {
- if(browser_has_Map ? rev.has(str) : rev.hasOwnProperty(str)) {
- var revarr = browser_has_Map ? rev.get(str) : rev[str];
- for(; i < revarr.length; ++i) {
- if(sst[revarr[i]].t === str) { sst.Count ++; return revarr[i]; }
- }
- }
- } else for(; i < len; ++i) {
- if(sst[i].t === str) { sst.Count ++; return i; }
- }
- sst[len] = ({t:str}/*:any*/); sst.Count ++; sst.Unique ++;
- if(rev) {
- if(browser_has_Map) {
- if(!rev.has(str)) rev.set(str, []);
- rev.get(str).push(len);
- } else {
- if(!rev.hasOwnProperty(str)) rev[str] = [];
- rev[str].push(len);
- }
- }
- return len;
+function get_sst_id(sst /*:SST*/ , str /*:string*/ , rev) /*:number*/ {
+ var i = 0,
+ len = sst.length;
+ if (rev) {
+ if (browser_has_Map ? rev.has(str) : rev.hasOwnProperty(str)) {
+ var revarr = browser_has_Map ? rev.get(str) : rev[str];
+ for (; i < revarr.length; ++i) {
+ if (sst[revarr[i]].t === str) {
+ sst.Count++;
+ return revarr[i];
+ }
+ }
+ }
+ } else
+ for (; i < len; ++i) {
+ if (sst[i].t === str) {
+ sst.Count++;
+ return i;
+ }
+ }
+ sst[len] = ({
+ t: str
+ } /*:any*/ );
+ sst.Count++;
+ sst.Unique++;
+ if (rev) {
+ if (browser_has_Map) {
+ if (!rev.has(str)) rev.set(str, []);
+ rev.get(str).push(len);
+ } else {
+ if (!rev.hasOwnProperty(str)) rev[str] = [];
+ rev[str].push(len);
+ }
+ }
+ return len;
}
-function col_obj_w(C/*:number*/, col) {
- var p = ({min:C+1,max:C+1}/*:any*/);
- /* wch (chars), wpx (pixels) */
- var wch = -1;
- if(col.MDW) MDW = col.MDW;
- if(col.width != null) p.customWidth = 1;
- else if(col.wpx != null) wch = px2char(col.wpx);
- else if(col.wch != null) wch = col.wch;
- if(wch > -1) { p.width = char2width(wch); p.customWidth = 1; }
- else if(col.width != null) p.width = col.width;
- if(col.hidden) p.hidden = true;
- return p;
+function col_obj_w(C /*:number*/ , col) {
+ var p = ({
+ min: C + 1,
+ max: C + 1
+ } /*:any*/ );
+ /* wch (chars), wpx (pixels) */
+ var wch = -1;
+ if (col.MDW) MDW = col.MDW;
+ if (col.width != null) p.customWidth = 1;
+ else if (col.wpx != null) wch = px2char(col.wpx);
+ else if (col.wch != null) wch = col.wch;
+ if (wch > -1) {
+ p.width = char2width(wch);
+ p.customWidth = 1;
+ } else if (col.width != null) p.width = col.width;
+ if (col.hidden) p.hidden = true;
+ return p;
}
-function default_margins(margins/*:Margins*/, mode/*:?string*/) {
- if(!margins) return;
- var defs = [0.7, 0.7, 0.75, 0.75, 0.3, 0.3];
- if(mode == 'xlml') defs = [1, 1, 1, 1, 0.5, 0.5];
- if(margins.left == null) margins.left = defs[0];
- if(margins.right == null) margins.right = defs[1];
- if(margins.top == null) margins.top = defs[2];
- if(margins.bottom == null) margins.bottom = defs[3];
- if(margins.header == null) margins.header = defs[4];
- if(margins.footer == null) margins.footer = defs[5];
+function default_margins(margins /*:Margins*/ , mode /*:?string*/ ) {
+ if (!margins) return;
+ var defs = [0.7, 0.7, 0.75, 0.75, 0.3, 0.3];
+ if (mode == 'xlml') defs = [1, 1, 1, 1, 0.5, 0.5];
+ if (margins.left == null) margins.left = defs[0];
+ if (margins.right == null) margins.right = defs[1];
+ if (margins.top == null) margins.top = defs[2];
+ if (margins.bottom == null) margins.bottom = defs[3];
+ if (margins.header == null) margins.header = defs[4];
+ if (margins.footer == null) margins.footer = defs[5];
}
-function get_cell_style(styles/*:Array*/, cell/*:Cell*/, opts) {
- var z = opts.revssf[cell.z != null ? cell.z : "General"];
- var i = 0x3c, len = styles.length;
- if(z == null && opts.ssf) {
- for(; i < 0x188; ++i) if(opts.ssf[i] == null) {
- SSF.load(cell.z, i);
- // $FlowIgnore
- opts.ssf[i] = cell.z;
- opts.revssf[cell.z] = z = i;
- break;
- }
- }
- for(i = 0; i != len; ++i) if(styles[i].numFmtId === z) return i;
- styles[len] = {
- numFmtId:z,
- fontId:0,
- fillId:0,
- borderId:0,
- xfId:0,
- applyNumberFormat:1
- };
- return len;
+function get_cell_style(styles /*:Array*/ , cell /*:Cell*/ , opts) {
+ var z = opts.revssf[cell.z != null ? cell.z : "General"];
+ var i = 0x3c,
+ result;
+ if (z == null && opts.ssf) {
+ for (; i < 0x188; ++i)
+ if (opts.ssf[i] == null) {
+ SSF.load(cell.z, i);
+ // $FlowIgnore
+ opts.ssf[i] = cell.z;
+ opts.revssf[cell.z] = z = i;
+ break;
+ }
+ }
+ if (cell.p && !styles.find(function(s){ return !!s.applyProtection; })) {
+ styles[styles.length] = {
+ numFmtId: z,
+ fontId: 0,
+ fillId: 0,
+ borderId: 0,
+ xfId: 1,
+ applyNumberFormat: 1,
+ applyProtection: 1
+ };
+ }
+ for (i = 0; i != styles.length; ++i) {
+ if (styles[i].numFmtId === z) {
+ if (cell.p && !styles[i].applyProtection) {
+ continue;
+ }
+ result = i;
+ break;
+ }
+ }
+ if (result == undefined) {
+ var len = styles.length;
+ styles[len] = {
+ numFmtId: z,
+ fontId: 0,
+ fillId: 0,
+ borderId: 0,
+ xfId: 0,
+ applyNumberFormat: 1
+ };
+ result = len;
+ }
+ return result;
}
-function safe_format(p/*:Cell*/, fmtid/*:number*/, fillid/*:?number*/, opts, themes, styles) {
- if(p.t === 'z') return;
- if(p.t === 'd' && typeof p.v === 'string') p.v = parseDate(p.v);
- try {
- if(opts.cellNF) p.z = SSF._table[fmtid];
- } catch(e) { if(opts.WTF) throw e; }
- if(!opts || opts.cellText !== false) try {
- if(SSF._table[fmtid] == null) SSF.load(SSFImplicit[fmtid] || "General", fmtid);
- if(p.t === 'e') p.w = p.w || BErr[p.v];
- else if(fmtid === 0) {
- if(p.t === 'n') {
- if((p.v|0) === p.v) p.w = SSF._general_int(p.v);
- else p.w = SSF._general_num(p.v);
- }
- else if(p.t === 'd') {
- var dd = datenum(p.v);
- if((dd|0) === dd) p.w = SSF._general_int(dd);
- else p.w = SSF._general_num(dd);
- }
- else if(p.v === undefined) return "";
- else p.w = SSF._general(p.v,_ssfopts);
- }
- else if(p.t === 'd') p.w = SSF.format(fmtid,datenum(p.v),_ssfopts);
- else p.w = SSF.format(fmtid,p.v,_ssfopts);
- } catch(e) { if(opts.WTF) throw e; }
- if(!opts.cellStyles) return;
- if(fillid != null) try {
- p.s = styles.Fills[fillid];
- if (p.s.fgColor && p.s.fgColor.theme && !p.s.fgColor.rgb) {
- p.s.fgColor.rgb = rgb_tint(themes.themeElements.clrScheme[p.s.fgColor.theme].rgb, p.s.fgColor.tint || 0);
- if(opts.WTF) p.s.fgColor.raw_rgb = themes.themeElements.clrScheme[p.s.fgColor.theme].rgb;
- }
- if (p.s.bgColor && p.s.bgColor.theme) {
- p.s.bgColor.rgb = rgb_tint(themes.themeElements.clrScheme[p.s.bgColor.theme].rgb, p.s.bgColor.tint || 0);
- if(opts.WTF) p.s.bgColor.raw_rgb = themes.themeElements.clrScheme[p.s.bgColor.theme].rgb;
- }
- } catch(e) { if(opts.WTF && styles.Fills) throw e; }
+function safe_format(p /*:Cell*/ , fmtid /*:number*/ , fillid /*:?number*/ , opts, themes, styles) {
+ if (p.t === 'z') return;
+ if (p.t === 'd' && typeof p.v === 'string') p.v = parseDate(p.v);
+ try {
+ if (opts.cellNF) p.z = SSF._table[fmtid];
+ } catch (e) {
+ if (opts.WTF) throw e;
+ }
+ if (!opts || opts.cellText !== false) try {
+ if (SSF._table[fmtid] == null) SSF.load(SSFImplicit[fmtid] || "General", fmtid);
+ if (p.t === 'e') p.w = p.w || BErr[p.v];
+ else if (fmtid === 0) {
+ if (p.t === 'n') {
+ if ((p.v | 0) === p.v) p.w = SSF._general_int(p.v);
+ else p.w = SSF._general_num(p.v);
+ } else if (p.t === 'd') {
+ var dd = datenum(p.v);
+ if ((dd | 0) === dd) p.w = SSF._general_int(dd);
+ else p.w = SSF._general_num(dd);
+ } else if (p.v === undefined) return "";
+ else p.w = SSF._general(p.v, _ssfopts);
+ } else if (p.t === 'd') p.w = SSF.format(fmtid, datenum(p.v), _ssfopts);
+ else p.w = SSF.format(fmtid, p.v, _ssfopts);
+ } catch (e) {
+ if (opts.WTF) throw e;
+ }
+ if (!opts.cellStyles) return;
+ if (fillid != null) try {
+ p.s = styles.Fills[fillid];
+ if (p.s.fgColor && p.s.fgColor.theme && !p.s.fgColor.rgb) {
+ p.s.fgColor.rgb = rgb_tint(themes.themeElements.clrScheme[p.s.fgColor.theme].rgb, p.s.fgColor.tint || 0);
+ if (opts.WTF) p.s.fgColor.raw_rgb = themes.themeElements.clrScheme[p.s.fgColor.theme].rgb;
+ }
+ if (p.s.bgColor && p.s.bgColor.theme) {
+ p.s.bgColor.rgb = rgb_tint(themes.themeElements.clrScheme[p.s.bgColor.theme].rgb, p.s.bgColor.tint || 0);
+ if (opts.WTF) p.s.bgColor.raw_rgb = themes.themeElements.clrScheme[p.s.bgColor.theme].rgb;
+ }
+ } catch (e) {
+ if (opts.WTF && styles.Fills) throw e;
+ }
}
-function check_ws(ws/*:Worksheet*/, sname/*:string*/, i/*:number*/) {
- if(ws && ws['!ref']) {
- var range = safe_decode_range(ws['!ref']);
- if(range.e.c < range.s.c || range.e.r < range.s.r) throw new Error("Bad range (" + i + "): " + ws['!ref']);
- }
-}
+function check_ws(ws /*:Worksheet*/ , sname /*:string*/ , i /*:number*/ ) {
+ if (ws && ws['!ref']) {
+ var range = safe_decode_range(ws['!ref']);
+ if (range.e.c < range.s.c || range.e.r < range.s.r) throw new Error("Bad range (" + i + "): " + ws['!ref']);
+ }
+}
\ No newline at end of file
diff --git a/dist/shim.min.js b/dist/shim.min.js
index a421ac0..e81e0b8 100644
--- a/dist/shim.min.js
+++ b/dist/shim.min.js
@@ -1,2 +1 @@
-/*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
-if(!Object.keys)Object.keys=function(){var t=Object.prototype.hasOwnProperty,e=!{toString:null}.propertyIsEnumerable("toString"),r=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],i=r.length;return function(n){if(typeof n!=="object"&&typeof n!=="function"||n===null)throw new TypeError("Object.keys called on non-object");var o=[];for(var a in n)if(t.call(n,a))o.push(a);if(e)for(var l=0;l=0;--e)if(!t.charAt(e).match(/^\s/))return t.slice(0,e+1);return""};if(!Array.prototype.forEach)Array.prototype.forEach=function(t){var e=this.length>>>0,r=arguments[1]||void 0;for(var i=0;i>>0,r=arguments[1]||void 0,i=new Array(e);for(var n=0;n>>0,r=arguments[1]|0||0;for(r<0&&(r+=e)<0&&(r=0);r>>0,r=e-1;for(;r>=0;--r)if(this[r]===t)return r;return-1};if(!Array.isArray)Array.isArray=function(t){return Object.prototype.toString.call(t)==="[object Array]"};if(!Date.prototype.toISOString)Date.prototype.toISOString=function(){function t(t,e){return("0000000"+t).slice(-(e||2))}return function e(){var e=this.getUTCFullYear(),r="";if(e>9999)r="+"+t(e,6);else if(e<0)r="-"+t(-e,6);else r=t(e,4);return[r,t(this.getUTCMonth()+1),t(this.getUTCDate())].join("-")+"T"+[t(this.getUTCHours()),t(this.getUTCMinutes()),t(this.getUTCSeconds())].join(":")+"."+t(this.getUTCMilliseconds(),3)+"Z"}}();if(typeof ArrayBuffer!=="undefined"&&!ArrayBuffer.prototype.slice)ArrayBuffer.prototype.slice=function(t,e){if(t==null)t=0;if(t<0){t+=this.byteLength;if(t<0)t=0}if(t>=this.byteLength)return new Uint8Array(0);if(e==null)e=this.byteLength;if(e<0){e+=this.byteLength;if(e<0)e=0}if(e>this.byteLength)e=this.byteLength;if(t>e)return new Uint8Array(0);var r=new ArrayBuffer(e-t);var i=new Uint8Array(r);var n=new Uint8Array(this,t,e-t);if(i.set)i.set(n);else while(t<=--e)i[e-t]=n[e];return r};if(typeof Uint8Array!=="undefined"&&!Uint8Array.prototype.slice)Uint8Array.prototype.slice=function(t,e){if(t==null)t=0;if(t<0){t+=this.length;if(t<0)t=0}if(t>=this.length)return new Uint8Array(0);if(e==null)e=this.length;if(e<0){e+=this.length;if(e<0)e=0}if(e>this.length)e=this.length;if(t>e)return new Uint8Array(0);var r=new Uint8Array(e-t);while(t<=--e)r[e-t]=this[e];return r};var IE_SaveFile=function(){try{if(typeof IE_SaveFile_Impl=="undefined")document.write(['