Catch Up

Author: oleibman

Diff for: src/PhpWord/Shared/Html.php

@@ -470,10 +470,10 @@ protected static function parseInput($node, $element, &$styles): void
      */
     protected static function parseHeading(DOMNode $node, AbstractContainer $element, array &$styles, string $headingStyle): TextRun
     {
-        self::parseInlineStyle($node, $styles['font']);
-        // Create a TextRun to hold styles and text
-        $styles['paragraph'] = $headingStyle;
-        $textRun = new TextRun($styles['paragraph']);
+        $style = new Paragraph();
+        $style->setStyleName($headingStyle);
+        $style->setStyleByArray(self::parseInlineStyle($node, $styles['paragraph']));
+        $textRun = new TextRun($style);
 
         // Create a title with level corresponding to number in heading style
         // (Eg, Heading1 = 1)

Diff for: src/PhpWord/Writer/HTML/Element/Title.php

@@ -19,9 +19,8 @@
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Element\Title as PhpWordTitle;
-use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Writer\HTML;
-use PhpOffice\PhpWord\Writer\HTML\Style\Font;
+use PhpOffice\PhpWord\Writer\HTML\Style\Paragraph;
 
 /**
  * TextRun element HTML writer.
@@ -44,17 +43,21 @@ public function write()
         $tag = 'h' . $this->element->getDepth();
 
         $text = $this->element->getText();
+        $paragraphStyle = null;
         if (is_string($text)) {
             $text = $this->parentWriter->escapeHTML($text);
         } else {
+            $paragraphStyle = $text->getParagraphStyle();
             $writer = new Container($this->parentWriter, $text);
             $text = $writer->write();
         }
         $css = '';
-        $style = Style::getStyle('Heading_' . $this->element->getDepth());
-        if ($style !== null) {
-            $styleWriter = new Font($style);
-            $css = ' style="' . $styleWriter->write() . '"';
+        if (is_object($paragraphStyle)) {
+            $styleWriter = new Paragraph($paragraphStyle);
+            $write = $styleWriter->write();
+            if ($write !== '') {
+                $css = " style=\"$write\"";
+            }
         }
 
         $content = "<{$tag}{$css}>{$text}</{$tag}>" . PHP_EOL;

Diff for: src/PhpWord/Writer/HTML/Part/Head.php

@@ -137,6 +137,7 @@ private function writeStyles(): string
                     $styleWriter = new FontStyleWriter($style);
                     if ($style->getStyleType() == 'title') {
                         $name = str_replace('Heading_', 'h', $name);
+                        $css .= "{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
                         $styleParagraph = $style->getParagraph();
                         $style = $styleParagraph;
                     } else {

Diff for: tests/PhpWordTests/Shared/HtmlHeadingsTest.php

@@ -40,7 +40,7 @@ public function testRoundTripHeadings(): void
         $section = $originalDoc->addSection();
         $expectedStrings = [];
         $section->addTitle('Title 1', 1);
-        $expectedStrings[] = '<h1 style="font-size: 20pt;">Title 1</h1>';
+        $expectedStrings[] = '<h1>Title 1</h1>';
         for ($i = 2; $i <= 6; ++$i) {
             $textRun = new TextRun();
             $textRun->addText('Title ');
@@ -59,9 +59,8 @@ public function testRoundTripHeadings(): void
         SharedHtml::addHtml($newSection, $content, true);
         $newWriter = new HtmlWriter($newDoc);
         $newContent = $newWriter->getContent();
-        // Reader transforms Text to TextRun,
-        //  but result is functionally the same.
-        $firstStringAsTextRun = '<h1><span style="font-size: 20pt;">Title 1</span></h1>';
-        self::assertSame($content, str_replace($firstStringAsTextRun, $expectedStrings[0], $newContent));
+
+        // This needs work
+        self::assertSame($newContent, str_replace('h1 {font-size: 20pt;}' . PHP_EOL, '', $content));
     }
 }

Diff for: tests/PhpWordTests/Shared/HtmlTest.php

@@ -24,6 +24,7 @@
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Element\Text;
 use PhpOffice\PhpWord\Element\TextRun;
+use PhpOffice\PhpWord\Element\Title;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\Converter;
@@ -134,6 +135,8 @@ public function testParseHeader(): void
 
         self::assertCount(1, $section->getElements());
         $element = $section->getElement(0);
+        self::assertInstanceOf(Title::class, $element);
+        $element = $element->getText();
         self::assertInstanceOf(TextRun::class, $element);
         self::assertInstanceOf(Paragraph::class, $element->getParagraphStyle());
         self::assertEquals('Heading1', $element->getParagraphStyle()->getStyleName());
@@ -155,6 +158,8 @@ public function testParseHeaderStyle(): void
 
         self::assertCount(1, $section->getElements());
         $element = $section->getElement(0);
+        self::assertInstanceOf(Title::class, $element);
+        $element = $element->getText();
         self::assertInstanceOf(TextRun::class, $element);
         self::assertInstanceOf(Paragraph::class, $element->getParagraphStyle());
         self::assertEquals('Heading1', $element->getParagraphStyle()->getStyleName());

Diff for: tests/PhpWordTests/Writer/HTML/PartTest.php

@@ -179,17 +179,15 @@ public function testTitleStyles(): void
         $xpath = new DOMXPath($dom);
 
         $style = Helper::getTextContent($xpath, '/html/head/style');
-        //self::assertNotFalse(strpos($style, 'h1 {font-family: \'Calibri\'; font-weight: bold;}'));
+        self::assertNotFalse(strpos($style, 'h1 {font-family: \'Calibri\'; font-weight: bold;}'));
         self::assertNotFalse(strpos($style, 'h1 {margin-top: 0.5pt; margin-bottom: 0.5pt;}'));
-        //self::assertNotFalse(strpos($style, 'h2 {font-family: \'Times New Roman\'; font-style: italic;}'));
+        self::assertNotFalse(strpos($style, 'h2 {font-family: \'Times New Roman\'; font-style: italic;}'));
         self::assertNotFalse(strpos($style, 'h2 {margin-top: 0.25pt; margin-bottom: 0.25pt;}'));
         self::assertEquals(1, Helper::getLength($xpath, '/html/body/div/h1'));
         self::assertEquals(2, Helper::getLength($xpath, '/html/body/div/h2'));
-        // code for getNamedItem had been erroneous
-        self::assertSame("font-family: 'Calibri'; font-weight: bold;", Helper::getNamedItem($xpath, '/html/body/div/h1', 'style')->textContent);
         $html = Helper::getHtmlString($phpWord);
-        self::assertStringContainsString('<h1 style="font-family: \'Calibri\'; font-weight: bold;">Header 1 #1</h1>', $html);
-        self::assertStringContainsString('<h2 style="font-family: \'Times New Roman\'; font-style: italic;">Header 2 #1</h2>', $html);
-        self::assertStringContainsString('<h2 style="font-family: \'Times New Roman\'; font-style: italic;">Header 2 #2</h2>', $html);
+        self::assertStringContainsString('<h1>Header 1 #1</h1>', $html);
+        self::assertStringContainsString('<h2>Header 2 #1</h2>', $html);
+        self::assertStringContainsString('<h2>Header 2 #2</h2>', $html);
     }
 }