Skip to content

Commit 048e62d

Browse files
authored
Update Font.php
1 parent daec456 commit 048e62d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function write()
7272
// Underline Keywords
7373
$underlines = [
7474
FontStyle::UNDERLINE_DASH => '\uldash',
75-
FontStyle::UNDERLINE_DASHHEAVY => '\ulth',
75+
FontStyle::UNDERLINE_DASHHEAVY => '\ulthdash',
7676
FontStyle::UNDERLINE_DASHLONG => '\ulldash',
7777
FontStyle::UNDERLINE_DASHLONGHEAVY => '\ulthldash',
7878
FontStyle::UNDERLINE_DOUBLE => '\uldb',
@@ -92,12 +92,15 @@ public function write()
9292

9393
// Style
9494
$content .= $this->getValueIf($style->isBold(), '\b');
95+
$content .= $this->getValueIf($style->isBold() === false, '\b0');
9596
$content .= $this->getValueIf($style->isItalic(), '\i');
97+
$content .= $this->getValueIf($style->isItalic() === false, '\i0');
9698
if (isset($underlines[$style->getUnderline()])) {
9799
$content .= $underlines[$style->getUnderline()];
98100
}
99101
$content .= $this->getValueIf($style->isStrikethrough(), '\strike');
100102
$content .= $this->getValueIf($style->isDoubleStrikethrough(), '\striked1');
103+
$content .= $this->getValueIf($style->isStrikethrough() === false && $style->isDoubleStrikethrough() === false, '\strike0');
101104
$content .= $this->getValueIf($style->isSuperScript(), '\super');
102105
$content .= $this->getValueIf($style->isSubScript(), '\sub');
103106
$content .= $this->getValueIf($style->isSmallCaps(), '\scaps');
@@ -113,12 +116,14 @@ public function write()
113116

114117
// General
115118
$content .= $this->getValueIf($style->isRTL(), '\rtlch');
119+
$content .= $this->getValueIf($style->isRTL() === false, '\ltrch');
116120
if ($style->getLang() !== null) {
117121
$content .= $this->getValueIf($style->getLang()->getLangId() !== null, '\lang' . $style->getLang()->getLangId());
118122
}
119123

120124
// Other (Font settings currently not included in getStyleValues() array)
121125
$content .= $this->getValueIf($style->isNoProof(), '\noproof');
126+
$content .= $this->getValueIf($style->isNoProof() === false, '\noproof0');
122127
$content .= $this->getValueIf($style->getBgColor() !== null, '\cb' . $this->bgColorIndex);
123128

124129
if (empty($content)) {

0 commit comments

Comments
 (0)