Commit Graph

109 Commits

Author SHA1 Message Date
DE TROOSTEMBERGH Antoine a4055fb7a0 'normal' line-height means default line height
Add unit test
2021-04-15 21:04:45 +02:00
DE TROOSTEMBERGH Antoine d731e9284f fix checkstyle issues 2021-04-14 22:15:58 +02:00
joelgo 7f78322d04
Update html.php
For acept text in line-height how "line-height:normal", etc.
2021-03-17 13:09:13 -05:00
troosan 659d3d7b4b
Update Html.php
fix
2021-02-12 20:16:18 +01:00
troosan bed1f7afbf
pass the paragraph style 2021-02-11 21:44:20 +01:00
troosan a382f9d754
fix 2021-02-11 19:25:28 +01:00
troosan d4f08a3f8a Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into tmp
Conflicts:
	tests/PhpWord/Shared/HtmlTest.php
2021-02-10 21:04:16 +01:00
troosan 81d613bc4d php 5.3 compatible code 2021-02-10 08:25:09 +01:00
troosan 4840faa422
Merge pull request #1922 from csk83/develop
Add Option for Dynamic Chart Legend Position #1699
2021-02-09 21:26:47 +01:00
troosan 1b7b43a4e5 fix code formatting 2021-02-08 22:58:14 +01:00
troosan 486321bb02
Compatibility with old PHP versions 2021-02-08 00:58:00 +01:00
troosan 6db2927484
Merge pull request #1965 from naept/feature_handle-style-inheritance-for-html
feat: Update addHtml to handle style inheritance
2021-02-08 00:51:34 +01:00
troosan 6baf287a5f
Merge branch 'develop' into udz-checkbox-feature 2021-02-07 23:30:28 +01:00
troosan 9e322dd6e7
Merge pull request #1902 from lubosdz/develop
Enhancements to addHTML parser
2021-02-07 22:53:53 +01:00
Julien Aupart b86c60694c feat: Update addHtml to handle style inheritance
The aim is to get the output closer to the source html
2020-11-09 11:41:03 +01:00
Libor M bf1bb2b7ca PHP 8.0 - fixed Error: Unknown named parameter $styles 2020-10-17 17:17:46 +02:00
Libor M 93978211a1 PHP 8.0 - depracated libxml_disable_entity_loader, is disabled by default 2020-10-17 15:48:39 +02:00
lubosdz 69632b3f03 remove extra line at the end, which possibly causes CI job fail 2020-07-22 10:46:23 +02:00
lubosdz f69885e7b9 fix bug - don't decode double quotes inside double quoted string 2020-07-22 10:04:12 +02:00
lubosdz 4448bda721 Better normalization for width of borders 2020-07-14 01:31:16 +02:00
lubosdz 70ad01550b Make scrunitizer happier 2020-07-13 19:16:38 +02:00
lubosdz 38788e0c7e Code style 2020-07-13 18:48:27 +02:00
lubosdz 889f4e3381 fix converting margin to incorrect unit (points instead of twips)
fix image alignment on float - relative to inner margin instead of page margin
2020-07-11 23:03:51 +02:00
lubosdz 3066d47003 Html parser (addHtml) - support vertical-align, valign 2020-07-11 22:47:40 +02:00
lubosdz 108c1cdc55 Html parser (addHtml) - support attributes start, type in ordered list <ol> 2020-07-11 17:20:36 +02:00
lubosdz ca5f081302 Html parser (addHtml) - support horizontal rule <hr/> 2020-07-11 15:42:28 +02:00
lubosdz e180cfe456 Html parser (addHtml) - support cellspacing, bgColor 2020-07-11 00:24:08 +02:00
lubosdz 701f770ab7 Html parser (addHtml) - support width in tables & cells 2020-07-10 23:44:25 +02:00
Matze2010 258b9a65c8 fix 2020-03-02 06:10:14 +00:00
Matze2010 ad8eeccd72 remove dead code 2020-03-02 06:00:51 +00:00
Matze2010 726c8caf54 HTML checkbox input field 2020-03-01 18:15:27 +00:00
Andrew Busel 415bdb378d
Update Html.php 2019-07-03 19:25:29 +03:00
Andrew Busel 9e93d5eae5
Update Html.php 2019-07-03 19:24:15 +03:00
arthur 2045e52db7 call static instead of self on protected method 2019-04-09 10:55:43 +02:00
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
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
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 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