diff --git a/src/Markdig.Tests/Markdig.Tests.csproj b/src/Markdig.Tests/Markdig.Tests.csproj
index a506836a..d5cd3b3f 100644
--- a/src/Markdig.Tests/Markdig.Tests.csproj
+++ b/src/Markdig.Tests/Markdig.Tests.csproj
@@ -62,6 +62,7 @@
+
diff --git a/src/Markdig.Tests/TestNormalize.cs b/src/Markdig.Tests/TestNormalize.cs
new file mode 100644
index 00000000..269c7467
--- /dev/null
+++ b/src/Markdig.Tests/TestNormalize.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+
+using System;
+using NUnit.Framework;
+
+namespace Markdig.Tests
+{
+ [TestFixture]
+ public class TestNormalize
+ {
+
+ [Test]
+ public void TestParagraph()
+ {
+ AssertNormalize("This is a plain paragraph");
+ AssertNormalize(@"This
+is
+a
+plain
+paragraph");
+ }
+
+ [Test]
+ public void TestParagraphMulti()
+ {
+ AssertNormalize(@"line1
+
+line2
+
+line3");
+ }
+
+ [Test]
+ public void TestListUnordered()
+ {
+ AssertNormalize(@"
+- a
+- b
+- c
+");
+ }
+
+ [Test]
+ public void TestListOrdered()
+ {
+ AssertNormalize(@"
+1. a
+2. b
+3. c
+");
+ }
+
+ [Test]
+ public void TestHeaderAndParagraph()
+ {
+ AssertNormalize(@"
+# heading
+
+paragraph
+");
+ }
+
+
+ [Test]
+ public void TestQuote()
+ {
+ AssertNormalize(@"
+> test1
+>
+> test2
+");
+ }
+
+
+ [Test]
+ public void TestEmphasis()
+ {
+ AssertNormalize("This is a plain **paragraph**");
+ AssertNormalize("This is a plain *paragraph*");
+ AssertNormalize("This is a plain _paragraph_");
+ AssertNormalize("This is a plain __paragraph__");
+ AssertNormalize("This is a pl*ai*n **paragraph**");
+ }
+
+ [Test]
+ public void TestLinks()
+ {
+ AssertNormalize("This is a [link](http://company.com)");
+ AssertNormalize("This is an ");
+ }
+
+
+ public void AssertNormalize(string input, string expected = null)
+ {
+ expected = expected ?? input;
+ input = NormText(input);
+ expected = NormText(expected);
+
+ var result = Markdown.Normalize(input);
+ result = NormText(result);
+
+ Console.WriteLine("```````````````````Source");
+ Console.WriteLine(TestParser.DisplaySpaceAndTabs(input));
+ Console.WriteLine("```````````````````Result");
+ Console.WriteLine(TestParser.DisplaySpaceAndTabs(result));
+ Console.WriteLine("```````````````````Expected");
+ Console.WriteLine(TestParser.DisplaySpaceAndTabs(expected));
+ Console.WriteLine("```````````````````");
+ Console.WriteLine();
+
+ TextAssert.AreEqual(expected, result);
+ }
+
+ private static string NormText(string text)
+ {
+ return text.Trim().Replace("\r\n", "\n").Replace('\r', '\n');
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Markdown.cs b/src/Markdig/Markdown.cs
index 61cc8f32..406a7557 100644
--- a/src/Markdig/Markdown.cs
+++ b/src/Markdig/Markdown.cs
@@ -7,6 +7,7 @@ using System.Reflection;
using Markdig.Extensions.SelfPipeline;
using Markdig.Parsers;
using Markdig.Renderers;
+using Markdig.Renderers.Normalize;
using Markdig.Syntax;
namespace Markdig
@@ -22,6 +23,42 @@ namespace Markdig
public static readonly string Version = ((AssemblyFileVersionAttribute) typeof(Markdown).Assembly.GetCustomAttributes(typeof(AssemblyFileVersionAttribute), false)[0]).Version;
#endif
+ ///
+ /// Normalizes the specified markdown to a normalized markdown text.
+ ///
+ /// The markdown.
+ /// The pipeline.
+ /// A normalized markdown text.
+ public static string Normalize(string markdown, MarkdownPipeline pipeline = null)
+ {
+ var writer = new StringWriter();
+ Normalize(markdown, writer, pipeline);
+ return writer.ToString();
+ }
+
+ ///
+ /// Normalizes the specified markdown to a normalized markdown text.
+ ///
+ /// The markdown.
+ /// The destination that will receive the result of the conversion.
+ /// The pipeline.
+ /// A normalized markdown text.
+ public static MarkdownDocument Normalize(string markdown, TextWriter writer, MarkdownPipeline pipeline = null)
+ {
+ pipeline = pipeline ?? new MarkdownPipelineBuilder().Build();
+ pipeline = CheckForSelfPipeline(pipeline, markdown);
+
+ // We override the renderer with our own writer
+ var renderer = new NormalizeRenderer(writer);
+ pipeline.Setup(renderer);
+
+ var document = Parse(markdown, pipeline);
+ renderer.Render(document);
+ writer.Flush();
+
+ return document;
+ }
+
///
/// Converts a Markdown string to HTML.
///
diff --git a/src/Markdig/Parsers/ThematicBreakParser.cs b/src/Markdig/Parsers/ThematicBreakParser.cs
index f73eece2..f0f45fee 100644
--- a/src/Markdig/Parsers/ThematicBreakParser.cs
+++ b/src/Markdig/Parsers/ThematicBreakParser.cs
@@ -88,7 +88,9 @@ namespace Markdig.Parsers
processor.NewBlocks.Push(new ThematicBreakBlock(this)
{
Column = processor.Column,
- Span = new SourceSpan(startPosition, line.End)
+ Span = new SourceSpan(startPosition, line.End),
+ ThematicChar = breakChar,
+ ThematicCharCount = breakCharCount
});
return BlockState.BreakDiscard;
}
diff --git a/src/Markdig/Renderers/Normalize/CodeBlockRenderer.cs b/src/Markdig/Renderers/Normalize/CodeBlockRenderer.cs
index 4dce78cc..c7ab8f60 100644
--- a/src/Markdig/Renderers/Normalize/CodeBlockRenderer.cs
+++ b/src/Markdig/Renderers/Normalize/CodeBlockRenderer.cs
@@ -39,12 +39,12 @@ namespace Markdig.Renderers.Normalize
}
renderer.WriteLine();
- renderer.WriteLeafRawLines(obj, true, false);
+ renderer.WriteLeafRawLines(obj, true);
renderer.WriteLine(opening);
}
else
{
- renderer.WriteLeafRawLines(obj, true, false, true);
+ renderer.WriteLeafRawLines(obj, true, true);
renderer.WriteLine();
}
}
diff --git a/src/Markdig/Renderers/Normalize/HeadingRenderer.cs b/src/Markdig/Renderers/Normalize/HeadingRenderer.cs
index 9554eb7a..ee7c91d3 100644
--- a/src/Markdig/Renderers/Normalize/HeadingRenderer.cs
+++ b/src/Markdig/Renderers/Normalize/HeadingRenderer.cs
@@ -29,7 +29,7 @@ namespace Markdig.Renderers.Normalize
renderer.Write(headingText).Write(' ');
renderer.WriteLeafInline(obj);
- renderer.WriteLine();
+ renderer.WriteLine().WriteLine();
}
}
}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/AutolinkInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/AutolinkInlineRenderer.cs
new file mode 100644
index 00000000..6dede810
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/AutolinkInlineRenderer.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for an .
+ ///
+ ///
+ public class AutolinkInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, AutolinkInline obj)
+ {
+ renderer.Write('<').Write(obj.Url).Write('>');
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs
new file mode 100644
index 00000000..7eace1e4
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class CodeInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, CodeInline obj)
+ {
+ renderer.Write(obj.Delimiter);
+ renderer.Write(obj.Content); // TODO: escape `
+ renderer.Write(obj.Delimiter);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/DelimiterInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/DelimiterInlineRenderer.cs
new file mode 100644
index 00000000..54709ea4
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/DelimiterInlineRenderer.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class DelimiterInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, DelimiterInline obj)
+ {
+ renderer.Write(obj.ToLiteral());
+ renderer.WriteChildren(obj);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/EmphasisInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/EmphasisInlineRenderer.cs
new file mode 100644
index 00000000..36633f99
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/EmphasisInlineRenderer.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for an .
+ ///
+ ///
+ public class EmphasisInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, EmphasisInline obj)
+ {
+ var emphasisText = new string(obj.DelimiterChar, obj.IsDouble ? 2 : 1);
+ renderer.Write(emphasisText);
+ renderer.WriteChildren(obj);
+ renderer.Write(emphasisText);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/LineBreakInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/LineBreakInlineRenderer.cs
new file mode 100644
index 00000000..4cdad0fe
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/LineBreakInlineRenderer.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class LineBreakInlineRenderer : NormalizeObjectRenderer
+ {
+ ///
+ /// 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(NormalizeRenderer renderer, LineBreakInline obj)
+ {
+ // TODO: handle hard
+ renderer.WriteLine();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/LinkInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/LinkInlineRenderer.cs
new file mode 100644
index 00000000..a2dddac8
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/LinkInlineRenderer.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class LinkInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, LinkInline link)
+ {
+ if (link.IsImage)
+ {
+ renderer.Write('!');
+ }
+ renderer.Write('[');
+ renderer.WriteChildren(link);
+ renderer.Write(']');
+ if (!string.IsNullOrEmpty(link.Url))
+ {
+ renderer.Write('(').Write(link.Url);
+
+ if (!string.IsNullOrEmpty(link.Title))
+ {
+ renderer.Write(" \"");
+ renderer.Write(link.Title); // TODO: escape "
+ renderer.Write("\"");
+ }
+
+ renderer.Write(')');
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/LiteralInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/LiteralInlineRenderer.cs
new file mode 100644
index 00000000..3b4e410f
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/LiteralInlineRenderer.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class LiteralInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, LiteralInline obj)
+ {
+ renderer.Write(ref obj.Content);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/NormalizeHtmlEntityInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/NormalizeHtmlEntityInlineRenderer.cs
new file mode 100644
index 00000000..2d7883c7
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/NormalizeHtmlEntityInlineRenderer.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ public class NormalizeHtmlEntityInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, HtmlEntityInline obj)
+ {
+ renderer.Write(obj.Transcoded);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/Inlines/NormalizeHtmlInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/NormalizeHtmlInlineRenderer.cs
new file mode 100644
index 00000000..33bc8536
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/Inlines/NormalizeHtmlInlineRenderer.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Renderers.Normalize.Inlines
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ public class NormalizeHtmlInlineRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, HtmlInline obj)
+ {
+ renderer.Write(obj.Tag);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/ListRenderer.cs b/src/Markdig/Renderers/Normalize/ListRenderer.cs
new file mode 100644
index 00000000..bf204740
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/ListRenderer.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using System.Globalization;
+using Markdig.Syntax;
+
+namespace Markdig.Renderers.Normalize
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class ListRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, ListBlock listBlock)
+ {
+ renderer.EnsureLine();
+ if (listBlock.IsOrdered)
+ {
+ int index = 0;
+ if (listBlock.OrderedStart != null)
+ {
+ switch (listBlock.BulletType)
+ {
+ case '1':
+ int.TryParse(listBlock.OrderedStart, out index);
+ break;
+ }
+ }
+ foreach (var item in listBlock)
+ {
+ var listItem = (ListItemBlock)item;
+ renderer.EnsureLine();
+
+ renderer.Write(index + "");
+ renderer.Write(listBlock.OrderedDelimiter);
+ renderer.Write(' ');
+ renderer.PushIndent(" "); // TODO: output accurate indent
+ renderer.WriteChildren(listItem);
+ renderer.PopIndent();
+ if (!listBlock.IsLoose)
+ {
+ renderer.WriteLine();
+ }
+
+ switch (listBlock.BulletType)
+ {
+ case '1':
+ index++;
+ break;
+ }
+ }
+ }
+ else
+ {
+ foreach (var item in listBlock)
+ {
+ var listItem = (ListItemBlock)item;
+ renderer.EnsureLine();
+ renderer.Write("- ");
+ renderer.PushIndent(" ");
+ renderer.WriteChildren(listItem);
+ renderer.PopIndent();
+ if (!listBlock.IsLoose)
+ {
+ renderer.WriteLine();
+ }
+ }
+ }
+ renderer.WriteLine();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/NormalizeRenderer.cs b/src/Markdig/Renderers/Normalize/NormalizeRenderer.cs
index 6b79d028..585ad7f0 100644
--- a/src/Markdig/Renderers/Normalize/NormalizeRenderer.cs
+++ b/src/Markdig/Renderers/Normalize/NormalizeRenderer.cs
@@ -9,6 +9,7 @@ using System.Text;
using Markdig.Helpers;
using Markdig.Renderers.Html;
using Markdig.Syntax;
+using Markdig.Renderers.Normalize.Inlines;
namespace Markdig.Renderers.Normalize
{
@@ -26,265 +27,92 @@ namespace Markdig.Renderers.Normalize
{
// Default block renderers
ObjectRenderers.Add(new CodeBlockRenderer());
- //ObjectRenderers.Add(new ListRenderer());
+ ObjectRenderers.Add(new ListRenderer());
ObjectRenderers.Add(new HeadingRenderer());
- //ObjectRenderers.Add(new HtmlBlockRenderer());
- //ObjectRenderers.Add(new ParagraphRenderer());
+ ObjectRenderers.Add(new HtmlBlockRenderer());
+ ObjectRenderers.Add(new ParagraphRenderer());
ObjectRenderers.Add(new QuoteBlockRenderer());
- //ObjectRenderers.Add(new ThematicBreakRenderer());
+ ObjectRenderers.Add(new ThematicBreakRenderer());
// Default inline renderers
- //ObjectRenderers.Add(new AutolinkInlineRenderer());
- //ObjectRenderers.Add(new CodeInlineRenderer());
- //ObjectRenderers.Add(new DelimiterInlineRenderer());
- //ObjectRenderers.Add(new EmphasisInlineRenderer());
- //ObjectRenderers.Add(new LineBreakInlineRenderer());
- //ObjectRenderers.Add(new HtmlInlineRenderer());
- //ObjectRenderers.Add(new HtmlEntityInlineRenderer());
- //ObjectRenderers.Add(new LinkInlineRenderer());
- //ObjectRenderers.Add(new LiteralInlineRenderer());
-
- EnableHtmlForInline = true;
- EnableHtmlEscape = true;
+ ObjectRenderers.Add(new AutolinkInlineRenderer());
+ ObjectRenderers.Add(new CodeInlineRenderer());
+ ObjectRenderers.Add(new DelimiterInlineRenderer());
+ ObjectRenderers.Add(new EmphasisInlineRenderer());
+ ObjectRenderers.Add(new LineBreakInlineRenderer());
+ ObjectRenderers.Add(new NormalizeHtmlInlineRenderer());
+ ObjectRenderers.Add(new NormalizeHtmlEntityInlineRenderer());
+ ObjectRenderers.Add(new LinkInlineRenderer());
+ ObjectRenderers.Add(new LiteralInlineRenderer());
}
- ///
- /// Gets or sets a value indicating whether to ouput HTML tags when rendering. See remarks.
- ///
- ///
- /// This is used by some renderers to disable HTML tags when rendering some inlines (for image links).
- ///
- public bool EnableHtmlForInline { get; set; }
+ /////
+ ///// Writes the attached on the specified .
+ /////
+ ///// The object.
+ /////
+ //public NormalizeRenderer WriteAttributes(MarkdownObject obj)
+ //{
+ // if (obj == null) throw new ArgumentNullException(nameof(obj));
+ // return WriteAttributes(obj.TryGetAttributes());
+ //}
- public bool EnableHtmlEscape { get; set; }
+ /////
+ ///// Writes the specified .
+ /////
+ ///// The attributes to render.
+ ///// This instance
+ //public NormalizeRenderer WriteAttributes(HtmlAttributes attributes)
+ //{
+ // if (attributes == null)
+ // {
+ // return this;
+ // }
- ///
- /// Gets or sets a value indicating whether to use implicit paragraph (optional <p>)
- ///
- public bool ImplicitParagraph { get; set; }
+ // if (attributes.Id != null)
+ // {
+ // Write(" id=\"").WriteEscape(attributes.Id).Write("\"");
+ // }
- ///
- /// Writes the content escaped for HTML.
- ///
- /// The content.
- /// This instance
- [MethodImpl(MethodImplOptionPortable.AggressiveInlining)]
- public NormalizeRenderer WriteEscape(string content)
- {
- if (string.IsNullOrEmpty(content))
- return this;
+ // if (attributes.Classes != null && attributes.Classes.Count > 0)
+ // {
+ // Write(" class=\"");
+ // for (int i = 0; i < attributes.Classes.Count; i++)
+ // {
+ // var cssClass = attributes.Classes[i];
+ // if (i > 0)
+ // {
+ // Write(" ");
+ // }
+ // WriteEscape(cssClass);
+ // }
+ // Write("\"");
+ // }
- WriteEscape(content, 0, content.Length);
- return this;
- }
+ // if (attributes.Properties != null && attributes.Properties.Count > 0)
+ // {
+ // foreach (var property in attributes.Properties)
+ // {
+ // Write(" ").Write(property.Key);
+ // if (property.Value != null)
+ // {
+ // Write("=").Write("\"");
+ // WriteEscape(property.Value);
+ // Write("\"");
+ // }
+ // }
+ // }
- ///
- /// Writes the content escaped for HTML.
- ///
- /// The slice.
- /// This instance
- [MethodImpl(MethodImplOptionPortable.AggressiveInlining)]
- public NormalizeRenderer WriteEscape(ref StringSlice slice)
- {
- if (slice.Start > slice.End)
- {
- return this;
- }
- return WriteEscape(slice.Text, slice.Start, slice.Length);
- }
-
- ///
- /// Writes the content escaped for HTML.
- ///
- /// The slice.
- /// This instance
- [MethodImpl(MethodImplOptionPortable.AggressiveInlining)]
- public NormalizeRenderer WriteEscape(StringSlice slice)
- {
- return WriteEscape(ref slice);
- }
-
- ///
- /// Writes the content escaped for HTML.
- ///
- /// The content.
- /// The offset.
- /// The length.
- /// This instance
- public NormalizeRenderer WriteEscape(string content, int offset, int length)
- {
- if (string.IsNullOrEmpty(content) || length == 0)
- return this;
-
- var end = offset + length;
- int previousOffset = offset;
- for (;offset < end; offset++)
- {
- switch (content[offset])
- {
- case '<':
- Write(content, previousOffset, offset - previousOffset);
- if (EnableHtmlEscape)
- {
- Write("<");
- }
- previousOffset = offset + 1;
- break;
- case '>':
- Write(content, previousOffset, offset - previousOffset);
- if (EnableHtmlEscape)
- {
- Write(">");
- }
- previousOffset = offset + 1;
- break;
- case '&':
- Write(content, previousOffset, offset - previousOffset);
- if (EnableHtmlEscape)
- {
- Write("&");
- }
- previousOffset = offset + 1;
- break;
- case '"':
- Write(content, previousOffset, offset - previousOffset);
- if (EnableHtmlEscape)
- {
- Write(""");
- }
- previousOffset = offset + 1;
- break;
- }
- }
-
- Write(content, previousOffset, end - previousOffset);
- return this;
- }
-
- ///
- /// Writes the URL escaped for HTML.
- ///
- /// The content.
- /// This instance
- public NormalizeRenderer WriteEscapeUrl(string content)
- {
- if (content == null)
- return this;
-
- int previousPosition = 0;
- int length = content.Length;
-
- for (var i = 0; i < length; i++)
- {
- var c = content[i];
-
- if (c < 128)
- {
- var escape = HtmlHelper.EscapeUrlCharacter(c);
- if (escape != null)
- {
- Write(content, previousPosition, i - previousPosition);
- previousPosition = i + 1;
- Write(escape);
- }
- }
- else
- {
- Write(content, previousPosition, i - previousPosition);
- previousPosition = i + 1;
-
- byte[] bytes;
- if (c >= '\ud800' && c <= '\udfff' && previousPosition < length)
- {
- bytes = Encoding.UTF8.GetBytes(new[] { c, content[previousPosition] });
- // Skip next char as it is decoded above
- i++;
- previousPosition = i + 1;
- }
- else
- {
- bytes = Encoding.UTF8.GetBytes(new[] { c });
- }
-
- for (var j = 0; j < bytes.Length; j++)
- {
- Write($"%{bytes[j]:X2}");
- }
- }
- }
-
- Write(content, previousPosition, length - previousPosition);
- return this;
- }
-
- ///
- /// Writes the attached on the specified .
- ///
- /// The object.
- ///
- public NormalizeRenderer WriteAttributes(MarkdownObject obj)
- {
- if (obj == null) throw new ArgumentNullException(nameof(obj));
- return WriteAttributes(obj.TryGetAttributes());
- }
-
- ///
- /// Writes the specified .
- ///
- /// The attributes to render.
- /// This instance
- public NormalizeRenderer WriteAttributes(HtmlAttributes attributes)
- {
- if (attributes == null)
- {
- return this;
- }
-
- if (attributes.Id != null)
- {
- Write(" id=\"").WriteEscape(attributes.Id).Write("\"");
- }
-
- if (attributes.Classes != null && attributes.Classes.Count > 0)
- {
- Write(" class=\"");
- for (int i = 0; i < attributes.Classes.Count; i++)
- {
- var cssClass = attributes.Classes[i];
- if (i > 0)
- {
- Write(" ");
- }
- WriteEscape(cssClass);
- }
- Write("\"");
- }
-
- if (attributes.Properties != null && attributes.Properties.Count > 0)
- {
- foreach (var property in attributes.Properties)
- {
- Write(" ").Write(property.Key);
- if (property.Value != null)
- {
- Write("=").Write("\"");
- WriteEscape(property.Value);
- Write("\"");
- }
- }
- }
-
- return this;
- }
+ // return this;
+ //}
///
/// Writes the lines of a
///
/// The leaf block.
/// if set to true write end of lines.
- /// if set to true escape the content for HTML
/// This instance
- public NormalizeRenderer WriteLeafRawLines(LeafBlock leafBlock, bool writeEndOfLines, bool escape, bool indent = false)
+ public NormalizeRenderer WriteLeafRawLines(LeafBlock leafBlock, bool writeEndOfLines, bool indent = false)
{
if (leafBlock == null) throw new ArgumentNullException(nameof(leafBlock));
if (leafBlock.Lines.Lines != null)
@@ -303,14 +131,8 @@ namespace Markdig.Renderers.Normalize
Write(" ");
}
- if (escape)
- {
- WriteEscape(ref slices[i].Slice);
- }
- else
- {
- Write(ref slices[i].Slice);
- }
+ Write(ref slices[i].Slice);
+
if (writeEndOfLines)
{
WriteLine();
diff --git a/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs b/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs
new file mode 100644
index 00000000..81d747d5
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax;
+
+namespace Markdig.Renderers.Normalize
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class ParagraphRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, ParagraphBlock obj)
+ {
+ renderer.EnsureLine();
+ renderer.WriteLeafInline(obj);
+ renderer.WriteLine().WriteLine();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Renderers/Normalize/ThematicBreakRenderer.cs b/src/Markdig/Renderers/Normalize/ThematicBreakRenderer.cs
new file mode 100644
index 00000000..2aa90c15
--- /dev/null
+++ b/src/Markdig/Renderers/Normalize/ThematicBreakRenderer.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+using Markdig.Syntax;
+
+namespace Markdig.Renderers.Normalize
+{
+ ///
+ /// A Normalize renderer for a .
+ ///
+ ///
+ public class ThematicBreakRenderer : NormalizeObjectRenderer
+ {
+ protected override void Write(NormalizeRenderer renderer, ThematicBreakBlock obj)
+ {
+ renderer.WriteLine(new string(obj.ThematicChar, obj.ThematicCharCount));
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Markdig/Syntax/ThematicBreakBlock.cs b/src/Markdig/Syntax/ThematicBreakBlock.cs
index ebf66bb1..c6839373 100644
--- a/src/Markdig/Syntax/ThematicBreakBlock.cs
+++ b/src/Markdig/Syntax/ThematicBreakBlock.cs
@@ -17,5 +17,9 @@ namespace Markdig.Syntax
public ThematicBreakBlock(BlockParser parser) : base(parser)
{
}
+
+ public char ThematicChar { get; set; }
+
+ public int ThematicCharCount { get; set; }
}
}
\ No newline at end of file