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

382 Commits

Author SHA1 Message Date
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