From b768eb2a42da1de3c66eab26df78b58bcaae7179 Mon Sep 17 00:00:00 2001 From: christophboecker Date: Thu, 24 Sep 2020 19:33:49 +0200 Subject: [PATCH 01/10] setBreaksEnabled( ) einstellbar machen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Statt setBreaksEnabled fix auf TRUE einzustellen, kann man nun über `rex::setProperty('rex_markdown_setBreaksEnabled',false)` den Default-Wert (true) überschreiben. --- redaxo/src/core/lib/util/markdown.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redaxo/src/core/lib/util/markdown.php b/redaxo/src/core/lib/util/markdown.php index 39da494fd2..f6039aff01 100644 --- a/redaxo/src/core/lib/util/markdown.php +++ b/redaxo/src/core/lib/util/markdown.php @@ -34,7 +34,7 @@ public static function factory() public function parse($code) { $parser = new ParsedownExtra(); - $parser->setBreaksEnabled(true); + $parser->setBreaksEnabled( rex::getProperty('rex_markdown_setBreaksEnabled',true) ); return rex_string::sanitizeHtml($parser->text($code)); } @@ -51,7 +51,7 @@ public function parse($code) public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3) { $parser = new rex_parsedown_with_toc(); - $parser->setBreaksEnabled(true); + $parser->setBreaksEnabled( rex::getProperty('rex_markdown_setBreaksEnabled',true) ); $parser->topLevel = $topLevel; $parser->bottomLevel = $bottomLevel; From 3c318e07ceedeae6b372cd6ff33617e8099b2f5a Mon Sep 17 00:00:00 2001 From: christophboecker Date: Thu, 24 Sep 2020 20:03:49 +0200 Subject: [PATCH 02/10] Leerzeichen entfernt --- redaxo/src/core/lib/util/markdown.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redaxo/src/core/lib/util/markdown.php b/redaxo/src/core/lib/util/markdown.php index f6039aff01..cbbcbde576 100644 --- a/redaxo/src/core/lib/util/markdown.php +++ b/redaxo/src/core/lib/util/markdown.php @@ -34,7 +34,7 @@ public static function factory() public function parse($code) { $parser = new ParsedownExtra(); - $parser->setBreaksEnabled( rex::getProperty('rex_markdown_setBreaksEnabled',true) ); + $parser->setBreaksEnabled(rex::getProperty('rex_markdown_setBreaksEnabled',true)); return rex_string::sanitizeHtml($parser->text($code)); } @@ -51,7 +51,7 @@ public function parse($code) public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3) { $parser = new rex_parsedown_with_toc(); - $parser->setBreaksEnabled( rex::getProperty('rex_markdown_setBreaksEnabled',true) ); + $parser->setBreaksEnabled(rex::getProperty('rex_markdown_setBreaksEnabled',true)); $parser->topLevel = $topLevel; $parser->bottomLevel = $bottomLevel; From c61a1e8997fcaf0f8efead1ae8fb3ad06ebe10b9 Mon Sep 17 00:00:00 2001 From: christophboecker Date: Fri, 25 Sep 2020 18:21:09 +0200 Subject: [PATCH 03/10] SET_BREAKS_ENABLED per Funktions-Parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zwei Konstanten SET_BREAKS_ENABLED und SET_BREAKS_DISABLED, die beim Aufruf des Parsers übergeben werdern können. Vorbelegung ist SET_BREAKS_ENABLED, so dass das gewohnte Verhalten weiter besteht, wenn nicht ausdrücklich beim Parser-Aufruf geändert. --- redaxo/src/core/lib/util/markdown.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/redaxo/src/core/lib/util/markdown.php b/redaxo/src/core/lib/util/markdown.php index cbbcbde576..d410d34eb0 100644 --- a/redaxo/src/core/lib/util/markdown.php +++ b/redaxo/src/core/lib/util/markdown.php @@ -11,6 +11,9 @@ class rex_markdown { use rex_factory_trait; + public const SET_BREAKS_ENABLED = true; + public const SET_BREAKS_DISABLED = false; + private function __construct() { } @@ -31,10 +34,10 @@ public static function factory() * * @return string HTML code */ - public function parse($code) + public function parse($code, bool $setBreaks = self::SET_BREAKS_ENABLED) { $parser = new ParsedownExtra(); - $parser->setBreaksEnabled(rex::getProperty('rex_markdown_setBreaksEnabled',true)); + $parser->setBreaksEnabled(self::SET_BREAKS_ENABLED===$setBreaks); return rex_string::sanitizeHtml($parser->text($code)); } @@ -48,10 +51,10 @@ public function parse($code) * * @return array tupel of table-of-content and content */ - public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3) + public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3, bool $setBreaks = self::SET_BREAKS_ENABLED) { $parser = new rex_parsedown_with_toc(); - $parser->setBreaksEnabled(rex::getProperty('rex_markdown_setBreaksEnabled',true)); + $parser->setBreaksEnabled(self::SET_BREAKS_ENABLED===$setBreaks); $parser->topLevel = $topLevel; $parser->bottomLevel = $bottomLevel; From 38322dfd4ee42165521f96c31c0ab56933cad04b Mon Sep 17 00:00:00 2001 From: christophboecker Date: Fri, 25 Sep 2020 18:23:13 +0200 Subject: [PATCH 04/10] Anzeige der README.md jetzt mit ex_markdown::SET_BREAKS_DISABLED --- redaxo/src/core/lib/be/controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaxo/src/core/lib/be/controller.php b/redaxo/src/core/lib/be/controller.php index e098fc1edf..172b545761 100644 --- a/redaxo/src/core/lib/be/controller.php +++ b/redaxo/src/core/lib/be/controller.php @@ -433,7 +433,7 @@ public static function includeCurrentPageSubPath(array $context = []) $path = $languagePath; } - [$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path)); + [$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path),2,3,rex_markdown::SET_BREAKS_DISABLED); $fragment = new rex_fragment(); $fragment->setVar('content', $content, false); $fragment->setVar('toc', $toc, false); From 50ed94778f538a1b798950fac846af93cbc3e3c8 Mon Sep 17 00:00:00 2001 From: christophboecker Date: Wed, 30 Sep 2020 18:50:08 +0200 Subject: [PATCH 05/10] softLineBreaks (def=true) abschaltbar --- redaxo/src/core/lib/util/markdown.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/redaxo/src/core/lib/util/markdown.php b/redaxo/src/core/lib/util/markdown.php index d410d34eb0..89dd26a29c 100644 --- a/redaxo/src/core/lib/util/markdown.php +++ b/redaxo/src/core/lib/util/markdown.php @@ -11,9 +11,6 @@ class rex_markdown { use rex_factory_trait; - public const SET_BREAKS_ENABLED = true; - public const SET_BREAKS_DISABLED = false; - private function __construct() { } @@ -34,10 +31,10 @@ public static function factory() * * @return string HTML code */ - public function parse($code, bool $setBreaks = self::SET_BREAKS_ENABLED) + public function parse($code, bool $softLineBreaks = true) { $parser = new ParsedownExtra(); - $parser->setBreaksEnabled(self::SET_BREAKS_ENABLED===$setBreaks); + $parser->setBreaksEnabled(true===$softLineBreaks); return rex_string::sanitizeHtml($parser->text($code)); } @@ -51,10 +48,10 @@ public function parse($code, bool $setBreaks = self::SET_BREAKS_ENABLED) * * @return array tupel of table-of-content and content */ - public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3, bool $setBreaks = self::SET_BREAKS_ENABLED) + public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3, bool $softLineBreaks = true) { $parser = new rex_parsedown_with_toc(); - $parser->setBreaksEnabled(self::SET_BREAKS_ENABLED===$setBreaks); + $parser->setBreaksEnabled(true===$softLineBreaks); $parser->topLevel = $topLevel; $parser->bottomLevel = $bottomLevel; From bafeacfff3dd09a914ed787b038481c03cb62fe1 Mon Sep 17 00:00:00 2001 From: christophboecker Date: Wed, 30 Sep 2020 19:14:28 +0200 Subject: [PATCH 06/10] Anzeige der README.md jetzt mit "Softbreaks disabled" --- redaxo/src/core/lib/be/controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaxo/src/core/lib/be/controller.php b/redaxo/src/core/lib/be/controller.php index 172b545761..47707641af 100644 --- a/redaxo/src/core/lib/be/controller.php +++ b/redaxo/src/core/lib/be/controller.php @@ -433,7 +433,7 @@ public static function includeCurrentPageSubPath(array $context = []) $path = $languagePath; } - [$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path),2,3,rex_markdown::SET_BREAKS_DISABLED); + [$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path),2,3,false); $fragment = new rex_fragment(); $fragment->setVar('content', $content, false); $fragment->setVar('toc', $toc, false); From 80a42b6ff1e7ed141fc8c10375c0af2a846dd480 Mon Sep 17 00:00:00 2001 From: christophboecker Date: Thu, 1 Oct 2020 08:07:17 +0200 Subject: [PATCH 07/10] =?UTF-8?q?Leerzeichen=20in=20Zeile=20440=20eingef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- redaxo/src/core/lib/be/controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaxo/src/core/lib/be/controller.php b/redaxo/src/core/lib/be/controller.php index 35f6e7e038..2cfea3c245 100644 --- a/redaxo/src/core/lib/be/controller.php +++ b/redaxo/src/core/lib/be/controller.php @@ -437,7 +437,7 @@ public static function includeCurrentPageSubPath(array $context = []) $path = $languagePath; } - [$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path),2,3,false); + [$toc, $content] = rex_markdown::factory()->parseWithToc(rex_file::get($path), 2, 3, false); $fragment = new rex_fragment(); $fragment->setVar('content', $content, false); $fragment->setVar('toc', $toc, false); From 6563c40f3b7dcfcc2059bade238f2f29bc3e17d4 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Fri, 2 Oct 2020 09:56:30 +0200 Subject: [PATCH 08/10] cs fix --- redaxo/src/core/lib/util/markdown.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redaxo/src/core/lib/util/markdown.php b/redaxo/src/core/lib/util/markdown.php index 9396ab5014..56690a2690 100644 --- a/redaxo/src/core/lib/util/markdown.php +++ b/redaxo/src/core/lib/util/markdown.php @@ -34,7 +34,7 @@ public static function factory() public function parse($code, bool $softLineBreaks = true) { $parser = new ParsedownExtra(); - $parser->setBreaksEnabled(true===$softLineBreaks); + $parser->setBreaksEnabled($softLineBreaks); return rex_string::sanitizeHtml($parser->text($code)); } @@ -51,7 +51,7 @@ public function parse($code, bool $softLineBreaks = true) public function parseWithToc($code, $topLevel = 2, $bottomLevel = 3, bool $softLineBreaks = true) { $parser = new rex_parsedown_with_toc(); - $parser->setBreaksEnabled(true===$softLineBreaks); + $parser->setBreaksEnabled($softLineBreaks); $parser->topLevel = $topLevel; $parser->bottomLevel = $bottomLevel; From 9643501f3454d4a8d089e621c1a6a4c5bedfa478 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Fri, 2 Oct 2020 10:00:59 +0200 Subject: [PATCH 09/10] Weitere Stellen --- redaxo/src/core/pages/packages.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redaxo/src/core/pages/packages.php b/redaxo/src/core/pages/packages.php index 73d4d099a2..95ad9bbf71 100644 --- a/redaxo/src/core/pages/packages.php +++ b/redaxo/src/core/pages/packages.php @@ -26,13 +26,13 @@ $package->includeFile('help.php'); $content .= ob_get_clean(); } elseif (is_readable($package->getPath('README.'. rex_i18n::getLanguage() .'.md'))) { - [$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.'. rex_i18n::getLanguage() .'.md'))); + [$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.'. rex_i18n::getLanguage() .'.md')), 2, 3, false); $fragment = new rex_fragment(); $fragment->setVar('content', $readmeContent, false); $fragment->setVar('toc', $readmeToc, false); $content .= $fragment->parse('core/page/docs.php'); } elseif (is_readable($package->getPath('README.md'))) { - [$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.md'))); + [$readmeToc, $readmeContent] = rex_markdown::factory()->parseWithToc(rex_file::get($package->getPath('README.md')), 2, 3, false); $fragment = new rex_fragment(); $fragment->setVar('content', $readmeContent, false); $fragment->setVar('toc', $readmeToc, false); From 34a6088ce5950e4364fc35be9af3f3e6e098bce6 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Fri, 2 Oct 2020 10:02:35 +0200 Subject: [PATCH 10/10] trailing whitespace in markdown nicht entfernen --- .editorconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.editorconfig b/.editorconfig index f2a39827de..b57e073ec8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,7 @@ indent_size = 4 [*.md] max_line_length = 80 +trim_trailing_whitespace = false [COMMIT_EDITMSG] max_line_length = 0