260bb75fc2
Fix TemplateProcessor :: fixBrokenMacros; ( #1502 )
...
* Fix TemplateProcessor :: fixBrokenMacros;
* add unit test for fixBrokenMacros
2018-12-07 23:22:04 +01:00
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
d9165f00fa
Merge pull request #1513 from carusogabriel/phpunit
...
Use dedicated PHPUnit assertions
2018-11-30 22:58:01 +01:00
f472bfbc75
Merge branch 'develop' into add_html_table_layout
2018-11-28 22:58:29 +01:00
b50de97a41
support `auto` table layout too
2018-11-28 22:54:57 +01:00
7aef21faca
add test for parsing HTML containing entities
2018-11-28 22:03:43 +01:00
663fb036d0
Use dedicated PHPUnit assertions
2018-11-19 01:36:23 -02:00
3cf0770376
Remove unnecessary ternary expressions
2018-11-19 01:32:28 -02:00
9f28ece4e9
Fix path to test document
2018-11-16 22:40:37 +01:00
7eb19c8f76
add test case for issue #1253
2018-10-11 09:40:12 +02:00
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
aa49536e3e
Merge branch 'develop' into add-getVariableCount-method
2018-07-21 14:48:24 +02:00
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
e07c6559a9
adapt test
2018-07-19 00:52:22 +02:00
8c62cea580
Fix Writer losing text when Title contains a TextRun instead a string.
2018-07-17 21:10:53 -04:00
f5e3807654
Improving Style Parsing - handling Heading style
2018-07-17 19:35:31 -04:00
affccc7937
Merge branch 'improve-cloneBlock-regex' of https://github.com/nicoder/PHPWord into fix_clone_block
2018-07-17 08:03:35 +02:00
fe454dbaf3
Merge pull request #1428 from troosan/parse_short_lang_code
...
Allow passing short lang code
2018-07-14 18:11:50 +02:00
87498e43e1
Allow passing short lang code
2018-07-14 17:21:30 +02:00
af4f834149
Merge branch 'develop' into develop
2018-07-14 17:12:45 +02:00
de83da2bbf
Merge branch 'develop' into parse_drawings
2018-07-14 03:30:11 +02:00
32907215ed
fix phpstan issues
2018-07-14 02:54:17 +02:00
adc1428607
use PasswordEncoder from phpoffice/common instead
2018-07-14 02:51:08 +02:00
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
536a1b89d7
disable entity loader
2018-07-14 00:50:01 +02:00
2593e9e200
Merge branch 'develop' of github.com:jgpATs2w/PHPWord into develop
2018-06-13 17:57:55 +02:00
fe647f6e55
fix when style line-height size comes in decimal number
2018-06-13 17:41:17 +02:00
5b9719071e
remove unused imports
2018-06-03 22:36:30 +02:00
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
da604a80c4
use annotation instead
2018-05-27 20:53:42 +02:00
a89e4c93a7
added exception control to file_get_contents error
2018-05-25 08:01:17 +02:00
46b7bea097
increased test coverage of new lines
2018-05-24 07:19:45 +02:00
a228811a61
fixes
2018-05-23 18:48:28 +02:00
d54cc6efee
fix lint
2018-05-23 18:35:12 +02:00
58c6c52ee9
merged with local version
2018-05-23 18:22:54 +02:00
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
94be56b0ec
fix parsing of link style
2018-04-25 23:57:07 +02:00
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
c52c96d657
add support for STYLEREF field
2018-04-17 07:34:57 +02:00
b394247740
Merge branch 'develop' into feature-add-table-indent-option
2018-04-14 22:46:09 +02:00
dd27f668e0
add line height test
...
[ci skip]
2018-04-14 22:42:58 +02:00
9bc85347ef
fix code formatting
2018-04-14 21:15:36 +02:00
6ba2df474f
Merge pull request #1336 from lalop/addhtpl-bookmark
...
support internal link in addHtml method
2018-04-13 22:40:09 +02:00
081c6722f6
Add support for table indent
2018-04-11 10:06:58 +02:00
ca82e19bba
support internal link in addHtml method
2018-04-07 11:24:52 +02:00
566e625b85
merge/add test/cleanup
2018-03-25 22:46:50 +02:00
d7fc1a5f7b
Merge branch 'develop' into develop
2018-03-20 21:49:36 +01:00
296706aa03
add unit tests
2018-03-20 21:35:06 +01:00
f73beaa26a
reset static collections at instantiation
2018-03-19 23:06:00 +01:00
16a9ded2c9
add exact line spacing test
2018-03-19 22:50:55 +01:00
997e21433c
add parsing of line-height and text-indent
2018-03-18 22:32:55 +01:00
bb70eb0b4c
fix docx parsing
2018-03-18 12:37:39 +01:00
17680f7aec
Merge branch 'develop' into word2007_read_tabs
2018-03-11 22:37:05 +01:00
a0111be6ae
update changelog and doc
2018-03-11 15:02:24 +01:00
e29a3e7c10
add text wrapping distance
2018-03-11 13:27:35 +01:00
77f2b16bc1
update copyright to 2018
2018-03-08 23:52:25 +01:00
f9a05547f7
Added support for Floating Table Positioning (tblpPr) ( #639 )
...
Added support for Floating Table Positioning (tblpPr)
2018-03-08 23:46:22 +01:00
9ffbd98cc6
Add missing tests
2018-03-07 07:01:54 +01:00
edc3aa3cce
Improve assertions
2018-03-07 07:01:54 +01:00
6a6497956d
Allow to set "autoHyphenation" setting ( #1282 )
...
* Allow to set "autoHyphenation" for document
* Allow to set "consecutiveHyphenLimit" for document
* Allow to set "hyphenationZone" for document
* Allow to set "doNotHyphenateCaps" for document
* Allow to set "suppressAutoHyphens" for paragraph
* randomize the tempDir more
* Word2007 parsing title formatting (#1297 )
* Improve Title parsing
- Title should be able to contain TextRun
- Style 'Title' should be treated the same with as Heading
- Add tests for Heading/Title reader
* update the documentation and the changelog
* PHP 7.2 build should not fail anymore
* fix parsing of footnotes and endnotes
* add method to remove an element from a section
* add method to allow sorting of sections
2018-03-06 22:19:39 +01:00
250fbd49b1
Added support for Vertically Raised or Lowered Text (w:position) ( #1294 )
...
* Added support for Vertically Raised or Lowered Text (w:position). Note that only docx writing is implemented for now.
* Add tests + changelog
* add reader + tests + doc
2018-03-06 06:35:43 +01:00
30b224b3d0
Word2007 parsing title formatting ( #1297 )
...
* Improve Title parsing
- Title should be able to contain TextRun
- Style 'Title' should be treated the same with as Heading
- Add tests for Heading/Title reader
* update the documentation and the changelog
* PHP 7.2 build should not fail anymore
* reduce dependencies versions
* fix parsing of footnotes and endnotes
* add method to remove an element from a section
2018-03-06 06:34:55 +01:00
8a2cba2292
Support multiple elements (w:t, w:delText, w:tab) in w:r.
2018-03-04 17:13:06 +01:00
0869bdc8f7
Add support for reading <w:tab/> element in runs. Internaly encoding it as "\t".
2018-03-01 01:40:54 +01:00
7fe32e6ac1
Add support for MACROBUTTON Field ( #1021 )
...
* add functionality to use MACROBUTTON as Field, use Styles for Field, add noProof to Font Style
* code review
* refactoring + fixes + unit tests
2018-02-27 23:27:18 +01:00
f3c73f333a
Fix HTML parsing when style attribute is empty ( #1295 )
2018-02-27 23:24:00 +01:00
59de019881
Fix listitem parsing ( #1290 )
...
* Word 2007 Reader: Added support for ListItemRun
* Add tests + changelog
2018-02-18 01:41:32 +01:00
04d0c02e23
Add support for cellSpacing for tables ( #1040 )
...
* Add cellSpacing into table
* add word 2007 reader
* add tests
* add documentation
2018-02-18 00:10:10 +01:00
6a926e26f1
refactor attribute name to layout, add doc and tests
2018-02-14 00:39:37 +01:00
ee95cf3df0
Merge pull request #1278 from troosan/fix_internal_links_in_html_output
...
Add HTML writer for Bookmarks + tests
2018-02-11 00:21:12 +01:00
377fb99fbc
Add HTML writer for Bookmarks + tests
2018-02-10 23:43:15 +01:00
b868c3370c
Merge pull request #1277 from troosan/fix_parsing_of_textbreaks
...
Fix parsing of textbreaks
2018-02-10 23:05:53 +01:00
91a8dd3b22
add parsing of p:br and add unit test
2018-02-10 22:16:55 +01:00
5b381bc0c0
Merge branch 'develop' into various_html_parsing_fixes
2018-02-09 21:53:48 +01:00
604e60cae9
Add support for Track changes ( #1262 )
...
* add changed information to HTML writer
* add missing writeFontStyle
* refactor track changes
* set the style
* update documentation and release note
* Update the changelog and doc
* fix scrutinizer issues
2018-02-09 21:49:11 +01:00
24f3463f9a
remove output
2018-02-08 07:18:02 +01:00
c0ed4ab03d
Merge remote-tracking branch 'samimussbach/PHPWord/fixNestedLists' into various_html_parsing_fixes
2018-02-08 07:02:38 +01:00
47c837abef
add unit tests
2018-02-06 23:31:56 +01:00
46a5f96d3b
fix parsing of table and p inside table cells
2018-02-06 23:16:32 +01:00
12ad6fa865
adapt code for php 5.3
2018-02-06 09:30:24 +01:00
07e97c38cd
add `getVariableCount` method to `TemplateProcessor`
...
returns how many times each placeholder is present in the document
almost the same code as `getVariables`
useful when cloning a block a number of times and want to replace
placeholders that are present more than once in the block
(using the `$limit` parameter of `setValue`)
2018-02-05 17:45:24 +01:00
4105a9aad1
improve `cloneBlock` regex
...
it wrongly matched `<w:pPr` when looking for `<w:p`
in that case the cloned block would not be valid XML,
and so the generated docx document could not be opened by Word
adding the `\b` word boundary to the regex fixes this.
the accompanying unit test failed with this message when trying to load
the generated file:
```
ErrorException: DOMDocument::loadXML(): Opening and ending tag mismatch:
p line 2 and body in Entity, line: 2
```
This might solve issues such as #681 and #664 .
2018-02-02 17:03:49 +01:00
e0096dba08
fix typo in test method name
2018-02-01 14:12:56 +01:00
8a9a4784d9
add (failing) test and correct documentation sample to valid HTML
2018-02-01 13:58:08 +01:00
0425a25cdb
Add parsing of HTML links
2018-01-25 23:24:21 +01:00
4c68ebbe9d
Parse formatting inside HTML lists ( #1239 )
2018-01-13 10:03:53 +01:00
400a8e65d3
rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) ( #1185 )
...
merge develop branch
2017-12-29 20:19:35 +01:00
d2b9e88047
add parsing of "align" HTML attribute
2017-12-29 15:16:03 +01:00
b614497ae6
fix dependencies to have 7.1 compatible build ( #1228 )
...
* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
2017-12-29 02:30:53 +01:00
3e6745f146
HTML image support & TextRun paragraph style ( #934 )
...
* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
2017-12-21 00:03:52 +01:00
200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
...
enable password protection (Word)
2017-12-20 22:00:34 +01:00
5d5362a3fd
sort imports
2017-12-14 00:15:23 +01:00
5a57409df0
fix tests
2017-12-13 23:55:48 +01:00
ad38d4c20f
Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection
2017-12-13 23:25:32 +01:00
9e029415cc
align with pull request submitted in PHPOffice/Commom
2017-12-13 23:17:01 +01:00
253b060241
correctly parse on/off values (w:val="true|false|1|0|on|off")
2017-12-13 07:47:49 +01:00
fd156bf12a
Merge branch 'develop' into html_br
2017-12-05 20:50:13 +01:00
8f512bf618
Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord
...
into develop
Conflicts:
src/PhpWord/Shared/Html.php
2017-12-05 17:33:51 +01:00
cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection
2017-12-05 00:34:14 +01:00
274f50ce5a
Add unit tests & add array type checks
2017-12-04 22:30:49 +01:00
ca25eba8aa
Scrutinizer fixes
2017-11-26 22:55:37 +01:00
911739a0b2
Merge branch 'develop' into odt_page_break
2017-11-26 00:36:37 +01:00
72a6b1b19f
Add unit test
2017-11-25 23:44:46 +01:00
ab5d4468f9
add the updateFields option on document settings
...
When set to true, word will ask you to update the fields in the document
when you open the document.
2017-11-25 01:48:30 +01:00
2e562512f4
Add unit tests for PasswordEncoder
2017-11-24 14:45:05 +01:00
ad83196a05
move password encoding in separate class
...
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
7b30145270
Merge branch 'develop' into feature/EnablePasswordProtection
2017-11-22 22:59:46 +01:00
b4b87cd1dc
CS fixer stronger checks
2017-11-22 09:43:35 +01:00
e07195c512
add test, fix warnings
2017-11-22 08:14:22 +01:00
670d46e543
add getter/setter on paragraph for child spacing rule
2017-11-22 00:14:31 +01:00
ac357d10d5
Various fixes
...
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
ab9a3dbc63
fix warning
2017-11-16 18:03:37 +01:00
5ad68e0ba6
add tests, improve code coverage
2017-11-15 22:58:28 +01:00
8eb72c976a
add HTML table parsing
2017-11-15 22:49:13 +01:00
a01d22ed67
improve HTML parser and add tests
2017-11-11 23:49:23 +01:00
e72446442b
fix format
2017-11-10 23:47:10 +01:00
ff8234bce4
add tests
2017-11-10 23:37:02 +01:00
8bb9a99975
fix warning
2017-11-10 21:47:45 +01:00
07c9d9fd00
Add unit tests for Html parser
2017-11-10 21:47:44 +01:00
ba6c03e06d
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
2017-11-09 06:36:47 -02:00
56a3a53e7b
add unit test
2017-11-07 22:11:31 +01:00
1e9203adc9
add unit tests
2017-11-06 21:47:02 +01:00
200d846f61
implement paragraph textAlignment
2017-11-05 21:39:10 +01:00
8c7ed19d62
Support for Mirrored page setup for docx ( #1183 )
2017-11-05 02:07:53 +01:00
0459670a9c
Enable php-cs-fixer in build & fix resulting warnings ( #1099 )
...
* enable php 7.1 build
* upgrade to dompdf/dompdf 0.8.*
* update phpunit & hide output during tests
* run code coverage analysis on 1 build only
* Add php-cs
* Update Copyright
2017-11-04 22:44:12 +01:00
0beeb275fe
Add support for changing the document language ( #1108 )
2017-09-27 00:40:08 +02:00
34a1be0053
Add support for XE and INDEX fields ( #922 )
2017-09-18 21:45:59 +02:00
8ce1a19ec4
make FontStyle basedOn paragraph if the paragraph is set on the font ( #926 )
...
* make FontStyle based on paragraph if it set
* replace tab with spaces
* basedOn not correctly set if FontStyle is based on other FontStyle
* Fix warnings
2017-09-17 21:38:00 +02:00
18cb0b26f7
Add support for comments ( #1067 )
...
Just a writer for now, reader to be done
2017-07-11 01:58:54 +02:00
be6b6008e8
add reader/writer for additional values in settings.xml ( #1098 )
...
* add reader/writer for settings.xml
The following values can currently be set/read
- w:trackRevisions
- w:doNotTrackMoves
- w:doNotTrackFormatting
- w:proofState
- w:zoom
- w:decimalSymbol
- w:revisionView
2017-07-11 01:56:20 +02:00
e9cc289243
refactor Settings to not mix PHPWord settings and document settings
2017-07-05 21:42:38 +02:00
8a5433e5df
add new NumberFormat values and refactor other uses
2017-07-04 15:04:30 +02:00
e7c551a0bf
Add possibility to show/hide spelling and grammatical errors ( #985 )
...
* Add possibility to show/hide spelling and grammatical errors
2017-07-02 00:37:29 +02:00
6a3135bff2
Merge pull request #989 from troosan/fix_for_different_even_odd_headers
...
add possibility to write w:evenAndOddHeaders in settings.xml
2017-07-01 23:36:46 +02:00
29f7cfb581
Merge pull request #1068 from troosan/footnote_properties
...
Add possibility to control the footnote number
2017-07-01 23:27:10 +02:00
0f649f3f37
Add test & update documentation
2017-07-01 22:51:53 +02:00
ccccb3d679
Merge pull request #988 from troosan/fix_image_loading_over_https
...
fix image loading over https
2017-07-01 17:07:07 +02:00
eff532e64f
make code php 5.3 -> 5.5 compatible
2017-06-17 01:01:54 +02:00
ac89cc39ea
Add possibility to control the footnote number
2017-05-30 00:31:32 +02:00
76246630ce
add test
2017-03-10 17:30:51 +01:00
aef7a0ba76
add possibility to write w:evenAndOddHeaders in settings.xml
2017-01-29 14:34:19 +01:00
217fd6ecf1
fix image loading over https
2017-01-29 13:37:43 +01:00
fc3bc29a02
fix default page size
2017-01-22 11:09:44 +01:00
b6a9f7c9b3
fix paper size and add tests for Paper class
2017-01-21 19:06:49 +01:00
6da9d8a0bf
Merge pull request #928 from likeuntomurphy/develop
...
Fixes PHPOffice/PHPWord#927
2016-12-13 16:56:57 +01:00
51c6b5fc38
add support for Image creation from string image data
2016-11-08 23:40:10 +01:00
000e36acfe
Fixes PHPOffice/PHPWord#927
2016-10-28 20:06:03 -04:00
2bcfacfbf9
Updated copyright.
2016-07-31 12:35:08 +04:00
fb863cdf21
https://github.com/PHPOffice/PHPWord/issues/335 .
2016-07-30 16:02:23 +04:00
f51422ad8d
add variable indexing for block cloning
...
Use the same functionality from cloneRow to index variables inside
cloned block sections
2016-06-15 14:46:07 -04:00
Yurii.sio2
troosan
Gabriel Caruso
Martin Hanzl
Abubakkar Rangara
Humberto Pereira
smaug1985
Javier Garcia
JAEK-S
Frank Liepert
Sam
Henri MEDOT
Damjan Cvetko
Lenz Weber
Samuel Laulhau
dox07
Nicolas Dermine
Sami Mussbach
Maxim
SRG Group
Maria Haubner
Progi1984
Jonathan Cox
Roman Syroeshko
Phil Betley