d09f0958c6
Fixed some merge issues
2013-12-16 06:40:30 -05:00
39e4dd2259
Merge branch 'master' of https://github.com/PHPOffice/PHPWord
...
Conflicts:
.gitignore
Classes/PHPWord.php
Classes/PHPWord/Section.php
Classes/PHPWord/Section/Footer.php
Classes/PHPWord/Section/Header.php
Classes/PHPWord/Section/Table/Cell.php
Classes/PHPWord/Section/TextRun.php
Classes/PHPWord/Shared/String.php
Classes/PHPWord/Style/Cell.php
Classes/PHPWord/Style/Paragraph.php
Classes/PHPWord/Template.php
Classes/PHPWord/Writer/Word2007.php
Classes/PHPWord/Writer/Word2007/Base.php
Classes/PHPWord/Writer/Word2007/Document.php
Examples/AdvancedTable.php
Examples/BasicTable.php
Examples/HeaderFooter.php
Examples/Link.php
Examples/ListItem.php
Examples/Object.php
Examples/Section.php
Examples/Template.php
Examples/Textrun.php
Examples/TitleTOC.php
Examples/Watermark.php
Examples/_earth.JPG
Examples/_mars.jpg
Examples/_sheet.xls
changelog.txt
samples/old/AdvancedTable.php
samples/old/BasicTable.php
samples/old/Image.php
samples/old/Link.php
samples/old/ListItem.php
samples/old/Object.php
samples/old/Section.php
samples/old/Template.php
samples/old/Textrun.php
samples/old/TitleTOC.php
samples/old/Watermark.php
samples/old/_earth.jpg
samples/old/_mars.jpg
samples/old/_sheet.xls
src/Examples/AdvancedTable.php
src/Examples/BasicTable.php
src/Examples/Link.php
src/Examples/ListItem.php
src/Examples/Object.php
src/Examples/Section.php
src/Examples/Template.php
src/Examples/Textrun.php
src/Examples/TitleTOC.php
src/Examples/Watermark.php
src/Examples/_earth.JPG
src/Examples/_mars.jpg
src/Examples/_sheet.xls
2013-12-15 14:15:28 -05:00
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
95f16cc3a5
Temporary files naming logic in PHPWord_Template can lead to a collision (GH-38)
2013-12-15 14:58:44 +01:00
9557dd9da8
FIXED : "Warning: Invalid error type specified in ...\PHPWord.php on line 226" is thrown when the specified template file is not found GH-32
2013-12-15 14:50:08 +01:00
049c89d079
IMPROVED : Advanced string replace in setValue for Template
2013-12-15 14:46:05 +01:00
38a15e5da5
Word2007 : Support for tab stops
2013-12-15 14:35:18 +01:00
a610c34a18
Word2007 : Add rowspan and colspan to cells
2013-12-15 13:42:36 +01:00
0d19d57cba
IMPROVED : Moved examples out of Classes directory
2013-12-15 13:35:17 +01:00
Gabriel Bull
Ryan Lovelett
Progi1984