diff --git a/lyx/lexer.go b/lyx/lexer.go
index aa71f5a..4831f9a 100644
--- a/lyx/lexer.go
+++ b/lyx/lexer.go
@@ -1066,7 +1066,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st_out
 	tr2:
-//line lyx/lexer.rl:298
+//line lyx/lexer.rl:299
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts+1 : lex.te-1])
@@ -1079,7 +1079,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr5:
-//line lyx/lexer.rl:300
+//line lyx/lexer.rl:301
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts+1 : lex.te-1])
@@ -1092,7 +1092,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr6:
-//line lyx/lexer.rl:314
+//line lyx/lexer.rl:315
 		(lex.p) = (lex.te) - 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2559,7 +2559,18 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 160:
+		case 159:
+			{
+				(lex.p) = (lex.te) - 1
+				lval.str = string(lex.data[lex.ts:lex.te])
+				tok = ALL
+				{
+					(lex.p)++
+					lex.cs = 9
+					goto _out
+				}
+			}
+		case 161:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2570,7 +2581,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 167:
+		case 168:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2581,7 +2592,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 170:
+		case 171:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2592,7 +2603,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 172:
+		case 173:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2603,7 +2614,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 173:
+		case 174:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2614,7 +2625,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 174:
+		case 175:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2625,7 +2636,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 177:
+		case 178:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2636,7 +2647,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 178:
+		case 179:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2647,7 +2658,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 179:
+		case 180:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2658,7 +2669,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 180:
+		case 181:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2669,7 +2680,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 181:
+		case 182:
 			{
 				(lex.p) = (lex.te) - 1
 				lval.str = string(lex.data[lex.ts:lex.te])
@@ -2680,7 +2691,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 					goto _out
 				}
 			}
-		case 182:
+		case 183:
 			{
 				(lex.p) = (lex.te) - 1
 
@@ -2696,7 +2707,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 
 		goto st9
 	tr18:
-//line lyx/lexer.rl:306
+//line lyx/lexer.rl:307
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2709,7 +2720,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr19:
-//line lyx/lexer.rl:307
+//line lyx/lexer.rl:308
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2722,7 +2733,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr22:
-//line lyx/lexer.rl:305
+//line lyx/lexer.rl:306
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2735,7 +2746,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr29:
-//line lyx/lexer.rl:311
+//line lyx/lexer.rl:312
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2748,7 +2759,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr59:
-//line lyx/lexer.rl:308
+//line lyx/lexer.rl:309
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2761,7 +2772,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr60:
-//line lyx/lexer.rl:309
+//line lyx/lexer.rl:310
 		lex.te = (lex.p) + 1
 		{
 			lval.str = string(lex.data[lex.ts:lex.te])
@@ -2781,7 +2792,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr63:
-//line lyx/lexer.rl:329
+//line lyx/lexer.rl:330
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2810,7 +2821,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr66:
-//line lyx/lexer.rl:314
+//line lyx/lexer.rl:315
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2859,7 +2870,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr74:
-//line lyx/lexer.rl:312
+//line lyx/lexer.rl:313
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2886,7 +2897,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr76:
-//line lyx/lexer.rl:319
+//line lyx/lexer.rl:320
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2900,7 +2911,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr79:
-//line lyx/lexer.rl:320
+//line lyx/lexer.rl:321
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2914,7 +2925,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 		goto st9
 	tr81:
-//line lyx/lexer.rl:299
+//line lyx/lexer.rl:300
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2927,7 +2938,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr102:
+	tr103:
 //line lyx/lexer.rl:173
 		lex.te = (lex.p)
 		(lex.p)--
@@ -2941,7 +2952,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr155:
+	tr156:
 //line lyx/lexer.rl:134
 		lex.te = (lex.p)
 		(lex.p)--
@@ -2955,7 +2966,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr161:
+	tr162:
 //line lyx/lexer.rl:133
 		lex.te = (lex.p)
 		(lex.p)--
@@ -2969,7 +2980,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr179:
+	tr180:
 //line lyx/lexer.rl:284
 		lex.te = (lex.p)
 		(lex.p)--
@@ -2983,7 +2994,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr225:
+	tr226:
 //line lyx/lexer.rl:118
 		lex.te = (lex.p)
 		(lex.p)--
@@ -2997,7 +3008,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr250:
+	tr251:
 //line lyx/lexer.rl:253
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3011,7 +3022,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr261:
+	tr262:
 //line lyx/lexer.rl:292
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3025,7 +3036,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr316:
+	tr317:
 //line lyx/lexer.rl:229
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3039,7 +3050,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr345:
+	tr346:
 //line lyx/lexer.rl:228
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3053,7 +3064,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr357:
+	tr358:
 //line lyx/lexer.rl:110
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3067,7 +3078,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr371:
+	tr372:
 //line lyx/lexer.rl:189
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3081,7 +3092,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr434:
+	tr435:
 //line lyx/lexer.rl:193
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3095,7 +3106,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr442:
+	tr443:
 //line lyx/lexer.rl:191
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3109,7 +3120,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr451:
+	tr452:
 //line lyx/lexer.rl:227
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3123,7 +3134,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr454:
+	tr455:
 //line lyx/lexer.rl:175
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3137,7 +3148,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr568:
+	tr569:
 //line lyx/lexer.rl:165
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3151,7 +3162,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			}
 		}
 		goto st9
-	tr662:
+	tr663:
 //line lyx/lexer.rl:197
 		lex.te = (lex.p)
 		(lex.p)--
@@ -3179,7 +3190,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 //line NONE:1
 		lex.ts = (lex.p)
 
-//line lyx/lexer.go:1756
+//line lyx/lexer.go:1759
 		switch lex.data[(lex.p)] {
 		case 32:
 			goto st10
@@ -3419,78 +3430,78 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:329
-		lex.act = 182
+//line lyx/lexer.rl:330
+		lex.act = 183
 		goto st12
 	tr17:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:317
-		lex.act = 173
+//line lyx/lexer.rl:318
+		lex.act = 174
 		goto st12
 	tr20:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:315
-		lex.act = 172
+//line lyx/lexer.rl:316
+		lex.act = 173
 		goto st12
 	tr21:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:313
-		lex.act = 170
+//line lyx/lexer.rl:314
+		lex.act = 171
 		goto st12
 	tr31:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:321
-		lex.act = 177
+//line lyx/lexer.rl:322
+		lex.act = 178
 		goto st12
 	tr61:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:318
-		lex.act = 174
+//line lyx/lexer.rl:319
+		lex.act = 175
 		goto st12
 	tr64:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:326
-		lex.act = 181
+//line lyx/lexer.rl:327
+		lex.act = 182
 		goto st12
 	tr77:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:324
-		lex.act = 179
+//line lyx/lexer.rl:325
+		lex.act = 180
 		goto st12
 	tr78:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:323
-		lex.act = 178
+//line lyx/lexer.rl:324
+		lex.act = 179
 		goto st12
 	tr80:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:325
-		lex.act = 180
+//line lyx/lexer.rl:326
+		lex.act = 181
 		goto st12
 	st12:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof12
 		}
 	st_case_12:
-//line lyx/lexer.go:2067
+//line lyx/lexer.go:2070
 		switch lex.data[(lex.p)] {
 		case 33:
 			goto tr15
@@ -3609,7 +3620,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			goto _test_eof14
 		}
 	st_case_14:
-//line lyx/lexer.go:2186
+//line lyx/lexer.go:2189
 		switch lex.data[(lex.p)] {
 		case 33:
 			goto tr15
@@ -3720,15 +3731,15 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:310
-		lex.act = 167
+//line lyx/lexer.rl:311
+		lex.act = 168
 		goto st17
 	st17:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof17
 		}
 	st_case_17:
-//line lyx/lexer.go:2305
+//line lyx/lexer.go:2308
 		if 48 <= lex.data[(lex.p)] && lex.data[(lex.p)] <= 57 {
 			goto tr7
 		}
@@ -3787,7 +3798,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			goto _test_eof19
 		}
 	st_case_19:
-//line lyx/lexer.go:2364
+//line lyx/lexer.go:2367
 		if lex.data[(lex.p)] == 42 {
 			goto st8
 		}
@@ -3822,8 +3833,8 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 //line NONE:1
 		lex.te = (lex.p) + 1
 
-//line lyx/lexer.rl:299
-		lex.act = 160
+//line lyx/lexer.rl:300
+		lex.act = 161
 		goto st21
 	tr89:
 //line NONE:1
@@ -3832,903 +3843,910 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 //line lyx/lexer.rl:281
 		lex.act = 146
 		goto st21
-	tr92:
+	tr90:
+//line NONE:1
+		lex.te = (lex.p) + 1
+
+//line lyx/lexer.rl:297
+		lex.act = 159
+		goto st21
+	tr93:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:247
 		lex.act = 118
 		goto st21
-	tr94:
+	tr95:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:174
 		lex.act = 64
 		goto st21
-	tr98:
+	tr99:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:245
 		lex.act = 117
 		goto st21
-	tr101:
+	tr102:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:214
 		lex.act = 94
 		goto st21
-	tr103:
+	tr104:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:203
 		lex.act = 87
 		goto st21
-	tr111:
+	tr112:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:262
 		lex.act = 130
 		goto st21
-	tr116:
+	tr117:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:171
 		lex.act = 61
 		goto st21
-	tr120:
+	tr121:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:267
 		lex.act = 133
 		goto st21
-	tr124:
+	tr125:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:263
 		lex.act = 131
 		goto st21
-	tr127:
+	tr128:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:121
 		lex.act = 20
 		goto st21
-	tr130:
+	tr131:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:113
 		lex.act = 12
 		goto st21
-	tr133:
+	tr134:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:251
 		lex.act = 120
 		goto st21
-	tr138:
+	tr139:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:120
 		lex.act = 19
 		goto st21
-	tr143:
+	tr144:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:238
 		lex.act = 112
 		goto st21
-	tr152:
+	tr153:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:286
 		lex.act = 150
 		goto st21
-	tr167:
+	tr168:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:206
 		lex.act = 89
 		goto st21
-	tr172:
+	tr173:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:244
 		lex.act = 116
 		goto st21
-	tr182:
+	tr183:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:211
 		lex.act = 93
 		goto st21
-	tr187:
+	tr188:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:291
 		lex.act = 154
 		goto st21
-	tr188:
+	tr189:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:182
 		lex.act = 69
 		goto st21
-	tr193:
+	tr194:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:156
 		lex.act = 46
 		goto st21
-	tr195:
+	tr196:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:221
 		lex.act = 98
 		goto st21
-	tr196:
+	tr197:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:254
 		lex.act = 123
 		goto st21
-	tr199:
+	tr200:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:237
 		lex.act = 111
 		goto st21
-	tr206:
+	tr207:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:127
 		lex.act = 24
 		goto st21
-	tr211:
+	tr212:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:159
 		lex.act = 49
 		goto st21
-	tr224:
+	tr225:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:147
 		lex.act = 38
 		goto st21
-	tr229:
+	tr230:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:117
 		lex.act = 16
 		goto st21
-	tr234:
+	tr235:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:180
 		lex.act = 68
 		goto st21
-	tr240:
+	tr241:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:272
 		lex.act = 138
 		goto st21
-	tr244:
+	tr245:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:155
 		lex.act = 45
 		goto st21
-	tr251:
+	tr252:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:252
 		lex.act = 121
 		goto st21
-	tr253:
+	tr254:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:239
 		lex.act = 113
 		goto st21
-	tr254:
+	tr255:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:204
 		lex.act = 88
 		goto st21
-	tr260:
+	tr261:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:187
 		lex.act = 73
 		goto st21
-	tr265:
+	tr266:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:116
 		lex.act = 15
 		goto st21
-	tr267:
+	tr268:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:264
 		lex.act = 132
 		goto st21
-	tr272:
+	tr273:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:282
 		lex.act = 147
 		goto st21
-	tr277:
+	tr278:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:258
 		lex.act = 127
 		goto st21
-	tr281:
+	tr282:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:257
 		lex.act = 126
 		goto st21
-	tr288:
+	tr289:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:295
 		lex.act = 157
 		goto st21
-	tr292:
+	tr293:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:148
 		lex.act = 39
 		goto st21
-	tr295:
+	tr296:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:217
 		lex.act = 96
 		goto st21
-	tr299:
+	tr300:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:177
 		lex.act = 66
 		goto st21
-	tr308:
+	tr309:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:199
 		lex.act = 84
 		goto st21
-	tr311:
+	tr312:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:201
 		lex.act = 85
 		goto st21
-	tr314:
+	tr315:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:115
 		lex.act = 14
 		goto st21
