Switch default markdown engine to Kramdown

This commit is contained in:
Ben Hollis 2013-04-06 16:01:40 -07:00
parent 53bddf8304
commit 3e75a10056
5 changed files with 5 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

@ -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 "&"
Then I should see "Hello"

View file

@ -0,0 +1 @@
set :markdown, :smartypants => true

View file

@ -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