oga 0.2.2-java → 0.2.3-java

data/ext/c/lexer.rl

@@ -19,11 +19,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;
 
 %%machine c_lexer;
 
@@ -173,8 +173,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);

data/ext/java/org/liboga/xml/Lexer.java

@@ -43,17 +43,17 @@ public class Lexer extends RubyObject
 private static byte[] init__java_lexer_actions_0()
 {
 	return new byte [] {
-	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
-	    6,    1,    7,    1,    8,    1,    9,    1,   10,    1,   11,    1,
-	   12,    1,   13,    1,   16,    1,   17,    1,   18,    1,   19,    1,
-	   20,    1,   21,    1,   22,    1,   23,    1,   24,    1,   25,    1,
-	   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,   31,    1,
-	   32,    1,   33,    1,   34,    1,   35,    1,   36,    1,   37,    1,
-	   38,    1,   39,    1,   40,    1,   41,    1,   42,    1,   44,    1,
-	   45,    1,   48,    1,   49,    1,   50,    1,   51,    1,   52,    1,
-	   53,    1,   54,    1,   55,    1,   56,    1,   57,    2,    0,    1,
-	    2,    0,   43,    2,    4,    0,    2,    4,   14,    2,    4,   15,
-	    2,    4,   46,    2,    4,   47
+	    0,    1,    0,    1,    3,    1,    5,    1,    6,    1,    7,    1,
+	    8,    1,    9,    1,   10,    1,   11,    1,   12,    1,   13,    1,
+	   14,    1,   15,    1,   18,    1,   19,    1,   20,    1,   21,    1,
+	   22,    1,   23,    1,   24,    1,   25,    1,   26,    1,   27,    1,
+	   28,    1,   29,    1,   30,    1,   31,    1,   32,    1,   33,    1,
+	   34,    1,   35,    1,   36,    1,   37,    1,   38,    1,   39,    1,
+	   40,    1,   41,    1,   42,    1,   43,    1,   45,    1,   46,    1,
+	   47,    1,   50,    1,   51,    1,   52,    1,   53,    1,   54,    1,
+	   55,    1,   56,    1,   57,    1,   58,    1,   59,    2,    0,    1,
+	    2,    0,    2,    2,    3,    4,    2,    6,   16,    2,    6,   17,
+	    2,    6,   48,    2,    6,   49,    3,    6,    0,   44
 	};
 }
 
@@ -65,11 +65,11 @@ private static short[] init__java_lexer_key_offsets_0()
 	return new short [] {
 	    0,    0,    4,    5,    6,    7,    9,   11,   13,   15,   17,   19,
 	   21,   23,   24,   25,   26,   27,   28,   29,   30,   31,   33,   41,
-	   51,   60,   61,   62,   63,   64,   65,   66,   67,   68,   69,   70,
-	   81,   83,   91,  100,  109,  110,  111,  112,  113,  114,  115,  116,
-	  117,  133,  141,  150,  159,  168,  177,  186,  195,  204,  213,  222,
-	  231,  242,  250,  251,  259,  268,  285,  294,  295,  296,  307,  318,
-	  319
+	   51,   60,   61,   62,   63,   74,   76,   84,   93,  102,  103,  104,
+	  105,  106,  107,  108,  109,  110,  126,  134,  143,  152,  161,  170,
+	  179,  188,  197,  206,  215,  224,  235,  243,  244,  252,  261,  278,
+	  287,  288,  289,  300,  311,  312,  313,  315,  317,  320,  322,  324,
+	  326,  328,  330,  332,  334
 	};
 }
 
@@ -84,28 +84,30 @@ private static char[] init__java_lexer_trans_keys_0()
 	   68,   65,   84,   65,   91,   93,   93,   62,   93,   45,   95,   48,
 	   57,   65,   90,   97,  122,   45,   58,   62,   95,   48,   57,   65,
 	   90,   97,  122,   45,   95,  120,   48,   57,   65,   90,   97,  122,
-	   10,   62,  115,   99,  114,  105,  112,  116,   62,   60,   33,   45,
-	   47,   63,   95,   48,   57,   65,   90,   97,  122,    9,   32,   45,
-	   95,   48,   57,   65,   90,   97,  122,   45,   95,  109,   48,   57,
-	   65,   90,   97,  122,   45,   95,  108,   48,   57,   65,   90,   97,
-	  122,   63,   62,   39,   39,   34,   34,   93,   93,    9,   32,   34,
-	   39,   45,   62,   80,   83,   91,   95,   48,   57,   65,   90,   97,
-	  122,   45,   95,   48,   57,   65,   90,   97,  122,   45,   85,   95,
-	   48,   57,   65,   90,   97,  122,   45,   66,   95,   48,   57,   65,
-	   90,   97,  122,   45,   76,   95,   48,   57,   65,   90,   97,  122,
-	   45,   73,   95,   48,   57,   65,   90,   97,  122,   45,   67,   95,
-	   48,   57,   65,   90,   97,  122,   45,   89,   95,   48,   57,   65,
-	   90,   97,  122,   45,   83,   95,   48,   57,   65,   90,   97,  122,
-	   45,   84,   95,   48,   57,   65,   90,   97,  122,   45,   69,   95,
-	   48,   57,   65,   90,   97,  122,   45,   77,   95,   48,   57,   65,
-	   90,   97,  122,   34,   39,   45,   63,   95,   48,   57,   65,   90,
-	   97,  122,   45,   95,   48,   57,   65,   90,   97,  122,   62,   45,
-	   95,   48,   57,   65,   90,   97,  122,   45,   58,   95,   48,   57,
-	   65,   90,   97,  122,    9,   10,   13,   32,   34,   39,   45,   47,
-	   61,   62,   95,   48,   57,   65,   90,   97,  122,   45,   58,   95,
-	   48,   57,   65,   90,   97,  122,   60,   60,   33,   45,   60,   63,
-	   95,   47,   57,   65,   90,   97,  122,   33,   45,   60,   63,   95,
-	   47,   57,   65,   90,   97,  122,   60,   47,    0
+	   10,   62,   60,   33,   45,   47,   63,   95,   48,   57,   65,   90,
+	   97,  122,    9,   32,   45,   95,   48,   57,   65,   90,   97,  122,
+	   45,   95,  109,   48,   57,   65,   90,   97,  122,   45,   95,  108,
+	   48,   57,   65,   90,   97,  122,   63,   62,   39,   39,   34,   34,
+	   93,   93,    9,   32,   34,   39,   45,   62,   80,   83,   91,   95,
+	   48,   57,   65,   90,   97,  122,   45,   95,   48,   57,   65,   90,
+	   97,  122,   45,   85,   95,   48,   57,   65,   90,   97,  122,   45,
+	   66,   95,   48,   57,   65,   90,   97,  122,   45,   76,   95,   48,
+	   57,   65,   90,   97,  122,   45,   73,   95,   48,   57,   65,   90,
+	   97,  122,   45,   67,   95,   48,   57,   65,   90,   97,  122,   45,
+	   89,   95,   48,   57,   65,   90,   97,  122,   45,   83,   95,   48,
+	   57,   65,   90,   97,  122,   45,   84,   95,   48,   57,   65,   90,
+	   97,  122,   45,   69,   95,   48,   57,   65,   90,   97,  122,   45,
+	   77,   95,   48,   57,   65,   90,   97,  122,   34,   39,   45,   63,
+	   95,   48,   57,   65,   90,   97,  122,   45,   95,   48,   57,   65,
+	   90,   97,  122,   62,   45,   95,   48,   57,   65,   90,   97,  122,
+	   45,   58,   95,   48,   57,   65,   90,   97,  122,    9,   10,   13,
+	   32,   34,   39,   45,   47,   61,   62,   95,   48,   57,   65,   90,
+	   97,  122,   45,   58,   95,   48,   57,   65,   90,   97,  122,   60,
+	   60,   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,
+	   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,   60,
+	   60,   47,   60,   60,  115,   60,   99,  116,   60,  114,   60,  105,
+	   60,  112,   60,  116,   60,   62,   60,  121,   60,  108,   60,  101,
+	    0
 	};
 }
 
