Merge branch 'develop' into issue255

Conflicts:
	CHANGELOG.md
	docs/shapes_chart.rst
	src/PhpPresentation/Shape/Chart/Axis.php

Author: Progi1984

.travis.yml

@@ -7,10 +7,12 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 matrix:
   allow_failures:
+    - php: 7.1
     - php: hhvm
 
 env:

CHANGELOG.md

@@ -10,12 +10,21 @@
 - PowerPoint2007 Writer : Fixed the axis title in bar chart - @pgee70 GH-267
 - PowerPoint2007 Writer : Fixed the label position in bar chart - @pgee70 GH-268
 - PowerPoint2007 Writer : Support of margins in cell in table - @carlosafonso @Progi1984 GH-273 GH-315
+- Fixed the corruption of file when an addExternalSlide is called - @Progi1984 GH-240
 
 ### Features
 - ODPresentation Writer : Show/Hide Value / Name / Series Name in Chart - @Progi1984 GH-272
 - ODPresentation Writer : Axis Bounds in Chart - @Progi1984 GH-269
+- PowerPoint97 Reader : Support of Slide Note - @Progi1984 GH-226
+- PowerPoint2007 Reader : Support of Shape Table - @Progi1984 GH-240
+- PowerPoint2007 Reader : Support of Slide Note - @Progi1984 GH-226
+- PowerPoint2007 Reader : Support text direction in Alignment for Table - @Progi1984 GH-218
 - PowerPoint2007 Writer : Implement character spacing - @jvanoostrom GH-301
 - PowerPoint2007 Writer : Axis Bounds in Chart - @Progi1984 GH-269
+- PowerPoint2007 Writer : Implement Legend Key in Series for Chart - @Progi1984 GH-319
+- PowerPoint2007 Writer : Support text direction in Alignment for Table - @SeregPie GH-218
+- PowerPoint2007 Writer : Support tick mark & unit in Axis for Chart - @Faab GH-218
+- PowerPoint2007 Writer : Support separator in Series for Chart - @jphchaput GH-218
 - PowerPoint2007 Writer : Add support for Outline in Axis - @Progi1984 GH-255
 - Misc : Added two methods for setting Border & Fill in Legend - @Progi1984 GH-265
 

README.md

