oga 0.2.2-java → 0.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac3dd20a675f61df95e40826873ab84368fdb16
-  data.tar.gz: 65c3ed0c9d23c6bc30ba5fade5e00d1ed86cd93c
+  metadata.gz: cab88a36213701cd96d5fc500eb1fa2a6a114f51
+  data.tar.gz: ea32fd579cd4c48079c7f9d0ad1ae661f4fd199e
 SHA512:
-  metadata.gz: 5eefa66c37fd2bee1560f39eda16b38bd7a59ebf5265afca68b711bc46336ca6fdb47fcaba8d5aa7cfb54e8683a1423d6e84bdff7eb1793b461b1f3e3a977c6a
-  data.tar.gz: f8705a85b19a5be1a17e4a754e56af34a039250411bebd5345faeebde4def88233d0e6d416a0950160c7d3c8265f7eef51a47c1c6399d648dfa76125bbd55ba5
+  metadata.gz: 7195e3bc746ab0c58111d0843bf9e0843cd5ea5e2712b9fdaef5ea487787f29b620bae9faa593eb476819f5bdcdbc69def2501d36ed15f14dd93867c28a8b500
+  data.tar.gz: 2c936b7fc7e9e21e1b0ba0ac938abd91513dd019d4ce652ebb4d2a5b9b0e0585d9eddb24e7f65d17cc2231dc6646f512e71098335d82ccf41296e2d9a03f5096

data/doc/changelog.md

@@ -3,6 +3,15 @@
 This document contains details of the various releases and their release dates.
 Dates are in the format `yyyy-mm-dd`.
 
+## 0.2.3 - 2015-03-04
+
+This release adds support for lexing HTML `<style>` tags similar to how
+`<script>` tags are handled. This ensures that the contents of these tags are
+treated as-is without any HTML entity conversion being applied.
+
+See commits 78e40b55c0e5941bee5791a5014260e9c2cf8aad and
+3b2055a30b128aa679a83332dfdfa68314271b24 for more information.
+
 ## 0.2.2 - 2015-03-03
 
 This release fixes a bug where setting the text of an element using

data/ext/c/lexer.c

@@ -21,11 +21,11 @@ on `ts` and `te`) so the macro ignores this argument.
 #define advance_line(amount) \
     rb_funcall(self, id_advance_line, 1, INT2NUM(amount));
 
-#define inside_html_script_p() \
-    rb_funcall(self, id_inside_html_script_p, 0) == Qtrue
+#define literal_html_element_p() \
+    rb_funcall(self, id_literal_html_element_p, 0) == Qtrue
 
 ID id_advance_line;
-ID id_inside_html_script_p;
+ID id_literal_html_element_p;
 
 
 #line 29 "ext/c/lexer.rl"
@@ -66,21 +66,21 @@ void liboga_xml_lexer_callback_simple(VALUE self, VALUE name)
 
 
 #line 69 "ext/c/lexer.c"
-static const int c_lexer_start = 34;
-static const int c_lexer_first_final = 34;
+static const int c_lexer_start = 27;
+static const int c_lexer_first_final = 27;
 static const int c_lexer_error = 0;
 
-static const int c_lexer_en_proc_ins_body = 40;
-static const int c_lexer_en_string_squote = 42;
-static const int c_lexer_en_string_dquote = 44;
-static const int c_lexer_en_doctype_inline = 46;
-static const int c_lexer_en_doctype = 48;
-static const int c_lexer_en_xml_decl = 60;
-static const int c_lexer_en_element_name = 63;
-static const int c_lexer_en_element_head = 65;
-static const int c_lexer_en_text = 67;
-static const int c_lexer_en_script_text = 71;
-static const int c_lexer_en_main = 34;
+static const int c_lexer_en_proc_ins_body = 33;
+static const int c_lexer_en_string_squote = 35;
+static const int c_lexer_en_string_dquote = 37;
+static const int c_lexer_en_doctype_inline = 39;
+static const int c_lexer_en_doctype = 41;
+static const int c_lexer_en_xml_decl = 53;
+static const int c_lexer_en_element_name = 56;
+static const int c_lexer_en_element_head = 58;
+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 = 27;
 
 
 #line 65 "ext/c/lexer.rl"
@@ -146,8 +146,8 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 
 _again:
 	switch ( ( state->cs) ) {
-		case 34: goto st34;
-		case 35: goto st35;
+		case 27: goto st27;
+		case 28: goto st28;
 		case 1: goto st1;
 		case 2: goto st2;
 		case 3: goto st3;
@@ -160,7 +160,7 @@ _again:
 		case 10: goto st10;
 		case 11: goto st11;
 		case 12: goto st12;
-		case 36: goto st36;
+		case 29: goto st29;
 		case 13: goto st13;
 		case 14: goto st14;
 		case 15: goto st15;
@@ -173,11 +173,19 @@ _again:
 		case 22: goto st22;
 		case 23: goto st23;
 		case 24: goto st24;
+		case 30: goto st30;
+		case 31: goto st31;
+		case 32: goto st32;
+		case 33: goto st33;
+		case 34: goto st34;
+		case 35: goto st35;
+		case 36: goto st36;
 		case 37: goto st37;
 		case 38: goto st38;
 		case 39: goto st39;
 		case 40: goto st40;
 		case 41: goto st41;
+		case 0: goto st0;
 		case 42: goto st42;
 		case 43: goto st43;
 		case 44: goto st44;
@@ -185,7 +193,6 @@ _again:
 		case 46: goto st46;
 		case 47: goto st47;
 		case 48: goto st48;
-		case 0: goto st0;
 		case 49: goto st49;
 		case 50: goto st50;
 		case 51: goto st51;
@@ -196,29 +203,26 @@ _again:
 		case 56: goto st56;
 		case 57: goto st57;
 		case 58: goto st58;
+		case 25: goto st25;
 		case 59: goto st59;
+		case 26: goto st26;
 		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 25: goto st25;
 		case 66: goto st66;
-		case 26: goto st26;
 		case 67: goto st67;
 		case 68: goto st68;
 		case 69: goto st69;
 		case 70: goto st70;
 		case 71: goto st71;
 		case 72: goto st72;
-		case 27: goto st27;
-		case 28: goto st28;
-		case 29: goto st29;
-		case 30: goto st30;
-		case 31: goto st31;
-		case 32: goto st32;
-		case 33: goto st33;
+		case 73: goto st73;
+		case 74: goto st74;
+		case 75: goto st75;
+		case 76: goto st76;
 	default: break;
 	}
 
@@ -228,11 +232,11 @@ _resume:
 	switch ( ( state->cs) )
 	{
 tr0:
-	( state->cs) = 34;
-#line 358 "ext/ragel/base_lexer.rl"
+	( state->cs) = 27;
+#line 356 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( state->cs) = 67;
+        ( state->cs) = 60;
     }}
 	goto _again;
 tr7:
@@ -240,60 +244,60 @@ tr7:
 	{te = p+1;{
         callback(id_on_comment, data, encoding, ts + 4, te - 3);
     }}
-	goto st34;
+	goto st27;
 tr23:
 #line 88 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback(id_on_cdata, data, encoding, ts + 9, te - 3);
     }}
-	goto st34;
+	goto st27;
 tr26:
 #line 289 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
-	goto st34;
-tr40:
-	( state->cs) = 34;
-#line 358 "ext/ragel/base_lexer.rl"
+	goto st27;
+tr32:
+	( state->cs) = 27;
+#line 356 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 67;
+        ( state->cs) = 60;
     }}
 	goto _again;
-tr42:
-	( state->cs) = 34;
-#line 358 "ext/ragel/base_lexer.rl"
+tr34:
+	( state->cs) = 27;
+#line 356 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( state->cs) = 67;
+        ( state->cs) = 60;
     }}
 	goto _again;
-tr44:
-	( state->cs) = 34;
+tr36:
+	( state->cs) = 27;
 #line 283 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_start);
         p--;
-        ( state->cs) = 63;
+        ( state->cs) = 56;
     }}
 	goto _again;
-tr46:
-	( state->cs) = 34;
+tr38:
+	( state->cs) = 27;
 #line 192 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
-        ( state->cs) = 48;
+        ( state->cs) = 41;
     }}
 	goto _again;
-tr47:
-	( state->cs) = 34;
+tr39:
+	( state->cs) = 27;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 36:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( state->cs) = 60;
+        ( state->cs) = 53;
     }
 	break;
 	case 39:
@@ -303,14 +307,14 @@ tr47:
 
         mark = te;
 
-        ( state->cs) = 40;
+        ( state->cs) = 33;
     }
 	break;
 	}
 	}
 	goto _again;
-tr48:
-	( state->cs) = 34;
+tr40:
+	( state->cs) = 27;
 #line 106 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
@@ -318,46 +322,46 @@ tr48:
 
         mark = te;
 
-        ( state->cs) = 40;
+        ( state->cs) = 33;
     }}
 	goto _again;
-st34:
+st27:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
+		goto _test_eof27;
+case 27:
 #line 1 "NONE"
 	{ts = p;}
-#line 333 "ext/c/lexer.c"
+#line 337 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr41;
-	goto tr40;
-tr41:
+		goto tr33;
+	goto tr32;
+tr33:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st35;
-st35:
+	goto st28;
+st28:
 	if ( ++p == pe )
-		goto _test_eof35;
-case 35:
-#line 345 "ext/c/lexer.c"
+		goto _test_eof28;
+case 28:
+#line 349 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
-		case 45: goto tr44;
+		case 45: goto tr36;
 		case 47: goto st22;
 		case 63: goto st24;
-		case 95: goto tr44;
+		case 95: goto tr36;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr44;
+			goto tr36;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr44;
+			goto tr36;
 	} else
-		goto tr44;
-	goto tr42;
+		goto tr36;
+	goto tr34;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
@@ -458,19 +462,19 @@ st12:
 		goto _test_eof12;
 case 12:
 	switch( (*p) ) {
-		case 9: goto st36;
-		case 32: goto st36;
+		case 9: goto st29;
+		case 32: goto st29;
 	}
 	goto tr0;
-st36:
+st29:
 	if ( ++p == pe )
-		goto _test_eof36;
-case 36:
+		goto _test_eof29;
+case 29:
 	switch( (*p) ) {
-		case 9: goto st36;
-		case 32: goto st36;
+		case 9: goto st29;
+		case 32: goto st29;
 	}
