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
Michaël Dupont
aa44594ed3
fix: PHPUnit test Process() format
...
\Symfony\Component\Process\Process refuses being passed a string
with version > 5, which is installed with PHP > 7.2.5.
It also refuses being passed an array with version < 3.3, which is
installed with PHP < 5.5.9.
Solved by checking if Process::fromShellCommandLine() exists, which
was introduced in version 4.2.0.
2019-12-02 16:17:26 +01:00
Bc. Štefan Kubini
1451fadc4a
Add List for docx to html writer #1717
2019-11-28 23:33:10 +01: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
Owen Leibman
00f9bb5897
Formatting changes in source code.
2019-11-17 00:07:02 -08:00
Owen Leibman
2513e54540
Errors in RTF Escaping
...
1. Codes meant to be in hex are specified in decimal.
Consequently characters which don't need escaping are escaped.
2. Special handling (prepend backslash) needed for {, }, and .
RTF docs generated with those characters cannot be opened in Word.
3. Tab character needs to be escaped as \tab.
RTF docs drop these characters.
While running test suite, found that Writer/RTF/ElementTest was coded
only for Unix line endings, and fails on Windows. Changed so that it
would work on either.
2019-11-16 23:20:02 -08:00
Owen Leibman
a10fe823b2
Errors in RTF Escaping
...
1. Codes meant to be in hex are specified in decimal.
Consequently characters which don't need escaping are escaped.
2. Special handling (prepend backslash) needed for {, }, and \.
RTF docs generated with those characters cannot be opened in Word.
3. Tab character needs to be escaped as \tab.
RTF docs drop these characters.
While running test suite, found that Writer/RTF/ElementTest was coded
only for Unix line endings, and fails on Windows. Changed so that it
would work on either.
2019-11-16 21:37:57 -08:00
Bc. Štefan Kubini
b230242127
fixed List item fail #1711
2019-11-05 10:46:24 +01:00
Manunchik
21db2d40a4
Improve unit test
2019-10-23 13:46:58 +05:00
Manunchik
cb7ffd0ac2
Improve unit test
2019-10-23 13:44:47 +05:00
Manunchik
b0de8e7d1d
Improve unit test
2019-10-23 13:41:35 +05:00
Michel Bardelmeijer
68118685d0
Merge branch 'master' into allowImageClosure
2019-10-21 12:33:12 +02:00
Samuel BF
7628b41fdf
Add support for basic fields in RTF writer.
2019-09-10 11:24:59 +02:00
Michel Bardelmeijer
5a68ef600b
Allow a closure to be passed with image replacement tags
2019-09-09 13:49:16 +02:00
troosan
815bb52ebf
Merge pull request #1628 from waltertamboer/feature/fix-issue-1529
...
No nested w:pPr elements in ListItemRun.
2019-08-08 07:11:05 +02:00
troosan
487622bb9e
Merge pull request #1637 from bhattnishant/master
...
To support PreserveText inside sub container
2019-08-08 07:08:13 +02:00
troosan
d7ed18c39d
fix test
2019-06-14 00:19:44 +02:00
troosan
3c6a1a1568
add unit test
2019-06-13 23:03:09 +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
Maxim
8931ab12b2
Merge branch 'develop' into html_writer_auto_invert_text_color
2019-03-01 16:33:50 +02:00
Maxim Bulygin
57ae7008b2
add test to auto invert text color
2019-03-01 16:31:47 +02:00
Nick Winfield
81a1b2acff
TrackChange doesn't handle all return types of \DateTime::createFromFormat(...) ( #1584 )
...
* Added boolean check before setting the date
2019-02-24 00:24:49 +01: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
e3020c0db3
fix warnings
2019-02-05 23:05:18 +01:00
troosan
235cc1205c
implement support for section vAlign
2019-02-05 21:42:14 +01:00
troosan
58a2849e38
Add reading of the settings part
2019-02-04 23:59:37 +01:00
troosan
bc448aed6c
improve code coverage
2019-02-04 21:53:19 +01:00
troosan
67f3bd369c
Add methods to replace macro with ComplexType
2019-01-31 01:26:19 +01:00
troosan
1956908aa7
Merge remote-tracking branch
...
'geraldb-nicat/PHPWord/templateProcessingViaArray' into develop
Conflicts:
docs/templates-processing.rst
2019-01-03 18:57:00 +01:00
troosan
f91863ed64
Add RTL aligning of tables
2019-01-03 11:33:56 +01:00
troosan
c408ac5d50
Use embedded http server to test loading of remote images
2018-12-30 14:14:27 +01:00
troosan
54e7c6dd5a
don't default styles to false
...
this allows us to for instance make part of a Heading not bold, which
would otherwise be the default.
2018-12-30 00:45:45 +01:00
troosan
481f2c7310
fix code indenting
2018-12-29 23:30:23 +01:00
troosan
23407c99dd
Add unit tests
2018-12-29 22:03:01 +01:00
troosan
b2c627d57c
Merge branch 'parsing_heading2' develop
...
Conflicts:
src/PhpWord/Reader/Word2007/Styles.php
tests/PhpWord/Reader/Word2007/StyleTest.php
2018-12-28 22:33:48 +01:00
troosan
d8d697c848
added convertors with test
2018-12-28 18:04:36 +01:00
troosan
7790b6a6b0
Pass values to replace macros with in cloneBlock
2018-12-27 22:13:48 +01:00
troosan
75620caf51
add parameter to keep backward compatibility + add test
2018-12-27 01:44:37 +01:00
troosan
1bcef04ddc
Merge remote-tracking branch 'JPBetley/PHPWord/clone-block-variables' into rebase_pull_request
2018-12-27 01:29:51 +01:00
troosan
1717bd4978
add test for cloneBlock operation
2018-12-27 00:30:04 +01:00
troosan
bbe517aa60
Merge pull request #1541 from morrisdj/develop
...
Add "Plain Text" type to SDT (Structured Document Tags)
2018-12-26 23:16:06 +01:00
troosan
254d300ea7
Merge pull request #1511 from carusogabriel/ternary-expressions
...
Remove unnecessary ternary expressions
2018-12-26 23:15:49 +01:00
troosan
d84da93a36
Add test and fix warnings
2018-12-26 22:50:19 +01:00
troosan
8ffaa1c8b7
add test to cover get TemplateProcessor::getVariables
2018-12-26 22:27:17 +01:00
Daniel Morris
a5ec49d99d
Add plain text SDT type
2018-12-26 21:45:32 +02: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
troosan
b188ab94e1
Merge branch 'develop' into add-getVariableCount-method
2018-12-11 21:31:18 +01:00
Nathan Dench
cf3132acac
Add ability to pass a Style object to a Section element ( #1416 )
...
* Add ability to pass a Style object to a Section
* Fix typo
* update changelog
2018-12-08 23:35:32 +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
Yurii.sio2
260bb75fc2
Fix TemplateProcessor :: fixBrokenMacros; ( #1502 )
...
* Fix TemplateProcessor :: fixBrokenMacros;
* add unit test for fixBrokenMacros
2018-12-07 23:22:04 +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
d9165f00fa
Merge pull request #1513 from carusogabriel/phpunit
...
Use dedicated PHPUnit assertions
2018-11-30 22:58:01 +01:00
troosan
f472bfbc75
Merge branch 'develop' into add_html_table_layout
2018-11-28 22:58:29 +01:00
troosan
b50de97a41
support `auto` table layout too
2018-11-28 22:54:57 +01:00
troosan
7aef21faca
add test for parsing HTML containing entities
2018-11-28 22:03:43 +01:00
Gabriel Caruso
663fb036d0
Use dedicated PHPUnit assertions
2018-11-19 01:36:23 -02:00
Gabriel Caruso
3cf0770376
Remove unnecessary ternary expressions
2018-11-19 01:32:28 -02:00
troosan
9f28ece4e9
Fix path to test document
2018-11-16 22:40:37 +01:00
Martin Hanzl
7eb19c8f76
add test case for issue #1253
2018-10-11 09:40:12 +02:00
Abubakkar Rangara
e61c40e71d
Adding table layout to the generated HTML if element has layout style. This is useful when using creating PDF from PHPWord (e.g. using dompdf), otherwise the PDF does not contain any layout for table.
2018-07-24 13:59:16 +01:00
troosan
aa49536e3e
Merge branch 'develop' into add-getVariableCount-method
2018-07-21 14:48:24 +02:00
troosan
18c26f9218
Merge pull request #1436 from begnini/fixing_title
...
HTML Title Writer loses text when Title contains a TextRun instead a string.
2018-07-19 02:00:36 +02:00
troosan
e07c6559a9
adapt test
2018-07-19 00:52:22 +02:00
Humberto Pereira
8c62cea580
Fix Writer losing text when Title contains a TextRun instead a string.
2018-07-17 21:10:53 -04:00
Humberto Pereira
f5e3807654
Improving Style Parsing - handling Heading style
2018-07-17 19:35:31 -04:00
troosan
affccc7937
Merge branch 'improve-cloneBlock-regex' of https://github.com/nicoder/PHPWord into fix_clone_block
2018-07-17 08:03:35 +02:00
troosan
fe454dbaf3
Merge pull request #1428 from troosan/parse_short_lang_code
...
Allow passing short lang code
2018-07-14 18:11:50 +02:00
troosan
87498e43e1
Allow passing short lang code
2018-07-14 17:21:30 +02:00
troosan
af4f834149
Merge branch 'develop' into develop
2018-07-14 17:12:45 +02:00
troosan
de83da2bbf
Merge branch 'develop' into parse_drawings
2018-07-14 03:30:11 +02:00
troosan
32907215ed
fix phpstan issues
2018-07-14 02:54:17 +02:00
troosan
adc1428607
use PasswordEncoder from phpoffice/common instead
2018-07-14 02:51:08 +02:00
smaug1985
3906be19ee
Added Support for Indentation & Tabs on RTF Writer. ( #1405 )
...
* Added Support for Indentation & Tabs on RTF Writer.
* add decimal tab writer + tests
* Update CHANGELOG.md
2018-07-14 02:13:45 +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
troosan
5b9719071e
remove unused imports
2018-06-03 22:36:30 +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
JAEK-S
65b0f062ad
New features when creating charts ( #1332 )
...
* add stacked bar and column charts
* add chart colors feature
* adding preliminary chart axis title functionality to XMLwriter
* added percent_stacked to available types array
* Make tick mark and tick label positions configurable
* scrutinizer fixes
* update changelog
2018-05-11 22:50:19 +02:00
troosan
94be56b0ec
fix parsing of link style
2018-04-25 23:57:07 +02:00
troosan
84fa44090f
Merge pull request #1343 from meteocontrol/feature-add-table-indent-option
...
Add support for table indent
2018-04-25 22:37:16 +02:00
troosan
c52c96d657
add support for STYLEREF field
2018-04-17 07:34:57 +02:00
troosan
b394247740
Merge branch 'develop' into feature-add-table-indent-option
2018-04-14 22:46:09 +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
Frank Liepert
081c6722f6
Add support for table indent
2018-04-11 10:06:58 +02:00
Sam
ca82e19bba
support internal link in addHtml method
2018-04-07 11:24:52 +02:00
troosan
566e625b85
merge/add test/cleanup
2018-03-25 22:46:50 +02:00
troosan
d7fc1a5f7b
Merge branch 'develop' into develop
2018-03-20 21:49:36 +01:00
troosan
296706aa03
add unit tests
2018-03-20 21:35:06 +01: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