Skip to content

Commit 022cdeb

Browse files
ivanlaninivanlanin
committed
Documentation updates and test fix for #254 
1 parent ec85d7d commit 022cdeb

File tree

4 files changed

+86
-86
lines changed

4 files changed

+86
-86
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3. Four
3333
- RTF Reader: Basic RTF reader - @ivanlanin GH-72 GH-252
3434
- Element: New `Line` element - @basjan GH-253
3535
- Title: Ability to apply numbering in heading - @ivanlanin GH-193
36-
- HTML Reader: Basic HTML reader - @ivanlanin GH-80
36+
- HTML Reader: Basic HTML reader - @ivanlanin GH-80 GH-254
3737

3838
### Bugfixes
3939

‎docs/intro.rst

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -117,61 +117,61 @@ Writers
117117
Readers
118118
~~~~~~~
119119

120-
+---------------------------+----------------------+--------+-------+-------+
121-
| Features | | DOCX | ODT | RTF |
122-
+===========================+======================+========+=======+=======+
123-
| **Document Properties** | Standard | ✓ | | |
124-
+---------------------------+----------------------+--------+-------+-------+
125-
| | Custom | ✓ | | |
126-
+---------------------------+----------------------+--------+-------+-------+
127-
| **Element Type** | Text | ✓ | ✓ | ✓ |
128-
+---------------------------+----------------------+--------+-------+-------+
129-
| | Text Run | ✓ | | |
130-
+---------------------------+----------------------+--------+-------+-------+
131-
| | Title | ✓ | ✓ | |
132-
+---------------------------+----------------------+--------+-------+-------+
133-
| | Link | ✓ | | |
134-
+---------------------------+----------------------+--------+-------+-------+
135-
| | Preserve Text | ✓ | | |
136-
+---------------------------+----------------------+--------+-------+-------+
137-
| | Text Break | ✓ | | |
138-
+---------------------------+----------------------+--------+-------+-------+
139-
| | Page Break | ✓ | | |
140-
+---------------------------+----------------------+--------+-------+-------+
141-
| | List | ✓ | ✓ | |
142-
+---------------------------+----------------------+--------+-------+-------+
143-
| | Table | ✓ | | |
144-
+---------------------------+----------------------+--------+-------+-------+
145-
| | Image | ✓ | | |
146-
+---------------------------+----------------------+--------+-------+-------+
147-
| | Object | | | |
148-
+---------------------------+----------------------+--------+-------+-------+
149-
| | Watermark | | | |
150-
+---------------------------+----------------------+--------+-------+-------+
151-
| | Table of Contents | | | |
152-
+---------------------------+----------------------+--------+-------+-------+
153-
| | Header | ✓ | | |
154-
+---------------------------+----------------------+--------+-------+-------+
155-
| | Footer | ✓ | | |
156-
+---------------------------+----------------------+--------+-------+-------+
157-
| | Footnote | ✓ | | |
158-
+---------------------------+----------------------+--------+-------+-------+
159-
| | Endnote | ✓ | | |
160-
+---------------------------+----------------------+--------+-------+-------+
161-
| **Graphs** | 2D basic graphs | | | |
162-
+---------------------------+----------------------+--------+-------+-------+
163-
| | 2D advanced graphs | | | |
164-
+---------------------------+----------------------+--------+-------+-------+
165-
| | 3D graphs | | | |
166-
+---------------------------+----------------------+--------+-------+-------+
167-
| **Math** | OMML support | | | |
168-
+---------------------------+----------------------+--------+-------+-------+
169-
| | MathML support | | | |
170-
+---------------------------+----------------------+--------+-------+-------+
171-
| **Bonus** | Encryption | | | |
172-
+---------------------------+----------------------+--------+-------+-------+
173-
| | Protection | | | |
174-
+---------------------------+----------------------+--------+-------+-------+
120+
+---------------------------+----------------------+--------+-------+-------+-------+
121+
| Features | | DOCX | ODT | RTF | HTML |
122+
+===========================+======================+========+=======+=======+=======+
123+
| **Document Properties** | Standard | ✓ | | | |
124+
+---------------------------+----------------------+--------+-------+-------+-------+
125+
| | Custom | ✓ | | | |
126+
+---------------------------+----------------------+--------+-------+-------+-------+
127+
| **Element Type** | Text | ✓ | ✓ | ✓ | ✓ |
128+
+---------------------------+----------------------+--------+-------+-------+-------+
129+
| | Text Run | ✓ | | | |
130+
+---------------------------+----------------------+--------+-------+-------+-------+
131+
| | Title | ✓ | ✓ | | |
132+
+---------------------------+----------------------+--------+-------+-------+-------+
133+
| | Link | ✓ | | | |
134+
+---------------------------+----------------------+--------+-------+-------+-------+
135+
| | Preserve Text | ✓ | | | |
136+
+---------------------------+----------------------+--------+-------+-------+-------+
137+
| | Text Break | ✓ | | | |
138+
+---------------------------+----------------------+--------+-------+-------+-------+
139+
| | Page Break | ✓ | | | |
140+
+---------------------------+----------------------+--------+-------+-------+-------+
141+
| | List | ✓ | ✓ | | ✓ |
142+
+---------------------------+----------------------+--------+-------+-------+-------+
143+
| | Table | ✓ | | | ✓ |
144+
+---------------------------+----------------------+--------+-------+-------+-------+
145+
| | Image | ✓ | | | |
146+
+---------------------------+----------------------+--------+-------+-------+-------+
147+
| | Object | | | | |
148+
+---------------------------+----------------------+--------+-------+-------+-------+
149+
| | Watermark | | | | |
150+
+---------------------------+----------------------+--------+-------+-------+-------+
151+
| | Table of Contents | | | | |
152+
+---------------------------+----------------------+--------+-------+-------+-------+
153+
| | Header | ✓ | | | |
154+
+---------------------------+----------------------+--------+-------+-------+-------+
155+
| | Footer | ✓ | | | |
156+
+---------------------------+----------------------+--------+-------+-------+-------+
157+
| | Footnote | ✓ | | | |
158+
+---------------------------+----------------------+--------+-------+-------+-------+
159+
| | Endnote | ✓ | | | |
160+
+---------------------------+----------------------+--------+-------+-------+-------+
161+
| **Graphs** | 2D basic graphs | | | | |
162+
+---------------------------+----------------------+--------+-------+-------+-------+
163+
| | 2D advanced graphs | | | | |
164+
+---------------------------+----------------------+--------+-------+-------+-------+
165+
| | 3D graphs | | | | |
166+
+---------------------------+----------------------+--------+-------+-------+-------+
167+
| **Math** | OMML support | | | | |
168+
+---------------------------+----------------------+--------+-------+-------+-------+
169+
| | MathML support | | | | |
170+
+---------------------------+----------------------+--------+-------+-------+-------+
171+
| **Bonus** | Encryption | | | | |
172+
+---------------------------+----------------------+--------+-------+-------+-------+
173+
| | Protection | | | | |
174+
+---------------------------+----------------------+--------+-------+-------+-------+
175175

