html-pipeline-linuxfr 0.14.16 → 0.14.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796b1191f5eef6a2771d0470018eb22958bec34d
-  data.tar.gz: fdc36f6f11c0ef21c566d52cbe419a674d5835ac
+  metadata.gz: 91758200c32929a358224d57f9b4c9a605828592
+  data.tar.gz: e1bb9b7188af2ea0a82fbe87541370784187de92
 SHA512:
-  metadata.gz: 5eb14d20231b8976a27338e7ba89f14f9130e58ac2ee1142f058eab638b5957bb8c97c20340c5a0ac491870487cb9e021cfbba514d561696e8403e42fde0a445
-  data.tar.gz: f539d030879ca2102f69613043b907b5d3cc3ae8edd23ca541206245454ca5a6113fff41202833a95308cd366fd8f691634bed2c49564d3ab194ad0829b1437e
+  metadata.gz: 800cd8164579dde57468761e943477199902941ba962bb5e1d5082c5c0835823c0099bde1ffeeaae876c4fec3edc368090d95d0c5d9697727f9b3b812cf40294
+  data.tar.gz: 0b5b66aa3ebe6cf96e84c6393c74f68c7b0b6ef3523866743dd12cd7dc6348f23fb2bf9736b3834a85f8e24315c856444661433dfca92a55c44033a9e938b883

data/lib/html/pipeline/svgtex.rb

@@ -11,15 +11,18 @@ module HTML
         def initialize(text, context = nil, result = nil)
           super text, context, result
           @text = @text.gsub "\r", ''
+          @inline = {}
           @codemap = {}
         end
 
         def call
-          extract_code!
+          extract_fenced_code!
+          extract_indented_code!
           @text.gsub!(/^\$\$([^$]+)\$\$\s*$/) do
             "\n\n```mathjax\n\\displaystyle{#{$1.gsub "\\", "\\\\\\\\"}}\n```\n\n"
           end
-          extract_code!
+          extract_fenced_code!
+          extract_inline_code!
           @text.gsub!(/\$([^$\n]+)\$/) do
             "`{mathjax} #{$1}`"
           end
@@ -27,8 +30,24 @@ module HTML
           @text
         end
 
+        def extract_inline_code!
+          @text.gsub!(/`(.*)`/) do
+            id = Digest::SHA1.hexdigest($1)
+            @inline[id] = $1
+            id
+          end
+        end
+
+        def extract_indented_code!
+          @text.gsub!(/(\A|^\r?\n)(((\t|\s{4}).*)+)\r?(\n$|\Z)/) do
+            id = Digest::SHA1.hexdigest($2)
+            @codemap[id] = { :code => $2 }
+            "\n#{id}"
+          end
+        end
+
         # Code taken from gollum (http://github.com/github/gollum)
-        def extract_code!
+        def extract_fenced_code!
           @text.gsub!(/^``` ?(.*?)\r?\n(.+?)\r?\n```\r?$/m) do
             id = Digest::SHA1.hexdigest($2)
             @codemap[id] = { :lang => $1, :code => $2 }
@@ -37,8 +56,11 @@ module HTML
         end
 
         def reinsert_code!
+          @inline.each do |id, code|
+            @text.gsub!(id) { "`#{code}`" }
+          end
           @codemap.each do |id, spec|
-            @text.gsub!(id, "```#{spec[:lang]}\n#{spec[:code]}\n```")
+            @text.gsub!(id) { "```#{spec[:lang]}\n#{spec[:code]}\n```" }
           end
         end
       end

data/lib/html/pipeline/syntax_highlight_filter.rb

@@ -26,7 +26,7 @@ module HTML
       end
 
       def highlight_with_timeout_handling(lexer, text)
-        lexer.highlight(text, options: { nowrap: true })
+        lexer.highlight(text, options: { nowrap: true, startinline: true })
       rescue Timeout::Error
         nil
       end

data/lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "0.14.16"
+    VERSION = "0.14.17"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-linuxfr
 version: !ruby/object:Gem::Version
-  version: 0.14.16
+  version: 0.14.17
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri