Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse fixed line space

Browse Source
This commit is contained in:
troosan 2018-03-19 22:43:10 +01:00
parent 97d60dd985
commit de01e86d41
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/PhpWord/Shared/Html.php
View File

@ -521,7 +521,18 @@ class Html
$styles['bgColor'] = trim($cValue, '#'); $styles['bgColor'] = trim($cValue, '#');
break; break;
case 'line-height': case 'line-height':
$styles['lineHeight'] = Html::toMultiplier($cValue); if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
$spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::EXACT;
$spacing = Converter::cssToTwip($matches[1]) / \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
} elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
$spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
$spacing = ((int) $matches[1]) / 100;
} else {
$spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
$spacing = $cValue;
}
$styles['spacingLineRule'] = $spacingLineRule;
$styles['lineHeight'] = $spacing;
break; break;
case 'text-indent': case 'text-indent':
$styles['indentation']['firstLine'] = Converter::cssToTwip($cValue); $styles['indentation']['firstLine'] = Converter::cssToTwip($cValue);
@ -681,15 +692,6 @@ class Html
return null; return null;
} }
private static function toMultiplier($cssValue)
{
if (preg_match('/([0-9]+)%/', $cssValue, $matches)) {
return ((int) $matches[1]) / 100;
}
return $cssValue;
}
/** /**
* Parse line break * Parse line break
* *