Changed error handling of all scanners: :error tokens are OK now, even in debug mode, but token kind is nil unless assigned.

Small fixes for C and Ruby scanners.
Renamed local variable type to kind in Ruby scanner.
Improved RHTML scanner to recognize -%> as delimiter.

HTML encoder: improved handling of malformed token strings.
Fixed PluginHost#inspect including docu.
Scanner#raise_inspect also shows state if given.

1 files changed, 15 insertions, 14 deletions

diff --git a/lib/coderay/scanners/_map.rb b/lib/coderay/scanners/_map.rb
index 6268a6c..1c5fc89 100644
--- a/lib/coderay/scanners/_map.rb
+++ b/lib/coderay/scanners/_map.rb
@@ -1,14 +1,15 @@
-module CodeRay

-module Scanners

-

-  map :cpp => :c,

-    :plain => :plaintext,

-    :pascal => :delphi,

-    :irb => :ruby,

-    :xml => :html,

-    :xhtml => :nitro_html

-

-  default :plain

-

-end

-end

+module CodeRay
+module Scanners
+
+  map :cpp => :c,
+    :plain => :plaintext,
+    :pascal => :delphi,
+    :irb => :ruby,
+    :xml => :html,
+    :xhtml => :nitro_xhtml,
+    :nitro => :nitro_xhtml
+
+  default :plain
+
+end
+end