cvs: pear /PhpDocumentor Release-1.3.0 package.xml package2.xml /PhpDocumentor/docbuilder actions.php builder.php config.php file_dialog.php top.php
/PhpDocumentor/docbuilder/includes utilities.php /PhpDocumentor/phpDocumentor Classes.inc Converter.inc DescHTML.inc DocBlockTags.inc Errors.inc
EventStack.inc HighlightParser.inc InlineTags.inc IntermediateParser.inc Io.inc LinkClasses.inc PackagePageElements.inc Parser.inc ParserData.inc
ParserDocBlock.inc ParserElements.inc ProceduralPages.inc Publisher.inc TutorialHighlightParser.inc WordParser.inc common.inc.php find_phpdoc.php
phpDocumentorTParser.inc phpDocumentorTWordParser.inc phpdoc.inc /PhpDocumentor/phpDocumentor/Converters/CHM/default CHMdefaultConverter.inc
/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty HTMLSmartyConverter.inc /PhpDocumentor/phpDocumentor/Converters/HTML/frames
HTMLframesConverter.inc /PhpDocumentor/phpDocumentor/Converters/PDF/default PDFdefaultConverter.inc ParserPDF.inc clas! s.phpdocpdf.php
/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2 Beautifier.php Plain.php Tokenizer.php XMLDocBookpeardoc2Converter.inc
/PhpDocumentor/scripts create_package.xml.php /PhpDocumentor/user default.ini

cellog Sun Apr 30 22:18:14 2006 UTC Modified files: /pear/PhpDocumentor Release-1.3.0 package.xml package2.xml /pear/PhpDocumentor/docbuilder actions.php builder.php config.php file_dialog.php top.php /pear/PhpDocumentor/docbuilder/includes utilities.php /pear/PhpDocumentor/phpDocumentor Classes.inc Converter.inc DescHTML.inc DocBlockTags.inc Errors.inc EventStack.inc HighlightParser.inc InlineTags.inc IntermediateParser.inc Io.inc LinkClasses.inc PackagePageElements.inc Parser.inc ParserData.inc ParserDocBlock.inc ParserElements.inc ProceduralPages.inc Publisher.inc TutorialHighlightParser.inc WordParser.inc common.inc.php find_phpdoc.php phpDocumentorTParser.inc phpDocumentorTWordParser.inc phpdoc.inc /pear/PhpDocumentor/phpDocumentor/Converters/CHM/default CHMdefaultConverter.inc /pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty HTMLSmartyConverter.inc /pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames HTMLframesConverter.inc /pear/PhpDocumentor/phpDocumentor/Converters/PDF/default PDFdefaultConverter.inc ParserPDF.inc class.phpdocpdf.php /pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2 Beautifier.php Plain.php Tokenizer.php XMLDocBookpeardoc2Converter.inc /pear/PhpDocumentor/scripts create_package.xml.php /pear/PhpDocumentor/user default.ini Log: fix sourceforge bug [ 1391432 ] Too many underscores in include links. remove unnecessary @category tag

