cvs: phd(PHD_0_4) / build.php mktoc.php /themes/pear pearchm.php

bjori Sun Oct 19 14:49:41 2008 UTC Modified files: (Branch: PHD_0_4) /phd build.php mktoc.php /phd/themes/pear pearchm.php Log: MFH: sync http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.54.2.3&r2=1.54.2.3.2.1&diff_format=u Index: phd/build.php diff -u phd/build.php:1.54.2.3 phd/build.php:1.54.2.3.2.1 --- phd/build.php:1.54.2.3 Sat Aug 23 13:51:11 2008 +++ phd/build.php Sun Oct 19 14:49:40 2008 @@ -1,6 +1,6 @@ #!@php_bin@ <?php -/* $Id: build.php,v 1.54.2.3 2008/08/23 13:51:11 bjori Exp $ */ +/* $Id: build.php,v 1.54.2.3.2.1 2008/10/19 14:49:40 bjori Exp $ */ /* {{{ Find the $ROOT directory of PhD @php_dir@ will be replaced by the pear package manager @@ -276,8 +276,11 @@ case XMLReader::CDATA: /* {{{ */ $value = $reader->value; - $retval = $format->CDATA($value); foreach($themes as $name => $theme) { + if (method_exists($theme, "CDATA")) + $retval = $theme->CDATA($value); + else + $retval = $format->CDATA($value); $theme->appendData($retval, false); } break; http://cvs.php.net/viewvc.cgi/phd/mktoc.php?r1=1.10.2.1.2.2&r2=1.10.2.1.2.3&diff_format=u Index: phd/mktoc.php diff -u phd/mktoc.php:1.10.2.1.2.2 phd/mktoc.php:1.10.2.1.2.3 --- phd/mktoc.php:1.10.2.1.2.2 Sun Oct 19 14:07:13 2008 +++ phd/mktoc.php Sun Oct 19 14:49:40 2008 @@ -29,7 +29,7 @@ * PhDHelper::getRefnameLink(), and allows easy refname->link resolution. * * @package PhD -* @version CVS: $Id: mktoc.php,v 1.10.2.1.2.2 2008/10/19 14:07:13 bjori Exp $ +* @version CVS: $Id: mktoc.php,v 1.10.2.1.2.3 2008/10/19 14:49:40 bjori Exp $ */ $r = new PhDReader($OPTIONS); @@ -38,6 +38,8 @@ #FIXME: This is a workaround for the <legalnotice> element in the PHP manual $PARENTS = array(-1 => "ROOT", 1 => "manual", 2 => "manual"); +// PEAR manual needs this line : $PARENTS = array(-1 => "ROOT", 1 => "guide"); + $lastid = 0; while ($r->read()) { @@ -51,7 +53,7 @@ $VARS[$refname] = $lastid; continue; } - else if($name == "titleabbrev") { + else if ($name == "titleabbrev") { $IDs[$lastid]["sdesc"] = $class = trim($r->readContent($name)); $elm = $r->getParentTagName(); if ($elm == "phpdoc:classref" || $elm == "phpdoc:exceptionref") { http://cvs.php.net/viewvc.cgi/phd/themes/pear/pearchm.php?r1=1.4.2.2&r2=1.4.2.2.2.1&diff_format=u Index: phd/themes/pear/pearchm.php diff -u phd/themes/pear/pearchm.php:1.4.2.2 phd/themes/pear/pearchm.php:1.4.2.2.2.1 --- phd/themes/pear/pearchm.php:1.4.2.2 Thu Oct 16 15:43:46 2008 +++ phd/themes/pear/pearchm.php Sun Oct 19 14:49:41 2008 @@ -247,7 +247,7 @@ Contents file=pear_manual_' . $lang . '.hhc Index file=pear_manual_' . $lang . '.hhk Default Window=doc -Default topic=res\index.html +Default topic=res\guide.html Display compile progress=Yes Full-text search=Yes Language=' . $this->LANGUAGES[$lang]["langcode"] . '