Bump version to 0.10.7

Add Replace method to replace an element in an OrderedList

src/Markdig.Benchmarks/Markdig.Benchmarks.nuget.targets

@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Microsoft.Diagnostics.Tracing.TraceEvent\1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Diagnostics.Tracing.TraceEvent\1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.diagnostics.tracing.traceevent\1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.diagnostics.tracing.traceevent\1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
   </ImportGroup>
 </Project>

src/Markdig.Tests/Markdig.Tests.csproj

@@ -65,6 +65,7 @@
     <Compile Include="TestHtmlHelper.cs" />
     <Compile Include="TestLineReader.cs" />
     <Compile Include="TestLinkHelper.cs" />
+    <Compile Include="TestOrderedList.cs" />
     <Compile Include="TestPragmaLines.cs" />
     <Compile Include="TestSourcePosition.cs" />
     <Compile Include="TestStringSliceList.cs" />

src/Markdig.Tests/Specs/AbbreviationSpecs.md

@@ -67,3 +67,13 @@ We should not abbreviate 1.1A or 11A!
 .
 <p>We should not abbreviate 1.1A or 11A!</p>
 ````````````````````````````````
+
+Abbreviations should match whole word only, even if the word is the entire content:
+
+```````````````````````````````` example
+*[1A]: First
+
+1.1A
+.
+<p>1.1A</p>
+````````````````````````````````

src/Markdig.Tests/Specs/EmojiSpecs.md

@@ -12,10 +12,28 @@ This is a test with a :) and a :angry: smiley
 <p>This is a test with a 😃 and a 😠 smiley</p>
 ````````````````````````````````
 
-An emoji needs to be preceded by a space and followed by a space:
+An emoji needs to be preceded by a space:
 
 ```````````````````````````````` example
-These are not:) an :)emoji with a:) x:angry:x
+These are not:) an emoji with a:) x:angry:x
 .
-<p>These are not:) an :)emoji with a:) x:angry:x</p>
+<p>These are not:) an emoji with a:) x:angry:x</p>
 ````````````````````````````````
+
+Emoji can be followed by close ponctuation (or any other characters):
+
+```````````````````````````````` example
+We all need :), it makes us :muscle:. (and :ok_hand:).
+.
+<p>We all need 😃, it makes us 💪. (and 👌).</p>
+````````````````````````````````
+
+Sentences can end with Emoji:
+
+```````````````````````````````` example
+This is a sentance :ok_hand:
+and keeps going to the next line :)
+.
+<p>This is a sentance 👌
+and keeps going to the next line 😃</p>
+````````````````````````````````

src/Markdig.Tests/Specs/EmphasisExtraSpecs.md

@@ -52,3 +52,16 @@ Marked text can be used to specify that a text has been marked in a document.  T
 .
 <p><mark>Marked text</mark></p>
 ````````````````````````````````
+## Emphasis on Html Entities
+
+
+```````````````````````````````` example
+This is text MyBrand ^&reg;^ and MyTrademark ^&trade;^
+This is text MyBrand^&reg;^ and MyTrademark^&trade;^
+This is text MyBrand~&reg;~ and MyCopyright^&copy;^
+.
+<p>This is text MyBrand <sup>®</sup> and MyTrademark <sup>TM</sup>
+This is text MyBrand<sup>®</sup> and MyTrademark<sup>TM</sup>
+This is text MyBrand<sub>®</sub> and MyCopyright<sup>©</sup></p>
+````````````````````````````````
+

src/Markdig.Tests/Specs/Specs.cs

@@ -17616,6 +17616,30 @@ namespace Markdig.Tests
             Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 5, "Extensions Marked");
 			TestParser.TestSpec("==Marked text==", "<p><mark>Marked text</mark></p>", "emphasisextras|advanced");
         }
+    }
+        // ## Emphasis on Html Entities
+    [TestFixture]
+    public partial class TestExtensionsEmphasisonHtmlEntities
+    {
+        [Test]
+        public void Example006()
+        {
+            // Example 6
+            // Section: Extensions Emphasis on Html Entities
+            //
+            // The following CommonMark:
+            //     This is text MyBrand ^&reg;^ and MyTrademark ^&trade;^
+            //     This is text MyBrand^&reg;^ and MyTrademark^&trade;^
+            //     This is text MyBrand~&reg;~ and MyCopyright^&copy;^
+            //
+            // Should be rendered as:
+            //     <p>This is text MyBrand <sup>®</sup> and MyTrademark <sup>TM</sup>
+            //     This is text MyBrand<sup>®</sup> and MyTrademark<sup>TM</sup>
+            //     This is text MyBrand<sub>®</sub> and MyCopyright<sup>©</sup></p>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 6, "Extensions Emphasis on Html Entities");
+			TestParser.TestSpec("This is text MyBrand ^&reg;^ and MyTrademark ^&trade;^\nThis is text MyBrand^&reg;^ and MyTrademark^&trade;^\nThis is text MyBrand~&reg;~ and MyCopyright^&copy;^", "<p>This is text MyBrand <sup>®</sup> and MyTrademark <sup>TM</sup>\nThis is text MyBrand<sup>®</sup> and MyTrademark<sup>TM</sup>\nThis is text MyBrand<sub>®</sub> and MyCopyright<sup>©</sup></p>", "emphasisextras|advanced");
+        }
     }
         // # Extensions
         //
@@ -18510,7 +18534,7 @@ namespace Markdig.Tests
 			TestParser.TestSpec("This is a test with a :) and a :angry: smiley", "<p>This is a test with a 😃 and a 😠 smiley</p>", "emojis|advanced+emojis");
         }
     }
-        // An emoji needs to be preceded by a space and followed by a space:
+        // An emoji needs to be preceded by a space:
     [TestFixture]
     public partial class TestExtensionsEmoji
     {
@@ -18521,13 +18545,55 @@ namespace Markdig.Tests
             // Section: Extensions Emoji
             //
             // The following CommonMark:
-            //     These are not:) an :)emoji with a:) x:angry:x
+            //     These are not:) an emoji with a:) x:angry:x
             //
             // Should be rendered as:
-            //     <p>These are not:) an :)emoji with a:) x:angry:x</p>
+            //     <p>These are not:) an emoji with a:) x:angry:x</p>
 
             Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 2, "Extensions Emoji");
-			TestParser.TestSpec("These are not:) an :)emoji with a:) x:angry:x", "<p>These are not:) an :)emoji with a:) x:angry:x</p>", "emojis|advanced+emojis");
+			TestParser.TestSpec("These are not:) an emoji with a:) x:angry:x", "<p>These are not:) an emoji with a:) x:angry:x</p>", "emojis|advanced+emojis");
+        }
+    }
+        // Emoji can be followed by close ponctuation (or any other characters):
+    [TestFixture]
+    public partial class TestExtensionsEmoji
+    {
+        [Test]
+        public void Example003()
+        {
+            // Example 3
+            // Section: Extensions Emoji
+            //
+            // The following CommonMark:
+            //     We all need :), it makes us :muscle:. (and :ok_hand:).
+            //
+            // Should be rendered as:
+            //     <p>We all need 😃, it makes us 💪. (and 👌).</p>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 3, "Extensions Emoji");
+			TestParser.TestSpec("We all need :), it makes us :muscle:. (and :ok_hand:).", "<p>We all need 😃, it makes us 💪. (and 👌).</p>", "emojis|advanced+emojis");
+        }
+    }
+        // Sentences can end with Emoji:
+    [TestFixture]
+    public partial class TestExtensionsEmoji
+    {
+        [Test]
+        public void Example004()
+        {
+            // Example 4
+            // Section: Extensions Emoji
+            //
+            // The following CommonMark:
+            //     This is a sentance :ok_hand:
+            //     and keeps going to the next line :)
+            //
+            // Should be rendered as:
+            //     <p>This is a sentance 👌
+            //     and keeps going to the next line 😃</p>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 4, "Extensions Emoji");
+			TestParser.TestSpec("This is a sentance :ok_hand:\nand keeps going to the next line :)", "<p>This is a sentance 👌\nand keeps going to the next line 😃</p>", "emojis|advanced+emojis");
         }
     }
         // # Extensions
@@ -18671,6 +18737,28 @@ namespace Markdig.Tests
             Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 6, "Extensions Abbreviation");
 			TestParser.TestSpec("*[1A]: First\n\nWe should not abbreviate 1.1A or 11A!", "<p>We should not abbreviate 1.1A or 11A!</p>", "abbreviations|advanced");
         }
+    }
+        // Abbreviations should match whole word only, even if the word is the entire content:
+    [TestFixture]
+    public partial class TestExtensionsAbbreviation
+    {
+        [Test]
+        public void Example007()
+        {
+            // Example 7
+            // Section: Extensions Abbreviation
+            //
+            // The following CommonMark:
+            //     *[1A]: First
+            //     
+            //     1.1A
+            //
+            // Should be rendered as:
+            //     <p>1.1A</p>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 7, "Extensions Abbreviation");
+			TestParser.TestSpec("*[1A]: First\n\n1.1A", "<p>1.1A</p>", "abbreviations|advanced");
+        }
     }
         // # Extensions
         //

src/Markdig.Tests/TestOrderedList.cs

