kramdown 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28967ed8b0da11707a43ff1e7e92eb844d472fd0
-  data.tar.gz: dcf6f6dcf3f06e7bbf0c6fe90f326e380466b29b
+  metadata.gz: 0fd1d5abb103643686848dd667d1e3106c4f5bcc
+  data.tar.gz: 6e14c9a736721e2bb5aab181d6c11f861f9edf83
 SHA512:
-  metadata.gz: 4736e9a72ae7c194704ea5e7870e0bee43161794d2f71c071df0def49933578e02fabd72c4c02ba80b70f045fce748cb494c83a40ff915511bd7c8a39036a6d5
-  data.tar.gz: 86304867c51dcaa09e446701d88d975cdfada7d998d6051bd2479defda8d8ef1c0d9c2f3b74f3fce0ee17832e8d6785574a694f39fe063e6347ceeb24c245cf4
+  metadata.gz: 5c6b26d0390aa2a2afdfad39cfcfadd782cc04c7e5c6d4ef00f5ccd66c78108b3271675adfd63c7182482024f6a817e104c7e4added160e895dd52d515a7d69f
+  data.tar.gz: bc3c786078e444d72d27985cd349b74e69b523d3419bd9bd78ac24ca0766a7a8275efaa52e99b425c45f4675b5963e2bdbaa408b5682fa6066c0e4a86491765f

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    763 Thomas Leitner <t_leitner@gmx.at>
+    772 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.7.0
+1.8.0

data/doc/index.page

@@ -97,8 +97,8 @@ extensions that have been made popular by the [PHP Markdown Extra] package and [
 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].
 
-Version **1.7.0**{:itemprop="softwareVersion"} released on
-**2015-04-27**{:itemprop="datePublished"}, [more news](news.html)
+Version **1.8.0**{:itemprop="softwareVersion"} released on
+**2015-07-04**{:itemprop="datePublished"}, [more news](news.html)
 {: style="text-align: center; font-size: 80%"}
 
 </div>

data/doc/installation.page

@@ -26,17 +26,14 @@ See the platform specific installation notes for more information!
 ### Linux
 
 There are a variety of Linux distributions out there with different package management systems. So
-we will focus on instructions for Ubuntu 9.04 here (which should probably also work for any newer
+we will focus on instructions for Ubuntu 15.04 here (which should probably also work for any newer
 Ubuntu version or any recent Debian based distribution).
 
 After running the following commands, kramdown is installed and ready to use:
 
-    sudo aptitude install ruby rubygems
+    sudo apt-get install ruby
     sudo gem install kramdown
 
-> You will also need to add `export PATH=$PATH:/var/lib/gems/1.9/bin` to your `~/.bashrc` because
-> this is the binary path the executable files get installed to.
-
 
 ### Mac OS X
 

data/lib/kramdown/converter/html.rb

@@ -330,7 +330,7 @@ module Kramdown
       def convert_root(el, indent)
         result = inner(el, indent)
         if @footnote_location
-          result.sub!(/#{@footnote_location}/, footnote_content)
+          result.sub!(/#{@footnote_location}/, footnote_content.gsub(/\\/, "\\\\\\\\"))
         else
           result << footnote_content
         end
@@ -341,7 +341,7 @@ module Kramdown
                  else
                    ''
                  end
-          result.sub!(/#{@toc_code.last}/, text)
+          result.sub!(/#{@toc_code.last}/, text.gsub(/\\/, "\\\\\\\\"))
         end
         result
       end
@@ -430,6 +430,7 @@ module Kramdown
         ol = Element.new(:ol)
         ol.attr['start'] = @footnote_start if @footnote_start != 1
         i = 0
+        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}"})
@@ -443,9 +444,9 @@ module Kramdown
             insert_space = false
           end
 
-          para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [insert_space ? ' ' : '', name, "&#8617;"])
+          para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [insert_space ? ' ' : '', name, backlink_text])
           (1..repeat).each do |index|
-            para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [" ", "#{name}:#{index}", "&#8617;<sup>#{index+1}</sup>"])
+            para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [" ", "#{name}:#{index}", "#{backlink_text}<sup>#{index+1}</sup>"])
           end
 
           ol.children << Element.new(:raw, convert(li, 4))

data/lib/kramdown/converter/latex.rb

@@ -237,7 +237,7 @@ module Kramdown
           @data[:packages] << 'minted'
           "#{latex_link_target(el)}#{highlighted_code}"
         else
-          "{\\tt #{latex_link_target(el)}#{escape(el.value)}}"
+          "\\texttt{#{latex_link_target(el)}#{escape(el.value)}}"
         end
       end
 

data/lib/kramdown/options.rb

@@ -580,6 +580,16 @@ EOF
       val
     end
 
+    define(:footnote_backlink, String, '&#8617;', <<EOF)
+Defines the text that should be used for the footnote backlinks
+
+The footnote backlink is just text, so any special HTML characters will
+be escaped.
+
+Default: '&8617;'
+Used by: HTML converter
+EOF
+
   end
 
 end

data/lib/kramdown/parser/html.rb

@@ -86,7 +86,6 @@ module Kramdown
           @tree.children << el
 
           if !closed && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
-            warning("The HTML tag '#{el.value}' on line #{line} cannot have any content - auto-closing it")
             closed = true
           end
           if name == 'script' || name == 'style'

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

@@ -11,7 +11,7 @@ module Kramdown
   module Parser
     class Kramdown
 
-      BLANK_LINE = /(?:^\s*\n)+/
+      BLANK_LINE = /(?>^\s*\n)+/
 
       # Parse the blank line at the current postition.
       def parse_blank_line

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

@@ -140,9 +140,7 @@ module Kramdown
                            :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}' on line #{line} cannot have any content - auto-closing it")
-          elsif !@src[4]
+          if !@src[4] && !HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
             if parse_spans(el, stop_re, (do_parsing ? nil : [:span_html]))
               @src.scan(stop_re)
             else

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

@@ -123,7 +123,7 @@ module Kramdown
 
       SQ_RULES = [
                   [/("|')(?=[_*]{1,2}\S)/, [:lquote1]],
-                  [/("|')(?=#{SQ_PUNCT}\B)/, [:rquote1]],
+                  [/("|')(?=#{SQ_PUNCT}(?!\.\.)\B)/, [:rquote1]],
                   # Special case for double sets of quotes, e.g.:
                   #   <p>He said, "'Quoted' words in a larger quote."</p>
                   [/(\s?)"'(?=\w)/, [1, :ldquo, :lsquo]],

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

@@ -45,8 +45,10 @@ module Kramdown
 
         while !@src.eos?
           break if !@src.check(TABLE_LINE)
-          if @src.scan(TABLE_SEP_LINE) && !rows.empty?
-            if table.options[:alignment].empty? && !has_footer
+          if @src.scan(TABLE_SEP_LINE)
+            if rows.empty?
+              # nothing to do, ignoring multiple consecutive separator lines
+            elsif table.options[:alignment].empty? && !has_footer
               add_container.call(:thead, false)
               table.options[:alignment] = @src[1].scan(TABLE_HSEP_ALIGN).map do |left, right|
                 (left.empty? && right.empty? && :default) || (right.empty? && :left) || (left.empty? && :right) || :center

data/lib/kramdown/version.rb

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

data/man/man1/kramdown.1

@@ -181,6 +181,18 @@ Default: :as_char
 Used by: HTML converter, kramdown converter
 
 
+.TP
+.B \-\-footnote-backlink ARG
+
+Defines the text that should be used for the footnote backlinks
+
+The footnote backlink is just text, so any special HTML characters will
+be escaped.
+
+Default: '&8617;'
+Used by: HTML converter
+
+
 .TP
 .B \-\-footnote-nr ARG
 

data/test/testcases/block/14_table/errors.html

@@ -6,3 +6,7 @@
 
 <p>|no|table|here|
 paragraph</p>
+
+<p>|-|-|
+|-|-|</p>
+

data/test/testcases/block/14_table/errors.text

@@ -7,3 +7,7 @@ No table body
 
 |no|table|here|
 paragraph
+
+|-|-|
+|-|-|
+

data/test/testcases/block/16_toc/toc_levels.html

@@ -1,5 +1,5 @@
 <ul id="markdown-toc">
-  <li><a href="#header-level-2" id="markdown-toc-header-level-2">Header level 2</a>    <ul>
+  <li><a href="#header--level-2" id="markdown-toc-header--level-2">Header \` level 2</a>    <ul>
       <li><a href="#header-level-3" id="markdown-toc-header-level-3">Header level 3</a></li>
     </ul>
   </li>
@@ -11,7 +11,7 @@
 
 <h1 id="header-level-1">Header level 1</h1>
 
-<h2 id="header-level-2">Header level 2</h2>
+<h2 id="header--level-2">Header \` level 2</h2>
 
 <h3 id="header-level-3">Header level 3</h3>
 

data/test/testcases/block/16_toc/toc_levels.text

@@ -3,7 +3,7 @@
 
 # Header level 1
 
-## Header level 2
+## Header \\\` level 2
 
 ### Header level 3
 

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

@@ -0,0 +1,9 @@
+<p>Some footnote here<sup id="fnref:fn"><a href="#fn:fn" class="footnote">1</a></sup></p>
+
+<div class="footnotes">
+  <ol>
+    <li id="fn:fn">
+      <p>Some text here <a href="#fnref:fn" class="reversefootnote">text &8617; &lt;img /&gt;</a></p>
+    </li>
+  </ol>
+</div>

data/test/testcases/span/04_footnote/backlink_text.options

@@ -0,0 +1 @@
+:footnote_backlink: 'text &8617; <img />'

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

@@ -0,0 +1,3 @@
+Some footnote here[^fn]
+
+[^fn]: Some text here

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

@@ -1,7 +1,7 @@
 <div class="footnotes">
   <ol>
     <li id="fn:1">
-      <p>Footnote text <a href="#fnref:1" class="reversefootnote">&#8617;</a></p>
+      <p>Footnote \` text <a href="#fnref:1" class="reversefootnote">&#8617;</a></p>
     </li>
   </ol>
 </div>

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

@@ -3,6 +3,6 @@
 
 Some para with a[^1] footnote.
 
-[^1]: Footnote text
+[^1]: Footnote \\\` text
 
 And another para.

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

@@ -0,0 +1,14 @@
+<h1>Something</h1>
+<p>something<sup id="fnref:note1"><a href="#fn:note1" class="footnote">1</a></sup>.</p>
+
+<h1>Footnotes</h1>
+
+<h1>Test</h1>
+<div class="footnotes">
+  <ol>
+    <li id="fn:note1">
+
+      <p>A note <a href="#fnref:note1" class="reversefootnote">&#8617;</a></p>
+    </li>
+  </ol>
+</div>

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

@@ -0,0 +1,52 @@
+# Something
+something[^note1].
+
+# Footnotes
+[^note1]:
+    A note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Test

data/test/testcases/span/text_substitutions/typography.html

@@ -28,3 +28,11 @@ Mark’s name. “…you”
 <p>&ldquo;<em>Hurrah!</em>&rdquo;</p>
 
 <p>&lsquo;<strong>Absolutely</strong>.&rsquo;</p>
+
+<p>&ldquo;&hellip;some Text&rdquo;</p>
+
+<p>&ldquo;&hellip; some Text&rdquo;</p>
+
+<p>This: &ldquo;&hellip;some Text&rdquo;</p>
+
+<p>This: &ldquo;&hellip; some Text&rdquo;</p>

data/test/testcases/span/text_substitutions/typography.text

@@ -28,3 +28,11 @@ Nam liber tempor
 "_Hurrah!_"
 
 '__Absolutely__.'
+
+"...some Text"
+
+"... some Text"
+
+This: "...some Text"
+
+This: "... some Text"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -563,6 +563,9 @@ files:
 - test/testcases/span/03_codespan/highlighting.text
 - test/testcases/span/03_codespan/normal.html
 - test/testcases/span/03_codespan/normal.text
+- test/testcases/span/04_footnote/backlink_text.html
+- test/testcases/span/04_footnote/backlink_text.options
+- test/testcases/span/04_footnote/backlink_text.text
 - test/testcases/span/04_footnote/definitions.html
 - test/testcases/span/04_footnote/definitions.latex
 - test/testcases/span/04_footnote/definitions.text
@@ -577,6 +580,8 @@ files:
 - test/testcases/span/04_footnote/markers.text
 - test/testcases/span/04_footnote/placement.html
 - test/testcases/span/04_footnote/placement.text
+- test/testcases/span/04_footnote/regexp_problem.html
+- test/testcases/span/04_footnote/regexp_problem.text
 - test/testcases/span/05_html/across_lines.html
 - test/testcases/span/05_html/across_lines.text
 - test/testcases/span/05_html/button.html