Merge pull request #828 from MihaZupan/net90

Add .NET 9 target, drop .NET 6

.github/workflows/ci.yml

@@ -13,6 +13,9 @@ jobs:
   build:
     uses: xoofx/.github/.github/workflows/dotnet.yml@main
     with:
-      dotnet-version: '6.0 8.0'
+      dotnet-version: |
+        6.0
+        8.0
+        9.0
     secrets:
       NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}    

readme.md

@@ -144,12 +144,12 @@ AMD Ryzen 9 5950X, 1 CPU, 32 logical and 16 physical cores
 - Markdig is roughly **x100 times faster than MarkdownSharp**
 - **20% faster than the reference cmark C implementation** 
 
+## Sponsors
 
-## Donate
+Supports this project with a monthly donation and help me continue improving it. \[[Become a sponsor](https://github.com/sponsors/xoofx)\]
 
-If you are using this library and find it useful for your project, please consider a donation for it!
-
-[![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 src="https://github.com/lilith.png?size=200" width="64px;" style="border-radius: 50%" alt="lilith"/>](https://github.com/lilith) Lilith River, author of [Imageflow Server, an easy on-demand
+image editing, optimization, and delivery server](https://github.com/imazen/imageflow-server)
 
 ## Credits
 

src/Markdig.Tests/Markdig.Tests.csproj

@@ -1,13 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>13.0</LangVersion>
     <StartupObject>Markdig.Tests.Program</StartupObject>
-    <SpecExecutable>$(MSBuildProjectDirectory)\..\SpecFileGen\bin\$(Configuration)\net8.0\SpecFileGen.dll</SpecExecutable>
-    <SpecTimestamp>$(MSBuildProjectDirectory)\..\SpecFileGen\bin\$(Configuration)\net8.0\SpecFileGen.timestamp</SpecTimestamp>
+    <SpecExecutable>$(MSBuildProjectDirectory)\..\SpecFileGen\bin\$(Configuration)\$(TargetFramework)\SpecFileGen.dll</SpecExecutable>
+    <SpecTimestamp>$(MSBuildProjectDirectory)\..\SpecFileGen\bin\$(Configuration)\$(TargetFramework)\SpecFileGen.timestamp</SpecTimestamp>
   </PropertyGroup>
 
   <ItemGroup>

src/Markdig.Tests/TestLinkHelper.cs

@@ -81,6 +81,14 @@ public class TestLinkHelper
         Assert.AreEqual(' ', text.CurrentChar);
     }
 
+    [Test]
+    public void TestTitleMultiline()
+    {
+        var text = new StringSlice("'this\ris\r\na\ntitle'");
+        Assert.True(LinkHelper.TryParseTitle(ref text, out string title, out _));
+        Assert.AreEqual("this\ris\r\na\ntitle", title);
+    }
+
     [Test]
     public void TestUrlAndTitle()
     {

src/Markdig.Tests/TestSourcePosition.cs

@@ -160,6 +160,17 @@ literal      ( 0, 8)  8-8
 ");
     }
 
+    [Test]
+    public void TestEmphasis4()
+    {
+        Check("**foo*", @"
+paragraph    ( 0, 0)  0-5
+literal      ( 0, 0)  0-0
+emphasis     ( 0, 1)  1-5
+literal      ( 0, 2)  2-4
+");
+    }
+
     [Test]
     public void TestEmphasisFalse()
     {

src/Markdig.Tests/TestYamlFrontMatterExtension.cs

@@ -107,7 +107,7 @@ public class TestYamlFrontMatterExtension
             }
         }
 
-        Assert.Pass("No exception parsing and iterating through YAML front matter block lines");
+        // No exception parsing and iterating through YAML front matter block lines
     }
 
 }

src/Markdig/Extensions/CustomContainers/CustomContainerExtension.cs

@@ -30,7 +30,11 @@ public class CustomContainerExtension : IMarkdownExtension
             {
                 if (delimiterCount == 2 && emphasisChar == ':')
                 {
-                    return new CustomContainerInline();
+                    return new CustomContainerInline
+                    {
+                        DelimiterChar = ':',
+                        DelimiterCount = 2
+                    };
                 }
                 return null;
             });

src/Markdig/Extensions/Footnotes/FootnoteParser.cs

@@ -57,6 +57,8 @@ public class FootnoteParser : BlockParser
         {
             Label = label,
             LabelSpan = labelSpan,
+            Column = processor.Column,
+            Span = new SourceSpan(processor.Start, processor.Line.End),
         };
 
         // Maintain a list of all footnotes at document level
@@ -74,6 +76,7 @@ public class FootnoteParser : BlockParser
         {
             CreateLinkInline = CreateLinkToFootnote,
             Line = processor.LineIndex,
+            Column = saved,
             Span = new SourceSpan(start, processor.Start - 2), // account for ]:
             LabelSpan = labelSpan,
             Label = label

src/Markdig/Helpers/FastStringWriter.cs

@@ -30,7 +30,7 @@ internal sealed class FastStringWriter : TextWriter
     public override string NewLine
     {
         get => _newLine;
-        set => _newLine = value ?? Environment.NewLine;
+        set => base.NewLine = _newLine = value ?? Environment.NewLine;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Markdig/Helpers/LinkHelper.cs

@@ -567,6 +567,7 @@ public static class LinkHelper
                     if (c == '\r' && text.PeekChar() == '\n')
                     {
                         buffer.Append('\n');
+                        text.SkipChar();
                     }
                     continue;
                 }
@@ -663,6 +664,7 @@ public static class LinkHelper
                     if (c == '\r' && text.PeekChar() == '\n')
                     {
                         buffer.Append('\n');
+                        text.SkipChar();
                     }
                     continue;
                 }

src/Markdig/Markdig.targets

@@ -5,7 +5,7 @@
     <Copyright>Alexandre Mutel</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Authors>Alexandre Mutel</Authors>
-    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <PackageTags>Markdown CommonMark md html md2html</PackageTags>
     <PackageReleaseNotes>https://github.com/lunet-io/markdig/blob/master/changelog.md</PackageReleaseNotes>

src/Markdig/Parsers/Inlines/EmphasisInlineParser.cs

@@ -302,14 +302,13 @@ public class EmphasisInlineParser : InlineParser, IPostInlineProcessor
                         var openDelimitercount = openDelimiter.DelimiterCount;
                         var closeDelimitercount = closeDelimiter.DelimiterCount;
 
-                        emphasis!.Span.Start = openDelimiter.Span.Start;
+                        emphasis!.Span.Start = openDelimiter.Span.Start + openDelimitercount - delimiterDelta;
                         emphasis.Line = openDelimiter.Line;
-                        emphasis.Column = openDelimiter.Column;
+                        emphasis.Column = openDelimiter.Column + openDelimitercount - delimiterDelta;
                         emphasis.Span.End = closeDelimiter.Span.End - closeDelimitercount + delimiterDelta;
 
-                        openDelimiter.Content.Start += delimiterDelta;
-                        openDelimiter.Span.Start += delimiterDelta;
-                        openDelimiter.Column += delimiterDelta;
+                        openDelimiter.Span.End -= delimiterDelta;
+                        openDelimiter.Content.End -= delimiterDelta;
                         closeDelimiter.Content.Start += delimiterDelta;
                         closeDelimiter.Span.Start += delimiterDelta;
                         closeDelimiter.Column += delimiterDelta;

src/SpecFileGen/SpecFileGen.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.100",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }