From fe647f6e5520b16dfe33b19ce9a2a8c8be05e3d1 Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Wed, 13 Jun 2018 17:41:17 +0200
Subject: [PATCH] fix when style line-height size comes in decimal number

---
 samples/resources/Sample_30_ReadHTML.html | 9 ++++++---
 src/PhpWord/Shared/Html.php               | 2 +-
 tests/PhpWord/Shared/ConverterTest.php    | 1 +
 tests/PhpWord/Shared/HtmlTest.php         | 5 +++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index b3d2fad2..3ccbb5f2 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -17,9 +17,12 @@
 <h2>Includes images</h2>
 <img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
 
-<img src="https://localhost/gev/desarrollo/actividades/pruebas_14/5b064503587f7.jpeg" name="Imagen 12" align="bottom" width="208" height="183" border="0"/>
-<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b064503589db.png" name="Imagen 13" align="bottom" width="143" height="202" border="0"/>
-<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b0645035aac8.jpeg" name="Imagen 14" align="bottom" width="194" height="188" border="0"/>
+<h2>Nested p and i</h2>
+<p class="western" align="right" style="font-weight: normal; line-height: 0.17in; orphans: 0; widows: 0">
+  Contenido
+  <font size="2" style="font-size: 9pt"><i>B.O. de la Provincia de Barcelona</i></font>
+  <font size="2" style="font-size: 9pt">, 6-9-1939, citado en Díaz Plaja, F.: "España 1939-1979",</font>
+</p>
 
 </body>
 </html>
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 58ce2412..f5a7e567 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -530,7 +530,7 @@ class Html
                     $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)) {
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 3798a07b..fbe92c25 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -126,6 +126,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
         $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);
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 481b5d75..ac273ad0 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -141,6 +141,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         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 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $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'));
     }
 
     /**