Merge pull request #1413 from jgpATs2w/develop

allows decimal numbers in line-height style

Author: troosan

src/PhpWord/Shared/Html.php

@@ -531,7 +531,7 @@ private static function parseStyle($attribute, $styles)
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
                 case 'line-height':
-                    if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
+                    if (preg_match('/([0-9]+\.?[0-9]*[a-z]+)/', $cValue, $matches)) {
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::EXACT;
                         $spacing = Converter::cssToTwip($matches[1]) / \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
                     } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {

tests/PhpWord/Shared/ConverterTest.php

@@ -126,6 +126,7 @@ public function testCssSizeParser()
         $this->assertEquals(10, Converter::cssToPoint('10pt'));
         $this->assertEquals(7.5, Converter::cssToPoint('10px'));
         $this->assertEquals(720, Converter::cssToPoint('10in'));
+        $this->assertEquals(7.2, Converter::cssToPoint('0.1in'));
         $this->assertEquals(120, Converter::cssToPoint('10pc'));
         $this->assertEquals(28.346457, Converter::cssToPoint('10mm'), '', 0.000001);
         $this->assertEquals(283.464567, Converter::cssToPoint('10cm'), '', 0.000001);

tests/PhpWord/Shared/HtmlTest.php

@@ -141,6 +141,7 @@ public function testParseLineHeight()
         Html::addHtml($section, '<p style="line-height: 1.5;">test</p>');
         Html::addHtml($section, '<p style="line-height: 15pt;">test</p>');
         Html::addHtml($section, '<p style="line-height: 120%;">test</p>');
+        Html::addHtml($section, '<p style="line-height: 0.17in;">test</p>');
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:spacing'));
@@ -154,6 +155,10 @@ public function testParseLineHeight()
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[3]/w:pPr/w:spacing'));
         $this->assertEquals(Paragraph::LINE_HEIGHT * 1.2, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:line'));
         $this->assertEquals(LineSpacingRule::AUTO, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:lineRule'));
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[4]/w:pPr/w:spacing'));
+        $this->assertEquals(244.8, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:spacing', 'w:line'));
+        $this->assertEquals(LineSpacingRule::EXACT, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:spacing', 'w:lineRule'));
     }
 
     /**