diff --git a/bits/31_version.js b/bits/31_version.js index 8c49085..bcd5a39 100644 --- a/bits/31_version.js +++ b/bits/31_version.js @@ -1 +1 @@ -XLSX.version = '0.5.0'; +XLSX.version = '0.5.1'; diff --git a/bits/36_xlsxutils.js b/bits/36_xlsxutils.js index c4a0321..ce6aba4 100644 --- a/bits/36_xlsxutils.js +++ b/bits/36_xlsxutils.js @@ -1,9 +1,11 @@ +var attregexg=/(\w+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; +var attregex=/(\w+)=((?:")(?:[^"]*)(?:")|(?:')(?:[^']*)(?:'))/; function parsexmltag(tag) { var words = tag.split(/\s+/); var z = {'0': words[0]}; if(words.length === 1) return z; - (tag.match(/(\w+)="([^"]*)"/g) || []).map( - function(x){var y=x.match(/(\w+)="([^"]*)"/); z[y[1]] = y[2]; }); + (tag.match(attregexg) || []).map( + function(x){var y=x.match(attregex); z[y[1]] = y[2].substr(1,y[2].length-2); }); return z; } diff --git a/bits/37_xlsbutils.js b/bits/37_xlsbutils.js index d765a9f..0c29061 100644 --- a/bits/37_xlsbutils.js +++ b/bits/37_xlsbutils.js @@ -132,26 +132,11 @@ function ReadShift(size, t) { this.l+=size; return o; } -function CheckField(hexstr, fld) { - var b = this.slice(this.l, this.l+hexstr.length/2); - var m = b.hexlify ? b.hexlify() : __hexlify(b); - if(m !== hexstr) throw (fld||"") + 'Expected ' + hexstr + ' saw ' + m; - this.l += hexstr.length/2; -} - -function WarnField(hexstr, fld) { - var b = this.slice(this.l, this.l+hexstr.length/2); - var m = b.hexlify ? b.hexlify() : __hexlify(b); - if(m !== hexstr) console.error((fld||"") + 'Expected ' + hexstr +' saw ' + m); - this.l += hexstr.length/2; -} - function prep_blob(blob, pos) { blob.read_shift = ReadShift.bind(blob); - blob.chk = CheckField; blob.l = pos || 0; - var read = ReadShift.bind(blob), chk = CheckField.bind(blob); - return [read, chk]; + var read = ReadShift.bind(blob); + return [read]; } function parsenoop(blob, length) { blob.l += length; } diff --git a/bits/39_parsestructs.js b/bits/39_parsestructs.js index bfbf921..58b39eb 100644 --- a/bits/39_parsestructs.js +++ b/bits/39_parsestructs.js @@ -6,8 +6,8 @@ var parse_RichStr = function(data, length) { var str = parse_XLWideString(data); var z = { t: str, - raw:"" + escapexml(str) + "", - r: str + r:"" + escapexml(str) + "", + h: str }; if(fRichStr) { /* TODO: formatted string */ diff --git a/bits/52_sstxml.js b/bits/52_sstxml.js index 078dd5a..11cb658 100644 --- a/bits/52_sstxml.js +++ b/bits/52_sstxml.js @@ -112,15 +112,15 @@ var parse_si = function(x) { /* 18.4.12 t ST_Xstring (Plaintext String) */ if(x[1] === 't') { z.t = utf8read(unescapexml(x.substr(x.indexOf(">")+1).split(/<\/t>/)[0])); - z.raw = x; - z.r = z.t; + z.r = x; + z.h = z.t; } /* 18.4.4 r CT_RElt (Rich Text Run) */ else if((y = x.match(//))) { - z.raw = x; + z.r = x; /* TODO: properly parse (note: no other valid child can have body text) */ z.t = utf8read(unescapexml(x.replace(/<[^>]*>/gm,""))); - z.r = parse_rs(x); + z.h = parse_rs(x); } /* 18.4.3 phoneticPr CT_PhoneticPr (TODO: needed for Asian support) */ /* 18.4.6 rPh CT_PhoneticRun (TODO: needed for Asian support) */ diff --git a/bits/65_comments.js b/bits/65_comments.js index 469f90d..14ce374 100644 --- a/bits/65_comments.js +++ b/bits/65_comments.js @@ -16,9 +16,9 @@ function parseComments(data) { var textMatch = x.match(/([^\u2603]*)<\/text>/m); if (!textMatch || !textMatch[1]) return; // a comment may contain an empty text tag. var rt = parse_si(textMatch[1]); - comment.raw = rt.raw; - comment.t = rt.t; comment.r = rt.r; + comment.t = rt.t; + comment.h = rt.h; commentList.push(comment); }); return commentList; @@ -62,7 +62,7 @@ function insertCommentsIntoSheet(sheetName, sheet, comments) { if (!cell.c) { cell.c = []; } - cell.c.push({a: comment.author, t: comment.t, raw: comment.raw, r: comment.r}); + cell.c.push({a: comment.author, t: comment.t, r: comment.r, h: comment.h}); }); } diff --git a/bits/72_wsxml.js b/bits/72_wsxml.js index 6eb44b6..080df0e 100644 --- a/bits/72_wsxml.js +++ b/bits/72_wsxml.js @@ -24,7 +24,7 @@ function parse_worksheet(data) { /* 18.3.1.4 c CT_Cell */ var cells = x.substr(x.indexOf('>')+1).split(/Yegor Kozlov:
first cell', "must have the html representation"); + assert.equal(ws.B1.c[0].h, 'Yegor Kozlov:
first cell', "must have the html representation"); + assert.equal(ws.B1.c[0].r, 'Yegor Kozlov:\r\nfirst cell', "must have the rich text representation"); assert.equal(ws.B1.c[0].a, "Yegor Kozlov","must have the same author"); }); }); diff --git a/xlsx.js b/xlsx.js index f9f20c8..c019471 100644 --- a/xlsx.js +++ b/xlsx.js @@ -420,7 +420,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.5.0'; +XLSX.version = '0.5.1'; var current_codepage, current_cptable, cptable; if(typeof module !== "undefined" && typeof require !== 'undefined') { if(typeof cptable === 'undefined') cptable = require('codepage'); @@ -460,12 +460,14 @@ if (typeof exports !== 'undefined') { _fs = require('fs'); } } +var attregexg=/(\w+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; +var attregex=/(\w+)=((?:")(?:[^"]*)(?:")|(?:')(?:[^']*)(?:'))/; function parsexmltag(tag) { var words = tag.split(/\s+/); var z = {'0': words[0]}; if(words.length === 1) return z; - (tag.match(/(\w+)="([^"]*)"/g) || []).map( - function(x){var y=x.match(/(\w+)="([^"]*)"/); z[y[1]] = y[2]; }); + (tag.match(attregexg) || []).map( + function(x){var y=x.match(attregex); z[y[1]] = y[2].substr(1,y[2].length-2); }); return z; } @@ -674,26 +676,11 @@ function ReadShift(size, t) { this.l+=size; return o; } -function CheckField(hexstr, fld) { - var b = this.slice(this.l, this.l+hexstr.length/2); - var m = b.hexlify ? b.hexlify() : __hexlify(b); - if(m !== hexstr) throw (fld||"") + 'Expected ' + hexstr + ' saw ' + m; - this.l += hexstr.length/2; -} - -function WarnField(hexstr, fld) { - var b = this.slice(this.l, this.l+hexstr.length/2); - var m = b.hexlify ? b.hexlify() : __hexlify(b); - if(m !== hexstr) console.error((fld||"") + 'Expected ' + hexstr +' saw ' + m); - this.l += hexstr.length/2; -} - function prep_blob(blob, pos) { blob.read_shift = ReadShift.bind(blob); - blob.chk = CheckField; blob.l = pos || 0; - var read = ReadShift.bind(blob), chk = CheckField.bind(blob); - return [read, chk]; + var read = ReadShift.bind(blob); + return [read]; } function parsenoop(blob, length) { blob.l += length; } @@ -719,8 +706,8 @@ var parse_RichStr = function(data, length) { var str = parse_XLWideString(data); var z = { t: str, - raw:"" + escapexml(str) + "", - r: str + r:"" + escapexml(str) + "", + h: str }; if(fRichStr) { /* TODO: formatted string */ @@ -911,15 +898,15 @@ var parse_si = function(x) { /* 18.4.12 t ST_Xstring (Plaintext String) */ if(x[1] === 't') { z.t = utf8read(unescapexml(x.substr(x.indexOf(">")+1).split(/<\/t>/)[0])); - z.raw = x; - z.r = z.t; + z.r = x; + z.h = z.t; } /* 18.4.4 r CT_RElt (Rich Text Run) */ else if((y = x.match(//))) { - z.raw = x; + z.r = x; /* TODO: properly parse (note: no other valid child can have body text) */ z.t = utf8read(unescapexml(x.replace(/<[^>]*>/gm,""))); - z.r = parse_rs(x); + z.h = parse_rs(x); } /* 18.4.3 phoneticPr CT_PhoneticPr (TODO: needed for Asian support) */ /* 18.4.6 rPh CT_PhoneticRun (TODO: needed for Asian support) */ @@ -1260,9 +1247,9 @@ function parseComments(data) { var textMatch = x.match(/([^\u2603]*)<\/text>/m); if (!textMatch || !textMatch[1]) return; // a comment may contain an empty text tag. var rt = parse_si(textMatch[1]); - comment.raw = rt.raw; - comment.t = rt.t; comment.r = rt.r; + comment.t = rt.t; + comment.h = rt.h; commentList.push(comment); }); return commentList; @@ -1306,7 +1293,7 @@ function insertCommentsIntoSheet(sheetName, sheet, comments) { if (!cell.c) { cell.c = []; } - cell.c.push({a: comment.author, t: comment.t, raw: comment.raw, r: comment.r}); + cell.c.push({a: comment.author, t: comment.t, r: comment.r, h: comment.h}); }); } @@ -1339,7 +1326,7 @@ function parse_worksheet(data) { /* 18.3.1.4 c CT_Cell */ var cells = x.substr(x.indexOf('>')+1).split(/