Skip to content

Commit

Permalink
Merge pull request #71 from AMDL/0.11
Browse files Browse the repository at this point in the history 
0.11
  • Loading branch information
@Knagis
Knagis committed Dec 29, 2015
2 parents 8d0359b + aff3558 commit 95edf7c
Show file tree
Hide file tree
Showing 29 changed files with 2,580 additions and 2,285 deletions.
7 changes: 4 additions & 3 deletions CommonMark.NET.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<id>CommonMark.NET</id>
<version>0.11.0</version>
<title>CommonMark.NET</title>
<authors>Knagis</authors>
<authors>Kārlis Gaņģis</authors>
<licenseUrl>https://raw.githubusercontent.com/Knagis/CommonMark.NET/master/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/Knagis/CommonMark.NET/</projectUrl>
<iconUrl>https://raw.githubusercontent.com/dcurtis/markdown-mark/master/png/32x20.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>Fastest .NET library for converting Markdown documents to HTML.</summary>
<description>.NET library for converting Markdown documents to HTML according to the CommonMark specification. Optimized for maximum performance and targets every .NET version since 2.0, including PCL, Mono and .NET Core.</description>
<releaseNotes>Added optimized PCL targeting .NET 4.5.</releaseNotes>
<releaseNotes>Updated to specification 0.23
Added optimized PCL targeting .NET 4.5.</releaseNotes>
<copyright>Copyright © Kārlis Gaņģis 2014-2015</copyright>
<tags>CommonMark Markdown</tags>
</metadata>
Expand All @@ -22,7 +23,7 @@
<file src="CommonMark\bin\v4.0\Release\CommonMark.*" target="lib\net40-client\" />
<file src="CommonMark\bin\v4.5\Release\CommonMark.*" target="lib\net45\" />
<file src="CommonMark\bin\portable\Release\CommonMark.*" target="lib\portable-net40+sl50+wp80+win+wpa81+MonoAndroid10+MonoTouch10\" />
<file src="CommonMark\bin\portable_v4.5\Release\CommonMark.*" target="lib\portable-net45+wp80+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\" />
<file src="CommonMark\bin\portable_259\Release\CommonMark.*" target="lib\portable-net45+wp80+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\" />
<file src="CommonMark\bin\core\Release\dnxcore50\CommonMark.*" target="lib\dnxcore50\" />
<file src="CommonMark.Console\bin\Release\CommonMark.Console.exe" target="tools\cmark.exe" />
<file src="CommonMark.Console\App.nuget.config" target="tools\cmark.exe.config" />
Expand Down
20 changes: 10 additions & 10 deletions CommonMark.Tests/DelimiterCharTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,79 +14,79 @@ public void EmphasisDelimiterChar()
{
var md = "*foo*";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('*', doc.FirstChild.InlineContent.DelimiterCharacter);
Assert.AreEqual('*', doc.FirstChild.InlineContent.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void EmphasisDelimiterChar2()
{
var md = "_foo_";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('_', doc.FirstChild.InlineContent.DelimiterCharacter);
Assert.AreEqual('_', doc.FirstChild.InlineContent.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void EmphasisDelimiterChar3()
{
var md = "_foo[bar_";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('_', doc.FirstChild.InlineContent.DelimiterCharacter);
Assert.AreEqual('_', doc.FirstChild.InlineContent.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void EmphasisDelimiterChar4()
{
var md = "*foo[bar*";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('*', doc.FirstChild.InlineContent.DelimiterCharacter);
Assert.AreEqual('*', doc.FirstChild.InlineContent.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void DoubleEmphasisDelimiterChar()
{
var md = "_*foo*_";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('*', doc.FirstChild.InlineContent.FirstChild.DelimiterCharacter);
Assert.AreEqual('*', doc.FirstChild.InlineContent.FirstChild.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void DoubleEmphasisDelimiterChar2()
{
var md = "*_foo_*";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('_', doc.FirstChild.InlineContent.FirstChild.DelimiterCharacter);
Assert.AreEqual('_', doc.FirstChild.InlineContent.FirstChild.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void DoubleEmphasisDelimiterChar3()
{
var md = "_*foo[bar*_";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('*', doc.FirstChild.InlineContent.FirstChild.DelimiterCharacter);
Assert.AreEqual('*', doc.FirstChild.InlineContent.FirstChild.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void DoubleEmphasisDelimiterChar4()
{
var md = "*_foo[bar_*";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('_', doc.FirstChild.InlineContent.FirstChild.DelimiterCharacter);
Assert.AreEqual('_', doc.FirstChild.InlineContent.FirstChild.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void DoubleEmphasisDelimiterChar5()
{
var md = "_*foo[bar*baz_";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('*', doc.FirstChild.InlineContent.FirstChild.DelimiterCharacter);
Assert.AreEqual('*', doc.FirstChild.InlineContent.FirstChild.Emphasis.DelimiterCharacter);
}

[TestMethod]
public void DoubleEmphasisDelimiterChar6()
{
var md = "*_foo[bar_baz*";
var doc = Helpers.ParseDocument(md);
Assert.AreEqual('_', doc.FirstChild.InlineContent.FirstChild.DelimiterCharacter);
Assert.AreEqual('_', doc.FirstChild.InlineContent.FirstChild.Emphasis.DelimiterCharacter);
}
}
}
11 changes: 3 additions & 8 deletions CommonMark.Tests/HeadingTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace CommonMark.Tests
{
[TestClass]
public class HeadingTests
{
[TestMethod]
[TestCategory("Leaf blocks - ATX headers")]
public void HeadingsAndHorizontalRulers()
[TestCategory("Leaf blocks - ATX headings")]
public void HeadingsAndThematicBreaks()
{
// see https://github.com/Knagis/CommonMark.NET/issues/60
Helpers.ExecuteTest("##### A\n---\n\n##### B\n---\n\n##### C\n---", "<h5>A</h5>\n<hr />\n<h5>B</h5>\n<hr />\n<h5>C</h5>\n<hr />\n");
Expand Down
14 changes: 6 additions & 8 deletions CommonMark.Tests/SourcePositionTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace CommonMark.Tests
Expand Down Expand Up @@ -35,13 +33,13 @@ public void SourcePositionEmptyString()

[TestMethod]
[TestCategory("SourcePosition - Blocks")]
public void SourcePositionSETextHeader()
public void SourcePositionSETextHeading()
{
var data = "foo\n\nbaz\n===\n\nbar";
var doc = Helpers.ParseDocument(data, Settings);

var code = doc.AsEnumerable()
.FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.SETextHeader);
.FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.SetextHeading);

Assert.IsNotNull(code);
Assert.AreEqual("baz\n===\n",
Expand All @@ -50,13 +48,13 @@ public void SourcePositionSETextHeader()

[TestMethod]
[TestCategory("SourcePosition - Blocks")]
public void SourcePositionAtxHeader()
public void SourcePositionAtxHeading()
{
var data = "foo\n\n## baz\n\nbar";
var doc = Helpers.ParseDocument(data, Settings);

var code = doc.AsEnumerable()
.FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.AtxHeader);
.FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.AtxHeading);

Assert.IsNotNull(code);
Assert.AreEqual("## baz\n",
Expand All @@ -65,13 +63,13 @@ public void SourcePositionAtxHeader()

[TestMethod]
[TestCategory("SourcePosition - Blocks")]
public void SourcePositionHorizontalRuler()
public void SourcePositionThematicBreak()
{
var data = "foo\n\n----\n\nbar";
var doc = Helpers.ParseDocument(data, Settings);

var code = doc.AsEnumerable()
.FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.HorizontalRuler);
.FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.ThematicBreak);

Assert.IsNotNull(code);
Assert.AreEqual("----\n",
Expand Down
Loading

0 comments on commit 95edf7c

Please sign in to comment.