Skip to content

Commit d93cdea

Browse files
Progi1984Progi1984
committed
Merge pull request #53 from PHPOffice/develop
Version 0.3
2 parents 7538eb3 + a730ab5 commit d93cdea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3501
-279
lines changed

‎CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## 0.3.0 - Not Released
4+
5+
### Features
6+
- PowerPoint97 Reader : Implement Basic Reader - @Progi1984 GH-15 GH-14 GH-4
7+
- ODPresentation Writer : Ability to set auto shrink text - @Progi1984 GH-28
8+
- Make package PSR-4 compliant. Autoload classes by composer out of the box - @Djuki GH-41
9+
10+
### Bugfix
11+
- PowerPoint2007 Writer : Powerpoint Repair Error in Office 2010 - @Progi1984 GH-39
12+
- PowerPoint2007 Writer : BUG: Repair Error / Wrong anchor if you don't set vertical alignment different to VERTICAL_BASE - @fregge GH-42
13+
- PowerPoint2007 Writer : Keynote incompatibility - @catrane CP#237322 / @Progi1984 GH-46
14+
15+
### Miscellaneous
16+
- QA : Move AbstractType for Chart - @Progi1984
17+
- QA : Unit Tests - @Progi1984
18+
319
## 0.2.0 - 2014-07-22
420

521
### Features

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ the following lines to your ``composer.json``.
5959
```
6060

6161
Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPPowerPoint/releases).
62-
In this case, you will have to register the autoloader.
62+
In this case, you will have to register the autoloader. Register autoloading is required only if you do not use composer in your project.
6363

6464
```php
6565
require_once 'path/to/PhpPowerpoint/src/PhpPowerpoint/Autoloader.php';

‎composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Franck Lefevre",
15-
"homepage": "http://blog.rootslabs.net"
15+
"homepage": "http://rootslabs.net"
1616
},
1717
{
1818
"name": "Ivan Lanin",
@@ -38,6 +38,9 @@
3838
"autoload": {
3939
"psr-0": {
4040
"PHPPowerPoint": "src/"
41+
},
42+
"psr-4": {
43+
"PhpOffice\\PhpPowerpoint\\": "src/PhpPowerpoint/"
4144
}
4245
}
4346
}

‎docs/intro.rst

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,60 +42,60 @@ Writers
4242
+---------------------------+----------------------+--------+-------+-------+-------+
4343
| Features | | PPTX | ODP | HTML | PDF |
4444
+===========================+======================+========+=======+=======+=======+
45-
| **Document Properties** | Standard | ✓ | | | |
45+
| **Document Properties** | Standard | ✓ | ✓ | | |
4646
+---------------------------+----------------------+--------+-------+-------+-------+
4747
| | Custom | | | | |
4848
+---------------------------+----------------------+--------+-------+-------+-------+
4949
| **Element Shape** | Image | ✓ | ✓ | | |
5050
+---------------------------+----------------------+--------+-------+-------+-------+
51-
| | Hyperlink | | | | |
51+
| | Hyperlink | ✓ | | | |
5252
+---------------------------+----------------------+--------+-------+-------+-------+
5353
| | Line | ✓ | ✓ | | |
5454
+---------------------------+----------------------+--------+-------+-------+-------+
5555
| | MemoryImage | ✓ | ✓ | | |
5656
+---------------------------+----------------------+--------+-------+-------+-------+
57-
| | RichText | | | | |
57+
| | RichText | ✓ | ✓ | | |
5858
+---------------------------+----------------------+--------+-------+-------+-------+
59-
| | Table | | | | |
59+
| | Table | ✓ | ✓ | | |
6060
+---------------------------+----------------------+--------+-------+-------+-------+
61-
| | Text | | | | |
61+
| | Text | ✓ | ✓ | | |
6262
+---------------------------+----------------------+--------+-------+-------+-------+
63-
| **Charts** | Bar3D | | | | |
63+
| **Charts** | Bar3D | ✓ | ✓ | | |
6464
+---------------------------+----------------------+--------+-------+-------+-------+
65-
| | Line | | | | |
65+
| | Line | ✓ | ✓ | | |
6666
+---------------------------+----------------------+--------+-------+-------+-------+
67-
| | Pie3D | | | | |
67+
| | Pie3D | ✓ | ✓ | | |
6868
+---------------------------+----------------------+--------+-------+-------+-------+
69-
| | Scatter | | | | |
69+
| | Scatter | ✓ | ✓ | | |
7070
+---------------------------+----------------------+--------+-------+-------+-------+
7171

