svn: /phd/trunk/phpdotnet/phd/Package/ Generic/Manpage.php PHP/Manpage.php
| From: | Moacir de Oliveira Miranda Júnior | Date: | Tue, 05 Apr 2011 02:33:11 +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-7921@lists.php.net to get a copy of this message | ||
moacir Tue, 05 Apr 2011 02:33:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309955
Log:
Fix bug #54436. Only render refentries under the funcref set
Bug: http://bugs.php.net/54436 (Open) 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-04 20:21:03 UTC (rev 309954)
+++ phd/trunk/phpdotnet/phd/Package/Generic/Manpage.php 2011-04-05 02:33:11 UTC (rev 309955)
@@ -127,7 +127,6 @@
'refsection' => 'format_refsect',
'refsynopsisdiv' => 'format_refsynopsisdiv',
'replaceable' => '\\fI',
- 'set' => 'format_bookname',
'screen' => 'format_verbatim',
'section' => 'format_suppressed_tags',
'sect1' => 'format_suppressed_tags',
@@ -140,6 +139,7 @@
'seglistitem' => 'format_seglistitem',
'segmentedlist' => 'format_segmentedlist',
'segtitle' => 'format_suppressed_tags',
+ 'set' => 'format_suppressed_tags',
'simpara' => array(
/* DEFAULT */ '.PP',
'listitem' => '',
@@ -216,6 +216,10 @@
/* 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-04 20:21:03 UTC (rev 309954)
+++ phd/trunk/phpdotnet/phd/Package/PHP/Manpage.php 2011-04-05 02:33:11 UTC (rev 309955)
@@ -6,6 +6,7 @@
protected $elementmap = array(
'phpdoc:varentry' => 'format_chunk',
+ 'set' => 'format_set',
);
protected $textmap = array(
@@ -13,6 +14,9 @@
protected $CURRENT_ID = "";
+ /* Only render refentries children of funcref */
+ protected $isFuncRef = false;
+
/* Current Chunk settings */
protected $cchunk = array();
/* Default Chunk settings */
@@ -59,6 +63,20 @@
}
}
+ 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);
+ }
+
}
/*