Code block support

src/Pretzel.Logic/Extensions/YamlExtensions.cs

@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using YamlDotNet.RepresentationModel;
 using System.IO;
+using System.Linq;
 using YamlDotNet.Serialization;
 
 namespace Pretzel.Logic.Extensions
@@ -107,7 +109,7 @@ public static string ExcludeHeader(this string text)
             if (m.Count == 0)
                 return text;
 
-            return text.Replace(m[0].Groups[0].Value, "").Trim();
+            return text.Replace(m[0].Groups[0].Value, "").TrimStart('\r', '\n').TrimEnd();
         }
     }
 }

src/Pretzel.Logic/Pretzel.Logic.csproj

@@ -37,6 +37,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\AjaxMin.5.13.5463.15282\lib\net40\AjaxMin.dll</HintPath>
     </Reference>
+    <Reference Include="CommonMark">
+      <HintPath>..\packages\CommonMark.NET.0.8.0\lib\net40-client\CommonMark.dll</HintPath>
+    </Reference>
     <Reference Include="dotless.ClientOnly">
       <HintPath>..\packages\DotlessClientOnly.1.4.1.0\lib\dotless.ClientOnly.dll</HintPath>
     </Reference>
@@ -46,10 +49,6 @@
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="MarkdownDeep, Version=1.5.4615.26275, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll</HintPath>
-    </Reference>
     <Reference Include="NDesk.Options">
       <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
     </Reference>
@@ -134,11 +133,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>RazorCsProject.resx</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Resources1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="Resources\Liquid\Sitemap.liquid" />
     <None Include="Resources\RazorAzure\Shim.cs" />
     <None Include="Resources\RazorCsProject\Category_cs" />
@@ -154,6 +148,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>RazorWiki.resx</DependentUpon>
     </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="SanityCheck.cs" />
     <Compile Include="Templating\Context\Category.cs" />
     <Compile Include="Templating\Context\NonProcessedPage.cs" />
@@ -198,7 +197,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
-      <LastGenOutput>Resources1.Designer.cs</LastGenOutput>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\RazorAzure.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -211,6 +210,7 @@
     <EmbeddedResource Include="Properties\RazorWiki.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>RazorWiki.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

src/Pretzel.Logic/Resources/Liquid/FirstPost.liquid

@@ -7,4 +7,12 @@ comments: true
 
 ## Hello world...
 
+```cs
+static void Main() 
+{
+    Console.WriteLine("Hello World!");
+}
+```
+
+
 This is my first post on the site!

src/Pretzel.Logic/Resources/Liquid/Index.liquid

@@ -9,15 +9,13 @@ title : SiteName
 			<div class="idea">
 				{% if forloop.first and post.layout == "post" %}
 					<h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
-
 					<div class="postdate">{{ post.date | date: "%e %B, %Y"  }}
 						<ul>
 						{% for tag in post.tags %}
 							<li><a href="/tag/{{ tag }}">{{ tag }}</a></li>
 						{% endfor %}
 						</ul>
 					</div>
-
 					{{ post.content }}
 					<br />
 					<a href="{{ post.url}}#disqus_thread">Comments</a>
@@ -31,7 +29,6 @@ title : SiteName
 						</ul>
 					</div>
 					{{ post.content }}
-
 					<a href="{{ post.url }}#disqus_thread">Comments</a>
 				{% endif %}
 			</div>

src/Pretzel.Logic/Resources/Liquid/Layout.liquid

@@ -5,10 +5,10 @@
 		<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
 		<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="Blog Feed" />
 		<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Blog Feed" />
-
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 		<title>{{ page.title }}</title>
 		<link rel="stylesheet" type="text/css" href="/css/style.css" />
+		<link rel="stylesheet" href="//cdn.jsdelivr.net/highlight.js/8.4/styles/default.min.css">
 		<link rel="shortcut icon" href="/img/favicon.ico" />
 	</head>
 	<body>
@@ -26,7 +26,8 @@
 			<div id="content">
 				{{content}}
 			</div>
-
 		</div>
+		<script src="//cdn.jsdelivr.net/highlight.js/8.4/highlight.min.js"></script>
+		<script>hljs.initHighlightingOnLoad();</script>
 	</body>
 </html>

src/Pretzel.Logic/Resources/Liquid/Post.liquid

@@ -25,7 +25,6 @@ layout: layout
 <script type="text/javascript">
     /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
     var disqus_shortname = 'NAME'; // required: replace example with your forum shortname
