Final (I hope) Changes for Sample11

RTF now works.

In the process of saving, ODText creates a lot of new styles. Because it was being done before RTF and HTML in the samples, it was masking problems in the other formats. It is now changed to happen after the other formats.

Author: oleibman

samples/Sample_Header.php

@@ -31,7 +31,14 @@
 }
 
 // Set writers
-$writers = ['Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf', 'HTML' => 'html', 'PDF' => 'pdf', 'EPub3' => 'epub'];
+$writers = [
+    'Word2007' => 'docx',
+    'RTF' => 'rtf',
+    'HTML' => 'html',
+    'PDF' => 'pdf',
+    'EPub3' => 'epub',
+    'ODText' => 'odt', // creates a lot of extra style - do it last
+];
 
 // Set PDF renderer
 if (null === Settings::getPdfRendererPath()) {

src/PhpWord/Writer/RTF/Element/AbstractElement.php

@@ -107,6 +107,11 @@ protected function getStyles(): void
             $this->fontStyle = $element->getFontStyle();
             if (is_string($this->fontStyle)) {
                 $this->fontStyle = Style::getStyle($this->fontStyle);
+            } elseif ($this->fontStyle !== null && is_string($this->fontStyle->getStyleName())) {
+                $temp = Style::getStyle($this->fontStyle->getStyleName());
+                if ($temp instanceof FontStyle) {
+                    $this->fontStyle = $temp;
+                }
             }
         }
 

src/PhpWord/Writer/RTF/Part/Header.php

@@ -205,9 +205,22 @@ private function registerFont(): void
             $elements = $section->getElements();
             $this->registerBorderColor($section->getStyle());
             foreach ($elements as $element) {
-                if (method_exists($element, 'getFontStyle')) {
-                    $style = $element->getFontStyle();
-                    $this->registerFontItems($style);
+                $this->anythingToRegister($element);
+            }
+        }
+    }
+
+    /** @param mixed $element */
+    private function anythingToRegister($element): void
+    {
+        if (is_object($element)) {
+            if (method_exists($element, 'getFontStyle')) {
+                $style = $element->getFontStyle();
+                $this->registerFontItems($style);
+            }
+            if (method_exists($element, 'getElements')) {
+                foreach ($element->getElements() as $subElement) {
+                    $this->anythingToRegister($subElement);
                 }
             }
         }

tests/PhpWordTests/Writer/RTF/Sample11Test.php

@@ -32,7 +32,11 @@ public function testSample11(): void
         $phpWord = IOFactory::load($source);
         $writer = new RTF($phpWord);
         $content = $writer->getContent();
-        $expected = '{\colortbl;\red255\green0\blue0;\red0\green0\blue0;\red0\green0\blue255;}';
+        $expected = '{\colortbl;\red255\green0\blue0;\red0\green0\blue0;\red0\green0\blue255;\red0\green176\blue80;\red255\green255\blue0;}';
+        self::assertStringContainsString($expected, $content);
+        $expected = '\highlight5 highlighted';
+        self::assertStringContainsString($expected, $content);
+        $expected = '\strike even ';
         self::assertStringContainsString($expected, $content);
     }
 }