kramdown 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e61a5f6dbf5b13bfcf0164acaf6a0c6e8fa2cd2c39fc7368bf9f54be38e0552
-  data.tar.gz: e03352fce83854b256596c7718dd2c48251b5851f7e1ca06012d433526b6015b
+  metadata.gz: e43c55f31bbce7153d1d863ab7c90bb24aee7741e7df3a0f6d89064286fe2344
+  data.tar.gz: c53d7af0318896bae6bdcb9123eb714f9572e4c9918f04d093c7d228c2431b0e
 SHA512:
-  metadata.gz: 3bf07ed2b152212b8aa8e50383b7cfc7a38a16d11441f6c5b2790c834020e3ef8ab82e6978bd86b3334740cc4b23a407f66b744ded4ee22bb6e75b210d3668cc
-  data.tar.gz: 0206cd73d6c8d75470701c197fb89d151e6f3c2c694b20af1068f8c4d03386f065194e92c2c3cea5ec37e72c5f52132ce282d2c80888f229811cefc62f2049ed
+  metadata.gz: 351a0939690de3cf44107f5cad613d8d3dc945b6d47d0e78f8bf676081b7887f696e738fb9200779a6821a870161a3110a7e42911e7705cc7d79af59ff061da6
+  data.tar.gz: dbd73556bc863c0d6a937705662909440fd1dea33415da9e98ac681e5cd33fbedde37a7311b1082c2bcd556aec2896c10ec1d203ca992783f05eae8e7572aea0

data/CONTRIBUTERS

@@ -1,12 +1,13 @@
   Count Name
 ======= ====
-    909 Thomas Leitner <t_leitner@gmx.at>
+    913 Thomas Leitner <t_leitner@gmx.at>
       7 Christian Cornelssen <ccorn@1tein.de>
       6 Gioele Barabucci <gioele@svario.it>
       4 Ted Pak <powerpak006@gmail.com>
       4 Shuanglei Tao <tsl0922@gmail.com>
       4 Gleb Mazovetskiy <glex.spb@gmail.com>
       4 Dan Allen <dan.j.allen@gmail.com>
+      4 Ashwin Maroli <ashmaroli@gmail.com>
       4 Arne Brasseur <arne@arnebrasseur.net>
       3 Henning Perl <perl@fast-sicher.de>
       3 gettalong <t_leitner@gmx.at>
@@ -59,7 +60,6 @@
       1 Damien Pollet <damien.pollet@gmail.com>
       1 Christopher Jefferson <caj21@st-andrews.ac.uk>
       1 Cédric Boutillier <cedric.boutillier@gmail.com>
-      1 Ashwin Maroli <ashmaroli@gmail.com>
       1 Ashe Connor <ashe@kivikakk.ee>
       1 Antoine Cotten <hello@acotten.com>
       1 Andrew <andrew.dale.wylie@gmail.com>

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/bin/kramdown

@@ -13,6 +13,37 @@ require 'rbconfig'
 require 'yaml'
 require 'kramdown'
 
+def add_kramdown_options(opts, parsed_options, banner: [], ignore: [])
+  banner_shown = false
+  defined_options = []
+  Kramdown::Options.definitions.sort.each do |n, definition|
+    next if ignore.include?(n)
+
+    unless banner_shown
+      opts.separator("")
+      banner.each {|part| opts.separator(part) }
+      opts.separator("")
+      banner_shown = true
+    end
+
+    defined_options << n
+    no = n.to_s.tr('_', '-')
+    if definition.type == Kramdown::Options::Boolean
+      opts.on("--[no-]#{no}") {|v| parsed_options[n] = Kramdown::Options.parse(n, v) }
+    else
+      type = definition.type
+      type = String if type == Symbol || type == Object
+      opts.on("--#{no} ARG", type) {|v| parsed_options[n] = Kramdown::Options.parse(n, v) }
+    end
+
+    definition.desc.split(/\n/).each do |line|
+      opts.separator opts.summary_indent + ' ' * 6 + line
+    end
+    opts.separator ''
+  end
+  defined_options
+end
+
 config_file = nil
 begin
   config_dir = case RbConfig::CONFIG['host_os']
@@ -30,6 +61,7 @@ end
 options = {}
 format = ['html']
 
+defined_options = []
 OptionParser.new do |opts|
   opts.banner = "Usage: kramdown [options] [FILE FILE ...]"
   opts.summary_indent = ' ' * 4
@@ -42,6 +74,20 @@ OptionParser.new do |opts|
           "html, or markdown") {|v| options[:input] = v }
   opts.on("-o", "--output ARG", Array, "Specify one or more output formats separated by commas: " \
           "html (default),", "kramdown, latex, man or remove_html_tags") {|v| format = v }
+  opts.on("-x", "--extension EXT", Array, "Load one or more extensions (without the 'kramdown-' " \
+          "prefix) separated", "by commas (e.g. parser-gfm,syntax-coderay)",
+          "Note: Use this option before other options!") do |exts|
+    exts.each do |ext|
+      begin
+        require "kramdown-#{ext}"
+        new_options = add_kramdown_options(opts, options, banner: ["#{ext} options:"],
+                                           ignore: defined_options)
+        defined_options.concat(new_options)
+      rescue LoadError
+        $stderr.puts "Couldn't load extension #{ext}, ignoring"
+      end
+    end
+  end
   opts.separator ""
   opts.on("--no-config-file", "Do not read any configuration file. Default behavior is to check " \
           "for a", "configuration file and read it if it exists.") { config_file = nil }
@@ -59,25 +105,8 @@ OptionParser.new do |opts|
     exit
   end
 
-  opts.separator ""
-  opts.separator "kramdown options:"
-  opts.separator ""
-
-  Kramdown::Options.definitions.sort.each do |n, definition|
-    no = n.to_s.tr('_', '-')
-    if definition.type == Kramdown::Options::Boolean
-      opts.on("--[no-]#{no}") {|v| options[n] = Kramdown::Options.parse(n, v) }
-    else
-      type = definition.type
-      type = String if type == Symbol || type == Object
-      opts.on("--#{no} ARG", type) {|v| options[n] = Kramdown::Options.parse(n, v) }
-    end
-
-    definition.desc.split(/\n/).each do |line|
-      opts.separator opts.summary_indent + ' ' * 6 + line
-    end
-    opts.separator ''
-  end
+  new_options = add_kramdown_options(opts, options, banner: ["kramdown options:"])
+  defined_options.concat(new_options)
 end.parse!
 
 begin

data/lib/kramdown/converter/syntax_highlighter/rouge.rb

@@ -25,8 +25,10 @@ module Kramdown::Converter::SyntaxHighlighter
       opts = options(converter, type)
       call_opts[:default_lang] = opts[:default_lang]
       return nil unless lang || opts[:default_lang] || opts[:guess_lang]
+
       lexer = ::Rouge::Lexer.find_fancy(lang || opts[:default_lang], text)
-      return nil if opts[:disable] || !lexer || lexer.tag == "plaintext"
+      return nil if opts[:disable] || !lexer || (lexer.tag == "plaintext" && !opts[:guess_lang])
+
       opts[:css_class] ||= 'highlight' # For backward compatibility when using Rouge 2.0
       formatter = formatter_class(opts).new(opts)
       formatter.format(lexer.lex(text))

data/lib/kramdown/parser/kramdown/blank_line.rb

@@ -16,8 +16,8 @@ module Kramdown
       # Parse the blank line at the current postition.
       def parse_blank_line
         @src.pos += @src.matched_size
-        if @tree.children.last && @tree.children.last.type == :blank
-          @tree.children.last.value << @src.matched
+        if (last_child = @tree.children.last) && last_child.type == :blank
+          last_child.value << @src.matched
         else
           @tree.children << new_block_el(:blank, @src.matched)
         end

data/lib/kramdown/parser/kramdown/block_boundary.rb

@@ -19,8 +19,9 @@ module Kramdown
 
       # Return +true+ if we are after a block boundary.
       def after_block_boundary?
-        !@tree.children.last || @tree.children.last.type == :blank ||
-          (@tree.children.last.type == :eob && @tree.children.last.value.nil?) || @block_ial
+        last_child = @tree.children.last
+        !last_child || last_child.type == :blank ||
+          (last_child.type == :eob && last_child.value.nil?) || @block_ial
       end
 
       # Return +true+ if we are before a block boundary.

data/lib/kramdown/parser/kramdown/extensions.rb

@@ -163,10 +163,10 @@ module Kramdown
         elsif @src.check(EXT_BLOCK_START)
           parse_extension_start_tag(:block)
         elsif @src.scan(IAL_BLOCK_START)
-          if @tree.children.last && @tree.children.last.type != :blank &&
-              (@tree.children.last.type != :eob ||
-               [:link_def, :abbrev_def, :footnote_def].include?(@tree.children.last.value))
-            parse_attribute_list(@src[1], @tree.children.last.options[:ial] ||= {})
+          if (last_child = @tree.children.last) && last_child.type != :blank &&
+              (last_child.type != :eob ||
+               [:link_def, :abbrev_def, :footnote_def].include?(last_child.value))
+            parse_attribute_list(@src[1], last_child.options[:ial] ||= {})
             @tree.children << new_block_el(:eob, :ial) unless @src.check(IAL_BLOCK_START)
           else
             parse_attribute_list(@src[1], @block_ial ||= {})
@@ -187,12 +187,12 @@ module Kramdown
         if @src.check(EXT_SPAN_START)
           parse_extension_start_tag(:span)
         elsif @src.check(IAL_SPAN_START)
-          if @tree.children.last && @tree.children.last.type != :text
+          if (last_child = @tree.children.last) && last_child.type != :text
             @src.pos += @src.matched_size
             attr = {}
             parse_attribute_list(@src[1], attr)
-            update_ial_with_ial(@tree.children.last.options[:ial] ||= {}, attr)
-            update_attr_with_ial(@tree.children.last.attr, attr)
+            update_ial_with_ial(last_child.options[:ial] ||= {}, attr)
+            update_attr_with_ial(last_child.attr, attr)
           else
             warning("Found span IAL after text - ignoring it")
             add_text(@src.getch)

data/lib/kramdown/parser/kramdown/link.rb

@@ -92,8 +92,9 @@ module Kramdown
           emit_warning = !@src[1]
           link_id = normalize_link_id(@src[1] || alt_text)
           if @link_defs.key?(link_id)
-            add_link(el, @link_defs[link_id][0], @link_defs[link_id][1], alt_text,
-                     @link_defs[link_id][2] && @link_defs[link_id][2].options[:ial])
+            link_def = @link_defs[link_id]
+            add_link(el, link_def[0], link_def[1], alt_text,
+                     link_def[2] && link_def[2].options[:ial])
           else
             if emit_warning
               warning("No link definition for link ID '#{link_id}' found on line #{start_line_number}")

data/lib/kramdown/parser/kramdown/list.rb

@@ -72,7 +72,7 @@ module Kramdown
               parse_first_list_line(@src[1].length, @src[2])
             list.children << item
 
-            item.value.sub!(self.class::LIST_ITEM_IAL) do |_match|
+            item.value.sub!(self.class::LIST_ITEM_IAL) do
               parse_attribute_list($1, item.options[:ial] ||= {})
               ''
             end
@@ -122,22 +122,24 @@ module Kramdown
 
           it.children = temp.children
           it.value = nil
-          next if it.children.empty?
+
+          it_children = it.children
+          next if it_children.empty?
 
           # Handle the case where an EOB marker is inserted by a block IAL for the first paragraph
-          it.children.delete_at(1) if it.children.first.type == :p &&
-            it.children.length >= 2 && it.children[1].type == :eob && it.children.first.options[:ial]
+          it_children.delete_at(1) if it_children.first.type == :p &&
+            it_children.length >= 2 && it_children[1].type == :eob && it_children.first.options[:ial]
 
-          if it.children.first.type == :p &&
-              (it.children.length < 2 || it.children[1].type != :blank ||
-               (it == list.children.last && it.children.length == 2 && !eob_found)) &&
+          if it_children.first.type == :p &&
+              (it_children.length < 2 || it_children[1].type != :blank ||
+              (it == list.children.last && it_children.length == 2 && !eob_found)) &&
               (list.children.last != it || list.children.size == 1 ||
-               list.children[0..-2].any? {|cit| !cit.children.first || cit.children.first.type != :p || cit.children.first.options[:transparent] })
-            it.children.first.children.first.value << "\n" if it.children.size > 1 && it.children[1].type != :blank
-            it.children.first.options[:transparent] = true
+              list.children[0..-2].any? {|cit| !cit.children.first || cit.children.first.type != :p || cit.children.first.options[:transparent] })
+            it_children.first.children.first.value << "\n" if it_children.size > 1 && it_children[1].type != :blank
+            it_children.first.options[:transparent] = true
           end
 
