kramdown 2.0.0.beta2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f737523fd370cb69aff3ae9bb1c7fbad526081be7d3df2275de8fb9563d9c4c2
-  data.tar.gz: 81ca8a7bb1aa6feecbad1cbe0cba3eeebb26751ff9b1e33692f0f0f663f76a3d
+  metadata.gz: 2a893196013756c877e4baa3d62eb2d3b862684748ed4f329a9723779e30bbeb
+  data.tar.gz: abfac14092805a87a5bdb0c7210ddb157b35a22391a8393a8401fdc547d2f902
 SHA512:
-  metadata.gz: 5e5cd66bdc510a27fa640fe0ed18d598c3f4acda9dcd8fe54b931f00ea08011e16772881f6e3b3a17338412cd03ea6af57e8687102601cdde24c6da195fa67f4
-  data.tar.gz: 06202fba99c3a55af853235d3c1d355856b085d30cc5d4d29bfbde3587a01c258663a4b47b12ce60e649ceeb2b1e72cca66c1d434ae662bfdd07221ba75d8d73
+  metadata.gz: 2fdb47e22271964a0a5caef5dc9054a6a5d50cfd81c01665ddfe9aa8e66539ce97125019bea46700ff54227602ce45fd3af98bd48824fe3460aefd6ce6ec3828
+  data.tar.gz: 9927a0d0fe778ac799dcd499727623c7bb35cc2a46a5745042c88d65685502d7bc04384c265155af214f046a2a27f72cf4b73b2d3ddba6a987de85939b6cfe56

data/CONTRIBUTERS

@@ -1,17 +1,19 @@
   Count Name
 ======= ====
-    895 Thomas Leitner <t_leitner@gmx.at>
+    943 Thomas Leitner <t_leitner@gmx.at>
+     18 Ashwin Maroli <ashmaroli@gmail.com>
       7 Christian Cornelssen <ccorn@1tein.de>
       6 Gioele Barabucci <gioele@svario.it>
+      5 Gleb Mazovetskiy <glex.spb@gmail.com>
       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 Arne Brasseur <arne@arnebrasseur.net>
       3 Henning Perl <perl@fast-sicher.de>
       3 gettalong <t_leitner@gmx.at>
       3 Brandur <brandur@mutelight.org>
       3 Ben Armston <ben.armston@googlemail.com>
+      3 Ashwin Maroli <ashmaroli@users.noreply.github.com>
       3 Alex Marandon <contact@alexmarandon.com>
       2 Tom Thorogood <me+github@tomthorogood.co.uk>
       2 Parker Moore <parkrmoore@gmail.com>
@@ -25,20 +27,25 @@
       1 utenmiki <utenmiki@gmail.com>
       1 Trevor Wennblom <trevor@well.com>
       1 tomykaira <tomykaira@gmail.com>
+      1 tom93 <tomlevy93@gmail.com>
       1 Tim Blair <tim@bla.ir>
       1 Tim Besard <tim.besard@gmail.com>
       1 Tim Bates <tim@rumpuslabs.com>
       1 Sun Yaozhu <yzyzsun@gmail.com>
+      1 Stephen <stephengroat@users.noreply.github.com>
       1 Stephen Crosby <stevecrozz@gmail.com>
       1 Simon Lydell <simon.lydell@gmail.com>
+      1 Simon Coffey <simon.coffey@futurelearn.com>
       1 Shusaku NAKAZATO <cu393uc@gmail.com>
       1 Sebastian Boehm <sebastian@sometimesfood.org>
       1 scherr <maximilianscherr@gmail.com>
       1 Postmodern <postmodern.mod3@gmail.com>
       1 Pete Michaud <michaudp@gmail.com>
+      1 Noah Doersing <doersino@gmail.com>
       1 myqlarson <myqlarson@gmail.com>
       1 milo.simpson <milo.simpson@bazaarvoice.com>
       1 Michal Till <michal.till@gmail.com>
