oga 0.3.1-java → 0.3.2-java

data/ext/c/lexer.rl

@@ -24,6 +24,7 @@ on `ts` and `te`) so the macro ignores this argument.
 
 ID id_advance_line;
 ID id_literal_html_element_p;
+ID id_html;
 
 %%machine c_lexer;
 
@@ -75,6 +76,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);
 
@@ -90,8 +94,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");
@@ -105,6 +113,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");
@@ -176,6 +185,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);

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

@@ -45,15 +45,18 @@ private static byte[] init__java_lexer_actions_0()
 	return new byte [] {
 	    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,   44,    1,   46,    1,
-	   47,    1,   48,    1,   51,    1,   52,    1,   53,    1,   54,    1,
-	   55,    1,   56,    1,   57,    1,   58,    1,   59,    1,   60,    2,
-	    0,    1,    2,    0,    2,    2,    3,    4,    2,    6,   16,    2,
-	    6,   17,    2,    6,   49,    2,    6,   50,    3,    6,    0,   45
+	   14,    1,   15,    1,   16,    1,   17,    1,   18,    1,   19,    1,
+	   20,    1,   23,    1,   24,    1,   25,    1,   26,    1,   27,    1,
+	   28,    1,   29,    1,   30,    1,   34,    1,   35,    1,   36,    1,
+	   37,    1,   38,    1,   39,    1,   40,    1,   41,    1,   42,    1,
+	   43,    1,   44,    1,   45,    1,   46,    1,   47,    1,   48,    1,
+	   49,    1,   50,    1,   51,    1,   52,    1,   53,    1,   54,    1,
+	   56,    1,   57,    1,   58,    1,   61,    1,   62,    1,   63,    1,
+	   64,    1,   65,    1,   66,    1,   67,    1,   68,    1,   69,    1,
+	   70,    2,    0,    1,    2,    0,    2,    2,    0,   33,    2,    3,
+	    4,    2,    6,    0,    2,    6,   21,    2,    6,   22,    2,    6,
+	   59,    2,    6,   60,    2,   31,    0,    2,   32,    0,    3,    6,
+	    0,   55
 	};
 }
 
@@ -63,13 +66,13 @@ private static final byte _java_lexer_actions[] = init__java_lexer_actions_0();
 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,   73,   75,   83,   92,  101,  102,  103,  104,
-	  105,  106,  107,  108,  109,  125,  133,  142,  151,  160,  169,  178,
-	  187,  196,  205,  214,  223,  234,  242,  243,  251,  260,  277,  278,
-	  287,  288,  289,  300,  311,  312,  313,  315,  317,  320,  322,  324,
-	  326,  328,  330,  332,  334
+	    0,    0,    4,    5,    7,    9,   11,   13,   15,   17,   19,   20,
+	   21,   22,   23,   24,   25,   33,   43,   52,   53,   54,   55,   56,
+	   67,   69,   77,   86,   95,   96,   97,   98,   99,  100,  101,  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,  270,  279,  281,  296,  297,  306,  307,  308,  319,  330,  331,
+	  332,  334,  336,  339,  341,  343,  345,  347,  349,  351,  353
 	};
 }
 
@@ -79,35 +82,36 @@ private static final short _java_lexer_key_offsets[] = init__java_lexer_key_offs
 private static char[] init__java_lexer_trans_keys_0()
 {
 	return new char [] {
-	   45,   68,   91,  100,   45,   45,   45,   45,   62,   79,  111,   67,
-	   99,   84,  116,   89,  121,   80,  112,   69,  101,    9,   32,   67,
-	   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,
-	   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,
+	   45,   68,   91,  100,   45,   79,  111,   67,   99,   84,  116,   89,
+	  121,   80,  112,   69,  101,    9,   32,   67,   68,   65,   84,   65,
+	   91,   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,   62,   62,   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,   45,
+	   45,   45,   93,   93,   93,   63,   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,   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,   10,   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
+	   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,   13,   32,   34,
+	   39,   96,    9,   10,   60,   62,   13,   32,   34,   39,   96,    9,
+	   10,   60,   62,   34,   39,    9,   10,   13,   32,   45,   47,   61,
+	   62,   95,   48,   57,   65,   90,   97,  122,   10,   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,13 +121,13 @@ private static final char _java_lexer_trans_keys[] = init__java_lexer_trans_keys
 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,    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,    1,    3,
-	    1,    1,    5,    5,    1,    1,    2,    2,    3,    2,    2,    2,
-	    2,    2,    2,    2,    2
+	    0,    4,    1,    2,    2,    2,    2,    2,    2,    2,    1,    1,
+	    1,    1,    1,    1,    2,    4,    3,    1,    1,    1,    1,    5,
+	    2,    2,    3,    3,    1,    1,    1,    1,    1,    1,    1,    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,
+	    5,    5,    2,    9,    1,    3,    1,    1,    5,    5,    1,    1,
+	    2,    2,    3,    2,    2,    2,    2,    2,    2,    2,    2
 	};
 }
 