-	tr320:
+	tr321:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:162
 		lex.act = 52
 		goto st21
-	tr322:
+	tr323:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:167
 		lex.act = 57
 		goto st21
-	tr324:
+	tr325:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:224
 		lex.act = 101
 		goto st21
-	tr328:
+	tr329:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:170
 		lex.act = 60
 		goto st21
-	tr335:
+	tr336:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:172
 		lex.act = 62
 		goto st21
-	tr339:
+	tr340:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:255
 		lex.act = 124
 		goto st21
-	tr341:
+	tr342:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:128
 		lex.act = 25
 		goto st21
-	tr342:
+	tr343:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:144
 		lex.act = 36
 		goto st21
-	tr351:
+	tr352:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:249
 		lex.act = 119
 		goto st21
-	tr353:
+	tr354:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:226
 		lex.act = 103
 		goto st21
-	tr356:
+	tr357:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:151
 		lex.act = 41
 		goto st21
-	tr359:
+	tr360:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:152
 		lex.act = 42
 		goto st21
-	tr363:
+	tr364:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:111
 		lex.act = 10
 		goto st21
-	tr368:
+	tr369:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:296
 		lex.act = 158
 		goto st21
-	tr370:
+	tr371:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:124
 		lex.act = 21
 		goto st21
-	tr376:
+	tr377:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:190
 		lex.act = 75
 		goto st21
-	tr382:
+	tr383:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:208
 		lex.act = 91
 		goto st21
-	tr385:
+	tr386:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:220
 		lex.act = 97
 		goto st21
-	tr387:
+	tr388:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:164
 		lex.act = 54
 		goto st21
-	tr394:
+	tr395:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:202
 		lex.act = 86
 		goto st21
-	tr398:
+	tr399:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:195
 		lex.act = 80
 		goto st21
-	tr401:
+	tr402:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:222
 		lex.act = 99
 		goto st21
-	tr403:
+	tr404:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:209
 		lex.act = 92
 		goto st21
-	tr406:
+	tr407:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:186
 		lex.act = 72
 		goto st21
-	tr410:
+	tr411:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:232
 		lex.act = 107
 		goto st21
-	tr416:
+	tr417:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:129
 		lex.act = 26
 		goto st21
-	tr419:
+	tr420:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:126
 		lex.act = 23
 		goto st21
-	tr429:
+	tr430:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:136
 		lex.act = 31
 		goto st21
-	tr432:
+	tr433:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:137
 		lex.act = 32
 		goto st21
-	tr438:
+	tr439:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:194
 		lex.act = 79
 		goto st21
-	tr443:
+	tr444:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:192
 		lex.act = 77
 		goto st21
-	tr447:
+	tr448:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:119
 		lex.act = 18
 		goto st21
-	tr453:
+	tr454:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:270
 		lex.act = 136
 		goto st21
-	tr458:
+	tr459:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:169
 		lex.act = 59
 		goto st21
-	tr464:
+	tr465:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:196
 		lex.act = 81
 		goto st21
-	tr467:
+	tr468:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:225
 		lex.act = 102
 		goto st21
-	tr475:
+	tr476:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:146
 		lex.act = 37
 		goto st21
-	tr479:
+	tr480:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:161
 		lex.act = 51
 		goto st21
-	tr483:
+	tr484:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:259
 		lex.act = 128
 		goto st21
-	tr487:
+	tr488:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:256
 		lex.act = 125
 		goto st21
-	tr496:
+	tr497:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:269
 		lex.act = 135
 		goto st21
-	tr497:
+	tr498:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:114
 		lex.act = 13
 		goto st21
-	tr503:
+	tr504:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:235
 		lex.act = 109
 		goto st21
-	tr510:
+	tr511:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:163
 		lex.act = 53
 		goto st21
-	tr517:
+	tr518:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:277
 		lex.act = 143
 		goto st21
-	tr523:
+	tr524:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:179
 		lex.act = 67
 		goto st21
-	tr526:
+	tr527:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:223
 		lex.act = 100
 		goto st21
-	tr528:
+	tr529:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:216
 		lex.act = 95
 		goto st21
-	tr529:
+	tr530:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:160
 		lex.act = 50
 		goto st21
-	tr534:
+	tr535:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:283
 		lex.act = 148
 		goto st21
-	tr548:
+	tr549:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:236
 		lex.act = 110
 		goto st21
-	tr551:
+	tr552:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:130
 		lex.act = 27
 		goto st21
-	tr554:
+	tr555:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:150
 		lex.act = 40
 		goto st21
-	tr563:
+	tr564:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:278
 		lex.act = 144
 		goto st21
-	tr567:
+	tr568:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:207
 		lex.act = 90
 		goto st21
-	tr570:
+	tr571:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:109
 		lex.act = 8
 		goto st21
-	tr574:
+	tr575:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:241
 		lex.act = 114
 		goto st21
-	tr575:
+	tr576:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:166
 		lex.act = 56
 		goto st21
-	tr577:
+	tr578:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:233
 		lex.act = 108
 		goto st21
-	tr583:
+	tr584:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:112
 		lex.act = 11
 		goto st21
-	tr587:
+	tr588:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:280
 		lex.act = 145
 		goto st21
-	tr590:
+	tr591:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:260
 		lex.act = 129
 		goto st21
-	tr592:
+	tr593:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:184
 		lex.act = 71
 		goto st21
-	tr596:
+	tr597:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:183
 		lex.act = 70
 		goto st21
-	tr600:
+	tr601:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:158
 		lex.act = 48
 		goto st21
-	tr602:
+	tr603:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:288
 		lex.act = 152
 		goto st21
-	tr604:
+	tr605:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:141
 		lex.act = 34
 		goto st21
-	tr614:
+	tr615:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:268
 		lex.act = 134
 		goto st21
-	tr615:
+	tr616:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:198
 		lex.act = 83
 		goto st21
-	tr620:
+	tr621:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:157
 		lex.act = 47
 		goto st21
-	tr632:
+	tr633:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:275
 		lex.act = 141
 		goto st21
-	tr634:
+	tr635:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:294
 		lex.act = 156
 		goto st21
-	tr638:
+	tr639:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:154
 		lex.act = 44
 		goto st21
-	tr645:
+	tr646:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:243
 		lex.act = 115
 		goto st21
-	tr648:
+	tr649:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:153
 		lex.act = 43
 		goto st21
-	tr652:
+	tr653:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:135
 		lex.act = 30
 		goto st21
