Skip to content

Commit 3380aa8

Browse files
authored
Merge pull request #1339 from meteocontrol/feature-wrong-unit-in-image-doc
Wrong unit in image style documentation
2 parents 57edede + 833cf07 commit 3380aa8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ v0.15.0 (?? ??? 2018)
3535

3636
### Changed
3737
- Remove zend-stdlib dependency @Trainmaster #1284
38+
- The default unit for `\PhpOffice\PhpWord\Style\Image` changed from `px` to `pt`.
3839

3940

4041
v0.14.0 (29 Dec 2017)

docs/elements.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ Available line style attributes:
435435
- ``dash``. Line types: dash, rounddot, squaredot, dashdot, longdash, longdashdot, longdashdotdot.
436436
- ``beginArrow``. Start type of arrow: block, open, classic, diamond, oval.
437437
- ``endArrow``. End type of arrow: block, open, classic, diamond, oval.
438-
- ``width``. Line-object width in pt.
439-
- ``height``. Line-object height in pt.
438+
- ``width``. Line-object width in *pt*.
439+
- ``height``. Line-object height in *pt*.
440440
- ``flip``. Flip the line element: true, false.
441441

442442
Chart

docs/styles.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ Image
149149
Available Image style options:
150150

151151
- ``alignment``. See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
152-
- ``height``. Height in pixels.
152+
- ``height``. Height in *pt*.
153153
- ``marginLeft``. Left margin in inches, can be negative.
154154
- ``marginTop``. Top margin in inches, can be negative.
155-
- ``width``. Width in pixels.
155+
- ``width``. Width in *pt*.
156156
- ``wrappingStyle``. Wrapping style, *inline*, *square*, *tight*, *behind*, or *infront*.
157157
- ``wrapDistanceTop``. Top text wrapping in pixels.
158158
- ``wrapDistanceBottom``. Bottom text wrapping in pixels.

0 commit comments

Comments
 (0)