@@ -134,12 +138,12 @@ 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,    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,    0,    3,
-	    0,    0,    3,    3,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0
+	    0,    0,    0,    0,    3,    3,    3,    0,    0,    0,    0,    3,
+	    0,    3,    3,    3,    0,    0,    0,    0,    0,    0,    0,    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,
+	    2,    2,    0,    3,    0,    3,    0,    0,    3,    3,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0
 	};
 }
 
@@ -149,69 +153,57 @@ private static final byte _java_lexer_range_lengths[] = init__java_lexer_range_l
 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,   88,   91,   97,  104,  111,  113,  115,  117,
-	  119,  121,  123,  125,  127,  141,  147,  154,  161,  168,  175,  182,
-	  189,  196,  203,  210,  217,  226,  232,  234,  240,  247,  262,  264,
-	  271,  273,  275,  284,  293,  295,  297,  300,  303,  307,  310,  313,
-	  316,  319,  322,  325,  328
+	    0,    0,    5,    7,   10,   13,   16,   19,   22,   25,   28,   30,
+	   32,   34,   36,   38,   40,   46,   54,   61,   63,   65,   67,   69,
+	   78,   81,   87,   94,  101,  103,  105,  107,  109,  111,  113,  115,
+	  117,  119,  121,  123,  125,  127,  129,  131,  145,  151,  158,  165,
+	  172,  179,  186,  193,  200,  207,  214,  221,  230,  236,  238,  244,
+	  251,  259,  267,  270,  283,  285,  292,  294,  296,  305,  314,  316,
+	  318,  321,  324,  328,  331,  334,  337,  340,  343,  346,  349
 	};
 }
 
 private static final short _java_lexer_index_offsets[] = init__java_lexer_index_offsets_0();
 
 