-          last = (it.children.last.type == :blank ? it.children.pop : nil)
+          last = (it_children.last.type == :blank ? it_children.pop : nil)
         end
 
         @tree.children << last if !last.nil? && !eob_found
@@ -222,27 +224,29 @@ module Kramdown
 
           parse_blocks(it, it.value)
           it.value = nil
-          next if it.children.empty?
+          it_children = it.children
+          next if it_children.empty?
 
-          last = (it.children.last.type == :blank ? it.children.pop : nil)
+          last = (it_children.last.type == :blank ? it_children.pop : nil)
 
-          if it.children.first && it.children.first.type == :p && !it.options.delete(:first_as_para)
-            it.children.first.children.first.value << "\n" if it.children.size > 1
-            it.children.first.options[:transparent] = true
+          if it_children.first && it_children.first.type == :p && !it.options.delete(:first_as_para)
+            it_children.first.children.first.value << "\n" if it_children.size > 1
+            it_children.first.options[:transparent] = true
           end
         end
 
-        if @tree.children.length >= 1 && @tree.children.last.type == :dl
-          @tree.children[-1].children.concat(deflist.children)
-        elsif @tree.children.length >= 2 && @tree.children[-1].type == :blank &&
-            @tree.children[-2].type == :dl
-          @tree.children.pop
-          @tree.children[-1].children.concat(deflist.children)
+        children = @tree.children
+        if children.length >= 1 && children.last.type == :dl
+          children[-1].children.concat(deflist.children)
+        elsif children.length >= 2 && children[-1].type == :blank &&
+            children[-2].type == :dl
+          children.pop
+          children[-1].children.concat(deflist.children)
         else
-          @tree.children << deflist
+          children << deflist
         end
 
-        @tree.children << last if last
+        children << last if last
 
         true
       end

data/lib/kramdown/parser/kramdown/paragraph.rb

@@ -36,13 +36,13 @@ module Kramdown
           result << @src.scan(PARAGRAPH_MATCH)
         end
         result.rstrip!
-        if @tree.children.last && @tree.children.last.type == :p
-          last_item_in_para = @tree.children.last.children.last
+        if (last_child = @tree.children.last) && last_child.type == :p
+          last_item_in_para = last_child.children.last
           if last_item_in_para && last_item_in_para.type == @text_type
             joiner = (extract_string((pos - 3)...pos, @src) == "  \n" ? "  \n" : "\n")
             last_item_in_para.value << joiner << result
           else
-            add_text(result, @tree.children.last)
+            add_text(result, last_child)
           end
         else
           @tree.children << new_block_el(:p, nil, nil, location: start_line_number)

data/lib/kramdown/parser/kramdown/table.rb

@@ -81,7 +81,7 @@ module Kramdown
                     cells.concat(l)
                   else
                     delim = (c.value.scan(/`+/).max || '') + '`'
-                    tmp = "#{delim}#{' ' if delim.size > 1}#{c.value}#{' ' if delim.size > 1}#{delim}"
+                    tmp = +"#{delim}#{' ' if delim.size > 1}#{c.value}#{' ' if delim.size > 1}#{delim}"
                     (cells.empty? ? cells : cells.last) << tmp
                   end
                 end

data/lib/kramdown/version.rb

@@ -10,6 +10,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 
 end

data/man/man1/kramdown.1

@@ -1,5 +1,5 @@
 .\" generated by kramdown
-.TH "KRAMDOWN" "1" "November 2016"
+.TH "KRAMDOWN" "1" "January 2019"
 .SH NAME
 kramdown \- a fast, pure\-Ruby Markdown\-superset converter
 .SH "SYNOPSIS"
@@ -20,6 +20,13 @@ Specify the input format\. Available input formats: \fIkramdown\fP (this is the
 \fB\-o\fP \fIFORMAT\fP, \fB\-\-output\fP \fIFORMAT\fP
 Specify one or more output formats separated by commas: \fIhtml\fP (default), \fIkramdown\fP, \fIlatex\fP, \fIman\fP or \fIremove_html_tags\fP\&\. The converter \fIpdf\fP is available through the \fBkramdown\-converter\-pdf\fP gem\.
 .TP
+\fB\-x\fP \fIEXT\fP, \fB\-\-extension\fP \fIEXT\fP
+Load one or more extensions\. The name of the extension should not include the \fBkramdown\-\fP prefix, e\.g\. just \fBparser\-gfm\fP\&\. Multiple extensions can be loaded by separating them with commas\.
+.RS
+.P
+Note: This option has to be used before any other options that rely on the extension already being loaded\.
+.RE
+.TP
 \fB\-\-no\-config\-file\fP
 Do not read any configuration file\. Default behavior is to check for a configuration file and read it if it exists\.
 .TP

data/test/test_files.rb

@@ -72,6 +72,7 @@ class TestFiles < Minitest::Test
       'test/testcases/block/06_codeblock/rouge/multiple.html', # bc of double surrounding <div>
       'test/testcases/block/06_codeblock/highlighting.html', # bc of span elements inside code element
       'test/testcases/block/06_codeblock/highlighting-opts.html', # bc of span elements inside code element
+      'test/testcases/block/06_codeblock/guess_lang_css_class.html', # bc of double surrounding <div>
       'test/testcases/block/12_extension/options3.html', # bc of rouge
       'test/testcases/block/14_table/empty_tag_in_cell.html', # bc of tidy
       'test/testcases/block/15_math/mathjax_preview.html', # bc of mathjax preview
@@ -211,6 +212,7 @@ class TestFiles < Minitest::Test
       'test/testcases/block/06_codeblock/whitespace.html', # bc of entity to char conversion
       'test/testcases/block/06_codeblock/rouge/simple.html', # bc of double surrounding <div>
       'test/testcases/block/06_codeblock/rouge/multiple.html', # bc of double surrounding <div>
+      'test/testcases/block/06_codeblock/guess_lang_css_class.html', # bc of double surrounding <div>
       'test/testcases/block/06_codeblock/highlighting.html', # bc of span elements inside code element
       'test/testcases/block/06_codeblock/highlighting-opts.html', # bc of span elements inside code element
       'test/testcases/block/11_ial/simple.html',           # bc of change of ordering of attributes in header

data/test/testcases/block/06_codeblock/guess_lang_css_class.html

@@ -0,0 +1,15 @@
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>class Foo
+  def bar
+    puts 'Hello'
+  end
+end
+</code></pre>
+</div></div>
+
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>class Foo
+  def bar
+    puts 'Hello'
+  end
+end
+</code></pre>
+</div></div>

data/test/testcases/block/06_codeblock/guess_lang_css_class.options

@@ -0,0 +1,2 @@
+:syntax_highlighter_opts:
+  guess_lang: true

data/test/testcases/block/06_codeblock/guess_lang_css_class.text

@@ -0,0 +1,13 @@
+~~~
+class Foo
+  def bar
+    puts 'Hello'
+  end
+end
+~~~
+
+    class Foo
+      def bar
+        puts 'Hello'
+      end
+    end

data/test/testcases/span/03_codespan/normal-css-class.html

@@ -0,0 +1 @@
+<p>This is a <code class="highlighter-rouge">code-span</code></p>

data/test/testcases/span/03_codespan/normal-css-class.options

@@ -0,0 +1,2 @@
+:syntax_highlighter_opts:
+  guess_lang: true

data/test/testcases/span/03_codespan/normal-css-class.text

@@ -0,0 +1 @@
+This is a `code-span`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -194,6 +194,9 @@ files:
 - test/testcases/block/06_codeblock/disable-highlighting.text
 - test/testcases/block/06_codeblock/error.html
 - test/testcases/block/06_codeblock/error.text
+- test/testcases/block/06_codeblock/guess_lang_css_class.html
+- test/testcases/block/06_codeblock/guess_lang_css_class.options
+- test/testcases/block/06_codeblock/guess_lang_css_class.text
 - test/testcases/block/06_codeblock/highlighting-minted-with-opts.latex
 - test/testcases/block/06_codeblock/highlighting-minted-with-opts.options
 - test/testcases/block/06_codeblock/highlighting-minted-with-opts.text
@@ -503,6 +506,9 @@ files:
 - test/testcases/span/03_codespan/highlighting-minted.text
 - test/testcases/span/03_codespan/highlighting.html
 - test/testcases/span/03_codespan/highlighting.text
+- test/testcases/span/03_codespan/normal-css-class.html
+- test/testcases/span/03_codespan/normal-css-class.options
+- test/testcases/span/03_codespan/normal-css-class.text
 - test/testcases/span/03_codespan/normal.html
 - test/testcases/span/03_codespan/normal.text
 - test/testcases/span/03_codespan/rouge/disabled.html