Improve Underline in ODF and HTML

Implements underline styles in ODF. Implements as much as CSS offers for underline styles.

Author: rasamassen

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

@@ -40,6 +40,26 @@ public function write()
         }
         $css = [];
 
+        $underlines = [
+            FontStyle::UNDERLINE_DASH => 'underline dashed ',
+            FontStyle::UNDERLINE_DASHHEAVY => 'underline dashed 2px ',
+            FontStyle::UNDERLINE_DASHLONG => 'underline dashed ',
+            FontStyle::UNDERLINE_DASHLONGHEAVY => 'underline dashed 2px ',
+            FontStyle::UNDERLINE_DOUBLE => 'underline double ',
+            FontStyle::UNDERLINE_DOTDASH => 'underline dotted ',
+            FontStyle::UNDERLINE_DOTDASHHEAVY => 'underline dotted 2px ',
+            FontStyle::UNDERLINE_DOTDOTDASH => 'underline dotted ',
+            FontStyle::UNDERLINE_DOTDOTDASHHEAVY => 'underline dotted 2px ',
+            FontStyle::UNDERLINE_DOTTED => 'underline dotted ',
+            FontStyle::UNDERLINE_DOTTEDHEAVY => 'underline dotted 2px ',
+            FontStyle::UNDERLINE_HEAVY => 'underline solid 2px ',
+            FontStyle::UNDERLINE_SINGLE => 'underline solid ',
+            FontStyle::UNDERLINE_WAVY => 'underline wavy ',
+            FontStyle::UNDERLINE_WAVYDOUBLE => 'underline wavy ',
+            FontStyle::UNDERLINE_WAVYHEAVY => 'underline wavy 2px ',
+            FontStyle::UNDERLINE_WORDS => 'underline solid ',
+        ];
+
         $font = $this->getFontFamily($style->getName(), $style->getFallbackFont());
         $size = $style->getSize();
         $color = $style->getColor();
@@ -57,7 +77,9 @@ public function write()
         $css['vertical-align'] .= $this->getValueIf($style->isSuperScript(), 'super');
         $css['vertical-align'] .= $this->getValueIf($style->isSubScript(), 'sub');
         $css['text-decoration'] = '';
-        $css['text-decoration'] .= $this->getValueIf($underline, 'underline ');
+        if (isset($underlines[$style->getUnderline()])) {
+            $css['text-decoration'] .= $this->getValueIf($underline, $underlines[$style->getUnderline()]);
+        }
         $css['text-decoration'] .= $this->getValueIf($lineThrough, 'line-through ');
         $css['text-transform'] = $this->getValueIf($style->isAllCaps(), 'uppercase');
         $css['font-variant'] = $this->getValueIf($style->isSmallCaps(), 'small-caps');

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

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
+use PhpOffice\PhpWord\Style\Font as FontStyle;
+
 /**
  * Font style writer.
  *
@@ -72,9 +74,34 @@ public function write(): void
         $xmlWriter->writeAttributeIf($style->isItalic(), 'style:font-style-complex', 'italic');
 
         // Underline
-        // @todo Various mode of underline
+        $underlines = [
+            FontStyle::UNDERLINE_DASH => 'dash',
+            FontStyle::UNDERLINE_DASHHEAVY => 'dash',
+            FontStyle::UNDERLINE_DASHLONG => 'long-dash',
+            FontStyle::UNDERLINE_DASHLONGHEAVY => 'long-dash',
+            FontStyle::UNDERLINE_DOUBLE => 'solid',
+            FontStyle::UNDERLINE_DOTDASH => 'dot-dash',
+            FontStyle::UNDERLINE_DOTDASHHEAVY => 'dot-dash',
+            FontStyle::UNDERLINE_DOTDOTDASH => 'dot-dot-dash',
+            FontStyle::UNDERLINE_DOTDOTDASHHEAVY => 'dot-dot-dash',
+            FontStyle::UNDERLINE_DOTTED => 'dotted',
+            FontStyle::UNDERLINE_DOTTEDHEAVY => 'dotted',
+            FontStyle::UNDERLINE_HEAVY => 'solid',
+            FontStyle::UNDERLINE_SINGLE => 'solid',
+            FontStyle::UNDERLINE_WAVY => 'wave',
+            FontStyle::UNDERLINE_WAVYDOUBLE => 'wave',
+            FontStyle::UNDERLINE_WAVYHEAVY => 'wave',
+            FontStyle::UNDERLINE_WORDS => 'solid',
+        ];
+
         $underline = $style->getUnderline();
-        $xmlWriter->writeAttributeIf($underline != 'none', 'style:text-underline-style', 'solid');
+        if (isset($underlines[$underline])) {
+            $xmlWriter->writeAttributeIf($underline != 'none', 'style:text-underline-style', $underlines[$underline]);
+            $xmlWriter->writeAttributeIf(str_contains(strtolower($underline), 'heavy'), 'style:text-underline-width', 'bold');
+            $xmlWriter->writeAttributeIf(str_contains(strtolower($underline), 'thick'), 'style:text-underline-width', 'bold');
+            $xmlWriter->writeAttributeIf(str_contains(strtolower($underline), 'double'), 'style:text-underline-type', 'double');
+            $xmlWriter->writeAttributeIf(str_contains(strtolower($underline), 'words'), 'style:text-underline-mode', 'skip-white-space');
+        }
 
         // Strikethrough, double strikethrough
         $xmlWriter->writeAttributeIf($style->isStrikethrough(), 'style:text-line-through-type', 'single');