./lib/coderay/scanners/nitro_xhtml.rb in coderay-0.7.4.215 vs ./lib/coderay/scanners/nitro_xhtml.rb in coderay-0.8.260

- old
+ new

@@ -9,10 +9,11 @@ # $Id$ class NitroXHTML < Scanner include Streamable register_for :nitro_xhtml + file_extension :xhtml NITRO_RUBY_BLOCK = / <\?r (?> [^\?]* @@ -93,23 +94,23 @@ elsif match = scan(/#{NITRO_VALUE_BLOCK}/o) start_tag = match[0,2] delimiter = CLOSING_PAREN[start_tag[1,1]] end_tag = match[-1,1] == delimiter ? delimiter : '' tokens << [:open, :inline] - tokens << [start_tag, :delimiter] + tokens << [start_tag, :inline_delimiter] code = match[start_tag.size .. -1 - end_tag.size] @ruby_scanner.tokenize code - tokens << [end_tag, :delimiter] unless end_tag.empty? + tokens << [end_tag, :inline_delimiter] unless end_tag.empty? tokens << [:close, :inline] elsif match = scan(/#{NITRO_RUBY_BLOCK}/o) start_tag = '<?r' end_tag = match[-2,2] == '?>' ? '?>' : '' tokens << [:open, :inline] - tokens << [start_tag, :delimiter] + tokens << [start_tag, :inline_delimiter] code = match[start_tag.size .. -(end_tag.size)-1] @ruby_scanner.tokenize code - tokens << [end_tag, :delimiter] unless end_tag.empty? + tokens << [end_tag, :inline_delimiter] unless end_tag.empty? tokens << [:close, :inline] elsif entity = scan(/#{NITRO_ENTITY}/o) tokens << [entity, :entity]