PHPOffice · Progi1984 · May 4, 2014 · Jan 20, 2014 · Mar 16, 2014 · Mar 20, 2014
diff --git a/.gitignore b/.gitignore
@@ -4,13 +4,12 @@
 .Trashes
 Thumbs.db
 Desktop.ini
-.idea
-_build
-phpunit.xml
 composer.lock
 composer.phar
-vendor
-/report
-/.settings
+phpunit.xml
 /.buildpath
-/.project
+/.idea
+/.project
+/.settings
+/build
+/vendor
diff --git a/.travis.yml b/.travis.yml
@@ -18,8 +18,9 @@ before_script:
   ## Composer
   # - curl -s http://getcomposer.org/installer | php
   # - php composer.phar install --prefer-source
+  - composer self-update
+  - composer require dompdf/dompdf:0.6.*
   - composer install --prefer-source
-  - composer selfupdate --quiet
   ## PHP_CodeSniffer
   - pyrus install pear/PHP_CodeSniffer
   - phpenv rehash
@@ -37,7 +38,7 @@ before_script:
 
 script:
   ## PHP_CodeSniffer
-  - phpcs --standard=PSR2 -n src/
+  - phpcs --standard=PSR2 -n src/ --ignore=src/PhpWord/Shared/PCLZip
   - phpcs --standard=PSR2 -n tests/
   ## PHP Copy/Paste Detector
   #- php phpcpd.phar --verbose src/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,92 @@
 
 This is the changelog between releases of PHPWord. Releases are listed in reverse chronological order with the latest version listed on top, while additions/changes in each release are listed in chronological order. Changes in each release are divided into three parts: added or change features, bugfixes, and miscellaneous improvements. Each line contains short information about the change made, the person who made it, and the related issue number(s) in GitHub.
 
