svn: /phd/trunk/phpdotnet/phd/Package/PEAR/ XHTML.php

From: Date: Fri, 10 Feb 2012 18:34:19 +0000
Subject: svn: /phd/trunk/phpdotnet/phd/Package/PEAR/ XHTML.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-9572@lists.php.net to get a copy of this message
avb Fri, 10 Feb 2012 18:34:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323155 Log: fixed misplaced <p> tags Changed paths: U phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php Modified: phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php =================================================================== --- phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php 2012-02-10 17:09:57 UTC (rev 323154) +++ phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php 2012-02-10 18:34:19 UTC (rev 323155) @@ -421,22 +421,6 @@ } /** - * Returns an opening <p> tag if a paragraph was opened before and closed due to non-phrasing content - * - * @return string - */ - protected function reopenParagraph() - { - if (!$this->openPara && 'p' == end($this->tagStack)) { - $this->openPara = true; - return '<p>'; - } - - return ''; - } - - - /** * Opens and closes <p></p> tags as needed * * Unlike DocBook, where all stuff can be inside <para></para> tags, <p></p> @@ -461,7 +445,12 @@ // we need to reopen paragraph for text content } elseif ('<' != $data[0]) { - return $this->reopenParagraph() . $data; + if ($this->openPara || 'p' != end($this->tagStack)) { + return $data; + } else { + $this->openPara = true; + return '<p>' . $data; + } // if <p> was closed before and not reopened, skip closing tag } elseif ('</p>' == trim($data) && !$this->openPara && 'p' == end($this->tagStack)) { @@ -497,7 +486,7 @@ } // adding tag stack to global tag stack - $openPara = $this->openPara && 'p' == end($this->tagStack); + $lastPara = 'p' == end($this->tagStack); $hasPara = false; foreach ($tagStack as $tagName) { if ('p' == $tagName) { @@ -515,9 +504,10 @@ } if ($hasPara) { return $data; - } elseif ($phrasing) { - return $this->reopenParagraph() . $data; - } elseif ($openPara) { + } elseif ($phrasing && $lastPara && !$this->openPara) { + $this->openPara = true; + return '<p>' . $data; + } elseif (!$phrasing && $lastPara && $this->openPara) { $this->openPara = false; return '</p>' . $data; } else {

« previous php.doc.cvs (#9572) next »