From d9d6dd5f4a73363ea5d353ecda142f77ed4eba5a Mon Sep 17 00:00:00 2001
From: Gavin Kistner <gkistner@nvidia.com>
Date: Thu, 6 Jun 2013 10:43:19 -0600
Subject: Support CDATA blocks in HTML/XML

---
 lib/coderay/scanners/html.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
index 3ba3b79..fcf249a 100644
--- a/lib/coderay/scanners/html.rb
+++ b/lib/coderay/scanners/html.rb
@@ -99,7 +99,17 @@ module Scanners
           case state
           
           when :initial
-            if match = scan(/<!--(?:.*?-->|.*)/m)
+            if match = scan(/<!\[CDATA\[/)
+              encoder.begin_group :string
+              encoder.text_token match, :delimiter
+              if match = scan(/.*?\]\]>/m)
+                encoder.text_token match[0..-4], :content
+                encoder.text_token ']]>', :delimiter
+              else
+                encoder.text_token scan(/.*/m), :error
+              end
+              encoder.end_group :string
+            elsif match = scan(/<!--(?:.*?-->|.*)/m)
               encoder.text_token match, :comment
             elsif match = scan(/<!(\w+)(?:.*?>|.*)|\]>/m)
               encoder.text_token match, :doctype
-- 
cgit v1.2.1


From 14f3a4f28341237503a51bfa0764c922bb02bdfa Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 23 Jun 2013 14:13:15 +0200
Subject: tweak HTML CDATA token kinds

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

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

diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
index fcf249a..530ce44 100644
--- a/lib/coderay/scanners/html.rb
+++ b/lib/coderay/scanners/html.rb
@@ -1,13 +1,13 @@
 module CodeRay
 module Scanners
-
+  
   # HTML Scanner
   # 
   # Alias: +xhtml+
   # 
   # See also: Scanners::XML
   class HTML < Scanner
-
+    
     register_for :html
     
     KINDS_NOT_LOC = [
@@ -100,15 +100,13 @@ module Scanners
           
           when :initial
             if match = scan(/<!\[CDATA\[/)
-              encoder.begin_group :string
-              encoder.text_token match, :delimiter
+              encoder.text_token match, :inline_delimiter
               if match = scan(/.*?\]\]>/m)
-                encoder.text_token match[0..-4], :content
-                encoder.text_token ']]>', :delimiter
-              else
-                encoder.text_token scan(/.*/m), :error
+                encoder.text_token match[0..-4], :plain
+                encoder.text_token ']]>', :inline_delimiter
+              elsif match = scan(/.+/)
+                encoder.text_token match, :error
               end
-              encoder.end_group :string
             elsif match = scan(/<!--(?:.*?-->|.*)/m)
               encoder.text_token match, :comment
             elsif match = scan(/<!(\w+)(?:.*?>|.*)|\]>/m)
-- 
cgit v1.2.1