+## 0.10.0 - Not yet released
+
+This release marked heavy refactorings on internal code structure with the creation of some abstract classes to reduce code duplication. `Element` subnamespace is introduced in this release to replace `Section`. Word2007 reader capability is greatly enhanced. Endnote is introduced. List numbering is now customizable. Basic HTML and PDF writing support is enabled. Basic ODText reader is introduced.
+
+### Features
+
+- Image: Get image dimensions without EXIF extension - @andrew-kzoo GH-184
+- Table: Add `tblGrid` element for Libre/Open Office table sizing - @gianis6 GH-183
+- Footnote: Ability to insert textbreak in footnote `$footnote->addTextBreak()` - @ivanlanin
+- Footnote: Ability to style footnote reference mark by using `FootnoteReference` style - @ivanlanin
+- Font: Add `bgColor` to font style to define background using HEX color - @jcarignan GH-168
+- Table: Add `exactHeight` to row style to define whether row height should be exact or atLeast - @jcarignan GH-168
+- Element: New `CheckBox` element for sections and table cells - @ozilion GH-156
+- Settings: Ability to use PCLZip as alternative to ZipArchive - @bskrtich @ivanlanin GH-106 GH-140 GH-185
+- Template: Ability to find & replace variables in headers & footers - @dgudgeon GH-190
+- Template: Ability to clone & delete block of text using `cloneBlock` and `deleteBlock` - @diego-vieira GH-191
+- TOC: Ability to have two or more TOC in one document and to set min and max depth for TOC - @Pyreweb GH-189
+- Table: Ability to add footnote in table cell - @ivanlanin GH-187
+- Footnote: Ability to add image in footnote - @ivanlanin GH-187
+- ListItem: Ability to add list item in header/footer - @ivanlanin GH-187
+- CheckBox: Ability to add checkbox in header/footer - @ivanlanin GH-187
+- Link: Ability to add link in header/footer - @ivanlanin GH-187
+- Object: Ability to add object in header, footer, textrun, and footnote - @ivanlanin GH-187
+- Media: Add `Media::resetElements()` to reset all media data - @juzi GH-19
+- General: Add `Style::resetStyles()`, `Footnote::resetElements()`, and `TOC::resetTitles()` - @ivanlanin GH-187
+- DOCX Reader: Ability to read header, footer, footnotes, link, preservetext, textbreak, pagebreak, table, list, image, and title - @ivanlanin
+- Endnote: Ability to add endnotes - @ivanlanin
+- ListItem: Ability to create custom list and reset list number - @ivanlanin GH-10 GH-198
+- ODT Writer: Basic table writing support - @ivanlanin
+- Image: Keep image aspect ratio if only 1 dimension styled - @japonicus GH-194
+- HTML Writer: Basic HTML writer: text, textrun, link, title, textbreak, table, image (as Base64), footnote, endnote - @ivanlanin GH-203 GH-67 GH-147
+- PDF Writer: Basic PDF writer using DomPDF: All HTML element except image - @ivanlanin GH-68
+- DOCX Writer: Change `docProps/app.xml` `Application` to `PHPWord` - @ivanlanin
+- DOCX Writer: Create `word/settings.xml` and `word/webSettings.xml` dynamically - @ivanlanin
+- ODT Writer: Basic image writing - @ivanlanin
+- ODT Writer: Link writing - @ivanlanin
+- ODT Reader: Basic ODText Reader - @ivanlanin GH-71
+- Section: Ability to define gutter and line numbering - @ivanlanin
+- Font: Small caps, all caps, and double strikethrough - @ivanlanin GH-151
+- Settings: Ability to use measurement unit other than twips with `setMeasurementUnit` - @ivanlanin GH-199
+- Style: Remove `bgColor` from `Font`, `Table`, and `Cell` and put it into the new `Shading` style - @ivanlanin
+- Style: New `Indentation` and `Spacing` style - @ivanlanin
+- Paragraph: Ability to define first line and right indentation - @ivanlanin
+
+### Bugfixes
+
+- Footnote: Footnote content doesn't show footnote reference number - @ivanlanin GH-170
+- Documentation: Error in a function - @theBeerNut GH-195
+
+### Deprecated
+
+- `createTextRun` replaced by `addTextRun`
+- `createFootnote` replaced by `addFootnote`
+- `createHeader` replaced by `addHeader`
+- `createFooter` replaced by `addFooter`
+- `createSection` replaced by `addSection`
+- `Element\Footnote::getReferenceId` replaced by `Element\AbstractElement::getRelationId`
+- `Element\Footnote::setReferenceId` replaced by `Element\AbstractElement::setRelationId`
+- `Footnote::addFootnoteLinkElement` replaced by `Media::addElement`
+- `Footnote::getFootnoteLinkElements` replaced by `Media::getElements`
+- All current methods on `Media`
+- `Element\Link::getLinkSrc` replaced by `Element\Link::getTarget`
+- `Element\Link::getLinkName` replaced by `Element\Link::getText`
+- `Style\Cell::getDefaultBorderColor`
+
+### Miscellaneous
+
+- Documentation: Simplify page level docblock - @ivanlanin GH-179
+- Writer: Refactor writer classes and create a new `Write\AbstractWriter` abstract class - @ivanlanin GH-160
+- General: Refactor folders: `Element` and `Exception` - @ivanlanin GH-187
+- General: Remove legacy `HashTable` and `Shared\ZipStreamWrapper` and all related properties/methods - @ivanlanin GH-187
+- Element: New `AbstractElement` abstract class - @ivanlanin GH-187
+- Media: Refactor media class to use one method for all docPart (section, header, footer, footnote) - @ivanlanin GH-187
+- General: Remove underscore prefix from all private properties name - @ivanlanin GH-187
+- General: Move Section `Settings` to `Style\Section` - @ivanlanin GH-187
+- General: Give `Abstract` prefix and `Interface` suffix for all abstract classes and interfaces as per [PHP-FIG recommendation](https://github.com/php-fig/fig-standards/blob/master/bylaws/002-psr-naming-conventions.md) - @ivanlanin GH-187
+- Style: New `Style\AbstractStyle` abstract class - @ivanlanin GH-187
+- Writer: New 'ODText\Base` class - @ivanlanin GH-187
+- General: Rename `Footnote` to `Footnotes` to reflect the nature of collection - @ivanlanin
+- General: Add some unit tests for Shared & Element (100%!) - @Progi1984
+- Test: Add some samples and tests for image wrapping style - @brunocasado GH-59
+- Refactor: Remove Style\Tabs - @ivanlanin
+- Refactor: Apply composite pattern for writers - @ivanlanin
+- Refactor: Split `AbstractContainer` from `AbstractElement` - @ivanlanin
+- Refactor: Apply composite pattern for Word2007 reader - @ivanlanin
+
 ## 0.9.1 - 27 Mar 2014
 
 This is a bugfix release for PSR-4 compatibility.

diff --git a/license.md → LICENSE.md b/license.md → LICENSE.md
diff --git a/README.md b/README.md
@@ -1,111 +1,112 @@
-# ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
-
-[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
-[![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
-[![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads.png)](https://packagist.org/packages/phpoffice/phpword)
-[![Latest Unstable Version](https://poser.pugx.org/phpoffice/phpword/v/unstable.png)](https://packagist.org/packages/phpoffice/phpword)
-[![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
-
-
-PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), and [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF).
-
-With PHPWord, you can create DOCX, ODT, or RTF documents dynamically using your PHP 5.3+ scripts. Below are some of the things that you can do with PHPWord library:
-
-* Set document properties, e.g. title, subject, and creator.
-* Create document sections with different settings, e.g. portrait/landscape, page size, and page numbering
-* Create header and footer for each sections
-* Set default font type, font size, and paragraph style
-* Use UTF-8 and East Asia fonts/characters
-* Define custom font styles (e.g. bold, italic, color) and paragraph styles (e.g. centered, multicolumns, spacing) either as named style or inline in text
-* Insert paragraphs, either as a simple text or complex one (a text run) that contains other elements
-* Insert titles (headers) and table of contents
-* Insert text breaks and page breaks
-* Insert and format images, either local, remote, or as page watermarks
-* Insert binary OLE Objects such as Excel or Visio
-* Insert and format table with customized properties for each rows (e.g. repeat as header row) and cells (e.g. background color, rowspan, colspan)
-* Insert list items as bulleted, numbered, or multilevel
-* Insert hyperlinks
-* Create document from templates
-* Use XSL 1.0 style sheets to transform main document part of OOXML template
-* ... and many more features on progress
-
-__Want to contribute?__ [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us.
-
-## Requirements
-* PHP 5.3+
-* PHP [Zip](http://php.net/manual/en/book.zip.php) extension
-* PHP [XML Parser](http://www.php.net/manual/en/xml.installation.php) extension
-
-### Optional PHP extensions
-* PHP [GD](http://php.net/manual/en/book.image.php) extension
-* PHP [XMLWriter](http://php.net/manual/en/book.xmlwriter.php) extension
-* PHP [XSL](http://php.net/manual/en/book.xsl.php) extension
-
-## Installation
-
-It is recommended that you install the PHPWord library [through composer](http://getcomposer.org/). To do so, add
-the following lines to your ``composer.json``.
-
-```json
-{
-    "require": {
-       "phpoffice/phpword": "dev-master"
-    }
-}
-```
-
-Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPWord/releases).
-In this case, you will have to register the autoloader.
-
-```php
-require_once 'path/to/PhpWord/src/PhpWord/Autoloader.php';
-PhpOffice\PhpWord\Autoloader::register();
-```
-
-## Basic usage
-
-The following is a basic example of the PHPWord library. More examples are provided in the [samples folder](samples/).
-
-```php
-$phpWord = new \PhpOffice\PhpWord\PhpWord();
-
-// Every element you want to append to the word document is placed in a section.
-// To create a basic section:
-$section = $phpWord->createSection();
-
-// After creating a section, you can append elements:
-$section->addText('Hello world!');
-
-// You can directly style your text by giving the addText function an array:
-$section->addText('Hello world! I am formatted.',
-    array('name'=>'Tahoma', 'size'=>16, 'bold'=>true));
-
-// If you often need the same style again you can create a user defined style
-// to the word document and give the addText function the name of the style:
-$phpWord->addFontStyle('myOwnStyle',
-    array('name'=>'Verdana', 'size'=>14, 'color'=>'1B2232'));
-$section->addText('Hello world! I am formatted by a user defined style',
-    'myOwnStyle');
-
-// You can also put the appended element to local object like this:
-$fontStyle = new \PhpOffice\PhpWord\Style\Font();
-$fontStyle->setBold(true);
-$fontStyle->setName('Verdana');
-$fontStyle->setSize(22);
-$myTextElement = $section->addText('Hello World!');
-$myTextElement->setFontStyle($fontStyle);
-
-// Finally, write the document:
-$objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'Word2007');
-$objWriter->save('helloWorld.docx');
-
-$objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'ODText');
-$objWriter->save('helloWorld.odt');
-
-$objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'RTF');
-$objWriter->save('helloWorld.rtf');
-```
-
-## Documentation
-
-__Want to know more?__ Read the full documentation of PHPWord on [Read The Docs](http://phpword.readthedocs.org/).
+# ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
+
+[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
+[![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
+[![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads.png)](https://packagist.org/packages/phpoffice/phpword)
+[![Latest Unstable Version](https://poser.pugx.org/phpoffice/phpword/v/unstable.png)](https://packagist.org/packages/phpoffice/phpword)
+[![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
+
+
+PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), and [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF).
+
+With PHPWord, you can create DOCX, ODT, or RTF documents dynamically using your PHP 5.3+ scripts. Below are some of the things that you can do with PHPWord library:
+
+* Set document properties, e.g. title, subject, and creator.
+* Create document sections with different settings, e.g. portrait/landscape, page size, and page numbering
+* Create header and footer for each sections
+* Set default font type, font size, and paragraph style
+* Use UTF-8 and East Asia fonts/characters
+* Define custom font styles (e.g. bold, italic, color) and paragraph styles (e.g. centered, multicolumns, spacing) either as named style or inline in text
+* Insert paragraphs, either as a simple text or complex one (a text run) that contains other elements
+* Insert titles (headers) and table of contents
+* Insert text breaks and page breaks
+* Insert and format images, either local, remote, or as page watermarks
+* Insert binary OLE Objects such as Excel or Visio
+* Insert and format table with customized properties for each rows (e.g. repeat as header row) and cells (e.g. background color, rowspan, colspan)
+* Insert list items as bulleted, numbered, or multilevel
+* Insert hyperlinks
+* Insert footnotes and endnotes
+* Create document from templates
+* Use XSL 1.0 style sheets to transform main document part of OOXML template
+* ... and many more features on progress
+
+__Want to contribute?__ [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us.
+
+## Requirements
+* PHP 5.3+
+* PHP [Zip](http://php.net/manual/en/book.zip.php) extension
+* PHP [XML Parser](http://www.php.net/manual/en/xml.installation.php) extension
+
+### Optional PHP extensions
+* PHP [GD](http://php.net/manual/en/book.image.php) extension
+* PHP [XMLWriter](http://php.net/manual/en/book.xmlwriter.php) extension
+* PHP [XSL](http://php.net/manual/en/book.xsl.php) extension
+
+## Installation
+
+It is recommended that you install the PHPWord library [through composer](http://getcomposer.org/). To do so, add
+the following lines to your ``composer.json``.
+
+```json
+{
+    "require": {
+       "phpoffice/phpword": "dev-master"
+    }
+}
+```
+
+Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPWord/releases).
+In this case, you will have to register the autoloader.
+
+```php
+require_once 'path/to/PhpWord/src/PhpWord/Autoloader.php';
+\PhpOffice\PhpWord\Autoloader::register();
+```
+
+## Basic usage
+
+The following is a basic example of the PHPWord library. More examples are provided in the [samples folder](samples/).
+
+```php
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+// Every element you want to append to the word document is placed in a section.
+// To create a basic section:
+$section = $phpWord->addSection();
+
+// After creating a section, you can append elements:
+$section->addText('Hello world!');
+
+// You can directly style your text by giving the addText function an array:
+$section->addText('Hello world! I am formatted.',
+    array('name'=>'Tahoma', 'size'=>16, 'bold'=>true));
+
+// If you often need the same style again you can create a user defined style
+// to the word document and give the addText function the name of the style:
+$phpWord->addFontStyle('myOwnStyle',
+    array('name'=>'Verdana', 'size'=>14, 'color'=>'1B2232'));
+$section->addText('Hello world! I am formatted by a user defined style',
+    'myOwnStyle');
+
+// You can also put the appended element to local object like this:
+$fontStyle = new \PhpOffice\PhpWord\Style\Font();
+$fontStyle->setBold(true);
+$fontStyle->setName('Verdana');
+$fontStyle->setSize(22);
+$myTextElement = $section->addText('Hello World!');
+$myTextElement->setFontStyle($fontStyle);
+
+// Finally, write the document:
+$objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'Word2007');
+$objWriter->save('helloWorld.docx');
+
+$objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'ODText');
+$objWriter->save('helloWorld.odt');
+
+$objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'RTF');
+$objWriter->save('helloWorld.rtf');
+```
+
+## Documentation
+
+__Want to know more?__ Read the full documentation of PHPWord on [Read The Docs](http://phpword.readthedocs.org/).
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     ],
     "homepage": "http://phpoffice.github.io",
     "type": "library",
-    "license": "LGPL-3.0+",
+    "license": "LGPL-2.1+",
     "authors": [
         {
             "name": "Mark Baker"
@@ -25,6 +25,10 @@
         {
             "name": "Ivan Lanin",
             "homepage": "http://ivan.lanin.org"
+        },
+        {
+            "name": "Roman Syroeshko",
+            "homepage": "http://ru.linkedin.com/pub/roman-syroeshko/34/a53/994/"
         }
     ],
     "require": {
@@ -36,9 +40,10 @@
         "phpunit/phpunit": "3.7.*"
     },
     "suggest": {
-        "ext-gd2": "*",
-        "ext-xmlwriter": "*",
-        "ext-xsl": "*"
+        "ext-gd2": "Required to add images",
+        "ext-xmlwriter": "Required to write DOCX and ODT",
+        "ext-xsl": "Required to apply XSL style sheet to template part",
+        "dompdf/dompdf": "Required to write PDF"
     },
     "autoload": {
         "psr-4": {