Commit Graph

233 Commits

Author SHA1 Message Date
Ivan Lanin 0164e37873 Decompose Shared\Html 2014-05-31 02:01:09 +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 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 079d08e94a Added Field Element 2014-05-28 17:59:44 +02:00
Ivan Lanin f9a1f34dcb Merge branch 'rtfreader' into rtf 2014-05-28 21:36:30 +07:00
Ivan Lanin 87f071d1b6 #72: Basic RTF Reader 2014-05-28 21:27:20 +07:00
Ivan Lanin 88f6518406 Init VERSION and improve requirement checking 2014-05-28 07:42:50 +07:00
Ivan Lanin fbce1c8fc9 #244: Enable "image float left" 2014-05-22 00:37:50 +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 0360f8e290 Unit tests for TCPDF and mPDF 2014-05-19 23:21:17 +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 5511378eca #200: Ability to use a config file to store various common settings 2014-05-16 00:59:38 +07:00
Ivan Lanin f1b2243e15 Short tag fix 2014-05-15 15:52:17 +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 7d5c62ab34 Merge branch 'nestedtable' into develop 2014-05-11 18:22:09 +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
Ivan Lanin 9ea767ea91 Table inside textbox sample 2014-05-10 22:04:10 +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 aa151c4010 Added function to add elements via HTML 2014-05-10 14:03:16 +02:00
Ivan Lanin 246557e3be Reactivate PHPMD and fix some rules for textbox 2014-05-09 03:15:26 +07:00
Ivan Lanin 6a0bfe3314 Move `addTextBox` to `AbstractContainer` and add sample for textbox 2014-05-08 10:58:19 +07:00
Ivan Lanin 6dd51c54ea Update changelog and add sample for bug fix #222 2014-05-05 09:08:15 +07: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 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 725162bc6b Deprecate static classes Footnotes, Endnotes, and TOC (#206); Reactivate `phpcpd` and `phpmd` on Travis 2014-05-04 03:40:54 +07: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 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 a676af30dd ODText Reader: Basic ODText reader 2014-04-29 01:19:12 +07:00
Ivan Lanin b4c22982cb Update .gitignore 2014-04-27 12:26:39 +07:00
Ivan Lanin 8ace1c1d99 Add icons from http://fontawesome.io/ 2014-04-26 15:11:20 +07:00
Ivan Lanin f5f03a5b2b Emulate \ZipArchive::extractTo for PCLZip 2014-04-18 02:58:38 +07:00
Ivan Lanin 9c738f7eae Refactor Element\Image and some samples 2014-04-16 09:50:56 +07:00
Ivan Lanin 20b363f00e Remove local path from sample and add DomPDF in `composer.json` `require-dev` 2014-04-16 07:54:55 +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 89f42884c6 Merge branch 'master' of https://github.com/brunocasado/PHPWord into 'develop' 2014-04-13 17:37:54 +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
Ivan Lanin 0ccea9620c Merge remote-tracking branch 'upstream/develop' into xml-reader 2014-04-09 18:48:04 +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 f049c48c59 [FIXED] Namespacing. 2014-04-08 21:58:00 +04:00
Roman Syroeshko 191d37b280 Leading backslashes in global function/constant calls were removed. 2014-04-08 21:56:18 +04: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 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 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 f0ee25f343 Deprecate `createSection` in favor of `addSection` 2014-04-02 11:02:56 +07:00
Ivan Lanin 495930be9d Add element availability matrix and enable `addObject` in footnote and textrun 2014-04-02 10:05:24 +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 0e2f476cc2 Docblock updates 2014-03-30 14:15:23 +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
Julien Carignan 612ad85773 changed heightRule string to exactHeight bool 2014-03-28 15:21:01 -04: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
Julien Carignan 8363ee27d1 table row height rule moved to rowStyle (ivanlanin)
new usage: $table->addRow($height, array("heightRule"=>"exact"));

Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-28 13:26:39 -04:00
Julien Carignan 6796883d43 added samples for bgColor and tableRowHeightRules
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 14:03:29 -04:00
Ivan Lanin aff112a13b Method name & code format for PSR/phpdoc compliance 2014-03-24 03:20:18 +07: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
Roman Syroeshko c305273e25 https://github.com/PHPOffice/PHPWord/issues/58 - PNG filename fix. 2014-03-23 10:33:10 +04:00
Roman Syroeshko ddb6277764 https://github.com/PHPOffice/PHPWord/issues/58 - More fixes. 2014-03-23 10:32:08 +04:00
Roman Syroeshko 0c449a6a0c https://github.com/PHPOffice/PHPWord/issues/58 - fixes for samples. 2014-03-22 15:36:17 +04:00
Roman Syroeshko ab96c75b08 https://github.com/PHPOffice/PHPWord/issues/58 - Part VIII (Autoloader). 2014-03-22 10:06:08 +04:00
Roman Syroeshko 8267a9e12f https://github.com/PHPOffice/PHPWord/issues/58 - Part VI (PhpWord). 2014-03-20 16:54:12 +04:00
Roman Syroeshko 4e546d1a21 https://github.com/PHPOffice/PHPWord/issues/58 - Part IV. 2014-03-19 11:04:48 +04:00
Ivan Lanin 47fa1f0c3b Bugfix: Preserve text doesn't render correctly when the text is not the first word, e.g. 'Page {PAGE}' 2014-03-17 19:43:38 +07:00
Ivan Lanin 9922f8e319 Closing bracket. Again. 2014-03-15 23:45:31 +07:00
Ivan Lanin 26483df5b2 Closing bracket bug 2014-03-15 23:22:51 +07:00
Ivan Lanin b35a7995ad Check requirements 2014-03-15 23:12:35 +07:00
Ivan Lanin 59eec587fc Convert samples 2014-03-15 22:39:57 +07:00
Ivan Lanin 44d2501293 TextBreak: Allow font/paragraph styling for text break 2014-03-14 22:03:19 +07:00
Ivan Lanin d3c739eb23 Remove old samples 2014-03-14 04:41:39 +07:00
Ivan Lanin b11cd40bba More unit tests 2014-03-14 04:25:09 +07:00
Ivan Lanin b3458b9c0a Test & migrate the remaining old samples 2014-03-14 00:49:27 +07:00
Ivan Lanin ff6b2a9e5f MemoryImage: Allow remote image when allow_url_open = on 2014-03-14 00:04:52 +07:00
Ivan Lanin 1aa83b9438 Some more tests for Writer/Word2007/Base.php. We're on 71.84% coverage now :) 2014-03-13 20:58:24 +07:00
Ivan Lanin 8d942b589a Rename Reader sample and sync Base.php 2014-03-13 19:34:16 +07:00
Ivan Lanin d180ac7fdf Merge branch 'develop' of https://github.com/jhfangying/PHPWord into develop 2014-03-13 19:28:52 +07:00
Ivan Lanin acfe64bb53 More unit tests for Writer\Word2007\Base 2014-03-13 19:09:35 +07:00
jhfangying b79a66ba9e 1 2014-03-13 15:50:56 +08:00
jhfangying af1a591271 support for eastAsia fontstyle
support for eastAsia fontstyle
add sample 10
2014-03-13 08:48:18 +08:00
Ivan Lanin 4119c6af07 Reorganize samples and write unsupported element to ODText and RTF 2014-03-12 21:55:20 +07:00
Ivan Lanin ec514f310f Reader: Read section settings and font/paragraph styles 2014-03-11 16:27:42 +07:00
Ivan Lanin cf790b9f98 Minimum working sample for text, textrun, and textbreak 2014-03-11 02:43:04 +07:00
Ivan Lanin 1100d9375e Tables samples, including colspan and rowspan 2014-03-10 21:06:15 +07:00
Ivan Lanin 7677e15ae8 Basic support for TextRun on ODT and RTF 2014-03-10 19:15:26 +07:00
Ivan Lanin df7083b647 Ability to define paragraph pagination: widow control, keep next, keep lines, and page break before. 2014-03-08 17:18:36 +07:00
Progi1984 3bc7f98a64 Merge pull request #90 from jeroenmoors/develop
Replace call to save with saveAs to save the document.
2014-03-07 23:43:19 +01:00
Jeroen Moors 47c7fab091 Replace call to save with saveAs to save the document. 2014-03-07 23:23:42 +01:00
Progi1984 db08572699 GH-16 : Initial addition of basic footnote support 2014-03-07 23:08:50 +01:00
Progi1984 86abe7e275 GH-16 : Initial addition of basic footnote support 2014-03-07 23:08:09 +01:00
Jeroen Moors 43a00b16ff Renamed sample files. 2014-03-07 17:22:30 +01:00
Jeroen Moors 590f08c42b Update cloneRow function to support vertical spanned cells. 2014-03-07 17:20:14 +01:00
Jeroen Moors 21589ffa61 Renamed the output file to 'Sample_03_TemplateCloneRow_result.docx'. 2014-03-07 17:19:59 +01:00
Jeroen Moors b5f71317b7 Create table rows on the fly with cloneRow() when using templates. 2014-03-07 17:18:51 +01:00
Ivan Lanin 350e7a61b6 Revert Tests/bootstrap.php and samples/Sample_03_Sections.php 2014-03-07 02:07:24 +07:00
Ivan Lanin 938d78f40b Samples: (1) Superscript and subscript; (2) Multicolumn 2014-03-06 22:07:09 +07:00
Ivan Lanin d3f62567e9 Merge remote-tracking branch 'remotes/upstream/develop' into develop
Conflicts:
	Classes/PHPWord/Section/Settings.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Writer/Word2007/Base.php
	README.md
