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

135 Commits

Author SHA1 Message Date
Ivan Lanin 589e603277 Unit test for Reader and additional methods for DocumentProperties, adapted from PHPExcel 2014-03-12 00:12:55 +07:00
Ivan Lanin d2a231799d Code formatting for PSR1 & PSR2 - Part 2 2014-03-11 21:44:54 +07:00
Ivan Lanin 4e3450e39f Code formatting for PSR1 & PSR2 - Part 1 2014-03-11 20:09:05 +07:00
Ivan Lanin ec514f310f Reader: Read section settings and font/paragraph styles 2014-03-11 16:27:42 +07:00
Ivan Lanin fa2878e530 Cleaning up code 2014-03-11 03:01:12 +07:00
Ivan Lanin cf790b9f98 Minimum working sample for text, textrun, and textbreak 2014-03-11 02:43:04 +07:00
Ivan Lanin c1b4b2e4a5 Skeleton copied from PHPExcel :) 2014-03-10 22:41:41 +07:00
Ivan Lanin 1100d9375e Tables samples, including colspan and rowspan 2014-03-10 21:06:15 +07:00
Ivan Lanin 7677e15ae8 Basic support for TextRun on ODT and RTF 2014-03-10 19:15:26 +07:00
Ivan Lanin e36b2c5a50 Some unit tests for Style Drawing, File, and String 2014-03-10 13:29:48 +07:00
Progi1984 8fb7da46ee Merge pull request #97 from gabrielbull/develop 
Changed PHPWord namespace to PhpOffice\PhpWord
 2014-03-09 22:34:30 +01:00
Ivan Lanin 6697057180 Fix section settings failed tests 2014-03-10 03:51:06 +07:00
Ivan Lanin 663e9008b3 Basic unit tests for PHPWord\Style completed 2014-03-10 03:20:24 +07:00
Gabriel Bull f2122c152a Changed PHPWord namespace to PhpOffice\PhpWord 2014-03-09 16:07:20 -04:00
Gabriel Bull 70588f2f8f Fixed bugs with Text class 2014-03-09 15:25:37 -04:00
Gabriel Bull 79f65f04e1 Fixed bug with footer preserve text 2014-03-09 15:11:51 -04:00
Gabriel Bull 9966508a62 Added line height to font style 2014-03-09 15:03:53 -04:00
Progi1984 88836672c3 Merge pull request #95 from gabrielbull/develop 
Removed fake namespacing from tests and reformatted code to PSR-2 coding standards
 2014-03-09 19:34:16 +01:00
Gabriel Bull 69a8192652 Added line height methods to mirror the line height settings in Word in the paragraph styling 2014-03-09 14:26:32 -04:00
Gabriel Bull 3519477535 Removed fake namespace from tests class names because we use real namespacing 2014-03-09 14:18:49 -04:00
Gabriel Bull 7abd5be62b Reformatted Tests to PSR-2 coding standards 2014-03-09 14:14:38 -04:00
Progi1984 99b43ced29 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop 2014-03-09 19:09:36 +01:00
Progi1984 9b793e5db1 Unit Tests on Section directory 2014-03-09 19:09:22 +01:00
Ivan Lanin fa1663a2b1 PHP method IS NOT case sensitive :) 2014-03-09 21:59:23 +07:00
Ivan Lanin c364490955 Remove PHPWord_Style_Cell::setHeight() since it's irrelevant and never used. Should be in PHPWord_Style_Row 2014-03-09 21:57:27 +07:00
Ivan Lanin d177b4744b New function PHPWord_Style_Paragraph::setTabs() and unit test for PHPWord_Style_Paragraph 2014-03-09 17:47:04 +07:00
Ivan Lanin 537f49eeb4 Fix non-existing functions in Writer/ODText/Content.php 2014-03-09 17:44:16 +07:00
Ivan Lanin 4dcde8c0a9 PHPWord_Shared_Drawing::centimetersToPixels() conversion 2014-03-09 16:06:35 +07:00
Ivan Lanin 9fd138494e Constants explanation 2014-03-09 15:21:53 +07:00
Ivan Lanin b39f9daee2 Refactor and unit test PHPWord_Style_Font 2014-03-08 23:43:27 +07:00
Ivan Lanin df7083b647 Ability to define paragraph pagination: widow control, keep next, keep lines, and page break before. 2014-03-08 17:18:36 +07:00
Progi1984 86abe7e275 GH-16 : Initial addition of basic footnote support 2014-03-07 23:08:09 +01:00
Progi1984 3ed25886f8 Merge pull request #88 from jeroenmoors/develop 
Clone table rows on the fly when using a template document
 2014-03-07 21:59:56 +01:00
Ivan Lanin 35c48dc155 Merge remote-tracking branch 'upstream/develop' into develop 2014-03-08 01:24:03 +07:00
Progi1984 50ae8f34a8 Merge pull request #83 from RomanSyroeshko/PHPWord#46 
Ability to apply XSL style sheet to Template
 2014-03-07 19:12:19 +01:00
Jeroen Moors 57f330c099 Handle the cases were there's no whitespace after <w:tr. 2014-03-07 17:20:40 +01:00
Jeroen Moors 590f08c42b Update cloneRow function to support vertical spanned cells. 2014-03-07 17:20:14 +01:00
Jeroen Moors b5f71317b7 Create table rows on the fly with cloneRow() when using templates. 2014-03-07 17:18:51 +01:00
Ivan Lanin 0d1c368c41 setNormalStyle > setDefaultParagraphStyle 2014-03-07 19:31:13 +07:00
Ivan Lanin 09ba95bd88 Paragraph: Ability to define (1) normal paragraph style with PHPWord::setNormalStyle() and (2) parent style (basedOn) and style for following paragraph (next) 2014-03-07 18:02:47 +07:00
Ivan Lanin be4b01b652 PHPWord_Shared_Font::pointSizeToTwips 2014-03-07 11:14:45 +07:00
Progi1984 545cbc6e23 GH-51 : Adding a value that contains "&" in a template breaks it 2014-03-06 23:29:51 +01:00
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
Progi1984 2d3725cc88 Merge pull request #85 from RomanSyroeshko/PHPWord#52 
Ability to limit number of replacements performed by setValue() method of Template class
 2014-03-05 13:07:31 +01: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
Progi1984 cc61801ca0 Merge pull request #57 from RomanSyroeshko/PHPWord#56 
Postprocessing of documents returned by Template class before moving to final destination
 2014-03-03 19:14:15 +01:00
Roman Syroeshko b765312469 https://github.com/PHPOffice/PHPWord/issues/46 
FIXED: indentation.
 2014-03-03 21:12:05 +04:00
Gabriel Bull 6f2297ea9a Added PSR-4 Autoloader 2014-03-02 13:44:00 -05:00
Roman Syroeshko e0e48938fa https://github.com/PHPOffice/PHPWord/issues/46 
Boolean values now meet PHP-FIG.
 2014-03-02 10:06:27 -08:00
Roman Syroeshko fb5ef658df https://github.com/PHPOffice/PHPWord/issues/46 
Compatibility with PHP 5.3 was fixed.
 2014-03-02 20:08:02 +04:00
Roman Syroeshko a0165701c7 https://github.com/PHPOffice/PHPWord/issues/46 
Correction of the docblock descrition.
 2014-03-02 05:42:16 -08:00
Roman Syroeshko 6ed2b11211 https://github.com/PHPOffice/PHPWord/issues/46 
Minor changes in exception messages.
 2014-03-02 05:14:51 -08:00
Roman Syroeshko 84807539b1 https://github.com/PHPOffice/PHPWord/issues/46 
Correction of the docblock descrition.
 2014-03-02 04:09:48 -08:00
Roman Syroeshko b579007611 https://github.com/PHPOffice/PHPWord/issues/46 
Signature of the method was changed. Optional parameter should be on the last position.
 2014-03-01 08:53:19 -08:00
Roman Syroeshko e5a4e2d8b6 https://github.com/PHPOffice/PHPWord/issues/46 
The method name was changed to be more correct.
 2014-03-01 05:12:11 -08:00
Ivan Lanin ab2b2deac3 Change default font to Times New Roman 12pt 2014-02-23 11:40:32 +07:00
Ivan Lanin eb6b44ef85 Use constant instead of hardcoded 'Arial' name. 2014-02-22 22:52:19 +07:00
Ivan Lanin b0a24703f3 `Table Row` allows `tblHeader` and `cantSplit` 2014-02-22 11:01:15 +07:00
Gabriel Bull 6697b72185 Fixed bug list items inside of cells 2014-02-13 12:24:11 -05: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
Roman Syroeshko 3cd60f76de https://github.com/PHPOffice/PHPWord/issues/56 
Postprocessing of documents returned by Template class before moving to final destination
 2014-01-17 00:02:09 -08:00
Roman Syroeshko 2c5fed61bd https://github.com/PHPOffice/PHPWord/issues/52 
Ability to limit number of replacements performed by setValue() method of Template class
 2014-01-16 04:19:41 -08:00
Ivan Lanin 194940d478 Width: dxa > pct 2014-01-16 14:33:38 +07: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 d3e8b69cc4 Remove (int) since there's a possibility for fraction 2014-01-02 01:30:57 +07:00
Ivan Lanin 72e8f3fccf Fix comment error 2014-01-02 01:02:01 +07:00
Ivan Lanin 0edaaaab50 Tidy up for pull request 2014-01-02 00:59:38 +07:00
Roman Syroeshko abbd288509 https://github.com/PHPOffice/PHPWord/issues/46 
Ability to apply XSLT to Template
 2014-01-01 06:28:10 -08: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
Ivan Lanin 891798bc16 Unix format 2013-12-31 14:34:50 +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 95f16cc3a5 Temporary files naming logic in PHPWord_Template can lead to a collision (GH-38) 2013-12-15 14:58:44 +01: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 049c89d079 IMPROVED : Advanced string replace in setValue for Template 2013-12-15 14:46:05 +01:00
Progi1984 38a15e5da5 Word2007 : Support for tab stops 2013-12-15 14:35:18 +01:00
Progi1984 a610c34a18 Word2007 : Add rowspan and colspan to cells 2013-12-15 13:42:36 +01:00
Progi1984 0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00