Skip to content

Commit f536bd6

Browse files
ivanlaninivanlanin
committed
Merge branch 'develop' into reader
2 parents 69a3a0f + ac23e90 commit f536bd6

File tree

18 files changed

+369
-48
lines changed

18 files changed

+369
-48
lines changed

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ before_script:
2222
- sudo apt-get -qq install graphviz > /dev/null
2323
## Composer
2424
- composer self-update
25-
- composer require dompdf/dompdf:0.6.*
26-
- composer update --prefer-source --dev
2725
- composer install --prefer-source --dev
2826
## PHP Copy/Paste Detector
2927
- curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar

‎CHANGELOG.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3; new r
1515
- HTML: Ability to add elements to PHPWord object via html - @basjan GH-231
1616
- ListItemRun: New element that can add a list item with inline formatting like a textrun - @basjan GH-235
1717
- Table: Ability to add table inside a cell (nested table) - @ivanlanin GH-149
18-
- RTF: UTF8 support for RTF: Internal UTF8 text is converted to Unicode before writing - @ivanlanin GH-158
18+
- RTF Writer: UTF8 support for RTF: Internal UTF8 text is converted to Unicode before writing - @ivanlanin GH-158
1919
- Table: Ability to define table width (in percent and twip) and position - @ivanlanin GH-237
20-
- RTF: Ability to add links and page breaks in RTF - @ivanlanin GH-196
20+
- RTF Writer: Ability to add links and page breaks in RTF - @ivanlanin GH-196
2121
- ListItemRun: Remove fontStyle parameter because ListItemRun is inherited from TextRun and TextRun doesn't have fontStyle - @ivanlanin
2222
- Config: Ability to use a config file to store various common settings - @ivanlanin GH-200
23-
- ODT: Enable inline font style in TextRun - @ivanlanin
24-
- ODT: Enable underline, strike/doublestrike, smallcaps/allcaps, superscript/subscript font style - @ivanlanin
25-
- ODT: Enable section and column - @ivanlanin
26-
- PDF: Add TCPDF and mPDF as optional PDF renderer library - @ivanlanin
23+
- ODT Writer: Enable inline font style in TextRun - @ivanlanin
24+
- ODT Writer: Enable underline, strike/doublestrike, smallcaps/allcaps, superscript/subscript font style - @ivanlanin
25+
- ODT Writer: Enable section and column - @ivanlanin
26+
- PDF Writer: Add TCPDF and mPDF as optional PDF renderer library - @ivanlanin
27+
- ODT Writer: Enable title element and custom document properties - @ivanlanin
28+
- ODT Reader: Ability to read standard and custom document properties - @ivanlanin
2729

2830
### Bugfixes
2931

