svn: /phd/trunk/phpdotnet/phd/Package/Generic/ XHTML.php
| From: | Hannes Magnusson | Date: | Tue, 05 Jan 2010 21:22:47 +0000 |
| Subject: | svn: /phd/trunk/phpdotnet/phd/Package/Generic/ XHTML.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-5761@lists.php.net to get a copy of this message | ||
bjori Tue, 05 Jan 2010 21:22:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293156
Log:
- Suppress <edition> tags
- Treat <inlinemediaobject> the same as we do <mediaobjects> (we don't do any hard
positioning/floating on them anyway)
- Add missing <exceptionname> support (wonder why this didn't exist before?)
- Treat <firstterm> like <term>
- Add <trademark> support
Changed paths:
U phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php
Modified: phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php 2010-01-05 20:46:53 UTC (rev 293155)
+++ phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php 2010-01-05 21:22:47 UTC (rev 293156)
@@ -34,6 +34,7 @@
'copyright' => 'format_copyright',
'date' => 'p',
'editor' => 'format_editor',
+ 'edition' => 'format_suppressed_tags',
'email' => 'format_suppressed_tags',
'errortext' => 'tt',
'firstname' => 'format_name',
@@ -141,6 +142,7 @@
'link' => 'format_link',
'xref' => 'format_xref',
'manvolnum' => 'format_manvolnum',
+ 'inlinemediaobject' => 'format_mediaobject',
'mediaobject' => 'format_mediaobject',
'methodparam' => 'format_methodparam',
'methodsynopsis' => 'format_methodsynopsis',
@@ -159,6 +161,7 @@
'classsynopsisinfo' =>
'format_classsynopsisinfo_oointerface',
),
'interfacename' => 'span',
+ 'exceptionname' => 'span',
'option' => 'span',
'orderedlist' => 'format_orderedlist',
'para' => array(
@@ -255,6 +258,7 @@
'synopsis' => 'pre',
'tag' => 'code',
'table' => 'format_table',
+ 'firstterm' => 'format_term',
'term' => 'format_term',
'tfoot' => 'format_th',
'tbody' => 'format_tbody',
@@ -305,6 +309,7 @@
),
'titleabbrev' => 'format_suppressed_tags',
'token' => 'tt',
+ 'trademark' => 'format_trademark',
'type' => 'format_spaced_span',
'userinput' => 'format_userinput',
'uri' => 'tt',
@@ -328,7 +333,7 @@
'questions' => 'ol', // From the PhD namespace
'answer' => 'dd',
- //phpdoc: implement in the PHP Package
+ //phpdoc: implemented in the PHP Package
'phpdoc:classref' => 'format_suppressed_tags',
'phpdoc:exception' => 'format_suppressed_tags',
'phpdoc:exceptionref' => 'format_suppressed_tags',
@@ -344,6 +349,7 @@
'affiliation' => 'format_suppressed_text',
'contrib' => 'format_suppressed_text',
'shortaffil' => 'format_suppressed_text',
+ 'edition' => 'format_suppressed_text',
'programlisting' => 'format_programlisting_text',
'alt' => 'format_alt_text',
@@ -1172,6 +1178,12 @@
}
return "</span>";
}
+ public function format_trademark($open, $name, $attrs, $props) {
+ if ($open) {
+ return '<span class=' .$name. '">';
+ }
+ return '®</span>';
+ }
public function format_userinput($open, $name, $attrs) {
if ($open) {
return '<strong class="' .$name. '"><code>';