From 20764e31eefcc077341a7dab649e37dcd361a8d0 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Mon, 25 Jul 2011 20:34:52 -0400 Subject: [PATCH] updated syntax highlighting support for perl and objective c in code_block and include_code plugins --- .themes/classic/sass/partials/_syntax.scss | 4 +++- plugins/code_block.rb | 2 ++ plugins/include_code.rb | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss index bb350ed..4ccd63d 100644 --- a/.themes/classic/sass/partials/_syntax.scss +++ b/.themes/classic/sass/partials/_syntax.scss @@ -126,9 +126,10 @@ p code { .n { color: $blue !important; } .na { color: $blue !important; } /* Name.Attribute */ .nb { color: $green !important; } /* Name.Builtin */ - //.nc { color: #445588; font-weight: bold } /* Name.Class */ + .nc { color: $magenta !important;} /* Name.Class */ .no { color: $yellow !important; } /* Name.Constant */ //.ni { color: #800080 } /* Name.Entity */ + .nl { color: $green !important; } .ne { color: $blue !important; font-weight: bold !important; } /* Name.Exception */ .nf { color: $blue !important; font-weight: bold !important; } /* Name.Function */ .nn { color: $yellow !important; } /* Name.Namespace */ @@ -215,3 +216,4 @@ figure[role=code] { padding-left: 3em; } + diff --git a/plugins/code_block.rb b/plugins/code_block.rb index 4264d19..4cf2817 100644 --- a/plugins/code_block.rb +++ b/plugins/code_block.rb @@ -73,6 +73,8 @@ module Jekyll source = "
" source += @caption if @caption if @filetype + @filetype = 'objc' if @filetype == 'm' + @filetype = 'perl' if @filetype == 'pl' source += "{% highlight #{@filetype} %}\n" + code + "\n{% endhighlight %}
" else source += "
" + code.lstrip.rstrip.gsub(/
" diff --git a/plugins/include_code.rb b/plugins/include_code.rb index 6a7d786..b0258a4 100644 --- a/plugins/include_code.rb +++ b/plugins/include_code.rb @@ -50,11 +50,13 @@ module Jekyll Dir.chdir(code_path) do code = file.read - file_type = file.extname + @filetype = file.extname + @filetype = 'objc' if @filetype == 'm' + @filetype = 'perl' if @filetype == 'pl' title = @title ? "#{@title} (#{file.basename})" : file.basename url = "#{context.registers[:site].config['url']}/#{code_dir}/#{@file}" source = "
#{title} download
\n" - source += "{% highlight #{file_type} %}\n" + code + "\n{% endhighlight %}
" + source += "{% highlight #{@filetype} %}\n" + code + "\n{% endhighlight %}" partial = Liquid::Template.parse(source) context.stack do partial.render(context)