From ef4dbe053349ba0a52b8396d4f494c23119cb39e Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Thu, 21 Jun 2012 19:44:34 +0200
Subject: replace LGPL license with MIT [GH-25]

---
 lib/coderay/helpers/word_list.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lib/coderay')

diff --git a/lib/coderay/helpers/word_list.rb b/lib/coderay/helpers/word_list.rb
index ea969c3..4a42c4a 100644
--- a/lib/coderay/helpers/word_list.rb
+++ b/lib/coderay/helpers/word_list.rb
@@ -4,11 +4,6 @@ module CodeRay
   # 
   # <b>A Hash subclass designed for mapping word lists to token types.</b>
   # 
-  # Copyright (c) 2006-2011 by murphy (Kornelius Kalnbach) <murphy rubychan de>
-  #
-  # License:: LGPL / ask the author
-  # Version:: 2.0 (2011-05-08)
-  #
   # A WordList is a Hash with some additional features.
   # It is intended to be used for keyword recognition.
   #
-- 
cgit v1.2.1


From f4dbdb3030a9507bdb02bdcc66f674913860a822 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Mon, 23 Jul 2012 15:36:03 +0200
Subject: add :string.:char, remove :regexp.:function color from terminal
 encode (GH #29)

---
 lib/coderay/encoders/terminal.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay')

diff --git a/lib/coderay/encoders/terminal.rb b/lib/coderay/encoders/terminal.rb
index 005032d..a0ceb3c 100644
--- a/lib/coderay/encoders/terminal.rb
+++ b/lib/coderay/encoders/terminal.rb
@@ -62,7 +62,6 @@ module CodeRay
           :content => '31',
           :delimiter => '1;29',
           :modifier => '35',
-          :function => '1;29'
         },
         :reserved => '1;31',
         :shell => {
@@ -75,6 +74,7 @@ module CodeRay
           :modifier => '1;32',
           :escape => '1;36',
           :delimiter => '1;32',
+          :char => '1;36',
         },
         :symbol => '1;32',
         :tag => '1;34',
-- 
cgit v1.2.1


From c9d6e77ab9cbc9cf001ab370d4da8a7ec8f77a8d Mon Sep 17 00:00:00 2001
From: shura <shura1991@gmail.com>
Date: Tue, 28 Aug 2012 06:08:02 +0300
Subject: Update lib/coderay/encoders/html/numbering.rb

---
 lib/coderay/encoders/html/numbering.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay')

diff --git a/lib/coderay/encoders/html/numbering.rb b/lib/coderay/encoders/html/numbering.rb
index 8bc6259..e717429 100644
--- a/lib/coderay/encoders/html/numbering.rb
+++ b/lib/coderay/encoders/html/numbering.rb
@@ -17,7 +17,7 @@ module Encoders
         
         anchor_prefix = options[:line_number_anchors]
         anchor_prefix = 'line' if anchor_prefix == true
-        anchor_prefix = anchor_prefix.to_s[/\w+/] if anchor_prefix
+        anchor_prefix = anchor_prefix.to_s[/[\w-]+/] if anchor_prefix
         anchoring =
           if anchor_prefix
             proc do |line|
-- 
cgit v1.2.1