2014-03-06 12:32:23 +07:00
Brandon Skrtich d0b4ed6d41 Ability to use images in a text run 2014-03-04 10:54:14 -07:00
Progi1984 d1e16a66d6 GH-5 : Word2007 : Added support for page header & page footer height 2014-03-03 20:15:29 +01:00
Bruno Casado ad58e726e5 Add some tests to new wrapping image 2014-01-20 10:55:54 -02:00
Gabriel Bull d09f0958c6 Fixed some merge issues 2013-12-16 06:40:30 -05:00
Ryan Lovelett 4fb18005ce Sections can support multiple headers
Each section can now have a single header (previous behavior). It can
now also support multiple headers. The spec defines three types of
headers: default, first, and even. These code changes provide support
for all three.

The HeaderFooter.php example has also been updated to illustrate how to
use the new multiple headers for a section.

Used these pages as spec reference:

http://www.schemacentral.com/sc/ooxml/e-w_headerReference-1.html
http://www.schemacentral.com/sc/ooxml/a-w_type-4.html
2013-12-15 09:49:02 -05:00
Progi1984 38a15e5da5 Word2007 : Support for tab stops 2013-12-15 14:35:18 +01:00
Progi1984 0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00
Progi1984 869b5fd180 IMPROVED : Samples\Sample01 2012-05-30 00:06:11 +02:00
Progi1984 95180b502d CHANGED : .gitignore 2012-05-30 00:05:53 +02:00
Progi1984 f29ce0fc4a CHANGED : .gitignore 2012-05-30 00:05:31 +02:00
Progi1984 f5da76e90a IMPROVED : Samples\Sample01 2012-05-29 20:57:12 +02:00
Progi1984 de11f4d038 ADDED : .gitignore 2012-05-29 20:56:28 +02:00