Merge branch '#234-#235-basjan' into develop

ivanlanin · ivanlanin · commit 27d18fde9889 · 2014-05-11T18:12:30.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,13 +10,15 @@ This release changed PHPWord license from LGPL 2.1 to LGPL 3.
 
 - Image: Ability to define relative and absolute positioning - @basjan GH-217
 - Footer: Conform footer with header by adding firstPage, evenPage and by inheritance - @basjan @ivanlanin GH-219
-- TextBox: Ability to add textbox in section, header, and footer - @basjan @ivanlanin GH-228
+- TextBox: Ability to add textbox in section, header, and footer - @basjan @ivanlanin GH-228 GH-229
 - TextBox: Ability to add table inside textbox - @basjan GH-231
 - HTML: Ability to add elements to PHPWord object via html - @basjan GH-231
+- ListItemRun: New element that can add a list item with inline formatting like a textrun - @basjan GH-235
 
 ### Bugfixes
 
 - Header: All images added to the second header were assigned to the first header - @basjan GH-222
+- Conversion: Fix conversion from cm to pixel, pixel to cm, and pixel to point - @basjan GH-233 GH-234
 
 ### Deprecated
 
diff --git a/samples/Sample_14_ListItem.php b/samples/Sample_14_ListItem.php
@@ -54,6 +54,18 @@
 $section->addListItem('List Item 7', 0, 'myOwnStyle', $predefinedMultilevel, 'P-Style');
 $section->addTextBreak(2);
 
