Skip to content

loss word 2007 format/ style #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
105 commits merged into from
Jul 31, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
2a5c667
#51 (updated tests, refactored a little).
Feb 6, 2015
8bb4573
#51 (updated tests, refactored a little).
Feb 6, 2015
cc305bc
Fixed broken paragraph alignment for OpenXml.
Feb 21, 2015
4eefb60
#51 (updated tests, refactored a little).
Feb 21, 2015
f902549
Minor refactoring.
Feb 21, 2015
2c040d2
Minor refactoring.
Feb 21, 2015
25a5ba2
Minor refactoring.
Feb 21, 2015
fbdd5f1
Minor refactoring.
Feb 21, 2015
e0dea8e
Fixed broken paragraph alignment for OpenXml.
Feb 21, 2015
cb6ad0e
Fixed broken paragraph alignment for OpenXml.
Feb 21, 2015
17ee9e1
Fixed broken paragraph alignment for OpenXml.
Mar 1, 2015
18c5462
Fixed broken paragraph alignment for OpenXml.
Mar 1, 2015
f2cd42f
#495.
Mar 22, 2015
0198aec
#495.
Mar 22, 2015
a38ec77
#495.
Mar 22, 2015
8e9f865
Removed typo.
Mar 22, 2015
75022c5
#495.
Mar 22, 2015
f33abcd
Performance improvement for #513.
Apr 11, 2015
520a7a8
Performance improvement for #513.
Apr 11, 2015
a5c3645
Performance improvement for #513.
Apr 11, 2015
b7387be
Reimplemented #498.
Apr 14, 2015
d5e276a
Reimplemented #498.
Apr 14, 2015
fef4a36
Implementation for #371.
Apr 14, 2015
6ef9ac2
Merge remote-tracking branch 'origin/develop' into develop
Apr 14, 2015
9770f44
Shortened names of ``TemplateProcessor`` properties.
Apr 14, 2015
4212c7e
Added Gitter badge.
May 26, 2015
7fdc50b
Changed Gitter badge to the Shields version.
May 26, 2015
1cd4fbf
Performance improvement for #513.
Jun 2, 2015
1383cef
Performance improvement for #513.
Jun 2, 2015
26b0eac
`.travis.yml` clanup.
Jun 23, 2015
858ab18
`.travis.yml` cleanup.
Jun 23, 2015
1b56db2
`.travis.yml` cleanup.
Jun 23, 2015
7a2125c
`.travis.yml` cleanup.
Jun 23, 2015
988eaca
Fix for #532.
Jul 2, 2015
db8221d
Fix for #532.
Jul 2, 2015
07e0d4c
Fix for #532.
Jul 2, 2015
637c2bc
Playing with Travis CI.
Jul 2, 2015
c1cfd50
Playing with Travis CI.
Jul 2, 2015
b0ff13c
Playing with Travis CI.
Jul 2, 2015
cd2e7f7
Playing with Travis CI.
Jul 4, 2015
75b479f
Removed redundant *.md documentation.
Aug 8, 2015
90295fe
#532.
Aug 16, 2015
adf20d3
#513.
Aug 30, 2015
3a58c81
Released v0.12.1.
Aug 30, 2015
a123ce4
Template processor setValue() improvements #614
kazitanvirahsan Sep 10, 2015
873d41a
Update Template processor setValue() improvements #614
kazitanvirahsan Sep 10, 2015
b446a23
Update 2 Template processor setValue() improvements #614
kazitanvirahsan Sep 10, 2015
94c0d02
Next round of refactoring of alignment-related functionality.
Oct 10, 2015
505cc76
Fixed build.
Oct 10, 2015
12823a5
Fixed build.
Oct 10, 2015
09e5e35
Changed init value of the NumberingLevel.alignment property.
Oct 21, 2015
d3908de
Updated change log due to the changes previously committed.
Oct 23, 2015
d74c0bd
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
3965f11
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
015a34f
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
f884527
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
e3c8852
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
4ebd668
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
e24fec7
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
e771b47
Added backward compatibility for deprecated alignment options.
Nov 14, 2015
c75bbf1
Merge branch 'master' into develop
Nov 14, 2015
ef3c3b8
Reorganized unit tests.
Nov 15, 2015
c75056f
Reorganized unit tests.
Nov 15, 2015
95c0971
Reorganized unit tests.
Nov 15, 2015
e6d73d8
Removed custom autoloader.
Nov 21, 2015
43fb23d
Copyright update.
Dec 5, 2015
7bd6cbd
Copyright update.
Dec 5, 2015
9f0b437
Copyright update.
Dec 5, 2015
529edcb
Merge pull request #617 from kazitanvirahsan/develop
Dec 12, 2015
5781f65
#617.
Dec 12, 2015
f359825
Reviewed and merged #658.
Jan 23, 2016
3981e01
Add PHP 7.0 into the build script.
Jan 23, 2016
ea4388d
Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665).
Jan 23, 2016
a621447
Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665).
Jan 23, 2016
8bc2364
Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665).
Jan 23, 2016
995dc68
Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665).
Jan 23, 2016
53a5369
Reviewed and merged #612.
Feb 6, 2016
16495a0
Reviewed and merged #612.
Feb 6, 2016
28f801b
#704.
Feb 23, 2016
1c5bb3a
#548.
Apr 9, 2016
d579736
#618.
Apr 23, 2016
40984dc
Update DOC: Add note about direction of text inside cell
githubjeka May 24, 2016
023977a
Merge pull request #803 from githubjeka/patch-1
Progi1984 May 24, 2016
d9627e1
Update Sample_09_Tables.php
githubjeka May 25, 2016
38ca52e
Merge pull request #804 from githubjeka/patch-1
Progi1984 May 26, 2016
d3f3a4a
Update Sample_09_Tables.php
githubjeka May 30, 2016
4954f28
Merge pull request #807 from githubjeka/patch-1
Progi1984 May 30, 2016
ec3c62b
#483. Output escaping for OOXML.
Jun 4, 2016
a07dc6c
#483. Output escaping for OOXML.
Jun 4, 2016
a2d3079
Fixed build.
Jun 4, 2016
ebbb3a5
#483. Output escaping for ODF.
Jun 13, 2016
508d619
Fixed build.
Jun 13, 2016
4c7e139
#483. Output escaping for HTML.
Jun 28, 2016
649da97
Fixed build.
Jun 28, 2016
3f1e0ac
#483. Output escaping for RTF.
Jul 8, 2016
e2ea1ee
Fixed tests.
Jul 8, 2016
7deb010
Fixed formatting.
Jul 8, 2016
fb863cd
https://github.com/PHPOffice/PHPWord/issues/335.
Jul 30, 2016
54013a6
https://github.com/PHPOffice/PHPWord/issues/399.
Jul 30, 2016
7817524
https://github.com/PHPOffice/PHPWord/issues/399.
Jul 30, 2016
1827eab
Removed deprecated code.
Jul 30, 2016
2bcfacf
Updated copyright.
Jul 31, 2016
4486e2b
Updated change log.
Jul 31, 2016
31cc01a
Updated change log.
Jul 31, 2016
0a3f873
Updated change log.
Jul 31, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added backward compatibility for deprecated alignment options.
  • Loading branch information
