Merge branch 'master' of https://github.com/PHPOffice/PHPWord

Conflicts:
	.gitignore
	Classes/PHPWord.php
	Classes/PHPWord/Section.php
	Classes/PHPWord/Section/Footer.php
	Classes/PHPWord/Section/Header.php
	Classes/PHPWord/Section/Table/Cell.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Shared/String.php
	Classes/PHPWord/Style/Cell.php
	Classes/PHPWord/Style/Paragraph.php
	Classes/PHPWord/Template.php
	Classes/PHPWord/Writer/Word2007.php
	Classes/PHPWord/Writer/Word2007/Base.php
	Classes/PHPWord/Writer/Word2007/Document.php
	Examples/AdvancedTable.php
	Examples/BasicTable.php
	Examples/HeaderFooter.php
	Examples/Link.php
	Examples/ListItem.php
	Examples/Object.php
	Examples/Section.php
	Examples/Template.php
	Examples/Textrun.php
	Examples/TitleTOC.php
	Examples/Watermark.php
	Examples/_earth.JPG
	Examples/_mars.jpg
	Examples/_sheet.xls
	changelog.txt
	samples/old/AdvancedTable.php
	samples/old/BasicTable.php
	samples/old/Image.php
	samples/old/Link.php
	samples/old/ListItem.php
	samples/old/Object.php
	samples/old/Section.php
	samples/old/Template.php
	samples/old/Textrun.php
	samples/old/TitleTOC.php
	samples/old/Watermark.php
	samples/old/_earth.jpg
	samples/old/_mars.jpg
	samples/old/_sheet.xls
	src/Examples/AdvancedTable.php
	src/Examples/BasicTable.php
	src/Examples/Link.php
	src/Examples/ListItem.php
	src/Examples/Object.php
	src/Examples/Section.php
	src/Examples/Template.php
	src/Examples/Textrun.php
	src/Examples/TitleTOC.php
	src/Examples/Watermark.php
	src/Examples/_earth.JPG
	src/Examples/_mars.jpg
	src/Examples/_sheet.xls

Author: Gabriel Bull

.gitignore

@@ -13,3 +13,8 @@ vendor
 /.buildpath
 /.project
 /docs
+*.odt
+*.docx
+*.rtf
+*.txt
+*.xml

.travis.yml

@@ -26,14 +26,14 @@ before_script:
 
 script:
   ## PHP_CodeSniffer
-  - phpcs --standard=PSR1 src/
-  - phpcs --standard=PSR2 src/
+  - phpcs --standard=PSR1 Classes/
+  - phpcs --standard=PSR2 Classes/
   ## PHP Copy/Paste Detector
-  - php phpcpd.phar --verbose src/
+  - php phpcpd.phar --verbose Classes/
   ## PHP Mess Detector
-  - phpmd src/ text codesize,unusedcode,naming,design
+  - phpmd Classes/ text codesize,unusedcode,naming,design
   ## PHPLOC
-  - php phploc.phar src/
+  - php phploc.phar Classes/
 
 notifications:
   email:

Classes/PHPWord.php

@@ -0,0 +1,229 @@
+<?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2011 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 010 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    Beta 0.6.3, 08.07.2011
+ */
+
+/** PHPWORD_BASE_PATH */
+if(!defined('PHPWORD_BASE_PATH')) {
+    define('PHPWORD_BASE_PATH', dirname(__FILE__) . '/');
+    require PHPWORD_BASE_PATH . 'PHPWord/Autoloader.php';
+    PHPWord_Autoloader::Register();
+}
+
+
+/**
+ * PHPWord
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2011 PHPWord
+ */
+class PHPWord {
+	
+	/**
+	 * Document properties
+	 *
+	 * @var PHPWord_DocumentProperties
+	 */
+	private $_properties;
+	
+	/**
+	 * Default Font Name
+	 *
+	 * @var string
+	 */
+	private $_defaultFontName;
+	
+	/**
+	 * Default Font Size
+	 *
+	 * @var int
+	 */
+	private $_defaultFontSize;
+	
+	/**
+	 * Collection of section elements
+	 *
+	 * @var array
+	 */
+	private $_sectionCollection = array();
+
+	
+	/**
+	 * Create a new PHPWord Document
+	 */
+	public function __construct() {
+		$this->_properties = new PHPWord_DocumentProperties();
+		$this->_defaultFontName = 'Arial';
+		$this->_defaultFontSize = 20;
+	}
+
+	/**
+	 * Get properties
+	 * @return PHPWord_DocumentProperties
+	 */
+	public function getProperties() {
+		return $this->_properties;
+	}
+	
+	/**
+	 * Set properties
+	 *
+	 * @param PHPWord_DocumentProperties $value
+	 * @return PHPWord
+	 */
+	public function setProperties(PHPWord_DocumentProperties $value) {
+		$this->_properties = $value;
+		return $this;
+	}
+	
+	/**
+	 * Create a new Section
+	 * 
+	 * @param PHPWord_Section_Settings $settings
+	 * @return PHPWord_Section
+	 */
+	public function createSection($settings = null) {
+		$sectionCount = $this->_countSections() + 1;
+		
+		$section = new PHPWord_Section($sectionCount, $settings);
+		$this->_sectionCollection[] = $section;
+		return $section;
+	}
+	
+	/**
+	 * Get default Font name
+	 * @return string
+	 */
+	public function getDefaultFontName() {
+		return $this->_defaultFontName;
+	}
+	
+	/**
+	 * Set default Font name
+	 * @param string $pValue
+	 */
+	public function setDefaultFontName($pValue) {
+		$this->_defaultFontName = $pValue;
+	}
+	
+	/**
+	 * Get default Font size
+	 * @return string
+	 */
+	public function getDefaultFontSize() {
+		return $this->_defaultFontSize;
+	}
+	
+	/**
+	 * Set default Font size
+	 * @param int $pValue
+	 */
+	public function setDefaultFontSize($pValue) {
+		$pValue = $pValue * 2;
+		$this->_defaultFontSize = $pValue;
+	}
+	
+	/**
+	 * Adds a paragraph style definition to styles.xml
+	 * 
+	 * @param $styleName string
+	 * @param $styles array
+	 */
+	public function addParagraphStyle($styleName, $styles) {
+		PHPWord_Style::addParagraphStyle($styleName, $styles);
+	}
+	
+	/**
+	 * Adds a font style definition to styles.xml
+	 * 
+	 * @param $styleName string
+	 * @param $styles array
+	 */
+	public function addFontStyle($styleName, $styleFont, $styleParagraph = null) {
+		PHPWord_Style::addFontStyle($styleName, $styleFont, $styleParagraph);
+	}
+	
+	/**
+	 * Adds a table style definition to styles.xml
+	 * 
+	 * @param $styleName string
+	 * @param $styles array
+	 */
+	public function addTableStyle($styleName, $styleTable, $styleFirstRow = null) {
+		PHPWord_Style::addTableStyle($styleName, $styleTable, $styleFirstRow);
+	}
+	
+	/**
+	 * Adds a heading style definition to styles.xml
+	 * 
+	 * @param $titleCount int
+	 * @param $styles array
+	 */
+	public function addTitleStyle($titleCount, $styleFont, $styleParagraph = null) {
+		PHPWord_Style::addTitleStyle($titleCount, $styleFont, $styleParagraph);
+	}
+	
+	/**
+	 * Adds a hyperlink style to styles.xml
+	 * 
+	 * @param $styleName string
+	 * @param $styles array
+	 */
+	public function addLinkStyle($styleName, $styles) {
+		PHPWord_Style::addLinkStyle($styleName, $styles);
+	}
+	
+	/**
+	 * Get sections
+	 * @return PHPWord_Section[]
+	 */
+	public function getSections() {
+		return $this->_sectionCollection;
+	}
+	
+	/**
+	 * Get section count
+	 * @return int
+	 */
+	private function _countSections() {
+		return count($this->_sectionCollection);
+	}
+    
+    /**
+     * Load a Template File
+     * 
+     * @param string $strFilename
+     * @return PHPWord_Template
+     */
+    public function loadTemplate($strFilename) {
+        if(file_exists($strFilename)) {
+            $template = new PHPWord_Template($strFilename);
+            return $template;
+        } else {
+            trigger_error('Template file '.$strFilename.' not found.', E_USER_ERROR);
+        }
+    }
+}

src/PHPWord/Autoloader.php renamed to Classes/PHPWord/Autoloader.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2009 - 2010 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2009 - 2010 PHPWord (http://www.codeplex.com/PHPWord)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+/**
+ * PHPWord_Exception
+ *
+ * @category PHPWord
+ * @package PHPWord
+ * @copyright Copyright (c) 2006 - 2013 PHPWord (http://www.codeplex.com/PHPWord)
+ */
+class PHPWord_Exception extends Exception {
+  /**
+   * Error handler callback
+   *
+   * @param mixed $code
+   * @param mixed $string
+   * @param mixed $file
+   * @param mixed $line
+   * @param mixed $context
+   */
+  public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    $e = new self($string, $code);
+    $e->line = $line;
+    $e->file = $file;
+    throw $e;
+  }
+}