@@ -117,11 +119,11 @@ private static byte[] init__java_lexer_single_lengths_0()
 	return new byte [] {
 	    0,    4,    1,    1,    1,    2,    2,    2,    2,    2,    2,    2,
 	    2,    1,    1,    1,    1,    1,    1,    1,    1,    2,    2,    4,
-	    3,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    5,
-	    2,    2,    3,    3,    1,    1,    1,    1,    1,    1,    1,    1,
-	   10,    2,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-	    5,    2,    1,    2,    3,   11,    3,    1,    1,    5,    5,    1,
-	    1
+	    3,    1,    1,    1,    5,    2,    2,    3,    3,    1,    1,    1,
+	    1,    1,    1,    1,    1,   10,    2,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    5,    2,    1,    2,    3,   11,    3,
+	    1,    1,    5,    5,    1,    1,    2,    2,    3,    2,    2,    2,
+	    2,    2,    2,    2,    2
 	};
 }
 
@@ -133,11 +135,11 @@ private static byte[] init__java_lexer_range_lengths_0()
 	return new byte [] {
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,    3,
-	    3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,
-	    0,    3,    3,    3,    0,    0,    0,    0,    0,    0,    0,    0,
-	    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-	    3,    3,    0,    3,    3,    3,    3,    0,    0,    3,    3,    0,
-	    0
+	    3,    0,    0,    0,    3,    0,    3,    3,    3,    0,    0,    0,
+	    0,    0,    0,    0,    0,    3,    3,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    3,    3,    0,    3,    3,    3,    3,
+	    0,    0,    3,    3,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0
 	};
 }
 
@@ -149,11 +151,11 @@ private static short[] init__java_lexer_index_offsets_0()
 	return new short [] {
 	    0,    0,    5,    7,    9,   11,   14,   17,   20,   23,   26,   29,
 	   32,   35,   37,   39,   41,   43,   45,   47,   49,   51,   54,   60,
-	   68,   75,   77,   79,   81,   83,   85,   87,   89,   91,   93,   95,
-	  104,  107,  113,  120,  127,  129,  131,  133,  135,  137,  139,  141,
-	  143,  157,  163,  170,  177,  184,  191,  198,  205,  212,  219,  226,
-	  233,  242,  248,  250,  256,  263,  278,  285,  287,  289,  298,  307,
-	  309
+	   68,   75,   77,   79,   81,   90,   93,   99,  106,  113,  115,  117,
+	  119,  121,  123,  125,  127,  129,  143,  149,  156,  163,  170,  177,
+	  184,  191,  198,  205,  212,  219,  228,  234,  236,  242,  249,  264,
+	  271,  273,  275,  284,  293,  295,  297,  300,  303,  307,  310,  313,
+	  316,  319,  322,  325,  328
 	};
 }
 
@@ -169,26 +171,28 @@ private static byte[] init__java_lexer_indicies_0()
 	    0,   16,    0,   17,    0,   18,    0,   19,    0,   20,    0,   21,
 	   20,   22,   20,   23,   22,   20,   24,   24,   24,   24,   24,    0,
 	   24,   25,   26,   24,   24,   24,   24,    0,   27,   27,   28,   27,
-	   27,   27,    0,   29,   30,   31,   30,   33,   32,   34,   32,   35,
-	   32,   36,   32,   37,   32,   38,   32,   39,   32,   41,   40,   43,
-	   44,   25,   45,   44,   44,   44,   44,   42,   14,   14,   46,   27,
-	   27,   27,   27,   27,   47,   27,   27,   49,   27,   27,   27,   48,
-	   27,   27,   50,   27,   27,   27,   48,   52,   51,   54,   53,   56,
-	   55,   57,   55,   59,   58,   60,   58,   62,   61,   63,   61,   64,
-	   64,   65,   66,   67,   68,   69,   70,   71,   67,   67,   67,   67,
-	   30,   67,   67,   67,   67,   67,   72,   67,   74,   67,   67,   67,
-	   67,   73,   67,   75,   67,   67,   67,   67,   73,   67,   76,   67,
-	   67,   67,   67,   73,   67,   77,   67,   67,   67,   67,   73,   67,
-	   78,   67,   67,   67,   67,   73,   67,   79,   67,   67,   67,   67,
-	   73,   67,   80,   67,   67,   67,   67,   73,   67,   81,   67,   67,
-	   67,   67,   73,   67,   82,   67,   67,   67,   67,   73,   67,   78,
-	   67,   67,   67,   67,   73,   84,   85,   86,   87,   86,   86,   86,
-	   86,   83,   86,   86,   86,   86,   86,   88,   90,   89,   91,   91,
-	   91,   91,   91,   30,   91,   93,   91,   91,   91,   91,   92,   94,
-	   29,   95,   94,   96,   97,   98,   99,   94,  100,   98,   98,   98,
-	   98,   30,   98,  102,   98,   98,   98,   98,  101,  104,  103,  106,
-	  103,  107,  107,  106,  107,  107,  107,  107,  107,  103,  108,  108,
-	  106,  108,  108,  108,  108,  108,  103,  110,  109,  112,  111,    0
+	   27,   27,    0,   29,   30,   31,   30,   33,   32,   35,   36,   25,
+	   37,   36,   36,   36,   36,   34,   14,   14,   38,   27,   27,   27,
+	   27,   27,   39,   27,   27,   41,   27,   27,   27,   40,   27,   27,
+	   42,   27,   27,   27,   40,   44,   43,   46,   45,   48,   47,   49,
+	   47,   51,   50,   52,   50,   54,   53,   55,   53,   56,   56,   57,
+	   58,   59,   60,   61,   62,   63,   59,   59,   59,   59,   30,   59,
+	   59,   59,   59,   59,   64,   59,   66,   59,   59,   59,   59,   65,
+	   59,   67,   59,   59,   59,   59,   65,   59,   68,   59,   59,   59,
+	   59,   65,   59,   69,   59,   59,   59,   59,   65,   59,   70,   59,
+	   59,   59,   59,   65,   59,   71,   59,   59,   59,   59,   65,   59,
+	   72,   59,   59,   59,   59,   65,   59,   73,   59,   59,   59,   59,
+	   65,   59,   74,   59,   59,   59,   59,   65,   59,   70,   59,   59,
+	   59,   59,   65,   76,   77,   78,   79,   78,   78,   78,   78,   75,
+	   78,   78,   78,   78,   78,   80,   82,   81,   83,   83,   83,   83,
+	   83,   30,   83,   85,   83,   83,   83,   83,   84,   86,   29,   87,
+	   86,   88,   89,   90,   91,   86,   92,   90,   90,   90,   90,   30,
+	   90,   94,   90,   90,   90,   90,   93,   96,   95,   98,   95,   99,
+	   99,   98,   99,   99,   99,   99,   99,   95,  100,  100,   98,  100,
+	  100,  100,  100,  100,   95,  102,  101,  102,  101,  105,  102,  101,
+	  102,  106,  101,  102,  107,  108,  101,  102,  109,  101,  102,  110,
+	  101,  102,  111,  101,  102,  112,  101,  102,  113,  101,  102,  114,
+	  101,  102,  115,  101,  102,  112,  101,    0
 	};
 }
 
