diff --git a/_test/cases/inc/parser/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index d08b2e358fef7ed7d282d34f59694919c3f2ec88..9aa3f8e14bc362b91b87fca0ccfb90b0fc6df4ba 100644
--- a/_test/cases/inc/parser/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
@@ -51,8 +51,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('cdata',array(" testing\ntesting ")),
array('footnote_close',array()),
array('cdata',array(' Bar')),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('p_close',array()),
array('document_end',array()),
);
@@ -86,18 +85,15 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('document_start',array()),
array('p_open',array()),
array('cdata',array('Foo ')),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('cdata',array('X')),
array('footnote_open',array()),
array('cdata',array(" test\ning ")),
array('footnote_close',array()),
array('cdata',array('Y')),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('cdata',array(' Bar')),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('p_close',array()),
array('document_end',array()),
);
@@ -135,9 +131,6 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('footnote_open',array()),
array('cdata',array(' ')),
array('hr',array()),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
@@ -156,9 +149,6 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('footnote_open',array()),
array('cdata',array(' ')),
array('code',array('Test',NULL)),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
@@ -177,9 +167,6 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('footnote_open',array()),
array('cdata',array(' ')),
array('preformatted',array('Test')),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
@@ -199,13 +186,9 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('footnote_open',array()),
array('cdata',array(' ')),
array('preformatted',array('Test')),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar')),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('p_close',array()),
array('document_end',array()),
);
@@ -263,36 +246,27 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('table_open',array(3,2)),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left')),
- array('cdata',array(' Row 0 Col 1')),
- array('cdata',array(' ')),
+ array('cdata',array(' Row 0 Col 1 ')),
array('tablecell_close',array()),
array('tablecell_open',array(1,'left')),
- array('cdata',array(' Row 0 Col 2')),
- array('cdata',array(' ')),
+ array('cdata',array(' Row 0 Col 2 ')),
array('tablecell_close',array()),
array('tablecell_open',array(1,'left')),
- array('cdata',array(' Row 0 Col 3')),
- array('cdata',array(' ')),
+ array('cdata',array(' Row 0 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
array('tablerow_open',array()),
array('tablecell_open',array(1,'left')),
- array('cdata',array(' Row 1 Col 1')),
- array('cdata',array(' ')),
+ array('cdata',array(' Row 1 Col 1 ')),
array('tablecell_close',array()),
array('tablecell_open',array(1,'left')),
- array('cdata',array(' Row 1 Col 2')),
- array('cdata',array(' ')),
+ array('cdata',array(' Row 1 Col 2 ')),
array('tablecell_close',array()),
array('tablecell_open',array(1,'left')),
- array('cdata',array(' Row 1 Col 3')),
- array('cdata',array(' ')),
+ array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
array('table_close',array()),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
@@ -333,9 +307,6 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('listcontent_close',array()),
array('listitem_close',array()),
array('listu_close',array()),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
@@ -362,9 +333,6 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('cdata',array("ghi")),
array('quote_close',array()),
array('quote_close',array()),
- array('p_open',array()),
- array('cdata',array(' ')),
- array('p_close',array()),
array('footnote_close',array()),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
diff --git a/_test/cases/inc/parser/parser_lists.test.php b/_test/cases/inc/parser/parser_lists.test.php
index f6dc1198fc18eb6973517f0080821dc372f60db5..e7729aa8ce2559d3cdcc0301a7706e8cd37b3f99 100644
--- a/_test/cases/inc/parser/parser_lists.test.php
+++ b/_test/cases/inc/parser/parser_lists.test.php
@@ -16,9 +16,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
');
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listu_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -38,9 +35,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
array('listcontent_close',array()),
array('listitem_close',array()),
array('listu_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -55,9 +49,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
');
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listo_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -77,9 +68,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
array('listcontent_close',array()),
array('listitem_close',array()),
array('listo_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -95,9 +83,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
');
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listo_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -117,9 +102,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
array('listcontent_close',array()),
array('listitem_close',array()),
array('listo_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -130,9 +112,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
$this->P->parse("\r\n *A\r\n * B\r\n * C\r\n");
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listu_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -152,9 +131,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
array('listcontent_close',array()),
array('listitem_close',array()),
array('listu_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -165,9 +141,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
$this->P->parse("\r\n -A\r\n - B\r\n - C\r\n");
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listo_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -187,9 +160,6 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
array('listcontent_close',array()),
array('listitem_close',array()),
array('listo_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -242,8 +212,7 @@ Bar');
array('listu_close',array()),
array('p_open',array()),
array('cdata',array("Bar")),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('p_close',array()),
array('document_end',array()),
);
@@ -262,9 +231,6 @@ Bar');
');
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listu_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -283,9 +249,6 @@ Bar');
array('listu_close',array()),
array('listitem_close',array()),
array('listu_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -303,9 +266,6 @@ Bar');
');
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listu_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
@@ -320,9 +280,6 @@ Bar');
array('listu_close',array()),
array('listitem_close',array()),
array('listu_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
@@ -338,15 +295,12 @@ Bar');
');
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('listu_open',array()),
array('listitem_open',array(1)),
array('listcontent_open',array()),
array('cdata',array("A")),
array('linebreak',array()),
- array('cdata',array("D")),
+ array('cdata',array(" D")),
array('listcontent_close',array()),
array('listu_open',array()),
array('listitem_open',array(2)),
@@ -362,15 +316,12 @@ Bar');
array('listcontent_close',array()),
array('listitem_close',array()),
array('listu_close',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('document_end',array()),
);
$this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
}
- // Huh?
+ // This breaks the parser/render chain badly #701
function testUnorderedListFootnote() {
$this->P->addMode('listblock',new Doku_Parser_Mode_ListBlock());
$this->P->addMode('footnote',new Doku_Parser_Mode_Footnote());
diff --git a/_test/cases/inc/parser/parser_quote.test.php b/_test/cases/inc/parser/parser_quote.test.php
index a974112c6402f3345203bcdeda27968ea5dab341..e7ab72784c84e9b8f91ca6b69853e3fa752c0715 100644
--- a/_test/cases/inc/parser/parser_quote.test.php
+++ b/_test/cases/inc/parser/parser_quote.test.php
@@ -58,18 +58,12 @@ class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
$this->P->parse("\n> def\n>>ghi\n ");
$calls = array (
array('document_start',array()),
- array('p_open',array()),
- array('cdata',array("\n")),
- array('p_close',array()),
array('quote_open',array()),
array('cdata',array(" def")),
array('quote_open',array()),
array('cdata',array("ghi")),
array('quote_close',array()),
array('quote_close',array()),
- array('p_open',array()),
- array('cdata',array(" \n")),
- array('p_close',array()),
array('document_end',array()),
);
@@ -93,8 +87,7 @@ class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
array('quote_close',array()),
array('p_open',array()),
array('cdata',array("klm")),
- array('p_close',array()),
- array('p_open',array()),
+ array('cdata',array(' ')),
array('p_close',array()),
array('document_end',array()),