Roman Syroeshko committed Nov 14, 2015
commit 015a34f5cb47082c3b823f067c46b3c947a94df1
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ before_script:
script:
## PHP_CodeSniffer
- ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
## PHP Copy/Paste Detector
- ./vendor/bin/phpcpd src/ tests/ --verbose
## PHP Mess Detector
- ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
## PHPUnit
Expand Down
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ Place announcement text here.
### Changed
- Improved error message for the case when `autoload.php` is not found. - @RomanSyroeshko #371
- Renamed the `align` option of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles into `alignment`. - @RomanSyroeshko
- Bootstrap script for the manual installation scenario (now include `bootstrap.php` instead of `src/PhpWord/Autoloader.php`). - @RomanSyroeshko

### Deprecated
- `getAlign` and `setAlign` methods of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles.
Use the correspondent `getAlignment` and `setAlignment` methods instead.
- `left`, `right`, and `justify` alignment options for paragraphs (now are mapped to `Jc::START`, `Jc::END`, and `Jc::BOTH`).
- `left`, `right`, and `justify` alignment options for tables (now are mapped to `Jc::START`, `Jc::END`, and `Jc::CENTER`).
Use the correspondent `getAlignment` and `setAlignment` methods instead. - @RomanSyroeshko
- `left`, `right`, and `justify` alignment options for paragraphs (now are mapped to `Jc::START`, `Jc::END`, and `Jc::BOTH`). - @RomanSyroeshko
- `left`, `right`, and `justify` alignment options for tables (now are mapped to `Jc::START`, `Jc::END`, and `Jc::CENTER`). - @RomanSyroeshko

### Removed
- `PhpOffice\PhpWord\Style\Alignment`. Style properties, which previously stored instances of this class, now deal with strings.
In each case set of available string values is defined by the correspondent simple type.
In each case set of available string values is defined by the correspondent simple type. - @RomanSyroeshko
- Manual installation option. To install PHPWord use Composer since now. - @RomanSyroeshko


0.12.1 (30 August 2015)
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"phpdocumentor/phpdocumentor":"2.*",
"squizlabs/php_codesniffer": "1.*",
"phpmd/phpmd": "2.*",
"sebastian/phpcpd": "2.*",
"phploc/phploc": "2.*",
"dompdf/dompdf":"0.6.*",
"tecnick.com/tcpdf": "6.*",
Expand Down
33 changes: 5 additions & 28 deletions docs/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,22 @@ Optional PHP extensions:
Installation
------------

There are two ways to install PHPWord, i.e. via
`Composer <http://getcomposer.org/>`__ or manually by downloading the library.

Using Composer
~~~~~~~~~~~~~~

To install via Composer, add the following lines to your ``composer.json``:
PHPWord is installed via `Composer <https://getcomposer.org/>`__.
You just need to `add dependency <https://getcomposer.org/doc/04-schema.md#package-links>`__ on PHPWord into your package.

Example:
.. code-block:: json

{
"require": {
"phpoffice/phpword": "dev-master"
"phpoffice/phpword": "v0.13.*"
}
}

If you are a developer or if you want to help us with testing then fetch the latest branch for developers.
Notice: all contributions must be done against the developer branch.

Example:
.. code-block:: json

{
Expand All @@ -49,26 +46,6 @@ Notice: all contributions must be done against the developer branch.
}


Manual installation
~~~~~~~~~~~~~~~~~~~

To install manually, you change to the web-server directory of your file system. Then you have 2 possibilities.

1. `download PHPWord package from github <https://github.com/PHPOffice/PHPWord/archive/master.zip>`__.
Extract the package and put the contents to your machine.
2. Alternatively you can use Git to install it:
.. code-block:: console

git clone https://github.com/PHPOffice/PHPWord.git

To use the library, include ``bootstrap.php`` in your PHP script and invoke ``Autoloader::register``.

.. code-block:: php

require_once "${path_to_the_cloned_repo}/bootstrap.php";
\PhpOffice\PhpWord\Autoloader::register();


Using samples
-------------

Expand Down