From bfc1152b8a2d248eb7c4580bbb9597aa0bdba444 Mon Sep 17 00:00:00 2001 From: Ruud Poutsma Date: Fri, 25 Sep 2020 22:35:49 +0200 Subject: [PATCH] default newline after Html block, fix newlines before list block --- src/Markdig.Tests/TestCst.cs | 3 ++- src/Markdig/Parsers/ListBlockParser.cs | 1 + src/Markdig/Renderers/Normalize/HtmlBlockRenderer.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Markdig.Tests/TestCst.cs b/src/Markdig.Tests/TestCst.cs index b54a6c5f..eb761bd6 100644 --- a/src/Markdig.Tests/TestCst.cs +++ b/src/Markdig.Tests/TestCst.cs @@ -136,7 +136,7 @@ namespace Markdig.Tests [TestCase("- i1\n- i2")] [TestCase("- i1\n - i2")] [TestCase("- i1\n - i1.1\n - i1.2")] - public void TestUnorederedList(string value) + public void TestUnorderedList(string value) { RoundTrip(value); } @@ -226,6 +226,7 @@ namespace Markdig.Tests [TestCase("\n> q\n\n")] [TestCase("> q\n\np")] [TestCase("p\n\n> q\n\n# h")] + [TestCase(">**b**\n>\n>p\n>\np\n")] public void TestBlockQuote_Paragraph(string value) { RoundTrip(value); diff --git a/src/Markdig/Parsers/ListBlockParser.cs b/src/Markdig/Parsers/ListBlockParser.cs index 7d8ce930..e6ae81bb 100644 --- a/src/Markdig/Parsers/ListBlockParser.cs +++ b/src/Markdig/Parsers/ListBlockParser.cs @@ -299,6 +299,7 @@ namespace Markdig.Parsers OrderedDelimiter = listInfo.OrderedDelimiter, DefaultOrderedStart = listInfo.DefaultOrderedStart, OrderedStart = listInfo.OrderedStart, + LinesBefore = state.UseLinesBefore(), }; state.NewBlocks.Push(newList); } diff --git a/src/Markdig/Renderers/Normalize/HtmlBlockRenderer.cs b/src/Markdig/Renderers/Normalize/HtmlBlockRenderer.cs index 4243318e..d6a0a030 100644 --- a/src/Markdig/Renderers/Normalize/HtmlBlockRenderer.cs +++ b/src/Markdig/Renderers/Normalize/HtmlBlockRenderer.cs @@ -11,7 +11,7 @@ namespace Markdig.Renderers.Normalize protected override void Write(NormalizeRenderer renderer, HtmlBlock obj) { renderer.RenderLinesBefore(obj); - renderer.WriteLeafRawLines(obj, false, false); + renderer.WriteLeafRawLines(obj, true, false); renderer.RenderLinesAfter(obj); } }