kramdown 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 558b4355efb3892936bc7f01dd747401964a4f2c
-  data.tar.gz: 4e3deeabf3bd99defba379802b3ff0007ed8cb9f
+  metadata.gz: d76ec0e7087a62788b9eb1d27027b1d4b4a2610e
+  data.tar.gz: 4b6fcefcd89fd851be053d975cdd825e07278c58
 SHA512:
-  metadata.gz: f59c155c5d6d29b2e0f74ead74808b5f6f535abe879cc8dc4cba244d76b4d5fe372916c9d6f207b86cb7a5dcee29af9731ed12553db8c12ed897c3a53f2ccd10
-  data.tar.gz: b18d1c60ea05561b59a37e97cd5208968cbce22cff4f4178d283a9772af7d60eaa85d3470f8f11728c2758284419af21c2f52f94fbb2882e7f291d7cb733b040
+  metadata.gz: 9c34e8bb6438d78c04d45c4237856530669933add8620ce12e3847729d6a49429b114be6dc00dcefe3ff2b450a4f947bfc36c2854dbb6c43799437f5429efbb8
+  data.tar.gz: 902838d7ee4add0e5dc66e67899b75fd9f44dddfff181eb6c99b20ffebd1af97c920f15bf6a87317c410ffef89f57ba28d9b6e48bbf1bc7de714389833ffee6a

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    681 Thomas Leitner <t_leitner@gmx.at>
+    700 Thomas Leitner <t_leitner@gmx.at>
       6 Gioele Barabucci <gioele@svario.it>
       4 Ted Pak <powerpak006@gmail.com>
       4 Arne Brasseur <arne@arnebrasseur.net>

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/data/kramdown/document.latex

