oga 0.3.1-java → 0.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac227c01680fb6b04932a7715c113e2fc09b1c62
-  data.tar.gz: 412ab533e651333c671442239e7165ba3bbec2e7
+  metadata.gz: 0a605ea6e3855cdb7db99e954d314f251b453865
+  data.tar.gz: 79a7612cce7622c0ace935ef9942cfdf1f8fe4fe
 SHA512:
-  metadata.gz: 7daa67d63f5148e7894bd03df2f6a85562a5f9a08eee09388ce41f5a510896e65f7fe5c6a582d46b6efac8399050ed752bd5a33b6494a4fd11ffa1a4b598b523
-  data.tar.gz: 12a94c68692f33941c0d040ea576537e0eb3e6dcc3326c7f7f4ad6664282688fc2b454e2b3b3bc27864a8f60d36d9424032c25f6ee24e95ab6d988426aaf91d3
+  metadata.gz: f9f5aca265b4ebfae680e3f23e03b28b41ce526e9fe93dc9f5ad486fd80409a59f9784a3f0651e394c763546770af12e3ffdc66331749bde317c681fa77e0eb0
+  data.tar.gz: 91d5e28c3ab6f50aa1fac0db192c43cba5e0667f729dcdebcce6012cb399b2ca6329ff29b9de354d859aa988646cca24c0af7c80dfe1379c7fc1b984c3366308

data/ext/c/lexer.c

@@ -26,9 +26,10 @@ on `ts` and `te`) so the macro ignores this argument.
 
 ID id_advance_line;
 ID id_literal_html_element_p;
+ID id_html;
 
 
-#line 29 "ext/c/lexer.rl"
+#line 30 "ext/c/lexer.rl"
 
 /**
  * Calls a method defined in the Ruby side of the lexer. The String value is
@@ -65,25 +66,29 @@ void liboga_xml_lexer_callback_simple(VALUE self, VALUE name)
 }
 
 
-#line 69 "ext/c/lexer.c"
-static const int c_lexer_start = 26;
-static const int c_lexer_first_final = 26;
+#line 70 "ext/c/lexer.c"
+static const int c_lexer_start = 22;
+static const int c_lexer_first_final = 22;
 static const int c_lexer_error = 0;
 
-static const int c_lexer_en_proc_ins_body = 32;
-static const int c_lexer_en_string_squote = 34;
-static const int c_lexer_en_string_dquote = 36;
-static const int c_lexer_en_doctype_inline = 38;
-static const int c_lexer_en_doctype = 40;
-static const int c_lexer_en_xml_decl = 52;
-static const int c_lexer_en_element_name = 55;
-static const int c_lexer_en_element_head = 57;
-static const int c_lexer_en_text = 60;
-static const int c_lexer_en_literal_html_element = 64;
-static const int c_lexer_en_main = 26;
-
-
-#line 65 "ext/c/lexer.rl"
+static const int c_lexer_en_comment_body = 28;
+static const int c_lexer_en_cdata_body = 31;
+static const int c_lexer_en_proc_ins_body = 34;
+static const int c_lexer_en_string_squote = 37;
+static const int c_lexer_en_string_dquote = 39;
+static const int c_lexer_en_doctype_inline = 41;
+static const int c_lexer_en_doctype = 43;
+static const int c_lexer_en_xml_decl = 55;
+static const int c_lexer_en_element_name = 58;
+static const int c_lexer_en_html_attribute_value = 60;
+static const int c_lexer_en_xml_attribute_value = 62;
+static const int c_lexer_en_element_head = 63;
+static const int c_lexer_en_text = 66;
+static const int c_lexer_en_literal_html_element = 70;
+static const int c_lexer_en_main = 22;
+
+
+#line 66 "ext/c/lexer.rl"
 
 /**
  * Lexes the String specifies as the method argument. Token values have the
@@ -97,6 +102,9 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     OgaLexerState *state;
     int lines;
 
+    /* Whether or not HTML mode is enabled */
+    int html_p = rb_funcall(self, id_html, 0) == Qtrue;
+
     /* Make sure that all data passed back to Ruby has the proper encoding. */
     rb_encoding *encoding = rb_enc_get(data_block);
 
@@ -112,8 +120,12 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     ID id_advance_line        = rb_intern("advance_line");
     ID id_on_attribute        = rb_intern("on_attribute");
     ID id_on_attribute_ns     = rb_intern("on_attribute_ns");
-    ID id_on_cdata            = rb_intern("on_cdata");
-    ID id_on_comment          = rb_intern("on_comment");
+    ID id_on_cdata_start      = rb_intern("on_cdata_start");
+    ID id_on_cdata_body       = rb_intern("on_cdata_body");
+    ID id_on_cdata_end        = rb_intern("on_cdata_end");
+    ID id_on_comment_start    = rb_intern("on_comment_start");
+    ID id_on_comment_body     = rb_intern("on_comment_body");
+    ID id_on_comment_end      = rb_intern("on_comment_end");
     ID id_on_doctype_end      = rb_intern("on_doctype_end");
     ID id_on_doctype_inline   = rb_intern("on_doctype_inline");
     ID id_on_doctype_name     = rb_intern("on_doctype_name");
@@ -127,6 +139,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     ID id_on_proc_ins_end     = rb_intern("on_proc_ins_end");
     ID id_on_proc_ins_name    = rb_intern("on_proc_ins_name");
     ID id_on_proc_ins_start   = rb_intern("on_proc_ins_start");
+    ID id_on_proc_ins_body    = rb_intern("on_proc_ins_body");
     ID id_on_string_body      = rb_intern("on_string_body");
     ID id_on_string_dquote    = rb_intern("on_string_dquote");
     ID id_on_string_squote    = rb_intern("on_string_squote");
@@ -139,7 +152,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     lines = state->lines;
 
     
-#line 143 "ext/c/lexer.c"
+#line 156 "ext/c/lexer.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -147,8 +160,8 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 
 _again:
 	switch ( ( state->cs) ) {
-		case 26: goto st26;
-		case 27: goto st27;
+		case 22: goto st22;
+		case 23: goto st23;
 		case 1: goto st1;
 		case 2: goto st2;
 		case 3: goto st3;
@@ -158,27 +171,27 @@ _again:
 		case 7: goto st7;
 		case 8: goto st8;
 		case 9: goto st9;
+		case 24: goto st24;
 		case 10: goto st10;
 		case 11: goto st11;
 		case 12: goto st12;
-		case 28: goto st28;
 		case 13: goto st13;
 		case 14: goto st14;
 		case 15: goto st15;
 		case 16: goto st16;
 		case 17: goto st17;
 		case 18: goto st18;
-		case 19: goto st19;
-		case 20: goto st20;
-		case 21: goto st21;
-		case 22: goto st22;
-		case 23: goto st23;
-		case 24: goto st24;
+		case 25: goto st25;
+		case 26: goto st26;
+		case 27: goto st27;
+		case 28: goto st28;
 		case 29: goto st29;
 		case 30: goto st30;
+		case 19: goto st19;
 		case 31: goto st31;
 		case 32: goto st32;
 		case 33: goto st33;
+		case 20: goto st20;
 		case 34: goto st34;
 		case 35: goto st35;
 		case 36: goto st36;
@@ -186,10 +199,10 @@ _again:
 		case 38: goto st38;
 		case 39: goto st39;
 		case 40: goto st40;
-		case 0: goto st0;
 		case 41: goto st41;
 		case 42: goto st42;
 		case 43: goto st43;
+		case 0: goto st0;
 		case 44: goto st44;
 		case 45: goto st45;
 		case 46: goto st46;
@@ -206,13 +219,13 @@ _again:
 		case 57: goto st57;
 		case 58: goto st58;
 		case 59: goto st59;
-		case 25: goto st25;
 		case 60: goto st60;
 		case 61: goto st61;
 		case 62: goto st62;
 		case 63: goto st63;
 		case 64: goto st64;
 		case 65: goto st65;
+		case 21: goto st21;
 		case 66: goto st66;
 		case 67: goto st67;
 		case 68: goto st68;
@@ -224,6 +237,12 @@ _again:
 		case 74: goto st74;
 		case 75: goto st75;
 		case 76: goto st76;
+		case 77: goto st77;
+		case 78: goto st78;
+		case 79: goto st79;
+		case 80: goto st80;
+		case 81: goto st81;
+		case 82: goto st82;
 	default: break;
 	}
 
@@ -233,145 +252,147 @@ _resume:
 	switch ( ( state->cs) )
 	{
 tr0:
-	( state->cs) = 26;
-#line 356 "ext/ragel/base_lexer.rl"
+	( state->cs) = 22;
+#line 471 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( state->cs) = 60;
+        ( state->cs) = 66;
     }}
 	goto _again;
-tr7:
-#line 72 "ext/ragel/base_lexer.rl"
+tr4:
+	( state->cs) = 22;
+#line 74 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback(id_on_comment, data, encoding, ts + 4, te - 3);
+        callback_simple(id_on_comment_start);
+
+        ( state->cs) = 28;
     }}
-	goto st26;
-tr23:
-#line 88 "ext/ragel/base_lexer.rl"
+	goto _again;
+tr17:
+	( state->cs) = 22;
+#line 113 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback(id_on_cdata, data, encoding, ts + 9, te - 3);
+        callback_simple(id_on_cdata_start);
+
+        ( state->cs) = 31;
     }}
-	goto st26;
-tr26:
-#line 289 "ext/ragel/base_lexer.rl"
+	goto _again;
+tr20:
+#line 357 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
-	goto st26;
-tr31:
-	( state->cs) = 26;
-#line 356 "ext/ragel/base_lexer.rl"
+	goto st22;
+tr29:
+	( state->cs) = 22;
+#line 471 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 60;
+        ( state->cs) = 66;
     }}
 	goto _again;
-tr33:
-	( state->cs) = 26;
-#line 356 "ext/ragel/base_lexer.rl"
+tr31:
+	( state->cs) = 22;
+#line 471 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( state->cs) = 60;
+        ( state->cs) = 66;
     }}
 	goto _again;
-tr35:
-	( state->cs) = 26;
-#line 283 "ext/ragel/base_lexer.rl"
+tr33:
+	( state->cs) = 22;
+#line 351 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_start);
         p--;
-        ( state->cs) = 55;
+        ( state->cs) = 58;
     }}
 	goto _again;
-tr37:
-	( state->cs) = 26;
-#line 192 "ext/ragel/base_lexer.rl"
+tr35:
+	( state->cs) = 22;
+#line 245 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
-        ( state->cs) = 40;
+        ( state->cs) = 43;
     }}
 	goto _again;
-tr38:
-	( state->cs) = 26;
+tr36:
+	( state->cs) = 22;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 36:
+	case 45:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( state->cs) = 52;
+        ( state->cs) = 55;
     }
 	break;
-	case 39:
+	case 48:
 	{{p = ((te))-1;}
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
 
-        mark = te;
-
-        ( state->cs) = 32;
+        ( state->cs) = 34;
     }
 	break;
 	}
 	}
 	goto _again;
-tr39:
-	( state->cs) = 26;
-#line 106 "ext/ragel/base_lexer.rl"
+tr37:
+	( state->cs) = 22;
+#line 155 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
 
-        mark = te;
-
-        ( state->cs) = 32;
+        ( state->cs) = 34;
     }}
 	goto _again;
-st26:
+st22:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
+		goto _test_eof22;
+case 22:
 #line 1 "NONE"
 	{ts = p;}
-#line 338 "ext/c/lexer.c"
+#line 359 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr32;
-	goto tr31;
-tr32:
+		goto tr30;
+	goto tr29;
+tr30:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st27;
-st27:
+	goto st23;
+st23:
 	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
-#line 350 "ext/c/lexer.c"
+		goto _test_eof23;
+case 23:
+#line 371 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
-		case 45: goto tr35;
-		case 47: goto st22;
-		case 63: goto st24;
-		case 95: goto tr35;
+		case 45: goto tr33;
+		case 47: goto st16;
+		case 63: goto st18;
+		case 95: goto tr33;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr35;
+			goto tr33;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr35;
+			goto tr33;
 	} else
-		goto tr35;
-	goto tr33;
+		goto tr33;
+	goto tr31;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
 	switch( (*p) ) {
 		case 45: goto st2;
-		case 68: goto st6;
-		case 91: goto st13;
-		case 100: goto st6;
+		case 68: goto st3;
+		case 91: goto st10;
+		case 100: goto st3;
 	}
 	goto tr0;
 st2:
@@ -379,38 +400,42 @@ st2:
 		goto _test_eof2;
 case 2:
 	if ( (*p) == 45 )
-		goto st3;
+		goto tr4;
 	goto tr0;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-	if ( (*p) == 45 )
-		goto st4;
-	goto st3;
+	switch( (*p) ) {
+		case 79: goto st4;
+		case 111: goto st4;
+	}
+	goto tr0;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-	if ( (*p) == 45 )
-		goto st5;
-	goto st3;
+	switch( (*p) ) {
+		case 67: goto st5;
+		case 99: goto st5;
+	}
+	goto tr0;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
 	switch( (*p) ) {
-		case 45: goto st5;
-		case 62: goto tr7;
+		case 84: goto st6;
+		case 116: goto st6;
 	}
-	goto st3;
+	goto tr0;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
 	switch( (*p) ) {
-		case 79: goto st7;
-		case 111: goto st7;
+		case 89: goto st7;
+		case 121: goto st7;
 	}
 	goto tr0;
 st7:
@@ -418,8 +443,8 @@ st7:
 		goto _test_eof7;
 case 7:
 	switch( (*p) ) {
-		case 67: goto st8;
-		case 99: goto st8;
+		case 80: goto st8;
+		case 112: goto st8;
 	}
 	goto tr0;
 st8:
@@ -427,8 +452,8 @@ st8:
 		goto _test_eof8;
 case 8:
 	switch( (*p) ) {
-		case 84: goto st9;
-		case 116: goto st9;
+		case 69: goto st9;
+		case 101: goto st9;
 	}
 	goto tr0;
 st9:
@@ -436,327 +461,421 @@ st9:
 		goto _test_eof9;
 case 9:
 	switch( (*p) ) {
-		case 89: goto st10;
-		case 121: goto st10;
+		case 9: goto st24;
+		case 32: goto st24;
 	}
 	goto tr0;
+st24:
+	if ( ++p == pe )
+		goto _test_eof24;
+case 24:
+	switch( (*p) ) {
+		case 9: goto st24;
+		case 32: goto st24;
+	}
+	goto tr35;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-	switch( (*p) ) {
-		case 80: goto st11;
-		case 112: goto st11;
-	}
+	if ( (*p) == 67 )
+		goto st11;
 	goto tr0;
 st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-	switch( (*p) ) {
-		case 69: goto st12;
-		case 101: goto st12;
-	}
+	if ( (*p) == 68 )
+		goto st12;
 	goto tr0;
 st12:
 	if ( ++p == pe )
 		goto _test_eof12;
 case 12:
-	switch( (*p) ) {
-		case 9: goto st28;
-		case 32: goto st28;
-	}
+	if ( (*p) == 65 )
+		goto st13;
 	goto tr0;
-st28:
-	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
-	switch( (*p) ) {
-		case 9: goto st28;
-		case 32: goto st28;
-	}
-	goto tr37;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-	if ( (*p) == 67 )
+	if ( (*p) == 84 )
 		goto st14;
 	goto tr0;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-	if ( (*p) == 68 )
+	if ( (*p) == 65 )
 		goto st15;
 	goto tr0;
 st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-	if ( (*p) == 65 )
-		goto st16;
+	if ( (*p) == 91 )
+		goto tr17;
 	goto tr0;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-	if ( (*p) == 84 )
