Seamus Lee
607378b8fb
Ensure that entity_loader disable variable is re-set back to the original setting
...
Simplify the setting of libxml_disable_entity_loader
2019-03-31 08:31:49 +11:00
troosan
3219950d59
trim color codes and add tests
2019-02-06 22:07:42 +01:00
troosan
5206c7f690
fix parsing of border-color and add test
2019-02-06 18:19:01 +01:00
troosan
54b94be65a
fix doc
2018-12-29 23:14:18 +01:00
troosan
d8d697c848
added convertors with test
2018-12-28 18:04:36 +01:00
troosan
254d300ea7
Merge pull request #1511 from carusogabriel/ternary-expressions
...
Remove unnecessary ternary expressions
2018-12-26 23:15:49 +01:00
Maxim
d5da80b56e
Support adding images in Templates ( #1170 )
...
* setImageValue() + fix adding files via ZipArchive
* fix phpdoc variable name
* Changed logic that determines extension image file extension for document to depend on MIME type. This same logic is used in Element/Image.php
* support <w:t> tags with arguments
* allow setup size of image into template variable
* support of 'ratio' replace attribute + documentation
2018-12-26 14:35:21 +01:00
Alex Morozov
c2b54cc343
add support for hidden text ( #1527 )
...
* added hidden text word 2007
* update changelog
* update documentation
* added unit test
* docx reader
* html reader/writer
* odt writer
* updated samples
2018-12-08 23:21:59 +01:00
troosan
af5a271e9e
Line spacing is wrong when using "exact" line spacing rule ( #1509 )
...
* Only add 240 twips when in auto lineRule
* don't add 1 line when using EXACT line spacing rule
* fix style & scrutinizer warning
2018-12-03 16:09:20 +01:00
troosan
a44aee8c34
fix some sonar warnings
2018-12-01 21:13:11 +01:00
Gabriel Caruso
3cf0770376
Remove unnecessary ternary expressions
2018-11-19 01:32:28 -02:00
troosan
af4f834149
Merge branch 'develop' into develop
2018-07-14 17:12:45 +02:00
troosan
32907215ed
fix phpstan issues
2018-07-14 02:54:17 +02:00
troosan
adc1428607
use PasswordEncoder from phpoffice/common instead
2018-07-14 02:51:08 +02:00
troosan
536a1b89d7
disable entity loader
2018-07-14 00:50:01 +02:00
Javier Garcia
2593e9e200
Merge branch 'develop' of github.com:jgpATs2w/PHPWord into develop
2018-06-13 17:57:55 +02:00
Javier Garcia
fe647f6e55
fix when style line-height size comes in decimal number
2018-06-13 17:41:17 +02:00
javier
1a06173e1b
Add parsing of html image in base64 format ( #1382 )
...
* increased test coverage of new lines
* added exception control to file_get_contents error
* update changelog
2018-05-31 01:28:14 +02:00
troosan
c22f7eab5e
add check on opened file
2018-05-27 21:27:45 +02:00
Javier Garcia
65a594d271
cs-fixer fixes
2018-05-25 09:29:58 +02:00
Javier Garcia
a89e4c93a7
added exception control to file_get_contents error
2018-05-25 08:01:17 +02:00
Javier Garcia
46b7bea097
increased test coverage of new lines
2018-05-24 07:19:45 +02:00
Javier Garcia
a228811a61
fixes
2018-05-23 18:48:28 +02:00
Javier Garcia
58c6c52ee9
merged with local version
2018-05-23 18:22:54 +02:00
troosan
94be56b0ec
fix parsing of link style
2018-04-25 23:57:07 +02:00
troosan
9bc85347ef
fix code formatting
2018-04-14 21:15:36 +02:00
troosan
6ba2df474f
Merge pull request #1336 from lalop/addhtpl-bookmark
...
support internal link in addHtml method
2018-04-13 22:40:09 +02:00
troosan
57ededeabf
Merge pull request #1338 from pcworld/image-security-doc
...
Improve security-related documentation of addImage and addHtml
2018-04-13 22:36:18 +02:00
pcworld
6253adaba1
Warn about parsing user-generated HTML
2018-04-09 02:48:49 +02:00
Sam
ca82e19bba
support internal link in addHtml method
2018-04-07 11:24:52 +02:00
troosan
de01e86d41
parse fixed line space
2018-03-19 22:50:54 +01:00
troosan
97d60dd985
tranlate percentage to rate
2018-03-19 22:50:54 +01:00
troosan
997e21433c
add parsing of line-height and text-indent
2018-03-18 22:32:55 +01:00
troosan
77f2b16bc1
update copyright to 2018
2018-03-08 23:52:25 +01:00
Frank Liepert
6a6497956d
Allow to set "autoHyphenation" setting ( #1282 )
...
* Allow to set "autoHyphenation" for document
* Allow to set "consecutiveHyphenLimit" for document
* Allow to set "hyphenationZone" for document
* Allow to set "doNotHyphenateCaps" for document
* Allow to set "suppressAutoHyphens" for paragraph
* randomize the tempDir more
* Word2007 parsing title formatting (#1297 )
* Improve Title parsing
- Title should be able to contain TextRun
- Style 'Title' should be treated the same with as Heading
- Add tests for Heading/Title reader
* update the documentation and the changelog
* PHP 7.2 build should not fail anymore
* fix parsing of footnotes and endnotes
* add method to remove an element from a section
* add method to allow sorting of sections
2018-03-06 22:19:39 +01:00
Samuel Laulhau
f3c73f333a
Fix HTML parsing when style attribute is empty ( #1295 )
2018-02-27 23:24:00 +01:00
troosan
bded91af9f
Footnote in listitem ( #1289 )
...
* Allow footnote to be added in ListItems
2018-02-18 00:39:00 +01:00
troosan
304173c4d7
fix nested list
2018-02-08 07:02:28 +01:00
troosan
33739ea21c
cannot add list on textrun
2018-02-07 21:39:01 +01:00
troosan
46476d7101
update phpdoc
2018-02-07 07:09:27 +01:00
troosan
47c837abef
add unit tests
2018-02-06 23:31:56 +01:00
troosan
46a5f96d3b
fix parsing of table and p inside table cells
2018-02-06 23:16:32 +01:00
troosan
0425a25cdb
Add parsing of HTML links
2018-01-25 23:24:21 +01:00
samimussbach
4c68ebbe9d
Parse formatting inside HTML lists ( #1239 )
2018-01-13 10:03:53 +01:00
troosan
d2b9e88047
add parsing of "align" HTML attribute
2017-12-29 15:16:03 +01:00
troosan
b614497ae6
fix dependencies to have 7.1 compatible build ( #1228 )
...
* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
2017-12-29 02:30:53 +01:00
SRG Group
3e6745f146
HTML image support & TextRun paragraph style ( #934 )
...
* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
2017-12-21 00:03:52 +01:00
troosan
200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
...
enable password protection (Word)
2017-12-20 22:00:34 +01:00
Gabriel Caruso
87acd3764b
Clean elses
2017-12-14 12:21:16 -02:00
troosan
5a57409df0
fix tests
2017-12-13 23:55:48 +01:00
troosan
ad38d4c20f
Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection
2017-12-13 23:25:32 +01:00
troosan
f7d2ad7201
formatting
2017-12-13 23:24:37 +01:00
troosan
9e029415cc
align with pull request submitted in PHPOffice/Commom
2017-12-13 23:17:01 +01:00
troosan
fd156bf12a
Merge branch 'develop' into html_br
2017-12-05 20:50:13 +01:00
troosan
9081ed9868
fix warning
2017-12-05 17:40:23 +01:00
troosan
8f512bf618
Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord
...
into develop
Conflicts:
src/PhpWord/Shared/Html.php
2017-12-05 17:33:51 +01:00
troosan
cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection
2017-12-05 00:34:14 +01:00
troosan
274f50ce5a
Add unit tests & add array type checks
2017-12-04 22:30:49 +01:00
troosan
ca25eba8aa
Scrutinizer fixes
2017-11-26 22:55:37 +01:00
troosan
23bc837666
Scrutinizer fixes
2017-11-26 17:54:47 +01:00
troosan
2e562512f4
Add unit tests for PasswordEncoder
2017-11-24 14:45:05 +01:00
troosan
ad83196a05
move password encoding in separate class
...
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
troosan
e07195c512
add test, fix warnings
2017-11-22 08:14:22 +01:00
troosan
670d46e543
add getter/setter on paragraph for child spacing rule
2017-11-22 00:14:31 +01:00
troosan
ac357d10d5
Various fixes
...
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
troosan
8eb72c976a
add HTML table parsing
2017-11-15 22:49:13 +01:00
troosan
a01d22ed67
improve HTML parser and add tests
2017-11-11 23:49:23 +01:00
troosan
9e7e07d0bc
Add unit tests for Html parser
2017-11-09 00:41:56 +01:00
troosan
c8b55b8e59
Merge branch 'bring_back_bold_and_italic' of https://github.com/FBnil/PHPWord into bring_back_bold_and_italic
2017-11-08 21:46:55 +01:00
Nilton
fcdafeedd4
Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;">
2017-11-08 21:46:37 +01:00
troosan
ce377b9b58
fix php-cs error
2017-11-05 02:16:04 +01:00
troosan
0459670a9c
Enable php-cs-fixer in build & fix resulting warnings ( #1099 )
...
* enable php 7.1 build
* upgrade to dompdf/dompdf 0.8.*
* update phpunit & hide output during tests
* run code coverage analysis on 1 build only
* Add php-cs
* Update Copyright
2017-11-04 22:44:12 +01:00
Nilton
87a355bb82
Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;">
2017-10-21 00:07:52 +02:00
troosan
8ce1a19ec4
make FontStyle basedOn paragraph if the paragraph is set on the font ( #926 )
...
* make FontStyle based on paragraph if it set
* replace tab with spaces
* basedOn not correctly set if FontStyle is based on other FontStyle
* Fix warnings
2017-09-17 21:38:00 +02:00
troosan
cf76b1f217
Simplify SimpleType validation
2017-07-22 00:06:04 +02:00
troosan
8a5433e5df
add new NumberFormat values and refactor other uses
2017-07-04 15:04:30 +02:00
Roman Syroeshko
2bcfacfbf9
Updated copyright.
2016-07-31 12:35:08 +04:00
Roman Syroeshko
f359825cb7
Reviewed and merged #658 .
2016-01-23 19:16:34 +04:00
Roman Syroeshko
7bd6cbdb64
Copyright update.
2015-12-05 21:28:46 +04:00
Roman Syroeshko
43fb23d896
Copyright update.
2015-12-05 21:26:01 +04:00
Henri MEDOT
f7afdebb03
Added support for linebreaks <br /> in Shared\Html::addHtml()
2015-11-12 18:51:04 +01:00
Roman Syroeshko
94c0d02330
Next round of refactoring of alignment-related functionality.
2015-10-10 19:06:23 +04:00
Roman Syroeshko
4445fd3258
Replaced `array_key_exists` with `isset` for better performance.
2014-10-10 21:10:29 +04:00
Progi1984
90d64bd347
#23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes)
2014-08-16 12:44:12 +02:00
Progi1984
4ade9c3c6e
#23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes)
2014-08-16 12:33:37 +02:00
Progi1984
e561d54661
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop
2014-08-16 11:55:13 +02:00
Progi1984
ca69de3962
#23 : Implement Word97 aka MsDoc Reader
2014-08-15 19:26:23 +02:00
Roman Syroeshko
3d06c77fc1
Minor refactoring of "Shared\ZipArchive" class.
2014-08-10 21:01:46 +04:00
Roman Syroeshko
e6d88a27e8
Refactored usages of "tempnam()" function.
2014-08-10 20:30:14 +04:00
Roman Syroeshko
56c3d8eda2
https://github.com/PHPOffice/PHPWord/issues/310
2014-08-10 20:00:19 +04:00
Roman Syroeshko
8056b6926c
[CHANGED] Docblock for pass-by-reference parameters.
2014-07-03 16:11:15 +04:00
Roman Syroeshko
d0a609bc95
[CHANGED] Added "@return" annotation where it as missed.
2014-07-03 15:40:24 +04:00
Progi1984
b527d06608
#23 : Implement Word97 aka MsDoc Reader
2014-06-21 09:18:57 +02:00
Progi1984
71b4ac9c56
FIXED : #282 : problem converting docx to pdf
...
PHP Catchable fatal error: Argument 2 passed to DOMXPath::query() must be an instance of DOMNode, null given, called in /var/www/xxx/PhpWord/Reader/Word2007.php on line 145 and defined in /var/www/xxx/PhpWord/Shared/XMLReader.php on line 99, referer: XXX
2014-06-17 15:48:39 +02:00
Ivan Lanin
6a81691d45
#266 : Ability to add textinput, checkbox, and dropdown form elements
2014-06-16 00:31:17 +07:00
Ivan Lanin
a13e5b20f9
#278 : 3D charts and ability to set width and height
2014-06-15 20:48:26 +07:00
Ivan Lanin
0f085f71e0
Merge branch 'chart' into develop
2014-06-14 12:51:41 +07:00
Ivan Lanin
3fef19093c
#278 : Basic chart
2014-06-14 12:49:39 +07:00
Ivan Lanin
8c2b099dbc
Merge `Shared\Drawing` and `Shared\Font` into `Shared\Converter`
2014-06-14 10:54:33 +07:00
Ivan Lanin
9a5f91afc6
Merge branch 'develop' into chart
2014-06-12 12:17:49 +07:00