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

Merge pull request #1339 from meteocontrol/feature-wrong-unit-in-image-doc 

Wrong unit in image style documentation
This commit is contained in:
troosan 2018-04-13 22:37:19 +02:00 committed by GitHub
parent 57ededeabf 833cf07c1a
commit 3380aa8b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -35,6 +35,7 @@ v0.15.0 (?? ??? 2018)
### Changed ### Changed
- Remove zend-stdlib dependency @Trainmaster #1284 - Remove zend-stdlib dependency @Trainmaster #1284
- The default unit for `\PhpOffice\PhpWord\Style\Image` changed from `px` to `pt`.
v0.14.0 (29 Dec 2017) v0.14.0 (29 Dec 2017)

4
docs/elements.rst
View File

@ -435,8 +435,8 @@ Available line style attributes:
- ``dash``. Line types: dash, rounddot, squaredot, dashdot, longdash, longdashdot, longdashdotdot. - ``dash``. Line types: dash, rounddot, squaredot, dashdot, longdash, longdashdot, longdashdotdot.
- ``beginArrow``. Start type of arrow: block, open, classic, diamond, oval. - ``beginArrow``. Start type of arrow: block, open, classic, diamond, oval.
- ``endArrow``. End type of arrow: block, open, classic, diamond, oval. - ``endArrow``. End type of arrow: block, open, classic, diamond, oval.
- ``width``. Line-object width in pt. - ``width``. Line-object width in *pt*.
- ``height``. Line-object height in pt. - ``height``. Line-object height in *pt*.
- ``flip``. Flip the line element: true, false. - ``flip``. Flip the line element: true, false.
Chart Chart

4
docs/styles.rst
View File

@ -149,10 +149,10 @@ Image
Available Image style options: Available Image style options:
- ``alignment``. See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details. - ``alignment``. See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
- ``height``. Height in pixels. - ``height``. Height in *pt*.
- ``marginLeft``. Left margin in inches, can be negative. - ``marginLeft``. Left margin in inches, can be negative.
- ``marginTop``. Top margin in inches, can be negative. - ``marginTop``. Top margin in inches, can be negative.
- ``width``. Width in pixels. - ``width``. Width in *pt*.
- ``wrappingStyle``. Wrapping style, *inline*, *square*, *tight*, *behind*, or *infront*. - ``wrappingStyle``. Wrapping style, *inline*, *square*, *tight*, *behind*, or *infront*.
- ``wrapDistanceTop``. Top text wrapping in pixels. - ``wrapDistanceTop``. Top text wrapping in pixels.
- ``wrapDistanceBottom``. Bottom text wrapping in pixels. - ``wrapDistanceBottom``. Bottom text wrapping in pixels.