HTML Reader : Read width & height attributes in points

Author: Progi1984

composer.json

@@ -68,6 +68,7 @@
         "ext-dom": "*",
         "ext-json": "*",
         "ext-xml": "*",
+        "phpoffice/common": "^1.0",
         "phpoffice/math": "^0.2"
     },
     "require-dev": {

composer.lock

@@ -22,6 +22,7 @@
 - Typo : Fix hardcoded macro chars in TemplateProcessor method [@glafarge](https://github.com/glafarge) in [#2618](https://github.com/PHPOffice/PHPWord/pull/2618)
 - XML Reader : Prevent fatal errors when opening corrupt files or "doc" files [@mmcev106](https://github.com/mmcev106) in [#2626](https://github.com/PHPOffice/PHPWord/pull/2626)
 - Documentation : Updated Comment element by [@laminga](https://github.com/laminga) in [#2650](https://github.com/PHPOffice/PHPWord/pull/2650)
+- HTML Reader : Read width & height attributes in points fixing [#2589](https://github.com/PHPOffice/PHPWord/issues/2589) by [@Progi1984](https://github.com/Progi1984) in [#2654](https://github.com/PHPOffice/PHPWord/pull/2654)
 
 ### Miscellaneous
 

docs/changes/2.x/2.0.0.md

@@ -22,6 +22,7 @@
 use DOMNode;
 use DOMXPath;
 use Exception;
+use PhpOffice\Common\Drawing;
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
@@ -902,15 +903,35 @@ protected static function parseImage($node, $element)
                     break;
                 case 'width':
                     $width = $attribute->value;
+
+                    // pt
+                    if (false !== strpos($width, 'pt')) {
+                        $height = Drawing::pointsToPixels((float) str_replace('pt', '', $width));
+                    }
+
+                    // px
+                    if (false !== strpos($width, 'px')) {
+                        $width = str_replace('px', '', $width);
+                    }
+
                     $style['width'] = $width;
                     $style['unit'] = \PhpOffice\PhpWord\Style\Image::UNIT_PX;
-
                     break;
                 case 'height':
                     $height = $attribute->value;
+
+                    // pt
+                    if (false !== strpos($height, 'pt')) {
+                        $height = Drawing::pointsToPixels((float) str_replace('pt', '', $height));
+                    }
+
+                    // px
+                    if (false !== strpos($height, 'px')) {
+                        $height = str_replace('px', '', $height);
+                    }
+
                     $style['height'] = $height;
                     $style['unit'] = \PhpOffice\PhpWord\Style\Image::UNIT_PX;
-
                     break;
                 case 'style':
                     $styleattr = explode(';', $attribute->value);

src/PhpWord/Shared/Html.php

@@ -806,6 +806,26 @@ public function testParseImage(): void
         self::assertStringMatchesFormat('%Smso-position-horizontal:left%S', $doc->getElementAttribute($baseXpath . '[2]/w:pict/v:shape', 'style'));
     }
 
+    /**
+     * Test parsing of img.
+     */
+    public function testParseImageWidthInPoints(): void
+    {
+        $src = __DIR__ . '/../_files/images/firefox.png';
+
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150pt" height="200px" /></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        self::assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+        self::assertStringMatchesFormat('%Swidth:212.76595744681px%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+        self::assertStringMatchesFormat('%Sheight:200px%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+    }
+
     /**
      * Test parsing of remote img.
      */