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

781 Commits

Author SHA1 Message Date
troosan 0f963e40a7
Merge pull request #1536 from Samuel-BF/fix-RTF-numerals 
For RTF writers, sizes should should never have decimals
 2018-12-26 23:16:22 +01:00
troosan bbe517aa60
Merge pull request #1541 from morrisdj/develop 
Add "Plain Text" type to SDT (Structured Document Tags)
 2018-12-26 23:16:06 +01:00
troosan 254d300ea7
Merge pull request #1511 from carusogabriel/ternary-expressions 
Remove unnecessary ternary expressions
 2018-12-26 23:15:49 +01:00
troosan d84da93a36 Add test and fix warnings 2018-12-26 22:50:19 +01:00
Daniel Morris 5e2374be4a Merge remote-tracking branch 'upstream/develop' into develop 2018-12-26 21:49:41 +02:00
Daniel Morris a5ec49d99d Add plain text SDT type 2018-12-26 21:45:32 +02:00
troosan 575c5531b8 replace self with static 2018-12-26 20:07:53 +01:00
troosan 6cf10b4562
Merge pull request #1161 from abcdmitry/patch-1 
Get rid of duplicated code in TemplateProcessor
call static methods with static:: instead of self::
 2018-12-26 20:04:18 +01:00
Maxim d5da80b56e Support adding images in Templates (#1170) 
* setImageValue() + fix adding files via ZipArchive
* fix phpdoc variable name
* Changed logic that determines extension image file extension for document to depend on MIME type. This same logic is used in Element/Image.php
* support <w:t> tags with arguments
* allow setup size of image into template variable
* support of 'ratio' replace attribute + documentation
 2018-12-26 14:35:21 +01:00
Craig Blanchette b1661af71a
Still add text if link missing 
If link target doesn't exist, still add the text anyway.
 2018-12-19 15:17:42 -05:00
Samuel BF c0f8cae55c Fixing RTF writers : numbers should be printed as integers and not float. 
This is specified in the spec, for example here :
http://www.biblioscape.com/rtf15_spec.htm#Heading2
« The delimiter marks the end of an RTF control word, and can be one of the following : [...]
* A digit or a hyphen (-), which indicates that a numeric parameter follows. The subsequent digital sequence is then delimited by a space or any character other than a letter or a digit. »
 2018-12-18 15:04:25 +01:00
troosan b188ab94e1
Merge branch 'develop' into add-getVariableCount-method 2018-12-11 21:31:18 +01:00
Nathan Dench cf3132acac Add ability to pass a Style object to a Section element (#1416) 
* Add ability to pass a Style object to a Section
* Fix typo
* update changelog
 2018-12-08 23:35:32 +01:00
Alex Morozov c2b54cc343 add support for hidden text (#1527) 
* added hidden text word 2007
* update changelog
* update documentation
* added unit test
* docx reader
* html reader/writer
* odt writer
* updated samples
 2018-12-08 23:21:59 +01:00
Yurii.sio2 260bb75fc2 Fix TemplateProcessor :: fixBrokenMacros; (#1502) 
* Fix TemplateProcessor :: fixBrokenMacros;
* add unit test for fixBrokenMacros
 2018-12-07 23:22:04 +01:00
troosan af5a271e9e
Line spacing is wrong when using "exact" line spacing rule (#1509) 
* Only add 240 twips when in auto lineRule
* don't add 1 line when using EXACT line spacing rule
* fix style & scrutinizer warning
 2018-12-03 16:09:20 +01:00
Eugene Bulbaka 7930f5d136
Update Language.php 
Added Language constants and values for Ukrainian (lines 71, 72):
const UK_UA = 'uk-UA';
const UK_UA_ID = 1058;
 2018-12-03 16:04:19 +02:00
troosan 7b3b723646
Merge pull request #1430 from nicoder/patch-4 
allow to override TemplateProcessor#ensureUtf8Encoded
 2018-12-03 01:01:51 +01:00
troosan 5b688d50d8 fix formatting 2018-12-02 23:54:25 +01:00
troosan 31968fa814 Merge branch 'develop' of https://github.com/Tom-Magill/PHPWord into develop_upstream 2018-12-02 23:38:08 +01:00
troosan a44aee8c34 fix some sonar warnings 2018-12-01 21:13:11 +01:00
troosan f472bfbc75
Merge branch 'develop' into add_html_table_layout 2018-11-28 22:58:29 +01:00
troosan b50de97a41 support `auto` table layout too 2018-11-28 22:54:57 +01:00
troosan 78ffbff0c1
Merge pull request #1498 from Garrcomm/fix-sharepoint 
Fix loading of Sharepoint document
 2018-11-25 01:40:12 +01:00
troosan d0bcfea4a4
Merge branch 'develop' into fix-sharepoint 2018-11-22 23:07:01 +01:00
troosan c12f98f69a fix check style warning 2018-11-20 22:40:54 +01:00
troosan 79a7d5fe0e Merge remote-tracking branch 'upstream/develop' into rebase_pull_request 2018-11-20 21:17:51 +01:00
Ralph02 d9d79c0666 RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals 2018-11-20 19:57:35 +01:00
Gabriel Caruso 3cf0770376
Remove unnecessary ternary expressions 2018-11-19 01:32:28 -02:00
troosan 925e9e0919
remove trailing spaces 2018-11-16 23:33:38 +01:00
troosan c51b6febc0
rename variable to comply with rules 2018-11-16 23:00:23 +01:00
Stefan Thoolen 54eb6e6f2c Fix for undefined index 
PHP Notice:  Undefined index: document in /home/stefan/Projects/garrcomm/PHPWord/src/PhpWord/Reader/Word2007.php on line 65
PHP Warning:  Invalid argument supplied for foreach() in /home/stefan/Projects/garrcomm/PHPWord/src/PhpWord/Reader/Word2007.php on line 65
 2018-11-06 14:24:56 +01:00
Martin Hanzl e19de8e8a4 #1253 - add explanatory comment 2018-10-11 11:28:44 +02:00
Martin Hanzl 7f55816eba detect actual filename of document xml (prevent mismatching document22.xml as in #1253) 2018-10-11 08:55:38 +02:00
troosan 18760620b3
Merge pull request #1445 from FCG-Group/writer_fixes_valign_watermark 
writer / word2007 / support valign and watermark without paragraph
 2018-10-03 23:28:05 +02:00
vblinden d8c0441975 Fix indenting 2018-09-03 13:32:00 +02:00
vblinden 683d91990f
Added Dutch (nl-NL) 2018-09-03 12:30:05 +02:00
Maxim Bulygin 677e3f6a19 writer / word2007 / support valign and watermark withouth paragraph 2018-07-31 18:25:29 +03:00
Abubakkar Rangara 4b9ae18d5a Adding table layout to the generated HTML - fixed php-cs-fixer error 2018-07-24 14:23:23 +01:00
Abubakkar Rangara e61c40e71d Adding table layout to the generated HTML if element has layout style. This is useful when using creating PDF from PHPWord (e.g. using dompdf), otherwise the PDF does not contain any layout for table. 2018-07-24 13:59:16 +01:00
troosan aa49536e3e
Merge branch 'develop' into add-getVariableCount-method 2018-07-21 14:48:24 +02:00
troosan 18c26f9218
Merge pull request #1436 from begnini/fixing_title 
HTML Title Writer loses text when Title contains a TextRun instead a string.
 2018-07-19 02:00:36 +02:00
Humberto Pereira 8c62cea580 Fix Writer losing text when Title contains a TextRun instead a string. 2018-07-17 21:10:53 -04:00
Tom-Magill 139242612d
Update Chart.php 2018-07-17 14:11:55 +01:00
Tom-Magill 0c3eb4bafc
Update Chart.php 2018-07-17 14:10:02 +01:00
troosan affccc7937 Merge branch 'improve-cloneBlock-regex' of https://github.com/nicoder/PHPWord into fix_clone_block 2018-07-17 08:03:35 +02:00
Nicolas Dermine 198165ce59
allow to override TemplateProcessor#ensureUtf8Encoded 
the method is `protected`,
but since it is called with `self` instead of `static`
it does not allow for subclasses to override it
 2018-07-16 19:49:30 +02:00
troosan fe454dbaf3
Merge pull request #1428 from troosan/parse_short_lang_code 
Allow passing short lang code
 2018-07-14 18:11:50 +02:00
troosan 87498e43e1 Allow passing short lang code 2018-07-14 17:21:30 +02:00
troosan af4f834149
Merge branch 'develop' into develop 2018-07-14 17:12:45 +02:00