Commit Graph

732 Commits

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