-	goto tr46;
+	goto tr38;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
@@ -579,7 +583,7 @@ case 24:
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
-		case 120: goto st38;
+		case 120: goto st31;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -595,18 +599,18 @@ tr27:
 	{te = p+1;}
 #line 106 "ext/ragel/base_lexer.rl"
 	{( state->act) = 39;}
-	goto st37;
-tr50:
+	goto st30;
+tr42:
 #line 1 "NONE"
 	{te = p+1;}
 #line 248 "ext/ragel/base_lexer.rl"
 	{( state->act) = 36;}
-	goto st37;
-st37:
+	goto st30;
+st30:
 	if ( ++p == pe )
-		goto _test_eof37;
-case 37:
-#line 610 "ext/c/lexer.c"
+		goto _test_eof30;
+case 30:
+#line 614 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
@@ -619,15 +623,15 @@ case 37:
 			goto tr27;
 	} else
 		goto tr27;
-	goto tr47;
-st38:
+	goto tr39;
+st31:
 	if ( ++p == pe )
-		goto _test_eof38;
-case 38:
+		goto _test_eof31;
+case 31:
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
-		case 109: goto st39;
+		case 109: goto st32;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -637,15 +641,15 @@ case 38:
 			goto tr27;
 	} else
 		goto tr27;
-	goto tr48;
-st39:
+	goto tr40;
+st32:
 	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
+		goto _test_eof32;
+case 32:
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
-		case 108: goto tr50;
+		case 108: goto tr42;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -655,17 +659,17 @@ case 39:
 			goto tr27;
 	} else
 		goto tr27;
-	goto tr48;
-tr51:
+	goto tr40;
+tr43:
 #line 125 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st40;
-tr53:
+	goto st33;
+tr45:
 #line 125 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st40;
-tr54:
-	( state->cs) = 40;
+	goto st33;
+tr46:
+	( state->cs) = 33;
 #line 116 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, mark, ts);
@@ -673,37 +677,37 @@ tr54:
 
             mark = 0;
 
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-st40:
+st33:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof40;
-case 40:
+		goto _test_eof33;
+case 33:
 #line 1 "NONE"
 	{ts = p;}
-#line 688 "ext/c/lexer.c"
+#line 692 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto st41;
-	goto tr51;
-st41:
+		goto st34;
+	goto tr43;
+st34:
 	if ( ++p == pe )
-		goto _test_eof41;
-case 41:
+		goto _test_eof34;
+case 34:
 	if ( (*p) == 62 )
-		goto tr54;
-	goto tr53;
-tr56:
+		goto tr46;
+	goto tr45;
+tr48:
 #line 163 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
             {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
         }}
-	goto st42;
-tr57:
+	goto st35;
+tr49:
 #line 137 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -715,42 +719,42 @@ tr57:
             lines = 0;
         }
     }}
-	goto st42;
-st42:
+	goto st35;
+st35:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof42;
-case 42:
+		goto _test_eof35;
+case 35:
 #line 1 "NONE"
 	{ts = p;}
-#line 728 "ext/c/lexer.c"
+#line 732 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr56;
-	goto tr55;
-tr55:
+		goto tr48;
+	goto tr47;
+tr47:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st43;
-st43:
+	goto st36;
+st36:
 	if ( ++p == pe )
-		goto _test_eof43;
-case 43:
-#line 742 "ext/c/lexer.c"
+		goto _test_eof36;
+case 36:
+#line 746 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr57;
-	goto tr55;
-tr59:
+		goto tr49;
+	goto tr47;
+tr51:
 #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 st44;
-tr60:
+	goto st37;
+tr52:
 #line 137 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -762,39 +766,39 @@ tr60:
             lines = 0;
         }
     }}
-	goto st44;
-st44:
+	goto st37;
+st37:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof44;
-case 44:
+		goto _test_eof37;
+case 37:
 #line 1 "NONE"
 	{ts = p;}
-#line 775 "ext/c/lexer.c"
+#line 779 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr59;
-	goto tr58;
-tr58:
+		goto tr51;
+	goto tr50;
+tr50:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st45;
-st45:
+	goto st38;
+st38:
 	if ( ++p == pe )
-		goto _test_eof45;
-case 45:
-#line 789 "ext/c/lexer.c"
+		goto _test_eof38;
+case 38:
+#line 793 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr60;
-	goto tr58;
-tr62:
-	( state->cs) = 46;
+		goto tr52;
+	goto tr50;
+tr54:
+	( state->cs) = 39;
 #line 210 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 48; }}
+	{te = p+1;{ ( state->cs) = 41; }}
 	goto _again;
-tr63:
+tr55:
 #line 199 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
@@ -806,67 +810,67 @@ tr63:
                 lines = 0;
             }
         }}
-	goto st46;
-st46:
+	goto st39;
+st39:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof46;
-case 46:
+		goto _test_eof39;
+case 39:
 #line 1 "NONE"
 	{ts = p;}
-#line 819 "ext/c/lexer.c"
+#line 823 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr62;
-	goto tr61;
-tr61:
+		goto tr54;
+	goto tr53;
+tr53:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st47;
-st47:
+	goto st40;
+st40:
 	if ( ++p == pe )
-		goto _test_eof47;
-case 47:
-#line 833 "ext/c/lexer.c"
+		goto _test_eof40;
+case 40:
+#line 837 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr63;
-	goto tr61;
-tr64:
+		goto tr55;
+	goto tr53;
+tr56:
 #line 229 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st48;
