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

846 Commits

Author SHA1 Message Date
Claas Augner 1dee5f33cf
docs(Converter): fix @param allowing float 2020-02-04 20:36:03 +01:00
Michaël Dupont 4852028743 fix: typo in getFootnoteProperties() method name 
Was "getFootnotePropoperties()".
Former bogus spelling is still working, albeit deprecated.
 2019-12-09 11:29:39 +01:00
troosan dfea4e12a6
Merge pull request #1766 from stefan-91/develop 
Add support for ListItemRun in HTML writer
 2019-12-08 20:38:03 +01:00
troosan 5940d18ab2
Merge pull request #1755 from oleibman/master 
Improvements in RTF writer
 2019-12-08 20:32:09 +01:00
Michaël Dupont f51811b96b fix: documentation about paragraph indentation 
Documentation contained the wrong unit for Paragraph indentation.
 2019-12-02 16:40:58 +01:00
Bc. Štefan Kubini 1451fadc4a Add List for docx to html writer #1717 2019-11-28 23:33:10 +01:00
Owen Leibman a10fe823b2 Errors in RTF Escaping 
1. Codes meant to be in hex are specified in decimal.
   Consequently characters which don't need escaping are escaped.
2. Special handling (prepend backslash) needed for {, }, and \.
   RTF docs generated with those characters cannot be opened in Word.
3. Tab character needs to be escaped as \tab.
   RTF docs drop these characters.
While running test suite, found that Writer/RTF/ElementTest was coded
only for Unix line endings, and fails on Windows. Changed so that it
would work on either.
 2019-11-16 21:37:57 -08:00
Bc. Štefan Kubini b230242127 fixed List item fail #1711 2019-11-05 10:46:24 +01:00
troosan 4f0d6f78ba
Merge pull request #1717 from Samuel-BF/rtf-basic-fields 
Add support for basic fields in RTF writer.
 2019-09-30 21:56:00 +02:00
Samuel BF 7628b41fdf Add support for basic fields in RTF writer. 2019-09-10 11:24:59 +02:00
František Maša 8f4f4dcd48 Added return type 2019-09-02 18:13:10 +02:00
troosan 85e9144822
Merge pull request #1329 from eweso/patch-1 
Adding setNumId method for ListItem style
 2019-08-08 07:13:03 +02:00
troosan 815bb52ebf
Merge pull request #1628 from waltertamboer/feature/fix-issue-1529 
No nested w:pPr elements in ListItemRun.
 2019-08-08 07:11:05 +02:00
troosan 24d120baf1
Merge pull request #1646 from SpinyMan/develop 
Change private to protected to be able extending class Html
 2019-08-08 07:09:35 +02:00
troosan 487622bb9e
Merge pull request #1637 from bhattnishant/master 
To support PreserveText inside sub container
 2019-08-08 07:08:13 +02:00
Andrew Busel 415bdb378d
Update Html.php 2019-07-03 19:25:29 +03:00
Andrew Busel 9e93d5eae5
Update Html.php 2019-07-03 19:24:15 +03:00
Mario 9abf4473b0
Update Wrong definition 2019-07-02 16:02:52 +02:00
Nishant Bhatt b209fec72b To suport preseve text inside sub container 
if we use preseve text inside table, issue fix

https://stackoverflow.com/questions/33070424/phpword-cannot-add-preservetext-in-section
 2019-06-03 15:44:10 +02:00
Walter Tamboer 18b3c754ef No nested w:pPr elements in ListItemRun. 
This commit fixes issue #1529

This commit prevents nested w:pPr elements when using a ListItemRun with
a paragraph style. The different between a ListItem and a ListItem run
is that the setWithoutPPR method is called on the ParagraphStyleWriter
(PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph).

According to the specs it's not allowed to have nested w:pPr elements.
See http://www.datypic.com/sc/ooxml/e-w_pPr-2.html
 2019-05-09 15:29:25 +02:00
