18 Commits

Author SHA1 Message Date
Ivan Lanin
f1c2c2fe5e Copyright year 2014-03-06 22:06:01 +07:00
Ivan Lanin
7533d30125 Changes:
- Use constants instead of hardcoded name and size for font (Arial, 20)
- Section: Multicolumn
- Section: Different section break
- Paragraph: Hanging paragraph
- Font: Superscript and subscript
- Table: Table width in percentage
- Table: Repeat as header row
- Table: Allow row to break across pages
2014-03-06 20:57:00 +07:00
Ivan Lanin
d3f62567e9 Merge remote-tracking branch 'remotes/upstream/develop' into develop
Conflicts:
	Classes/PHPWord/Section/Settings.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Writer/Word2007/Base.php
	README.md
2014-03-06 12:32:23 +07:00
Brandon Skrtich
d0b4ed6d41 Ability to use images in a text run 2014-03-04 10:54:14 -07:00
Progi1984
d1e16a66d6 GH-5 : Word2007 : Added support for page header & page footer height 2014-03-03 20:15:29 +01:00
Ivan Lanin
b0a24703f3 Table Row allows tblHeader and cantSplit 2014-02-22 11:01:15 +07:00
Gabriel Bull
7ea686f698 Fixed bug with table cell styles and added grid span unit tests 2014-02-13 11:06:17 -05:00
Gabriel Bull
617feb3240 Added section page numbering 2014-02-12 12:07:50 -05:00
Gabriel Bull
3cf069fc46 Happy new year! 2014-02-12 11:21:04 -05:00
Ivan Lanin
4d94d5763c (1) new width property for table; (2) allow table cell width to be null 2014-01-13 23:14:05 +07:00
Ivan Lanin
0edaaaab50 Tidy up for pull request 2014-01-02 00:59:38 +07:00
Ivan Lanin
3fa49ee53b section breakType 2014-01-01 20:12:51 +07:00
Ivan Lanin
3037fbf59e Read README.md 2014-01-01 18:59:19 +07:00
Gabriel Bull
d09f0958c6 Fixed some merge issues 2013-12-16 06:40:30 -05:00
Gabriel Bull
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
Ryan Lovelett
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
Progi1984
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
Progi1984
0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00