improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace.

imathis · imathis · commit 089af26b02db · 2011-08-21T10:31:58.000-04:00
diff --git a/plugins/code_block.rb b/plugins/code_block.rb
@@ -55,9 +55,9 @@ def initialize(tag_name, markup, tokens)
       @caption = nil
       @filetype = nil
       @highlight = true
-      if markup =~ /\s+lang:(\w+)/i
+      if markup =~ /\s*lang:(\w+)/i
         @filetype = $1
-        markup = markup.sub(/\s+lang:\w+\s*/i,'')
+        markup = markup.sub(/lang:\w+/i,'')
       end
       if markup =~ CaptionUrlTitle
         @file = $1
diff --git a/plugins/include_code.rb b/plugins/include_code.rb
@@ -30,9 +30,9 @@ class IncludeCodeTag < Liquid::Tag
     def initialize(tag_name, markup, tokens)
       @title = nil
       @file = nil
-      if markup.strip =~ /\s+lang:(\w+)/i
+      if markup.strip =~ /\s*lang:(\w+)/i
         @filetype = $1
-        markup = markup.strip.sub(/\s+lang:\w+\s*/i,'')
+        markup = markup.strip.sub(/lang:\w+/i,'')
       end
       if markup.strip =~ /(.*)?(\s+|^)(\/*\S+)/i
         @title = $1 || nil
