Merge pull request #250 from adobe-rnd/fix-underline-none

Fix: Underline with value 'none' is wrongly detected

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js
index e7e306c..ad4f409 100644
--- a/lib/docx/body-reader.js
+++ b/lib/docx/body-reader.js
@@ -70,7 +70,7 @@ function BodyReader(options) {
                 font: element.firstOrEmpty("w:rFonts").attributes["w:ascii"],
                 fontSize: fontSize,
                 isBold: readBooleanElement(element.first("w:b")),
-                isUnderline: readBooleanElement(element.first("w:u")),
+                isUnderline: readUnderline(element.first("w:u")),
                 isItalic: readBooleanElement(element.first("w:i")),
                 isStrikethrough: readBooleanElement(element.first("w:strike")),
                 isSmallCaps: readBooleanElement(element.first("w:smallCaps"))
@@ -78,6 +78,15 @@ function BodyReader(options) {
         });
     }
 
+    function readUnderline(element) {
+        if (element) {
+            var value = element.attributes["w:val"];
+            return value !== "false" && value !== "0" && value !== "none";
+        } else {
+            return false;
+        }
+    }
+
     function readBooleanElement(element) {
         if (element) {
             var value = element.attributes["w:val"];