Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added start:LINENO/end:LINENO to include_code #478

Closed
wants to merge 3 commits into from
Closed

added start:LINENO/end:LINENO to include_code #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e13cd5b
added start:LINENO/end:LINENO to include_code
Mar 11, 2012
86fc77b
added options hash to HighlightCode#highlight
Mar 26, 2012
39a6b17
pass linenostart option to highlight invokation
Mar 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions plugins/include_code.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ def initialize(tag_name, markup, tokens)
@filetype = $1
markup = markup.strip.sub(/lang:\w+/i,'')
end
if markup.strip =~ /start:(\d+)/
@start_line = $1.to_i || 0
markup = markup.strip.sub(/start:(\d+)/, '')
end
if markup.strip =~ /end:(\d+)/
@end_line = $1.to_i || 0
markup = markup.strip.sub(/end:(\d+)/, '')
end
if markup.strip =~ /(.*)?(\s+|^)(\/*\S+)/i
@title = $1 || nil
@file = $3
Expand All @@ -57,12 +65,20 @@ def render(context)
end

Dir.chdir(code_path) do
code = file.read
lines = file.readlines

start_line = @start_line || 1
end_line = @end_line && @end_line >= start_line ? @end_line : lines.size
code = lines[(start_line-1)..(end_line-1)].join("")

options = {:linenostart => start_line}

@filetype = file.extname.sub('.','') if @filetype.nil?
title = @title ? "#{@title} (#{file.basename})" : file.basename
start_end_title = ", line #{start_line} to #{end_line}" if @start_line || @end_line
title = @title ? "#{@title} (#{file.basename}#{start_end_title})" : file.basename
url = "/#{code_dir}/#{@file}"
source = "<figure class='code'><figcaption><span>#{title}</span> <a href='#{url}'>download</a></figcaption>\n"
source += " #{highlight(code, @filetype)}</figure>"
source += " #{highlight(code, @filetype, options)}</figure>"
safe_wrap(source)
end
end
Expand Down
9 changes: 5 additions & 4 deletions plugins/pygments_code.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
FileUtils.mkdir_p(PYGMENTS_CACHE_DIR)

module HighlightCode
def highlight(str, lang)
def highlight(str, lang, options={})
lang = 'ruby' if lang == 'ru'
lang = 'objc' if lang == 'm'
lang = 'perl' if lang == 'pl'
lang = 'yaml' if lang == 'yml'
str = pygments(str, lang).match(/<pre>(.+)<\/pre>/m)[1].to_s.gsub(/ *$/, '') #strip out divs <div class="highlight">
tableize_code(str, lang)
tableize_code(str, lang, options)
end

def pygments(code, lang)
Expand All @@ -29,11 +29,12 @@ def pygments(code, lang)
end
highlighted_code
end
def tableize_code (str, lang = '')
def tableize_code (str, lang = '', options={})
options = {:linenostart => 1}.merge(options)
table = '<div class="highlight"><table><tr><td class="gutter"><pre class="line-numbers">'
code = ''
str.lines.each_with_index do |line,index|
table += "<span class='line-number'>#{index+1}</span>\n"
table += "<span class='line-number'>#{index+options[:linenostart]}</span>\n"
code += "<span class='line'>#{line}</span>"
end
table += "</pre></td><td class='code'><pre><code class='#{lang}'>#{code}</code></pre></td></tr></table></div>"
Expand Down