Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Documentation updates and test fix for #254

This commit is contained in:
Ivan Lanin 2014-05-31 03:28:58 +07:00
parent ec85d7d641
commit 022cdeb570
4 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -33,7 +33,7 @@ This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3. Four
- RTF Reader: Basic RTF reader - @ivanlanin GH-72 GH-252 - RTF Reader: Basic RTF reader - @ivanlanin GH-72 GH-252
- Element: New `Line` element - @basjan GH-253 - Element: New `Line` element - @basjan GH-253
- Title: Ability to apply numbering in heading - @ivanlanin GH-193 - Title: Ability to apply numbering in heading - @ivanlanin GH-193
- HTML Reader: Basic HTML reader - @ivanlanin GH-80 - HTML Reader: Basic HTML reader - @ivanlanin GH-80 GH-254
### Bugfixes ### Bugfixes

110
docs/intro.rst
View File

@ -117,61 +117,61 @@ Writers
Readers Readers
~~~~~~~ ~~~~~~~
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| Features | | DOCX | ODT | RTF | | Features | | DOCX | ODT | RTF | HTML |
+===========================+======================+========+=======+=======+ +===========================+======================+========+=======+=======+=======+
| **Document Properties** | Standard | ✓ | | | | **Document Properties** | Standard | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Custom | ✓ | | | | | Custom | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| **Element Type** | Text | ✓ | ✓ | ✓ | | **Element Type** | Text | ✓ | ✓ | ✓ | ✓ |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Text Run | ✓ | | | | | Text Run | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Title | ✓ | ✓ | | | | Title | ✓ | ✓ | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Link | ✓ | | | | | Link | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Preserve Text | ✓ | | | | | Preserve Text | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Text Break | ✓ | | | | | Text Break | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Page Break | ✓ | | | | | Page Break | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | List | ✓ | ✓ | | | | List | ✓ | ✓ | | ✓ |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Table | ✓ | | | | | Table | ✓ | | | ✓ |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Image | ✓ | | | | | Image | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Object | | | | | | Object | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Watermark | | | | | | Watermark | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Table of Contents | | | | | | Table of Contents | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Header | ✓ | | | | | Header | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Footer | ✓ | | | | | Footer | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Footnote | ✓ | | | | | Footnote | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Endnote | ✓ | | | | | Endnote | ✓ | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| **Graphs** | 2D basic graphs | | | | | **Graphs** | 2D basic graphs | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | 2D advanced graphs | | | | | | 2D advanced graphs | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | 3D graphs | | | | | | 3D graphs | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| **Math** | OMML support | | | | | **Math** | OMML support | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | MathML support | | | | | | MathML support | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| **Bonus** | Encryption | | | | | **Bonus** | Encryption | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
| | Protection | | | | | | Protection | | | | |
+---------------------------+----------------------+--------+-------+-------+ +---------------------------+----------------------+--------+-------+-------+-------+
Contributing Contributing
------------ ------------

56
docs/src/documentation.md
View File

@ -111,34 +111,34 @@ Below are the supported features for each file formats.
### Readers ### Readers
| Features | | DOCX | ODT | RTF | | Features | | DOCX | ODT | RTF | HTML|
|-------------------------|--------------------|------|-----|-----| |-------------------------|--------------------|------|-----|-----|-----|
| **Document Properties** | Standard | ✓ | | | | **Document Properties** | Standard | ✓ | | | |
| | Custom | ✓ | | | | | Custom | ✓ | | | |
| **Element Type** | Text | ✓ | ✓ | ✓ | | **Element Type** | Text | ✓ | ✓ | ✓ | ✓ |
| | Text Run | ✓ | | | | | Text Run | ✓ | | | |
| | Title | ✓ | ✓ | | | | Title | ✓ | ✓ | | |
| | Link | ✓ | | | | | Link | ✓ | | | |
| | Preserve Text | ✓ | | | | | Preserve Text | ✓ | | | |
| | Text Break | ✓ | | | | | Text Break | ✓ | | | |
| | Page Break | ✓ | | | | | Page Break | ✓ | | | |
| | List | ✓ | ✓ | | | | List | ✓ | ✓ | | ✓ |
| | Table | ✓ | | | | | Table | ✓ | | | ✓ |
| | Image | ✓ | | | | | Image | ✓ | | | |
| | Object | | | | | | Object | | | | |
| | Watermark | | | | | | Watermark | | | | |
| | Table of Contents | | | | | | Table of Contents | | | | |
| | Header | ✓ | | | | | Header | ✓ | | | |
| | Footer | ✓ | | | | | Footer | ✓ | | | |
| | Footnote | ✓ | | | | | Footnote | ✓ | | | |
| | Endnote | ✓ | | | | | Endnote | ✓ | | | |
| **Graphs** | 2D basic graphs | | | | | **Graphs** | 2D basic graphs | | | | |
| | 2D advanced graphs | | | | | | 2D advanced graphs | | | | |
| | 3D graphs | | | | | | 3D graphs | | | | |
| **Math** | OMML support | | | | | **Math** | OMML support | | | | |
| | MathML support | | | | | | MathML support | | | | |
| **Bonus** | Encryption | | | | | **Bonus** | Encryption | | | | |
| | Protection | | | | | | Protection | | | | |
## Contributing ## Contributing

4
tests/PhpWord/Tests/Shared/HtmlTest.php
View File

@ -58,8 +58,8 @@ class HtmlTest extends \PHPUnit_Framework_TestCase
$section = new Section(1); $section = new Section(1);
$content = ''; $content = '';
$content .= '<table><tr><th>Header</th><td>Content</td></tr></table>'; $content .= '<table><tr><th>Header</th><td>Content</td></tr></table>';
$content .= '<ul><li>Bullet</li></ul>'; $content .= '<ul><li>Bullet</li><ul><li>Bullet</li></ul></ul>';
$content .= '<ol><li>Bullet</li></ol>'; $content .= '<ol><li>Bullet</li></ol>';
Html::addHtml($section, $content, null, array('listdepth' => 2)); Html::addHtml($section, $content);
} }
} }