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

289 Commits

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