diff --git a/src/Markdig.Tests/RoundtripSpecs/Inlines/TestLiteralInline.cs b/src/Markdig.Tests/RoundtripSpecs/Inlines/TestLiteralInline.cs deleted file mode 100644 index 50cf8979..00000000 --- a/src/Markdig.Tests/RoundtripSpecs/Inlines/TestLiteralInline.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Markdig.Tests.RoundtripSpecs.Inlines -{ - class TestLiteralInline - { - } -} diff --git a/src/Markdig.Tests/TestClassAttribute.cs b/src/Markdig.Tests/TestClassAttribute.cs deleted file mode 100644 index f0d30790..00000000 --- a/src/Markdig.Tests/TestClassAttribute.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace Markdig.Tests -{ - internal class TestClassAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Markdig.Tests/TestMediaLinks.cs b/src/Markdig.Tests/TestMediaLinks.cs index bad7034b..27ba3426 100644 --- a/src/Markdig.Tests/TestMediaLinks.cs +++ b/src/Markdig.Tests/TestMediaLinks.cs @@ -62,21 +62,21 @@ namespace Markdig.Tests } } - //[Test] - //[TestCase("![p1](https://sample.com/video.mp4)", "

\n", @"^https?://sample.com/(.+)$", @"https://example.com/$1")] - //[TestCase("![p1](//sample.com/video.mp4)", "

\n", @"^//sample.com/(.+)$", @"https://example.com/$1")] - //[TestCase("![p1](https://sample.com/video.mp4)", "

\n", @"^https?://sample.com/(.+)$", @"https://example.com/$1?token=aaabbb")] - //public void TestCustomHostProvider(string markdown, string expected, string provider, string replace) - //{ - // string html = Markdown.ToHtml(markdown, GetPipeline(new MediaOptions - // { - // Hosts = - // { - // new TestHostProvider(provider, replace), - // } - // })); - // Assert.AreEqual(html, expected); - //} + [Test] + [TestCase("![p1](https://sample.com/video.mp4)", "

\n", @"^https?://sample.com/(.+)$", @"https://example.com/$1")] + [TestCase("![p1](//sample.com/video.mp4)", "

\n", @"^//sample.com/(.+)$", @"https://example.com/$1")] + [TestCase("![p1](https://sample.com/video.mp4)", "

\n", @"^https?://sample.com/(.+)$", @"https://example.com/$1?token=aaabbb")] + public void TestCustomHostProvider(string markdown, string expected, string provider, string replace) + { + string html = Markdown.ToHtml(markdown, GetPipeline(new MediaOptions + { + Hosts = + { + new TestHostProvider(provider, replace), + } + })); + Assert.AreEqual(html, expected); + } [Test] [TestCase("![static mp4](//sample.com/video.mp4)", "

