diff options
| author | Nathan Youngman <git@nathany.com> | 2012-09-11 14:57:58 -0600 |
|---|---|---|
| committer | Nathan Youngman <git@nathany.com> | 2012-09-11 14:57:58 -0600 |
| commit | 39517be0c026af1c08142680da96ea88ae8fcb2c (patch) | |
| tree | 852f363f8ea07d53a1d69cef9f84a2f2b7704a91 /lib | |
| parent | 2b16d115f7d6caf21864934df763556e126d6357 (diff) | |
| parent | 5f54b367d9161a3c5ac30dcc70bd8de5dc378167 (diff) | |
| download | coderay-39517be0c026af1c08142680da96ea88ae8fcb2c.tar.gz | |
Merge branch 'master' into lua-scanner
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/coderay/encoders/html/numbering.rb | 2 | ||||
| -rw-r--r-- | lib/coderay/encoders/terminal.rb | 2 | ||||
| -rw-r--r-- | lib/coderay/helpers/word_list.rb | 5 |
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. # |