-tr65:
+	goto st41;
+tr57:
 #line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 48; goto st44;}
+        {( state->stack)[( state->top)++] = 41; goto st37;}
     }}
-	goto st48;
-tr66:
+	goto st41;
+tr58:
 #line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 48; goto st42;}
+        {( state->stack)[( state->top)++] = 41; goto st35;}
     }}
-	goto st48;
-tr68:
-	( state->cs) = 48;
+	goto st41;
+tr60:
+	( state->cs) = 41;
 #line 235 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-tr71:
-	( state->cs) = 48;
+tr63:
+	( state->cs) = 41;
 #line 221 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 46; }}
+	{te = p+1;{ ( state->cs) = 39; }}
 	goto _again;
-tr72:
+tr64:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 9:
@@ -881,491 +885,489 @@ tr72:
 	break;
 	}
 	}
-	goto st48;
-tr73:
+	goto st41;
+tr65:
 #line 231 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
-	goto st48;
-st48:
+	goto st41;
+st41:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof48;
-case 48:
+		goto _test_eof41;
+case 41:
 #line 1 "NONE"
 	{ts = p;}
-#line 900 "ext/c/lexer.c"
+#line 904 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr64;
-		case 32: goto tr64;
-		case 34: goto tr65;
-		case 39: goto tr66;
-		case 45: goto tr67;
-		case 62: goto tr68;
-		case 80: goto st50;
-		case 83: goto st55;
-		case 91: goto tr71;
-		case 95: goto tr67;
+		case 9: goto tr56;
+		case 32: goto tr56;
+		case 34: goto tr57;
+		case 39: goto tr58;
+		case 45: goto tr59;
+		case 62: goto tr60;
+		case 80: goto st43;
+		case 83: goto st48;
+		case 91: goto tr63;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
+		goto tr59;
 	goto st0;
 st0:
 ( state->cs) = 0;
 	goto _out;
-tr67:
+tr59:
 #line 1 "NONE"
 	{te = p+1;}
 #line 231 "ext/ragel/base_lexer.rl"
 	{( state->act) = 14;}
-	goto st49;
-tr78:
+	goto st42;
+tr70:
 #line 1 "NONE"
 	{te = p+1;}
 #line 216 "ext/ragel/base_lexer.rl"
 	{( state->act) = 9;}
-	goto st49;
-st49:
+	goto st42;
+st42:
 	if ( ++p == pe )
-		goto _test_eof49;
-case 49:
-#line 941 "ext/c/lexer.c"
+		goto _test_eof42;
+case 42:
+#line 945 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr72;
-st50:
+		goto tr59;
+	goto tr64;
+st43:
 	if ( ++p == pe )
-		goto _test_eof50;
-case 50:
+		goto _test_eof43;
+case 43:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 85: goto st51;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 85: goto st44;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st51:
+		goto tr59;
+	goto tr65;
+st44:
 	if ( ++p == pe )
-		goto _test_eof51;
-case 51:
+		goto _test_eof44;
+case 44:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 66: goto st52;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 66: goto st45;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st52:
+		goto tr59;
+	goto tr65;
+st45:
 	if ( ++p == pe )
-		goto _test_eof52;
-case 52:
+		goto _test_eof45;
+case 45:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 76: goto st53;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 76: goto st46;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st53:
+		goto tr59;
+	goto tr65;
+st46:
 	if ( ++p == pe )
-		goto _test_eof53;
-case 53:
+		goto _test_eof46;
+case 46:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 73: goto st54;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 73: goto st47;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st54:
+		goto tr59;
+	goto tr65;
+st47:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
+		goto _test_eof47;
+case 47:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 67: goto tr78;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 67: goto tr70;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st55:
+		goto tr59;
+	goto tr65;
+st48:
 	if ( ++p == pe )
-		goto _test_eof55;
-case 55:
+		goto _test_eof48;
+case 48:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 89: goto st56;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 89: goto st49;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st56:
+		goto tr59;
+	goto tr65;
+st49:
 	if ( ++p == pe )
-		goto _test_eof56;
-case 56:
+		goto _test_eof49;
+case 49:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 83: goto st57;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 83: goto st50;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st57:
+		goto tr59;
+	goto tr65;
+st50:
 	if ( ++p == pe )
-		goto _test_eof57;
-case 57:
+		goto _test_eof50;
+case 50:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 84: goto st58;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 84: goto st51;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st58:
+		goto tr59;
+	goto tr65;
+st51:
 	if ( ++p == pe )
-		goto _test_eof58;
-case 58:
+		goto _test_eof51;
+case 51:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 69: goto st59;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 69: goto st52;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-st59:
+		goto tr59;
+	goto tr65;
+st52:
 	if ( ++p == pe )
-		goto _test_eof59;
-case 59:
+		goto _test_eof52;
+case 52:
 	switch( (*p) ) {
-		case 45: goto tr67;
-		case 77: goto tr78;
-		case 95: goto tr67;
+		case 45: goto tr59;
+		case 77: goto tr70;
+		case 95: goto tr59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr67;
+			goto tr59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr67;
+			goto tr59;
 	} else
-		goto tr67;
-	goto tr73;
-tr83:
+		goto tr59;
+	goto tr65;
+tr75:
 #line 268 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st60;
-tr84:
+	goto st53;
+tr76:
 #line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 60; goto st44;}
+        {( state->stack)[( state->top)++] = 53; goto st37;}
     }}
-	goto st60;
-tr85:
+	goto st53;
+tr77:
 #line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 60; goto st42;}
+        {( state->stack)[( state->top)++] = 53; goto st35;}
     }}
-	goto st60;
-tr88:
+	goto st53;
+tr80:
 #line 261 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st60;
-tr89:
+	goto st53;
+tr81:
 #line 268 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st60;
-tr90:
-	( state->cs) = 60;
+	goto st53;
+tr82:
+	( state->cs) = 53;
 #line 255 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_xml_decl_end);
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-st60:
+st53:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof60;
-case 60:
+		goto _test_eof53;
+case 53:
 #line 1 "NONE"
 	{ts = p;}
-#line 1181 "ext/c/lexer.c"
+#line 1185 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr84;
-		case 39: goto tr85;
-		case 45: goto st61;
-		case 63: goto st62;
-		case 95: goto st61;
+		case 34: goto tr76;
+		case 39: goto tr77;
+		case 45: goto st54;
+		case 63: goto st55;
+		case 95: goto st54;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st61;
+			goto st54;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st61;
+			goto st54;
 	} else
-		goto st61;
-	goto tr83;
-st61:
+		goto st54;
+	goto tr75;
+st54:
 	if ( ++p == pe )
-		goto _test_eof61;
-case 61:
+		goto _test_eof54;
+case 54:
 	switch( (*p) ) {
-		case 45: goto st61;
-		case 95: goto st61;
+		case 45: goto st54;
+		case 95: goto st54;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st61;
+			goto st54;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st61;
+			goto st54;
 	} else
-		goto st61;
-	goto tr88;
-st62:
+		goto st54;
+	goto tr80;
+st55:
 	if ( ++p == pe )
-		goto _test_eof62;
-case 62:
+		goto _test_eof55;
+case 55:
 	if ( (*p) == 62 )
-		goto tr90;
-	goto tr89;
-tr92:
-	( state->cs) = 63;
+		goto tr82;
+	goto tr81;
+tr84:
+	( state->cs) = 56;
 #line 299 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( state->cs) = 65;
+            ( state->cs) = 58;
         }}
 	goto _again;
-tr93:
+tr85:
 #line 295 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
-	goto st63;
-st63:
+	goto st56;
+st56:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof63;
-case 63:
+		goto _test_eof56;
+case 56:
 #line 1 "NONE"
 	{ts = p;}
-#line 1244 "ext/c/lexer.c"
+#line 1248 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st64;
-		case 95: goto st64;
+		case 45: goto st57;
+		case 95: goto st57;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st64;
+			goto st57;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st64;
+			goto st57;
 	} else
-		goto st64;
+		goto st57;
 	goto st0;
-st64:
+st57:
 	if ( ++p == pe )
-		goto _test_eof64;
-case 64:
+		goto _test_eof57;
+case 57:
 	switch( (*p) ) {
-		case 45: goto st64;
-		case 58: goto tr93;
-		case 95: goto st64;
+		case 45: goto st57;
+		case 58: goto tr85;
+		case 95: goto st57;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st64;
+			goto st57;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st64;
+			goto st57;
 	} else
-		goto st64;
-	goto tr92;
+		goto st57;
+	goto tr84;
 tr29:
 #line 310 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_advance_line);
         }}
-	goto st65;
+	goto st58;
 tr31:
-	( state->cs) = 65;
-#line 344 "ext/ragel/base_lexer.rl"
+	( state->cs) = 58;
+#line 342 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-tr94:
+tr86:
 #line 308 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st65;
-tr96:
+	goto st58;
+tr88:
 #line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 65; goto st44;}
+        {( state->stack)[( state->top)++] = 58; goto st37;}
     }}
-	goto st65;
-tr97:
+	goto st58;
+tr89:
 #line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 65; goto st42;}
+        {( state->stack)[( state->top)++] = 58; goto st35;}
     }}
-	goto st65;
-tr100:
-	( state->cs) = 65;
+	goto st58;
+tr92:
+	( state->cs) = 58;
 #line 328 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
-            if ( inside_html_script_p() )
+            if ( literal_html_element_p() )
             {
-                mark = ts + 1;
-
-                ( state->cs) = 71;
+                ( state->cs) = 64;
             }
             else
             {
-                ( state->cs) = 34;
+                ( state->cs) = 27;
             }
         }}
 	goto _again;
-tr101:
+tr93:
 #line 319 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st65;
-tr102:
+	goto st58;
+tr94:
 #line 315 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
-	goto st65;
-st65:
+	goto st58;
+st58:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof65;
-case 65:
+		goto _test_eof58;
+case 58:
 #line 1 "NONE"
 	{ts = p;}
-#line 1348 "ext/c/lexer.c"
+#line 1350 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr94;
+		case 9: goto tr86;
 		case 10: goto tr29;
 		case 13: goto st25;
-		case 32: goto tr94;
-		case 34: goto tr96;
-		case 39: goto tr97;
-		case 45: goto st66;
+		case 32: goto tr86;
+		case 34: goto tr88;
+		case 39: goto tr89;
+		case 45: goto st59;
 		case 47: goto st26;
