diff options
| author | Brandon Mathis <brandon@imathis.com> | 2013-04-09 09:17:46 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2013-04-09 09:17:46 -0500 |
| commit | 3ab22cb8209687f9a77b22c896e16c23a00f3845 (patch) | |
| tree | cb5f8a9018506878ae1f194812f457107c3ae359 | |
| parent | 7dfba9a26e21b970f74aa663a86d407ae8fd5958 (diff) | |
| download | my_new_personal_website-3ab22cb8209687f9a77b22c896e16c23a00f3845.tar.xz my_new_personal_website-3ab22cb8209687f9a77b22c896e16c23a00f3845.zip | |
Allowing dashes in code names. Closes #1166
Diffstat (limited to '')
| -rw-r--r-- | plugins/code_block.rb | 4 | ||||
| -rw-r--r-- | plugins/include_code.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/code_block.rb b/plugins/code_block.rb index 660f73d7..f2ae3e55 100644 --- a/plugins/code_block.rb +++ b/plugins/code_block.rb @@ -56,9 +56,9 @@ module Jekyll @caption = nil @filetype = nil @highlight = true - if markup =~ /\s*lang:(\w+)/i + if markup =~ /\s*lang:([\w-]+)/i @filetype = $1 - markup = markup.sub(/lang:\w+/i,'') + markup = markup.sub(/\s*lang:([\w-]+)/i,'') end if markup =~ CaptionUrlTitle @file = $1 diff --git a/plugins/include_code.rb b/plugins/include_code.rb index fc6daa36..1ee3223f 100644 --- a/plugins/include_code.rb +++ b/plugins/include_code.rb @@ -32,9 +32,9 @@ module Jekyll 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(/lang:\w+/i,'') + markup = markup.strip.sub(/\s*lang:([\w-]+)/i,'') end if markup.strip =~ /(.*)?(\s+|^)(\/*\S+)/i @title = $1 || nil |