Commit Graph

935 Commits

Author SHA1 Message Date
troosan 99b04f0353
fix reading of docx default style (#1238) 2018-01-12 23:42:22 +01:00
troosan 23693b403c change impl to avoid compilation issue 2017-12-29 21:47:55 +01:00
Maxim 400a8e65d3 rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) (#1185)
merge develop branch
2017-12-29 20:19:35 +01:00
troosan d2b9e88047 add parsing of "align" HTML attribute 2017-12-29 15:16:03 +01:00
troosan 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
troosan fce1bf28c8 format code 2017-12-25 22:05:46 +01:00
troosan 512cf952ae randomise temp directory name to avoid collisions 2017-12-25 20:42:37 +01:00
troosan 7250b15e74 Title can be added in Cell 2017-12-25 08:33:02 +01:00
SRG Group 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
troosan 200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
enable password protection (Word)
2017-12-20 22:00:34 +01:00
troosan 8929917677
Merge pull request #592 from ComputerTinker/ComputerTinker-FixEmptyDropdownEntry
Pad Empty Dropdown Entry
2017-12-19 21:53:59 +01:00
troosan 0f200d99f4
Merge pull request #1222 from carusogabriel/clean-elses
Clean elses
2017-12-19 21:41:21 +01:00
Gabriel Caruso 87acd3764b Clean elses 2017-12-14 12:21:16 -02:00
troosan 5a57409df0 fix tests 2017-12-13 23:55:48 +01:00
troosan ad38d4c20f Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection 2017-12-13 23:25:32 +01:00
troosan f7d2ad7201 formatting 2017-12-13 23:24:37 +01:00
troosan 9e029415cc align with pull request submitted in PHPOffice/Commom 2017-12-13 23:17:01 +01:00
troosan dc7cb1ee75 update changelog & doc 2017-12-13 22:48:58 +01:00
troosan 253b060241 correctly parse on/off values (w:val="true|false|1|0|on|off") 2017-12-13 07:47:49 +01:00
troosan 88bbe49d01
Merge pull request #1217 from troosan/html_br
Added support for linebreaks <br/> in Shared\Html::addHtml()
2017-12-05 21:38:55 +01:00
troosan d4c6427418
Merge pull request #727 from irond/container_for_checkbox
Add TextRun as container for CheckBox
2017-12-05 21:28:59 +01:00
troosan 0c7593ba10
Merge pull request #582 from SSchwaiger/patch-2
A chart object can also be added to a table cell
2017-12-05 21:04:07 +01:00
troosan fd156bf12a
Merge branch 'develop' into html_br 2017-12-05 20:50:13 +01:00
troosan 9081ed9868 fix warning 2017-12-05 17:40:23 +01:00
troosan 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
troosan 05e2f1bf63 use non deprecated method 2017-12-05 08:02:23 +01:00
troosan cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection 2017-12-05 00:34:14 +01:00
troosan 274f50ce5a Add unit tests & add array type checks 2017-12-04 22:30:49 +01:00
troosan ca25eba8aa Scrutinizer fixes 2017-11-26 22:55:37 +01:00
troosan 23bc837666 Scrutinizer fixes 2017-11-26 17:54:47 +01:00
troosan 911739a0b2
Merge branch 'develop' into odt_page_break 2017-11-26 00:36:37 +01:00
troosan 355027d854 PHP-CS fix, improve code coverage 2017-11-26 00:11:09 +01:00
Michael Spahn 5d928db916 Implement PageBreak for odt writer 2017-11-25 23:44:45 +01:00
troosan 5a5ae48bb6 also add w:bCs 2017-11-25 21:37:11 +01:00
troosan 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
troosan 2e562512f4 Add unit tests for PasswordEncoder 2017-11-24 14:45:05 +01:00
troosan ad83196a05 move password encoding in separate class
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
troosan 7b30145270
Merge branch 'develop' into feature/EnablePasswordProtection 2017-11-22 22:59:46 +01:00
troosan 6a5d2a636d CS fixer warning 2017-11-22 09:02:16 +01:00
troosan 8d82340589 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into release_0.14 2017-11-22 08:42:13 +01:00
troosan 38ea5ecb5f fix wrong variable 2017-11-22 08:41:42 +01:00
troosan e07195c512 add test, fix warnings 2017-11-22 08:14:22 +01:00
troosan 0354e4e4a1
Merge pull request #480 from fergusean/patch-1
Skip inquiring PHP for temp directory when it's user defined
2017-11-22 00:24:03 +01:00
troosan 670d46e543 add getter/setter on paragraph for child spacing rule 2017-11-22 00:14:31 +01:00
troosan ac357d10d5 Various fixes
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
troosan b22208f810 format 2017-11-16 23:09:56 +01:00
troosan bc4750dd7c
Merge pull request #1060 from Mord1n/patch-1
ODT Writer automatic-styles should be closed before opening master-styles.
2017-11-16 23:08:13 +01:00
troosan 9cd373806c fix build 2017-11-16 17:47:48 +01:00
troosan 5ad68e0ba6 add tests, improve code coverage 2017-11-15 22:58:28 +01:00
troosan 8eb72c976a add HTML table parsing 2017-11-15 22:49:13 +01:00
troosan a01d22ed67 improve HTML parser and add tests 2017-11-11 23:49:23 +01:00
troosan ff8234bce4 add tests 2017-11-10 23:37:02 +01:00
troosan 9e7e07d0bc Add unit tests for Html parser 2017-11-09 00:41:56 +01:00
troosan c8b55b8e59 Merge branch 'bring_back_bold_and_italic' of https://github.com/FBnil/PHPWord into bring_back_bold_and_italic 2017-11-08 21:46:55 +01:00
Nilton fcdafeedd4 Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;"> 2017-11-08 21:46:37 +01:00
troosan 13dc3bb2e4
Merge pull request #874 from bskrtich/develop
Fix incorrect image size between windows and mac.
2017-11-08 00:45:00 +01:00
troosan 5412df29fa update doc 2017-11-08 00:34:22 +01:00
troosan 64a6505f70
Merge pull request #578 from ComputerTinker/develop
#574 Incorrect Constant Names in \Style\Font.php
2017-11-08 00:31:45 +01:00
troosan 610d91e041 call parent constructor in SDT and FormField 2017-11-08 00:27:58 +01:00
troosan 1b9c1d921b format 2017-11-07 23:13:41 +01:00
troosan 75bf84fa48
Merge pull request #887 from taophp/patch-1
Fix division by zero
2017-11-07 22:34:49 +01:00
troosan 5ddb3f0b77 Merge remote-tracking branch 'origin/develop' into tmp
Conflicts:
	src/PhpWord/Writer/Word2007/Element/SDT.php
2017-11-07 17:43:22 +01:00
troosan 1e9203adc9 add unit tests 2017-11-06 21:47:02 +01:00
sergeizelenyi 9c1c544954 stylization code 2017-11-06 20:53:08 +01:00
sergeizelenyi 9ac9016f50 added functionality specified alias and tag 2017-11-06 20:53:08 +01:00
troosan a7a35c688d Allow reading of TargetMode for external images 2017-11-05 22:48:04 +01:00
troosan 200d846f61 implement paragraph textAlignment 2017-11-05 21:39:10 +01:00
troosan 92fc54992a fix end of line space 2017-11-05 08:54:52 +01:00
troosan ce377b9b58 fix php-cs error 2017-11-05 02:16:04 +01:00
troosan 8c7ed19d62
Support for Mirrored page setup for docx (#1183) 2017-11-05 02:07:53 +01:00
troosan de9268ae12
Merge pull request #1150 from kaigoh/patch-2
pad the $args array instead of ignoring errors
2017-11-05 00:54:20 +01:00
troosan 835aa9c5a4
Merge branch 'develop' into fix_php7_issues 2017-11-05 00:22:04 +01:00
troosan 03d4a36b9b fixed HTML superscript, and added allcaps, smallcaps, and letter-spacing 2017-11-05 00:03:06 +01:00
troosan 601a2b6ec6 make Comment constructor attributes optional 2017-11-04 23:26:04 +01:00
troosan f4697ab6e1
Merge pull request #1178 from lightbringer1991/489-fix-wrappingStyle-z-index-in-64bit-OS
489: Fix z-index size too big in 64bit OS
2017-11-04 22:44:44 +01:00
troosan 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
lightbringer 3cbc65bae4 489: Fix z-index size too big in 64bit OS 2017-10-28 18:56:16 +11:00
Nilton 87a355bb82 Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;"> 2017-10-21 00:07:52 +02:00
Dmitry Lukashin 7792eb2769 Break the references in foreach within TemplateProcessor 2017-10-19 19:02:26 +03:00
Dmitry Lukashin ba9e8958d7 Replace self:: with static:: calls 2017-10-19 18:51:57 +03:00
Dmitry Lukashin f7cb73e8a6 Get rid of duplicated code in TemplateProcessor.php 2017-10-19 17:33:46 +03:00
Kai Gohegan 4084d4f191 Update AbstractContainer.php
Suppressing the PHP warning doesn't seem to work. Padding the $args array does.
2017-10-09 13:19:23 +01:00
troosan e6f4d0276a Merge branch 'development' into fix_php7_issues 2017-09-27 01:09:23 +02:00
troosan 0beeb275fe Add support for changing the document language (#1108) 2017-09-27 00:40:08 +02:00
troosan 6657f0eec3 fix doc 2017-09-26 22:46:46 +02:00
troosan 7e3d9fb89a replace @link with @see 2017-09-26 22:00:02 +02:00
troosan cb469b973e more fixes 2017-09-26 17:34:57 +02:00
troosan a8ade6d22d general updates
Change "some" code to comply to php-cs rules
Update copyright year to 2010-2017
2017-09-24 22:15:42 +02:00
troosan 34a1be0053 Add support for XE and INDEX fields (#922) 2017-09-18 21:45:59 +02:00
troosan 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
troosan 34ac7170a2 Merge remote-tracking branch 'github_troosan/fix-travis-build' into fix_php7_issues 2017-09-13 22:25:16 +02:00
troosan d5291629f7 Merge remote-tracking branch 'github_troosan/develop' into fix_php7_issues 2017-09-13 22:19:16 +02:00
troosan 41a048604e upgrade to dompdf/dompdf 0.8.* 2017-09-13 22:10:04 +02:00
Fabio Bas c448046b52 Fix: different footer for first page 2017-08-02 10:52:42 +02:00
troosan cf76b1f217 Simplify SimpleType validation 2017-07-22 00:06:04 +02:00
troosan 18cb0b26f7 Add support for comments (#1067)
Just a writer for now, reader to be done
2017-07-11 01:58:54 +02:00
troosan 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
troosan 4c7c84b17e fix pclzip compatibility issues 2017-07-09 22:21:34 +02:00
troosan 88cc13dd85 fix 2017-07-07 08:02:31 +02:00
troosan 722c81d89d fix md remarks 2017-07-06 23:03:07 +02:00
troosan b919d58bac add reader for settings 2017-07-06 22:41:04 +02:00
troosan e9cc289243 refactor Settings to not mix PHPWord settings and document settings 2017-07-05 21:42:38 +02:00
troosan 17849b3514 Merge pull request #1075 from slowprog/develop
Fix names of styles
2017-07-04 15:54:41 +02:00
troosan a6c6f9faa1 Merge branch 'development' into develop
Conflicts:
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
2017-07-04 15:38:01 +02:00
troosan f3f11cb64b Merge pull request #1092 from troosan/implement_request_#1041
add new NumberFormat values and refactor FootnoteProperties to use same values
2017-07-04 15:30:21 +02:00
troosan 8a5433e5df add new NumberFormat values and refactor other uses 2017-07-04 15:04:30 +02:00
troosan 663a552d29 Merge pull request #1008 from slowprog/develop
Fix name of style definitions
2017-07-03 14:14:43 +02:00
troosan ef95611203 Fix multiple paragraphs being created 2017-07-03 12:54:18 +02:00
troosan 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
troosan 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
troosan 29f7cfb581 Merge pull request #1068 from troosan/footnote_properties
Add possibility to control the footnote number
2017-07-01 23:27:10 +02:00
troosan 0f649f3f37 Add test & update documentation 2017-07-01 22:51:53 +02:00
Maxim Barulin d5dbfb98b0 add support for contextualSpacing attribute issue #1037 2017-07-01 21:08:05 +02:00
troosan 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
troosan f59b7228bb Merge pull request #977 from troosan/paper_size_computation
fix paper size and add tests for Paper class
2017-07-01 17:03:01 +02:00
troosan 8c3efa4a51 remove unused variable 2017-07-01 16:56:33 +02:00
Andrey Tyshev 2074d35ab0 Fix PreserveText in Section #452 2017-06-19 13:51:41 +03:00
Andrey Tyshev aae9ad4249 Fix names of styles 2017-06-19 13:47:47 +03:00
Hubert Miazek e22ece8c00 #431 2017-06-19 11:05:59 +02:00
antoine cbea5aed87 Merge branch 'footer_properties' into develop 2017-06-17 01:02:40 +02:00
antoine eff532e64f make code php 5.3 -> 5.5 compatible 2017-06-17 01:01:54 +02:00
antoine 2d1b52bc90 Merge branch 'support_for_xe_and_index_field' into develop 2017-06-17 00:35:39 +02:00
antoine 2b4b200e42 fix namespace 2017-06-17 00:34:02 +02:00
antoine 373039cbdc Merge branch 'support_for_xe_and_index_field' into develop 2017-06-16 18:01:23 +02:00
antoine 64f06e1114 use fully qualified name 2017-06-16 17:55:24 +02:00
antoine f0fa91f63c Merge branch 'support_for_xe_and_index_field' into develop 2017-06-11 12:58:06 +02:00
antoine 8aabf812f8 update XE field to support formatted text + add documentation 2017-06-11 12:56:59 +02:00
antoine ee2dcddc6e Merge branch 'support_for_xe_and_index_field' into develop 2017-06-07 02:27:55 +02:00
antoine 6a84b8ed26 Add possiblity to add not defined options 2017-06-07 02:26:59 +02:00
antoine 7ce54abac3 Merge remote-tracking branch 'github_troosan/footnote_properties' into develop 2017-05-30 00:37:37 +02:00
antoine ac89cc39ea Add possibility to control the footnote number 2017-05-30 00:31:32 +02:00
antoine 68dd3fd576 rename attribute to match generated XML node name 2017-05-24 00:18:17 +02:00
Mord1n a55405e655 Update Styles.php
automatic-styles should be closed before opening master-styles.

This will prevent issue that styles wont work in future if you implement styling for ODT writer....
2017-05-18 16:25:05 +02:00
antoine 11c711b275 Merge branch 'fix_font_style_based_on' into develop 2017-05-16 02:41:52 +02:00
antoine 09e669f9e9 basedOn not correctly set if FontStyle is based on other FontStyle 2017-05-16 02:38:15 +02:00
antoine 6e49e89547 Merge branch 'support_comments' into develop 2017-05-15 23:00:10 +02:00
antoine 1cfb62de0d Add support for comments 2017-05-15 22:49:02 +02:00
Lenz Weber 71574d1fe2 Code Review; minor changes to salt handling, corrected some comments 2017-03-13 16:22:04 +01:00
Maria Haubner 76246630ce add test 2017-03-10 17:30:51 +01:00
Maria Haubner 0221414ee0 randomly genereate salt for word password protection 2017-03-10 16:57:42 +01:00
Maria Haubner 703e34137b refactored hash function to word settings 2017-03-10 16:24:52 +01:00
Maria Haubner 483a167500 refactoring of hash function 2017-03-10 15:44:13 +01:00
Maria Haubner 05387fac09 enable password setting in word 2017-03-10 13:28:32 +01:00
Maria Haubner 488b10b73b allow setValue() for SDTs 2017-03-08 13:08:33 +01:00
Andrey Tyshev f9cab8d02c Fix name of style definitions 2017-02-21 21:42:56 +03:00
antoine d8c5703e06 Merge remote-tracking branch
'github_troosan/fix_for_different_even_odd_headers' into develop

Conflicts:
	tests/PhpWord/SettingsTest.php
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
2017-01-29 14:54:08 +01:00
antoine aef7a0ba76 add possibility to write w:evenAndOddHeaders in settings.xml 2017-01-29 14:34:19 +01:00
antoine 217fd6ecf1 fix image loading over https 2017-01-29 13:37:43 +01:00
antoine 517c432ee6 fix image loading over https 2017-01-29 13:16:54 +01:00
antoine 91f79d85cf Merge branch 'show_hide_spelling_grammatical_errors' into develop 2017-01-28 12:04:51 +01:00
antoine d23409f687 Add possibility to show/hide spelling and grammatical errors 2017-01-28 11:39:43 +01:00
antoine 8d7775552c Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-22 15:16:16 +01:00
antoine fc3bc29a02 fix default page size 2017-01-22 11:09:44 +01:00
antoine da60645be3 Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-21 19:29:14 +01:00
antoine b6a9f7c9b3 fix paper size and add tests for Paper class 2017-01-21 19:06:49 +01:00
Stéphane Mourey 1a1b362f40 Update Paragraph.php 2016-12-13 21:51:44 +01:00
Progi1984 6da9d8a0bf Merge pull request #928 from likeuntomurphy/develop
Fixes PHPOffice/PHPWord#927
2016-12-13 16:56:57 +01:00
antoine 51c6b5fc38 add support for Image creation from string image data 2016-11-08 23:40:10 +01:00
antoine a070628225 Merge remote-tracking branch 'origin/develop' into develop 2016-11-08 23:33:50 +01:00
antoine 46eebe2136 add support for Image creation from string image data 2016-11-08 23:22:22 +01:00
liangtaohy 3f9ab94812 Update MsDoc.php
fix style\font not found bug
2016-11-08 18:32:22 +08:00
Jonathan Cox 000e36acfe Fixes PHPOffice/PHPWord#927 2016-10-28 20:06:03 -04:00
antoine c50e3c581a replace tab with spaces 2016-10-28 23:28:05 +02:00
antoine 18474c56c4 replace tab with spaces 2016-10-28 23:27:24 +02:00
antoine 77ed1565c3 make FontStyle based on paragraph if it set 2016-10-28 22:40:44 +02:00
antoine e7229fc15c make FontStyle based on paragraph if it set 2016-10-28 22:27:05 +02:00
antoine d52d9b8985 Add support for XE and INDEX fields 2016-10-27 23:12:26 +02:00
Stéphane Mourey 23e19a2d47 Fix division by zero
See #886
2016-09-12 16:43:21 +02:00
Brandon Skrtich 49492b2516 Fix incorrect image size between windows and mac.
See Issue #224
2016-08-26 11:06:19 -06:00
Progi1984 c71069022e Merge pull request #821 from brutto/patch-1
Add info about Invalid image
2016-08-23 10:24:27 +02:00
Roman Syroeshko 2bcfacfbf9 Updated copyright. 2016-07-31 12:35:08 +04:00
Roman Syroeshko 1827eab20c Removed deprecated code. 2016-07-30 22:41:31 +04:00
Roman Syroeshko 54013a6164 https://github.com/PHPOffice/PHPWord/issues/399. 2016-07-30 22:32:32 +04:00
Roman Syroeshko fb863cdf21 https://github.com/PHPOffice/PHPWord/issues/335. 2016-07-30 16:02:23 +04:00
ale rimoldi 133b727f59 table->setStretch() optionally avoids the table to stretch to the page width (only for word output) 2016-07-25 10:11:52 +02:00
Roman Syroeshko 7deb010318 Fixed formatting. 2016-07-08 23:43:12 +04:00
Roman Syroeshko e2ea1eec7c Fixed tests. 2016-07-08 23:21:38 +04:00
Roman Syroeshko 3f1e0ac4a7 #483. Output escaping for RTF. 2016-07-08 22:56:59 +04:00
Roman Syroeshko 649da97a42 Fixed build. 2016-06-28 21:50:02 +04:00
Roman Syroeshko 4c7e1399fe #483. Output escaping for HTML. 2016-06-28 21:37:36 +04:00
Anton Karakulov 0652302423 add info about Invalid image
if there are many images in document are used and one of them throws `InvalidImageException` it is very difficult to detect which one without any message here...
2016-06-19 15:27:01 +03:00
Phil Betley b011e6f157 5.3 array syntax 2016-06-16 08:54:24 -04:00
Phil Betley 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
Roman Syroeshko 508d6194fc Fixed build. 2016-06-13 20:31:33 +04:00
Roman Syroeshko ebbb3a525e #483. Output escaping for ODF. 2016-06-13 20:14:54 +04:00
Roman Syroeshko a07dc6cdf0 #483. Output escaping for OOXML. 2016-06-04 20:21:54 +04:00
Roman Syroeshko ec3c62b051 #483. Output escaping for OOXML. 2016-06-04 20:06:37 +04:00
Roman Syroeshko d57973693d #618. 2016-04-23 19:49:10 +04:00
Sam Sullivan f4ec74a4c5 imagesavealpha() in Element\Image 2016-04-11 12:49:18 -05:00
Sam Sullivan adfcc62e64 imagesavealpha() in Writer\AbstractWriter 2016-04-11 12:48:43 -05:00
Roman Syroeshko 1c5bb3a911 #548. 2016-04-09 22:03:21 +04:00
Roman Syroeshko 28f801b5d0 #704. 2016-02-23 19:02:35 +04:00
Denis Solovyov 0857f36572 Add TextRun as container for CheckBox 2016-02-12 17:37:44 +02:00
Roman Syroeshko 53a53695ff Reviewed and merged #612. 2016-02-06 22:14:29 +04:00
Roman Syroeshko 995dc68706 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 22:19:06 +04:00
Roman Syroeshko 8bc236460a Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 22:10:13 +04:00
Roman Syroeshko a621447993 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 21:35:04 +04:00
Roman Syroeshko ea4388def5 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 21:06:09 +04:00
Roman Syroeshko f359825cb7 Reviewed and merged #658. 2016-01-23 19:16:34 +04:00
Roman Syroeshko 529edcb68e Merge pull request #617 from kazitanvirahsan/develop
Template processor setValue() improvements #614
2015-12-12 21:01:31 +04:00
Roman Syroeshko 7bd6cbdb64 Copyright update. 2015-12-05 21:28:46 +04:00
Roman Syroeshko 43fb23d896 Copyright update. 2015-12-05 21:26:01 +04:00
Gerald Buttinger bcfb3e868c Add methods setValuesFromArray and cloneRowFromArray to the TemplateProcessor-class and update samples and docs accordingly 2015-11-27 14:30:22 +01:00
Roman Syroeshko e6d73d8ff8 Removed custom autoloader. 2015-11-21 20:24:49 +04:00
Roman Syroeshko 95c097106f Reorganized unit tests. 2015-11-15 21:34:36 +04:00
Roman Syroeshko 3965f110ff Added backward compatibility for deprecated alignment options. 2015-11-14 15:57:15 +04:00
Roman Syroeshko d74c0bd878 Added backward compatibility for deprecated alignment options. 2015-11-14 15:31:50 +04:00
Henri MEDOT f7afdebb03 Added support for linebreaks <br /> in Shared\Html::addHtml() 2015-11-12 18:51:04 +01:00
Roman Syroeshko 09e5e352a9 Changed init value of the NumberingLevel.alignment property. 2015-10-21 21:44:10 +04:00
Roman Syroeshko 12823a5fbf Fixed build. 2015-10-10 19:32:53 +04:00
Roman Syroeshko 505cc76406 Fixed build. 2015-10-10 19:22:19 +04:00
Roman Syroeshko 94c0d02330 Next round of refactoring of alignment-related functionality. 2015-10-10 19:06:23 +04:00
kazi Tanvir Ahsan b446a23b61 Update 2 Template processor setValue() improvements #614 2015-09-10 23:50:23 +10:00
kazi Tanvir Ahsan 873d41a872 Update Template processor setValue() improvements #614 2015-09-10 23:46:48 +10:00
kazi Tanvir Ahsan a123ce41e5 Template processor setValue() improvements #614 2015-09-10 23:33:02 +10:00
Roman Syroeshko 3d78ee70b7 Merged #513. 2015-08-30 18:15:16 +04:00
Roman Syroeshko adf20d318f #513. 2015-08-30 18:03:31 +04:00
Roman Syroeshko 48a88f9cba Fixed build. 2015-08-16 22:55:40 +04:00
Roman Syroeshko 4238154034 Fixed build. 2015-08-16 22:54:35 +04:00
Roman Syroeshko 2a62b3ac43 Fixed build. 2015-08-16 22:36:28 +04:00
Roman Syroeshko 9be25449e1 Merged #498. 2015-08-16 20:27:05 +04:00
Roman Syroeshko 8dc276a0db Merged #513. 2015-08-16 20:20:13 +04:00
Roman Syroeshko 7c371e1d08 Merged #532. 2015-08-16 19:53:03 +04:00
Roman Syroeshko 90295fe09c #532. 2015-08-16 19:50:47 +04:00
Russ d11b2467aa Fix Empty Dropdown Entry
Pad any empty dropdown entries we find so that xmlWriter doesn't
generate an error.
2015-08-06 15:57:18 -05:00
Russ a9398e32c7 Fix Hour Casing for Intended Formats to Work Correctly
Time formats should either be "h" or "HH".  There were some formats
which were incorrectly specified as "H".
2015-08-06 13:22:01 -05:00
Russ cb034879b4 Add Date Formats to Field Element
Fix a typo (d-M-yyy H:mm), and expand the list of valid date formats.
2015-08-06 12:50:31 -05:00
Sebastian Schwaiger 13a1c9f24f A chart object can also be added to a table cell 2015-07-29 11:16:04 +02:00
Russ e929610746 Map Underline Codes to Corrected Constant Values 2015-07-22 09:01:01 -05:00
Russ 304765162e #574 Incorrect Constant Names in \Style\Font.php
Correct constants mapped to "dotDash" and "dotDashHeavy", leaving old spellings for backwards compatibility.
2015-07-22 08:57:15 -05:00
Frank Meyer a6528471c2 changed if statement due to error in codesniffer 2015-07-21 15:11:34 +02:00
Frank Meyer 3a251770e8 Removed complains of php-codesniffer
removed whitespace
changed inline if statement
2015-07-21 14:56:29 +02:00
Frank Meyer 62d3f97e30 dded the ability to enable gridlines and axislabels on charts
added options 'showAxisLabels', 'showGridX', 'showGridY' to charts style element
2015-07-21 14:07:23 +02:00
Roman Syroeshko db8221d303 Fix for #532. 2015-07-02 21:46:29 +03:00
Roman Syroeshko 988eaca87e Fix for #532. 2015-07-02 21:39:54 +03:00
Roman Syroeshko 1cd4fbf5ae Performance improvement for #513. 2015-06-02 22:15:58 +03:00
Roman Syroeshko 9770f44877 Shortened names of ``TemplateProcessor`` properties. 2015-04-15 00:12:37 +03:00
Roman Syroeshko b7387be3fd Reimplemented #498. 2015-04-14 22:47:41 +03:00
Roman Syroeshko a5c3645717 Performance improvement for #513. 2015-04-11 21:41:58 +04:00
Roman Syroeshko f33abcdcc4 Performance improvement for #513. 2015-04-11 21:25:40 +04:00
Roman Syroeshko 4eefb60362 #51 (updated tests, refactored a little). 2015-02-21 18:30:00 +04:00
Roman Syroeshko cc305bcb11 Fixed broken paragraph alignment for OpenXml. 2015-02-21 17:43:46 +04:00
fergusean 00adf6de81 Skip inquiring PHP for temp directory when it's user defined 2015-02-13 00:12:13 -05:00
h6w 474f8ef2f7 Update AbstractStyle.php 2014-12-29 18:16:05 +11:00
Roman Syroeshko fbfde2e0ee #441 (added @since annotation). 2014-12-17 21:39:19 +04:00
Progi1984 2176232910 Merge PR #441 2014-12-10 19:55:07 +01:00
chc88 d330e57018 Update PageBreak.php
Update pdf-generation; check if we're generating a pdf
2014-12-10 15:49:40 +01:00
Roman Syroeshko 2cb124f5b1 https://github.com/PHPOffice/PHPWord/issues/51 2014-12-09 21:35:26 +04:00
Roman Syroeshko f8ee230495 [FIXED] Typo. 2014-12-04 22:12:16 +04:00
Franz Holzinger ca664a53d7 Update Table.php
You must not open a <th> and close it as a </td>.
read http://www.w3schools.com/tags/tag_th.asp
2014-12-03 17:01:27 +01:00
chc88 37ca009769 Extend HTML output for pagebreaks for PDF generation
Make HTML output of pagebreak compatible for the different PDF writers by combining:
http://mpdf1.com/manual/index.php?tid=110 (tested and working)
and
https://code.google.com/p/dompdf/wiki/FAQ (tested and working)
and
http://chandeshparekh.com/css-to-create-new-page-in-php-tcpdf-pdf/
2014-11-14 17:26:23 +01:00
Roman Syroeshko c0e04fac51 Reverted #51. 2014-11-07 20:54:24 +04:00
Roman Syroeshko b2286f8545 [FIXED] https://github.com/PHPOffice/PHPWord/issues/401 2014-10-22 19:53:50 +04:00
pjt33 b1acecb255 Correct spelling of fldCharType separate. See http://www.ecma-international.org/news/TC45_current_work/OfficeOpenXML-XMLSchema.zip , file wml.xsd, line 3977. 2014-10-20 11:27:57 +02:00
Roman Syroeshko fa575ef12c Minor refactoring. 2014-10-14 21:33:04 +04:00
Roman Syroeshko 2c81d5f38b Some phpdoc for https://github.com/PHPOffice/PHPWord/pull/390. 2014-10-10 21:20:52 +04:00
Roman Syroeshko 4445fd3258 Replaced `array_key_exists` with `isset` for better performance. 2014-10-10 21:10:29 +04:00
Spike Ilacqua 4e25283195 Add missing setters for pageSizeW and pageSizeH 2014-10-02 10:44:34 -06:00
Progi1984 8ebe3b3738 Revert "Add missing setters for pageSizeW and pageSizeH" 2014-10-02 17:21:17 +02:00
Spike Ilacqua 0a8635ece8 Add missing setters for pageSizeW and pageSizeH 2014-09-22 16:58:00 -06:00
Franz Holzinger 27b0c69fd4 Update Head.php
The generated HTML and PDF tables are missing the border lines. Sample_07_TemplateCloneRow.docx shows the lines around the table and the table cells. However the generated HTML and PDF file are missing those lines. This patch fixes this issue.
2014-09-22 15:46:55 +02:00
Roman Syroeshko fdbd983d14 Merge pull request #356 from GMTA/develop
Set the right method name for addShape() for AbstractContainer
2014-09-07 18:52:29 +04:00
Roman Syroeshko 5811aac272 Merge pull request #302 from basjan/absolute-positioning 2014-09-07 18:21:24 +04:00
Roman Syroeshko 42955f17dd Merge pull request #302 from basjan/absolute-positioning 2014-09-07 18:19:10 +04:00
Roman Syroeshko c4cbabeb36 Merge pull request #302 from basjan/absolute-positioning
For absolute positioning vPos and hPos need to be set to POS_ABSOLUTE
2014-09-07 18:01:53 +04:00
Jelle Raaijmakers 9b3b1aa7a0 Set the right method name for addShape() in PHPDoc @method for AbstractContainer. 2014-08-31 00:06:00 +02:00
Roman Syroeshko 9757fbb033 [FIXED] https://github.com/PHPOffice/PHPWord/issues/340 2014-08-23 20:19:48 +04:00
Roman Syroeshko bf0136c156 https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:46:38 +04:00
Roman Syroeshko 5a75d84f8f Merge remote-tracking branch 'origin/develop' into develop 2014-08-16 15:22:35 +04:00
Roman Syroeshko ec25dd338b https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:21:58 +04:00
Progi1984 90d64bd347 #23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes) 2014-08-16 12:44:12 +02:00
Progi1984 4ade9c3c6e #23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes) 2014-08-16 12:33:37 +02:00
Progi1984 e561d54661 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop 2014-08-16 11:55:13 +02:00
Progi1984 ca69de3962 #23 : Implement Word97 aka MsDoc Reader 2014-08-15 19:26:23 +02:00
Progi1984 8d9e85b2ba #331 : Word2007 Writer : Support for RTL 2014-08-12 13:32:05 +02:00
Roman Syroeshko 6f2d444ba9 https://github.com/PHPOffice/PHPWord/issues/310 2014-08-11 22:30:46 +04:00
Roman Syroeshko 3d06c77fc1 Minor refactoring of "Shared\ZipArchive" class. 2014-08-10 21:01:46 +04:00
Roman Syroeshko e31f080ea6 Removed unused comment. 2014-08-10 20:46:10 +04:00
Roman Syroeshko e6d88a27e8 Refactored usages of "tempnam()" function. 2014-08-10 20:30:14 +04:00
Roman Syroeshko 56c3d8eda2 https://github.com/PHPOffice/PHPWord/issues/310 2014-08-10 20:00:19 +04:00
Progi1984 f25833c60d #327 : Fixes PHP-MD errors
@link : https://travis-ci.org/PHPOffice/PHPWord/jobs/31598319#L539
2014-08-04 11:17:05 +02:00
Philipp Scheit 07e03fc955 bugfix: specific borders were not written correctly in word2007 2014-08-04 10:40:36 +02:00
Progi1984 a23ff4de2f Merge pull request #305 from jonnsn/internal-links
Internal links
2014-07-06 22:12:21 +02:00
jogo 7202634573 fix wrong formatting 2014-07-04 15:54:20 +02:00
jogo 7c8ff2884b add sample
fix undefined Index
2014-07-04 15:31:48 +02:00
Roman Syroeshko 197c6ec0b3 [FIXED] Wrong use of passing by reference. 2014-07-04 16:52:39 +04:00
Roman Syroeshko 7bbe1ed620 [FIXED] Wrong use of passing by reference. 2014-07-04 16:49:01 +04:00
Roman Syroeshko c4638df0d6 [FIXED] Wrong use of passing by reference. 2014-07-04 16:35:13 +04:00
Roman Syroeshko fd209fc999 [FIXED] Wrong use of passing by reference. 2014-07-04 16:20:18 +04:00
jogo 87c3df5536 add missing file
apply formatting to CGL
2014-07-04 14:10:20 +02:00
Roman Syroeshko f2c4329108 [FIXED] Wrong use of passing by reference. 2014-07-04 16:00:17 +04:00
jogo 4d060b3f07 sync with develop-branch 2014-07-04 13:32:47 +02:00
jogo 475c76dd79 convert tabs to spaces 2014-07-04 13:30:07 +02:00
jogo fdeefb77d9 include minor changes from develop branch 2014-07-04 13:24:14 +02:00
jogo d54a674b97 add element bookmark and allow links to internal bookmarks in Word2007 2014-07-04 13:07:08 +02:00
Roman Syroeshko 1b9b8d4f90 [FIXED] Wrong use of passing by reference. 2014-07-04 14:44:22 +04:00
Roman Syroeshko 47a17a33e8 Revert: [FIXED] Wrong use of passing by reference. 2014-07-04 13:02:28 +04:00
Roman Syroeshko f2e9e3716b [FIXED] Wrong use of passing by reference. 2014-07-04 13:00:52 +04:00
Roman Syroeshko 2c5d13c88e [FIXED] Typo in Section->addHeaderFooter(). 2014-07-04 12:25:53 +04:00
Roman Syroeshko 4a02142d63 [FIXED] Wrong use of passing by reference. 2014-07-04 12:13:11 +04:00
Roman Syroeshko 8056b6926c [CHANGED] Docblock for pass-by-reference parameters. 2014-07-03 16:11:15 +04:00
Roman Syroeshko d0a609bc95 [CHANGED] Added "@return" annotation where it as missed. 2014-07-03 15:40:24 +04:00
Bas-Jan 't Jong 52406daee1 For absolute positioning vPos and hPos need to be set to POS_ABSOLUTE 2014-07-02 22:13:54 +02:00
Roman Syroeshko e1164f8989 [Changed] Refactored Template a little. 2014-07-02 17:49:53 +04:00
Roman Syroeshko c446028acc [Changed] Refactored Template a little. 2014-07-02 17:44:26 +04:00
Roman Syroeshko 75c8e7e816 [NEW] Introduced CopyFileException. 2014-07-02 17:21:43 +04:00
Roman Syroeshko 369f55a71f [NEW] Introduced CreateTemporaryFileException. 2014-07-02 13:17:13 +04:00
Roman Syroeshko dbc9737136 [NEW] Introduced CreateTemporaryFileException. 2014-07-02 12:58:55 +04:00
Roman Syroeshko 3c694ea572 [NEW] Introduced CreateTemporaryFileException. 2014-07-02 12:42:50 +04:00
Ivan Lanin d8aef5c502 Bugfix #294: `add<elementName>` of container should be case insensitive 2014-07-01 09:52:24 +07:00
Ivan Lanin 415d9b95c4 Update tests 2014-06-29 14:10:49 +07:00
Ivan Lanin 33570f7cd4 #294: Support for paragraph with borders 2014-06-28 22:59:00 +07:00
Ivan Lanin 689a7371cd Fix Travis errors 2014-06-28 12:01:53 +07:00
Ivan Lanin b5a63c5b55 Elaborate SDT elements 2014-06-28 11:47:29 +07:00
Ivan Lanin b2daeed6cb Merge branch 'develop' into sdt 2014-06-24 00:15:39 +07:00
Ivan Lanin 5be8414ef8 Settings: OOXML compatibility 2014-06-21 20:45:30 +07:00
Progi1984 b527d06608 #23 : Implement Word97 aka MsDoc Reader 2014-06-21 09:18:57 +02:00
Ivan Lanin cd547927ea New structured document tag (SDT) element 2014-06-21 02:06:49 +07:00
Progi1984 71b4ac9c56 FIXED : #282 : problem converting docx to pdf
PHP Catchable fatal error: Argument 2 passed to DOMXPath::query() must be an instance of DOMNode, null given, called in /var/www/xxx/PhpWord/Reader/Word2007.php on line 145 and defined in /var/www/xxx/PhpWord/Shared/XMLReader.php on line 99, referer: XXX
2014-06-17 15:48:39 +02:00
Ivan Lanin 5c8e100d41 Bugfix #280: Table inside vertical border does not rendered properly 2014-06-16 16:23:41 +07:00
Ivan Lanin 384107e7cf Ability to define document protection and new `Metadata` subnamespace 2014-06-16 11:58:05 +07:00
Ivan Lanin 6a81691d45 #266: Ability to add textinput, checkbox, and dropdown form elements 2014-06-16 00:31:17 +07:00
Ivan Lanin a13e5b20f9 #278: 3D charts and ability to set width and height 2014-06-15 20:48:26 +07:00
Ivan Lanin 0f085f71e0 Merge branch 'chart' into develop 2014-06-14 12:51:41 +07:00
Ivan Lanin 3fef19093c #278: Basic chart 2014-06-14 12:49:39 +07:00
Ivan Lanin 8c2b099dbc Merge `Shared\Drawing` and `Shared\Font` into `Shared\Converter` 2014-06-14 10:54:33 +07:00
Ivan Lanin 9a5f91afc6 Merge branch 'develop' into chart 2014-06-12 12:17:49 +07:00
Ivan Lanin f54d9a1eb4 #274: Page breaks on titles and tables 2014-06-12 02:32:00 +07:00
Ivan Lanin a93b686ca3 Chart improvements 2014-06-11 23:04:13 +07:00
Ivan Lanin 056ff5e676 Basic chart support 2014-06-11 02:03:04 +07:00
Brandon Skrtich d17a806305 Small fixes for addHtml.
Adding some HTML Entities to the test for addHTML
2014-06-09 16:32:12 -06:00
Ivan Lanin 4c04071fd5 Fix typo: ODT > ODText 2014-06-09 18:52:06 +07:00
Ivan Lanin 1ec0589c55 Update basic example 2014-06-08 22:38:50 +07:00
Ivan Lanin 6839ee41dd New `PhpWord::save()` method to encapsulate `IOFactory` 2014-06-08 22:05:50 +07:00
Ivan Lanin e952fdefb5 Refactor PhpWord to reduce dependencies 2014-06-08 19:37:08 +07:00
Ivan Lanin 63d53ac910 Use section "style" instead of "settings" for consistency 2014-06-08 16:44:46 +07:00
Ivan Lanin a9c9c21d3b Fix Travis test error 2014-06-08 03:38:53 +07:00
Ivan Lanin 893843969f Refactor elements to move set relation Id from container to element 2014-06-08 03:00:53 +07:00
Ivan Lanin 01853f7aac Update change log and adjust some coding standards for #261, #265, and #267 2014-06-07 17:52:48 +07:00
Ivan Lanin 0489533c5f Merge branch 'develop' of github.com:bskrtich/PHPWord into develop 2014-06-07 17:36:59 +07:00
Ivan Lanin bc6b40dde5 Merge branch 'fix-rare-pclzip-temp-file-issue' of github.com:andrew-kzoo/PHPWord into develop 2014-06-07 17:36:37 +07:00
Ivan Lanin 7bbaab30b9 Merge branch 'fix-rare-pclzip-realpath-php-version-issue' of github.com:andrew-kzoo/PHPWord into develop 2014-06-07 17:33:58 +07:00
Brandon Skrtich 8b0472dd52 Autoloader Options
Add the ability to set the autoloader options.
2014-06-06 13:34:01 -06:00
Ivan Lanin 09a143fe71 QA: Type check fix for RTF section style and docblock comment fix for AbstractContainer 2014-06-06 18:56:09 +07:00
Ivan Lanin a2ec62a79f Section: Ability to set paper size, e.g. A4, A3, and Legal 2014-06-06 18:31:01 +07:00
Ivan Lanin 49f4e6ba64 RTF Writer: Support for sections, margins, and borders #249 2014-06-06 12:53:01 +07:00
Andrew Collins 3d2cd163d3 Ensure temp file in pclzipAddFile() removed
Make pclzipAddFile() similar to pclzipAddFromString() in removing
temporary files.
2014-06-05 13:45:18 -04:00
Ivan Lanin d97602fa98 Reduce duplications and fix some docblocks 2014-06-05 23:47:39 +07:00
Ivan Lanin 479713da55 Update changelog and unit test for #264 2014-06-05 22:41:58 +07:00
Ivan Lanin 00c6b76d68 Merge branch 'feature-paragraphBgColor' of github.com:lrobert/PHPWord-1 into develop 2014-06-05 22:28:44 +07:00