From: Fletcher T. Penney Date: Sun, 9 Apr 2017 22:23:42 +0000 (-0400) Subject: FIXED: Fix regular expression to match table separator lines. (Fixes #50) X-Git-Tag: 6.0.4^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf293c65af1eac38fb37801166f5759d869354ae;p=multimarkdown FIXED: Fix regular expression to match table separator lines. (Fixes #50) --- diff --git a/Sources/libMultiMarkdown/scanners.c b/Sources/libMultiMarkdown/scanners.c index 4fa33f9..7a8a1c4 100644 --- a/Sources/libMultiMarkdown/scanners.c +++ b/Sources/libMultiMarkdown/scanners.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.14.3 on Wed Mar 29 19:08:11 2017 */ +/* Generated by re2c 0.14.3 on Sun Apr 9 18:23:03 2017 */ /** MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more. @@ -65254,12 +65254,12 @@ size_t scan_table_separator(const char * c) { case 0x7F: goto yy1322; case '\t': case ' ': + case '|': goto yy1318; case '+': case '-': case ':': - case '=': goto yy1319; - case '|': goto yy1318; - case 0xC2: goto yy1320; + case '=': goto yy1321; + case 0xC2: goto yy1319; case 0xC3: case 0xC4: case 0xC5: @@ -65317,33 +65317,16 @@ yy1317: yy1318: yych = *(marker = ++c); switch (yych) { - case 0x00: case '\t': - case '\n': - case '\r': - case ' ': + case ' ': goto yy1340; case '+': case '-': case ':': - case '=': - case '|': - case 0xC2: goto yy1339; + case '=': goto yy1334; + case 0xC2: goto yy1342; default: goto yy1317; } yy1319: - yych = *(marker = ++c); - switch (yych) { - case '\t': - case ' ': - case '+': - case '-': - case ':': - case '=': goto yy1331; - case '|': goto yy1329; - case 0xC2: goto yy1333; - default: goto yy1317; - } -yy1320: yych = *++c; switch (yych) { case 0x80: @@ -65409,12 +65392,25 @@ yy1320: case 0xBD: case 0xBE: case 0xBF: goto yy1322; - case 0xA0: goto yy1319; - default: goto yy1321; + case 0xA0: goto yy1318; + default: goto yy1320; } -yy1321: +yy1320: c = marker; goto yy1317; +yy1321: + yych = *(marker = ++c); + switch (yych) { + case '\t': + case ' ': goto yy1329; + case '+': + case '-': + case ':': + case '=': goto yy1334; + case '|': goto yy1332; + case 0xC2: goto yy1331; + default: goto yy1317; + } yy1322: yych = *++c; goto yy1317; @@ -65485,7 +65481,7 @@ yy1323: case 0xBD: case 0xBE: case 0xBF: goto yy1322; - default: goto yy1321; + default: goto yy1320; } yy1324: yych = *++c; @@ -65522,7 +65518,7 @@ yy1324: case 0xBD: case 0xBE: case 0xBF: goto yy1323; - default: goto yy1321; + default: goto yy1320; } yy1325: yych = *++c; @@ -65591,7 +65587,7 @@ yy1325: case 0xBD: case 0xBE: case 0xBF: goto yy1323; - default: goto yy1321; + default: goto yy1320; } yy1326: yych = *++c; @@ -65644,7 +65640,7 @@ yy1326: case 0xBD: case 0xBE: case 0xBF: goto yy1325; - default: goto yy1321; + default: goto yy1320; } yy1327: yych = *++c; @@ -65713,7 +65709,7 @@ yy1327: case 0xBD: case 0xBE: case 0xBF: goto yy1325; - default: goto yy1321; + default: goto yy1320; } yy1328: yych = *++c; @@ -65734,87 +65730,91 @@ yy1328: case 0x8D: case 0x8E: case 0x8F: goto yy1325; - default: goto yy1321; + default: goto yy1320; } yy1329: ++c; yych = *c; switch (yych) { - case 0x00: - case '\n': goto yy1335; case '\t': - case ' ': - case '+': - case '-': - case ':': - case '=': - case '|': goto yy1329; - case '\r': goto yy1337; - case 0xC2: goto yy1334; - default: goto yy1321; + case ' ': goto yy1329; + case '|': goto yy1332; + case 0xC2: goto yy1331; + default: goto yy1320; } yy1331: ++c; yych = *c; switch (yych) { + case 0xA0: goto yy1329; + default: goto yy1320; + } +yy1332: + ++c; + yych = *c; + switch (yych) { + case 0x00: + case '\n': goto yy1337; case '\t': - case ' ': + case ' ': goto yy1332; + case '\r': goto yy1339; case '+': case '-': case ':': - case '=': goto yy1331; - case '|': goto yy1329; - case 0xC2: goto yy1333; - default: goto yy1321; + case '=': goto yy1334; + case 0xC2: goto yy1336; + default: goto yy1320; } -yy1333: +yy1334: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1331; - default: goto yy1321; + case '\t': + case ' ': goto yy1329; + case '+': + case '-': + case ':': + case '=': goto yy1334; + case '|': goto yy1332; + case 0xC2: goto yy1331; + default: goto yy1320; } -yy1334: +yy1336: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1329; - default: goto yy1321; + case 0xA0: goto yy1332; + default: goto yy1320; } -yy1335: +yy1337: ++c; -yy1336: +yy1338: { return (size_t)( c - start ); } -yy1337: +yy1339: yych = *++c; switch (yych) { - case '\n': goto yy1335; - default: goto yy1336; + case '\n': goto yy1337; + default: goto yy1338; } -yy1338: +yy1340: ++c; yych = *c; -yy1339: switch (yych) { - case 0x00: - case '\n': goto yy1335; case '\t': - case ' ': + case ' ': goto yy1340; case '+': case '-': case ':': - case '=': - case '|': goto yy1338; - case '\r': goto yy1337; - case 0xC2: goto yy1340; - default: goto yy1321; + case '=': goto yy1334; + case 0xC2: goto yy1342; + default: goto yy1320; } -yy1340: +yy1342: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1338; - default: goto yy1321; + case 0xA0: goto yy1340; + default: goto yy1320; } } @@ -65950,13 +65950,13 @@ size_t scan_alignment_string(const char * c) { case '|': case '}': case '~': - case 0x7F: goto yy1349; + case 0x7F: goto yy1351; case '\t': - case ' ': goto yy1344; + case ' ': goto yy1346; case '-': - case '=': goto yy1348; - case ':': goto yy1347; - case 0xC2: goto yy1345; + case '=': goto yy1350; + case ':': goto yy1349; + case 0xC2: goto yy1347; case 0xC3: case 0xC4: case 0xC5: @@ -65985,8 +65985,8 @@ size_t scan_alignment_string(const char * c) { case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1350; - case 0xE0: goto yy1351; + case 0xDF: goto yy1352; + case 0xE0: goto yy1353; case 0xE1: case 0xE2: case 0xE3: @@ -66001,28 +66001,28 @@ size_t scan_alignment_string(const char * c) { case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1352; - case 0xF0: goto yy1353; + case 0xEF: goto yy1354; + case 0xF0: goto yy1355; case 0xF1: case 0xF2: - case 0xF3: goto yy1354; - case 0xF4: goto yy1355; - default: goto yy1343; + case 0xF3: goto yy1356; + case 0xF4: goto yy1357; + default: goto yy1345; } -yy1343: +yy1345: { return 0; } -yy1344: +yy1346: yych = *(marker = ++c); switch (yych) { case '\t': - case ' ': goto yy1399; + case ' ': goto yy1401; case '-': - case '=': goto yy1357; - case ':': goto yy1398; - case 0xC2: goto yy1401; - default: goto yy1343; + case '=': goto yy1359; + case ':': goto yy1400; + case 0xC2: goto yy1403; + default: goto yy1345; } -yy1345: +yy1347: yych = *++c; switch (yych) { case 0x80: @@ -66087,32 +66087,32 @@ yy1345: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1349; - case 0xA0: goto yy1344; - default: goto yy1346; + case 0xBF: goto yy1351; + case 0xA0: goto yy1346; + default: goto yy1348; } -yy1346: +yy1348: c = marker; - goto yy1343; -yy1347: + goto yy1345; +yy1349: yych = *(marker = ++c); switch (yych) { case '-': - case '=': goto yy1371; - default: goto yy1343; + case '=': goto yy1373; + default: goto yy1345; } -yy1348: +yy1350: yych = *(marker = ++c); switch (yych) { case '-': - case '=': goto yy1357; - case ':': goto yy1356; - default: goto yy1343; + case '=': goto yy1359; + case ':': goto yy1358; + default: goto yy1345; } -yy1349: +yy1351: yych = *++c; - goto yy1343; -yy1350: + goto yy1345; +yy1352: yych = *++c; switch (yych) { case 0x80: @@ -66178,10 +66178,10 @@ yy1350: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1349; - default: goto yy1346; + case 0xBF: goto yy1351; + default: goto yy1348; } -yy1351: +yy1353: yych = *++c; switch (yych) { case 0xA0: @@ -66215,10 +66215,10 @@ yy1351: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1350; - default: goto yy1346; + case 0xBF: goto yy1352; + default: goto yy1348; } -yy1352: +yy1354: yych = *++c; switch (yych) { case 0x80: @@ -66284,10 +66284,10 @@ yy1352: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1350; - default: goto yy1346; + case 0xBF: goto yy1352; + default: goto yy1348; } -yy1353: +yy1355: yych = *++c; switch (yych) { case 0x90: @@ -66337,10 +66337,10 @@ yy1353: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1352; - default: goto yy1346; + case 0xBF: goto yy1354; + default: goto yy1348; } -yy1354: +yy1356: yych = *++c; switch (yych) { case 0x80: @@ -66406,10 +66406,10 @@ yy1354: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1352; - default: goto yy1346; + case 0xBF: goto yy1354; + default: goto yy1348; } -yy1355: +yy1357: yych = *++c; switch (yych) { case 0x80: @@ -66427,254 +66427,254 @@ yy1355: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1352; - default: goto yy1346; + case 0x8F: goto yy1354; + default: goto yy1348; } -yy1356: +yy1358: yych = *++c; switch (yych) { - case '+': goto yy1365; - default: goto yy1360; + case '+': goto yy1367; + default: goto yy1362; } -yy1357: +yy1359: ++c; yych = *c; switch (yych) { case '-': - case '=': goto yy1357; - case ':': goto yy1356; - default: goto yy1346; + case '=': goto yy1359; + case ':': goto yy1358; + default: goto yy1348; } -yy1359: +yy1361: ++c; yych = *c; -yy1360: +yy1362: switch (yych) { case 0x00: case '\n': - case '|': goto yy1362; + case '|': goto yy1364; case '\t': - case ' ': goto yy1359; - case '\r': goto yy1364; - case 0xC2: goto yy1361; - default: goto yy1346; + case ' ': goto yy1361; + case '\r': goto yy1366; + case 0xC2: goto yy1363; + default: goto yy1348; } -yy1361: +yy1363: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1359; - default: goto yy1346; + case 0xA0: goto yy1361; + default: goto yy1348; } -yy1362: +yy1364: ++c; -yy1363: +yy1365: { return ALIGN_RIGHT; } -yy1364: +yy1366: yych = *++c; switch (yych) { - case '\n': goto yy1362; - default: goto yy1363; + case '\n': goto yy1364; + default: goto yy1365; } -yy1365: +yy1367: ++c; yych = *c; switch (yych) { case 0x00: case '\n': - case '|': goto yy1368; + case '|': goto yy1370; case '\t': - case ' ': goto yy1365; - case '\r': goto yy1370; - case 0xC2: goto yy1367; - default: goto yy1346; + case ' ': goto yy1367; + case '\r': goto yy1372; + case 0xC2: goto yy1369; + default: goto yy1348; } -yy1367: +yy1369: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1365; - default: goto yy1346; + case 0xA0: goto yy1367; + default: goto yy1348; } -yy1368: +yy1370: ++c; -yy1369: +yy1371: { return ALIGN_WRAP | ALIGN_RIGHT; } -yy1370: +yy1372: yych = *++c; switch (yych) { - case '\n': goto yy1368; - default: goto yy1369; + case '\n': goto yy1370; + default: goto yy1371; } -yy1371: +yy1373: ++c; yych = *c; switch (yych) { case 0x00: case '\n': - case '|': goto yy1376; + case '|': goto yy1378; case '\t': - case ' ': goto yy1373; - case '\r': goto yy1378; - case '+': goto yy1380; + case ' ': goto yy1375; + case '\r': goto yy1380; + case '+': goto yy1382; case '-': - case '=': goto yy1371; - case ':': goto yy1379; - case 0xC2: goto yy1375; - default: goto yy1346; + case '=': goto yy1373; + case ':': goto yy1381; + case 0xC2: goto yy1377; + default: goto yy1348; } -yy1373: +yy1375: ++c; yych = *c; switch (yych) { case 0x00: case '\n': - case '|': goto yy1376; + case '|': goto yy1378; case '\t': - case ' ': goto yy1373; - case '\r': goto yy1378; - case 0xC2: goto yy1375; - default: goto yy1346; + case ' ': goto yy1375; + case '\r': goto yy1380; + case 0xC2: goto yy1377; + default: goto yy1348; } -yy1375: +yy1377: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1373; - default: goto yy1346; + case 0xA0: goto yy1375; + default: goto yy1348; } -yy1376: +yy1378: ++c; -yy1377: +yy1379: { return ALIGN_LEFT; } -yy1378: +yy1380: yych = *++c; switch (yych) { - case '\n': goto yy1376; - default: goto yy1377; + case '\n': goto yy1378; + default: goto yy1379; } -yy1379: +yy1381: yych = *++c; switch (yych) { - case '+': goto yy1386; - default: goto yy1389; + case '+': goto yy1388; + default: goto yy1391; } -yy1380: +yy1382: ++c; yych = *c; switch (yych) { case 0x00: case '\n': - case '|': goto yy1383; + case '|': goto yy1385; case '\t': - case ' ': goto yy1380; - case '\r': goto yy1385; - case 0xC2: goto yy1382; - default: goto yy1346; + case ' ': goto yy1382; + case '\r': goto yy1387; + case 0xC2: goto yy1384; + default: goto yy1348; } -yy1382: +yy1384: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1380; - default: goto yy1346; + case 0xA0: goto yy1382; + default: goto yy1348; } -yy1383: +yy1385: ++c; -yy1384: +yy1386: { return ALIGN_WRAP | ALIGN_LEFT; } -yy1385: +yy1387: yych = *++c; switch (yych) { - case '\n': goto yy1383; - default: goto yy1384; + case '\n': goto yy1385; + default: goto yy1386; } -yy1386: +yy1388: ++c; yych = *c; switch (yych) { case 0x00: case '\n': - case '|': goto yy1395; + case '|': goto yy1397; case '\t': - case ' ': goto yy1386; - case '\r': goto yy1397; - case 0xC2: goto yy1394; - default: goto yy1346; + case ' ': goto yy1388; + case '\r': goto yy1399; + case 0xC2: goto yy1396; + default: goto yy1348; } -yy1388: +yy1390: ++c; yych = *c; -yy1389: +yy1391: switch (yych) { case 0x00: case '\n': - case '|': goto yy1391; + case '|': goto yy1393; case '\t': - case ' ': goto yy1388; - case '\r': goto yy1393; - case 0xC2: goto yy1390; - default: goto yy1346; + case ' ': goto yy1390; + case '\r': goto yy1395; + case 0xC2: goto yy1392; + default: goto yy1348; } -yy1390: +yy1392: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1388; - default: goto yy1346; + case 0xA0: goto yy1390; + default: goto yy1348; } -yy1391: +yy1393: ++c; -yy1392: +yy1394: { return ALIGN_CENTER; } -yy1393: +yy1395: yych = *++c; switch (yych) { - case '\n': goto yy1391; - default: goto yy1392; + case '\n': goto yy1393; + default: goto yy1394; } -yy1394: +yy1396: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1386; - default: goto yy1346; + case 0xA0: goto yy1388; + default: goto yy1348; } -yy1395: +yy1397: ++c; -yy1396: +yy1398: { return ALIGN_WRAP | ALIGN_CENTER; } -yy1397: +yy1399: yych = *++c; switch (yych) { - case '\n': goto yy1395; - default: goto yy1396; + case '\n': goto yy1397; + default: goto yy1398; } -yy1398: +yy1400: yych = *++c; switch (yych) { case '-': - case '=': goto yy1371; - default: goto yy1346; + case '=': goto yy1373; + default: goto yy1348; } -yy1399: +yy1401: ++c; yych = *c; switch (yych) { case '\t': - case ' ': goto yy1399; + case ' ': goto yy1401; case '-': - case '=': goto yy1357; - case ':': goto yy1398; - case 0xC2: goto yy1401; - default: goto yy1346; + case '=': goto yy1359; + case ':': goto yy1400; + case 0xC2: goto yy1403; + default: goto yy1348; } -yy1401: +yy1403: ++c; yych = *c; switch (yych) { - case 0xA0: goto yy1399; - default: goto yy1346; + case 0xA0: goto yy1401; + default: goto yy1348; } } @@ -66694,7 +66694,7 @@ size_t scan_destination(const char * c) { case 0x00: case '\t': case '\r': - case ' ': goto yy1416; + case ' ': goto yy1418; case 0x01: case 0x02: case 0x03: @@ -66816,9 +66816,9 @@ size_t scan_destination(const char * c) { case '|': case '}': case '~': - case 0x7F: goto yy1407; - case '<': goto yy1405; - case 0xC2: goto yy1408; + case 0x7F: goto yy1409; + case '<': goto yy1407; + case 0xC2: goto yy1410; case 0xC3: case 0xC4: case 0xC5: @@ -66847,8 +66847,8 @@ size_t scan_destination(const char * c) { case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1410; - case 0xE0: goto yy1411; + case 0xDF: goto yy1412; + case 0xE0: goto yy1413; case 0xE1: case 0xE2: case 0xE3: @@ -66863,27 +66863,27 @@ size_t scan_destination(const char * c) { case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1412; - case 0xF0: goto yy1413; + case 0xEF: goto yy1414; + case 0xF0: goto yy1415; case 0xF1: case 0xF2: - case 0xF3: goto yy1414; - case 0xF4: goto yy1415; - default: goto yy1404; + case 0xF3: goto yy1416; + case 0xF4: goto yy1417; + default: goto yy1406; } -yy1404: +yy1406: { return 0; } -yy1405: +yy1407: yyaccept = 1; yych = *(marker = ++c); - goto yy1427; -yy1406: + goto yy1429; +yy1408: { return (size_t)( c - start ); } -yy1407: +yy1409: yyaccept = 1; yych = *(marker = ++c); - goto yy1418; -yy1408: + goto yy1420; +yy1410: yych = *++c; switch (yych) { case 0x80: @@ -66948,18 +66948,18 @@ yy1408: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1407; - case 0xA0: goto yy1416; - default: goto yy1409; + case 0xBF: goto yy1409; + case 0xA0: goto yy1418; + default: goto yy1411; } -yy1409: +yy1411: c = marker; if (yyaccept == 0) { - goto yy1404; - } else { goto yy1406; + } else { + goto yy1408; } -yy1410: +yy1412: yych = *++c; switch (yych) { case 0x80: @@ -67025,10 +67025,10 @@ yy1410: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1407; - default: goto yy1409; + case 0xBF: goto yy1409; + default: goto yy1411; } -yy1411: +yy1413: yych = *++c; switch (yych) { case 0xA0: @@ -67062,10 +67062,10 @@ yy1411: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1410; - default: goto yy1409; + case 0xBF: goto yy1412; + default: goto yy1411; } -yy1412: +yy1414: yych = *++c; switch (yych) { case 0x80: @@ -67131,10 +67131,10 @@ yy1412: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1410; - default: goto yy1409; + case 0xBF: goto yy1412; + default: goto yy1411; } -yy1413: +yy1415: yych = *++c; switch (yych) { case 0x90: @@ -67184,10 +67184,10 @@ yy1413: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1412; - default: goto yy1409; + case 0xBF: goto yy1414; + default: goto yy1411; } -yy1414: +yy1416: yych = *++c; switch (yych) { case 0x80: @@ -67253,10 +67253,10 @@ yy1414: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1412; - default: goto yy1409; + case 0xBF: goto yy1414; + default: goto yy1411; } -yy1415: +yy1417: yych = *++c; switch (yych) { case 0x80: @@ -67274,17 +67274,17 @@ yy1415: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1412; - default: goto yy1409; + case 0x8F: goto yy1414; + default: goto yy1411; } -yy1416: +yy1418: yych = *++c; - goto yy1404; -yy1417: + goto yy1406; +yy1419: yyaccept = 1; marker = ++c; yych = *c; -yy1418: +yy1420: switch (yych) { case 0x01: case 0x02: @@ -67408,8 +67408,8 @@ yy1418: case '|': case '}': case '~': - case 0x7F: goto yy1417; - case 0xC2: goto yy1419; + case 0x7F: goto yy1419; + case 0xC2: goto yy1421; case 0xC3: case 0xC4: case 0xC5: @@ -67438,8 +67438,8 @@ yy1418: case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1420; - case 0xE0: goto yy1421; + case 0xDF: goto yy1422; + case 0xE0: goto yy1423; case 0xE1: case 0xE2: case 0xE3: @@ -67454,15 +67454,15 @@ yy1418: case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1422; - case 0xF0: goto yy1423; + case 0xEF: goto yy1424; + case 0xF0: goto yy1425; case 0xF1: case 0xF2: - case 0xF3: goto yy1424; - case 0xF4: goto yy1425; - default: goto yy1406; + case 0xF3: goto yy1426; + case 0xF4: goto yy1427; + default: goto yy1408; } -yy1419: +yy1421: ++c; yych = *c; switch (yych) { @@ -67528,10 +67528,10 @@ yy1419: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1417; - default: goto yy1409; + case 0xBF: goto yy1419; + default: goto yy1411; } -yy1420: +yy1422: ++c; yych = *c; switch (yych) { @@ -67598,10 +67598,10 @@ yy1420: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1417; - default: goto yy1409; + case 0xBF: goto yy1419; + default: goto yy1411; } -yy1421: +yy1423: ++c; yych = *c; switch (yych) { @@ -67636,10 +67636,10 @@ yy1421: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1420; - default: goto yy1409; + case 0xBF: goto yy1422; + default: goto yy1411; } -yy1422: +yy1424: ++c; yych = *c; switch (yych) { @@ -67706,10 +67706,10 @@ yy1422: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1420; - default: goto yy1409; + case 0xBF: goto yy1422; + default: goto yy1411; } -yy1423: +yy1425: ++c; yych = *c; switch (yych) { @@ -67760,10 +67760,10 @@ yy1423: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1422; - default: goto yy1409; + case 0xBF: goto yy1424; + default: goto yy1411; } -yy1424: +yy1426: ++c; yych = *c; switch (yych) { @@ -67830,10 +67830,10 @@ yy1424: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1422; - default: goto yy1409; + case 0xBF: goto yy1424; + default: goto yy1411; } -yy1425: +yy1427: ++c; yych = *c; switch (yych) { @@ -67852,14 +67852,14 @@ yy1425: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1422; - default: goto yy1409; + case 0x8F: goto yy1424; + default: goto yy1411; } -yy1426: +yy1428: yyaccept = 1; marker = ++c; yych = *c; -yy1427: +yy1429: switch (yych) { case 0x01: case 0x02: @@ -67982,9 +67982,9 @@ yy1427: case '|': case '}': case '~': - case 0x7F: goto yy1426; - case '>': goto yy1417; - case 0xC2: goto yy1428; + case 0x7F: goto yy1428; + case '>': goto yy1419; + case 0xC2: goto yy1430; case 0xC3: case 0xC4: case 0xC5: @@ -68013,8 +68013,8 @@ yy1427: case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1429; - case 0xE0: goto yy1430; + case 0xDF: goto yy1431; + case 0xE0: goto yy1432; case 0xE1: case 0xE2: case 0xE3: @@ -68029,15 +68029,15 @@ yy1427: case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1431; - case 0xF0: goto yy1432; + case 0xEF: goto yy1433; + case 0xF0: goto yy1434; case 0xF1: case 0xF2: - case 0xF3: goto yy1433; - case 0xF4: goto yy1434; - default: goto yy1406; + case 0xF3: goto yy1435; + case 0xF4: goto yy1436; + default: goto yy1408; } -yy1428: +yy1430: ++c; yych = *c; switch (yych) { @@ -68103,10 +68103,10 @@ yy1428: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1426; - default: goto yy1409; + case 0xBF: goto yy1428; + default: goto yy1411; } -yy1429: +yy1431: ++c; yych = *c; switch (yych) { @@ -68173,10 +68173,10 @@ yy1429: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1426; - default: goto yy1409; + case 0xBF: goto yy1428; + default: goto yy1411; } -yy1430: +yy1432: ++c; yych = *c; switch (yych) { @@ -68211,10 +68211,10 @@ yy1430: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1429; - default: goto yy1409; + case 0xBF: goto yy1431; + default: goto yy1411; } -yy1431: +yy1433: ++c; yych = *c; switch (yych) { @@ -68281,10 +68281,10 @@ yy1431: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1429; - default: goto yy1409; + case 0xBF: goto yy1431; + default: goto yy1411; } -yy1432: +yy1434: ++c; yych = *c; switch (yych) { @@ -68335,10 +68335,10 @@ yy1432: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1431; - default: goto yy1409; + case 0xBF: goto yy1433; + default: goto yy1411; } -yy1433: +yy1435: ++c; yych = *c; switch (yych) { @@ -68405,10 +68405,10 @@ yy1433: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1431; - default: goto yy1409; + case 0xBF: goto yy1433; + default: goto yy1411; } -yy1434: +yy1436: ++c; yych = *c; switch (yych) { @@ -68427,8 +68427,8 @@ yy1434: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1431; - default: goto yy1409; + case 0x8F: goto yy1433; + default: goto yy1411; } } @@ -68567,10 +68567,10 @@ size_t scan_title(const char * c) { case '|': case '}': case '~': - case 0x7F: goto yy1441; - case '"': goto yy1438; - case '\'': goto yy1439; - case '(': goto yy1440; + case 0x7F: goto yy1443; + case '"': goto yy1440; + case '\'': goto yy1441; + case '(': goto yy1442; case 0xC2: case 0xC3: case 0xC4: @@ -68600,8 +68600,8 @@ size_t scan_title(const char * c) { case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1442; - case 0xE0: goto yy1444; + case 0xDF: goto yy1444; + case 0xE0: goto yy1446; case 0xE1: case 0xE2: case 0xE3: @@ -68616,17 +68616,17 @@ size_t scan_title(const char * c) { case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1445; - case 0xF0: goto yy1446; + case 0xEF: goto yy1447; + case 0xF0: goto yy1448; case 0xF1: case 0xF2: - case 0xF3: goto yy1447; - case 0xF4: goto yy1448; - default: goto yy1437; + case 0xF3: goto yy1449; + case 0xF4: goto yy1450; + default: goto yy1439; } -yy1437: +yy1439: { return 0; } -yy1438: +yy1440: yych = *(marker = ++c); switch (yych) { case 0x01: @@ -68804,10 +68804,10 @@ yy1438: case 0xF1: case 0xF2: case 0xF3: - case 0xF4: goto yy1468; - default: goto yy1437; + case 0xF4: goto yy1470; + default: goto yy1439; } -yy1439: +yy1441: yych = *(marker = ++c); switch (yych) { case 0x01: @@ -68985,10 +68985,10 @@ yy1439: case 0xF1: case 0xF2: case 0xF3: - case 0xF4: goto yy1460; - default: goto yy1437; + case 0xF4: goto yy1462; + default: goto yy1439; } -yy1440: +yy1442: yych = *(marker = ++c); switch (yych) { case 0x01: @@ -69166,13 +69166,13 @@ yy1440: case 0xF1: case 0xF2: case 0xF3: - case 0xF4: goto yy1450; - default: goto yy1437; + case 0xF4: goto yy1452; + default: goto yy1439; } -yy1441: +yy1443: yych = *++c; - goto yy1437; -yy1442: + goto yy1439; +yy1444: yych = *++c; switch (yych) { case 0x80: @@ -69238,13 +69238,13 @@ yy1442: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1441; - default: goto yy1443; + case 0xBF: goto yy1443; + default: goto yy1445; } -yy1443: +yy1445: c = marker; - goto yy1437; -yy1444: + goto yy1439; +yy1446: yych = *++c; switch (yych) { case 0xA0: @@ -69278,10 +69278,10 @@ yy1444: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1442; - default: goto yy1443; + case 0xBF: goto yy1444; + default: goto yy1445; } -yy1445: +yy1447: yych = *++c; switch (yych) { case 0x80: @@ -69347,10 +69347,10 @@ yy1445: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1442; - default: goto yy1443; + case 0xBF: goto yy1444; + default: goto yy1445; } -yy1446: +yy1448: yych = *++c; switch (yych) { case 0x90: @@ -69400,10 +69400,10 @@ yy1446: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1445; - default: goto yy1443; + case 0xBF: goto yy1447; + default: goto yy1445; } -yy1447: +yy1449: yych = *++c; switch (yych) { case 0x80: @@ -69469,10 +69469,10 @@ yy1447: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1445; - default: goto yy1443; + case 0xBF: goto yy1447; + default: goto yy1445; } -yy1448: +yy1450: yych = *++c; switch (yych) { case 0x80: @@ -69490,13 +69490,13 @@ yy1448: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1445; - default: goto yy1443; + case 0x8F: goto yy1447; + default: goto yy1445; } -yy1449: +yy1451: ++c; yych = *c; -yy1450: +yy1452: switch (yych) { case 0x01: case 0x02: @@ -69621,8 +69621,8 @@ yy1450: case '|': case '}': case '~': - case 0x7F: goto yy1449; - case ')': goto yy1457; + case 0x7F: goto yy1451; + case ')': goto yy1459; case 0xC2: case 0xC3: case 0xC4: @@ -69652,8 +69652,8 @@ yy1450: case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1451; - case 0xE0: goto yy1452; + case 0xDF: goto yy1453; + case 0xE0: goto yy1454; case 0xE1: case 0xE2: case 0xE3: @@ -69668,15 +69668,15 @@ yy1450: case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1453; - case 0xF0: goto yy1454; + case 0xEF: goto yy1455; + case 0xF0: goto yy1456; case 0xF1: case 0xF2: - case 0xF3: goto yy1455; - case 0xF4: goto yy1456; - default: goto yy1443; + case 0xF3: goto yy1457; + case 0xF4: goto yy1458; + default: goto yy1445; } -yy1451: +yy1453: ++c; yych = *c; switch (yych) { @@ -69743,10 +69743,10 @@ yy1451: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1449; - default: goto yy1443; + case 0xBF: goto yy1451; + default: goto yy1445; } -yy1452: +yy1454: ++c; yych = *c; switch (yych) { @@ -69781,10 +69781,10 @@ yy1452: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1451; - default: goto yy1443; + case 0xBF: goto yy1453; + default: goto yy1445; } -yy1453: +yy1455: ++c; yych = *c; switch (yych) { @@ -69851,10 +69851,10 @@ yy1453: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1451; - default: goto yy1443; + case 0xBF: goto yy1453; + default: goto yy1445; } -yy1454: +yy1456: ++c; yych = *c; switch (yych) { @@ -69905,10 +69905,10 @@ yy1454: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1453; - default: goto yy1443; + case 0xBF: goto yy1455; + default: goto yy1445; } -yy1455: +yy1457: ++c; yych = *c; switch (yych) { @@ -69975,10 +69975,10 @@ yy1455: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1453; - default: goto yy1443; + case 0xBF: goto yy1455; + default: goto yy1445; } -yy1456: +yy1458: ++c; yych = *c; switch (yych) { @@ -69997,16 +69997,16 @@ yy1456: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1453; - default: goto yy1443; + case 0x8F: goto yy1455; + default: goto yy1445; } -yy1457: +yy1459: ++c; { return (size_t)( c - start ); } -yy1459: +yy1461: ++c; yych = *c; -yy1460: +yy1462: switch (yych) { case 0x01: case 0x02: @@ -70131,8 +70131,8 @@ yy1460: case '|': case '}': case '~': - case 0x7F: goto yy1459; - case '\'': goto yy1457; + case 0x7F: goto yy1461; + case '\'': goto yy1459; case 0xC2: case 0xC3: case 0xC4: @@ -70162,8 +70162,8 @@ yy1460: case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1461; - case 0xE0: goto yy1462; + case 0xDF: goto yy1463; + case 0xE0: goto yy1464; case 0xE1: case 0xE2: case 0xE3: @@ -70178,15 +70178,15 @@ yy1460: case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1463; - case 0xF0: goto yy1464; + case 0xEF: goto yy1465; + case 0xF0: goto yy1466; case 0xF1: case 0xF2: - case 0xF3: goto yy1465; - case 0xF4: goto yy1466; - default: goto yy1443; + case 0xF3: goto yy1467; + case 0xF4: goto yy1468; + default: goto yy1445; } -yy1461: +yy1463: ++c; yych = *c; switch (yych) { @@ -70253,10 +70253,10 @@ yy1461: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1459; - default: goto yy1443; + case 0xBF: goto yy1461; + default: goto yy1445; } -yy1462: +yy1464: ++c; yych = *c; switch (yych) { @@ -70291,10 +70291,10 @@ yy1462: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1461; - default: goto yy1443; + case 0xBF: goto yy1463; + default: goto yy1445; } -yy1463: +yy1465: ++c; yych = *c; switch (yych) { @@ -70361,10 +70361,10 @@ yy1463: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1461; - default: goto yy1443; + case 0xBF: goto yy1463; + default: goto yy1445; } -yy1464: +yy1466: ++c; yych = *c; switch (yych) { @@ -70415,10 +70415,10 @@ yy1464: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1463; - default: goto yy1443; + case 0xBF: goto yy1465; + default: goto yy1445; } -yy1465: +yy1467: ++c; yych = *c; switch (yych) { @@ -70485,10 +70485,10 @@ yy1465: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1463; - default: goto yy1443; + case 0xBF: goto yy1465; + default: goto yy1445; } -yy1466: +yy1468: ++c; yych = *c; switch (yych) { @@ -70507,13 +70507,13 @@ yy1466: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1463; - default: goto yy1443; + case 0x8F: goto yy1465; + default: goto yy1445; } -yy1467: +yy1469: ++c; yych = *c; -yy1468: +yy1470: switch (yych) { case 0x01: case 0x02: @@ -70638,8 +70638,8 @@ yy1468: case '|': case '}': case '~': - case 0x7F: goto yy1467; - case '"': goto yy1457; + case 0x7F: goto yy1469; + case '"': goto yy1459; case 0xC2: case 0xC3: case 0xC4: @@ -70669,8 +70669,8 @@ yy1468: case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1469; - case 0xE0: goto yy1470; + case 0xDF: goto yy1471; + case 0xE0: goto yy1472; case 0xE1: case 0xE2: case 0xE3: @@ -70685,15 +70685,15 @@ yy1468: case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1471; - case 0xF0: goto yy1472; + case 0xEF: goto yy1473; + case 0xF0: goto yy1474; case 0xF1: case 0xF2: - case 0xF3: goto yy1473; - case 0xF4: goto yy1474; - default: goto yy1443; + case 0xF3: goto yy1475; + case 0xF4: goto yy1476; + default: goto yy1445; } -yy1469: +yy1471: ++c; yych = *c; switch (yych) { @@ -70760,10 +70760,10 @@ yy1469: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1467; - default: goto yy1443; + case 0xBF: goto yy1469; + default: goto yy1445; } -yy1470: +yy1472: ++c; yych = *c; switch (yych) { @@ -70798,10 +70798,10 @@ yy1470: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1469; - default: goto yy1443; + case 0xBF: goto yy1471; + default: goto yy1445; } -yy1471: +yy1473: ++c; yych = *c; switch (yych) { @@ -70868,10 +70868,10 @@ yy1471: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1469; - default: goto yy1443; + case 0xBF: goto yy1471; + default: goto yy1445; } -yy1472: +yy1474: ++c; yych = *c; switch (yych) { @@ -70922,10 +70922,10 @@ yy1472: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1471; - default: goto yy1443; + case 0xBF: goto yy1473; + default: goto yy1445; } -yy1473: +yy1475: ++c; yych = *c; switch (yych) { @@ -70992,10 +70992,10 @@ yy1473: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1471; - default: goto yy1443; + case 0xBF: goto yy1473; + default: goto yy1445; } -yy1474: +yy1476: ++c; yych = *c; switch (yych) { @@ -71014,8 +71014,8 @@ yy1474: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1471; - default: goto yy1443; + case 0x8F: goto yy1473; + default: goto yy1445; } } @@ -71153,11 +71153,11 @@ size_t scan_setext(const char * c) { case '|': case '}': case '~': - case 0x7F: goto yy1483; - case ' ': goto yy1478; - case '-': goto yy1482; - case '=': goto yy1481; - case 0xC2: goto yy1479; + case 0x7F: goto yy1485; + case ' ': goto yy1480; + case '-': goto yy1484; + case '=': goto yy1483; + case 0xC2: goto yy1481; case 0xC3: case 0xC4: case 0xC5: @@ -71186,8 +71186,8 @@ size_t scan_setext(const char * c) { case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1484; - case 0xE0: goto yy1485; + case 0xDF: goto yy1486; + case 0xE0: goto yy1487; case 0xE1: case 0xE2: case 0xE3: @@ -71202,26 +71202,26 @@ size_t scan_setext(const char * c) { case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1486; - case 0xF0: goto yy1487; + case 0xEF: goto yy1488; + case 0xF0: goto yy1489; case 0xF1: case 0xF2: - case 0xF3: goto yy1488; - case 0xF4: goto yy1489; - default: goto yy1477; + case 0xF3: goto yy1490; + case 0xF4: goto yy1491; + default: goto yy1479; } -yy1477: +yy1479: { return 0; } -yy1478: +yy1480: yych = *(marker = ++c); switch (yych) { - case ' ': goto yy1500; - case '-': goto yy1502; - case '=': goto yy1503; - case 0xC2: goto yy1501; - default: goto yy1477; + case ' ': goto yy1502; + case '-': goto yy1504; + case '=': goto yy1505; + case 0xC2: goto yy1503; + default: goto yy1479; } -yy1479: +yy1481: yych = *++c; switch (yych) { case 0x80: @@ -71286,29 +71286,29 @@ yy1479: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1483; - case 0xA0: goto yy1478; - default: goto yy1480; + case 0xBF: goto yy1485; + case 0xA0: goto yy1480; + default: goto yy1482; } -yy1480: +yy1482: c = marker; - goto yy1477; -yy1481: + goto yy1479; +yy1483: yych = *(marker = ++c); switch (yych) { - case '=': goto yy1495; - default: goto yy1477; + case '=': goto yy1497; + default: goto yy1479; } -yy1482: +yy1484: yych = *(marker = ++c); switch (yych) { - case '-': goto yy1490; - default: goto yy1477; + case '-': goto yy1492; + default: goto yy1479; } -yy1483: +yy1485: yych = *++c; - goto yy1477; -yy1484: + goto yy1479; +yy1486: yych = *++c; switch (yych) { case 0x80: @@ -71374,10 +71374,10 @@ yy1484: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1483; - default: goto yy1480; + case 0xBF: goto yy1485; + default: goto yy1482; } -yy1485: +yy1487: yych = *++c; switch (yych) { case 0xA0: @@ -71411,10 +71411,10 @@ yy1485: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1484; - default: goto yy1480; + case 0xBF: goto yy1486; + default: goto yy1482; } -yy1486: +yy1488: yych = *++c; switch (yych) { case 0x80: @@ -71480,10 +71480,10 @@ yy1486: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1484; - default: goto yy1480; + case 0xBF: goto yy1486; + default: goto yy1482; } -yy1487: +yy1489: yych = *++c; switch (yych) { case 0x90: @@ -71533,10 +71533,10 @@ yy1487: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1486; - default: goto yy1480; + case 0xBF: goto yy1488; + default: goto yy1482; } -yy1488: +yy1490: yych = *++c; switch (yych) { case 0x80: @@ -71602,10 +71602,10 @@ yy1488: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1486; - default: goto yy1480; + case 0xBF: goto yy1488; + default: goto yy1482; } -yy1489: +yy1491: yych = *++c; switch (yych) { case 0x80: @@ -71623,88 +71623,88 @@ yy1489: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1486; - default: goto yy1480; + case 0x8F: goto yy1488; + default: goto yy1482; } -yy1490: +yy1492: ++c; yych = *c; switch (yych) { case 0x00: - case '\n': goto yy1492; - case '\r': goto yy1494; - case '-': goto yy1490; - default: goto yy1480; + case '\n': goto yy1494; + case '\r': goto yy1496; + case '-': goto yy1492; + default: goto yy1482; } -yy1492: +yy1494: ++c; -yy1493: +yy1495: { return (size_t)( c - start ); } -yy1494: +yy1496: yych = *++c; switch (yych) { - case '\n': goto yy1492; - default: goto yy1493; + case '\n': goto yy1494; + default: goto yy1495; } -yy1495: +yy1497: ++c; yych = *c; switch (yych) { case 0x00: - case '\n': goto yy1497; - case '\r': goto yy1499; - case '=': goto yy1495; - default: goto yy1480; + case '\n': goto yy1499; + case '\r': goto yy1501; + case '=': goto yy1497; + default: goto yy1482; } -yy1497: +yy1499: ++c; -yy1498: +yy1500: { return (size_t)( c - start ); } -yy1499: +yy1501: yych = *++c; switch (yych) { - case '\n': goto yy1497; - default: goto yy1498; + case '\n': goto yy1499; + default: goto yy1500; } -yy1500: +yy1502: yych = *++c; switch (yych) { - case ' ': goto yy1504; - case '-': goto yy1502; - case '=': goto yy1503; - case 0xC2: goto yy1505; - default: goto yy1480; + case ' ': goto yy1506; + case '-': goto yy1504; + case '=': goto yy1505; + case 0xC2: goto yy1507; + default: goto yy1482; } -yy1501: +yy1503: yych = *++c; switch (yych) { - case 0xA0: goto yy1500; - default: goto yy1480; + case 0xA0: goto yy1502; + default: goto yy1482; } -yy1502: +yy1504: yych = *++c; switch (yych) { - case '-': goto yy1490; - default: goto yy1480; + case '-': goto yy1492; + default: goto yy1482; } -yy1503: +yy1505: yych = *++c; switch (yych) { - case '=': goto yy1495; - default: goto yy1480; + case '=': goto yy1497; + default: goto yy1482; } -yy1504: +yy1506: yych = *++c; switch (yych) { - case '-': goto yy1502; - case '=': goto yy1503; - default: goto yy1480; + case '-': goto yy1504; + case '=': goto yy1505; + default: goto yy1482; } -yy1505: +yy1507: ++c; switch ((yych = *c)) { - case 0xA0: goto yy1504; - default: goto yy1480; + case 0xA0: goto yy1506; + default: goto yy1482; } } @@ -71844,8 +71844,8 @@ size_t scan_atx(const char * c) { case '|': case '}': case '~': - case 0x7F: goto yy1510; - case '#': goto yy1509; + case 0x7F: goto yy1512; + case '#': goto yy1511; case 0xC2: case 0xC3: case 0xC4: @@ -71875,8 +71875,8 @@ size_t scan_atx(const char * c) { case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1511; - case 0xE0: goto yy1513; + case 0xDF: goto yy1513; + case 0xE0: goto yy1515; case 0xE1: case 0xE2: case 0xE3: @@ -71891,29 +71891,29 @@ size_t scan_atx(const char * c) { case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1514; - case 0xF0: goto yy1515; + case 0xEF: goto yy1516; + case 0xF0: goto yy1517; case 0xF1: case 0xF2: - case 0xF3: goto yy1516; - case 0xF4: goto yy1517; - default: goto yy1508; + case 0xF3: goto yy1518; + case 0xF4: goto yy1519; + default: goto yy1510; } -yy1508: +yy1510: { return 0; } -yy1509: +yy1511: yych = *(marker = ++c); switch (yych) { case '\t': - case ' ': goto yy1518; - case '#': goto yy1521; - case 0xC2: goto yy1520; - default: goto yy1508; + case ' ': goto yy1520; + case '#': goto yy1523; + case 0xC2: goto yy1522; + default: goto yy1510; } -yy1510: +yy1512: yych = *++c; - goto yy1508; -yy1511: + goto yy1510; +yy1513: yych = *++c; switch (yych) { case 0x80: @@ -71979,13 +71979,13 @@ yy1511: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1510; - default: goto yy1512; + case 0xBF: goto yy1512; + default: goto yy1514; } -yy1512: +yy1514: c = marker; - goto yy1508; -yy1513: + goto yy1510; +yy1515: yych = *++c; switch (yych) { case 0xA0: @@ -72019,10 +72019,10 @@ yy1513: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1511; - default: goto yy1512; + case 0xBF: goto yy1513; + default: goto yy1514; } -yy1514: +yy1516: yych = *++c; switch (yych) { case 0x80: @@ -72088,10 +72088,10 @@ yy1514: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1511; - default: goto yy1512; + case 0xBF: goto yy1513; + default: goto yy1514; } -yy1515: +yy1517: yych = *++c; switch (yych) { case 0x90: @@ -72141,10 +72141,10 @@ yy1515: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1514; - default: goto yy1512; + case 0xBF: goto yy1516; + default: goto yy1514; } -yy1516: +yy1518: yych = *++c; switch (yych) { case 0x80: @@ -72210,10 +72210,10 @@ yy1516: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1514; - default: goto yy1512; + case 0xBF: goto yy1516; + default: goto yy1514; } -yy1517: +yy1519: yych = *++c; switch (yych) { case 0x80: @@ -72231,10 +72231,10 @@ yy1517: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1514; - default: goto yy1512; + case 0x8F: goto yy1516; + default: goto yy1514; } -yy1518: +yy1520: ++c; yych = *c; switch (yych) { @@ -72360,10 +72360,10 @@ yy1518: case '|': case '}': case '~': - case 0x7F: goto yy1523; + case 0x7F: goto yy1525; case '\t': - case ' ': goto yy1518; - case 0xC2: goto yy1525; + case ' ': goto yy1520; + case 0xC2: goto yy1527; case 0xC3: case 0xC4: case 0xC5: @@ -72392,8 +72392,8 @@ yy1518: case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy1526; - case 0xE0: goto yy1527; + case 0xDF: goto yy1528; + case 0xE0: goto yy1529; case 0xE1: case 0xE2: case 0xE3: @@ -72408,34 +72408,34 @@ yy1518: case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy1528; - case 0xF0: goto yy1529; + case 0xEF: goto yy1530; + case 0xF0: goto yy1531; case 0xF1: case 0xF2: - case 0xF3: goto yy1530; - case 0xF4: goto yy1531; - default: goto yy1512; + case 0xF3: goto yy1532; + case 0xF4: goto yy1533; + default: goto yy1514; } -yy1520: +yy1522: yych = *++c; switch (yych) { - case 0xA0: goto yy1518; - default: goto yy1512; + case 0xA0: goto yy1520; + default: goto yy1514; } -yy1521: +yy1523: ++c; yych = *c; switch (yych) { case '\t': - case ' ': goto yy1518; - case '#': goto yy1521; - case 0xC2: goto yy1520; - default: goto yy1512; + case ' ': goto yy1520; + case '#': goto yy1523; + case 0xC2: goto yy1522; + default: goto yy1514; } -yy1523: +yy1525: ++c; { return (size_t)( c - start ); } -yy1525: +yy1527: ++c; yych = *c; switch (yych) { @@ -72501,11 +72501,11 @@ yy1525: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1523; - case 0xA0: goto yy1518; - default: goto yy1512; + case 0xBF: goto yy1525; + case 0xA0: goto yy1520; + default: goto yy1514; } -yy1526: +yy1528: yych = *++c; switch (yych) { case 0x80: @@ -72571,10 +72571,10 @@ yy1526: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1523; - default: goto yy1512; + case 0xBF: goto yy1525; + default: goto yy1514; } -yy1527: +yy1529: yych = *++c; switch (yych) { case 0xA0: @@ -72608,10 +72608,10 @@ yy1527: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1526; - default: goto yy1512; + case 0xBF: goto yy1528; + default: goto yy1514; } -yy1528: +yy1530: yych = *++c; switch (yych) { case 0x80: @@ -72677,10 +72677,10 @@ yy1528: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1526; - default: goto yy1512; + case 0xBF: goto yy1528; + default: goto yy1514; } -yy1529: +yy1531: yych = *++c; switch (yych) { case 0x90: @@ -72730,10 +72730,10 @@ yy1529: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1528; - default: goto yy1512; + case 0xBF: goto yy1530; + default: goto yy1514; } -yy1530: +yy1532: yych = *++c; switch (yych) { case 0x80: @@ -72799,10 +72799,10 @@ yy1530: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy1528; - default: goto yy1512; + case 0xBF: goto yy1530; + default: goto yy1514; } -yy1531: +yy1533: ++c; switch ((yych = *c)) { case 0x80: @@ -72820,8 +72820,8 @@ yy1531: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy1528; - default: goto yy1512; + case 0x8F: goto yy1530; + default: goto yy1514; } } diff --git a/Sources/libMultiMarkdown/scanners.re b/Sources/libMultiMarkdown/scanners.re index d15e178..d6341ee 100644 --- a/Sources/libMultiMarkdown/scanners.re +++ b/Sources/libMultiMarkdown/scanners.re @@ -144,7 +144,8 @@ definition = non_indent ':' sp [^\n\r\x00]; - table_separator = (('|' [:\-= \240\t|+]*) | ([:\-= \240\t+]+ '|' [:\-= \240\t|+]*)) nl_eof; + table_sep_cell = [ \240\t]* [:\-=+]+ [ \240\t]*; + table_separator = '|'? ( table_sep_cell '|')+ [ \240\t]* nl_eof; align = [\-=]+; align_left = sp ':' align sp ('|' | nl_eof); diff --git a/tests/MMD6Tests/Dutch.html b/tests/MMD6Tests/Dutch.html index 1b4a239..4157180 100644 --- a/tests/MMD6Tests/Dutch.html +++ b/tests/MMD6Tests/Dutch.html @@ -3,7 +3,6 @@ Dutch - diff --git a/tests/MMD6Tests/Dutch.tex b/tests/MMD6Tests/Dutch.tex index 2a6ff00..60dc59f 100644 --- a/tests/MMD6Tests/Dutch.tex +++ b/tests/MMD6Tests/Dutch.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{Dutch} -\def\language{nl} \input{mmd6-article-begin} `foo' diff --git a/tests/MMD6Tests/English.html b/tests/MMD6Tests/English.html index 8774910..69bb642 100644 --- a/tests/MMD6Tests/English.html +++ b/tests/MMD6Tests/English.html @@ -3,7 +3,6 @@ English - diff --git a/tests/MMD6Tests/English.tex b/tests/MMD6Tests/English.tex index fa2865e..f8f7762 100644 --- a/tests/MMD6Tests/English.tex +++ b/tests/MMD6Tests/English.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{English} -\def\language{en} \input{mmd6-article-begin} `foo' diff --git a/tests/MMD6Tests/French.html b/tests/MMD6Tests/French.html index 08afd2e..daaa861 100644 --- a/tests/MMD6Tests/French.html +++ b/tests/MMD6Tests/French.html @@ -3,7 +3,6 @@ French - diff --git a/tests/MMD6Tests/French.tex b/tests/MMD6Tests/French.tex index 6c24fbb..2d640a2 100644 --- a/tests/MMD6Tests/French.tex +++ b/tests/MMD6Tests/French.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{French} -\def\language{fr} \input{mmd6-article-begin} 'foo' diff --git a/tests/MMD6Tests/German Guillemets.html b/tests/MMD6Tests/German Guillemets.html index d09d68b..f31baec 100644 --- a/tests/MMD6Tests/German Guillemets.html +++ b/tests/MMD6Tests/German Guillemets.html @@ -3,7 +3,6 @@ German Guillemets - diff --git a/tests/MMD6Tests/German Guillemets.tex b/tests/MMD6Tests/German Guillemets.tex index caa4443..35e598b 100644 --- a/tests/MMD6Tests/German Guillemets.tex +++ b/tests/MMD6Tests/German Guillemets.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{German Guillemets} -\def\language{de} \input{mmd6-article-begin} ›foo‹ diff --git a/tests/MMD6Tests/German.html b/tests/MMD6Tests/German.html index bb895e7..c0ee276 100644 --- a/tests/MMD6Tests/German.html +++ b/tests/MMD6Tests/German.html @@ -3,7 +3,6 @@ German - diff --git a/tests/MMD6Tests/German.tex b/tests/MMD6Tests/German.tex index 5a4096b..94d68e7 100644 --- a/tests/MMD6Tests/German.tex +++ b/tests/MMD6Tests/German.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{German} -\def\language{de} \input{mmd6-article-begin} ‚foo` diff --git a/tests/MMD6Tests/Spanish.html b/tests/MMD6Tests/Spanish.html index 1b49bc3..55fd08a 100644 --- a/tests/MMD6Tests/Spanish.html +++ b/tests/MMD6Tests/Spanish.html @@ -3,7 +3,6 @@ Spanish - diff --git a/tests/MMD6Tests/Spanish.tex b/tests/MMD6Tests/Spanish.tex index fe8e732..5da7605 100644 --- a/tests/MMD6Tests/Spanish.tex +++ b/tests/MMD6Tests/Spanish.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{Spanish} -\def\language{es} \input{mmd6-article-begin} `foo' diff --git a/tests/MMD6Tests/Swedish.html b/tests/MMD6Tests/Swedish.html index 56d52fa..d1d9e09 100644 --- a/tests/MMD6Tests/Swedish.html +++ b/tests/MMD6Tests/Swedish.html @@ -3,7 +3,6 @@ Swedish - diff --git a/tests/MMD6Tests/Swedish.tex b/tests/MMD6Tests/Swedish.tex index 8aa8da0..81d0870 100644 --- a/tests/MMD6Tests/Swedish.tex +++ b/tests/MMD6Tests/Swedish.tex @@ -1,6 +1,5 @@ \input{mmd6-article-leader} \def\mytitle{Swedish} -\def\language{sv} \input{mmd6-article-begin} 'foo'