kramdown 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc587193307dcea4710eed05bfa2060a518c67e
-  data.tar.gz: 712948207deb53058cfd494b071874d1c867c309
+  metadata.gz: 558b4355efb3892936bc7f01dd747401964a4f2c
+  data.tar.gz: 4e3deeabf3bd99defba379802b3ff0007ed8cb9f
 SHA512:
-  metadata.gz: 83c5923ed5c7d2268ef7a6a4056a8f27b52845c78eb30af5d14c42f75ac5d496e24fd5a0b8479cbf145c064de4862b46ad8194b07aca5a57b5752d4714538a54
-  data.tar.gz: 6b49da8d9362d5f47a3181e36977c1d3d6a996b8fb062e7e496eb323f8a38604a3e14c722f75be33c671f3850178e8deb2451dbdbb1345e4ccedff82766c2362
+  metadata.gz: f59c155c5d6d29b2e0f74ead74808b5f6f535abe879cc8dc4cba244d76b4d5fe372916c9d6f207b86cb7a5dcee29af9731ed12553db8c12ed897c3a53f2ccd10
+  data.tar.gz: b18d1c60ea05561b59a37e97cd5208968cbce22cff4f4178d283a9772af7d60eaa85d3470f8f11728c2758284419af21c2f52f94fbb2882e7f291d7cb733b040

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    676 Thomas Leitner <t_leitner@gmx.at>
+    681 Thomas Leitner <t_leitner@gmx.at>
       6 Gioele Barabucci <gioele@svario.it>
       4 Ted Pak <powerpak006@gmail.com>
       4 Arne Brasseur <arne@arnebrasseur.net>
@@ -12,12 +12,15 @@
       2 Nathanael Jones <nathanael.jones@gmail.com>
       2 Jo Hund <jhund@clearcove.ca>
       2 Bran <m.versum@gmail.com>
+      1 utenmiki <utenmiki@gmail.com>
       1 Trevor Wennblom <trevor@well.com>
       1 tomykaira <tomykaira@gmail.com>
+      1 Tim Blair <tim@bla.ir>
       1 Tim Besard <tim.besard@gmail.com>
       1 Tim Bates <tim@rumpuslabs.com>
       1 Simon Lydell <simon.lydell@gmail.com>
       1 Shusaku NAKAZATO <cu393uc@gmail.com>
+      1 Sebastian Boehm <sebastian@sometimesfood.org>
       1 Postmodern <postmodern.mod3@gmail.com>
       1 Pete Michaud <michaudp@gmail.com>
       1 myqlarson <myqlarson@gmail.com>

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/bin/kramdown

@@ -21,8 +21,8 @@ OptionParser.new do |opts|
   opts.separator "Command line options:"
   opts.separator ""
 
-  opts.on("-i", "--input ARG", "Specify the input format: kramdown (default) or html") {|v| options[:input] = v}
-  opts.on("-o", "--output ARG", Array, "Specify one or more output formats separated by commas: html (default), kramdown, latex or remove_html_tags") {|v| format = v}
+  opts.on("-i", "--input ARG", "Specify the input format: kramdown (default), html, GFM 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, pdf or remove_html_tags") {|v| format = v}
 
   opts.on("-v", "--version", "Show the version of kramdown") do
     puts Kramdown::VERSION

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <span class="inline-important">1.4.0</span> and it was released
-on <span class="inline-important">2014-06-18</span></p>
+<p>The latest version of kramdown is <span class="inline-important">1.4.1</span> and it was released
+on <span class="inline-important">2014-08-02</span></p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/doc/syntax.page

@@ -936,7 +936,7 @@ inline math statement, you need to escape the first dollar sign:
 
     \$$ 5 + 5 $$
 
-If you don't even won't the inline math statement, escape the first two dollar signs:
+If you don't even want the inline math statement, escape the first two dollar signs:
 
     \$\$ 5 + 5 $$
 

data/lib/kramdown/converter/latex.rb

@@ -213,14 +213,15 @@ module Kramdown
       end
 
       def convert_img(el, opts)
+        line = el.options[:location]
         if el.attr['src'] =~ /^(https?|ftps?):\/\//
