Merge branch 'master' of git@github.com:splitbrain/dokuwiki

13 files changed, 187 insertions, 187 deletions

diff --git a/_test/cases/inc/parser/parser_eol.test.php b/_test/cases/inc/parser/parser_eol.test.php
index 8d3a812b2..692882c6c 100644
--- a/_test/cases/inc/parser/parser_eol.test.php
+++ b/_test/cases/inc/parser/parser_eol.test.php
@@ -13,7 +13,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("Foo".DOKU_PARSER_EOL."Bar".DOKU_PARSER_EOL)),
+            array('cdata',array("Foo".DOKU_PARSER_EOL."Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -29,7 +29,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('cdata',array("Foo")),
             array('p_close',array()),
             array('p_open',array()),
-            array('cdata',array("bar".DOKU_PARSER_EOL."Foo".DOKU_PARSER_EOL)),
+            array('cdata',array("bar".DOKU_PARSER_EOL."Foo")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -42,7 +42,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("Foo".DOKU_PARSER_EOL."Bar".DOKU_PARSER_EOL)),
+            array('cdata',array("Foo".DOKU_PARSER_EOL."Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -57,7 +57,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\nFoo")),
             array('linebreak',array()),
-            array('cdata',array("Bar\n")),
+            array('cdata',array("Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -76,7 +76,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('linebreak',array()),
             array('p_close',array()),
             array('p_open',array()),
-            array('cdata',array("Bar".DOKU_PARSER_EOL)),
+            array('cdata',array("Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -89,7 +89,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\n".'Foo\\\\Bar'."\n")),
+            array('cdata',array("\n".'Foo\\\\Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index a1da2ab06..e3571d8e7 100644
--- a/_test/cases/inc/parser/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
@@ -23,7 +23,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' testing ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -35,7 +35,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nFoo (( testing\n Bar\n")),
+            array('cdata',array("\nFoo (( testing\n Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -54,7 +54,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(" testing\ntesting ")),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'.DOKU_PARSER_EOL)),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -72,7 +72,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' x((y')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array('z )) Bar'."\n")),
+            array('cdata',array('z )) Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -91,7 +91,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(" test\ning ")),
               array('footnote_close',array()),
             ))),
-            array('cdata',array('Y'.DOKU_PARSER_EOL.' Bar'.DOKU_PARSER_EOL)),
+            array('cdata',array('Y'.DOKU_PARSER_EOL.' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -114,7 +114,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -135,7 +135,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array("\n ")),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -156,7 +156,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -177,7 +177,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -199,7 +199,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'.DOKU_PARSER_EOL)),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -221,7 +221,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -240,7 +240,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(" \n====Test====\n ")),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -286,7 +286,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -328,7 +328,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -356,7 +356,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
               array('cdata',array(' ')),
               array('footnote_close',array()),
             ))),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -381,7 +381,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
             ))),
             array('cdata',array(" ")),
             array('strong_close',array()),
