svn: /phd/trunk/phpdotnet/phd/Package/ Generic/Manpage.php PHP/Manpage.php
| From: | Hannes Magnusson | Date: | Sat, 16 Apr 2011 12:43:35 +0000 |
| Subject: | svn: /phd/trunk/phpdotnet/phd/Package/ Generic/Manpage.php PHP/Manpage.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-7943@lists.php.net to get a copy of this message | ||
bjori Sat, 16 Apr 2011 12:43:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=310253
Log:
Revert r309955 (wrong fix for bug#54436)
Bug: http://bugs.php.net/54436 (Closed) gzip issues with -P
PHP -f manpage
Changed paths:
U phd/trunk/phpdotnet/phd/Package/Generic/Manpage.php
U phd/trunk/phpdotnet/phd/Package/PHP/Manpage.php
Modified: phd/trunk/phpdotnet/phd/Package/Generic/Manpage.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Generic/Manpage.php 2011-04-16 10:35:29 UTC (rev 310252)
+++ phd/trunk/phpdotnet/phd/Package/Generic/Manpage.php 2011-04-16 12:43:35 UTC (rev 310253)
@@ -127,6 +127,7 @@
'refsection' => 'format_refsect',
'refsynopsisdiv' => 'format_refsynopsisdiv',
'replaceable' => '\\fI',
+ 'set' => 'format_bookname',
'screen' => 'format_verbatim',
'section' => 'format_suppressed_tags',
'sect1' => 'format_suppressed_tags',
@@ -139,7 +140,6 @@
'seglistitem' => 'format_seglistitem',
'segmentedlist' => 'format_segmentedlist',
'segtitle' => 'format_suppressed_tags',
- 'set' => 'format_suppressed_tags',
'simpara' => array(
/* DEFAULT */ '.PP',
'listitem' => '',
@@ -216,10 +216,6 @@
/* DEFAULT */ false,
'refsect' => 'format_refsect_text',
'refsect1' => 'format_refsect_text',
- 'set' => array(
- /* DEFAULT */ 'format_bookname',
- 'set' => false,
- ),
),
'tag' => 'format_tag_text',
'type' => array(
Modified: phd/trunk/phpdotnet/phd/Package/PHP/Manpage.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/PHP/Manpage.php 2011-04-16 10:35:29 UTC (rev 310252)
+++ phd/trunk/phpdotnet/phd/Package/PHP/Manpage.php 2011-04-16 12:43:35 UTC (rev 310253)
@@ -6,7 +6,6 @@
protected $elementmap = array(
'phpdoc:varentry' => 'format_chunk',
- 'set' => 'format_set',
);
protected $textmap = array(
@@ -14,9 +13,6 @@
protected $CURRENT_ID = "";
- /* Only render refentries children of funcref */
- protected $isFuncRef = false;
-
/* Current Chunk settings */
protected $cchunk = array();
/* Default Chunk settings */
@@ -63,20 +59,6 @@
}
}
- public function format_set($open, $name, $attrs, $props) {
- if (isset($attrs[Reader::XMLNS_XML]['id']) &&
$attrs[Reader::XMLNS_XML]['id'] == 'funcref') {
- $this->isFuncRef = $open;
- }
- return false;
- }
-
- public function format_chunk($open, $name, $attrs, $props) {
- if (!$this->isFuncRef) {
- return false;
- }
- return parent::format_chunk($open, $name, $name, $props);
- }
-
}
/*