styled-exceljs 0.21.3 → 0.21.4

package/xlsx.js

@@ -4,7 +4,7 @@
 /*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false, DataView:false, Deno:false, Set:false, Float32Array:false, Int8Array:false */
 var XLSX = {};
 function make_xlsx_lib(XLSX){
-XLSX.version = '0.21.3';
+XLSX.version = '0.21.4';
 var current_codepage = 1200, current_ansi = 1252;
 /*global cptable:true, window */
 var $cptable;
@@ -3872,7 +3872,7 @@ function escapexmltag(text){ return escapexml(text).replace(/ /g,"_x0020_"); }
 var htmlcharegex = /[\u0000-\u001f]/g;
 function escapehtml(text){
 	var s = text + '';
-	return s.replace(decregex, function(y) { return rencoding[y]; }).replace(/\n/g, "<br/>").replace(htmlcharegex,function(s) { return "&#x" + ("000"+s.charCodeAt(0).toString(16)).slice(-4) + ";"; });
+	return s.replace(decregex, function(y) { return rencoding[y]; }).replace(/\r\n|\r|\n/g, "<br/>").replace(htmlcharegex,function(s) { return "&#x" + ("000"+s.charCodeAt(0).toString(16)).slice(-4) + ";"; });
 }
 
 function escapexlml(text){
@@ -5675,6 +5675,7 @@ var RELS = ({
 	MS: "http://schemas.microsoft.com/office/2006/relationships/xlMacrosheet",
 	IMG: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
 	DRAW: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+	TABLE: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table",
 	XLMETA: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata",
 	TCMNT: "http://schemas.microsoft.com/office/2017/10/relationships/threadedComment",
 	PEOPLE: "http://schemas.microsoft.com/office/2017/10/relationships/person",
@@ -11138,6 +11139,9 @@ function resolve_style_obj_color(obj, themes) {
 
 /* 18.3.1.13 width calculations */
 /* [MS-OI29500] 2.1.595 Column Width & Formatting */
+/* The file format does not store MDW directly.  Seven is the Office-compatible
+ * fallback when Normal-font metrics are unavailable.  A single stored column
+ * width is ambiguous and must not change the scale for the rest of a sheet. */
 var DEF_MDW = 7, MAX_MDW = 15, MIN_MDW = 1, MDW = DEF_MDW;
 function width2px(width) { return Math.floor(( width + (Math.round(128/MDW))/256 )* MDW ); }
 function px2char(px) { return (Math.floor((px - 5)/MDW * 100 + 0.5))/100; }
@@ -11971,6 +11975,47 @@ function parse_dxfs(t, styles, themes, opts) {
 	});
 }
 
+function parse_tableStyles(t, styles, opts) {
+	styles.TableStyles = {styles:[]};
+	var tableStyle = null, pass = false;
+	(t.match(tagregex)||[]).forEach(function(x) {
+		var y = parsexmltag(x), tag = strip_ns(y[0]);
+		switch(tag) {
+			case '<tableStyles': case '<tableStyles>':
+				if(y.defaultTableStyle) styles.TableStyles.defaultTableStyle = utf8read(unescapexml(y.defaultTableStyle));
+				if(y.defaultPivotStyle) styles.TableStyles.defaultPivotStyle = utf8read(unescapexml(y.defaultPivotStyle));
+				break;
+			case '<tableStyles/>': case '</tableStyles>': break;
+			case '<tableStyle': case '<tableStyle>': case '<tableStyle/>':
+				if(styles.TableStyles.styles.length >= TABLE_STYLE_MAX_TABLES) {
+					tableStyle = null;
+					break;
+				}
+				tableStyle = {
+					name:utf8read(unescapexml(y.name || "")),
+					pivot:y.pivot != null ? parsexmlbool(y.pivot) : false,
+					table:y.table != null ? parsexmlbool(y.table) : true,
+					elements:[]
+				};
+				styles.TableStyles.styles.push(tableStyle);
+				if(tag.slice(-2) == "/>") tableStyle = null;
+				break;
+			case '</tableStyle>': tableStyle = null; break;
+			case '<tableStyleElement': case '<tableStyleElement>': case '<tableStyleElement/>':
+				if(tableStyle && tableStyle.elements.length < 64 && table_style_element_type(y.type) && y.dxfId != null) tableStyle.elements.push({
+					type:y.type,
+					dxfId:parseInt(y.dxfId, 10),
+					size:y.size != null ? Math.max(1, parseInt(y.size, 10) || 1) : 1
+				});
+				break;
+			case '<extLst': case '<extLst>': case '</extLst>': break;
+			case '<ext': pass = true; break;
+			case '</ext>': pass = false; break;
+			default: if(opts && opts.WTF && !pass) throw new Error('unrecognized ' + y[0] + ' in tableStyles');
+		}
+	});
+}
+
 function parse_colors(t, styles, themes, opts) {
 	styles.Colors = {indexedColors:[], mruColors:[], themeColors:[]};
 	var target = null, pass = false;
@@ -12049,6 +12094,7 @@ return function parse_sty_xml(data, themes, opts) {
 	if((t=str_match_xml_ns(data, "dxfs"))) parse_dxfs(t[0], styles, themes, opts);
 
 	/* 18.8.42 tableStyles CT_TableStyles ? */
+	if((t=str_match_xml_ns(data, "tableStyles"))) parse_tableStyles(t[0], styles, opts);
 	/* 18.8.11 colors CT_Colors ? */
 	if((t=str_match_xml_ns(data, "colors"))) parse_colors(t[0], styles, themes, opts);
 
@@ -16574,7 +16620,11 @@ function validate_merges(ws, opts) {
 				errors.push({code:"E_MERGE_OVERLAP", message:"Merge ranges overlap", index:i, other:j, range:enc, otherRange:encode_range(merges[j])});
 		}
 	}
-	if(errors.length && opts && opts.WTF) throw new Error(errors[0].message + " (" + (errors[0].range || errors[0].index) + ")");
+	if(errors.length && opts && opts.WTF) {
+		var err = new Error(errors[0].message + " (" + (errors[0].range || errors[0].index) + ")");
+		err.code = errors[0].code;
+		throw err;
+	}
 	return errors;
 }
 
@@ -16584,6 +16634,312 @@ function check_ws(ws, sname, i) {
 		if(range.e.c < range.s.c || range.e.r < range.s.r) throw new Error("Bad range (" + i + "): " + ws['!ref']);
 	}
 }
+var TABLE_STYLE_MAX_TABLES = 1024;
+var TABLE_STYLE_MAX_COLUMNS = 16384;
+var TABLE_STYLE_MAX_XML_LENGTH = 5 * 1024 * 1024;
+var TABLE_STYLE_ELEMENT_TYPES = {
+	wholeTable:true, headerRow:true, totalRow:true,
+	firstColumn:true, lastColumn:true,
+	firstRowStripe:true, secondRowStripe:true,
+	firstColumnStripe:true, secondColumnStripe:true,
+	firstHeaderCell:true, lastHeaderCell:true,
+	firstTotalCell:true, lastTotalCell:true
+};
+
+function table_style_safe_key(key) {
+	return key != "__proto__" && key != "constructor" && key != "prototype";
+}
+
+function table_style_element_type(type) {
+	return Object.prototype.hasOwnProperty.call(TABLE_STYLE_ELEMENT_TYPES, type);
+}
+
+function table_style_attr(y, name) {
+	if(y[name] != null) return y[name];
+	return y[name.toLowerCase()];
+}
+
+function table_style_bool(y, name, fallback) {
+	var value = table_style_attr(y, name);
+	return value == null ? fallback : parsexmlbool(value);
+}
+
+function table_style_int(y, name) {
+	var value = table_style_attr(y, name);
+	if(value == null || value === "") return void 0;
+	value = parseInt(value, 10);
+	return isFinite(value) && value >= 0 ? value : void 0;
+}
+
+function table_style_merge(target, source) {
+	if(!source) return target;
+	if(!target) target = {};
+	keys(source).forEach(function(k) {
+		if(!table_style_safe_key(k)) return;
+		var value = source[k];
+		if(value && typeof value == "object" && !Array.isArray(value)) {
+			target[k] = table_style_merge(
+				target[k] && typeof target[k] == "object" && !Array.isArray(target[k]) ? table_style_merge({}, target[k]) : {},
+				value
+			);
+		} else target[k] = value;
+	});
+	return target;
+}
+
+function table_style_color(themes, theme, tint) {
+	return style_color_from_attrs({theme:String(theme), tint:String(tint || 0)}, themes);
+}
+
+function table_style_fill(color) {
+	return {fill:{patternType:"solid", fgColor:color}};
+}
+
+function table_style_font(color, bold) {
+	var font = {};
+	if(color) font.color = color;
+	if(bold) font.bold = 1;
+	return {font:font};
+}
+
+function table_style_border(side, color, style) {
+	var border = {}, out = {border:border};
+	border[side] = {style:style || "thin", color:color};
+	return out;
+}
+
+function table_style_accent(themes, index) {
+	var position = (index - 1) % 7;
+	/* The first style in each seven-style family is neutral. The remaining
+	 * six entries use the workbook's accent1..accent6 colors. */
+	return table_style_color(themes, position ? 3 + position : 1, 0);
+}
+
+function built_in_table_style_rules(name, themes) {
+	var match = /^TableStyle(Light|Medium|Dark)(\d+)$/i.exec(name || "");
+	if(!match) return null;
+	var family = match[1].toLowerCase(), index = parseInt(match[2], 10);
+	var maximum = family == "light" ? 21 : family == "medium" ? 28 : 11;
+	if(index < 1 || index > maximum) return null;
+	var accent = table_style_accent(themes, index);
+	var white = table_style_color(themes, 0, 0);
+	var dark = table_style_color(themes, 1, 0);
+	var rules = {};
+
+	if(family == "light") {
+		rules.headerRow = table_style_merge(
+			table_style_font(accent, true),
+			table_style_border("bottom", accent, "medium")
+		);
+		rules.totalRow = table_style_merge(
+			table_style_font(accent, true),
+			table_style_border("top", accent, "double")
+		);
+		rules.firstRowStripe = table_style_fill(table_style_color(themes, accent.theme, 0.9));
+		rules.firstColumnStripe = rules.firstRowStripe;
+	} else if(family == "medium") {
+		var group = Math.floor((index - 1) / 7);
+		rules.headerRow = table_style_merge(table_style_fill(accent), table_style_font(white, true));
+		rules.totalRow = table_style_merge(
+			table_style_font(accent, true),
+			table_style_border("top", accent, "double")
+		);
+		if(group == 1) {
+			/* Medium 8..14 use two theme-derived body fills. This is the family
+			 * used by Excel's TableStyleMedium13. */
+			rules.wholeTable = table_style_fill(table_style_color(themes, accent.theme, 0.8));
+			rules.firstRowStripe = table_style_fill(table_style_color(themes, accent.theme, 0.6));
+			rules.firstColumnStripe = rules.firstRowStripe;
+		} else if(group == 2) {
+			rules.firstRowStripe = table_style_fill(table_style_color(themes, accent.theme, 0.8));
+			rules.firstColumnStripe = rules.firstRowStripe;
+			rules.wholeTable = table_style_border("bottom", table_style_color(themes, accent.theme, 0.4), "thin");
+		} else if(group == 3) {
+			rules.wholeTable = table_style_fill(table_style_color(themes, accent.theme, 0.9));
+			rules.firstRowStripe = table_style_fill(table_style_color(themes, accent.theme, 0.7));
+			rules.firstColumnStripe = rules.firstRowStripe;
+		} else {
+			rules.firstRowStripe = table_style_fill(table_style_color(themes, accent.theme, 0.8));
+			rules.firstColumnStripe = rules.firstRowStripe;
+		}
+	} else {
+		rules.wholeTable = table_style_merge(table_style_fill(dark), table_style_font(white, false));
+		rules.headerRow = table_style_merge(table_style_fill(accent), table_style_font(white, true));
+		rules.firstRowStripe = table_style_fill(table_style_color(themes, accent.theme, -0.35));
+		rules.firstColumnStripe = rules.firstRowStripe;
+		rules.totalRow = table_style_merge(
+			table_style_font(white, true),
+			table_style_border("top", accent, "double")
+		);
+	}
+
+	rules.firstColumn = table_style_font(null, true);
+	rules.lastColumn = table_style_font(null, true);
+	return rules;
+}
+
+function custom_table_style_rules(name, styles) {
+	var tableStyles = styles && styles.TableStyles;
+	if(!tableStyles || !tableStyles.styles) return null;
+	for(var i = 0; i < tableStyles.styles.length; ++i) {
+		var tableStyle = tableStyles.styles[i];
+		if(tableStyle.name != name) continue;
+		var rules = Object.create(null);
+		(tableStyle.elements || []).forEach(function(element) {
+			if(!table_style_element_type(element.type)) return;
+			var dxf = styles.Dxfs && styles.Dxfs[element.dxfId];
+			if(dxf) rules[element.type] = {style:dup(dxf), size:element.size || 1};
+		});
+		return rules;
+	}
+	return null;
+}
+
+function parse_table_xml(data, path, themes, styles, opts) {
+	if(!data || data.length > TABLE_STYLE_MAX_XML_LENGTH) return null;
+	data = remove_doctype(str_remove_ng(data, "<!--", "-->"));
+	var table = {columns:[]}, column = null, pass = false;
+	(data.match(tagregex)||[]).forEach(function(x) {
+		var y = parsexmltag(x), tag = strip_ns(y[0]);
+		switch(tag) {
+			case '<table': case '<table>':
+				table.id = table_style_int(y, "id");
+				table.name = utf8read(unescapexml(table_style_attr(y, "name") || ""));
+				table.displayName = utf8read(unescapexml(table_style_attr(y, "displayName") || table.name));
+				table.ref = table_style_attr(y, "ref") || "";
+				table.headerRowCount = table_style_int(y, "headerRowCount");
+				table.totalsRowCount = table_style_int(y, "totalsRowCount");
+				table.totalsRowShown = table_style_bool(y, "totalsRowShown", false);
+				table.headerRowDxfId = table_style_int(y, "headerRowDxfId");
+				table.dataDxfId = table_style_int(y, "dataDxfId");
+				table.totalsRowDxfId = table_style_int(y, "totalsRowDxfId");
+				table.path = path;
+				break;
+			case '<tableColumn': case '<tableColumn>': case '<tableColumn/>':
+				if(table.columns.length >= TABLE_STYLE_MAX_COLUMNS) {
+					column = null;
+					break;
+				}
+				column = {
+					id:table_style_int(y, "id"),
+					name:utf8read(unescapexml(table_style_attr(y, "name") || "")),
+					headerRowDxfId:table_style_int(y, "headerRowDxfId"),
+					dataDxfId:table_style_int(y, "dataDxfId"),
+					totalsRowDxfId:table_style_int(y, "totalsRowDxfId")
+				};
+				table.columns.push(column);
+				if(tag.slice(-2) == "/>" ) column = null;
+				break;
+			case '</tableColumn>': column = null; break;
+			case '<tableStyleInfo': case '<tableStyleInfo>': case '<tableStyleInfo/>':
+				table.styleInfo = {
+					name:utf8read(unescapexml(table_style_attr(y, "name") || "")),
+					showFirstColumn:table_style_bool(y, "showFirstColumn", false),
+					showLastColumn:table_style_bool(y, "showLastColumn", false),
+					showRowStripes:table_style_bool(y, "showRowStripes", false),
+					showColumnStripes:table_style_bool(y, "showColumnStripes", false)
+				};
+				break;
+			case '<extLst': case '<extLst>': case '</extLst>': break;
+			case '<ext': pass = true; break;
+			case '</ext>': pass = false; break;
+			default: if(opts && opts.WTF && !pass) {
+				/* Table formulas and filter metadata are intentionally preserved by
+				 * the raw XML parser but do not affect visual style resolution. */
+				if(/^<\/?(?:tableColumns|autoFilter|sortState|calculatedColumnFormula|totalsRowFormula|xmlColumnPr)/.test(tag)) break;
+			}
+		}
+	});
+	if(!table.ref) return null;
+	try {
+		table.range = safe_decode_range(table.ref);
+		if(table.range.s.r < 0 || table.range.s.c < 0 || table.range.e.r > 1048575 || table.range.e.c > 16383) return null;
+	} catch(e) { return null; }
+	var styleName = table.styleInfo && table.styleInfo.name;
+	table.styleRules = custom_table_style_rules(styleName, styles) || built_in_table_style_rules(styleName, themes) || {};
+	table.dxfs = styles && styles.Dxfs ? styles.Dxfs : [];
+	return table;
+}
+
+function parse_sheet_tables(sheet, zip, path, rels, opts, themes, styles) {
+	if(!sheet || !rels || !rels['!id'] || !opts || !opts.cellStyles) return;
+	var tables = [], seen = Object.create(null);
+	keys(rels['!id']).forEach(function(id) {
+		if(tables.length >= TABLE_STYLE_MAX_TABLES) return;
+		var rel = rels['!id'][id];
+		if(!rel || rel.TargetMode == "External" || typeof rel.Target != "string" || !rel.Target ||
+			(rel.Type != RELS.TABLE && !/\/table$/.test(rel.Type || ""))) return;
+		var tablePath = resolve_path(rel.Target, path);
+		if(seen[tablePath]) return;
+		seen[tablePath] = true;
+		var table = parse_table_xml(getzipstr(zip, tablePath, true), tablePath, themes, styles, opts);
+		if(table) tables.push(table);
+	});
+	if(tables.length) sheet['!tables'] = tables;
+}
+
+function table_style_rule_value(rule) {
+	return rule && rule.style ? rule.style : rule;
+}
+
+function table_style_stripe_rule(first, second, offset) {
+	var firstSize = first && first.size || 1, secondSize = second && second.size || 1;
+	var period = firstSize + secondSize;
+	if(!period) return null;
+	return offset % period < firstSize ? first : second;
+}
+
+function table_style_dxf(table, id) {
+	return id == null || !table.dxfs ? null : table.dxfs[id];
+}
+
+function resolve_table_cell_style(ws, row, col, baseStyle) {
+	var tables = ws && ws['!tables'];
+	var resolved = baseStyle ? table_style_merge({}, baseStyle) : {};
+	if(!tables || !tables.length) return keys(resolved).length ? resolved : void 0;
+	for(var i = 0; i < tables.length; ++i) {
+		var table = tables[i], range = table.range;
+		if(!range || row < range.s.r || row > range.e.r || col < range.s.c || col > range.e.c) continue;
+		var rules = table.styleRules || {}, info = table.styleInfo || {};
+		var rowOffset = row - range.s.r, colOffset = col - range.s.c;
+		var headerRows = table.headerRowCount == null ? 1 : table.headerRowCount;
+		var totalRows = table.totalsRowCount != null ? table.totalsRowCount : table.totalsRowShown ? 1 : 0;
+		var dataStart = headerRows, dataEnd = range.e.r - range.s.r - totalRows;
+		var isHeader = rowOffset < headerRows;
+		var isTotal = totalRows > 0 && rowOffset > dataEnd;
+		var dataOffset = rowOffset - dataStart;
+		var column = table.columns && table.columns[colOffset];
+
+		resolved = table_style_merge(resolved, table_style_rule_value(rules.wholeTable));
+		if(!isHeader && !isTotal && dataOffset >= 0) {
+			if(info.showRowStripes) resolved = table_style_merge(resolved, table_style_rule_value(
+				table_style_stripe_rule(rules.firstRowStripe, rules.secondRowStripe, dataOffset)
+			));
+			if(info.showColumnStripes) resolved = table_style_merge(resolved, table_style_rule_value(
+				table_style_stripe_rule(rules.firstColumnStripe, rules.secondColumnStripe, colOffset)
+			));
+		}
+		if(info.showFirstColumn && col == range.s.c) resolved = table_style_merge(resolved, table_style_rule_value(rules.firstColumn));
+		if(info.showLastColumn && col == range.e.c) resolved = table_style_merge(resolved, table_style_rule_value(rules.lastColumn));
+		if(isHeader) {
+			resolved = table_style_merge(resolved, table_style_rule_value(rules.headerRow));
+			if(col == range.s.c) resolved = table_style_merge(resolved, table_style_rule_value(rules.firstHeaderCell));
+			if(col == range.e.c) resolved = table_style_merge(resolved, table_style_rule_value(rules.lastHeaderCell));
+			resolved = table_style_merge(resolved, table_style_dxf(table, table.headerRowDxfId));
+			resolved = table_style_merge(resolved, table_style_dxf(table, column && column.headerRowDxfId));
+		} else if(isTotal) {
+			resolved = table_style_merge(resolved, table_style_rule_value(rules.totalRow));
+			if(col == range.s.c) resolved = table_style_merge(resolved, table_style_rule_value(rules.firstTotalCell));
+			if(col == range.e.c) resolved = table_style_merge(resolved, table_style_rule_value(rules.lastTotalCell));
+			resolved = table_style_merge(resolved, table_style_dxf(table, table.totalsRowDxfId));
+			resolved = table_style_merge(resolved, table_style_dxf(table, column && column.totalsRowDxfId));
+		} else {
+			resolved = table_style_merge(resolved, table_style_dxf(table, table.dataDxfId));
+			resolved = table_style_merge(resolved, table_style_dxf(table, column && column.dataDxfId));
+		}
+	}
+	return keys(resolved).length ? resolved : void 0;
+}
 function parse_ws_xml_dim(ws, s) {
 	var d = safe_decode_range(s);
 	if(d.s.r<=d.e.r && d.s.c<=d.e.c && d.s.r>=0 && d.s.c>=0) ws["!ref"] = encode_range(d);
@@ -16698,7 +17054,7 @@ function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
 	if(columns.length > 0) s["!cols"] = columns;
 	if(merges.length > 0) {
 		s["!merges"] = merges;
-		var mergeErrors = validate_merges(s, {WTF: !!(opts && (opts.WTF || opts.validateMerges))});
+		var mergeErrors = validate_merges(s, {WTF: !!(opts && opts.validateMerges)});
 		if(mergeErrors.length) s["!mergeErrors"] = mergeErrors;
 	}
 	if(rels['!id'][s['!rel']]) s['!drawel'] = rels['!id'][s['!rel']];
@@ -16813,7 +17169,8 @@ function parse_ws_xml_cols(columns, cols) {
 		var colm=parseInt(coll.min, 10)-1, colM=parseInt(coll.max,10)-1;
 		if(coll.outlineLevel) coll.level = (+coll.outlineLevel || 0);
 		delete coll.min; delete coll.max; coll.width = +coll.width;
-		/* OOXML widths share the workbook Normal-font MDW; do not infer a different scale per sheet. */
+		/* OOXML widths share the workbook Normal-font MDW.  Do not infer it from
+		 * one ambiguous stored width or leak another worksheet's scale. */
 		if(!seencol && coll.width) { seencol = true; MDW = DEF_MDW; }
 		process_col(coll);
 		while(colm <= colM) columns[colm++] = dup(coll);
@@ -17236,7 +17593,7 @@ function write_ws_xml(idx, opts, wb, rels) {
 	/* customSheetViews */
 
 	if(ws['!merges'] != null && ws['!merges'].length > 0) {
-		validate_merges(ws, {WTF:true});
+		validate_merges(ws, {WTF: !!(opts && opts.validateMerges)});
 		o[o.length] = (write_ws_xml_merges(ws['!merges']));
 	}
 
@@ -18722,7 +19079,6 @@ function check_wb(wb) {
 	check_wb_names(wb.SheetNames, Sheets, !!wb.vbaraw);
 	for(var i = 0; i < wb.SheetNames.length; ++i) {
 		var ws = sheet_map_get(wb.Sheets, wb.SheetNames[i]);
-		if(!ws) throw new Error("Missing worksheet |" + wb.SheetNames[i] + "|");
 		check_ws(ws, wb.SheetNames[i], i);
 	}
 	wb.SheetNames.forEach(function(n, i) {
@@ -21140,7 +21496,7 @@ function parse_workbook(blob, options) {
 	};
 	var finalize_sheet_visuals = function finalizesheetvisuals(ws) {
 		if(ws["!merges"] && ws["!merges"].length) {
-			var mergeErrors = validate_merges(ws, {WTF: !!(options && (options.WTF || options.validateMerges))});
+			var mergeErrors = validate_merges(ws, {WTF: !!(options && options.validateMerges)});
 			if(mergeErrors.length) ws["!mergeErrors"] = mergeErrors;
 		}
 		if(drawings && (drawings.images.length || drawings.shapes.length || drawings.charts.length || drawings.raw.length)) ws["!drawings"] = drawings;
@@ -23695,7 +24051,7 @@ function write_ws_biff8(idx, opts, wb) {
 	if(b8) write_biff_rec(ba, 0x023e /* Window2 */, write_Window2((_WB.Views||[])[0]));
 	/* ... */
 	if(b8 && (ws['!merges']||[]).length) {
-		validate_merges(ws, {WTF:true});
+		validate_merges(ws, {WTF: !!(opts && opts.validateMerges)});
 		write_biff_rec(ba, 0x00e5 /* MergeCells */, write_MergeCells(ws['!merges']));
 	}
 	/* [LRng] *QUERYTABLE [PHONETICINFO] CONDFMTS */
@@ -24084,6 +24440,7 @@ function make_html_row(ws, r, R, o) {
 			if(cols[C] && cols[C].s) extend_style_obj(inherited, cols[C].s);
 			if(row && row.s) extend_style_obj(inherited, row.s);
 			if(cell && cell.s) extend_style_obj(inherited, cell.s);
+			inherited = resolve_table_cell_style(ws, R, C, inherited) || inherited;
 			if(keys(inherited).length) {
 				stylecell = cell ? dup(cell) : {t:'z'};
 				stylecell.s = inherited;
@@ -28210,6 +28567,7 @@ function safe_parse_sheet(zip, path, relsPath, sheet, idx, sheetRels, sheets, st
 			case 'dialog': _ws = parse_ds(data, path, idx, opts, sheetRels[sheet], wb, themes, styles); break;
 			default: throw new Error("Unrecognized sheet type " + stype);
 		}
+		if(stype == "sheet") parse_sheet_tables(_ws, zip, path, sheetRels[sheet], opts, themes, styles);
 		sheet_map_set(sheets, sheet, _ws);
 
 		/* scan rels for comments and threaded comments */
@@ -28230,7 +28588,9 @@ function safe_parse_sheet(zip, path, relsPath, sheet, idx, sheetRels, sheets, st
 		if(tcomments && tcomments.length) sheet_insert_comments(_ws, tcomments, true, opts.people || []);
 		if(stype == "sheet") parse_sheet_drawing(_ws, stype, zip, path, idx, opts, wb);
 		parse_sheet_legacy_drawing(_ws, stype, zip, path, idx, opts, wb, comments);
-	} catch(e) { if(opts.WTF) throw e; }
+	} catch(e) {
+		if(opts.WTF || (opts.validateMerges && e && /^E_MERGE_/.test(e.code))) throw e;
+	}
 }
 
 function strip_front_slash(x) { return x.charAt(0) == '/' ? x.slice(1) : x; }
@@ -29531,6 +29891,7 @@ var utils = {
 	measure_text_width: measure_text_width,
 	auto_fit_columns: auto_fit_columns,
 	autofit_columns: auto_fit_columns,
+	resolve_table_cell_style: resolve_table_cell_style,
 	col_width_to_px: width2px,
 	px_to_col_width: function(px) { return char2width(px2char(px)); },
 	row_height_to_px: pt2px_browser,