oga 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a600ef4530a2b62bbec7f94c18bbb2256a0c863
-  data.tar.gz: 69e4f07389226d4abdea959c238d08a548570c09
+  metadata.gz: 9f8a4c2a027e02e07a94874d17bb49492bd09460
+  data.tar.gz: 2798515da813f4ef194075131846affbb95e25ac
 SHA512:
-  metadata.gz: 665d474cdb5414c29c92bb16b4bea1bffe5ffebaa7e09c8b861ac8a6020f7ea0ae632920ef18d311021f974ba072d16f4bb7e70a26c2e42b763f9fd41974a010
-  data.tar.gz: eb9f04d4192d9812d8ae294602fbfb513b96062f2f8ccd686b3d9d1cd9c0d8b70aa841d7262ae446834e51a3636fc713b85ef9a4b83b8ca97d7700d353aad8e3
+  metadata.gz: 8b567514db0296d5c16a815d769d0a38c1f70949d198f971338d25fe00c95b0ff513c698c65b63a5e965097502d51945a81a695f6ae208c1dfb6a7c41b43f602
+  data.tar.gz: b69129e2b101db42009f8b9f1cac4cc18e3f54f83a78eb6b990689e520e4d027e3c1e47865d76968e3c59f0311bf30fa0362472a151dca2be9b473fa03189509

data/.yardopts

@@ -11,3 +11,4 @@
 ./doc/*.md
 LICENSE
 CONTRIBUTING.md
+CHANGELOG.md

data/README.md

@@ -76,15 +76,45 @@ Parse a string of XML using the SAX parser:
 
 Querying a document using XPath:
 
-    document = Oga.parse_xml('<people><person>Alice</person></people>')
-
-    document.xpath('string(people/person)') # => "Alice"
-
-Querying a document using CSS:
-
-    document = Oga.parse_xml('<people><person>Alice</person></people>')
+    document = Oga.parse_xml <<-EOF
+    <people>
+      <person id="1">
+        <name>Alice</name>
+        <age>28</name>
+      </person>
+    </people>
+    EOF
+
+    # The "xpath" method returns an enumerable (Oga::XML::NodeSet) that you can
+    # iterate over.
+    document.xpath('people/person').each do |person|
+      puts person.get('id') # => "1"
+
+      # The "at_xpath" method returns a single node from a set, it's the same as
+      # person.xpath('name').first.
+      puts person.at_xpath('name').text # => "Alice"
+    end
 
-    document.css('people person') # => NodeSet(Element(name: "person" ...))
+Querying the same document using CSS:
+
+    document = Oga.parse_xml <<-EOF
+    <people>
+      <person id="1">
+        <name>Alice</name>
+        <age>28</name>
+      </person>
+    </people>
+    EOF
+
+    # The "css" method returns an enumerable (Oga::XML::NodeSet) that you can
+    # iterate over.
+    document.css('people person').each do |person|
+      puts person.get('id') # => "1"
+
+      # The "at_css" method returns a single node from a set, it's the same as
+      # person.css('name').first.
+      puts person.at_css('name').text # => "Alice"
+    end
 
 Modifying a document and serializing it back to XML:
 

data/ext/c/extconf.rb

@@ -1,13 +1,11 @@
 require 'mkmf'
 
-have_header('ruby.h')
-
-$CFLAGS << ' -Wextra -Wall -pedantic'
+if RbConfig::CONFIG['CC'] =~ /clang|gcc/
+  $CFLAGS << ' -pedantic'
+end
 
 if ENV['DEBUG']
   $CFLAGS << ' -O0 -g'
-else
-  $CFLAGS << ' -O3'
 end
 
 create_makefile('liboga')

data/ext/c/lexer.c

@@ -41,7 +41,7 @@ ID id_literal_html_element_p;
  */
 void liboga_xml_lexer_callback(
     VALUE self,
-    VALUE name,
+    ID name,
     rb_encoding *encoding,
     const char *ts,
     const char *te
@@ -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 = 27;
-static const int c_lexer_first_final = 27;
+static const int c_lexer_start = 26;
+static const int c_lexer_first_final = 26;
 static const int c_lexer_error = 0;
 
-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_proc_ins_body = 32;
+static const int c_lexer_en_string_squote = 34;
+static const int c_lexer_en_string_dquote = 36;
+static const int c_lexer_en_doctype_inline = 38;
+static const int c_lexer_en_doctype = 40;
+static const int c_lexer_en_xml_decl = 52;
+static const int c_lexer_en_element_name = 55;
+static const int c_lexer_en_element_head = 57;
 static const int c_lexer_en_text = 60;
 static const int c_lexer_en_literal_html_element = 64;
-static const int c_lexer_en_main = 27;
+static const int c_lexer_en_main = 26;
 
 
 #line 65 "ext/c/lexer.rl"
@@ -95,14 +95,13 @@ static const int c_lexer_en_main = 27;
 VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 {
     OgaLexerState *state;
+    int lines;
 
     /* Make sure that all data passed back to Ruby has the proper encoding. */
     rb_encoding *encoding = rb_enc_get(data_block);
 
     char *data_str_val = StringValueCStr(data_block);
 
-    Data_Get_Struct(self, OgaLexerState, state);
-
     const char *p    = data_str_val;
     const char *pe   = data_str_val + strlen(data_str_val);
     const char *eof  = pe;
@@ -110,8 +109,6 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     const char *te   = 0;
     const char *mark = 0;
 
-    int lines = state->lines;
-
     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");
@@ -137,8 +134,12 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     ID id_on_xml_decl_end     = rb_intern("on_xml_decl_end");
     ID id_on_xml_decl_start   = rb_intern("on_xml_decl_start");
 
+    Data_Get_Struct(self, OgaLexerState, state);
+
+    lines = state->lines;
+
     
-#line 142 "ext/c/lexer.c"
+#line 143 "ext/c/lexer.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -146,8 +147,8 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 
 _again:
 	switch ( ( state->cs) ) {
+		case 26: goto st26;
 		case 27: goto st27;
-		case 28: goto st28;
 		case 1: goto st1;
 		case 2: goto st2;
 		case 3: goto st3;
@@ -160,7 +161,7 @@ _again:
 		case 10: goto st10;
 		case 11: goto st11;
 		case 12: goto st12;
-		case 29: goto st29;
+		case 28: goto st28;
 		case 13: goto st13;
 		case 14: goto st14;
 		case 15: goto st15;
@@ -173,6 +174,7 @@ _again:
 		case 22: goto st22;
 		case 23: goto st23;
 		case 24: goto st24;
+		case 29: goto st29;
 		case 30: goto st30;
 		case 31: goto st31;
 		case 32: goto st32;
@@ -184,8 +186,8 @@ _again:
 		case 38: goto st38;
 		case 39: goto st39;
 		case 40: goto st40;
-		case 41: goto st41;
 		case 0: goto st0;
+		case 41: goto st41;
 		case 42: goto st42;
 		case 43: goto st43;
 		case 44: goto st44;
@@ -203,9 +205,8 @@ _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 25: goto st25;
 		case 60: goto st60;
 		case 61: goto st61;
 		case 62: goto st62;
@@ -232,7 +233,7 @@ _resume:
 	switch ( ( state->cs) )
 	{
 tr0:
-	( state->cs) = 27;
+	( state->cs) = 26;
 #line 356 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
@@ -244,60 +245,60 @@ tr7:
 	{te = p+1;{
         callback(id_on_comment, data, encoding, ts + 4, te - 3);
     }}
-	goto st27;
+	goto st26;
 tr23:
 #line 88 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback(id_on_cdata, data, encoding, ts + 9, te - 3);
     }}
-	goto st27;
+	goto st26;
 tr26:
 #line 289 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
-	goto st27;
-tr32:
-	( state->cs) = 27;
+	goto st26;
+tr31:
+	( state->cs) = 26;
 #line 356 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( state->cs) = 60;
     }}
 	goto _again;
-tr34:
-	( state->cs) = 27;
+tr33:
+	( state->cs) = 26;
 #line 356 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
         ( state->cs) = 60;
     }}
 	goto _again;
-tr36:
-	( state->cs) = 27;
+tr35:
+	( state->cs) = 26;
 #line 283 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_start);
         p--;
-        ( state->cs) = 56;
+        ( state->cs) = 55;
     }}
 	goto _again;
-tr38:
-	( state->cs) = 27;
+tr37:
+	( state->cs) = 26;
 #line 192 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
-        ( state->cs) = 41;
+        ( state->cs) = 40;
     }}
 	goto _again;
-tr39:
-	( state->cs) = 27;
+tr38:
+	( state->cs) = 26;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 36:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( state->cs) = 53;
+        ( state->cs) = 52;
     }
 	break;
 	case 39:
@@ -307,14 +308,14 @@ tr39:
 
         mark = te;
 
-        ( state->cs) = 33;
+        ( state->cs) = 32;
     }
 	break;
 	}
 	}
 	goto _again;
-tr40:
-	( state->cs) = 27;
+tr39:
+	( state->cs) = 26;
 #line 106 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
@@ -322,46 +323,46 @@ tr40:
 
         mark = te;
 
-        ( state->cs) = 33;
+        ( state->cs) = 32;
     }}
 	goto _again;
-st27:
+st26:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
+		goto _test_eof26;
+case 26:
 #line 1 "NONE"
 	{ts = p;}
-#line 337 "ext/c/lexer.c"
+#line 338 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr33;
-	goto tr32;
-tr33:
+		goto tr32;
+	goto tr31;
+tr32:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st28;
-st28:
+	goto st27;
+st27:
 	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
-#line 349 "ext/c/lexer.c"
+		goto _test_eof27;
+case 27:
+#line 350 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
-		case 45: goto tr36;
+		case 45: goto tr35;
 		case 47: goto st22;
 		case 63: goto st24;
-		case 95: goto tr36;
+		case 95: goto tr35;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr36;
+			goto tr35;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr36;
+			goto tr35;
 	} else
-		goto tr36;
-	goto tr34;
+		goto tr35;
+	goto tr33;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
@@ -462,19 +463,19 @@ st12:
 		goto _test_eof12;
 case 12:
 	switch( (*p) ) {
-		case 9: goto st29;
-		case 32: goto st29;
+		case 9: goto st28;
+		case 32: goto st28;
 	}
 	goto tr0;
-st29:
+st28:
 	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
+		goto _test_eof28;
+case 28:
 	switch( (*p) ) {
-		case 9: goto st29;
-		case 32: goto st29;
+		case 9: goto st28;
+		case 32: goto st28;
 	}
-	goto tr38;
+	goto tr37;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
@@ -583,7 +584,7 @@ case 24:
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
-		case 120: goto st31;
+		case 120: goto st30;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -599,18 +600,18 @@ tr27:
 	{te = p+1;}
 #line 106 "ext/ragel/base_lexer.rl"
 	{( state->act) = 39;}
-	goto st30;
-tr42:
+	goto st29;
+tr41:
 #line 1 "NONE"
 	{te = p+1;}
 #line 248 "ext/ragel/base_lexer.rl"
 	{( state->act) = 36;}
-	goto st30;
-st30:
+	goto st29;
+st29:
 	if ( ++p == pe )
-		goto _test_eof30;
-case 30:
-#line 614 "ext/c/lexer.c"
+		goto _test_eof29;
+case 29:
+#line 615 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
@@ -623,15 +624,15 @@ case 30:
 			goto tr27;
 	} else
 		goto tr27;
-	goto tr39;
-st31:
+	goto tr38;
+st30:
 	if ( ++p == pe )
-		goto _test_eof31;
-case 31:
+		goto _test_eof30;
+case 30:
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
-		case 109: goto st32;
+		case 109: goto st31;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -641,15 +642,15 @@ case 31:
 			goto tr27;
 	} else
 		goto tr27;
-	goto tr40;
-st32:
+	goto tr39;
+st31:
 	if ( ++p == pe )
-		goto _test_eof32;
-case 32:
+		goto _test_eof31;
+case 31:
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
-		case 108: goto tr42;
+		case 108: goto tr41;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -659,17 +660,17 @@ case 32:
 			goto tr27;
 	} else
 		goto tr27;
-	goto tr40;
-tr43:
+	goto tr39;
+tr42:
 #line 125 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st33;
-tr45:
+	goto st32;
+tr44:
 #line 125 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st33;
-tr46:
-	( state->cs) = 33;
+	goto st32;
+tr45:
+	( state->cs) = 32;
 #line 116 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, mark, ts);
@@ -677,37 +678,37 @@ tr46:
 
             mark = 0;
 
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
-st33:
+st32:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
+		goto _test_eof32;
+case 32:
 #line 1 "NONE"
 	{ts = p;}
-#line 692 "ext/c/lexer.c"
+#line 693 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto st34;
-	goto tr43;
-st34:
+		goto st33;
+	goto tr42;
+st33:
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
+		goto _test_eof33;
+case 33:
 	if ( (*p) == 62 )
-		goto tr46;
-	goto tr45;
-tr48:
+		goto tr45;
+	goto tr44;
+tr47:
 #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 st35;
-tr49:
+	goto st34;
+tr48:
 #line 137 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -719,42 +720,42 @@ tr49:
             lines = 0;
         }
     }}
-	goto st35;
-st35:
+	goto st34;
+st34:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof35;
-case 35:
+		goto _test_eof34;
+case 34:
 #line 1 "NONE"
 	{ts = p;}
-#line 732 "ext/c/lexer.c"
+#line 733 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr48;
-	goto tr47;
-tr47:
+		goto tr47;
+	goto tr46;
+tr46:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st36;
-st36:
+	goto st35;
+st35:
 	if ( ++p == pe )
-		goto _test_eof36;
-case 36:
-#line 746 "ext/c/lexer.c"
+		goto _test_eof35;
+case 35:
+#line 747 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr49;
-	goto tr47;
-tr51:
+		goto tr48;
+	goto tr46;
+tr50:
 #line 173 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
             {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
         }}
-	goto st37;
-tr52:
+	goto st36;
+tr51:
 #line 137 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -766,39 +767,39 @@ tr52:
             lines = 0;
         }
     }}
-	goto st37;
-st37:
+	goto st36;
+st36:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof37;
-case 37:
+		goto _test_eof36;
+case 36:
 #line 1 "NONE"
 	{ts = p;}
-#line 779 "ext/c/lexer.c"
+#line 780 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr51;
-	goto tr50;
-tr50:
+		goto tr50;
+	goto tr49;
+tr49:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st38;
-st38:
+	goto st37;
+st37:
 	if ( ++p == pe )
-		goto _test_eof38;
-case 38:
-#line 793 "ext/c/lexer.c"
+		goto _test_eof37;
+case 37:
+#line 794 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr52;
-	goto tr50;
-tr54:
-	( state->cs) = 39;
+		goto tr51;
+	goto tr49;
+tr53:
+	( state->cs) = 38;
 #line 210 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 41; }}
+	{te = p+1;{ ( state->cs) = 40; }}
 	goto _again;
-tr55:
+tr54:
 #line 199 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
@@ -810,67 +811,67 @@ tr55:
                 lines = 0;
             }
         }}
-	goto st39;
-st39:
+	goto st38;
+st38:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
+		goto _test_eof38;
+case 38:
 #line 1 "NONE"
 	{ts = p;}
-#line 823 "ext/c/lexer.c"
+#line 824 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr54;
-	goto tr53;
-tr53:
+		goto tr53;
+	goto tr52;
+tr52:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st40;
-st40:
+	goto st39;
+st39:
 	if ( ++p == pe )
-		goto _test_eof40;
-case 40:
-#line 837 "ext/c/lexer.c"
+		goto _test_eof39;
+case 39:
+#line 838 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr55;
-	goto tr53;
-tr56:
+		goto tr54;
+	goto tr52;
+tr55:
 #line 229 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st41;
-tr57:
+	goto st40;
+tr56:
 #line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 41; goto st37;}
+        {( state->stack)[( state->top)++] = 40; goto st36;}
     }}
-	goto st41;
-tr58:
+	goto st40;
+tr57:
 #line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 41; goto st35;}
+        {( state->stack)[( state->top)++] = 40; goto st34;}
     }}
-	goto st41;
-tr60:
-	( state->cs) = 41;
+	goto st40;
+tr59:
+	( state->cs) = 40;
 #line 235 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
-tr63:
-	( state->cs) = 41;
+tr62:
+	( state->cs) = 40;
 #line 221 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 39; }}
+	{te = p+1;{ ( state->cs) = 38; }}
 	goto _again;
-tr64:
+tr63:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 9:
@@ -885,433 +886,433 @@ tr64:
 	break;
 	}
 	}
-	goto st41;
-tr65:
+	goto st40;
+tr64:
 #line 231 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
-	goto st41;
-st41:
+	goto st40;
+st40:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof41;
-case 41:
+		goto _test_eof40;
+case 40:
 #line 1 "NONE"
 	{ts = p;}
-#line 904 "ext/c/lexer.c"
+#line 905 "ext/c/lexer.c"
 	switch( (*p) ) {
-		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;
+		case 9: goto tr55;
+		case 32: goto tr55;
+		case 34: goto tr56;
+		case 39: goto tr57;
+		case 45: goto tr58;
+		case 62: goto tr59;
+		case 80: goto st42;
+		case 83: goto st47;
+		case 91: goto tr62;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
+		goto tr58;
 	goto st0;
 st0:
 ( state->cs) = 0;
 	goto _out;
-tr59:
+tr58:
 #line 1 "NONE"
 	{te = p+1;}
 #line 231 "ext/ragel/base_lexer.rl"
 	{( state->act) = 14;}
-	goto st42;
-tr70:
+	goto st41;
+tr69:
 #line 1 "NONE"
 	{te = p+1;}
 #line 216 "ext/ragel/base_lexer.rl"
 	{( state->act) = 9;}
-	goto st42;
+	goto st41;
+st41:
+	if ( ++p == pe )
+		goto _test_eof41;
+case 41:
+#line 946 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 45: goto tr58;
+		case 95: goto tr58;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr58;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr58;
+	} else
+		goto tr58;
+	goto tr63;
 st42:
 	if ( ++p == pe )
 		goto _test_eof42;
 case 42:
-#line 945 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 85: goto st43;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
+		goto tr58;
 	goto tr64;
 st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 85: goto st44;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 66: goto st44;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st44:
 	if ( ++p == pe )
 		goto _test_eof44;
 case 44:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 66: goto st45;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 76: goto st45;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 76: goto st46;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 73: goto st46;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 73: goto st47;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 67: goto tr69;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st47:
 	if ( ++p == pe )
 		goto _test_eof47;
 case 47:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 67: goto tr70;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 89: goto st48;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 89: goto st49;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 83: goto st49;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st49:
 	if ( ++p == pe )
 		goto _test_eof49;
 case 49:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 83: goto st50;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 84: goto st50;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st50:
 	if ( ++p == pe )
 		goto _test_eof50;
 case 50:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 84: goto st51;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 69: goto st51;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
+		goto tr58;
+	goto tr64;
 st51:
 	if ( ++p == pe )
 		goto _test_eof51;
 case 51:
 	switch( (*p) ) {
-		case 45: goto tr59;
-		case 69: goto st52;
-		case 95: goto tr59;
+		case 45: goto tr58;
+		case 77: goto tr69;
+		case 95: goto tr58;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
+			goto tr58;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
+			goto tr58;
 	} else
-		goto tr59;
-	goto tr65;
-st52:
-	if ( ++p == pe )
-		goto _test_eof52;
-case 52:
-	switch( (*p) ) {
-		case 45: goto tr59;
-		case 77: goto tr70;
-		case 95: goto tr59;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr59;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
-	} else
-		goto tr59;
-	goto tr65;
-tr75:
+		goto tr58;
+	goto tr64;
+tr74:
 #line 268 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st53;
-tr76:
+	goto st52;
+tr75:
 #line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 53; goto st37;}
+        {( state->stack)[( state->top)++] = 52; goto st36;}
     }}
-	goto st53;
-tr77:
+	goto st52;
+tr76:
 #line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 53; goto st35;}
+        {( state->stack)[( state->top)++] = 52; goto st34;}
     }}
-	goto st53;
-tr80:
+	goto st52;
+tr79:
 #line 261 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st53;
-tr81:
+	goto st52;
+tr80:
 #line 268 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st53;
-tr82:
-	( state->cs) = 53;
+	goto st52;
+tr81:
+	( state->cs) = 52;
 #line 255 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_xml_decl_end);
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
-st53:
+st52:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof53;
-case 53:
+		goto _test_eof52;
+case 52:
 #line 1 "NONE"
 	{ts = p;}
-#line 1185 "ext/c/lexer.c"
+#line 1186 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr76;
-		case 39: goto tr77;
-		case 45: goto st54;
-		case 63: goto st55;
-		case 95: goto st54;
+		case 34: goto tr75;
+		case 39: goto tr76;
+		case 45: goto st53;
+		case 63: goto st54;
+		case 95: goto st53;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st54;
+			goto st53;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st54;
+			goto st53;
 	} else
-		goto st54;
-	goto tr75;
-st54:
+		goto st53;
+	goto tr74;
+st53:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
+		goto _test_eof53;
+case 53:
 	switch( (*p) ) {
-		case 45: goto st54;
-		case 95: goto st54;
+		case 45: goto st53;
+		case 95: goto st53;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st54;
+			goto st53;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st54;
+			goto st53;
 	} else
-		goto st54;
-	goto tr80;
-st55:
+		goto st53;
+	goto tr79;
+st54:
 	if ( ++p == pe )
-		goto _test_eof55;
-case 55:
+		goto _test_eof54;
+case 54:
 	if ( (*p) == 62 )
-		goto tr82;
-	goto tr81;
-tr84:
-	( state->cs) = 56;
+		goto tr81;
+	goto tr80;
+tr83:
+	( state->cs) = 55;
 #line 299 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( state->cs) = 58;
+            ( state->cs) = 57;
         }}
 	goto _again;
-tr85:
+tr84:
 #line 295 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
-	goto st56;
-st56:
+	goto st55;
+st55:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof56;
-case 56:
+		goto _test_eof55;
+case 55:
 #line 1 "NONE"
 	{ts = p;}
-#line 1248 "ext/c/lexer.c"
+#line 1249 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st57;
-		case 95: goto st57;
+		case 45: goto st56;
+		case 95: goto st56;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st57;
+			goto st56;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st57;
+			goto st56;
 	} else
-		goto st57;
+		goto st56;
 	goto st0;
-st57:
+st56:
 	if ( ++p == pe )
-		goto _test_eof57;
-case 57:
+		goto _test_eof56;
+case 56:
 	switch( (*p) ) {
-		case 45: goto st57;
-		case 58: goto tr85;
-		case 95: goto st57;
+		case 45: goto st56;
+		case 58: goto tr84;
+		case 95: goto st56;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st57;
+			goto st56;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st57;
+			goto st56;
 	} else
-		goto st57;
-	goto tr84;
+		goto st56;
+	goto tr83;
 tr29:
-#line 310 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-            callback_simple(id_advance_line);
-        }}
-	goto st58;
-tr31:
-	( state->cs) = 58;
+	( state->cs) = 57;
 #line 342 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
-tr86:
+tr85:
 #line 308 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st58;
+	goto st57;
+tr86:
+#line 310 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_advance_line);
+        }}
+	goto st57;
 tr88:
 #line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 58; goto st37;}
+        {( state->stack)[( state->top)++] = 57; goto st36;}
     }}
-	goto st58;
+	goto st57;
 tr89:
 #line 148 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 58; goto st35;}
+        {( state->stack)[( state->top)++] = 57; goto st34;}
     }}
-	goto st58;
+	goto st57;
 tr92:
-	( state->cs) = 58;
+	( state->cs) = 57;
 #line 328 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
@@ -1322,41 +1323,47 @@ tr92:
             }
             else
             {
-                ( state->cs) = 27;
+                ( state->cs) = 26;
             }
         }}
 	goto _again;
 tr93:
+#line 310 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback_simple(id_advance_line);
+        }}
+	goto st57;
+tr94:
 #line 319 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st58;
-tr94:
+	goto st57;
+tr95:
 #line 315 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
-	goto st58;
-st58:
+	goto st57;
+st57:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof58;
-case 58:
+		goto _test_eof57;
+case 57:
 #line 1 "NONE"
 	{ts = p;}
-#line 1350 "ext/c/lexer.c"
+#line 1357 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr86;
-		case 10: goto tr29;
-		case 13: goto st25;
-		case 32: goto tr86;
+		case 9: goto tr85;
+		case 10: goto tr86;
+		case 13: goto st58;
+		case 32: goto tr85;
 		case 34: goto tr88;
 		case 39: goto tr89;
 		case 45: goto st59;
-		case 47: goto st26;
-		case 61: goto tr86;
+		case 47: goto st25;
+		case 61: goto tr85;
 		case 62: goto tr92;
 		case 95: goto st59;
 	}
@@ -1369,20 +1376,20 @@ case 58:
 	} else
 		goto st59;
 	goto st0;
-st25:
+st58:
 	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
+		goto _test_eof58;
+case 58:
 	if ( (*p) == 10 )
-		goto tr29;
-	goto st0;
+		goto tr86;
+	goto tr93;
 st59:
 	if ( ++p == pe )
 		goto _test_eof59;
 case 59:
 	switch( (*p) ) {
 		case 45: goto st59;
-		case 58: goto tr94;
+		case 58: goto tr95;
 		case 95: goto st59;
 	}
 	if ( (*p) < 65 ) {
@@ -1393,15 +1400,15 @@ case 59:
 			goto st59;
 	} else
 		goto st59;
-	goto tr93;
-st26:
+	goto tr94;
+st25:
 	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
+		goto _test_eof25;
+case 25:
 	if ( (*p) == 62 )
-		goto tr31;
+		goto tr29;
 	goto st0;
-tr97:
+tr98:
 	( state->cs) = 60;
 #line 371 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
@@ -1414,10 +1421,10 @@ tr97:
                 lines = 0;
             }
 
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
-tr99:
+tr100:
 	( state->cs) = 60;
 #line 385 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
@@ -1433,10 +1440,10 @@ tr99:
                 lines = 0;
             }
 
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
-tr100:
+tr101:
 	( state->cs) = 60;
 #line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
@@ -1449,7 +1456,7 @@ tr100:
                 lines = 0;
             }
 
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
 st60:
@@ -1460,11 +1467,11 @@ st60:
 case 60:
 #line 1 "NONE"
 	{ts = p;}
-#line 1464 "ext/c/lexer.c"
+#line 1471 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr96;
-	goto tr95;
-tr95:
+		goto tr97;
+	goto tr96;
+tr96:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1474,11 +1481,11 @@ st61:
 	if ( ++p == pe )
 		goto _test_eof61;
 case 61:
-#line 1478 "ext/c/lexer.c"
+#line 1485 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr98;
-	goto tr95;
-tr98:
+		goto tr99;
+	goto tr96;
+tr99:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1490,24 +1497,24 @@ st62:
 	if ( ++p == pe )
 		goto _test_eof62;
 case 62:
-#line 1494 "ext/c/lexer.c"
+#line 1501 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr99;
-		case 45: goto tr99;
-		case 60: goto tr98;
-		case 63: goto tr99;
-		case 95: goto tr99;
+		case 33: goto tr100;
+		case 45: goto tr100;
+		case 60: goto tr99;
+		case 63: goto tr100;
+		case 95: goto tr100;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr99;
+			goto tr100;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr99;
+			goto tr100;
 	} else
-		goto tr99;
-	goto tr95;
-tr96:
+		goto tr100;
+	goto tr96;
+tr97:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1519,24 +1526,24 @@ st63:
 	if ( ++p == pe )
 		goto _test_eof63;
 case 63:
-#line 1523 "ext/c/lexer.c"
+#line 1530 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr100;
-		case 45: goto tr100;
-		case 60: goto tr98;
-		case 63: goto tr100;
-		case 95: goto tr100;
+		case 33: goto tr101;
+		case 45: goto tr101;
+		case 60: goto tr99;
+		case 63: goto tr101;
+		case 95: goto tr101;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr100;
+			goto tr101;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr100;
+			goto tr101;
 	} else
-		goto tr100;
-	goto tr95;
-tr103:
+		goto tr101;
+	goto tr96;
+tr104:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 0:
@@ -1557,7 +1564,7 @@ tr103:
 	}
 	}
 	goto st64;
-tr104:
+tr105:
 #line 409 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
@@ -1570,7 +1577,7 @@ tr104:
             }
         }}
 	goto st64;
-tr113:
+tr114:
 	( state->cs) = 64;
 #line 420 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
@@ -1586,7 +1593,7 @@ tr113:
                 lines = 0;
             }
 
-            ( state->cs) = 27;
+            ( state->cs) = 26;
         }}
 	goto _again;
 st64:
@@ -1599,11 +1606,11 @@ st64:
 case 64:
 #line 1 "NONE"
 	{ts = p;}
-#line 1603 "ext/c/lexer.c"
+#line 1610 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr102;
-	goto tr101;
-tr101:
+		goto tr103;
+	goto tr102;
+tr102:
 #line 1 "NONE"
 	{te = p+1;}
 #line 51 "ext/ragel/base_lexer.rl"
@@ -1617,11 +1624,11 @@ st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
-#line 1621 "ext/c/lexer.c"
+#line 1628 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr102;
-	goto tr101;
-tr102:
+		goto tr103;
+	goto tr102;
+tr103:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1633,13 +1640,13 @@ st66:
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
-#line 1637 "ext/c/lexer.c"
+#line 1644 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr105;
-		case 60: goto tr102;
+		case 47: goto tr106;
+		case 60: goto tr103;
 	}
-	goto tr101;
-tr105:
+	goto tr102;
+tr106:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1649,13 +1656,13 @@ st67:
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
-#line 1653 "ext/c/lexer.c"
+#line 1660 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 115: goto tr106;
+		case 60: goto tr103;
+		case 115: goto tr107;
 	}
-	goto tr101;
-tr106:
+	goto tr102;
+tr107:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1665,14 +1672,14 @@ st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 1669 "ext/c/lexer.c"
+#line 1676 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 99: goto tr107;
-		case 116: goto tr108;
+		case 60: goto tr103;
+		case 99: goto tr108;
+		case 116: goto tr109;
 	}
-	goto tr101;
-tr107:
+	goto tr102;
+tr108:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1682,13 +1689,13 @@ st69:
 	if ( ++p == pe )
 		goto _test_eof69;
 case 69:
-#line 1686 "ext/c/lexer.c"
+#line 1693 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 114: goto tr109;
+		case 60: goto tr103;
+		case 114: goto tr110;
 	}
-	goto tr101;
-tr109:
+	goto tr102;
+tr110:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1698,13 +1705,13 @@ st70:
 	if ( ++p == pe )
 		goto _test_eof70;
 case 70:
-#line 1702 "ext/c/lexer.c"
+#line 1709 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 105: goto tr110;
+		case 60: goto tr103;
+		case 105: goto tr111;
 	}
-	goto tr101;
-tr110:
+	goto tr102;
+tr111:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1714,13 +1721,13 @@ st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 1718 "ext/c/lexer.c"
+#line 1725 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 112: goto tr111;
+		case 60: goto tr103;
+		case 112: goto tr112;
 	}
-	goto tr101;
-tr111:
+	goto tr102;
+tr112:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1730,13 +1737,13 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 1734 "ext/c/lexer.c"
+#line 1741 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 116: goto tr112;
+		case 60: goto tr103;
+		case 116: goto tr113;
 	}
-	goto tr101;
-tr112:
+	goto tr102;
+tr113:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1746,13 +1753,13 @@ st73:
 	if ( ++p == pe )
 		goto _test_eof73;
 case 73:
-#line 1750 "ext/c/lexer.c"
+#line 1757 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 62: goto tr113;
+		case 60: goto tr103;
+		case 62: goto tr114;
 	}
-	goto tr101;
-tr108:
+	goto tr102;
+tr109:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1762,13 +1769,13 @@ st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 1766 "ext/c/lexer.c"
+#line 1773 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 121: goto tr114;
+		case 60: goto tr103;
+		case 121: goto tr115;
 	}
-	goto tr101;
-tr114:
+	goto tr102;
+tr115:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1778,13 +1785,13 @@ st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 1782 "ext/c/lexer.c"
+#line 1789 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 108: goto tr115;
+		case 60: goto tr103;
+		case 108: goto tr116;
 	}
-	goto tr101;
-tr115:
+	goto tr102;
+tr116:
 #line 51 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1794,15 +1801,15 @@ st76:
 	if ( ++p == pe )
 		goto _test_eof76;
 case 76:
-#line 1798 "ext/c/lexer.c"
+#line 1805 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr102;
-		case 101: goto tr112;
+		case 60: goto tr103;
+		case 101: goto tr113;
 	}
-	goto tr101;
+	goto tr102;
 	}
+	_test_eof26: ( state->cs) = 26; goto _test_eof; 
 	_test_eof27: ( state->cs) = 27; goto _test_eof; 
-	_test_eof28: ( state->cs) = 28; goto _test_eof; 
 	_test_eof1: ( state->cs) = 1; goto _test_eof; 
 	_test_eof2: ( state->cs) = 2; goto _test_eof; 
 	_test_eof3: ( state->cs) = 3; goto _test_eof; 
@@ -1815,7 +1822,7 @@ case 76:
 	_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_eof29: ( state->cs) = 29; goto _test_eof; 
+	_test_eof28: ( state->cs) = 28; goto _test_eof; 
 	_test_eof13: ( state->cs) = 13; goto _test_eof; 
 	_test_eof14: ( state->cs) = 14; goto _test_eof; 
 	_test_eof15: ( state->cs) = 15; goto _test_eof; 
@@ -1828,6 +1835,7 @@ case 76:
 	_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_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; 
@@ -1857,9 +1865,8 @@ case 76:
 	_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_eof25: ( state->cs) = 25; goto _test_eof; 
 	_test_eof60: ( state->cs) = 60; goto _test_eof; 
 	_test_eof61: ( state->cs) = 61; goto _test_eof; 
 	_test_eof62: ( state->cs) = 62; goto _test_eof; 
@@ -1882,7 +1889,7 @@ case 76:
 	if ( p == eof )
 	{
 	switch ( ( state->cs) ) {
-	case 28: goto tr34;
+	case 27: goto tr33;
 	case 1: goto tr0;
 	case 2: goto tr0;
 	case 3: goto tr0;
@@ -1895,7 +1902,7 @@ case 76:
 	case 10: goto tr0;
 	case 11: goto tr0;
 	case 12: goto tr0;
-	case 29: goto tr38;
+	case 28: goto tr37;
 	case 13: goto tr0;
 	case 14: goto tr0;
 	case 15: goto tr0;
@@ -1908,50 +1915,51 @@ case 76:
 	case 22: goto tr0;
 	case 23: goto tr0;
 	case 24: goto tr0;
+	case 29: goto tr38;
 	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 31: goto tr39;
+	case 33: goto tr44;
+	case 35: goto tr48;
+	case 37: goto tr51;
+	case 39: goto tr54;
+	case 41: goto tr63;
 	case 42: goto tr64;
-	case 43: goto 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 43: goto tr64;
+	case 44: goto tr64;
+	case 45: goto tr64;
+	case 46: goto tr64;
+	case 47: goto tr64;
+	case 48: goto tr64;
+	case 49: goto tr64;
+	case 50: goto tr64;
+	case 51: goto tr64;
+	case 53: goto tr79;
 	case 54: goto tr80;
-	case 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;
+	case 56: goto tr83;
+	case 58: goto tr93;
+	case 59: goto tr94;
+	case 61: goto tr98;
+	case 62: goto tr98;
+	case 63: goto tr98;
+	case 65: goto tr104;
+	case 66: goto tr105;
+	case 67: goto tr105;
+	case 68: goto tr105;
+	case 69: goto tr105;
+	case 70: goto tr105;
+	case 71: goto tr105;
+	case 72: goto tr105;
+	case 73: goto tr105;
+	case 74: goto tr105;
+	case 75: goto tr105;
+	case 76: goto tr105;
 	}
 	}
 
 	_out: {}
 	}
 
-#line 119 "ext/c/lexer.rl"
+#line 120 "ext/c/lexer.rl"
 
     state->lines = lines;
 
@@ -1995,7 +2003,7 @@ VALUE oga_xml_lexer_allocate(VALUE klass)
 }
 
 
-#line 168 "ext/c/lexer.rl"
+#line 169 "ext/c/lexer.rl"
 
 
 void Init_liboga_xml_lexer()