-		goto st17;
-	goto tr0;
-st17:
-	if ( ++p == pe )
-		goto _test_eof17;
-case 17:
-	if ( (*p) == 65 )
-		goto st18;
-	goto tr0;
-st18:
-	if ( ++p == pe )
-		goto _test_eof18;
-case 18:
-	if ( (*p) == 91 )
-		goto st19;
-	goto tr0;
-st19:
-	if ( ++p == pe )
-		goto _test_eof19;
-case 19:
-	if ( (*p) == 93 )
-		goto st20;
-	goto st19;
-st20:
-	if ( ++p == pe )
-		goto _test_eof20;
-case 20:
-	if ( (*p) == 93 )
-		goto st21;
-	goto st19;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-	switch( (*p) ) {
-		case 62: goto tr23;
-		case 93: goto st21;
-	}
-	goto st19;
-st22:
-	if ( ++p == pe )
-		goto _test_eof22;
-case 22:
 	switch( (*p) ) {
-		case 45: goto st23;
-		case 95: goto st23;
+		case 45: goto st17;
+		case 95: goto st17;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st23;
+			goto st17;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st23;
+			goto st17;
 	} else
-		goto st23;
+		goto st17;
 	goto tr0;
-st23:
+st17:
 	if ( ++p == pe )
-		goto _test_eof23;
-case 23:
+		goto _test_eof17;
+case 17:
 	switch( (*p) ) {
-		case 45: goto st23;
-		case 58: goto st22;
-		case 62: goto tr26;
-		case 95: goto st23;
+		case 45: goto st17;
+		case 58: goto st16;
+		case 62: goto tr20;
+		case 95: goto st17;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st23;
+			goto st17;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st23;
+			goto st17;
 	} else
-		goto st23;
+		goto st17;
 	goto tr0;
-st24:
+st18:
 	if ( ++p == pe )
-		goto _test_eof24;
-case 24:
+		goto _test_eof18;
+case 18:
 	switch( (*p) ) {
-		case 45: goto tr27;
-		case 95: goto tr27;
-		case 120: goto st30;
+		case 45: goto tr21;
+		case 95: goto tr21;
+		case 120: goto st26;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr27;
+			goto tr21;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr27;
+			goto tr21;
 	} else
-		goto tr27;
+		goto tr21;
 	goto tr0;
-tr27:
+tr21:
 #line 1 "NONE"
 	{te = p+1;}
-#line 106 "ext/ragel/base_lexer.rl"
-	{( state->act) = 39;}
-	goto st29;
-tr41:
+#line 155 "ext/ragel/base_lexer.rl"
+	{( state->act) = 48;}
+	goto st25;
+tr39:
 #line 1 "NONE"
 	{te = p+1;}
-#line 248 "ext/ragel/base_lexer.rl"
-	{( state->act) = 36;}
-	goto st29;
-st29:
+#line 301 "ext/ragel/base_lexer.rl"
+	{( state->act) = 45;}
+	goto st25;
+st25:
 	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
-#line 615 "ext/c/lexer.c"
+		goto _test_eof25;
+case 25:
+#line 590 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr27;
-		case 95: goto tr27;
+		case 45: goto tr21;
+		case 95: goto tr21;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr27;
+			goto tr21;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr27;
+			goto tr21;
 	} else
-		goto tr27;
-	goto tr38;
-st30:
+		goto tr21;
+	goto tr36;
+st26:
 	if ( ++p == pe )
-		goto _test_eof30;
-case 30:
+		goto _test_eof26;
+case 26:
 	switch( (*p) ) {
-		case 45: goto tr27;
-		case 95: goto tr27;
-		case 109: goto st31;
+		case 45: goto tr21;
+		case 95: goto tr21;
+		case 109: goto st27;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr27;
+			goto tr21;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr27;
+			goto tr21;
 	} else
-		goto tr27;
-	goto tr39;
-st31:
+		goto tr21;
+	goto tr37;
+st27:
 	if ( ++p == pe )
-		goto _test_eof31;
-case 31:
+		goto _test_eof27;
+case 27:
 	switch( (*p) ) {
-		case 45: goto tr27;
-		case 95: goto tr27;
-		case 108: goto tr41;
+		case 45: goto tr21;
+		case 95: goto tr21;
+		case 108: goto tr39;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr27;
+			goto tr21;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr27;
+			goto tr21;
 	} else
-		goto tr27;
-	goto tr39;
-tr42:
-#line 125 "ext/ragel/base_lexer.rl"
-	{te = p+1;}
-	goto st32;
-tr44:
-#line 125 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
-	goto st32;
-tr45:
-	( state->cs) = 32;
-#line 116 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-            callback(id_on_text, data, encoding, mark, ts);
-            callback_simple(id_on_proc_ins_end);
+		goto tr21;
+	goto tr37;
+tr23:
+#line 81 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}{
+            callback(id_on_comment_body, data, encoding, ts, te);
 
-            mark = 0;
+            if ( lines > 0 )
+            {
+                advance_line(lines);
 
-            ( state->cs) = 26;
+                lines = 0;
+            }
         }}
-	goto _again;
-st32:
-#line 1 "NONE"
-	{ts = 0;}
-	if ( ++p == pe )
-		goto _test_eof32;
-case 32:
-#line 1 "NONE"
-	{ts = p;}
-#line 693 "ext/c/lexer.c"
-	if ( (*p) == 63 )
-		goto st33;
-	goto tr42;
-st33:
-	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
-	if ( (*p) == 62 )
-		goto tr45;
-	goto tr44;
-tr47:
-#line 163 "ext/ragel/base_lexer.rl"
+	goto st28;
+tr24:
+	( state->cs) = 28;
+#line 92 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback_simple(id_on_string_squote);
+            callback_simple(id_on_comment_end);
 
-            {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
+            ( state->cs) = 22;
         }}
-	goto st34;
-tr48:
-#line 137 "ext/ragel/base_lexer.rl"
+	goto _again;
+tr42:
+#line 81 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
-        callback(id_on_string_body, data, encoding, ts, te);
+            callback(id_on_comment_body, data, encoding, ts, te);
 
-        if ( lines > 0 )
-        {
-            advance_line(lines);
+            if ( lines > 0 )
+            {
+                advance_line(lines);
 
-            lines = 0;
-        }
-    }}
-	goto st34;
-st34:
+                lines = 0;
+            }
+        }}
+	goto st28;
+st28:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
+		goto _test_eof28;
+case 28:
 #line 1 "NONE"
 	{ts = p;}
-#line 733 "ext/c/lexer.c"
-	if ( (*p) == 39 )
-		goto tr47;
-	goto tr46;
-tr46:
+#line 683 "ext/c/lexer.c"
+	if ( (*p) == 45 )
+		goto tr41;
+	goto tr40;
+tr40:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st35;
-st35:
+	goto st29;
+st29:
 	if ( ++p == pe )
-		goto _test_eof35;
-case 35:
-#line 747 "ext/c/lexer.c"
-	if ( (*p) == 39 )
-		goto tr48;
-	goto tr46;
-tr50:
-#line 173 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-            callback_simple(id_on_string_dquote);
-
-            {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
-        }}
-	goto st36;
+		goto _test_eof29;
+case 29:
+#line 697 "ext/c/lexer.c"
+	if ( (*p) == 45 )
+		goto tr42;
+	goto tr40;
+tr41:
+#line 1 "NONE"
+	{te = p+1;}
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st30;
+st30:
+	if ( ++p == pe )
+		goto _test_eof30;
+case 30:
+#line 713 "ext/c/lexer.c"
+	if ( (*p) == 45 )
+		goto st19;
+	goto tr42;
+st19:
+	if ( ++p == pe )
+		goto _test_eof19;
+case 19:
+	if ( (*p) == 62 )
+		goto tr24;
+	goto tr23;
+tr25:
+#line 120 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}{
+            callback(id_on_cdata_body, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }}
+	goto st31;
+tr26:
+	( state->cs) = 31;
+#line 131 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_cdata_end);
+
+            ( state->cs) = 22;
+        }}
+	goto _again;
+tr46:
+#line 120 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_cdata_body, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }}
+	goto st31;
+st31:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof31;
+case 31:
+#line 1 "NONE"
+	{ts = p;}
+#line 767 "ext/c/lexer.c"
+	if ( (*p) == 93 )
+		goto tr45;
+	goto tr44;
+tr44:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st32;
+st32:
+	if ( ++p == pe )
+		goto _test_eof32;
+case 32:
+#line 781 "ext/c/lexer.c"
+	if ( (*p) == 93 )
+		goto tr46;
+	goto tr44;
+tr45:
+#line 1 "NONE"
+	{te = p+1;}
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st33;
+st33:
+	if ( ++p == pe )
+		goto _test_eof33;
+case 33:
+#line 797 "ext/c/lexer.c"
+	if ( (*p) == 93 )
+		goto st20;
+	goto tr46;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
+	if ( (*p) == 62 )
+		goto tr26;
+	goto tr25;
+tr50:
+#line 163 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_proc_ins_body, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }}
+	goto st34;
 tr51:
-#line 137 "ext/ragel/base_lexer.rl"
+	( state->cs) = 34;
+#line 174 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_proc_ins_end);
+
+            ( state->cs) = 22;
+        }}
+	goto _again;
+st34:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof34;
+case 34:
+#line 1 "NONE"
+	{ts = p;}
+#line 838 "ext/c/lexer.c"
+	if ( (*p) == 63 )
+		goto tr49;
+	goto tr48;
+tr48:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st35;
+st35:
+	if ( ++p == pe )
+		goto _test_eof35;
+case 35:
+#line 852 "ext/c/lexer.c"
+	if ( (*p) == 63 )
+		goto tr50;
+	goto tr48;
+tr49:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st36;
+st36:
+	if ( ++p == pe )
+		goto _test_eof36;
+case 36:
+#line 866 "ext/c/lexer.c"
+	if ( (*p) == 62 )
+		goto tr51;
+	goto tr50;
+tr53:
+#line 216 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_string_squote);
+
+            {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
+        }}
+	goto st37;
+tr54:
+#line 190 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -767,40 +886,87 @@ tr51:
             lines = 0;
         }
     }}
-	goto st36;
-st36:
+	goto st37;
+st37:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof36;
-case 36:
+		goto _test_eof37;
+case 37:
+#line 1 "NONE"
+	{ts = p;}
+#line 899 "ext/c/lexer.c"
+	if ( (*p) == 39 )
+		goto tr53;
+	goto tr52;
+tr52:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st38;
+st38:
+	if ( ++p == pe )
+		goto _test_eof38;
+case 38:
+#line 913 "ext/c/lexer.c"
+	if ( (*p) == 39 )
+		goto tr54;
+	goto tr52;
+tr56:
+#line 226 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_string_dquote);
+
+            {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
+        }}
+	goto st39;
+tr57:
+#line 190 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        callback(id_on_string_body, data, encoding, ts, te);
+
+        if ( lines > 0 )
+        {
+            advance_line(lines);
+
+            lines = 0;
+        }
+    }}
+	goto st39;
+st39:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof39;
+case 39:
 #line 1 "NONE"
 	{ts = p;}
-#line 780 "ext/c/lexer.c"
+#line 946 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr50;
-	goto tr49;
-tr49:
+		goto tr56;
+	goto tr55;
+tr55:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st37;
-st37:
+	goto st40;
+st40:
 	if ( ++p == pe )
-		goto _test_eof37;
-case 37:
-#line 794 "ext/c/lexer.c"
+		goto _test_eof40;
+case 40:
+#line 960 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr51;
-	goto tr49;
-tr53:
-	( state->cs) = 38;
-#line 210 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 40; }}
+		goto tr57;
+	goto tr55;
+tr59:
+	( state->cs) = 41;
+#line 263 "ext/ragel/base_lexer.rl"
+	{te = p+1;{ ( state->cs) = 43; }}
 	goto _again;
-tr54:
-#line 199 "ext/ragel/base_lexer.rl"
+tr60:
+#line 252 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
 
@@ -811,606 +977,746 @@ tr54:
                 lines = 0;
             }
         }}
-	goto st38;
-st38:
+	goto st41;
+st41:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof38;
-case 38:
+		goto _test_eof41;
+case 41:
 #line 1 "NONE"
 	{ts = p;}
-#line 824 "ext/c/lexer.c"
+#line 990 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr53;
-	goto tr52;
-tr52:
+		goto tr59;
+	goto tr58;
+tr58:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st39;
-st39:
+	goto st42;
+st42:
 	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
-#line 838 "ext/c/lexer.c"
+		goto _test_eof42;
+case 42:
+#line 1004 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr54;
-	goto tr52;
-tr55:
-#line 229 "ext/ragel/base_lexer.rl"
+		goto tr60;
+	goto tr58;
+tr61:
+#line 282 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st40;
-tr56:
-#line 154 "ext/ragel/base_lexer.rl"
+	goto st43;
+tr62:
+#line 207 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 40; goto st36;}
+        {( state->stack)[( state->top)++] = 43; goto st39;}
     }}
-	goto st40;
-tr57:
-#line 148 "ext/ragel/base_lexer.rl"
+	goto st43;
+tr63:
+#line 201 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 40; goto st34;}
+        {( state->stack)[( state->top)++] = 43; goto st37;}
     }}
-	goto st40;
-tr59:
-	( state->cs) = 40;
-#line 235 "ext/ragel/base_lexer.rl"
+	goto st43;
+tr65:
+	( state->cs) = 43;
+#line 288 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( state->cs) = 26;
+            ( state->cs) = 22;
         }}
 	goto _again;
-tr62:
-	( state->cs) = 40;
-#line 221 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 38; }}
+tr68:
+	( state->cs) = 43;
+#line 274 "ext/ragel/base_lexer.rl"
+	{te = p+1;{ ( state->cs) = 41; }}
 	goto _again;
-tr63:
+tr69:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 9:
+	case 13:
 	{{p = ((te))-1;}
             callback(id_on_doctype_type, data, encoding, ts, te);
         }
 	break;
-	case 14:
+	case 18:
 	{{p = ((te))-1;}
             callback(id_on_doctype_name, data, encoding, ts, te);
         }
 	break;
 	}
 	}
-	goto st40;
-tr64:
-#line 231 "ext/ragel/base_lexer.rl"
+	goto st43;
+tr70:
+#line 284 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
-	goto st40;
-st40:
+	goto st43;
+st43:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof40;
-case 40:
+		goto _test_eof43;
+case 43:
 #line 1 "NONE"
 	{ts = p;}
-#line 905 "ext/c/lexer.c"
+#line 1071 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr55;
-		case 32: goto tr55;
-		case 34: goto tr56;
-		case 39: goto tr57;
-		case 45: goto tr58;
-		case 62: goto tr59;
-		case 80: goto st42;
-		case 83: goto st47;
-		case 91: goto tr62;
-		case 95: goto tr58;
+		case 9: goto tr61;
+		case 32: goto tr61;
+		case 34: goto tr62;
+		case 39: goto tr63;
+		case 45: goto tr64;
+		case 62: goto tr65;
+		case 80: goto st45;
+		case 83: goto st50;
+		case 91: goto tr68;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
+		goto tr64;
 	goto st0;
 st0:
 ( state->cs) = 0;
 	goto _out;
-tr58:
+tr64:
 #line 1 "NONE"
 	{te = p+1;}
-#line 231 "ext/ragel/base_lexer.rl"
-	{( state->act) = 14;}
-	goto st41;
-tr69:
+#line 284 "ext/ragel/base_lexer.rl"
+	{( state->act) = 18;}
+	goto st44;
+tr75:
 #line 1 "NONE"
 	{te = p+1;}
