Menu
▾
▴
[ODP-Repository] SF.net SVN: opendocumentphp: [33] poc/src
|
From: <nma...@us...> - 2006-03-20 13:49:58
|
Revision: 33 Author: nmarkgraf Date: 2006-03-20 05:49:26 -0800 (Mon, 20 Mar 2006) ViewCVS: http://svn.sourceforge.net/opendocumentphp/?rev=33&view=rev Log Message: ----------- done. This could be the last revision before POC 0.5. Please test it a lot and tell me every error you found. Updated: - etc/coverage-frames.xsl copied from PHing svn distribution. - samples/TestOutput.php now acts with the new classes and methods. - OpenDocument, OpenDocumentSingle, OpenDocumentPackage are now running. - content/Content and styles/Styles are up to date and using FontFaceDeclSplitter to share FontFaceDeclarations. To do: - Like FontFaceDeclSplitter we need a AutomaticStylesSplitter to share AutomaticStyles between content.xml and styles.xml - Maybe FontFaceDecl could be a interface implemeted by FontFaceDeclaration and FontFaceDeclSplitter - ... Norman Modified Paths: -------------- poc/etc/coverage-frames.xsl poc/src/OpenDocument.php poc/src/OpenDocumentPackage.php poc/src/OpenDocumentSingle.php poc/src/content/Content.php poc/src/samples/TestOutput.php poc/src/styles/FontFaceDeclaration.php poc/src/styles/Styles.php Added Paths: ----------- poc/src/styles/FontFaceDeclSplitter.php Modified: poc/etc/coverage-frames.xsl =================================================================== --- poc/etc/coverage-frames.xsl 2006-03-20 09:43:58 UTC (rev 32) +++ poc/etc/coverage-frames.xsl 2006-03-20 13:49:26 UTC (rev 33) @@ -291,6 +291,7 @@ <td class="small">Classes: <xsl:value-of select="count(package/class)"/></td> <td class="small">Methods: <xsl:value-of select="@methodcount"/></td> <td class="small">LOC: <xsl:value-of select="count(package/class/sourcefile/sourceline)"/></td> + <td class="small">Statements: <xsl:value-of select="@statementcount"/></td> </tr> </table> <br/> @@ -414,6 +415,7 @@ <td class="small">Classes: <xsl:value-of select="count(class)"/></td> <td class="small">Methods: <xsl:value-of select="@methodcount"/></td> <td class="small">LOC: <xsl:value-of select="count(class/sourcefile/sourceline)"/></td> + <td class="small">Statements: <xsl:value-of select="@statementcount"/></td> </tr> </table> <br/> @@ -462,6 +464,7 @@ <tr class="a"> <td class="small">Methods: <xsl:value-of select="@methodcount"/></td> <td class="small">LOC: <xsl:value-of select="count(sourcefile/sourceline)"/></td> + <td class="small">Statements: <xsl:value-of select="@statementcount"/></td> </tr> </table> <br/> Modified: poc/src/OpenDocument.php =================================================================== --- poc/src/OpenDocument.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/OpenDocument.php 2006-03-20 13:49:26 UTC (rev 33) @@ -65,7 +65,13 @@ */ public function getStyle(); - + /** + * + * @access public + * + * @since 0.4.4 + */ + public function getScripts(); /** * Modified: poc/src/OpenDocumentPackage.php =================================================================== --- poc/src/OpenDocumentPackage.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/OpenDocumentPackage.php 2006-03-20 13:49:26 UTC (rev 33) @@ -2,6 +2,11 @@ /** * OpenDocumentPackage Class * + * This class will include the following files in one ZIP file with a Manifest file (like JAR files + * for Java) Meta in meta.xml, Settings in settings.xml, Scripts, FontFaceDeclarations, Automatic Styles, + * Body in content.xml, FontFaceDelarations, Styles, Automatic Styles, Master Styles in styles.xml. + * <i>Be aware:</i> FontFaceDeclarations and Automatic Styles are the same in content.xml and styles.xml. + * * $Id$ * * @copyright GNU General Public License @@ -14,6 +19,7 @@ require_once( "settings/Settings.php" ); require_once( "content/Scripts.php" ); require_once( "styles/FontFaceDeclaration.php" ); +require_once( "styles/FontFaceDeclSplitter.php" ); require_once( "styles/Style.php" ); require_once( "styles/AutomaticStyles.php" ); require_once( "styles/MasterStyles.php" ); @@ -21,7 +27,7 @@ require_once( "OpenDocumentAbstract.php" ); class OpenDocumentPackage extends OpenDocumentAbstract implements OpenDocument { - private $manifest; + private $packagename; private $packagetmp; private $zip; @@ -44,8 +50,6 @@ $this->logger->debug( "Generating ZipFile object." ); $this->zip = new ZipFile; - $this->logger->debug( "Generating Manifest with mimetype \"".$this->getMimeType()."\"." ); - $this->manifest = new Manifest( $this->getMimeType() ); if ( !empty( $documentName ) ) { $this->setPackageName( $documentName ); @@ -53,6 +57,27 @@ $this->path = $documentPath; } } + $this->logger->debug( "Generating Manifest with mimetype \"".$this->getMimeType()."\"." ); + $this->DocumentObjects[ "manifest" ] = new Manifest( $this->getMimeType() ); + $this->DocumentObjects[ "meta" ] = new Meta( ); +// $this->DocumentObjects[ "settings" ] = new Settings( ); + + $content = new Content( ); + $this->DocumentObjects[ "content" ] = $content; + + $styles = new Styles( ); + $this->DocumentObjects[ "styles" ] = $styles; + +// $this->DocumentObjects[ "scripts" ] = new Scripts( $contentDom ); +// $this->DocumentObjects[ "automaticstyles" ] = new AutomaticStyles( $contentDom ); + $this->DocumentObjects[ "body" ] = $content->getBody(); + + + $this->DocumentObjects[ "style" ] = $styles->getStyle(); + $this->DocumentObjects[ "fontfacedecl" ] = new FontFaceDeclSplitter( $content->getFontFaceDecl(), + $styles->getFontFaceDecl() ); +// $this->DocumentObjects[ "automaticstyles" ] = new AutomaticStylesSpliter(... ); +// $this->DocumentObjects[ "masterstyles" ] = $styles->getMasterStyles(); } /** @@ -197,7 +222,7 @@ public function addXMLDocument( $fullpath, $dom, $mimetype="text/xml" ) { $this->logger->info( "OpenDocumentPackage->addXMLDocument(" . $fullpath . ") with mimetype '" . $mimetype . "' to package '". $this->packagetmp . "'" ); - $this->manifest->addEntryToManifest( $fullpath, $mimetype ); + $this->DocumentObjects[ "manifest" ]->addEntryToManifest( $fullpath, $mimetype ); $this->writeDOMToPackage( $fullpath, $dom ); } @@ -214,8 +239,8 @@ case "meta" : $this->addXMLDocument( "meta.xml", $docObj->get() ); break; - case "style" : - $this->addXMLDocument( "style.xml", $docObj->get() ); + case "styles" : + $this->addXMLDocument( "styles.xml", $docObj->get() ); break; case "content" : $this->addXMLDocument( "content.xml", $docObj->get() ); @@ -228,7 +253,7 @@ } } - $this->writeDOMToPackage( "META-INF/manifest.xml" , $this->manifest->get() ); + $this->writeDOMToPackage( "META-INF/manifest.xml" , $this->DocumentObjects[ "manifest" ]->get() ); $this->logger->debug( "OpenDocumentPackage->commit: Write mimetype \"". $this->getMimeType()."\" to file \"mimetype\"..." ); $this->zip->addFile( $this->getMimeType(), "mimetype" ); $this->logger->debug( "OpenDocumentPackage->commit: Commited package named \"" . $this->packagename . "\"..." ); @@ -289,21 +314,21 @@ */ public function getStyle() { if (!array_key_exists ( "style", $this->DocumentObjects) ) { - $this->DocumentObjects[ "style" ] = new Style(); + $this->DocumentObjects[ "style" ] = $this->DocumentObjects[ "styles" ]->getStyle(); } return $this->DocumentObjects[ "style" ]; } - + /** * * @access public - * * @since 0.4.0 */ - public function getBody(){ - return 0; + public function getStyles() { + return getStyle(); } - + + /** * * @access public @@ -311,7 +336,7 @@ * @since 0.4.4 */ public function getFontFaceDeclaration(){ - return 0; + return $this->DocumentObjects[ "fontfacedecl" ]; } /** @@ -323,6 +348,16 @@ public function getSettings(){ return 0; } + + /** + * + * @access public + * + * @since 0.4.0 + */ + public function getBody() { + return $this->DocumentObjects[ "body" ]; + } /** * @@ -330,9 +365,14 @@ * * @since 0.4.4 */ - public function getStyles(){ - return 0; + public function getScripts(){ + if ( !array_key_exists( "scripts", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "scripts" ] = $this->DocumentObjects[ "content" ]->getScripts(); + } + return $this->DocumentObjects[ "scripts" ]; } + + /** * * @access public @@ -340,7 +380,10 @@ * @since 0.4.4 */ public function getAutomaticStyles(){ - return 0; + if ( !array_key_exists( "automaticstyles", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "automaticstyles" ] = 0; + } + return $this->DocumentObjects[ "automaticstyles" ]; } /** @@ -349,10 +392,12 @@ * * @since 0.4.4 */ - public function getMasterStyles() { - return 0; + public function getMasterStyles(){ + if ( !array_key_exists( "masterstyles", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "masterstyles" ] = 0; + } + return $this->DocumentObjects[ "masterstyles" ]; } - } ?> \ No newline at end of file Modified: poc/src/OpenDocumentSingle.php =================================================================== --- poc/src/OpenDocumentSingle.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/OpenDocumentSingle.php 2006-03-20 13:49:26 UTC (rev 33) @@ -71,14 +71,13 @@ $this->root->setAttributeNS( self::NS_OFFICE, "office:mimetype", $mimetype ); $this->DocumentObjects[ "meta" ] = new Meta( $this->dom, $this->root ); - $this->DocumentObjects[ "settings" ] = new Settings( $this->dom, $this->root ); - $this->DocumentObjects[ "scripts" ] = new Scripts( $this->dom, $this->root ); +// $this->DocumentObjects[ "settings" ] = new Settings( $this->dom, $this->root ); +// $this->DocumentObjects[ "scripts" ] = new Scripts( $this->dom, $this->root ); $this->DocumentObjects[ "fontfacedecl" ] = new FontFaceDeclaration( $this->dom, $this->root ); $this->DocumentObjects[ "style" ] = new Style( $this->dom, $this->root ); - $this->DocumentObjects[ "automaticstyles" ] = new AutomaticStyles( $this->dom, $this->root ); - $this->DocumentObjects[ "masterstyles" ] = new MasterStyles( $this->dom, $this->root ); - $this->DocumentObjects[ "body" ] = new Body( $this->dom, $this->root ); - +// $this->DocumentObjects[ "automaticstyles" ] = new AutomaticStyles( $this->dom, $this->root ); +// $this->DocumentObjects[ "masterstyles" ] = new MasterStyles( $this->dom, $this->root ); + $this->DocumentObjects[ "body" ] = new Body( $this->dom, $this->root ); } /** @@ -125,18 +124,35 @@ */ private function commit() { $this->logger->debug( "OpenDocumentSingle->commit()" ); - - $this->DocumentObjects[ "meta" ]->commit(); -// $this->DocumentObjects[ "settings" ]->commit(); -// $this->root->appendChild( $this->DocumentObjects[ "scripts" ]->get() ); - $this->root->appendChild( $this->DocumentObjects[ "fontfacedecl" ]->get() ); - $this->root->appendChild( $this->DocumentObjects[ "style" ]->get() ); -// $this->root->appendChild( $this->DocumentObjects[ "automaticstyles" ]->get() ); -// $this->root->appendChild( $this->DocumentObjects[ "masterstyles" ]->get() ); - $this->root->appendChild( $this->DocumentObjects[ "body" ]->get() ); - + // Add Meta data + $this->DocumentObjects[ "meta" ]->commit(); + // Add settings, if needed + if ( array_key_exists( "settings", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "settings" ]->commit(); + } + // Add scripts, if needed + if ( array_key_exists( "scripts", $this->DocumentObjects ) ) { + $this->root->appendChild( $this->DocumentObjects[ "scripts" ]->get() ); + } + // Add FontFaceDeclarations + $this->root->appendChild( $this->DocumentObjects[ "fontfacedecl" ]->get() ); + // Add Style + $this->root->appendChild( $this->DocumentObjects[ "style" ]->get() ); + // Add AutomaticSytles, if needed + if ( array_key_exists( "automaticstyles", $this->DocumentObjects ) ) { + $this->root->appendChild( $this->DocumentObjects[ "automaticstyles" ]->get() ); + } + // Add MasterStyles, if needed + if ( array_key_exists( "masterstyles", $this->DocumentObjects ) ) { + $this->root->appendChild( $this->DocumentObjects[ "masterstyles" ]->get() ); + } + // Add Body + $this->root->appendChild( $this->DocumentObjects[ "body" ]->get() ); + // Add all to DOM document $this->dom->appendChild( $this->root ); + // Normalzise DOM document $this->dom->normalize(); + // Set everthing to commited. $this->isCommited = true; } @@ -207,8 +223,8 @@ * * @since 0.3.0 */ - public function getStyle() { - return $this->getStyles(); + public function getStyles() { + return $this->getStyle(); } /** @@ -217,7 +233,7 @@ * * @since 0.3.0 */ - public function getStyles() { + public function getStyle() { if ( !array_key_exists( "style", $this->DocumentObjects ) ) { $this->DocumentObjects[ "style" ] = new Style( $this->dom, $this->root ); } @@ -251,7 +267,10 @@ * @since 0.4.4 */ public function getSettings(){ - return $this->DocumentObjects[ "setting" ]; + if ( !array_key_exists( "settings", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "settings" ] = new Settings( $this->dom, $this->root ); + } + return $this->DocumentObjects[ "settings" ]; } /** @@ -260,7 +279,24 @@ * * @since 0.4.4 */ + public function getScripts(){ + if ( !array_key_exists( "scripts", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "scripts" ] = new Scripts( $this->dom, $this->root ); + } + return $this->DocumentObjects[ "scripts" ]; + } + + + /** + * + * @access public + * + * @since 0.4.4 + */ public function getAutomaticStyles(){ + if ( !array_key_exists( "automaticstyles", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "automaticstyles" ] = new AutomaticStyles( $this->dom, $this->root ); + } return $this->DocumentObjects[ "automaticstyles" ]; } @@ -271,6 +307,9 @@ * @since 0.4.4 */ public function getMasterStyles(){ + if ( !array_key_exists( "masterstyles", $this->DocumentObjects ) ) { + $this->DocumentObjects[ "masterstyles" ] = new AutomaticStyles( $this->dom, $this->root ); + } return $this->DocumentObjects[ "masterstyles" ]; } Modified: poc/src/content/Content.php =================================================================== --- poc/src/content/Content.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/content/Content.php 2006-03-20 13:49:26 UTC (rev 33) @@ -66,71 +66,16 @@ /** * * @access public - * @depricated * - * @since 0.4.0 - */ - public function addNoScript() { - $this->root->appendChild( $this->dom->createElementNS( self::NS_OFFICE, "office:script" ) ); - } - - /** - * - * @depricated - * - * @access public - * - * @since 0.4.0 - */ - public function addFontFace( $name, $fontFamily, $genericFamily=0, $fontPitch=0, $fontCharset=0 ) { - $this->FontFaceDecl->addFontFaceOld( $name, $fontFamily, $genericFamily, $fontPitch, $fontCharset ); - } - - /** - * - * @access public - * * @since 0.4.2 */ public function getFontFaceDecl() { return $this->FontFaceDecl; } - /** - * - * @access public - * @depricated - * - * @since 0.4.0 - */ - public function addAutomaticStyles() { - - } /** * - * @access public - * @depricated - * - * @since 0.4.0 - */ - public function addNoAutomaticStyles() { - $this->root->appendChild( $this->dom->createElementNS( self::NS_OFFICE, "office:automatics-sytles" ) ); - } - - -/* - <text:sequence-decls> - <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/> - <text:sequence-decl text:display-outline-level="0" text:name="Table"/> - <text:sequence-decl text:display-outline-level="0" text:name="Text"/> - <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> - </text:sequence-decls> - -*/ - - /** - * * @return * * @access public Modified: poc/src/samples/TestOutput.php =================================================================== --- poc/src/samples/TestOutput.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/samples/TestOutput.php 2006-03-20 13:49:26 UTC (rev 33) @@ -65,16 +65,17 @@ $text->addNoForms(); - $text->addToText( $text->getTextHeading( "Heading", "The first step" ) ); + $text->addToText( $text->getTextHeading( "Heading", 1, "The first step" ) ); $text->addToText( $text->getTextParagraph( "Paragraph", "This is a little test!" ) ); } - - function makeStyle( $style ) { + + function makeFontFaceDecl( $fontfacedecl ) { $styleAttr = array(); $styleAttr[ "font-family" ] ="Tahoma"; - $style->getFontFaceDecl()->addFontFace( "Test", $styleAttr ); - unset( $styleAttr ); - + $fontFaceDecl->addFontFace( "Test", $styleAttr ); + } + + function makeStyle( $style ) { // Set default style $style->addDefaultStyle( "paragraph" ); @@ -162,8 +163,7 @@ // Get a OpenDocument object from the factory: - if(isset($SingleDocument)) - { + if(isset($SingleDocument)) { $TestDoc = OpenDocumentFactory::createOpenDocument( self::DocumentName, self::PathToDocument, @@ -175,15 +175,14 @@ */ $this->makeMeta( $TestDoc->getMeta(), $creator, $title, "en-EN" ); + $this->makeFontFaceDecl( $TestDoc->getFontFaceDeclaration() ); $this->makeStyle( $TestDoc->getStyle() ); $this->makeContent( $TestDoc->getContent() ); echo $TestDoc->get(); //$TestDoc->save(); - } - - + } } } Added: poc/src/styles/FontFaceDeclSplitter.php =================================================================== --- poc/src/styles/FontFaceDeclSplitter.php (rev 0) +++ poc/src/styles/FontFaceDeclSplitter.php 2006-03-20 13:49:26 UTC (rev 33) @@ -0,0 +1,56 @@ +<?php +/** + * FontFaceDeclSplitter Class + * + * $Id$ + * + * @license GNU General Public License + * @copyright Copyright © 2006, Norman Markgraf + * @author Norman Markgraf <nma...@us...> + * @version $Revision$ + * @package OpenDocument + * @subpackage styles + * @since 0.4.4 + */ +require_once( "OpenDocumentObjectAbstract.php" ); + +class FontFaceDeclSplitter extends OpenDocumentObjectAbstract { + private $FFD1; + private $FFD2; + /** + * + * @param DOMDocument $dom + * + * @access public + * + * @since 0.4.4 + */ + public function __construct( $f1, $f2 ) { + parent::__construct(); + + $this->FFD1 = $f1; + $this->FFD2 = $f2; + } + + /** + * + * @access public + * + * @since 0.4.4 + */ + public function addFontFace( $name, $styleAttr=0, $SVGAttr=0 ) { + $this->FFD1->addFontFace( $name, $styleAttr, $SVGAttr); + $this->FFD2->addFontFace( $name, $styleAttr, $SVGAttr); + } + + /** + * + * @access public + * + * @since 0.4.4 + */ + public function commit() { + $this->isCommited = true; + } + +} Property changes on: poc/src/styles/FontFaceDeclSplitter.php ___________________________________________________________________ Name: svn:keywords + Date Revision Author HeadURL Id Modified: poc/src/styles/FontFaceDeclaration.php =================================================================== --- poc/src/styles/FontFaceDeclaration.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/styles/FontFaceDeclaration.php 2006-03-20 13:49:26 UTC (rev 33) @@ -20,44 +20,22 @@ * */ private $FontFaceDecl; - + /** * - */ - private $FontFaceDecl2; - - /** - * - */ - private $dom2; - - /** - * - */ - private $useDom2; - - /** - * * @param DOMDocument $dom * * @access public * * @since 0.4.2 */ - public function __construct( $dom, $root=0, $dom2=0 ) { + public function __construct( $dom, $root=0) { parent::__construct(); $this->dom = $dom; - $this->dom2 = $dom2; $this->useDom2 = false; $this->FontFaceDecl = $this->dom->createElementNS( self::NS_OFFICE, "office:font-face-decls" ); - - if (!empty($dom2)) { - // Package Document with two DOM documents, $dom <-> content.xml $dom2 <-> styles.xml - $this->FontFaceDecl2 = $this->dom2->createElementNS( self::NS_OFFICE, "office:font-face-decls" ); - $this->useDom2 = true; - } } /** @@ -138,18 +116,11 @@ public function addFontFace( $name, $styleAttr=0, $SVGAttr=0 ) { $font = $this->dom->createElementNS( self::NS_STYLE, "style:font-face" ); $font->setAttributeNS( self::NS_STYLE, "style:name", $name ); - if ($this->useDom2) { - $font2 = $this->dom2->createElementNS( self::NS_STYLE, "style:font-face" ); - $font2->setAttributeNS( self::NS_STYLE, "style:name", $name ); - } if (!empty($styleAttr)) { foreach( $styleAttr as $key => $value ) { // ***FIX ME*** Here we should check if the keys are possible if ($this->checkStyle($key, $value)) { $font->setAttributeNS( self::NS_STYLE, "style:".$key, $value ); - if ($this->useDom2) { - $font2->setAttributeNS( self::NS_STYLE, "style:".$key, $value ); - } } } } @@ -158,17 +129,10 @@ // ***FIX ME*** Here we should check if the keys are possible if ($this->checkSVG( $key, $value )) { $font->setAttributeNS( self::NS_SVG, "svg:".$key, $value ); - if ($this->useDom2) { - $font2->setAttributeNS( self::NS_SVG, "svg:".$key, $value ); - } } } } $this->FontFaceDecl->appendChild( $font ); - if ($this->useDom2) { - $this->FontFaceDecl2->appendChild( $font2 ); - unset( $font2 ); - } unset( $font ); } @@ -218,21 +182,5 @@ return $this->FontFaceDecl; } - /** - * - * @return DOMDocument - * - * @access public - * @final - * - * @since 0.4.4 - */ - final public function get2() { - if (!$this->isCommited) { - $this->commit(); - } - return $this->FontFaceDecl; - } - } ?> \ No newline at end of file Modified: poc/src/styles/Styles.php =================================================================== --- poc/src/styles/Styles.php 2006-03-20 09:43:58 UTC (rev 32) +++ poc/src/styles/Styles.php 2006-03-20 13:49:26 UTC (rev 33) @@ -47,7 +47,7 @@ $this->root->setAttributeNS( self::NS_OFFICE, "office:version", "1.0" ); $this->styles = $this->dom; - $this->FontFaceDecl = new FontFaceDecl( $this->dom, $this->root ); + $this->FontFaceDecl = new FontFaceDeclaration( $this->dom, $this->root ); $this->Style = new Style( $this->dom, $this->root ); $this->AutomaticStyles = new AutomaticStyles( $this->dom, $this->root ); $this->MasterStyles = new MasterStyles( $this->dom, $this->root ); @@ -66,30 +66,45 @@ unset( $this->root ); unset( $this->style ); } + + /** + * + * @access public + * + * @since 0.4.2 + */ + public function getFontFaceDecl() { + return $this->FontFaceDecl; + } - + /** + * + * @access public + * + * @since 0.4.4 + */ + public function getStyle() { + return $this->Style; + } /** * - * @depricated * @access public * - * @since 0.4.0 + * @since 0.4.4 */ - public function addFontFace( $name, $fontFamily, $genericFamily=0, $fontPitch=0, $fontCharset=0 ) { - $this->FontFaceDecl->addFontFaceOld( $name, $fontFamily, $genericFamily, $fontPitch, $fontCharset ); + public function getAutomaticStyles() { + return $this->AutomaticStyles; } - /** * - * @depricated * @access public * - * @since 0.4.2 + * @since 0.4.4 */ - public function getFontFaceDecl() { - return $this->FontFaceDecl; + public function getMasterStyles() { + return $this->MasterStyles; } /** @@ -104,7 +119,7 @@ $this->root->appendChild( $this->AutomaticStyles->get() ); $this->root->appendChild( $this->MasterStyles->get() ); - $this->style->appendChild( $this->root ); + $this->styles->appendChild( $this->root ); $this->dom->normalize(); $this->isCommited = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
