From 1038400859b483d64b07312bbc8024ebaa367a26 Mon Sep 17 00:00:00 2001
From: OliverZ <o.z86@live.de>
Date: Sat, 25 Mar 2017 20:14:28 +0200
Subject: [PATCH] International Properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Excel localizes "Worksheets" and other names in XLS[XMB] Properties

Fixes #33

note: @oliverz contributed a file with "Arbeitsblätter"
      @sheetjsdev tested against test suite, PR #32 details used
---
 bits/22_xmlutils.js |  4 ++--
 bits/34_extprops.js | 20 ++++++++++++++++++--
 xlsx.flow.js        | 24 ++++++++++++++++++++----
 xlsx.js             | 24 ++++++++++++++++++++----
 4 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/bits/22_xmlutils.js b/bits/22_xmlutils.js
index de09b13..970788b 100644
--- a/bits/22_xmlutils.js
+++ b/bits/22_xmlutils.js
@@ -127,7 +127,7 @@ var vtregex = (function(){ var vt_cache = {};
 		if(vt_cache[bt] !== undefined) return vt_cache[bt];
 		return (vt_cache[bt] = new RegExp("<(?:vt:)?" + bt + ">(.*?)</(?:vt:)?" + bt + ">", 'g') );
 };})();
-var vtvregex = /<\/?(:?vt:)?variant>/g, vtmregex = /<(:?vt:)?([^>]*)>(.*)</;
+var vtvregex = /<\/?(?:vt:)?variant>/g, vtmregex = /<(?:vt:)([^>]*)>(.*)</;
 function parseVector(data) {
 	var h = parsexmltag(data);
 
@@ -136,7 +136,7 @@ function parseVector(data) {
 	var res = [];
 	matches.forEach(function(x) {
 		var v = x.replace(vtvregex,"").match(vtmregex);
-		res.push({v:v[2], t:v[1]});
+		res.push({v:utf8read(v[2]), t:v[1]});
 	});
 	return res;
 }
diff --git a/bits/34_extprops.js b/bits/34_extprops.js
index 457aa1d..7dc4bd6 100644
--- a/bits/34_extprops.js
+++ b/bits/34_extprops.js
@@ -33,14 +33,30 @@ function parse_ext_props(data, p) {
 
 	if(q.HeadingPairs && q.TitlesOfParts) {
 		var v = parseVector(q.HeadingPairs);
-		var j = 0, widx = 0;
+		var j = 0, widx = 0, cidx = -1;
 		for(var i = 0; i !== v.length; ++i) {
 			switch(v[i].v) {
+				case "工作表":
+				case "Листы":
+				case "ワークシート":
+				case "גליונות עבודה":
+				case "Arbeitsblätter":
+				case "Çalışma Sayfaları":
+				case "Feuilles de calcul":
+				case "Fogli di lavoro":
+				case "Folhas de cálculo":
+				case "Planilhas":
+				case "Werkbladen":
 				case "Worksheets": widx = j; p.Worksheets = +(v[++i].v); break;
+
+				case "Benannte Bereiche":
 				case "Named Ranges": ++i; break; // TODO: Handle Named Ranges
+
+				case "Charts": cidx = j; p.Charts = +(v[++i].v); break;
+				default: break; //throw new Error(v[i].v);
 			}
 		}
-		var parts = parseVector(q.TitlesOfParts).map(function(x) { return utf8read(x.v); });
+		var parts = parseVector(q.TitlesOfParts).map(function(x) { return x.v; });
 		p.SheetNames = parts.slice(widx, widx + p.Worksheets);
 	}
 	return p;
diff --git a/xlsx.flow.js b/xlsx.flow.js
index da1a13b..c63f208 100644
--- a/xlsx.flow.js
+++ b/xlsx.flow.js
@@ -1662,7 +1662,7 @@ var vtregex = (function(){ var vt_cache = {};
 		if(vt_cache[bt] !== undefined) return vt_cache[bt];
 		return (vt_cache[bt] = new RegExp("<(?:vt:)?" + bt + ">(.*?)</(?:vt:)?" + bt + ">", 'g') );
 };})();
-var vtvregex = /<\/?(:?vt:)?variant>/g, vtmregex = /<(:?vt:)?([^>]*)>(.*)</;
+var vtvregex = /<\/?(?:vt:)?variant>/g, vtmregex = /<(?:vt:)([^>]*)>(.*)</;
 function parseVector(data) {
 	var h = parsexmltag(data);
 
@@ -1671,7 +1671,7 @@ function parseVector(data) {
 	var res = [];
 	matches.forEach(function(x) {
 		var v = x.replace(vtvregex,"").match(vtmregex);
-		res.push({v:v[2], t:v[1]});
+		res.push({v:utf8read(v[2]), t:v[1]});
 	});
 	return res;
 }
@@ -3024,14 +3024,30 @@ function parse_ext_props(data, p) {
 
 	if(q.HeadingPairs && q.TitlesOfParts) {
 		var v = parseVector(q.HeadingPairs);
-		var j = 0, widx = 0;
+		var j = 0, widx = 0, cidx = -1;
 		for(var i = 0; i !== v.length; ++i) {
 			switch(v[i].v) {
+				case "工作表":
+				case "Листы":
+				case "ワークシート":
+				case "גליונות עבודה":
+				case "Arbeitsblätter":
+				case "Çalışma Sayfaları":
+				case "Feuilles de calcul":
+				case "Fogli di lavoro":
+				case "Folhas de cálculo":
+				case "Planilhas":
+				case "Werkbladen":
 				case "Worksheets": widx = j; p.Worksheets = +(v[++i].v); break;
+
+				case "Benannte Bereiche":
 				case "Named Ranges": ++i; break; // TODO: Handle Named Ranges
+
+				case "Charts": cidx = j; p.Charts = +(v[++i].v); break;
+				default: break; //throw new Error(v[i].v);
 			}
 		}
-		var parts = parseVector(q.TitlesOfParts).map(function(x) { return utf8read(x.v); });
+		var parts = parseVector(q.TitlesOfParts).map(function(x) { return x.v; });
 		p.SheetNames = parts.slice(widx, widx + p.Worksheets);
 	}
 	return p;
diff --git a/xlsx.js b/xlsx.js
index 4adcc7b..b8717db 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -1613,7 +1613,7 @@ var vtregex = (function(){ var vt_cache = {};
 		if(vt_cache[bt] !== undefined) return vt_cache[bt];
 		return (vt_cache[bt] = new RegExp("<(?:vt:)?" + bt + ">(.*?)</(?:vt:)?" + bt + ">", 'g') );
 };})();
-var vtvregex = /<\/?(:?vt:)?variant>/g, vtmregex = /<(:?vt:)?([^>]*)>(.*)</;
+var vtvregex = /<\/?(?:vt:)?variant>/g, vtmregex = /<(?:vt:)([^>]*)>(.*)</;
 function parseVector(data) {
 	var h = parsexmltag(data);
 
@@ -1622,7 +1622,7 @@ function parseVector(data) {
 	var res = [];
 	matches.forEach(function(x) {
 		var v = x.replace(vtvregex,"").match(vtmregex);
-		res.push({v:v[2], t:v[1]});
+		res.push({v:utf8read(v[2]), t:v[1]});
 	});
 	return res;
 }
@@ -2972,14 +2972,30 @@ function parse_ext_props(data, p) {
 
 	if(q.HeadingPairs && q.TitlesOfParts) {
 		var v = parseVector(q.HeadingPairs);
-		var j = 0, widx = 0;
+		var j = 0, widx = 0, cidx = -1;
 		for(var i = 0; i !== v.length; ++i) {
 			switch(v[i].v) {
+				case "工作表":
+				case "Листы":
+				case "ワークシート":
+				case "גליונות עבודה":
+				case "Arbeitsblätter":
+				case "Çalışma Sayfaları":
+				case "Feuilles de calcul":
+				case "Fogli di lavoro":
+				case "Folhas de cálculo":
+				case "Planilhas":
+				case "Werkbladen":
 				case "Worksheets": widx = j; p.Worksheets = +(v[++i].v); break;
+
+				case "Benannte Bereiche":
 				case "Named Ranges": ++i; break; // TODO: Handle Named Ranges
+
+				case "Charts": cidx = j; p.Charts = +(v[++i].v); break;
+				default: break; //throw new Error(v[i].v);
 			}
 		}
-		var parts = parseVector(q.TitlesOfParts).map(function(x) { return utf8read(x.v); });
+		var parts = parseVector(q.TitlesOfParts).map(function(x) { return x.v; });
 		p.SheetNames = parts.slice(widx, widx + p.Worksheets);
 	}
 	return p;