Bump to 0.26.0

Fixes xoofx/markdig#567

changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.26.0 (27 Aug 2021)
+- Fix rendering diff between line endings ([PR #560](https://github.com/lunet-io/markdig/pull/560))
+- Make Mathematics extension respect EnableHtml* options ([PR #570](https://github.com/lunet-io/markdig/pull/570))
+
+## 0.25.0 (10 June 2021)
+- Fix regression when parsing link reference definitions (#543)
+- Make digits in JiraKey's posible ([PR #548](https://github.com/lunet-io/markdig/pull/548))
+
 ## 0.24.0 (20 Mar 2021)
 - Add support for roundtrip Markdown ([PR #481](https://github.com/lunet-io/markdig/pull/481))
 - Introduction of nullability ([PR #522](https://github.com/lunet-io/markdig/pull/522) [PR #524](https://github.com/lunet-io/markdig/pull/524) [PR #525](https://github.com/lunet-io/markdig/pull/525) [PR #526](https://github.com/lunet-io/markdig/pull/526) [PR #527](https://github.com/lunet-io/markdig/pull/527))

readme.md

@@ -1,4 +1,4 @@
-# Markdig [![Build Status](https://github.com/lunet-io/markdig/workflows/ci/badge.svg?branch=master)](https://github.com/lunet-io/markdig/actions) [![Coverage Status](https://coveralls.io/repos/github/lunet-io/markdig/badge.svg?branch=master)](https://coveralls.io/github/lunet-io/markdig?branch=master) [![NuGet](https://img.shields.io/nuget/v/Markdig.svg)](https://www.nuget.org/packages/Markdig/) [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRGHXBTP442JL)
+# Markdig [![Build Status](https://github.com/lunet-io/markdig/workflows/ci/badge.svg?branch=master)](https://github.com/lunet-io/markdig/actions) [![Coverage Status](https://coveralls.io/repos/github/xoofx/markdig/badge.svg?branch=master)](https://coveralls.io/github/xoofx/markdig?branch=master) [![NuGet](https://img.shields.io/nuget/v/Markdig.svg)](https://www.nuget.org/packages/Markdig/) [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRGHXBTP442JL)
 
 <img align="right" width="160px" height="160px" src="img/markdig.png">
 

src/Markdig.Tests/RoundtripSpecs/TestParagraph.cs

@@ -115,9 +115,9 @@ namespace Markdig.Tests.RoundtripSpecs
         }
 
 
-        //[TestCase("\n")]
-        //[TestCase("\r\n")]
-        //[TestCase("\r")]
+        [TestCase("\n")]
+        [TestCase("\r\n")]
+        [TestCase("\r")]
 
         [TestCase("p\n")]
         [TestCase("p\r")]

src/Markdig.Tests/Specs/JiraLinks.generated.cs

@@ -23,7 +23,7 @@ namespace Markdig.Tests.Specs.JiraLinks
         // 
         // The rules for detecting a link are:
         // 
-        // - The project key must be composed of one or more capitalized ASCII letter `[A-Z]+`
+        // - The project key must be composed of one or more capitalized ASCII letters or digits `[A-Z,0-9]+`
         // - A single hyphen `-` must separate the project key and issue number.
         // - The issue number is composed of 1 or more digits `[0, 9]+`
         // - The reference must be preceded by either `(` or whitespace or EOF.
@@ -53,13 +53,13 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is a KIRA-1 issue
+            //     This is a ABC4-123 issue
             //
             // Should be rendered as:
-            //     <p>This is a <a href="http://your.company.abc/browse/KIRA-1" target="blank">KIRA-1</a> issue</p>
+            //     <p>This is a <a href="http://your.company.abc/browse/ABC4-123" target="blank">ABC4-123</a> issue</p>
 
             Console.WriteLine("Example 2\nSection Jira Links\n");
-            TestParser.TestSpec("This is a KIRA-1 issue", "<p>This is a <a href=\"http://your.company.abc/browse/KIRA-1\" target=\"blank\">KIRA-1</a> issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a ABC4-123 issue", "<p>This is a <a href=\"http://your.company.abc/browse/ABC4-123\" target=\"blank\">ABC4-123</a> issue</p>", "jiralinks");
         }
 
         [Test]
@@ -69,16 +69,15 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is a Z-1 issue
+            //     This is a ABC45-123 issue
             //
             // Should be rendered as:
-            //     <p>This is a <a href="http://your.company.abc/browse/Z-1" target="blank">Z-1</a> issue</p>
+            //     <p>This is a <a href="http://your.company.abc/browse/ABC45-123" target="blank">ABC45-123</a> issue</p>
 
             Console.WriteLine("Example 3\nSection Jira Links\n");
-            TestParser.TestSpec("This is a Z-1 issue", "<p>This is a <a href=\"http://your.company.abc/browse/Z-1\" target=\"blank\">Z-1</a> issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a ABC45-123 issue", "<p>This is a <a href=\"http://your.company.abc/browse/ABC45-123\" target=\"blank\">ABC45-123</a> issue</p>", "jiralinks");
         }
 
-        // These are also valid links with `(` and `)`:
         [Test]
         public void JiraLinks_Example004()
         {
@@ -86,13 +85,13 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is a (ABCD-123) issue
+            //     This is a KIRA-1 issue
             //
             // Should be rendered as:
-            //     <p>This is a (<a href="http://your.company.abc/browse/ABCD-123" target="blank">ABCD-123</a>) issue</p>
+            //     <p>This is a <a href="http://your.company.abc/browse/KIRA-1" target="blank">KIRA-1</a> issue</p>
 
             Console.WriteLine("Example 4\nSection Jira Links\n");
-            TestParser.TestSpec("This is a (ABCD-123) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/ABCD-123\" target=\"blank\">ABCD-123</a>) issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a KIRA-1 issue", "<p>This is a <a href=\"http://your.company.abc/browse/KIRA-1\" target=\"blank\">KIRA-1</a> issue</p>", "jiralinks");
         }
 
         [Test]
@@ -102,15 +101,16 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is a (KIRA-1) issue
+            //     This is a Z-1 issue
             //
             // Should be rendered as:
-            //     <p>This is a (<a href="http://your.company.abc/browse/KIRA-1" target="blank">KIRA-1</a>) issue</p>
+            //     <p>This is a <a href="http://your.company.abc/browse/Z-1" target="blank">Z-1</a> issue</p>
 
             Console.WriteLine("Example 5\nSection Jira Links\n");
-            TestParser.TestSpec("This is a (KIRA-1) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/KIRA-1\" target=\"blank\">KIRA-1</a>) issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a Z-1 issue", "<p>This is a <a href=\"http://your.company.abc/browse/Z-1\" target=\"blank\">Z-1</a> issue</p>", "jiralinks");
         }
 
+        // These are also valid links with `(` and `)`:
         [Test]
         public void JiraLinks_Example006()
         {
@@ -118,16 +118,15 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is a (Z-1) issue
+            //     This is a (ABCD-123) issue
             //
             // Should be rendered as:
-            //     <p>This is a (<a href="http://your.company.abc/browse/Z-1" target="blank">Z-1</a>) issue</p>
+            //     <p>This is a (<a href="http://your.company.abc/browse/ABCD-123" target="blank">ABCD-123</a>) issue</p>
 
             Console.WriteLine("Example 6\nSection Jira Links\n");
-            TestParser.TestSpec("This is a (Z-1) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/Z-1\" target=\"blank\">Z-1</a>) issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a (ABCD-123) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/ABCD-123\" target=\"blank\">ABCD-123</a>) issue</p>", "jiralinks");
         }
 
-        // These are not valid links:
         [Test]
         public void JiraLinks_Example007()
         {
@@ -135,13 +134,13 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is not aJIRA-123 issue
+            //     This is a (ABC4-123) issue
             //
             // Should be rendered as:
-            //     <p>This is not aJIRA-123 issue</p>
+            //     <p>This is a (<a href="http://your.company.abc/browse/ABC4-123" target="blank">ABC4-123</a>) issue</p>
 
             Console.WriteLine("Example 7\nSection Jira Links\n");
-            TestParser.TestSpec("This is not aJIRA-123 issue", "<p>This is not aJIRA-123 issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a (ABC4-123) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/ABC4-123\" target=\"blank\">ABC4-123</a>) issue</p>", "jiralinks");
         }
 
         [Test]
@@ -151,13 +150,13 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
-            //     This is not JIRA-123a issue
+            //     This is a (KIRA-1) issue
             //
             // Should be rendered as:
-            //     <p>This is not JIRA-123a issue</p>
+            //     <p>This is a (<a href="http://your.company.abc/browse/KIRA-1" target="blank">KIRA-1</a>) issue</p>
 
             Console.WriteLine("Example 8\nSection Jira Links\n");
-            TestParser.TestSpec("This is not JIRA-123a issue", "<p>This is not JIRA-123a issue</p>", "jiralinks");
+            TestParser.TestSpec("This is a (KIRA-1) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/KIRA-1\" target=\"blank\">KIRA-1</a>) issue</p>", "jiralinks");
         }
 
         [Test]
@@ -167,13 +166,94 @@ namespace Markdig.Tests.Specs.JiraLinks
             // Section: Jira Links
             //
             // The following Markdown:
+            //     This is a (Z-1) issue
+            //
+            // Should be rendered as:
+            //     <p>This is a (<a href="http://your.company.abc/browse/Z-1" target="blank">Z-1</a>) issue</p>
+
+            Console.WriteLine("Example 9\nSection Jira Links\n");
+            TestParser.TestSpec("This is a (Z-1) issue", "<p>This is a (<a href=\"http://your.company.abc/browse/Z-1\" target=\"blank\">Z-1</a>) issue</p>", "jiralinks");
+        }
+
+        // These are not valid links:
+        [Test]
+        public void JiraLinks_Example010()
+        {
+            // Example 10
+            // Section: Jira Links
+            //
+            // The following Markdown:
+            //     This is not aJIRA-123 issue
+            //
+            // Should be rendered as:
+            //     <p>This is not aJIRA-123 issue</p>
+
+            Console.WriteLine("Example 10\nSection Jira Links\n");
+            TestParser.TestSpec("This is not aJIRA-123 issue", "<p>This is not aJIRA-123 issue</p>", "jiralinks");
+        }
+
+        [Test]
+        public void JiraLinks_Example011()
+        {
+            // Example 11
+            // Section: Jira Links
+            //
+            // The following Markdown:
+            //     This is not 4JIRA-123 issue
+            //
+            // Should be rendered as:
+            //     <p>This is not 4JIRA-123 issue</p>
+
+            Console.WriteLine("Example 11\nSection Jira Links\n");
+            TestParser.TestSpec("This is not 4JIRA-123 issue", "<p>This is not 4JIRA-123 issue</p>", "jiralinks");
+        }
+
+        [Test]
+        public void JiraLinks_Example012()
+        {
+            // Example 12
+            // Section: Jira Links
+            //
+            // The following Markdown:
+            //     This is not JIRA-123a issue
+            //
+            // Should be rendered as:
+            //     <p>This is not JIRA-123a issue</p>
+
+            Console.WriteLine("Example 12\nSection Jira Links\n");
+            TestParser.TestSpec("This is not JIRA-123a issue", "<p>This is not JIRA-123a issue</p>", "jiralinks");
+        }
+
+        [Test]
+        public void JiraLinks_Example013()
+        {
+            // Example 13
+            // Section: Jira Links
+            //
+            // The following Markdown:
             //     This is not JIRA- issue
             //
             // Should be rendered as:
             //     <p>This is not JIRA- issue</p>
 
-            Console.WriteLine("Example 9\nSection Jira Links\n");
+            Console.WriteLine("Example 13\nSection Jira Links\n");
             TestParser.TestSpec("This is not JIRA- issue", "<p>This is not JIRA- issue</p>", "jiralinks");
         }
+
+        [Test]
+        public void JiraLinks_Example014()
+        {
+            // Example 14
+            // Section: Jira Links
+            //
+            // The following Markdown:
+            //     This is not JIR4- issue
+            //
+            // Should be rendered as:
+            //     <p>This is not JIR4- issue</p>
+
+            Console.WriteLine("Example 14\nSection Jira Links\n");
+            TestParser.TestSpec("This is not JIR4- issue", "<p>This is not JIR4- issue</p>", "jiralinks");
+        }
     }
 }

src/Markdig.Tests/Specs/JiraLinks.md

@@ -10,7 +10,7 @@ var pipeline = new MarkdownPipelineBuilder()
 
 The rules for detecting a link are:
 
-- The project key must be composed of one or more capitalized ASCII letter `[A-Z]+`
+- The project key must be composed of one or more capitalized ASCII letters or digits `[A-Z,0-9]+`
 - A single hyphen `-` must separate the project key and issue number.
 - The issue number is composed of 1 or more digits `[0, 9]+`
 - The reference must be preceded by either `(` or whitespace or EOF.
@@ -24,6 +24,18 @@ This is a ABCD-123 issue
 <p>This is a <a href="http://your.company.abc/browse/ABCD-123" target="blank">ABCD-123</a> issue</p>
 ````````````````````````````````
 
+```````````````````````````````` example
+This is a ABC4-123 issue
+.
+<p>This is a <a href="http://your.company.abc/browse/ABC4-123" target="blank">ABC4-123</a> issue</p>
+````````````````````````````````
+
+```````````````````````````````` example
+This is a ABC45-123 issue
+.
+<p>This is a <a href="http://your.company.abc/browse/ABC45-123" target="blank">ABC45-123</a> issue</p>
+````````````````````````````````
+
 ```````````````````````````````` example
 This is a KIRA-1 issue
 .
@@ -44,6 +56,12 @@ This is a (ABCD-123) issue
 <p>This is a (<a href="http://your.company.abc/browse/ABCD-123" target="blank">ABCD-123</a>) issue</p>
 ````````````````````````````````
 
+```````````````````````````````` example
+This is a (ABC4-123) issue
+.
+<p>This is a (<a href="http://your.company.abc/browse/ABC4-123" target="blank">ABC4-123</a>) issue</p>
+````````````````````````````````
+
 ```````````````````````````````` example
 This is a (KIRA-1) issue
 .
@@ -64,6 +82,12 @@ This is not aJIRA-123 issue
 <p>This is not aJIRA-123 issue</p>
 ````````````````````````````````
 
+```````````````````````````````` example
+This is not 4JIRA-123 issue
+.
+<p>This is not 4JIRA-123 issue</p>
+````````````````````````````````
+
 ```````````````````````````````` example
 This is not JIRA-123a issue
 .
@@ -75,3 +99,9 @@ This is not JIRA- issue
 .
 <p>This is not JIRA- issue</p>
 ````````````````````````````````
+
+```````````````````````````````` example
+This is not JIR4- issue
+.
+<p>This is not JIR4- issue</p>
+````````````````````````````````

src/Markdig.Tests/TestNewLine.cs

@@ -0,0 +1,17 @@
+using NUnit.Framework;
+
+namespace Markdig.Tests
+{
+    [TestFixture]
+    public class TestNewLine
+    {
+        [TestCase("a  \nb", "<p>a<br />\nb</p>\n")]
+        [TestCase("a\\\nb", "<p>a<br />\nb</p>\n")]
+        [TestCase("a `b\nc`", "<p>a <code>b c</code></p>\n")]
+        public void Test(string value, string expectedHtml)
+        {
+            Assert.AreEqual(expectedHtml, Markdown.ToHtml(value));
+            Assert.AreEqual(expectedHtml, Markdown.ToHtml(value.Replace("\n", "\r\n")));
+        }
+    }
+}

src/Markdig.Tests/TestPipeTable.cs

@@ -0,0 +1,26 @@
+using Markdig.Extensions.Tables;
+using Markdig.Syntax;
+using NUnit.Framework;
+using System.Linq;
+
+namespace Markdig.Tests
+{
+    [TestFixture]
+    public sealed class TestPipeTable
+    {
+        [TestCase("| S | T |\r\n|---|---| \r\n| G | H |")]
+        [TestCase("| S | T |\r\n|---|---|\t\r\n| G | H |")]
+        [TestCase("| S | T |\r\n|---|---|\v\r\n| G | H |")]
+        [TestCase("| S | T |\r\n|---|---|\f\r\n| G | H |")]
+        [TestCase("| S | T |\r\n|---|---|\f\v\t \r\n| G | H |")]
+        [TestCase("| S | \r\n|---|\r\n| G |\r\n\r\n| D | D |\r\n| ---| ---| \r\n| V | V |", 2)]
+        public void TestTableBug(string markdown, int tableCount = 1)
+        {
+            MarkdownDocument document = Markdown.Parse(markdown, new MarkdownPipelineBuilder().UseAdvancedExtensions().Build());
+
+            Table[] tables = document.Descendants().OfType<Table>().ToArray();
+
+            Assert.AreEqual(tableCount, tables.Length);
+        }
+    }
+}

src/Markdig.Tests/TestPlayParser.cs

@@ -12,6 +12,16 @@ namespace Markdig.Tests
     [TestFixture]
     public class TestPlayParser
     {
+        [Test]
+        public void TestLinksWithCarriageReturn()
+        {
+            {
+                var text = "[Link 1][link-1], [link 2][link-2].\r\n\r\n[link-1]: https://example.com\r\n[link-2]: https://example.com";
+                var result = Markdown.ToHtml(text).TrimEnd();
+                Assert.AreEqual("<p><a href=\"https://example.com\">Link 1</a>, <a href=\"https://example.com\">link 2</a>.</p>", result);
+            }
+        }
+
         [Test]
         public void TestLink()
         {

src/Markdig.Tests/TestRoundtrip.cs

@@ -23,7 +23,8 @@ namespace Markdig.Tests
 
             nr.Write(markdownDocument);
 
-            Assert.AreEqual(markdown, sw.ToString());
+            var result = sw.ToString();
+            Assert.AreEqual(markdown, result);
         }
     }
 }

src/Markdig/Extensions/JiraLinks/JiraLinkInlineParser.cs

@@ -40,8 +40,14 @@ namespace Markdig.Extensions.JiraLinks
             var startKey = slice.Start;
             var endKey = slice.Start;
 
-            //read as many uppercase characters as required - project key
-            while (current.IsAlphaUpper())
+            // the first character of the key can not be a digit.
+            if (current.IsDigit())
+            {
+                return false;
+            }
+
+            // read as many uppercase characters or digits as required - project key
+            while (current.IsAlphaUpper() || current.IsDigit())
             {
                 endKey = slice.Start;
                 current = slice.NextChar();

src/Markdig/Extensions/Mathematics/HtmlMathBlockRenderer.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Alexandre Mutel. All rights reserved.
-// This file is licensed under the BSD-Clause 2 license. 
+// This file is licensed under the BSD-Clause 2 license.
 // See the license.txt file in the project root for more information.
 
 using Markdig.Renderers;
@@ -16,11 +16,19 @@ namespace Markdig.Extensions.Mathematics
         protected override void Write(HtmlRenderer renderer, MathBlock obj)
         {
             renderer.EnsureLine();
-            renderer.Write("<div").WriteAttributes(obj).WriteLine(">");
-            renderer.WriteLine("\\[");
-            renderer.WriteLeafRawLines(obj, true, true);
-            renderer.Write("\\]");
-            renderer.WriteLine("</div>");
+            if (renderer.EnableHtmlForBlock)
+            {
+                renderer.Write("<div").WriteAttributes(obj).WriteLine(">");
+                renderer.WriteLine("\\[");
+            }
+
+            renderer.WriteLeafRawLines(obj, true, renderer.EnableHtmlEscape);
+
+            if (renderer.EnableHtmlForBlock)
+            {
+                renderer.Write("\\]");
+                renderer.WriteLine("</div>");
+            }
         }
     }
 }

