mirror of
https://github.com/moparisthebest/android.moparisthebest.org
synced 2024-10-31 23:35:00 -04:00
added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108
This commit is contained in:
parent
d5e4bf2d8c
commit
cbd6f8d8de
@ -53,7 +53,12 @@ module Jekyll
|
||||
def initialize(tag_name, markup, tokens)
|
||||
@title = nil
|
||||
@caption = nil
|
||||
@filetype = nil
|
||||
@highlight = true
|
||||
if markup =~ /\s+lang:(\w+)/i
|
||||
@filetype = $1
|
||||
markup = markup.sub(/\s+lang:\w+\s*/i,'')
|
||||
end
|
||||
if markup =~ CaptionUrlTitle
|
||||
@file = $1
|
||||
@caption = "<figcaption><span>#{$1}</span><a href='#{$2 + $3}'>#{$4}</a></figcaption>"
|
||||
@ -64,7 +69,7 @@ module Jekyll
|
||||
@file = $1
|
||||
@caption = "<figcaption><span>#{$1}</span></figcaption>\n"
|
||||
end
|
||||
if @file =~ /\S[\S\s]*\w+\.(\w+)/
|
||||
if @file =~ /\S[\S\s]*\w+\.(\w+)/ && @filetype.nil?
|
||||
@filetype = $1
|
||||
end
|
||||
super
|
||||
|
@ -30,6 +30,10 @@ module Jekyll
|
||||
def initialize(tag_name, markup, tokens)
|
||||
@title = nil
|
||||
@file = nil
|
||||
if markup.strip =~ /\s+lang:(\w+)/i
|
||||
@filetype = $1
|
||||
markup = markup.strip.sub(/\s+lang:\w+\s*/i,'')
|
||||
end
|
||||
if markup.strip =~ /(.*)?(\s+|^)(\/*\S+)/i
|
||||
@title = $1 || nil
|
||||
@file = $3
|
||||
@ -52,7 +56,7 @@ module Jekyll
|
||||
|
||||
Dir.chdir(code_path) do
|
||||
code = file.read
|
||||
@filetype = file.extname.sub('.','')
|
||||
@filetype = file.extname.sub('.','') if @filetype.nil?
|
||||
title = @title ? "#{@title} (#{file.basename})" : file.basename
|
||||
url = "#{context.registers[:site].config['url']}/#{code_dir}/#{@file}"
|
||||
source = "<div><figure role=code><figcaption><span>#{title}</span> <a href='#{url}'>download</a></figcaption>\n"
|
||||
|
Loading…
Reference in New Issue
Block a user