@@ -198,16 +202,16 @@ private static final byte _java_lexer_indicies[] = init__java_lexer_indicies_0()
 private static byte[] init__java_lexer_trans_targs_0()
 {
 	return new byte [] {
-	   34,    2,    6,   13,    3,    4,    5,   34,    7,    8,    9,   10,
-	   11,   12,   36,   14,   15,   16,   17,   18,   19,   20,   21,   34,
-	   23,   22,   34,   37,   38,   65,    0,   65,   71,   28,   29,   30,
-	   31,   32,   33,   71,   34,   35,   34,    1,   34,   24,   34,   34,
-	   34,   39,   37,   40,   41,   40,   40,   43,   42,   42,   45,   44,
-	   44,   47,   46,   46,   48,   48,   48,   49,   48,   50,   55,   48,
-	   48,   48,   51,   52,   53,   54,   49,   56,   57,   58,   59,   60,
-	   60,   60,   61,   62,   60,   60,   60,   64,   63,   63,   65,   25,
-	   65,   65,   66,   26,   65,   65,   65,   68,   70,   67,   69,   67,
-	   67,   71,   72,   71,   27
+	   27,    2,    6,   13,    3,    4,    5,   27,    7,    8,    9,   10,
+	   11,   12,   29,   14,   15,   16,   17,   18,   19,   20,   21,   27,
+	   23,   22,   27,   30,   31,   58,    0,   58,   27,   28,   27,    1,
+	   27,   24,   27,   27,   27,   32,   30,   33,   34,   33,   33,   36,
+	   35,   35,   38,   37,   37,   40,   39,   39,   41,   41,   41,   42,
+	   41,   43,   48,   41,   41,   41,   44,   45,   46,   47,   42,   49,
+	   50,   51,   52,   53,   53,   53,   54,   55,   53,   53,   53,   57,
+	   56,   56,   58,   25,   58,   58,   59,   26,   58,   58,   58,   61,
+	   63,   60,   62,   60,   60,   65,   66,   64,   64,   67,   68,   69,
+	   74,   70,   71,   72,   73,   64,   75,   76
 	};
 }
 
@@ -219,14 +223,14 @@ private static byte[] init__java_lexer_trans_actions_0()
 	return new byte [] {
 	  101,    0,    0,    0,    0,    0,    0,   85,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   87,
-	    0,    0,   91,  123,    0,   59,    0,   69,   83,    0,    0,    0,
-	    0,    0,    0,   79,   93,    7,   99,    0,   89,    0,   95,  103,
-	   97,    0,  120,   11,    0,   13,    9,    1,   15,   17,    1,   19,
-	   21,    1,   23,   25,   33,   31,   29,  117,   35,    0,    0,   27,
-	   39,   37,    0,    0,    0,    0,  114,    0,    0,    0,    0,   47,
-	   45,   43,    0,    0,   49,   51,   41,    0,   55,   53,   57,    0,
-	   65,   63,    0,    0,   67,   71,   61,    1,  105,   77,  105,   75,
-	   73,  108,  111,   81,    0
+	    0,    0,   91,  123,    0,   59,    0,   69,   93,    7,   99,    0,
+	   89,    0,   95,  103,   97,    0,  120,   11,    0,   13,    9,    1,
+	   15,   17,    1,   19,   21,    1,   23,   25,   33,   31,   29,  117,
+	   35,    0,    0,   27,   39,   37,    0,    0,    0,    0,  114,    0,
+	    0,    0,    0,   47,   45,   43,    0,    0,   49,   51,   41,    0,
+	   55,   53,   57,    0,   65,   63,    0,    0,   67,   71,   61,    1,
+	  105,   77,  105,   75,   73,  126,  108,   83,   81,    1,    1,    1,
+	    1,    1,    1,    1,    1,   79,    1,    1
 	};
 }
 
@@ -238,11 +242,11 @@ private static byte[] init__java_lexer_to_state_actions_0()
 	return new byte [] {
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,    0,
-	    0,    0,    0,    0,    3,    0,    3,    0,    3,    0,    3,    0,
-	    3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    3,    0,    0,    3,    0,    3,    0,    3,    0,    0,    0,    3,
-	    0
+	    0,    0,    0,    3,    0,    0,    0,    0,    0,    3,    0,    3,
+	    0,    3,    0,    3,    0,    3,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    3,    0,    0,    3,    0,    3,    0,
+	    3,    0,    0,    0,  111,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0
 	};
 }
 
@@ -254,11 +258,11 @@ private static byte[] init__java_lexer_from_state_actions_0()
 	return new byte [] {
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,    0,
-	    0,    0,    0,    0,    5,    0,    5,    0,    5,    0,    5,    0,
-	    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    5,    0,    0,    5,    0,    5,    0,    5,    0,    0,    0,    5,
-	    0
+	    0,    0,    0,    5,    0,    0,    0,    0,    0,    5,    0,    5,
+	    0,    5,    0,    5,    0,    5,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    5,    0,    0,    5,    0,    5,    0,
+	    5,    0,    0,    0,    5,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0
 	};
 }
 
@@ -270,32 +274,32 @@ private static short[] init__java_lexer_eof_trans_0()
 	return new short [] {
 	    0,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
 	    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	    1,    0,    0,   33,   33,   33,   33,   33,   33,   33,    0,   43,
-	   47,   48,   49,   49,    0,   54,    0,   58,    0,   61,    0,   64,
-	    0,   73,   74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
-	    0,   89,   90,    0,   93,    0,  102,    0,  106,  106,  106,    0,
-	  112
+	    1,    0,    0,    0,   35,   39,   40,   41,   41,    0,   46,    0,
+	   50,    0,   53,    0,   56,    0,   65,   66,   66,   66,   66,   66,
+	   66,   66,   66,   66,   66,    0,   81,   82,    0,   85,    0,   94,
+	    0,   98,   98,   98,    0,  104,  105,  105,  105,  105,  105,  105,
+	  105,  105,  105,  105,  105
 	};
 }
 
 private static final short _java_lexer_eof_trans[] = init__java_lexer_eof_trans_0();
 
 
-static final int java_lexer_start = 34;
-static final int java_lexer_first_final = 34;
+static final int java_lexer_start = 27;
+static final int java_lexer_first_final = 27;
 static final int java_lexer_error = 0;
 
-static final int java_lexer_en_proc_ins_body = 40;
-static final int java_lexer_en_string_squote = 42;
-static final int java_lexer_en_string_dquote = 44;
-static final int java_lexer_en_doctype_inline = 46;
-static final int java_lexer_en_doctype = 48;
-static final int java_lexer_en_xml_decl = 60;
-static final int java_lexer_en_element_name = 63;
-static final int java_lexer_en_element_head = 65;
-static final int java_lexer_en_text = 67;
-static final int java_lexer_en_script_text = 71;
-static final int java_lexer_en_main = 34;
+static final int java_lexer_en_proc_ins_body = 33;
+static final int java_lexer_en_string_squote = 35;
+static final int java_lexer_en_string_dquote = 37;
+static final int java_lexer_en_doctype_inline = 39;
+static final int java_lexer_en_doctype = 41;
+static final int java_lexer_en_xml_decl = 53;
+static final int java_lexer_en_element_name = 56;
+static final int java_lexer_en_element_head = 58;
+static final int java_lexer_en_text = 60;
+static final int java_lexer_en_literal_html_element = 64;
+static final int java_lexer_en_main = 27;
 
 
 // line 39 "ext/java/org/liboga/xml/Lexer.rl"
@@ -390,7 +394,7 @@ static final int java_lexer_en_main = 34;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 394 "ext/java/org/liboga/xml/Lexer.java"
+// line 398 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -415,11 +419,11 @@ case 1:
 	_nacts = (int) _java_lexer_actions[_acts++];
 	while ( _nacts-- > 0 ) {
 		switch ( _java_lexer_actions[_acts++] ) {
-	case 3:
+	case 5:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 423 "ext/java/org/liboga/xml/Lexer.java"
+// line 427 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -490,14 +494,18 @@ case 3:
     }
 	break;
 	case 1:
-// line 387 "ext/ragel/base_lexer.rl"
+// line 385 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
-	case 4:
+	case 2:
+// line 420 "ext/ragel/base_lexer.rl"
+	{ mark = p; }
+	break;
+	case 6:
 // line 1 "NONE"
 	{te = p+1;}
 	break;
-	case 5:
+	case 7:
 // line 116 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, mark, ts);
@@ -505,18 +513,18 @@ case 3:
 
             mark = 0;
 
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 6:
+	case 8:
 // line 125 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 7:
+	case 9:
 // line 125 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 8:
+	case 10:
 // line 163 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
@@ -524,7 +532,7 @@ case 3:
             {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
         }}
 	break;
-	case 9:
+	case 11:
 // line 137 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -537,7 +545,7 @@ case 3:
         }
     }}
 	break;
-	case 10:
+	case 12:
 // line 173 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
@@ -545,7 +553,7 @@ case 3:
             {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
         }}
 	break;
-	case 11:
+	case 13:
 // line 137 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -558,11 +566,11 @@ case 3:
         }
     }}
 	break;
-	case 12:
+	case 14:
 // line 210 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( this.cs) = 48; }}
+	{te = p+1;{ ( this.cs) = 41; }}
 	break;
-	case 13:
+	case 15:
 // line 199 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
@@ -575,52 +583,52 @@ case 3:
             }
         }}
 	break;
-	case 14:
+	case 16:
 // line 216 "ext/ragel/base_lexer.rl"
 	{( this.act) = 9;}
 	break;
-	case 15:
+	case 17:
 // line 231 "ext/ragel/base_lexer.rl"
 	{( this.act) = 14;}
 	break;
-	case 16:
+	case 18:
 // line 221 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( this.cs) = 46; }}
+	{te = p+1;{ ( this.cs) = 39; }}
 	break;
-	case 17:
+	case 19:
 // line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 42; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 35; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 18:
+	case 20:
 // line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 44; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 19:
+	case 21:
 // line 229 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 20:
+	case 22:
 // line 235 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 21:
+	case 23:
 // line 231 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
 	break;
-	case 22:
+	case 24:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
 	case 9:
@@ -636,120 +644,118 @@ case 3:
 	}
 	}
 	break;
-	case 23:
+	case 25:
 // line 255 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_xml_decl_end);
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 24:
+	case 26:
 // line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 42; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 35; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 25:
+	case 27:
 // line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 44; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 26:
+	case 28:
 // line 268 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 27:
+	case 29:
 // line 261 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
-	case 28:
+	case 30:
 // line 268 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 29:
+	case 31:
 // line 295 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
 	break;
-	case 30:
+	case 32:
 // line 299 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( this.cs) = 65;
+            ( this.cs) = 58;
         }}
 	break;
-	case 31:
+	case 33:
 // line 308 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 32:
+	case 34:
 // line 310 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_advance_line);
         }}
 	break;
-	case 33:
+	case 35:
 // line 315 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	break;
-	case 34:
+	case 36:
 // line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 42; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 35; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 35:
+	case 37:
 // line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 44; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 36:
+	case 38:
 // 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;
-
-                ( this.cs) = 71;
+                ( this.cs) = 64;
             }
             else
             {
-                ( this.cs) = 34;
+                ( this.cs) = 27;
             }
         }}
 	break;
-	case 37:
-// line 344 "ext/ragel/base_lexer.rl"
+	case 39:
+// line 342 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 38:
+	case 40:
 // line 319 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
-	case 39:
-// line 373 "ext/ragel/base_lexer.rl"
+	case 41:
+// line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -760,11 +766,11 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 40:
-// line 387 "ext/ragel/base_lexer.rl"
+	case 42:
+// line 385 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -778,11 +784,11 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 41:
-// line 373 "ext/ragel/base_lexer.rl"
+	case 43:
+// line 371 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -793,14 +799,19 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 34;
+            ( this.cs) = 27;
         }}
 	break;
-	case 42:
-// line 408 "ext/ragel/base_lexer.rl"
+	case 44:
+// line 409 "ext/ragel/base_lexer.rl"
+	{( this.act) = 33;}
+	break;
+	case 45:
+// 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 )
@@ -810,72 +821,92 @@ case 3:
                 lines = 0;
             }
 
-            callback_simple(id_on_element_end);
+            ( this.cs) = 27;
+        }}
+	break;
+	case 46:
+// line 409 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_text, data, encoding, ts, te);
 
-            ( this.cs) = 34;
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
         }}
 	break;
-	case 43:
-// line 425 "ext/ragel/base_lexer.rl"
-	{te = p+1;}
+	case 47:
+// line 1 "NONE"
+	{	switch( ( this.act) ) {
+	case 0:
+	{{( this.cs) = 0; _goto_targ = 2; if (true) continue _goto;}}
 	break;
-	case 44:
-// line 425 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
+	case 33:
+	{{p = ((te))-1;}
+            callback(id_on_text, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }
 	break;
-	case 45:
-// line 425 "ext/ragel/base_lexer.rl"
-	{{p = ((te))-1;}}
+	}
+	}
 	break;
-	case 46:
+	case 48:
 // line 248 "ext/ragel/base_lexer.rl"
 	{( this.act) = 36;}
 	break;
-	case 47:
+	case 49:
 // line 106 "ext/ragel/base_lexer.rl"
 	{( this.act) = 39;}
 	break;
-	case 48:
+	case 50:
 // line 72 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback(id_on_comment, data, encoding, ts + 4, te - 3);
     }}
 	break;
-	case 49:
+	case 51:
 // line 88 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback(id_on_cdata, data, encoding, ts + 9, te - 3);
     }}
 	break;
-	case 50:
+	case 52:
 // line 283 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_start);
         p--;
-        ( this.cs) = 63;
+        ( this.cs) = 56;
     }}
 	break;
-	case 51:
+	case 53:
 // line 289 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
 	break;
-	case 52:
-// line 358 "ext/ragel/base_lexer.rl"
+	case 54:
+// line 356 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( this.cs) = 67;
+        ( this.cs) = 60;
     }}
 	break;
-	case 53:
+	case 55:
 // line 192 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
-        ( this.cs) = 48;
+        ( this.cs) = 41;
     }}
 	break;
-	case 54:
+	case 56:
 // line 106 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
@@ -883,30 +914,30 @@ case 3:
 
         mark = te;
 
-        ( this.cs) = 40;
+        ( this.cs) = 33;
     }}
 	break;
-	case 55:
-// line 358 "ext/ragel/base_lexer.rl"
+	case 57:
+// line 356 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( this.cs) = 67;
+        ( this.cs) = 60;
     }}
 	break;
-	case 56:
-// line 358 "ext/ragel/base_lexer.rl"
+	case 58:
+// line 356 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( this.cs) = 67;
+        ( this.cs) = 60;
     }}
 	break;
-	case 57:
+	case 59:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
 	case 36:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( this.cs) = 60;
+        ( this.cs) = 53;
     }
 	break;
 	case 39:
@@ -916,13 +947,13 @@ case 3:
 
         mark = te;
 
-        ( this.cs) = 40;
+        ( this.cs) = 33;
     }
 	break;
 	}
 	}
 	break;
-// line 926 "ext/java/org/liboga/xml/Lexer.java"
+// line 957 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -932,11 +963,15 @@ case 2:
 	_nacts = (int) _java_lexer_actions[_acts++];
 	while ( _nacts-- > 0 ) {
 		switch ( _java_lexer_actions[_acts++] ) {
-	case 2:
+	case 3:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 940 "ext/java/org/liboga/xml/Lexer.java"
+	case 4:
+// line 1 "NONE"
+	{( this.act) = 0;}
+	break;
+// line 975 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -1024,17 +1059,16 @@ case 5:
     }
 
     /**
-     * Returns true if we're in an HTML script tag. See
-     * Oga::XML::Lexer#inside_html_script? for more information.
+     * See * Oga::XML::Lexer#literal_html_element? for more information.
      */
-    public Boolean inside_html_script_p()
+    public Boolean literal_html_element_p()
     {
         ThreadContext context = this.runtime.getCurrentContext();
 
-        return this.callMethod(context, "inside_html_script?").isTrue();
+        return this.callMethod(context, "literal_html_element?").isTrue();
     }
 }
 
 
-// line 208 "ext/java/org/liboga/xml/Lexer.rl"
+// line 207 "ext/java/org/liboga/xml/Lexer.rl"