@@ -0,0 +1,43 @@
+// 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.Helpers;
+using NUnit.Framework;
+
+namespace Markdig.Tests
+{
+    [TestFixture]
+    public class TestOrderedList
+    {
+        [Test]
+        public void TestReplace()
+        {
+            var list = new OrderedList<ITest>
+            {
+                new A(),
+                new B(),
+                new C(),
+            };
+
+            // Replacing B with D. Order should now be A, D, B.
+            var result = list.Replace<B>(new D());
+            Assert.That(result, Is.True);
+            Assert.That(list.Count, Is.EqualTo(3));
+            Assert.That(list[0], Is.InstanceOf<A>());
+            Assert.That(list[1], Is.InstanceOf<D>());
+            Assert.That(list[2], Is.InstanceOf<C>());
+
+            // Replacing B again should fail, as it's no longer in the list.
+            Assert.That(list.Replace<B>(new D()), Is.False);
+        }
+
+        #region Test fixtures
+        private interface ITest { }
+        private class A : ITest { }
+        private class B : ITest { }
+        private class C : ITest { }
+        private class D : ITest { }
+        #endregion
+    }
+}

src/Markdig/Extensions/Abbreviations/AbbreviationParser.cs

@@ -190,7 +190,7 @@ namespace Markdig.Extensions.Abbreviations
         {
             // The word matched must be embraced by punctuation or whitespace or \0.
             var index = matchIndex - 1;
-            while (index > content.Start)
+            while (index >= content.Start)
             {
                 var c = content.PeekCharAbsolute(index);
                 if (!(c == '\0' || c.IsAsciiPunctuation() || c.IsWhitespace()))
@@ -204,7 +204,7 @@ namespace Markdig.Extensions.Abbreviations
                 index--;
             }
             index = matchIndex + match.Length;
-            while (index < content.End)
+            while (index <= content.End)
             {
                 var c = content.PeekCharAbsolute(index);
                 if (!(c == '\0' || c.IsAsciiPunctuation() || c.IsWhitespace()))

src/Markdig/Extensions/Emoji/EmojiParser.cs

@@ -81,12 +81,6 @@ namespace Markdig.Extensions.Emoji
                 return false;
             }
 
-            // Following char must be a space
-            if (!slice.PeekCharExtra(match.Length).IsWhiteSpaceOrZero())
-            {
-                return false;
-            }
-
             // If we have a smiley, we decode it to emoji
             string emoji;
             if (!SmileyToEmoji.TryGetValue(match, out emoji))

src/Markdig/Extensions/ListExtras/ListExtraItemParser.cs

@@ -62,7 +62,7 @@ namespace Markdig.Extensions.ListExtras
             {
                 // otherwise we expect a regular alpha lettered list with a single character.
                 var isUpper = c.IsAlphaUpper();
-                result.OrderedStart = (Char.ToUpper(c) - 64).ToString();
+                result.OrderedStart = (Char.ToUpperInvariant(c) - 64).ToString();
                 result.BulletType = isUpper ? 'A' : 'a';
                 result.DefaultOrderedStart = isUpper ? "A" : "a";
                 state.NextChar();

src/Markdig/Helpers/CharHelper.cs

@@ -96,9 +96,9 @@ namespace Markdig.Helpers
             int result = 0;
             for (int i = 0; i < text.Length; i++)
             {
-                var character = Char.ToUpper(text[i]);
+                var character = Char.ToUpperInvariant(text[i]);
                 var candidate = romanMap[character];
-                if (i + 1 < text.Length && candidate < romanMap[Char.ToUpper(text[i + 1])])
+                if (i + 1 < text.Length && candidate < romanMap[Char.ToUpperInvariant(text[i + 1])])
                 {
                     result -= candidate;
                 }
@@ -162,6 +162,9 @@ namespace Markdig.Helpers
             return IsWhitespace(c) || IsZero(c);
         }
 
+        // Note that we are not considering the character & as a punctuation in HTML
+        // as it is used for HTML entities, print unicode, so we assume that when we have a `&` 
+        // it is more likely followed by a valid HTML Entity that represents a non punctuation
         public static void CheckUnicodeCategory(this char c, out bool space, out bool punctuation)
         {
             // Credits: code from CommonMark.NET
@@ -170,7 +173,7 @@ namespace Markdig.Helpers
             if (c <= 'ÿ')
             {
                 space = c == '\0' || c == ' ' || (c >= '\t' && c <= '\r') || c == '\u00a0' || c == '\u0085';
-                punctuation = c == '\0' || (c >= 33 && c <= 47) || (c >= 58 && c <= 64) || (c >= 91 && c <= 96) || (c >= 123 && c <= 126);
+                punctuation = c == '\0' || (c >= 33 && c <= 47 && c != 38) || (c >= 58 && c <= 64) || (c >= 91 && c <= 96) || (c >= 123 && c <= 126);
             }
             else
             {

src/Markdig/Helpers/OrderedList.cs

@@ -101,5 +101,25 @@ namespace Markdig.Helpers
             }
             return false;
         }
+
+        /// <summary>
+        /// Replaces <typeparamref name="TElement"/> with <paramref name="replacement"/>.
+        /// </summary>
+        /// <typeparam name="TElement">Element type to find in the list</typeparam>
+        /// <param name="replacement">Object to replace this element with</param>
+        /// <returns><c>true</c> if a replacement was made; otherwise <c>false</c>.</returns>
+        public bool Replace<TElement>(T replacement) where TElement : T
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                if (this[i] is TElement)
+                {
+                    RemoveAt(i);
+                    Insert(i, replacement);
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

src/Markdig/MarkdownExtensions.cs

@@ -39,6 +39,17 @@ namespace Markdig
     /// </summary>
     public static class MarkdownExtensions
     {
+        /// <summary>
+        /// Adds the specified extension to the extensions collection.
+        /// </summary>
+        /// <typeparam name="TExtension">The type of the extension.</typeparam>
+        /// <returns>The instance of <see cref="MarkdownPipelineBuilder" /></returns>
+        public static MarkdownPipelineBuilder Use<TExtension>(this MarkdownPipelineBuilder pipeline) where TExtension : class, IMarkdownExtension, new()
+        {
+            pipeline.Extensions.AddIfNotAlready<TExtension>();
+            return pipeline;
+        }
+
         /// <summary>
         /// Uses all extensions except the BootStrap, Emoji, SmartyPants and soft line as hard line breaks extensions.
         /// </summary>
@@ -66,8 +77,7 @@ namespace Markdig
                 .UseAutoLinks()
                 .UseGenericAttributes(); // Must be last as it is one parser that is modifying other parsers
         }
-
-
+        
         /// <summary>
         /// Uses this extension to enable autolinks from text `http://`, `https://`, `ftp://`, `mailto:`, `www.xxx.yyy`
         /// </summary>

src/Markdig/Properties/AssemblyInfo.cs

@@ -25,6 +25,6 @@ namespace Markdig
 {
     public static partial class Markdown
     {
-        public const string Version = "0.10.4";
+        public const string Version = "0.10.7";
     }
 }

src/Markdig/project.json

@@ -1,6 +1,6 @@
 {
   "title": "Markdig",
-  "version": "0.10.4",
+  "version": "0.10.7",
   "authors": [ "Alexandre Mutel" ],
   "description": "A fast, powerfull, CommonMark compliant, extensible Markdown processor for .NET with 20+ builtin extensions (pipetables, footnotes, definition lists... etc.)",
   "copyright": "Alexandre Mutel",
@@ -11,7 +11,7 @@
     "projectUrl": "https://github.com/lunet-io/markdig",
     "iconUrl": "https://raw.githubusercontent.com/lunet-io/markdig/master/img/markdig.png",
     "requireLicenseAcceptance": false,
-    "releaseNotes": "> 0.10.4\n - Fix issue with autolinks\n - Normalize number of columns for tables\n> 0.10.3\n - Fix issue with pipetables shifting a cell to a new column (issue #73)\n> 0.10.2\n - Fix exception when trying to urlize an url with an unicode character outside the supported range by NormD (issue #75)\n > 0.10.1\n- Update to latest CommonMark specs\n- Fix source span for LinkReferenceDefinition\n> 0.10.0\n- Breaking change of the IMarkdownExtension to allow to receive the MarkdownPipeline for the renderers setup\n",
+    "releaseNotes": "> 0.10.7\n - Fix issue when an url ends by a dot `.`\n> 0.10.6\n - Fix emphasis with HTML entities\n> 0.10.5\n - Several minor fixes\n> 0.10.4\n - Fix issue with autolinks\n - Normalize number of columns for tables\n> 0.10.3\n - Fix issue with pipetables shifting a cell to a new column (issue #73)\n> 0.10.2\n - Fix exception when trying to urlize an url with an unicode character outside the supported range by NormD (issue #75)\n > 0.10.1\n- Update to latest CommonMark specs\n- Fix source span for LinkReferenceDefinition\n> 0.10.0\n- Breaking change of the IMarkdownExtension to allow to receive the MarkdownPipeline for the renderers setup\n",
     "tags": [ "Markdown CommonMark md html md2html" ]
   },
   "configurations": {

src/global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "1.0.0-preview2-003121"
+  }
+}