Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,008 Commits 6 Branches 21 Tags
Commit Graph

87 Commits

Author SHA1 Message Date
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
troosan
9e322dd6e7
Merge pull request #1902 from lubosdz/develop 
Enhancements to addHTML parser
 2021-02-07 22:53:53 +01:00
Libor M
ea917c28da fix coverage 2021-01-10 14:06:19 +01:00
Libor M
681d5c4709 fix PHP 8.0 compatibility 2021-01-02 09:08:43 +01:00
Libor M
a2c8d8c2d5 \PhpOffice\Common\XMLWriter -> \PhpOffice\PhpWord\Shared\XMLWriter 2021-01-02 08:26:46 +01:00
Libor M
0cca050bcd \PhpOffice\Common\XMLReader -> \PhpOffice\PhpWord\Shared\XMLReader 2021-01-01 16:33:27 +01:00
Libor M
9a26ad9189 \PhpOffice\Common\Microsoft\PasswordEncoder -> \PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder 2021-01-01 16:23:58 +01:00
Libor M
b656720619 \PhpOffice\Common\Drawing -> \PhpOffice\PhpWord\Shared\Drawing 2021-01-01 16:15:24 +01:00
Libor M
c52686c243 \PhpOffice\Common\Text -> \PhpOffice\PhpWord\Shared\Text 2021-01-01 16:09:16 +01:00
troosan
b2335d2b73
Merge pull request #1796 from oleibman/odtchanges 
ODT Changes
 2020-12-29 23:18:23 +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
Owen Leibman
d5149b2867 Coveralls Changes 
Changes to improve test coverage based on Coveralls report.
 2020-02-06 19:20:13 -08:00
owen
ecfafd7576 RTF Changes 
1. Converter is currently expecting colors as strings of hex digits,
   but PhpWord allows specification of colors by named constant, so
   result is random when one of those is used. This change handles
   all the named colors.
2. Table needs \pard at end; formatting may be wrong without it.
3. RTF writer will no longer ignore paragraph style for TextRun.
4. RTF writer will no longer ignore paragraph and font style for Title.
5. Add support for RTF headers and footers.
6. Add support for right-to-left in font.
7. Add support for PageBreakBefore and LineHeight for paragraphs.
8. Add support for PageNumberingStart for sections.

There are test cases for all of these changes.
 2019-12-03 07:46:16 -08:00
owen
ebf5cf784f Convert named constant colors to RGB in Shared/Converter. 
Otherwise, colors will not be as expected for RTF and ODT.
 2019-11-19 14:24:29 -08: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
d8d697c848 added convertors with test 2018-12-28 18:04:36 +01:00
troosan
7aef21faca add test for parsing HTML containing entities 2018-11-28 22:03:43 +01:00
troosan
af4f834149
Merge branch 'develop' into develop 2018-07-14 17:12:45 +02:00
troosan
adc1428607 use PasswordEncoder from phpoffice/common instead 2018-07-14 02:51:08 +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
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