diff --git a/src/Markdig/Helpers/StringSlice.cs b/src/Markdig/Helpers/StringSlice.cs index bc941bc6..2614e26e 100644 --- a/src/Markdig/Helpers/StringSlice.cs +++ b/src/Markdig/Helpers/StringSlice.cs @@ -482,5 +482,22 @@ namespace Markdig.Helpers } return true; } + + public bool Overlaps(StringSlice other) + { + if (Length == 0 || other.Length == 0) + { + return false; + } + if (other.End >= Start) + { + return true; + } + if (other.Start <= End) + { + return true; + } + return false; + } } } \ No newline at end of file diff --git a/src/Markdig/Parsers/HeadingBlockParser.cs b/src/Markdig/Parsers/HeadingBlockParser.cs index fa545fb6..b055c74b 100644 --- a/src/Markdig/Parsers/HeadingBlockParser.cs +++ b/src/Markdig/Parsers/HeadingBlockParser.cs @@ -72,10 +72,16 @@ namespace Markdig.Parsers // A space is required after leading # if (leadingCount > 0 && leadingCount <= MaxLeadingCount && (c.IsSpaceOrTab() || c == '\0')) { + StringSlice whitespace = StringSlice.Empty; + if (c.IsSpaceOrTab()) + { + whitespace = new StringSlice(processor.Line.Text, processor.Start + leadingCount, processor.Start + leadingCount); + } // Move to the content var headingBlock = new HeadingBlock(this) { HeaderChar = matchingChar, + WhitespaceAfterAtxHeaderChar = whitespace, Level = leadingCount, Column = column, Span = { Start = sourcePosition }, @@ -129,7 +135,14 @@ namespace Markdig.Parsers // Setup the source end position of this element headingBlock.Span.End = processor.Line.End; - headingBlock.AfterWhitespace = new StringSlice(processor.Line.Text, processor.Line.End + 1, sourceEnd); + + var wsa = new StringSlice(processor.Line.Text, processor.Line.End + 1, sourceEnd); + headingBlock.AfterWhitespace = wsa; + if (wsa.Overlaps(headingBlock.WhitespaceAfterAtxHeaderChar)) + { + // prevent double whitespace allocation in case of closing # i.e. "# #" + headingBlock.WhitespaceAfterAtxHeaderChar = StringSlice.Empty; + } // We expect a single line, so don't continue return BlockState.Break; diff --git a/src/Markdig/Renderers/Normalize/HeadingRenderer.cs b/src/Markdig/Renderers/Normalize/HeadingRenderer.cs index 39c6c024..85978cbd 100644 --- a/src/Markdig/Renderers/Normalize/HeadingRenderer.cs +++ b/src/Markdig/Renderers/Normalize/HeadingRenderer.cs @@ -48,7 +48,8 @@ namespace Markdig.Renderers.Normalize : new string('#', obj.Level); renderer.Write(obj.BeforeWhitespace); - renderer.Write(headingText).Write(' '); + renderer.Write(headingText); + renderer.Write(obj.WhitespaceAfterAtxHeaderChar); renderer.WriteLeafInline(obj); renderer.Write(obj.AfterWhitespace); renderer.WriteLine(obj.Newline); diff --git a/src/Markdig/Syntax/HeadingBlock.cs b/src/Markdig/Syntax/HeadingBlock.cs index ccd59315..1ddf609e 100644 --- a/src/Markdig/Syntax/HeadingBlock.cs +++ b/src/Markdig/Syntax/HeadingBlock.cs @@ -38,5 +38,8 @@ namespace Markdig.Syntax public int HeaderCharCount { get; set; } public Newline SetextNewline { get; set; } + + // space is mandatory after # only when there is heading content. I.e. "#" is valid + public StringSlice WhitespaceAfterAtxHeaderChar { get; set; } } } \ No newline at end of file