Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,676 Commits 6 Branches 21 Tags
Commit Graph

756 Commits

Author SHA1 Message Date
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
Damjan Cvetko
0869bdc8f7 Add support for reading <w:tab/> element in runs. Internaly encoding it as "\t". 2018-03-01 01:40:54 +01:00
Lenz Weber
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
Samuel Laulhau
f3c73f333a Fix HTML parsing when style attribute is empty (#1295) 2018-02-27 23:24:00 +01:00
Matt Bolt
a95c3f83bc Fix colspan and rowspan for tables in HTML Writer. Syntax improved. 2018-02-19 18:02:55 +08:00