Commit Graph

478 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
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
troosan dc9b1edb5b fix formatting 2021-02-06 22:50:11 +01:00
Antoine de Troostembergh 1168789e8a fix formatting 2021-02-06 21:32:30 +01:00
dbarzin 214df1a1cb fix unit test 2021-02-06 12:57:16 +01:00
troosan 4e87e72110
Merge pull request #1716 from enflow/allowImageClosure
Allow a closure to be passed with image replacement tags
2021-02-05 22:08:56 +01:00
troosan ca1272bd69
remove whitespace 2021-02-05 20:48:05 +01:00
troosan 554e90a46c
Merge pull request #1851 from oleibman/defaultpaper
Make Default Paper Configurable
2021-01-12 21:40:26 +01:00
troosan c391b90823
Merge pull request #1924 from sven-ahrens/feature/parse-shapes
Feature Request: Read shape node values
2021-01-12 21:37:23 +01:00
Libor M 293efab0c2 TCPDF doesn't support PHP 8.0, skip test 2021-01-10 14:33:13 +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 357e905e8b fix PasswordEncoder namespace 2021-01-01 16:52:15 +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 20856fc102
Merge pull request #1858 from oleibman/wordcoverage
Improve Word2007 Test Coverage
2020-12-29 23:56:22 +01:00
troosan b2335d2b73
Merge pull request #1796 from oleibman/odtchanges
ODT Changes
2020-12-29 23:18:23 +01:00
Libor M 36b63a107c skip test, because php 8.0 contain internally validation 2020-12-11 12:43:15 +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 6d49b28678 skip TCPDF test in PHP 5.3, because
version 6.3.5 doesn't support PHP 5.3, fixed via https://github.com/tecnickcom/TCPDF/pull/197, pending new release.
2020-10-18 07:47:25 +02:00
Libor M 93579e90ef forgotten condition for libxml_disable_entity_loader 2020-10-17 16:05:30 +02:00
Libor M e334ecf059 compatibility with phpmd 2.9 2020-10-17 13:39:22 +02:00
Sven Ahrens 166a136f22 Fix spacing 2020-09-02 14:36:08 +02:00
Sven Ahrens ae34ae9518 Add testcase 2020-09-02 13:03:29 +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 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
troosan 250e206b59
Merge pull request #1775 from oleibman/rtfchanges
Add support for several features for the RTF writer
2020-07-06 08:36:38 +02:00
Owen Leibman 3738a6806e Improve Word2007 Test Coverage
After this change, Writer/Word2007 is 100% covered.
One source change is required. Writer/Word2007/Style/AbstractStyle
has incorrectly searched Measurement Array using
in_array (which searches values) rather than array_key_exists (keys).
There was no test for this, and now there is.

3 changes in tests/PhpWord/_includes are borrowed from "ODT Changes"
(pull request 1796, not yet merged)
and "Fix PHPUnit Tests" (pull request 1771,
merged after work on this change was started).

Writer/Word2007/ElementTest was becoming too unwieldy. Tests for
Chart and FormFields were moved to their own members.
2020-04-27 21:29:27 -07:00
Owen Leibman ba3d616282 Improve Test Coverage
Coverage for Writer/ODText is now 100%.
2020-04-23 17:25:56 -07:00
Owen Leibman 41a5b74f93 Make Default Paper Configurable
Each section currently has a hard-coded default paper of A4.
It would make sense to allow the user to set this default,
and specify it in a configuration file, just as is done
with default font name and size.
2020-04-16 23:30:27 -07:00
Matze2010 726c8caf54 HTML checkbox input field 2020-03-01 18:15:27 +00:00
Owen Leibman 4e347b33d7 One Additional Coveralls Test
Cover one line previously omitted from coverage.
2020-02-06 23:34:24 -08:00
Owen Leibman d5149b2867 Coveralls Changes
Changes to improve test coverage based on Coveralls report.
2020-02-06 19:20:13 -08:00