dtext_rb 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2dc855a8c723c735b883c1f0ba6491e66fc8645
-  data.tar.gz: 627469455f50c2e3ef31fbdef8dfbbcd5acccd80
+  metadata.gz: 3188890bf9e9c90679a4920a5b0658ad8a2804a6
+  data.tar.gz: 89f0bb1e22367b1fd9ce690149f10f120ba39baa
 SHA512:
-  metadata.gz: 1082e89c7638dbf7556c91ac6696c8475f7c9ae48770cead16db63125986900f55145d8c758d62f74960338994d3f23ff6f2863f888a2b8f316ba569a1ef92c8
-  data.tar.gz: ae4d2a3d834d70be1d26f2761c2a8ba852804e45603466ff55dd6db1821409edd2a7465254313894f3f6ff4a2f8cb74a4131c06673e503078003b649ad07fe25
+  metadata.gz: 4cb9a2d224adc11348c435caf82ea1beaff25c342c2c77872de9893660090420ec41b573ef967d31395e27a2798db06cb20b6660de6d25e84e51302bc8fb6c12
+  data.tar.gz: 7c82b25fa0ea7b2ec12be5dc05bec209f0e197259a0c2e38c6c0207e8cca958f9bb45b8a186e6c10b57166c2da812ca23c2191554b066542abbd8c5452f542e9

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/dtext_rb.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dtext_rb 1.2.0 ruby lib
+# stub: dtext_rb 1.3.0 ruby lib
 # stub: ext/dtext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "dtext_rb"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["r888888888"]
-  s.date = "2016-12-13"
+  s.date = "2017-01-16"
   s.description = "Compield DText parser"
   s.email = "r888888888@gmail.com"
   s.extensions = ["ext/dtext/extconf.rb"]

data/ext/dtext/dtext.c

@@ -72,7 +72,7 @@ static const int BLOCK_H5 = 27;
 static const int BLOCK_H6 = 28;
 
 
-#line 1056 "ext/dtext/dtext.rl"
+#line 1052 "ext/dtext/dtext.rl"
 
 
 
@@ -110,16 +110,15 @@ static const short _dtext_to_state_actions[] = {
 	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, 60, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 60, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 60, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 60, 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, 0, 0, 60, 
-	0, 60, 0, 60, 0, 60, 0, 0, 
-	0, 0, 0
+	0, 60, 0, 60, 0, 60, 0, 60, 
+	0, 0, 0, 0, 0
 };
 
 static const short _dtext_from_state_actions[] = {
@@ -155,31 +154,30 @@ static const short _dtext_from_state_actions[] = {
 	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, 61, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 61, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 61, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 61, 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, 0, 0, 61, 
-	0, 61, 0, 61, 0, 61, 0, 0, 
-	0, 0, 0
+	0, 61, 0, 61, 0, 61, 0, 61, 
+	0, 0, 0, 0, 0
 };
 
-static const int dtext_start = 266;
-static const int dtext_first_final = 266;
+static const int dtext_start = 263;
+static const int dtext_first_final = 263;
 static const int dtext_error = -1;
 
-static const int dtext_en_inline = 282;
-static const int dtext_en_code = 319;
-static const int dtext_en_nodtext = 321;
-static const int dtext_en_table = 323;
-static const int dtext_en_list = 325;
-static const int dtext_en_main = 266;
+static const int dtext_en_inline = 279;
+static const int dtext_en_code = 313;
+static const int dtext_en_nodtext = 315;
+static const int dtext_en_table = 317;
+static const int dtext_en_list = 319;
+static const int dtext_en_main = 263;
 
 
-#line 1059 "ext/dtext/dtext.rl"
+#line 1055 "ext/dtext/dtext.rl"
 
 static inline void underscore_string(char * str, size_t len) {
   for (size_t i=0; i<len; ++i) {
@@ -509,7 +507,7 @@ static StateMachine * parse_helper(const char * src, size_t len, bool f_strip, b
   sm->f_mentions = f_mentions;
 
   
-#line 513 "ext/dtext/dtext.c"
+#line 511 "ext/dtext/dtext.c"
 	{
 	 sm->cs = dtext_start;
 	( sm->top) = 0;
@@ -518,9 +516,9 @@ static StateMachine * parse_helper(const char * src, size_t len, bool f_strip, b
 	( sm->act) = 0;
 	}
 
-#line 1388 "ext/dtext/dtext.rl"
+#line 1384 "ext/dtext/dtext.rl"
   
-#line 524 "ext/dtext/dtext.c"
+#line 522 "ext/dtext/dtext.c"
 	{
 	if ( ( sm->p) == ( sm->pe) )
 		goto _test_eof;
@@ -530,42 +528,42 @@ _resume:
 #line 1 "NONE"
 	{( sm->ts) = ( sm->p);}
 	break;
-#line 534 "ext/dtext/dtext.c"
+#line 532 "ext/dtext/dtext.c"
 	}
 
 	switch (  sm->cs ) {
-case 266:
+case 263:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr319;
-		case 10: goto tr320;
-		case 13: goto tr321;
-		case 42: goto tr322;
-		case 72: goto tr323;
-		case 91: goto tr324;
-		case 104: goto tr323;
+		case 0: goto tr314;
+		case 10: goto tr315;
+		case 13: goto tr316;
+		case 42: goto tr317;
+		case 72: goto tr318;
+		case 91: goto tr319;
+		case 104: goto tr318;
 	}
-	goto tr318;
-case 267:
+	goto tr313;
+case 264:
 	switch( (*( sm->p)) ) {
 		case 10: goto tr1;
-		case 13: goto tr325;
+		case 13: goto tr320;
 	}
 	goto tr0;
 case 0:
 	if ( (*( sm->p)) == 10 )
 		goto tr1;
 	goto tr0;
-case 268:
+case 265:
 	if ( (*( sm->p)) == 10 )
-		goto tr320;
-	goto tr326;
-case 269:
+		goto tr315;
+	goto tr321;
+case 266:
 	switch( (*( sm->p)) ) {
 		case 9: goto tr5;
 		case 32: goto tr5;
 		case 42: goto tr6;
 	}
-	goto tr326;
+	goto tr321;
 case 1:
 	switch( (*( sm->p)) ) {
 		case 0: goto tr2;
@@ -575,19 +573,19 @@ case 1:
 		case 32: goto tr4;
 	}
 	goto tr3;
-case 270:
+case 267:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr327;
-		case 10: goto tr327;
-		case 13: goto tr327;
+		case 0: goto tr322;
+		case 10: goto tr322;
+		case 13: goto tr322;
 	}
-	goto tr328;
-case 271:
+	goto tr323;
+case 268:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr327;
+		case 0: goto tr322;
 		case 9: goto tr4;
-		case 10: goto tr327;
-		case 13: goto tr327;
+		case 10: goto tr322;
+		case 13: goto tr322;
 		case 32: goto tr4;
 	}
 	goto tr3;
@@ -598,10 +596,10 @@ case 2:
 		case 42: goto tr6;
 	}
 	goto tr2;
-case 272:
+case 269:
 	if ( 49 <= (*( sm->p)) && (*( sm->p)) <= 54 )
-		goto tr329;
-	goto tr326;
+		goto tr324;
+	goto tr321;
 case 3:
 	switch( (*( sm->p)) ) {
 		case 35: goto tr7;
@@ -625,35 +623,35 @@ case 5:
 	if ( 35 <= (*( sm->p)) && (*( sm->p)) <= 126 )
 		goto tr10;
 	goto tr2;
-case 273:
+case 270:
 	switch( (*( sm->p)) ) {
-		case 9: goto tr331;
-		case 32: goto tr331;
+		case 9: goto tr326;
+		case 32: goto tr326;
 	}
-	goto tr330;
-case 274:
+	goto tr325;
+case 271:
 	switch( (*( sm->p)) ) {
-		case 9: goto tr333;
-		case 32: goto tr333;
+		case 9: goto tr328;
+		case 32: goto tr328;
 	}
-	goto tr332;
-case 275:
+	goto tr327;
+case 272:
 	switch( (*( sm->p)) ) {
-		case 47: goto tr334;
-		case 67: goto tr335;
-		case 69: goto tr336;
-		case 78: goto tr337;
-		case 81: goto tr338;
-		case 83: goto tr339;
-		case 84: goto tr340;
-		case 99: goto tr335;
-		case 101: goto tr336;
-		case 110: goto tr337;
-		case 113: goto tr338;
-		case 115: goto tr339;
-		case 116: goto tr340;
-	}
-	goto tr326;
+		case 47: goto tr329;
+		case 67: goto tr330;
+		case 69: goto tr331;
+		case 78: goto tr332;
+		case 81: goto tr333;
+		case 83: goto tr334;
+		case 84: goto tr335;
+		case 99: goto tr330;
+		case 101: goto tr331;
+		case 110: goto tr332;
+		case 113: goto tr333;
+		case 115: goto tr334;
+		case 116: goto tr335;
+	}
+	goto tr321;
 case 6:
 	switch( (*( sm->p)) ) {
 		case 83: goto tr12;
@@ -729,12 +727,12 @@ case 18:
 	if ( (*( sm->p)) == 93 )
 		goto tr24;
 	goto tr2;
-case 276:
+case 273:
 	if ( (*( sm->p)) == 32 )
 		goto tr24;
 	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
 		goto tr24;
-	goto tr341;
+	goto tr336;
 case 19:
 	switch( (*( sm->p)) ) {
 		case 88: goto tr25;
@@ -779,18 +777,18 @@ case 26:
 	if ( (*( sm->p)) == 93 )
 		goto tr34;
 	goto tr33;
-case 277:
+case 274:
 	if ( (*( sm->p)) == 32 )
-		goto tr343;
+		goto tr338;
 	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
-		goto tr343;
-	goto tr342;
-case 278:
+		goto tr338;
+	goto tr337;
+case 275:
 	if ( (*( sm->p)) == 32 )
 		goto tr31;
 	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
 		goto tr31;
-	goto tr344;
+	goto tr339;
 case 27:
 	switch( (*( sm->p)) ) {
 		case 79: goto tr35;
@@ -831,12 +829,12 @@ case 33:
 	if ( (*( sm->p)) == 93 )
 		goto tr41;
 	goto tr2;
-case 279:
+case 276:
 	if ( (*( sm->p)) == 32 )
 		goto tr41;
 	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
 		goto tr41;
-	goto tr345;
+	goto tr340;
 case 34:
 	switch( (*( sm->p)) ) {
 		case 85: goto tr42;
@@ -865,12 +863,12 @@ case 38:
 	if ( (*( sm->p)) == 93 )
 		goto tr46;
 	goto tr2;
-case 280:
+case 277:
 	if ( (*( sm->p)) == 32 )
 		goto tr46;
 	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
 		goto tr46;
-	goto tr346;
+	goto tr341;
 case 39:
 	switch( (*( sm->p)) ) {
 		case 80: goto tr47;
@@ -918,12 +916,12 @@ case 46:
 	if ( (*( sm->p)) == 93 )
 		goto tr54;
 	goto tr2;
-case 281:
+case 278:
 	if ( (*( sm->p)) == 32 )
 		goto tr54;
 	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
 		goto tr54;
-	goto tr347;
+	goto tr342;
 case 47:
 	switch( (*( sm->p)) ) {
 		case 65: goto tr55;
@@ -958,46 +956,45 @@ case 52:
 	if ( (*( sm->p)) == 93 )
 		goto tr61;
 	goto tr2;
-case 282:
+case 279:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr349;
-		case 10: goto tr350;
-		case 13: goto tr351;
-		case 34: goto tr352;
-		case 64: goto tr353;
-		case 65: goto tr354;
-		case 67: goto tr355;
-		case 70: goto tr356;
-		case 72: goto tr357;
-		case 73: goto tr358;
-		case 80: goto tr359;
-		case 84: goto tr360;
-		case 85: goto tr361;
-		case 91: goto tr362;
-		case 97: goto tr354;
-		case 99: goto tr355;
-		case 102: goto tr356;
-		case 104: goto tr363;
-		case 105: goto tr358;
-		case 112: goto tr359;
-		case 116: goto tr360;
-		case 117: goto tr361;
-		case 123: goto tr364;
-	}
-	goto tr348;
-case 283:
+		case 0: goto tr344;
+		case 10: goto tr345;
+		case 13: goto tr346;
+		case 34: goto tr347;
+		case 64: goto tr348;
+		case 65: goto tr349;
+		case 67: goto tr350;
+		case 70: goto tr351;
+		case 73: goto tr352;
+		case 80: goto tr353;
+		case 84: goto tr354;
+		case 85: goto tr355;
+		case 91: goto tr356;
+		case 97: goto tr349;
+		case 99: goto tr350;
+		case 102: goto tr351;
+		case 104: goto tr357;
+		case 105: goto tr352;
+		case 112: goto tr353;
+		case 116: goto tr354;
+		case 117: goto tr355;
+		case 123: goto tr358;
+	}
+	goto tr343;
+case 280:
 	switch( (*( sm->p)) ) {
 		case 10: goto tr63;
-		case 13: goto tr366;
-		case 42: goto tr367;
+		case 13: goto tr360;
+		case 42: goto tr361;
 	}
-	goto tr365;
-case 284:
+	goto tr359;
+case 281:
 	switch( (*( sm->p)) ) {
 		case 10: goto tr63;
-		case 13: goto tr366;
+		case 13: goto tr360;
 	}
-	goto tr368;
+	goto tr362;
 case 53:
 	if ( (*( sm->p)) == 10 )
 		goto tr63;
@@ -1018,30 +1015,30 @@ case 55:
 		case 32: goto tr68;
 	}
 	goto tr67;
-case 285:
+case 282:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr369;
-		case 10: goto tr369;
-		case 13: goto tr369;
+		case 0: goto tr363;
+		case 10: goto tr363;
+		case 13: goto tr363;
 	}
-	goto tr370;
-case 286:
+	goto tr364;
+case 283:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr369;
+		case 0: goto tr363;
 		case 9: goto tr68;
-		case 10: goto tr369;
-		case 13: goto tr369;
+		case 10: goto tr363;
+		case 13: goto tr363;
 		case 32: goto tr68;
 	}
 	goto tr67;
-case 287:
+case 284:
 	if ( (*( sm->p)) == 10 )
-		goto tr350;
-	goto tr371;
-case 288:
+		goto tr345;
+	goto tr365;
+case 285:
 	if ( (*( sm->p)) == 34 )
-		goto tr372;
-	goto tr373;
+		goto tr366;
+	goto tr367;
 case 56:
 	if ( (*( sm->p)) == 34 )
 		goto tr71;
@@ -1074,7 +1071,7 @@ case 60:
 	if ( (*( sm->p)) <= -65 )
 		goto tr79;
 	goto tr62;
-case 289:
+case 286:
 	if ( (*( sm->p)) < -32 ) {
 		if ( -62 <= (*( sm->p)) && (*( sm->p)) <= -33 )
 			goto tr76;
@@ -1086,7 +1083,7 @@ case 289:
 			goto tr78;
 	} else
 		goto tr77;
-	goto tr374;
+	goto tr368;
 case 61:
 	if ( (*( sm->p)) <= -65 )
 		goto tr76;
@@ -1201,24 +1198,24 @@ case 82:
 	if ( (*( sm->p)) == 58 )
 		goto tr97;
 	goto tr69;
-case 290:
+case 287:
 	if ( (*( sm->p)) < -32 ) {
 		if ( -62 <= (*( sm->p)) && (*( sm->p)) <= -33 )
-			goto tr375;
+			goto tr369;
 	} else if ( (*( sm->p)) > -17 ) {
 		if ( (*( sm->p)) > -12 ) {
 			if ( 33 <= (*( sm->p)) && (*( sm->p)) <= 126 )
-				goto tr378;
+				goto tr372;
 		} else if ( (*( sm->p)) >= -16 )
-			goto tr377;
+			goto tr371;
 	} else
-		goto tr376;
-	goto tr372;
+		goto tr370;
+	goto tr366;
 case 83:
 	if ( (*( sm->p)) <= -65 )
 		goto tr101;
 	goto tr62;
-case 291:
+case 288:
 	if ( (*( sm->p)) < -32 ) {
 		if ( -62 <= (*( sm->p)) && (*( sm->p)) <= -33 )
 			goto tr102;
@@ -1227,10 +1224,10 @@ case 291:
 			if ( 33 <= (*( sm->p)) && (*( sm->p)) <= 126 )
 				goto tr101;
 		} else if ( (*( sm->p)) >= -16 )
-			goto tr380;
+			goto tr374;
 	} else
 		goto tr103;
-	goto tr379;
+	goto tr373;
 case 84:
 	if ( (*( sm->p)) <= -65 )
 		goto tr102;
@@ -1239,9 +1236,9 @@ case 85:
 	if ( (*( sm->p)) <= -65 )
 		goto tr103;
 	goto tr62;
-case 292:
+case 289:
 	if ( (*( sm->p)) == 64 )
-		goto tr382;
+		goto tr376;
 	if ( (*( sm->p)) < -32 ) {
 		if ( -62 <= (*( sm->p)) && (*( sm->p)) <= -33 )
 			goto tr102;
@@ -1250,16 +1247,16 @@ case 292:
 			if ( 33 <= (*( sm->p)) && (*( sm->p)) <= 126 )
 				goto tr101;
 		} else if ( (*( sm->p)) >= -16 )
-			goto tr380;
+			goto tr374;
 	} else
 		goto tr103;
-	goto tr381;
-case 293:
+	goto tr375;
+case 290:
 	switch( (*( sm->p)) ) {
-		case 82: goto tr383;
-		case 114: goto tr383;
+		case 82: goto tr377;
+		case 114: goto tr377;
 	}
-	goto tr372;
+	goto tr366;
 case 86:
 	switch( (*( sm->p)) ) {
 		case 84: goto tr104;
@@ -1296,16 +1293,16 @@ case 92:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
 		goto tr110;
 	goto tr69;
-case 294:
+case 291:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr385;
-	goto tr384;
-case 295:
+		goto tr379;
+	goto tr378;
+case 292:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr386;
-		case 111: goto tr386;
+		case 79: goto tr380;
+		case 111: goto tr380;
 	}
-	goto tr372;
+	goto tr366;
 case 93:
 	switch( (*( sm->p)) ) {
 		case 77: goto tr111;
@@ -1348,16 +1345,16 @@ case 100:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
 		goto tr118;
 	goto tr69;
-case 296:
+case 293:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr388;
-	goto tr387;
-case 297:
+		goto tr382;
+	goto tr381;
+case 294:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr389;
-		case 111: goto tr389;
+		case 79: goto tr383;
+		case 111: goto tr383;
 	}
-	goto tr372;
+	goto tr366;
 case 101:
 	switch( (*( sm->p)) ) {
 		case 82: goto tr119;
@@ -1388,1102 +1385,1061 @@ case 106:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
 		goto tr124;
 	goto tr69;
-case 298:
+case 295:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr391;
-	goto tr390;
-case 299:
-	if ( 49 <= (*( sm->p)) && (*( sm->p)) <= 54 )
-		goto tr392;
-	goto tr372;
-case 107:
-	switch( (*( sm->p)) ) {
-		case 35: goto tr125;
-		case 46: goto tr126;
-	}
-	goto tr69;
-case 108:
-	if ( (*( sm->p)) == 33 )
-		goto tr127;
-	if ( (*( sm->p)) > 45 ) {
-		if ( 47 <= (*( sm->p)) && (*( sm->p)) <= 126 )
-			goto tr127;
-	} else if ( (*( sm->p)) >= 35 )
-		goto tr127;
-	goto tr69;
-case 109:
-	switch( (*( sm->p)) ) {
-		case 33: goto tr128;
-		case 46: goto tr129;
-	}
-	if ( 35 <= (*( sm->p)) && (*( sm->p)) <= 126 )
-		goto tr128;
-	goto tr69;
-case 300:
-	switch( (*( sm->p)) ) {
-		case 9: goto tr394;
-		case 32: goto tr394;
-	}
-	goto tr393;
-case 301:
-	switch( (*( sm->p)) ) {
-		case 9: goto tr396;
-		case 32: goto tr396;
-	}
-	goto tr395;
-case 302:
+		goto tr385;
+	goto tr384;
+case 296:
 	switch( (*( sm->p)) ) {
-		case 83: goto tr397;
-		case 115: goto tr397;
+		case 83: goto tr386;
+		case 115: goto tr386;
 	}
-	goto tr372;
-case 110:
+	goto tr366;
+case 107:
 	switch( (*( sm->p)) ) {
-		case 83: goto tr130;
-		case 115: goto tr130;
+		case 83: goto tr125;
+		case 115: goto tr125;
 	}
 	goto tr69;
-case 111:
+case 108:
 	switch( (*( sm->p)) ) {
-		case 85: goto tr131;
-		case 117: goto tr131;
+		case 85: goto tr126;
+		case 117: goto tr126;
 	}
 	goto tr69;
-case 112:
+case 109:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr132;
-		case 101: goto tr132;
+		case 69: goto tr127;
+		case 101: goto tr127;
 	}
 	goto tr69;
-case 113:
+case 110:
 	if ( (*( sm->p)) == 32 )
-		goto tr133;
+		goto tr128;
 	goto tr69;
-case 114:
+case 111:
 	if ( (*( sm->p)) == 35 )
-		goto tr134;
+		goto tr129;
 	goto tr69;
-case 115:
+case 112:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr135;
+		goto tr130;
 	goto tr69;
-case 303:
+case 297:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr399;
-	goto tr398;
-case 304:
+		goto tr388;
+	goto tr387;
+case 298:
 	switch( (*( sm->p)) ) {
-		case 73: goto tr400;
-		case 79: goto tr401;
-		case 105: goto tr400;
-		case 111: goto tr401;
+		case 73: goto tr389;
+		case 79: goto tr390;
+		case 105: goto tr389;
+		case 111: goto tr390;
 	}
-	goto tr372;
-case 116:
+	goto tr366;
+case 113:
 	switch( (*( sm->p)) ) {
-		case 88: goto tr136;
-		case 120: goto tr136;
+		case 88: goto tr131;
+		case 120: goto tr131;
 	}
 	goto tr69;
-case 117:
+case 114:
 	switch( (*( sm->p)) ) {
-		case 73: goto tr137;
-		case 105: goto tr137;
+		case 73: goto tr132;
+		case 105: goto tr132;
 	}
 	goto tr69;
-case 118:
+case 115:
 	switch( (*( sm->p)) ) {
-		case 86: goto tr138;
-		case 118: goto tr138;
+		case 86: goto tr133;
+		case 118: goto tr133;
 	}
 	goto tr69;
-case 119:
+case 116:
 	if ( (*( sm->p)) == 32 )
-		goto tr139;
+		goto tr134;
 	goto tr69;
-case 120:
+case 117:
 	if ( (*( sm->p)) == 35 )
-		goto tr140;
+		goto tr135;
 	goto tr69;
-case 121:
+case 118:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr141;
+		goto tr136;
 	goto tr69;
-case 305:
+case 299:
 	if ( (*( sm->p)) == 47 )
-		goto tr403;
+		goto tr392;
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr404;
-	goto tr402;
-case 122:
+		goto tr393;
+	goto tr391;
+case 119:
 	if ( (*( sm->p)) == 112 )
-		goto tr143;
-	goto tr142;
-case 123:
+		goto tr138;
+	goto tr137;
+case 120:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr144;
-	goto tr142;
-case 306:
+		goto tr139;
+	goto tr137;
+case 300:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr406;
-	goto tr405;
-case 124:
+		goto tr395;
+	goto tr394;
+case 121:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr145;
-		case 83: goto tr146;
-		case 111: goto tr145;
-		case 115: goto tr146;
+		case 79: goto tr140;
+		case 83: goto tr141;
+		case 111: goto tr140;
+		case 115: goto tr141;
 	}
 	goto tr69;
