From 37a031caee5a58a5f734157dc9b91e0f1fc7501f Mon Sep 17 00:00:00 2001
From: Pieter Sheth-Voss <pieter@protobi.com>
Date: Sat, 28 Mar 2015 13:04:20 -0400
Subject: [PATCH] Parse font
 bold-italic-strike-outline-shadow-superscript-subscript

---
 bits/47_styxml.js       | 20 ++++++++++++++++++--
 bits/92_stylebuilder.js |  7 +++++++
 xlsx.js                 | 27 +++++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/bits/47_styxml.js b/bits/47_styxml.js
index 79a211a..71c8a87 100644
--- a/bits/47_styxml.js
+++ b/bits/47_styxml.js
@@ -49,20 +49,36 @@ function parse_fonts(t, opts) {
   t[0].match(tagregex).forEach(function(x) {
     var y = parsexmltag(x);
     switch(y[0]) {
+
       case '<fonts': case  '<fonts>': case '</fonts>': break;
-      case '<font>': break;
-      case '</font>': styles.Fonts.push(font); font = {}; break;
+      case '<font':
+        break;
+      case '</font>': styles.Fonts.push(font); console.log(font);font = {}; break;
 
       case '<name':
         if(y.val) font.name = y.val;
         break;
       case '<name/>': case '</name>': break;
 
+
+      case '<b/>': font.bold = true;break;
+      case '<u/>':  font.underline = true;break;
+      case '<i/>':  font.italic = true;break;
+      case '<strike/>':  font.strike = true;break;
+      case '<outline/>':  font.outline = true;break;
+      case '<shadow/>':  font.shadow = true;break;
+
+
       case '<sz':
         if(y.val) font.sz = y.val;
         break;
       case '<sz/>': case '</sz>': break;
 
+      case '<vertAlign':
+        if(y.val) font.vertAlign = y.val;
+        break;
+      case '<vertAlign/>': case '</vertAlign>': break;
+
 
       case '<color':
         if (!font.color) font.color = {};
diff --git a/bits/92_stylebuilder.js b/bits/92_stylebuilder.js
index 35cbe1c..8a01cf7 100644
--- a/bits/92_stylebuilder.js
+++ b/bits/92_stylebuilder.js
@@ -215,6 +215,13 @@ if ((typeof 'module' != 'undefined'  && typeof require != 'undefined') || (typeo
         if (attributes.bold) $font.append(XmlNode('b'));
         if (attributes.underline)  $font.append(XmlNode('u'));
         if (attributes.italic)  $font.append(XmlNode('i'));
+        if (attributes.strike)  $font.append(XmlNode('strike'));
+        if (attributes.outline)  $font.append(XmlNode('outline'));
+        if (attributes.shadow)  $font.append(XmlNode('shadow'));
+
+        if (attributes.vertAlign) {
+          $font.append(XmlNode('vertAlign').attr('val', attributes.vertAlign))
+        }
 
 
         if (attributes.color) {
diff --git a/xlsx.js b/xlsx.js
index afddc5a..e5ba440 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -2241,20 +2241,36 @@ function parse_fonts(t, opts) {
   t[0].match(tagregex).forEach(function(x) {
     var y = parsexmltag(x);
     switch(y[0]) {
+
       case '<fonts': case  '<fonts>': case '</fonts>': break;
-      case '<font>': break;
-      case '</font>': styles.Fonts.push(font); font = {}; break;
+      case '<font':
+        break;
+      case '</font>': styles.Fonts.push(font); console.log(font);font = {}; break;
 
       case '<name':
         if(y.val) font.name = y.val;
         break;
       case '<name/>': case '</name>': break;
 
+
+      case '<b/>': font.bold = true;break;
+      case '<u/>':  font.underline = true;break;
+      case '<i/>':  font.italic = true;break;
+      case '<strike/>':  font.strike = true;break;
+      case '<outline/>':  font.outline = true;break;
+      case '<shadow/>':  font.shadow = true;break;
+
+
       case '<sz':
         if(y.val) font.sz = y.val;
         break;
       case '<sz/>': case '</sz>': break;
 
+      case '<vertAlign':
+        if(y.val) font.vertAlign = y.val;
+        break;
+      case '<vertAlign/>': case '</vertAlign>': break;
+
 
       case '<color':
         if (!font.color) font.color = {};
@@ -5791,6 +5807,13 @@ if ((typeof 'module' != 'undefined'  && typeof require != 'undefined') || (typeo
         if (attributes.bold) $font.append(XmlNode('b'));
         if (attributes.underline)  $font.append(XmlNode('u'));
         if (attributes.italic)  $font.append(XmlNode('i'));
+        if (attributes.strike)  $font.append(XmlNode('strike'));
+        if (attributes.outline)  $font.append(XmlNode('outline'));
+        if (attributes.shadow)  $font.append(XmlNode('shadow'));
+
+        if (attributes.vertAlign) {
+          $font.append(XmlNode('vertAlign').attr('val', attributes.vertAlign))
+        }
 
 
         if (attributes.color) {