From 9eba0c7decb383e3ef73a3fee375e725442cde56 Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Mon, 19 Oct 2009 17:34:39 +0000
Subject: Updating scanners: Ruby 1.9 warnings, KINDS_NOT_LOC * Also, DATABASE
 is a SQL keyword.

---
 lib/coderay/scanners/html.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/coderay/scanners/html.rb')

diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
index 1f4d8fe..d59fa69 100644
--- a/lib/coderay/scanners/html.rb
+++ b/lib/coderay/scanners/html.rb
@@ -6,6 +6,13 @@ module Scanners
 
     include Streamable
     register_for :html
+    
+    KINDS_NOT_LOC = [
+      :comment, :doctype, :preprocessor,
+      :tag, :attribute_name, :operator,
+      :attribute_value, :delimiter, :content,
+      :plain, :entity, :error
+    ]
 
     ATTR_NAME = /[\w.:-]+/
     ATTR_VALUE_UNQUOTED = ATTR_NAME
@@ -68,9 +75,9 @@ module Scanners
               kind = :preprocessor
             elsif scan(/<\?.*?\?>|<%.*?%>/m)
               kind = :comment
-            elsif scan(/<\/[-\w_.:]*>/m)
+            elsif scan(/<\/[-\w.:]*>/m)
               kind = :tag
-            elsif match = scan(/<[-\w_.:]+>?/m)
+            elsif match = scan(/<[-\w.:]+>?/m)
               kind = :tag
               state = :attribute unless match[-1] == ?>
             elsif scan(/[^<>&]+/)
-- 
cgit v1.2.1