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

215 Commits

Author SHA1 Message Date
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
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
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
Libor M
9dad1d20e8 PHP 7.4 - fixed invalid value in hexdec 
avoid notice: "Invalid characters passed for attempted conversion, these have been ignored"
 2020-10-17 14:05:52 +02:00
troosan
ec1b3d35ee
Merge pull request #1818 from caugner/patch-1 
Fixes PHPDoc @param and @return types for several Converter methods
 2020-08-30 19:56:35 +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
Claas Augner
1dee5f33cf
docs(Converter): fix @param allowing float 2020-02-04 20:36:03 +01: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
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
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