-case 125:
+case 122:
 	switch( (*( sm->p)) ) {
-		case 76: goto tr147;
-		case 108: goto tr147;
+		case 76: goto tr142;
+		case 108: goto tr142;
 	}
 	goto tr69;
-case 126:
+case 123:
 	if ( (*( sm->p)) == 32 )
-		goto tr148;
+		goto tr143;
 	goto tr69;
-case 127:
+case 124:
 	if ( (*( sm->p)) == 35 )
-		goto tr149;
+		goto tr144;
 	goto tr69;
-case 128:
+case 125:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr150;
+		goto tr145;
 	goto tr69;
-case 307:
+case 301:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr408;
-	goto tr407;
-case 129:
+		goto tr397;
+	goto tr396;
+case 126:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr151;
-		case 116: goto tr151;
+		case 84: goto tr146;
+		case 116: goto tr146;
 	}
 	goto tr69;
-case 130:
+case 127:
 	if ( (*( sm->p)) == 32 )
-		goto tr152;
+		goto tr147;
 	goto tr69;
-case 131:
+case 128:
 	if ( (*( sm->p)) == 35 )
-		goto tr153;
+		goto tr148;
 	goto tr69;
-case 132:
+case 129:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr154;
+		goto tr149;
 	goto tr69;
-case 308:
+case 302:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr410;
-	goto tr409;
-case 309:
+		goto tr399;
+	goto tr398;
+case 303:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr411;
-		case 111: goto tr411;
+		case 79: goto tr400;
+		case 111: goto tr400;
 	}
-	goto tr372;
-case 133:
+	goto tr366;
+case 130:
 	switch( (*( sm->p)) ) {
-		case 80: goto tr155;
-		case 112: goto tr155;
+		case 80: goto tr150;
+		case 112: goto tr150;
 	}
 	goto tr69;
-case 134:
+case 131:
 	switch( (*( sm->p)) ) {
-		case 73: goto tr156;
-		case 105: goto tr156;
+		case 73: goto tr151;
+		case 105: goto tr151;
 	}
 	goto tr69;
-case 135:
+case 132:
 	switch( (*( sm->p)) ) {
-		case 67: goto tr157;
-		case 99: goto tr157;
+		case 67: goto tr152;
+		case 99: goto tr152;
 	}
 	goto tr69;
-case 136:
+case 133:
 	if ( (*( sm->p)) == 32 )
-		goto tr158;
+		goto tr153;
 	goto tr69;
-case 137:
+case 134:
 	if ( (*( sm->p)) == 35 )
-		goto tr159;
+		goto tr154;
 	goto tr69;
-case 138:
+case 135:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr160;
+		goto tr155;
 	goto tr69;
-case 310:
+case 304:
 	if ( (*( sm->p)) == 47 )
-		goto tr413;
+		goto tr402;
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr414;
-	goto tr412;
-case 139:
+		goto tr403;
+	goto tr401;
+case 136:
 	if ( (*( sm->p)) == 112 )
-		goto tr162;
-	goto tr161;
-case 140:
+		goto tr157;
+	goto tr156;
+case 137:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr163;
-	goto tr161;
-case 311:
+		goto tr158;
+	goto tr156;
+case 305:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr416;
-	goto tr415;
-case 312:
+		goto tr405;
+	goto tr404;
+case 306:
 	switch( (*( sm->p)) ) {
-		case 83: goto tr417;
-		case 115: goto tr417;
+		case 83: goto tr406;
+		case 115: goto tr406;
 	}
-	goto tr372;
-case 141:
+	goto tr366;
+case 138:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr164;
-		case 101: goto tr164;
+		case 69: goto tr159;
+		case 101: goto tr159;
 	}
 	goto tr69;
-case 142:
+case 139:
 	switch( (*( sm->p)) ) {
-		case 82: goto tr165;
-		case 114: goto tr165;
+		case 82: goto tr160;
+		case 114: goto tr160;
 	}
 	goto tr69;
-case 143:
+case 140:
 	if ( (*( sm->p)) == 32 )
-		goto tr166;
+		goto tr161;
 	goto tr69;
-case 144:
+case 141:
 	if ( (*( sm->p)) == 35 )
-		goto tr167;
+		goto tr162;
 	goto tr69;
-case 145:
+case 142:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr168;
+		goto tr163;
 	goto tr69;
-case 313:
+case 307:
 	if ( 48 <= (*( sm->p)) && (*( sm->p)) <= 57 )
-		goto tr419;
-	goto tr418;
-case 314:
+		goto tr408;
+	goto tr407;
+case 308:
+	switch( (*( sm->p)) ) {
+		case 47: goto tr409;
+		case 66: goto tr410;
+		case 69: goto tr411;
+		case 73: goto tr412;
+		case 78: goto tr413;
+		case 81: goto tr414;
+		case 83: goto tr415;
+		case 84: goto tr416;
+		case 85: goto tr417;
+		case 91: goto tr418;
+		case 98: goto tr410;
+		case 101: goto tr411;
+		case 105: goto tr412;
+		case 110: goto tr413;
+		case 113: goto tr414;
+		case 115: goto tr415;
+		case 116: goto tr416;
+		case 117: goto tr417;
+	}
+	goto tr366;
+case 143:
+	switch( (*( sm->p)) ) {
+		case 66: goto tr164;
+		case 69: goto tr165;
+		case 73: goto tr166;
+		case 81: goto tr167;
+		case 83: goto tr168;
+		case 84: goto tr169;
+		case 85: goto tr170;
+		case 98: goto tr164;
+		case 101: goto tr165;
+		case 105: goto tr166;
+		case 113: goto tr167;
+		case 115: goto tr168;
+		case 116: goto tr169;
+		case 117: goto tr170;
+	}
+	goto tr69;
+case 144:
+	if ( (*( sm->p)) == 93 )
+		goto tr171;
+	goto tr69;
+case 145:
 	switch( (*( sm->p)) ) {
-		case 47: goto tr420;
-		case 66: goto tr421;
-		case 69: goto tr422;
-		case 73: goto tr423;
-		case 78: goto tr424;
-		case 81: goto tr425;
-		case 83: goto tr426;
-		case 84: goto tr427;
-		case 85: goto tr428;
-		case 91: goto tr429;
-		case 98: goto tr421;
-		case 101: goto tr422;
-		case 105: goto tr423;
-		case 110: goto tr424;
-		case 113: goto tr425;
-		case 115: goto tr426;
-		case 116: goto tr427;
-		case 117: goto tr428;
-	}
-	goto tr372;
+		case 88: goto tr172;
+		case 120: goto tr172;
+	}
+	goto tr69;
 case 146:
 	switch( (*( sm->p)) ) {
-		case 66: goto tr169;
-		case 69: goto tr170;
-		case 73: goto tr171;
-		case 81: goto tr172;
-		case 83: goto tr173;
-		case 84: goto tr174;
-		case 85: goto tr175;
-		case 98: goto tr169;
-		case 101: goto tr170;
-		case 105: goto tr171;
-		case 113: goto tr172;
-		case 115: goto tr173;
-		case 116: goto tr174;
-		case 117: goto tr175;
+		case 80: goto tr173;
+		case 112: goto tr173;
 	}
 	goto tr69;
 case 147:
-	if ( (*( sm->p)) == 93 )
-		goto tr176;
+	switch( (*( sm->p)) ) {
+		case 65: goto tr174;
+		case 97: goto tr174;
+	}
 	goto tr69;
 case 148:
 	switch( (*( sm->p)) ) {
-		case 88: goto tr177;
-		case 120: goto tr177;
+		case 78: goto tr175;
+		case 110: goto tr175;
 	}
 	goto tr69;
 case 149:
 	switch( (*( sm->p)) ) {
-		case 80: goto tr178;
-		case 112: goto tr178;
+		case 68: goto tr176;
+		case 100: goto tr176;
 	}
 	goto tr69;
 case 150:
-	switch( (*( sm->p)) ) {
-		case 65: goto tr179;
-		case 97: goto tr179;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr177;
 	goto tr69;
 case 151:
-	switch( (*( sm->p)) ) {
-		case 78: goto tr180;
-		case 110: goto tr180;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr178;
 	goto tr69;
 case 152:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr181;
-		case 100: goto tr181;
+		case 85: goto tr179;
+		case 117: goto tr179;
 	}
 	goto tr69;
 case 153:
-	if ( (*( sm->p)) == 93 )
-		goto tr182;
+	switch( (*( sm->p)) ) {
+		case 79: goto tr180;
+		case 111: goto tr180;
+	}
 	goto tr69;
 case 154:
-	if ( (*( sm->p)) == 93 )
-		goto tr183;
+	switch( (*( sm->p)) ) {
+		case 84: goto tr181;
+		case 116: goto tr181;
+	}
 	goto tr69;
 case 155:
 	switch( (*( sm->p)) ) {
-		case 85: goto tr184;
-		case 117: goto tr184;
+		case 69: goto tr182;
+		case 101: goto tr182;
 	}
 	goto tr69;
 case 156:
-	switch( (*( sm->p)) ) {
-		case 79: goto tr185;
-		case 111: goto tr185;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr183;
 	goto tr69;
+case 309:
+	if ( (*( sm->p)) == 32 )
+		goto tr183;
+	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
+		goto tr183;
+	goto tr419;
 case 157:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr186;
-		case 116: goto tr186;
+		case 80: goto tr184;
+		case 93: goto tr185;
+		case 112: goto tr184;
 	}
 	goto tr69;
 case 158:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr187;
-		case 101: goto tr187;
+		case 79: goto tr186;
+		case 111: goto tr186;
 	}
 	goto tr69;
 case 159:
-	if ( (*( sm->p)) == 93 )
-		goto tr188;
+	switch( (*( sm->p)) ) {
+		case 73: goto tr187;
+		case 105: goto tr187;
+	}
 	goto tr69;
-case 315:
-	if ( (*( sm->p)) == 32 )
-		goto tr188;
-	if ( 9 <= (*( sm->p)) && (*( sm->p)) <= 13 )
-		goto tr188;
-	goto tr430;
 case 160:
 	switch( (*( sm->p)) ) {
-		case 80: goto tr189;
-		case 93: goto tr190;
-		case 112: goto tr189;
+		case 76: goto tr188;
+		case 108: goto tr188;
 	}
 	goto tr69;
 case 161:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr191;