+$section->addText('List with inline formatting.');
+$listItemRun = $section->addListItemRun();
+$listItemRun->addText('List item 1');
+$listItemRun->addText(' in bold', array('bold'=>true));
+$listItemRun = $section->addListItemRun();
+$listItemRun->addText('List item 2');
+$listItemRun->addText(' in italic', array('italic'=>true));
+$listItemRun = $section->addListItemRun();
+$listItemRun->addText('List item 3');
+$listItemRun->addText(' underlined', array('underline'=>'dash'));
+$section->addTextBreak(2);
+
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
 if (!CLI) {
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
@@ -106,7 +106,7 @@ public function addText($text, $fontStyle = null, $paragraphStyle = null, $eleme
         $elementClass = substr(get_class($this), 0, strrpos(get_class($this), '\\')) . '\\' . $elementName;
 
         // Reset paragraph style for footnote and textrun. They have their own
-        if (in_array($this->container, array('textrun', 'footnote', 'endnote'))) {
+        if (in_array($this->container, array('textrun', 'footnote', 'endnote', 'listitemrun'))) {
             $paragraphStyle = null;
         }
 
@@ -205,6 +205,26 @@ public function addListItem($text, $depth = 0, $fontStyle = null, $listStyle = n
         return $element;
     }
 
+    /**
+     * Add listitemrun element
+     *
+     * @param int $depth
+     * @param mixed $fontStyle
+     * @param mixed $listStyle
+     * @param mixed $paragraphStyle
+     * @return \PhpOffice\PhpWord\Element\ListItemRun
+     */
+    public function addListItemRun($depth = 0, $fontStyle = null, $listStyle = null, $paragraphStyle = null)
+    {
+        $this->checkValidity('ListItemRun');
+    
+        $element = new ListItemRun($depth, $fontStyle, $listStyle, $paragraphStyle);
+        $element->setDocPart($this->getDocPart(), $this->getDocPartId());
+        $this->addElement($element);
+    
+        return $element;
+    }
+    
     /**
      * Add table element
      *
@@ -345,7 +365,7 @@ public function addTextBox($style = null)
     private function checkValidity($method)
     {
         // Valid containers for each element
-        $allContainers = array('section', 'header', 'footer', 'cell', 'textrun', 'footnote', 'endnote', 'textbox');
+        $allContainers = array('section', 'header', 'footer', 'cell', 'textrun', 'footnote', 'endnote', 'textbox', 'listitemrun');
         $validContainers = array(
             'Text'          => $allContainers,
             'Link'          => $allContainers,
@@ -354,6 +374,7 @@ private function checkValidity($method)
             'Object'        => $allContainers,
             'TextRun'       => array('section', 'header', 'footer', 'cell', 'textbox'),
             'ListItem'      => array('section', 'header', 'footer', 'cell', 'textbox'),
+            'ListItemRun'      => array('section', 'header', 'footer', 'cell', 'textbox'),
             'Table'         => array('section', 'header', 'footer', 'textbox'),
             'CheckBox'      => array('section', 'header', 'footer', 'cell'),
             'TextBox'       => array('section', 'header', 'footer', 'cell'),
@@ -395,7 +416,7 @@ private function checkValidity($method)
      */
     private function checkElementDocPart()
     {
-        $inOtherPart = in_array($this->container, array('cell', 'textrun', 'textbox'));
+        $inOtherPart = in_array($this->container, array('cell', 'textrun', 'textbox', 'listitemrun'));
         $docPart = $inOtherPart ? $this->getDocPart() : $this->container;
         $docPartId = $inOtherPart ? $this->getDocPartId() : $this->sectionId;
         $inHeaderFooter = ($docPart == 'header' || $docPart == 'footer');
diff --git a/src/PhpWord/Element/ListItemRun.php b/src/PhpWord/Element/ListItemRun.php
@@ -0,0 +1,80 @@
+<?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-2014 PHPWord contributors
+* @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+*/
+
+namespace PhpOffice\PhpWord\Element;
+
+use PhpOffice\PhpWord\Shared\String;
+use PhpOffice\PhpWord\Style\ListItem as ListItemStyle;
+use PhpOffice\PhpWord\Style\Paragraph;
+
+/**
+ * List item element
+ */
+class ListItemRun extends TextRun
+{
+    /**
+     * ListItem Style
+     *
+     * @var \PhpOffice\PhpWord\Style\ListItem
+     */
+    private $style;
+
+    /**
+     * ListItem Depth
+     *
+     * @var int
+     */
+    private $depth;
+
+    /**
+     * Create a new ListItem
+     *
+     * @param int $depth
+     * @param mixed $fontStyle
+     * @param array|string|null $listStyle
+     * @param mixed $paragraphStyle
+     */
+    public function __construct($depth = 0, $fontStyle = null, $listStyle = null, $paragraphStyle = null)
+    {
+        $this->container = 'listitemrun';
+        $this->depth = $depth;
+
+        // Version >= 0.10.0 will pass numbering style name. Older version will use old method
+        if (!is_null($listStyle) && is_string($listStyle)) {
+            $this->style = new ListItemStyle($listStyle);
+        } else {
+            $this->style = $this->setStyle(new ListItemStyle(), $listStyle, true);
+        }
+        $this->paragraphStyle = $this->setStyle(new Paragraph(), $paragraphStyle);
+    }
+
+    /**
+     * Get ListItem style
+     */
+    public function getStyle()
+    {
+        return $this->style;
+    }
+
+     /**
+     * Get ListItem depth
+     */
+    public function getDepth()
+    {
+        return $this->depth;
+    }
+}
diff --git a/src/PhpWord/Element/TextRun.php b/src/PhpWord/Element/TextRun.php
@@ -29,7 +29,7 @@ class TextRun extends AbstractContainer
      *
      * @var string|\PhpOffice\PhpWord\Style\Paragraph
      */
-    private $paragraphStyle;
+    protected $paragraphStyle;
 
     /**
      * Create new instance
diff --git a/src/PhpWord/Shared/Drawing.php b/src/PhpWord/Shared/Drawing.php
@@ -56,7 +56,7 @@ public static function emuToPixels($value = 0)
      */
     public static function pixelsToPoints($value = 0)
     {
-        return $value * 0.67777777;
+        return $value * 0.75;
     }
 
     /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Container.php b/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -41,7 +41,7 @@ public function write()
         $xmlWriter = $this->getXmlWriter();
         $container = $this->getElement();
         $containerClass = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
-        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote')) ? true : false;
+        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote', 'ListItemRun')) ? true : false;
 
         // Loop through subelements
         $subelements = $container->getElements();
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
@@ -0,0 +1,61 @@
+<?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-2014 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
+use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
+
+/**
+ * ListItemRun element writer
+ *
+ * @since 0.10.0
+ */
+class ListItemRun extends AbstractElement
+{
+    /**
+     * Write list item element
+     */
+    public function write()
+    {
+        $xmlWriter = $this->getXmlWriter();
+        $element = $this->getElement();
+
+        $xmlWriter->startElement('w:p');
+
+        $xmlWriter->startElement('w:pPr');
+        $paragraphStyle = $element->getParagraphStyle();
+        $styleWriter = new ParagraphStyleWriter($xmlWriter, $paragraphStyle);
+        $styleWriter->setIsInline(true);
+        $styleWriter->write();
+
+        $xmlWriter->startElement('w:numPr');
+        $xmlWriter->startElement('w:ilvl');
+        $xmlWriter->writeAttribute('w:val', $element->getDepth());
+        $xmlWriter->endElement(); // w:ilvl
+        $xmlWriter->startElement('w:numId');
+        $xmlWriter->writeAttribute('w:val', $element->getStyle()->getNumId());
+        $xmlWriter->endElement(); // w:numId
+        $xmlWriter->endElement(); // w:numPr
+
+        $xmlWriter->endElement(); // w:pPr
+
+        $containerWriter = new Container($xmlWriter, $element);
+        $containerWriter->write();
+
+        $xmlWriter->endElement(); // w:p
+    }
+}
diff --git a/tests/PhpWord/Tests/Element/ListItemRunTest.php b/tests/PhpWord/Tests/Element/ListItemRunTest.php
diff --git a/tests/PhpWord/Tests/Shared/DrawingTest.php b/tests/PhpWord/Tests/Shared/DrawingTest.php

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class TextRun extends AbstractContainer`
`29`	`29`	`*`
`30`	`30`	`* @var string\|\PhpOffice\PhpWord\Style\Paragraph`
`31`	`31`	`*/`
`32`		`- private $paragraphStyle;`
	`32`	`+ protected $paragraphStyle;`
`33`	`33`
`34`	`34`	`/**`
`35`	`35`	`* Create new instance`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static function emuToPixels($value = 0)`
`56`	`56`	`*/`
`57`	`57`	`public static function pixelsToPoints($value = 0)`
`58`	`58`	`{`
`59`		`- return $value * 0.67777777;`
	`59`	`+ return $value * 0.75;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`