From 2e4585098eb6e538f7eb3eec09aa7f0b3351f7ea Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 12 May 2016 22:10:57 +0100
Subject: Simplify vMerge logic

---
 lib/docx/body-reader.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js
index 5474dd5..4b37510 100644
--- a/lib/docx/body-reader.js
+++ b/lib/docx/body-reader.js
@@ -240,7 +240,7 @@ function BodyReader(options) {
         var element = properties.first("w:vMerge");
         if (element) {
             var val = element.attributes["w:val"];
-            return val ? val : "continue";
+            return val === "continue" || !val;
         } else {
             return null;
         }
@@ -271,11 +271,11 @@ function BodyReader(options) {
         rows.forEach(function(row) {
             var cellIndex = 0;
             row.children.forEach(function(cell) {
-                if (cell._vMerge === "continue" && columns[cellIndex]) {
+                if (cell._vMerge && columns[cellIndex]) {
                     columns[cellIndex].rowSpan++;
-                    cell._delete = true;
                 } else {
                     columns[cellIndex] = cell;
+                    cell._vMerge = false;
                 }
                 cellIndex += cell.colSpan;
             });
@@ -283,7 +283,7 @@ function BodyReader(options) {
         
         rows.forEach(function(row) {
             row.children = row.children.filter(function(cell) {
-                return !cell._delete;
+                return !cell._vMerge;
             });
             row.children.forEach(function(cell) {
                 delete cell._vMerge;
-- 
cgit v1.2.3