diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2012-06-25 09:56:30 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2012-06-25 09:56:30 +0200 |
| commit | 5c5954d3dbcb9576fbd17a12d70014a9bef91a14 (patch) | |
| tree | 43dc98d13276fdf1c4f47786b4f4b65f8d810e10 /lib/coderay | |
| parent | 5598df049e8823f9838b348e76227ef836c4e39b (diff) | |
| parent | a4b8b094da5525354cb8a927761385825236c5a1 (diff) | |
| download | coderay-5c5954d3dbcb9576fbd17a12d70014a9bef91a14.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Diffstat (limited to 'lib/coderay')
| -rw-r--r-- | lib/coderay/helpers/word_list.rb | 5 | ||||
| -rw-r--r-- | lib/coderay/scanners/html.rb | 5 |
2 files changed, 1 insertions, 9 deletions
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. # diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb index 98d06fc..733dd6f 100644 --- a/lib/coderay/scanners/html.rb +++ b/lib/coderay/scanners/html.rb @@ -149,12 +149,9 @@ module Scanners if match = scan(/=/) #/ encoder.text_token match, :operator state = :attribute_value - elsif scan(/#{ATTR_NAME}/o) || scan(/#{TAG_END}/o) - state = :attribute - next else - encoder.text_token getch, :error state = :attribute + next end when :attribute_value |