kramdown 1.13.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac24860921ac7d24babbeb2397b605667e526e6
-  data.tar.gz: de71ec32ce2b27eb011e80c1dfb24bf1f9e1298b
+  metadata.gz: f25c643525687184c1434ee51de53d28b8237de4
+  data.tar.gz: a9c68da82ab28b9bdacca96b9e514be75074eb95
 SHA512:
-  metadata.gz: 44277038c2e63576e706f7bdd2b9b993822c3fb092d4fcc6d866d9bf67b027c4aa9ddea79ea9ab4ba50e720f5bcda3c00b5dbaefd9f28d32adfee2d51fc1d5c6
-  data.tar.gz: e9e836ae44d96518f45597131b0cfce32eb987f824d5c6fa3ff8e5aa25fe3eadee5d150dfb7171c4f9d4aa6761d906f7619c5975f05800c832b511cfcbeeaf18
+  metadata.gz: 94d832f8a619061f2f640678aad4411bf9551443ccc048bf21e10a2f568488c009598eef54b4898c2cda2ff86cd55db4c9112d9468a8be9ffa2d87d02ad3e6d0
+  data.tar.gz: 4171a7226bf13985a08886f8af41073aad599bb09db839d3c7481b77399106e46048f41240c893a6f79b16053a08545bf890b1373d43517ef181e5faa76ea906

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    829 Thomas Leitner <t_leitner@gmx.at>
+    847 Thomas Leitner <t_leitner@gmx.at>
       6 Gioele Barabucci <gioele@svario.it>
       4 Ted Pak <powerpak006@gmail.com>
       4 Shuanglei Tao <tsl0922@gmail.com>
@@ -17,6 +17,7 @@
       2 Jo Hund <jhund@clearcove.ca>
       2 Bran <m.versum@gmail.com>
       1 winniehell <git@winniehell.de>
+      1 William <suttonwilliamd@gmail.com>
       1 utenmiki <utenmiki@gmail.com>
       1 Trevor Wennblom <trevor@well.com>
       1 tomykaira <tomykaira@gmail.com>
@@ -32,13 +33,16 @@
       1 myqlarson <myqlarson@gmail.com>
       1 Michal Till <michal.till@gmail.com>
       1 Matt Hickford <matt.hickford@gmail.com>
+      1 Martyn Chamberlin <martyn@perfectioncoding.com>
       1 Marek Tuchowski <marek@tuchowski.com.pl>
       1 Marcus Stollsteimer <sto.mar@web.de>
       1 Luca Barbato <luca.barbato@gmail.com>
       1 l3kn <hello@l3kn.de>
+      1 Jonathan Hooper <jonathan.hooper@gsa.gov>
       1 John Croisant <jacius@gmail.com>
       1 Joe Fiorini <joe@faithfulgeek.org>
       1 Jens Kraemer <jk@jkraemer.net>
+      1 Hirofumi Wakasugi <baenej@gmail.com>
       1 Hector Correa <hector@hectorcorrea.com>
       1 Florian Klampfer <f.klampfer@gmail.com>
       1 Floreal Morandat florealm@gmail.com <florealm@gmail.com>

data/README.md

@@ -7,8 +7,8 @@ requests it is now released under the MIT license and therefore can easily be us
 projects, too.
 
 However, if you use kramdown in a commercial setting, please consider **contributing back any
-changes** for the benefit of the community and/or **making a donation** (see the links in the
-sidebar on the [kramdown homepage](http://kramdown.gettalong.org/)!
+changes** for the benefit of the community and/or
+[**becoming a patron**](https://www.patreon.com/gettalong) - thanks!
 
 
 ## Introduction

data/VERSION

@@ -1 +1 @@
-1.13.1
+1.14.0

data/benchmark/benchmark.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ~/.bashrc
+source ~/.profile
 
 RUBY_VERSIONS=`rvm list strings | sort`
 KD_VERSIONS="`git tag | sort -V` master"
@@ -8,7 +8,7 @@ OTHERS=false
 AVERAGE=1
 MASTER_AS=master
 
-while getopts "r:k:o:m:a:" optname; do
+while getopts "r:k:om:a:" optname; do
     case "$optname" in
         "r")
             RUBY_VERSIONS="$OPTARG"
@@ -18,13 +18,13 @@ while getopts "r:k:o:m:a:" optname; do
             ;;
         "o")
             OTHERS=true
-	    ;;
-	"m")
-	    MASTER_AS="$OPTARG"
             ;;
-	"a")
-	    AVERAGE="$OPTARG"
-	    ;;
+        "m")
+            MASTER_AS="$OPTARG"
+            ;;
+        "a")
+            AVERAGE="$OPTARG"
+            ;;
         "?")
             echo "Unknown option $OPTARG"
             exit 1