-#line 216 "ext/ragel/base_lexer.rl"
-	{( state->act) = 9;}
-	goto st41;
-st41:
-	if ( ++p == pe )
-		goto _test_eof41;
-case 41:
-#line 946 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 45: goto tr58;
-		case 95: goto tr58;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
-	} else
-		goto tr58;
-	goto tr63;
-st42:
-	if ( ++p == pe )
-		goto _test_eof42;
-case 42:
-	switch( (*p) ) {
-		case 45: goto tr58;
-		case 85: goto st43;
-		case 95: goto tr58;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
-	} else
-		goto tr58;
-	goto tr64;
-st43:
-	if ( ++p == pe )
-		goto _test_eof43;
-case 43:
-	switch( (*p) ) {
-		case 45: goto tr58;
-		case 66: goto st44;
-		case 95: goto tr58;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
-	} else
-		goto tr58;
-	goto tr64;
+#line 269 "ext/ragel/base_lexer.rl"
+	{( state->act) = 13;}
+	goto st44;
 st44:
 	if ( ++p == pe )
 		goto _test_eof44;
 case 44:
+#line 1112 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 76: goto st45;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr69;
 st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 73: goto st46;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 85: goto st46;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr70;
 st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 67: goto tr69;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 66: goto st47;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr70;
 st47:
 	if ( ++p == pe )
 		goto _test_eof47;
 case 47:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 89: goto st48;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 76: goto st48;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr70;
 st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 83: goto st49;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 73: goto st49;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr70;
 st49:
 	if ( ++p == pe )
 		goto _test_eof49;
 case 49:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 84: goto st50;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 67: goto tr75;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr70;
 st50:
 	if ( ++p == pe )
 		goto _test_eof50;
 case 50:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 69: goto st51;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 89: goto st51;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
+		goto tr64;
+	goto tr70;
 st51:
 	if ( ++p == pe )
 		goto _test_eof51;
 case 51:
 	switch( (*p) ) {
-		case 45: goto tr58;
-		case 77: goto tr69;
-		case 95: goto tr58;
+		case 45: goto tr64;
+		case 83: goto st52;
+		case 95: goto tr64;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr64;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr64;
+	} else
+		goto tr64;
+	goto tr70;
+st52:
+	if ( ++p == pe )
+		goto _test_eof52;
+case 52:
+	switch( (*p) ) {
+		case 45: goto tr64;
+		case 84: goto st53;
+		case 95: goto tr64;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr64;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr64;
+	} else
+		goto tr64;
+	goto tr70;
+st53:
+	if ( ++p == pe )
+		goto _test_eof53;
+case 53:
+	switch( (*p) ) {
+		case 45: goto tr64;
+		case 69: goto st54;
+		case 95: goto tr64;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr64;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr64;
+	} else
+		goto tr64;
+	goto tr70;
+st54:
+	if ( ++p == pe )
+		goto _test_eof54;
+case 54:
+	switch( (*p) ) {
+		case 45: goto tr64;
+		case 77: goto tr75;
+		case 95: goto tr64;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr58;
+			goto tr64;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr58;
+			goto tr64;
 	} else
-		goto tr58;
-	goto tr64;
-tr74:
-#line 268 "ext/ragel/base_lexer.rl"
+		goto tr64;
+	goto tr70;
+tr80:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+#line 336 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st52;
-tr75:
-#line 154 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr81:
+#line 207 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 52; goto st36;}
+        {( state->stack)[( state->top)++] = 55; goto st39;}
     }}
-	goto st52;
-tr76:
-#line 148 "ext/ragel/base_lexer.rl"
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st55;
+tr82:
+#line 201 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 52; goto st34;}
+        {( state->stack)[( state->top)++] = 55; goto st37;}
     }}
-	goto st52;
-tr79:
-#line 261 "ext/ragel/base_lexer.rl"
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st55;
+tr85:
+#line 322 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st52;
-tr80:
-#line 268 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr87:
+#line 336 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st52;
-tr81:
-	( state->cs) = 52;
-#line 255 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr88:
+	( state->cs) = 55;
+#line 308 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
             callback_simple(id_on_xml_decl_end);
-            ( state->cs) = 26;
+
+            ( state->cs) = 22;
         }}
 	goto _again;
-st52:
+st55:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof52;
-case 52:
+		goto _test_eof55;
+case 55:
 #line 1 "NONE"
 	{ts = p;}
-#line 1186 "ext/c/lexer.c"
+#line 1379 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr75;
-		case 39: goto tr76;
-		case 45: goto st53;
-		case 63: goto st54;
-		case 95: goto st53;
+		case 34: goto tr81;
+		case 39: goto tr82;
+		case 45: goto tr83;
+		case 63: goto tr84;
+		case 95: goto tr83;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st53;
+			goto tr83;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st53;
+			goto tr83;
 	} else
-		goto st53;
-	goto tr74;
-st53:
+		goto tr83;
+	goto tr80;
+tr83:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st56;
+st56:
 	if ( ++p == pe )
-		goto _test_eof53;
-case 53:
+		goto _test_eof56;
+case 56:
+#line 1406 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st53;
-		case 95: goto st53;
+		case 45: goto st56;
+		case 95: goto st56;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st53;
+			goto st56;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st53;
+			goto st56;
 	} else
-		goto st53;
-	goto tr79;
-st54:
+		goto st56;
+	goto tr85;
+tr84:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st57;
+st57:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
+		goto _test_eof57;
+case 57:
+#line 1430 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr81;
-	goto tr80;
-tr83:
-	( state->cs) = 55;
-#line 299 "ext/ragel/base_lexer.rl"
+		goto tr88;
+	goto tr87;
+tr90:
+	( state->cs) = 58;
+#line 367 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( state->cs) = 57;
+            ( state->cs) = 63;
         }}
 	goto _again;
-tr84:
-#line 295 "ext/ragel/base_lexer.rl"
+tr91:
+#line 363 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
-	goto st55;
-st55:
+	goto st58;
+st58:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof55;
-case 55:
+		goto _test_eof58;
+case 58:
 #line 1 "NONE"
 	{ts = p;}
-#line 1249 "ext/c/lexer.c"
+#line 1456 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st56;
-		case 95: goto st56;
+		case 45: goto st59;
+		case 95: goto st59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st56;
+			goto st59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st56;
+			goto st59;
 	} else
-		goto st56;
+		goto st59;
 	goto st0;
-st56:
+st59:
+	if ( ++p == pe )
+		goto _test_eof59;
+case 59:
+	switch( (*p) ) {
+		case 45: goto st59;
+		case 58: goto tr91;
+		case 95: goto st59;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st59;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto st59;
+	} else
+		goto st59;
+	goto tr90;
+tr93:
+	( state->cs) = 60;
+#line 373 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        p--;
+        ( state->cs) = 63;
+    }}
+	goto _again;
+tr94:
+	( state->cs) = 60;
+#line 387 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            p--;
+            ( state->cs) = 62;
+        }}
+	goto _again;
+tr95:
+#line 394 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback_simple(id_on_string_squote);
+
+            callback(id_on_string_body, data, encoding, ts, te);
+
+            callback_simple(id_on_string_squote);
+        }}
+	goto st60;
+st60:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof60;
+case 60:
+#line 1 "NONE"
+	{ts = p;}
+#line 1522 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 13: goto tr93;
+		case 32: goto tr93;
+		case 34: goto tr94;
+		case 39: goto tr94;
+		case 96: goto tr93;
+	}
+	if ( (*p) > 10 ) {
+		if ( 60 <= (*p) && (*p) <= 62 )
+			goto tr93;
+	} else if ( (*p) >= 9 )
+		goto tr93;
+	goto st61;
+st61:
+	if ( ++p == pe )
+		goto _test_eof61;
+case 61:
+	switch( (*p) ) {
+		case 13: goto tr95;
+		case 32: goto tr95;
+		case 34: goto tr95;
+		case 39: goto tr95;
+		case 96: goto tr95;
+	}
+	if ( (*p) > 10 ) {
+		if ( 60 <= (*p) && (*p) <= 62 )
+			goto tr95;
+	} else if ( (*p) >= 9 )
+		goto tr95;
+	goto st61;
+tr96:
+	( state->cs) = 62;
+#line 373 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        p--;
+        ( state->cs) = 63;
+    }}
+	goto _again;
+tr97:
+#line 207 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple(id_on_string_dquote);
+
+        {( state->stack)[( state->top)++] = 62; goto st39;}
+    }}
+	goto st62;
+tr98:
+#line 201 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple(id_on_string_squote);
+
+        {( state->stack)[( state->top)++] = 62; goto st37;}
+    }}
+	goto st62;
+st62:
+#line 1 "NONE"
+	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof56;
-case 56:
+		goto _test_eof62;
+case 62:
+#line 1 "NONE"
+	{ts = p;}
+#line 1585 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st56;
-		case 58: goto tr84;
-		case 95: goto st56;
+		case 34: goto tr97;
+		case 39: goto tr98;
 	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st56;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st56;