-		case 111: goto tr191;
+		case 69: goto tr189;
+		case 101: goto tr189;
 	}
 	goto tr69;
 case 162:
 	switch( (*( sm->p)) ) {
-		case 73: goto tr192;
-		case 105: goto tr192;
+		case 82: goto tr190;
+		case 114: goto tr190;
 	}
 	goto tr69;
 case 163:
 	switch( (*( sm->p)) ) {
-		case 76: goto tr193;
-		case 108: goto tr193;
+		case 83: goto tr191;
+		case 93: goto tr192;
+		case 115: goto tr191;
 	}
 	goto tr69;
 case 164:
-	switch( (*( sm->p)) ) {
-		case 69: goto tr194;
-		case 101: goto tr194;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr192;
 	goto tr69;
 case 165:
 	switch( (*( sm->p)) ) {
-		case 82: goto tr195;
-		case 114: goto tr195;
+		case 68: goto tr193;
+		case 72: goto tr194;
+		case 78: goto tr195;
+		case 100: goto tr193;
+		case 104: goto tr194;
+		case 110: goto tr195;
 	}
 	goto tr69;
 case 166:
-	switch( (*( sm->p)) ) {
-		case 83: goto tr196;
-		case 93: goto tr197;
-		case 115: goto tr196;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr196;
 	goto tr69;
 case 167:
 	if ( (*( sm->p)) == 93 )
 		goto tr197;
 	goto tr69;
 case 168:
-	switch( (*( sm->p)) ) {
-		case 68: goto tr198;
-		case 72: goto tr199;
-		case 78: goto tr200;
-		case 100: goto tr198;
-		case 104: goto tr199;
-		case 110: goto tr200;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr198;
 	goto tr69;
 case 169:
 	if ( (*( sm->p)) == 93 )
-		goto tr201;
+		goto tr199;
 	goto tr69;
 case 170:
 	if ( (*( sm->p)) == 93 )
-		goto tr202;
+		goto tr200;
 	goto tr69;
 case 171:
-	if ( (*( sm->p)) == 93 )
-		goto tr203;
+	switch( (*( sm->p)) ) {
+		case 88: goto tr201;
+		case 120: goto tr201;
+	}
 	goto tr69;
 case 172:
-	if ( (*( sm->p)) == 93 )
-		goto tr204;
+	switch( (*( sm->p)) ) {
+		case 80: goto tr202;
+		case 112: goto tr202;
+	}
 	goto tr69;
 case 173:
-	if ( (*( sm->p)) == 93 )
-		goto tr205;
+	switch( (*( sm->p)) ) {
+		case 65: goto tr203;
+		case 97: goto tr203;
+	}
 	goto tr69;
 case 174:
 	switch( (*( sm->p)) ) {
-		case 88: goto tr206;
-		case 120: goto tr206;
+		case 78: goto tr204;
+		case 110: goto tr204;
 	}
 	goto tr69;
 case 175:
 	switch( (*( sm->p)) ) {
-		case 80: goto tr207;
-		case 112: goto tr207;
+		case 68: goto tr205;
+		case 100: goto tr205;
 	}
 	goto tr69;
 case 176:
-	switch( (*( sm->p)) ) {
-		case 65: goto tr208;
-		case 97: goto tr208;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr206;
 	goto tr69;
 case 177:
-	switch( (*( sm->p)) ) {
-		case 78: goto tr209;
-		case 110: goto tr209;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr207;
 	goto tr69;
 case 178:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr210;
-		case 100: goto tr210;
+		case 79: goto tr208;
+		case 111: goto tr208;
 	}
 	goto tr69;
 case 179:
-	if ( (*( sm->p)) == 93 )
-		goto tr211;
+	switch( (*( sm->p)) ) {
+		case 68: goto tr209;
+		case 100: goto tr209;
+	}
 	goto tr69;
 case 180:
-	if ( (*( sm->p)) == 93 )
-		goto tr212;
+	switch( (*( sm->p)) ) {
+		case 84: goto tr210;
+		case 116: goto tr210;
+	}
 	goto tr69;
 case 181:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr213;
-		case 111: goto tr213;
+		case 69: goto tr211;
+		case 101: goto tr211;
 	}
 	goto tr69;
 case 182:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr214;
-		case 100: goto tr214;
+		case 88: goto tr212;
+		case 120: goto tr212;
 	}
 	goto tr69;
 case 183:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr215;
-		case 116: goto tr215;
+		case 84: goto tr213;
+		case 116: goto tr213;
 	}
 	goto tr69;
 case 184:
-	switch( (*( sm->p)) ) {
-		case 69: goto tr216;
-		case 101: goto tr216;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr214;
 	goto tr69;
 case 185:
 	switch( (*( sm->p)) ) {
-		case 88: goto tr217;
-		case 120: goto tr217;
+		case 85: goto tr215;
+		case 117: goto tr215;
 	}
 	goto tr69;
 case 186:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr218;
-		case 116: goto tr218;
+		case 79: goto tr216;
+		case 111: goto tr216;
 	}
 	goto tr69;
 case 187:
-	if ( (*( sm->p)) == 93 )
-		goto tr219;
+	switch( (*( sm->p)) ) {
+		case 84: goto tr217;
+		case 116: goto tr217;
+	}
 	goto tr69;
 case 188:
 	switch( (*( sm->p)) ) {
-		case 85: goto tr220;
-		case 117: goto tr220;
+		case 69: goto tr218;
+		case 101: goto tr218;
 	}
 	goto tr69;
 case 189:
-	switch( (*( sm->p)) ) {
-		case 79: goto tr221;
-		case 111: goto tr221;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr219;
 	goto tr69;
 case 190:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr222;
-		case 116: goto tr222;
+		case 80: goto tr220;
+		case 93: goto tr221;
+		case 112: goto tr220;
 	}
 	goto tr69;
 case 191:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr223;
-		case 101: goto tr223;
+		case 79: goto tr222;
+		case 111: goto tr222;
 	}
 	goto tr69;
 case 192:
-	if ( (*( sm->p)) == 93 )
-		goto tr224;
+	switch( (*( sm->p)) ) {
+		case 73: goto tr223;
+		case 105: goto tr223;
+	}
 	goto tr69;
 case 193:
 	switch( (*( sm->p)) ) {
-		case 80: goto tr225;
-		case 93: goto tr226;
-		case 112: goto tr225;
+		case 76: goto tr224;
+		case 108: goto tr224;
 	}
 	goto tr69;
 case 194:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr227;
-		case 111: goto tr227;
+		case 69: goto tr225;
+		case 101: goto tr225;
 	}
 	goto tr69;
 case 195:
 	switch( (*( sm->p)) ) {
-		case 73: goto tr228;
-		case 105: goto tr228;
+		case 82: goto tr226;
+		case 114: goto tr226;
 	}
 	goto tr69;
 case 196:
 	switch( (*( sm->p)) ) {
-		case 76: goto tr229;
-		case 108: goto tr229;
+		case 83: goto tr227;
+		case 93: goto tr228;
+		case 115: goto tr227;
 	}
 	goto tr69;
 case 197:
-	switch( (*( sm->p)) ) {
-		case 69: goto tr230;
-		case 101: goto tr230;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr228;
 	goto tr69;
 case 198:
 	switch( (*( sm->p)) ) {
-		case 82: goto tr231;
-		case 114: goto tr231;
+		case 78: goto tr229;
+		case 110: goto tr229;
 	}
 	goto tr69;
 case 199:
-	switch( (*( sm->p)) ) {
-		case 83: goto tr232;
-		case 93: goto tr233;
-		case 115: goto tr232;
-	}
+	if ( (*( sm->p)) == 93 )
+		goto tr230;
 	goto tr69;
 case 200:
 	if ( (*( sm->p)) == 93 )
-		goto tr233;
+		goto tr231;
 	goto tr69;
 case 201:
 	switch( (*( sm->p)) ) {
-		case 78: goto tr234;
-		case 110: goto tr234;
+		case 93: goto tr69;
+		case 124: goto tr233;
 	}
-	goto tr69;
+	goto tr232;
 case 202:
-	if ( (*( sm->p)) == 93 )
-		goto tr235;
-	goto tr69;
+	switch( (*( sm->p)) ) {
+		case 93: goto tr235;
+		case 124: goto tr236;
+	}
+	goto tr234;
 case 203:
 	if ( (*( sm->p)) == 93 )
-		goto tr236;
+		goto tr237;
 	goto tr69;
 case 204:
 	switch( (*( sm->p)) ) {
 		case 93: goto tr69;
-		case 124: goto tr238;
+		case 124: goto tr69;
 	}
-	goto tr237;
+	goto tr238;
 case 205:
 	switch( (*( sm->p)) ) {
 		case 93: goto tr240;
-		case 124: goto tr241;
+		case 124: goto tr69;
 	}
 	goto tr239;
 case 206:
 	if ( (*( sm->p)) == 93 )
-		goto tr242;
+		goto tr241;
 	goto tr69;
 case 207:
 	switch( (*( sm->p)) ) {
-		case 93: goto tr69;
+		case 93: goto tr235;
 		case 124: goto tr69;
 	}
-	goto tr243;
-case 208:
-	switch( (*( sm->p)) ) {
-		case 93: goto tr245;
-		case 124: goto tr69;
-	}
-	goto tr244;
-case 209:
-	if ( (*( sm->p)) == 93 )
-		goto tr246;
-	goto tr69;
-case 210:
-	switch( (*( sm->p)) ) {
-		case 93: goto tr240;
-		case 124: goto tr69;
-	}
-	goto tr247;
-case 316:
+	goto tr242;
+case 310:
 	if ( (*( sm->p)) == 116 )
-		goto tr431;
-	if ( 49 <= (*( sm->p)) && (*( sm->p)) <= 54 )
-		goto tr392;
-	goto tr372;
-case 211:
+		goto tr420;
+	goto tr366;
+case 208:
 	if ( (*( sm->p)) == 116 )
-		goto tr248;
+		goto tr243;
 	goto tr69;
-case 212:
+case 209:
 	if ( (*( sm->p)) == 112 )
-		goto tr249;
+		goto tr244;
 	goto tr69;
-case 213:
+case 210:
 	switch( (*( sm->p)) ) {
-		case 58: goto tr250;
-		case 115: goto tr251;
+		case 58: goto tr245;
+		case 115: goto tr246;
 	}
 	goto tr69;
-case 214:
+case 211:
 	if ( (*( sm->p)) == 47 )
-		goto tr252;
+		goto tr247;
 	goto tr69;
-case 215:
+case 212:
 	if ( (*( sm->p)) == 47 )
-		goto tr253;
+		goto tr248;
 	goto tr69;
-case 216:
+case 213:
 	if ( (*( sm->p)) < -32 ) {
 		if ( -62 <= (*( sm->p)) && (*( sm->p)) <= -33 )
-			goto tr254;
+			goto tr249;
 	} else if ( (*( sm->p)) > -17 ) {
 		if ( (*( sm->p)) > -12 ) {
 			if ( 33 <= (*( sm->p)) && (*( sm->p)) <= 126 )
-				goto tr257;
+				goto tr252;
 		} else if ( (*( sm->p)) >= -16 )
-			goto tr256;
+			goto tr251;
 	} else
-		goto tr255;
+		goto tr250;
 	goto tr69;
-case 217:
+case 214:
 	if ( (*( sm->p)) <= -65 )
-		goto tr257;
+		goto tr252;
 	goto tr62;
-case 317:
+case 311:
 	if ( (*( sm->p)) < -32 ) {
 		if ( -62 <= (*( sm->p)) && (*( sm->p)) <= -33 )
-			goto tr254;
+			goto tr249;
 	} else if ( (*( sm->p)) > -17 ) {
 		if ( (*( sm->p)) > -12 ) {
 			if ( 33 <= (*( sm->p)) && (*( sm->p)) <= 126 )
-				goto tr257;
+				goto tr252;
 		} else if ( (*( sm->p)) >= -16 )
-			goto tr256;
+			goto tr251;
 	} else
-		goto tr255;
-	goto tr432;
-case 218:
+		goto tr250;
+	goto tr421;
+case 215:
 	if ( (*( sm->p)) <= -65 )
-		goto tr254;
+		goto tr249;
 	goto tr62;
-case 219:
+case 216:
 	if ( (*( sm->p)) <= -65 )
-		goto tr255;
+		goto tr250;
 	goto tr62;
-case 220:
+case 217:
 	if ( (*( sm->p)) == 58 )
-		goto tr250;
+		goto tr245;
 	goto tr69;
-case 318:
+case 312:
 	if ( (*( sm->p)) == 123 )
-		goto tr433;
-	goto tr372;
-case 221:
+		goto tr422;
+	goto tr366;
+case 218:
 	if ( (*( sm->p)) == 125 )
 		goto tr69;
-	goto tr258;
-case 222:
+	goto tr253;
+case 219:
 	if ( (*( sm->p)) == 125 )
-		goto tr260;
-	goto tr259;
-case 223:
+		goto tr255;
+	goto tr254;
+case 220:
 	if ( (*( sm->p)) == 125 )
-		goto tr261;
+		goto tr256;
 	goto tr69;
-case 319:
+case 313:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr435;
-		case 91: goto tr436;
+		case 0: goto tr424;
+		case 91: goto tr425;
 	}
-	goto tr434;
-case 320:
+	goto tr423;
+case 314:
 	if ( (*( sm->p)) == 47 )
-		goto tr438;
-	goto tr437;
+		goto tr427;
+	goto tr426;
+case 221:
+	switch( (*( sm->p)) ) {
+		case 67: goto tr258;
+		case 99: goto tr258;
+	}
+	goto tr257;
+case 222:
+	switch( (*( sm->p)) ) {
+		case 79: goto tr259;
+		case 111: goto tr259;
+	}
+	goto tr257;
+case 223:
+	switch( (*( sm->p)) ) {
+		case 68: goto tr260;
+		case 100: goto tr260;
+	}
+	goto tr257;
 case 224:
 	switch( (*( sm->p)) ) {
-		case 67: goto tr263;
-		case 99: goto tr263;
+		case 69: goto tr261;
+		case 101: goto tr261;
 	}
-	goto tr262;
+	goto tr257;
 case 225:
+	if ( (*( sm->p)) == 93 )
+		goto tr262;
+	goto tr257;
+case 315:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr264;
-		case 111: goto tr264;
+		case 0: goto tr429;
+		case 91: goto tr430;
 	}
-	goto tr262;
+	goto tr428;
+case 316:
+	if ( (*( sm->p)) == 47 )
+		goto tr432;
+	goto tr431;
 case 226:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr265;
-		case 100: goto tr265;
+		case 78: goto tr264;
+		case 110: goto tr264;
 	}
-	goto tr262;
+	goto tr263;
 case 227:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr266;
-		case 101: goto tr266;
+		case 79: goto tr265;
+		case 111: goto tr265;
 	}
-	goto tr262;
+	goto tr263;
 case 228:
-	if ( (*( sm->p)) == 93 )
-		goto tr267;
-	goto tr262;
-case 321:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr440;
-		case 91: goto tr441;
+		case 68: goto tr266;
+		case 100: goto tr266;
 	}
-	goto tr439;
-case 322:
-	if ( (*( sm->p)) == 47 )
-		goto tr443;
-	goto tr442;
+	goto tr263;
 case 229:
 	switch( (*( sm->p)) ) {
-		case 78: goto tr269;
-		case 110: goto tr269;
+		case 84: goto tr267;
+		case 116: goto tr267;
 	}
-	goto tr268;
+	goto tr263;
 case 230:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr270;
-		case 111: goto tr270;
+		case 69: goto tr268;
+		case 101: goto tr268;
 	}
-	goto tr268;
+	goto tr263;
 case 231:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr271;
-		case 100: goto tr271;
+		case 88: goto tr269;
+		case 120: goto tr269;
 	}
-	goto tr268;
+	goto tr263;
 case 232:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr272;
-		case 116: goto tr272;
+		case 84: goto tr270;
+		case 116: goto tr270;
 	}
-	goto tr268;
+	goto tr263;
 case 233:
+	if ( (*( sm->p)) == 93 )
+		goto tr271;
+	goto tr263;
+case 317:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr273;
-		case 101: goto tr273;
+		case 0: goto tr434;
+		case 91: goto tr435;
 	}
-	goto tr268;
+	goto tr433;
+case 318:
+	switch( (*( sm->p)) ) {
+		case 47: goto tr437;
+		case 84: goto tr438;
+		case 116: goto tr438;
+	}
+	goto tr436;
 case 234:
 	switch( (*( sm->p)) ) {
-		case 88: goto tr274;
-		case 120: goto tr274;
+		case 84: goto tr273;
+		case 116: goto tr273;
 	}
-	goto tr268;
+	goto tr272;
 case 235:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr275;
-		case 116: goto tr275;
+		case 65: goto tr274;
+		case 66: goto tr275;
+		case 72: goto tr276;
+		case 82: goto tr277;
+		case 97: goto tr274;
+		case 98: goto tr275;
+		case 104: goto tr276;
+		case 114: goto tr277;
 	}
-	goto tr268;
+	goto tr272;
 case 236:
-	if ( (*( sm->p)) == 93 )
-		goto tr276;
-	goto tr268;
-case 323:
-	switch( (*( sm->p)) ) {
-		case 0: goto tr445;
-		case 91: goto tr446;
-	}
-	goto tr444;
-case 324:
 	switch( (*( sm->p)) ) {
-		case 47: goto tr448;
-		case 84: goto tr449;
-		case 116: goto tr449;
+		case 66: goto tr278;
+		case 98: goto tr278;
 	}
-	goto tr447;
+	goto tr272;
 case 237:
 	switch( (*( sm->p)) ) {
-		case 84: goto tr278;
-		case 116: goto tr278;
+		case 76: goto tr279;
+		case 108: goto tr279;
 	}
-	goto tr277;
+	goto tr272;
 case 238:
 	switch( (*( sm->p)) ) {
-		case 65: goto tr279;
-		case 66: goto tr280;
-		case 72: goto tr281;
-		case 82: goto tr282;
-		case 97: goto tr279;
-		case 98: goto tr280;
-		case 104: goto tr281;
-		case 114: goto tr282;
+		case 69: goto tr280;
+		case 101: goto tr280;
 	}
-	goto tr277;
+	goto tr272;
 case 239:
-	switch( (*( sm->p)) ) {
-		case 66: goto tr283;
-		case 98: goto tr283;
-	}
-	goto tr277;
+	if ( (*( sm->p)) == 93 )
+		goto tr281;
+	goto tr272;
 case 240:
 	switch( (*( sm->p)) ) {
-		case 76: goto tr284;
-		case 108: goto tr284;
+		case 79: goto tr282;
+		case 111: goto tr282;
 	}
-	goto tr277;
+	goto tr272;
 case 241:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr285;
-		case 101: goto tr285;
+		case 68: goto tr283;
+		case 100: goto tr283;
 	}
-	goto tr277;
+	goto tr272;
 case 242:
-	if ( (*( sm->p)) == 93 )
-		goto tr286;
-	goto tr277;
-case 243:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr287;
-		case 111: goto tr287;
+		case 89: goto tr284;
+		case 121: goto tr284;
 	}
-	goto tr277;
+	goto tr272;
+case 243:
+	if ( (*( sm->p)) == 93 )
+		goto tr285;
+	goto tr272;
 case 244:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr288;
-		case 100: goto tr288;
+		case 69: goto tr286;
+		case 101: goto tr286;
 	}
-	goto tr277;
+	goto tr272;
 case 245:
 	switch( (*( sm->p)) ) {
-		case 89: goto tr289;
-		case 121: goto tr289;
+		case 65: goto tr287;
+		case 97: goto tr287;
 	}
-	goto tr277;
+	goto tr272;
 case 246:
-	if ( (*( sm->p)) == 93 )
-		goto tr290;
-	goto tr277;
-case 247:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr291;
-		case 101: goto tr291;
+		case 68: goto tr288;
+		case 100: goto tr288;
 	}
-	goto tr277;
+	goto tr272;
+case 247:
+	if ( (*( sm->p)) == 93 )
+		goto tr289;
+	goto tr272;
 case 248:
-	switch( (*( sm->p)) ) {
-		case 65: goto tr292;
-		case 97: goto tr292;
-	}
-	goto tr277;
+	if ( (*( sm->p)) == 93 )
+		goto tr290;
+	goto tr272;
 case 249:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr293;
-		case 100: goto tr293;
+		case 66: goto tr291;
+		case 68: goto tr292;
+		case 72: goto tr293;
+		case 82: goto tr294;
+		case 98: goto tr291;
+		case 100: goto tr292;
+		case 104: goto tr293;
+		case 114: goto tr294;
 	}
-	goto tr277;
+	goto tr272;
 case 250:
-	if ( (*( sm->p)) == 93 )
-		goto tr294;
-	goto tr277;
-case 251:
-	if ( (*( sm->p)) == 93 )
-		goto tr295;
-	goto tr277;
-case 252:
-	switch( (*( sm->p)) ) {
-		case 66: goto tr296;
-		case 68: goto tr297;
-		case 72: goto tr298;
-		case 82: goto tr299;
-		case 98: goto tr296;
-		case 100: goto tr297;
-		case 104: goto tr298;
-		case 114: goto tr299;
-	}
-	goto tr277;
-case 253:
 	switch( (*( sm->p)) ) {
-		case 79: goto tr300;
-		case 111: goto tr300;
+		case 79: goto tr295;
+		case 111: goto tr295;
 	}
-	goto tr277;
-case 254:
+	goto tr272;
+case 251:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr301;
-		case 100: goto tr301;
+		case 68: goto tr296;
+		case 100: goto tr296;
 	}
-	goto tr277;
-case 255:
+	goto tr272;
+case 252:
 	switch( (*( sm->p)) ) {
-		case 89: goto tr302;
-		case 121: goto tr302;
+		case 89: goto tr297;
+		case 121: goto tr297;
 	}
-	goto tr277;
-case 256:
+	goto tr272;
+case 253:
 	if ( (*( sm->p)) == 93 )
-		goto tr303;
-	goto tr277;
-case 257:
+		goto tr298;
+	goto tr272;
+case 254:
 	if ( (*( sm->p)) == 93 )
-		goto tr304;
-	goto tr277;
-case 258:
+		goto tr299;
+	goto tr272;
+case 255:
 	switch( (*( sm->p)) ) {
-		case 69: goto tr305;
-		case 93: goto tr306;
-		case 101: goto tr305;
+		case 69: goto tr300;
+		case 93: goto tr301;
+		case 101: goto tr300;
 	}
-	goto tr277;
-case 259:
+	goto tr272;
+case 256:
 	switch( (*( sm->p)) ) {
-		case 65: goto tr307;
-		case 97: goto tr307;
+		case 65: goto tr302;
+		case 97: goto tr302;
 	}
-	goto tr277;
-case 260:
+	goto tr272;
+case 257:
 	switch( (*( sm->p)) ) {
-		case 68: goto tr308;
-		case 100: goto tr308;
+		case 68: goto tr303;
+		case 100: goto tr303;
 	}
-	goto tr277;
-case 261:
+	goto tr272;
+case 258:
 	if ( (*( sm->p)) == 93 )
-		goto tr309;
-	goto tr277;
-case 262:
+		goto tr304;
+	goto tr272;
+case 259:
 	if ( (*( sm->p)) == 93 )
-		goto tr310;
-	goto tr277;
-case 325:
+		goto tr305;
+	goto tr272;
+case 319:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr451;
-		case 10: goto tr452;
-		case 13: goto tr453;
-		case 42: goto tr454;
+		case 0: goto tr440;
+		case 10: goto tr441;
+		case 13: goto tr442;
+		case 42: goto tr443;
 	}
-	goto tr450;
-case 326:
+	goto tr439;
+case 320:
 	switch( (*( sm->p)) ) {
-		case 10: goto tr312;
-		case 13: goto tr455;
+		case 10: goto tr307;
+		case 13: goto tr444;
 	}
-	goto tr311;
-case 263:
+	goto tr306;
+case 260:
 	if ( (*( sm->p)) == 10 )
-		goto tr312;
-	goto tr311;
-case 327:
+		goto tr307;
+	goto tr306;
+case 321:
 	if ( (*( sm->p)) == 10 )
-		goto tr452;
-	goto tr456;
-case 328:
+		goto tr441;
+	goto tr445;
+case 322:
 	switch( (*( sm->p)) ) {
-		case 9: goto tr316;
-		case 32: goto tr316;
-		case 42: goto tr317;
+		case 9: goto tr311;
+		case 32: goto tr311;
+		case 42: goto tr312;
 	}
-	goto tr456;
-case 264:
+	goto tr445;
+case 261:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr313;
-		case 9: goto tr315;
-		case 10: goto tr313;
-		case 13: goto tr313;
-		case 32: goto tr315;
+		case 0: goto tr308;
+		case 9: goto tr310;
+		case 10: goto tr308;
+		case 13: goto tr308;
+		case 32: goto tr310;
 	}
-	goto tr314;
-case 329:
+	goto tr309;
+case 323:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr457;
-		case 10: goto tr457;
-		case 13: goto tr457;
+		case 0: goto tr446;
+		case 10: goto tr446;
+		case 13: goto tr446;
 	}
-	goto tr458;
-case 330:
+	goto tr447;
+case 324:
 	switch( (*( sm->p)) ) {
-		case 0: goto tr457;
-		case 9: goto tr315;
-		case 10: goto tr457;
-		case 13: goto tr457;
-		case 32: goto tr315;
+		case 0: goto tr446;
+		case 9: goto tr310;
+		case 10: goto tr446;
+		case 13: goto tr446;
+		case 32: goto tr310;
 	}
-	goto tr314;
-case 265:
+	goto tr309;
+case 262:
 	switch( (*( sm->p)) ) {
-		case 9: goto tr316;
-		case 32: goto tr316;
-		case 42: goto tr317;
+		case 9: goto tr311;
+		case 32: goto tr311;
+		case 42: goto tr312;
 	}
-	goto tr313;
+	goto tr308;
 	}
 
-	tr325:  sm->cs = 0; goto _again;
+	tr320:  sm->cs = 0; goto _again;
 	tr5:  sm->cs = 1; goto f4;
 	tr6:  sm->cs = 2; goto _again;
-	tr329:  sm->cs = 3; goto f7;
+	tr324:  sm->cs = 3; goto f7;
 	tr7:  sm->cs = 4; goto f4;
 	tr10:  sm->cs = 5; goto _again;
 	tr9:  sm->cs = 5; goto f3;
-	tr334:  sm->cs = 6; goto _again;
+	tr329:  sm->cs = 6; goto _again;
 	tr12:  sm->cs = 7; goto _again;
 	tr13:  sm->cs = 8; goto _again;
 	tr14:  sm->cs = 9; goto _again;
@@ -2492,11 +2448,11 @@ case 265:
 	tr17:  sm->cs = 12; goto _again;
 	tr18:  sm->cs = 13; goto _again;
 	tr19:  sm->cs = 14; goto _again;
-	tr335:  sm->cs = 15; goto _again;
+	tr330:  sm->cs = 15; goto _again;
 	tr21:  sm->cs = 16; goto _again;
 	tr22:  sm->cs = 17; goto _again;
 	tr23:  sm->cs = 18; goto _again;
-	tr336:  sm->cs = 19; goto _again;
+	tr331:  sm->cs = 19; goto _again;
 	tr25:  sm->cs = 20; goto _again;
 	tr26:  sm->cs = 21; goto _again;
 	tr27:  sm->cs = 22; goto _again;
@@ -2505,19 +2461,19 @@ case 265:
 	tr30:  sm->cs = 25; goto _again;
 	tr33:  sm->cs = 26; goto _again;
 	tr32:  sm->cs = 26; goto f7;
-	tr337:  sm->cs = 27; goto _again;
+	tr332:  sm->cs = 27; goto _again;
 	tr35:  sm->cs = 28; goto _again;
 	tr36:  sm->cs = 29; goto _again;
 	tr37:  sm->cs = 30; goto _again;
 	tr38:  sm->cs = 31; goto _again;
 	tr39:  sm->cs = 32; goto _again;
 	tr40:  sm->cs = 33; goto _again;
-	tr338:  sm->cs = 34; goto _again;
+	tr333:  sm->cs = 34; goto _again;
 	tr42:  sm->cs = 35; goto _again;
 	tr43:  sm->cs = 36; goto _again;
 	tr44:  sm->cs = 37; goto _again;
 	tr45:  sm->cs = 38; goto _again;
-	tr339:  sm->cs = 39; goto _again;
+	tr334:  sm->cs = 39; goto _again;
 	tr47:  sm->cs = 40; goto _again;
 	tr48:  sm->cs = 41; goto _again;
 	tr49:  sm->cs = 42; goto _again;
@@ -2525,18 +2481,18 @@ case 265:
 	tr51:  sm->cs = 44; goto _again;
 	tr52:  sm->cs = 45; goto _again;
 	tr53:  sm->cs = 46; goto _again;
-	tr340:  sm->cs = 47; goto _again;
+	tr335:  sm->cs = 47; goto _again;
 	tr55:  sm->cs = 48; goto _again;
 	tr57:  sm->cs = 49; goto _again;
 	tr58:  sm->cs = 50; goto _again;
 	tr59:  sm->cs = 51; goto _again;
 	tr56:  sm->cs = 52; goto _again;
-	tr366:  sm->cs = 53; goto _again;
+	tr360:  sm->cs = 53; goto _again;
 	tr66:  sm->cs = 54; goto _again;
-	tr367:  sm->cs = 54; goto f7;
+	tr361:  sm->cs = 54; goto f7;
 	tr65:  sm->cs = 55; goto f4;
 	tr70:  sm->cs = 56; goto _again;
-	tr373:  sm->cs = 56; goto f7;
+	tr367:  sm->cs = 56; goto f7;
 	tr71:  sm->cs = 57; goto f4;
 	tr72:  sm->cs = 58; goto _again;
 	tr100:  sm->cs = 59; goto _again;
@@ -2566,19 +2522,19 @@ case 265:
 	tr99:  sm->cs = 81; goto _again;
 	tr98:  sm->cs = 82; goto _again;
 	tr102:  sm->cs = 83; goto _again;
-	tr375:  sm->cs = 83; goto f7;
+	tr369:  sm->cs = 83; goto f7;
 	tr103:  sm->cs = 84; goto _again;
-	tr376:  sm->cs = 84; goto f7;
-	tr380:  sm->cs = 85; goto _again;
-	tr377:  sm->cs = 85; goto f7;
-	tr383:  sm->cs = 86; goto _again;
+	tr370:  sm->cs = 84; goto f7;
+	tr374:  sm->cs = 85; goto _again;
+	tr371:  sm->cs = 85; goto f7;
+	tr377:  sm->cs = 86; goto _again;
 	tr104:  sm->cs = 87; goto _again;
 	tr105:  sm->cs = 88; goto _again;
 	tr106:  sm->cs = 89; goto _again;
 	tr107:  sm->cs = 90; goto _again;
 	tr108:  sm->cs = 91; goto _again;
 	tr109:  sm->cs = 92; goto _again;
-	tr386:  sm->cs = 93; goto _again;
+	tr380:  sm->cs = 93; goto _again;
 	tr111:  sm->cs = 94; goto _again;
 	tr112:  sm->cs = 95; goto _again;
 	tr113:  sm->cs = 96; goto _again;
@@ -2586,355 +2542,344 @@ case 265:
 	tr115:  sm->cs = 98; goto _again;
 	tr116:  sm->cs = 99; goto _again;
 	tr117:  sm->cs = 100; goto _again;
-	tr389:  sm->cs = 101; goto _again;
+	tr383:  sm->cs = 101; goto _again;
 	tr119:  sm->cs = 102; goto _again;
 	tr120:  sm->cs = 103; goto _again;
 	tr121:  sm->cs = 104; goto _again;
 	tr122:  sm->cs = 105; goto _again;
 	tr123:  sm->cs = 106; goto _again;