src/Markdig/Extensions/Mathematics/HtmlMathInlineRenderer.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Alexandre Mutel. All rights reserved.
-// This file is licensed under the BSD-Clause 2 license. 
+// This file is licensed under the BSD-Clause 2 license.
 // See the license.txt file in the project root for more information.
 
 using Markdig.Renderers;
@@ -15,9 +15,24 @@ namespace Markdig.Extensions.Mathematics
     {
         protected override void Write(HtmlRenderer renderer, MathInline obj)
         {
-            renderer.Write("<span").WriteAttributes(obj).Write(">\\(");
-            renderer.WriteEscape(ref obj.Content);
-            renderer.Write("\\)</span>");
+            if (renderer.EnableHtmlForInline)
+            {
+                renderer.Write("<span").WriteAttributes(obj).Write(">\\(");
+            }
+
+            if (renderer.EnableHtmlEscape)
+            {
+                renderer.WriteEscape(ref obj.Content);
+            }
+            else
+            {
+                renderer.Write(ref obj.Content);
+            }
+
+            if (renderer.EnableHtmlForInline)
+            {
+                renderer.Write("\\)</span>");
+            }
         }
     }
 }

src/Markdig/Extensions/Tables/PipeTableParser.cs

@@ -511,13 +511,15 @@ namespace Markdig.Extensions.Tables
 
                     // Check the left side of a `|` delimiter
                     TableColumnAlign? align = null;
