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
c0e04fac51
Reverted #51 .
2014-11-07 20:54:24 +04:00
b2286f8545
[FIXED] https://github.com/PHPOffice/PHPWord/issues/401
2014-10-22 19:53:50 +04:00
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
fa575ef12c
Minor refactoring.
2014-10-14 21:33:04 +04:00
2c81d5f38b
Some phpdoc for https://github.com/PHPOffice/PHPWord/pull/390 .
2014-10-10 21:20:52 +04:00
4445fd3258
Replaced `array_key_exists` with `isset` for better performance.
2014-10-10 21:10:29 +04:00
4e25283195
Add missing setters for pageSizeW and pageSizeH
2014-10-02 10:44:34 -06:00
8ebe3b3738
Revert "Add missing setters for pageSizeW and pageSizeH"
2014-10-02 17:21:17 +02:00
0a8635ece8
Add missing setters for pageSizeW and pageSizeH
2014-09-22 16:58:00 -06:00
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
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
5811aac272
Merge pull request #302 from basjan/absolute-positioning
2014-09-07 18:21:24 +04:00
42955f17dd
Merge pull request #302 from basjan/absolute-positioning
2014-09-07 18:19:10 +04:00
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
9b3b1aa7a0
Set the right method name for addShape() in PHPDoc @method for AbstractContainer.
2014-08-31 00:06:00 +02:00
9757fbb033
[FIXED] https://github.com/PHPOffice/PHPWord/issues/340
2014-08-23 20:19:48 +04:00
bf0136c156
https://github.com/PHPOffice/PHPWord/issues/216
2014-08-16 15:46:38 +04:00
5a75d84f8f
Merge remote-tracking branch 'origin/develop' into develop
2014-08-16 15:22:35 +04:00
ec25dd338b
https://github.com/PHPOffice/PHPWord/issues/216
2014-08-16 15:21:58 +04:00
90d64bd347
#23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes)
2014-08-16 12:44:12 +02:00
4ade9c3c6e
#23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes)
2014-08-16 12:33:37 +02:00
e561d54661
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop
2014-08-16 11:55:13 +02:00
ca69de3962
#23 : Implement Word97 aka MsDoc Reader
2014-08-15 19:26:23 +02:00
8d9e85b2ba
#331 : Word2007 Writer : Support for RTL
2014-08-12 13:32:05 +02:00
6f2d444ba9
https://github.com/PHPOffice/PHPWord/issues/310
2014-08-11 22:30:46 +04:00
3d06c77fc1
Minor refactoring of "Shared\ZipArchive" class.
2014-08-10 21:01:46 +04:00
e31f080ea6
Removed unused comment.
2014-08-10 20:46:10 +04:00
e6d88a27e8
Refactored usages of "tempnam()" function.
2014-08-10 20:30:14 +04:00
56c3d8eda2
https://github.com/PHPOffice/PHPWord/issues/310
2014-08-10 20:00:19 +04:00
f25833c60d
#327 : Fixes PHP-MD errors
...
@link : https://travis-ci.org/PHPOffice/PHPWord/jobs/31598319#L539
2014-08-04 11:17:05 +02:00
07e03fc955
bugfix: specific borders were not written correctly in word2007
2014-08-04 10:40:36 +02:00
a23ff4de2f
Merge pull request #305 from jonnsn/internal-links
...
Internal links
2014-07-06 22:12:21 +02:00
7202634573
fix wrong formatting
2014-07-04 15:54:20 +02:00
7c8ff2884b
add sample
...
fix undefined Index
2014-07-04 15:31:48 +02:00
197c6ec0b3
[FIXED] Wrong use of passing by reference.
2014-07-04 16:52:39 +04:00
7bbe1ed620
[FIXED] Wrong use of passing by reference.
2014-07-04 16:49:01 +04:00
c4638df0d6
[FIXED] Wrong use of passing by reference.
2014-07-04 16:35:13 +04:00
fd209fc999
[FIXED] Wrong use of passing by reference.
2014-07-04 16:20:18 +04:00
87c3df5536
add missing file
...
apply formatting to CGL
2014-07-04 14:10:20 +02:00
f2c4329108
[FIXED] Wrong use of passing by reference.
2014-07-04 16:00:17 +04:00
4d060b3f07
sync with develop-branch
2014-07-04 13:32:47 +02:00
475c76dd79
convert tabs to spaces
2014-07-04 13:30:07 +02:00
fdeefb77d9
include minor changes from develop branch
2014-07-04 13:24:14 +02:00
d54a674b97
add element bookmark and allow links to internal bookmarks in Word2007
2014-07-04 13:07:08 +02:00
1b9b8d4f90
[FIXED] Wrong use of passing by reference.
2014-07-04 14:44:22 +04:00
47a17a33e8
Revert: [FIXED] Wrong use of passing by reference.
2014-07-04 13:02:28 +04:00
f2e9e3716b
[FIXED] Wrong use of passing by reference.
2014-07-04 13:00:52 +04:00
2c5d13c88e
[FIXED] Typo in Section->addHeaderFooter().
2014-07-04 12:25:53 +04:00
4a02142d63
[FIXED] Wrong use of passing by reference.
2014-07-04 12:13:11 +04:00
8056b6926c
[CHANGED] Docblock for pass-by-reference parameters.
2014-07-03 16:11:15 +04:00
d0a609bc95
[CHANGED] Added "@return" annotation where it as missed.
2014-07-03 15:40:24 +04:00
52406daee1
For absolute positioning vPos and hPos need to be set to POS_ABSOLUTE
2014-07-02 22:13:54 +02:00
e1164f8989
[Changed] Refactored Template a little.
2014-07-02 17:49:53 +04:00
c446028acc
[Changed] Refactored Template a little.
2014-07-02 17:44:26 +04:00
75c8e7e816
[NEW] Introduced CopyFileException.
2014-07-02 17:21:43 +04:00
369f55a71f
[NEW] Introduced CreateTemporaryFileException.
2014-07-02 13:17:13 +04:00
dbc9737136
[NEW] Introduced CreateTemporaryFileException.
2014-07-02 12:58:55 +04:00
3c694ea572
[NEW] Introduced CreateTemporaryFileException.
2014-07-02 12:42:50 +04:00
d8aef5c502
Bugfix #294 : `add<elementName>` of container should be case insensitive
2014-07-01 09:52:24 +07:00
415d9b95c4
Update tests
2014-06-29 14:10:49 +07:00
33570f7cd4
#294 : Support for paragraph with borders
2014-06-28 22:59:00 +07:00
689a7371cd
Fix Travis errors
2014-06-28 12:01:53 +07:00
b5a63c5b55
Elaborate SDT elements
2014-06-28 11:47:29 +07:00
b2daeed6cb
Merge branch 'develop' into sdt
2014-06-24 00:15:39 +07:00
5be8414ef8
Settings: OOXML compatibility
2014-06-21 20:45:30 +07:00
b527d06608
#23 : Implement Word97 aka MsDoc Reader
2014-06-21 09:18:57 +02:00
cd547927ea
New structured document tag (SDT) element
2014-06-21 02:06:49 +07:00
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
5c8e100d41
Bugfix #280 : Table inside vertical border does not rendered properly
2014-06-16 16:23:41 +07:00
384107e7cf
Ability to define document protection and new `Metadata` subnamespace
2014-06-16 11:58:05 +07:00
6a81691d45
#266 : Ability to add textinput, checkbox, and dropdown form elements
2014-06-16 00:31:17 +07:00
a13e5b20f9
#278 : 3D charts and ability to set width and height
2014-06-15 20:48:26 +07:00
0f085f71e0
Merge branch 'chart' into develop
2014-06-14 12:51:41 +07:00
3fef19093c
#278 : Basic chart
2014-06-14 12:49:39 +07:00
8c2b099dbc
Merge `Shared\Drawing` and `Shared\Font` into `Shared\Converter`
2014-06-14 10:54:33 +07:00
9a5f91afc6
Merge branch 'develop' into chart
2014-06-12 12:17:49 +07:00
f54d9a1eb4
#274 : Page breaks on titles and tables
2014-06-12 02:32:00 +07:00
a93b686ca3
Chart improvements
2014-06-11 23:04:13 +07:00
056ff5e676
Basic chart support
2014-06-11 02:03:04 +07:00
d17a806305
Small fixes for addHtml.
...
Adding some HTML Entities to the test for addHTML
2014-06-09 16:32:12 -06:00
4c04071fd5
Fix typo: ODT > ODText
2014-06-09 18:52:06 +07:00
1ec0589c55
Update basic example
2014-06-08 22:38:50 +07:00
6839ee41dd
New `PhpWord::save()` method to encapsulate `IOFactory`
2014-06-08 22:05:50 +07:00
e952fdefb5
Refactor PhpWord to reduce dependencies
2014-06-08 19:37:08 +07:00
63d53ac910
Use section "style" instead of "settings" for consistency
2014-06-08 16:44:46 +07:00
a9c9c21d3b
Fix Travis test error
2014-06-08 03:38:53 +07:00
893843969f
Refactor elements to move set relation Id from container to element
2014-06-08 03:00:53 +07:00
01853f7aac
Update change log and adjust some coding standards for #261 , #265 , and #267
2014-06-07 17:52:48 +07:00
0489533c5f
Merge branch 'develop' of github.com:bskrtich/PHPWord into develop
2014-06-07 17:36:59 +07:00
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
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
8b0472dd52
Autoloader Options
...
Add the ability to set the autoloader options.
2014-06-06 13:34:01 -06:00
09a143fe71
QA: Type check fix for RTF section style and docblock comment fix for AbstractContainer
2014-06-06 18:56:09 +07:00
a2ec62a79f
Section: Ability to set paper size, e.g. A4, A3, and Legal
2014-06-06 18:31:01 +07:00
49f4e6ba64
RTF Writer: Support for sections, margins, and borders #249
2014-06-06 12:53:01 +07:00
3d2cd163d3
Ensure temp file in pclzipAddFile() removed
...
Make pclzipAddFile() similar to pclzipAddFromString() in removing
temporary files.
2014-06-05 13:45:18 -04:00
d97602fa98
Reduce duplications and fix some docblocks
2014-06-05 23:47:39 +07:00
479713da55
Update changelog and unit test for #264
2014-06-05 22:41:58 +07:00
00c6b76d68
Merge branch 'feature-paragraphBgColor' of github.com:lrobert/PHPWord-1 into develop
2014-06-05 22:28:44 +07:00
f44ff4b7a6
Added shading to the paragraph style for full width shading
2014-06-05 10:47:53 -04:00
1accec2ff0
Refactor styles: Inherit Image and Line from Frame
2014-06-05 15:48:58 +07:00
2328e34e64
Refactor Word2007/Element to identify the same properties
2014-06-05 08:13:54 +07:00
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
a2294b4b1e
Font: New `scale`, `spacing`, and `kerning` property of font style
2014-06-04 23:28:08 +07:00
9c8620ecd7
Refactor `IOFactory` to remove duplication
2014-06-02 23:47:44 +07:00
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
a66f93ccdc
#123 : New drawing shapes (arc, curve, line, polyline, rect, oval)
2014-06-02 21:55:44 +07:00
38d3d7be20
Bugfix for #257 : HTML Reader: `<p>` and header tags puts no output
2014-06-02 18:30:51 +07:00
e0d2c6584c
Refactor IOFactory and AbstractContainer to allow more dynamic inclusion.
2014-06-01 01:08:06 +07:00
9839222492
QA: Additional unit tests
2014-05-31 22:28:13 +07:00
2205377259
#245 : Basic table support in RTF writer
2014-05-31 13:33:38 +07:00
e7540c079e
Add $nestedLevel to elements
2014-05-31 09:29:09 +07:00
ec85d7d641
#80 : Basic HTML reader
2014-05-31 03:06:11 +07:00
0164e37873
Decompose Shared\Html
2014-05-31 02:01:09 +07:00
4f9399899a
QA: Docblock improvements and -q parameter for phpdoc
2014-05-30 20:44:06 +07:00
900a96addf
Bugfix for #236 (OpenOffice crash when opening DOCX) and paragraph style refactoring
2014-05-30 19:59:57 +07:00
d3ac5b1fa1
Merge branch ' #193 ' into develop
2014-05-30 13:19:51 +07:00
5c2c687efd
#193 : Heading numbering
2014-05-30 13:19:10 +07:00
a57b28de8f
Some adjustments for the new `Line` element #253
2014-05-30 01:05:55 +07:00
748e16473d
Final try to resolve Travis build errors
2014-05-29 18:07:01 +02:00
0103787873
Second attempt to resolve Travis build errors
2014-05-29 17:44:14 +02:00
54af93a20a
Fixed some Travis build errors
2014-05-29 17:11:54 +02:00
1580113d7b
Added Line element
2014-05-29 16:44:00 +02:00
7a42802b48
RTF reader: Unit tests and some improvements
2014-05-29 18:02:49 +07:00
7c2ad59530
Merge branch 'develop' into rtf
2014-05-29 16:54:13 +07:00
e81d92e265
Update changelog, docs, and unit tests for new `Field` element #251
2014-05-29 16:25:39 +07:00
2d88ea22b4
RTF Reader: Split control parsers into functions
2014-05-29 15:09:02 +07:00
8f74f26fd4
Travis build error fix
2014-05-28 20:35:24 +02:00
079d08e94a
Added Field Element
2014-05-28 17:59:44 +02:00
87f071d1b6
#72 : Basic RTF Reader
2014-05-28 21:27:20 +07:00
3085445081
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop
2014-05-26 21:25:07 +02:00
d7f3d25b2a
#248 More flexible checking for float value
2014-05-27 01:08:54 +07:00
d9a2c4c3ca
Bugfix #248 : Image: `marginLeft` and `marginTop` cannot accept float value
2014-05-27 00:46:18 +07:00
36080c14ca
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop
2014-05-25 22:57:01 +02:00
92c7a24c38
QA: Additional unit tests and docblock fixes
2014-05-25 23:08:02 +07:00
dc6c487cd0
Fix test error
2014-05-25 00:43:38 +07:00
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
5ff47f44e9
QA: Misc. bugfixes and docblock improvements
2014-05-24 11:11:12 +07:00
991016a48b
Additional writer test
2014-05-24 10:05:39 +07:00
a65c3c3cf1
RTF Writer: Ability to write image
2014-05-23 19:22:40 +07:00
e00b551aa2
Breakdown HTML Writer to head and body parts and more cyclomatic complexity reductions
2014-05-23 16:48:11 +07:00
d79ca9ae31
Reduce cyclomatic complexity on DocumentProperties and Word2007 Document Writer.
2014-05-23 10:19:57 +07:00
e46fecffdd
RTF Writer: Ability to write document properties
2014-05-23 09:05:10 +07:00
2086e9e262
Refactor: Reduce cyclomatic complexity
2014-05-22 22:01:21 +07:00
fbce1c8fc9
#244 : Enable "image float left"
2014-05-22 00:37:50 +07:00
d764de018c
Additional unit tests and @since documentation
2014-05-21 22:36:00 +07:00
3569271277
Word2007 Writer: Enable the missing custom document properties writer
2014-05-21 19:20:13 +07:00
343f378782
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop
2014-05-20 22:29:26 +02:00
5aac7f4782
From upstream
2014-05-20 22:28:34 +02:00
721c5825a6
Small fixes for the last commit
2014-05-21 00:26:43 +07:00
61c6d51e5e
Refactor Word2007 reader
2014-05-21 00:00:19 +07:00
f536bd6fbd
Merge branch 'develop' into reader
2014-05-20 23:25:56 +07:00
ac23e90ef4
ODT Reader: Ability to read standard and custom document properties
2014-05-20 18:00:00 +07:00
930d8de462
ODT Writer: Enable title element and custom document properties
2014-05-20 14:53:02 +07:00
69a3a0f4f2
Refactor reader
2014-05-20 11:27:28 +07:00
0360f8e290
Unit tests for TCPDF and mPDF
2014-05-19 23:21:17 +07:00
f7bee23f65
Add TCPDF and mPDF as optional PDF renderer library
2014-05-19 18:06:42 +07:00
553371f088
Type hinting and docblock update
2014-05-19 14:27:55 +07:00
32f1f62b45
Change Settings constants
2014-05-18 23:10:10 +07:00
d64fc98a51
Merge branch 'zip' into develop
2014-05-18 22:56:45 +07:00
39d4e8ee54
Bugfix #150 : Page break adds new line in the beginning of the new page
2014-05-18 22:23:28 +07:00
7d9bcd46d4
ODT: New Image and Table style writer
2014-05-18 21:15:35 +07:00
b1e16e4386
Word2007: Reformat fonttable and theme parts
2014-05-18 17:49:47 +07:00
970c6a24eb
Bug fixes for last commit
2014-05-18 16:48:15 +07:00
410ce4bffe
ODT: Enable section and column
2014-05-18 16:29:56 +07:00
b91e3209fa
Refactor ODT writer to give enable some additional features
2014-05-18 14:43:11 +07:00
f825ef50c0
Reorder code
2014-05-18 02:21:26 +07:00
3f61d1807c
Test fixes
2014-05-18 00:40:29 +07:00
5519131f3e
Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive
2014-05-17 23:30:13 +07:00
7c12dfc735
Fixes for last commit
2014-05-16 16:00:40 +07:00
048436cd04
Use INI instead of YML
2014-05-16 15:02:57 +07:00
f380c29eef
Add `writeRaw` annotation and disambiguate `Settings`
2014-05-16 01:22:34 +07:00
5511378eca
#200 : Ability to use a config file to store various common settings
2014-05-16 00:59:38 +07:00
4d9e4062c3
QA: Scrutinizer dedup
2014-05-15 14:41:08 +07:00
1c3735fc08
Refactor table and font styles to reduce duplication
2014-05-15 11:46:28 +07:00
abbf60a3be
Increase minimum mass for php_sim and some test fixes
2014-05-15 10:24:20 +07:00
27fa3ba233
Remove fontStyle parameter from ListItemRun and various small fixes
2014-05-15 01:13:22 +07:00
04a62f3255
QA: Code cleanup and some additional tests
2014-05-14 19:41:44 +07:00
6ba6ed40fc
Reactivate php_sim in Scrutinizer and fix some minor issues
2014-05-14 08:40:21 +07:00
e03e121e85
#196 : RTF link styling fixes
2014-05-14 00:42:05 +07:00
1ee43da4de
#196 : RTF link styling
2014-05-13 23:41:16 +07:00
7ae8c3cb81
Refactoring: Word2007 table and marginborder style writer
2014-05-13 14:57:04 +07:00
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
4b1a16006d
#196 : Ability to add links and page breaks in RTF
2014-05-13 02:48:44 +07:00
f8f98cccab
#237 : Ability to define table width (in percent and twip) and position
2014-05-13 01:32:44 +07:00
e589961e68
#158 : Convert UTF8 text to Unicode before writing RTF (support UTF8 in RTF)
2014-05-12 23:12:07 +07:00
55e715b5b1
Add variable type hints
2014-05-12 15:54:10 +07:00
c9179d681f
Refactor elements and containers
2014-05-12 01:36:28 +07:00
c7e4ed0c18
Type check in element writers
2014-05-11 20:10:36 +07:00
c243a11e57
Additional type checks in style writers
2014-05-11 19:06:36 +07:00
7d5c62ab34
Merge branch 'nestedtable' into develop
2014-05-11 18:22:09 +07:00
da77ba6a71
Merge branch 'ListItemRun' of github.com:basjan/PHPWord into #234-#235-basjan
2014-05-11 17:58:16 +07:00
fc66030b82
Merge branch 'Fixed-conversion' of github.com:basjan/PHPWord into #234-#235-basjan
2014-05-11 17:57:01 +07:00
ded651d947
#149 : Ability to add table inside a cell (nested table)
2014-05-11 17:30:23 +07:00
467f15a480
Added ListItemRun Element
2014-05-11 11:08:39 +02:00
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
17e2f02817
Type checks on style writers
2014-05-11 11:23:46 +07:00
c524394f5f
Fixed conversion factor Centimeters to Pixels and vice versa.
2014-05-10 23:52:10 +02:00
516c13e032
Some unit tests for the new features
2014-05-10 23:40:34 +07:00
chc88
Roman Syroeshko
pjt33
Spike Ilacqua
Progi1984
Franz Holzinger
Roman Syroeshko
Jelle Raaijmakers
Philipp Scheit
jogo
Bas-Jan 't Jong
Ivan Lanin
Brandon Skrtich
Andrew Collins
lrobert