-		case 61: goto tr94;
-		case 62: goto tr100;
-		case 95: goto st66;
+		case 61: goto tr86;
+		case 62: goto tr92;
+		case 95: goto st59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st66;
+			goto st59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st66;
+			goto st59;
 	} else
-		goto st66;
+		goto st59;
 	goto st0;
 st25:
 	if ( ++p == pe )
@@ -1374,24 +1376,24 @@ case 25:
 	if ( (*p) == 10 )
 		goto tr29;
 	goto st0;
-st66:
+st59:
 	if ( ++p == pe )
-		goto _test_eof66;
-case 66:
+		goto _test_eof59;
+case 59:
 	switch( (*p) ) {
-		case 45: goto st66;
-		case 58: goto tr102;
-		case 95: goto st66;
+		case 45: goto st59;
+		case 58: goto tr94;
+		case 95: goto st59;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st66;
+			goto st59;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st66;
+			goto st59;
 	} else
-		goto st66;
-	goto tr101;
+		goto st59;
+	goto tr93;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
@@ -1399,9 +1401,9 @@ case 26:
 	if ( (*p) == 62 )
 		goto tr31;
 	goto st0;
-tr105:
-	( state->cs) = 67;
-#line 373 "ext/ragel/base_lexer.rl"
+tr97:
+	( state->cs) = 60;
+#line 371 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1412,12 +1414,12 @@ tr105:
                 lines = 0;
             }
 
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-tr107:
-	( state->cs) = 67;
-#line 387 "ext/ragel/base_lexer.rl"
+tr99:
+	( state->cs) = 60;
+#line 385 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1431,12 +1433,12 @@ tr107:
                 lines = 0;
             }
 
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-tr108:
-	( state->cs) = 67;
-#line 373 "ext/ragel/base_lexer.rl"
+tr100:
+	( state->cs) = 60;
+#line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1447,103 +1449,134 @@ tr108:
                 lines = 0;
             }
 
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
-st67:
+st60:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof67;
-case 67:
+		goto _test_eof60;
+case 60:
 #line 1 "NONE"
 	{ts = p;}
-#line 1462 "ext/c/lexer.c"
+#line 1464 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr104;
-	goto tr103;
-tr103:
+		goto tr96;
+	goto tr95;
+tr95:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st68;
-st68:
+	goto st61;
+st61:
 	if ( ++p == pe )
-		goto _test_eof68;
-case 68:
-#line 1476 "ext/c/lexer.c"
+		goto _test_eof61;
+case 61:
+#line 1478 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr106;
-	goto tr103;
-tr106:
+		goto tr98;
+	goto tr95;
+tr98:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 387 "ext/ragel/base_lexer.rl"
+#line 385 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st69;
-st69:
+	goto st62;
+st62:
 	if ( ++p == pe )
-		goto _test_eof69;
-case 69:
-#line 1492 "ext/c/lexer.c"
+		goto _test_eof62;
+case 62:
+#line 1494 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr107;
-		case 45: goto tr107;
-		case 60: goto tr106;
-		case 63: goto tr107;
-		case 95: goto tr107;
+		case 33: goto tr99;
+		case 45: goto tr99;
+		case 60: goto tr98;
+		case 63: goto tr99;
+		case 95: goto tr99;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr107;
+			goto tr99;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr107;
+			goto tr99;
 	} else
-		goto tr107;
-	goto tr103;
-tr104:
+		goto tr99;
+	goto tr95;
+tr96:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 387 "ext/ragel/base_lexer.rl"
+#line 385 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st70;
-st70:
+	goto st63;
+st63:
 	if ( ++p == pe )
-		goto _test_eof70;
-case 70:
-#line 1521 "ext/c/lexer.c"
+		goto _test_eof63;
+case 63:
+#line 1523 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr108;
-		case 45: goto tr108;
-		case 60: goto tr106;
-		case 63: goto tr108;
-		case 95: goto tr108;
+		case 33: goto tr100;
+		case 45: goto tr100;
+		case 60: goto tr98;
+		case 63: goto tr100;
+		case 95: goto tr100;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr108;
+			goto tr100;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr108;
+			goto tr100;
 	} else
-		goto tr108;
-	goto tr103;
-tr32:
-#line 425 "ext/ragel/base_lexer.rl"
-	{{p = ((te))-1;}}
-	goto st71;
-tr39:
-	( state->cs) = 71;
-#line 408 "ext/ragel/base_lexer.rl"
+		goto tr100;
+	goto tr95;
+tr103:
+#line 1 "NONE"
+	{	switch( ( state->act) ) {
+	case 0:
+	{{goto st0;}}
+	break;
+	case 33:
+	{{p = ((te))-1;}
+            callback(id_on_text, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }
+	break;
+	}
+	}
+	goto st64;
+tr104:
+#line 409 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_text, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }}
+	goto st64;
+tr113:
+	( state->cs) = 64;
+#line 420 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback(id_on_text, data, encoding, mark, ts);
+            callback(id_on_text, data, encoding, ts, mark);
 
+            p    = mark - 1;
             mark = 0;
 
             if ( lines > 0 )
@@ -1553,38 +1586,141 @@ tr39:
                 lines = 0;
             }
 