-	tr657:
+	tr658:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:287
 		lex.act = 151
 		goto st21
-	tr659:
+	tr660:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:168
 		lex.act = 58
 		goto st21
-	tr665:
+	tr666:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:140
 		lex.act = 33
 		goto st21
-	tr668:
+	tr669:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:271
 		lex.act = 137
 		goto st21
-	tr671:
+	tr672:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
 //line lyx/lexer.rl:125
 		lex.act = 22
 		goto st21
-	tr674:
+	tr675:
 //line NONE:1
 		lex.te = (lex.p) + 1
 
@@ -4740,7 +4758,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			goto _test_eof21
 		}
 	st_case_21:
-//line lyx/lexer.go:3317
+//line lyx/lexer.go:3327
 		switch lex.data[(lex.p)] {
 		case 36:
 			goto tr56
@@ -4995,10 +5013,14 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		switch lex.data[(lex.p)] {
 		case 36:
 			goto tr56
+		case 76:
+			goto tr90
 		case 84:
 			goto st31
 		case 95:
 			goto tr56
+		case 108:
+			goto tr90
 		case 116:
 			goto st31
 		}
@@ -5052,11 +5074,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr92
+			goto tr93
 		case 95:
 			goto tr56
 		case 114:
-			goto tr92
+			goto tr93
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5082,13 +5104,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 65:
 			goto st34
 		case 68:
-			goto tr94
+			goto tr95
 		case 95:
 			goto tr56
 		case 97:
 			goto st34
 		case 100:
-			goto tr94
+			goto tr95
 		}
 		switch {
 		case lex.data[(lex.p)] < 66:
@@ -5196,11 +5218,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr98
+			goto tr99
 		case 95:
 			goto tr56
 		case 101:
-			goto tr98
+			goto tr99
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5280,11 +5302,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr101
+			goto tr102
 		case 95:
 			goto tr56
 		case 121:
-			goto tr101
+			goto tr102
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5308,13 +5330,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 67:
-			goto tr103
+			goto tr104
 		case 89:
 			goto st42
 		case 95:
 			goto tr56
 		case 99:
-			goto tr103
+			goto tr104
 		case 121:
 			goto st42
 		}
@@ -5330,7 +5352,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr102
+		goto tr103
 	st42:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof42
@@ -5508,11 +5530,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 67:
-			goto tr111
+			goto tr112
 		case 95:
 			goto tr56
 		case 99:
-			goto tr111
+			goto tr112
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5544,7 +5566,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 82:
 			goto st69
 		case 89:
-			goto tr116
+			goto tr117
 		case 95:
 			goto tr56
 		case 101:
@@ -5556,7 +5578,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 114:
 			goto st69
 		case 121:
-			goto tr116
+			goto tr117
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5640,11 +5662,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr120
+			goto tr121
 		case 95:
 			goto tr56
 		case 110:
-			goto tr120
+			goto tr121
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5752,11 +5774,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr124
+			goto tr125
 		case 95:
 			goto tr56
 		case 110:
-			goto tr124
+			goto tr125
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5784,7 +5806,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 78:
 			goto st61
 		case 84:
-			goto tr127
+			goto tr128
 		case 95:
 			goto tr56
 		case 103:
@@ -5792,7 +5814,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 110:
 			goto st61
 		case 116:
-			goto tr127
+			goto tr128
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5872,11 +5894,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr130
+			goto tr131
 		case 95:
 			goto tr56
 		case 116:
-			goto tr130
+			goto tr131
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -5956,11 +5978,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr133
+			goto tr134
 		case 95:
 			goto tr56
 		case 121:
-			goto tr133
+			goto tr134
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -6096,11 +6118,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr138
+			goto tr139
 		case 95:
 			goto tr56
 		case 110:
-			goto tr138
+			goto tr139
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -6236,11 +6258,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 72:
-			goto tr143
+			goto tr144
 		case 95:
 			goto tr56
 		case 104:
-			goto tr143
+			goto tr144
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -6344,11 +6366,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr152
+			goto tr153
 		case 95:
 			goto tr56
 		case 101:
-			goto tr152
+			goto tr153
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -6446,7 +6468,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr155
+		goto tr156
 	st80:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof80
@@ -6586,7 +6608,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr161
+		goto tr162
 	st85:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof85
@@ -6708,11 +6730,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr167
+			goto tr168
 		case 95:
 			goto tr56
 		case 115:
-			goto tr167
+			goto tr168
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -6848,11 +6870,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr172
+			goto tr173
 		case 95:
 			goto tr56
 		case 114:
-			goto tr172
+			goto tr173
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7014,7 +7036,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr179
+		goto tr180
 	st100:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof100
@@ -7052,11 +7074,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 68:
-			goto tr182
+			goto tr183
 		case 95:
 			goto tr56
 		case 100:
-			goto tr182
+			goto tr183
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7192,11 +7214,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr187
+			goto tr188
 		case 95:
 			goto tr56
 		case 116:
-			goto tr187
+			goto tr188
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7220,11 +7242,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr188
+			goto tr189
 		case 95:
 			goto tr56
 		case 121:
-			goto tr188
+			goto tr189
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7336,11 +7358,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr193
+			goto tr194
 		case 95:
 			goto tr56
 		case 101:
-			goto tr193
+			goto tr194
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7392,11 +7414,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr195
+			goto tr196
 		case 95:
 			goto tr56
 		case 115:
-			goto tr195
+			goto tr196
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7420,11 +7442,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 86:
-			goto tr196
+			goto tr197
 		case 95:
 			goto tr56
 		case 118:
-			goto tr196
+			goto tr197
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7504,11 +7526,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr199
+			goto tr200
 		case 95:
 			goto tr56
 		case 101:
-			goto tr199
+			goto tr200
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7578,13 +7600,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 84:
 			goto st120
 		case 89:
-			goto tr206
+			goto tr207
 		case 95:
 			goto tr56
 		case 116:
 			goto st120
 		case 121:
-			goto tr206
+			goto tr207
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7720,11 +7742,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr211
+			goto tr212
 		case 95:
 			goto tr56
 		case 101:
-			goto tr211
+			goto tr212
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -7964,11 +7986,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr224
+			goto tr225
 		case 95:
 			goto tr56
 		case 101:
-			goto tr224
+			goto tr225
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8010,7 +8032,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr225
+		goto tr226
 	st134:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof134