-            array('cdata',array(" c ))\n")),
+            array('cdata',array(" c ))")),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_formatting.test.php b/_test/cases/inc/parser/parser_formatting.test.php
index f2eda81b8..69c57dfb5 100644
--- a/_test/cases/inc/parser/parser_formatting.test.php
+++ b/_test/cases/inc/parser/parser_formatting.test.php
@@ -17,7 +17,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('strong_open',array()),
             array('cdata',array('bar')),
             array('strong_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -30,7 +30,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc **bar def\n")),
+            array('cdata',array("\nabc **bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -47,7 +47,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('bar')),
             array('emphasis_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -64,7 +64,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('Тест: ')),
             array('emphasis_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -81,7 +81,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('b')),
             array('emphasis_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -98,7 +98,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('foo:')),
             array('emphasis_close',array()),
-            array('cdata',array(' bar// def'."\n")),
+            array('cdata',array(' bar// def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -118,7 +118,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('externallink',array('http://www.google.com', NULL)),
             array('cdata',array(' bar')),
             array('emphasis_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -131,7 +131,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc //bar def\n")),
+            array('cdata',array("\nabc //bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -148,7 +148,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('bar')),
             array('emphasis_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
                         array('p_close',array()),
             array('document_end',array()),
         );
@@ -161,7 +161,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc //http:// def\n")),
+            array('cdata',array("\nabc //http:// def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -185,7 +185,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('text:')),
             array('emphasis_close',array()),
-            array('cdata',array(" another Blablabla Blablabla\n")),
+            array('cdata',array(" another Blablabla Blablabla")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -203,7 +203,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_open',array()),
             array('cdata',array('Тест:')),
             array('emphasis_close',array()),
-            array('cdata',array("\n")),
+            array('cdata', array('')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -248,7 +248,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('underline_open',array()),
             array('cdata',array('bar')),
             array('underline_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -261,7 +261,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc __bar def\n")),
+            array('cdata',array("\nabc __bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -278,7 +278,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('monospace_open',array()),
             array('cdata',array('bar')),
             array('monospace_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -291,7 +291,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc ''bar def\n")),
+            array('cdata',array("\nabc ''bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -308,7 +308,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('subscript_open',array()),
             array('cdata',array('bar')),
             array('subscript_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -321,7 +321,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc <sub>bar def\n")),
+            array('cdata',array("\nabc <sub>bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -338,7 +338,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('superscript_open',array()),
             array('cdata',array('bar')),
             array('superscript_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -351,7 +351,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc <sup>bar def\n")),
+            array('cdata',array("\nabc <sup>bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -368,7 +368,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('deleted_open',array()),
             array('cdata',array('bar')),
             array('deleted_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -381,7 +381,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc <del>bar def\n")),
+            array('cdata',array("\nabc <del>bar def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -403,7 +403,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('emphasis_close',array()),
             array('cdata',array('c')),
             array('strong_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -424,7 +424,7 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
             array('strong_open',array()),
             array('cdata',array('c')),
             array('strong_close',array()),
-            array('cdata',array(' def'."\n")),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_headers.test.php b/_test/cases/inc/parser/parser_headers.test.php
index e1c6783f5..688bac2eb 100644
--- a/_test/cases/inc/parser/parser_headers.test.php
+++ b/_test/cases/inc/parser/parser_headers.test.php
@@ -13,12 +13,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -32,12 +32,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',2,6)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -51,12 +51,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',3,6)),
             array('section_open',array(3)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -70,12 +70,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',4,6)),
             array('section_open',array(4)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -89,12 +89,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',5,6)),
             array('section_open',array(5)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -108,12 +108,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',2,6)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -127,12 +127,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',2,6)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -146,12 +146,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -165,7 +165,7 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n= Header =\n def\n")),
+            array('cdata',array("\nabc \n= Header =\n def")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -179,12 +179,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('== Header ==',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -198,12 +198,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('====== Header ======',5,6)),
             array('section_open',array(5)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -217,12 +217,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n== ====== Header\n")),
+            array('cdata',array("\nabc \n== ====== Header")),
             array('p_close',array()),
             array('header',array('',1,23)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -243,12 +243,12 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array('abc '.DOKU_PARSER_EOL)),
+            array('cdata',array('abc ')),
             array('p_close',array()),
             array('header',array('Header',1, 6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array(' def'.DOKU_PARSER_EOL)),
+            array('cdata',array(' def')),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -263,18 +263,18 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc \n")),
+            array('cdata',array("\nabc ")),
             array('p_close',array()),
             array('header',array('Header',1,6)),
             array('section_open',array(1)),
             array('p_open',array()),
-            array('cdata',array("\n def abc \n")),
+            array('cdata',array("\n def abc ")),
             array('p_close',array()),
             array('section_close',array()),
             array('header',array('Header2',2,39)),
             array('section_open',array(2)),
             array('p_open',array()),
-            array('cdata',array("\n def\n")),
+            array('cdata',array("\n def")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array())
diff --git a/_test/cases/inc/parser/parser_i18n.test.php b/_test/cases/inc/parser/parser_i18n.test.php
index f0cceb69e..27ec3c78b 100644
--- a/_test/cases/inc/parser/parser_i18n.test.php
+++ b/_test/cases/inc/parser/parser_i18n.test.php
@@ -47,7 +47,7 @@ class TestOfDoku_Parser_i18n extends TestOfDoku_Parser {
             array('deleted_open',array()),
             array('cdata',array('æ')),
             array('deleted_close',array()),
-            array('cdata',array("tiøn\n")),
+            array('cdata',array("tiøn")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -60,12 +60,12 @@ class TestOfDoku_Parser_i18n extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nFoo\n")),
+            array('cdata',array("\nFoo")),
             array('p_close',array()),
             array('header',array('Iñtërnâtiônàlizætiøn',3,5)),
             array('section_open',array(3)),
             array('p_open',array()),
-            array('cdata',array("\n Bar\n")),
+            array('cdata',array("\n Bar")),
             array('p_close',array()),
             array('section_close',array()),
             array('document_end',array()),
@@ -110,7 +110,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(153)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -126,7 +126,7 @@ def');
             array('p_open',array()),
             array('cdata',array("\nFoo ")),
             array('acronym',array('Iñtërnâtiônàlizætiøn')),
-            array('cdata',array(" Bar\n")),
+            array('cdata',array(" Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -141,7 +141,7 @@ def');
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('interwikilink',array('wp>Iñtërnâtiônàlizætiøn','Iñtërnâtiônàlizætiøn','wp','Iñtërnâtiônàlizætiøn')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -156,7 +156,7 @@ def');
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('x:Iñtërnâtiônàlizætiøn:y:foo_bar:z','Iñtërnâtiônàlizætiøn')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index 81186ef5e..a4a8c5826 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -16,7 +16,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('http://www.google.com', NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -31,7 +31,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('HTTP://WWW.GOOGLE.COM', NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -46,7 +46,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('http://123.123.3.21/foo', NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -61,7 +61,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('http://[3ffe:2a00:100:7031::1]/foo', NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -106,7 +106,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
                     array('p_open',array()),
                     array('cdata',array("\n".'Foo ')),
                     array('externallink',array($link, $name)),
-                    array('cdata',array(' Bar'."\n")),
+                    array('cdata',array(' Bar')),
                     array('p_close',array()),
                     array('document_end',array()),
                 );
@@ -124,7 +124,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nFoo javascript:alert('XSS'); Bar\n")),
+            array('cdata',array("\nFoo javascript:alert('XSS'); Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -139,7 +139,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('http://www.google.com', 'www.google.com')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -154,7 +154,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('ftp://ftp.sunsite.com', 'ftp.sunsite.com')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -168,7 +168,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('emaillink',array('bugs@php.net', NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -183,7 +183,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('emaillink',array("~fix+bug's.for/ev{e}r@php.net", NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -198,7 +198,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('emaillink',array('bugs@pHp.net', NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -214,7 +214,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('l',NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -229,7 +229,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('foo:bar',NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -244,7 +244,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('x:1:y:foo_bar:z','Test')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -259,7 +259,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('wiki:syntax#internal','Syntax')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -274,7 +274,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('http://www.google.com','Google')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -289,7 +289,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('interwikilink',array('iw>somepage','Some Page','iw','somepage')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -304,7 +304,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('interwikilink',array('IW>somepage','Some Page','iw','somepage')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -319,7 +319,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('interwikilink',array('wp>Callback_(computer_science)','callbacks','wp','Callback_(computer_science)')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -334,7 +334,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('camelcaselink',array('FooBar')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -349,7 +349,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('filelink',array('file://temp/file.txt ',NULL)),
-            array('cdata',array('Bar'."\n")),
+            array('cdata',array('Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -364,7 +364,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externallink',array('file://temp/file.txt','Some File')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -379,7 +379,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('windowssharelink',array('\\\server\share',NULL)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -394,7 +394,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('windowssharelink',array('\\\server\share','My Documents')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -409,7 +409,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif',NULL,NULL,NULL,NULL,'cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -424,7 +424,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif',NULL,NULL,NULL,NULL,'cache','linkonly')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -439,7 +439,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('foo.txt','Some File',null,10,10,'cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -454,7 +454,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif',NULL,'left',NULL,NULL,'cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -469,7 +469,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif',NULL,'right',NULL,NULL,'cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -484,7 +484,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif',NULL,'center',NULL,NULL,'cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -499,7 +499,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif',NULL,NULL,'50','100','nocache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -514,7 +514,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',array('img.gif','Some Image',NULL,'50','100','cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -529,7 +529,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externalmedia',array('http://www.google.com/img.gif',NULL,NULL,NULL,NULL,'cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -544,7 +544,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('externalmedia',array('http://www.google.com/img.gif',NULL,NULL,'50','100','nocache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -560,7 +560,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('cdata',array("\n".'Foo ')),
             array('externalmedia',
             array('http://www.google.com/img.gif','Some Image',NULL,'50','100','cache','details')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -587,7 +587,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('x:1:y:foo_bar:z',$image)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -614,7 +614,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('internallink',array('x:1:y:foo_bar:z',$image)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -641,7 +641,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('emaillink',array('foo@example.com',$image)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -657,7 +657,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
             array('cdata',array("\n".'Foo ')),
             array('internalmedia',
             array('img.gif','{{foo.gif|{{bar.gif|Bar',NULL,NULL,NULL,'cache','details')),
-            array('cdata',array('}}}} Bar'."\n")),
+            array('cdata',array('}}}} Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_lists.test.php b/_test/cases/inc/parser/parser_lists.test.php
index 34f0eb760..6e61da1a1 100644
--- a/_test/cases/inc/parser/parser_lists.test.php
+++ b/_test/cases/inc/parser/parser_lists.test.php
@@ -171,7 +171,7 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nFoo  -bar  *foo Bar\n")),
+            array('cdata',array("\nFoo  -bar  *foo Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -211,7 +211,7 @@ Bar');
             array('listitem_close',array()),
             array('listu_close',array()),
             array('p_open',array()),
-            array('cdata',array("Bar".DOKU_PARSER_EOL)),
+            array('cdata',array("Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_preformatted.test.php b/_test/cases/inc/parser/parser_preformatted.test.php
index 8e3bd591b..7a00f3599 100644
--- a/_test/cases/inc/parser/parser_preformatted.test.php
+++ b/_test/cases/inc/parser/parser_preformatted.test.php
@@ -17,7 +17,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('file',array('testing',null,null)),
             array('p_open',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -35,7 +35,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('code',array('testing', null, null)),
             array('p_open',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -52,7 +52,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('code',array('testing', null, null)),
             array('p_open',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -69,7 +69,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('code',array('testing', 'php', null)),
             array('p_open',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -86,7 +86,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('preformatted',array("x  \n  y  ")),
             array('p_open',array()),
-            array('cdata',array('Bar'."\n\n")),
+            array('cdata',array('Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -103,7 +103,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('preformatted',array("x  \n  y  ")),
             array('p_open',array()),
-            array('cdata',array('Bar'."\n\n")),
+            array('cdata',array('Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -120,7 +120,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('preformatted',array("x\t\n\ty\t")),
             array('p_open',array()),
-            array('cdata',array("Bar\n\n")),
+            array('cdata',array("Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -137,7 +137,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('preformatted',array("x\t\n\ty\t")),
             array('p_open',array()),
-            array('cdata',array("Bar\n\n")),
+            array('cdata',array("Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -169,7 +169,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_close',array()),
             array('preformatted',array("x  \n  y  \n-X\n*Y")),
             array('p_open',array()),
-            array('cdata',array("Bar\n\n")),
+            array('cdata',array("Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -186,7 +186,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('php',array('testing')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -203,7 +203,7 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('html',array('testing')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_quote.test.php b/_test/cases/inc/parser/parser_quote.test.php
index 5d5a7e2a5..ebc5da604 100644
--- a/_test/cases/inc/parser/parser_quote.test.php
+++ b/_test/cases/inc/parser/parser_quote.test.php
@@ -22,7 +22,7 @@ class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
             array('quote_close',array()),
             array('quote_close',array()),
             array('p_open',array()),
-            array('cdata',array("klm\n")),
+            array('cdata',array("klm")),
             array('p_close',array()),
             array('document_end',array()),
             
@@ -45,7 +45,7 @@ class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
             array('quote_close',array()),
             array('quote_close',array()),
             array('p_open',array()),
-            array('cdata',array("klm\n")),
+            array('cdata',array("klm")),
             array('p_close',array()),
             array('document_end',array()),
             
@@ -86,7 +86,7 @@ class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
             array('quote_close',array()),
             array('quote_close',array()),
             array('p_open',array()),
-            array('cdata',array("klm".DOKU_PARSER_EOL)),
+            array('cdata',array("klm")),
             array('p_close',array()),
             array('document_end',array()),
             
diff --git a/_test/cases/inc/parser/parser_quotes.test.php b/_test/cases/inc/parser/parser_quotes.test.php
index 9f191d6b0..77e323799 100644
--- a/_test/cases/inc/parser/parser_quotes.test.php
+++ b/_test/cases/inc/parser/parser_quotes.test.php
@@ -22,7 +22,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('singlequoteopening',array()),
-            array('cdata',array('hello Bar'."\n")),
+            array('cdata',array('hello Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -39,7 +39,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo said:')),
             array('singlequoteopening',array()),
-            array('cdata',array('hello Bar'."\n")),
+            array('cdata',array('hello Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -56,7 +56,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo hello')),
             array('singlequoteclosing',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -73,7 +73,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo hello')),
             array('singlequoteclosing',array()),
-            array('cdata',array(') Bar'."\n")),
+            array('cdata',array(') Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -92,7 +92,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('singlequoteopening',array()),
             array('cdata',array('hello')),
             array('singlequoteclosing',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -109,7 +109,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'hey it')),
             array('apostrophe',array()),
-            array('cdata',array('s fine weather today'."\n")),
+            array('cdata',array('s fine weather today')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -129,7 +129,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('singlequoteopening',array()),
             array('cdata',array('hello')),
             array('singlequoteclosing',array()),
-            array('cdata',array(') Bar'."\n")),
+            array('cdata',array(') Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -146,7 +146,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('doublequoteopening',array()),
-            array('cdata',array('hello Bar'."\n")),
+            array('cdata',array('hello Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -163,7 +163,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo said:')),
             array('doublequoteopening',array()),
-            array('cdata',array('hello Bar'."\n")),
+            array('cdata',array('hello Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -180,7 +180,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo hello')),
             array('doublequoteclosing',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -197,7 +197,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo hello')),
             array('doublequoteclosing',array()),
-            array('cdata',array(') Bar'."\n")),
+            array('cdata',array(') Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -216,7 +216,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('doublequoteopening',array()),
             array('cdata',array('hello')),
             array('doublequoteclosing',array()),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -235,7 +235,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('doublequoteopening',array()),
             array('cdata',array('hello')),
             array('doublequoteclosing',array()),
-            array('cdata',array(') Bar'."\n")),
+            array('cdata',array(') Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -261,7 +261,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('cdata',array('s world')),
             array('singlequoteclosing',array()),
             array('doublequoteclosing',array()),
-            array('cdata',array(".\n")),
+            array('cdata',array(".")),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_replacements.test.php b/_test/cases/inc/parser/parser_replacements.test.php
index 6aa9069a1..d277560c7 100644
--- a/_test/cases/inc/parser/parser_replacements.test.php
+++ b/_test/cases/inc/parser/parser_replacements.test.php
@@ -17,7 +17,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'abc ')),
             array('acronym',array('FOOBAR')),
-            array('cdata',array(' xyz'."\n")),
+            array('cdata',array(' xyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -32,7 +32,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\n".'abcFOOBARxyz'."\n")),
+            array('cdata',array("\n".'abcFOOBARxyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -49,7 +49,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'FOOBAR ')),
             array('acronym',array('FOO')),
-            array('cdata',array("\n")),
+            array('cdata',array('')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -68,7 +68,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('acronym',array('FOO')),
             array('cdata',array(' def ')),
             array('acronym',array('BAR')),
-            array('cdata',array(' xyz'."\n")),
+            array('cdata',array(' xyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -92,7 +92,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('acronym',array('FOO.1')),
             array('cdata',array(" ")),
             array('acronym',array('A.FOO.1')),
-            array('cdata',array("\n")),
+            array('cdata',array('')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -115,7 +115,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('acronym',array('FOO.1')),
             array('cdata',array(" ")),
             array('acronym',array('A.FOO.1')),
-            array('cdata',array("\n")),
+            array('cdata',array('')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -130,7 +130,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc:-)xyz\n")),
+            array('cdata',array("\nabc:-)xyz")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -147,7 +147,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'abc ')),
             array('smiley',array(':-)')),
-            array('cdata',array(' xyz'."\n")),
+            array('cdata',array(' xyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -162,7 +162,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc:-)x^_^yz\n")),
+            array('cdata',array("\nabc:-)x^_^yz")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -181,7 +181,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('smiley',array(':-)')),
             array('cdata',array(' x ')),
             array('smiley',array('^_^')),
-            array('cdata',array(' yz'."\n")),
+            array('cdata',array(' yz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -197,7 +197,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\nabc".':-\\\\'."xyz\n")),
+            array('cdata',array("\nabc".':-\\\\'."xyz")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -215,7 +215,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'abc ')),
             array('smiley',array(':-\\\\')),
-            array('cdata',array(' xyz'."\n")),
+            array('cdata',array(' xyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -232,7 +232,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'abc ')),
             array('wordblock',array('CAT')),
-            array('cdata',array(' xyz'."\n")),
+            array('cdata',array(' xyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -249,7 +249,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'abc ')),
             array('wordblock',array('cat')),
-            array('cdata',array(' xyz'."\n")),
+            array('cdata',array(' xyz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -268,7 +268,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('wordblock',array('cat')),
             array('cdata',array(' x ')),
             array('wordblock',array('DOG')),
-            array('cdata',array(' yz'."\n")),
+            array('cdata',array(' yz')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -285,7 +285,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'x ')),
             array('entity',array('->')),
-            array('cdata',array(' y'."\n")),
+            array('cdata',array(' y')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -304,7 +304,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('entity',array('->')),
             array('cdata',array(' y ')),
             array('entity',array('<-')),
-            array('cdata',array(' z'."\n")),
+            array('cdata',array(' z')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -321,7 +321,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('multiplyentity',array(10,20)),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -337,7 +337,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array("\n".'Foo 0x123 Bar'."\n")),
+            array('cdata',array("\n".'Foo 0x123 Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -356,7 +356,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_close',array()),
             array('hr',array()),
             array('p_open',array()),
-            array('cdata',array("\n Bar\n")),
+            array('cdata',array("\n Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -374,7 +374,7 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
             array('p_close',array()),
             array('hr',array()),
             array('p_open',array()),
-            array('cdata',array("\n Bar\n")),
+            array('cdata',array("\n Bar")),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index 04bce650a..12898860c 100644
--- a/_test/cases/inc/parser/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
@@ -44,7 +44,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(121)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -84,7 +84,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(121)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -108,7 +108,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(7)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -142,7 +142,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(19)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -177,7 +177,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(23)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -220,7 +220,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(31)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -268,7 +268,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(51)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -306,7 +306,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(27)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -326,7 +326,7 @@ def');
         $calls = array (
             array('document_start',array()),
             array('p_open',array()),
-            array('cdata',array(DOKU_PARSER_EOL."abc")),
+            array('cdata',array("abc")),
             array('p_close',array()),
             array('table_open',array(3, 2, 6)),
             array('tablerow_open',array()),
@@ -353,7 +353,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(121)),
             array('p_open',array()),
-            array('cdata',array('def'.DOKU_PARSER_EOL)),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -408,7 +408,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(129)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -459,7 +459,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(155)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -506,7 +506,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(123)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -566,7 +566,7 @@ def');
             array('tablerow_close',array()),
             array('table_close',array(129)),
             array('p_open',array()),
-            array('cdata',array('def'."\n")),
+            array('cdata',array('def')),
             array('p_close',array()),
             array('document_end',array()),
         );
diff --git a/_test/cases/inc/parser/parser_unformatted.test.php b/_test/cases/inc/parser/parser_unformatted.test.php
index 56820a27a..dd69564b4 100644
--- a/_test/cases/inc/parser/parser_unformatted.test.php
+++ b/_test/cases/inc/parser/parser_unformatted.test.php
@@ -15,7 +15,7 @@ class TestOfDoku_Parser_Unformatted extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('unformatted',array('testing')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -32,7 +32,7 @@ class TestOfDoku_Parser_Unformatted extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\n".'Foo ')),
             array('unformatted',array('testing')),
-            array('cdata',array(' Bar'."\n")),
+            array('cdata',array(' Bar')),
             array('p_close',array()),
             array('document_end',array()),
         );