-                    if (delimiter.PreviousSibling != null && !ParseHeaderString(delimiter.PreviousSibling, out align))
+                    if (delimiter.PreviousSibling != null &&
+                        !(delimiter.PreviousSibling is LiteralInline li && li.Content.IsEmptyOrWhitespace()) && // ignore parsed whitespace
+                        !ParseHeaderString(delimiter.PreviousSibling, out align))
                     {
                         break;
                     }
 
                     // Create aligns until we may have a header row
-                    
+
                     aligns ??= new List<TableColumnDefinition>();
                     
                     aligns.Add(new TableColumnDefinition() { Alignment =  align });

src/Markdig/Helpers/LinkHelper.cs

@@ -1231,7 +1231,9 @@ namespace Markdig.Helpers
             var saved = text;
             var hasWhiteSpaces = CharIteratorHelper.TrimStartAndCountNewLines(ref text, out int newLineCount, out newLine);
 
-            triviaBeforeTitle = new SourceSpan(triviaBeforeTitleStart, text.Start - 1);
+            // Remove the newline from the trivia (as it may have multiple lines)
+            var triviaBeforeTitleEnd = text.Start - 1;
+            triviaBeforeTitle = new SourceSpan(triviaBeforeTitleStart, triviaBeforeTitleEnd);
             var c = text.CurrentChar;
             if (c == '\'' || c == '"' || c == '(')
             {
@@ -1246,6 +1248,9 @@ namespace Markdig.Helpers
                     {
                         return false;
                     }
+
+                    // Discard the newline if we have a title
+                    newLine = NewLine.None;
                 }
                 else
                 {
@@ -1256,6 +1261,8 @@ namespace Markdig.Helpers
             {
                 if (text.IsEmpty || newLineCount > 0)
                 {
+                    // If we have an end of line, we need to remove it from the trivia
+                    triviaBeforeTitle.End -= newLine.Length();
                     triviaAfterTitle = new SourceSpan(text.Start, text.Start - 1);
                     return true;
                 }
@@ -1277,6 +1284,7 @@ namespace Markdig.Helpers
                 {
                     text = saved;
                     title = null;
+                    newLine = NewLine.None;
                     unescapedTitle = SourceSpan.Empty;
                     triviaAfterTitle = SourceSpan.Empty;
                     return true;

src/Markdig/Helpers/StringLineGroup.cs

@@ -299,7 +299,7 @@ namespace Markdig.Helpers
                                 CurrentChar = '\r';
                             }
                         }
-                        else if (_offset + 1 == slice.Length)
+                        else if (_offset - 1 == slice.Length)
                         {
                             if (newLine == NewLine.CarriageReturnLineFeed)
                             {

src/Markdig/Markdig.targets

@@ -4,7 +4,7 @@
     <Description>A fast, powerful, CommonMark compliant, extensible Markdown processor for .NET with 20+ builtin extensions (pipetables, footnotes, definition lists... etc.)</Description>
     <Copyright>Alexandre Mutel</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>0.24.0</VersionPrefix>
+    <VersionPrefix>0.26.0</VersionPrefix>
     <Authors>Alexandre Mutel</Authors>
     <!-- Markdig.Wpf still supports net452, a target still supported by by Microsoft until January 10, 2023 -->
     <!-- see: https://github.com/xoofx/markdig/pull/466 -->

src/Markdig/Parsers/Inlines/CodeInlineParser.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Alexandre Mutel. All rights reserved.
-// This file is licensed under the BSD-Clause 2 license. 
+// This file is licensed under the BSD-Clause 2 license.
 // See the license.txt file in the project root for more information.
 
 using Markdig.Helpers;
@@ -63,6 +63,12 @@ namespace Markdig.Parsers.Inlines
                 {
                     c = ' ';
                 }
+                else if (c == '\r')
+                {
+                    slice.SkipChar();
+                    c = slice.CurrentChar;
+                    continue;
+                }
 
                 if (c == match)
                 {

src/Markdig/Parsers/Inlines/EscapeInlineParser.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Alexandre Mutel. All rights reserved.
-// This file is licensed under the BSD-Clause 2 license. 
+// This file is licensed under the BSD-Clause 2 license.
 // See the license.txt file in the project root for more information.
 
 using Markdig.Helpers;
@@ -66,7 +66,7 @@ namespace Markdig.Parsers.Inlines
             }
             else
             {
-                if (c == '\n')
+                if (c == '\n' || c == '\r')
                 {
                     processor.Inline = new LineBreakInline()
                     {

src/Markdig/Parsers/Inlines/LiteralInlineParser.cs

@@ -52,7 +52,8 @@ namespace Markdig.Parsers.Inlines
                 length = nextStart - slice.Start;
                 if (!processor.TrackTrivia)
                 {
-                    if (text[nextStart] == '\n')
+                    var nextText = text[nextStart];
+                    if (nextText == '\n' || nextText == '\r')
                     {
                         int end = nextStart - 1;
                         while (length > 0 && text[end].IsSpace())

src/Markdig/Syntax/CharIteratorHelper.cs

@@ -13,45 +13,39 @@ namespace Markdig.Syntax
     {
         public static bool TrimStartAndCountNewLines<T>(ref T iterator, out int countNewLines) where T : ICharIterator
         {
-            countNewLines = 0;
-            var c = iterator.CurrentChar;
-            bool hasWhitespaces = false;
-            while (c.IsWhitespace())
-            {
-                if (c == '\n')
-                {
-                    countNewLines++;
-                }
-                hasWhitespaces = true;
-                c = iterator.NextChar();
-            }
-            return hasWhitespaces;
+            return TrimStartAndCountNewLines(ref iterator, out countNewLines, out _);
         }
 
-        public static bool TrimStartAndCountNewLines<T>(ref T iterator, out int countNewLines, out NewLine firstNewline) where T : ICharIterator
+        public static bool TrimStartAndCountNewLines<T>(ref T iterator, out int countNewLines, out NewLine lastLine) where T : ICharIterator
         {
             countNewLines = 0;
             var c = iterator.CurrentChar;
             bool hasWhitespaces = false;
-            firstNewline = NewLine.None;
-            while (c.IsWhitespace())
+            lastLine = NewLine.None;
+            while (c != '\0' && c.IsWhitespace())
             {
                 if (c == '\n' || c == '\r')
                 {
-                    if (c == '\r' && iterator.PeekChar() == '\n' && firstNewline != NewLine.None)
+                    if (c == '\r' && iterator.PeekChar() == '\n')
                     {
-                        firstNewline = NewLine.CarriageReturnLineFeed;
+                        lastLine = NewLine.CarriageReturnLineFeed;
+                        iterator.SkipChar(); // skip \n
                     }
-                    else if (c == '\n' && firstNewline != NewLine.None)
+                    else if (c == '\n')
                     {
-                        firstNewline = NewLine.LineFeed;
+                        lastLine = NewLine.LineFeed;
                     }
-                    else if (c == '\r' && firstNewline != NewLine.None)
+                    else if (c == '\r')
                     {
-                        firstNewline = NewLine.CarriageReturn;
+                        lastLine = NewLine.CarriageReturn;
                     }
                     countNewLines++;
                 }
+                else
+                {
+                    // reset last line if if have a whitespace after
+                    lastLine = NewLine.None;
+                }
                 hasWhitespaces = true;
                 c = iterator.NextChar();
             }