-            callback_simple(id_on_element_end);
-
-            ( state->cs) = 34;
+            ( state->cs) = 27;
         }}
 	goto _again;
+st64:
+#line 1 "NONE"
+	{ts = 0;}
+#line 1 "NONE"
+	{( state->act) = 0;}
+	if ( ++p == pe )
+		goto _test_eof64;
+case 64:
+#line 1 "NONE"
+	{ts = p;}
+#line 1603 "ext/c/lexer.c"
+	if ( (*p) == 60 )
+		goto tr102;
+	goto tr101;
+tr101:
+#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:
+	if ( ++p == pe )
+		goto _test_eof65;
+case 65:
+#line 1621 "ext/c/lexer.c"
+	if ( (*p) == 60 )
+		goto tr102;
+	goto tr101;
+tr102:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+#line 420 "ext/ragel/base_lexer.rl"
+	{ mark = p; }
+	goto st66;
+st66:
+	if ( ++p == pe )
+		goto _test_eof66;
+case 66:
+#line 1637 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 47: goto tr105;
+		case 60: goto tr102;
+	}
+	goto tr101;
+tr105:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st67;
+st67:
+	if ( ++p == pe )
+		goto _test_eof67;
+case 67:
+#line 1653 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 115: goto tr106;
+	}
+	goto tr101;
+tr106:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st68;
+st68:
+	if ( ++p == pe )
+		goto _test_eof68;
+case 68:
+#line 1669 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 99: goto tr107;
+		case 116: goto tr108;
+	}
+	goto tr101;
+tr107:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st69;
+st69:
+	if ( ++p == pe )
+		goto _test_eof69;
+case 69:
+#line 1686 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 114: goto tr109;
+	}
+	goto tr101;
 tr109:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 425 "ext/ragel/base_lexer.rl"
-	{te = p+1;}
-	goto st71;
-tr111:
-#line 425 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
+	goto st70;
+st70:
+	if ( ++p == pe )
+		goto _test_eof70;
+case 70:
+#line 1702 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 105: goto tr110;
+	}
+	goto tr101;
+tr110:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
 	goto st71;
 st71:
-#line 1 "NONE"
-	{ts = 0;}
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 1 "NONE"
-	{ts = p;}
-#line 1582 "ext/c/lexer.c"
-	if ( (*p) == 60 )
-		goto tr110;
-	goto tr109;
-tr110:
-#line 1 "NONE"
-	{te = p+1;}
+#line 1718 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 112: goto tr111;
+	}
+	goto tr101;
+tr111:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1594,62 +1730,79 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 1598 "ext/c/lexer.c"
-	if ( (*p) == 47 )
-		goto st27;
-	goto tr111;
-st27:
-	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
-	if ( (*p) == 115 )
-		goto st28;
-	goto tr32;
-st28:
-	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
-	if ( (*p) == 99 )
-		goto st29;
-	goto tr32;
-st29:
-	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
-	if ( (*p) == 114 )
-		goto st30;
-	goto tr32;
-st30:
+#line 1734 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 116: goto tr112;
+	}
+	goto tr101;
+tr112:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st73;
+st73:
 	if ( ++p == pe )
-		goto _test_eof30;
-case 30:
-	if ( (*p) == 105 )
-		goto st31;
-	goto tr32;
-st31:
+		goto _test_eof73;
+case 73:
+#line 1750 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 62: goto tr113;
+	}
+	goto tr101;
+tr108:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st74;
+st74:
 	if ( ++p == pe )
-		goto _test_eof31;
-case 31:
-	if ( (*p) == 112 )
-		goto st32;
-	goto tr32;
-st32:
+		goto _test_eof74;
+case 74:
+#line 1766 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 121: goto tr114;
+	}
+	goto tr101;
+tr114:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st75;
+st75:
 	if ( ++p == pe )
-		goto _test_eof32;
-case 32:
-	if ( (*p) == 116 )
-		goto st33;
-	goto tr32;
-st33:
+		goto _test_eof75;
+case 75:
+#line 1782 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 108: goto tr115;
+	}
+	goto tr101;
+tr115:
+#line 51 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st76;
+st76:
 	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
-	if ( (*p) == 62 )
-		goto tr39;
-	goto tr32;
+		goto _test_eof76;
+case 76:
+#line 1798 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 60: goto tr102;
+		case 101: goto tr112;
 	}
-	_test_eof34: ( state->cs) = 34; goto _test_eof; 
-	_test_eof35: ( state->cs) = 35; goto _test_eof; 
+	goto tr101;
+	}
+	_test_eof27: ( state->cs) = 27; goto _test_eof; 
+	_test_eof28: ( state->cs) = 28; 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; 
@@ -1662,7 +1815,7 @@ case 33:
 	_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_eof36: ( state->cs) = 36; goto _test_eof; 
+	_test_eof29: ( state->cs) = 29; 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; 
@@ -1675,6 +1828,13 @@ case 33:
 	_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_eof30: ( state->cs) = 30; 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_eof34: ( state->cs) = 34; goto _test_eof; 
+	_test_eof35: ( state->cs) = 35; goto _test_eof; 
+	_test_eof36: ( state->cs) = 36; goto _test_eof; 
 	_test_eof37: ( state->cs) = 37; goto _test_eof; 
 	_test_eof38: ( state->cs) = 38; goto _test_eof; 
 	_test_eof39: ( state->cs) = 39; goto _test_eof; 
