cvs: phd /formats xhtml.php /include PhDHelper.class.php

bjori Sun Oct 19 15:01:23 2008 UTC Modified files: /phd/formats xhtml.php /phd/include PhDHelper.class.php Log: MFB0.4: Sync http://cvs.php.net/viewvc.cgi/phd/formats/xhtml.php?r1=1.69&r2=1.70&diff_format=u Index: phd/formats/xhtml.php diff -u phd/formats/xhtml.php:1.69 phd/formats/xhtml.php:1.70 --- phd/formats/xhtml.php:1.69 Wed Oct 8 20:31:48 2008 +++ phd/formats/xhtml.php Sun Oct 19 15:01:23 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: xhtml.php,v 1.69 2008/10/08 20:31:48 cweiske Exp $ */ +/* $Id: xhtml.php,v 1.70 2008/10/19 15:01:23 bjori Exp $ */ class XHTMLPhDFormat extends PhDFormat { protected $elementmap = array( /* {{{ */ @@ -38,7 +38,7 @@ 'funcdef' => 'format_suppressed_tags', 'funcsynopsis' => 'div', 'funcsynopsisinfo' => 'pre', - 'function' => 'span', + 'function' => 'span', 'funcprototype' => 'code', 'surname' => 'format_name', 'othername' => 'format_name', @@ -189,6 +189,8 @@ ), 'proptype' => 'span', 'pubdate' => 'div', /* Docbook-XSL prints "published" */ + /* hack for phpdoc:varentry */ + 'phpdoc:varentry' => 'format_varentry_chunk', 'refentry' => 'format_chunk', 'refentrytitle' => 'span', 'reference' => 'format_container_chunk', @@ -526,6 +528,9 @@ return $str. "</div>"; } + public function format_varentry_chunk($open, $name, $attrs, $props) { + return $this->format_chunk($open, "refentry", $attrs, $props); + } public function format_refsect1_para($open, $name, $attrs, $props) { if ($open) { switch ($props["sibling"]) { http://cvs.php.net/viewvc.cgi/phd/include/PhDHelper.class.php?r1=1.11&r2=1.12&diff_format=u Index: phd/include/PhDHelper.class.php diff -u phd/include/PhDHelper.class.php:1.11 phd/include/PhDHelper.class.php:1.12 --- phd/include/PhDHelper.class.php:1.11 Thu Oct 16 21:00:46 2008 +++ phd/include/PhDHelper.class.php Sun Oct 19 15:01:23 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: PhDHelper.class.php,v 1.11 2008/10/16 21:00:46 cweiske Exp $ */ +/* $Id: PhDHelper.class.php,v 1.12 2008/10/19 15:01:23 bjori Exp $ */ /** * Base class for PhDTheme @@ -24,6 +24,9 @@ */ private $refs = array(); + private $classes = array(); + private $vars = array(); + /* abstract */ protected $elementmap = array(); /* abstract */ protected $textmap = array(); private static $autogen = array(); @@ -39,6 +42,8 @@ public function __construct(array $a) { $this->IDs = $a[0]; $this->refs = $a[1]; + $this->classes = $a[2]; + $this->vars = $a[3]; } /** @@ -119,6 +124,13 @@ return isset($this->refs[$ref]) ? $this->refs[$ref] : null; } + public function getClassnameLink($class) { + return isset($this->classes[$class]) ? $this->classes[$class] : null; + } + public function getVarnameLink($var) { + return isset($this->vars[$var]) ? $this->vars[$var] : null; + } + final public function getElementMap() { return $this->elementmap; }