Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code style

This commit is contained in:
lubosdz 2020-07-13 18:48:27 +02:00
parent 889f4e3381
commit 38788e0c7e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,11 +109,11 @@ class Html
break; break;
case 'width': case 'width':
// tables, cells // tables, cells
if(false !== strpos($val, '%')){ if (false !== strpos($val, '%')) {
// e.g. <table width="100%"> or <td width=50%> // e.g. <table width="100%"> or <td width="50%">
$styles['width'] = intval($val) * 50; $styles['width'] = intval($val) * 50;
$styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::PERCENT; $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::PERCENT;
}else{ } else {
// e.g. <table width="250> where "250" = 250px (always pixels) // e.g. <table width="250> where "250" = 250px (always pixels)
$styles['width'] = Converter::pixelToTwip($val); $styles['width'] = Converter::pixelToTwip($val);
$styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP; $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP;
@ -472,10 +472,10 @@ class Html
$levels = $style->getLevels(); $levels = $style->getLevels();
/** @var \PhpOffice\PhpWord\Style\NumberingLevel */ /** @var \PhpOffice\PhpWord\Style\NumberingLevel */
$level = $levels[0]; $level = $levels[0];
if($start > 0){ if ($start > 0) {
$level->setStart($start); $level->setStart($start);
} }
if($type && !!($type = self::mapListType($type))){ if ($type && !!($type = self::mapListType($type))) {
$level->setFormat($type); $level->setFormat($type);
} }
} }
@ -675,10 +675,10 @@ class Html
// must have exact order [width color style], e.g. "1px #0011CC solid" or "2pt green solid" // must have exact order [width color style], e.g. "1px #0011CC solid" or "2pt green solid"
// Word does not accept shortened hex colors e.g. #CCC, only full e.g. #CCCCCC // Word does not accept shortened hex colors e.g. #CCC, only full e.g. #CCCCCC
if (preg_match('/([0-9]+[^0-9]*)\s+(\#[a-fA-F0-9]+|[a-zA-Z]+)\s+([a-z]+)/', $cValue, $matches)) { if (preg_match('/([0-9]+[^0-9]*)\s+(\#[a-fA-F0-9]+|[a-zA-Z]+)\s+([a-z]+)/', $cValue, $matches)) {
if(false !== strpos($cKey, '-')){ if (false !== strpos($cKey, '-')) {
$which = explode('-', $cKey)[1]; $which = explode('-', $cKey)[1];
$which = ucfirst($which); // e.g. bottom -> Bottom $which = ucfirst($which); // e.g. bottom -> Bottom
}else{ } else {
$which = ''; $which = '';
} }
// normalization: in HTML 1px means tinest possible line width, so we cannot convert 1px -> 15 twips, coz line'd be bold, we use smallest twip instead // normalization: in HTML 1px means tinest possible line width, so we cannot convert 1px -> 15 twips, coz line'd be bold, we use smallest twip instead
@ -883,6 +883,10 @@ class Html
case 'baseline': case 'baseline':
return 'top'; return 'top';
default: default:
// @discuss - which one should apply:
// - Word uses default vert. alignment: top
// - all browsers use default vert. alignment: middle
// Returning empty string means attribute wont be set so use Word default (top).
return ''; return '';
} }
} }