cvs: pear /XML_Transformer README Transformer.php package.xml /XML_Transformer/Transformer Namespace.php Util.php
/XML_Transformer/Transformer/Namespace Anchor.php DocBook.php Image.php
| From: | Sebastian Bergmann | Date: | Fri, 26 Sep 2003 16:52:37 +0000 |
| Subject: | cvs: pear /XML_Transformer README Transformer.php package.xml /XML_Transformer/Transformer Namespace.php Util.php /XML_Transformer/Transformer/Namespace Anchor.php DocBook.php Image.php |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-13111@lists.php.net to get a copy of this message | ||
sebastian Fri Sep 26 12:52:37 2003 EDT
Modified files:
/pear/XML_Transformer README Transformer.php package.xml
/pear/XML_Transformer/Transformer Namespace.php Util.php
/pear/XML_Transformer/Transformer/Namespace Anchor.php DocBook.php
Image.php
Log:
Use XML_Util::attributesToString().
Index: pear/XML_Transformer/README diff -u pear/XML_Transformer/README:1.10 pear/XML_Transformer/README:1.11 --- pear/XML_Transformer/README:1.10 Sun Dec 15 07:00:30 2002 +++ pear/XML_Transformer/README Fri Sep 26 12:52:35 2003 @@ -102,21 +102,7 @@ provides functionality, which can be used by XML_Transformer or your own classes. -We offer the attributesToString() method, which returns a hash of tag attributes -(key, value) as a string that can be added to your output. - - $att = array( - 'a' => 'blah', - 'b' => 'yak' - ); - - echo XML_Transformer_Util::attributesToString($att); - - /* prints - * a='blah' b='yak' - */ - -Another method, qualifiedElement(), takes a tag name or possibly a namespace:tag +The qualifiedElement() method takes a tag name or possibly a namespace:tag combination and returns an array of namespace and tag name. If the tag name has no namespace, the namespace is returned as '&MAIN'. Index: pear/XML_Transformer/Transformer.php diff -u pear/XML_Transformer/Transformer.php:1.112 pear/XML_Transformer/Transformer.php:1.113 --- pear/XML_Transformer/Transformer.php:1.112 Mon Sep 8 12:25:06 2003 +++ pear/XML_Transformer/Transformer.php Fri Sep 26 12:52:35 2003 @@ -13,11 +13,12 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Transformer.php,v 1.112 2003/09/08 16:25:06 sebastian Exp $ +// $Id: Transformer.php,v 1.113 2003/09/26 16:52:35 sebastian Exp $ // require_once 'XML/Transformer/CallbackRegistry.php'; require_once 'XML/Transformer/Util.php'; +require_once 'XML/Util.php'; /** * XML Transformations in PHP. @@ -28,7 +29,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.112 $ +* @version $Revision: 1.113 $ * @access public */ class XML_Transformer { @@ -214,9 +215,9 @@ $stackdump .= sprintf( "level=%d\nelement=%s:%s\ncdata=%s\n\n", $i, - isset($this->_elementStack[$i]) ? $this->_elementStack[$i] : '', - isset($this->_attributesStack[$i]) ? XML_Transformer_Util::attributesToString($this->_attributesStack[$i]) : '', - isset($this->_cdataStack[$i]) ? $this->_cdataStack[$i] : '' + isset($this->_elementStack[$i]) ? $this->_elementStack[$i] : '', + isset($this->_attributesStack[$i]) ? XML_Util::attributesToString($this->_attributesStack[$i]) : '', + isset($this->_cdataStack[$i]) ? $this->_cdataStack[$i] : '' ); } @@ -488,7 +489,7 @@ 'startElement[%d]: %s %s', $this->_level, $element, - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ) ); } @@ -509,7 +510,7 @@ $cdata = sprintf( '<%s%s>', $element, - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } Index: pear/XML_Transformer/package.xml diff -u pear/XML_Transformer/package.xml:1.68 pear/XML_Transformer/package.xml:1.69 --- pear/XML_Transformer/package.xml:1.68 Thu Sep 11 11:54:48 2003 +++ pear/XML_Transformer/package.xml Fri Sep 26 12:52:35 2003 @@ -24,13 +24,15 @@ </maintainers> <license>PHP License</license> <release> - <version>0.8.2</version> - <state>stable</state> - <date>2003-09-11</date> + <version>0.9.0-dev</version> + <state>devel</state> + <date>200Y-MM-DD</date> <notes> <![CDATA[ -* Performance improvements due to changes in the - debug mode. +- Removed XML_Transformer_Util::attributesToString() + method in favour of XML_Util::attributesToString(). + +! The XML_Util package is now required. ]]> </notes> <filelist> @@ -60,9 +62,21 @@ <deps> <dep type="php" rel="ge" version="4.2.0" /> <dep type="ext" rel="has">xml</dep> + <dep type="pkg" rel="has">XML_Util</dep> </deps> </release> <changelog> + <release> + <version>0.8.2</version> + <state>stable</state> + <date>2003-09-11</date> + <notes> +<![CDATA[ +* Performance improvements due to changes in the + debug mode. +]]> + </notes> + </release> <release> <version>0.8.1</version> <state>stable</state> Index: pear/XML_Transformer/Transformer/Namespace.php diff -u pear/XML_Transformer/Transformer/Namespace.php:1.20 pear/XML_Transformer/Transformer/Namespace.php:1.21 --- pear/XML_Transformer/Transformer/Namespace.php:1.20 Sat Jan 18 13:01:23 2003 +++ pear/XML_Transformer/Transformer/Namespace.php Fri Sep 26 12:52:36 2003 @@ -13,10 +13,11 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Namespace.php,v 1.20 2003/01/18 18:01:23 sebastian Exp $ +// $Id: Namespace.php,v 1.21 2003/09/26 16:52:36 sebastian Exp $ // require_once 'XML/Transformer/Util.php'; +require_once 'XML/Util.php'; /** * Convenience Base Class for Namespace Transformers. @@ -63,7 +64,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.20 $ +* @version $Revision: 1.21 $ * @access public */ class XML_Transformer_Namespace { @@ -133,7 +134,7 @@ "<%s%s>", $element, - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } Index: pear/XML_Transformer/Transformer/Util.php diff -u pear/XML_Transformer/Transformer/Util.php:1.9 pear/XML_Transformer/Transformer/Util.php:1.10 --- pear/XML_Transformer/Transformer/Util.php:1.9 Mon Sep 8 13:38:31 2003 +++ pear/XML_Transformer/Transformer/Util.php Fri Sep 26 12:52:36 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Util.php,v 1.9 2003/09/08 17:38:31 sebastian Exp $ +// $Id: Util.php,v 1.10 2003/09/26 16:52:36 sebastian Exp $ // /** @@ -21,35 +21,10 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.9 $ +* @version $Revision: 1.10 $ * @access public */ class XML_Transformer_Util { - // {{{ function attributesToString($attributes) - - /** - * Returns string representation of attributes array. - * - * @param array - * @return string - * @access public - * @static - */ - function attributesToString($attributes) { - $string = ''; - - if (is_array($attributes)) { - ksort($attributes); - - foreach ($attributes as $key => $value) { - $string .= ' ' . $key . '="' . $value . '"'; - } - } - - return $string; - } - - // }}} // {{{ function logMessage($logMessage, $target = 'error_log') /** Index: pear/XML_Transformer/Transformer/Namespace/Anchor.php diff -u pear/XML_Transformer/Transformer/Namespace/Anchor.php:1.10 pear/XML_Transformer/Transformer/Namespace/Anchor.php:1.11 --- pear/XML_Transformer/Transformer/Namespace/Anchor.php:1.10 Sat Jan 18 13:01:24 2003 +++ pear/XML_Transformer/Transformer/Namespace/Anchor.php Fri Sep 26 12:52:37 2003 @@ -13,10 +13,11 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Anchor.php,v 1.10 2003/01/18 18:01:24 sebastian Exp $ +// $Id: Anchor.php,v 1.11 2003/09/26 16:52:37 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; +require_once 'XML/Util.php'; /** * Handler for the Anchor Namespace. @@ -54,7 +55,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.10 $ +* @version $Revision: 1.11 $ * @access public */ class XML_Transformer_Namespace_Anchor extends XML_Transformer_Namespace { @@ -194,7 +195,7 @@ ); return sprintf('<a %s>%s</a>', - XML_Transformer_Util::attributesToString($this->_anchorDatabase[$name]), + XML_Util::attributesToString($this->_anchorDatabase[$name]), $cdata ); } @@ -227,7 +228,7 @@ $name = $keys[$pos]; return sprintf('<a %s>%s</a>', - XML_Transformer_Util::attributesToString($this->_anchorDatabase[$name]), + XML_Util::attributesToString($this->_anchorDatabase[$name]), $cdata ); } Index: pear/XML_Transformer/Transformer/Namespace/DocBook.php diff -u pear/XML_Transformer/Transformer/Namespace/DocBook.php:1.22 pear/XML_Transformer/Transformer/Namespace/DocBook.php:1.23 --- pear/XML_Transformer/Transformer/Namespace/DocBook.php:1.22 Sat Jan 18 13:01:24 2003 +++ pear/XML_Transformer/Transformer/Namespace/DocBook.php Fri Sep 26 12:52:37 2003 @@ -13,10 +13,11 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: DocBook.php,v 1.22 2003/01/18 18:01:24 sebastian Exp $ +// $Id: DocBook.php,v 1.23 2003/09/26 16:52:37 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; +require_once 'XML/Util.php'; /** * DocBook Namespace Handler. @@ -146,7 +147,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.22 $ +* @version $Revision: 1.23 $ * @access public */ class XML_Transformer_Namespace_DocBook extends XML_Transformer_Namespace { @@ -284,7 +285,7 @@ if (!$this->_secondPass) { return sprintf( '<artheader%s>', - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } } @@ -939,7 +940,7 @@ } else { return sprintf( '<xref%s>', - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } } Index: pear/XML_Transformer/Transformer/Namespace/Image.php diff -u pear/XML_Transformer/Transformer/Namespace/Image.php:1.15 pear/XML_Transformer/Transformer/Namespace/Image.php:1.16 --- pear/XML_Transformer/Transformer/Namespace/Image.php:1.15 Tue May 6 11:15:58 2003 +++ pear/XML_Transformer/Transformer/Namespace/Image.php Fri Sep 26 12:52:37 2003 @@ -13,11 +13,12 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Image.php,v 1.15 2003/05/06 15:15:58 sebastian Exp $ +// $Id: Image.php,v 1.16 2003/09/26 16:52:37 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; require_once 'XML/Transformer/Util.php'; +require_once 'XML/Util.php'; define('PEAR_XML_TRANSFORMER_IMAGE_FONTPATH', '/usr/X11R6/lib/X11/fonts/truetype'); define('PEAR_XML_TRANSFORMER_IMAGE_cacheDir', '/cache/gtext'); @@ -56,7 +57,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.15 $ +* @version $Revision: 1.16 $ * @access public */ class XML_Transformer_Namespace_Image extends XML_Transformer_Namespace { @@ -118,7 +119,7 @@ return sprintf( '<img %s />', - XML_Transformer_Util::attributesToString($this->_imgAttributes) + XML_Util::attributesToString($this->_imgAttributes) ); } @@ -314,7 +315,7 @@ * This is very conserative and may create to many cachefiles, * but better to err on the safe side. */ - $cachefile = md5(XML_Transformer_Util::attributesToString($this->_gtextAttributes) . ':' . $word) . '.png'; + $cachefile = md5(XML_Util::attributesToString($this->_gtextAttributes) . ':' . $word) . '.png'; $cacheDir = $_SERVER['DOCUMENT_ROOT'] . PEAR_XML_TRANSFORMER_IMAGE_cacheDir; $cacheName = "$cacheDir/$cachefile";
Index: pear/XML_Transformer/README diff -u pear/XML_Transformer/README:1.10 pear/XML_Transformer/README:1.11 --- pear/XML_Transformer/README:1.10 Sun Dec 15 07:00:30 2002 +++ pear/XML_Transformer/README Fri Sep 26 12:52:35 2003 @@ -102,21 +102,7 @@ provides functionality, which can be used by XML_Transformer or your own classes. -We offer the attributesToString() method, which returns a hash of tag attributes -(key, value) as a string that can be added to your output. - - $att = array( - 'a' => 'blah', - 'b' => 'yak' - ); - - echo XML_Transformer_Util::attributesToString($att); - - /* prints - * a='blah' b='yak' - */ - -Another method, qualifiedElement(), takes a tag name or possibly a namespace:tag +The qualifiedElement() method takes a tag name or possibly a namespace:tag combination and returns an array of namespace and tag name. If the tag name has no namespace, the namespace is returned as '&MAIN'. Index: pear/XML_Transformer/Transformer.php diff -u pear/XML_Transformer/Transformer.php:1.112 pear/XML_Transformer/Transformer.php:1.113 --- pear/XML_Transformer/Transformer.php:1.112 Mon Sep 8 12:25:06 2003 +++ pear/XML_Transformer/Transformer.php Fri Sep 26 12:52:35 2003 @@ -13,11 +13,12 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Transformer.php,v 1.112 2003/09/08 16:25:06 sebastian Exp $ +// $Id: Transformer.php,v 1.113 2003/09/26 16:52:35 sebastian Exp $ // require_once 'XML/Transformer/CallbackRegistry.php'; require_once 'XML/Transformer/Util.php'; +require_once 'XML/Util.php'; /** * XML Transformations in PHP. @@ -28,7 +29,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.112 $ +* @version $Revision: 1.113 $ * @access public */ class XML_Transformer { @@ -214,9 +215,9 @@ $stackdump .= sprintf( "level=%d\nelement=%s:%s\ncdata=%s\n\n", $i, - isset($this->_elementStack[$i]) ? $this->_elementStack[$i] : '', - isset($this->_attributesStack[$i]) ? XML_Transformer_Util::attributesToString($this->_attributesStack[$i]) : '', - isset($this->_cdataStack[$i]) ? $this->_cdataStack[$i] : '' + isset($this->_elementStack[$i]) ? $this->_elementStack[$i] : '', + isset($this->_attributesStack[$i]) ? XML_Util::attributesToString($this->_attributesStack[$i]) : '', + isset($this->_cdataStack[$i]) ? $this->_cdataStack[$i] : '' ); } @@ -488,7 +489,7 @@ 'startElement[%d]: %s %s', $this->_level, $element, - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ) ); } @@ -509,7 +510,7 @@ $cdata = sprintf( '<%s%s>', $element, - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } Index: pear/XML_Transformer/package.xml diff -u pear/XML_Transformer/package.xml:1.68 pear/XML_Transformer/package.xml:1.69 --- pear/XML_Transformer/package.xml:1.68 Thu Sep 11 11:54:48 2003 +++ pear/XML_Transformer/package.xml Fri Sep 26 12:52:35 2003 @@ -24,13 +24,15 @@ </maintainers> <license>PHP License</license> <release> - <version>0.8.2</version> - <state>stable</state> - <date>2003-09-11</date> + <version>0.9.0-dev</version> + <state>devel</state> + <date>200Y-MM-DD</date> <notes> <![CDATA[ -* Performance improvements due to changes in the - debug mode. +- Removed XML_Transformer_Util::attributesToString() + method in favour of XML_Util::attributesToString(). + +! The XML_Util package is now required. ]]> </notes> <filelist> @@ -60,9 +62,21 @@ <deps> <dep type="php" rel="ge" version="4.2.0" /> <dep type="ext" rel="has">xml</dep> + <dep type="pkg" rel="has">XML_Util</dep> </deps> </release> <changelog> + <release> + <version>0.8.2</version> + <state>stable</state> + <date>2003-09-11</date> + <notes> +<![CDATA[ +* Performance improvements due to changes in the + debug mode. +]]> + </notes> + </release> <release> <version>0.8.1</version> <state>stable</state> Index: pear/XML_Transformer/Transformer/Namespace.php diff -u pear/XML_Transformer/Transformer/Namespace.php:1.20 pear/XML_Transformer/Transformer/Namespace.php:1.21 --- pear/XML_Transformer/Transformer/Namespace.php:1.20 Sat Jan 18 13:01:23 2003 +++ pear/XML_Transformer/Transformer/Namespace.php Fri Sep 26 12:52:36 2003 @@ -13,10 +13,11 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Namespace.php,v 1.20 2003/01/18 18:01:23 sebastian Exp $ +// $Id: Namespace.php,v 1.21 2003/09/26 16:52:36 sebastian Exp $ // require_once 'XML/Transformer/Util.php'; +require_once 'XML/Util.php'; /** * Convenience Base Class for Namespace Transformers. @@ -63,7 +64,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.20 $ +* @version $Revision: 1.21 $ * @access public */ class XML_Transformer_Namespace { @@ -133,7 +134,7 @@ "<%s%s>", $element, - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } Index: pear/XML_Transformer/Transformer/Util.php diff -u pear/XML_Transformer/Transformer/Util.php:1.9 pear/XML_Transformer/Transformer/Util.php:1.10 --- pear/XML_Transformer/Transformer/Util.php:1.9 Mon Sep 8 13:38:31 2003 +++ pear/XML_Transformer/Transformer/Util.php Fri Sep 26 12:52:36 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Util.php,v 1.9 2003/09/08 17:38:31 sebastian Exp $ +// $Id: Util.php,v 1.10 2003/09/26 16:52:36 sebastian Exp $ // /** @@ -21,35 +21,10 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.9 $ +* @version $Revision: 1.10 $ * @access public */ class XML_Transformer_Util { - // {{{ function attributesToString($attributes) - - /** - * Returns string representation of attributes array. - * - * @param array - * @return string - * @access public - * @static - */ - function attributesToString($attributes) { - $string = ''; - - if (is_array($attributes)) { - ksort($attributes); - - foreach ($attributes as $key => $value) { - $string .= ' ' . $key . '="' . $value . '"'; - } - } - - return $string; - } - - // }}} // {{{ function logMessage($logMessage, $target = 'error_log') /** Index: pear/XML_Transformer/Transformer/Namespace/Anchor.php diff -u pear/XML_Transformer/Transformer/Namespace/Anchor.php:1.10 pear/XML_Transformer/Transformer/Namespace/Anchor.php:1.11 --- pear/XML_Transformer/Transformer/Namespace/Anchor.php:1.10 Sat Jan 18 13:01:24 2003 +++ pear/XML_Transformer/Transformer/Namespace/Anchor.php Fri Sep 26 12:52:37 2003 @@ -13,10 +13,11 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Anchor.php,v 1.10 2003/01/18 18:01:24 sebastian Exp $ +// $Id: Anchor.php,v 1.11 2003/09/26 16:52:37 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; +require_once 'XML/Util.php'; /** * Handler for the Anchor Namespace. @@ -54,7 +55,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.10 $ +* @version $Revision: 1.11 $ * @access public */ class XML_Transformer_Namespace_Anchor extends XML_Transformer_Namespace { @@ -194,7 +195,7 @@ ); return sprintf('<a %s>%s</a>', - XML_Transformer_Util::attributesToString($this->_anchorDatabase[$name]), + XML_Util::attributesToString($this->_anchorDatabase[$name]), $cdata ); } @@ -227,7 +228,7 @@ $name = $keys[$pos]; return sprintf('<a %s>%s</a>', - XML_Transformer_Util::attributesToString($this->_anchorDatabase[$name]), + XML_Util::attributesToString($this->_anchorDatabase[$name]), $cdata ); } Index: pear/XML_Transformer/Transformer/Namespace/DocBook.php diff -u pear/XML_Transformer/Transformer/Namespace/DocBook.php:1.22 pear/XML_Transformer/Transformer/Namespace/DocBook.php:1.23 --- pear/XML_Transformer/Transformer/Namespace/DocBook.php:1.22 Sat Jan 18 13:01:24 2003 +++ pear/XML_Transformer/Transformer/Namespace/DocBook.php Fri Sep 26 12:52:37 2003 @@ -13,10 +13,11 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: DocBook.php,v 1.22 2003/01/18 18:01:24 sebastian Exp $ +// $Id: DocBook.php,v 1.23 2003/09/26 16:52:37 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; +require_once 'XML/Util.php'; /** * DocBook Namespace Handler. @@ -146,7 +147,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.22 $ +* @version $Revision: 1.23 $ * @access public */ class XML_Transformer_Namespace_DocBook extends XML_Transformer_Namespace { @@ -284,7 +285,7 @@ if (!$this->_secondPass) { return sprintf( '<artheader%s>', - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } } @@ -939,7 +940,7 @@ } else { return sprintf( '<xref%s>', - XML_Transformer_Util::attributesToString($attributes) + XML_Util::attributesToString($attributes) ); } } Index: pear/XML_Transformer/Transformer/Namespace/Image.php diff -u pear/XML_Transformer/Transformer/Namespace/Image.php:1.15 pear/XML_Transformer/Transformer/Namespace/Image.php:1.16 --- pear/XML_Transformer/Transformer/Namespace/Image.php:1.15 Tue May 6 11:15:58 2003 +++ pear/XML_Transformer/Transformer/Namespace/Image.php Fri Sep 26 12:52:37 2003 @@ -13,11 +13,12 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Image.php,v 1.15 2003/05/06 15:15:58 sebastian Exp $ +// $Id: Image.php,v 1.16 2003/09/26 16:52:37 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; require_once 'XML/Transformer/Util.php'; +require_once 'XML/Util.php'; define('PEAR_XML_TRANSFORMER_IMAGE_FONTPATH', '/usr/X11R6/lib/X11/fonts/truetype'); define('PEAR_XML_TRANSFORMER_IMAGE_cacheDir', '/cache/gtext'); @@ -56,7 +57,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.15 $ +* @version $Revision: 1.16 $ * @access public */ class XML_Transformer_Namespace_Image extends XML_Transformer_Namespace { @@ -118,7 +119,7 @@ return sprintf( '<img %s />', - XML_Transformer_Util::attributesToString($this->_imgAttributes) + XML_Util::attributesToString($this->_imgAttributes) ); } @@ -314,7 +315,7 @@ * This is very conserative and may create to many cachefiles, * but better to err on the safe side. */ - $cachefile = md5(XML_Transformer_Util::attributesToString($this->_gtextAttributes) . ':' . $word) . '.png'; + $cachefile = md5(XML_Util::attributesToString($this->_gtextAttributes) . ':' . $word) . '.png'; $cacheDir = $_SERVER['DOCUMENT_ROOT'] . PEAR_XML_TRANSFORMER_IMAGE_cacheDir; $cacheName = "$cacheDir/$cachefile";