version bump 0.7.5: sheet name encoding

- BIFF8 uses unicode BIFF5 uses codepage for sheet names (h/t @ajuhos @shakhal) - Added readFileSync, readSync (h/t @jmarca)
SheetJS · Feb 18, 2015 · 8979999 · 8979999
1 parent b7be968
commit 8979999
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 30 deletions.
diff --git a/bin/xls.njs b/bin/xls.njs
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
 var n = "xls";
 /* vim: set ts=2 ft=javascript: */
 var X = require('../');

diff --git a/bits/01_version.js b/bits/01_version.js
@@ -1 +1 @@
-XLS.version = '0.7.4-a';
+XLS.version = '0.7.5';
diff --git a/bits/20_parsebits.js b/bits/20_parsebits.js
@@ -39,11 +39,15 @@ function parse_Bes(blob) {
 function parse_ShortXLUnicodeString(blob, length, opts) {
 	var cch = blob.read_shift(1);
 	var width = 1, encoding = 'sbcs';
+	var cp = current_codepage;
+	if(opts && opts.biff >= 8) current_codepage = 1200;
 	if(opts === undefined || opts.biff !== 5) {
 		var fHighByte = blob.read_shift(1);
 		if(fHighByte) { width = 2; encoding = 'dbcs'; }
 	}
-	return cch ? blob.read_shift(cch, encoding) : "";
+	var o = cch ? blob.read_shift(cch, encoding) : "";
+	current_codepage = cp;
+	return o;
 }
 
 /* 2.5.293 XLUnicodeRichExtendedString */

diff --git a/bits/98_exports.js b/bits/98_exports.js
@@ -1,6 +1,8 @@
 XLS.parse_xlscfb = parse_xlscfb;
 XLS.read = xlsread;
 XLS.readFile = readFile;
+XLS.readSync = xlsread;
+XLS.readFileSync = readFile;
 XLS.utils = utils;
 XLS.CFB = CFB;
 XLS.SSF = SSF;
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "js-xls",
   "homepage": "https://github.com/SheetJS/js-xls",
   "main": "dist/xls.js",
-  "version": "0.7.4-a",
+  "version": "0.7.5",
   "ignore": [
         "bin",
         "bits",

diff --git a/dist/xls.core.min.js b/dist/xls.core.min.js
diff --git a/dist/xls.core.min.map b/dist/xls.core.min.map
diff --git a/dist/xls.full.min.js b/dist/xls.full.min.js
diff --git a/dist/xls.full.min.map b/dist/xls.full.min.map
diff --git a/dist/xls.js b/dist/xls.js
@@ -3,7 +3,7 @@
 /*jshint funcscope:true, eqnull:true */
 var XLS = {};
 (function make_xls(XLS){
-XLS.version = '0.7.4-a';
+XLS.version = '0.7.5';
 var current_codepage = 1200, current_cptable;
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
 	if(typeof cptable === 'undefined') cptable = require('./dist/cpexcel');
@@ -1777,11 +1777,15 @@ function parse_Bes(blob) {
 function parse_ShortXLUnicodeString(blob, length, opts) {
 	var cch = blob.read_shift(1);
 	var width = 1, encoding = 'sbcs';
+	var cp = current_codepage;
+	if(opts && opts.biff >= 8) current_codepage = 1200;
 	if(opts === undefined || opts.biff !== 5) {
 		var fHighByte = blob.read_shift(1);
 		if(fHighByte) { width = 2; encoding = 'dbcs'; }
 	}
-	return cch ? blob.read_shift(cch, encoding) : "";
+	var o = cch ? blob.read_shift(cch, encoding) : "";
+	current_codepage = cp;
+	return o;
 }
 
 /* 2.5.293 XLUnicodeRichExtendedString */
@@ -7375,6 +7379,8 @@ var utils = {
 XLS.parse_xlscfb = parse_xlscfb;
 XLS.read = xlsread;
 XLS.readFile = readFile;
+XLS.readSync = xlsread;
+XLS.readFileSync = readFile;
 XLS.utils = utils;
 XLS.CFB = CFB;
 XLS.SSF = SSF;

diff --git a/dist/xls.min.js b/dist/xls.min.js
diff --git a/dist/xls.min.map b/dist/xls.min.map
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- xls.js (C) 2013-2014 SheetJS http://sheetjs.com -->
+<!-- xls.js (C) 2013-2015 SheetJS http://sheetjs.com -->
 <!-- vim: set ts=2: -->
 <html>
 <head>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsjs",
-	"version": "0.7.4-a",
+	"version": "0.7.5",
 	"author": "sheetjs",
 	"description": "Excel 5.0/95 and 97-2004 spreadsheet (BIFF5 XLS / BIFF8 XLS / XML 2003) parser",
 	"keywords": [ "excel", "xls", "office", "spreadsheet" ],

diff --git a/xls.js b/xls.js
@@ -3,7 +3,7 @@
 /*jshint funcscope:true, eqnull:true */
 var XLS = {};
 (function make_xls(XLS){
-XLS.version = '0.7.4-a';
+XLS.version = '0.7.5';
 var current_codepage = 1200, current_cptable;
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
 	if(typeof cptable === 'undefined') cptable = require('./dist/cpexcel');
@@ -1777,11 +1777,15 @@ function parse_Bes(blob) {
 function parse_ShortXLUnicodeString(blob, length, opts) {
 	var cch = blob.read_shift(1);
 	var width = 1, encoding = 'sbcs';
+	var cp = current_codepage;
+	if(opts && opts.biff >= 8) current_codepage = 1200;
 	if(opts === undefined || opts.biff !== 5) {
 		var fHighByte = blob.read_shift(1);
 		if(fHighByte) { width = 2; encoding = 'dbcs'; }
 	}
-	return cch ? blob.read_shift(cch, encoding) : "";
+	var o = cch ? blob.read_shift(cch, encoding) : "";
+	current_codepage = cp;
+	return o;
 }
 
 /* 2.5.293 XLUnicodeRichExtendedString */
@@ -7375,6 +7379,8 @@ var utils = {
 XLS.parse_xlscfb = parse_xlscfb;
 XLS.read = xlsread;
 XLS.readFile = readFile;
+XLS.readSync = xlsread;
+XLS.readFileSync = readFile;
 XLS.utils = utils;
 XLS.CFB = CFB;
 XLS.SSF = SSF;

diff --git a/xlsworker.js b/xlsworker.js
@@ -1,4 +1,4 @@
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
 /* uncomment the next line for encoding support */
 //importScripts('dist/cpexcel.js');
 importScripts('xls.js');

diff --git a/xlsworker1.js b/xlsworker1.js
@@ -1,4 +1,4 @@
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
 /* uncomment the next line for encoding support */
 //importScripts('dist/cpexcel.js');
 importScripts('xls.js');

diff --git a/xlsworker2.js b/xlsworker2.js
@@ -1,4 +1,4 @@
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
 /* uncomment the next line for encoding support */
 //importScripts('dist/cpexcel.js');
 importScripts('xls.js');