jekyll-pypedown 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b420396b59f49fcbafc8ce0e01bb591a8a1ed116
-  data.tar.gz: 9027d7e5f3f5907fb7420bc0e94e6ce95b5a40dc
+  metadata.gz: 4f0595e2e583784ac03bd806d204a8fde5d819a1
+  data.tar.gz: 43b775b241b9228596a414af5ef6510713a01dda
 SHA512:
-  metadata.gz: a95d1bb54b67700e76027f7dcd0eebd4d1c3b8b9deb86d8a98bdff7c2261cdd657c93b342bb53ddcb455d3de286b89e16fc273414de483fe5eb4ab9e105b252f
-  data.tar.gz: fda138d06aac038fec08ec65cfb6462df7ad83991ce72dec2d6f96ff711bf8a004093c51b13c236506ab2593bb29da38969c2db65ffa0b29a7d310c0a159f150
+  metadata.gz: 6394bcf0cfec454f385ddf552e853fccd731d9ea7df5a56a1967f766e2b71e326609e6603d2508c9a933735fde54900b47d5bffc6035428dbbebc75fecdc39af
+  data.tar.gz: a50e2a5295d77c9cdf092f15feebc1228a5aedf28e1590d69891e3ab5800d6e741538b913f17b148aaa3e46cb073e4f44f806f5fd8c68199f30463d05307031c

data/lib/jekyll-pypedown.rb

@@ -1,29 +1,11 @@
+require 'pygments.rb'
+require 'typogruby'
+require 'kramdown'
+require 'kramdown/converter/html_pygments'
 require 'jekyll'
+require 'jekyll/converters/markdown/pypedown'
 
-# Create a new Markdown processor that uses Pygments-flavoured kramdown
-# We can only patch the converter once, so add typographic hooks with Typogruby
 module Jekyll
-  class Pypedown < Jekyll::Converters::Markdown
-    # Internal requires
-    autoload :Kramdown, 'jekyll-pypedown/kramdown'
-
-    def initialize(config)
-      @config = config
-      if @config['pypedown']
-        %w[auto_ids auto_id_prefix default_lang entity_output footnote_nr smart_quotes toc_levels indent input].each do |key|
-          @config['pypedown'][key] = @config['kramdown'][key] unless @config['pypedown'][key]
-        end
-      elsif
-        @config['pypedown'] = @config['kramdown']
-      end
-    end
-
-    def convert(content)
-      options = Jekyll::Utils.symbolize_hash_keys(@config["pypedown"])
-      html = Kramdown::Document.new(content, options).to_pygs
-
-      return Typogruby.improve(html)
-    end
-
+  module Pypedown
   end
 end

data/lib/jekyll-pypedown/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Pypedown
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/jekyll/converters/markdown/pypedown.rb

@@ -0,0 +1,38 @@
+module Jekyll
+  module Converters
+
+    class Markdown::Pypedown
+      def initialize(config)
+        @config = config
+
+        # Kramdown
+        if @config['pypedown']
+          %w[auto_ids auto_id_prefix default_lang entity_output footnote_nr smart_quotes toc_levels indent input].each do |key|
+            @config['pypedown'][key] = @config['kramdown'][key] unless @config['pypedown'][key]
+          end
+        elsif
+          @config['pypedown'] = @config['kramdown']
+        end
+
+        # Typogruby
+        if @config['pypedown']['typogruby'].nil?
+          @typogruby_enabled = true
+        else
+          @typogruby_enabled = false
+        end
+      end
+
+      def convert(content)
+        options = Jekyll::Utils.symbolize_hash_keys(@config["pypedown"])
+        html = Kramdown::Document.new(content, options).to_html_pygments
+
+        if @typogruby_enabled == true
+          return Typogruby.improve(html)
+        else
+          return html
+        end
+      end
+    end
+
+  end
+end

data/lib/{jekyll-pypedown/kramdown.rb → kramdown/converter/html_pygments.rb}

@@ -1,13 +1,7 @@
-require 'pygments'
-require 'typogruby'
-require 'kramdown'
-
-# Patch kramdown to use Pygments for syntax highlighting
 module Kramdown
   module Converter
 
-    # Subclass Html to add indent option and disable coderay
-    class Html
+    class HtmlPygments < Html
       attr_accessor :indent
 
       def initialize(root, options)
@@ -18,32 +12,29 @@ module Kramdown
         @footnote_location = nil
         @toc = []
         @toc_code = nil
-        @indent = @options[:indent] || 2
+        @indent = @options[:indent] || 4
         @stack = []
         @coderay_enabled = false
       end
-    end
 
-    # Highlight code blocks and code spans using Pygments
-    class Pygs < Html
       def convert_codeblock(el, indent)
         attr = el.attr.dup
-        lang = extract_code_language!(attr) || @options[:coderay_default_lang]
+        lang = extract_code_language!(attr) || @options[:default_lang]
         code = pygmentize(el.value, lang)
         code_attr = {}
-        code_attr['class'] = "syntax syntax--#{lang}" if lang
+        code_attr['class'] = "language-#{lang}" if lang
         "#{' '*indent}<pre#{html_attributes(attr)}><code#{html_attributes(code_attr)}>#{code}</code></pre>\n"
       end
 
       def convert_codespan(el, indent)
         attr = el.attr.dup
-        lang = extract_code_language!(attr) || @options[:coderay_default_lang]
+        lang = extract_code_language!(attr) || @options[:default_lang]
         code = pygmentize(el.value, lang)
         if lang
           if attr.has_key?('class')
-            attr['class'] += " syntax syntax--#{lang}"
+            attr['class'] += " language-#{lang}"
           else
-            attr['class'] = "syntax syntax--#{lang}"
+            attr['class'] = "language-#{lang}"
           end
         end
         "<code#{html_attributes(attr)}>#{code}</code>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-pypedown
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Paul Robert Lloyd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -74,8 +74,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-pypedown.rb
-- lib/jekyll-pypedown/kramdown.rb
 - lib/jekyll-pypedown/version.rb
+- lib/jekyll/converters/markdown/pypedown.rb
+- lib/kramdown/converter/html_pygments.rb
 homepage: https://github.com/paulrobertlloyd/jekyll-pypedown
 licenses:
 - MIT