Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master

Conflicts:
	plugins/category_generator.rb

1 files changed, 4 insertions, 3 deletions

diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb
index 52f2d7ef..a7658458 100644
--- a/plugins/category_generator.rb
+++ b/plugins/category_generator.rb
@@ -16,8 +16,9 @@
 # - category_dir:          The subfolder to build category pages in (default is 'categories').
 # - category_title_prefix: The string used before the category name in the page title (default is
 #                          'Category: ').
-module Jekyll
+require "unicode_utils"
 
+module Jekyll
 
   # The CategoryIndex class creates a single category page for the specified category.
   class CategoryIndex < Page
@@ -68,7 +69,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(/[_\W]/, '-').gsub(/-{2,}/, '-')), category)
+          self.write_category_index(File.join(dir, UnicodeUtils.nfkd(category).gsub(/[^\x00-\x7F]/, '').gsub(/_|\W/, '-').gsub(/-{2,}/, '-').to_s), category)
         end
 
       # Throw an exception if the layout couldn't be found.
@@ -105,7 +106,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(/[_\W]/, '-').gsub(/-{2,}/, '-')}/'>#{item}</a>"
+        "<a class='category' href='/#{dir}/#{UnicodeUtils.nfkd(item).gsub(/[^\x00-\x7F]/, '').gsub(/_|\W/, '-').gsub(/-{2,}/, '-').to_s}/'>#{item}</a>"
       end
 
       case categories.length