-	tr392:  sm->cs = 107; goto f7;
-	tr125:  sm->cs = 108; goto f4;
-	tr128:  sm->cs = 109; goto _again;
-	tr127:  sm->cs = 109; goto f3;
-	tr397:  sm->cs = 110; goto _again;
-	tr130:  sm->cs = 111; goto _again;
-	tr131:  sm->cs = 112; goto _again;
-	tr132:  sm->cs = 113; goto _again;
-	tr133:  sm->cs = 114; goto _again;
-	tr134:  sm->cs = 115; goto _again;
-	tr400:  sm->cs = 116; goto _again;
-	tr136:  sm->cs = 117; goto _again;
-	tr137:  sm->cs = 118; goto _again;
-	tr138:  sm->cs = 119; goto _again;
-	tr139:  sm->cs = 120; goto _again;
-	tr140:  sm->cs = 121; goto _again;
-	tr403:  sm->cs = 122; goto f4;
-	tr143:  sm->cs = 123; goto _again;
-	tr401:  sm->cs = 124; goto _again;
-	tr145:  sm->cs = 125; goto _again;
-	tr147:  sm->cs = 126; goto _again;
-	tr148:  sm->cs = 127; goto _again;
-	tr149:  sm->cs = 128; goto _again;
-	tr146:  sm->cs = 129; goto _again;
-	tr151:  sm->cs = 130; goto _again;
-	tr152:  sm->cs = 131; goto _again;
-	tr153:  sm->cs = 132; goto _again;
-	tr411:  sm->cs = 133; goto _again;
-	tr155:  sm->cs = 134; goto _again;
-	tr156:  sm->cs = 135; goto _again;
-	tr157:  sm->cs = 136; goto _again;
-	tr158:  sm->cs = 137; goto _again;
-	tr159:  sm->cs = 138; goto _again;
-	tr413:  sm->cs = 139; goto f4;
-	tr162:  sm->cs = 140; goto _again;
-	tr417:  sm->cs = 141; goto _again;
-	tr164:  sm->cs = 142; goto _again;
-	tr165:  sm->cs = 143; goto _again;
-	tr166:  sm->cs = 144; goto _again;
-	tr167:  sm->cs = 145; goto _again;
-	tr420:  sm->cs = 146; goto _again;
-	tr169:  sm->cs = 147; goto _again;
-	tr170:  sm->cs = 148; goto _again;
-	tr177:  sm->cs = 149; goto _again;
-	tr178:  sm->cs = 150; goto _again;
-	tr179:  sm->cs = 151; goto _again;
-	tr180:  sm->cs = 152; goto _again;
-	tr181:  sm->cs = 153; goto _again;
-	tr171:  sm->cs = 154; goto _again;
-	tr172:  sm->cs = 155; goto _again;
-	tr184:  sm->cs = 156; goto _again;
-	tr185:  sm->cs = 157; goto _again;
-	tr186:  sm->cs = 158; goto _again;
-	tr187:  sm->cs = 159; goto _again;
-	tr173:  sm->cs = 160; goto _again;
-	tr189:  sm->cs = 161; goto _again;
-	tr191:  sm->cs = 162; goto _again;
-	tr192:  sm->cs = 163; goto _again;
-	tr193:  sm->cs = 164; goto _again;
-	tr194:  sm->cs = 165; goto _again;
-	tr195:  sm->cs = 166; goto _again;
-	tr196:  sm->cs = 167; goto _again;
-	tr174:  sm->cs = 168; goto _again;
-	tr198:  sm->cs = 169; goto _again;
-	tr199:  sm->cs = 170; goto _again;
-	tr200:  sm->cs = 171; goto _again;
-	tr175:  sm->cs = 172; goto _again;
-	tr421:  sm->cs = 173; goto _again;
-	tr422:  sm->cs = 174; goto _again;
-	tr206:  sm->cs = 175; goto _again;
-	tr207:  sm->cs = 176; goto _again;
-	tr208:  sm->cs = 177; goto _again;
-	tr209:  sm->cs = 178; goto _again;
-	tr210:  sm->cs = 179; goto _again;
-	tr423:  sm->cs = 180; goto _again;
-	tr424:  sm->cs = 181; goto _again;
-	tr213:  sm->cs = 182; goto _again;
-	tr214:  sm->cs = 183; goto _again;
-	tr215:  sm->cs = 184; goto _again;
-	tr216:  sm->cs = 185; goto _again;
-	tr217:  sm->cs = 186; goto _again;
-	tr218:  sm->cs = 187; goto _again;
-	tr425:  sm->cs = 188; goto _again;
-	tr220:  sm->cs = 189; goto _again;
-	tr221:  sm->cs = 190; goto _again;
-	tr222:  sm->cs = 191; goto _again;
-	tr223:  sm->cs = 192; goto _again;
-	tr426:  sm->cs = 193; goto _again;
-	tr225:  sm->cs = 194; goto _again;
-	tr227:  sm->cs = 195; goto _again;
-	tr228:  sm->cs = 196; goto _again;
-	tr229:  sm->cs = 197; goto _again;
-	tr230:  sm->cs = 198; goto _again;
-	tr231:  sm->cs = 199; goto _again;
-	tr232:  sm->cs = 200; goto _again;
-	tr427:  sm->cs = 201; goto _again;
+	tr386:  sm->cs = 107; goto _again;
+	tr125:  sm->cs = 108; goto _again;
+	tr126:  sm->cs = 109; goto _again;
+	tr127:  sm->cs = 110; goto _again;
+	tr128:  sm->cs = 111; goto _again;
+	tr129:  sm->cs = 112; goto _again;
+	tr389:  sm->cs = 113; goto _again;
+	tr131:  sm->cs = 114; goto _again;
+	tr132:  sm->cs = 115; goto _again;
+	tr133:  sm->cs = 116; goto _again;
+	tr134:  sm->cs = 117; goto _again;
+	tr135:  sm->cs = 118; goto _again;
+	tr392:  sm->cs = 119; goto f4;
+	tr138:  sm->cs = 120; goto _again;
+	tr390:  sm->cs = 121; goto _again;
+	tr140:  sm->cs = 122; goto _again;
+	tr142:  sm->cs = 123; goto _again;
+	tr143:  sm->cs = 124; goto _again;
+	tr144:  sm->cs = 125; goto _again;
+	tr141:  sm->cs = 126; goto _again;
+	tr146:  sm->cs = 127; goto _again;
+	tr147:  sm->cs = 128; goto _again;
+	tr148:  sm->cs = 129; goto _again;
+	tr400:  sm->cs = 130; goto _again;
+	tr150:  sm->cs = 131; goto _again;
+	tr151:  sm->cs = 132; goto _again;
+	tr152:  sm->cs = 133; goto _again;
+	tr153:  sm->cs = 134; goto _again;
+	tr154:  sm->cs = 135; goto _again;
+	tr402:  sm->cs = 136; goto f4;
+	tr157:  sm->cs = 137; goto _again;
+	tr406:  sm->cs = 138; goto _again;
+	tr159:  sm->cs = 139; goto _again;
+	tr160:  sm->cs = 140; goto _again;
+	tr161:  sm->cs = 141; goto _again;
+	tr162:  sm->cs = 142; goto _again;
+	tr409:  sm->cs = 143; goto _again;
+	tr164:  sm->cs = 144; goto _again;
+	tr165:  sm->cs = 145; goto _again;
+	tr172:  sm->cs = 146; goto _again;
+	tr173:  sm->cs = 147; goto _again;
+	tr174:  sm->cs = 148; goto _again;
+	tr175:  sm->cs = 149; goto _again;
+	tr176:  sm->cs = 150; goto _again;
+	tr166:  sm->cs = 151; goto _again;
+	tr167:  sm->cs = 152; goto _again;
+	tr179:  sm->cs = 153; goto _again;
+	tr180:  sm->cs = 154; goto _again;
+	tr181:  sm->cs = 155; goto _again;
+	tr182:  sm->cs = 156; goto _again;
+	tr168:  sm->cs = 157; goto _again;
+	tr184:  sm->cs = 158; goto _again;
+	tr186:  sm->cs = 159; goto _again;
+	tr187:  sm->cs = 160; goto _again;
+	tr188:  sm->cs = 161; goto _again;
+	tr189:  sm->cs = 162; goto _again;
+	tr190:  sm->cs = 163; goto _again;
+	tr191:  sm->cs = 164; goto _again;
+	tr169:  sm->cs = 165; goto _again;
+	tr193:  sm->cs = 166; goto _again;
+	tr194:  sm->cs = 167; goto _again;
+	tr195:  sm->cs = 168; goto _again;
+	tr170:  sm->cs = 169; goto _again;
+	tr410:  sm->cs = 170; goto _again;
+	tr411:  sm->cs = 171; goto _again;
+	tr201:  sm->cs = 172; goto _again;
+	tr202:  sm->cs = 173; goto _again;
+	tr203:  sm->cs = 174; goto _again;
+	tr204:  sm->cs = 175; goto _again;
+	tr205:  sm->cs = 176; goto _again;
+	tr412:  sm->cs = 177; goto _again;
+	tr413:  sm->cs = 178; goto _again;
+	tr208:  sm->cs = 179; goto _again;
+	tr209:  sm->cs = 180; goto _again;
+	tr210:  sm->cs = 181; goto _again;
+	tr211:  sm->cs = 182; goto _again;
+	tr212:  sm->cs = 183; goto _again;
+	tr213:  sm->cs = 184; goto _again;
+	tr414:  sm->cs = 185; goto _again;
+	tr215:  sm->cs = 186; goto _again;
+	tr216:  sm->cs = 187; goto _again;
+	tr217:  sm->cs = 188; goto _again;
+	tr218:  sm->cs = 189; goto _again;
+	tr415:  sm->cs = 190; goto _again;
+	tr220:  sm->cs = 191; goto _again;
+	tr222:  sm->cs = 192; goto _again;
+	tr223:  sm->cs = 193; goto _again;
+	tr224:  sm->cs = 194; goto _again;
+	tr225:  sm->cs = 195; goto _again;
+	tr226:  sm->cs = 196; goto _again;
+	tr227:  sm->cs = 197; goto _again;
+	tr416:  sm->cs = 198; goto _again;
+	tr229:  sm->cs = 199; goto _again;
+	tr417:  sm->cs = 200; goto _again;
+	tr418:  sm->cs = 201; goto _again;
 	tr234:  sm->cs = 202; goto _again;
-	tr428:  sm->cs = 203; goto _again;
-	tr429:  sm->cs = 204; goto _again;
+	tr232:  sm->cs = 202; goto f7;
+	tr235:  sm->cs = 203; goto f4;
+	tr236:  sm->cs = 204; goto f4;
 	tr239:  sm->cs = 205; goto _again;
-	tr237:  sm->cs = 205; goto f7;
-	tr240:  sm->cs = 206; goto f4;
-	tr241:  sm->cs = 207; goto f4;
-	tr244:  sm->cs = 208; goto _again;
-	tr243:  sm->cs = 208; goto f3;
-	tr245:  sm->cs = 209; goto f5;
-	tr247:  sm->cs = 210; goto _again;
-	tr238:  sm->cs = 210; goto f7;
-	tr431:  sm->cs = 211; goto _again;
-	tr248:  sm->cs = 212; goto _again;
-	tr249:  sm->cs = 213; goto _again;
-	tr250:  sm->cs = 214; goto _again;
-	tr252:  sm->cs = 215; goto _again;
-	tr253:  sm->cs = 216; goto _again;
-	tr254:  sm->cs = 217; goto _again;
-	tr255:  sm->cs = 218; goto _again;
-	tr256:  sm->cs = 219; goto _again;
-	tr251:  sm->cs = 220; goto _again;
-	tr433:  sm->cs = 221; goto _again;
-	tr259:  sm->cs = 222; goto _again;
-	tr258:  sm->cs = 222; goto f7;
-	tr260:  sm->cs = 223; goto f4;
-	tr438:  sm->cs = 224; goto _again;
-	tr263:  sm->cs = 225; goto _again;
-	tr264:  sm->cs = 226; goto _again;
-	tr265:  sm->cs = 227; goto _again;
-	tr266:  sm->cs = 228; goto _again;
-	tr443:  sm->cs = 229; goto _again;
-	tr269:  sm->cs = 230; goto _again;
-	tr270:  sm->cs = 231; goto _again;
-	tr271:  sm->cs = 232; goto _again;
-	tr272:  sm->cs = 233; goto _again;
-	tr273:  sm->cs = 234; goto _again;
-	tr274:  sm->cs = 235; goto _again;
-	tr275:  sm->cs = 236; goto _again;
-	tr448:  sm->cs = 237; goto _again;
-	tr278:  sm->cs = 238; goto _again;
-	tr279:  sm->cs = 239; goto _again;
-	tr283:  sm->cs = 240; goto _again;
-	tr284:  sm->cs = 241; goto _again;
-	tr285:  sm->cs = 242; goto _again;
-	tr280:  sm->cs = 243; goto _again;
-	tr287:  sm->cs = 244; goto _again;
-	tr288:  sm->cs = 245; goto _again;
-	tr289:  sm->cs = 246; goto _again;
-	tr281:  sm->cs = 247; goto _again;
-	tr291:  sm->cs = 248; goto _again;
-	tr292:  sm->cs = 249; goto _again;
-	tr293:  sm->cs = 250; goto _again;
-	tr282:  sm->cs = 251; goto _again;
-	tr449:  sm->cs = 252; goto _again;
-	tr296:  sm->cs = 253; goto _again;
-	tr300:  sm->cs = 254; goto _again;
-	tr301:  sm->cs = 255; goto _again;
-	tr302:  sm->cs = 256; goto _again;
-	tr297:  sm->cs = 257; goto _again;
-	tr298:  sm->cs = 258; goto _again;
-	tr305:  sm->cs = 259; goto _again;
-	tr307:  sm->cs = 260; goto _again;
-	tr308:  sm->cs = 261; goto _again;
-	tr299:  sm->cs = 262; goto _again;
-	tr455:  sm->cs = 263; goto _again;
-	tr316:  sm->cs = 264; goto f4;
-	tr317:  sm->cs = 265; goto _again;
-	tr0:  sm->cs = 266; goto f0;
-	tr2:  sm->cs = 266; goto f2;
-	tr20:  sm->cs = 266; goto f6;
-	tr60:  sm->cs = 266; goto f8;
-	tr61:  sm->cs = 266; goto f9;
-	tr318:  sm->cs = 266; goto f61;
-	tr319:  sm->cs = 266; goto f62;
-	tr326:  sm->cs = 266; goto f65;
-	tr327:  sm->cs = 266; goto f66;
-	tr330:  sm->cs = 266; goto f67;
-	tr332:  sm->cs = 266; goto f68;
-	tr341:  sm->cs = 266; goto f69;
-	tr342:  sm->cs = 266; goto f70;
-	tr344:  sm->cs = 266; goto f71;
-	tr345:  sm->cs = 266; goto f72;
-	tr346:  sm->cs = 266; goto f73;
-	tr347:  sm->cs = 266; goto f74;
-	tr1:  sm->cs = 267; goto f1;
-	tr320:  sm->cs = 267; goto f63;
-	tr321:  sm->cs = 268; goto _again;
-	tr322:  sm->cs = 269; goto f17;
-	tr328:  sm->cs = 270; goto _again;
-	tr3:  sm->cs = 270; goto f3;
-	tr4:  sm->cs = 271; goto f3;
-	tr323:  sm->cs = 272; goto f64;
-	tr331:  sm->cs = 273; goto _again;
-	tr11:  sm->cs = 273; goto f5;
-	tr333:  sm->cs = 274; goto _again;
-	tr8:  sm->cs = 274; goto f4;
-	tr324:  sm->cs = 275; goto f64;
-	tr24:  sm->cs = 276; goto _again;
-	tr343:  sm->cs = 277; goto _again;
-	tr34:  sm->cs = 277; goto f4;
-	tr31:  sm->cs = 278; goto _again;
-	tr41:  sm->cs = 279; goto _again;
-	tr46:  sm->cs = 280; goto _again;
-	tr54:  sm->cs = 281; goto _again;
-	tr62:  sm->cs = 282; goto f10;
-	tr64:  sm->cs = 282; goto f12;
-	tr69:  sm->cs = 282; goto f13;
-	tr86:  sm->cs = 282; goto f15;
-	tr142:  sm->cs = 282; goto f18;
-	tr161:  sm->cs = 282; goto f19;
-	tr176:  sm->cs = 282; goto f20;
-	tr182:  sm->cs = 282; goto f21;
-	tr183:  sm->cs = 282; goto f22;
-	tr190:  sm->cs = 282; goto f23;
-	tr197:  sm->cs = 282; goto f24;
-	tr201:  sm->cs = 282; goto f25;
-	tr202:  sm->cs = 282; goto f26;
-	tr203:  sm->cs = 282; goto f27;
-	tr204:  sm->cs = 282; goto f28;
-	tr205:  sm->cs = 282; goto f29;
-	tr211:  sm->cs = 282; goto f30;
-	tr212:  sm->cs = 282; goto f31;
-	tr219:  sm->cs = 282; goto f32;
-	tr224:  sm->cs = 282; goto f33;
-	tr226:  sm->cs = 282; goto f34;
-	tr233:  sm->cs = 282; goto f35;
-	tr235:  sm->cs = 282; goto f36;
-	tr236:  sm->cs = 282; goto f37;
-	tr242:  sm->cs = 282; goto f38;
-	tr246:  sm->cs = 282; goto f39;
-	tr261:  sm->cs = 282; goto f41;
-	tr348:  sm->cs = 282; goto f75;
-	tr349:  sm->cs = 282; goto f76;
-	tr365:  sm->cs = 282; goto f79;
-	tr368:  sm->cs = 282; goto f80;
-	tr369:  sm->cs = 282; goto f81;
-	tr371:  sm->cs = 282; goto f82;
-	tr372:  sm->cs = 282; goto f83;
-	tr374:  sm->cs = 282; goto f84;
-	tr379:  sm->cs = 282; goto f86;
-	tr381:  sm->cs = 282; goto f87;
-	tr384:  sm->cs = 282; goto f89;
-	tr387:  sm->cs = 282; goto f90;
-	tr390:  sm->cs = 282; goto f91;
-	tr393:  sm->cs = 282; goto f92;
-	tr395:  sm->cs = 282; goto f93;
-	tr398:  sm->cs = 282; goto f94;
-	tr402:  sm->cs = 282; goto f95;
-	tr405:  sm->cs = 282; goto f96;
-	tr407:  sm->cs = 282; goto f97;
-	tr409:  sm->cs = 282; goto f98;
-	tr412:  sm->cs = 282; goto f99;
-	tr415:  sm->cs = 282; goto f100;
-	tr418:  sm->cs = 282; goto f101;
-	tr430:  sm->cs = 282; goto f102;
-	tr432:  sm->cs = 282; goto f103;
-	tr350:  sm->cs = 283; goto f77;
-	tr63:  sm->cs = 284; goto f11;
-	tr370:  sm->cs = 285; goto _again;
-	tr67:  sm->cs = 285; goto f3;
-	tr68:  sm->cs = 286; goto f3;
-	tr351:  sm->cs = 287; goto _again;
-	tr352:  sm->cs = 288; goto f78;
-	tr79:  sm->cs = 289; goto f14;
-	tr353:  sm->cs = 290; goto f78;
-	tr101:  sm->cs = 291; goto f16;
-	tr382:  sm->cs = 291; goto f88;
-	tr378:  sm->cs = 292; goto f85;
-	tr354:  sm->cs = 293; goto f64;
-	tr385:  sm->cs = 294; goto _again;
-	tr110:  sm->cs = 294; goto f7;
-	tr355:  sm->cs = 295; goto f64;
-	tr388:  sm->cs = 296; goto _again;
-	tr118:  sm->cs = 296; goto f7;
-	tr356:  sm->cs = 297; goto f64;
-	tr391:  sm->cs = 298; goto _again;
-	tr124:  sm->cs = 298; goto f7;
-	tr357:  sm->cs = 299; goto f64;
-	tr394:  sm->cs = 300; goto _again;
-	tr129:  sm->cs = 300; goto f5;
-	tr396:  sm->cs = 301; goto _again;
-	tr126:  sm->cs = 301; goto f4;
-	tr358:  sm->cs = 302; goto f64;
-	tr399:  sm->cs = 303; goto _again;
-	tr135:  sm->cs = 303; goto f7;
-	tr359:  sm->cs = 304; goto f64;
-	tr141:  sm->cs = 305; goto f17;
-	tr404:  sm->cs = 305; goto f64;
-	tr406:  sm->cs = 306; goto _again;
-	tr144:  sm->cs = 306; goto f3;
+	tr238:  sm->cs = 205; goto f3;
+	tr240:  sm->cs = 206; goto f5;
+	tr242:  sm->cs = 207; goto _again;
+	tr233:  sm->cs = 207; goto f7;
+	tr420:  sm->cs = 208; goto _again;
+	tr243:  sm->cs = 209; goto _again;
+	tr244:  sm->cs = 210; goto _again;
+	tr245:  sm->cs = 211; goto _again;
+	tr247:  sm->cs = 212; goto _again;
+	tr248:  sm->cs = 213; goto _again;
+	tr249:  sm->cs = 214; goto _again;
+	tr250:  sm->cs = 215; goto _again;
+	tr251:  sm->cs = 216; goto _again;
+	tr246:  sm->cs = 217; goto _again;
+	tr422:  sm->cs = 218; goto _again;
+	tr254:  sm->cs = 219; goto _again;
+	tr253:  sm->cs = 219; goto f7;
+	tr255:  sm->cs = 220; goto f4;
+	tr427:  sm->cs = 221; goto _again;
+	tr258:  sm->cs = 222; goto _again;
+	tr259:  sm->cs = 223; goto _again;
+	tr260:  sm->cs = 224; goto _again;
+	tr261:  sm->cs = 225; goto _again;
+	tr432:  sm->cs = 226; goto _again;
+	tr264:  sm->cs = 227; goto _again;
+	tr265:  sm->cs = 228; goto _again;
+	tr266:  sm->cs = 229; goto _again;
+	tr267:  sm->cs = 230; goto _again;
+	tr268:  sm->cs = 231; goto _again;
+	tr269:  sm->cs = 232; goto _again;
+	tr270:  sm->cs = 233; goto _again;
+	tr437:  sm->cs = 234; goto _again;
+	tr273:  sm->cs = 235; goto _again;
+	tr274:  sm->cs = 236; goto _again;
+	tr278:  sm->cs = 237; goto _again;
+	tr279:  sm->cs = 238; goto _again;
+	tr280:  sm->cs = 239; goto _again;
+	tr275:  sm->cs = 240; goto _again;
+	tr282:  sm->cs = 241; goto _again;
+	tr283:  sm->cs = 242; goto _again;
+	tr284:  sm->cs = 243; goto _again;
+	tr276:  sm->cs = 244; goto _again;
+	tr286:  sm->cs = 245; goto _again;
+	tr287:  sm->cs = 246; goto _again;
+	tr288:  sm->cs = 247; goto _again;
+	tr277:  sm->cs = 248; goto _again;
+	tr438:  sm->cs = 249; goto _again;
+	tr291:  sm->cs = 250; goto _again;
+	tr295:  sm->cs = 251; goto _again;
+	tr296:  sm->cs = 252; goto _again;
+	tr297:  sm->cs = 253; goto _again;
+	tr292:  sm->cs = 254; goto _again;
+	tr293:  sm->cs = 255; goto _again;
+	tr300:  sm->cs = 256; goto _again;
+	tr302:  sm->cs = 257; goto _again;
+	tr303:  sm->cs = 258; goto _again;
+	tr294:  sm->cs = 259; goto _again;
+	tr444:  sm->cs = 260; goto _again;
+	tr311:  sm->cs = 261; goto f4;
+	tr312:  sm->cs = 262; goto _again;
+	tr0:  sm->cs = 263; goto f0;
+	tr2:  sm->cs = 263; goto f2;
+	tr20:  sm->cs = 263; goto f6;
+	tr60:  sm->cs = 263; goto f8;
+	tr61:  sm->cs = 263; goto f9;
+	tr313:  sm->cs = 263; goto f61;
+	tr314:  sm->cs = 263; goto f62;
+	tr321:  sm->cs = 263; goto f65;
+	tr322:  sm->cs = 263; goto f66;
+	tr325:  sm->cs = 263; goto f67;
+	tr327:  sm->cs = 263; goto f68;
+	tr336:  sm->cs = 263; goto f69;
+	tr337:  sm->cs = 263; goto f70;
+	tr339:  sm->cs = 263; goto f71;
+	tr340:  sm->cs = 263; goto f72;
+	tr341:  sm->cs = 263; goto f73;
+	tr342:  sm->cs = 263; goto f74;
+	tr1:  sm->cs = 264; goto f1;
+	tr315:  sm->cs = 264; goto f63;
+	tr316:  sm->cs = 265; goto _again;
+	tr317:  sm->cs = 266; goto f17;
+	tr323:  sm->cs = 267; goto _again;
+	tr3:  sm->cs = 267; goto f3;
+	tr4:  sm->cs = 268; goto f3;
+	tr318:  sm->cs = 269; goto f64;
+	tr326:  sm->cs = 270; goto _again;
+	tr11:  sm->cs = 270; goto f5;
+	tr328:  sm->cs = 271; goto _again;
+	tr8:  sm->cs = 271; goto f4;
+	tr319:  sm->cs = 272; goto f64;
+	tr24:  sm->cs = 273; goto _again;
+	tr338:  sm->cs = 274; goto _again;
+	tr34:  sm->cs = 274; goto f4;
+	tr31:  sm->cs = 275; goto _again;
+	tr41:  sm->cs = 276; goto _again;
+	tr46:  sm->cs = 277; goto _again;
+	tr54:  sm->cs = 278; goto _again;
+	tr62:  sm->cs = 279; goto f10;
+	tr64:  sm->cs = 279; goto f12;
+	tr69:  sm->cs = 279; goto f13;
+	tr86:  sm->cs = 279; goto f15;
+	tr137:  sm->cs = 279; goto f18;
+	tr156:  sm->cs = 279; goto f19;
+	tr171:  sm->cs = 279; goto f20;
+	tr177:  sm->cs = 279; goto f21;
+	tr178:  sm->cs = 279; goto f22;
+	tr185:  sm->cs = 279; goto f23;
+	tr192:  sm->cs = 279; goto f24;
+	tr196:  sm->cs = 279; goto f25;
+	tr197:  sm->cs = 279; goto f26;
+	tr198:  sm->cs = 279; goto f27;
+	tr199:  sm->cs = 279; goto f28;
+	tr200:  sm->cs = 279; goto f29;
+	tr206:  sm->cs = 279; goto f30;
+	tr207:  sm->cs = 279; goto f31;
+	tr214:  sm->cs = 279; goto f32;
+	tr219:  sm->cs = 279; goto f33;
+	tr221:  sm->cs = 279; goto f34;
+	tr228:  sm->cs = 279; goto f35;
+	tr230:  sm->cs = 279; goto f36;
+	tr231:  sm->cs = 279; goto f37;
+	tr237:  sm->cs = 279; goto f38;
+	tr241:  sm->cs = 279; goto f39;
+	tr256:  sm->cs = 279; goto f41;
+	tr343:  sm->cs = 279; goto f75;
+	tr344:  sm->cs = 279; goto f76;
+	tr359:  sm->cs = 279; goto f79;
+	tr362:  sm->cs = 279; goto f80;
+	tr363:  sm->cs = 279; goto f81;
+	tr365:  sm->cs = 279; goto f82;
+	tr366:  sm->cs = 279; goto f83;
+	tr368:  sm->cs = 279; goto f84;
+	tr373:  sm->cs = 279; goto f86;
+	tr375:  sm->cs = 279; goto f87;
+	tr378:  sm->cs = 279; goto f89;
+	tr381:  sm->cs = 279; goto f90;
+	tr384:  sm->cs = 279; goto f91;
+	tr387:  sm->cs = 279; goto f92;
+	tr391:  sm->cs = 279; goto f93;
+	tr394:  sm->cs = 279; goto f94;
+	tr396:  sm->cs = 279; goto f95;
+	tr398:  sm->cs = 279; goto f96;
+	tr401:  sm->cs = 279; goto f97;
+	tr404:  sm->cs = 279; goto f98;
+	tr407:  sm->cs = 279; goto f99;
+	tr419:  sm->cs = 279; goto f100;
+	tr421:  sm->cs = 279; goto f101;
+	tr345:  sm->cs = 280; goto f77;
+	tr63:  sm->cs = 281; goto f11;
+	tr364:  sm->cs = 282; goto _again;
+	tr67:  sm->cs = 282; goto f3;
+	tr68:  sm->cs = 283; goto f3;
+	tr346:  sm->cs = 284; goto _again;
+	tr347:  sm->cs = 285; goto f78;
+	tr79:  sm->cs = 286; goto f14;
+	tr348:  sm->cs = 287; goto f78;
+	tr101:  sm->cs = 288; goto f16;
+	tr376:  sm->cs = 288; goto f88;
+	tr372:  sm->cs = 289; goto f85;
+	tr349:  sm->cs = 290; goto f64;
+	tr379:  sm->cs = 291; goto _again;
+	tr110:  sm->cs = 291; goto f7;
+	tr350:  sm->cs = 292; goto f64;
+	tr382:  sm->cs = 293; goto _again;
+	tr118:  sm->cs = 293; goto f7;
+	tr351:  sm->cs = 294; goto f64;
+	tr385:  sm->cs = 295; goto _again;
+	tr124:  sm->cs = 295; goto f7;
+	tr352:  sm->cs = 296; goto f64;
+	tr388:  sm->cs = 297; goto _again;
+	tr130:  sm->cs = 297; goto f7;
+	tr353:  sm->cs = 298; goto f64;
+	tr136:  sm->cs = 299; goto f17;
+	tr393:  sm->cs = 299; goto f64;
+	tr395:  sm->cs = 300; goto _again;
+	tr139:  sm->cs = 300; goto f3;
+	tr397:  sm->cs = 301; goto _again;
+	tr145:  sm->cs = 301; goto f7;
+	tr399:  sm->cs = 302; goto _again;
+	tr149:  sm->cs = 302; goto f7;
+	tr354:  sm->cs = 303; goto f64;
+	tr155:  sm->cs = 304; goto f17;
+	tr403:  sm->cs = 304; goto f64;
+	tr405:  sm->cs = 305; goto _again;
+	tr158:  sm->cs = 305; goto f3;
+	tr355:  sm->cs = 306; goto f64;
 	tr408:  sm->cs = 307; goto _again;
-	tr150:  sm->cs = 307; goto f7;
-	tr410:  sm->cs = 308; goto _again;
-	tr154:  sm->cs = 308; goto f7;
-	tr360:  sm->cs = 309; goto f64;
-	tr160:  sm->cs = 310; goto f17;
-	tr414:  sm->cs = 310; goto f64;
-	tr416:  sm->cs = 311; goto _again;
-	tr163:  sm->cs = 311; goto f3;
-	tr361:  sm->cs = 312; goto f64;
-	tr419:  sm->cs = 313; goto _again;
-	tr168:  sm->cs = 313; goto f7;
-	tr362:  sm->cs = 314; goto f64;
-	tr188:  sm->cs = 315; goto _again;
-	tr363:  sm->cs = 316; goto f78;
-	tr257:  sm->cs = 317; goto f40;
-	tr364:  sm->cs = 318; goto f64;
-	tr262:  sm->cs = 319; goto f42;
-	tr267:  sm->cs = 319; goto f43;
-	tr434:  sm->cs = 319; goto f104;
-	tr435:  sm->cs = 319; goto f105;
-	tr437:  sm->cs = 319; goto f106;
-	tr436:  sm->cs = 320; goto f64;
-	tr268:  sm->cs = 321; goto f44;
-	tr276:  sm->cs = 321; goto f45;
-	tr439:  sm->cs = 321; goto f107;
-	tr440:  sm->cs = 321; goto f108;
-	tr442:  sm->cs = 321; goto f109;
-	tr441:  sm->cs = 322; goto f64;
-	tr277:  sm->cs = 323; goto f46;
-	tr286:  sm->cs = 323; goto f47;
-	tr290:  sm->cs = 323; goto f48;
-	tr294:  sm->cs = 323; goto f49;
-	tr295:  sm->cs = 323; goto f50;
-	tr303:  sm->cs = 323; goto f51;
-	tr304:  sm->cs = 323; goto f52;
-	tr306:  sm->cs = 323; goto f53;
-	tr309:  sm->cs = 323; goto f54;
-	tr310:  sm->cs = 323; goto f55;
-	tr444:  sm->cs = 323; goto f110;
-	tr445:  sm->cs = 323; goto f111;
-	tr447:  sm->cs = 323; goto f112;
-	tr446:  sm->cs = 324; goto f64;
-	tr311:  sm->cs = 325; goto f56;
-	tr313:  sm->cs = 325; goto f58;
-	tr450:  sm->cs = 325; goto f113;
-	tr451:  sm->cs = 325; goto f114;
-	tr456:  sm->cs = 325; goto f116;
-	tr457:  sm->cs = 325; goto f117;
-	tr312:  sm->cs = 326; goto f57;
-	tr452:  sm->cs = 326; goto f115;
-	tr453:  sm->cs = 327; goto _again;
-	tr454:  sm->cs = 328; goto f17;
-	tr458:  sm->cs = 329; goto _again;
-	tr314:  sm->cs = 329; goto f3;
-	tr315:  sm->cs = 330; goto f3;
+	tr163:  sm->cs = 307; goto f7;
+	tr356:  sm->cs = 308; goto f64;
+	tr183:  sm->cs = 309; goto _again;
+	tr357:  sm->cs = 310; goto f78;
+	tr252:  sm->cs = 311; goto f40;
+	tr358:  sm->cs = 312; goto f64;
+	tr257:  sm->cs = 313; goto f42;
+	tr262:  sm->cs = 313; goto f43;
+	tr423:  sm->cs = 313; goto f102;
+	tr424:  sm->cs = 313; goto f103;
+	tr426:  sm->cs = 313; goto f104;
+	tr425:  sm->cs = 314; goto f64;
+	tr263:  sm->cs = 315; goto f44;
+	tr271:  sm->cs = 315; goto f45;
+	tr428:  sm->cs = 315; goto f105;
+	tr429:  sm->cs = 315; goto f106;
+	tr431:  sm->cs = 315; goto f107;
+	tr430:  sm->cs = 316; goto f64;
+	tr272:  sm->cs = 317; goto f46;
+	tr281:  sm->cs = 317; goto f47;
+	tr285:  sm->cs = 317; goto f48;
+	tr289:  sm->cs = 317; goto f49;
+	tr290:  sm->cs = 317; goto f50;
+	tr298:  sm->cs = 317; goto f51;
+	tr299:  sm->cs = 317; goto f52;
+	tr301:  sm->cs = 317; goto f53;
+	tr304:  sm->cs = 317; goto f54;
+	tr305:  sm->cs = 317; goto f55;
+	tr433:  sm->cs = 317; goto f108;
+	tr434:  sm->cs = 317; goto f109;
+	tr436:  sm->cs = 317; goto f110;
+	tr435:  sm->cs = 318; goto f64;
+	tr306:  sm->cs = 319; goto f56;
+	tr308:  sm->cs = 319; goto f58;
+	tr439:  sm->cs = 319; goto f111;
+	tr440:  sm->cs = 319; goto f112;
+	tr445:  sm->cs = 319; goto f114;
+	tr446:  sm->cs = 319; goto f115;
+	tr307:  sm->cs = 320; goto f57;
+	tr441:  sm->cs = 320; goto f113;
+	tr442:  sm->cs = 321; goto _again;
+	tr443:  sm->cs = 322; goto f17;
+	tr447:  sm->cs = 323; goto _again;
+	tr309:  sm->cs = 323; goto f3;
+	tr310:  sm->cs = 324; goto f3;
 
 f7:
 #line 98 "ext/dtext/dtext.rl"
@@ -3115,17 +3060,8 @@ f27:
     }
   }}
 	goto _again;
-f33:
-#line 514 "ext/dtext/dtext.rl"
-	{( sm->te) = ( sm->p)+1;{
-    g_debug("inline [quote]");
-    dstack_close_before_block(sm);
-    {( sm->p) = (( sm->ts))-1;}
-    { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
-  }}
-	goto _again;
 f35:
-#line 537 "ext/dtext/dtext.rl"
+#line 500 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("inline [spoiler]");
     g_debug("  push <span>");
@@ -3134,7 +3070,7 @@ f35:
   }}
 	goto _again;
 f24:
-#line 544 "ext/dtext/dtext.rl"
+#line 507 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("inline [/spoiler]");
     dstack_close_before_block(sm);
@@ -3156,8 +3092,36 @@ f24:
     }
   }}
 	goto _again;
+f32:
+#line 528 "ext/dtext/dtext.rl"
+	{( sm->te) = ( sm->p)+1;{
+    dstack_push(sm, &INLINE_NODTEXT);
+    g_debug("push inline nodtext");
+    {
+  size_t len = sm->stack->len;
+
+  if (len > MAX_STACK_DEPTH) {
+    free_machine(sm);
+    rb_raise(rb_eSyntaxError, "too many nested elements");
+  }
+
+  if (sm->top >= len) {
+    sm->stack = g_array_set_size(sm->stack, len + 16);
+  }
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 315; goto _again;}}
+  }}
+	goto _again;
+f33:
+#line 537 "ext/dtext/dtext.rl"
+	{( sm->te) = ( sm->p)+1;{
+    g_debug("inline [quote]");
+    dstack_close_before_block(sm);
+    {( sm->p) = (( sm->ts))-1;}
+    { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
+  }}
+	goto _again;
 f30:
-#line 565 "ext/dtext/dtext.rl"
+#line 560 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("inline [expand]");
     dstack_rewind(sm);
@@ -3166,7 +3130,7 @@ f30:
   }}
 	goto _again;
 f21:
-#line 572 "ext/dtext/dtext.rl"
+#line 567 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_close_before_block(sm);
 
@@ -3179,26 +3143,8 @@ f21:
     }
   }}
 	goto _again;
-f32:
-#line 584 "ext/dtext/dtext.rl"
-	{( sm->te) = ( sm->p)+1;{
-    dstack_push(sm, &INLINE_NODTEXT);
-    {
-  size_t len = sm->stack->len;
-
-  if (len > MAX_STACK_DEPTH) {
-    free_machine(sm);
-    rb_raise(rb_eSyntaxError, "too many nested elements");
-  }
-
-  if (sm->top >= len) {
-    sm->stack = g_array_set_size(sm->stack, len + 16);
-  }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 321; goto _again;}}
-  }}
-	goto _again;
 f26:
-#line 589 "ext/dtext/dtext.rl"
+#line 579 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_TH)) {
       dstack_pop(sm);
@@ -3210,7 +3156,7 @@ f26:
   }}
 	goto _again;
 f25:
-#line 599 "ext/dtext/dtext.rl"
+#line 589 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_TD)) {
       dstack_pop(sm);
@@ -3222,7 +3168,7 @@ f25:
   }}
 	goto _again;
 f76:
-#line 609 "ext/dtext/dtext.rl"
+#line 599 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("inline 0");
     g_debug("  return");
@@ -3232,13 +3178,13 @@ f76:
   }}
 	goto _again;
 f75:
-#line 645 "ext/dtext/dtext.rl"
+#line 635 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("inline char: %c", (*( sm->p)));
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
-f103:
+f101:
 #line 353 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     if (is_boundary_c((*( sm->p)))) {
@@ -3260,24 +3206,8 @@ f103:
     }
   }}
 	goto _again;
-f93:
-#line 502 "ext/dtext/dtext.rl"
-	{( sm->te) = ( sm->p);( sm->p)--;{
-    dstack_rewind(sm);
-    {( sm->p) = (( sm->a1 - 1))-1;}
-    { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
-  }}
-	goto _again;
-f92:
-#line 508 "ext/dtext/dtext.rl"
-	{( sm->te) = ( sm->p);( sm->p)--;{
-    dstack_rewind(sm);
-    {( sm->p) = (( sm->a1 - 1))-1;}
-    { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
-  }}
-	goto _again;
-f102:
-#line 521 "ext/dtext/dtext.rl"
+f100:
+#line 544 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("inline [/quote]");
     dstack_close_before_block(sm);
@@ -3295,7 +3225,7 @@ f102:
   }}
 	goto _again;
 f80:
-#line 617 "ext/dtext/dtext.rl"
+#line 607 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("inline newline2");
     g_debug("  return");
@@ -3309,7 +3239,7 @@ f80:
   }}
 	goto _again;
 f79:
-#line 629 "ext/dtext/dtext.rl"
+#line 619 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("inline newline");
 
@@ -3323,13 +3253,13 @@ f79:
   }}
 	goto _again;
 f82:
-#line 641 "ext/dtext/dtext.rl"
+#line 631 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     append_c(sm, ' ');
   }}
 	goto _again;
 f83:
-#line 645 "ext/dtext/dtext.rl"
+#line 635 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("inline char: %c", (*( sm->p)));
     append_c_html_escaped(sm, (*( sm->p)));
@@ -3358,7 +3288,7 @@ f18:
   }}
 	goto _again;
 f12:
-#line 629 "ext/dtext/dtext.rl"
+#line 619 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}{
     g_debug("inline newline");
 
@@ -3372,7 +3302,7 @@ f12:
   }}
 	goto _again;
 f13:
-#line 645 "ext/dtext/dtext.rl"
+#line 635 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}{
     g_debug("inline char: %c", (*( sm->p)));
     append_c_html_escaped(sm, (*( sm->p)));
@@ -3460,7 +3390,7 @@ f10:
     }
   }
 	break;
-	case 43:
+	case 41:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("inline newline2");
     g_debug("  return");
@@ -3473,7 +3403,7 @@ f10:
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }
 	break;
-	case 44:
+	case 42:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("inline newline");
 
@@ -3486,7 +3416,7 @@ f10:
     }
   }
 	break;
-	case 46:
+	case 44:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("inline char: %c", (*( sm->p)));
     append_c_html_escaped(sm, (*( sm->p)));
@@ -3496,7 +3426,7 @@ f10:
 	}
 	goto _again;
 f43:
-#line 652 "ext/dtext/dtext.rl"
+#line 642 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_CODE)) {
       dstack_rewind(sm);
@@ -3506,80 +3436,84 @@ f43:
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }}
 	goto _again;
-f105:
-#line 661 "ext/dtext/dtext.rl"
+f103:
+#line 651 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     ( sm->p)--;
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }}
 	goto _again;
-f104:
-#line 666 "ext/dtext/dtext.rl"
+f102:
+#line 656 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
-f106:
-#line 666 "ext/dtext/dtext.rl"
+f104:
+#line 656 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
 f42:
-#line 666 "ext/dtext/dtext.rl"
+#line 656 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}{
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
 f45:
-#line 672 "ext/dtext/dtext.rl"
+#line 662 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
-    if (dstack_check(sm, BLOCK_NODTEXT)) {
+    if (dstack_check2(sm, BLOCK_NODTEXT)) {
+      g_debug("block dstack check");
+      dstack_pop(sm);
       dstack_pop(sm);
       append_block(sm, "</p>");
       { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
     } else if (dstack_check(sm, INLINE_NODTEXT)) {
+      g_debug("inline dstack check");
       dstack_pop(sm);
       { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
     } else {
+      g_debug("else dstack check");
       append(sm, true, "[/nodtext]");
     }
   }}
 	goto _again;
-f108:
-#line 685 "ext/dtext/dtext.rl"
+f106:
+#line 679 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     ( sm->p)--;
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }}
 	goto _again;
-f107:
-#line 690 "ext/dtext/dtext.rl"
+f105:
+#line 684 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
-f109:
-#line 690 "ext/dtext/dtext.rl"
+f107:
+#line 684 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
 f44:
-#line 690 "ext/dtext/dtext.rl"
+#line 684 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}{
     append_c_html_escaped(sm, (*( sm->p)));
   }}
 	goto _again;
 f54:
-#line 696 "ext/dtext/dtext.rl"
+#line 690 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_push(sm, &BLOCK_THEAD);
     append_block(sm, "<thead>");
   }}
 	goto _again;
 f49:
-#line 701 "ext/dtext/dtext.rl"
+#line 695 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_THEAD)) {
       dstack_pop(sm);
@@ -3590,14 +3524,14 @@ f49:
   }}
 	goto _again;
 f51:
-#line 710 "ext/dtext/dtext.rl"
+#line 704 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_push(sm, &BLOCK_TBODY);
     append_block(sm, "<tbody>");
   }}
 	goto _again;
 f48:
-#line 715 "ext/dtext/dtext.rl"
+#line 709 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_TBODY)) {
       dstack_pop(sm);
@@ -3608,7 +3542,7 @@ f48:
   }}
 	goto _again;
 f53:
-#line 724 "ext/dtext/dtext.rl"
+#line 718 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_push(sm, &BLOCK_TH);
     append_block(sm, "<th>");
@@ -3623,18 +3557,18 @@ f53:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f55:
-#line 730 "ext/dtext/dtext.rl"
+#line 724 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_push(sm, &BLOCK_TR);
     append_block(sm, "<tr>");
   }}
 	goto _again;
 f50:
-#line 735 "ext/dtext/dtext.rl"
+#line 729 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_TR)) {
       dstack_pop(sm);
@@ -3645,7 +3579,7 @@ f50:
   }}
 	goto _again;
 f52:
-#line 744 "ext/dtext/dtext.rl"
+#line 738 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_push(sm, &BLOCK_TD);
     append_block(sm, "<td>");
@@ -3660,11 +3594,11 @@ f52:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f47:
-#line 750 "ext/dtext/dtext.rl"
+#line 744 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     if (dstack_check(sm, BLOCK_TABLE)) {
       dstack_pop(sm);
@@ -3675,43 +3609,43 @@ f47:
     }
   }}
 	goto _again;
-f111:
-#line 760 "ext/dtext/dtext.rl"
+f109:
+#line 754 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     ( sm->p)--;
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }}
 	goto _again;
-f110:
-#line 765 "ext/dtext/dtext.rl"
+f108:
+#line 759 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;}
 	goto _again;
-f112:
-#line 765 "ext/dtext/dtext.rl"
+f110:
+#line 759 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;}
 	goto _again;
 f46:
-#line 765 "ext/dtext/dtext.rl"
+#line 759 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}}
 	goto _again;
-f114:
-#line 808 "ext/dtext/dtext.rl"
+f112:
+#line 802 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_close_list(sm);
     {( sm->p) = (( sm->ts))-1;}
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }}
 	goto _again;
-f113:
-#line 816 "ext/dtext/dtext.rl"
+f111:
+#line 810 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_rewind(sm);
     ( sm->p)--;
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }}
 	goto _again;
-f116:
-#line 816 "ext/dtext/dtext.rl"
+f114:
+#line 810 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     dstack_rewind(sm);
     ( sm->p)--;
@@ -3719,7 +3653,7 @@ f116:
   }}
 	goto _again;
 f58:
-#line 816 "ext/dtext/dtext.rl"
+#line 810 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}{
     dstack_rewind(sm);
     ( sm->p)--;
@@ -3729,7 +3663,7 @@ f58:
 f56:
 #line 1 "NONE"
 	{	switch( ( sm->act) ) {
-	case 65:
+	case 63:
 	{{( sm->p) = ((( sm->te)))-1;}
     dstack_close_list(sm);
     {( sm->p) = (( sm->ts))-1;}
@@ -3743,7 +3677,7 @@ f56:
 	}
 	goto _again;
 f6:
-#line 948 "ext/dtext/dtext.rl"
+#line 942 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("block [/spoiler]");
     dstack_close_before_block(sm);
@@ -3754,7 +3688,7 @@ f6:
   }}
 	goto _again;
 f8:
-#line 995 "ext/dtext/dtext.rl"
+#line 991 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_close_before_block(sm);
     dstack_push(sm, &BLOCK_TABLE);
@@ -3770,11 +3704,11 @@ f8:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 323; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 317; goto _again;}}
   }}
 	goto _again;
 f9:
-#line 1002 "ext/dtext/dtext.rl"
+#line 998 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     dstack_push(sm, &BLOCK_TN);
     append_block(sm, "<p class=\"tn\">");
@@ -3789,11 +3723,11 @@ f9:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f62:
-#line 1018 "ext/dtext/dtext.rl"
+#line 1014 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("block 0");
     g_debug("  close dstack");
@@ -3801,7 +3735,7 @@ f62:
   }}
 	goto _again;
 f61:
-#line 1041 "ext/dtext/dtext.rl"
+#line 1037 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p)+1;{
     g_debug("block char: %c", (*( sm->p)));
     ( sm->p)--;
@@ -3824,11 +3758,11 @@ f61:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f67:
-#line 824 "ext/dtext/dtext.rl"
+#line 818 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     char header = *sm->a1;
     GString * id_name = g_string_new_len(sm->b1, sm->b2 - sm->b1);
@@ -3898,11 +3832,11 @@ f67:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f68:
-#line 885 "ext/dtext/dtext.rl"
+#line 879 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     char header = *sm->a1;
 
@@ -3956,11 +3890,11 @@ f68:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f73:
-#line 930 "ext/dtext/dtext.rl"
+#line 924 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block [quote]");
     g_debug("  push quote");
@@ -3971,7 +3905,7 @@ f73:
   }}
 	goto _again;
 f74:
-#line 939 "ext/dtext/dtext.rl"
+#line 933 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block [spoiler]");
     g_debug("  push spoiler");
@@ -3982,7 +3916,7 @@ f74:
   }}
 	goto _again;
 f69:
-#line 957 "ext/dtext/dtext.rl"
+#line 951 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block [code]");
     dstack_close_before_block(sm);
@@ -3999,11 +3933,11 @@ f69:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 319; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 313; goto _again;}}
   }}
 	goto _again;
 f71:
-#line 965 "ext/dtext/dtext.rl"
+#line 959 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block [expand]");
     dstack_close_before_block(sm);
@@ -4014,7 +3948,7 @@ f71:
   }}
 	goto _again;
 f70:
-#line 974 "ext/dtext/dtext.rl"
+#line 968 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block [expand=]");
     dstack_close_before_block(sm);
@@ -4028,12 +3962,14 @@ f70:
   }}
 	goto _again;
 f72:
-#line 986 "ext/dtext/dtext.rl"
+#line 980 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block [nodtext]");
     dstack_close_before_block(sm);
     dstack_push(sm, &BLOCK_NODTEXT);
     dstack_push(sm, &BLOCK_P);
+    g_debug("push block nodtext");
+    g_debug("push block p");
     append_block(sm, "<p>");
     {
   size_t len = sm->stack->len;
@@ -4046,11 +3982,11 @@ f72:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 321; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 315; goto _again;}}
   }}
 	goto _again;
 f65:
-#line 1041 "ext/dtext/dtext.rl"
+#line 1037 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block char: %c", (*( sm->p)));
     ( sm->p)--;
@@ -4073,11 +4009,11 @@ f65:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f2:
-#line 1041 "ext/dtext/dtext.rl"
+#line 1037 "ext/dtext/dtext.rl"
 	{{( sm->p) = ((( sm->te)))-1;}{
     g_debug("block char: %c", (*( sm->p)));
     ( sm->p)--;
@@ -4100,13 +4036,13 @@ f2:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f0:
 #line 1 "NONE"
 	{	switch( ( sm->act) ) {
-	case 81:
+	case 79:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("block newline2");
 
@@ -4120,7 +4056,7 @@ f0:
     }
   }
 	break;
-	case 82:
+	case 80:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("block newline");
   }
@@ -4128,7 +4064,7 @@ f0:
 	}
 	}
 	goto _again;