-
     /* * * DON'T EDIT BELOW THIS LINE * * */
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;

src/Pretzel.Logic/Resources/Liquid/Rss.liquid

@@ -11,7 +11,6 @@ layout: nil
     <language>en-au</language>
     <pubDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
     <lastBuildDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
-
     {% for post in site.posts %}
     <item>
       <title>{{ post.title | xml_escape }}</title>
@@ -22,6 +21,5 @@ layout: nil
       <description>{{ post.content | xml_escape }}</description>
     </item>
     {% endfor %}
-
   </channel> 
 </rss>

src/Pretzel.Logic/Resources/Liquid/Sitemap.liquid

@@ -8,7 +8,6 @@ layout: nil
   xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
   http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
   <!-- Generated with pretzel -->
-
   {% for post in site.posts %}
   <url>
     <loc>http://domain{{ post.url }}</loc>
@@ -27,5 +26,4 @@ layout: nil
 	</url>
 	{% endif %}
   {% endfor %}
-
 </urlset>

src/Pretzel.Logic/Resources/Razor/FirstPost.cshtml

@@ -7,4 +7,13 @@ comments: true
 
 ## Hello world...
 
+Code:
+
+```cs
+static void Main() 
+{
+    Console.WriteLine("Hello World!");
+}
+```
+
 This is my first post on the site!

src/Pretzel.Logic/Resources/Razor/Index.cshtml

@@ -16,7 +16,6 @@ title : SiteName
                 @if (i == 0 && post.Layout == "post")
                 {
                     <h1><a href="@post.Url">@post.Title</a></h1>
-
                     <div class="postdate">@post.Date.ToString("d MMM, yyyy")
                         <ul>
                             @foreach(var tag in post.Tags)
@@ -41,7 +40,6 @@ title : SiteName
                         </ul>
                     </div>
                     @Raw(post.Content)
-
                     <a href="@post.Url#disqus_thread">Comments</a>
                 }
             </div>

src/Pretzel.Logic/Resources/Razor/Layout.cshtml

@@ -7,10 +7,10 @@
 		<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
 		<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="Blog Feed" />
 		<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Blog Feed" />
-
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 		<title>@Model.Title</title>
 		<link rel="stylesheet" type="text/css" href="/css/style.css" />
+		<link rel="stylesheet" href="//cdn.jsdelivr.net/highlight.js/8.4/styles/default.min.css">
 		<link rel="shortcut icon" href="/img/favicon.ico" />
 	</head>
 	<body>
@@ -28,7 +28,8 @@
 			<div id="content">
 				@Raw(Model.Content)
 			</div>
-
 		</div>
+		<script src="//cdn.jsdelivr.net/highlight.js/8.4/highlight.min.js"></script>
+		<script>hljs.initHighlightingOnLoad();</script>
 	</body>
 </html>

src/Pretzel.Logic/Templating/Context/SiteContextGenerator.cs

@@ -1,5 +1,4 @@
-using MarkdownDeep;
-using Pretzel.Logic.Extensibility;
+using Pretzel.Logic.Extensibility;
 using Pretzel.Logic.Extensions;
 using System;
 using System.Collections.Generic;
@@ -22,7 +21,6 @@ public class SiteContextGenerator
 
 
         readonly Dictionary<string, Page> pageCache = new Dictionary<string, Page>();
-        static readonly Markdown Markdown = new Markdown();
         readonly IFileSystem fileSystem;
         readonly IEnumerable<IContentTransform> contentTransformers;
         readonly List<string> includes = new List<string>();
@@ -328,7 +326,7 @@ private string RenderContent(string file, string contents, IDictionary<string, o
                 var contentsWithoutHeader = contents.ExcludeHeader();
 
                 html = Path.GetExtension(file).IsMarkdownFile()
-                       ? Markdown.Transform(contentsWithoutHeader)
+                       ? CommonMark.CommonMarkConverter.Convert(contentsWithoutHeader).Trim()
                        : contentsWithoutHeader;
 
                 html = contentTransformers.Aggregate(html, (current, contentTransformer) => contentTransformer.Transform(current));

src/Pretzel.Logic/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AjaxMin" version="5.13.5463.15282" targetFramework="net40" />
+  <package id="CommonMark.NET" version="0.8.0" targetFramework="net40" />
   <package id="DotlessClientOnly" version="1.4.1.0" targetFramework="net40" />
   <package id="DotLiquid" version="1.8.0" targetFramework="net40" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net40" />