-	} else
-		goto st56;
-	goto tr83;
-tr29:
-	( state->cs) = 57;
-#line 342 "ext/ragel/base_lexer.rl"
+	goto tr96;
+tr27:
+	( state->cs) = 63;
+#line 457 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
-            ( state->cs) = 26;
+            ( state->cs) = 22;
         }}
 	goto _again;
-tr85:
-#line 308 "ext/ragel/base_lexer.rl"
+tr99:
+#line 415 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st57;
-tr86:
-#line 310 "ext/ragel/base_lexer.rl"
+	goto st63;
+tr100:
+#line 417 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_advance_line);
         }}
-	goto st57;
-tr88:
-#line 154 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-        callback_simple(id_on_string_dquote);
-
-        {( state->stack)[( state->top)++] = 57; goto st36;}
-    }}
-	goto st57;
-tr89:
-#line 148 "ext/ragel/base_lexer.rl"
+	goto st63;
+tr104:
+	( state->cs) = 63;
+#line 431 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback_simple(id_on_string_squote);
-
-        {( state->stack)[( state->top)++] = 57; goto st34;}
-    }}
-	goto st57;
-tr92:
-	( state->cs) = 57;
-#line 328 "ext/ragel/base_lexer.rl"
+            if ( html_p )
+            {
+                ( state->cs) = 60;
+            }
+            else
+            {
+                ( state->cs) = 62;
+            }
+        }}
+	goto _again;
+tr105:
+	( state->cs) = 63;
+#line 443 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
             if ( literal_html_element_p() )
             {
-                ( state->cs) = 64;
+                ( state->cs) = 70;
             }
             else
             {
-                ( state->cs) = 26;
+                ( state->cs) = 22;
             }
         }}
 	goto _again;
-tr93:
-#line 310 "ext/ragel/base_lexer.rl"
+tr106:
+#line 417 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_advance_line);
         }}
-	goto st57;
-tr94:
-#line 319 "ext/ragel/base_lexer.rl"
+	goto st63;
+tr107:
+#line 426 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st57;
-tr95:
-#line 315 "ext/ragel/base_lexer.rl"
+	goto st63;
+tr108:
+#line 422 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
-	goto st57;
-st57:
+	goto st63;
+st63:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof57;
-case 57:
+		goto _test_eof63;
+case 63:
 #line 1 "NONE"
 	{ts = p;}
-#line 1357 "ext/c/lexer.c"
+#line 1665 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr85;
-		case 10: goto tr86;
-		case 13: goto st58;
-		case 32: goto tr85;
-		case 34: goto tr88;
-		case 39: goto tr89;
-		case 45: goto st59;
-		case 47: goto st25;
-		case 61: goto tr85;
-		case 62: goto tr92;
-		case 95: goto st59;
+		case 9: goto tr99;
+		case 10: goto tr100;
+		case 13: goto st64;
+		case 32: goto tr99;
+		case 45: goto st65;
+		case 47: goto st21;
+		case 61: goto tr104;
+		case 62: goto tr105;
+		case 95: goto st65;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st59;
+			goto st65;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st59;
+			goto st65;
 	} else
-		goto st59;
+		goto st65;
 	goto st0;
-st58:
+st64:
 	if ( ++p == pe )
-		goto _test_eof58;
-case 58:
+		goto _test_eof64;
+case 64:
 	if ( (*p) == 10 )
-		goto tr86;
-	goto tr93;
-st59:
+		goto tr100;
+	goto tr106;
+st65:
 	if ( ++p == pe )
-		goto _test_eof59;
-case 59:
+		goto _test_eof65;
+case 65:
 	switch( (*p) ) {
-		case 45: goto st59;
-		case 58: goto tr95;
-		case 95: goto st59;
+		case 45: goto st65;
+		case 58: goto tr108;
+		case 95: goto st65;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st59;
+			goto st65;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st59;
+			goto st65;
 	} else
-		goto st59;
-	goto tr94;
-st25:
+		goto st65;
+	goto tr107;
+st21:
 	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
+		goto _test_eof21;
+case 21:
 	if ( (*p) == 62 )
-		goto tr29;
+		goto tr27;
 	goto st0;
-tr98:
-	( state->cs) = 60;
-#line 371 "ext/ragel/base_lexer.rl"
+tr111:
+	( state->cs) = 66;
+#line 486 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1421,12 +1727,12 @@ tr98:
                 lines = 0;
             }
 
-            ( state->cs) = 26;
+            ( state->cs) = 22;
         }}
 	goto _again;
-tr100:
-	( state->cs) = 60;
-#line 385 "ext/ragel/base_lexer.rl"
+tr113:
+	( state->cs) = 66;
+#line 500 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1440,12 +1746,12 @@ tr100:
                 lines = 0;
             }
 
-            ( state->cs) = 26;
+            ( state->cs) = 22;
         }}
 	goto _again;
-tr101:
-	( state->cs) = 60;
-#line 371 "ext/ragel/base_lexer.rl"
+tr114:
+	( state->cs) = 66;
+#line 486 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1456,100 +1762,100 @@ tr101:
                 lines = 0;
             }
 
-            ( state->cs) = 26;
+            ( state->cs) = 22;
         }}
 	goto _again;
-st60:
+st66:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof60;
-case 60:
+		goto _test_eof66;
+case 66:
 #line 1 "NONE"
 	{ts = p;}
-#line 1471 "ext/c/lexer.c"
+#line 1777 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr97;
-	goto tr96;
-tr96:
+		goto tr110;
+	goto tr109;
+tr109:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st61;
-st61:
+	goto st67;
+st67:
 	if ( ++p == pe )
-		goto _test_eof61;
-case 61:
-#line 1485 "ext/c/lexer.c"
+		goto _test_eof67;
+case 67:
+#line 1791 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr99;
-	goto tr96;
-tr99:
+		goto tr112;
+	goto tr109;
+tr112:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 385 "ext/ragel/base_lexer.rl"
+#line 500 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st62;
-st62:
+	goto st68;
+st68:
 	if ( ++p == pe )
-		goto _test_eof62;
-case 62:
-#line 1501 "ext/c/lexer.c"
+		goto _test_eof68;
+case 68:
+#line 1807 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr100;
-		case 45: goto tr100;
-		case 60: goto tr99;
-		case 63: goto tr100;
-		case 95: goto tr100;
+		case 33: goto tr113;
+		case 45: goto tr113;
+		case 60: goto tr112;
+		case 63: goto tr113;
+		case 95: goto tr113;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr100;
+			goto tr113;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr100;
+			goto tr113;
 	} else
-		goto tr100;
-	goto tr96;
-tr97:
+		goto tr113;
+	goto tr109;
+tr110:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 385 "ext/ragel/base_lexer.rl"
+#line 500 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st63;
-st63:
+	goto st69;
+st69:
 	if ( ++p == pe )
-		goto _test_eof63;
-case 63:
-#line 1530 "ext/c/lexer.c"
+		goto _test_eof69;
+case 69:
+#line 1836 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr101;
-		case 45: goto tr101;
-		case 60: goto tr99;
-		case 63: goto tr101;
-		case 95: goto tr101;
+		case 33: goto tr114;
+		case 45: goto tr114;
+		case 60: goto tr112;
+		case 63: goto tr114;
+		case 95: goto tr114;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr101;
+			goto tr114;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr101;
+			goto tr114;
 	} else
-		goto tr101;
-	goto tr96;
-tr104:
+		goto tr114;
+	goto tr109;
+tr117:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 0:
 	{{goto st0;}}
 	break;
