Merge pull request #254 from danielbair/danielbair-patch-1

Include complete manual installation instructions

Author: Progi1984

README.md

@@ -48,6 +48,8 @@ PHPPresentation requires the following:
 
 ### Installation
 
+#### Composer method
+
 It is recommended that you install the PHPPresentation library [through composer](http://getcomposer.org/). To do so, add
 the following lines to your ``composer.json``.
 
@@ -59,14 +61,25 @@ the following lines to your ``composer.json``.
 }
 ```
 
-Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPPresentation/releases).
-In this case, you will have to register the autoloader. Register autoloading is required only if you do not use composer in your project.
+#### Manual download method
+
+Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPPresentation/releases).  
+In this case, you will have to register the autoloader.  
+(Register autoloading is required only if you do not use composer in your project.)
 
 ```php
 require_once 'path/to/PhpPresentation/src/PhpPresentation/Autoloader.php';
 \PhpOffice\PhpPresentation\Autoloader::register();
 ```
 
+You will also need to download the latest PHPOffice/Common release from its [releases page](https://github.com/PHPOffice/Common/releases).  
+And you will also have to register its autoloader, too. 
+
+```php
+require_once 'path/to/PhpOffice/Common/src/Common/Autoloader.php';
+\PhpOffice\Common\Autoloader::register();
+```
+
 ## Getting started
 
 The following is a basic usage example of the PHPPresentation library.
@@ -75,6 +88,8 @@ The following is a basic usage example of the PHPPresentation library.
 // with your own install
 require_once 'src/PhpPresentation/Autoloader.php';
 \PhpOffice\PhpPresentation\Autoloader::register();
+require_once 'src/Common/Autoloader.php';
+\PhpOffice\Common\Autoloader::register();
 
 // with Composer
 require_once 'vendor/autoload.php';

src/PhpPresentation/Shape/Line.php

@@ -43,7 +43,6 @@ public function __construct($fromX, $fromY, $toX, $toY)
         $this->setOffsetY($fromY);
         $this->setWidth($toX - $fromX);
         $this->setHeight($toY - $fromY);
-
     }
 
     /**

src/PhpPresentation/Writer/ODPresentation/Content.php

@@ -1343,6 +1343,5 @@ protected function writeStylePartShadow(XMLWriter $objWriter, Shadow $oShadow)
         }
         $objWriter->writeAttribute('draw:shadow-opacity', (100 - $oShadow->getAlpha()) . '%');
         $objWriter->writeAttribute('style:mirror', 'none');
-
     }
 }

tests/PhpPresentation/Tests/Slide/TransitionTest.php

@@ -88,6 +88,5 @@ public function testTransitionType()
         $this->assertNull($object->getTransitionType());
         $this->assertInstanceOf('PhpOffice\\PhpPresentation\\Slide\\Transition', $object->setTransitionType(Transition::TRANSITION_RANDOM));
         $this->assertEquals(Transition::TRANSITION_RANDOM, $object->getTransitionType());
-
     }
 }

tests/PhpPresentation/Tests/Writer/ODPresentation/ObjectsChartTest.php

@@ -86,7 +86,6 @@ public function testAxisFont()
         $this->assertEquals('normal', $oXMLDoc->getElementAttribute($element, 'fo:font-style', 'Object 1/content.xml'));//Italic YAxis
         $this->assertEquals('16pt', $oXMLDoc->getElementAttribute($element, 'fo:font-size', 'Object 1/content.xml'));//Size YAxis
         $this->assertEquals('Arial', $oXMLDoc->getElementAttribute($element, 'fo:font-family', 'Object 1/content.xml'));//Size YAxis
-
     }
 
     public function testLegend()