Permalink
Browse files

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)
  • Loading branch information...
1 parent b7be968 commit 8979999ad2c41c8647ecd5752846782d13b82f32 @SheetJSDev SheetJSDev committed Feb 18, 2015
Showing with 48 additions and 30 deletions.
  1. +1 −1 bin/xls.njs
  2. +1 −1 bits/01_version.js
  3. +5 −1 bits/20_parsebits.js
  4. +2 −0 bits/98_exports.js
  5. +1 −1 bower.json
  6. +5 −5 dist/xls.core.min.js
  7. +1 −1 dist/xls.core.min.map
  8. +4 −4 dist/xls.full.min.js
  9. +1 −1 dist/xls.full.min.map
  10. +8 −2 dist/xls.js
  11. +5 −5 dist/xls.min.js
  12. +1 −1 dist/xls.min.map
  13. +1 −1 index.html
  14. +1 −1 package.json
  15. +8 −2 xls.js
  16. +1 −1 xlsworker.js
  17. +1 −1 xlsworker1.js
  18. +1 −1 xlsworker2.js
View
@@ -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('../');
View
@@ -1 +1 @@
-XLS.version = '0.7.4-a';
+XLS.version = '0.7.5';
@@ -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 */
View
@@ -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;
View
@@ -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",
View
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
@@ -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;
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -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>
View
@@ -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" ],
View
@@ -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;
View
@@ -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');
View
@@ -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');
View
@@ -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');

0 comments on commit 8979999

Please sign in to comment.