diff --git a/Gemfile b/Gemfile index 99b66e00..3668ba73 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ gem 'rdoc', '~> 3.11' gem 'redgreen', '~> 1.2' gem 'shoulda', '~> 3.5' gem 'cucumber', '1.3.18' -gem 'maruku', '~> 0.7.0' gem 'rdiscount', '~> 2.0' gem 'launchy', '~> 2.3' gem 'simplecov', '~> 0.9' diff --git a/features/markdown.feature b/features/markdown.feature index 2342951a..c0eeb25d 100644 --- a/features/markdown.feature +++ b/features/markdown.feature @@ -30,41 +30,3 @@ Feature: Markdown Then the _site directory should exist And I should see "Index" in "_site/index.html" And I should see "

My Title

" in "_site/index.html" - - Scenario: Maruku fenced codeblocks - Given I have a configuration file with "markdown" set to "maruku" - And I have an "index.markdown" file with content: - """ - --- - title: My title - --- - - # My title - - ``` - My awesome code - ``` - """ - When I run jekyll build - Then the _site directory should exist - And I should see "My awesome code" in "_site/index.html" - And I should see "
My awesome code
" in "_site/index.html" - - Scenario: Maruku fenced codeblocks with syntax highlighting - Given I have a configuration file with "markdown" set to "maruku" - And I have an "index.markdown" file with content: - """ - --- - title: My title - --- - - # My title - - ```ruby - puts "My awesome string" - ``` - """ - When I run jekyll build - Then the _site directory should exist - And I should see "My awesome string" in "_site/index.html" - And I should see "
puts "My awesome string"
" in "_site/index.html" diff --git a/features/site_configuration.feature b/features/site_configuration.feature index d3dadd2a..c9edc2ff 100644 --- a/features/site_configuration.feature +++ b/features/site_configuration.feature @@ -83,13 +83,6 @@ Feature: Site configuration Then the _site directory should exist And I should see "Google" in "_site/index.html" - Scenario: Use Maruku for markup - Given I have an "index.markdown" page that contains "[Google](http://google.com)" - And I have a configuration file with "markdown" set to "maruku" - When I run jekyll build - Then the _site directory should exist - And I should see "Google" in "_site/index.html" - Scenario: Highlight code with pygments Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}" When I run jekyll build diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 33668d81..84e1db8d 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -56,15 +56,6 @@ module Jekyll 'quiet' => false, 'defaults' => [], - 'maruku' => { - 'use_tex' => false, - 'use_divs' => false, - 'png_engine' => 'blahtex', - 'png_dir' => 'images/latex', - 'png_url' => '/images/latex', - 'fenced_code_blocks' => true - }, - 'rdiscount' => { 'extensions' => [] }, @@ -257,9 +248,11 @@ module Jekyll end if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku") - Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " + - "Markdown processor. Maruku support has been deprecated and will " + - "be removed in 3.0.0. We recommend you switch to Kramdown." + Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " + + "Markdown processor, which has been removed as of 3.0.0. " + + "We recommend you switch to Kramdown. To do this, replace " + + "`markdown: maruku` with `markdown: kramdown` in your " + + "`_config.yml` file." end config diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index 39389874..30c7ef36 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -13,7 +13,6 @@ module Jekyll when 'redcarpet' then RedcarpetParser.new(@config) when 'kramdown' then KramdownParser.new(@config) when 'rdiscount' then RDiscountParser.new(@config) - when 'maruku' then MarukuParser.new(@config) else # So they can't try some tricky bullshit or go down the ancestor chain, I hope. if allowed_custom_class?(@config['markdown']) @@ -29,7 +28,6 @@ module Jekyll def valid_processors %w[ - maruku rdiscount kramdown redcarpet @@ -39,7 +37,6 @@ module Jekyll def third_party_processors self.class.constants - %w[ KramdownParser - MarukuParser RDiscountParser RedcarpetParser PRIORITIES diff --git a/lib/jekyll/converters/markdown/maruku_parser.rb b/lib/jekyll/converters/markdown/maruku_parser.rb deleted file mode 100644 index 7be577c8..00000000 --- a/lib/jekyll/converters/markdown/maruku_parser.rb +++ /dev/null @@ -1,55 +0,0 @@ -module Jekyll - module Converters - class Markdown - class MarukuParser - def initialize(config) - require 'maruku' - @config = config - @errors = [] - load_divs_library if @config['maruku']['use_divs'] - load_blahtext_library if @config['maruku']['use_tex'] - - # allow fenced code blocks (new in Maruku 0.7.0) - MaRuKu::Globals[:fenced_code_blocks] = !!@config['maruku']['fenced_code_blocks'] - - rescue LoadError - STDERR.puts 'You are missing a library required for Markdown. Please run:' - STDERR.puts ' $ [sudo] gem install maruku' - raise Errors::FatalException.new("Missing dependency: maruku") - end - - def load_divs_library - require 'maruku/ext/div' - STDERR.puts 'Maruku: Using extended syntax for div elements.' - end - - def load_blahtext_library - require 'maruku/ext/math' - STDERR.puts "Maruku: Using LaTeX extension. Images in `#{@config['maruku']['png_dir']}`." - - # Switch off MathML output - MaRuKu::Globals[:html_math_output_mathml] = false - MaRuKu::Globals[:html_math_engine] = 'none' - - # Turn on math to PNG support with blahtex - # Resulting PNGs stored in `images/latex` - MaRuKu::Globals[:html_math_output_png] = true - MaRuKu::Globals[:html_png_engine] = @config['maruku']['png_engine'] - MaRuKu::Globals[:html_png_dir] = @config['maruku']['png_dir'] - MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url'] - end - - def print_errors_and_fail - print @errors.join - raise MaRuKu::Exception, "MaRuKu encountered problem(s) while converting your markup." - end - - def convert(content) - converted = Maruku.new(content, :error_stream => @errors).to_html.strip - print_errors_and_fail unless @errors.empty? - converted - end - end - end - end -end diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index 836eed37..d24f49a8 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -514,14 +514,6 @@ quiet: false defaults: [] # Markdown Processors -maruku: - use_tex: false - use_divs: false - png_engine: blahtex - png_dir: images/latex - png_url: /images/latex - fenced_code_blocks: true - rdiscount: extensions: [] diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md index eb65fd40..e9a03b79 100644 --- a/site/_docs/troubleshooting.md +++ b/site/_docs/troubleshooting.md @@ -114,21 +114,6 @@ The various markup engines that Jekyll uses may have some issues. This page will document them to help others who may run into the same problems. -### Maruku - -If your link has characters that need to be escaped, you need to use -this syntax: - -{% highlight text %} -![Alt text](http://yuml.me/diagram/class/[Project]->[Task]) -{% endhighlight %} - -If you have an empty tag, i.e. ``, Maruku -transforms this into `