Commit Graph

698 Commits

Author SHA1 Message Date
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
lrobert f44ff4b7a6 Added shading to the paragraph style for full width shading 2014-06-05 10:47:53 -04:00
Ivan Lanin 1accec2ff0 Refactor styles: Inherit Image and Line from Frame 2014-06-05 15:48:58 +07:00
Ivan Lanin 2328e34e64 Refactor Word2007/Element to identify the same properties 2014-06-05 08:13:54 +07:00
Andrew Collins d57606082d Fix rare PclZip/realpath/PHP version problem
In PHP 5.4.4 realpath() handles absolute paths correctly, but in PHP 5.3.8 returns false.
2014-06-04 13:27:18 -04:00
Ivan Lanin a2294b4b1e Font: New `scale`, `spacing`, and `kerning` property of font style 2014-06-04 23:28:08 +07:00
Ivan Lanin 9c8620ecd7 Refactor `IOFactory` to remove duplication 2014-06-02 23:47:44 +07:00
Ivan Lanin 61d8dbde49 QA: Small fixes for #258 based on Scrutinizer https://scrutinizer-ci.com/g/PHPOffice/PHPWord/inspections/54c74458-884d-4299-aed1-a7d2eb6a5654 2014-06-02 22:57:11 +07:00
Ivan Lanin a66f93ccdc #123: New drawing shapes (arc, curve, line, polyline, rect, oval) 2014-06-02 21:55:44 +07:00
Ivan Lanin 38d3d7be20 Bugfix for #257: HTML Reader: `<p>` and header tags puts no output 2014-06-02 18:30:51 +07:00
Ivan Lanin e0d2c6584c Refactor IOFactory and AbstractContainer to allow more dynamic inclusion. 2014-06-01 01:08:06 +07:00
Ivan Lanin 9839222492 QA: Additional unit tests 2014-05-31 22:28:13 +07:00
Ivan Lanin 2205377259 #245: Basic table support in RTF writer 2014-05-31 13:33:38 +07:00
Ivan Lanin e7540c079e Add $nestedLevel to elements 2014-05-31 09:29:09 +07:00
Ivan Lanin ec85d7d641 #80: Basic HTML reader 2014-05-31 03:06:11 +07:00
Ivan Lanin 0164e37873 Decompose Shared\Html 2014-05-31 02:01:09 +07:00
Ivan Lanin 4f9399899a QA: Docblock improvements and -q parameter for phpdoc 2014-05-30 20:44:06 +07:00
Ivan Lanin 900a96addf Bugfix for #236 (OpenOffice crash when opening DOCX) and paragraph style refactoring 2014-05-30 19:59:57 +07:00
Ivan Lanin d3ac5b1fa1 Merge branch '#193' into develop 2014-05-30 13:19:51 +07:00
Ivan Lanin 5c2c687efd #193: Heading numbering 2014-05-30 13:19:10 +07:00
Ivan Lanin a57b28de8f Some adjustments for the new `Line` element #253 2014-05-30 01:05:55 +07:00
Bas-Jan 't Jong 748e16473d Final try to resolve Travis build errors 2014-05-29 18:07:01 +02:00
Bas-Jan 't Jong 0103787873 Second attempt to resolve Travis build errors 2014-05-29 17:44:14 +02:00
Bas-Jan 't Jong 54af93a20a Fixed some Travis build errors 2014-05-29 17:11:54 +02:00
Bas-Jan 't Jong 1580113d7b Added Line element 2014-05-29 16:44:00 +02:00
Ivan Lanin 7a42802b48 RTF reader: Unit tests and some improvements 2014-05-29 18:02:49 +07:00
Ivan Lanin 7c2ad59530 Merge branch 'develop' into rtf 2014-05-29 16:54:13 +07:00
Ivan Lanin e81d92e265 Update changelog, docs, and unit tests for new `Field` element #251 2014-05-29 16:25:39 +07:00
Ivan Lanin 2d88ea22b4 RTF Reader: Split control parsers into functions 2014-05-29 15:09:02 +07:00
Bas-Jan 't Jong 8f74f26fd4 Travis build error fix 2014-05-28 20:35:24 +02:00
Bas-Jan 't Jong 079d08e94a Added Field Element 2014-05-28 17:59:44 +02:00
Ivan Lanin 87f071d1b6 #72: Basic RTF Reader 2014-05-28 21:27:20 +07:00
Bas-Jan 't Jong 3085445081 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-26 21:25:07 +02:00
Ivan Lanin d7f3d25b2a #248 More flexible checking for float value 2014-05-27 01:08:54 +07:00
Ivan Lanin d9a2c4c3ca Bugfix #248: Image: `marginLeft` and `marginTop` cannot accept float value 2014-05-27 00:46:18 +07:00
Bas-Jan 't Jong 36080c14ca Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-25 22:57:01 +02:00
Ivan Lanin 92c7a24c38 QA: Additional unit tests and docblock fixes 2014-05-25 23:08:02 +07:00
Ivan Lanin dc6c487cd0 Fix test error 2014-05-25 00:43:38 +07:00
Ivan Lanin 1e9a498ca2 QA: Reduce some complexities: https://scrutinizer-ci.com/g/PHPOffice/PHPWord/code-structure/develop?elementType=operation 2014-05-24 15:38:41 +07:00
Ivan Lanin 5ff47f44e9 QA: Misc. bugfixes and docblock improvements 2014-05-24 11:11:12 +07:00
Ivan Lanin 991016a48b Additional writer test 2014-05-24 10:05:39 +07:00
Ivan Lanin a65c3c3cf1 RTF Writer: Ability to write image 2014-05-23 19:22:40 +07:00
Ivan Lanin e00b551aa2 Breakdown HTML Writer to head and body parts and more cyclomatic complexity reductions 2014-05-23 16:48:11 +07:00
Ivan Lanin d79ca9ae31 Reduce cyclomatic complexity on DocumentProperties and Word2007 Document Writer. 2014-05-23 10:19:57 +07:00
Ivan Lanin e46fecffdd RTF Writer: Ability to write document properties 2014-05-23 09:05:10 +07:00
Ivan Lanin 2086e9e262 Refactor: Reduce cyclomatic complexity 2014-05-22 22:01:21 +07:00
Ivan Lanin fbce1c8fc9 #244: Enable "image float left" 2014-05-22 00:37:50 +07:00
Ivan Lanin d764de018c Additional unit tests and @since documentation 2014-05-21 22:36:00 +07:00
Ivan Lanin 3569271277 Word2007 Writer: Enable the missing custom document properties writer 2014-05-21 19:20:13 +07:00
Bas-Jan 't Jong 343f378782 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-20 22:29:26 +02:00
Bas-Jan 't Jong 5aac7f4782 From upstream 2014-05-20 22:28:34 +02:00
Ivan Lanin 721c5825a6 Small fixes for the last commit 2014-05-21 00:26:43 +07:00
Ivan Lanin 61c6d51e5e Refactor Word2007 reader 2014-05-21 00:00:19 +07:00
Ivan Lanin f536bd6fbd Merge branch 'develop' into reader 2014-05-20 23:25:56 +07:00
Ivan Lanin ac23e90ef4 ODT Reader: Ability to read standard and custom document properties 2014-05-20 18:00:00 +07:00
Ivan Lanin 930d8de462 ODT Writer: Enable title element and custom document properties 2014-05-20 14:53:02 +07:00
Ivan Lanin 69a3a0f4f2 Refactor reader 2014-05-20 11:27:28 +07:00
Ivan Lanin 0360f8e290 Unit tests for TCPDF and mPDF 2014-05-19 23:21:17 +07:00
Ivan Lanin f7bee23f65 Add TCPDF and mPDF as optional PDF renderer library 2014-05-19 18:06:42 +07:00
Ivan Lanin 553371f088 Type hinting and docblock update 2014-05-19 14:27:55 +07:00
Ivan Lanin 32f1f62b45 Change Settings constants 2014-05-18 23:10:10 +07:00
Ivan Lanin d64fc98a51 Merge branch 'zip' into develop 2014-05-18 22:56:45 +07:00
Ivan Lanin 39d4e8ee54 Bugfix #150: Page break adds new line in the beginning of the new page 2014-05-18 22:23:28 +07:00
Ivan Lanin 7d9bcd46d4 ODT: New Image and Table style writer 2014-05-18 21:15:35 +07:00
Ivan Lanin b1e16e4386 Word2007: Reformat fonttable and theme parts 2014-05-18 17:49:47 +07:00
Ivan Lanin 970c6a24eb Bug fixes for last commit 2014-05-18 16:48:15 +07:00
Ivan Lanin 410ce4bffe ODT: Enable section and column 2014-05-18 16:29:56 +07:00
Ivan Lanin b91e3209fa Refactor ODT writer to give enable some additional features 2014-05-18 14:43:11 +07:00
Ivan Lanin f825ef50c0 Reorder code 2014-05-18 02:21:26 +07:00
Ivan Lanin 3f61d1807c Test fixes 2014-05-18 00:40:29 +07:00
Ivan Lanin 5519131f3e Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive 2014-05-17 23:30:13 +07:00
Ivan Lanin 7c12dfc735 Fixes for last commit 2014-05-16 16:00:40 +07:00
Ivan Lanin 048436cd04 Use INI instead of YML 2014-05-16 15:02:57 +07:00
Ivan Lanin f380c29eef Add `writeRaw` annotation and disambiguate `Settings` 2014-05-16 01:22:34 +07:00
Ivan Lanin 5511378eca #200: Ability to use a config file to store various common settings 2014-05-16 00:59:38 +07:00
Ivan Lanin 4d9e4062c3 QA: Scrutinizer dedup 2014-05-15 14:41:08 +07:00
Ivan Lanin 1c3735fc08 Refactor table and font styles to reduce duplication 2014-05-15 11:46:28 +07:00
Ivan Lanin abbf60a3be Increase minimum mass for php_sim and some test fixes 2014-05-15 10:24:20 +07:00
Ivan Lanin 27fa3ba233 Remove fontStyle parameter from ListItemRun and various small fixes 2014-05-15 01:13:22 +07:00
Ivan Lanin 04a62f3255 QA: Code cleanup and some additional tests 2014-05-14 19:41:44 +07:00
Ivan Lanin 6ba6ed40fc Reactivate php_sim in Scrutinizer and fix some minor issues 2014-05-14 08:40:21 +07:00
Ivan Lanin e03e121e85 #196: RTF link styling fixes 2014-05-14 00:42:05 +07:00
Ivan Lanin 1ee43da4de #196: RTF link styling 2014-05-13 23:41:16 +07:00
Ivan Lanin 7ae8c3cb81 Refactoring: Word2007 table and marginborder style writer 2014-05-13 14:57:04 +07:00
Ivan Lanin 8745c5ee30 Change behaviour of `set...` function of boolean properties; Some bug fixing based on Scrutinizer; New `Row` Word2007 style writer 2014-05-13 12:50:18 +07:00
Ivan Lanin 4b1a16006d #196: Ability to add links and page breaks in RTF 2014-05-13 02:48:44 +07:00
Ivan Lanin f8f98cccab #237: Ability to define table width (in percent and twip) and position 2014-05-13 01:32:44 +07:00
Ivan Lanin e589961e68 #158: Convert UTF8 text to Unicode before writing RTF (support UTF8 in RTF) 2014-05-12 23:12:07 +07:00
Ivan Lanin 55e715b5b1 Add variable type hints 2014-05-12 15:54:10 +07:00
Ivan Lanin c9179d681f Refactor elements and containers 2014-05-12 01:36:28 +07:00
Ivan Lanin c7e4ed0c18 Type check in element writers 2014-05-11 20:10:36 +07:00
Ivan Lanin c243a11e57 Additional type checks in style writers 2014-05-11 19:06:36 +07:00
Ivan Lanin 7d5c62ab34 Merge branch 'nestedtable' into develop 2014-05-11 18:22:09 +07:00
Ivan Lanin da77ba6a71 Merge branch 'ListItemRun' of github.com:basjan/PHPWord into #234-#235-basjan 2014-05-11 17:58:16 +07:00
Ivan Lanin fc66030b82 Merge branch 'Fixed-conversion' of github.com:basjan/PHPWord into #234-#235-basjan 2014-05-11 17:57:01 +07:00
Ivan Lanin ded651d947 #149: Ability to add table inside a cell (nested table) 2014-05-11 17:30:23 +07:00
Bas-Jan 't Jong 467f15a480 Added ListItemRun Element 2014-05-11 11:08:39 +02:00
Bas-Jan 't Jong afc3d5cb64 Minor fix. If conversion factor from pointToPixel is 1.333333, then the
conversion factor for PixelTopoint should be 0.75
2014-05-11 09:16:36 +02:00
Ivan Lanin 17e2f02817 Type checks on style writers 2014-05-11 11:23:46 +07:00
Bas-Jan 't Jong c524394f5f Fixed conversion factor Centimeters to Pixels and vice versa. 2014-05-10 23:52:10 +02:00
Ivan Lanin 516c13e032 Some unit tests for the new features 2014-05-10 23:40:34 +07:00
Ivan Lanin feff87e769 Fix Travis test errors 2014-05-10 21:56:06 +07:00
Ivan Lanin 62ed725032 Some modifications for the new `Html::addHtml` feature 2014-05-10 21:38:44 +07:00
Ivan Lanin a595e6d78c Merge branch 'AddHtml' of github.com:basjan/PHPWord 2014-05-10 20:13:33 +07:00
Bas-Jan 't Jong 07b4ae2c0f Added possiblity to add tables inside textbox 2014-05-10 14:04:15 +02:00
Bas-Jan 't Jong aa151c4010 Added function to add elements via HTML 2014-05-10 14:03:16 +02:00
Ivan Lanin 530f8ee357 Writers refactoring fixes 2014-05-10 14:45:51 +07:00
Ivan Lanin 0b13b22e07 Refactor HTML & PDF writer with composite pattern 2014-05-10 14:23:22 +07:00
Ivan Lanin 246557e3be Reactivate PHPMD and fix some rules for textbox 2014-05-09 03:15:26 +07:00
Ivan Lanin 6f0579c78f Fix Travis build error 2014-05-09 00:34:08 +07:00
Ivan Lanin 8a1d07f71a Fix Travis test errors 2014-05-08 23:13:45 +07:00
Ivan Lanin f7dd9dd07c Refactor writers and styles 2014-05-08 20:46:13 +07:00
Ivan Lanin ea41b08a9a Refactor the new textbox element 2014-05-08 13:05:27 +07:00
Ivan Lanin e12daacc0b Merge branch 'refactor' into develop 2014-05-08 12:17:14 +07:00
Ivan Lanin 6a0bfe3314 Move `addTextBox` to `AbstractContainer` and add sample for textbox 2014-05-08 10:58:19 +07:00
Ivan Lanin c7a940cc4c Merge branch 'textbox' of github.com:basjan/PHPWord 2014-05-08 08:56:34 +07:00
Bas-Jan 't Jong 364131aa5d Added TextBox functionality 2014-05-07 21:27:51 +02:00
Ivan Lanin 88560de601 Refactor writers 2014-05-08 02:19:57 +07:00
Ivan Lanin e0638f56bd Change Scrutinizer similarity analysis min mass 2014-05-07 01:44:51 +07:00
Ivan Lanin 51d69a44c6 Refactoring based on Scrutinizer recommendation 2014-05-07 01:11:56 +07:00
Ivan Lanin 0c1e47d7a7 Type checking 2014-05-06 23:37:14 +07:00
Ivan Lanin c4e8fdac84 Refactoring for code quality improvement (based on Scrutinizer) 2014-05-06 22:08:39 +07:00
Ivan Lanin c28f28ea25 Refactoring for code quality improvement (based on Scrutinizer) 2014-05-06 21:22:24 +07:00
Ivan Lanin b3229c6a7b Fix Travis test and update Scrutinizer config 2014-05-06 17:13:16 +07:00
Ivan Lanin 13c178d140 Refactor: Composite Word2007 & ODText writer parts 2014-05-06 16:38:16 +07:00
Ivan Lanin 4039304ba0 Word2007 Writer: Refactor writer parts using composite pattern 2014-05-06 01:45:13 +07:00
Ivan Lanin 704cc2fe04 Refactoring: Extends Endnotes from Footnotes & Heder from Footer 2014-05-05 23:30:15 +07:00
Ivan Lanin 5a2f4020fb QA: Additional unit testing and template scrutinizer config file 2014-05-05 18:57:54 +07:00
Roman Syroeshko 2add5541ce [CHANGED] https://github.com/PHPOffice/PHPWord/pull/179 - copyright notice has been added. 2014-05-05 13:06:53 +04:00
Roman Syroeshko 89f94b793d [CHANGED] https://github.com/PHPOffice/PHPWord/pull/179 - copyright info has been changed. 2014-05-05 12:38:32 +04:00
Ivan Lanin d11376e387 Merge branch 'second-header-bug' of github.com:basjan/PHPWord into develop 2014-05-05 09:03:13 +07:00
Bas-Jan 't Jong 11b3941103 Fixed a bug, that when a second header was added to a section, all
images added to the second header were assigned to the first header,
resulting in at least a corrupted DOCX.
2014-05-04 22:48:17 +02:00
Bas-Jan 't Jong aba15481c8 Corrected typo to 'const POSITION_HORIZONTAL_CENTER = 'center';' and
added examples to Sample_13
2014-05-04 22:34:37 +02:00
Ivan Lanin fd4fa11390 Merge remote-tracking branch 'upstream/develop' into nonstatic 2014-05-05 00:26:02 +07:00
Roman Syroeshko 6c3d1e721d License version has been added. 2014-05-04 21:03:29 +04:00
Ivan Lanin 3d19256c9c Merge branch 'develop' into nonstatic 2014-05-04 22:30:06 +07:00
Ivan Lanin 42c712e334 Refactor new image styles and create `Word2007/Style/Image` class 2014-05-04 21:36:52 +07:00
Ivan Lanin 6898ada0e0 Merge branch 'develop' of github.com:basjan/PHPWord into #217-basjan 2014-05-04 18:16:33 +07:00
Ivan Lanin 35d06cc2ce Change PHPWord license to LGPL 3 as per #211 2014-05-04 17:55:54 +07:00
Ivan Lanin c21e28f974 More refactoring for PHPMD compliance 2014-05-04 16:57:39 +07:00
Bas-Jan 't Jong 1a544cb2fa Fixed bug in header / footer, in which media elements were all assigned
to the first header element. This resulted in a corrupted DOCX, when a
media element was assigned to a second header in the same section.
2014-05-04 10:36:13 +02:00
Bas-Jan 't Jong 15dcb384c6 Messed up something. Resetting 2014-05-04 10:34:40 +02:00
Bas-Jan 't Jong 2187954b56 Fixed bug in header, wherein all images were assigned to the first
header in a section. This resulted in a corrupt DOCX
2014-05-04 10:16:28 +02:00
Ivan Lanin f6f52afa68 Fix Travis build error 2014-05-04 14:15:44 +07:00
Ivan Lanin 725162bc6b Deprecate static classes Footnotes, Endnotes, and TOC (#206); Reactivate `phpcpd` and `phpmd` on Travis 2014-05-04 03:40:54 +07:00
Bas-Jan 't Jong 9c11067720 Added Image relative and absolute positioning 2014-05-03 10:08:39 +02:00
Shawn Iwinski 6606d5c5c4 Remove spurious executable bits 2014-05-02 14:43:43 -04:00
Ivan Lanin e613e13478 New `Indentation` and `Spacing` style; Ability to define first line and right indentation 2014-05-02 14:12:07 +07:00
Ivan Lanin 999a9c5037 Style: Remove `bgColor` from `Font`, `Table`, and `Cell` and put it into the new `Shading` style 2014-05-02 09:45:16 +07:00
Ivan Lanin 9afa46105e Docblock fixes 2014-05-02 01:15:28 +07:00
Ivan Lanin 1d84c1db33 #151 Small caps, all caps, and double strikethrough; #199 Ability to use measurement unit other than twips 2014-05-02 00:49:42 +07:00
Ivan Lanin 1a1356a30b Section: Ability to define gutter and line numbering 2014-05-01 23:10:38 +07:00
Ivan Lanin 9b1f2f210c Add style class checker and rename $fStyle/$pStyle variables 2014-05-01 14:37:58 +07:00
Ivan Lanin 4e5bbb98b1 Refactor: Increase DocumentProperties cohesion 2014-04-30 18:49:48 +07:00
Ivan Lanin 98613423f8 Refactor: Simplify DocumentProperties 2014-04-30 17:50:22 +07:00
Ivan Lanin 4a3400c5b2 Refactor: Create writers' `Part` folders and remove all static parts 2014-04-30 13:49:48 +07:00
Ivan Lanin a676af30dd ODText Reader: Basic ODText reader 2014-04-29 01:19:12 +07:00
Ivan Lanin 1ed8f0dfc2 Refactor: Remove some duplication found by phpcpd. One more to go. 2014-04-28 23:33:26 +07:00
Ivan Lanin a4fa3dfb55 Refactor: Apply composite pattern for Word2007 reader 2014-04-27 12:09:43 +07:00
Ivan Lanin 2cbdb0b383 ODText Writer: Style writers 2014-04-27 09:00:32 +07:00
Ivan Lanin d25dc965c9 ODT Writer: Link writing 2014-04-26 16:06:56 +07:00
Ivan Lanin 0f79eb5186 Refactor: Split `AbstractContainer` from `AbstractElement` 2014-04-26 13:29:43 +07:00
Ivan Lanin 7863e397c4 Writer: Style writers 2014-04-26 12:44:11 +07:00
Ivan Lanin ec9d90017f Refactor: Fine tune element writing 2014-04-25 23:57:43 +07:00
Ivan Lanin 2567a2223c Update changelog and fine tune changes 2014-04-25 18:56:19 +07:00
Ivan Lanin 2be4cbf131 Refactor: Apply composite design pattern to RTF writer 2014-04-25 18:01:17 +07:00
Ivan Lanin 559a798acb Refactor: Apply composite design pattern to ODText/OpenDocument writer 2014-04-25 16:07:13 +07:00
Ivan Lanin b7480d81c0 Refactor: Apply composite design pattern to Word2007/OOXML writer 2014-04-25 14:48:44 +07:00
Ivan Lanin 324994137f Refactor: Apply composite design pattern to HTML writer 2014-04-24 23:50:06 +07:00
Ivan Lanin 03ff0fb7cd Doc: Add documentation source
ODT Writer: Refactor content writer part
2014-04-23 14:09:41 +07:00
Ivan Lanin 43d5aa345e DOCX Reader: Read titles 2014-04-23 04:08:02 +07:00
Ivan Lanin 0060e4316c PHPMD fixes and remove Style\Tabs (not needed) 2014-04-22 17:54:08 +07:00
Ivan Lanin f829559f65 ODT Writer: Basic image writing support 2014-04-18 23:12:51 +07:00
Ivan Lanin f5f03a5b2b Emulate \ZipArchive::extractTo for PCLZip 2014-04-18 02:58:38 +07:00
Ivan Lanin 4db75c37a9 QA: Additional tests for Word2007 writer 2014-04-17 16:19:23 +07:00
Ivan Lanin 306c354b2c ODText Writer: Additional unit tests 2014-04-17 03:47:43 +07:00
Ivan Lanin 94e1661958 Merge remote-tracking branch 'upstream/develop' into develop 2014-04-16 22:55:42 +07:00
Ivan Lanin b670a1e70f DOCX Writer: Create `word/settings.xml` and `word/webSettings.xml` dynamically 2014-04-16 22:13:00 +07:00
Roman Syroeshko db1d89ab23 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	src/PhpWord/Element/Section.php
	src/PhpWord/Endnotes.php
	src/PhpWord/Footnotes.php
	src/PhpWord/Media.php
	src/PhpWord/PhpWord.php
	src/PhpWord/Reader/Word2007.php
	src/PhpWord/Writer/AbstractWriter.php
	src/PhpWord/Writer/ODText/Content.php
	src/PhpWord/Writer/Word2007.php
	src/PhpWord/Writer/Word2007/Notes.php
2014-04-16 17:39:26 +04:00
Roman Syroeshko 2c1c1ea60f [IMPROVED] Dockblocks as per https://github.com/PHPOffice/PHPWord/pull/187. 2014-04-16 17:22:30 +04:00
Ivan Lanin b419d64277 Change Application DocProps to "PHPWord" 2014-04-16 18:41:29 +07:00
Ivan Lanin 52b3506bbb HTML Writer: Enable footnotes and endnotes 2014-04-16 17:17:42 +07:00
Ivan Lanin 3d8ae044b7 Set image size and additional tests for HTML writer 2014-04-16 14:45:43 +07:00
Ivan Lanin 406534cd42 Fix unit test error 2014-04-16 13:37:48 +07:00
Ivan Lanin 2829fd8216 Enable image in HTML writer 2014-04-16 12:12:32 +07:00
Ivan Lanin 9c738f7eae Refactor Element\Image and some samples 2014-04-16 09:50:56 +07:00
Ivan Lanin 3cb6d86e22 Unit tests for PDF writer; Enable `zip://zipFilename#archiveFilename` construct for image source 2014-04-16 07:50:39 +07:00
Ivan Lanin 413f5e88d8 Change PDF Core to AbstractRenderer 2014-04-14 10:07:35 +07:00
Ivan Lanin 580a61a832 Basic PDF Writer #68 2014-04-14 00:28:15 +07:00
Ivan Lanin 15ca8f294c Merge branch 'develop' into html 2014-04-13 22:11:31 +07:00
Ivan Lanin 19a69e2c39 Basic HTML writer 2014-04-13 22:04:07 +07:00
Ivan Lanin e78489b36e Update unit test and changelog 2014-04-13 18:03:59 +07:00
Ivan Lanin abc67edb50 Merge branch 'develop' of https://github.com/japonicus/PHPWord into develop 2014-04-13 17:45:50 +07:00
Ivan Lanin 89f42884c6 Merge branch 'master' of https://github.com/brunocasado/PHPWord into 'develop' 2014-04-13 17:37:54 +07:00
Ivan Lanin 9bb5655292 Unit test for AbstractStyle 2014-04-12 12:59:44 +07:00
Ivan Lanin 47956b019c Code formatting and some more tests 2014-04-12 12:17:28 +07:00
Progi1984 b40218da45 Add some unit tests for Shared & Element (100%!) - @Progi1984 2014-04-12 00:59:29 +02:00
Ivan Lanin fb35a5f80c Change object name 2014-04-12 00:40:22 +07:00
Ivan Lanin a5c815d50c ODT: Basic table writing support 2014-04-11 23:46:12 +07:00
Ivan Lanin a3a9af51e5 Additional unit tests and some code deduplication 2014-04-11 21:28:43 +07:00
Ivan Lanin ae652a6379 Update upcoming version number to 0.10.0 as per #178 2014-04-11 19:04:53 +07:00
Ivan Lanin 42167f8855 Fix documentation format and some type check 2014-04-11 18:16:24 +07:00
Ivan Lanin 297eeaadf0 Documentation for new ListItem feature 2014-04-11 17:59:48 +07:00
Ivan Lanin 39a5e8c51e Merge branch 'numbering' into develop 2014-04-11 17:11:21 +07:00
Ivan Lanin 47669f501a Ability to create custom list #10 and to read list definition from DOCX 2014-04-11 17:08:47 +07:00
Roman Syroeshko 4849bb271c [FIXED] Dockblocks for https://github.com/PHPOffice/PHPWord/pull/187. 2014-04-10 11:47:26 +04:00
Roman Syroeshko 5b4ed10999 [FIXED] Dockblock for https://github.com/PHPOffice/PHPWord/pull/187 2014-04-10 11:06:39 +04:00
Ivan Lanin f837381238 Ability to add Endnotes 2014-04-10 01:36:41 +07:00
Ivan Lanin 38418677f8 Fix unit test error 2014-04-09 20:44:32 +07:00
Ivan Lanin 0ccea9620c Merge remote-tracking branch 'upstream/develop' into xml-reader 2014-04-09 18:48:04 +07:00
Ivan Lanin db129b4805 Update footnote unit tests 2014-04-09 18:47:10 +07:00
Ivan Lanin 2cdad4b247 Reader: Ability to read header, footer, footnotes, link, preservetext, textbreak, pagebreak, table 2014-04-09 18:13:43 +07:00
Roman Syroeshko 9c9f7eb7c6 NULLs changed to lowercase to meet PSR. 2014-04-08 22:00:36 +04:00
Roman Syroeshko 191d37b280 Leading backslashes in global function/constant calls were removed. 2014-04-08 21:56:18 +04:00
japonicus 833dfea1e0 Keep image aspect ratio if only 1 dimension styled
If only one of image width or height is specified, then scale missing
dimension to maintain the aspect ratio.
2014-04-08 17:42:01 +01:00
Ivan Lanin 6456255300 Merge branch '#160-element-container' into xml-reader 2014-04-08 08:21:52 +07:00
Ivan Lanin cd2dba0848 Element inheritance refinements 2014-04-08 03:27:19 +07:00
Ivan Lanin 3ef0f41c25 New `Style\AbstractStyle` and 'ODText\Base` 2014-04-08 03:03:14 +07:00
Ivan Lanin dadfc2903c Merge branch '#160-element-container' into xml-reader 2014-04-08 01:15:14 +07:00
Ivan Lanin f1108c48e6 Add Abstract- prefix and -Interface suffix for corresponding classes 2014-04-08 01:09:06 +07:00
Ivan Lanin b594e32f04 Move container files 2014-04-08 00:03:53 +07:00
Ivan Lanin d1d1e6b4df Reader: Ability to read tables, links, preserve text, and text break 2014-04-07 23:39:03 +07:00
Ivan Lanin 177c523799 Remove underscore prefix from all private properties name 2014-04-06 18:16:28 +07:00
Ivan Lanin a218202dbd Enhance unit tests 2014-04-06 15:19:09 +07:00
Ivan Lanin 50e9e0f029 Merge branch 'develop' into #160-element-container 2014-04-06 11:44:37 +07:00
Ivan Lanin eb7f0a3543 Merge remote-tracking branch 'upstream/develop' into #189-pyreweb 2014-04-06 00:42:40 +07:00
Ivan Lanin a84171de42 Merge branch 'master' of https://github.com/Pyreweb/PHPWord into #189-pyreweb 2014-04-06 00:41:36 +07:00
Ivan Lanin 61885e0d37 Merge branch 'develop' of https://github.com/diego-vieira/PHPWord into #191-diego-vieira 2014-04-05 23:46:13 +07:00
Ivan Lanin 03934af334 Refactor header/footer and media model 2014-04-05 22:39:04 +07:00
Ivan Lanin 6aa73544a6 Fix failed test 2014-04-05 01:41:48 +07:00
Ivan Lanin dd9faaee06 Add Media::reset(), Style::reset(), Footnote::reset(), and TOC::reset() 2014-04-05 01:28:28 +07:00
Ivan Lanin d7c18fe4b8 Move OOXML specific feature from Media to Word2007\Base 2014-04-05 00:19:45 +07:00
Ivan Lanin b75403f9a1 Refactor Media, addObject to header and footer 2014-04-04 15:28:35 +07:00
Diego Vieira e800d96cf9 added clone, delete, replace block #165
Because I needed to clone, delete and replace some tables, I added those
functions.
2014-04-04 00:58:42 -03:00
Ivan Lanin 0fc1a06267 Merge all Word2007 relationships writer 2014-04-03 22:09:14 +07:00
Ivan Lanin 1751ab09ee Remove unused ZipStreamWrapper.php and cleanup some scripts 2014-04-03 13:05:07 +07:00
Ivan Lanin 7c549f5802 DocBlock and use fixes 2014-04-03 10:13:13 +07:00
Ivan Lanin 1ebd26ddc6 Fix some test error 2014-04-03 09:20:21 +07:00
Ivan Lanin 637c9fce6f Create new Element abstract class 2014-04-03 09:12:11 +07:00
Ivan Lanin 04e6dbc86a Remove some duplication on Word2007 writers 2014-04-03 06:54:45 +07:00
Ivan Lanin 237625d22a Merge branch 'develop' into #160-element-container 2014-04-02 20:02:36 +07:00
Ivan Lanin 51a8628209 Merge #190, reorder methods (public, protected, private), and add example to Sample_07_TemplateCloneRow 2014-04-02 19:07:28 +07:00
Ivan Lanin 06ba9e7093 Make one level Element folder structure (move Cell and Row up one level) 2014-04-02 11:27:02 +07:00
Ivan Lanin f0ee25f343 Deprecate `createSection` in favor of `addSection` 2014-04-02 11:02:56 +07:00
Ivan Lanin a2a00393c1 Remove HashTable and all related properties/methods. PHPWord doesn't (yet) need it. 2014-04-02 10:43:42 +07:00
Ivan Lanin 495930be9d Add element availability matrix and enable `addObject` in footnote and textrun 2014-04-02 10:05:24 +07:00
Dave Gudgeon 4f514d2159 Load any number of headers and footers 2014-04-01 22:13:03 +01:00
Dave Gudgeon 763de347df Add support for document headers and footers to Template class. 2014-04-01 13:25:05 +01:00
Ivan Lanin 6f7b97e3ab Add unit tests for refactoring results 2014-04-01 19:05:07 +07:00
Ivan Lanin 07be5eaea3 Adding more functionalities to containers:
- Table: Ability to add footnote in table cell
- Footnote: Ability to add image in footnote
- ListItem: Ability to add list item in header/footer
- CheckBox: Ability to add checkbox in header/footer
- Link: Ability to add link in header/footer
2014-04-01 18:36:35 +07:00
Ivan Lanin faba46cc05 Extends `Container` abstract class into `Footnote`, `TextRun`, and `Cell` element class. 2014-04-01 00:56:24 +07:00
Ivan Lanin 2bf0bbb094 Container abstract class 2014-03-31 23:23:45 +07:00
Louis b7fd623121 Re-indent with spaces TOC Depth filter
Travis said spaces, not tab. Meh.
2014-03-31 17:07:58 +02:00
Ivan Lanin 13e5ca0a84 #160 Refactor folders: Element, Container, and Exception
- Rename folder Section to Element
- Rename folder Exceptions to Exception
- Move Section, Header, Footer, Settings to Container folder
- Move Element\Footer\PreserveText to Element\PreserveText
2014-03-31 10:11:52 +07:00
Ivan Lanin 9d3c2e8ae7 Update changelog and documentation for PCLZip 2014-03-31 00:26:41 +07:00
Ivan Lanin 71b60e9bd5 Merge branch 'develop' into #140-bskrtich-pclzip 2014-03-30 23:19:04 +07:00
Ivan Lanin 45b0baf7bc Refactor writer classes 2014-03-30 23:14:14 +07:00
Ivan Lanin 4127860f1e Refactor writers and readers
- Create Writer abstract class
- Inherit writers class from Writer
- Inherit ODText\WriterPart from Word2007\WriterPart
- Rename AbstractReader > Reader
2014-03-30 17:55:44 +07:00
Ivan Lanin 0e2f476cc2 Docblock updates 2014-03-30 14:15:23 +07:00
Ivan Lanin 05a4b95255 Unit test enhancements 2014-03-30 11:50:35 +07:00
Ivan Lanin f0803efabb #156 Merge branch 'master' of https://github.com/ozilion/PHPWord 2014-03-30 03:15:41 +07:00
Ivan Lanin 970cb32b45 Fix deprecated method, unused parts, initial definition, and @method annotation 2014-03-30 01:17:22 +07:00
Ivan Lanin 01f3f4071e #168 Merge branch 'develop' of https://github.com/jcarignan/PHPWord
- Comment header('Content-Length:'): HTTP header should not be in class that can be called via CLI
- Incorporate temporary location to ODT and RTF
- Update documentation
- Add unit tests
2014-03-29 23:56:28 +07:00
Ivan Lanin c91d6b61c9 Writer unit test enhancements 2014-03-29 22:26:00 +07:00
Ivan Lanin 255af437f2 Bugfix for footnote reference number and additional feature to insert text break and style the reference number 2014-03-29 01:26:18 +07:00
Ivan Lanin 338ceabdf0 Merge and modify 'pclzip' of https://github.com/bskrtich/PHPWord to make it work with the latest develop branch 2014-03-29 00:12:53 +07:00
Ivan Lanin 7a424318d2 Unit tests enhancement 2014-03-28 19:00:41 +07:00
Louis 88be3c962e TOC Depth filter function added
Add options to TOC to only show selected depth of titles ; ie pass 1,3
arguments to only show titles depth 1 to titles depth 3
Plus now you can have two+ TOC on your document, each different
2014-03-28 10:46:46 +01:00
Ivan Lanin de286936f2 Merge pull request #184 from andrew-kzoo/fix-exif-imagetype
Get image dimensions without EXIF extension
2014-03-28 09:56:37 +07:00
Ivan Lanin 160c2c7922 Merge branch 'master' of https://github.com/gianis6/PHPWord into gianis6-master 2014-03-28 09:49:16 +07:00
Andrew Collins a8da5b1b72 Get image dimensions without EXIF extension
Use `getimagesize` when `exif_imagetype` doesn't exist.
2014-03-27 17:25:09 -04:00
Ivan Lanin e6a26dd8fc Simplify all classes docblock 2014-03-27 23:55:06 +07:00
gianis6 b3c5a76a64 Update Base.php
added tblGrid element so that LibreOffice and OpenOffice can size the tables columns properly
2014-03-27 16:33:02 +01:00
Ivan Lanin a6568e988b Proposed simplified docblock 2014-03-26 17:21:23 +07:00
Ivan Lanin c72dc688ff Revert project name capitalization #176 2014-03-26 16:33:20 +07:00
Ivan Lanin dfccd54e66 Update README.md, docs, and version number 2014-03-26 15:53:17 +07:00
Ivan Lanin 3055a0e6fc Merge remote-tracking branch 'upstream/develop' into #160-refactoring 2014-03-26 15:16:16 +07:00
Roman Syroeshko 4aeef04afb Fix for tests 5. 2014-03-25 10:02:42 -07:00
Roman Syroeshko a0e8b43193 https://github.com/PHPOffice/PHPWord/issues/58 - "\PhpOffice\PhpWord\Shared\File" class was cut out. 2014-03-25 17:00:07 +04:00
Ivan Lanin 8aba90ded9 Change exception type 2014-03-25 17:53:10 +07:00
Ivan Lanin eed86f3768 Merge MemoryImage with Image, but left addMemoryImage for backward compatibility 2014-03-24 18:30:45 +07:00
Ivan Lanin b24550d060 Merge Table and TableFull style 2014-03-24 13:34:45 +07:00
Ivan Lanin aff112a13b Method name & code format for PSR/phpdoc compliance 2014-03-24 03:20:18 +07:00
Gabriel Bull 66c73c07c5 Fixed exceptions in reader/writer 2014-03-23 12:48:18 -04:00
Gabriel Bull 421b6e6f9d Made autoloader PSR-4 compliant and removed PHPWORD_BASE_DIR global constant 2014-03-23 12:48:18 -04:00
Ivan Lanin c7f03ecdf3 #159 #58 Merge branch 'develop' of https://github.com/RomanSyroeshko/PHPWord into develop 2014-03-23 21:10:48 +07:00