redcarpet 2.2.2 → 2.3.0

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org/"
 gemspec

data/README.markdown

@@ -1,6 +1,8 @@
 Redcarpet 2 is written with sugar, spice and everything nice
 ============================================================
 
+[![Build Status](https://travis-ci.org/vmg/redcarpet.png?branch=master)](https://travis-ci.org/vmg/redcarpet)
+
 Redcarpet is Ruby library for Markdown processing that smells like
 butterflies and popcorn.
 
@@ -14,7 +16,7 @@ library. You might want to find out more about Sundown to see what makes this
 Ruby library so awesome.
 
 This library is written by people
--------------------------------------------------------
+---------------------------------
 
 Redcarpet 2 has been rewritten from scratch by Vicent Martí (@vmg). Why
 are you not following me on Twitter?
@@ -45,114 +47,121 @@ output.
 The `Markdown` object is encouraged to be instantiated once with the required
 settings, and reused between parses.
 
-    Markdown.new(renderer, extensions={})
+~~~~~ ruby
+# Initializes a Markdown parser
+Markdown.new(renderer, extensions = {})
+~~~~~
+
+
+Here, the `renderer` variable refers to a renderer object, inheriting
+from `Redcarpet::Render::Base`. If the given object has not been
+instantiated, the library will do it with default arguments.
 
-    Initializes a Markdown parser
+You can also specify a hash containing the Markdown extensions which the
+parser will identify. The following extensions are accepted:
 
-    renderer -  a renderer object, inheriting from Redcarpet::Render::Base.
-                If the given object has not been instantiated, the library
-                will do it with default arguments.
+* `:no_intra_emphasis`: do not parse emphasis inside of words.
+Strings such as `foo_bar_baz` will not generate `<em>` tags.
 
-    extensions - a hash containing the Markdown extensions which the parser
-                will identify. The following extensions are accepted:
+* `:tables`: parse tables, PHP-Markdown style
 
-                :no_intra_emphasis - do not parse emphasis inside of words.
-                    Strings such as `foo_bar_baz` will not generate `<em>`
-                    tags.
+* `:fenced_code_blocks`: parse fenced code blocks, PHP-Markdown
+style. Blocks delimited with 3 or more `~` or backtickswill be considered
+as code, without the need to be indented. An optional language name may
+be added at the end of the opening fence for the code block
 
-                :tables - parse tables, PHP-Markdown style
+* `:autolink`: parse links even when they are not enclosed in `<>`
+characters. Autolinks for the http, https and ftp protocols will be
+automatically detected. Email addresses are also handled, and http
+links without protocol, but starting with `www`.
 
-                :fenced_code_blocks - parse fenced code blocks, PHP-Markdown
-                    style. Blocks delimited with 3 or more `~` or backticks
-                    will be considered as code, without the need to be
-                    indented. An optional language name may be added at the
-                    end of the opening fence for the code block
+* `:disable_indented_code_blocks`: do not parse usual markdown
+code blocks. Markdown converts text with four spaces at
+the front of each line to code blocks. This options
+prevents it from doing so. Recommended to use
+with `fenced_code_blocks: true`.
 
-                :autolink - parse links even when they are not enclosed in
-                    `<>` characters. Autolinks for the http, https and ftp
-                    protocols will be automatically detected. Email addresses
-                    are also handled, and http links without protocol, but
-                    starting with `www.`
+* `:strikethrough`: parse strikethrough, PHP-Markdown style
+Two `~` characters mark the start of a strikethrough,
+e.g. `this is ~~good~~ bad`
 
-                :strikethrough - parse strikethrough, PHP-Markdown style
-                    Two `~` characters mark the start of a strikethrough,
-                    e.g. `this is ~~good~~ bad`
+* `:lax_spacing` - HTML blocks do not require to be surrounded by an
+empty line as in the Markdown standard.
 
-                :lax_spacing - HTML blocks do not require to be surrounded
-                    by an empty line as in the Markdown standard.
+* `:space_after_headers`: A space is always required between the hash
+at the beginning of a header and its name, e.g. `#this is my header`
+would not be a valid header.
 
-                :space_after_headers - A space is always required between the
-                    hash at the beginning of a header and its name, e.g.
-                    `#this is my header` would not be a valid header.
+* `:superscript`: parse superscripts after the `^` character; contiguous superscripts are nested together, and complex values can be enclosed in parenthesis, e.g. `this is the 2^(nd) time`
 
-                :superscript - parse superscripts after the `^` character;
-                    contiguous superscripts are nested together, and complex
-                    values can be enclosed in parenthesis,
-                    e.g. `this is the 2^(nd) time`
+* `:underline`: parse underscored emphasis as underlines.
+`This is _underlined_ but this is still *italic*`.
 
-    Example:
+Example:
 
-        markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-            :autolink => true, :space_after_headers => true)
+~~~~~ ruby
+markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
+~~~~~
 
 Rendering with the `Markdown` object is done through `Markdown#render`.
 Unlike in the RedCloth API, the text to render is passed as an argument
 and not stored inside the `Markdown` instance, to encourage reusability.
+Example:
 
-    Markdown#render(text)
-
-    Render a Markdown document with the attached renderer
-
-    text - a Markdown document
-
-    Example:
-
-        markdown.render("This is *bongos*, indeed.")
-        #=> "<p>This is <em>bongos</em>, indeed</p>"
+~~~~~ ruby
+markdown.render("This is *bongos*, indeed.")
+# => "<p>This is <em>bongos</em>, indeed</p>"
+~~~~~
 
 
-Darling, I packed you a couple renderers for lunch 
+Darling, I packed you a couple renderers for lunch
 --------------------------------------------------
 
 Redcarpet comes with two built-in renderers, `Redcarpet::Render::HTML` and
 `Redcarpet::Render::XHTML`, which output HTML and XHTML, respectively. These
-renderers are actually implemented in C, and hence offer a brilliant
-performance, several degrees of magnitude faster than other Ruby Markdown
+renderers are actually implemented in C and hence offer brilliant
+performance — several degrees of magnitude faster than other Ruby Markdown
 solutions.
 
 All the rendering flags that previously applied only to HTML output have
 now been moved to the `Render::HTML` class, and may be enabled when
 instantiating the renderer:
 
-    Render::HTML.new(render_options={})
+~~~~~ ruby
+Render::HTML.new(render_options = {})
+~~~~~
 
 Initializes an HTML renderer. The following flags are available:
 
-    :filter_html - do not allow any user-inputted HTML in the output
+* `:filter_html`: do not allow any user-inputted HTML in the output
+
+* `:no_images`: do not generate any `<img>` tags
 
-    :no_images - do not generate any `<img>` tags
+* `:no_links`: do not generate any `<a>` tags
 
-    :no_links - do not generate any `<a>` tags
+* `:no_styles`: do not generate any `<style>` tags
 
-    :no_styles - do not generate any `<style>` tags
+* `:safe_links_only`: only generate links for protocols which are considered
+safe
 
-    :safe_links_only - only generate links for protocols which are considered safe
+* `:with_toc_data`: add HTML anchors to each header in the output HTML,
+to allow linking to each section.
 
-    :with_toc_data - add HTML anchors to each header in the output HTML,
-        to allow linking to each section.
+* `:hard_wrap`: insert HTML `<br>` tags inside on paragraphs where the origin
+Markdown document had newlines (by default, Markdown ignores these newlines).
 
-    :hard_wrap - insert HTML `<br>` tags inside on paragraphs where the origin
-        Markdown document had newlines (by default, Markdown ignores these
-        newlines).
+* `:xhtml`: output XHTML-conformant tags. This option is always enabled in the
+`Render::XHTML` renderer.
 
-    :xhtml - output XHTML-conformant tags. This option is always enabled in the
-        `Render::XHTML` renderer.
+* `:prettify`: add prettyprint classes to `<code>` tags for google-code-prettify
 
-        :link_attributes - hash of extra attributes to add to links
+* `:link_attributes`: hash of extra attributes to add to links
 
 Example:
 
-    rndr = Redcarpet::Render::HTML.new(:no_links => true, :hard_wrap => true)
+~~~~~ ruby
+renderer = Redcarpet::Render::HTML.new(:no_links => true, :hard_wrap => true)
+~~~~~
 
 
 The `HTML` renderer has an alternate version, `Redcarpet::Render::HTML_TOC`,
@@ -172,13 +181,13 @@ built-in renderers, `HTML` and `XHTML` may be extended as such:
 
 ~~~~~ ruby
 # create a custom renderer that allows highlighting of code blocks
-class HTMLwithAlbino < Redcarpet::Render::HTML
+class HTMLwithPygments < Redcarpet::Render::HTML
   def block_code(code, language)
-    Albino.safe_colorize(code, language)
+    Pygments.highlight(code, :lexer => language)
   end
 end
 
-markdown = Redcarpet::Markdown.new(HTMLwithAlbino, :fenced_code_blocks => true)
+markdown = Redcarpet::Markdown.new(HTMLwithPygments, :fenced_code_blocks => true)
 ~~~~~
 
 But new renderers can also be created from scratch (see `lib/render_man.rb` for
@@ -192,65 +201,76 @@ end
 
 The following instance methods may be implemented by the renderer:
 
-    # Block-level calls
-    # If the return value of the method is `nil`, the block
-    # will be skipped.
-    # If the method for a document element is not implemented,
-    # the block will be skipped.
-    # 
-    # Example:
-    #
-    #   class RenderWithoutCode < Redcarpet::Render::HTML
-    #     def block_code(code, language)
-    #       nil
-    #     end
-    #   end
-    #
-    block_code(code, language)
-    block_quote(quote)
-    block_html(raw_html)
-    header(text, header_level)
-    hrule()
-    list(contents, list_type)
-    list_item(text, list_type)
-    paragraph(text)
-    table(header, body)
-    table_row(content)
-    table_cell(content, alignment)
-
-    # Span-level calls
-    # A return value of `nil` will not output any data
-    # If the method for a document element is not implemented,
-    # the contents of the span will be copied verbatim
-    autolink(link, link_type)
-    codespan(code)
-    double_emphasis(text)
-    emphasis(text)
-    image(link, title, alt_text)
-    linebreak()
-    link(link, title, content)
-    raw_html(raw_html)
-    triple_emphasis(text)
-    strikethrough(text)
-    superscript(text)
-
-    # Low level rendering
-    entity(text)
-    normal_text(text)
-
-    # Header of the document
-    # Rendered before any another elements
-    doc_header()
-
-    # Footer of the document
-    # Rendered after all the other elements
-    doc_footer()
-
-    # Pre/post-process
-    # Special callback: preprocess or postprocess the whole
-    # document before or after the rendering process begins
-    preprocess(full_document)
-    postprocess(full_document)
+### Block-level calls
+If the return value of the method is `nil`, the block will be skipped.
+If the method for a document element is not implemented, the block will
+be skipped.
+
+Example:
+
+~~~~ ruby
+class RenderWithoutCode < Redcarpet::Render::HTML
+  def block_code(code, language)
+    nil
+  end
+end
+~~~~
+
+* block_code(code, language)
+* block_quote(quote)
+* block_html(raw_html)
+* header(text, header_level)
+* hrule()
+* list(contents, list_type)
+* list_item(text, list_type)
+* paragraph(text)
+* table(header, body)
+* table_row(content)
+* table_cell(content, alignment)
+
+### Span-level calls
+
+A return value of `nil` will not output any data. If the method for
+a document element is not implemented, the contents of the span will
+be copied verbatim:
+
+* autolink(link, link_type)
+* codespan(code)
+* double_emphasis(text)
+* emphasis(text)
+* image(link, title, alt_text)
+* linebreak()
+* link(link, title, content)
+* raw_html(raw_html)
+* triple_emphasis(text)
+* strikethrough(text)
+* superscript(text)
+* underline(text)
+
+### Low level rendering
+
+* entity(text)
+* normal_text(text)
+
+### Header of the document
+
+Rendered before any another elements:
+
+* doc_header()
+
+### Footer of the document
+
+Rendered after all the other elements:
+
+* doc_footer()
+
+### Pre/post-process
+
+Special callback: preprocess or postprocess the whole document before
+or after the rendering process begins:
+
+* preprocess(full_document)
+* postprocess(full_document)
 
 You can look at
 ["How to extend the Redcarpet 2 Markdown library?"](http://dev.af83.com/2012/02/27/howto-extend-the-redcarpet2-markdown-lib.html)
@@ -281,7 +301,7 @@ Redcarpet::Render::SmartyPants.render("<p>Oh SmartyPants, you're so crazy...</p>
 ~~~~~
 
 SmartyPants works on top of already-rendered HTML, and will ignore replacements
-inside the content of HTML tags and inside specific HTML blocks such as 
+inside the content of HTML tags and inside specific HTML blocks such as
 `<code>` or `<pre>`.
 
 What? You really want to mix Markdown renderers?
@@ -298,16 +318,20 @@ only way to have reliable and predictable Markdown output on your program.
 Still, if major forces (let's say, tornadoes or other natural disasters) force you
 to keep a Markdown-compatibility layer, Redcarpet also supports this:
 
-    require 'redcarpet/compat'
+~~~~~ ruby
+require 'redcarpet/compat'
+~~~~~
 
 Requiring the compatibility library will declare a `Markdown` class with the
 classical RedCloth API, e.g.
 
-    Markdown.new('this is my text').to_html
+~~~~~ ruby
+Markdown.new('this is my text').to_html
+~~~~~
 
 This class renders 100% standards compliant Markdown with 0 extensions. Nada.
 Don't even try to enable extensions with a compatibility layer, because
-that's a maintance nightmare and won't work.
+that's a maintenance nightmare and won't work.
 
 On a related topic: if your Markdown gem has a `lib/markdown.rb` file that
 monkeypatches the Markdown class, you're a terrible human being. Just saying.
@@ -332,4 +356,3 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-

data/Rakefile

@@ -5,127 +5,14 @@ require 'digest/md5'
 
 task :default => [:test]
 
-# ==========================================================
 # Ruby Extension
-# ==========================================================
-
 Rake::ExtensionTask.new('redcarpet')
 
-# ==========================================================
-# Testing
-# ==========================================================
-
-require 'rake/testtask'
-Rake::TestTask.new('test:unit') do |t|
-  t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts += ['-rubygems'] if defined? Gem
-end
-task 'test:unit' => [:compile]
-
-desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
-task 'test:conformance' => [:compile] do |t|
-  script = "#{pwd}/bin/redcarpet"
-  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
-  lib_dir = "#{pwd}/lib"
-  chdir("test/MarkdownTest_#{test_version}") do
-    sh "RUBYLIB=#{lib_dir} ./MarkdownTest.pl --script='#{script}' --tidy"
-  end
-end
-
-desc 'Run version 1.0 conformance suite'
-task 'test:conformance:1.0' => [:compile] do |t|
-  ENV['MARKDOWN_TEST_VER'] = '1.0'
-  Rake::Task['test:conformance'].invoke
-end
-
-desc 'Run 1.0.3 conformance suite'
-task 'test:conformance:1.0.3' => [:compile] do |t|
-  ENV['MARKDOWN_TEST_VER'] = '1.0.3'
-  Rake::Task['test:conformance'].invoke
-end
-
-desc 'Run unit and conformance tests'
-task :test => %w[test:unit test:conformance]
-
-desc 'Run benchmarks'
-task :benchmark => :build do |t|
-  $:.unshift 'lib'
-  load 'test/benchmark.rb'
-end
-
-# PACKAGING =================================================================
-
-require 'rubygems'
-$spec = eval(File.read('redcarpet.gemspec'))
+# Packaging
+require 'bundler/gem_tasks'
 
-def package(ext='')
-  "pkg/redcarpet-#{$spec.version}" + ext
-end
-
-desc 'Build packages'
-task :package => %w[.gem .tar.gz].map {|e| package(e)}
-
-desc 'Build and install as local gem'
-task :install => package('.gem') do
-  sh "gem install #{package('.gem')}"
-end
-
-directory 'pkg/'
-
-file package('.gem') => %w[pkg/ redcarpet.gemspec] + $spec.files do |f|
-  sh "gem build redcarpet.gemspec"
-  mv File.basename(f.name), f.name
-end
-
-file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
-  sh "git archive --format=tar HEAD | gzip > #{f.name}"
-end
-
-# GEMSPEC HELPERS ==========================================================
-
-def source_version
-  line = File.read('lib/redcarpet.rb')[/^\s*VERSION = .*/]
-  line.match(/.*VERSION = '(.*)'/)[1]
-end
-
-task :update_gem do
-  # read spec file and split out manifest section
-  GEMFILE = 'redcarpet.gemspec'
-  spec = File.read(GEMFILE)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-  head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
-  head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject{ |file| file =~ /^\./ || file =~ /^test\/MarkdownTest/ }.
-    map{ |file| "    #{file}" }.
-    join("\n")
-  # piece file back together and write...
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head,manifest,tail].join("  # = MANIFEST =\n")
-  File.open(GEMFILE, 'w') { |io| io.write(spec) }
-  puts "updated #{GEMFILE}"
-end
-
-desc 'Gather required Sundown sources into extension directory'
-task :gather => 'sundown:checkout' do |t|
-  files =
-    FileList[
-      'sundown/src/{markdown,buffer,stack,autolink,html_blocks}.h',
-      'sundown/src/{markdown,buffer,stack,autolink}.c',
-      'sundown/html/{html,html_smartypants,houdini_html_e,houdini_href_e}.c',
-      'sundown/html/{html,houdini}.h',
-    ]
-  cp files, 'ext/redcarpet/',
-    :preserve => true,
-    :verbose => true
-end
+# Testing
+load 'tasks/testing.rake'
 
-task 'sundown:checkout' do |t|
-  unless File.exists?('sundown/src/markdown.h')
-    sh 'git submodule init'
-    sh 'git submodule update'
-  end
-end
+# Sundown
+load 'tasks/sundown.rake'