version bump 0.11.15: right-to-left write

- XLSX right-to-left support (fixes SheetJS#927 h/t @mghayour) - HTML string preserve newline (fixes SheetJS#929 h/t @Irikos)
jzlingmo · Dec 25, 2017 · 33f96fc · 33f96fc
1 parent 028d701
commit 33f96fc
Show file tree

Hide file tree

Showing 22 changed files with 108 additions and 68 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,3 +8,4 @@ docbits/*      linguist-documentation
 dist/*         linguist-generated=true
 xlsx.js        linguist-generated=true
 xlsxworker.js  linguist-generated=true
+tests/core.js  linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,8 @@ tmp
 *.[pP][rR][nN]
 *.[sS][lL][kK]
 *.socialcalc
-*.[xX][lL][sSwWcC]
-*.[xX][lL][sS][xXmMbB]
+*.[xX][lL][sSwWcCaAtT]
+*.[xX][lL][sSaAtT][xXmMbB]
 *.[oO][dD][sS]
 *.[fF][oO][dD][sS]
 *.[xX][mM][lL]

diff --git a/bits/01_version.js b/bits/01_version.js
@@ -1 +1 @@
-XLSX.version = '0.11.14';
+XLSX.version = '0.11.15';
diff --git a/bits/30_ctype.js b/bits/30_ctype.js
@@ -148,6 +148,7 @@ var CT_LIST = (function(){
 			xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
 			xlsm: "application/vnd.ms-excel.sheet.macroEnabled.main+xml",
 			xlsb: "application/vnd.ms-excel.sheet.binary.macroEnabled.main",
+			xlam: "application/vnd.ms-excel.addin.macroEnabled.main+xml",
 			xltx: "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml"
 		},
 		strs: { /* Shared Strings */

diff --git a/bits/67_wsxml.js b/bits/67_wsxml.js
@@ -193,7 +193,10 @@ function write_ws_xml_autofilter(data)/*:string*/ {
 /* 18.3.1.88 sheetViews CT_SheetViews */
 /* 18.3.1.87 sheetView CT_SheetView */
 function write_ws_xml_sheetviews(ws, opts, idx, wb)/*:string*/ {
-	return writextag("sheetViews", writextag("sheetView", null, {workbookViewId:"0"}), {});
+	var sview = {workbookViewId:"0"};
+	// $FlowIgnore
+	if( (((wb||{}).Workbook||{}).Views||[])[0] ) sview.rightToLeft = wb.Workbook.Views[0].RTL ? "1" : "0";
+	return writextag("sheetViews", writextag("sheetView", null, sview), {});
 }
 
 function write_ws_xml_cell(cell, ref, ws, opts, idx, wb) {

diff --git a/bits/68_wsbin.js b/bits/68_wsbin.js
@@ -335,9 +335,12 @@ function write_BrtMargins(margins/*:Margins*/, o) {
 }
 
 /* [MS-XLSB] 2.4.292 BrtBeginWsView */
-function write_BrtBeginWsView(ws, o) {
+function write_BrtBeginWsView(ws, Workbook, o) {
 	if(o == null) o = new_buf(30);
-	o.write_shift(2, 924); // bit flag
+	var f = 0x39c;
+	// $FlowIgnore
+	if((((Workbook||{}).Views||[])[0]||{}).RTL) f |= 0x20;
+	o.write_shift(2, f); // bit flag
 	o.write_shift(4, 0);
 	o.write_shift(4, 0); // view first row
 	o.write_shift(4, 0); // view first col
@@ -748,11 +751,11 @@ function write_AUTOFILTER(ba, ws) {
 	write_record(ba, "BrtEndAFilter");
 }
 
-function write_WSVIEWS2(ba, ws) {
+function write_WSVIEWS2(ba, ws, Workbook) {
 	write_record(ba, "BrtBeginWsViews");
 	{ /* 1*WSVIEW2 */
 		/* [ACUID] */
-		write_record(ba, "BrtBeginWsView", write_BrtBeginWsView(ws));
+		write_record(ba, "BrtBeginWsView", write_BrtBeginWsView(ws, Workbook));
 		/* [BrtPane] */
 		/* *4BrtSel */
 		/* *4SXSELECT */
@@ -785,7 +788,7 @@ function write_ws_bin(idx/*:number*/, opts, wb/*:Workbook*/, rels) {
 	write_record(ba, "BrtBeginSheet");
 	write_record(ba, "BrtWsProp", write_BrtWsProp(c));
 	write_record(ba, "BrtWsDim", write_BrtWsDim(r));
-	write_WSVIEWS2(ba, ws);
+	write_WSVIEWS2(ba, ws, wb.Workbook);
 	write_WSFMTINFO(ba, ws);
 	write_COLINFOS(ba, ws, idx, opts, wb);
 	write_CELLTABLE(ba, ws, idx, opts, wb);

diff --git a/bits/79_html.js b/bits/79_html.js
@@ -24,7 +24,6 @@ var HTML_ = (function() {
 				var m = cell, cc = 0;
 				/* TODO: parse styles etc */
 				while(m.charAt(0) == "<" && (cc = m.indexOf(">")) > -1) m = m.slice(cc+1);
-				while(m.indexOf(">") > -1) m = m.slice(0, m.lastIndexOf("<"));
 				var tag = parsexmltag(cell.slice(0, cell.indexOf(">")));
 				CS = tag.colspan ? +tag.colspan : 1;
 				if((RS = +tag.rowspan)>0 || CS>1) merges.push({s:{r:R,c:C},e:{r:R + (RS||1) - 1, c:C + CS - 1}});

diff --git a/dist/xlsx.core.min.js b/dist/xlsx.core.min.js
diff --git a/dist/xlsx.core.min.map b/dist/xlsx.core.min.map
diff --git a/dist/xlsx.full.min.js b/dist/xlsx.full.min.js
diff --git a/dist/xlsx.full.min.map b/dist/xlsx.full.min.map
diff --git a/dist/xlsx.js b/dist/xlsx.js
diff --git a/dist/xlsx.min.js b/dist/xlsx.min.js
diff --git a/dist/xlsx.min.map b/dist/xlsx.min.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.11.14",
+	"version": "0.11.15",
 	"author": "sheetjs",
 	"description": "SheetJS Spreadsheet data parser and writer",
 	"keywords": [

diff --git a/test.js b/test.js
@@ -1900,6 +1900,11 @@ describe('HTML', function() {
 		it('should interpret values by default', function() { plaintext_test(X.read(html_bstr, {type:"binary"}), false, false); });
 		it('should generate strings if raw option is passed', function() { plaintext_test(X.read(html_bstr, {type:"binary", raw:true}), true, false); });
 		it('should handle "string" type', function() { plaintext_test(X.read(html_str, {type:"string"}), false, false); });
+		it('should handle newlines correctly', function() {
+			var table = "<table><tr><td>foo<br/>bar</td><td>baz</td></tr></table>";
+			var wb = X.read(table, {type:"string"});
+			assert.equal(get_cell(wb.Sheets.Sheet1, "A1").v, "foo\nbar");
+		});
 	});
 	(domtest ? describe : describe.skip)('input DOM', function() {
 		it('should interpret values by default', function() { plaintext_test(X.utils.table_to_book(get_dom_element(html_str)), false, true); });

diff --git a/tests/core.js b/tests/core.js
diff --git a/tests/write.js b/tests/write.js
@@ -158,6 +158,7 @@ ws['!protect'] = {
 if(!wb.Workbook) wb.Workbook = {Sheets:[], WBProps:{}};
 if(!wb.Workbook.WBProps) wb.Workbook.WBProps = {};
 wb.Workbook.WBProps.filterPrivacy = true;
+//wb.Workbook.Views = [{RTL:true}];
 
 console.log("Worksheet Model:");
 console.log(ws);

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -271,6 +271,9 @@ export interface WBProps {
     /** Defined Names */
     Names?: DefinedName[];
 
+    /** Workbook Views */
+    Views?: any[];
+
     /** Other Workbook Properties */
     WBProps?: WorkbookProperties;
 }

diff --git a/types/write.ts b/types/write.ts
@@ -144,6 +144,7 @@ ws['!protect'] = {
 if(!wb.Workbook) wb.Workbook = {Sheets:[], WBProps:{}};
 if(!wb.Workbook.WBProps) wb.Workbook.WBProps = {};
 wb.Workbook.WBProps.filterPrivacy = true;
+wb.Workbook.Views = [{RTL:true}];
 
 console.log("Worksheet Model:");
 console.log(ws);

diff --git a/xlsx.flow.js b/xlsx.flow.js
@@ -4,7 +4,7 @@
 /*global global, exports, module, require:false, process:false, Buffer:false */
 var XLSX = {};
 (function make_xlsx(XLSX){
-XLSX.version = '0.11.14';
+XLSX.version = '0.11.15';
 var current_codepage = 1200;
 /*:: declare var cptable:any; */
 /*global cptable:true */
@@ -3468,6 +3468,7 @@ var CT_LIST = (function(){
 			xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
 			xlsm: "application/vnd.ms-excel.sheet.macroEnabled.main+xml",
 			xlsb: "application/vnd.ms-excel.sheet.binary.macroEnabled.main",
+			xlam: "application/vnd.ms-excel.addin.macroEnabled.main+xml",
 			xltx: "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml"
 		},
 		strs: { /* Shared Strings */
@@ -11836,7 +11837,10 @@ function write_ws_xml_autofilter(data)/*:string*/ {
 /* 18.3.1.88 sheetViews CT_SheetViews */
 /* 18.3.1.87 sheetView CT_SheetView */
 function write_ws_xml_sheetviews(ws, opts, idx, wb)/*:string*/ {
-	return writextag("sheetViews", writextag("sheetView", null, {workbookViewId:"0"}), {});
+	var sview = {workbookViewId:"0"};
+	// $FlowIgnore
+	if( (((wb||{}).Workbook||{}).Views||[])[0] ) sview.rightToLeft = wb.Workbook.Views[0].RTL ? "1" : "0";
+	return writextag("sheetViews", writextag("sheetView", null, sview), {});
 }
 
 function write_ws_xml_cell(cell, ref, ws, opts, idx, wb) {
@@ -12534,9 +12538,12 @@ function write_BrtMargins(margins/*:Margins*/, o) {
 }
 
 /* [MS-XLSB] 2.4.292 BrtBeginWsView */
-function write_BrtBeginWsView(ws, o) {
+function write_BrtBeginWsView(ws, Workbook, o) {
 	if(o == null) o = new_buf(30);
-	o.write_shift(2, 924); // bit flag
+	var f = 0x39c;
+	// $FlowIgnore
+	if((((Workbook||{}).Views||[])[0]||{}).RTL) f |= 0x20;
+	o.write_shift(2, f); // bit flag
 	o.write_shift(4, 0);
 	o.write_shift(4, 0); // view first row
 	o.write_shift(4, 0); // view first col
@@ -12947,11 +12954,11 @@ function write_AUTOFILTER(ba, ws) {
 	write_record(ba, "BrtEndAFilter");
 }
 
-function write_WSVIEWS2(ba, ws) {
+function write_WSVIEWS2(ba, ws, Workbook) {
 	write_record(ba, "BrtBeginWsViews");
 	{ /* 1*WSVIEW2 */
 		/* [ACUID] */
-		write_record(ba, "BrtBeginWsView", write_BrtBeginWsView(ws));
+		write_record(ba, "BrtBeginWsView", write_BrtBeginWsView(ws, Workbook));
 		/* [BrtPane] */
 		/* *4BrtSel */
 		/* *4SXSELECT */
@@ -12984,7 +12991,7 @@ function write_ws_bin(idx/*:number*/, opts, wb/*:Workbook*/, rels) {
 	write_record(ba, "BrtBeginSheet");
 	write_record(ba, "BrtWsProp", write_BrtWsProp(c));
 	write_record(ba, "BrtWsDim", write_BrtWsDim(r));
-	write_WSVIEWS2(ba, ws);
+	write_WSVIEWS2(ba, ws, wb.Workbook);
 	write_WSFMTINFO(ba, ws);
 	write_COLINFOS(ba, ws, idx, opts, wb);
 	write_CELLTABLE(ba, ws, idx, opts, wb);
@@ -17436,7 +17443,6 @@ var HTML_ = (function() {
 				var m = cell, cc = 0;
 				/* TODO: parse styles etc */
 				while(m.charAt(0) == "<" && (cc = m.indexOf(">")) > -1) m = m.slice(cc+1);
-				while(m.indexOf(">") > -1) m = m.slice(0, m.lastIndexOf("<"));
 				var tag = parsexmltag(cell.slice(0, cell.indexOf(">")));
 				CS = tag.colspan ? +tag.colspan : 1;
 				if((RS = +tag.rowspan)>0 || CS>1) merges.push({s:{r:R,c:C},e:{r:R + (RS||1) - 1, c:C + CS - 1}});

diff --git a/xlsx.js b/xlsx.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		XLSX.version = '0.11.14';
		XLSX.version = '0.11.15';