176176
Contributing
177177
------------

‎docs/src/documentation.md

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -111,34 +111,34 @@ Below are the supported features for each file formats.
111111

112112
### Readers
113113

114-
| Features | | DOCX | ODT | RTF |
115-
|-------------------------|--------------------|------|-----|-----|
116-
| **Document Properties** | Standard | ✓ | | |
117-
| | Custom | ✓ | | |
118-
| **Element Type** | Text | ✓ | ✓ | ✓ |
119-
| | Text Run | ✓ | | |
120-
| | Title | ✓ | ✓ | |
121-
| | Link | ✓ | | |
122-
| | Preserve Text | ✓ | | |
123-
| | Text Break | ✓ | | |
124-
| | Page Break | ✓ | | |
125-
| | List | ✓ | ✓ | |
126-
| | Table | ✓ | | |
127-
| | Image | ✓ | | |
128-
| | Object | | | |
129-
| | Watermark | | | |
130-
| | Table of Contents | | | |
131-
| | Header | ✓ | | |
132-
| | Footer | ✓ | | |
133-
| | Footnote | ✓ | | |
134-
| | Endnote | ✓ | | |
135-
| **Graphs** | 2D basic graphs | | | |
136-
| | 2D advanced graphs | | | |
137-
| | 3D graphs | | | |
138-
| **Math** | OMML support | | | |
139-
| | MathML support | | | |
140-
| **Bonus** | Encryption | | | |
141-
| | Protection | | | |
114+
| Features | | DOCX | ODT | RTF | HTML|
115+
|-------------------------|--------------------|------|-----|-----|-----|
116+
| **Document Properties** | Standard | ✓ | | | |
117+
| | Custom | ✓ | | | |
118+
| **Element Type** | Text | ✓ | ✓ | ✓ | ✓ |
119+
| | Text Run | ✓ | | | |
120+
| | Title | ✓ | ✓ | | |
121+
| | Link | ✓ | | | |
122+
| | Preserve Text | ✓ | | | |
123+
| | Text Break | ✓ | | | |
124+
| | Page Break | ✓ | | | |
125+
| | List | ✓ | ✓ | | ✓ |
126+
| | Table | ✓ | | | ✓ |
127+
| | Image | ✓ | | | |
128+
| | Object | | | | |
129+
| | Watermark | | | | |
130+
| | Table of Contents | | | | |
131+
| | Header | ✓ | | | |
132+
| | Footer | ✓ | | | |
133+
| | Footnote | ✓ | | | |
134+
| | Endnote | ✓ | | | |
135+
| **Graphs** | 2D basic graphs | | | | |
136+
| | 2D advanced graphs | | | | |
137+
| | 3D graphs | | | | |
138+
| **Math** | OMML support | | | | |
139+
| | MathML support | | | | |
140+
| **Bonus** | Encryption | | | | |
141+
| | Protection | | | | |
142142

143143
## Contributing
144144

‎tests/PhpWord/Tests/Shared/HtmlTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function testAddHtml()
5858
$section = new Section(1);
5959
$content = '';
6060
$content .= '<table><tr><th>Header</th><td>Content</td></tr></table>';
61-
$content .= '<ul><li>Bullet</li></ul>';
61+
$content .= '<ul><li>Bullet</li><ul><li>Bullet</li></ul></ul>';
6262
$content .= '<ol><li>Bullet</li></ol>';
63-
Html::addHtml($section, $content, null, array('listdepth' => 2));
63+
Html::addHtml($section, $content);
6464
}
6565
}

0 commit comments

Comments
 (0)