From 3e75a10056fe3016488f0cbe62b1ff68ffd78959 Mon Sep 17 00:00:00 2001
From: Ben Hollis <ben@benhollis.net>
Date: Sat, 6 Apr 2013 16:01:40 -0700
Subject: [PATCH] Switch default markdown engine to Kramdown

---
 CHANGELOG.md                                            | 1 +
 middleman-core/lib/middleman-core/renderers/markdown.rb | 2 +-
 middleman-more/features/markdown.feature                | 2 +-
 middleman-more/fixtures/markdown-app/config.rb          | 1 +
 middleman-more/middleman-more.gemspec                   | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d38345a7..e7d137a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 master
 ===
 
+* Switched default Markdown engine to Kramdown. #852
 * Overhaul content-type handling, and add a `:content_type` parameter for `page`, `proxy`, and frontmatter that allows for overriding the default content type. #851
 * Fixes for upcoming Sass versions.
 * Fix markdown filters in Haml 4 so that they don't throw errors when generating links/images and so they use our magic image_tag/link_to methods. #662
diff --git a/middleman-core/lib/middleman-core/renderers/markdown.rb b/middleman-core/lib/middleman-core/renderers/markdown.rb
index 08b8c8b7..162e593a 100644
--- a/middleman-core/lib/middleman-core/renderers/markdown.rb
+++ b/middleman-core/lib/middleman-core/renderers/markdown.rb
@@ -10,7 +10,7 @@ module Middleman
         # Once registered
         def registered(app)
           # Set our preference for a markdown engine
-          app.config.define_setting :markdown_engine, :maruku, 'Preferred markdown engine'
+          app.config.define_setting :markdown_engine, :kramdown, 'Preferred markdown engine'
           app.config.define_setting :markdown_engine_prefix, ::Tilt, 'The parent module for markdown template engines'
 
           app.before_configuration do
diff --git a/middleman-more/features/markdown.feature b/middleman-more/features/markdown.feature
index 88b99bd6..ef8de3ea 100644
--- a/middleman-more/features/markdown.feature
+++ b/middleman-more/features/markdown.feature
@@ -9,4 +9,4 @@ Feature: Markdown support
   Scenario: Markdown extensions (Maruku)
     Given the Server is running at "markdown-app"
     When I go to "/smarty_pants.html"
-    Then I should see "&"
\ No newline at end of file
+    Then I should see "“Hello”"
\ No newline at end of file
diff --git a/middleman-more/fixtures/markdown-app/config.rb b/middleman-more/fixtures/markdown-app/config.rb
index e69de29b..55b36b24 100644
--- a/middleman-more/fixtures/markdown-app/config.rb
+++ b/middleman-more/fixtures/markdown-app/config.rb
@@ -0,0 +1 @@
+set :markdown, :smartypants => true
diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec
index 64795889..b6f9cd7d 100644
--- a/middleman-more/middleman-more.gemspec
+++ b/middleman-more/middleman-more.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("compass", [">= 0.12.2"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.4.0"])
-  s.add_dependency("maruku", ["~> 0.6.0"])
+  s.add_dependency("kramdown", ["~> 1.0.0"])
   s.add_dependency("i18n", ["~> 0.6.4"])
   s.add_dependency("padrino-helpers", ["0.10.7"])
 end
\ No newline at end of file