@@ -1697,35 +1857,32 @@ case 33:
 	_test_eof56: ( state->cs) = 56; goto _test_eof; 
 	_test_eof57: ( state->cs) = 57; goto _test_eof; 
 	_test_eof58: ( state->cs) = 58; goto _test_eof; 
+	_test_eof25: ( state->cs) = 25; goto _test_eof; 
 	_test_eof59: ( state->cs) = 59; goto _test_eof; 
+	_test_eof26: ( state->cs) = 26; 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_eof25: ( state->cs) = 25; goto _test_eof; 
 	_test_eof66: ( state->cs) = 66; goto _test_eof; 
-	_test_eof26: ( state->cs) = 26; goto _test_eof; 
 	_test_eof67: ( state->cs) = 67; goto _test_eof; 
 	_test_eof68: ( state->cs) = 68; goto _test_eof; 
 	_test_eof69: ( state->cs) = 69; goto _test_eof; 
 	_test_eof70: ( state->cs) = 70; goto _test_eof; 
 	_test_eof71: ( state->cs) = 71; goto _test_eof; 
 	_test_eof72: ( state->cs) = 72; 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_eof31: ( state->cs) = 31; goto _test_eof; 
-	_test_eof32: ( state->cs) = 32; goto _test_eof; 
-	_test_eof33: ( state->cs) = 33; goto _test_eof; 
+	_test_eof73: ( state->cs) = 73; goto _test_eof; 
+	_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_eof: {}
 	if ( p == eof )
 	{
 	switch ( ( state->cs) ) {
-	case 35: goto tr42;
+	case 28: goto tr34;
 	case 1: goto tr0;
 	case 2: goto tr0;
 	case 3: goto tr0;
@@ -1738,7 +1895,7 @@ case 33:
 	case 10: goto tr0;
 	case 11: goto tr0;
 	case 12: goto tr0;
-	case 36: goto tr46;
+	case 29: goto tr38;
 	case 13: goto tr0;
 	case 14: goto tr0;
 	case 15: goto tr0;
@@ -1751,39 +1908,43 @@ case 33:
 	case 22: goto tr0;
 	case 23: goto tr0;
 	case 24: goto tr0;
-	case 37: goto tr47;
-	case 38: goto tr48;
-	case 39: goto tr48;
-	case 41: goto tr53;
-	case 43: goto tr57;
-	case 45: goto tr60;
-	case 47: goto tr63;
-	case 49: goto tr72;
-	case 50: goto tr73;
-	case 51: goto tr73;
-	case 52: goto tr73;
-	case 53: goto tr73;
-	case 54: goto tr73;
-	case 55: goto tr73;
-	case 56: goto tr73;
-	case 57: goto tr73;
-	case 58: goto tr73;
-	case 59: goto tr73;
-	case 61: goto tr88;
-	case 62: goto tr89;
-	case 64: goto tr92;
-	case 66: goto tr101;
-	case 68: goto tr105;
-	case 69: goto tr105;
-	case 70: goto tr105;
-	case 72: goto tr111;
-	case 27: goto tr32;
-	case 28: goto tr32;
-	case 29: goto tr32;
-	case 30: goto tr32;
-	case 31: goto tr32;
-	case 32: goto tr32;
-	case 33: goto tr32;
+	case 30: goto tr39;
+	case 31: goto tr40;
+	case 32: goto tr40;
+	case 34: goto tr45;
+	case 36: goto tr49;
+	case 38: goto tr52;
+	case 40: goto tr55;
+	case 42: goto tr64;
+	case 43: goto tr65;
+	case 44: goto tr65;
+	case 45: goto tr65;
+	case 46: goto tr65;
+	case 47: goto tr65;
+	case 48: goto tr65;
+	case 49: goto tr65;
+	case 50: goto tr65;
+	case 51: goto tr65;
+	case 52: goto tr65;
+	case 54: goto tr80;
+	case 55: goto tr81;
+	case 57: goto tr84;
+	case 59: goto tr93;
+	case 61: goto tr97;
+	case 62: goto tr97;
+	case 63: goto tr97;
+	case 65: goto tr103;
+	case 66: goto tr104;
+	case 67: goto tr104;
+	case 68: goto tr104;
+	case 69: goto tr104;
+	case 70: goto tr104;
+	case 71: goto tr104;
+	case 72: goto tr104;
+	case 73: goto tr104;
+	case 74: goto tr104;
+	case 75: goto tr104;
+	case 76: goto tr104;
 	}
 	}
 
@@ -1843,8 +2004,8 @@ void Init_liboga_xml_lexer()
     VALUE mXML   = rb_const_get(mOga, rb_intern("XML"));
     VALUE cLexer = rb_define_class_under(mXML, "Lexer", rb_cObject);
 
-    id_advance_line         = rb_intern("advance_line");
-    id_inside_html_script_p = rb_intern("inside_html_script?");
+    id_advance_line           = rb_intern("advance_line");
+    id_literal_html_element_p = rb_intern("literal_html_element?");
 
     rb_define_method(cLexer, "advance_native", oga_xml_lexer_advance, 1);
     rb_define_method(cLexer, "reset_native", oga_xml_lexer_reset, 0);