@@ -8076,11 +8098,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr229
+			goto tr230
 		case 95:
 			goto tr56
 		case 108:
-			goto tr229
+			goto tr230
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8192,11 +8214,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr234
+			goto tr235
 		case 95:
 			goto tr56
 		case 116:
-			goto tr234
+			goto tr235
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8360,11 +8382,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr240
+			goto tr241
 		case 95:
 			goto tr56
 		case 101:
-			goto tr240
+			goto tr241
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8448,11 +8470,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr244
+			goto tr245
 		case 95:
 			goto tr56
 		case 101:
-			goto tr244
+			goto tr245
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8616,11 +8638,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr251
+			goto tr252
 		case 95:
 			goto tr56
 		case 115:
-			goto tr251
+			goto tr252
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8634,7 +8656,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr250
+		goto tr251
 	st156:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof156
@@ -8672,11 +8694,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 72:
-			goto tr253
+			goto tr254
 		case 95:
 			goto tr56
 		case 104:
-			goto tr253
+			goto tr254
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8700,11 +8722,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 67:
-			goto tr254
+			goto tr255
 		case 95:
 			goto tr56
 		case 99:
-			goto tr254
+			goto tr255
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8868,11 +8890,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr260
+			goto tr261
 		case 95:
 			goto tr56
 		case 116:
-			goto tr260
+			goto tr261
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -8914,7 +8936,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr261
+		goto tr262
 	st166:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof166
@@ -8980,11 +9002,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr265
+			goto tr266
 		case 95:
 			goto tr56
 		case 101:
-			goto tr265
+			goto tr266
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9036,11 +9058,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 80:
-			goto tr267
+			goto tr268
 		case 95:
 			goto tr56
 		case 112:
-			goto tr267
+			goto tr268
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9102,13 +9124,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 67:
 			goto st173
 		case 68:
-			goto tr272
+			goto tr273
 		case 95:
 			goto tr56
 		case 99:
 			goto st173
 		case 100:
-			goto tr272
+			goto tr273
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9244,11 +9266,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 71:
-			goto tr277
+			goto tr278
 		case 95:
 			goto tr56
 		case 103:
-			goto tr277
+			goto tr278
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9356,11 +9378,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr281
+			goto tr282
 		case 95:
 			goto tr56
 		case 101:
-			goto tr281
+			goto tr282
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9480,11 +9502,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr288
+			goto tr289
 		case 95:
 			goto tr56
 		case 116:
-			goto tr288
+			goto tr289
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9592,11 +9614,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr292
+			goto tr293
 		case 95:
 			goto tr56
 		case 101:
-			goto tr292
+			goto tr293
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9676,11 +9698,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr295
+			goto tr296
 		case 95:
 			goto tr56
 		case 115:
-			goto tr295
+			goto tr296
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9788,11 +9810,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr299
+			goto tr300
 		case 95:
 			goto tr56
 		case 110:
-			goto tr299
+			goto tr300
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -9920,11 +9942,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr308
+			goto tr309
 		case 95:
 			goto tr56
 		case 101:
-			goto tr308
+			goto tr309
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10004,11 +10026,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr311
+			goto tr312
 		case 95:
 			goto tr56
 		case 116:
-			goto tr311
+			goto tr312
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10088,11 +10110,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr314
+			goto tr315
 		case 95:
 			goto tr56
 		case 116:
-			goto tr314
+			goto tr315
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10162,7 +10184,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr316
+		goto tr317
 	st209:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof209
@@ -10228,11 +10250,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr320
+			goto tr321
 		case 95:
 			goto tr56
 		case 110:
-			goto tr320
+			goto tr321
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10284,11 +10306,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 77:
-			goto tr322
+			goto tr323
 		case 95:
 			goto tr56
 		case 109:
-			goto tr322
+			goto tr323
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10340,11 +10362,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr324
+			goto tr325
 		case 95:
 			goto tr56
 		case 108:
-			goto tr324
+			goto tr325
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10452,11 +10474,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 80:
-			goto tr328
+			goto tr329
 		case 95:
 			goto tr56
 		case 112:
-			goto tr328
+			goto tr329
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10600,11 +10622,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 71:
-			goto tr335
+			goto tr336
 		case 95:
 			goto tr56
 		case 103:
-			goto tr335
+			goto tr336
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10712,11 +10734,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr339
+			goto tr340
 		case 95:
 			goto tr56
 		case 114:
-			goto tr339
+			goto tr340
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10768,11 +10790,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr341
+			goto tr342
 		case 95:
 			goto tr56
 		case 114:
-			goto tr341
+			goto tr342
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10796,7 +10818,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 70:
-			goto tr342
+			goto tr343
 		case 78:
 			goto st232
 		case 83:
@@ -10804,7 +10826,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 95:
 			goto tr56
 		case 102:
-			goto tr342
+			goto tr343
 		case 110:
 			goto st232
 		case 115:
@@ -10862,7 +10884,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr345
+		goto tr346
 	st233:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof233
@@ -10900,11 +10922,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 88:
-			goto tr351
+			goto tr352
 		case 95:
 			goto tr56
 		case 120:
-			goto tr351
+			goto tr352
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -10956,11 +10978,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr353
+			goto tr354
 		case 95:
 			goto tr56
 		case 114:
-			goto tr353
+			goto tr354
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11040,11 +11062,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr356
+			goto tr357
 		case 95:
 			goto tr56
 		case 116:
-			goto tr356
+			goto tr357
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11070,13 +11092,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 69:
 			goto st241
 		case 79:
-			goto tr359
+			goto tr360
 		case 95:
 			goto tr56
 		case 101:
 			goto st241
 		case 111:
-			goto tr359
+			goto tr360
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11090,7 +11112,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr357
+		goto tr358
 	st241:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof241
@@ -11160,11 +11182,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr363
+			goto tr364
 		case 95:
 			goto tr56
 		case 114:
-			goto tr363
+			goto tr364
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11276,11 +11298,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr368
+			goto tr369
 		case 95:
 			goto tr56
 		case 116:
-			goto tr368
+			goto tr369
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11332,11 +11354,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr370
+			goto tr371
 		case 95:
 			goto tr56
 		case 108:
-			goto tr370
+			goto tr371
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11382,7 +11404,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr371
+		goto tr372
 	st251:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof251
@@ -11448,11 +11470,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr376
+			goto tr377
 		case 95:
 			goto tr56
 		case 108:
