Bump to 0.5.4

Fix bug for html block parsing in StringSlice.Search (issue #12 )
Bump version to 0.5.3
2026-02-14 21:47:13 +00:00 · 2016-06-20 06:58:55 +09:00 · 2016-06-20 06:56:13 +09:00 · 2016-06-19 11:37:26 +09:00 · 2016-06-19 11:37:12 +09:00
8 changed files with 263 additions and 42 deletions
--- a/src/Markdig.Tests/Specs/PipeTableSpecs.md
+++ b/src/Markdig.Tests/Specs/PipeTableSpecs.md
@@ -214,6 +214,76 @@ Column delimiters `|` at the very beginning of a line or just before a line endi
 </tbody>
 </table>
 ````````````````````````````````
+
+A pipe may be present at both the beginning/ending of each line:
+
+```````````````````````````````` example
+|a|b|
+|-|-|
+|0|1|
+.
+<table>
+<thead>
+<tr>
+<th>a</th>
+<th>b</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>0</td>
+<td>1</td>
+</tr>
+</tbody>
+</table>
+````````````````````````````````
+
+Or may be ommitted on one side:
+
+```````````````````````````````` example
+a|b|
+-|-|
+0|1|
+.
+<table>
+<thead>
+<tr>
+<th>a</th>
+<th>b</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>0</td>
+<td>1</td>
+</tr>
+</tbody>
+</table>
+````````````````````````````````
+
+```````````````````````````````` example
+|a|b
+|-|-
+|0|1
+.
+<table>
+<thead>
+<tr>
+<th>a</th>
+<th>b</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>0</td>
+<td>1</td>
+</tr>
+</tbody>
+</table>
+````````````````````````````````
+
+
+
 Single column table can be declared with lines starting only by a column delimiter: 

 ```````````````````````````````` example
--- a/src/Markdig.Tests/Specs/Specs.cs
+++ b/src/Markdig.Tests/Specs/Specs.cs
@@ -16631,7 +16631,7 @@ namespace Markdig.Tests
 			TestParser.TestSpec("  a     | b     |\n--      | --\n| 0     | 1\n| 2     | 3     |\n  4     | 5 ", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td>1</td>\n</tr>\n<tr>\n<td>2</td>\n<td>3</td>\n</tr>\n<tr>\n<td>4</td>\n<td>5</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
-        // Single column table can be declared with lines starting only by a column delimiter:
+        // A pipe may be present at both the beginning/ending of each line:
    [TestFixture]
    public partial class TestExtensionsPipeTable
    {
@@ -16642,6 +16642,110 @@ namespace Markdig.Tests
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
+            //     |a|b|
+            //     |-|-|
+            //     |0|1|
+            //
+            // Should be rendered as:
+            //     <table>
+            //     <thead>
+            //     <tr>
+            //     <th>a</th>
+            //     <th>b</th>
+            //     </tr>
+            //     </thead>
+            //     <tbody>
+            //     <tr>
+            //     <td>0</td>
+            //     <td>1</td>
+            //     </tr>
+            //     </tbody>
+            //     </table>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 10, "Extensions Pipe Table");
+			TestParser.TestSpec("|a|b|\n|-|-|\n|0|1|", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td>1</td>\n</tr>\n</tbody>\n</table>", "pipetables");
+        }
+    }
+        // Or may be ommitted on one side:
+    [TestFixture]
+    public partial class TestExtensionsPipeTable
+    {
+        [Test]
+        public void Example011()
+        {
+            // Example 11
+            // Section: Extensions Pipe Table
+            //
+            // The following CommonMark:
+            //     a|b|
+            //     -|-|
+            //     0|1|
+            //
+            // Should be rendered as:
+            //     <table>
+            //     <thead>
+            //     <tr>
+            //     <th>a</th>
+            //     <th>b</th>
+            //     </tr>
+            //     </thead>
+            //     <tbody>
+            //     <tr>
+            //     <td>0</td>
+            //     <td>1</td>
+            //     </tr>
+            //     </tbody>
+            //     </table>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 11, "Extensions Pipe Table");
+			TestParser.TestSpec("a|b|\n-|-|\n0|1|", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td>1</td>\n</tr>\n</tbody>\n</table>", "pipetables");
+        }
+    }
+    [TestFixture]
+    public partial class TestExtensionsPipeTable
+    {
+        [Test]
+        public void Example012()
+        {
+            // Example 12
+            // Section: Extensions Pipe Table
+            //
+            // The following CommonMark:
+            //     |a|b
+            //     |-|-
+            //     |0|1
+            //
+            // Should be rendered as:
+            //     <table>
+            //     <thead>
+            //     <tr>
+            //     <th>a</th>
+            //     <th>b</th>
+            //     </tr>
+            //     </thead>
+            //     <tbody>
+            //     <tr>
+            //     <td>0</td>
+            //     <td>1</td>
+            //     </tr>
+            //     </tbody>
+            //     </table>
+
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 12, "Extensions Pipe Table");
+			TestParser.TestSpec("|a|b\n|-|-\n|0|1", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td>1</td>\n</tr>\n</tbody>\n</table>", "pipetables");
+        }
+    }
+        // Single column table can be declared with lines starting only by a column delimiter:
+    [TestFixture]
+    public partial class TestExtensionsPipeTable
+    {
+        [Test]
+        public void Example013()
+        {
+            // Example 13
+            // Section: Extensions Pipe Table
+            //
+            // The following CommonMark:
            //     | a
            //     | --
            //     | b
@@ -16664,7 +16768,7 @@ namespace Markdig.Tests
            //     </tbody>
            //     </table>

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 10, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 13, "Extensions Pipe Table");
 			TestParser.TestSpec("| a\n| --\n| b\n| c ", "<table>\n<thead>\n<tr>\n<th>a</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>b</td>\n</tr>\n<tr>\n<td>c</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
@@ -16681,9 +16785,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example011()
+        public void Example014()
        {
-            // Example 11
+            // Example 14
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16712,7 +16816,7 @@ namespace Markdig.Tests
            //     </tbody>
            //     </table>

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 11, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 14, "Extensions Pipe Table");
 			TestParser.TestSpec(" a     | b \n-------|-------\n 0     | 1 \n 2     | 3 ", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td>1</td>\n</tr>\n<tr>\n<td>2</td>\n<td>3</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
@@ -16722,9 +16826,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example012()
+        public void Example015()
        {
-            // Example 12
+            // Example 15
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16756,7 +16860,7 @@ namespace Markdig.Tests
            //     </tbody>
            //     </table>

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 12, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 15, "Extensions Pipe Table");
 			TestParser.TestSpec(" a     | b       | c \n:------|:-------:| ----:\n 0     | 1       | 2 \n 3     | 4       | 5 ", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th style=\"text-align: center;\">b</th>\n<th style=\"text-align: right;\">c</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td style=\"text-align: center;\">1</td>\n<td style=\"text-align: right;\">2</td>\n</tr>\n<tr>\n<td>3</td>\n<td style=\"text-align: center;\">4</td>\n<td style=\"text-align: right;\">5</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
@@ -16765,9 +16869,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example013()
+        public void Example016()
        {
-            // Example 13
+            // Example 16
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16782,7 +16886,7 @@ namespace Markdig.Tests
            //     0     | 1
            //     2     | 3</p> 

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 13, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 16, "Extensions Pipe Table");
 			TestParser.TestSpec(" a     | b\n-------|---x---\n 0     | 1\n 2     | 3 ", "<p>a     | b\n-------|---x---\n0     | 1\n2     | 3</p> ", "pipetables");
        }
    }
@@ -16793,9 +16897,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example014()
+        public void Example017()
        {
-            // Example 14
+            // Example 17
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16824,7 +16928,7 @@ namespace Markdig.Tests
            //     </tbody>
            //     </table>

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 14, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 17, "Extensions Pipe Table");
 			TestParser.TestSpec(" *a*   | b\n-----  |-----\n 0     | _1_\n _2    | 3* ", "<table>\n<thead>\n<tr>\n<th><em>a</em></th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td><em>1</em></td>\n</tr>\n<tr>\n<td>_2</td>\n<td>3*</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
@@ -16835,9 +16939,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example015()
+        public void Example018()
        {
-            // Example 15
+            // Example 18
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16847,7 +16951,7 @@ namespace Markdig.Tests
            // Should be rendered as:
            //     <p>a | b <code>0 |</code></p> 

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 15, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 18, "Extensions Pipe Table");
 			TestParser.TestSpec("a | b `\n0 | ` ", "<p>a | b <code>0 |</code></p> ", "pipetables");
        }
    }
@@ -16858,9 +16962,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example016()
+        public void Example019()
        {
-            // Example 16
+            // Example 19
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16884,7 +16988,7 @@ namespace Markdig.Tests
            //     </tbody>
            //     </table>

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 16, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 19, "Extensions Pipe Table");
 			TestParser.TestSpec("a <a href=\"\" title=\"|\"></a> | b\n-- | --\n0  | 1", "<table>\n<thead>\n<tr>\n<th>a <a href=\"\" title=\"|\"></a></th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>0</td>\n<td>1</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
@@ -16895,9 +16999,9 @@ namespace Markdig.Tests
    public partial class TestExtensionsPipeTable
    {
        [Test]
-        public void Example017()
+        public void Example020()
        {
-            // Example 17
+            // Example 20
            // Section: Extensions Pipe Table
            //
            // The following CommonMark:
@@ -16921,7 +17025,7 @@ namespace Markdig.Tests
            //     </tbody>
            //     </table>

-            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 17, "Extensions Pipe Table");
+            Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 20, "Extensions Pipe Table");
 			TestParser.TestSpec("a  | b\n-- | --\n[This is a link with a | inside the label](http://google.com) | 1", "<table>\n<thead>\n<tr>\n<th>a</th>\n<th>b</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td><a href=\"http://google.com\">This is a link with a | inside the label</a></td>\n<td>1</td>\n</tr>\n</tbody>\n</table>", "pipetables");
        }
    }
--- a/src/Markdig.Tests/TestSourcePosition.cs
+++ b/src/Markdig.Tests/TestSourcePosition.cs
@@ -206,19 +206,6 @@ literal      ( 0, 4)  4-5
            Assert.AreEqual(SourceSpan.Empty, link.TitleSpan);
        }

-        [Test]
-        public void TestHtmlInline()
-        {
-            //     0123456789
-            Check("01<b>4</b>", @"
-paragraph    ( 0, 0)  0-9
-literal      ( 0, 0)  0-1
-html         ( 0, 2)  2-4
-literal      ( 0, 5)  5-5
-html         ( 0, 6)  6-9
-");
-        }
-
        [Test]
        public void TestAutolinkInline()
        {
@@ -252,6 +239,64 @@ literal      ( 4, 0) 16-16
 ");
        }

+        [Test]
+        public void TestHtmlBlock1()
+        {
+            //     0           1
+            //     01 2 345678901 23
+            Check("0\n\n<!--A-->\n1\n", @"
+paragraph    ( 0, 0)  0-0
+literal      ( 0, 0)  0-0
+html         ( 2, 0)  3-10
+paragraph    ( 3, 0) 12-12
+literal      ( 3, 0) 12-12
+");
+        }
+
+        [Test]
+        public void TestHtmlComment()
+        {
+            //     0         1          2
+            //     012345678901 234567890 1234
+            Check("# 012345678\n<!--0-->\n123\n", @"
+heading      ( 0, 0)  0-10
+literal      ( 0, 2)  2-10
+html         ( 1, 0) 12-19
+paragraph    ( 2, 0) 21-23
+literal      ( 2, 0) 21-23
+");
+        }
+
+        [Test]
+        public void TestHtmlInline()
+        {
+            //     0123456789
+            Check("01<b>4</b>", @"
+paragraph    ( 0, 0)  0-9
+literal      ( 0, 0)  0-1
+html         ( 0, 2)  2-4
+literal      ( 0, 5)  5-5
+html         ( 0, 6)  6-9
+");
+        }
+
+        [Test]
+        public void TestHtmlInline1()
+        {
+            //     0         
+            //     0123456789
+            Check("0<!--A-->1", @"
+paragraph    ( 0, 0)  0-9
+literal      ( 0, 0)  0-0
+html         ( 0, 1)  1-8
+literal      ( 0, 9)  9-9
+");
+        }
+
+
+
+
+
        [Test]
        public void TestThematicBreak()
        {
--- a/src/Markdig/Extensions/Tables/PipeTableExtension.cs
+++ b/src/Markdig/Extensions/Tables/PipeTableExtension.cs
@@ -28,6 +28,8 @@ namespace Markdig.Extensions.Tables

        public void Setup(MarkdownPipelineBuilder pipeline)
        {
+            // Pipe tables require precise source location
+            pipeline.PreciseSourceLocation = true;
            if (!pipeline.BlockParsers.Contains<PipeTableBlockParser>())
            {
                pipeline.BlockParsers.Insert(0, new PipeTableBlockParser());
--- a/src/Markdig/Extensions/Tables/PipeTableParser.cs
+++ b/src/Markdig/Extensions/Tables/PipeTableParser.cs
@@ -444,8 +444,8 @@ namespace Markdig.Extensions.Tables
                        }

                        // Check the left side of a `|` delimiter
-                        TableColumnAlign align;
-                        if (!ParseHeaderString(delimiter.PreviousSibling, out align))
+                        TableColumnAlign align = TableColumnAlign.Left;
+                        if (delimiter.PreviousSibling != null && !ParseHeaderString(delimiter.PreviousSibling, out align))
                        {
                            break;
                        }
--- a/src/Markdig/Helpers/StringSlice.cs
+++ b/src/Markdig/Helpers/StringSlice.cs
@@ -212,7 +212,7 @@ namespace Markdig.Helpers
            index = Start + offset;
            for (int i = index; i <= end; i ++)
            {
-                if (Match(text, End, i))
+                if (Match(text, End, i - Start))
                {
                    index = i + text.Length;
                    return true;
--- a/src/Markdig/Properties/AssemblyInfo.cs
+++ b/src/Markdig/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@ namespace Markdig
 {
    public static partial class Markdown
    {
-        public const string Version = "0.5.2";
+        public const string Version = "0.5.4";
    }
 }
--- a/src/Markdig/project.json
+++ b/src/Markdig/project.json
@@ -1,6 +1,6 @@
 {
  "title": "Markdig",
-  "version": "0.5.2",
+  "version": "0.5.4",
  "authors": [ "Alexandre Mutel" ],
  "description": "A fast, powerfull, CommonMark compliant, extensible Markdown processor for .NET",
  "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.5.2:\nAdd better support for precise source location for link parts (label, url...)\n> 0.5.1:\nAdd support for task lists.\nAdd support for precise source location pipelineBuilder.UsePreciseSourceLocation.\nBreaking change: Markdown.ToHtml() accept now only a string instead of a TextReader as this improve the overall performance.",
+    "releaseNotes": "Fix bug in HTML block parsing which could break parsing of remaining document",
    "tags": [ "Markdown CommonMark md html md2html" ]
  },
  "configurations": {
Author	SHA1	Message	Date
Alexandre Mutel	5844ccc395	Bump to 0.5.4	2016-06-20 06:58:55 +09:00
Alexandre Mutel	be9c6fa54b	Fix bug for html block parsing in StringSlice.Search (issue #12 )	2016-06-20 06:56:13 +09:00
Alexandre Mutel	d14f277c7b	Bump version to 0.5.3	2016-06-19 11:37:26 +09:00
Alexandre Mutel	593bf08b92	Fix bug in pipetables with a trailing `\|` on the header row separator (issue #10 )	2016-06-19 11:37:12 +09:00