+      1 Maxime Kjaer <maxime.kjaer@gmail.com>
       1 Matt Hickford <matt.hickford@gmail.com>
       1 Martyn Chamberlin <martyn@perfectioncoding.com>
       1 Marek Tuchowski <marek@tuchowski.com.pl>
@@ -55,13 +62,17 @@
       1 Hector Correa <hector@hectorcorrea.com>
       1 Florian Klampfer <f.klampfer@gmail.com>
       1 Floreal Morandat florealm@gmail.com <florealm@gmail.com>
+      1 Fangyi Zhou <me@fangyi.io>
       1 Diego Galeota <diegobg123@gmail.com>
+      1 David Rodríguez <deivid.rodriguez@riseup.net>
       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 Bob Lail <lail@squareup.com>
       1 Ashe Connor <ashe@kivikakk.ee>
+      1 Antoine Cotten <hello@acotten.com>
       1 Andrew <andrew.dale.wylie@gmail.com>
       1 Alpha Chen <alpha.chen@gmail.com>
       1 Alex Tomlins <alex.tomlins@digital.cabinet-office.gov.uk>
       1 Alexey Vasiliev <le0pard@users.noreply.github.com>
+      1 284km <k.furuhashi10@gmail.com>

data/VERSION

@@ -1 +1 @@
-2.0.0.beta1
+2.3.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/base.rb

@@ -106,7 +106,8 @@ module Kramdown
         end
         result = converter.convert(tree)
         if result.respond_to?(:encode!) && result.encoding != Encoding::BINARY
-          result.encode!(tree.options[:encoding])
+          result.encode!(tree.options[:encoding] ||
+                         (raise ::Kramdown::Error, "Missing encoding option on root element"))
         end
         if !converter.options[:template].empty? && converter.apply_template_after?
           result = apply_template(converter, result)

data/lib/kramdown/converter/html.rb

@@ -46,15 +46,16 @@ module Kramdown
         @toc_code = nil
         @indent = 2
         @stack = []
-      end
 
-      # The mapping of element type to conversion method.
-      DISPATCHER = Hash.new {|h, k| h[k] = "convert_#{k}" }
+        # stash string representation of symbol to avoid allocations from multiple interpolations.
+        @highlighter_class = " highlighter-#{options[:syntax_highlighter]}"
+        @dispatcher = Hash.new {|h, k| h[k] = :"convert_#{k}" }
+      end
 
       # Dispatch the conversion of the element +el+ to a +convert_TYPE+ method using the +type+ of
       # the element.
       def convert(el, indent = -@indent)
-        send(DISPATCHER[el.type], el, indent)
+        send(@dispatcher[el.type], el, indent)
       end
 
       # Return the converted content of the children of +el+ as a string. The parameter +indent+ has
@@ -67,7 +68,7 @@ module Kramdown
         indent += @indent
         @stack.push(el)
         el.children.each do |inner_el|
-          result << send(DISPATCHER[inner_el.type], inner_el, indent)
+          result << send(@dispatcher[inner_el.type], inner_el, indent)
         end
         @stack.pop
         result
@@ -78,17 +79,33 @@ module Kramdown
       end
 
       def convert_text(el, _indent)
-        escape_html(el.value, :text)
+        escaped = escape_html(el.value, :text)
+        @options[:remove_line_breaks_for_cjk] ? fix_cjk_line_break(escaped) : escaped
       end
 
       def convert_p(el, indent)
         if el.options[:transparent]
           inner(el, indent)
+        elsif el.children.size == 1 && el.children.first.type == :img &&
+            el.children.first.options[:ial]&.[](:refs)&.include?('standalone')
+          convert_standalone_image(el.children.first, indent)
         else
-          format_as_block_html(el.type, el.attr, inner(el, indent), indent)
+          format_as_block_html("p", el.attr, inner(el, indent), indent)
         end
       end
 