@@ -41,6 +41,8 @@ encmap = {
 <%   end %>
 <% end %>
 
+\setcounter{footnote}{<%= @converter.options[:footnote_nr] - 1 %>}
+
 \hypersetup{colorlinks=true,urlcolor=blue}
 
 \begin{document}

data/doc/index.page

@@ -87,8 +87,8 @@ Markdown implementations because kramdown borrowed many ideas from existing pack
 completely written in Ruby, supports standard Markdown (with some minor modifications) and various
 extensions that have been made popular by the [PHP Markdown Extra] package and [Maruku].
 
-It is probably the fastest pure-Ruby Markdown converter available (March 2013), being about 4x
-faster than [Maruku] and about 5x faster than [BlueFeather].
+It is probably the fastest pure-Ruby Markdown converter available (September 2014), being about 3x
+faster than [Maruku] and about 4.5x faster than [BlueFeather].
 
 [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/
 [Maruku]: http://maruku.rubyforge.org

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<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>The latest version of kramdown is <span class="inline-important">1.4.2</span> and it was released
+on <span class="inline-important">2014-09-16</span></p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/doc/tests.page

@@ -33,73 +33,72 @@ kramdown comes with a small benchmark to test how fast it is in regard to four o
 implementations: Maruku, BlueFeather, BlueCloth, RDiscount and Redcarpet. The first two are written
 using only Ruby, the latter three are written in C and need to be compiled.
 
-As one can see below, kramdown is currently (January 2014) ~2.5x faster than Maruku, ~4-6x faster
-than BlueFeather but ~30x slower than BlueCloth and RDiscount and ~150x slower than Redcarpet:
+As one can see below, kramdown is currently (September 2014) ~3x faster than Maruku, ~4.5x faster
+than BlueFeather but ~30x slower than RDiscount and ~150x slower than Redcarpet:
 
 <pre><code>
-Running tests on 2014-01-05 under ruby 2.0.0p247 (2013-06-27 revision 41674) [x86_64-linux]
+Running tests on 2014-09-16 under ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-linux]
 
 Test using file mdsyntax.text and 20 runs
 Rehearsal ----------------------------------------------------
-kramdown 1.3.0     1.090000   0.020000   1.110000 (  1.102094)
-Maruku 0.7.0       3.140000   0.010000   3.150000 (  3.151116)
-BlueFeather 0.41   5.140000   0.000000   5.140000 (  5.136591)
-BlueCloth 2.2.0    0.050000   0.000000   0.050000 (  0.057502)
-RDiscount 2.0.7    0.020000   0.000000   0.020000 (  0.015115)
-redcarpet 3.0.0    0.000000   0.000000   0.000000 (  0.004641)
-------------------------------------------- total: 9.470000sec
+kramdown 1.4.2     0.900000   0.010000   0.910000 (  0.914992)
+Maruku 0.7.1       2.360000   0.040000   2.400000 (  2.403571)
+BlueFeather 0.41   3.760000   0.010000   3.770000 (  3.776421)
+BlueCloth 2.2.0    0.050000   0.000000   0.050000 (  0.050221)
+RDiscount 2.1.7    0.020000   0.000000   0.020000 (  0.024180)
+redcarpet 3.1.2    0.010000   0.000000   0.010000 (  0.004579)
+------------------------------------------- total: 7.160000sec
 
                        user     system      total        real
-kramdown 1.3.0     1.200000   0.000000   1.200000 (  1.199684)
-Maruku 0.7.0       3.010000   0.040000   3.050000 (  3.043411)
-BlueFeather 0.41   5.720000   0.000000   5.720000 (  5.723845)
-BlueCloth 2.2.0    0.040000   0.000000   0.040000 (  0.040749)
-RDiscount 2.0.7    0.020000   0.000000   0.020000 (  0.017600)
-redcarpet 3.0.0    0.000000   0.000000   0.000000 (  0.004822)
+kramdown 1.4.2     0.830000   0.000000   0.830000 (  0.834144)
+Maruku 0.7.1       2.250000   0.030000   2.280000 (  2.286579)
+BlueFeather 0.41   3.680000   0.010000   3.690000 (  3.693769)
+BlueCloth 2.2.0    0.050000   0.000000   0.050000 (  0.044831)
+RDiscount 2.1.7    0.020000   0.000000   0.020000 (  0.022847)
+redcarpet 3.1.2    0.010000   0.000000   0.010000 (  0.004601)
 
 Real time of X divided by real time of kramdown
-Maruku             2.5368
-BlueFeather        4.7711
-BlueCloth          0.034
-RDiscount          0.0147
-redcarpet          0.004
+Maruku             2.7412
+BlueFeather        4.4282
+BlueCloth          0.0537
+RDiscount          0.0274
+redcarpet          0.0055
 
 Test using file mdbasics.text and 20 runs
 Rehearsal ----------------------------------------------------
-kramdown 1.3.0     0.220000   0.000000   0.220000 (  0.217277)
-Maruku 0.7.0       0.850000   0.000000   0.850000 (  0.847144)
-BlueFeather 0.41   1.290000   0.010000   1.300000 (  1.291695)
-BlueCloth 2.2.0    0.010000   0.000000   0.010000 (  0.012484)
-RDiscount 2.0.7    0.000000   0.000000   0.000000 (  0.004158)
-redcarpet 3.0.0    0.000000   0.000000   0.000000 (  0.001721)
-------------------------------------------- total: 2.380000sec
+kramdown 1.4.2     0.150000   0.000000   0.150000 (  0.149989)
+Maruku 0.7.1       0.580000   0.010000   0.590000 (  0.584910)
+BlueFeather 0.41   0.780000   0.000000   0.780000 (  0.788740)
+BlueCloth 2.2.0    0.020000   0.000000   0.020000 (  0.014700)
+RDiscount 2.1.7    0.000000   0.000000   0.000000 (  0.007692)
+redcarpet 3.1.2    0.010000   0.000000   0.010000 (  0.002064)
+------------------------------------------- total: 1.550000sec
 
                        user     system      total        real
-kramdown 1.3.0     0.210000   0.000000   0.210000 (  0.215760)
-Maruku 0.7.0       0.590000   0.000000   0.590000 (  0.591681)
-BlueFeather 0.41   1.360000   0.000000   1.360000 (  1.362281)
-BlueCloth 2.2.0    0.010000   0.000000   0.010000 (  0.013973)
-RDiscount 2.0.7    0.010000   0.000000   0.010000 (  0.005797)
-redcarpet 3.0.0    0.000000   0.000000   0.000000 (  0.001692)
+kramdown 1.4.2     0.150000   0.000000   0.150000 (  0.151586)
+Maruku 0.7.1       0.520000   0.000000   0.520000 (  0.525707)
+BlueFeather 0.41   0.770000   0.010000   0.780000 (  0.763559)
+BlueCloth 2.2.0    0.020000   0.000000   0.020000 (  0.015509)
+RDiscount 2.1.7    0.010000   0.000000   0.010000 (  0.006545)
+redcarpet 3.1.2    0.000000   0.000000   0.000000 (  0.001475)
 
 Real time of X divided by real time of kramdown
-Maruku             2.7423
-BlueFeather        6.3139
-BlueCloth          0.0648
-RDiscount          0.0269
-redcarpet          0.0078
+Maruku             3.468
+BlueFeather        5.0371
+BlueCloth          0.1023
+RDiscount          0.0432
+redcarpet          0.0097
 </code></pre>
 
 And here are some graphs which show the execution times of the various kramdown releases on
 different Ruby interpreters:
 
 ![ruby 1.8.7p302]({relocatable: img/graph-ruby-1.8.7-302.png})
-![ruby 1.9.2p320]({relocatable: img/graph-ruby-1.9.2p320-320.png})
 ![ruby 1.9.3p448]({relocatable: img/graph-ruby-1.9.3p448-448.png})
 ![ruby 2.0.0p247]({relocatable: img/graph-ruby-2.0.0p247-247.png})
-![ruby 2.1.0p0]({relocatable: img/graph-ruby-2.1.0p0-0.png})
-![jruby 1.7.3]({relocatable: img/graph-jruby-1.7.3-385.png})
-![rubinius 2.0.0]({relocatable: img/graph-rubinius-2.0.0-0.png})
+![ruby 2.1.2p95]({relocatable: img/graph-ruby-2.1.2p95-95.png})
+![jruby 1.7.15]({relocatable: img/graph-jruby-1.7.15-392.png})
+![rubinius 2.2.10]({relocatable: img/graph-rubinius-2.2.10-0.png})
 
 [Markdown Test Suite]: http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip
 [MDTest]: http://www.michelf.com/docs/projets/mdtest-1.0.zip

data/lib/kramdown/converter/html.rb

@@ -430,10 +430,11 @@ module Kramdown
       def footnote_content
         ol = Element.new(:ol)
         ol.attr['start'] = @footnote_start if @footnote_start != 1
-        @footnotes.each do |name, data, _, repeat|
+        i = 0
+        while i < @footnotes.length
+          name, data, _, repeat = *@footnotes[i]
           li = Element.new(:li, nil, {'id' => "fn:#{name}"})
           li.children = Marshal.load(Marshal.dump(data.children))
-          ol.children << li
 
           if li.children.last.type == :p
             para = li.children.last
@@ -447,6 +448,9 @@ module Kramdown
           (1..repeat).each do |index|
             para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [" ", "#{name}:#{index}", "&#8617;<sup>#{index+1}</sup>"])
           end
+
+          ol.children << Element.new(:raw, convert(li, 4))
+          i += 1
         end
         (ol.children.empty? ? '' : format_as_indented_block_html('div', {:class => "footnotes"}, convert(ol, 2), 0))
       end

data/lib/kramdown/converter/kramdown.rb

@@ -105,6 +105,7 @@ module Kramdown
       def convert_header(el, opts)
         res = ''
         res << "#{'#' * output_header_level(el.options[:level])} #{inner(el, opts)}"
+        res[-1, 1] = "\\#" if res[-1] == ?#
         res << "   {##{el.attr['id']}}" if el.attr['id'] && !el.attr['id'].strip.empty?
         res << "\n"
       end

data/lib/kramdown/converter/latex.rb

@@ -32,8 +32,6 @@ module Kramdown
       # Initialize the LaTeX converter with the +root+ element and the conversion +options+.
       def initialize(root, options)
         super
-        #TODO: set the footnote counter at the beginning of the document
-        @options[:footnote_nr]
         @data[:packages] = Set.new
       end
 

data/lib/kramdown/parser/base.rb

@@ -97,10 +97,11 @@ module Kramdown
       # This helper method adds the given +text+ either to the last element in the +tree+ if it is a
       # +type+ element or creates a new text element with the given +type+.
       def add_text(text, tree = @tree, type = @text_type)
-        if tree.children.last && tree.children.last.type == type
-          tree.children.last.value << text
+        last = tree.children.last
+        if last && last.type == type
+          last.value << text
         elsif !text.empty?
-          tree.children << Element.new(type, text)
+          tree.children << Element.new(type, text, nil, :location => (last && last.options[:location] || tree.options[:location]))
         end
       end
 

data/lib/kramdown/parser/gfm.rb

@@ -8,7 +8,7 @@ module Kramdown
 
       def initialize(source, options)
         super
-        @span_parsers.delete(:line_break)
+        @span_parsers.delete(:line_break) if @options[:hard_wrap]
         {:codeblock_fenced => :codeblock_fenced_gfm,
           :atx_header => :atx_header_gfm}.each do |current, replacement|
           i = @block_parsers.index(current)

data/lib/kramdown/parser/html.rb

@@ -34,11 +34,11 @@ module Kramdown
         HTML_ENTITY_RE = /&([\w:][\-\w\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
 
         HTML_CONTENT_MODEL_BLOCK = %w{address applet article aside button blockquote body
-             dd div dl fieldset figure figcaption footer form header hgroup iframe li map menu nav
-              noscript object section td}
+             dd details div dl fieldset figure figcaption footer form header hgroup iframe li map menu nav
+              noscript object section summary td}
         HTML_CONTENT_MODEL_SPAN  = %w{a abbr acronym b bdo big button cite caption del dfn dt em
              h1 h2 h3 h4 h5 h6 i ins label legend optgroup p q rb rbc
-             rp rt rtc ruby select small span strong sub sup summary th tt}
+             rp rt rtc ruby select small span strong sub sup th tt}
         HTML_CONTENT_MODEL_RAW   = %w{script style math option textarea pre code kbd samp var}
         # The following elements are also parsed as raw since they need child elements that cannot
         # be expressed using kramdown syntax: colgroup table tbody thead tfoot tr ul ol

data/lib/kramdown/parser/kramdown.rb

@@ -89,7 +89,7 @@ module Kramdown
         parse_blocks(@root, adapt_source(source))
         update_tree(@root)
         replace_abbreviations(@root)
-        @footnotes.each {|name,data| update_tree(data[:marker].last.value) if data[:marker]}
+        @footnotes.each {|name,data| update_tree(data[:content])}
       end
 
       #######

data/lib/kramdown/parser/kramdown/abbreviation.rb

@@ -38,16 +38,20 @@ module Kramdown
           if child.type == :text
             if child.value =~ regexps.first
               result = []
-              strscan = Kramdown::Utils::StringScanner.new(child.value)
+              strscan = Kramdown::Utils::StringScanner.new(child.value, child.options[:location])
+              text_lineno = strscan.current_line_number
               while temp = strscan.scan_until(regexps.last)
+                abbr_lineno = strscan.current_line_number
                 abbr = strscan.scan(regexps.first) # begin of line case of abbr with \W char as first one
                 if abbr.nil?
                   temp << strscan.scan(/\W|^/)
                   abbr = strscan.scan(regexps.first)
                 end
-                result << Element.new(:text, temp) << Element.new(:abbreviation, abbr)
+                result << Element.new(:text, temp, nil, :location => text_lineno)
+                result << Element.new(:abbreviation, abbr, nil, :location => abbr_lineno)
+                text_lineno = strscan.current_line_number
               end
-              result << Element.new(:text, strscan.rest)
+              result << Element.new(:text, strscan.rest, nil, :location => text_lineno)
             else
               child
             end

data/lib/kramdown/parser/kramdown/codespan.rb

@@ -18,7 +18,7 @@ module Kramdown
         start_line_number = @src.current_line_number
         result = @src.scan(CODESPAN_DELIMITER)
         simple = (result.length == 1)
-        reset_pos = @src.pos
+        saved_pos = @src.save_pos
 
         if simple && @src.pre_match =~ /\s\Z/ && @src.match?(/\s/)
           add_text(result)
@@ -33,7 +33,7 @@ module Kramdown
           end
           @tree.children << Element.new(:codespan, text, nil, :location => start_line_number)
         else
-          @src.pos = reset_pos
+          @src.revert_pos(saved_pos)
           add_text(result)
         end
       end

data/lib/kramdown/parser/kramdown/emphasis.rb

@@ -16,10 +16,11 @@ module Kramdown
       # Parse the emphasis at the current location.
       def parse_emphasis
         start_line_number = @src.current_line_number
+        saved_pos = @src.save_pos
+
         result = @src.scan(EMPHASIS_START)
         element = (result.length == 2 ? :strong : :em)
         type = result[0..0]
-        reset_pos = @src.pos
 
         if (type == '_' && @src.pre_match =~ /[[:alnum:]]\z/ && @src.check(/[[:alnum:]]/)) || @src.check(/\s/) ||
             @tree.type == element || @stack.any? {|el, _| el.type == element}
@@ -40,14 +41,16 @@ module Kramdown
 
         found, el, stop_re = sub_parse.call(result, element)
         if !found && element == :strong && @tree.type != :em
-          @src.pos = reset_pos - 1
+          @src.revert_pos(saved_pos)
+          @src.pos += 1
           found, el, stop_re = sub_parse.call(type, :em)
         end
         if found
           @src.scan(stop_re)
           @tree.children << el
         else
-          @src.pos = reset_pos
+          @src.revert_pos(saved_pos)
+          @src.pos += result.length
           add_text(result)
         end
       end

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

@@ -54,13 +54,13 @@ module Kramdown
       # Parse the generic extension at the current point. The parameter +type+ can either be :block
       # or :span depending whether we parse a block or span extension tag.
       def parse_extension_start_tag(type)
-        orig_pos = @src.pos
+        saved_pos = @src.save_pos
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
 
         error_block = lambda do |msg|
           warning(msg)
-          @src.pos = orig_pos
+          @src.revert_pos(saved_pos)
           add_text(@src.getch) if type == :span
           false
         end
@@ -85,20 +85,20 @@ module Kramdown
           end
         end
 
-        if !handle_extension(ext, opts, body, type)
+        if !handle_extension(ext, opts, body, type, start_line_number)
           error_block.call("Invalid extension with name '#{ext}' specified on line #{start_line_number} - ignoring it")
         else
           true
         end
       end
 
-      def handle_extension(name, opts, body, type)
+      def handle_extension(name, opts, body, type, line_no = nil)
         case name
         when 'comment'
-          @tree.children << Element.new(:comment, body, nil, :category => type) if body.kind_of?(String)
+          @tree.children << Element.new(:comment, body, nil, :category => type, :location => line_no) if body.kind_of?(String)
           true
         when 'nomarkdown'
-          @tree.children << Element.new(:raw, body, nil, :category => type, :type => opts['type'].to_s.split(/\s+/)) if body.kind_of?(String)
+          @tree.children << Element.new(:raw, body, nil, :category => type, :location => line_no, :type => opts['type'].to_s.split(/\s+/)) if body.kind_of?(String)
           true
         when 'options'
           opts.select do |k,v|

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

@@ -26,7 +26,7 @@ module Kramdown
         parse_blocks(el, @src[2].gsub(INDENT, ''))
         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)
+        @tree.children << Element.new(:eob, :footnote_def)
         true
       end
       define_parser(:footnote_definition, FOOTNOTE_DEFINITION_START)

data/lib/kramdown/parser/kramdown/header.rb

@@ -34,7 +34,7 @@ module Kramdown
 
 
       ATX_HEADER_START = /^\#{1,6}/
-      ATX_HEADER_MATCH = /^(\#{1,6})(.+?)\s*?#*#{HEADER_ID}\s*?\n/
+      ATX_HEADER_MATCH = /^(\#{1,6})(.+?(?:\\#)?)\s*?#*#{HEADER_ID}\s*?\n/
 
       # Parse the Atx header at the current location.
       def parse_atx_header

data/lib/kramdown/parser/kramdown/line_break.rb

@@ -15,8 +15,8 @@ module Kramdown
 
       # Parse the line break at the current location.
       def parse_line_break
+        @tree.children << Element.new(:br, nil, nil, :location => @src.current_line_number)
         @src.pos += @src.matched_size
-        @tree.children << Element.new(:br)
       end
       define_parser(:line_break, LINE_BREAK, '(  |\\\\)(?=\n)')
 

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

@@ -57,7 +57,8 @@ module Kramdown
       def parse_link
         start_line_number = @src.current_line_number
         result = @src.scan(LINK_START)
-        reset_pos = @src.pos
+        cur_pos = @src.pos
+        saved_pos = @src.save_pos
 
         link_type = (result =~ /^!/ ? :img : :a)
 
@@ -74,11 +75,11 @@ module Kramdown
           count - el.children.select {|c| c.type == :img}.size == 0
         end
         if !found || (link_type == :a && el.children.empty?)
-          @src.pos = reset_pos
+          @src.revert_pos(saved_pos)
           add_text(result)
           return
         end
-        alt_text = extract_string(reset_pos...@src.pos, @src).gsub(ESCAPED_CHARS, '\1')
+        alt_text = extract_string(cur_pos...@src.pos, @src).gsub(ESCAPED_CHARS, '\1')
         @src.scan(LINK_BRACKET_STOP_RE)
 
         # reference style link or no link url
@@ -88,7 +89,7 @@ module Kramdown
             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 on line #{start_line_number}")
-            @src.pos = reset_pos
+            @src.revert_pos(saved_pos)
             add_text(result)
           end
           return
@@ -127,7 +128,7 @@ module Kramdown
         if @src.scan(LINK_INLINE_TITLE_RE)
           add_link(el, link_url, @src[2], alt_text)
         else
-          @src.pos = reset_pos
+          @src.revert_pos(saved_pos)
           add_text(result)
         end
       end

data/lib/kramdown/parser/kramdown/math.rb

@@ -25,14 +25,14 @@ module Kramdown
           return false
         end
 
-        orig_pos = @src.pos
+        saved_pos = @src.save_pos
         @src.pos += @src.matched_size
         data = @src[2]
         if before_block_boundary?
           @tree.children << new_block_el(:math, data, nil, :category => :block, :location => start_line_number)
           true
         else
-          @src.pos = orig_pos
+          @src.revert_pos(saved_pos)
           false
         end
       end

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

@@ -40,7 +40,7 @@ module Kramdown
         else
           @tree.children << new_block_el(:p, nil, nil, :location => start_line_number)
           result.lstrip!
-          @tree.children.last.children << Element.new(@text_type, result)
+          add_text(result, @tree.children.last)
         end
         true
       end

data/lib/kramdown/parser/kramdown/smart_quotes.rb

@@ -156,13 +156,14 @@ module Kramdown
 
       # Parse the smart quotes at current location.
       def parse_smart_quotes
+        start_line_number = @src.current_line_number
         substs = SQ_RULES.find {|reg, subst| @src.scan(reg)}[1]
         substs.each do |subst|
           if subst.kind_of?(Integer)
             add_text(@src[subst])
           else
             val = SQ_SUBSTS[[subst, @src[subst.to_s[-1,1].to_i]]] || subst
-            @tree.children << Element.new(:smart_quote, val)
+            @tree.children << Element.new(:smart_quote, val, nil, :location => start_line_number)
           end
         end
       end

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

@@ -25,6 +25,7 @@ module Kramdown
       def parse_table
         return false if !after_block_boundary?
 
+        saved_pos = @src.save_pos
         orig_pos = @src.pos
         table = new_block_el(:table, nil, nil, :alignment => [], :location => @src.current_line_number)
         leading_pipe = (@src.check(TABLE_LINE) =~ /^\s*\|/)
@@ -104,7 +105,7 @@ module Kramdown
         end
 
         if !before_block_boundary?
-          @src.pos = orig_pos
+          @src.revert_pos(saved_pos)
           return false
         end
 
@@ -135,13 +136,13 @@ module Kramdown
             pipe_on_line = (lines.size > 1 ? false : pipe_on_line) || (lines.last =~ /^#{TABLE_PIPE_CHECK}/)
           end
         end
-        @src.pos = orig_pos and return false if !pipe_on_line
+        @src.revert_pos(saved_pos) and return false if !pipe_on_line
 
         add_container.call(has_footer ? :tfoot : :tbody, false) if !rows.empty?
 
         if !table.children.any? {|el| el.type == :tbody}
           warning("Found table without body on line #{table.options[:location]} - ignoring it")
-          @src.pos = orig_pos
+          @src.revert_pos(saved_pos)
           return false
         end
 

data/lib/kramdown/utils/string_scanner.rb

@@ -23,29 +23,32 @@ module Kramdown
         @previous_line_number = @start_line_number
       end
 
-      # To make this unicode (multibyte) aware, we have to use #charpos which was added in Ruby
-      # version 2.0.0.
-      #
-      # This method will work with older versions of Ruby, however it will report incorrect line
-      # numbers if the scanned string contains multibyte characters.
-      if instance_methods.include?(:charpos)
-        def best_pos
-          charpos
-        end
-      else
-        def best_pos
-          pos
-        end
-      end
-
       # Sets the byte position of the scan pointer.
       #
       # Note: This also resets some internal variables, so always use pos= when setting the position
       # and don't use any other method for that!
       def pos=(pos)
+        if self.pos > pos
+          @previous_line_number = @start_line_number
+          @previous_pos = 0
+        end
         super
-        @previous_line_number = @start_line_number
-        @previous_pos = 0
+      end
+
+      # Return information needed to revert the byte position of the string scanner in a performant
+      # way.
+      #
+      # The returned data can be fed to #revert_pos to revert the position to the saved one.
+      #
+      # Note: Just saving #pos won't be enough.
+      def save_pos
+        [pos, @previous_pos, @previous_line_number]
+      end
+
+      # Revert the position to one saved by #save_pos.
+      def revert_pos(data)
+        self.pos = data[0]
+        @previous_pos, @previous_line_number = data[1], data[2]
       end
 
       # Returns the line number for current charpos.
@@ -61,7 +64,7 @@ module Kramdown
         old_pos = pos + 1
         @previous_line_number += 1 while strscan.skip_until(/\n/) && strscan.pos <= old_pos
 
-        @previous_pos = (eos? ? best_pos : best_pos + 1)
+        @previous_pos = (eos? ? pos : pos + 1)
         @previous_line_number
       end
 

data/lib/kramdown/version.rb

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

data/test/test_location.rb

@@ -151,6 +151,16 @@ describe 'location' do
       * {:.line-5} * {:.line-5} one
         * {:.line-6} two
     ),
+    'gh issue 158' => %(
+      😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁😁
+      {:.line-1}
+
+      - {:.line-4} T
+      {:.line-4}
+
+      # T
+      {:.line-7}
+    ),
   }
   test_cases.each do |name, test_string|
     it "Handles #{ name }" do
@@ -169,4 +179,28 @@ describe 'location' do
     doc.warnings.must_equal ["Duplicate abbreviation ID 'duplicate' on line 4 - overwriting"]
   end
 
+  it 'handles abbreviations' do
+    str = "This *is* ABC and\n**and** ABC second\nanother ABC\nas ABC as\nABC at the end.\n\n*[ABC]: ABC"
+    doc = Kramdown::Document.new(str)
+    doc.root.children.first.children.select {|e| e.type == :abbreviation}.each_with_index do |e, i|
+      assert_equal(i + 1, e.options[:location])
+    end
+  end
+
+  it 'handles line breaks' do
+    str = "First  \nsecond\\\\\nthird  \n"
+    doc = Kramdown::Document.new(str)
+    doc.root.children.first.children.select {|e| e.type == :br}.each_with_index do |e, i|
+      assert_equal(i + 1, e.options[:location])
+    end
+  end
+
+  it 'handles smart quotes' do
+    str = "This is 'first'\nand 'second' and\n'third'"
+    doc = Kramdown::Document.new(str)
+    doc.root.children.first.children.select {|e| e.type == :smart_quote}.each_with_index do |e, i|
+      assert_equal(((i + 1) /2.0).ceil, e.options[:location])
+    end
+  end
+
 end

data/test/testcases/block/04_header/atx_header.html

@@ -26,6 +26,8 @@
 ### not a header</p>
 </blockquote>
 
+<h1>header #</h1>
+
 <h1>header</h1>
 
 <p># </p>

data/test/testcases/block/04_header/atx_header.text

@@ -23,6 +23,7 @@ paragraph
 > blockquote
 ### not a header
 
+# header \#
 
 # header
 

data/test/testcases/span/04_footnote/inside_footnote.html

@@ -0,0 +1,17 @@
+<p>Lorem ipsum<sup id="fnref:first"><a href="#fn:first" class="footnote">1</a></sup> dolor sit amet.</p>
+
+<p>Lorem ipsum<sup id="fnref:second"><a href="#fn:second" class="footnote">2</a></sup> dolor sit amet.</p>
+
+<div class="footnotes">
+  <ol>
+    <li id="fn:first">
+      <p>Consecutur adisping.<sup id="fnref:third"><a href="#fn:third" class="footnote">3</a></sup> <a href="#fnref:first" class="reversefootnote">&#8617;</a></p>
+    </li>
+    <li id="fn:second">
+      <p>Sed ut perspiciatis unde omnis. <a href="#fnref:second" class="reversefootnote">&#8617;</a></p>
+    </li>
+    <li id="fn:third">
+      <p>Sed ut. <a href="#fnref:third" class="reversefootnote">&#8617;</a></p>
+    </li>
+  </ol>
+</div>

data/test/testcases/span/04_footnote/inside_footnote.text

@@ -0,0 +1,9 @@
+Lorem ipsum[^first] dolor sit amet.
+
+Lorem ipsum[^second] dolor sit amet.
+
+[^first]: Consecutur adisping.[^third]
+
+[^second]: Sed ut perspiciatis unde omnis.
+
+[^third]: Sed ut.

data/test/testcases_gfm/hard_line_breaks_off.html

@@ -1,2 +1,2 @@
-<p>This is just a normal paragraph.
-Containing a line break.</p>
+<p>This is just a normal paragraph.<br />
+Containing a manual line break above.</p>

data/test/testcases_gfm/hard_line_breaks_off.text

@@ -1,2 +1,2 @@
-This is just a normal paragraph.
-Containing a line break.
+This is just a normal paragraph.  
+Containing a manual line break above.

data/test/testcases_gfm/two_para_hard_line_breaks.html

@@ -1,4 +1,4 @@
-<p>This is just a normal paragraph.<br />
+<p>This is just a normal paragraph.  <br />
 Containing a line break.</p>
 
 <p>Another paragraph.</p>

data/test/testcases_gfm/two_para_hard_line_breaks.text

@@ -1,4 +1,4 @@
-This is just a normal paragraph.
+This is just a normal paragraph.  
 Containing a line break.
 
 Another paragraph.

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 description: |
@@ -75,14 +75,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
-- setup.rb
+- AUTHORS
+- CONTRIBUTERS
 - COPYING
 - README.md
-- AUTHORS
+- Rakefile
 - VERSION
-- CONTRIBUTERS
-- bin/kramdown
 - benchmark/benchmark.rb
 - benchmark/benchmark.sh
 - benchmark/generate_data.rb
@@ -90,6 +88,27 @@ files:
 - benchmark/mdsyntax.text
 - benchmark/testing.sh
 - benchmark/timing.sh
+- bin/kramdown
+- data/kramdown/document.html
+- data/kramdown/document.latex
+- doc/_design.scss
+- doc/bg.png
+- doc/default.scss
+- doc/default.template
+- doc/documentation.page
+- doc/documentation.template
+- doc/index.page
+- doc/installation.page
+- doc/links.markdown
+- doc/metainfo
+- doc/news.feed
+- doc/news.page
+- doc/options.page
+- doc/quickref.page
+- doc/sidebar.template
+- doc/syntax.page
+- doc/tests.page
+- doc/virtual
 - lib/kramdown.rb
 - lib/kramdown/compatibility.rb
 - lib/kramdown/converter.rb
@@ -142,26 +161,7 @@ files:
 - lib/kramdown/utils/unidecoder.rb
 - lib/kramdown/version.rb
 - man/man1/kramdown.1
-- data/kramdown/document.html
-- data/kramdown/document.latex
-- doc/_design.scss
-- doc/bg.png
-- doc/default.scss
-- doc/default.template
-- doc/documentation.page
-- doc/documentation.template
-- doc/index.page
-- doc/installation.page
-- doc/links.markdown
-- doc/metainfo
-- doc/news.feed
-- doc/news.page
-- doc/options.page
-- doc/quickref.page
-- doc/sidebar.template
-- doc/syntax.page
-- doc/tests.page
-- doc/virtual
+- setup.rb
 - test/run_tests.rb
 - test/test_files.rb
 - test/test_location.rb
@@ -470,6 +470,8 @@ files:
 - test/testcases/span/04_footnote/footnote_nr.latex
 - test/testcases/span/04_footnote/footnote_nr.options
 - test/testcases/span/04_footnote/footnote_nr.text
+- test/testcases/span/04_footnote/inside_footnote.html
+- test/testcases/span/04_footnote/inside_footnote.text
 - test/testcases/span/04_footnote/markers.html
 - test/testcases/span/04_footnote/markers.latex
 - test/testcases/span/04_footnote/markers.text
@@ -551,23 +553,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - lib/kramdown/document.rb
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: kramdown is a fast, pure-Ruby Markdown-superset converter.