Commit Graph

65 Commits

Author SHA1 Message Date
Adrien Crivelli 25c56a3e2d
Update all PHP dependencies
This way we can share the same dependencies across PHP 7.4 to PHP 8.1,
and simplify our CI pipeline
2022-09-16 11:27:29 +02:00
Progi1984 a4cdcd6250 HTML Reader : Use `border` attribute for tables 2022-09-14 17:50:54 +02:00
Progi1984 2de551647b HTML Reader : Style page-break-after in paragraph 2022-09-06 22:05:33 +02:00
DE TROOSTEMBERGH Antoine a4055fb7a0 'normal' line-height means default line height
Add unit test
2021-04-15 21:04:45 +02:00
troosan 8bb0b73733 fix merge 2021-02-10 21:10:06 +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 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 e1bbc85cc4
Make syntax php 5.3 compliant 2021-02-08 22:40:46 +01:00
troosan cba1edc9e8
remove trailing whitespaces 2021-02-08 00:59:44 +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
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
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 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 726c8caf54 HTML checkbox input field 2020-03-01 18:15:27 +00: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 c408ac5d50 Use embedded http server to test loading of remote images 2018-12-30 14:14:27 +01:00
troosan 7aef21faca add test for parsing HTML containing entities 2018-11-28 22:03:43 +01: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
troosan da604a80c4 use annotation instead 2018-05-27 20:53:42 +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 d54cc6efee fix lint 2018-05-23 18:35:12 +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 dd27f668e0 add line height test
[ci skip]
2018-04-14 22:42:58 +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
Sam ca82e19bba support internal link in addHtml method 2018-04-07 11:24:52 +02:00
troosan f73beaa26a reset static collections at instantiation 2018-03-19 23:06:00 +01:00
troosan 16a9ded2c9 add exact line spacing test 2018-03-19 22:50:55 +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
Samuel Laulhau f3c73f333a Fix HTML parsing when style attribute is empty (#1295) 2018-02-27 23:24:00 +01:00
troosan 24f3463f9a remove output 2018-02-08 07:18:02 +01:00
troosan c0ed4ab03d Merge remote-tracking branch 'samimussbach/PHPWord/fixNestedLists' into various_html_parsing_fixes 2018-02-08 07:02:38 +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
Sami Mussbach e0096dba08 fix typo in test method name 2018-02-01 14:12:56 +01:00
Sami Mussbach 8a9a4784d9 add (failing) test and correct documentation sample to valid HTML 2018-02-01 13:58:08 +01:00