-	case 33:
+	case 42:
 	{{p = ((te))-1;}
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1563,9 +1869,9 @@ tr104:
 	break;
 	}
 	}
-	goto st64;
-tr105:
-#line 409 "ext/ragel/base_lexer.rl"
+	goto st70;
+tr118:
+#line 524 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1576,10 +1882,10 @@ tr105:
                 lines = 0;
             }
         }}
-	goto st64;
-tr114:
-	( state->cs) = 64;
-#line 420 "ext/ragel/base_lexer.rl"
+	goto st70;
+tr127:
+	( state->cs) = 70;
+#line 535 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1593,223 +1899,223 @@ tr114:
                 lines = 0;
             }
 
-            ( state->cs) = 26;
+            ( state->cs) = 22;
         }}
 	goto _again;
-st64:
+st70:
 #line 1 "NONE"
 	{ts = 0;}
 #line 1 "NONE"
 	{( state->act) = 0;}
 	if ( ++p == pe )
-		goto _test_eof64;
-case 64:
+		goto _test_eof70;
+case 70:
 #line 1 "NONE"
 	{ts = p;}
-#line 1610 "ext/c/lexer.c"
+#line 1916 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr103;
-	goto tr102;
-tr102:
+		goto tr116;
+	goto tr115;
+tr115:
 #line 1 "NONE"
 	{te = p+1;}
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 409 "ext/ragel/base_lexer.rl"
-	{( state->act) = 33;}
-	goto st65;
-st65:
+#line 524 "ext/ragel/base_lexer.rl"
+	{( state->act) = 42;}
+	goto st71;
+st71:
 	if ( ++p == pe )
-		goto _test_eof65;
-case 65:
-#line 1628 "ext/c/lexer.c"
+		goto _test_eof71;
+case 71:
+#line 1934 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr103;
-	goto tr102;
-tr103:
+		goto tr116;
+	goto tr115;
+tr116:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 420 "ext/ragel/base_lexer.rl"
+#line 535 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st66;
-st66:
+	goto st72;
+st72:
 	if ( ++p == pe )
-		goto _test_eof66;
-case 66:
-#line 1644 "ext/c/lexer.c"
+		goto _test_eof72;
+case 72:
+#line 1950 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr106;
-		case 60: goto tr103;
+		case 47: goto tr119;
+		case 60: goto tr116;
 	}
-	goto tr102;
-tr106:
+	goto tr115;
+tr119:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st67;
-st67:
+	goto st73;
+st73:
 	if ( ++p == pe )
-		goto _test_eof67;
-case 67:
-#line 1660 "ext/c/lexer.c"
+		goto _test_eof73;
+case 73:
+#line 1966 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 115: goto tr107;
+		case 60: goto tr116;
+		case 115: goto tr120;
 	}
-	goto tr102;
-tr107:
+	goto tr115;
+tr120:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st68;
-st68:
+	goto st74;
+st74:
 	if ( ++p == pe )
-		goto _test_eof68;
-case 68:
-#line 1676 "ext/c/lexer.c"
+		goto _test_eof74;
+case 74:
+#line 1982 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 99: goto tr108;
-		case 116: goto tr109;
+		case 60: goto tr116;
+		case 99: goto tr121;
+		case 116: goto tr122;
 	}
-	goto tr102;
-tr108:
+	goto tr115;
+tr121:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st69;
-st69:
+	goto st75;
+st75:
 	if ( ++p == pe )
-		goto _test_eof69;
-case 69:
-#line 1693 "ext/c/lexer.c"
+		goto _test_eof75;
+case 75:
+#line 1999 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 114: goto tr110;
+		case 60: goto tr116;
+		case 114: goto tr123;
 	}
-	goto tr102;
-tr110:
+	goto tr115;
+tr123:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st70;
-st70:
+	goto st76;
+st76:
 	if ( ++p == pe )
-		goto _test_eof70;
-case 70:
-#line 1709 "ext/c/lexer.c"
+		goto _test_eof76;
+case 76:
+#line 2015 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 105: goto tr111;
+		case 60: goto tr116;
+		case 105: goto tr124;
 	}
-	goto tr102;
-tr111:
+	goto tr115;
+tr124:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st71;
-st71:
+	goto st77;
+st77:
 	if ( ++p == pe )
-		goto _test_eof71;
-case 71:
-#line 1725 "ext/c/lexer.c"
+		goto _test_eof77;
+case 77:
+#line 2031 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 112: goto tr112;
+		case 60: goto tr116;
+		case 112: goto tr125;
 	}
-	goto tr102;
-tr112:
+	goto tr115;
+tr125:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st72;
-st72:
+	goto st78;
+st78:
 	if ( ++p == pe )
-		goto _test_eof72;
-case 72:
-#line 1741 "ext/c/lexer.c"
+		goto _test_eof78;
+case 78:
+#line 2047 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 116: goto tr113;
+		case 60: goto tr116;
+		case 116: goto tr126;
 	}
-	goto tr102;
-tr113:
+	goto tr115;
+tr126:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st73;
-st73:
+	goto st79;
+st79:
 	if ( ++p == pe )
-		goto _test_eof73;
-case 73:
-#line 1757 "ext/c/lexer.c"
+		goto _test_eof79;
+case 79:
+#line 2063 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 62: goto tr114;
+		case 60: goto tr116;
+		case 62: goto tr127;
 	}
-	goto tr102;
-tr109:
+	goto tr115;
+tr122:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st74;
-st74:
+	goto st80;
+st80:
 	if ( ++p == pe )
-		goto _test_eof74;
-case 74:
-#line 1773 "ext/c/lexer.c"
+		goto _test_eof80;
+case 80:
+#line 2079 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 121: goto tr115;
+		case 60: goto tr116;
+		case 121: goto tr128;
 	}
-	goto tr102;
-tr115:
+	goto tr115;
+tr128:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st75;
-st75:
+	goto st81;
+st81:
 	if ( ++p == pe )
-		goto _test_eof75;
-case 75:
-#line 1789 "ext/c/lexer.c"
+		goto _test_eof81;
+case 81:
+#line 2095 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 108: goto tr116;
+		case 60: goto tr116;
+		case 108: goto tr129;
 	}
-	goto tr102;
-tr116:
+	goto tr115;
+tr129:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st76;
-st76:
+	goto st82;
+st82:
 	if ( ++p == pe )
-		goto _test_eof76;
-case 76:
-#line 1805 "ext/c/lexer.c"
+		goto _test_eof82;
+case 82:
+#line 2111 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr103;
-		case 101: goto tr113;
+		case 60: goto tr116;
+		case 101: goto tr126;
 	}
-	goto tr102;
+	goto tr115;
 	}
-	_test_eof26: ( state->cs) = 26; goto _test_eof; 
-	_test_eof27: ( state->cs) = 27; goto _test_eof; 
+	_test_eof22: ( state->cs) = 22; goto _test_eof; 
+	_test_eof23: ( state->cs) = 23; goto _test_eof; 
 	_test_eof1: ( state->cs) = 1; goto _test_eof; 
 	_test_eof2: ( state->cs) = 2; goto _test_eof; 
 	_test_eof3: ( state->cs) = 3; goto _test_eof; 
@@ -1819,27 +2125,27 @@ case 76:
 	_test_eof7: ( state->cs) = 7; goto _test_eof; 
 	_test_eof8: ( state->cs) = 8; goto _test_eof; 
 	_test_eof9: ( state->cs) = 9; goto _test_eof; 
+	_test_eof24: ( state->cs) = 24; goto _test_eof; 
 	_test_eof10: ( state->cs) = 10; goto _test_eof; 
 	_test_eof11: ( state->cs) = 11; goto _test_eof; 
 	_test_eof12: ( state->cs) = 12; goto _test_eof; 
-	_test_eof28: ( state->cs) = 28; goto _test_eof; 
 	_test_eof13: ( state->cs) = 13; goto _test_eof; 
 	_test_eof14: ( state->cs) = 14; goto _test_eof; 
 	_test_eof15: ( state->cs) = 15; goto _test_eof; 
 	_test_eof16: ( state->cs) = 16; goto _test_eof; 
 	_test_eof17: ( state->cs) = 17; goto _test_eof; 
 	_test_eof18: ( state->cs) = 18; goto _test_eof; 
