From 9d39eac0b9919bfe9a4b7a91f7429541d6395ea3 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Thu, 21 Nov 2019 16:00:22 +0100
Subject: [PATCH] Fix blank p tags after p tag, before pre

Also process p tags, and strip off new line.
---
 .../Setup/ContentElements/ParseFunc.typoscript  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript b/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript
index f5659f5..37fed18 100644
--- a/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript
+++ b/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript
@@ -45,32 +45,25 @@ lib.parseFunc {
 lib.parseFunc_RTE < lib.parseFunc
 lib.parseFunc_RTE {
     # Processing <ol>, <ul> and <table> blocks separately
-    externalBlocks = blockquote, div, dd, dl, ol, ul, pre
+    externalBlocks = blockquote, div, dd, dl, ol, ul, pre, p
     externalBlocks {
         ol {
             stripNL = 1
             stdWrap.parseFunc = < lib.parseFunc
         }
-        ul {
-            stripNL = 1
-            stdWrap.parseFunc = < lib.parseFunc
-        }
+        ul < .ol
         pre {
+            stripNl = 1
             stdWrap.parseFunc < lib.parseFunc
         }
         div {
             stripNL = 1
             callRecursive = 1
         }
-        article < .div
-        aside < .div
         blockquote < .div
-        footer < .div
-        header < .div
-        nav < .div
-        section < .div
         dl < .div
         dd < .div
+        p < .div
     }
     plainTextStdWrap {
         replacement {
@@ -91,7 +84,7 @@ lib.parseFunc_RTE {
     }
     nonTypoTagStdWrap {
         encapsLines {
-            encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
+            encapsTagList = p,h1,h2,h3,h4,h5,h6,hr,dt
             remapTag.DIV = P
             nonWrappedTag = P
             innerStdWrap_all.ifBlank = &nbsp;