Merge branch '#217-basjan' into develop

Author: ivanlanin

CHANGELOG.md

@@ -8,19 +8,16 @@ PHPWord license is changed from LGPL 2.1 to LGPL 3 in this release.
 
 ### Features
 
--
+- Image: Ability to define relative and absolute positioning - @basjan GH-217
 
 ### Bugfixes
 
--
-
-### Deprecated
-
--
+- ...
 
 ### Miscellaneous
 
 - License: Change the project license from LGPL 2.1 into LGPL 3.0 - GH-211
+- Word2007 Writer: New `Style\Image` class - @ivanlanin
 
 ## 0.10.0 - 4 May 2014
 

samples/Sample_13_Images.php

@@ -26,7 +26,7 @@
 foreach ($wrappingStyles as $wrappingStyle) {
     $section->addTextBreak(5);
     $section->addText('Wrapping style ' . $wrappingStyle);
-    $section->addImage('resources/_earth.jpg', array('marginTop' => -1, 'marginLeft' => 1,
+    $section->addImage('resources/_earth.jpg', array('positioning' => 'relative', 'marginTop' => -1, 'marginLeft' => 1,
         'width' => 80, 'height' => 80, 'wrappingStyle' => $wrappingStyle));
     $section->addText($text);
 }

src/PhpWord/Element/AbstractContainer.php

@@ -249,7 +249,6 @@ public function addImage($src, $style = null, $isWatermark = false)
         $rId = Media::addElement($elementDocPart, 'image', $src, $image);
         $image->setRelationId($rId);
         $this->addElement($image);
-
         return $image;
     }
 
@@ -413,7 +412,7 @@ private function checkElementDocPart()
         $docPart = $isCellTextrun ? $this->getDocPart() : $this->container;
         $docPartId = $isCellTextrun ? $this->getDocPartId() : $this->sectionId;
         $inHeaderFooter = ($docPart == 'header' || $docPart == 'footer');
-
+        $docPartId = $inHeaderFooter ? $this->getDocPartId() : $docPartId;
         return $inHeaderFooter ? $docPart . $docPartId : $docPart;
     }