Sample 11 Fixed for Odt and Docx, Partial for RTF and HTML

Still not out of the woods.

Write to Docx and Odt are fine.

Write to RTF and HTML are fine only if they follow write to ODT.

Author: oleibman

src/PhpWord/Style.php

@@ -178,15 +178,24 @@ public static function getStyles()
     /**
      * Get style by name.
      *
-     * @param string $styleName
+     * @param ?string $styleName
      *
      * @return ?AbstractStyle Paragraph|Font|Table|Numbering
      */
     public static function getStyle($styleName)
     {
+        if ($styleName === null) {
+            return null;
+        }
         if (isset(self::$styles[$styleName])) {
             return self::$styles[$styleName];
         }
+        foreach (self::$styles as $key => $value) {
+            $styleId = self::alternateName($key);
+            if ($styleId === $styleName) {
+                return $value;
+            }
+        }
 
         return null;
     }
@@ -221,4 +230,24 @@ private static function setStyleValues($name, $style, $value = null)
 
         return self::getStyle($name);
     }
+
+    /**
+     * Get alternate name for style names with embedded spaces.
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public static function alternateName($name)
+    {
+        $explode = explode(' ', $name);
+        if (count($explode) > 1) {
+            $name = '';
+            foreach ($explode as $explodeItem) {
+                $name .= ucfirst($explodeItem);
+            }
+        }
+
+        return $name;
+    }
 }

src/PhpWord/Writer/HTML/Part/Head.php

@@ -130,7 +130,8 @@ private function writeStyles(): string
         // Custom styles
         $customStyles = Style::getStyles();
         if (is_array($customStyles)) {
-            foreach ($customStyles as $name => $style) {
+            foreach ($customStyles as $namex => $style) {
+                $name = Style::alternateName($namex);
                 $styleParagraph = null;
                 if ($style instanceof Font) {
                     $styleWriter = new FontStyleWriter($style);

src/PhpWord/Writer/ODText/Style/Font.php

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
+use PhpOffice\PhpWord\Style;
+
 /**
  * Font style writer.
  *
@@ -31,21 +33,21 @@ class Font extends AbstractStyle
     public function write(): void
     {
         $style = $this->getStyle();
-        if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
+        if (!$style instanceof Style\Font) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
 
         $stylep = $style->getParagraph();
-        if ($stylep instanceof \PhpOffice\PhpWord\Style\Paragraph) {
+        if ($stylep instanceof Style\Paragraph) {
             $temp1 = clone $stylep;
             $temp1->setStyleName($style->getStyleName());
             $temp2 = new Paragraph($xmlWriter, $temp1);
             $temp2->write();
         }
 
         $xmlWriter->startElement('style:style');
-        $xmlWriter->writeAttribute('style:name', $style->getStyleName());
+        $xmlWriter->writeAttribute('style:name', Style::alternateName($style->getStyleName()));
         $xmlWriter->writeAttribute('style:family', 'text');
         $xmlWriter->startElement('style:text-properties');
 
@@ -100,9 +102,9 @@ public function write(): void
             $xmlWriter->writeAttribute('style:country-complex', 'none');
         }
 
-        // @todo Foreground-Color
-
-        // @todo Background color
+        // Foreground-Color (which is really background color)
+        $fgColor = $style->getFgColor();
+        $xmlWriter->writeAttributeIf($fgColor != '', 'fo:background-color', '#' . \PhpOffice\PhpWord\Shared\Converter::stringToRgb($fgColor));
 
         $xmlWriter->endElement(); // style:text-properties
         $xmlWriter->endElement(); // style:style

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

@@ -41,7 +41,21 @@ public function write()
         $content = '';
         $content .= $this->writeOpening();
         $content .= '{\field {\*\fldinst {HYPERLINK "' . $this->element->getSource() . '"}}{\\fldrslt {';
-        $content .= $this->writeFontStyle();
+        $temp = $this->writeFontStyle();
+        $content .= $temp;
+        if ($temp === '\cf0\f0 ') {
+            $content .= '\ul ';
+            $colors = $this->parentWriter->getColorTable();
+            $count = count($colors);
+            for ($i = 0; $i < $count; ++$i) {
+                if ($colors[$i] === '0000FF') {
+                    $j = $i + 1;
+                    $content .= '\cf' . $j . ' ';
+
+                    break;
+                }
+            }
+        }
         $content .= $this->writeText($this->element->getText());
         $content .= '}}}';
         $content .= $this->writeClosing();

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

@@ -45,6 +45,21 @@ public function write()
         $content .= $this->writeOpening();
         $content .= '{';
         $content .= $this->writeFontStyle();
+        $change = $element->getTrackChange();
+        if ($change !== null) {
+            if ($change->getChangeType() === 'DELETED') {
+                $content .= '\strike ';
+            }
+        }
+        if ($this->fontStyle !== null) {
+            $fgColor = $this->fontStyle->getFgColor();
+            if ($fgColor !== null) {
+                $fgColorIndex = array_search($fgColor, $this->parentWriter->getColorTable());
+                if ($fgColorIndex !== false) {
+                    $content .= '\highlight' . ++$fgColorIndex . ' ';
+                }
+            }
+        }
         $content .= $this->writeText($element->getText());
         $content .= '}';
         $content .= $this->writeClosing();

src/PhpWord/Writer/Word2007/Part/Styles.php

@@ -202,6 +202,11 @@ private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $sty
         } elseif (null !== $paragraphStyle) {
             // if type is 'paragraph' it should have a styleId
             $xmlWriter->writeAttribute('w:styleId', $styleName);
+        } else {
+            $styleId = Style::alternateName($styleName);
+            if ($styleName !== $styleId) {
+                $xmlWriter->writeAttribute('w:styleId', $styleId);
+            }
         }
 
         // Style name

src/PhpWord/Writer/Word2007/Style/Font.php

@@ -39,8 +39,7 @@ public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
-        $isStyleName = $this->isInline && null !== $this->style && is_string($this->style);
-        if ($isStyleName) {
+        if ($this->isInline && null !== $this->style && is_string($this->style)) {
             $xmlWriter->startElement('w:rPr');
             $xmlWriter->startElement('w:rStyle');
             $xmlWriter->writeAttribute('w:val', $this->style);