+      # Helper method used by +convert_p+ to convert a paragraph that only contains a single :img
+      # element.
+      def convert_standalone_image(el, indent)
+        attr = el.attr.dup
+        figure_attr = {}
+        figure_attr['class'] = attr.delete('class') if attr.key?('class')
+        figure_attr['id'] = attr.delete('id') if attr.key?('id')
+        body = "#{' ' * (indent + @indent)}<img#{html_attributes(attr)} />\n" \
+          "#{' ' * (indent + @indent)}<figcaption>#{attr['alt']}</figcaption>\n"
+        format_as_indented_block_html("figure", figure_attr, body, indent)
+      end
+
       def convert_codeblock(el, indent)
         attr = el.attr.dup
         lang = extract_code_language!(attr)
@@ -120,7 +137,7 @@ module Kramdown
       end
 
       def convert_blockquote(el, indent)
-        format_as_indented_block_html(el.type, el.attr, inner(el, indent), indent)
+        format_as_indented_block_html("blockquote", el.attr, inner(el, indent), indent)
       end
 
       def convert_header(el, indent)
@@ -137,12 +154,15 @@ module Kramdown
         "#{' ' * indent}<hr#{html_attributes(el.attr)} />\n"
       end
 
+      ZERO_TO_ONETWENTYEIGHT = (0..128).to_a.freeze
+      private_constant :ZERO_TO_ONETWENTYEIGHT
+
       def convert_ul(el, indent)
-        if !@toc_code && (el.options[:ial][:refs].include?('toc') rescue nil)
-          @toc_code = [el.type, el.attr, (0..128).to_a.map { rand(36).to_s(36) }.join]
+        if !@toc_code && el.options.dig(:ial, :refs)&.include?('toc')
+          @toc_code = [el.type, el.attr, ZERO_TO_ONETWENTYEIGHT.map { rand(36).to_s(36) }.join]
           @toc_code.last
-        elsif !@footnote_location && el.options[:ial] && (el.options[:ial][:refs] || []).include?('footnotes')
-          @footnote_location = (0..128).to_a.map { rand(36).to_s(36) }.join
+        elsif !@footnote_location && el.options.dig(:ial, :refs)&.include?('footnotes')
+          @footnote_location = ZERO_TO_ONETWENTYEIGHT.map { rand(36).to_s(36) }.join
         else
           format_as_indented_block_html(el.type, el.attr, inner(el, indent), indent)
         end
@@ -150,7 +170,7 @@ module Kramdown
       alias convert_ol convert_ul
 
       def convert_dl(el, indent)
-        format_as_indented_block_html(el.type, el.attr, inner(el, indent), indent)
+        format_as_indented_block_html("dl", el.attr, inner(el, indent), indent)
       end
 
       def convert_li(el, indent)
@@ -173,7 +193,7 @@ module Kramdown
             break
           end
         end if !attr['id'] && @stack.last.options[:ial] && @stack.last.options[:ial][:refs]
-        format_as_block_html(el.type, attr, inner(el, indent), indent)
+        format_as_block_html("dt", attr, inner(el, indent), indent)
       end
 
       def convert_html_element(el, indent)
@@ -248,7 +268,7 @@ module Kramdown
       end
 
       def convert_a(el, indent)
-        format_as_span_html(el.type, el.attr, inner(el, indent))
+        format_as_span_html("a", el.attr, inner(el, indent))
       end
 
       def convert_img(el, _indent)
@@ -271,17 +291,19 @@ module Kramdown
 
       def convert_footnote(el, _indent)
         repeat = ''
-        if (footnote = @footnotes_by_name[el.options[:name]])
+        name = @options[:footnote_prefix] + el.options[:name]
+        if (footnote = @footnotes_by_name[name])
           number = footnote[2]
           repeat = ":#{footnote[3] += 1}"
         else
           number = @footnote_counter
           @footnote_counter += 1
-          @footnotes << [el.options[:name], el.value, number, 0]
-          @footnotes_by_name[el.options[:name]] = @footnotes.last
+          @footnotes << [name, el.value, number, 0]
+          @footnotes_by_name[name] = @footnotes.last
         end
-        "<sup id=\"fnref:#{el.options[:name]}#{repeat}\">" \
-          "<a href=\"#fn:#{el.options[:name]}\" class=\"footnote\">#{number}</a></sup>"
+        "<sup id=\"fnref:#{name}#{repeat}\" role=\"doc-noteref\">" \
+          "<a href=\"#fn:#{name}\" class=\"footnote\">" \
+          "#{number}</a></sup>"
       end
 
       def convert_raw(el, _indent)
@@ -383,7 +405,7 @@ module Kramdown
       # Add the syntax highlighter name to the 'class' attribute of the given attribute hash. And
       # overwrites or add a "language-LANG" part using the +lang+ parameter if +lang+ is not nil.
       def add_syntax_highlighter_to_class_attr(attr, lang = nil)
-        (attr['class'] = (attr['class'] || '') + " highlighter-#{@options[:syntax_highlighter]}").lstrip!
+        (attr['class'] = (attr['class'] || '') + @highlighter_class).lstrip!
         attr['class'].sub!(/\blanguage-\S+|(^)/) { "language-#{lang}#{$1 ? ' ' : ''}" } if lang
       end
 
@@ -458,9 +480,9 @@ module Kramdown
         result
       end
 
-      FOOTNOTE_BACKLINK_FMT = "%s<a href=\"#fnref:%s\" class=\"reversefootnote\">%s</a>"
+      FOOTNOTE_BACKLINK_FMT = "%s<a href=\"#fnref:%s\" class=\"reversefootnote\" role=\"doc-backlink\">%s</a>"
 
-      # Return a HTML ordered list with the footnote content for the used footnotes.
+      # Return an HTML ordered list with the footnote content for the used footnotes.
       def footnote_content
         ol = Element.new(:ol)
         ol.attr['start'] = @footnote_start if @footnote_start != 1
@@ -468,7 +490,7 @@ module Kramdown
         backlink_text = escape_html(@options[:footnote_backlink], :text)
         while i < @footnotes.length
           name, data, _, repeat = *@footnotes[i]
-          li = Element.new(:li, nil, 'id' => "fn:#{name}")
+          li = Element.new(:li, nil, 'id' => "fn:#{name}", 'role' => 'doc-endnote')
           li.children = Marshal.load(Marshal.dump(data.children))
 
           para = nil
@@ -503,7 +525,7 @@ module Kramdown
         if ol.children.empty?
           ''
         else
-          format_as_indented_block_html('div', {class: "footnotes"}, convert(ol, 2), 0)
+          format_as_indented_block_html('div', {class: "footnotes", role: "doc-endnotes"}, convert(ol, 2), 0)
         end
       end
 

data/lib/kramdown/converter/kramdown.rb

@@ -34,13 +34,13 @@ module Kramdown
         res = res.dup if res.frozen?
         if ![:html_element, :li, :dt, :dd, :td].include?(el.type) && (ial = ial_for_element(el))
           res << ial
-          res << "\n\n" if Element.category(el) == :block
+          res << "\n\n" if el.block?
         elsif [:ul, :dl, :ol, :codeblock].include?(el.type) && opts[:next] &&
             ([el.type, :codeblock].include?(opts[:next].type) ||
              (opts[:next].type == :blank && opts[:nnext] &&
               [el.type, :codeblock].include?(opts[:nnext].type)))
           res << "^\n\n"
-        elsif Element.category(el) == :block &&
+        elsif el.block? &&
             ![:li, :dd, :dt, :td, :th, :tr, :thead, :tbody, :tfoot, :blank].include?(el.type) &&
             (el.type != :html_element || @stack.last.type != :html_element) &&
             (el.type != :p || !el.options[:transparent])
@@ -184,10 +184,15 @@ module Kramdown
 
       HTML_TAGS_WITH_BODY = ['div', 'script', 'iframe', 'textarea']
 
+      HTML_ELEMENT_TYPES = [:entity, :text, :html_element].freeze
+      private_constant :HTML_ELEMENT_TYPES
+
       def convert_html_element(el, opts)
         markdown_attr = el.options[:category] == :block && el.children.any? do |c|
