dokuwiki · fts-tmassey · Sep 11, 2023 · Sep 11, 2023 · Sep 11, 2023 · Sep 11, 2023
diff --git a/inc/Parsing/Lexer/Lexer.php b/inc/Parsing/Lexer/Lexer.php
@@ -149,6 +149,13 @@ public function parse($raw)
             if ($currentLength === $length) {
                 return false;
             }
+            // If we are closing a block and the last character consumed by our matched
+            //  string is a newline, put it back.  See the following for details:
+            //  https://github.com/dokuwiki/dokuwiki/issues/4054
+            if ($mode == "__exit" && substr($matched, -1) == "\n") {
 if (!function_exists('str_ends_with')) { 
     function str_ends_with(string $haystack, string $needle) 
 /** 
  * polyfill for PHP < 8 
  * @see https://www.php.net/manual/en/function.str-starts-with 
  */ 
 if (!function_exists('str_starts_with')) { 
     function str_starts_with(string $haystack, string $needle) 
     { 
         return empty($needle) || strpos($haystack, $needle) === 0; 
     } 
 } 
 /** 
  * polyfill for PHP < 8 
  * @see https://www.php.net/manual/en/function.str-contains 
  */ 
 if (!function_exists('str_contains')) { 
     function str_contains(string $haystack, string $needle) 
     { 
         return empty($needle) || strpos($haystack, $needle) !== false; 
     } 
 } 
 /** 
  * polyfill for PHP < 8 
  * @see https://www.php.net/manual/en/function.str-ends-with 
  */ 
 if (!function_exists('str_ends_with')) { 
     function str_ends_with(string $haystack, string $needle) 
     { 
         return empty($needle) || substr($haystack, -strlen($needle)) === $needle; 
     } 
 } 
 if (!function_exists('str_ends_with')) { 
     function str_ends_with(string $haystack, string $needle) 
 /** 
  * polyfill for PHP < 8 
  * @see https://www.php.net/manual/en/function.str-starts-with 
  */ 
 if (!function_exists('str_starts_with')) { 
     function str_starts_with(string $haystack, string $needle) 
     { 
         return empty($needle) || strpos($haystack, $needle) === 0; 
     } 
 } 
  
 /** 
  * polyfill for PHP < 8 
  * @see https://www.php.net/manual/en/function.str-contains 
  */ 
 if (!function_exists('str_contains')) { 
     function str_contains(string $haystack, string $needle) 
     { 
         return empty($needle) || strpos($haystack, $needle) !== false; 
     } 
 } 
  
 /** 
  * polyfill for PHP < 8 
  * @see https://www.php.net/manual/en/function.str-ends-with 
  */ 
 if (!function_exists('str_ends_with')) { 
     function str_ends_with(string $haystack, string $needle) 
     { 
         return empty($needle) || substr($haystack, -strlen($needle)) === $needle; 
     } 
 } 
+                $raw = "\n" . $raw;
+                $currentLength++;
+            }
             $length = $currentLength;
             $pos = $initialLength - $currentLength;
         }

diff --git a/inc/Parsing/ParserMode/Preformatted.php b/inc/Parsing/ParserMode/Preformatted.php
@@ -12,8 +12,8 @@ public function connectTo($mode)
         $this->Lexer->addEntryPattern('\n\t(?![\*\-])', $mode, 'preformatted');
 
         // How to effect a sub pattern with the Lexer!
-        $this->Lexer->addPattern('\n  ', 'preformatted');
-        $this->Lexer->addPattern('\n\t', 'preformatted');
+        $this->Lexer->addPattern('\n  (?![\*\-])', 'preformatted');
+        $this->Lexer->addPattern('\n\t(?![\*\-])', 'preformatted');
     }
 
     /** @inheritdoc */