From ce9e211760b6fe5b83423c63075b24ac264b8c12 Mon Sep 17 00:00:00 2001 From: SheetJS Date: Thu, 21 Mar 2013 10:15:52 -0400 Subject: [PATCH] xml preserve space regex --- xlsx.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xlsx.js b/xlsx.js index 23cfb5d..37634c6 100644 --- a/xlsx.js +++ b/xlsx.js @@ -104,7 +104,7 @@ function parseSheet(data) { //TODO: use a real xml parser //s.cells = {}; var q = ["v","f"]; if(!data.match(//)) - data.match(/(.*)<\/sheetData>/)[1].split("").forEach(function(x) { + data.match(/([^]*)<\/sheetData>/)[1].split("").forEach(function(x) { if(x === "") return; var row = parsexmltag(x.match(/]*>/)[0]); //s.rows[row.r]=row.spans; if(refguess.s.r > row.r - 1) refguess.s.r = row.r - 1; @@ -147,7 +147,7 @@ function parseSheet(data) { //TODO: use a real xml parser } // matches ... extracts content -function matchtag(f,g) {return new RegExp('<' + f + '>([\\s\\S]*)',g||"");} +function matchtag(f,g) {return new RegExp('<'+f+'(?: xml:space="preserve")?>([^]*)',(g||"")+"m");} function parseVector(data) { var h = parsexmltag(data);