-f98:
+f96:
 #line 102 "ext/dtext/dtext.rl"
 	{
   sm->a2 = sm->p;
@@ -4158,7 +4094,7 @@ f91:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f99:
+f97:
 #line 102 "ext/dtext/dtext.rl"
 	{
   sm->a2 = sm->p;
@@ -4188,7 +4124,7 @@ f90:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f97:
+f95:
 #line 102 "ext/dtext/dtext.rl"
 	{
   sm->a2 = sm->p;
@@ -4203,7 +4139,7 @@ f97:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f101:
+f99:
 #line 102 "ext/dtext/dtext.rl"
 	{
   sm->a2 = sm->p;
@@ -4233,7 +4169,7 @@ f89:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f94:
+f92:
 #line 102 "ext/dtext/dtext.rl"
 	{
   sm->a2 = sm->p;
@@ -4248,7 +4184,7 @@ f94:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f95:
+f93:
 #line 102 "ext/dtext/dtext.rl"
 	{
   sm->a2 = sm->p;
@@ -4383,7 +4319,7 @@ f86:
     }
   }
 	break;
-	case 43:
+	case 41:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("inline newline2");
     g_debug("  return");
@@ -4396,7 +4332,7 @@ f86:
     { sm->cs = ( ((int *)sm->stack->data))[--( sm->top)];goto _again;}
   }
 	break;
-	case 44:
+	case 42:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("inline newline");
 
@@ -4409,7 +4345,7 @@ f86:
     }
   }
 	break;
-	case 46:
+	case 44:
 	{{( sm->p) = ((( sm->te)))-1;}
     g_debug("inline char: %c", (*( sm->p)));
     append_c_html_escaped(sm, (*( sm->p)));
@@ -4432,7 +4368,7 @@ f15:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f100:
+f98:
 #line 110 "ext/dtext/dtext.rl"
 	{
   sm->b2 = sm->p;
@@ -4451,7 +4387,7 @@ f100:
     append(sm, true, "</a>");
   }}
 	goto _again;
-f96:
+f94:
 #line 110 "ext/dtext/dtext.rl"
 	{
   sm->b2 = sm->p;
@@ -4521,15 +4457,15 @@ f81:
 
     g_debug("  next list");
     {( sm->p) = (( sm->ts + 1))-1;}
-     sm->cs = 325;
+     sm->cs = 319;
   }}
 	goto _again;
-f117:
+f115:
 #line 110 "ext/dtext/dtext.rl"
 	{
   sm->b2 = sm->p;
 }
-#line 769 "ext/dtext/dtext.rl"
+#line 763 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     int prev_nest = sm->list_nest;
     append_closing_p_if(sm);
@@ -4576,7 +4512,7 @@ f117:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 282; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 279; goto _again;}}
   }}
 	goto _again;
 f66:
@@ -4584,7 +4520,7 @@ f66:
 	{
   sm->b2 = sm->p;
 }
-#line 1008 "ext/dtext/dtext.rl"
+#line 1004 "ext/dtext/dtext.rl"
 	{( sm->te) = ( sm->p);( sm->p)--;{
     g_debug("block list");
     g_debug("  call list");
@@ -4603,7 +4539,7 @@ f66:
   if (sm->top >= len) {
     sm->stack = g_array_set_size(sm->stack, len + 16);
   }
-{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 325; goto _again;}}
+{( ((int *)sm->stack->data))[( sm->top)++] =  sm->cs;  sm->cs = 319; goto _again;}}
   }}
 	goto _again;
 f17:
@@ -4641,44 +4577,44 @@ f16:
 f11:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 617 "ext/dtext/dtext.rl"
-	{( sm->act) = 43;}
+#line 607 "ext/dtext/dtext.rl"
+	{( sm->act) = 41;}
 	goto _again;
 f77:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 629 "ext/dtext/dtext.rl"
-	{( sm->act) = 44;}
+#line 619 "ext/dtext/dtext.rl"
+	{( sm->act) = 42;}
 	goto _again;
 f78:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 645 "ext/dtext/dtext.rl"
-	{( sm->act) = 46;}
+#line 635 "ext/dtext/dtext.rl"
+	{( sm->act) = 44;}
 	goto _again;
 f57:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 808 "ext/dtext/dtext.rl"
-	{( sm->act) = 65;}
+#line 802 "ext/dtext/dtext.rl"
+	{( sm->act) = 63;}
 	goto _again;
-f115:
+f113:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 814 "ext/dtext/dtext.rl"
-	{( sm->act) = 66;}
+#line 808 "ext/dtext/dtext.rl"
+	{( sm->act) = 64;}
 	goto _again;
 f1:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 1024 "ext/dtext/dtext.rl"
-	{( sm->act) = 81;}
+#line 1020 "ext/dtext/dtext.rl"
+	{( sm->act) = 79;}
 	goto _again;
 f63:
 #line 1 "NONE"
 	{( sm->te) = ( sm->p)+1;}
-#line 1037 "ext/dtext/dtext.rl"
-	{( sm->act) = 82;}
+#line 1033 "ext/dtext/dtext.rl"
+	{( sm->act) = 80;}
 	goto _again;
 f85:
 #line 1 "NONE"
@@ -4697,7 +4633,7 @@ _again:
 #line 1 "NONE"
 	{( sm->ts) = 0;}
 	break;
-#line 4701 "ext/dtext/dtext.c"
+#line 4637 "ext/dtext/dtext.c"
 	}
 
 	if ( ++( sm->p) != ( sm->pe) )
@@ -4706,21 +4642,21 @@ _again:
 	if ( ( sm->p) == ( sm->eof) )
 	{
 	switch (  sm->cs ) {
-	case 267: goto tr0;
+	case 264: goto tr0;
 	case 0: goto tr0;
-	case 268: goto tr326;
-	case 269: goto tr326;
+	case 265: goto tr321;
+	case 266: goto tr321;
 	case 1: goto tr2;
-	case 270: goto tr327;
-	case 271: goto tr327;
+	case 267: goto tr322;
+	case 268: goto tr322;
 	case 2: goto tr2;
-	case 272: goto tr326;
+	case 269: goto tr321;
 	case 3: goto tr2;
 	case 4: goto tr2;
 	case 5: goto tr2;
-	case 273: goto tr330;
-	case 274: goto tr332;
-	case 275: goto tr326;
+	case 270: goto tr325;
+	case 271: goto tr327;
+	case 272: goto tr321;
 	case 6: goto tr2;
 	case 7: goto tr2;
 	case 8: goto tr2;
@@ -4734,7 +4670,7 @@ _again:
 	case 16: goto tr2;
 	case 17: goto tr2;
 	case 18: goto tr2;
-	case 276: goto tr341;
+	case 273: goto tr336;
 	case 19: goto tr2;
 	case 20: goto tr2;
 	case 21: goto tr2;
@@ -4743,8 +4679,8 @@ _again:
 	case 24: goto tr2;
 	case 25: goto tr2;
 	case 26: goto tr2;
-	case 277: goto tr342;
-	case 278: goto tr344;
+	case 274: goto tr337;
+	case 275: goto tr339;
 	case 27: goto tr2;
 	case 28: goto tr2;
 	case 29: goto tr2;
@@ -4752,13 +4688,13 @@ _again:
 	case 31: goto tr2;
 	case 32: goto tr2;
 	case 33: goto tr2;
-	case 279: goto tr345;
+	case 276: goto tr340;
 	case 34: goto tr2;
 	case 35: goto tr2;
 	case 36: goto tr2;
 	case 37: goto tr2;
 	case 38: goto tr2;
-	case 280: goto tr346;
+	case 277: goto tr341;
 	case 39: goto tr2;
 	case 40: goto tr2;
 	case 41: goto tr2;
@@ -4767,28 +4703,28 @@ _again:
 	case 44: goto tr2;
 	case 45: goto tr2;
 	case 46: goto tr2;
-	case 281: goto tr347;
+	case 278: goto tr342;
 	case 47: goto tr2;
 	case 48: goto tr2;
 	case 49: goto tr2;
 	case 50: goto tr2;
 	case 51: goto tr2;
 	case 52: goto tr2;
-	case 283: goto tr365;
-	case 284: goto tr368;
+	case 280: goto tr359;
+	case 281: goto tr362;
 	case 53: goto tr62;
 	case 54: goto tr64;
 	case 55: goto tr64;
-	case 285: goto tr369;
-	case 286: goto tr369;
-	case 287: goto tr371;
-	case 288: goto tr372;
+	case 282: goto tr363;
+	case 283: goto tr363;
+	case 284: goto tr365;
+	case 285: goto tr366;
 	case 56: goto tr69;
 	case 57: goto tr69;
 	case 58: goto tr69;
 	case 59: goto tr69;
 	case 60: goto tr62;
-	case 289: goto tr374;
+	case 286: goto tr368;
 	case 61: goto tr62;
 	case 62: goto tr62;
 	case 63: goto tr69;
@@ -4811,13 +4747,13 @@ _again:
 	case 80: goto tr69;
 	case 81: goto tr69;
 	case 82: goto tr69;
-	case 290: goto tr372;
+	case 287: goto tr366;
 	case 83: goto tr62;
-	case 291: goto tr379;
+	case 288: goto tr373;
 	case 84: goto tr62;
 	case 85: goto tr62;
-	case 292: goto tr381;
-	case 293: goto tr372;
+	case 289: goto tr375;
+	case 290: goto tr366;
 	case 86: goto tr69;
 	case 87: goto tr69;
 	case 88: goto tr69;
@@ -4825,8 +4761,8 @@ _again:
 	case 90: goto tr69;
 	case 91: goto tr69;
 	case 92: goto tr69;
-	case 294: goto tr384;
-	case 295: goto tr372;
+	case 291: goto tr378;
+	case 292: goto tr366;
 	case 93: goto tr69;
 	case 94: goto tr69;
 	case 95: goto tr69;
@@ -4835,70 +4771,67 @@ _again:
 	case 98: goto tr69;
 	case 99: goto tr69;
 	case 100: goto tr69;
-	case 296: goto tr387;
-	case 297: goto tr372;
+	case 293: goto tr381;
+	case 294: goto tr366;
 	case 101: goto tr69;
 	case 102: goto tr69;
 	case 103: goto tr69;
 	case 104: goto tr69;
 	case 105: goto tr69;
 	case 106: goto tr69;
-	case 298: goto tr390;
-	case 299: goto tr372;
+	case 295: goto tr384;
+	case 296: goto tr366;
 	case 107: goto tr69;
 	case 108: goto tr69;
 	case 109: goto tr69;
-	case 300: goto tr393;
-	case 301: goto tr395;
-	case 302: goto tr372;
 	case 110: goto tr69;
 	case 111: goto tr69;
 	case 112: goto tr69;
+	case 297: goto tr387;
+	case 298: goto tr366;
 	case 113: goto tr69;
 	case 114: goto tr69;
 	case 115: goto tr69;
-	case 303: goto tr398;
-	case 304: goto tr372;
 	case 116: goto tr69;
 	case 117: goto tr69;
 	case 118: goto tr69;
-	case 119: goto tr69;
-	case 120: goto tr69;
+	case 299: goto tr391;
+	case 119: goto tr137;
+	case 120: goto tr137;
+	case 300: goto tr394;
 	case 121: goto tr69;
-	case 305: goto tr402;
-	case 122: goto tr142;
-	case 123: goto tr142;
-	case 306: goto tr405;
+	case 122: goto tr69;
+	case 123: goto tr69;
 	case 124: goto tr69;
 	case 125: goto tr69;
+	case 301: goto tr396;
 	case 126: goto tr69;
 	case 127: goto tr69;
 	case 128: goto tr69;
-	case 307: goto tr407;
 	case 129: goto tr69;
+	case 302: goto tr398;
+	case 303: goto tr366;
 	case 130: goto tr69;
 	case 131: goto tr69;
 	case 132: goto tr69;
-	case 308: goto tr409;
-	case 309: goto tr372;
 	case 133: goto tr69;
 	case 134: goto tr69;
 	case 135: goto tr69;
-	case 136: goto tr69;
-	case 137: goto tr69;
+	case 304: goto tr401;
+	case 136: goto tr156;
+	case 137: goto tr156;
+	case 305: goto tr404;
+	case 306: goto tr366;
 	case 138: goto tr69;
-	case 310: goto tr412;
-	case 139: goto tr161;
-	case 140: goto tr161;
-	case 311: goto tr415;
-	case 312: goto tr372;
+	case 139: goto tr69;
+	case 140: goto tr69;
 	case 141: goto tr69;
 	case 142: goto tr69;
+	case 307: goto tr407;
+	case 308: goto tr366;
 	case 143: goto tr69;
 	case 144: goto tr69;
 	case 145: goto tr69;
-	case 313: goto tr418;
-	case 314: goto tr372;
 	case 146: goto tr69;
 	case 147: goto tr69;
 	case 148: goto tr69;
@@ -4910,10 +4843,10 @@ _again:
 	case 154: goto tr69;
 	case 155: goto tr69;
 	case 156: goto tr69;
+	case 309: goto tr419;
 	case 157: goto tr69;
 	case 158: goto tr69;
 	case 159: goto tr69;
-	case 315: goto tr430;
 	case 160: goto tr69;
 	case 161: goto tr69;
 	case 162: goto tr69;
@@ -4962,81 +4895,78 @@ _again:
 	case 205: goto tr69;
 	case 206: goto tr69;
 	case 207: goto tr69;
+	case 310: goto tr366;
 	case 208: goto tr69;
 	case 209: goto tr69;
 	case 210: goto tr69;
-	case 316: goto tr372;
 	case 211: goto tr69;
 	case 212: goto tr69;
 	case 213: goto tr69;
-	case 214: goto tr69;
-	case 215: goto tr69;
-	case 216: goto tr69;
-	case 217: goto tr62;
-	case 317: goto tr432;
-	case 218: goto tr62;
-	case 219: goto tr62;
+	case 214: goto tr62;
+	case 311: goto tr421;
+	case 215: goto tr62;
+	case 216: goto tr62;
+	case 217: goto tr69;
+	case 312: goto tr366;
+	case 218: goto tr69;
+	case 219: goto tr69;
 	case 220: goto tr69;
-	case 318: goto tr372;
-	case 221: goto tr69;
-	case 222: goto tr69;
-	case 223: goto tr69;
-	case 320: goto tr437;
-	case 224: goto tr262;
-	case 225: goto tr262;
-	case 226: goto tr262;
-	case 227: goto tr262;
-	case 228: goto tr262;
-	case 322: goto tr442;
-	case 229: goto tr268;
-	case 230: goto tr268;
-	case 231: goto tr268;
-	case 232: goto tr268;
-	case 233: goto tr268;
-	case 234: goto tr268;
-	case 235: goto tr268;
-	case 236: goto tr268;
-	case 324: goto tr447;
-	case 237: goto tr277;
-	case 238: goto tr277;
-	case 239: goto tr277;
-	case 240: goto tr277;
-	case 241: goto tr277;
-	case 242: goto tr277;
-	case 243: goto tr277;
-	case 244: goto tr277;
-	case 245: goto tr277;
-	case 246: goto tr277;
-	case 247: goto tr277;
-	case 248: goto tr277;
-	case 249: goto tr277;
-	case 250: goto tr277;
-	case 251: goto tr277;
-	case 252: goto tr277;
-	case 253: goto tr277;
-	case 254: goto tr277;
-	case 255: goto tr277;
-	case 256: goto tr277;
-	case 257: goto tr277;
-	case 258: goto tr277;
-	case 259: goto tr277;
-	case 260: goto tr277;
-	case 261: goto tr277;
-	case 262: goto tr277;
-	case 326: goto tr311;
-	case 263: goto tr311;
-	case 327: goto tr456;
-	case 328: goto tr456;
-	case 264: goto tr313;
-	case 329: goto tr457;
-	case 330: goto tr457;
-	case 265: goto tr313;
-	}
-	}
-
-	}
-
-#line 1389 "ext/dtext/dtext.rl"
+	case 314: goto tr426;
+	case 221: goto tr257;
+	case 222: goto tr257;
+	case 223: goto tr257;
+	case 224: goto tr257;
+	case 225: goto tr257;
+	case 316: goto tr431;
+	case 226: goto tr263;
+	case 227: goto tr263;
+	case 228: goto tr263;
+	case 229: goto tr263;
+	case 230: goto tr263;
+	case 231: goto tr263;
+	case 232: goto tr263;
+	case 233: goto tr263;
+	case 318: goto tr436;
+	case 234: goto tr272;
+	case 235: goto tr272;
+	case 236: goto tr272;
+	case 237: goto tr272;
+	case 238: goto tr272;
+	case 239: goto tr272;
+	case 240: goto tr272;
+	case 241: goto tr272;
+	case 242: goto tr272;
+	case 243: goto tr272;
+	case 244: goto tr272;
+	case 245: goto tr272;
+	case 246: goto tr272;
+	case 247: goto tr272;
+	case 248: goto tr272;
+	case 249: goto tr272;
+	case 250: goto tr272;
+	case 251: goto tr272;
+	case 252: goto tr272;
+	case 253: goto tr272;
+	case 254: goto tr272;
+	case 255: goto tr272;
+	case 256: goto tr272;
+	case 257: goto tr272;
+	case 258: goto tr272;
+	case 259: goto tr272;
+	case 320: goto tr306;
+	case 260: goto tr306;
+	case 321: goto tr445;
+	case 322: goto tr445;
+	case 261: goto tr308;
+	case 323: goto tr446;
+	case 324: goto tr446;
+	case 262: goto tr308;
+	}
+	}
+
+	}
+
+#line 1385 "ext/dtext/dtext.rl"
 
   dstack_close(sm);