-			goto tr376
+			goto tr377
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11616,11 +11638,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr382
+			goto tr383
 		case 95:
 			goto tr56
 		case 110:
-			goto tr382
+			goto tr383
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11700,11 +11722,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr385
+			goto tr386
 		case 95:
 			goto tr56
 		case 110:
-			goto tr385
+			goto tr386
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11756,11 +11778,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr387
+			goto tr388
 		case 95:
 			goto tr56
 		case 121:
-			goto tr387
+			goto tr388
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11856,11 +11878,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr394
+			goto tr395
 		case 95:
 			goto tr56
 		case 116:
-			goto tr394
+			goto tr395
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -11968,11 +11990,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr398
+			goto tr399
 		case 95:
 			goto tr56
 		case 108:
-			goto tr398
+			goto tr399
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12028,11 +12050,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr401
+			goto tr402
 		case 95:
 			goto tr56
 		case 116:
-			goto tr401
+			goto tr402
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12084,11 +12106,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr403
+			goto tr404
 		case 95:
 			goto tr56
 		case 108:
-			goto tr403
+			goto tr404
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12168,11 +12190,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr406
+			goto tr407
 		case 95:
 			goto tr56
 		case 116:
-			goto tr406
+			goto tr407
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12280,11 +12302,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 68:
-			goto tr410
+			goto tr411
 		case 95:
 			goto tr56
 		case 100:
-			goto tr410
+			goto tr411
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12424,11 +12446,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr416
+			goto tr417
 		case 95:
 			goto tr56
 		case 101:
-			goto tr416
+			goto tr417
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12508,11 +12530,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 72:
-			goto tr419
+			goto tr420
 		case 95:
 			goto tr56
 		case 104:
-			goto tr419
+			goto tr420
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12716,11 +12738,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr429
+			goto tr430
 		case 95:
 			goto tr56
 		case 108:
-			goto tr429
+			goto tr430
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12800,11 +12822,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr432
+			goto tr433
 		case 95:
 			goto tr56
 		case 114:
-			goto tr432
+			goto tr433
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -12874,7 +12896,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr434
+		goto tr435
 	st303:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof303
@@ -12940,11 +12962,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 76:
-			goto tr438
+			goto tr439
 		case 95:
 			goto tr56
 		case 108:
-			goto tr438
+			goto tr439
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13028,11 +13050,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr443
+			goto tr444
 		case 95:
 			goto tr56
 		case 115:
-			goto tr443
+			goto tr444
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13046,7 +13068,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr442
+		goto tr443
 	st309:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof309
@@ -13140,11 +13162,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 67:
-			goto tr447
+			goto tr448
 		case 95:
 			goto tr56
 		case 99:
-			goto tr447
+			goto tr448
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13222,7 +13244,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr451
+		goto tr452
 	st315:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof315
@@ -13232,11 +13254,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr453
+			goto tr454
 		case 95:
 			goto tr56
 		case 121:
-			goto tr453
+			goto tr454
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13278,7 +13300,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr454
+		goto tr455
 	st317:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof317
@@ -13320,11 +13342,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr458
+			goto tr459
 		case 95:
 			goto tr56
 		case 114:
-			goto tr458
+			goto tr459
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13488,11 +13510,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr464
+			goto tr465
 		case 95:
 			goto tr56
 		case 121:
-			goto tr464
+			goto tr465
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13572,11 +13594,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr467
+			goto tr468
 		case 95:
 			goto tr56
 		case 114:
-			goto tr467
+			goto tr468
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13748,11 +13770,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr475
+			goto tr476
 		case 95:
 			goto tr56
 		case 101:
-			goto tr475
+			goto tr476
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13860,11 +13882,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 89:
-			goto tr479
+			goto tr480
 		case 95:
 			goto tr56
 		case 121:
-			goto tr479
+			goto tr480
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -13972,11 +13994,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 77:
-			goto tr483
+			goto tr484
 		case 95:
 			goto tr56
 		case 109:
-			goto tr483
+			goto tr484
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -14084,11 +14106,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr487
+			goto tr488
 		case 95:
 			goto tr56
 		case 101:
-			goto tr487
+			goto tr488
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -14192,15 +14214,15 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 68:
-			goto tr496
-		case 76:
 			goto tr497
+		case 76:
+			goto tr498
 		case 95:
 			goto tr56
 		case 100:
-			goto tr496
-		case 108:
 			goto tr497
+		case 108:
+			goto tr498
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -14364,11 +14386,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr503
+			goto tr504
 		case 95:
 			goto tr56
 		case 101:
-			goto tr503
+			goto tr504
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -14560,11 +14582,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr510
+			goto tr511
 		case 95:
 			goto tr56
 		case 115:
-			goto tr510
+			goto tr511
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -14756,11 +14778,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr517
+			goto tr518
 		case 95:
 			goto tr56
 		case 101:
-			goto tr517
+			goto tr518
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -14924,11 +14946,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 71:
-			goto tr523
+			goto tr524
 		case 95:
 			goto tr56
 		case 103:
-			goto tr523
+			goto tr524
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15008,11 +15030,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr526
+			goto tr527
 		case 95:
 			goto tr56
 		case 116:
-			goto tr526
+			goto tr527
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15038,13 +15060,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 76:
 			goto st379
 		case 87:
-			goto tr528
+			goto tr529
 		case 95:
 			goto tr56
 		case 108:
 			goto st379
 		case 119:
-			goto tr528
+			goto tr529
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15068,13 +15090,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr529
+			goto tr530
 		case 76:
 			goto st380
 		case 95:
 			goto tr56
 		case 101:
-			goto tr529
+			goto tr530
 		case 108:
 			goto st380
 		}
@@ -15184,11 +15206,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 75:
-			goto tr534
+			goto tr535
 		case 95:
 			goto tr56
 		case 107:
-			goto tr534
+			goto tr535
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15360,11 +15382,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 72:
-			goto tr548
+			goto tr549
 		case 95:
 			goto tr56
 		case 104:
-			goto tr548
+			goto tr549
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15444,11 +15466,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 68:
-			goto tr551
+			goto tr552
 		case 95:
 			goto tr56
 		case 100:
-			goto tr551
+			goto tr552
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15528,11 +15550,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr554
+			goto tr555
 		case 95:
 			goto tr56
 		case 116:
-			goto tr554
+			goto tr555
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15780,11 +15802,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr563
+			goto tr564
 		case 95:
 			goto tr56
 		case 101:
-			goto tr563
+			goto tr564
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15892,11 +15914,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr567
+			goto tr568
 		case 95:
 			goto tr56
 		case 110:
-			goto tr567
+			goto tr568
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -15938,7 +15960,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr568
+		goto tr569
 	st409:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof409
@@ -15948,11 +15970,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 70:
-			goto tr570
+			goto tr571
 		case 95:
 			goto tr56
 		case 102:
-			goto tr570
+			goto tr571
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16036,11 +16058,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr574
+			goto tr575
 		case 95:
 			goto tr56
 		case 101:
-			goto tr574
+			goto tr575
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16064,11 +16086,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 87:
-			goto tr575
+			goto tr576
 		case 95:
 			goto tr56
 		case 119:
-			goto tr575
+			goto tr576
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16120,11 +16142,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 80:
-			goto tr577
+			goto tr578
 		case 95:
 			goto tr56
 		case 112:
-			goto tr577
+			goto tr578
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16288,11 +16310,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr583
+			goto tr584
 		case 95:
 			goto tr56
 		case 116:
-			goto tr583
+			goto tr584
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16376,11 +16398,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr587
+			goto tr588
 		case 95:
 			goto tr56
 		case 116:
-			goto tr587
+			goto tr588
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16436,11 +16458,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr590
+			goto tr591
 		case 95:
 			goto tr56
 		case 110:
-			goto tr590
+			goto tr591
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16492,11 +16514,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr592
+			goto tr593
 		case 95:
 			goto tr56
 		case 116:
-			goto tr592
+			goto tr593
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16526,7 +16548,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 73:
 			goto st435
 		case 79:
-			goto tr596
+			goto tr597
 		case 82:
 			goto st437
 		case 95:
@@ -16538,7 +16560,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 105:
 			goto st435
 		case 111:
-			goto tr596
+			goto tr597
 		case 114:
 			goto st437
 		}
@@ -16620,11 +16642,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr600
+			goto tr601
 		case 95:
 			goto tr56
 		case 101:
-			goto tr600
+			goto tr601
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16676,11 +16698,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr602
+			goto tr603
 		case 95:
 			goto tr56
 		case 110:
-			goto tr602
+			goto tr603
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16732,11 +16754,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr604
+			goto tr605
 		case 95:
 			goto tr56
 		case 101:
-			goto tr604
+			goto tr605
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -16988,11 +17010,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr614
+			goto tr615
 		case 95:
 			goto tr56
 		case 110:
-			goto tr614
+			goto tr615
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17016,13 +17038,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr615
+			goto tr616
 		case 78:
 			goto st447
 		case 95:
 			goto tr56
 		case 101:
-			goto tr615
+			goto tr616
 		case 110:
 			goto st447
 		}
@@ -17132,11 +17154,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr620
+			goto tr621
 		case 95:
 			goto tr56
 		case 101:
-			goto tr620
+			goto tr621
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17420,11 +17442,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 68:
-			goto tr632
+			goto tr633
 		case 95:
 			goto tr56
 		case 100:
-			goto tr632
+			goto tr633
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17476,11 +17498,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr634
+			goto tr635
 		case 95:
 			goto tr56
 		case 110:
-			goto tr634
+			goto tr635
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17588,11 +17610,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr638
+			goto tr639
 		case 95:
 			goto tr56
 		case 101:
-			goto tr638
+			goto tr639
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17736,11 +17758,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 77:
-			goto tr645
+			goto tr646
 		case 95:
 			goto tr56
 		case 109:
-			goto tr645
+			goto tr646
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17820,11 +17842,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 83:
-			goto tr648
+			goto tr649
 		case 95:
 			goto tr56
 		case 115:
-			goto tr648
+			goto tr649
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -17932,11 +17954,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr652
+			goto tr653
 		case 95:
 			goto tr56
 		case 114:
-			goto tr652
+			goto tr653
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -18024,13 +18046,13 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 78:
-			goto tr657
+			goto tr658
 		case 82:
 			goto st482
 		case 95:
 			goto tr56
 		case 110:
-			goto tr657
+			goto tr658
 		case 114:
 			goto st482
 		}
@@ -18056,11 +18078,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr659
+			goto tr660
 		case 95:
 			goto tr56
 		case 101:
-			goto tr659
+			goto tr660
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -18158,7 +18180,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		default:
 			goto tr56
 		}
-		goto tr662
+		goto tr663
 	st486:
 		if (lex.p)++; (lex.p) == (lex.pe) {
 			goto _test_eof486
@@ -18196,11 +18218,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 84:
-			goto tr665
+			goto tr666
 		case 95:
 			goto tr56
 		case 116:
-			goto tr665
+			goto tr666
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -18280,11 +18302,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr668
+			goto tr669
 		case 95:
 			goto tr56
 		case 101:
-			goto tr668
+			goto tr669
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -18364,11 +18386,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 82:
-			goto tr671
+			goto tr672
 		case 95:
 			goto tr56
 		case 114:
-			goto tr671
+			goto tr672
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -18448,11 +18470,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		case 36:
 			goto tr56
 		case 69:
-			goto tr674
+			goto tr675
 		case 95:
 			goto tr56
 		case 101:
-			goto tr674
+			goto tr675
 		}
 		switch {
 		case lex.data[(lex.p)] < 65:
@@ -20031,7 +20053,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 40:
 				goto tr81
 			case 41:
-				goto tr102
+				goto tr103
 			case 42:
 				goto tr81
 			case 43:
@@ -20107,7 +20129,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 78:
 				goto tr81
 			case 79:
-				goto tr155
+				goto tr156
 			case 80:
 				goto tr81
 			case 81:
@@ -20117,7 +20139,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 83:
 				goto tr81
 			case 84:
-				goto tr161
+				goto tr162
 			case 85:
 				goto tr81
 			case 86:
@@ -20147,7 +20169,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 98:
 				goto tr81
 			case 99:
-				goto tr179
+				goto tr180
 			case 100:
 				goto tr81
 			case 101:
@@ -20215,7 +20237,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 132:
 				goto tr81
 			case 133:
-				goto tr225
+				goto tr226
 			case 134:
 				goto tr81
 			case 135:
@@ -20259,7 +20281,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 154:
 				goto tr81
 			case 155:
-				goto tr250
+				goto tr251
 			case 156:
 				goto tr81
 			case 157:
@@ -20279,7 +20301,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 164:
 				goto tr81
 			case 165:
-				goto tr261
+				goto tr262
 			case 166:
 				goto tr81
 			case 167:
@@ -20365,7 +20387,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 207:
 				goto tr81
 			case 208:
-				goto tr316
+				goto tr317
 			case 209:
 				goto tr81
 			case 210:
@@ -20413,7 +20435,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 231:
 				goto tr81
 			case 232:
-				goto tr345
+				goto tr346
 			case 233:
 				goto tr81
 			case 234:
@@ -20429,7 +20451,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 239:
 				goto tr81
 			case 240:
-				goto tr357
+				goto tr358
 			case 241:
 				goto tr81
 			case 242:
@@ -20449,7 +20471,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 249:
 				goto tr81
 			case 250:
-				goto tr371
+				goto tr372
 			case 251:
 				goto tr81
 			case 252:
@@ -20553,7 +20575,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 301:
 				goto tr81
 			case 302:
-				goto tr434
+				goto tr435
 			case 303:
 				goto tr81
 			case 304:
@@ -20565,7 +20587,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 307:
 				goto tr81
 			case 308:
-				goto tr442
+				goto tr443
 			case 309:
 				goto tr81
 			case 310:
@@ -20577,11 +20599,11 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 313:
 				goto tr81
 			case 314:
-				goto tr451
+				goto tr452
 			case 315:
 				goto tr81
 			case 316:
-				goto tr454
+				goto tr455
 			case 317:
 				goto tr81
 			case 318:
@@ -20765,7 +20787,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 407:
 				goto tr81
 			case 408:
-				goto tr568
+				goto tr569
 			case 409:
 				goto tr81
 			case 410:
@@ -20919,7 +20941,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 			case 484:
 				goto tr81
 			case 485:
-				goto tr662
+				goto tr663
 			case 486:
 				goto tr81
 			case 487:
@@ -20950,7 +20972,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
 		}
 	}
 
