trenni 2.0.1 → 2.0.2

data/ext/trenni/markup.rl

@@ -22,6 +22,13 @@
 	action pcdata_end {
 	}
 	
+	action text_begin {
+	}
+	
+	action text_end {
+		rb_funcall(delegate, id_text, 1, pcdata);
+	}
+	
 	action characters_begin {
 		characters.begin = p;
 	}
@@ -44,7 +51,7 @@
 		entity.end = p;
 		
 		Trenni_append_string(&pcdata, encoding, 
-			rb_funcall(entities, rb_intern("[]"), 1, Trenni_token(entity, encoding))
+			rb_funcall(entities, id_key_get, 1, Trenni_token(entity, encoding))
 		);
 	}
 	
@@ -177,15 +184,6 @@
 		Trenni_raise_error("could not parse cdata", buffer, p-s);
 	}
 	
-	action text_begin {
-	
-	}
-	
-	action text_end {
-		// Entities are handled separately:
-		rb_funcall(delegate, id_text, 1, pcdata);
-	}
-	
 	include markup "trenni/markup.rl";
 	
 	write data;

data/ext/trenni/trenni.c

@@ -5,7 +5,7 @@
 #include "template.h"
 
 VALUE rb_Trenni = Qnil, rb_Trenni_Native = Qnil, rb_Trenni_ParseError = Qnil;
-ID id_cdata, id_open_tag_begin, id_open_tag_end, id_attribute, id_close_tag, id_text, id_doctype, id_comment, id_instruction, id_read, id_expression;
+ID id_cdata, id_open_tag_begin, id_open_tag_end, id_attribute, id_close_tag, id_text, id_doctype, id_comment, id_instruction, id_read, id_expression, id_key_get;
 
 void Trenni_raise_error(const char * message, VALUE buffer, size_t offset) {
 	VALUE exception = rb_funcall(rb_Trenni_ParseError, rb_intern("new"), 3, rb_str_new_cstr(message), buffer, ULONG2NUM(offset));
@@ -13,32 +13,6 @@ void Trenni_raise_error(const char * message, VALUE buffer, size_t offset) {
 	rb_exc_raise(exception);
 }
 
-void Trenni_append_string(VALUE * buffer, rb_encoding * encoding, VALUE string) {
-	if (*buffer == Qnil) {
-		*buffer = rb_enc_str_new("", 0, encoding);
-	}
-	
-	rb_str_concat(*buffer, string);
-}
-
-void Trenni_append_token(VALUE * buffer, rb_encoding * encoding, Token token) {
-	if (*buffer == Qnil) {
-		// Allocate a buffer exactly the right size:
-		*buffer = rb_enc_str_new(token.begin, token.end - token.begin, encoding);
-	} else {
-		// Append the characters to the existing buffer:
-		rb_str_buf_cat(*buffer, token.begin, token.end - token.begin);
-	}
-}
-
-void Trenni_append_codepoint(VALUE * buffer, rb_encoding * encoding, unsigned long codepoint) {
-	if (*buffer == Qnil) {
-		*buffer = rb_enc_str_new("", 0, encoding);
-	}
-	
-	rb_str_concat(*buffer, ULONG2NUM(codepoint));
-}
-
 void Init_trenni() {
 	id_open_tag_begin = rb_intern("open_tag_begin");
 	id_open_tag_end = rb_intern("open_tag_end");
@@ -54,6 +28,8 @@ void Init_trenni() {
 	
 	id_read = rb_intern("read");
 	
+	id_key_get = rb_intern("[]");
+	
 	rb_Trenni = rb_define_module("Trenni");
 	rb_Trenni_Native = rb_define_module_under(rb_Trenni, "Native");
 	

data/ext/trenni/trenni.h

@@ -6,7 +6,7 @@
 
 extern VALUE rb_Trenni, rb_Trenni_Native, rb_Trenni_ParseError;
 
-extern ID id_cdata, id_open_tag_begin, id_open_tag_end, id_attribute, id_close_tag, id_text, id_doctype, id_comment, id_instruction, id_read, id_expression;
+extern ID id_cdata, id_open_tag_begin, id_open_tag_end, id_attribute, id_close_tag, id_text, id_doctype, id_comment, id_instruction, id_read, id_expression, id_key_get;
 
 typedef struct {
 	const char * begin;
@@ -23,6 +23,30 @@ static inline VALUE Trenni_string(const char * begin, const char * end, rb_encod
 
 void Trenni_raise_error(const char * message, VALUE buffer, size_t offset);
 
-void Trenni_append_string(VALUE * buffer, rb_encoding * encoding, VALUE string);
-void Trenni_append_token(VALUE * buffer, rb_encoding * encoding, Token token);
-void Trenni_append_codepoint(VALUE * buffer, rb_encoding * encoding, unsigned long codepoint);
+static inline void Trenni_append_string(VALUE * buffer, rb_encoding * encoding, VALUE string) {
+	if (*buffer == Qnil) {
+		*buffer = rb_enc_str_new("", 0, encoding);
+	}
+	
+	rb_str_concat(*buffer, string);
+}
+
+static inline void Trenni_append_token(VALUE * buffer, rb_encoding * encoding, Token token) {
+	// printf("append_token(%ul bytes)\n", token.end - token.begin);
+	
+	if (*buffer == Qnil) {
+		// Allocate a buffer exactly the right size:
+		*buffer = rb_enc_str_new(token.begin, token.end - token.begin, encoding);
+	} else {
+		// Append the characters to the existing buffer:
+		rb_str_buf_cat(*buffer, token.begin, token.end - token.begin);
+	}
+}
+
+static inline void Trenni_append_codepoint(VALUE * buffer, rb_encoding * encoding, unsigned long codepoint) {
+	if (*buffer == Qnil) {
+		*buffer = rb_enc_str_new("", 0, encoding);
+	}
+	
+	rb_str_concat(*buffer, ULONG2NUM(codepoint));
+}

data/lib/trenni/fallback/markup.rb

@@ -379,19 +379,19 @@ end
 self._markup_trans_actions = [
 	2, 1, 0, 0, 0, 0, 3, 4, 
 	3, 5, 0, 6, 0, 0, 7, 8, 
-	9, 7, 0, 0, 10, 0, 11, 12, 
-	13, 14, 15, 16, 15, 17, 18, 19, 
-	20, 21, 20, 10, 11, 12, 14, 17, 
-	19, 0, 0, 0, 0, 0, 0, 0, 
+	9, 7, 0, 0, 10, 0, 11, 0, 
+	12, 13, 14, 15, 14, 16, 17, 18, 
+	19, 20, 19, 10, 11, 0, 13, 16, 
+	18, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 2, 0, 9, 2, 25, 0, 26, 
-	0, 27, 0, 28, 0, 29, 29, 0, 
-	0, 30, 29, 0, 31, 0, 32, 33, 
-	34, 35, 12, 14, 37, 17, 19, 39, 
-	41, 42, 43, 45, 46, 47, 49, 50, 
-	51, 53, 54, 55, 57, 58, 59, 61, 
-	62, 63
+	0, 2, 0, 9, 2, 24, 0, 25, 
+	0, 26, 0, 27, 0, 28, 28, 0, 
+	0, 29, 28, 0, 30, 0, 31, 32, 
+	33, 34, 0, 13, 36, 16, 18, 38, 
+	40, 41, 42, 44, 45, 46, 48, 49, 
+	50, 52, 53, 54, 56, 57, 58, 60, 
+	61, 62
 ]
 
 class << self
@@ -401,12 +401,12 @@ end
 self._markup_eof_actions = [
 	0, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 0, 
-	0, 22, 22, 22, 0, 0, 0, 0, 
-	0, 0, 23, 0, 0, 0, 0, 0, 
-	0, 24, 24, 24, 1, 1, 25, 25, 
-	25, 25, 28, 28, 28, 28, 28, 28, 
-	0, 36, 38, 40, 44, 48, 52, 56, 
-	60, 0
+	0, 21, 21, 21, 0, 0, 0, 0, 
+	0, 0, 22, 0, 0, 0, 0, 0, 
+	0, 23, 23, 23, 1, 1, 24, 24, 
+	24, 24, 27, 27, 27, 27, 27, 27, 
+	0, 35, 37, 39, 43, 47, 51, 55, 
+	59, 0
 ]
 
 class << self
@@ -513,53 +513,53 @@ begin
 
 		identifier_end = p
 			end
-	when 18 then
+	when 17 then
 # line 36 "markup.rl"
 		begin
 
 			end
-	when 17 then
-# line 39 "markup.rl"
+	when 16 then
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 28 then
-# line 49 "markup.rl"
+	when 27 then
+# line 56 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse entity", buffer, p)
 			end
-	when 29 then
-# line 53 "markup.rl"
+	when 28 then
+# line 60 "markup.rl"
 		begin
 
 		entity_begin = p
 			end
-	when 27 then
-# line 112 "markup.rl"
+	when 26 then
+# line 119 "markup.rl"
 		begin
 
 			end
-	when 25 then
-# line 119 "markup.rl"
+	when 24 then
+# line 126 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse instruction", buffer, p)
 			end
 	when 6 then
-# line 132 "markup.rl"
+# line 139 "markup.rl"
 		begin
 
 		self_closing = true
 			end
 	when 1 then
-# line 170 "markup.rl"
+# line 177 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse tag", buffer, p)
 			end
-	when 19 then
+	when 18 then
 # line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 		begin
 	begin
@@ -570,13 +570,13 @@ begin
 		next
 	end
 		end
-	when 26 then
+	when 25 then
 # line 28 "markup.rl"
 		begin
 
 		identifier_end = p
 			end
-# line 109 "markup.rl"
+# line 116 "markup.rl"
 		begin
 
 			end
@@ -586,7 +586,7 @@ begin
 
 		identifier_end = p
 			end
-# line 123 "markup.rl"
+# line 130 "markup.rl"
 		begin
 
 		self_closing = false
@@ -599,7 +599,7 @@ begin
 
 		identifier_end = p
 			end
-# line 149 "markup.rl"
+# line 156 "markup.rl"
 		begin
 
 		if has_value
@@ -616,7 +616,7 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
@@ -637,33 +637,20 @@ begin
 		next
 	end
 		end
-	when 13 then
-# line 43 "markup.rl"
-		begin
-
-		characters_end = p
-		
-		pcdata << data.byteslice(characters_begin...characters_end)
-			end
-# line 36 "markup.rl"
-		begin
-
-			end
 	when 12 then
-# line 43 "markup.rl"
+# line 50 "markup.rl"
 		begin
 
 		characters_end = p
 		
 		pcdata << data.byteslice(characters_begin...characters_end)
 			end
-# line 39 "markup.rl"
+# line 36 "markup.rl"
 		begin
 
-		characters_begin = p
 			end
-	when 14 then
-# line 43 "markup.rl"
+	when 13 then
+# line 50 "markup.rl"
 		begin
 
 		characters_end = p
@@ -680,8 +667,8 @@ begin
 		next
 	end
 		end
-	when 32 then
-# line 57 "markup.rl"
+	when 31 then
+# line 64 "markup.rl"
 		begin
 
 		entity_end = p
@@ -699,8 +686,8 @@ begin
 		next
 	end
 		end
-	when 31 then
-# line 65 "markup.rl"
+	when 30 then
+# line 72 "markup.rl"
 		begin
 
 		entity_end = p
@@ -716,8 +703,8 @@ begin
 		next
 	end
 		end
-	when 30 then
-# line 71 "markup.rl"
+	when 29 then
+# line 78 "markup.rl"
 		begin
 
 		entity_end = p
@@ -734,7 +721,7 @@ begin
 	end
 		end
 	when 5 then
-# line 136 "markup.rl"
+# line 143 "markup.rl"
 		begin
 
 		has_value = false
@@ -745,13 +732,13 @@ begin
 
 		identifier_begin = p
 			end
-	when 15 then
-# line 141 "markup.rl"
+	when 14 then
+# line 148 "markup.rl"
 		begin
 
 		has_value = true
 			end
-# line 149 "markup.rl"
+# line 156 "markup.rl"
 		begin
 
 		if has_value
@@ -762,13 +749,13 @@ begin
 		
 		delegate.attribute(data.byteslice(identifier_begin...identifier_end), value)
 			end
-	when 20 then
-# line 145 "markup.rl"
+	when 19 then
+# line 152 "markup.rl"
 		begin
 
 		has_value = true
 			end
-# line 149 "markup.rl"
+# line 156 "markup.rl"
 		begin
 
 		if has_value
@@ -785,14 +772,14 @@ begin
 
 		identifier_end = p
 			end
-# line 123 "markup.rl"
+# line 130 "markup.rl"
 		begin
 
 		self_closing = false
 		
 		delegate.open_tag_begin(data.byteslice(identifier_begin...identifier_end), identifier_begin)
 			end
-# line 132 "markup.rl"
+# line 139 "markup.rl"
 		begin
 
 		self_closing = true
@@ -803,7 +790,7 @@ begin
 
 		identifier_end = p
 			end
-# line 149 "markup.rl"
+# line 156 "markup.rl"
 		begin
 
 		if has_value
@@ -814,40 +801,53 @@ begin
 		
 		delegate.attribute(data.byteslice(identifier_begin...identifier_end), value)
 			end
-# line 132 "markup.rl"
+# line 139 "markup.rl"
 		begin
 
 		self_closing = true
 			end
-	when 16 then
-# line 141 "markup.rl"
+	when 32 then
+# line 39 "markup.rl"
 		begin
 
-		has_value = true
 			end
-# line 149 "markup.rl"
+# line 32 "markup.rl"
 		begin
 
-		if has_value
-			value = pcdata
-		else
-			value = true
-		end
-		
-		delegate.attribute(data.byteslice(identifier_begin...identifier_end), value)
+		pcdata = ""
 			end
-# line 132 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
-		self_closing = true
+		characters_begin = p
 			end
-	when 21 then
-# line 145 "markup.rl"
+	when 33 then
+# line 39 "markup.rl"
+		begin
+
+			end
+# line 32 "markup.rl"
+		begin
+
+		pcdata = ""
+			end
+# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+		begin
+	begin
+		stack[top] = cs
+		top+= 1
+		cs = 42
+		_goto_level = _again
+		next
+	end
+		end
+	when 15 then
+# line 148 "markup.rl"
 		begin
 
 		has_value = true
 			end
-# line 149 "markup.rl"
+# line 156 "markup.rl"
 		begin
 
 		if has_value
@@ -858,55 +858,42 @@ begin
 		
 		delegate.attribute(data.byteslice(identifier_begin...identifier_end), value)
 			end
-# line 132 "markup.rl"
+# line 139 "markup.rl"
 		begin
 
 		self_closing = true
 			end
-	when 33 then
-# line 188 "markup.rl"
-		begin
-
-			end
-# line 32 "markup.rl"
-		begin
-
-		pcdata = ""
-			end
-# line 39 "markup.rl"
+	when 20 then
+# line 152 "markup.rl"
 		begin
 
-		characters_begin = p
+		has_value = true
 			end
-	when 34 then
-# line 188 "markup.rl"
+# line 156 "markup.rl"
 		begin
 
+		if has_value
+			value = pcdata
+		else
+			value = true
+		end
+		
+		delegate.attribute(data.byteslice(identifier_begin...identifier_end), value)
 			end
-# line 32 "markup.rl"
+# line 139 "markup.rl"
 		begin
 
-		pcdata = ""
+		self_closing = true
 			end
-# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
-		begin
-	begin
-		stack[top] = cs
-		top+= 1
-		cs = 42
-		_goto_level = _again
-		next
-	end
-		end
-	when 49 then
-# line 81 "markup.rl"
+	when 48 then
+# line 88 "markup.rl"
 		begin
 
 		doctype_end = p
 		
 		delegate.doctype(data.byteslice(doctype_begin...doctype_end))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -915,20 +902,20 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 50 then
-# line 81 "markup.rl"
+	when 49 then
+# line 88 "markup.rl"
 		begin
 
 		doctype_end = p
 		
 		delegate.doctype(data.byteslice(doctype_begin...doctype_end))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -947,15 +934,15 @@ begin
 		next
 	end
 		end
-	when 45 then
-# line 95 "markup.rl"
+	when 44 then
+# line 102 "markup.rl"
 		begin
 
 		comment_end = p
 		
 		delegate.comment(data.byteslice(comment_begin...comment_end))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -964,20 +951,20 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 46 then
-# line 95 "markup.rl"
+	when 45 then
+# line 102 "markup.rl"
 		begin
 
 		comment_end = p
 		
 		delegate.comment(data.byteslice(comment_begin...comment_end))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -996,13 +983,13 @@ begin
 		next
 	end
 		end
-	when 61 then
-# line 115 "markup.rl"
+	when 60 then
+# line 122 "markup.rl"
 		begin
 
 		delegate.instruction(data.byteslice(instruction_begin, p-instruction_begin))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1011,18 +998,18 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 62 then
-# line 115 "markup.rl"
+	when 61 then
+# line 122 "markup.rl"
 		begin
 
 		delegate.instruction(data.byteslice(instruction_begin, p-instruction_begin))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1041,13 +1028,13 @@ begin
 		next
 	end
 		end
-	when 41 then
-# line 159 "markup.rl"
+	when 40 then
+# line 166 "markup.rl"
 		begin
 
 		delegate.open_tag_end(self_closing)
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1056,18 +1043,18 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 42 then
-# line 159 "markup.rl"
+	when 41 then
+# line 166 "markup.rl"
 		begin
 
 		delegate.open_tag_end(self_closing)
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1086,13 +1073,13 @@ begin
 		next
 	end
 		end
-	when 57 then
-# line 166 "markup.rl"
+	when 56 then
+# line 173 "markup.rl"
 		begin
 
 		delegate.close_tag(data.byteslice(identifier_begin...identifier_end), identifier_begin)
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1101,18 +1088,18 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 58 then
-# line 166 "markup.rl"
+	when 57 then
+# line 173 "markup.rl"
 		begin
 
 		delegate.close_tag(data.byteslice(identifier_begin...identifier_end), identifier_begin)
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1131,15 +1118,15 @@ begin
 		next
 	end
 		end
-	when 53 then
-# line 178 "markup.rl"
+	when 52 then
+# line 185 "markup.rl"
 		begin
 
 		cdata_end = p
 		
 		delegate.cdata(data.byteslice(cdata_begin...cdata_end))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1148,20 +1135,20 @@ begin
 
 		pcdata = ""
 			end
-# line 39 "markup.rl"
+# line 46 "markup.rl"
 		begin
 
 		characters_begin = p
 			end
-	when 54 then
-# line 178 "markup.rl"
+	when 53 then
+# line 185 "markup.rl"
 		begin
 
 		cdata_end = p
 		
 		delegate.cdata(data.byteslice(cdata_begin...cdata_end))
 			end
-# line 188 "markup.rl"
+# line 39 "markup.rl"
 		begin
 
 			end
@@ -1180,285 +1167,285 @@ begin
 		next
 	end
 		end
-	when 35 then
-# line 129 "markup.rl"
+	when 34 then
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 51 then
-# line 81 "markup.rl"
+	when 50 then
+# line 88 "markup.rl"
 		begin
 
 		doctype_end = p
 		
 		delegate.doctype(data.byteslice(doctype_begin...doctype_end))
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 47 then
-# line 95 "markup.rl"
+	when 46 then
+# line 102 "markup.rl"
 		begin
 
 		comment_end = p
 		
 		delegate.comment(data.byteslice(comment_begin...comment_end))
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 63 then
-# line 115 "markup.rl"
+	when 62 then
+# line 122 "markup.rl"
 		begin
 
 		delegate.instruction(data.byteslice(instruction_begin, p-instruction_begin))
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 43 then
-# line 159 "markup.rl"
+	when 42 then
+# line 166 "markup.rl"
 		begin
 
 		delegate.open_tag_end(self_closing)
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 59 then
-# line 166 "markup.rl"
+	when 58 then
+# line 173 "markup.rl"
 		begin
 
 		delegate.close_tag(data.byteslice(identifier_begin...identifier_end), identifier_begin)
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 55 then
-# line 178 "markup.rl"
+	when 54 then
+# line 185 "markup.rl"
 		begin
 
 		cdata_end = p
 		
 		delegate.cdata(data.byteslice(cdata_begin...cdata_end))
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 39 then
+	when 38 then
 # line 36 "markup.rl"
 		begin
 
 			end
-# line 191 "markup.rl"
+# line 42 "markup.rl"
 		begin
 
 		delegate.text(pcdata)
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-	when 37 then
-# line 43 "markup.rl"
+	when 36 then
+# line 50 "markup.rl"
 		begin
 
 		characters_end = p
@@ -1469,40 +1456,40 @@ begin
 		begin
 
 			end
-# line 191 "markup.rl"
+# line 42 "markup.rl"
 		begin
 
 		delegate.text(pcdata)
 			end
-# line 129 "markup.rl"
+# line 136 "markup.rl"
 		begin
 
 			end
-# line 163 "markup.rl"
+# line 170 "markup.rl"
 		begin
 
 			end
-# line 105 "markup.rl"
+# line 112 "markup.rl"
 		begin
 
 		instruction_begin = p
 			end
-# line 91 "markup.rl"
+# line 98 "markup.rl"
 		begin
 
 		comment_begin = p
 			end
-# line 77 "markup.rl"
+# line 84 "markup.rl"
 		begin
 
 		doctype_begin = p
 			end
-# line 174 "markup.rl"
+# line 181 "markup.rl"
 		begin
 
 		cdata_begin = p
 			end
-# line 1506 "markup.rb"
+# line 1493 "markup.rb"
 	end
 	end
 	end
@@ -1520,96 +1507,96 @@ begin
 	if _goto_level <= _test_eof
 	if p == eof
 	  case _markup_eof_actions[cs]
-	when 28 then
-# line 49 "markup.rl"
+	when 27 then
+# line 56 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse entity", buffer, p)
 			end
-	when 48 then
-# line 81 "markup.rl"
+	when 47 then
+# line 88 "markup.rl"
 		begin
 
 		doctype_end = p
 		
 		delegate.doctype(data.byteslice(doctype_begin...doctype_end))
 			end
-	when 23 then
-# line 87 "markup.rl"
+	when 22 then
+# line 94 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse doctype", buffer, p)
 			end
-	when 44 then
-# line 95 "markup.rl"
+	when 43 then
+# line 102 "markup.rl"
 		begin
 
 		comment_end = p
 		
 		delegate.comment(data.byteslice(comment_begin...comment_end))
 			end
-	when 22 then
-# line 101 "markup.rl"
+	when 21 then
+# line 108 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse comment", buffer, p)
 			end
-	when 60 then
-# line 115 "markup.rl"
+	when 59 then
+# line 122 "markup.rl"
 		begin
 
 		delegate.instruction(data.byteslice(instruction_begin, p-instruction_begin))
 			end
-	when 25 then
-# line 119 "markup.rl"
+	when 24 then
+# line 126 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse instruction", buffer, p)
 			end
-	when 40 then
-# line 159 "markup.rl"
+	when 39 then
+# line 166 "markup.rl"
 		begin
 
 		delegate.open_tag_end(self_closing)
 			end
-	when 56 then
-# line 166 "markup.rl"
+	when 55 then
+# line 173 "markup.rl"
 		begin
 
 		delegate.close_tag(data.byteslice(identifier_begin...identifier_end), identifier_begin)
 			end
 	when 1 then
-# line 170 "markup.rl"
+# line 177 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse tag", buffer, p)
 			end
-	when 52 then
-# line 178 "markup.rl"
+	when 51 then
+# line 185 "markup.rl"
 		begin
 
 		cdata_end = p
 		
 		delegate.cdata(data.byteslice(cdata_begin...cdata_end))
 			end
-	when 24 then
-# line 184 "markup.rl"
+	when 23 then
+# line 191 "markup.rl"
 		begin
 
 		raise ParseError.new("could not parse cdata", buffer, p)
 			end
-	when 38 then
+	when 37 then
 # line 36 "markup.rl"
 		begin
 
 			end
-# line 191 "markup.rl"
+# line 42 "markup.rl"
 		begin
 
 		delegate.text(pcdata)
 			end
-	when 36 then
-# line 43 "markup.rl"
+	when 35 then
+# line 50 "markup.rl"
 		begin
 
 		characters_end = p
@@ -1620,12 +1607,12 @@ begin
 		begin
 
 			end
-# line 191 "markup.rl"
+# line 42 "markup.rl"
 		begin
 
 		delegate.text(pcdata)
 			end
-# line 1629 "markup.rb"
+# line 1616 "markup.rb"
 	  end
 	end