@@ -1,13 +1,15 @@
 # ![PHPPresentation](https://raw.githubusercontent.com/mvargasmoran/PHPPresentation/develop/docs/images/PHPPresentationLogo.png "PHPPresentation")
 
 [![Latest Stable Version](https://poser.pugx.org/phpoffice/phppresentation/v/stable.png)](https://packagist.org/packages/phpoffice/phppresentation)
-[![Build Status](https://travis-ci.org/PHPOffice/PHPPresentation.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPPresentation)
 [![Code Climate](https://codeclimate.com/github/PHPOffice/PHPPresentation/badges/gpa.svg)](https://codeclimate.com/github/PHPOffice/PHPPresentation)
 [![Test Coverage](https://codeclimate.com/github/PHPOffice/PHPPresentation/badges/coverage.svg)](https://codeclimate.com/github/PHPOffice/PHPPresentation/coverage)
 [![Total Downloads](https://poser.pugx.org/phpoffice/phppresentation/downloads.png)](https://packagist.org/packages/phpoffice/phppresentation)
 [![License](https://poser.pugx.org/phpoffice/phppresentation/license.png)](https://packagist.org/packages/phpoffice/phppresentation)
+[![BountySource](https://img.shields.io/bountysource/team/phpoffice/activity.svg)](https://www.bountysource.com/teams/phpoffice)
 [![Join the chat at https://gitter.im/PHPOffice/PHPPresentation](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPPresentation)
 
+Branch Master : [![Build Status](https://travis-ci.org/PHPOffice/PHPPresentation.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPPresentation) [![Documentation Status](https://readthedocs.org/projects/phppresentation/badge/?version=master)](http://phppresentation.readthedocs.io/en/latest/?badge=master)  
+Branch Develop : [![Build Status](https://travis-ci.org/PHPOffice/PHPPresentation.svg?branch=develop)](https://travis-ci.org/PHPOffice/PHPPresentation) [![Documentation Status](https://readthedocs.org/projects/phppresentation/badge/?version=develop)](http://phppresentation.readthedocs.io/en/latest/?badge=develop)
 
 PHPPresentation is a library written in pure PHP that provides a set of classes to write to different presentation file formats, i.e. Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML) or OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF). 
 

docs/shapes_chart.rst

@@ -59,6 +59,34 @@ You can define outline for each axis (X & Y).
     $oShape->getPlotArea()->getAxisX()->getOutline()->setWidth(10);
     $oShape->getPlotArea()->getAxisX()->getOutline()->getFill()->setFillType(Fill::FILL_SOLID)->setStartColor(new Color(Color::COLOR_BLUE));
 
+For Axis Y, you can define tick mark with `setMinorTickMark` & `setMajorTickMark` methods.
+For resetting them, you pass Axis::TICK_MARK_NONE as parameter to these methods.
+
+.. code-block:: php
+
+    use \PhpOffice\PhpPresentation\Shape\Chart\Axis;
+
+    $oLine = new Line();
+
+    $oShape = $oSlide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    $oShape->getPlotArea()->getAxisY()->setMinorTickMark(Axis::TICK_MARK_NONE);
+    $oShape->getPlotArea()->getAxisY()->setMajorTickMark(Axis::TICK_MARK_INSIDE);
+
+For Axis Y, you can define unit with `setMinorUnit` & `setMajorUnit` methods.
+For resetting them, you pass null as parameter to these methods.
+
+.. code-block:: php
+
+    use \PhpOffice\PhpPresentation\Shape\Chart\Axis;
+
+    $oLine = new Line();
+
+    $oShape = $oSlide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    $oShape->getPlotArea()->getAxisY()->setMinorUnit(null);
+    $oShape->getPlotArea()->getAxisY()->setMajorUnit(0.05);
+
 Title
 ^^^^^
 
@@ -115,6 +143,19 @@ Each position is described in `MSDN <https://msdn.microsoft.com/en-us/library/mt
     $oSeries = new Series('Downloads', $seriesData);
     $oSeries->setLabelPosition(Series::LABEL_INSIDEEND);
 
+You can define if some informations are displayed.
+
+.. code-block:: php
+
+    $oSeries = new Series('Downloads', $seriesData);
+    $oSeries->setSeparator(';');
+    $oSeries->setShowCategoryName(true);
+    $oSeries->setShowLeaderLines(true);
+    $oSeries->setShowLegendKey(true);
+    $oSeries->setShowPercentage(true);
+    $oSeries->setShowSeriesName(true);
+    $oSeries->setShowValue(true);
+
 Types
 -----
 

docs/shapes_table.rst

@@ -66,12 +66,25 @@ For defining margins of cell, you can use the `setMargin*` method of a Alignment
 	    ->setMarginTop(80);
 
 
+Define the text direction of a cell
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For defining the text direction of cell, you can use the `setTextDirection` method of the `getAlignment` method of a Cell object.
+The width is in pixels.
+
+.. code-block:: php
+
+	$tableShape = $slide->createTableShape($columns);
+	$row = $tableShape->createRow();
+	$cellA1 = $row->nextCell();
+	$cellA1->getAlignment()->setTextDirection(\PhpOffice\PhpPresentation\Style\Alignment::TEXT_DIRECTION_VERTICAL_270);
+
+
 Define the width of a cell
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 The width of cells are defined by the width of cell of the first row.
 If not defined, all cells widths are calculated from the width of the shape and the number of columns.
 
-For defining the width of cell, you can use the `setWidth` method of a Cell object. 
+For defining the width of cell, you can use the `setWidth` method of a Cell object.
 The width is in pixels.
 
 .. code-block:: php

phpmd.xml.dist

@@ -20,7 +20,7 @@
         <!-- PptSlides needs more coupling (default: 13) -->
         <!-- Writer/Office2007/AbstractSlide needs more coupling (default: 13) -->
 		<properties>
-            <property name="minimum" value="32" />
+            <property name="minimum" value="35" />
         </properties>
     </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">

samples/Sample_04_Table.php

@@ -79,7 +79,9 @@
 			   ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFE06B20'));
 $row->nextCell()->createTextRun('R2C1');
-$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(30);
+$row->getCell()->getActiveParagraph()->getAlignment()
+	->setMarginLeft(30)
+	->setTextDirection(\PhpOffice\PhpPresentation\Style\Alignment::TEXT_DIRECTION_VERTICAL_270);
 $row->nextCell()->createTextRun('R2C2');
 $row->nextCell()->createTextRun('R2C3');
 

samples/Sample_20_ExternalSlide.php

@@ -0,0 +1,23 @@
+<?php
+include_once 'Sample_Header.php';
+
+use PhpOffice\PhpPresentation\PhpPresentation;
+use PhpOffice\PhpPresentation\Shape\RichText;
+
+// Create new PHPPresentation object
+echo date('H:i:s') . ' Create new PHPPresentation object' . EOL;
+$objPHPPresentation = new PhpPresentation();
+$objPHPPresentation->removeSlideByIndex(0);
+
+$oReader = \PhpOffice\PhpPresentation\IOFactory::createReader('PowerPoint2007');
+$oPresentation04 = $oReader->load(__DIR__ . '/results/Sample_04_Table.pptx');
+
+foreach ($oPresentation04->getAllSlides() as $oSlide) {
+    $objPHPPresentation->addExternalSlide($oSlide);
+}
+
+// Save file
+echo write($objPHPPresentation, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}

samples/Sample_Header.php

@@ -86,6 +86,7 @@
  * @param \PhpOffice\PhpPresentation\PhpPresentation $phpPresentation
  * @param string $filename
  * @param array $writers
+ * @return string
  */
 function write($phpPresentation, $filename, $writers)
 {
@@ -113,6 +114,7 @@ function write($phpPresentation, $filename, $writers)
  * Get ending notes
  *
  * @param array $writers
+ * @return string
  */
 function getEndingNotes($writers)
 {
@@ -296,6 +298,16 @@ protected function displayPhpPresentationInfo(PhpPresentation $oPHPPpt)
                     $this->append('<dt>Background Image</dt><dd><img src="data:image/png;base64,'.base64_encode($sBkgImgContents).'"></dd>');
                 }
             }
+            $oNote = $oSlide->getNote();
+            if ($oNote->getShapeCollection()->count() > 0) {
+                $this->append('<dt>Notes</dt>');
+                foreach ($oNote->getShapeCollection() as $oShape) {
+                    if ($oShape instanceof RichText) {
+                        $this->append('<dd>' . $oShape->getPlainText() . '</dd>');
+                    }
+                }
+            }
+
             $this->append('</dl>');
             $this->append('</div>');
 

src/PhpPresentation/PhpPresentation.php

@@ -324,6 +324,8 @@ public function addExternalSlide(Slide $slide)
     {
         $slide->rebindParent($this);
 
+        $this->addMasterSlide($slide->getSlideLayout()->getSlideMaster());
+
         return $this->addSlide($slide);
     }
 
@@ -353,8 +355,8 @@ public function createMasterSlide()
      * Add masterslide
      *
      * @param  \PhpOffice\PhpPresentation\Slide\SlideMaster $slide
+     * @return \PhpOffice\PhpPresentation\Slide\SlideMaster
      * @throws \Exception
-     * @retun \PhpOffice\PhpPresentation\Slide\SlideMaster
      */
     public function addMasterSlide(SlideMaster $slide = null)
     {