-//line lyx/lexer.rl:340
+//line lyx/lexer.rl:341
 
 	return int(tok)
 }
diff --git a/lyx/lexer.rl b/lyx/lexer.rl
index a836ce9..8d2724f 100644
--- a/lyx/lexer.rl
+++ b/lyx/lexer.rl
@@ -294,6 +294,7 @@ func (lex *Lexer) Lex(lval *yySymType) int {
             /UNION/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = UNION; fbreak;};
             /EXCEPT/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = EXCEPT; fbreak;};
             /INTERSECT/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = INTERSECT; fbreak;};
+            /ALL/i => { lval.str = string(lex.data[lex.ts:lex.te]); tok = ALL; fbreak;};
 
             qidentifier      => { lval.str = string(lex.data[lex.ts + 1:lex.te - 1]); tok = IDENT; fbreak;};
             identifier      => { lval.str = string(lex.data[lex.ts:lex.te]); tok = IDENT; fbreak;};
diff --git a/lyx/lx_test.go b/lyx/lx_test.go
index e1ce684..9ef232d 100644
--- a/lyx/lx_test.go
+++ b/lyx/lx_test.go
@@ -171,6 +171,15 @@ func TestSimple(t *testing.T) {
 			},
 			err: nil,
 		},
+		{
+			query: `
+			SELECT * FROM t UNION ALL SELECT * FROM a
+			`,
+			exp: []int{
+				lyx.SELECT, lyx.TMUL, lyx.FROM, lyx.IDENT, lyx.UNION, lyx.ALL, lyx.SELECT, lyx.TMUL, lyx.FROM, lyx.IDENT,
+			},
+			err: nil,
+		},
 	} {
 		t := lyx.NewStringTokenizer(tt.query)
 		var res []int
diff --git a/lyx/yx_test.go b/lyx/yx_test.go
index a6b6497..234cfcf 100644
--- a/lyx/yx_test.go
+++ b/lyx/yx_test.go
@@ -679,6 +679,89 @@ func TestSetOp(t *testing.T) {
 			},
 			err: nil,
 		},
+		{
+			query: `SELECT * FROM a WHERE i = 1 UNION SELECT * FROM b WHERE j = 1`,
+			exp: &lyx.Select{
+				Op: lyx.SetOpUnion,
+				LArg: &lyx.Select{
+					TargetList: []lyx.Node{
+						&lyx.AExprEmpty{},
+					},
+					Where: &lyx.AExprOp{
+						Left: &lyx.ColumnRef{
+							ColName: "i",
+						},
+						Right: &lyx.AExprIConst{Value: 1},
+						Op:    "=",
+					},
+					FromClause: []lyx.FromClauseNode{
+						&lyx.RangeVar{
+							RelationName: "a",
+						},
+					},
+				},
+				RArg: &lyx.Select{
+					TargetList: []lyx.Node{
+						&lyx.AExprEmpty{},
+					},
+					Where: &lyx.AExprOp{
+						Left: &lyx.ColumnRef{
+							ColName: "j",
+						},
+						Right: &lyx.AExprIConst{Value: 1},
+						Op:    "=",
+					},
+					FromClause: []lyx.FromClauseNode{
+						&lyx.RangeVar{
+							RelationName: "b",
+						},
+					},
+				},
+			},
+			err: nil,
+		},
+
+		{
+			query: `SELECT * FROM a WHERE i = 1 UNION ALL SELECT * FROM b WHERE j = 1`,
+			exp: &lyx.Select{
+				Op: lyx.SetOpUnion,
+				LArg: &lyx.Select{
+					TargetList: []lyx.Node{
+						&lyx.AExprEmpty{},
+					},
+					Where: &lyx.AExprOp{
+						Left: &lyx.ColumnRef{
+							ColName: "i",
+						},
+						Right: &lyx.AExprIConst{Value: 1},
+						Op:    "=",
+					},
+					FromClause: []lyx.FromClauseNode{
+						&lyx.RangeVar{
+							RelationName: "a",
+						},
+					},
+				},
+				RArg: &lyx.Select{
+					TargetList: []lyx.Node{
+						&lyx.AExprEmpty{},
+					},
+					Where: &lyx.AExprOp{
+						Left: &lyx.ColumnRef{
+							ColName: "j",
+						},
+						Right: &lyx.AExprIConst{Value: 1},
+						Op:    "=",
+					},
+					FromClause: []lyx.FromClauseNode{
+						&lyx.RangeVar{
+							RelationName: "b",
+						},
+					},
+				},
+			},
+			err: nil,
+		},
 	} {
 		tmp, err := lyx.Parse(tt.query)