‎composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
"require-dev": {
4040
"phpunit/phpunit": "3.7.*",
4141
"phpdocumentor/phpdocumentor":"2.*",
42-
"squizlabs/php_codesniffer": "1.*"
42+
"squizlabs/php_codesniffer": "1.*",
43+
"dompdf/dompdf":"0.6.*",
44+
"tecnick.com/tcpdf": "6.*",
45+
"mpdf/mpdf": "5.*"
4346
},
4447
"suggest": {
4548
"ext-gd2": "Required to add images",

‎composer.lock

Lines changed: 109 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/intro.rst

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,15 @@ Writers
6161
+---------------------------+----------------------+--------+-------+-------+--------+-------+
6262
| Features | | DOCX | ODT | RTF | HTML | PDF |
6363
+===========================+======================+========+=======+=======+========+=======+
64-
| **Document Properties** | Standard | ✓ | | | | |
64+
| **Document Properties** | Standard | ✓ | ✓ | | | |
6565
+---------------------------+----------------------+--------+-------+-------+--------+-------+
66-
| | Extended | ✓ | | | | |
67-
+---------------------------+----------------------+--------+-------+-------+--------+-------+
68-
| | UserDefined | ✓ | | | | |
66+
| | Custom | ✓ | ✓ | | | |
6967
+---------------------------+----------------------+--------+-------+-------+--------+-------+
7068
| **Element Type** | Text | ✓ | ✓ | ✓ | ✓ | ✓ |
7169
+---------------------------+----------------------+--------+-------+-------+--------+-------+
7270
| | Text Run | ✓ | ✓ | ✓ | ✓ | ✓ |
7371
+---------------------------+----------------------+--------+-------+-------+--------+-------+
74-
| | Title | ✓ | | | ✓ | ✓ |
72+
| | Title | ✓ | ✓ | | ✓ | ✓ |
7573
+---------------------------+----------------------+--------+-------+-------+--------+-------+
7674
| | Link | ✓ | ✓ | ✓ | ✓ | ✓ |
7775
+---------------------------+----------------------+--------+-------+-------+--------+-------+
@@ -124,9 +122,7 @@ Readers
124122
+===========================+======================+========+=======+=======+
125123
| **Document Properties** | Standard | ✓ | | |
126124
+---------------------------+----------------------+--------+-------+-------+
127-
| | Extended | ✓ | | |
128-
+---------------------------+----------------------+--------+-------+-------+
129-
| | UserDefined | ✓ | | |
125+
| | Custom | ✓ | | |
130126
+---------------------------+----------------------+--------+-------+-------+
131127
| **Element Type** | Text | ✓ | ✓ | |
132128
+---------------------------+----------------------+--------+-------+-------+

‎docs/src/documentation.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,11 @@ Below are the supported features for each file formats.
7878

7979
| Features | | DOCX | ODT | RTF | HTML | PDF |
8080
|-------------------------|--------------------|------|-----|-----|------|-----|
81-
| **Document Properties** | Standard | ✓ | | | | |
82-
| | Extended | ✓ | | | | |
83-
| | UserDefined | ✓ | | | | |
81+
| **Document Properties** | Standard | ✓ | ✓ | | | |
82+
| | Custom | ✓ | ✓ | | | |
8483
| **Element Type** | Text | ✓ | ✓ | ✓ | ✓ | ✓ |
8584
| | Text Run | ✓ | ✓ | ✓ | ✓ | ✓ |
86-
| | Title | ✓ | | | ✓ | ✓ |
85+
| | Title | ✓ | ✓ | | ✓ | ✓ |
8786
| | Link | ✓ | ✓ | ✓ | ✓ | ✓ |
8887
| | Preserve Text | ✓ | | | | |
8988
| | Text Break | ✓ | ✓ | ✓ | ✓ | ✓ |
@@ -111,8 +110,7 @@ Below are the supported features for each file formats.
111110
| Features | | DOCX | ODT | RTF |
112111
|-------------------------|--------------------|------|-----|-----|
113112
| **Document Properties** | Standard | ✓ | | |
114-
| | Extended | ✓ | | |
115-
| | UserDefined | ✓ | | |
113+
| | Custom | ✓ | | |
116114
| **Element Type** | Text | ✓ | ✓ | |
117115
| | Text Run | ✓ | | |
118116
| | Title | ✓ | ✓ | |

‎samples/Sample_Header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use PhpOffice\PhpWord\Settings;
77
use PhpOffice\PhpWord\IOFactory;
88

9-
error_reporting(E_ALL);
9+
error_reporting(E_ALL & ~E_DEPRECATED);
1010
define('CLI', (PHP_SAPI == 'cli') ? true : false);
1111
define('EOL', CLI ? PHP_EOL : '<br />');
1212
define('SCRIPT_FILENAME', basename($_SERVER['SCRIPT_FILENAME'], '.php'));

‎samples/resources/Sample_11_ReadWord2007.docx

-2.92 KB
Binary file not shown.

‎samples/resources/Sample_24_ReadODText.odt

194 Bytes
Binary file not shown.

‎src/PhpWord/Reader/ODText.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public function load($docFile)
4040

4141
$readerParts = array(
4242
'content.xml' => 'Content',
43+
'meta.xml' => 'Meta',
4344
);
4445

4546
foreach ($readerParts as $xmlFile => $partName) {

0 commit comments

Comments
 (0)