From f404b174cc58dc5a9f0db1e8a9bba533fab3df49 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 16 Jan 2020 15:53:29 +0100 Subject: [PATCH] Respect paragraphs in abstract when rendering --- .../ContentElements/ParseFunc.typoscript | 44 +++++++++++++------ Resources/Private/Partials/Menu/Page.html | 2 +- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript b/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript index 65fd2c7..062bc79 100644 --- a/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript +++ b/Configuration/TypoScript/Setup/ContentElements/ParseFunc.typoscript @@ -1,3 +1,17 @@ +temp.removeBlankLines { + search = #\r\n\r\n# + replace { + cObject = COA + cObject { + 1 = TEXT + 1.char = 13 + 2 = TEXT + 2.char = 10 + } + } + useRegExp = 1 +} + # Creates persistent ParseFunc setup for non-HTML content. lib.parseFunc { makelinks = 1 @@ -72,19 +86,7 @@ lib.parseFunc_RTE { plainTextStdWrap { replacement { - 10 { - search = #\r\n\r\n# - replace { - cObject = COA - cObject { - 1 = TEXT - 1.char = 13 - 2 = TEXT - 2.char = 10 - } - } - useRegExp = 1 - } + 10 < temp.removeBlankLines 11 { search = #\r\n# replace = @@ -107,3 +109,19 @@ lib.parseFunc_RTE { } } } + +lib.parseFunc_abstract < lib.parseFunc +lib.parseFunc_abstract { + plainTextStdWrap { + replacement { + 10 < temp.removeBlankLines + } + } + + nonTypoTagStdWrap { + encapsLines { + encapsTagList = p + nonWrappedTag = P + } + } +} diff --git a/Resources/Private/Partials/Menu/Page.html b/Resources/Private/Partials/Menu/Page.html index c262e2f..3f6a4a9 100644 --- a/Resources/Private/Partials/Menu/Page.html +++ b/Resources/Private/Partials/Menu/Page.html @@ -9,7 +9,7 @@ })}
- {page.data.abstract -> f:format.html()} + {page.data.abstract -> f:format.html(parseFuncTSPath: 'lib.parseFunc_abstract')} {f:render(partial: 'Image', arguments: {image: page.media.0})}