http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/Release-1.3.0?r1=1.29&r2=1.30&diff_format=u Index: pear/PhpDocumentor/Release-1.3.0 diff -u pear/PhpDocumentor/Release-1.3.0:1.29 pear/PhpDocumentor/Release-1.3.0:1.30 --- pear/PhpDocumentor/Release-1.3.0:1.29 Sun Apr 30 05:15:28 2006 +++ pear/PhpDocumentor/Release-1.3.0 Sun Apr 30 22:18:13 2006 @@ -1,4 +1,4 @@ -$Id: Release-1.3.0,v 1.29 2006/04/30 05:15:28 cellog Exp $ +$Id: Release-1.3.0,v 1.30 2006/04/30 22:18:13 cellog Exp $ PhpDocumentor Version 1.3.0 ################################################################################ @@ -126,6 +126,7 @@ [ 1366260 ] Default 0 parameter in method is not displayed [ 1373244 ] Undefined variable: root_dir in docbuilder/file_dialog.php [ 1380845 ] @uses tags not sorting + [ 1391432 ] Too many underscores in include links. [ 1393998 ] HTMLSmartyConverter Fatal error (line 627) fix [ 1398977 ] @return is not merged when using DocBlock Templates [ 1428660 ] Confusing error when using {@link} in @uses http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/package.xml?r1=1.54&r2=1.55&diff_format=u Index: pear/PhpDocumentor/package.xml diff -u pear/PhpDocumentor/package.xml:1.54 pear/PhpDocumentor/package.xml:1.55 --- pear/PhpDocumentor/package.xml:1.54 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/package.xml Sun Apr 30 22:18:13 2006 @@ -179,6 +179,7 @@ [ 1366260 ] Default 0 parameter in method is not displayed [ 1373244 ] Undefined variable: root_dir in docbuilder/file_dialog.php [ 1380845 ] @uses tags not sorting + [ 1391432 ] Too many underscores in include links. [ 1393998 ] HTMLSmartyConverter Fatal error (line 627) fix [ 1398977 ] @return is not merged when using DocBlock Templates [ 1428660 ] Confusing error when using {@link} in @uses @@ -2518,6 +2519,7 @@ [ 1366260 ] Default 0 parameter in method is not displayed [ 1373244 ] Undefined variable: root_dir in docbuilder/file_dialog.php [ 1380845 ] @uses tags not sorting + [ 1391432 ] Too many underscores in include links. [ 1393998 ] HTMLSmartyConverter Fatal error (line 627) fix [ 1398977 ] @return is not merged when using DocBlock Templates [ 1428660 ] Confusing error when using {@link} in @uses http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/package2.xml?r1=1.46&r2=1.47&diff_format=u Index: pear/PhpDocumentor/package2.xml diff -u pear/PhpDocumentor/package2.xml:1.46 pear/PhpDocumentor/package2.xml:1.47 --- pear/PhpDocumentor/package2.xml:1.46 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/package2.xml Sun Apr 30 22:18:13 2006 @@ -64,7 +64,7 @@ <active>yes</active> </developer> <date>2006-04-30</date> - <time>13:40:45</time> + <time>17:21:18</time> <version> <release>1.3.0RC6</release> <api>1.3.0</api> @@ -182,6 +182,7 @@ [ 1366260 ] Default 0 parameter in method is not displayed [ 1373244 ] Undefined variable: root_dir in docbuilder/file_dialog.php [ 1380845 ] @uses tags not sorting + [ 1391432 ] Too many underscores in include links. [ 1393998 ] HTMLSmartyConverter Fatal error (line 627) fix [ 1398977 ] @return is not merged when using DocBlock Templates [ 1428660 ] Confusing error when using {@link} in @uses @@ -2693,6 +2694,7 @@ [ 1366260 ] Default 0 parameter in method is not displayed [ 1373244 ] Undefined variable: root_dir in docbuilder/file_dialog.php [ 1380845 ] @uses tags not sorting + [ 1391432 ] Too many underscores in include links. [ 1393998 ] HTMLSmartyConverter Fatal error (line 627) fix [ 1398977 ] @return is not merged when using DocBlock Templates [ 1428660 ] Confusing error when using {@link} in @uses http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/docbuilder/actions.php?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/docbuilder/actions.php diff -u pear/PhpDocumentor/docbuilder/actions.php:1.3 pear/PhpDocumentor/docbuilder/actions.php:1.4 --- pear/PhpDocumentor/docbuilder/actions.php:1.3 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/docbuilder/actions.php Sun Apr 30 22:18:13 2006 @@ -23,13 +23,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Andrew Eddie * @author Greg Beaver <cellog@php.net> * @copyright 2003-2006 Andrew Eddie, Greg Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: actions.php,v 1.3 2006/04/30 18:38:56 cellog Exp $ + * @version CVS: $Id: actions.php,v 1.4 2006/04/30 22:18:13 cellog Exp $ */ $path = dirname(__FILE__); if ('@WEB-DIR@' != '@'.'WEB-DIR@') http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/docbuilder/builder.php?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/docbuilder/builder.php diff -u pear/PhpDocumentor/docbuilder/builder.php:1.3 pear/PhpDocumentor/docbuilder/builder.php:1.4 --- pear/PhpDocumentor/docbuilder/builder.php:1.3 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/docbuilder/builder.php Sun Apr 30 22:18:13 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Andrew Eddie * @author Greg Beaver <cellog@php.net> * @copyright 2003-2006 Andrew Eddie, Greg Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: builder.php,v 1.3 2006/04/30 18:38:56 cellog Exp $ + * @version CVS: $Id: builder.php,v 1.4 2006/04/30 22:18:13 cellog Exp $ * @filesource * @see phpdoc.php */ http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/docbuilder/config.php?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/docbuilder/config.php diff -u pear/PhpDocumentor/docbuilder/config.php:1.3 pear/PhpDocumentor/docbuilder/config.php:1.4 --- pear/PhpDocumentor/docbuilder/config.php:1.3 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/docbuilder/config.php Sun Apr 30 22:18:13 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Andrew Eddie * @author Greg Beaver <cellog@php.net> * @copyright 2003-2006 Andrew Eddie, Greg Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: config.php,v 1.3 2006/04/30 18:38:56 cellog Exp $ + * @version CVS: $Id: config.php,v 1.4 2006/04/30 22:18:13 cellog Exp $ * @filesource * @see phpdoc.php */ @@ -611,8 +610,8 @@ <!-- Created: Tue Jun 26 18:52:40 MEST 2001 --> <!-- hhmts start --> <pre> - Last modified: $Date: 2006/04/30 18:38:56 $ - Revision: $Revision: 1.3 $ + Last modified: $Date: 2006/04/30 22:18:13 $ + Revision: $Revision: 1.4 $ </pre> </div> <div class="tab-page" id="tab_links"> http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/docbuilder/file_dialog.php?r1=1.4&r2=1.5&diff_format=u Index: pear/PhpDocumentor/docbuilder/file_dialog.php diff -u pear/PhpDocumentor/docbuilder/file_dialog.php:1.4 pear/PhpDocumentor/docbuilder/file_dialog.php:1.5 --- pear/PhpDocumentor/docbuilder/file_dialog.php:1.4 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/docbuilder/file_dialog.php Sun Apr 30 22:18:13 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Andrew Eddie * @author Greg Beaver <cellog@php.net> * @copyright 2003-2006 Andrew Eddie, Greg Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: file_dialog.php,v 1.4 2006/04/30 18:38:56 cellog Exp $ + * @version CVS: $Id: file_dialog.php,v 1.5 2006/04/30 22:18:13 cellog Exp $ * @filesource * @see phpdoc.php */ http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/docbuilder/top.php?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/docbuilder/top.php diff -u pear/PhpDocumentor/docbuilder/top.php:1.3 pear/PhpDocumentor/docbuilder/top.php:1.4 --- pear/PhpDocumentor/docbuilder/top.php:1.3 Sun Apr 30 18:38:56 2006 +++ pear/PhpDocumentor/docbuilder/top.php Sun Apr 30 22:18:13 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Andrew Eddie * @author Greg Beaver <cellog@php.net> * @copyright 2003-2006 Andrew Eddie, Greg Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: top.php,v 1.3 2006/04/30 18:38:56 cellog Exp $ + * @version CVS: $Id: top.php,v 1.4 2006/04/30 22:18:13 cellog Exp $ * @filesource * @see phpdoc.php */ http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/docbuilder/includes/utilities.php?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/docbuilder/includes/utilities.php diff -u pear/PhpDocumentor/docbuilder/includes/utilities.php:1.3 pear/PhpDocumentor/docbuilder/includes/utilities.php:1.4 --- pear/PhpDocumentor/docbuilder/includes/utilities.php:1.3 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/docbuilder/includes/utilities.php Sun Apr 30 22:18:13 2006 @@ -23,13 +23,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Andrew Eddie * @author Greg Beaver <cellog@php.net> * @copyright 2003-2006 Andrew Eddie, Greg Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: utilities.php,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: utilities.php,v 1.4 2006/04/30 22:18:13 cellog Exp $ */ if ('@DATA-DIR@' != '@'.'DATA-DIR@') http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Classes.inc?r1=1.8&r2=1.9&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Classes.inc diff -u pear/PhpDocumentor/phpDocumentor/Classes.inc:1.8 pear/PhpDocumentor/phpDocumentor/Classes.inc:1.9 --- pear/PhpDocumentor/phpDocumentor/Classes.inc:1.8 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Classes.inc Sun Apr 30 22:18:13 2006 @@ -25,12 +25,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Greg Beaver <cellog@php.net> * @copyright 2001-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Classes.inc,v 1.8 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Classes.inc,v 1.9 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -57,7 +56,7 @@ * @package phpDocumentor * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: Classes.inc,v 1.8 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: Classes.inc,v 1.9 2006/04/30 22:18:13 cellog Exp $ */ class Classes { @@ -1078,7 +1077,7 @@ if (!$all) { foreach ($this->specialRoots as $package => $root) { foreach ($root as $parent => $info) { - $temproots[$info[0]] = $info[1]; + $temproots[$info[0]][] = $info[1]; } } } http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converter.inc?r1=1.25&r2=1.26&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converter.inc diff -u pear/PhpDocumentor/phpDocumentor/Converter.inc:1.25 pear/PhpDocumentor/phpDocumentor/Converter.inc:1.26 --- pear/PhpDocumentor/phpDocumentor/Converter.inc:1.25 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converter.inc Sun Apr 30 22:18:13 2006 @@ -30,7 +30,7 @@ * @author Greg Beaver <cellog@php.net> * @copyright 2001-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Converter.inc,v 1.25 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Converter.inc,v 1.26 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -70,7 +70,7 @@ * @abstract * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: Converter.inc,v 1.25 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: Converter.inc,v 1.26 2006/04/30 22:18:13 cellog Exp $ */ class Converter { @@ -2420,7 +2420,9 @@ foreach($this->todoList as $package => $r) { usort($this->todoList[$package], array('Converter', '_sortTodoPackage')); foreach ($r as $a => $sub) { - usort($this->todoList[$package][$a][1],array('Converter', '_sortTodos')); + if (is_array($this->todoList[$package][$a][1])) { + usort($this->todoList[$package][$a][1],array('Converter', '_sortTodos')); + } } } phpDocumentor_out("done\n"); @@ -2435,6 +2437,9 @@ /** @access private */ function _sortTodos($a, $b) { + if (!is_object($a)) { + var_dump($a); + } return strnatcasecmp($a->getString(), $b->getString()); } http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/DescHTML.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/DescHTML.inc diff -u pear/PhpDocumentor/phpDocumentor/DescHTML.inc:1.2 pear/PhpDocumentor/phpDocumentor/DescHTML.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/DescHTML.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/DescHTML.inc Sun Apr 30 22:18:13 2006 @@ -40,13 +40,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage DescHTML * @author Greg Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: DescHTML.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: DescHTML.inc,v 1.3 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc?r1=1.5&r2=1.6&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc diff -u pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc:1.5 pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc:1.6 --- pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc:1.5 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/DocBlockTags.inc Sun Apr 30 22:18:13 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage DocBlockTags * @author Greg Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: DocBlockTags.inc,v 1.5 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: DocBlockTags.inc,v 1.6 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -48,7 +47,7 @@ * @subpackage DocBlockTags * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: DocBlockTags.inc,v 1.5 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: DocBlockTags.inc,v 1.6 2006/04/30 22:18:13 cellog Exp $ */ class parserTag extends parserStringWithInlineTags { @@ -274,7 +273,7 @@ * @subpackage DocBlockTags * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: DocBlockTags.inc,v 1.5 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: DocBlockTags.inc,v 1.6 2006/04/30 22:18:13 cellog Exp $ */ class parserReturnTag extends parserTag { @@ -366,7 +365,7 @@ * @subpackage DocBlockTags * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: DocBlockTags.inc,v 1.5 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: DocBlockTags.inc,v 1.6 2006/04/30 22:18:13 cellog Exp $ */ class parserVarTag extends parserReturnTag { @@ -419,7 +418,7 @@ * @subpackage DocBlockTags * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: DocBlockTags.inc,v 1.5 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: DocBlockTags.inc,v 1.6 2006/04/30 22:18:13 cellog Exp $ */ class parserLinkTag extends parserTag { @@ -455,7 +454,7 @@ * @subpackage DocBlockTags * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: DocBlockTags.inc,v 1.5 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: DocBlockTags.inc,v 1.6 2006/04/30 22:18:13 cellog Exp $ */ class parserSeeTag extends parserLinkTag { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Errors.inc?r1=1.6&r2=1.7&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Errors.inc diff -u pear/PhpDocumentor/phpDocumentor/Errors.inc:1.6 pear/PhpDocumentor/phpDocumentor/Errors.inc:1.7 --- pear/PhpDocumentor/phpDocumentor/Errors.inc:1.6 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Errors.inc Sun Apr 30 22:18:13 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Errors * @author Greg Beaver <cellog@php.net> * @copyright 2001-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Errors.inc,v 1.6 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Errors.inc,v 1.7 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -360,7 +359,7 @@ */ define("PDERROR_DUMB_USES",73); /** - * warning triggered if <ul> is nested inside <ul> and not <li> + * warning triggered if <<ul>> is nested inside <<ul>> and not <<li>> */ define("PDERROR_UL_IN_UL", 74); /** http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/EventStack.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/EventStack.inc diff -u pear/PhpDocumentor/phpDocumentor/EventStack.inc:1.2 pear/PhpDocumentor/phpDocumentor/EventStack.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/EventStack.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/EventStack.inc Sun Apr 30 22:18:13 2006 @@ -25,12 +25,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Joshua Eichorn <jeichorn@phpdoc.org> * @copyright 2000-2006 Joshua Eichorn * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: EventStack.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: EventStack.inc,v 1.3 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -40,7 +39,7 @@ * An event Stack * * @author Joshua Eichorn <jeichorn@phpdoc.org> - * @version $Id: EventStack.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: EventStack.inc,v 1.3 2006/04/30 22:18:13 cellog Exp $ * @package phpDocumentor */ class EventStack http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/HighlightParser.inc?r1=1.7&r2=1.8&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/HighlightParser.inc diff -u pear/PhpDocumentor/phpDocumentor/HighlightParser.inc:1.7 pear/PhpDocumentor/phpDocumentor/HighlightParser.inc:1.8 --- pear/PhpDocumentor/phpDocumentor/HighlightParser.inc:1.7 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/HighlightParser.inc Sun Apr 30 22:18:13 2006 @@ -35,13 +35,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: HighlightParser.inc,v 1.7 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: HighlightParser.inc,v 1.8 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/InlineTags.inc?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/InlineTags.inc diff -u pear/PhpDocumentor/phpDocumentor/InlineTags.inc:1.3 pear/PhpDocumentor/phpDocumentor/InlineTags.inc:1.4 --- pear/PhpDocumentor/phpDocumentor/InlineTags.inc:1.3 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/InlineTags.inc Sun Apr 30 22:18:13 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage InlineTags * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: InlineTags.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: InlineTags.inc,v 1.4 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -44,7 +43,7 @@ * @subpackage InlineTags * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * @tutorial inlinetags.pkg */ class parserInlineTag extends parserBase http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/IntermediateParser.inc?r1=1.9&r2=1.10&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/IntermediateParser.inc diff -u pear/PhpDocumentor/phpDocumentor/IntermediateParser.inc:1.9 pear/PhpDocumentor/phpDocumentor/IntermediateParser.inc:1.10 --- pear/PhpDocumentor/phpDocumentor/IntermediateParser.inc:1.9 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/IntermediateParser.inc Sun Apr 30 22:18:13 2006 @@ -27,12 +27,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: IntermediateParser.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: IntermediateParser.inc,v 1.10 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -54,7 +53,7 @@ * $docblock parameter of the parserElement * descendant object. * @author Gregory Beaver - * @version $Id: IntermediateParser.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: IntermediateParser.inc,v 1.10 2006/04/30 22:18:13 cellog Exp $ * @copyright 2002 Gregory Beaver * @package phpDocumentor */ http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Io.inc?r1=1.9&r2=1.10&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Io.inc diff -u pear/PhpDocumentor/phpDocumentor/Io.inc:1.9 pear/PhpDocumentor/phpDocumentor/Io.inc:1.10 --- pear/PhpDocumentor/phpDocumentor/Io.inc:1.9 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Io.inc Sun Apr 30 22:18:13 2006 @@ -28,13 +28,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Gregory Beaver <cellog@php.net> * @copyright 2000-2006 Joshua Eichorn, Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Io.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Io.inc,v 1.10 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -45,7 +44,7 @@ * * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Gregory Beaver <cellog@php.net> - * @version $Id: Io.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: Io.inc,v 1.10 2006/04/30 22:18:13 cellog Exp $ * @package phpDocumentor */ class Io http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/LinkClasses.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/LinkClasses.inc diff -u pear/PhpDocumentor/phpDocumentor/LinkClasses.inc:1.2 pear/PhpDocumentor/phpDocumentor/LinkClasses.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/LinkClasses.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/LinkClasses.inc Sun Apr 30 22:18:13 2006 @@ -29,13 +29,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Links * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: LinkClasses.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: LinkClasses.inc,v 1.3 2006/04/30 22:18:13 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/PackagePageElements.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/PackagePageElements.inc diff -u pear/PhpDocumentor/phpDocumentor/PackagePageElements.inc:1.2 pear/PhpDocumentor/phpDocumentor/PackagePageElements.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/PackagePageElements.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/PackagePageElements.inc Sun Apr 30 22:18:13 2006 @@ -38,13 +38,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Tutorial * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: PackagePageElements.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: PackagePageElements.inc,v 1.3 2006/04/30 22:18:13 cellog Exp $ * @tutorial tutorials.pkg * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Parser.inc?r1=1.4&r2=1.5&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Parser.inc diff -u pear/PhpDocumentor/phpDocumentor/Parser.inc:1.4 pear/PhpDocumentor/phpDocumentor/Parser.inc:1.5 --- pear/PhpDocumentor/phpDocumentor/Parser.inc:1.4 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Parser.inc Sun Apr 30 22:18:13 2006 @@ -25,14 +25,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Gregory Beaver <cellog@php.net> * @copyright 2000-2006 Joshua Eichorn, Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Parser.inc,v 1.4 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Parser.inc,v 1.5 2006/04/30 22:18:13 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 0.1 @@ -327,7 +326,7 @@ * This parser is slower than the tokenizer-based parser, and is deprecated. * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Gregory Beaver <cellog@users.sourceforge.net> - * @version $Id: Parser.inc,v 1.4 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: Parser.inc,v 1.5 2006/04/30 22:18:13 cellog Exp $ * @package phpDocumentor * @subpackage Parsers * @deprecated in favor of {@link phpDocumentorTParser} http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/ParserData.inc?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/ParserData.inc diff -u pear/PhpDocumentor/phpDocumentor/ParserData.inc:1.3 pear/PhpDocumentor/phpDocumentor/ParserData.inc:1.4 --- pear/PhpDocumentor/phpDocumentor/ParserData.inc:1.3 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/ParserData.inc Sun Apr 30 22:18:13 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage ParserData * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: ParserData.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: ParserData.inc,v 1.4 2006/04/30 22:18:13 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 1.0rc1 @@ -43,7 +42,7 @@ * @subpackage ParserData * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserData.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserData.inc,v 1.4 2006/04/30 22:18:13 cellog Exp $ */ class parserPage { @@ -74,6 +73,13 @@ */ var $name = ''; /** + * original phpdoc-safe name (only letters, numbers and _) + * + * This fixes [ 1391432 ] Too many underscores in include links. + * @var string + */ + var $origName = ''; + /** * @var string */ var $category = 'default'; @@ -205,6 +211,8 @@ */ function setName($name) { + var_dump($name); + $this->origName = $name; $this->name = $name; } @@ -275,7 +283,7 @@ * @subpackage ParserData * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserData.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserData.inc,v 1.4 2006/04/30 22:18:13 cellog Exp $ */ class parserData { @@ -553,7 +561,7 @@ * @abstract * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserData.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserData.inc,v 1.4 2006/04/30 22:18:13 cellog Exp $ */ class parserBase { @@ -602,7 +610,7 @@ * @subpackage ParserData * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserData.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserData.inc,v 1.4 2006/04/30 22:18:13 cellog Exp $ */ class parserStringWithInlineTags extends parserBase { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/ParserDocBlock.inc?r1=1.6&r2=1.7&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/ParserDocBlock.inc diff -u pear/PhpDocumentor/phpDocumentor/ParserDocBlock.inc:1.6 pear/PhpDocumentor/phpDocumentor/ParserDocBlock.inc:1.7 --- pear/PhpDocumentor/phpDocumentor/ParserDocBlock.inc:1.6 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/ParserDocBlock.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage ParserDocBlock * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: ParserDocBlock.inc,v 1.6 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: ParserDocBlock.inc,v 1.7 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @see Parser, WordParser @@ -43,7 +42,7 @@ * @subpackage ParserDocBlock * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserDocBlock.inc,v 1.6 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserDocBlock.inc,v 1.7 2006/04/30 22:18:14 cellog Exp $ */ class parserDesc extends parserStringWithInlineTags { @@ -125,7 +124,7 @@ * @subpackage ParserDocBlock * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserDocBlock.inc,v 1.6 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserDocBlock.inc,v 1.7 2006/04/30 22:18:14 cellog Exp $ */ class parserDocBlock { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/ParserElements.inc?r1=1.9&r2=1.10&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/ParserElements.inc diff -u pear/PhpDocumentor/phpDocumentor/ParserElements.inc:1.9 pear/PhpDocumentor/phpDocumentor/ParserElements.inc:1.10 --- pear/PhpDocumentor/phpDocumentor/ParserElements.inc:1.9 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/ParserElements.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage ParserElements * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @see Parser, WordParser @@ -45,7 +44,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserElement extends parserBase { @@ -198,7 +197,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserInclude extends parserElement { @@ -214,7 +213,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserGlobal extends parserElement { @@ -317,7 +316,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserFunction extends parserElement { @@ -678,7 +677,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserClass extends parserElement { @@ -1410,7 +1409,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserVar extends parserElement { @@ -1622,7 +1621,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserMethod extends parserFunction { @@ -1977,7 +1976,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserDefine extends parserElement { @@ -2021,7 +2020,7 @@ * @subpackage ParserElements * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Id: ParserElements.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ParserElements.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ */ class parserPackagePage extends parserStringWithInlineTags { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/ProceduralPages.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/ProceduralPages.inc diff -u pear/PhpDocumentor/phpDocumentor/ProceduralPages.inc:1.2 pear/PhpDocumentor/phpDocumentor/ProceduralPages.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/ProceduralPages.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/ProceduralPages.inc Sun Apr 30 22:18:14 2006 @@ -27,12 +27,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: ProceduralPages.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: ProceduralPages.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 1.1 @@ -45,7 +44,7 @@ * @package phpDocumentor * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.1 - * @version $Id: ProceduralPages.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: ProceduralPages.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ */ class ProceduralPages { @@ -208,6 +207,8 @@ $info = array(); if (!isset($this->pathpages[$path])) return false; $p = $this->pages[$this->pathpages[$path]][$path]; + // fixes [ 1391432 ] Too many underscores in include links. + $p->name = $p->origName; $p->name = $c->getPageName($p); $info['package'] = $p->package; $info['subpackage'] = $p->subpackage; http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Publisher.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Publisher.inc diff -u pear/PhpDocumentor/phpDocumentor/Publisher.inc:1.2 pear/PhpDocumentor/phpDocumentor/Publisher.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/Publisher.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Publisher.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Kellin <passionplay@hotmail.com> * @author Joshua Eichorn <jeichorn@phpdoc.org> * @copyright 2000-2006 Kellin, Joshua Eichorn * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Publisher.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Publisher.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 0.1 @@ -41,7 +40,7 @@ * * @author Kellin <passionplay@hotmail.com> * @author Joshua Eichorn <jeichorn@phpdoc.org> - * @version $Id: Publisher.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: Publisher.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @package phpDocumentor */ class Publisher http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/TutorialHighlightParser.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/TutorialHighlightParser.inc diff -u pear/PhpDocumentor/phpDocumentor/TutorialHighlightParser.inc:1.2 pear/PhpDocumentor/phpDocumentor/TutorialHighlightParser.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/TutorialHighlightParser.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/TutorialHighlightParser.inc Sun Apr 30 22:18:14 2006 @@ -36,13 +36,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Gregory Beaver <cellog@php.net> * @copyright 2003-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: TutorialHighlightParser.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: TutorialHighlightParser.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @tutorial tags.example.pkg, tags.filesource.pkg * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/WordParser.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/WordParser.inc diff -u pear/PhpDocumentor/phpDocumentor/WordParser.inc:1.2 pear/PhpDocumentor/phpDocumentor/WordParser.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/WordParser.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/WordParser.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage WordParsers * @author Joshua Eichorn <jeichorn@phpdoc.org> * @copyright 2000-2006 Joshua Eichorn * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: WordParser.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: WordParser.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 0.1 @@ -40,7 +39,7 @@ * Retrieves tokens from source code for use by the Parser * @see Parser * @author Joshua Eichorn <jeichorn@phpdoc.org> - * @version $Id: WordParser.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: WordParser.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @package phpDocumentor * @subpackage WordParsers */ http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/common.inc.php?r1=1.4&r2=1.5&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/common.inc.php diff -u pear/PhpDocumentor/phpDocumentor/common.inc.php:1.4 pear/PhpDocumentor/phpDocumentor/common.inc.php:1.5 --- pear/PhpDocumentor/phpDocumentor/common.inc.php:1.4 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/common.inc.php Sun Apr 30 22:18:14 2006 @@ -25,12 +25,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Greg Beaver <cellog@php.net> * @copyright 2001-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: common.inc.php,v 1.4 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: common.inc.php,v 1.5 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/find_phpdoc.php?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/find_phpdoc.php diff -u pear/PhpDocumentor/phpDocumentor/find_phpdoc.php:1.2 pear/PhpDocumentor/phpDocumentor/find_phpdoc.php:1.3 --- pear/PhpDocumentor/phpDocumentor/find_phpdoc.php:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/find_phpdoc.php Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage setup * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: find_phpdoc.php,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: find_phpdoc.php,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc?r1=1.12&r2=1.13&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc diff -u pear/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc:1.12 pear/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc:1.13 --- pear/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc:1.12 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/phpDocumentorTParser.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: phpDocumentorTParser.inc,v 1.12 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: phpDocumentorTParser.inc,v 1.13 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 1.2 @@ -41,7 +40,7 @@ * @package phpDocumentor * @subpackage Parsers * @author Gregory Beaver <cellog@users.sourceforge.net> - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ */ class phpDocumentorTParser extends Parser { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/phpDocumentorTWordParser.inc?r1=1.4&r2=1.5&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/phpDocumentorTWordParser.inc diff -u pear/PhpDocumentor/phpDocumentor/phpDocumentorTWordParser.inc:1.4 pear/PhpDocumentor/phpDocumentor/phpDocumentorTWordParser.inc:1.5 --- pear/PhpDocumentor/phpDocumentor/phpDocumentorTWordParser.inc:1.4 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/phpDocumentorTWordParser.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: phpDocumentorTWordParser.inc,v 1.4 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: phpDocumentorTWordParser.inc,v 1.5 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 1.2 http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/phpdoc.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/phpdoc.inc diff -u pear/PhpDocumentor/phpDocumentor/phpdoc.inc:1.2 pear/PhpDocumentor/phpDocumentor/phpdoc.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/phpdoc.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/phpdoc.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Gregory Beaver <cellog@php.net> * @copyright 2000-2006 Joshua Eichorn, Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: phpdoc.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: phpdoc.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor * @since 0.1 http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc?r1=1.6&r2=1.7&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc diff -u pear/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc:1.6 pear/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc:1.7 --- pear/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc:1.6 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc Sun Apr 30 22:18:14 2006 @@ -25,14 +25,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage CHMdefault * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Greg Beaver <cellog@php.net> * @copyright 2000-2006 Joshua Eichorn, Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: CHMdefaultConverter.inc,v 1.6 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: CHMdefaultConverter.inc,v 1.7 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -52,7 +51,7 @@ * @subpackage CHMdefault * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ */ class CHMdefaultConverter extends Converter { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc?r1=1.9&r2=1.10&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc diff -u pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc:1.9 pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc:1.10 --- pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc:1.9 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc Sun Apr 30 22:18:14 2006 @@ -26,14 +26,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage HTMLframes * @author Joshua Eichorn <jeichorn@phpdoc.org> * @author Greg Beaver <cellog@php.net> * @copyright 2000-2006 Joshua Eichorn, Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: HTMLSmartyConverter.inc,v 1.9 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: HTMLSmartyConverter.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -50,7 +49,7 @@ * @see parserDocBlock, parserInclude, parserPage, parserClass, parserDefine, parserFunction, parserMethod, parserVar * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.0rc1 - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ class HTMLSmartyConverter extends Converter { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc?r1=1.10&r2=1.11&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc diff -u pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc:1.10 pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc:1.11 --- pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc:1.10 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc Sun Apr 30 22:18:14 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage HTMLframes * @author Gregory Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: HTMLframesConverter.inc,v 1.10 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: HTMLframesConverter.inc,v 1.11 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -49,7 +48,7 @@ * @see parserDocBlock, parserInclude, parserPage, parserClass, parserDefine, parserFunction, parserMethod, parserVar * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.2 - * @version $Id: HTMLframesConverter.inc,v 1.10 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: HTMLframesConverter.inc,v 1.11 2006/04/30 22:18:14 cellog Exp $ */ class HTMLframesConverter extends Converter { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc diff -u pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc:1.2 pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage PDFdefault * @author Greg Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: PDFdefaultConverter.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: PDFdefaultConverter.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -50,7 +49,7 @@ * @subpackage PDFdefault * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.1 - * @version $Id: PDFdefaultConverter.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: PDFdefaultConverter.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @todo Implement links to conflicts/inheritance */ class PDFdefaultConverter extends Converter http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/ParserPDF.inc?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/ParserPDF.inc diff -u pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/ParserPDF.inc:1.2 pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/ParserPDF.inc:1.3 --- pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/ParserPDF.inc:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/ParserPDF.inc Sun Apr 30 22:18:14 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage PDFdefault * @author Greg Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: ParserPDF.inc,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: ParserPDF.inc,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/class.phpdocpdf.php?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/class.phpdocpdf.php diff -u pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/class.phpdocpdf.php:1.3 pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/class.phpdocpdf.php:1.4 --- pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/class.phpdocpdf.php:1.3 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/PDF/default/class.phpdocpdf.php Sun Apr 30 22:18:14 2006 @@ -25,13 +25,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage PDFdefault * @author Greg Beaver <cellog@php.net> * @copyright 2000-2006 Joshua Eichorn, Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: class.phpdocpdf.php,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: class.phpdocpdf.php,v 1.4 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php diff -u pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php:1.2 pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php:1.3 --- pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php Sun Apr 30 22:18:14 2006 @@ -27,13 +27,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Greg Beaver <cellog@php.net> * @copyright 2004-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Beautifier.php,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Beautifier.php,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Plain.php?r1=1.1&r2=1.2&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Plain.php diff -u pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Plain.php:1.1 pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Plain.php:1.2 --- pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Plain.php:1.1 Mon Oct 17 18:37:36 2005 +++ pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Plain.php Sun Apr 30 22:18:14 2006 @@ -19,7 +19,6 @@ /** * XML/Beautifier/Renderer/Plain.php * - * @category XML * @package XML_Beautifier * @author Stephan Schmidt <schst@php.net> */ @@ -37,7 +36,6 @@ /** * Basic XML Renderer for XML Beautifier * - * @category XML * @package XML_Beautifier * @author Stephan Schmidt <schst@php.net> * @todo option to specify inline tags http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Tokenizer.php?r1=1.2&r2=1.3&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Tokenizer.php diff -u pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Tokenizer.php:1.2 pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Tokenizer.php:1.3 --- pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Tokenizer.php:1.2 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/Tokenizer.php Sun Apr 30 22:18:14 2006 @@ -27,13 +27,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package phpDocumentor * @subpackage Parsers * @author Greg Beaver <cellog@php.net> * @copyright 2004-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: Tokenizer.php,v 1.2 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: Tokenizer.php,v 1.3 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -387,6 +386,7 @@ $this->_curthing .= $word; } + /**#@-*/ /** * Handler for character data * http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc?r1=1.3&r2=1.4&diff_format=u Index: pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc diff -u pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc:1.3 pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc:1.4 --- pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc:1.3 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc Sun Apr 30 22:18:14 2006 @@ -26,13 +26,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @category documentation * @package Converters * @subpackage XMLDocBook * @author Greg Beaver <cellog@php.net> * @copyright 2002-2006 Gregory Beaver * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version CVS: $Id: XMLDocBookpeardoc2Converter.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version CVS: $Id: XMLDocBookpeardoc2Converter.inc,v 1.4 2006/04/30 22:18:14 cellog Exp $ * @filesource * @link http://www.phpdoc.org * @link http://pear.php.net/PhpDocumentor @@ -54,7 +53,7 @@ * @subpackage XMLDocBook * @author Greg Beaver <cellog@users.sourceforge.net> * @since 1.2 - * @version $Id: XMLDocBookpeardoc2Converter.inc,v 1.3 2006/04/30 18:38:57 cellog Exp $ + * @version $Id: XMLDocBookpeardoc2Converter.inc,v 1.4 2006/04/30 22:18:14 cellog Exp $ */ class XMLDocBookpeardoc2Converter extends Converter { http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/scripts/create_package.xml.php?r1=1.58&r2=1.59&diff_format=u Index: pear/PhpDocumentor/scripts/create_package.xml.php diff -u pear/PhpDocumentor/scripts/create_package.xml.php:1.58 pear/PhpDocumentor/scripts/create_package.xml.php:1.59 --- pear/PhpDocumentor/scripts/create_package.xml.php:1.58 Sun Apr 30 18:38:57 2006 +++ pear/PhpDocumentor/scripts/create_package.xml.php Sun Apr 30 22:18:14 2006 @@ -114,6 +114,7 @@ [ 1366260 ] Default 0 parameter in method is not displayed [ 1373244 ] Undefined variable: root_dir in docbuilder/file_dialog.php [ 1380845 ] @uses tags not sorting + [ 1391432 ] Too many underscores in include links. [ 1393998 ] HTMLSmartyConverter Fatal error (line 627) fix [ 1398977 ] @return is not merged when using DocBlock Templates [ 1428660 ] Confusing error when using {@link} in @uses http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/user/default.ini?r1=1.1&r2=1.2&diff_format=u Index: pear/PhpDocumentor/user/default.ini diff -u pear/PhpDocumentor/user/default.ini:1.1 pear/PhpDocumentor/user/default.ini:1.2 --- pear/PhpDocumentor/user/default.ini:1.1 Mon Oct 17 18:37:50 2005 +++ pear/PhpDocumentor/user/default.ini Sun Apr 30 22:18:14 2006 @@ -71,7 +71,7 @@ ;; legal values: directory paths separated by commas ;directory = /path1,/path2,.,..,subdirectory ;directory = /home/jeichorn/cvs/pear -directory = /home/cellog/phpdoc +directory = /home/cellog/pear/PhpDocumentor ;; template base directory (the equivalent directory of <installdir>/phpDocumentor) ;templatebase = /path/to/my/templates @@ -82,7 +82,8 @@ ;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore ;; legal values: any wildcard strings separated by commas ;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/ -ignore = templates_c/,*HTML/default/*,spec/ +ignore = pear-*,templates/,Documentation/,test*.php + ;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format ;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib, @@ -91,7 +92,7 @@ ;; HTML:frames:DOM/phphtmllib,HTML:frames:DOM/earthli ;; HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS ;; PDF:default:default,CHM:default:default,XML:DocBook/peardoc2:default -output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS,CHM:default:default,PDF:default:default +output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS,CHM:default:default ;; turn this option on if you want highlighted source code for every file ;; legal values: on/off