85e9144822
Merge pull request #1329 from eweso/patch-1
...
Adding setNumId method for ListItem style
2019-08-08 07:13:03 +02:00
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
24d120baf1
Merge pull request #1646 from SpinyMan/develop
...
Change private to protected to be able extending class Html
2019-08-08 07:09:35 +02:00
487622bb9e
Merge pull request #1637 from bhattnishant/master
...
To support PreserveText inside sub container
2019-08-08 07:08:13 +02:00
415bdb378d
Update Html.php
2019-07-03 19:25:29 +03:00
9e93d5eae5
Update Html.php
2019-07-03 19:24:15 +03:00
9abf4473b0
Update Wrong definition
2019-07-02 16:02:52 +02:00
b209fec72b
To suport preseve text inside sub container
...
if we use preseve text inside table, issue fix
https://stackoverflow.com/questions/33070424/phpword-cannot-add-preservetext-in-section
2019-06-03 15:44:10 +02:00
18b3c754ef
No nested w:pPr elements in ListItemRun.
...
This commit fixes issue #1529
This commit prevents nested w:pPr elements when using a ListItemRun with
a paragraph style. The different between a ListItem and a ListItem run
is that the setWithoutPPR method is called on the ParagraphStyleWriter
(PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph).
According to the specs it's not allowed to have nested w:pPr elements.
See http://www.datypic.com/sc/ooxml/e-w_pPr-2.html
2019-05-09 15:29:25 +02:00
2045e52db7
call static instead of self on protected method
2019-04-09 10:55:43 +02:00
1534dc23c3
Merge pull request #1595 from NickCoolii/patch-1
...
Added new constant to russian language
2019-03-31 20:48:10 +02:00
8cea3221dc
remove trailing spaces
2019-03-31 13:20:51 +02:00
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
014ff7d261
Added new constant to russian language
2019-03-13 16:39:32 +03:00
8931ab12b2
Merge branch 'develop' into html_writer_auto_invert_text_color
2019-03-01 16:33:50 +02:00
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
9958a4825f
allow other streams
2019-02-22 22:06:54 +01:00
b3982ebb70
fix documentation
2019-02-22 22:06:30 +01:00
3219950d59
trim color codes and add tests
2019-02-06 22:07:42 +01:00
5206c7f690
fix parsing of border-color and add test
2019-02-06 18:19:01 +01:00
e3020c0db3
fix warnings
2019-02-05 23:05:18 +01:00
235cc1205c
implement support for section vAlign
2019-02-05 21:42:14 +01:00
58a2849e38
Add reading of the settings part
2019-02-04 23:59:37 +01:00
d2b0b317e0
fix scrutinizer warnings
2019-02-04 22:57:33 +01:00
bc448aed6c
improve code coverage
2019-02-04 21:53:19 +01:00
67f3bd369c
Add methods to replace macro with ComplexType
2019-01-31 01:26:19 +01:00
3c9fa2df13
Language::validateLocale should pass with locale 'zxx'.
2019-01-28 10:50:28 +01:00
1956908aa7
Merge remote-tracking branch
...
'geraldb-nicat/PHPWord/templateProcessingViaArray' into develop
Conflicts:
docs/templates-processing.rst
2019-01-03 18:57:00 +01:00
f91863ed64
Add RTL aligning of tables
2019-01-03 11:33:56 +01:00
b375b8580f
fix broken samples
2018-12-30 01:13:54 +01:00
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
3390c907dc
fix scrutiniser warning
2018-12-29 23:16:56 +01:00
54b94be65a
fix doc
2018-12-29 23:14:18 +01:00
23407c99dd
Add unit tests
2018-12-29 22:03:01 +01:00
5057617de7
change regex instead of checking twice
2018-12-29 14:56:11 +01:00
7c8cfb7b8a
Adding condition for document template saving using libreoffice
...
When I save document template with libreoffice (in .docx format) the cloneRow with nested table doesn't work.
The problem is that the regular expression, that used for search if row is no longer part of the spanned row, was wrong:
<w:vMerge w:val="continue" /> became <w:vMerge w:val="continue"/> without space at the closure tag.
Sorry for my English.
2018-12-29 14:50:30 +01:00
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
ccf291234e
Avoid warning if variable is null
2018-12-28 20:32:10 +01:00
d8d697c848
added convertors with test
2018-12-28 18:04:36 +01:00
a4b532083b
Merge pull request #1162 from abcdmitry/patch-2
...
Break the references in foreach within TemplateProcessor
2018-12-27 22:22:20 +01:00
7790b6a6b0
Pass values to replace macros with in cloneBlock
2018-12-27 22:13:48 +01:00
75620caf51
add parameter to keep backward compatibility + add test
2018-12-27 01:44:37 +01:00
1bcef04ddc
Merge remote-tracking branch 'JPBetley/PHPWord/clone-block-variables' into rebase_pull_request
2018-12-27 01:29:51 +01:00
0f963e40a7
Merge pull request #1536 from Samuel-BF/fix-RTF-numerals
...
For RTF writers, sizes should should never have decimals
2018-12-26 23:16:22 +01:00
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
254d300ea7
Merge pull request #1511 from carusogabriel/ternary-expressions
...
Remove unnecessary ternary expressions
2018-12-26 23:15:49 +01:00
d84da93a36
Add test and fix warnings
2018-12-26 22:50:19 +01:00
5e2374be4a
Merge remote-tracking branch 'upstream/develop' into develop
2018-12-26 21:49:41 +02:00
a5ec49d99d
Add plain text SDT type
2018-12-26 21:45:32 +02:00
575c5531b8
replace self with static
2018-12-26 20:07:53 +01:00
6cf10b4562
Merge pull request #1161 from abcdmitry/patch-1
...
Get rid of duplicated code in TemplateProcessor
call static methods with static:: instead of self::
2018-12-26 20:04:18 +01:00
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
b1661af71a
Still add text if link missing
...
If link target doesn't exist, still add the text anyway.
2018-12-19 15:17:42 -05:00
c0f8cae55c
Fixing RTF writers : numbers should be printed as integers and not float.
...
This is specified in the spec, for example here :
http://www.biblioscape.com/rtf15_spec.htm#Heading2
« The delimiter marks the end of an RTF control word, and can be one of the following : [...]
* A digit or a hyphen (-), which indicates that a numeric parameter follows. The subsequent digital sequence is then delimited by a space or any character other than a letter or a digit. »
2018-12-18 15:04:25 +01:00
b188ab94e1
Merge branch 'develop' into add-getVariableCount-method
2018-12-11 21:31:18 +01:00
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
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
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
7930f5d136
Update Language.php
...
Added Language constants and values for Ukrainian (lines 71, 72):
const UK_UA = 'uk-UA';
const UK_UA_ID = 1058;
2018-12-03 16:04:19 +02:00
7b3b723646
Merge pull request #1430 from nicoder/patch-4
...
allow to override TemplateProcessor#ensureUtf8Encoded
2018-12-03 01:01:51 +01:00
5b688d50d8
fix formatting
2018-12-02 23:54:25 +01:00
31968fa814
Merge branch 'develop' of https://github.com/Tom-Magill/PHPWord into develop_upstream
2018-12-02 23:38:08 +01:00
a44aee8c34
fix some sonar warnings
2018-12-01 21:13:11 +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
78ffbff0c1
Merge pull request #1498 from Garrcomm/fix-sharepoint
...
Fix loading of Sharepoint document
2018-11-25 01:40:12 +01:00
d0bcfea4a4
Merge branch 'develop' into fix-sharepoint
2018-11-22 23:07:01 +01:00
c12f98f69a
fix check style warning
2018-11-20 22:40:54 +01:00
79a7d5fe0e
Merge remote-tracking branch 'upstream/develop' into rebase_pull_request
2018-11-20 21:17:51 +01:00
d9d79c0666
RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals
2018-11-20 19:57:35 +01:00
3cf0770376
Remove unnecessary ternary expressions
2018-11-19 01:32:28 -02:00
925e9e0919
remove trailing spaces
2018-11-16 23:33:38 +01:00
c51b6febc0
rename variable to comply with rules
2018-11-16 23:00:23 +01:00
54eb6e6f2c
Fix for undefined index
...
PHP Notice: Undefined index: document in /home/stefan/Projects/garrcomm/PHPWord/src/PhpWord/Reader/Word2007.php on line 65
PHP Warning: Invalid argument supplied for foreach() in /home/stefan/Projects/garrcomm/PHPWord/src/PhpWord/Reader/Word2007.php on line 65
2018-11-06 14:24:56 +01:00
e19de8e8a4
#1253 - add explanatory comment
2018-10-11 11:28:44 +02:00
7f55816eba
detect actual filename of document xml (prevent mismatching document22.xml as in #1253 )
2018-10-11 08:55:38 +02:00
18760620b3
Merge pull request #1445 from FCG-Group/writer_fixes_valign_watermark
...
writer / word2007 / support valign and watermark without paragraph
2018-10-03 23:28:05 +02:00
d8c0441975
Fix indenting
2018-09-03 13:32:00 +02:00
683d91990f
Added Dutch (nl-NL)
2018-09-03 12:30:05 +02:00
677e3f6a19
writer / word2007 / support valign and watermark withouth paragraph
2018-07-31 18:25:29 +03:00
4b9ae18d5a
Adding table layout to the generated HTML - fixed php-cs-fixer error
2018-07-24 14:23:23 +01: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
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
139242612d
Update Chart.php
2018-07-17 14:11:55 +01:00
0c3eb4bafc
Update Chart.php
2018-07-17 14:10:02 +01: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
198165ce59
allow to override TemplateProcessor#ensureUtf8Encoded
...
the method is `protected`,
but since it is called with `self` instead of `static`
it does not allow for subclasses to override it
2018-07-16 19:49:30 +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
6475812e82
fix documentation
2018-07-14 03:28:09 +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
da43a880e3
Address scrutinizer issues
2018-06-03 00:32:21 +02:00
d9ddc162a3
write column width in ODT writer
2018-06-03 00:32:20 +02:00
844a7c95ba
Merge pull request #1391 from omarpiani/develop
...
Added Italian to supported languages
2018-06-01 09:13:40 +02:00
0bd7c0b301
Add constants for Italian
2018-05-31 19:50:43 +02:00
aa27109101
Update Language.php
2018-05-31 11:43:20 +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
b2cafffffc
Merge remote-tracking branch 'upstream/develop' into develop_upstream
2018-05-31 00:25:31 +02:00
82f3a2ab44
Update documentation for Style::add*Style methods ( #1383 )
...
* Update documentation for Style::add*Style methods
* remove phpDocumentor, simplify dependencies
2018-05-31 00:21:08 +02:00
c22f7eab5e
add check on opened file
2018-05-27 21:27:45 +02:00
65a594d271
cs-fixer fixes
2018-05-25 09:29:58 +02:00
a89e4c93a7
added exception control to file_get_contents error
2018-05-25 08:01:17 +02:00
e40449e7c8
fix variable names
2018-05-24 17:40:21 +03:00
13fc647d01
html writes / setup table cell color
2018-05-24 17:03:35 +03: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
58c6c52ee9
merged with local version
2018-05-23 18:22:54 +02:00
7f46d951eb
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop_upstream
2018-05-20 14:40:15 +02:00
453ddf078b
Do not try to read document protection if not present
2018-05-20 14:37:59 +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
85e1e5c280
fix warning
2018-04-14 23:21:02 +02:00
b394247740
Merge branch 'develop' into feature-add-table-indent-option
2018-04-14 22:46:09 +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
57ededeabf
Merge pull request #1338 from pcworld/image-security-doc
...
Improve security-related documentation of addImage and addHtml
2018-04-13 22:36:18 +02:00
081c6722f6
Add support for table indent
2018-04-11 10:06:58 +02:00
6253adaba1
Warn about parsing user-generated HTML
2018-04-09 02:48:49 +02:00
ca82e19bba
support internal link in addHtml method
2018-04-07 11:24:52 +02:00
91ada213c5
Update ListItem.php
2018-03-31 00:38:43 +02:00
5741e47129
Update ListItem.php
2018-03-31 00:37:50 +02:00
a09e7151ac
Update ListItem.php
2018-03-30 22:58:03 +02:00
71618f704d
Adding setNumId method for ListItem style
...
By allowing to set the numId in the ListItem style manually, you can separate lists. Every ListItem with the same numId belongs to one list. This allows you to restart list counting.
2018-03-30 19:24:45 +02:00
566e625b85
merge/add test/cleanup
2018-03-25 22:46:50 +02:00
9b722a5b0c
Added missing namespaces
2018-03-23 21:29:41 +01:00
34bda10536
Fix images added in word 2011
2018-03-23 21:28:53 +01:00
400ee57bee
fix
2018-03-22 22:47:27 +01:00
c08f2718af
check style fixes
2018-03-21 21:58:41 +01:00
45e2e92af7
fix graph data
2018-03-21 21:50:41 +01:00
a8d1775eb1
Merge remote-tracking branch 'FrankMeyer/develop' into develop
2018-03-21 06:51:22 +01:00
2c5970a388
php 5.3 compatibility
2018-03-20 23:42:01 +01:00
d8387c1aba
Escape incoming invalid XML characters using htmlspecialchars().
2018-03-20 22:47:15 +01:00
d7fc1a5f7b
Merge branch 'develop' into develop
2018-03-20 21:49:36 +01:00
992d842552
fix
2018-03-19 23:07:35 +01:00
f73beaa26a
reset static collections at instantiation
2018-03-19 23:06:00 +01:00
de01e86d41
parse fixed line space
2018-03-19 22:50:54 +01:00
97d60dd985
tranlate percentage to rate
2018-03-19 22:50:54 +01:00
troosan
Andrew Busel
Mario
Nishant Bhatt
Walter Tamboer
arthur
Seamus Lee
Mykola Nicholas
Maxim
Nick Winfield
Stathis Papadopoulos
Antonio Malatesta
Daniel Morris
Craig Blanchette
Samuel BF
Nathan Dench
Alex Morozov
Yurii.sio2
Eugene Bulbaka
Ralph02
Gabriel Caruso
Stefan Thoolen
Martin Hanzl
vblinden
Maxim Bulygin
Abubakkar Rangara
Humberto Pereira
Tom-Magill
Nicolas Dermine
smaug1985
Javier Garcia
Omar Piani
Edvin Hultberg
JAEK-S
Frank Liepert
pcworld
Sam
eweso
gthomas2
Tim Jarrett