diff --git a/README.md b/README.md index 6324db2..a6a6f7c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ # xlsx -Currently a parser for XLSX files. Cleanroom implementation from the ISO 29500 Office Open XML specifications. - -This has been tested on some very basic XLSX files generated from Excel 2011. +Currently a parser for XLSX and XLSM files. Cleanroom implementation from the +ISO 29500 Office Open XML specifications. If you need something that is not currently supported, file an issue and attach a sample file. I will get to it :) diff --git a/bits/51_version.js b/bits/51_version.js index 12cca7e..70556bf 100644 --- a/bits/51_version.js +++ b/bits/51_version.js @@ -1 +1 @@ -XLSX.version = '0.3.9'; +XLSX.version = '0.3.10'; diff --git a/bits/70_xlsx.js b/bits/70_xlsx.js index a3fde18..fe24e47 100644 --- a/bits/70_xlsx.js +++ b/bits/70_xlsx.js @@ -1,6 +1,7 @@ var ct2type = { "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml": "workbooks", + "application/vnd.ms-excel.sheet.macroEnabled.main+xml":"workbooks", /*XLSM*/ "application/vnd.openxmlformats-package.core-properties+xml": "coreprops", "application/vnd.openxmlformats-officedocument.extended-properties+xml": "extprops", "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml": "calcchains", diff --git a/index.html b/index.html index 7e4c207..78b97d9 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ JSON
FORMULAE
-
Drop an XLSX file here to see sheet data.
+
Drop an XLSX or XLSM file here to see sheet data.

diff --git a/package.json b/package.json
index c9da8ac..fd5eb13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"author": "sheetjs",
 	"description": "(one day) a full-featured XLSX parser and writer.  For now, primitive parser",
 	"keywords": [ "xlsx", "office", "excel", "spreadsheet" ],
diff --git a/tests.lst b/tests.lst
index a806a30..6b886dc 100644
--- a/tests.lst
+++ b/tests.lst
@@ -204,3 +204,8 @@ spreadsheet-parsexlsx_bug-8.xlsx
 xlrd_reveng1.xlsx
 xlrd_text_bar.xlsx
 חישוב_נקודות_זיכוי.xlsx
+apachepoi_45431.xlsm
+apachepoi_47026.xlsm
+apachepoi_47089.xlsm
+apachepoi_ExcelWithAttachments.xlsm
+openpyxl_r_vba-test.xlsm
diff --git a/xlsx.js b/xlsx.js
index a37a33d..e885a4f 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -419,7 +419,7 @@ SSF.load_table = function(tbl) { for(var i=0; i!=0x0188; ++i) if(tbl[i]) SSF.loa
 make_ssf(SSF);
 var XLSX = {};
 (function(XLSX){
-XLSX.version = '0.3.9';
+XLSX.version = '0.3.10';
 function parsexmltag(tag) {
 	var words = tag.split(/\s+/);
 	var z = {'0': words[0]};
@@ -627,6 +627,7 @@ var parse_sst = (function(){
 
 var ct2type = {
 	"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml": "workbooks",
+	"application/vnd.ms-excel.sheet.macroEnabled.main+xml":"workbooks", /*XLSM*/
 	"application/vnd.openxmlformats-package.core-properties+xml": "coreprops",
 	"application/vnd.openxmlformats-officedocument.extended-properties+xml": "extprops",
 	"application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml": "calcchains",