Skip to content

fix paper size and add tests for Paper class #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2017
Merged

fix paper size and add tests for Paper class #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a9f7c
fix paper size and add tests for Paper class
troosan Jan 21, 2017
fc3bc29
fix default page size
troosan Jan 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/PhpWord/Style/Paper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

namespace PhpOffice\PhpWord\Style;

use PhpOffice\PhpWord\Shared\Converter;

/**
* Paper size from ISO/IEC 29500-1:2012 pg. 1656-1657
*
Expand Down Expand Up @@ -100,6 +102,7 @@ class Paper extends AbstractStyle
'A3' => array(297, 420, 'mm'),
'A4' => array(210, 297, 'mm'),
'A5' => array(148, 210, 'mm'),
'B5' => array(176, 250, 'mm'),
'Folio' => array(8.5, 13, 'in'),
'Legal' => array(8.5, 14, 'in'),
'Letter' => array(8.5, 11, 'in'),
Expand Down Expand Up @@ -157,11 +160,14 @@ public function setSize($size)
$this->size = $this->setEnumVal($size, array_keys($this->sizes), $this->size);

list($width, $height, $unit) = $this->sizes[$this->size];
$multipliers = array('mm' => 56.5217, 'in' => 1440);
$multiplier = $multipliers[$unit];

$this->width = (int)round($width * $multiplier);
$this->height = (int)round($height * $multiplier);
if ($unit == 'mm') {
$this->width = Converter::cmToTwip($width / 10);
$this->height = Converter::cmToTwip($height / 10);
} else {
$this->width = Converter::inchToTwip($width);
$this->height = Converter::inchToTwip($height);
}

return $this;
}
Expand Down
14 changes: 7 additions & 7 deletions src/PhpWord/Style/Section.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ class Section extends Border
*
* @const int|float
*/
const DEFAULT_WIDTH = 11870; // In twips.
const DEFAULT_HEIGHT = 16787; // In twips.
const DEFAULT_MARGIN = 1440; // In twips.
const DEFAULT_GUTTER = 0; // In twips.
const DEFAULT_HEADER_HEIGHT = 720; // In twips.
const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
const DEFAULT_WIDTH = 11905.511811024; // In twips.
const DEFAULT_HEIGHT = 16837.79527559; // In twips.
const DEFAULT_MARGIN = 1440; // In twips.
const DEFAULT_GUTTER = 0; // In twips.
const DEFAULT_HEADER_HEIGHT = 720; // In twips.
const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
const DEFAULT_COLUMN_COUNT = 1;
const DEFAULT_COLUMN_SPACING = 720; // In twips.
const DEFAULT_COLUMN_SPACING = 720; // In twips.

/**
* Page Orientation
Expand Down
72 changes: 72 additions & 0 deletions tests/PhpWord/Style/PaperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php
/**
* This file is part of PHPWord - A pure PHP library for reading and writing
* word processing documents.
*
* PHPWord is free software distributed under the terms of the GNU Lesser
* General Public License version 3 as published by the Free Software Foundation.
*
* For the full copyright and license information, please read the LICENSE
* file that was distributed with this source code. For the full list of
* contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2010-2016 PHPWord contributors
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Style;

use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\TestHelperDOCX;

/**
* Test class for PhpOffice\PhpWord\Style\Paper
*
* @runTestsInSeparateProcesses
*/
class PaperTest extends \PHPUnit_Framework_TestCase
{
/**
* Tear down after each test
*/
public function tearDown()
{
TestHelperDOCX::clear();
}

/**
* Test initiation for paper
*/
public function testInitiation()
{
$object = new Paper();

$this->assertEquals('A4', $object->getSize());
}

/**
* Test paper size for B5 format
*/
public function testB5Size()
{
$object = new Paper('B5');

$this->assertEquals('B5', $object->getSize());
$this->assertEquals(9977.9527559055, $object->getWidth(), '', 0.000000001);
$this->assertEquals(14173.228346457, $object->getHeight(), '', 0.000000001);
}

/**
* Test paper size for Folio format
*/
public function testFolioSize()
{
$object = new Paper();
$object->setSize('Folio');

$this->assertEquals('Folio', $object->getSize());
$this->assertEquals(12240, $object->getWidth(), '', 0.1);
$this->assertEquals(18720, $object->getHeight(), '', 0.1);
}
}
20 changes: 10 additions & 10 deletions tests/PhpWord/Style/SectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public function testSettingValue()
$oSettings = new Section();

$this->assertEquals('portrait', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
$this->assertEquals('A4', $oSettings->getPaperSize());

$oSettings->setSettingValue('orientation', 'landscape');
$this->assertEquals('landscape', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);

$iVal = rand(1, 1000);
$oSettings->setSettingValue('borderSize', $iVal);
Expand Down Expand Up @@ -110,7 +110,7 @@ public function testPageWidth()
// Section Settings
$oSettings = new Section();

$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
$iVal = rand(1, 1000);
$oSettings->setSettingValue('pageSizeW', $iVal);
$this->assertEquals($iVal, $oSettings->getPageSizeW());
Expand All @@ -124,7 +124,7 @@ public function testPageHeight()
// Section Settings
$oSettings = new Section();

$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
$iVal = rand(1, 1000);
$oSettings->setSettingValue('pageSizeH', $iVal);
$this->assertEquals($iVal, $oSettings->getPageSizeH());
Expand All @@ -140,8 +140,8 @@ public function testOrientationLandscape()

$oSettings->setLandscape();
$this->assertEquals('landscape', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
}

/**
Expand All @@ -154,8 +154,8 @@ public function testOrientationPortrait()

$oSettings->setPortrait();
$this->assertEquals('portrait', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
}

/**
Expand Down