@@ -50,8 +50,8 @@ git clone .git ${TMPDIR}/kramdown
 cd ${TMPDIR}/kramdown
 
 for RUBY_VERSION in $RUBY_VERSIONS; do
-	rvm $RUBY_VERSION
-	echo "Creating benchmark data for $(ruby -v)"
+  rvm use $RUBY_VERSION
+  echo "Creating benchmark data for $(ruby -v)"
 
     for KD_VERSION in $KD_VERSIONS; do
         echo "Using kramdown version $KD_VERSION"

data/doc/default.scss

@@ -190,3 +190,28 @@ acronym {
     display: block;
     text-align: center;
 }
+
+
+.patreon, .patreon:hover {
+    border-radius: 50px;
+    padding: 5px 10px;
+    margin: 0 5px;
+    display: inline-block;
+    text-decoration: none !important;
+    background-color: #e6461a !important;
+    box-shadow: 0px 0px 5px 5px #e6461a;
+    color: white !important;
+    font-weight: bold;
+
+    &:hover {
+      box-shadow: 0px 0px 0px 5px #e6461a;
+    }
+}
+
+#call-to-arms {
+  text-align: center;
+  margin: 40px 0 10px;
+  background-color: rgba(255, 255, 255, 0.18);
+  padding: 30px;
+  border-radius: 100px;
+}

data/doc/documentation.template

@@ -1,4 +1,8 @@
 --- name:sidebar pipeline:erb,tags,kramdown
+<div style="text-align: right">
+<a href="https://www.patreon.com/bePatron?u=4908963" class="patreon">Become a Patron!</a>
+</div>
+
 <h1>Documentation</h1>
 
 * Parsers

data/doc/index.page

@@ -97,12 +97,16 @@ 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.13.2**{:itemprop="softwareVersion"} released on
-**2017-01-07**{:itemprop="datePublished"}, [more news](news.html)
+Version **1.14.0**{:itemprop="softwareVersion"} released on
+**2017-06-26**{:itemprop="datePublished"}, [more news](news.html)
 {: style="text-align: center; font-size: 80%"}
 
 </div>
 
+<div id="call-to-arms">
+Support kramdown development and <a href="https://www.patreon.com/bePatron?u=4908963" class="patreon">become a patron</a>!
+</div>
+
 
 [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/
 [Maruku]: http://maruku.rubyforge.org

data/doc/quickref.page

@@ -3,6 +3,10 @@ title: Quick Reference
 in_menu: true
 sort_info: 9
 --- name:sidebar
+<div style="text-align: right">
+<a href="https://www.patreon.com/bePatron?u=4908963" class="patreon">Become a Patron!</a>
+</div>
+
 <h1>Contents</h1>
 
 {menu: {options: {descendants: true, levels: [2,6]}}}
@@ -518,7 +522,7 @@ syntax to HTML.
 {kdexample}
 
 If you want to use literal backticks in your code, just use two or more backticks as delimiters. The
-space right after the beginning delimiter and the one right before the closing delimiter are ignore:
+space right after the beginning delimiter and the one right before the closing delimiter are ignored:
 
 {kdexample::}
 Use backticks to markup code,

data/doc/sidebar.template

@@ -1,9 +1,13 @@
 <h2>Support kramdown</h2>
 
 <p>If you like kramdown and would like to support it, you are welcome to make a small
-donation (PayPal or Pledgie) -- it will surely be appreciated! Thanks!</p>
+donation (Patreon, PayPal or Pledgie) -- it will surely be appreciated! Thanks!</p>
 
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+<div style="text-align: center">
+
+<a href="https://www.patreon.com/bePatron?u=4908963" class="patreon">Become a Patron!</a>
+
+<form style="margin-top: 15px" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="hosted_button_id" value="99HUWKWPMUHWG">
 <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
@@ -12,6 +16,8 @@ donation (PayPal or Pledgie) -- it will surely be appreciated! Thanks!</p>
 
 <a href='https://pledgie.com/campaigns/16657'><img alt='Click here to lend your support to: kramdown and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/16657.png?skin_name=chrome' border='0' ></a>
 
+</div>
+
 <h2>Sponsors</h2>
 
 <p>GROSSWEBER provides <a href="http://grossweber.com/b/kramdown" target="_blank">software

data/doc/syntax.page

@@ -3,6 +3,10 @@ title: Syntax
 in_menu: true
 sort_info: 10
 --- name:sidebar
+<div style="text-align: right">
+<a href="https://www.patreon.com/bePatron?u=4908963" class="patreon">Become a Patron!</a>
+</div>
+
 <h1>Contents</h1>
 
 {menu: {options: {descendants: true, levels: [2,6]}}}

data/lib/kramdown/converter.rb

@@ -27,6 +27,7 @@ module Kramdown
     autoload :RemoveHtmlTags, 'kramdown/converter/remove_html_tags'
     autoload :Pdf, 'kramdown/converter/pdf'
     autoload :HashAST, 'kramdown/converter/hash_ast'
+    autoload :HashAst, 'kramdown/converter/hash_ast'
     autoload :Man, 'kramdown/converter/man'
 
     extend ::Kramdown::Utils::Configurable

data/lib/kramdown/converter/base.rb

@@ -67,7 +67,7 @@ module Kramdown
         false
       end
 
-      # Returns whether the template should be applied ater the conversion of the tree.
+      # Returns whether the template should be applied after the conversion of the tree.
       #
       # Defaults to true.
       def apply_template_after?

data/lib/kramdown/converter/hash_ast.rb

@@ -32,5 +32,7 @@ module Kramdown
 
     end
 
+    HashAst = HashAST
+
   end
 end

data/lib/kramdown/converter/syntax_highlighter/rouge.rb

@@ -17,6 +17,14 @@ module Kramdown::Converter::SyntaxHighlighter
 
       # Highlighting via Rouge is available if this constant is +true+.
       AVAILABLE = true
+
+      begin
+        # Rouge::Formatters::HTMLLegacy is available on Rouge 2.0 or later
+        FORMATTER_CLASS = ::Rouge::Formatters::HTMLLegacy
+      rescue NameError
+        # Fallbacks to Rouge 1.x formatter if Rouge::Formatters::HTMLLegacy is not available
+        FORMATTER_CLASS = ::Rouge::Formatters::HTML
+      end
     rescue LoadError, SyntaxError
       AVAILABLE = false  # :nodoc:
     end
@@ -26,8 +34,8 @@ module Kramdown::Converter::SyntaxHighlighter
       call_opts[:default_lang] = opts[:default_lang]
       lexer = ::Rouge::Lexer.find_fancy(lang || opts[:default_lang], text)
       return nil if opts[:disable] || !lexer
-
-      formatter = (opts.fetch(:formatter, ::Rouge::Formatters::HTML)).new(opts)
+      opts[:css_class] ||= 'highlight' # For backward compatibility when using Rouge 2.0
+      formatter = (opts.fetch(:formatter, FORMATTER_CLASS)).new(opts)
       formatter.format(lexer.lex(text))
     end
 

data/lib/kramdown/parser/gfm.rb

@@ -84,7 +84,13 @@ module Kramdown
           elsif child.type == :smart_quote
             raw_text << ::Kramdown::Utils::Entities.entity(child.value.to_s).char
           elsif child.type == :typographic_sym
-            raw_text << ::Kramdown::Utils::Entities.entity(child.value.to_s).char
+            if child.value == :laquo_space
+              raw_text << "« "
+            elsif child.value == :raquo_space
+              raw_text << " »"
+            else
+              raw_text << ::Kramdown::Utils::Entities.entity(child.value.to_s).char
+            end
           else
             child.children.each {|c| append_text.call(c)}
           end

data/lib/kramdown/version.rb

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

data/test/test_files.rb

@@ -15,8 +15,14 @@ require 'tmpdir'
 begin
   require 'kramdown/converter/syntax_highlighter/rouge'
 
+  class Kramdown::Converter::SyntaxHighlighter::Rouge::FORMATTER_CLASS
+    def format(tokens, &b)
+      super.sub(/<\/code><\/pre>\n?/, "</code></pre>\n")
+    end
+  end
+
   # custom formatter for tests
-  class RougeHTMLFormatters < ::Rouge::Formatters::HTML
+  class RougeHTMLFormatters < Kramdown::Converter::SyntaxHighlighter::Rouge::FORMATTER_CLASS
     tag 'rouge_html_formatters'
 
     def stream(tokens, &b)

data/test/testcases_gfm/header_ids.html

@@ -22,6 +22,6 @@
 
 <h3 id="with-smart-quotes">With &#8220;smart&#8221; quotes</h3>
 
-<h3 id="with--typographic--symbols">with &#8212; typographic &#8230; symbols</h3>
+<h3 id="with--typographic--symbols">with &#8212; &#171;&#160;typographic&#160;&#187; &#8230; symbols</h3>
 
 <h3 id="with-m5">with <script type="math/tex">m=5</script></h3>

data/test/testcases_gfm/header_ids.html.19

@@ -22,6 +22,6 @@
 
 <h3 id="with-smart-quotes">With “smart” quotes</h3>
 
-<h3 id="with--typographic--symbols">with — typographic … symbols</h3>
+<h3 id="with--typographic--symbols">with — « typographic » … symbols</h3>
 
 <h3 id="with-m5">with <script type="math/tex">m=5</script></h3>

data/test/testcases_gfm/header_ids.text

@@ -22,6 +22,6 @@
 
 ### With "smart" quotes
 
-### with --- typographic ... symbols
+### with --- << typographic >> ... symbols
 
 ### with $$m=5$$

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest