Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,777 Commits 1 Branch 0 Tags 12 MiB
Commit Graph

818 Commits

Author SHA1 Message Date
troosan a44aee8c34 fix some sonar warnings 2018-12-01 21:13:11 +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 78ffbff0c1
Merge pull request #1498 from Garrcomm/fix-sharepoint 
Fix loading of Sharepoint document
 2018-11-25 01:40:12 +01:00
troosan d0bcfea4a4
Merge branch 'develop' into fix-sharepoint 2018-11-22 23:07:01 +01:00
troosan c12f98f69a fix check style warning 2018-11-20 22:40:54 +01:00
troosan 79a7d5fe0e Merge remote-tracking branch 'upstream/develop' into rebase_pull_request 2018-11-20 21:17:51 +01:00
Ralph02 d9d79c0666 RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals 2018-11-20 19:57:35 +01:00
Gabriel Caruso 3cf0770376
Remove unnecessary ternary expressions 2018-11-19 01:32:28 -02:00
troosan 925e9e0919
remove trailing spaces 2018-11-16 23:33:38 +01:00
troosan c51b6febc0
rename variable to comply with rules 2018-11-16 23:00:23 +01:00
Stefan Thoolen 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
Martin Hanzl e19de8e8a4 #1253 - add explanatory comment 2018-10-11 11:28:44 +02:00
Martin Hanzl 7f55816eba detect actual filename of document xml (prevent mismatching document22.xml as in #1253) 2018-10-11 08:55:38 +02:00
troosan 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
vblinden d8c0441975 Fix indenting 2018-09-03 13:32:00 +02:00
vblinden 683d91990f
Added Dutch (nl-NL) 2018-09-03 12:30:05 +02:00
Maxim Bulygin 677e3f6a19 writer / word2007 / support valign and watermark withouth paragraph 2018-07-31 18:25:29 +03:00
Abubakkar Rangara 4b9ae18d5a Adding table layout to the generated HTML - fixed php-cs-fixer error 2018-07-24 14:23:23 +01: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
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
Tom-Magill 139242612d
Update Chart.php 2018-07-17 14:11:55 +01:00
Tom-Magill 0c3eb4bafc
Update Chart.php 2018-07-17 14:10:02 +01: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
Nicolas Dermine 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
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 6475812e82 fix documentation 2018-07-14 03:28:09 +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 da43a880e3 Address scrutinizer issues 2018-06-03 00:32:21 +02:00
troosan d9ddc162a3 write column width in ODT writer 2018-06-03 00:32:20 +02:00
troosan 844a7c95ba
Merge pull request #1391 from omarpiani/develop 
Added Italian to supported languages
 2018-06-01 09:13:40 +02:00
troosan 0bd7c0b301
Add constants for Italian 2018-05-31 19:50:43 +02:00
Omar Piani aa27109101
Update Language.php 2018-05-31 11:43:20 +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 b2cafffffc Merge remote-tracking branch 'upstream/develop' into develop_upstream 2018-05-31 00:25:31 +02:00
Edvin Hultberg 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
troosan c22f7eab5e add check on opened file 2018-05-27 21:27:45 +02:00
Javier Garcia 65a594d271 cs-fixer fixes 2018-05-25 09:29:58 +02:00
Javier Garcia a89e4c93a7 added exception control to file_get_contents error 2018-05-25 08:01:17 +02:00
Maxim Bulygin e40449e7c8 fix variable names 2018-05-24 17:40:21 +03:00
Maxim Bulygin 13fc647d01 html writes / setup table cell color 2018-05-24 17:03:35 +03: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 58c6c52ee9 merged with local version 2018-05-23 18:22:54 +02:00
troosan 7f46d951eb Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop_upstream 2018-05-20 14:40:15 +02:00
troosan 453ddf078b Do not try to read document protection if not present 2018-05-20 14:37:59 +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 85e1e5c280
fix warning 2018-04-14 23:21:02 +02:00
troosan b394247740
Merge branch 'develop' into feature-add-table-indent-option 2018-04-14 22:46:09 +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
troosan 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
Frank Liepert 081c6722f6 Add support for table indent 2018-04-11 10:06:58 +02:00
pcworld 6253adaba1 Warn about parsing user-generated HTML 2018-04-09 02:48:49 +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
gthomas2 9b722a5b0c Added missing namespaces 2018-03-23 21:29:41 +01:00
gthomas2 34bda10536 Fix images added in word 2011 2018-03-23 21:28:53 +01:00
troosan 400ee57bee fix 2018-03-22 22:47:27 +01:00
troosan c08f2718af check style fixes 2018-03-21 21:58:41 +01:00
troosan 45e2e92af7 fix graph data 2018-03-21 21:50:41 +01:00
troosan a8d1775eb1 Merge remote-tracking branch 'FrankMeyer/develop' into develop 2018-03-21 06:51:22 +01:00
troosan 2c5970a388 php 5.3 compatibility 2018-03-20 23:42:01 +01:00
Tim Jarrett d8387c1aba Escape incoming invalid XML characters using htmlspecialchars(). 2018-03-20 22:47:15 +01:00
troosan d7fc1a5f7b
Merge branch 'develop' into develop 2018-03-20 21:49:36 +01:00
troosan 992d842552 fix 2018-03-19 23:07:35 +01:00
troosan f73beaa26a reset static collections at instantiation 2018-03-19 23:06:00 +01:00
troosan de01e86d41 parse fixed line space 2018-03-19 22:50:54 +01:00
troosan 97d60dd985 tranlate percentage to rate 2018-03-19 22:50:54 +01:00
troosan 997e21433c add parsing of line-height and text-indent 2018-03-18 22:32:55 +01:00
troosan 4c846426ce format & changelog 2018-03-18 20:53:05 +01:00
troosan fb1e2e41cc Merge branch 'ComputerTinker-AddFieldDateFormats' of 
https://github.com/ComputerTinker/PHPWord into
ComputerTinker-ComputerTinker-AddFieldDateFormats

# Conflicts:
#	src/PhpWord/Element/Field.php
 2018-03-18 20:44:05 +01:00
troosan bb70eb0b4c fix docx parsing 2018-03-18 12:37:39 +01:00
troosan 17680f7aec
Merge branch 'develop' into word2007_read_tabs 2018-03-11 22:37:05 +01:00
troosan 6b48451ebc
Merge pull request #1310 from troosan/add_image_wrap_distance 
add text wrapping distance
 2018-03-11 20:42:40 +01:00
troosan e29a3e7c10 add text wrapping distance 2018-03-11 13:27:35 +01:00
troosan 8bafe0000f
Merge pull request #1307 from franciscosens/add-suport-pt-br 2018-03-10 08:48:30 +01:00
troosan 77f2b16bc1 update copyright to 2018 2018-03-08 23:52:25 +01:00
Henri MEDOT f9a05547f7 Added support for Floating Table Positioning (tblpPr) (#639) 
Added support for Floating Table Positioning (tblpPr)
 2018-03-08 23:46:22 +01:00
Francisco Lucas Sens eb6900969f Added new constant to Brazilian portuguese language 2018-03-08 16:15:31 -03:00
Frank Liepert f41c542ba0 Enforce valid value for on/off type 2018-03-07 07:01:54 +01:00
Frank Liepert 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
troosan 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
troosan 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
Damjan Cvetko 8a2cba2292 Support multiple elements (w:t, w:delText, w:tab) in w:r. 2018-03-04 17:13:06 +01:00
troosan 740e66acf5
randomize the tempDir more 
to make sure directory is unique [ci skip]
 2018-03-02 07:17:26 +01:00