Remove Maruku and references to it
This commit is contained in:
parent
6dcdf06c8a
commit
ae039663b9
1
Gemfile
1
Gemfile
|
@ -14,7 +14,6 @@ gem 'rdoc', '~> 3.11'
|
||||||
gem 'redgreen', '~> 1.2'
|
gem 'redgreen', '~> 1.2'
|
||||||
gem 'shoulda', '~> 3.5'
|
gem 'shoulda', '~> 3.5'
|
||||||
gem 'cucumber', '1.3.18'
|
gem 'cucumber', '1.3.18'
|
||||||
gem 'maruku', '~> 0.7.0'
|
|
||||||
gem 'rdiscount', '~> 2.0'
|
gem 'rdiscount', '~> 2.0'
|
||||||
gem 'launchy', '~> 2.3'
|
gem 'launchy', '~> 2.3'
|
||||||
gem 'simplecov', '~> 0.9'
|
gem 'simplecov', '~> 0.9'
|
||||||
|
|
|
@ -13,7 +13,6 @@ module Jekyll
|
||||||
when 'redcarpet' then RedcarpetParser.new(@config)
|
when 'redcarpet' then RedcarpetParser.new(@config)
|
||||||
when 'kramdown' then KramdownParser.new(@config)
|
when 'kramdown' then KramdownParser.new(@config)
|
||||||
when 'rdiscount' then RDiscountParser.new(@config)
|
when 'rdiscount' then RDiscountParser.new(@config)
|
||||||
when 'maruku' then MarukuParser.new(@config)
|
|
||||||
else
|
else
|
||||||
# So they can't try some tricky bullshit or go down the ancestor chain, I hope.
|
# So they can't try some tricky bullshit or go down the ancestor chain, I hope.
|
||||||
if allowed_custom_class?(@config['markdown'])
|
if allowed_custom_class?(@config['markdown'])
|
||||||
|
@ -29,7 +28,6 @@ module Jekyll
|
||||||
|
|
||||||
def valid_processors
|
def valid_processors
|
||||||
%w[
|
%w[
|
||||||
maruku
|
|
||||||
rdiscount
|
rdiscount
|
||||||
kramdown
|
kramdown
|
||||||
redcarpet
|
redcarpet
|
||||||
|
@ -39,7 +37,6 @@ module Jekyll
|
||||||
def third_party_processors
|
def third_party_processors
|
||||||
self.class.constants - %w[
|
self.class.constants - %w[
|
||||||
KramdownParser
|
KramdownParser
|
||||||
MarukuParser
|
|
||||||
RDiscountParser
|
RDiscountParser
|
||||||
RedcarpetParser
|
RedcarpetParser
|
||||||
PRIORITIES
|
PRIORITIES
|
||||||
|
|
|
@ -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
|
|
|
@ -514,14 +514,6 @@ quiet: false
|
||||||
defaults: []
|
defaults: []
|
||||||
|
|
||||||
# Markdown Processors
|
# 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:
|
rdiscount:
|
||||||
extensions: []
|
extensions: []
|
||||||
|
|
||||||
|
|
|
@ -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
|
page will document them to help others who may run into the same
|
||||||
problems.
|
problems.
|
||||||
|
|
||||||
### Maruku
|
|
||||||
|
|
||||||
If your link has characters that need to be escaped, you need to use
|
|
||||||
this syntax:
|
|
||||||
|
|
||||||
{% highlight text %}
|
|
||||||

|
|
||||||
{% endhighlight %}
|
|
||||||
|
|
||||||
If you have an empty tag, i.e. `<script src="js.js"></script>`, Maruku
|
|
||||||
transforms this into `<script src="js.js" />`. This causes problems in
|
|
||||||
Firefox and possibly other browsers and is [discouraged in
|
|
||||||
XHTML.](http://www.w3.org/TR/xhtml1/#C_3) An easy fix is to put a space
|
|
||||||
between the opening and closing tags.
|
|
||||||
|
|
||||||
### Liquid
|
### Liquid
|
||||||
|
|
||||||
The latest version, version 2.0, seems to break the use of `{{ "{{" }}` in
|
The latest version, version 2.0, seems to break the use of `{{ "{{" }}` in
|
||||||
|
|
Loading…
Reference in New Issue