cvs: phd /formats xhtml.php /themes/pear peartheme.php

cweiske Tue Oct 28 20:10:45 2008 UTC Modified files: /phd/formats xhtml.php /phd/themes/pear peartheme.php Log: - make table captions render properly in peardoc - add support for <arg> and <cmdsynopsis> used in peardoc http://cvs.php.net/viewvc.cgi/phd/formats/xhtml.php?r1=1.70&r2=1.71&diff_format=u Index: phd/formats/xhtml.php diff -u phd/formats/xhtml.php:1.70 phd/formats/xhtml.php:1.71 --- phd/formats/xhtml.php:1.70 Sun Oct 19 15:01:23 2008 +++ phd/formats/xhtml.php Tue Oct 28 20:10:45 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: xhtml.php,v 1.70 2008/10/19 15:01:23 bjori Exp $ */ +/* $Id: xhtml.php,v 1.71 2008/10/28 20:10:45 cweiske Exp $ */ class XHTMLPhDFormat extends PhDFormat { protected $elementmap = array( /* {{{ */ @@ -8,6 +8,7 @@ 'acronym' => 'acronym', 'affiliation' => 'format_suppressed_tags', 'alt' => 'format_suppressed_tags', + 'arg' => 'format_suppressed_tags', 'article' => 'format_container_chunk', 'author' => array( /* DEFAULT */ 'format_author', @@ -26,6 +27,7 @@ 'book' => 'format_container_chunk', 'chapter' => 'format_container_chunk', 'citetitle' => 'i', + 'cmdsynopsis' => 'format_cmdsynopsis', 'co' => 'format_co', 'colophon' => 'format_chunk', 'copyright' => 'format_copyright', @@ -633,6 +635,14 @@ return $method; } + public function format_cmdsynopsis($open, $name, $attrs) + { + if ($open) { + return '<span style="background-color:#eee">'; + } + return '</span>'; + } + public function format_fieldsynopsis($open, $name, $attrs) { $this->cchunk["fieldsynopsis"] = $this->dchunk["fieldsynopsis"]; if ($open) { http://cvs.php.net/viewvc.cgi/phd/themes/pear/peartheme.php?r1=1.10&r2=1.11&diff_format=u Index: phd/themes/pear/peartheme.php diff -u phd/themes/pear/peartheme.php:1.10 phd/themes/pear/peartheme.php:1.11 --- phd/themes/pear/peartheme.php:1.10 Tue Oct 28 17:13:15 2008 +++ phd/themes/pear/peartheme.php Tue Oct 28 20:10:45 2008 @@ -142,6 +142,7 @@ 'appendix' => 'format_container_chunk_title', 'chapter' => 'format_container_chunk_title', //'example' => 'format_example_title', + 'informaltable' => 'format_table_title', 'part' => 'format_container_chunk_title', 'section' => array( /* DEFAULT */ 'format_container_chunk_title', @@ -156,6 +157,7 @@ ), ), ), + 'table' => 'format_table_title', 'warning' => 'format_warning_title', ), 'refsect1' => 'h2', @@ -588,9 +590,9 @@ if ($props["empty"]) return ""; if ($open) { - return '<p><b>'; + return '<caption><b>'; } - return '</b></p>'; + return '</b></caption>'; } public function format_userinput($open, $name, $attrs, $props) {