Skip to content

Commit a0111be

Browse files
committed
update changelog and doc
1 parent e29a3e7 commit a0111be

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ v0.15.0 (?? ??? 2018)
1717
- Add support for MACROBUTTON field @phryneas @troosan #1021
1818
- Add support for Hyphenation @Trainmaster #1282 (Document: `autoHyphenation`, `consecutiveHyphenLimit`, `hyphenationZone`, `doNotHyphenateCaps`, Paragraph: `suppressAutoHyphens`)
1919
- Added support for Floating Table Positioning (tblpPr) @anrikun #639
20+
- Added support for Image text wrapping distance @troosan #1310
2021

2122
### Fixed
2223
- Fix reading of docx default style - @troosan #1238

docs/styles.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ Available Image style options:
154154
- ``marginTop``. Top margin in inches, can be negative.
155155
- ``width``. Width in pixels.
156156
- ``wrappingStyle``. Wrapping style, *inline*, *square*, *tight*, *behind*, or *infront*.
157+
- ``wrapDistanceTop``. Top text wrapping in pixels.
158+
- ``wrapDistanceBottom``. Bottom text wrapping in pixels.
159+
- ``wrapDistanceLeft``. Left text wrapping in pixels.
160+
- ``wrapDistanceRight``. Right text wrapping in pixels.
157161

158162
.. _numbering-level-style:
159163

tests/PhpWord/Writer/HTML/ElementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
namespace PhpOffice\PhpWord\Writer\HTML;
1919

20-
use PhpOffice\PhpWord\PhpWord;
2120
use PhpOffice\PhpWord\Element\Text as TextElement;
2221
use PhpOffice\PhpWord\Element\TrackChange;
22+
use PhpOffice\PhpWord\PhpWord;
2323
use PhpOffice\PhpWord\Writer\HTML;
2424
use PhpOffice\PhpWord\Writer\HTML\Element\Text;
2525

0 commit comments

Comments
 (0)