deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch default markdown engine to Kramdown

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
master 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 * 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. * 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 * 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

2
middleman-core/lib/middleman-core/renderers/markdown.rb
View file

@ -10,7 +10,7 @@ module Middleman
# Once registered # Once registered
def registered(app) def registered(app)
# Set our preference for a markdown engine # 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.config.define_setting :markdown_engine_prefix, ::Tilt, 'The parent module for markdown template engines'
app.before_configuration do app.before_configuration do

2
middleman-more/features/markdown.feature
View file

@ -9,4 +9,4 @@ Feature: Markdown support
Scenario: Markdown extensions (Maruku) Scenario: Markdown extensions (Maruku)
Given the Server is running at "markdown-app" Given the Server is running at "markdown-app"
When I go to "/smarty_pants.html" When I go to "/smarty_pants.html"
Then I should see "&" Then I should see "“Hello”"

1
middleman-more/fixtures/markdown-app/config.rb
View file

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

2
middleman-more/middleman-more.gemspec
View file

@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency("compass", [">= 0.12.2"]) s.add_dependency("compass", [">= 0.12.2"])
s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("coffee-script", ["~> 2.2.0"])
s.add_dependency("execjs", ["~> 1.4.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("i18n", ["~> 0.6.4"])
s.add_dependency("padrino-helpers", ["0.10.7"]) s.add_dependency("padrino-helpers", ["0.10.7"])
end end