[Phphtmllib-devel] SF.net SVN: phphtmllib:[3202] trunk/phphtmllib/src/svg/SVGTAGS.inc
Status: Beta
Brought to you by:
hemna
From: <he...@us...> - 2008-11-21 18:28:56
|
Revision: 3202 http://phphtmllib.svn.sourceforge.net/phphtmllib/?rev=3202&view=rev Author: hemna Date: 2008-11-21 18:28:52 +0000 (Fri, 21 Nov 2008) Log Message: ----------- some updates to SVG to bring it into the php5 world. Modified Paths: -------------- trunk/phphtmllib/src/svg/SVGTAGS.inc Modified: trunk/phphtmllib/src/svg/SVGTAGS.inc =================================================================== --- trunk/phphtmllib/src/svg/SVGTAGS.inc 2008-11-21 18:27:45 UTC (rev 3201) +++ trunk/phphtmllib/src/svg/SVGTAGS.inc 2008-11-21 18:28:52 UTC (rev 3202) @@ -30,13 +30,13 @@ * @param mixed - any N number of params for * content for the tag */ - function __construct( $attributes=array() ) { + public function __construct( $attributes=array() ) { $this->set_tag_attributes( $attributes ); $num_args = func_num_args(); for ($i=1;$i<$num_args;$i++) { $this->add(func_get_arg($i)); } - $this->_set_flags(); + //$this->_set_flags(); } /** @@ -51,7 +51,7 @@ * @param string - the class value. * @link http://www.w3.org/TR/SVG/struct.html#StdAttrs */ - function set_id( $value ) { + public function set_id( $value ) { $this->set_tag_attribute("id", $value); } @@ -63,7 +63,7 @@ * @param string - the 'xml:base' attribute * @link http://www.w3.org/TR/SVG/struct.html#StdAttrs */ - function set_xmlbase( $xmlbase ) { + public function set_xmlbase( $xmlbase ) { $this->set_tag_attribute( "xml:base", $xmlbase ); } @@ -79,7 +79,7 @@ * @param string - the 'xml:lang' attribute * @link http://www.w3.org/TR/SVG/struct.html#StdAttrs */ - function set_xmllang( $xmllang ) { + public function set_xmllang( $xmllang ) { $this->set_tag_attribute( "xml:lang", $xmlbase ); } @@ -91,7 +91,7 @@ * @param string - the 'xml:space' attribute * @link http://www.w3.org/TR/SVG/struct.html#StdAttrs */ - function set_xmlspace( $xmlspace ) { + public function set_xmlspace( $xmlspace ) { $this->set_tag_attribute( "xml:space", $xmlbase ); } @@ -102,7 +102,7 @@ * * @param string - the class value. */ - function set_class( $value ) { + public function set_class( $value ) { $this->set_tag_attribute("class", $value); } @@ -113,7 +113,7 @@ * * @param string - the class value. */ - function set_style( $value ) { + public function set_style( $value ) { $this->set_tag_attribute("style", $value); } @@ -123,23 +123,9 @@ * * @param string - the 'transform' attribute */ - function set_transform( $value ) { + public function set_transform( $value ) { $this->set_tag_attribute("transform", $value ); } - - /** - * we override this method - * to automatically check to - * see if the tag has content. - * if it doesn't then we - * don't need to render the - * close tag. - */ - function _prepare_flags() { - if ($this->count_content() == 0) { - $this->_flags &= ~(phphtmllib::_CONTENTREQUIRED | phphtmllib::_CLOSETAGREQUIRED); - } - } } /** @@ -148,7 +134,7 @@ * @package phpHtmlLib */ class Asvgtag extends SVGTagClass { - var $_tag = "a"; + protected $_tag = "a"; } // Asvgtag /** @@ -157,7 +143,7 @@ * @package phpHtmlLib */ class ALTGLYGHsvgtag extends SVGTagClass { - var $_tag = "altGlyph"; + protected $_tag = "altGlyph"; } // ALTGLYGHsvgtag /** @@ -166,7 +152,7 @@ * @package phpHtmlLib */ class ALTGLYGHDEFsvgtag extends SVGTagClass { - var $_tag = "altGlyphDef"; + protected $_tag = "altGlyphDef"; } // ALTGLYGHDEFsvgtag /** @@ -175,7 +161,7 @@ * @package phpHtmlLib */ class ALTGLYGHITEMsvgtag extends SVGTagClass { - var $_tag = "altGlyphItem"; + protected $_tag = "altGlyphItem"; } // ALTGLYGHITEMsvgtag /** @@ -184,7 +170,7 @@ * @package phpHtmlLib */ class ANIMATEsvgtag extends SVGTagClass { - var $_tag = "animate"; + protected $_tag = "animate"; } // ANIMATEsvgtag /** @@ -193,7 +179,7 @@ * @package phpHtmlLib */ class ANIMATECOLORsvgtag extends SVGTagClass { - var $_tag = "animateColor"; + protected $_tag = "animateColor"; } // ANIMATECOLORsvgtag /** @@ -202,7 +188,7 @@ * @package phpHtmlLib */ class ANIMATEMOTIONsvgtag extends SVGTagClass { - var $_tag = "animateMotion"; + protected $_tag = "animateMotion"; } // ANIMATEMOTIONsvgtag /** @@ -211,7 +197,7 @@ * @package phpHtmlLib */ class ANIMATETTRANSFORMsvgtag extends SVGTagClass { - var $_tag = "animateTransform"; + protected $_tag = "animateTransform"; } // ANIMATETTRANSFORMsvgtag /** @@ -220,7 +206,7 @@ * @package phpHtmlLib */ class CIRCLEsvgtag extends SVGTagClass { - var $_tag = "circle"; + protected $_tag = "circle"; } // CIRCLEsvgtag /** @@ -229,7 +215,7 @@ * @package phpHtmlLib */ class CLIPPATHsvgtag extends SVGTagClass { - var $_tag = "clipPath"; + protected $_tag = "clipPath"; } // CLIPPATHsvgtag /** @@ -238,7 +224,7 @@ * @package phpHtmlLib */ class COLORPROFILEsvgtag extends SVGTagClass { - var $_tag = "color-profile"; + protected $_tag = "color-profile"; } // COLORPROFILEsvgtag /** @@ -247,7 +233,7 @@ * @package phpHtmlLib */ class CURSORsvgtag extends SVGTagClass { - var $_tag = "cursor"; + protected $_tag = "cursor"; } // CIRCLEsvgtag /** @@ -256,7 +242,7 @@ * @package phpHtmlLib */ class DEFSsvgtag extends SVGTagClass { - var $_tag = "defs"; + protected $_tag = "defs"; } // DEFSsvgtag /** @@ -265,7 +251,7 @@ * @package phpHtmlLib */ class DESCsvgtag extends SVGTagClass { - var $_tag = "desc"; + protected $_tag = "desc"; } // DESCsvgtag /** @@ -274,13 +260,8 @@ * @package phpHtmlLib */ class DEFINITIONSRCsvgtag extends SVGTagClass { - var $_tag = "definition-src"; + protected $_tag = "definition-src"; protected $_flags = phphtmllib::_FLAGS_XML_OPEN_ONLY; - - //function _set_flags() { - // parent::_set_flags(); - // $this->_flags &= ~(_CONTENTREQUIRED | _CLOSETAGREQUIRED); - //} } // DEFINITIONSRCsvgtag /** @@ -289,13 +270,8 @@ * @package phpHtmlLib */ class ELLIPSEsvgtag extends SVGTagClass { - var $_tag = "ellipse"; + protected $_tag = "ellipse"; protected $_flags = phphtmllib::_FLAGS_XML_OPEN_ONLY; - - //function _set_flags() { - // parent::_set_flags(); - // $this->_flags &= ~(_CONTENTREQUIRED | _CLOSETAGREQUIRED); - //} } // ELLIPSEsvgtag /** @@ -304,7 +280,7 @@ * @package phpHtmlLib */ class FEBLENDsvgtag extends SVGTagClass { - var $_tag = "feBlend"; + protected $_tag = "feBlend"; } // FEBLENDsvgtag /** @@ -313,7 +289,7 @@ * @package phpHtmlLib */ class FECOLORMATRIXsvgtag extends SVGTagClass { - var $_tag = "feColorMatrix"; + protected $_tag = "feColorMatrix"; } // FECOLORMATRIXsvgtag /** @@ -322,7 +298,7 @@ * @package phpHtmlLib */ class FECOMPONENTTANSFERsvgtag extends SVGTagClass { - var $_tag = "feComponentTransfer"; + protected $_tag = "feComponentTransfer"; } // FECOMPONENTTANSFERsvgtag /** @@ -331,7 +307,7 @@ * @package phpHtmlLib */ class FECOMPOSITEsvgtag extends SVGTagClass { - var $_tag = "feComposite"; + protected $_tag = "feComposite"; } // FECOMPOSITEsvgtag /** @@ -340,7 +316,7 @@ * @package phpHtmlLib */ class FECONVOLVEMATRIXsvgtag extends SVGTagClass { - var $_tag = "feConvolveMatrix"; + protected $_tag = "feConvolveMatrix"; } // FECONVOLVEMATRIXsvgtag /** @@ -349,7 +325,7 @@ * @package phpHtmlLib */ class FEDIFFUSELIGHTINGsvgtag extends SVGTagClass { - var $_tag = "feDiffuseLighting"; + protected $_tag = "feDiffuseLighting"; } // FEDIFFUSELIGHTINGsvgtag /** @@ -358,7 +334,7 @@ * @package phpHtmlLib */ class FEDISPLACEMENTMAPsvgtag extends SVGTagClass { - var $_tag = "feDisplacementMap"; + protected $_tag = "feDisplacementMap"; } // FEDISPLACEMENTMAPsvgtag /** @@ -367,7 +343,7 @@ * @package phpHtmlLib */ class FEDISTANTLIGHTsvgtag extends SVGTagClass { - var $_tag = "feDistantLight"; + protected $_tag = "feDistantLight"; } // FEDISTANTLIGHTsvgtag /** @@ -376,7 +352,7 @@ * @package phpHtmlLib */ class FEFLOODsvgtag extends SVGTagClass { - var $_tag = "feFlood"; + protected $_tag = "feFlood"; } // FEFLOODsvgtag /** @@ -385,7 +361,7 @@ * @package phpHtmlLib */ class FEFUNCAsvgtag extends SVGTagClass { - var $_tag = "feFuncA"; + protected $_tag = "feFuncA"; } // FEFUNCAsvgtag /** @@ -394,7 +370,7 @@ * @package phpHtmlLib */ class FEFUNCBsvgtag extends SVGTagClass { - var $_tag = "feFuncB"; + protected $_tag = "feFuncB"; } // FEFUNCBsvgtag /** @@ -403,7 +379,7 @@ * @package phpHtmlLib */ class FEFUNCGsvgtag extends SVGTagClass { - var $_tag = "feFuncG"; + protected $_tag = "feFuncG"; } // FEFUNCGsvgtag /** @@ -412,7 +388,7 @@ * @package phpHtmlLib */ class FEFUNCRsvgtag extends SVGTagClass { - var $_tag = "feFuncR"; + protected $_tag = "feFuncR"; } // FEFUNCRsvgtag /** @@ -421,7 +397,7 @@ * @package phpHtmlLib */ class FEGAUSSIANBLURsvgtag extends SVGTagClass { - var $_tag = "feGaussianBlur"; + protected $_tag = "feGaussianBlur"; } // FEGAUSSIANBLURsvgtag /** @@ -430,7 +406,7 @@ * @package phpHtmlLib */ class FEIMAGEsvgtag extends SVGTagClass { - var $_tag = "feImage"; + protected $_tag = "feImage"; } // FEIMAGEsvgtag /** @@ -439,7 +415,7 @@ * @package phpHtmlLib */ class FEMERGEsvgtag extends SVGTagClass { - var $_tag = "feMerge"; + protected $_tag = "feMerge"; } // FEMERGEsvgtag /** @@ -448,7 +424,7 @@ * @package phpHtmlLib */ class FEMERGENODEsvgtag extends SVGTagClass { - var $_tag = "feMergeNode"; + protected $_tag = "feMergeNode"; } // FEMERGENODEsvgtag /** @@ -457,7 +433,7 @@ * @package phpHtmlLib */ class FEMORPHOLOGYsvgtag extends SVGTagClass { - var $_tag = "feMorphology"; + protected $_tag = "feMorphology"; } // FEMORPHOLOGYsvgtag /** @@ -466,7 +442,7 @@ * @package phpHtmlLib */ class FEOFFSETsvgtag extends SVGTagClass { - var $_tag = "feOffset"; + protected $_tag = "feOffset"; } // FEOFFSETsvgtag /** @@ -475,7 +451,7 @@ * @package phpHtmlLib */ class FEPOINTLIGHTsvgtag extends SVGTagClass { - var $_tag = "fePointLight"; + protected $_tag = "fePointLight"; } // FEPOINTLIGHTsvgtag /** @@ -484,7 +460,7 @@ * @package phpHtmlLib */ class FESPECTACULARLIGHTINGsvgtag extends SVGTagClass { - var $_tag = "feSpecularLighting"; + protected $_tag = "feSpecularLighting"; } // FESPECTACULARLIGHTINGsvgtag /** @@ -493,7 +469,7 @@ * @package phpHtmlLib */ class FESPOTLIGHTsvgtag extends SVGTagClass { - var $_tag = "feSpotLight"; + protected $_tag = "feSpotLight"; } // FESPOTLIGHTsvgtag /** @@ -502,7 +478,7 @@ * @package phpHtmlLib */ class FETILEsvgtag extends SVGTagClass { - var $_tag = "feTile"; + protected $_tag = "feTile"; } // FETILEsvgtag /** @@ -511,7 +487,7 @@ * @package phpHtmlLib */ class FETURBULENCEsvgtag extends SVGTagClass { - var $_tag = "feTurbulence"; + protected $_tag = "feTurbulence"; } // FETURBULENCEsvgtag /** @@ -520,7 +496,7 @@ * @package phpHtmlLib */ class FILTERsvgtag extends SVGTagClass { - var $_tag = "filter"; + protected $_tag = "filter"; } // FILTERsvgtag /** @@ -529,7 +505,7 @@ * @package phpHtmlLib */ class FONTsvgtag extends SVGTagClass { - var $_tag = "font"; + protected $_tag = "font"; } // FONTsvgtag /** @@ -538,7 +514,7 @@ * @package phpHtmlLib */ class FONTFACEsvgtag extends SVGTagClass { - var $_tag = "font-face"; + protected $_tag = "font-face"; } // FONTFACEsvgtag /** @@ -547,13 +523,8 @@ * @package phpHtmlLib */ class FONTFACEFORMATsvgtag extends SVGTagClass { - var $_tag = "font-face-format"; + protected $_tag = "font-face-format"; protected $_flags = phphtmllib::_FLAGS_XML_OPEN_ONLY; - - //function _set_flags() { - // parent::_set_flags(); - // $this->_flags &= ~(_CONTENTREQUIRED | _CLOSETAGREQUIRED); - //} } // FONTFACEFORMATsvgtag /** @@ -562,13 +533,8 @@ * @package phpHtmlLib */ class FONTFACENAMEsvgtag extends SVGTagClass { - var $_tag = "font-face-name"; + protected $_tag = "font-face-name"; protected $_flags = phphtmllib::_FLAGS_XML_OPEN_ONLY; - - //function _set_flags() { - // parent::_set_flags(); - // $this->_flags &= ~(_CONTENTREQUIRED | _CLOSETAGREQUIRED); - //} } // FONTFACEFORMATsvgtag /** @@ -577,7 +543,7 @@ * @package phpHtmlLib */ class FONTFACESRCsvgtag extends SVGTagClass { - var $_tag = "font-face-src"; + protected $_tag = "font-face-src"; } // FONTFACESRCsvgtag /** @@ -586,7 +552,7 @@ * @package phpHtmlLib */ class FONTFACEURIsvgtag extends SVGTagClass { - var $_tag = "font-face-uri"; + protected $_tag = "font-face-uri"; } // FONTFACEURIsvgtag /** @@ -595,7 +561,7 @@ * @package phpHtmlLib */ class FOREIGNOBJECTsvgtag extends SVGTagClass { - var $_tag = "foreignObject"; + protected $_tag = "foreignObject"; } // FOREIGNOBJECTsvgtag /** @@ -604,7 +570,7 @@ * @package phpHtmlLib */ class Gsvgtag extends SVGTagClass { - var $_tag = "g"; + protected $_tag = "g"; } // Gsvgtag /** @@ -613,7 +579,7 @@ * @package phpHtmlLib */ class GLYPHsvgtag extends SVGTagClass { - var $_tag = "glyph"; + protected $_tag = "glyph"; } // GLYPHsvgtag /** @@ -622,7 +588,7 @@ * @package phpHtmlLib */ class GLYPHREFsvgtag extends SVGTagClass { - var $_tag = "glyphRef"; + protected $_tag = "glyphRef"; } // GLYPHREFsvgtag /** @@ -631,13 +597,8 @@ * @package phpHtmlLib */ class HKERNsvgtag extends SVGTagClass { - var $_tag = "hkern"; + protected $_tag = "hkern"; protected $_flags = phphtmllib::_FLAGS_XML_OPEN_ONLY; - - //function _set_flags() { - // parent::_set_flags(); - // $this->_flags &= ~(_CONTENTREQUIRED | _CLOSETAGREQUIRED); - //} } // HKERNsvgtag /** @@ -646,7 +607,7 @@ * @package phpHtmlLib */ class IMAGEsvgtag extends SVGTagClass { - var $_tag = "image"; + protected $_tag = "image"; } // IMAGEsvgtag /** @@ -655,7 +616,7 @@ * @package phpHtmlLib */ class LINEsvgtag extends SVGTagClass { - var $_tag = "line"; + protected $_tag = "line"; } // LINEsvgtag /** @@ -664,7 +625,7 @@ * @package phpHtmlLib */ class LINEARGRADIENTsvgtag extends SVGTagClass { - var $_tag = "linearGradient"; + protected $_tag = "linearGradient"; } // LINEARGRADIENTsvgtag /** @@ -673,7 +634,7 @@ * @package phpHtmlLib */ class MARKERsvgtag extends SVGTagClass { - var $_tag = "marker"; + protected $_tag = "marker"; } // MARKERsvgtag /** @@ -682,7 +643,7 @@ * @package phpHtmlLib */ class MASKsvgtag extends SVGTagClass { - var $_tag = "mask"; + protected $_tag = "mask"; } // MASKsvgtag /** @@ -691,7 +652,7 @@ * @package phpHtmlLib */ class METADATAsvgtag extends SVGTagClass { - var $_tag = "metadata"; + protected $_tag = "metadata"; } // METADATAsvgtag /** @@ -700,7 +661,7 @@ * @package phpHtmlLib */ class MISSINGGLYPHsvgtag extends SVGTagClass { - var $_tag = "missing-glyph"; + protected $_tag = "missing-glyph"; } // MISSINGGLYPHsvgtag /** @@ -709,7 +670,7 @@ * @package phpHtmlLib */ class MPATHsvgtag extends SVGTagClass { - var $_tag = "mpath"; + protected $_tag = "mpath"; } // MPATHsvgtag /** @@ -718,7 +679,7 @@ * @package phpHtmlLib */ class PATHsvgtag extends SVGTagClass { - var $_tag = "path"; + protected $_tag = "path"; } // PATHsvgtag /** @@ -727,7 +688,7 @@ * @package phpHtmlLib */ class PATTERNsvgtag extends SVGTagClass { - var $_tag = "pattern"; + protected $_tag = "pattern"; } // PATTERNsvgtag /** @@ -736,7 +697,7 @@ * @package phpHtmlLib */ class POLYGONsvgtag extends SVGTagClass { - var $_tag = "polygon"; + protected $_tag = "polygon"; } // POLYGONsvgtag /** @@ -745,7 +706,7 @@ * @package phpHtmlLib */ class POLYLINEsvgtag extends SVGTagClass { - var $_tag = "polyline"; + protected $_tag = "polyline"; } // POLYLINEsvgtag /** @@ -754,7 +715,7 @@ * @package phpHtmlLib */ class RADIALGRADIENTsvgtag extends SVGTagClass { - var $_tag = "radialGradient"; + protected $_tag = "radialGradient"; } // RADIALGRADIENTsvgtag /** @@ -763,7 +724,7 @@ * @package phpHtmlLib */ class RECTsvgtag extends SVGTagClass { - var $_tag = "rect"; + protected $_tag = "rect"; } // RECTsvgtag /** @@ -772,12 +733,15 @@ * @package phpHtmlLib */ class SCRIPTsvgtag extends SVGTagClass { - var $_tag = "script"; + protected $_tag = "script"; + protected $_flags = 2048; + + - function _set_flags() { + //protected function _set_flags() { // HTMLTagClass::_set_flags(); - $this->_flags |= _CDATACONTENTWRAP; - } + // $this->_flags |= _CDATACONTENTWRAP; + // } } // SCRIPTsvgtag /** @@ -786,7 +750,7 @@ * @package phpHtmlLib */ class SETsvgtag extends SVGTagClass { - var $_tag = "set"; + protected $_tag = "set"; } // SETsvgtag /** @@ -795,7 +759,7 @@ * @package phpHtmlLib */ class STOPsvgtag extends SVGTagClass { - var $_tag = "stop"; + protected $_tag = "stop"; } // STOPsvgtag /** @@ -804,9 +768,9 @@ * @package phpHtmlLib */ class STYLEsvgtag extends SVGTagClass { - var $_tag = "style"; + protected $_tag = "style"; - function _set_flags() { + protected function _set_flags() { // HTMLTagClass::_set_flags(); $this->_flags |= phphtmllib::_CDATACONTENTWRAP; } @@ -818,7 +782,7 @@ * @package phpHtmlLib */ class SVGsvgtag extends SVGTagClass { - var $_tag = "svg"; + protected $_tag = "svg"; } // SVGsvgtag /** @@ -827,7 +791,7 @@ * @package phpHtmlLib */ class SWITCHsvgtag extends SVGTagClass { - var $_tag = "switch"; + protected $_tag = "switch"; } // SWITCHsvgtag /** @@ -836,7 +800,7 @@ * @package phpHtmlLib */ class SYMBOLsvgtag extends SVGTagClass { - var $_tag = "symbol"; + protected $_tag = "symbol"; } // SYMBOLsvgtag /** @@ -845,7 +809,8 @@ * @package phpHtmlLib */ class TEXTsvgtag extends SVGTagClass { - var $_tag = "text"; + protected $_tag = "text"; + protected $_flags = phphtmllib::_FLAGS_DEFAULT_XMLTAG; } // TEXTsvgtag /** @@ -854,7 +819,7 @@ * @package phpHtmlLib */ class TEXTPATHsvgtag extends SVGTagClass { - var $_tag = "text"; + protected $_tag = "text"; } // TEXTsvgtag /** @@ -863,7 +828,7 @@ * @package phpHtmlLib */ class TITLEsvgtag extends SVGTagClass { - var $_tag = "title"; + protected $_tag = "title"; } // TITLEsvgtag /** @@ -872,7 +837,7 @@ * @package phpHtmlLib */ class TREFsvgtag extends SVGTagClass { - var $_tag = "tref"; + protected $_tag = "tref"; } // TEXTsvgtag /** @@ -881,7 +846,7 @@ * @package phpHtmlLib */ class TSPANsvgtag extends SVGTagClass { - var $_tag = "tspan"; + protected $_tag = "tspan"; } // TEXTsvgtag /** @@ -890,7 +855,7 @@ * @package phpHtmlLib */ class USEsvgtag extends SVGTagClass { - var $_tag = "use"; + protected $_tag = "use"; } // USEsvgtag /** @@ -899,7 +864,7 @@ * @package phpHtmlLib */ class VIEWsvgtag extends SVGTagClass { - var $_tag = "view"; + protected $_tag = "view"; } // VIEWsvgtag /** @@ -908,7 +873,7 @@ * @package phpHtmlLib */ class VKERNsvgtag extends SVGTagClass { - var $_tag = "vkern"; + protected $_tag = "vkern"; protected $_flags = phphtmllib::_FLAGS_XML_OPEN_ONLY; //function _set_flags() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |