kramdown 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762672bf30e0c2bcc71355e3b43edb552dc0680f
-  data.tar.gz: ab25e4ed7bc11403cf899f114b6ae468219adced
+  metadata.gz: a29271ef47d6e3832bc4b1ce30803ca7e6c1b985
+  data.tar.gz: 8e215448828e83deb9e53039eb0ffec9dda82306
 SHA512:
-  metadata.gz: c97487f81874d9c1e4109e94ec1050997c8c4998b8cc3a3d5c64e43513473e3942111b26060555bf508e3201b672b67ae3db44ebdb2f96ccdac0689abf8c0558
-  data.tar.gz: 89837ca84aa43bf437fb3aec9c6ac919cc9f424045746201b5e365b23a11b5962ef0d340357338587e06dc9fa0cb191e52a86d800365ac47b551c9c0486d51c9
+  metadata.gz: a28a80e5bba88ba0f15a8c9e9d7fc21fd804195f752467693de148b363c3f8dd05ca8101d1392c585a78a208ba1ed2718c7b6bf1211982ac73d80b8bc7ba137f
+  data.tar.gz: 25523fb2b906cc42592e422fe691474f50072f7caa64762d84d0b3ac46d1b6f6359d116a1481ea501d5b6ef9c2bd313086b4f4c1c9ad260b5a7c9e32b4bf9f93

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    631 Thomas Leitner <t_leitner@gmx.at>
+    643 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/Rakefile

@@ -183,6 +183,7 @@ EOF
       s.add_development_dependency 'minitest', '~> 5.0'
       s.add_development_dependency 'coderay', '~> 1.0.0'
       s.add_development_dependency 'stringex', '~> 1.5.1'
+      s.add_development_dependency 'prawn', '~> 0.13'
 
       #### Documentation
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/doc/index.page

@@ -28,15 +28,15 @@ content_processor.tikz.opts: |
   child[concept color=orange, grow=140, ->] {node[concept] (i-kramdown) {kramdown}}
   child[concept color=orange, grow=180] {node[concept] (i-html) {HTML}}
   child[concept color=orange, grow=220] {node[concept] (i-markdown) {Markdown}}
-  child[concept color=green!50!black, grow=40] {node[concept] (o-html) {HTML}}
-  child[concept color=green!50!black, grow=0] {node[concept] (o-kramdown) {kramdown}}
-  child[concept color=green!50!black, grow=-40] {
+  child[concept color=green!50!black, grow=60] {node[concept] (o-html) {HTML}}
+  child[concept color=green!50!black, grow=20] {node[concept] (o-kramdown) {kramdown}}
+  child[concept color=green!50!black, grow=-20] {
     node[concept] (o-latex) {\LaTeX}
     child[grow=0] {
       node[concept] (o-latex-pdf) {PDF}
     }
   }
-  child[concept color=green!50!black, grow=-40] {node[concept] {\LaTeX}}
+  child[concept color=green!50!black, grow=-60] {node[concept] (o-pdf) {PDF}}
 ;
 \draw [dash pattern=on 0pt off 2pt,line width=5pt,arrows=-angle 60,shorten >=15pt,shorten <=10pt,color=orange]
    (i-kramdown) edge(lib)
@@ -45,7 +45,8 @@ content_processor.tikz.opts: |
 \draw [dash pattern=on 0pt off 2pt,line width=5pt,arrows=-angle 60,shorten >=10pt,shorten <=15pt,color=green!50!black]
    (lib) edge(o-html)
    (lib) edge (o-kramdown)
-   (lib) edge (o-latex);
+   (lib) edge (o-latex)
+   (lib) edge (o-pdf);
 {tikz}
 {: style="text-align: center"}
 

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <span class="inline-important">1.3.0</span> and it was released
-on <span class="inline-important">2013-12-08</span></p>
+<p>The latest version of kramdown is <span class="inline-important">1.3.1</span> and it was released
+on <span class="inline-important">2014-01-05</span></p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/doc/tests.page

@@ -33,73 +33,73 @@ 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 (May 2013) ~3-4x faster than Maruku, ~4-5x faster
-than BlueFeather but ~30x slower than BlueCloth and RDiscount and ~100x slower than Redcarpet:
+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:
 
 <pre><code>
-Running tests on 2013-05-08 under ruby 1.9.3p327 (2012-11-10 revision 37606) [x86_64-linux]
+Running tests on 2014-01-05 under ruby 2.0.0p247 (2013-06-27 revision 41674) [x86_64-linux]
 
 Test using file mdsyntax.text and 20 runs
 Rehearsal ----------------------------------------------------
-kramdown 1.0.1     1.010000   0.000000   1.010000 (  1.014665)
-Maruku 0.6.0       2.910000   0.020000   2.930000 (  2.939359)
-BlueFeather 0.40   3.890000   0.000000   3.890000 (  3.903594)
-BlueCloth 2.2.0    0.050000   0.000000   0.050000 (  0.048246)
-RDiscount 1.6.8    0.020000   0.000000   0.020000 (  0.020237)
-redcarpet 2.2.2    0.000000   0.000000   0.000000 (  0.005038)
-------------------------------------------- total: 7.900000sec
+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
 
                        user     system      total        real
-kramdown 1.0.1     0.850000   0.000000   0.850000 (  0.856454)
-Maruku 0.6.0       2.820000   0.030000   2.850000 (  2.856139)
-BlueFeather 0.40   3.870000   0.000000   3.870000 (  3.884309)
-BlueCloth 2.2.0    0.040000   0.000000   0.040000 (  0.044865)
-RDiscount 1.6.8    0.020000   0.000000   0.020000 (  0.022889)
-redcarpet 2.2.2    0.010000   0.000000   0.010000 (  0.005234)
+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)
 
 Real time of X divided by real time of kramdown
-Maruku             3.3348
-BlueFeather        4.5353
-BlueCloth          0.0524
-RDiscount          0.0267
-redcarpet          0.0061
+Maruku             2.5368
+BlueFeather        4.7711
+BlueCloth          0.034
+RDiscount          0.0147
+redcarpet          0.004
 
 Test using file mdbasics.text and 20 runs
 Rehearsal ----------------------------------------------------
-kramdown 1.0.1     0.150000   0.000000   0.150000 (  0.154616)
-Maruku 0.6.0       0.690000   0.000000   0.690000 (  0.689874)
-BlueFeather 0.40   1.000000   0.000000   1.000000 (  1.003185)
-BlueCloth 2.2.0    0.010000   0.000000   0.010000 (  0.012767)
-RDiscount 1.6.8    0.010000   0.000000   0.010000 (  0.004747)
-redcarpet 2.2.2    0.000000   0.000000   0.000000 (  0.001594)
-------------------------------------------- total: 1.860000sec
+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
 
                        user     system      total        real
-kramdown 1.0.1     0.160000   0.000000   0.160000 (  0.155369)
-Maruku 0.6.0       0.670000   0.000000   0.670000 (  0.673886)
-BlueFeather 0.40   1.000000   0.000000   1.000000 (  0.995874)
-BlueCloth 2.2.0    0.020000   0.000000   0.020000 (  0.013389)
-RDiscount 1.6.8    0.010000   0.000000   0.010000 (  0.006698)
-redcarpet 2.2.2    0.000000   0.000000   0.000000 (  0.001691)
+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)
 
 Real time of X divided by real time of kramdown
-Maruku             4.3373
-BlueFeather        6.4097
-BlueCloth          0.0862
-RDiscount          0.0431
-redcarpet          0.0109
+Maruku             2.7423
+BlueFeather        6.3139
+BlueCloth          0.0648
+RDiscount          0.0269
+redcarpet          0.0078
 </code></pre>
 
 And here are some graphs which show the execution times of the various kramdown releases on
 different Ruby interpreters:
 
-![ruby 1.8.5p231]({relocatable: img/graph-ruby-1.8.5-231.png})
-![ruby 1.8.6p399]({relocatable: img/graph-ruby-1.8.6-399.png})
-![ruby 1.8.7p249]({relocatable: img/graph-ruby-1.8.7-249.png})
 ![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.3p392]({relocatable: img/graph-ruby-1.9.3p392-392.png})
-![ruby 2.0.0]({relocatable: img/graph-ruby-2.0.0p0-0.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})
 
 [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/pdf.rb

@@ -539,7 +539,6 @@ module Kramdown
 
       # Create the PDF outline from the header elements in the TOC.
       def create_outline(root)
-        patch_outline_object
         toc = ::Kramdown::Converter::Toc.convert(root).first
 
         text_of_header = lambda do |el|
@@ -568,24 +567,6 @@ module Kramdown
         end
       end
 
-      # Patch the pdf_document.outline object to accept arbitrary destinations.
-      def patch_outline_object
-        def (@pdf.outline).create_outline_item(title, options)
-          outline_item = ::Prawn::OutlineItem.new(title, parent, options)
-
-          case options[:destination]
-          when Integer
-            page_index = options[:destination] - 1
-            outline_item.dest = [document.state.pages[page_index].dictionary, :Fit]
-          when Array
-            outline_item.dest = options[:destination]
-          end
-
-          outline_item.prev = prev if @prev
-          items[title] = document.ref!(outline_item)
-        end
-      end
-
 
       # ----------------------------
       # :section: Helper methods

data/lib/kramdown/utils/string_scanner.rb

@@ -19,6 +19,8 @@ module Kramdown
       def initialize(string, start_line_number = 1)
         super(string)
         @start_line_number = start_line_number || 1
+        @previous_pos = 0
+        @previous_line_number = @start_line_number
       end
 
       # To make this unicode (multibyte) aware, we have to use #charpos which was added in Ruby
@@ -43,7 +45,14 @@ module Kramdown
       # NOTE: Normally we'd have to add one to the count of newlines to get the correct line number.
       # However we add the one indirectly by using a one-based start_line_number.
       def current_line_number
-        string[0..best_pos].count("\n") + start_line_number
+        # Not using string[@previous_pos..best_pos].count('\n') because it is slower
+        strscan = ::StringScanner.new(string)
+        strscan.pos = @previous_pos
+        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_line_number
       end
 
     end

data/lib/kramdown/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !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: |
   kramdown is yet-another-markdown-parser but fast, pure Ruby,
   using a strict syntax definition and supporting several common extensions.