lib/kramdown/converter/kramdown.rb in kramdown-0.10.0 vs lib/kramdown/converter/kramdown.rb in kramdown-0.11.0

@@ -39,161 +39,161 @@
         @footnotes = []
         @abbrevs = []
         @stack = []
       end
 
-      def convert(el, opts = {})
+      def convert(el, opts = {:indent => 0})
         res = send("convert_#{el.type}", el, opts)
         if el.type != :html_element && el.type != :li && el.type != :dd && (ial = ial_for_element(el))
           res << ial
           res << "\n\n" if el.options[:category] == :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 el.options[:category] == :block && ![:li, :dd, :dt, :td, :th, :tr, :thead, :tbody, :tfoot, :blank].include?(el.type) &&
+            (el.type != :p || !el.options[:transparent])
+          res << "\n"
         end
         res
       end
 
-      def inner(el, opts = {})
-        @stack.push([el, opts])
+      def inner(el, opts = {:indent => 0})
+        @stack.push(el)
         result = ''
         el.children.each_with_index do |inner_el, index|
           options = opts.dup
           options[:index] = index
           options[:prev] = (index == 0 ? nil : el.children[index-1])
+          options[:pprev] = (index <= 1 ? nil : el.children[index-2])
           options[:next] = (index == el.children.length - 1 ? nil : el.children[index+1])
+          options[:nnext] = (index >= el.children.length - 2 ? nil : el.children[index+2])
           result << convert(inner_el, options)
         end
         @stack.pop
         result
       end
 
       def convert_blank(el, opts)
-        "\n"
+        ""
       end
 