-          warning("Cannot include non-local image")
+          warning("Cannot include non-local image#{line ? " (line #{line})" : ''}")
           ''
         elsif !el.attr['src'].empty?
           @data[:packages] << 'graphicx'
           "#{latex_link_target(el)}\\includegraphics{#{el.attr['src']}}"
         else
-          warning("Cannot include image with empty path")
+          warning("Cannot include image with empty path#{line ? " (line #{line})" : ''}")
           ''
         end
       end

data/lib/kramdown/converter/pdf.rb

@@ -8,6 +8,7 @@
 #
 
 require 'prawn'
+require 'prawn/table'
 require 'kramdown/utils/entities'
 require 'open-uri'
 
@@ -139,12 +140,13 @@ module Kramdown
 
       def render_standalone_image(el, opts)
         img = el.children.first
+        line = img.options[:location]
 
         if img.attr['src'].empty?
-          warning("Rendering an image without a source is not possible")
+          warning("Rendering an image without a source is not possible#{line ? " (line #{line})" : ''}")
           return nil
         elsif img.attr['src'] !~ /\.jpe?g$|\.png$/
-          warning("Cannot render images other than JPEG or PNG, got #{img.attr['src']}")
+          warning("Cannot render images other than JPEG or PNG, got #{img.attr['src']}#{line ? " on line #{line}" : ''}")
           return nil
         end
 
@@ -287,7 +289,8 @@ module Kramdown
             data << []
             row.children.each do |cell|
               if cell.children.any? {|child| child.options[:category] == :block}
-                warning("Can't render tables with cells containing block elements")
+                line = el.options[:location]
+                warning("Can't render tables with cells containing block elements#{line ? " (line #{line})" : ''}")
                 return
               end
               cell_data = inner(cell, opts)
@@ -404,7 +407,8 @@ module Kramdown
       end
 
       def render_img(el, *args) #:nodoc:
-        warning("Rendering span images is not supported for PDF converter")
+        line = el.options[:location]
+        warning("Rendering span images is not supported for PDF converter#{line ? " (line #{line})" : ''}")
         nil
       end
 
@@ -428,7 +432,8 @@ module Kramdown
       alias_method :render_blank, :render_xml_comment
 
       def render_footnote(el, *args) #:nodoc:
-        warning("Rendering #{el.type} not supported for PDF converter")
+        line = el.options[:location]
+        warning("Rendering #{el.type} not supported for PDF converter#{line ? " (line #{line})" : ''}")
         nil
       end
       alias_method :render_raw, :render_footnote

data/lib/kramdown/parser/html.rb

@@ -50,9 +50,10 @@ module Kramdown
 
         # Some HTML elements like script belong to both categories (i.e. are valid in block and
         # span HTML) and don't appear therefore!
+        # script, textarea
         HTML_SPAN_ELEMENTS = %w{a abbr acronym b big bdo br button cite code del dfn em i img input
                               ins kbd label option q rb rbc rp rt rtc ruby samp select small span
-                              strong sub sup textarea tt var}
+                              strong sub sup tt u var}
         HTML_BLOCK_ELEMENTS = %w{address article aside applet body button blockquote caption col colgroup dd div dl dt fieldset
                                figcaption footer form h1 h2 h3 h4 h5 h6 header hgroup hr html head iframe legend menu
                                li map nav ol optgroup p pre section summary table tbody td th thead tfoot tr ul}
@@ -74,17 +75,18 @@ module Kramdown
         # (first parameter is the created element; the second parameter is +true+ if the HTML
         # element is already closed, ie. contains no body; the third parameter specifies whether the
         # body - and the end tag - need to be handled in case closed=false).
-        def handle_html_start_tag # :yields: el, closed, handle_body
+        def handle_html_start_tag(line = nil) # :yields: el, closed, handle_body
           name = @src[1].downcase
           closed = !@src[4].nil?
           attrs = Utils::OrderedHash.new
           @src[2].scan(HTML_ATTRIBUTE_RE).each {|attr,sep,val| attrs[attr.downcase] = val || ""}
 
           el = Element.new(:html_element, name, attrs, :category => :block)
+          el.options[:location] = line if line
           @tree.children << el
 
           if !closed && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
-            warning("The HTML tag '#{el.value}' cannot have any content - auto-closing it")
+            warning("The HTML tag '#{el.value}' on line #{line} cannot have any content - auto-closing it")
             closed = true
           end
           if name == 'script' || name == 'style'
@@ -127,17 +129,22 @@ module Kramdown
           while !@src.eos? && !done
             if result = @src.scan_until(HTML_RAW_START)
               add_text(result, @tree, :text)
+              line = @src.current_line_number
               if result = @src.scan(HTML_COMMENT_RE)
-                @tree.children << Element.new(:xml_comment, result, nil, :category => :block)
+                @tree.children << Element.new(:xml_comment, result, nil, :category => :block, :location => line)
               elsif result = @src.scan(HTML_INSTRUCTION_RE)
-                @tree.children << Element.new(:xml_pi, result, nil, :category => :block)
+                @tree.children << Element.new(:xml_pi, result, nil, :category => :block, :location => line)
               elsif @src.scan(HTML_TAG_RE)
-                handle_html_start_tag(&block)
+                if method(:handle_html_start_tag).arity == 1
+                  handle_html_start_tag(line, &block)
+                else
+                  handle_html_start_tag(&block) # DEPRECATED: method needs to accept line number in 2.0
+                end
               elsif @src.scan(HTML_TAG_CLOSE_RE)
                 if @tree.value == @src[1].downcase
                   done = true
                 else
-                  warning("Found invalidly used HTML closing tag for '#{@src[1].downcase}' - ignoring it")
+                  warning("Found invalidly used HTML closing tag for '#{@src[1].downcase}' on line #{line} - ignoring it")
                 end
               else
                 add_text(@src.getch, @tree, :text)
@@ -145,7 +152,7 @@ module Kramdown
             else
               add_text(@src.rest, @tree, :text)
               @src.terminate
-              warning("Found no end tag for '#{@tree.value}' - auto-closing it") if @tree.type == :html_element
+              warning("Found no end tag for '#{@tree.value}' on line #{@tree.options[:location]} - auto-closing it") if @tree.type == :html_element
               done = true
             end
           end
@@ -330,6 +337,10 @@ module Kramdown
           el.children.each {|c| extract_text(c, raw)}
         end
 
+        def convert_textarea(el)
+          process_html_element(el, true, true)
+        end
+
         def convert_a(el)
           if el.attr['href']
             set_basics(el, :a)

data/lib/kramdown/parser/kramdown/footnote.rb

@@ -24,7 +24,7 @@ module Kramdown
 
         el = Element.new(:footnote_def, nil, nil, :location => start_line_number)
         parse_blocks(el, @src[2].gsub(INDENT, ''))
-        warning("Duplicate footnote name '#{@src[1]}' - overwriting") if @footnotes[@src[1]]
+        warning("Duplicate footnote name '#{@src[1]}' on line #{start_line_number} - overwriting") if @footnotes[@src[1]]
         (@footnotes[@src[1]] = {})[:content] = el
         @tree.children << Element.new(:eob, :footnote_def, nil, :location => start_line_number)
         true

data/lib/kramdown/parser/kramdown/html.rb

@@ -41,7 +41,7 @@ module Kramdown
         if !closed && handle_body
           if content_model == :block
             if !parse_blocks(el)
-              warning("Found no end tag for '#{el.value}' - auto-closing it")
+              warning("Found no end tag for '#{el.value}' (line #{el.options[:location]}) - auto-closing it")
             end
           elsif content_model == :span
             curpos = @src.pos
@@ -51,7 +51,7 @@ module Kramdown
             else
               add_text(@src.rest, el)
               @src.terminate
-              warning("Found no end tag for '#{el.value}' - auto-closing it")
+              warning("Found no end tag for '#{el.value}' (line #{el.options[:location]}) - auto-closing it")
             end
           else
             parse_raw_html(el, &method(:handle_kramdown_html_tag))
@@ -65,18 +65,19 @@ module Kramdown
 
       # Parse the HTML at the current position as block-level HTML.
       def parse_block_html
+        line = @src.current_line_number
         if result = @src.scan(HTML_COMMENT_RE)
-          @tree.children << Element.new(:xml_comment, result, nil, :category => :block)
+          @tree.children << Element.new(:xml_comment, result, nil, :category => :block, :location => line)
           @src.scan(TRAILING_WHITESPACE)
           true
         elsif result = @src.scan(HTML_INSTRUCTION_RE)
-          @tree.children << Element.new(:xml_pi, result, nil, :category => :block)
+          @tree.children << Element.new(:xml_pi, result, nil, :category => :block, :location => line)
           @src.scan(TRAILING_WHITESPACE)
           true
         else
           if result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
             @src.pos += @src.matched_size
-            handle_html_start_tag(&method(:handle_kramdown_html_tag))
+            handle_html_start_tag(line, &method(:handle_kramdown_html_tag))
             Kramdown::Parser::Html::ElementConverter.convert(@root, @tree.children.last) if @options[:html_to_native]
             true
           elsif result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
@@ -100,17 +101,18 @@ module Kramdown
 
       # Parse the HTML at the current position as span-level HTML.
       def parse_span_html
+        line = @src.current_line_number
         if result = @src.scan(HTML_COMMENT_RE)
-          @tree.children << Element.new(:xml_comment, result, nil, :category => :span)
+          @tree.children << Element.new(:xml_comment, result, nil, :category => :span, :location => line)
         elsif result = @src.scan(HTML_INSTRUCTION_RE)
-          @tree.children << Element.new(:xml_pi, result, nil, :category => :span)
+          @tree.children << Element.new(:xml_pi, result, nil, :category => :span, :location => line)
         elsif result = @src.scan(HTML_TAG_CLOSE_RE)
-          warning("Found invalidly used HTML closing tag for '#{@src[1]}'")
+          warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line}")
           add_text(result)
         elsif result = @src.scan(HTML_TAG_RE)
           tag_name = @src[1].downcase
           if HTML_BLOCK_ELEMENTS.include?(tag_name)
-            warning("Found block HTML tag '#{tag_name}' in span-level text")
+            warning("Found block HTML tag '#{tag_name}' in span-level text on line #{line}")
             add_text(result)
             return
           end
@@ -121,7 +123,7 @@ module Kramdown
           do_parsing = (HTML_CONTENT_MODEL[tag_name] == :raw || @tree.options[:content_model] == :raw ? false : @options[:parse_span_html])
           if val = HTML_MARKDOWN_ATTR_MAP[attrs.delete('markdown')]
             if val == :block
-              warning("Cannot use block-level parsing in span-level HTML tag - using default mode")
+              warning("Cannot use block-level parsing in span-level HTML tag (line #{line}) - using default mode")
             elsif val == :span
               do_parsing = true
             elsif val == :default
@@ -131,17 +133,17 @@ module Kramdown
             end
           end
 
-          el = Element.new(:html_element, tag_name, attrs, :category => :span,
+          el = Element.new(:html_element, tag_name, attrs, :category => :span, :location => line,
                            :content_model => (do_parsing ? :span : :raw), :is_closed => !!@src[4])
           @tree.children << el
           stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/i
           if !@src[4] && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
-            warning("The HTML tag '#{el.value}' cannot have any content - auto-closing it")
+            warning("The HTML tag '#{el.value}' on line #{line} cannot have any content - auto-closing it")
           elsif !@src[4]
             if parse_spans(el, stop_re, (do_parsing ? nil : [:span_html]))
               @src.scan(stop_re)
             else
-              warning("Found no end tag for '#{el.value}' - auto-closing it")
+              warning("Found no end tag for '#{el.value}' (line #{line}) - auto-closing it")
               add_text(@src.rest, el)
               @src.terminate
             end

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

@@ -15,7 +15,7 @@ module Kramdown
 
       # Normalize the link identifier.
       def normalize_link_id(id)
-        id.gsub(/[\s\n]+/, ' ').downcase
+        id.gsub(/[\s]+/, ' ').downcase
       end
 
       LINK_DEFINITION_START = /^#{OPT_SPACE}\[([^\n\]]+)\]:[ \t]*(?:<(.*?)>|([^'"\n]*?\S[^'"\n]*?))[ \t]*?(?:\n?[ \t]*?(["'])(.+?)\4[ \t]*?)?\n/
@@ -87,7 +87,7 @@ module Kramdown
           if @link_defs.has_key?(link_id)
             add_link(el, @link_defs[link_id].first, @link_defs[link_id].last, alt_text)
           else
-            warning("No link definition for link ID '#{link_id}' found")
+            warning("No link definition for link ID '#{link_id}' found on line #{start_line_number}")
             @src.pos = reset_pos
             add_text(result)
           end

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

@@ -140,7 +140,7 @@ module Kramdown
         add_container.call(has_footer ? :tfoot : :tbody, false) if !rows.empty?
 
         if !table.children.any? {|el| el.type == :tbody}
-          warning("Found table without body - ignoring it")
+          warning("Found table without body on line #{table.options[:location]} - ignoring it")
           @src.pos = orig_pos
           return false
         end

data/lib/kramdown/version.rb

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

data/test/testcases/block/09_html/textarea.html

@@ -0,0 +1,8 @@
+<p>This is a <textarea>inline</textarea></p>
+
+<textarea>This
+is
+
+some
+text
+</textarea>

data/test/testcases/block/09_html/textarea.text

@@ -0,0 +1,8 @@
+This is a <textarea>inline</textarea>
+
+<textarea>This
+is
+
+some
+text
+</textarea>

data/test/testcases/span/05_html/normal.html

@@ -39,3 +39,5 @@ now </span>.</p>
 
 <p>Some <code>element with | pipe
 symbol|</code></p>
+
+<p><u>underlined</u></p>

data/test/testcases/span/05_html/normal.text

@@ -39,3 +39,5 @@ Some <span><code>element with | pipe symbol</code></span>
 
 Some <code>element with | pipe
 symbol|</code>
+
+<u>underlined</u>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -350,6 +350,8 @@ files:
 - test/testcases/block/09_html/simple.html.19
 - test/testcases/block/09_html/simple.options
 - test/testcases/block/09_html/simple.text
+- test/testcases/block/09_html/textarea.html
+- test/testcases/block/09_html/textarea.text
 - test/testcases/block/10_ald/simple.html
 - test/testcases/block/10_ald/simple.text
 - test/testcases/block/11_ial/auto_id_and_ial.html