-private static byte[] init__java_lexer_indicies_0()
-{
-	return new byte [] {
-	    1,    2,    3,    2,    0,    4,    0,    5,    4,    6,    4,    6,
-	    7,    4,    8,    8,    0,    9,    9,    0,   10,   10,    0,   11,
-	   11,    0,   12,   12,    0,   13,   13,    0,   14,   14,    0,   15,
-	    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,   32,   31,   34,   35,   25,   36,   35,
-	   35,   35,   35,   33,   14,   14,   37,   27,   27,   27,   27,   27,
-	   38,   27,   27,   40,   27,   27,   27,   39,   27,   27,   41,   27,
-	   27,   27,   39,   43,   42,   45,   44,   47,   46,   48,   46,   50,
-	   49,   51,   49,   53,   52,   54,   52,   55,   55,   56,   57,   58,
-	   59,   60,   61,   62,   58,   58,   58,   58,   30,   58,   58,   58,
-	   58,   58,   63,   58,   65,   58,   58,   58,   58,   64,   58,   66,
-	   58,   58,   58,   58,   64,   58,   67,   58,   58,   58,   58,   64,
-	   58,   68,   58,   58,   58,   58,   64,   58,   69,   58,   58,   58,
-	   58,   64,   58,   70,   58,   58,   58,   58,   64,   58,   71,   58,
-	   58,   58,   58,   64,   58,   72,   58,   58,   58,   58,   64,   58,
-	   73,   58,   58,   58,   58,   64,   58,   69,   58,   58,   58,   58,
-	   64,   75,   76,   77,   78,   77,   77,   77,   77,   74,   77,   77,
-	   77,   77,   77,   79,   81,   80,   82,   82,   82,   82,   82,   30,
-	   82,   84,   82,   82,   82,   82,   83,   85,   86,   87,   85,   88,
-	   89,   90,   91,   85,   92,   90,   90,   90,   90,   30,   86,   93,
-	   90,   95,   90,   90,   90,   90,   94,   97,   96,   99,   96,  100,
-	  100,   99,  100,  100,  100,  100,  100,   96,  101,  101,   99,  101,
-	  101,  101,  101,  101,   96,  103,  102,  103,  102,  106,  103,  102,
-	  103,  107,  102,  103,  108,  109,  102,  103,  110,  102,  103,  111,
-	  102,  103,  112,  102,  103,  113,  102,  103,  114,  102,  103,  115,
-	  102,  103,  116,  102,  103,  113,  102,    0
-	};
-}
-
-private static final byte _java_lexer_indicies[] = init__java_lexer_indicies_0();
-
-
 private static byte[] init__java_lexer_trans_targs_0()
 {
 	return new byte [] {
-	   26,    2,    6,   13,    3,    4,    5,   26,    7,    8,    9,   10,
-	   11,   12,   28,   14,   15,   16,   17,   18,   19,   20,   21,   26,
-	   23,   22,   26,   29,   30,   57,    0,   26,   27,   26,    1,   26,
-	   24,   26,   26,   26,   31,   29,   32,   33,   32,   32,   35,   34,
-	   34,   37,   36,   36,   39,   38,   38,   40,   40,   40,   41,   40,
-	   42,   47,   40,   40,   40,   43,   44,   45,   46,   41,   48,   49,
-	   50,   51,   52,   52,   52,   53,   54,   52,   52,   52,   56,   55,
-	   55,   57,   57,   58,   57,   57,   59,   25,   57,   57,   57,   57,
-	   61,   63,   60,   62,   60,   60,   65,   66,   64,   64,   67,   68,
-	   69,   74,   70,   71,   72,   73,   64,   75,   76
+	    2,    3,   10,    3,   22,   22,   22,    4,    4,   22,    5,    5,
+	   22,    6,    6,   22,    7,    7,   22,    8,    8,   22,    9,    9,
+	   22,   24,   24,   22,   11,   22,   12,   22,   13,   22,   14,   22,
+	   15,   22,   22,   22,   17,   17,   17,   17,   17,   22,   17,   16,
+	   22,   17,   17,   17,   17,   22,   25,   25,   26,   25,   25,   25,
+	   22,   28,   28,   31,   31,   63,    0,   23,   22,    1,   22,   16,
+	   18,   22,   22,   22,   22,   22,   24,   24,   22,   25,   25,   25,
+	   25,   25,   22,   25,   25,   27,   25,   25,   25,   22,   25,   25,
+	   25,   25,   25,   25,   22,   30,   29,   28,   29,   19,   28,   33,
+	   32,   31,   32,   20,   31,   36,   35,   34,   35,   34,   34,   37,
+	   38,   37,   38,   39,   40,   39,   40,   41,   42,   41,   42,   43,
+	   43,   43,   43,   44,   43,   45,   50,   43,   44,   44,   44,   44,
+	    0,   44,   44,   44,   44,   44,   43,   44,   46,   44,   44,   44,
+	   44,   43,   44,   47,   44,   44,   44,   44,   43,   44,   48,   44,
+	   44,   44,   44,   43,   44,   49,   44,   44,   44,   44,   43,   44,
+	   44,   44,   44,   44,   44,   43,   44,   51,   44,   44,   44,   44,
+	   43,   44,   52,   44,   44,   44,   44,   43,   44,   53,   44,   44,
+	   44,   44,   43,   44,   54,   44,   44,   44,   44,   43,   44,   44,
+	   44,   44,   44,   44,   43,   55,   55,   56,   57,   56,   56,   56,
+	   56,   55,   56,   56,   56,   56,   56,   55,   55,   55,   59,   59,
+	   59,   59,   59,    0,   59,   58,   59,   59,   59,   59,   58,   60,
+	   60,   60,   60,   60,   60,   60,   61,   60,   60,   60,   60,   60,
+	   60,   60,   61,   62,   62,   62,   63,   63,   64,   63,   65,   21,
+	   63,   63,   65,   65,   65,   65,    0,   63,   63,   65,   63,   65,
+	   65,   65,   65,   63,   69,   67,   68,   67,   66,   66,   68,   66,
+	   66,   66,   66,   66,   67,   66,   66,   68,   66,   66,   66,   66,
+	   66,   67,   72,   71,   72,   71,   73,   72,   71,   72,   74,   71,
+	   72,   75,   80,   71,   72,   76,   71,   72,   77,   71,   72,   78,
+	   71,   72,   79,   71,   72,   70,   71,   72,   81,   71,   72,   82,
+	   71,   72,   79,   71,   22,   22,   22,   22,   22,   22,   22,   22,
+	   22,   22,   22,   22,   22,   22,   22,   22,   22,   22,   28,   31,
+	   22,   22,   22,   22,   22,   28,   28,   31,   31,   34,   34,   37,
+	   39,   41,   43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+	   43,   55,   55,   58,   60,   63,   63,   66,   66,   66,   70,   70,
+	   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,    0
 	};
 }
 