-      ESCAPED_CHAR_RE = /(\$\$|[\\*_`\[\]\{\}"'])|^[ ]{0,3}(:)/
+      ESCAPED_CHAR_RE = /(\$\$|[\\*_`\[\]\{"'])|^[ ]{0,3}(:)/
 
       def convert_text(el, opts)
         if opts[:raw_text]
           el.value
         else
-          nl = (el.value =~ /\n$/)
-          el.value.gsub(/\s+/, ' ').gsub(ESCAPED_CHAR_RE) { "\\#{$1 || $2}" } + (nl ? "\n" : '')
+          el.value.gsub(/\A\n/) do
+            opts[:prev] && opts[:prev].type == :br ? '' : "\n"
+          end.gsub(/\s+/, ' ').gsub(ESCAPED_CHAR_RE) { "\\#{$1 || $2}" }
         end
       end
 
       def convert_p(el, opts)
-        res = inner(el, opts).strip.gsub(/\A(?:([#|])|(\d+)\.|([+-]\s))/) do
-          $1 || $3 ? "\\#{$1 || $3}" : "#{$2}\\."
-        end + "\n"
-        if opts[:next] && opts[:next].type == :p && !ial_for_element(el)
-          res += "\n"
-        end
-        res
+        w = @doc.options[:line_width] - opts[:indent].to_s.to_i
+        first, second, *rest = inner(el, opts).strip.gsub(/(.{1,#{w}})( +|$\n?)/, "\\1\n").split(/\n/)
+        first.gsub!(/^(?:(#)|(\d+)\.|([+-]\s))/) { $1 || $3 ? "\\#{$1 || $3}" : "#{$2}\\."}
+        first.gsub!(/\|/, '\\|')
+        second.gsub!(/^([=-]+\s*?)$/, "\\\1") if second
+        [first, second, *rest].compact.join("\n") + "\n"
       end
 
-      CODEBLOCK_PREV_EL = [:ul, :ol, :dl, :codeblock]
 
       def convert_codeblock(el, opts)
-        res = ''
-        res << "^\n" if opts[:prev] && ((CODEBLOCK_PREV_EL.include?(opts[:prev].type) && !ial_for_element(opts[:prev])) ||
-                                        (opts[:prev].type == :blank &&
-                                         opts[:index]-2 >= 0 &&
-                                         (tmp = @stack.last.first.children[opts[:index]-2]) &&
-                                         CODEBLOCK_PREV_EL.include?(tmp.type) && !ial_for_element(tmp)))
-        res << el.value.split(/\n/).map {|l| l.empty? ? "    " : "    #{l}"}.join("\n") + "\n"
+        el.value.split(/\n/).map {|l| l.empty? ? "    " : "    #{l}"}.join("\n") + "\n"
       end
 
       def convert_blockquote(el, opts)
-        res = ''
-        res << "\n" if opts[:prev] && opts[:prev].type == :blockquote
-        res << inner(el, opts).chomp.split(/\n/).map {|l| "> #{l}"}.join("\n") << "\n"
+        opts[:indent] += 2
+        inner(el, opts).chomp.split(/\n/).map {|l| "> #{l}"}.join("\n") << "\n"
       end
 
       def convert_header(el, opts)
         res = ''
-        res << "\n" if opts[:prev] && opts[:prev].type != :blank
         res << "#{'#' * el.options[:level]} #{inner(el, opts)}"
-        res << "   {##{el.options[:attr]['id']}}" if el.options[:attr] && el.options[:attr]['id']
-        res << "\n" if opts[:next] && opts[:next].type != :blank
+        res << "   {##{el.attr['id']}}" if el.attr['id']
         res << "\n"
       end
 
       def convert_hr(el, opts)
         "* * *\n"
       end
 
       def convert_ul(el, opts)
-        res = ''
-        res << "\n" if opts[:prev] && (opts[:prev].type == :p && !opts[:prev].options[:transparent])
-        res << "^\n" if opts[:prev] && ((opts[:prev].type == el.type && !ial_for_element(opts[:prev])) ||
-                                        (opts[:prev].type == :blank && opts[:index]-2 >= 0 &&
-                                         (tmp = @stack.last.first.children[opts[:index]-2]) &&
-                                         tmp.type == el.type && !ial_for_element(tmp)))
-        res + inner(el, opts).sub(/\n+\Z/, "\n")
+        inner(el, opts).sub(/\n+\Z/, "\n")
       end
       alias :convert_ol :convert_ul
       alias :convert_dl :convert_ul
 
       def convert_li(el, opts)
-        sym, width = if @stack.last.first.type == :ul
+        sym, width = if @stack.last.type == :ul
                        ['* ', el.children.first.type == :codeblock ? 4 : 2]
                      else
                        ["#{opts[:index] + 1}.".ljust(4), 4]
                      end
         if ial = ial_for_element(el)
           sym += ial + " "
         end
 
-        first, *last = inner(el, opts).chomp.split(/\n/)
+        opts[:indent] += width
+        text = inner(el, opts)
+        newlines = text.scan(/\n*\Z/).first
+        first, *last = text.split(/\n/)
         last = last.map {|l| " "*width + l}.join("\n")
-        last = last.empty? ? "\n" : "\n#{last}\n"
+        text = first + (last.empty? ? "" : "\n") + last + newlines
         if el.children.first.type == :p && !el.children.first.options[:transparent]
-          res = "#{sym}#{first}\n#{last}"
-          res << "^\n" if el.children.size == 1 && @stack.last.first.children.last == el &&
-            (@stack.last.first.children.any? {|c| c.children.first.type != :p} || @stack.last.first.children.size == 1)
+          res = "#{sym}#{text}"
+          res << "^\n" if el.children.size == 1 && @stack.last.children.last == el &&
+            (@stack.last.children.any? {|c| c.children.first.type != :p} || @stack.last.children.size == 1)
           res
         elsif el.children.first.type == :codeblock
-          "#{sym}\n    #{first}#{last}"
+          "#{sym}\n    #{text}"
         else
-          "#{sym}#{first}#{last}"
+          "#{sym}#{text}"
         end
       end
 
       def convert_dd(el, opts)
         sym, width = ": ", (el.children.first.type == :codeblock ? 4 : 2)
         if ial = ial_for_element(el)
           sym += ial + " "
         end
 
-        first, *last = inner(el, opts).chomp.split(/\n/)
+        opts[:indent] += width
+        text = inner(el, opts)
+        newlines = text.scan(/\n*\Z/).first
+        first, *last = text.split(/\n/)
         last = last.map {|l| " "*width + l}.join("\n")
-        text = first + (last.empty? ? '' : "\n" + last)
+        text = first + (last.empty? ? "" : "\n") + last + newlines
+        text.chomp! if text =~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dd
+        text += "\n" if text !~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dt
         if el.children.first.type == :p && !el.children.first.options[:transparent]
-          "\n#{sym}#{text}\n"
+          "\n#{sym}#{text}"
         elsif el.children.first.type == :codeblock
-          "#{sym}\n    #{text}\n"
+          "#{sym}\n    #{text}"
         else
-          "#{sym}#{text}\n"
+          "#{sym}#{text}"
         end
       end
 
       def convert_dt(el, opts)
-        res = ''
-        res << inner(el, opts) << "\n"
+        inner(el, opts) << "\n"
       end
 
-      HTML_TAGS_WITH_BODY=['div', 'script']
+      HTML_TAGS_WITH_BODY=['div', 'script', 'iframe', 'textarea']
 
       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]) && c.options[:category] == :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] || (el.options[:category] != :span && !markdown_attr)
         opts[:block_raw_text] = true if el.options[:category] == :block && opts[:raw_text]
         res = inner(el, opts)
         if el.options[:category] == :span
-          "<#{el.value}#{html_attributes(el)}" << (!res.empty? ? ">#{res}</#{el.value}>" : " />")
+          "<#{el.value}#{html_attributes(el)}" << (!res.empty? || HTML_TAGS_WITH_BODY.include?(el.value) ? ">#{res}</#{el.value}>" : " />")
         else
           output = ''
           output << "<#{el.value}#{html_attributes(el)}"
           output << " markdown=\"1\"" if markdown_attr
           if !res.empty? && el.options[:parse_type] != :block
@@ -203,17 +203,17 @@
           elsif HTML_TAGS_WITH_BODY.include?(el.value)
             output << "></#{el.value}>"
           else
             output << " />"
           end
-          output << "\n" if el.options[:outer_element] || !el.options[:parent_is_raw]
+          output << "\n" if @stack.last.type != :html_element || @stack.last.options[:parse_type] != :raw
           output
         end
       end
 
       def convert_xml_comment(el, opts)
-        if el.options[:category] == :block && !el.options[:parent_is_raw]
+        if el.options[:category] == :block && (@stack.last.type != :html_element || @stack.last.options[:parse_type] != :raw)
           el.value + "\n"
         else
           el.value
         end
       end
@@ -272,21 +272,38 @@
       def convert_br(el, opts)
         "  \n"
       end
 
       def convert_a(el, opts)
-        if el.options[:attr]['href'].empty?
+        if el.attr['href'].empty?
           "[#{inner(el, opts)}]()"
+        elsif el.attr['href'] =~ /^(?:http|ftp)/ || el.attr['href'].count("()") > 0
+          index = if link_el = @linkrefs.find {|c| c.attr['href'] == el.attr['href']}
+                    @linkrefs.index(link_el) + 1
+                  else
+                    @linkrefs << el
+                    @linkrefs.size
+                  end
+          "[#{inner(el, opts)}][#{index}]"
         else
-          @linkrefs << el
-          "[#{inner(el, opts)}][#{@linkrefs.size}]"
+          title = el.attr['title'].to_s.empty? ? '' : ' "' + el.attr['title'].gsub(/"/, "&quot;") + '"'
+          "[#{inner(el, opts)}](#{el.attr['href']}#{title})"
         end
       end
 
       def convert_img(el, opts)
-        title = (el.options[:attr]['title'] ? ' "' + el.options[:attr]['title'].gsub(/"/, "&quot;") + '"' : '')
-        "![#{el.options[:attr]['alt']}](<#{el.options[:attr]['src']}>#{title})"
+        if el.attr['src'].empty?
+          "![#{el.attr['alt']}]()"
+        else
+          title = (el.attr['title'] ? ' "' + el.attr['title'].gsub(/"/, "&quot;") + '"' : '')
+          link = if el.attr['src'].count("()") > 0
+                   "<#{el.attr['src']}>"
+                 else
+                   el.attr['src']
+                 end
+          "![#{el.attr['alt']}](#{link}#{title})"
+        end
       end
 
       def convert_codespan(el, opts)
         delim = (el.value.scan(/`+/).max || '') + '`'
         "#{delim}#{' ' if delim.size > 1}#{el.value}#{' ' if delim.size > 1}#{delim}"
@@ -296,16 +313,18 @@
         @footnotes << [el.options[:name], @doc.parse_infos[:footnotes][el.options[:name]]]
         "[^#{el.options[:name]}]"
       end
 
       def convert_raw(el, opts)
-        if @stack.last.first.type == :html_element
+        attr = (el.options[:type] || []).join(' ')
+        attr = " type=\"#{attr}\"" if attr.length > 0
+        if @stack.last.type == :html_element
           el.value
         elsif el.options[:category] == :block
-          "{::nomarkdown}\n#{el.value}\n{:/}\n"
+          "{::nomarkdown#{attr}}\n#{el.value}\n{:/}\n"
         else
-          "{::nomarkdown}#{el.value}{:/}"
+          "{::nomarkdown#{attr}}#{el.value}{:/}"
         end
       end
 
       def convert_em(el, opts)
         "*#{inner(el, opts)}*"
@@ -331,11 +350,11 @@
       def convert_smart_quote(el, opts)
         el.value.to_s =~ /[rl]dquo/ ? "\"" : "'"
       end
 
       def convert_math(el, opts)
-        (@stack.last.first.type == :p && opts[:prev].nil? ? "\\" : '') + "$$#{el.value}$$" + (el.options[:category] == :block ? "\n" : '')
+        (@stack.last.type == :p && opts[:prev].nil? ? "\\" : '') + "$$#{el.value}$$" + (el.options[:category] == :block ? "\n" : '')
       end
 
       def convert_abbreviation(el, opts)
         el.value
       end
@@ -350,24 +369,21 @@
 
       def create_link_defs
         res = ''
         res << "\n\n" if @linkrefs.size > 0
         @linkrefs.each_with_index do |el, i|
-          link = (el.type == :a ? el.options[:attr]['href'] : el.options[:attr]['src'])
-          link = "<#{link}>" if link =~ / /
-          title = el.options[:attr]['title']
-          res << "[#{i+1}]: #{link} #{title ? '"' + title.gsub(/"/, "&quot;") + '"' : ''}\n"
+          title = el.attr['title']
+          res << "[#{i+1}]: #{el.attr['href']} #{title ? '"' + title.gsub(/"/, "&quot;") + '"' : ''}\n"
         end
         res
       end
 
       def create_footnote_defs
         res = ''
-        res = "\n" if @footnotes.size > 0
         @footnotes.each do |name, data|
-          res << "\n[^#{name}]:\n"
-          res << inner(data[:content]).chomp.split(/\n/).map {|l| "    #{l}"}.join("\n")
+          res << "[^#{name}]:\n"
+          res << inner(data[:content]).chomp.split(/\n/).map {|l| "    #{l}"}.join("\n") + "\n\n"
         end
         res
       end
 
       def create_abbrev_defs
@@ -379,14 +395,22 @@
         res
       end
 
       # Return the IAL containing the attributes of the element +el+.
       def ial_for_element(el)
-        res = (el.options[:attr] || {}).map do |k,v|
+        res = el.attr.map do |k,v|
           next if [:img, :a].include?(el.type) && ['href', 'src', 'alt', 'title'].include?(k)
           next if el.type == :header && k == 'id'
-          v.nil? ? '' : " #{k}=\"#{v.to_s}\""
-        end.compact.sort.join('')
+          if v.nil?
+            ''
+          elsif k == 'class'
+            " " + v.split(/\s+/).map {|w| ".#{w}"}.join(" ")
+          elsif k == 'id'
+            " ##{v}"
+          else
+            " #{k}=\"#{v.to_s}\""
+          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)
         res.strip.empty? ? nil : "{:#{res}}"
       end