From dc7cb1ee75b2edcc3ab1c19671f3b245ec353e3f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Dec 2017 22:48:58 +0100
Subject: [PATCH] update changelog & doc

---
 CHANGELOG.md                                 | 1 +
 src/PhpWord/Element/Comment.php              | 1 +
 src/PhpWord/Element/TrackChange.php          | 1 +
 src/PhpWord/Reader/Word2007/AbstractPart.php | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dc8b458..51f92434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ This is the last version to support PHP 5.3
 - Padded the $args array to remove error - @kaigoh #1150, @reformed #870
 - Fix incorrect image size between windows and mac - @bskrtich #874
 - Fix adding HTML table to document - @mogilvie @arivanbastos #324
+- Fix parsing on/off values (w:val="true|false|1|0|on|off") - @troosan #1221 #1219
 
 ### Deprecated
 - PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 908b8785..18836929 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Element;
 
 /**
  * Comment element
+ * @see http://datypic.com/sc/ooxml/t-w_CT_Comment.html
  */
 class Comment extends TrackChange
 {
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 9ed623f9..d14fc201 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Element;
 
 /**
  * TrackChange element
+ * @see http://datypic.com/sc/ooxml/t-w_CT_TrackChange.html
  */
 class TrackChange extends AbstractContainer
 {
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 4b7f6e0a..6a48fd46 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -384,7 +384,7 @@ abstract class AbstractPart
     {
         $style = null;
         $margins = array('top', 'left', 'bottom', 'right');
-        $borders = $margins + array('insideH', 'insideV');
+        $borders = array_merge($margins, array('insideH', 'insideV'));
 
         if ($xmlReader->elementExists('w:tblPr', $domNode)) {
             if ($xmlReader->elementExists('w:tblPr/w:tblStyle', $domNode)) {
@@ -422,7 +422,7 @@ abstract class AbstractPart
             'textDirection' => array(self::READ_VALUE, 'w:textDirection'),
             'gridSpan'      => array(self::READ_VALUE, 'w:gridSpan'),
             'vMerge'        => array(self::READ_VALUE, 'w:vMerge'),
-            'bgColor'       => array(self::READ_VALUE, 'w:shd/w:fill'),
+            'bgColor'       => array(self::READ_VALUE, 'w:shd', 'w:fill'),
         );
 
         return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);