@@ -221,16 +213,41 @@ private static final byte _java_lexer_trans_targs[] = init__java_lexer_trans_tar
 private static short[] init__java_lexer_trans_actions_0()
 {
 	return new short [] {
-	  103,    0,    0,    0,    0,    0,    0,   87,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   89,
-	    0,    0,   93,  125,    0,   69,    0,   95,    7,  101,    0,   91,
-	    0,   97,  105,   99,    0,  122,   11,    0,   13,    9,    1,   15,
-	   17,    1,   19,   21,    1,   23,   25,   33,   31,   29,  119,   35,
-	    0,    0,   27,   39,   37,    0,    0,    0,    0,  116,    0,    0,
-	    0,    0,   47,   45,   43,    0,    0,   49,   51,   41,    0,   55,
-	   53,   57,   59,    0,   65,   63,    0,    0,   67,   71,   73,   61,
-	    1,  107,   79,  107,   77,   75,  128,  110,   85,   83,    1,    1,
-	    1,    1,    1,    1,    1,    1,   81,    1,    1
+	    0,    0,    0,    0,  117,  101,  117,    0,    0,  117,    0,    0,
+	  117,    0,    0,  117,    0,    0,  117,    0,    0,  117,    0,    0,
+	  117,    0,    0,  117,    0,  117,    0,  117,    0,  117,    0,  117,
+	    0,  117,  103,  117,    0,    0,    0,    0,    0,  117,    0,    0,
+	  107,    0,    0,    0,    0,  117,  145,  145,    0,  145,  145,  145,
+	  117,    9,   13,   15,   19,   83,    0,    7,  109,    0,  105,    0,
+	    0,  105,  105,  105,  105,  115,    0,    0,  111,  145,  145,  145,
+	  145,  145,  119,  145,  145,    0,  145,  145,  145,  113,  145,  145,
+	  142,  145,  145,  145,  113,  133,    1,   11,    1,    0,   11,  133,
+	    1,   17,    1,    0,   17,    1,    1,   23,    1,   21,   23,   25,
+	    1,   27,    1,   29,    1,   31,    1,   33,    1,   35,    1,   43,
+	   43,   41,   39,  139,   45,    0,    0,   37,  139,  139,  139,  139,
+	    0,  139,  139,  139,  139,  139,   49,  139,    0,  139,  139,  139,
+	  139,   47,  139,    0,  139,  139,  139,  139,   47,  139,    0,  139,
+	  139,  139,  139,   47,  139,    0,  139,  139,  139,  139,   47,  139,
+	  136,  139,  139,  139,  139,   47,  139,    0,  139,  139,  139,  139,
+	   47,  139,    0,  139,  139,  139,  139,   47,  139,    0,  139,  139,
+	  139,  139,   47,  139,    0,  139,  139,  139,  139,   47,  139,  136,
+	  139,  139,  139,  139,   47,  151,  148,    1,    1,    1,    1,    1,
+	    1,  127,    0,    0,    0,    0,    0,   53,   51,   55,    0,    0,
+	    0,    0,    0,    0,    0,   57,    0,    0,    0,    0,   59,   63,
+	   63,   61,   61,   63,   63,   63,    0,   65,   65,   65,   65,   65,
+	   65,   65,    0,   69,   67,   71,   73,   75,    0,   73,    0,    0,
+	   79,   81,    0,    0,    0,    0,    0,   75,   85,    0,   77,    0,
+	    0,    0,    0,   87,  121,    1,  121,    1,   91,   91,  121,   91,
+	   91,   91,   91,   91,    1,   89,   89,  121,   89,   89,   89,   89,
+	   89,    1,  124,  154,  124,  154,    1,  124,  154,  124,    1,  154,
+	  124,    1,    1,  154,  124,    1,  154,  124,    1,  154,  124,    1,
+	  154,  124,    1,  154,  124,   95,  154,  124,    1,  154,  124,    1,
+	  154,  124,    1,  154,  117,  117,  117,  117,  117,  117,  117,  117,
+	  117,  117,  117,  117,  117,  117,  117,  117,  117,  117,   13,   19,
+	  115,  111,  119,  113,  113,   11,   11,   17,   17,   23,   23,   27,
+	   31,   35,   49,   47,   47,   47,   47,   47,   47,   47,   47,   47,
+	   47,   53,   55,   59,   65,   85,   87,   93,   93,   93,   99,   97,
+	   97,   97,   97,   97,   97,   97,   97,   97,   97,   97,    0
 	};
 }
 
@@ -241,12 +258,12 @@ private static short[] init__java_lexer_to_state_actions_0()
 {
 	return new short [] {
 	    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,    0,
-	    3,    0,    0,    0,  113,    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,    0,    3,    0,    0,    3,    0,
+	    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,    3,    0,    0,    3,    0,    0,    0,  130,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0
 	};
 }
 
@@ -257,12 +274,12 @@ private static short[] init__java_lexer_from_state_actions_0()
 {
 	return new short [] {
 	    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,    0,
-	    5,    0,    0,    0,    5,    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,    0,    5,    0,    0,    5,    0,
+	    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,    5,    0,    0,    5,    0,    0,    0,    5,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0
 	};
 }
 
@@ -272,34 +289,38 @@ private static final short _java_lexer_from_state_actions[] = init__java_lexer_f
 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,   34,   38,   39,   40,   40,    0,   45,    0,   49,
-	    0,   52,    0,   55,    0,   64,   65,   65,   65,   65,   65,   65,
-	   65,   65,   65,   65,    0,   80,   81,    0,   84,    0,   94,   95,
-	    0,   99,   99,   99,    0,  105,  106,  106,  106,  106,  106,  106,
-	  106,  106,  106,  106,  106
+	    0,  370,  370,  370,  370,  370,  370,  370,  370,  370,  370,  370,
+	  370,  370,  370,  370,  370,  370,  370,  371,  372,    0,    0,  373,
+	  374,  375,  377,  377,    0,  379,  379,    0,  381,  381,    0,  383,
+	  383,    0,  384,    0,  385,    0,  386,    0,  387,  397,  397,  397,
+	  397,  397,  397,  397,  397,  397,  397,    0,  398,  399,    0,  400,
+	    0,  401,    0,    0,  402,  403,    0,  406,  406,  406,    0,  407,
+	  418,  418,  418,  418,  418,  418,  418,  418,  418,  418,  418
 	};
 }
 
 private static final short _java_lexer_eof_trans[] = init__java_lexer_eof_trans_0();
 
 
-static final int java_lexer_start = 26;
-static final int java_lexer_first_final = 26;
+static final int java_lexer_start = 22;
+static final int java_lexer_first_final = 22;
 static final int java_lexer_error = 0;
 
-static final int java_lexer_en_proc_ins_body = 32;
-static final int java_lexer_en_string_squote = 34;
-static final int java_lexer_en_string_dquote = 36;
-static final int java_lexer_en_doctype_inline = 38;
-static final int java_lexer_en_doctype = 40;
-static final int java_lexer_en_xml_decl = 52;
-static final int java_lexer_en_element_name = 55;
-static final int java_lexer_en_element_head = 57;
-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 = 26;
+static final int java_lexer_en_comment_body = 28;
+static final int java_lexer_en_cdata_body = 31;
+static final int java_lexer_en_proc_ins_body = 34;
+static final int java_lexer_en_string_squote = 37;
+static final int java_lexer_en_string_dquote = 39;
+static final int java_lexer_en_doctype_inline = 41;
+static final int java_lexer_en_doctype = 43;
+static final int java_lexer_en_xml_decl = 55;
+static final int java_lexer_en_element_name = 58;
+static final int java_lexer_en_html_attribute_value = 60;
+static final int java_lexer_en_xml_attribute_value = 62;
+static final int java_lexer_en_element_head = 63;
+static final int java_lexer_en_text = 66;
+static final int java_lexer_en_literal_html_element = 70;
+static final int java_lexer_en_main = 22;
 
 
 // line 39 "ext/java/org/liboga/xml/Lexer.rl"
@@ -356,6 +377,8 @@ static final int java_lexer_en_main = 26;
     @JRubyMethod
     public IRubyObject advance_native(ThreadContext context, RubyString rb_str)
     {
+        Boolean html_p = this.callMethod(context, "html").isTrue();
+
         Encoding encoding = rb_str.getEncoding();
 
         byte[] data = rb_str.getBytes();
@@ -371,8 +394,12 @@ static final int java_lexer_en_main = 26;
         String id_advance_line        = "advance_line";
         String id_on_attribute        = "on_attribute";
         String id_on_attribute_ns     = "on_attribute_ns";
-        String id_on_cdata            = "on_cdata";
-        String id_on_comment          = "on_comment";
+        String id_on_cdata_start      = "on_cdata_start";
+        String id_on_cdata_body       = "on_cdata_body";
+        String id_on_cdata_end        = "on_cdata_end";
+        String id_on_comment_start    = "on_comment_start";
+        String id_on_comment_body     = "on_comment_body";
+        String id_on_comment_end      = "on_comment_end";
         String id_on_doctype_end      = "on_doctype_end";
         String id_on_doctype_inline   = "on_doctype_inline";
         String id_on_doctype_name     = "on_doctype_name";
@@ -386,6 +413,7 @@ static final int java_lexer_en_main = 26;
         String id_on_proc_ins_end     = "on_proc_ins_end";
         String id_on_proc_ins_name    = "on_proc_ins_name";
         String id_on_proc_ins_start   = "on_proc_ins_start";
+        String id_on_proc_ins_body    = "on_proc_ins_body";
         String id_on_string_body      = "on_string_body";
         String id_on_string_dquote    = "on_string_dquote";
         String id_on_string_squote    = "on_string_squote";
@@ -394,7 +422,7 @@ static final int java_lexer_en_main = 26;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 398 "ext/java/org/liboga/xml/Lexer.java"
+// line 426 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -423,7 +451,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 427 "ext/java/org/liboga/xml/Lexer.java"
+// line 455 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -476,7 +504,6 @@ case 1:
 	}
 	} while (false);
 
-	_trans = _java_lexer_indicies[_trans];
 case 3:
 	( this.cs) = _java_lexer_trans_targs[_trans];
 
@@ -494,11 +521,11 @@ case 3:
     }
 	break;
 	case 1:
-// line 385 "ext/ragel/base_lexer.rl"
+// line 500 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
 	case 2:
-// line 420 "ext/ragel/base_lexer.rl"
+// line 535 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
 	case 6:
@@ -506,34 +533,104 @@ case 3:
 	{te = p+1;}
 	break;
 	case 7:
-// line 116 "ext/ragel/base_lexer.rl"
+// line 92 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback(id_on_text, data, encoding, mark, ts);
-            callback_simple(id_on_proc_ins_end);
-
-            mark = 0;
+            callback_simple(id_on_comment_end);
 
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
 	case 8:
-// line 125 "ext/ragel/base_lexer.rl"
-	{te = p+1;}
+// line 81 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_comment_body, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }}
 	break;
 	case 9:
-// line 125 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
+// line 81 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}{
+            callback(id_on_comment_body, data, encoding, ts, te);
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+        }}
 	break;
 	case 10:
+// line 131 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_cdata_end);
+
+            ( this.cs) = 22;
+        }}
+	break;
+	case 11:
+// 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;
+            }
+        }}
+	break;
+	case 12:
+// 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;
+            }
+        }}
+	break;
+	case 13:
+// line 174 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_proc_ins_end);
+
+            ( this.cs) = 22;
+        }}
+	break;
+	case 14:
 // 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;
+            }
+        }}
+	break;
+	case 15:
+// line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
             {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
         }}
 	break;
-	case 11:
-// line 137 "ext/ragel/base_lexer.rl"
+	case 16:
+// line 190 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -545,16 +642,16 @@ case 3:
         }
     }}
 	break;
-	case 12:
-// line 173 "ext/ragel/base_lexer.rl"
+	case 17:
+// line 226 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
             {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
         }}
 	break;
-	case 13:
-// line 137 "ext/ragel/base_lexer.rl"
+	case 18:
+// line 190 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -566,12 +663,12 @@ case 3:
         }
     }}
 	break;
-	case 14:
-// line 210 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( this.cs) = 40; }}
+	case 19:
+// line 263 "ext/ragel/base_lexer.rl"
+	{te = p+1;{ ( this.cs) = 43; }}
 	break;
-	case 15:
-// line 199 "ext/ragel/base_lexer.rl"
+	case 20:
+// line 252 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
 
@@ -583,60 +680,60 @@ case 3:
             }
         }}
 	break;
-	case 16:
-// line 216 "ext/ragel/base_lexer.rl"
-	{( this.act) = 9;}
+	case 21:
+// line 269 "ext/ragel/base_lexer.rl"
+	{( this.act) = 13;}
 	break;
-	case 17:
-// line 231 "ext/ragel/base_lexer.rl"
-	{( this.act) = 14;}
+	case 22:
+// line 284 "ext/ragel/base_lexer.rl"
+	{( this.act) = 18;}
 	break;
-	case 18:
-// line 221 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( this.cs) = 38; }}
+	case 23:
+// line 274 "ext/ragel/base_lexer.rl"
+	{te = p+1;{ ( this.cs) = 41; }}
 	break;
-	case 19:
-// line 148 "ext/ragel/base_lexer.rl"
+	case 24:
+// line 201 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 34; _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 20:
-// line 154 "ext/ragel/base_lexer.rl"
+	case 25:
+// line 207 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 36; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 39; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 21:
-// line 229 "ext/ragel/base_lexer.rl"
+	case 26:
+// line 282 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 22:
-// line 235 "ext/ragel/base_lexer.rl"
+	case 27:
+// line 288 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
-	case 23:
-// line 231 "ext/ragel/base_lexer.rl"
+	case 28:
+// line 284 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
 	break;
-	case 24:
+	case 29:
 // line 1 "NONE"
 	{	switch( ( this.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);
         }
@@ -644,124 +741,183 @@ case 3:
 	}
 	}
 	break;
-	case 25:
-// line 255 "ext/ragel/base_lexer.rl"
+	case 30:
+// 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);
-            ( this.cs) = 26;
+
+            ( this.cs) = 22;
         }}
 	break;
-	case 26:
-// line 148 "ext/ragel/base_lexer.rl"
+	case 31:
+// line 201 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 34; _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 27:
-// line 154 "ext/ragel/base_lexer.rl"
+	case 32:
+// line 207 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 36; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 39; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 28:
-// line 268 "ext/ragel/base_lexer.rl"
+	case 33:
+// line 336 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 29:
-// line 261 "ext/ragel/base_lexer.rl"
+	case 34:
+// 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);
         }}
 	break;
-	case 30:
-// line 268 "ext/ragel/base_lexer.rl"
+	case 35:
+// line 336 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 31:
-// line 295 "ext/ragel/base_lexer.rl"
+	case 36:
+// line 363 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
 	break;
-	case 32:
-// line 299 "ext/ragel/base_lexer.rl"
+	case 37:
+// line 367 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( this.cs) = 57;
+            ( this.cs) = 63;
         }}
 	break;
-	case 33:
-// line 308 "ext/ragel/base_lexer.rl"
-	{te = p+1;}
-	break;
-	case 34:
-// line 310 "ext/ragel/base_lexer.rl"
+	case 38:
+// line 387 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback_simple(id_advance_line);
+            p--;
+            ( this.cs) = 62;
         }}
 	break;
-	case 35:
-// line 315 "ext/ragel/base_lexer.rl"
+	case 39:
+// line 373 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback(id_on_attribute_ns, data, encoding, ts, te - 1);
+        p--;
+        ( this.cs) = 63;
+    }}
+	break;
+	case 40:
+// 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);
         }}
 	break;
-	case 36:
-// line 148 "ext/ragel/base_lexer.rl"
+	case 41:
+// line 201 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 34; _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 37:
-// line 154 "ext/ragel/base_lexer.rl"
+	case 42:
+// line 207 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 36; _goto_targ = 2; if (true) continue _goto;}
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 39; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 38:
-// line 328 "ext/ragel/base_lexer.rl"
+	case 43:
+// line 373 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        p--;
+        ( this.cs) = 63;
+    }}
+	break;
+	case 44:
+// line 415 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	break;
+	case 45:
+// line 417 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_advance_line);
+        }}
+	break;
+	case 46:
+// line 422 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback(id_on_attribute_ns, data, encoding, ts, te - 1);
+        }}
+	break;
+	case 47:
+// line 431 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            if ( html_p )
+            {
+                ( this.cs) = 60;
+            }
+            else
+            {
+                ( this.cs) = 62;
+            }
+        }}
+	break;
+	case 48:
+// line 443 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
             if ( literal_html_element_p() )
             {
-                ( this.cs) = 64;
+                ( this.cs) = 70;
             }
             else
             {
-                ( this.cs) = 26;
+                ( this.cs) = 22;
             }
         }}
 	break;
-	case 39:
-// line 342 "ext/ragel/base_lexer.rl"
+	case 49:
+// line 457 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
-	case 40:
-// line 310 "ext/ragel/base_lexer.rl"
+	case 50:
+// line 417 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_advance_line);
         }}
 	break;
-	case 41:
-// line 319 "ext/ragel/base_lexer.rl"
+	case 51:
+// line 426 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
-	case 42:
-// line 371 "ext/ragel/base_lexer.rl"
+	case 52:
+// line 486 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -772,11 +928,11 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
-	case 43:
-// line 385 "ext/ragel/base_lexer.rl"
+	case 53:
+// line 500 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -790,11 +946,11 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
-	case 44:
-// line 371 "ext/ragel/base_lexer.rl"
+	case 54:
+// line 486 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -805,15 +961,15 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
-	case 45:
-// line 409 "ext/ragel/base_lexer.rl"
-	{( this.act) = 33;}
+	case 55:
+// line 524 "ext/ragel/base_lexer.rl"
+	{( this.act) = 42;}
 	break;
-	case 46:
-// line 420 "ext/ragel/base_lexer.rl"
+	case 56:
+// line 535 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -827,11 +983,11 @@ case 3:
                 lines = 0;
             }
 
-            ( this.cs) = 26;
+            ( this.cs) = 22;
         }}
 	break;
-	case 47:
-// line 409 "ext/ragel/base_lexer.rl"
+	case 57:
+// line 524 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -843,13 +999,13 @@ case 3:
             }
         }}
 	break;
-	case 48:
+	case 58:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
 	case 0:
 	{{( this.cs) = 0; _goto_targ = 2; if (true) continue _goto;}}
 	break;
-	case 33:
+	case 42:
 	{{p = ((te))-1;}
             callback(id_on_text, data, encoding, ts, te);
 
@@ -864,102 +1020,102 @@ case 3:
 	}
 	}
 	break;
-	case 49:
-// line 248 "ext/ragel/base_lexer.rl"
-	{( this.act) = 36;}
+	case 59:
+// line 301 "ext/ragel/base_lexer.rl"
+	{( this.act) = 45;}
 	break;
-	case 50:
-// line 106 "ext/ragel/base_lexer.rl"
-	{( this.act) = 39;}
+	case 60:
+// line 155 "ext/ragel/base_lexer.rl"
+	{( this.act) = 48;}
 	break;
-	case 51:
-// line 72 "ext/ragel/base_lexer.rl"
+	case 61:
+// 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);
+
+        ( this.cs) = 28;
     }}
 	break;
-	case 52:
-// line 88 "ext/ragel/base_lexer.rl"
+	case 62:
+// 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);
+
+        ( this.cs) = 31;
     }}
 	break;
-	case 53:
-// line 283 "ext/ragel/base_lexer.rl"
+	case 63:
+// line 351 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_start);
         p--;
-        ( this.cs) = 55;
+        ( this.cs) = 58;
     }}
 	break;
-	case 54:
-// line 289 "ext/ragel/base_lexer.rl"
+	case 64:
+// line 357 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
 	break;
-	case 55:
-// line 356 "ext/ragel/base_lexer.rl"
+	case 65:
+// line 471 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( this.cs) = 60;
+        ( this.cs) = 66;
     }}
 	break;
-	case 56:
-// line 192 "ext/ragel/base_lexer.rl"
+	case 66:
+// line 245 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
-        ( this.cs) = 40;
+        ( this.cs) = 43;
     }}
 	break;
-	case 57:
-// line 106 "ext/ragel/base_lexer.rl"
+	case 67:
+// 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;
-
-        ( this.cs) = 32;
+        ( this.cs) = 34;
     }}
 	break;
-	case 58:
-// line 356 "ext/ragel/base_lexer.rl"
+	case 68:
+// line 471 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( this.cs) = 60;
+        ( this.cs) = 66;
     }}
 	break;
-	case 59:
-// line 356 "ext/ragel/base_lexer.rl"
+	case 69:
+// line 471 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( this.cs) = 60;
+        ( this.cs) = 66;
     }}
 	break;
-	case 60:
+	case 70:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
-	case 36:
+	case 45:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( this.cs) = 52;
+        ( this.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;
-
-        ( this.cs) = 32;
+        ( this.cs) = 34;
     }
 	break;
 	}
 	}
 	break;
-// line 963 "ext/java/org/liboga/xml/Lexer.java"
+// line 1119 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -977,7 +1133,7 @@ case 2:
 // line 1 "NONE"
 	{( this.act) = 0;}
 	break;
-// line 981 "ext/java/org/liboga/xml/Lexer.java"
+// line 1137 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -1004,7 +1160,7 @@ case 5:
 	break; }
 	}
 
-// line 130 "ext/java/org/liboga/xml/Lexer.rl"
+// line 137 "ext/java/org/liboga/xml/Lexer.rl"
 
         this.lines = lines;
 
@@ -1076,5 +1232,5 @@ case 5:
 }
 
 
-// line 207 "ext/java/org/liboga/xml/Lexer.rl"
+// line 214 "ext/java/org/liboga/xml/Lexer.rl"