-          c.type != :html_element && (c.type != :p || !c.options[:transparent]) &&
-            Element.category(c) == :block
+          c.type != :html_element &&
+            (c.type != :p || !c.options[:transparent] ||
+             c.children.any? {|t| !HTML_ELEMENT_TYPES.member?(t.type) }) &&
+            c.block?
         end
         opts[:force_raw_text] = true if %w[script pre code].include?(el.value)
         opts[:raw_text] = opts[:force_raw_text] || opts[:block_raw_text] || \
@@ -421,9 +426,9 @@ module Kramdown
           end
         end.compact.join('')
         res = "toc" + (res.strip.empty? ? '' : " #{res}") if (el.type == :ul || el.type == :ol) &&
-          (el.options[:ial][:refs].include?('toc') rescue nil)
+          el.options.dig(:ial, :refs)&.include?('toc')
         res = "footnotes" + (res.strip.empty? ? '' : " #{res}") if (el.type == :ul || el.type == :ol) &&
-          (el.options[:ial][:refs].include?('footnotes') rescue nil)
+          el.options.dig(:ial, :refs)&.include?('footnotes')
         if el.type == :dl && el.options[:ial] && el.options[:ial][:refs]
           auto_ids = el.options[:ial][:refs].select {|ref| ref.start_with?('auto_ids') }.join(" ")
           res = auto_ids << (res.strip.empty? ? '' : " #{res}") unless auto_ids.empty?

data/lib/kramdown/converter/latex.rb

@@ -127,7 +127,7 @@ module Kramdown
       end
 
       def convert_ul(el, opts)
-        if !@data[:has_toc] && (el.options[:ial][:refs].include?('toc') rescue nil)
+        if !@data[:has_toc] && el.options.dig(:ial, :refs)&.include?('toc')
           @data[:has_toc] = true
           '\tableofcontents'
         else

data/lib/kramdown/converter/math_engine/mathjax.rb

@@ -16,40 +16,14 @@ module Kramdown::Converter::MathEngine
   module Mathjax
 
     def self.call(converter, el, opts)
-      type = el.options[:category]
-      text = (el.value =~ /<|&/ ? "% <![CDATA[\n#{el.value} %]]>" : el.value).dup
-      text.gsub!(/<\/?script>?/, '')
-
-      preview = preview_string(converter, el, opts).dup
-
-      attr = {type: "math/tex#{type == :block ? '; mode=display' : ''}"}
-      preview << if type == :block
-                   converter.format_as_block_html('script', attr, text, opts[:indent])
-                 else
-                   converter.format_as_span_html('script', attr, text)
-                 end
-    end
-
-    def self.preview_string(converter, el, opts)
-      preview = converter.options[:math_engine_opts][:preview]
-      return '' unless preview
-
-      preview = (preview == true ? converter.escape_html(el.value) : preview.to_s)
-
-      preview_as_code = converter.options[:math_engine_opts][:preview_as_code]
-
-      if el.options[:category] == :block
-        if preview_as_code
-          converter.format_as_block_html('pre', {'class' => 'MathJax_Preview'},
-                                         converter.format_as_span_html('code', {}, preview),
-                                         opts[:indent])
-        else
-          converter.format_as_block_html('div', {'class' => 'MathJax_Preview'}, preview,
-                                         opts[:indent])
-        end
+      value = converter.escape_html(el.value)
+      result = el.options[:category] == :block ?  "\\[#{value}\\]\n" : "\\(#{value}\\)"
+      if el.attr.empty?
+        result
+      elsif el.options[:category] == :block
+        converter.format_as_block_html('div', el.attr, result, opts[:indent])
       else
-        converter.format_as_span_html(preview_as_code ? 'code' : 'span',
-                                      {'class' => 'MathJax_Preview'}, preview)
+        converter.format_as_span_html('span', el.attr, "$#{el.value}$")
       end
     end