From d102dcda688191af6845322c91e7a66be688b0ee Mon Sep 17 00:00:00 2001
From: Leonardo Saraiva <vyper@maneh.org>
Date: Tue, 19 Jun 2012 01:05:15 -0300
Subject: Added stringex and changed to use #to_url for create directory. To
 don't receive error in url to accented characters.

---
 plugins/category_generator.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb
index bb5fd329..2a7a6731 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.
@@ -143,7 +145,7 @@ module Jekyll
     def category_links(categories)
       dir = @context.registers[:site].config['category_dir']
       categories = categories.sort!.map do |item|
-        "<a class='category' href='/#{dir}/#{item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{item}</a>"
+        "<a class='category' href='/#{dir}/#{item.to_url}/'>#{item}</a>"
       end
 
       case categories.length
-- 
cgit v1.2.1


From 9293ecc174c9466329753b63c1e292dd14055dea Mon Sep 17 00:00:00 2001
From: sjml <shane@techie.net>
Date: Wed, 30 Jan 2013 01:53:04 -0500
Subject: Update plugins/pygments_code.rb

Making it so the build doesn't fail if a bad lexer is passed to the code highlighting.
---
 plugins/pygments_code.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb
index 1676a3e0..debeae14 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 Exception => e
+          highlighted_code = Pygments.highlight(code, :lexer => 'text', :formatter => 'html', :options => {:encoding => 'utf-8'})
+        end
         File.open(path, 'w') {|f| f.print(highlighted_code) }
       end
     else
-- 
cgit v1.2.1


From 35e23f59ca00a04c1784180b765c3e6cc23f9a40 Mon Sep 17 00:00:00 2001
From: Shane Liesegang <shane@techie.net>
Date: Wed, 30 Jan 2013 21:51:26 -0500
Subject: Update plugins/pygments_code.rb

Giving a more helpful error message instead of silently failing.
---
 plugins/pygments_code.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb
index debeae14..87d3cd6d 100644
--- a/plugins/pygments_code.rb
+++ b/plugins/pygments_code.rb
@@ -23,8 +23,8 @@ module HighlightCode
       else
         begin
           highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'})
-        rescue Exception => e
-          highlighted_code = Pygments.highlight(code, :lexer => 'text', :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
-- 
cgit v1.2.1