summaryrefslogtreecommitdiff
path: root/lib/coderay
diff options
context:
space:
mode:
Diffstat (limited to 'lib/coderay')
-rw-r--r--lib/coderay/encoders/html/numbering.rb2
-rw-r--r--lib/coderay/encoders/terminal.rb2
-rw-r--r--lib/coderay/helpers/word_list.rb5
3 files changed, 2 insertions, 7 deletions
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|
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',
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.
#