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

Merge pull request #1536 from Samuel-BF/fix-RTF-numerals 

For RTF writers, sizes should should never have decimals
This commit is contained in:
troosan 2018-12-26 23:16:22 +01:00 committed by GitHub
parent bbe517aa60 10b106ce05
commit 0f963e40a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ v0.16.0 (xx dec 2018)
- Fix loading of Sharepoint document @Garrcomm #1498
- RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals @Patrick64 #1493
- Fix parsing of Office 365 documents @Timanx #1485
- For RTF writers, sizes should should never have decimals @Samuel-BF #1536
### Miscelaneous
- Get rid of duplicated code in TemplateProcessor @abcdmitry #1161

2
src/PhpWord/Writer/RTF/Style/Border.php
View File

@ -92,7 +92,7 @@ class Border extends AbstractStyle
$content .= '\pgbrdr' . substr($side, 0, 1);
$content .= '\brdrs'; // Single-thickness border; @todo Get other type of border
$content .= '\brdrw' . $width; // Width
$content .= '\brdrw' . round($width); // Width
$content .= '\brdrcf' . $colorIndex; // Color
$content .= '\brsp480'; // Space in twips between borders and the paragraph (24pt, following OOXML)
$content .= ' ';

2
src/PhpWord/Writer/RTF/Style/Font.php
View File

@ -53,7 +53,7 @@ class Font extends AbstractStyle
$content .= '\f' . $this->nameIndex;
$size = $style->getSize();
$content .= $this->getValueIf(is_numeric($size), '\fs' . ($size * 2));
$content .= $this->getValueIf(is_numeric($size), '\fs' . round($size * 2));
$content .= $this->getValueIf($style->isBold(), '\b');
$content .= $this->getValueIf($style->isItalic(), '\i');

6
src/PhpWord/Writer/RTF/Style/Indentation.php
View File

@ -36,9 +36,9 @@ class Indentation extends AbstractStyle
return '';
}
$content = '\fi' . $style->getFirstLine();
$content .= '\li' . $style->getLeft();
$content .= '\ri' . $style->getRight();
$content = '\fi' . round($style->getFirstLine());
$content .= '\li' . round($style->getLeft());
$content .= '\ri' . round($style->getRight());
return $content . ' ';
}

4
src/PhpWord/Writer/RTF/Style/Paragraph.php
View File

@ -65,8 +65,8 @@ class Paragraph extends AbstractStyle
$content .= $alignments[$style->getAlignment()];
}
$content .= $this->writeIndentation($style->getIndentation());
$content .= $this->getValueIf($spaceBefore !== null, '\sb' . $spaceBefore);
$content .= $this->getValueIf($spaceAfter !== null, '\sa' . $spaceAfter);
$content .= $this->getValueIf($spaceBefore !== null, '\sb' . round($spaceBefore));
$content .= $this->getValueIf($spaceAfter !== null, '\sa' . round($spaceAfter));
$styles = $style->getStyleValues();
$content .= $this->writeTabs($styles['tabs']);

14
src/PhpWord/Writer/RTF/Style/Section.php
View File

@ -46,13 +46,13 @@ class Section extends AbstractStyle
$content .= $this->getValueIf($style->getPageSizeW() !== null, '\pgwsxn' . round($style->getPageSizeW()));
$content .= $this->getValueIf($style->getPageSizeH() !== null, '\pghsxn' . round($style->getPageSizeH()));
$content .= ' ';
$content .= $this->getValueIf($style->getMarginTop() !== null, '\margtsxn' . $style->getMarginTop());
$content .= $this->getValueIf($style->getMarginRight() !== null, '\margrsxn' . $style->getMarginRight());
$content .= $this->getValueIf($style->getMarginBottom() !== null, '\margbsxn' . $style->getMarginBottom());
$content .= $this->getValueIf($style->getMarginLeft() !== null, '\marglsxn' . $style->getMarginLeft());
$content .= $this->getValueIf($style->getHeaderHeight() !== null, '\headery' . $style->getHeaderHeight());
$content .= $this->getValueIf($style->getFooterHeight() !== null, '\footery' . $style->getFooterHeight());
$content .= $this->getValueIf($style->getGutter() !== null, '\guttersxn' . $style->getGutter());
$content .= $this->getValueIf($style->getMarginTop() !== null, '\margtsxn' . round($style->getMarginTop()));
$content .= $this->getValueIf($style->getMarginRight() !== null, '\margrsxn' . round($style->getMarginRight()));
$content .= $this->getValueIf($style->getMarginBottom() !== null, '\margbsxn' . round($style->getMarginBottom()));
$content .= $this->getValueIf($style->getMarginLeft() !== null, '\marglsxn' . round($style->getMarginLeft()));
$content .= $this->getValueIf($style->getHeaderHeight() !== null, '\headery' . round($style->getHeaderHeight()));
$content .= $this->getValueIf($style->getFooterHeight() !== null, '\footery' . round($style->getFooterHeight()));
$content .= $this->getValueIf($style->getGutter() !== null, '\guttersxn' . round($style->getGutter()));
$content .= ' ';
// Borders

2
src/PhpWord/Writer/RTF/Style/Tab.php
View File

@ -42,7 +42,7 @@ class Tab extends AbstractStyle
if (isset($tabs[$style->getType()])) {
$content .= $tabs[$style->getType()];
}
$content .= '\tx' . $style->getPosition();
$content .= '\tx' . round($style->getPosition());
return $content;
}