arthur 2045e52db7 call static instead of self on protected method 2019-04-09 10:55:43 +02:00
troosan 1534dc23c3
Merge pull request #1595 from NickCoolii/patch-1 
Added new constant to russian language
 2019-03-31 20:48:10 +02:00
troosan 8cea3221dc
remove trailing spaces 2019-03-31 13:20:51 +02:00
Seamus Lee 607378b8fb Ensure that entity_loader disable variable is re-set back to the original setting 
Simplify the setting of libxml_disable_entity_loader
 2019-03-31 08:31:49 +11:00
Mykola Nicholas 014ff7d261
Added new constant to russian language 2019-03-13 16:39:32 +03:00
Maxim 8931ab12b2
Merge branch 'develop' into html_writer_auto_invert_text_color 2019-03-01 16:33:50 +02:00
Nick Winfield 81a1b2acff TrackChange doesn't handle all return types of \DateTime::createFromFormat(...) (#1584) 
* Added boolean check before setting the date
 2019-02-24 00:24:49 +01:00
troosan 9958a4825f allow other streams 2019-02-22 22:06:54 +01:00
troosan b3982ebb70 fix documentation 2019-02-22 22:06:30 +01:00
troosan 3219950d59 trim color codes and add tests 2019-02-06 22:07:42 +01:00
troosan 5206c7f690 fix parsing of border-color and add test 2019-02-06 18:19:01 +01:00
troosan e3020c0db3 fix warnings 2019-02-05 23:05:18 +01:00
troosan 235cc1205c implement support for section vAlign 2019-02-05 21:42:14 +01:00
troosan 58a2849e38 Add reading of the settings part 2019-02-04 23:59:37 +01:00
troosan d2b0b317e0 fix scrutinizer warnings 2019-02-04 22:57:33 +01:00
troosan bc448aed6c improve code coverage 2019-02-04 21:53:19 +01:00
troosan 67f3bd369c Add methods to replace macro with ComplexType 2019-01-31 01:26:19 +01:00
Stathis Papadopoulos 3c9fa2df13 Language::validateLocale should pass with locale 'zxx'. 2019-01-28 10:50:28 +01:00
troosan 1956908aa7 Merge remote-tracking branch 
'geraldb-nicat/PHPWord/templateProcessingViaArray' into develop

Conflicts:
	docs/templates-processing.rst
 2019-01-03 18:57:00 +01:00
troosan f91863ed64 Add RTL aligning of tables 2019-01-03 11:33:56 +01:00
troosan b375b8580f fix broken samples 2018-12-30 01:13:54 +01:00
troosan 54e7c6dd5a don't default styles to false 
this allows us to for instance make part of a Heading not bold, which
would otherwise be the default.
 2018-12-30 00:45:45 +01:00
troosan 3390c907dc fix scrutiniser warning 2018-12-29 23:16:56 +01:00
troosan 54b94be65a fix doc 2018-12-29 23:14:18 +01:00
troosan 23407c99dd Add unit tests 2018-12-29 22:03:01 +01:00
troosan 5057617de7 change regex instead of checking twice 2018-12-29 14:56:11 +01:00
Antonio Malatesta 7c8cfb7b8a Adding condition for document template saving using libreoffice 
When  I save document template with libreoffice (in .docx format) the cloneRow with nested table doesn't work.
The problem is that the regular expression, that used for search if row is no longer part of the spanned row, was wrong: 
<w:vMerge w:val="continue" /> became <w:vMerge w:val="continue"/> without space at the closure tag.
Sorry for my English.
 2018-12-29 14:50:30 +01:00
troosan b2c627d57c Merge branch 'parsing_heading2' develop 
Conflicts:
	src/PhpWord/Reader/Word2007/Styles.php
	tests/PhpWord/Reader/Word2007/StyleTest.php
 2018-12-28 22:33:48 +01:00
troosan ccf291234e Avoid warning if variable is null 2018-12-28 20:32:10 +01:00
troosan d8d697c848 added convertors with test 2018-12-28 18:04:36 +01:00