\n", "")] diff --git a/src/Markdig/Helpers/CharHelper.cs b/src/Markdig/Helpers/CharHelper.cs index d4af040b..c2329393 100644 --- a/src/Markdig/Helpers/CharHelper.cs +++ b/src/Markdig/Helpers/CharHelper.cs @@ -221,7 +221,7 @@ namespace Markdig.Helpers } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool IsNewLineLineFeed(this char c) + public static bool IsNewLineOrLineFeed(this char c) { return c == '\n' || c == '\r'; } diff --git a/src/Markdig/Helpers/LinkHelper.cs b/src/Markdig/Helpers/LinkHelper.cs index 3679d705..50f841d0 100644 --- a/src/Markdig/Helpers/LinkHelper.cs +++ b/src/Markdig/Helpers/LinkHelper.cs @@ -759,7 +759,7 @@ namespace Markdig.Helpers continue; } - if (c.IsNewLineLineFeed()) + if (c.IsNewLineOrLineFeed()) { break; } @@ -902,7 +902,7 @@ namespace Markdig.Helpers continue; } - if (c.IsNewLineLineFeed()) + if (c.IsNewLineOrLineFeed()) { break; } diff --git a/src/Markdig/Helpers/Newline.cs b/src/Markdig/Helpers/Newline.cs index 989c0cbd..ed232cb4 100644 --- a/src/Markdig/Helpers/Newline.cs +++ b/src/Markdig/Helpers/Newline.cs @@ -6,7 +6,7 @@ namespace Markdig.Helpers /// Represents a character or set of characters that represent a separation /// between two lines of text /// - public enum NewLine + public enum NewLine : byte { None, CarriageReturn, diff --git a/src/Markdig/Parsers/QuoteBlockParser.cs b/src/Markdig/Parsers/QuoteBlockParser.cs index c1e8410f..641c566a 100644 --- a/src/Markdig/Parsers/QuoteBlockParser.cs +++ b/src/Markdig/Parsers/QuoteBlockParser.cs @@ -115,7 +115,6 @@ namespace Markdig.Parsers c = processor.NextChar(); // Skip quote marker char if (c == ' ') { - //processor.NextChar(); processor.NextColumn(); hasSpaceAfterQuoteChar = true; processor.SkipFirstUnwindSpace = true; diff --git a/src/Markdig/Renderers/Roundtrip/CodeBlockRenderer.cs b/src/Markdig/Renderers/Roundtrip/CodeBlockRenderer.cs index bbea06df..a38c65e0 100644 --- a/src/Markdig/Renderers/Roundtrip/CodeBlockRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/CodeBlockRenderer.cs @@ -8,13 +8,11 @@ using System.Collections.Generic; namespace Markdig.Renderers.Roundtrip { /// - /// An Normalize renderer for a and . + /// An Roundtrip renderer for a and . /// /// public class CodeBlockRenderer : RoundtripObjectRenderer { - public bool OutputAttributesOnPre { get; set; } - protected override void Write(RoundtripRenderer renderer, CodeBlock obj) { renderer.RenderLinesBefore(obj); diff --git a/src/Markdig/Renderers/Roundtrip/HeadingRenderer.cs b/src/Markdig/Renderers/Roundtrip/HeadingRenderer.cs index 2cd9f468..b73fb708 100644 --- a/src/Markdig/Renderers/Roundtrip/HeadingRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/HeadingRenderer.cs @@ -7,7 +7,7 @@ using Markdig.Syntax; namespace Markdig.Renderers.Roundtrip { /// - /// An Normalize renderer for a . + /// An Roundtrip renderer for a . /// /// public class HeadingRenderer : RoundtripObjectRenderer diff --git a/src/Markdig/Renderers/Roundtrip/Inlines/LineBreakInlineRenderer.cs b/src/Markdig/Renderers/Roundtrip/Inlines/LineBreakInlineRenderer.cs index 7edcd657..2c47866d 100644 --- a/src/Markdig/Renderers/Roundtrip/Inlines/LineBreakInlineRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/Inlines/LineBreakInlineRenderer.cs @@ -12,17 +12,11 @@ namespace Markdig.Renderers.Roundtrip.Inlines /// public class LineBreakInlineRenderer : RoundtripObjectRenderer { - /// - /// Gets or sets a value indicating whether to render this softline break as a Normalize hardline break tag (<br />) - /// - public bool RenderAsHardlineBreak { get; set; } - protected override void Write(RoundtripRenderer renderer, LineBreakInline obj) { if (obj.IsHard && obj.IsBackslash) { renderer.Write("\\"); - //renderer.Write(obj.IsBackslash ? "\\" : " "); } renderer.WriteLine(obj.NewLine); } diff --git a/src/Markdig/Renderers/Roundtrip/ListRenderer.cs b/src/Markdig/Renderers/Roundtrip/ListRenderer.cs index e08c252f..340470e0 100644 --- a/src/Markdig/Renderers/Roundtrip/ListRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/ListRenderer.cs @@ -9,7 +9,7 @@ using Markdig.Syntax; namespace Markdig.Renderers.Roundtrip { /// - /// A Normalize renderer for a . + /// A Roundtrip renderer for a . /// /// public class ListRenderer : RoundtripObjectRenderer diff --git a/src/Markdig/Renderers/Roundtrip/ParagraphRenderer.cs b/src/Markdig/Renderers/Roundtrip/ParagraphRenderer.cs index c0b8ed44..4f439de4 100644 --- a/src/Markdig/Renderers/Roundtrip/ParagraphRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/ParagraphRenderer.cs @@ -8,7 +8,7 @@ using System.Diagnostics; namespace Markdig.Renderers.Roundtrip { /// - /// A Normalize renderer for a . + /// A Roundtrip renderer for a . /// /// [DebuggerDisplay("renderer.Writer.ToString()")] diff --git a/src/Markdig/Renderers/Roundtrip/QuoteBlockRenderer.cs b/src/Markdig/Renderers/Roundtrip/QuoteBlockRenderer.cs index 0bcb60e0..dbc92b34 100644 --- a/src/Markdig/Renderers/Roundtrip/QuoteBlockRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/QuoteBlockRenderer.cs @@ -9,9 +9,8 @@ using System.Collections.Generic; namespace Markdig.Renderers.Roundtrip { /// - /// A Normalize renderer for a . + /// A Roundtrip renderer for a . /// - /// public class QuoteBlockRenderer : RoundtripObjectRenderer { protected override void Write(RoundtripRenderer renderer, QuoteBlock quoteBlock) diff --git a/src/Markdig/Renderers/Roundtrip/RoundtripRenderer.cs b/src/Markdig/Renderers/Roundtrip/RoundtripRenderer.cs index 2e0c7d63..07847e29 100644 --- a/src/Markdig/Renderers/Roundtrip/RoundtripRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/RoundtripRenderer.cs @@ -6,19 +6,21 @@ using System.IO; using Markdig.Syntax; using Markdig.Renderers.Roundtrip.Inlines; using Markdig.Helpers; +using Markdig.Parsers; namespace Markdig.Renderers.Roundtrip { /// - /// Default HTML renderer for a Markdown object. + /// Markdown renderer honoring trivia for a object. /// + /// Ensure to enable the property when + /// parsing markdown to have trivia available for rendering. public class RoundtripRenderer : TextRendererBase { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The writer. - /// The normalize options public RoundtripRenderer(TextWriter writer) : base(writer) { // Default block renderers diff --git a/src/Markdig/Renderers/Roundtrip/ThematicBreakRenderer.cs b/src/Markdig/Renderers/Roundtrip/ThematicBreakRenderer.cs index 3fb21017..fda7caec 100644 --- a/src/Markdig/Renderers/Roundtrip/ThematicBreakRenderer.cs +++ b/src/Markdig/Renderers/Roundtrip/ThematicBreakRenderer.cs @@ -7,7 +7,7 @@ using Markdig.Syntax; namespace Markdig.Renderers.Roundtrip { /// - /// A Normalize renderer for a . + /// A Roundtrip renderer for a . /// /// public class ThematicBreakRenderer : RoundtripObjectRenderer @@ -16,11 +16,7 @@ namespace Markdig.Renderers.Roundtrip { renderer.RenderLinesBefore(obj); - // for now, render always a newline - // TODO: only render a newline when not last line - //renderer.Write(obj.BeforeWhitespace); renderer.Write(obj.Content); - //renderer.Write(obj.AfterWhitespace); renderer.WriteLine(obj.NewLine); renderer.RenderLinesAfter(obj); } diff --git a/src/Markdig/Roundtrip.md b/src/Markdig/Roundtrip.md index 4b9de0da..9e39279e 100644 --- a/src/Markdig/Roundtrip.md +++ b/src/Markdig/Roundtrip.md @@ -4,10 +4,10 @@ Markdig supports parsing trivia characters and tracks the source position of the To use this functionality, set the optional `trackTrivia` parameter to true when using the static `Markdown` class: ```csharp MarkdownDocument markdownDocument = Markdown.Parse(inputMarkdown, trackTrivia = true); -MarkdownDocument markdownDocument = Markdown.Parse(inputMarkdown, pipeline, trackTrivia = true); +true); ``` You will get a parse tree where various `Trivia*` properties of `Block` and `Inline` instances now have instances. To write a document to Markdown using this tree, use the `RoundtripRenderer`: -```csharp +```csharpTestLiteralInline var sw = new StringWriter(); var rr = new RoundtripRenderer(sw); rr.Write(markdownDocument); diff --git a/src/Markdig/Syntax/IBlock.cs b/src/Markdig/Syntax/IBlock.cs index ee79549c..3196fb6a 100644 --- a/src/Markdig/Syntax/IBlock.cs +++ b/src/Markdig/Syntax/IBlock.cs @@ -58,8 +58,16 @@ namespace Markdig.Syntax /// event ProcessInlineDelegate ProcessInlinesEnd; - public StringSlice TriviaBefore { get; set; } - public StringSlice TriviaAfter { get; set; } + /// + /// Trivia occurring before this block + /// + /// Trivia: only parsed when is enabled, otherwise . + StringSlice TriviaBefore { get; set; } + /// + /// Trivia occurring after this block + /// + /// Trivia: only parsed when is enabled, otherwise . + StringSlice TriviaAfter { get; set; } } } \ No newline at end of file diff --git a/src/Markdig/Syntax/IFencedBlock.cs b/src/Markdig/Syntax/IFencedBlock.cs index b6bab80d..5a0230a7 100644 --- a/src/Markdig/Syntax/IFencedBlock.cs +++ b/src/Markdig/Syntax/IFencedBlock.cs @@ -20,7 +20,7 @@ namespace Markdig.Syntax /// /// Gets or sets the fenced character count used to open this fenced code block. /// - public int OpeningFencedCharCount { get; set; } + int OpeningFencedCharCount { get; set; } /// /// Gets or sets the trivia after the .