-	_test_eof19: ( state->cs) = 19; goto _test_eof; 
-	_test_eof20: ( state->cs) = 20; goto _test_eof; 
-	_test_eof21: ( state->cs) = 21; goto _test_eof; 
-	_test_eof22: ( state->cs) = 22; goto _test_eof; 
-	_test_eof23: ( state->cs) = 23; goto _test_eof; 
-	_test_eof24: ( state->cs) = 24; goto _test_eof; 
+	_test_eof25: ( state->cs) = 25; goto _test_eof; 
+	_test_eof26: ( state->cs) = 26; goto _test_eof; 
+	_test_eof27: ( state->cs) = 27; goto _test_eof; 
+	_test_eof28: ( state->cs) = 28; goto _test_eof; 
 	_test_eof29: ( state->cs) = 29; goto _test_eof; 
 	_test_eof30: ( state->cs) = 30; goto _test_eof; 
+	_test_eof19: ( state->cs) = 19; goto _test_eof; 
 	_test_eof31: ( state->cs) = 31; goto _test_eof; 
 	_test_eof32: ( state->cs) = 32; goto _test_eof; 
 	_test_eof33: ( state->cs) = 33; goto _test_eof; 
+	_test_eof20: ( state->cs) = 20; goto _test_eof; 
 	_test_eof34: ( state->cs) = 34; goto _test_eof; 
 	_test_eof35: ( state->cs) = 35; goto _test_eof; 
 	_test_eof36: ( state->cs) = 36; goto _test_eof; 
@@ -1866,13 +2172,13 @@ case 76:
 	_test_eof57: ( state->cs) = 57; goto _test_eof; 
 	_test_eof58: ( state->cs) = 58; goto _test_eof; 
 	_test_eof59: ( state->cs) = 59; goto _test_eof; 
-	_test_eof25: ( state->cs) = 25; goto _test_eof; 
 	_test_eof60: ( state->cs) = 60; goto _test_eof; 
 	_test_eof61: ( state->cs) = 61; goto _test_eof; 
 	_test_eof62: ( state->cs) = 62; goto _test_eof; 
 	_test_eof63: ( state->cs) = 63; goto _test_eof; 
 	_test_eof64: ( state->cs) = 64; goto _test_eof; 
 	_test_eof65: ( state->cs) = 65; goto _test_eof; 
+	_test_eof21: ( state->cs) = 21; goto _test_eof; 
 	_test_eof66: ( state->cs) = 66; goto _test_eof; 
 	_test_eof67: ( state->cs) = 67; goto _test_eof; 
 	_test_eof68: ( state->cs) = 68; goto _test_eof; 
@@ -1884,12 +2190,18 @@ case 76:
 	_test_eof74: ( state->cs) = 74; goto _test_eof; 
 	_test_eof75: ( state->cs) = 75; goto _test_eof; 
 	_test_eof76: ( state->cs) = 76; goto _test_eof; 
+	_test_eof77: ( state->cs) = 77; goto _test_eof; 
+	_test_eof78: ( state->cs) = 78; goto _test_eof; 
+	_test_eof79: ( state->cs) = 79; goto _test_eof; 
+	_test_eof80: ( state->cs) = 80; goto _test_eof; 
+	_test_eof81: ( state->cs) = 81; goto _test_eof; 
+	_test_eof82: ( state->cs) = 82; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
 	{
 	switch ( ( state->cs) ) {
-	case 27: goto tr33;
+	case 23: goto tr31;
 	case 1: goto tr0;
 	case 2: goto tr0;
 	case 3: goto tr0;
@@ -1899,67 +2211,69 @@ case 76:
 	case 7: goto tr0;
 	case 8: goto tr0;
 	case 9: goto tr0;
+	case 24: goto tr35;
 	case 10: goto tr0;
 	case 11: goto tr0;
 	case 12: goto tr0;
-	case 28: goto tr37;
 	case 13: goto tr0;
 	case 14: goto tr0;
 	case 15: goto tr0;
 	case 16: goto tr0;
 	case 17: goto tr0;
 	case 18: goto tr0;
-	case 19: goto tr0;
-	case 20: goto tr0;
-	case 21: goto tr0;
-	case 22: goto tr0;
-	case 23: goto tr0;
-	case 24: goto tr0;
-	case 29: goto tr38;
-	case 30: goto tr39;
-	case 31: goto tr39;
-	case 33: goto tr44;
-	case 35: goto tr48;
-	case 37: goto tr51;
-	case 39: goto tr54;
-	case 41: goto tr63;
-	case 42: goto tr64;
-	case 43: goto tr64;
-	case 44: goto tr64;
-	case 45: goto tr64;
-	case 46: goto tr64;
-	case 47: goto tr64;
-	case 48: goto tr64;
-	case 49: goto tr64;
-	case 50: goto tr64;
-	case 51: goto tr64;
-	case 53: goto tr79;
-	case 54: goto tr80;
-	case 56: goto tr83;
-	case 58: goto tr93;
-	case 59: goto tr94;
-	case 61: goto tr98;
-	case 62: goto tr98;
-	case 63: goto tr98;
-	case 65: goto tr104;
-	case 66: goto tr105;
-	case 67: goto tr105;
-	case 68: goto tr105;
-	case 69: goto tr105;
-	case 70: goto tr105;
-	case 71: goto tr105;
-	case 72: goto tr105;
-	case 73: goto tr105;
-	case 74: goto tr105;
-	case 75: goto tr105;
-	case 76: goto tr105;
+	case 25: goto tr36;
+	case 26: goto tr37;
+	case 27: goto tr37;
+	case 29: goto tr42;
+	case 30: goto tr42;
+	case 19: goto tr23;
+	case 32: goto tr46;
+	case 33: goto tr46;
+	case 20: goto tr25;
+	case 35: goto tr50;
+	case 36: goto tr50;
+	case 38: goto tr54;
+	case 40: goto tr57;
+	case 42: goto tr60;
+	case 44: goto tr69;
+	case 45: goto tr70;
+	case 46: goto tr70;
+	case 47: goto tr70;
+	case 48: goto tr70;
+	case 49: goto tr70;
+	case 50: goto tr70;
+	case 51: goto tr70;
+	case 52: goto tr70;
+	case 53: goto tr70;
+	case 54: goto tr70;
+	case 56: goto tr85;
+	case 57: goto tr87;
+	case 59: goto tr90;
+	case 61: goto tr95;
+	case 64: goto tr106;
+	case 65: goto tr107;
+	case 67: goto tr111;
+	case 68: goto tr111;
+	case 69: goto tr111;
+	case 71: goto tr117;
+	case 72: goto tr118;
+	case 73: goto tr118;
+	case 74: goto tr118;
+	case 75: goto tr118;
+	case 76: goto tr118;
+	case 77: goto tr118;
+	case 78: goto tr118;
+	case 79: goto tr118;
+	case 80: goto tr118;
+	case 81: goto tr118;
+	case 82: goto tr118;
 	}
 	}
 
 	_out: {}
 	}
 
-#line 120 "ext/c/lexer.rl"
+#line 129 "ext/c/lexer.rl"
 
     state->lines = lines;
 
@@ -2003,7 +2317,7 @@ VALUE oga_xml_lexer_allocate(VALUE klass)
 }
 
 
-#line 169 "ext/c/lexer.rl"
+#line 178 "ext/c/lexer.rl"
 
 
 void Init_liboga_xml_lexer()
@@ -2014,6 +2328,7 @@ void Init_liboga_xml_lexer()
 
     id_advance_line           = rb_intern("advance_line");
     id_literal_html_element_p = rb_intern("literal_html_element?");
+    id_html                   = rb_intern("html");
 
     rb_define_method(cLexer, "advance_native", oga_xml_lexer_advance, 1);
     rb_define_method(cLexer, "reset_native", oga_xml_lexer_reset, 0);