7272
Readers
7373
~~~~~~~
74-
+---------------------------+----------------------+--------+-------+-------+-------+
75-
| Features | | PPTX | ODP | HTML | PDF |
76-
+===========================+======================+========+=======+=======+=======+
77-
| **Document Properties** | Standard | | | | |
78-
+---------------------------+----------------------+--------+-------+-------+-------+
79-
| | Custom | | | | |
80-
+---------------------------+----------------------+--------+-------+-------+-------+
81-
| **Element Shape** | Image | | | | |
82-
+---------------------------+----------------------+--------+-------+-------+-------+
83-
| | Hyperlink | | | | |
84-
+---------------------------+----------------------+--------+-------+-------+-------+
85-
| | RichText | | | | |
86-
+---------------------------+----------------------+--------+-------+-------+-------+
87-
| | Table | | | | |
88-
+---------------------------+----------------------+--------+-------+-------+-------+
89-
| | Text | | | | |
90-
+---------------------------+----------------------+--------+-------+-------+-------+
91-
| **Charts** | Bar3D | | | | |
92-
+---------------------------+----------------------+--------+-------+-------+-------+
93-
| | Line | | | | |
94-
+---------------------------+----------------------+--------+-------+-------+-------+
95-
| | Pie3D | | | | |
96-
+---------------------------+----------------------+--------+-------+-------+-------+
97-
| | Scatter | | | | |
98-
+---------------------------+----------------------+--------+-------+-------+-------+
74+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
75+
| Features | | PPTX | ODP | HTML | PDF | PPT |
76+
+===========================+======================+========+=======+=======+=======+=======+
77+
| **Document Properties** | Standard | | | | | |
78+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
79+
| | Custom | | | | | |
80+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
81+
| **Element Shape** | Image | | | | | ✓ |
82+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
83+
| | Hyperlink | | | | | ✓ |
84+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
85+
| | RichText | | | | | ✓ |
86+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
87+
| | Table | | | | | |
88+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
89+
| | Text | | | | | ✓ |
90+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
91+
| **Charts** | Bar3D | | | | | |
92+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
93+
| | Line | | | | | |
94+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
95+
| | Pie3D | | | | | |
96+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
97+
| | Scatter | | | | | |
98+
+---------------------------+----------------------+--------+-------+-------+-------+-------+
9999

100100
Contributing
101101
------------

‎docs/references.rst

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
References
44
==========
55

6-
ISO/IEC 29500, Third edition, 2012-09-01
6+
OpenXML
77
---------------------
88

9+
Known as "ISO/IEC 29500, Third edition, 2012-09-01"
10+
11+
ISO :
12+
913
- `Part 1: Fundamentals and Markup Language Reference
1014
<http://standards.iso.org/ittf/PubliclyAvailableStandards/c061750_ISO_IEC_29500-1_2012.zip>`__
1115
- `Part 2: Open Packaging Conventions
@@ -14,15 +18,21 @@ ISO/IEC 29500, Third edition, 2012-09-01
1418
<http://standards.iso.org/ittf/PubliclyAvailableStandards/c061797_ISO_IEC_29500-3_2012.zip>`__
1519
- `Part 4: Transitional Migration Features
1620
<http://standards.iso.org/ittf/PubliclyAvailableStandards/c061798_ISO_IEC_29500-4_2012.zip>`__
21+
MSDN :
1722

18-
Formal specifications
23+
- `DocumentFormat.OpenXml.Presentation Namespace on
24+
MSDN <http://msdn.microsoft.com/en-us/library/documentformat.openxml.presentation(v=office.14).aspx>`__
25+
- `Open XML SDK 2.5 with Validator <http://www.microsoft.com/en-gb/download/details.aspx?id=30425>`__
26+
27+
OpenDocument
1928
---------------------
2029

2130
- `Oasis OpenDocument Standard Version
2231
1.2 <http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os.html>`__
2332

24-
Other resources
33+
34+
PowerPoint 97
2535
---------------
2636

27-
- `DocumentFormat.OpenXml.Presentation Namespace on
28-
MSDN <http://msdn.microsoft.com/en-us/library/documentformat.openxml.presentation(v=office.14).aspx>`__
37+
- `[MS-PPT]: PowerPoint (.ppt) Binary File Format <http://msdn.microsoft.com/en-us/library/cc313106(v=office.12).aspx>`__
38+
- `OffVis : Microsoft Tool for reading PPT files <http://blogs.technet.com/b/srd/archive/2009/07/31/announcing-offvis.aspx>`__

‎docs/shapes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Below are the properties that you can set for a rich text shape.
4444
- ``leftInset`` in pixels
4545
- ``rightInset`` in pixels
4646
- ``topInset`` in pixels
47+
- ``autoShrinkHorizontal`` (boolean)
48+
- ``autoShrinkVertical`` (boolean)
4749

4850
Properties that can be set for each paragraphs are as follow.
4951

0 commit comments

Comments
 (0)