diff options
| -rw-r--r-- | .themes/classic/source/_includes/facebook_like.html | 2 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/head.html | 4 | ||||
| -rw-r--r-- | plugins/category_generator.rb | 6 | ||||
| -rw-r--r-- | plugins/pygments_code.rb | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/.themes/classic/source/_includes/facebook_like.html b/.themes/classic/source/_includes/facebook_like.html index 74f91307..d263e6d2 100644 --- a/.themes/classic/source/_includes/facebook_like.html +++ b/.themes/classic/source/_includes/facebook_like.html @@ -3,7 +3,7 @@ <script>(function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) {return;} - js = d.createElement(s); js.id = id; + js = d.createElement(s); js.id = id; js.async = true; js.src = "//connect.facebook.net/en_US/all.js#appId=212934732101925&xfbml=1"; fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk'));</script> diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html index 75c76ccc..8de6679f 100644 --- a/.themes/classic/source/_includes/head.html +++ b/.themes/classic/source/_includes/head.html @@ -20,10 +20,10 @@ <link rel="canonical" href="{{ canonical }}"> <link href="{{ root_url }}/favicon.png" rel="icon"> <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> + <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"> + {% include custom/head.html %} <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script> <script src="{{ root_url }}/javascripts/ender.js"></script> <script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script> - <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"> - {% include custom/head.html %} {% include google_analytics.html %} </head> diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb index d4840a8d..a49c4296 100644 --- a/plugins/category_generator.rb +++ b/plugins/category_generator.rb @@ -19,6 +19,8 @@ # - category_title_prefix: The string used before the category name in the page title (default is # 'Category: '). +require 'stringex' + module Jekyll # The CategoryIndex class creates a single category page for the specified category. @@ -106,7 +108,7 @@ module Jekyll if self.layouts.key? 'category_index' dir = self.config['category_dir'] || 'categories' self.categories.keys.each do |category| - self.write_category_index(File.join(dir, category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase), category) + self.write_category_index(File.join(dir, category.to_url), category) end # Throw an exception if the layout couldn't be found. @@ -171,7 +173,7 @@ ERR # def category_link(category) dir = @context.registers[:site].config['category_dir'] - "<a class='category' href='/#{dir}/#{category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{category}</a>" + "<a class='category' href='/#{dir}/#{category.to_url}/'>#{category}</a>" end # Outputs the post.date as formatted html, with hooks for CSS styling. diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb index 1676a3e0..87d3cd6d 100644 --- a/plugins/pygments_code.rb +++ b/plugins/pygments_code.rb @@ -21,7 +21,11 @@ module HighlightCode if File.exist?(path) highlighted_code = File.read(path) else - highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'}) + begin + highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'}) + rescue MentosError + raise "Pygments can't parse unknown language: #{lang}." + end File.open(path, 'w') {|f| f.print(highlighted_code) } end else |