From e0fb09207dbeb470471adcfc2cec6c228c3338a7 Mon Sep 17 00:00:00 2001
From: John Haugeland <stonecypher@gmail.com>
Date: Sat, 6 Jul 2024 11:48:48 -0700
Subject: [PATCH] Tidy up alternative graphing in viz.  Fixes
 StoneCypher/fsl#374, fixes StoneCypher/fsl#1296

---
 src/ts/fsl_parser.peg |   1 +
 src/ts/fsl_parser.ts  | 895 +++++++++++++++++++++---------------------
 src/ts/jssm_types.ts  |   2 +-
 src/ts/version.ts     |   4 +-
 4 files changed, 457 insertions(+), 445 deletions(-)

diff --git a/src/ts/fsl_parser.peg b/src/ts/fsl_parser.peg
index 3ab98e6e..65b221dc 100644
--- a/src/ts/fsl_parser.peg
+++ b/src/ts/fsl_parser.peg
@@ -809,6 +809,7 @@ GvizLayout
   / "circo"
   / "fdp"
   / "neato"
+  / "twopi";
 
 // StateItemShapeKey
 //   = "shape"
diff --git a/src/ts/fsl_parser.ts b/src/ts/fsl_parser.ts
index 47322969..f92fa64d 100644
--- a/src/ts/fsl_parser.ts
+++ b/src/ts/fsl_parser.ts
@@ -1514,206 +1514,208 @@ function peg$parse(input, options) {
       peg$c1325 = peg$literalExpectation("fdp", false),
       peg$c1326 = "neato",
       peg$c1327 = peg$literalExpectation("neato", false),
-      peg$c1328 = "state",
-      peg$c1329 = peg$literalExpectation("state", false),
-      peg$c1330 = function(state_items) {
+      peg$c1328 = "twopi",
+      peg$c1329 = peg$literalExpectation("twopi", false),
+      peg$c1330 = "state",
+      peg$c1331 = peg$literalExpectation("state", false),
+      peg$c1332 = function(state_items) {
           return { key: "default_state_config", value: state_items || [] };
         },
-      peg$c1331 = "start_state",
-      peg$c1332 = peg$literalExpectation("start_state", false),
-      peg$c1333 = function(state_items) {
+      peg$c1333 = "start_state",
+      peg$c1334 = peg$literalExpectation("start_state", false),
+      peg$c1335 = function(state_items) {
           return { key: "default_start_state_config", value: state_items || [] };
         },
-      peg$c1334 = "end_state",
-      peg$c1335 = peg$literalExpectation("end_state", false),
-      peg$c1336 = function(state_items) {
+      peg$c1336 = "end_state",
+      peg$c1337 = peg$literalExpectation("end_state", false),
+      peg$c1338 = function(state_items) {
           return { key: "default_end_state_config", value: state_items || [] };
         },
-      peg$c1337 = "active_state",
-      peg$c1338 = peg$literalExpectation("active_state", false),
-      peg$c1339 = function(state_items) {
+      peg$c1339 = "active_state",
+      peg$c1340 = peg$literalExpectation("active_state", false),
+      peg$c1341 = function(state_items) {
           return { key: "default_active_state_config", value: state_items || [] };
         },
-      peg$c1340 = "terminal_state",
-      peg$c1341 = peg$literalExpectation("terminal_state", false),
-      peg$c1342 = function(state_items) {
+      peg$c1342 = "terminal_state",
+      peg$c1343 = peg$literalExpectation("terminal_state", false),
+      peg$c1344 = function(state_items) {
           return { key: "default_terminal_state_config", value: state_items || [] };
         },
-      peg$c1343 = "hooked_state",
-      peg$c1344 = peg$literalExpectation("hooked_state", false),
-      peg$c1345 = function(state_items) {
+      peg$c1345 = "hooked_state",
+      peg$c1346 = peg$literalExpectation("hooked_state", false),
+      peg$c1347 = function(state_items) {
           return { key: "default_hooked_state_config", value: state_items || [] };
         },
-      peg$c1346 = function(actionkey, value) { return {key:actionkey, value:value}; },
-      peg$c1347 = "action",
-      peg$c1348 = peg$literalExpectation("action", false),
-      peg$c1349 = function(action_items) {
+      peg$c1348 = function(actionkey, value) { return {key:actionkey, value:value}; },
+      peg$c1349 = "action",
+      peg$c1350 = peg$literalExpectation("action", false),
+      peg$c1351 = function(action_items) {
           return { config_kind: "action", config_items: action_items || [] };
         },
-      peg$c1350 = function(key, value) { return { key, value }; },
-      peg$c1351 = peg$otherExpectation("graph default edge color"),
-      peg$c1352 = function(value) { return { key:'graph_default_edge_color', value }; },
-      peg$c1353 = "transition",
-      peg$c1354 = peg$literalExpectation("transition", false),
-      peg$c1355 = function(transition_items) {
+      peg$c1352 = function(key, value) { return { key, value }; },
+      peg$c1353 = peg$otherExpectation("graph default edge color"),
+      peg$c1354 = function(value) { return { key:'graph_default_edge_color', value }; },
+      peg$c1355 = "transition",
+      peg$c1356 = peg$literalExpectation("transition", false),
+      peg$c1357 = function(transition_items) {
           return { config_kind: "transition", config_items: transition_items || [] };
         },
-      peg$c1356 = "graph_layout",
-      peg$c1357 = peg$literalExpectation("graph_layout", false),
-      peg$c1358 = function(value) { return { key: "graph_layout",    value: value }; },
-      peg$c1359 = "start_states",
-      peg$c1360 = peg$literalExpectation("start_states", false),
-      peg$c1361 = function(value) { return { key: "start_states",    value: value }; },
-      peg$c1362 = "end_states",
-      peg$c1363 = peg$literalExpectation("end_states", false),
-      peg$c1364 = function(value) { return { key: "end_states",      value: value }; },
-      peg$c1365 = "graph_bg_color",
-      peg$c1366 = peg$literalExpectation("graph_bg_color", false),
-      peg$c1367 = function(value) { return { key: "graph_bg_color",  value: value }; },
-      peg$c1368 = "allows_override",
-      peg$c1369 = peg$literalExpectation("allows_override", false),
-      peg$c1370 = function(value) { return { key: "allows_override", value: value }; },
-      peg$c1371 = function() { return true;      },
-      peg$c1372 = function() { return false;     },
-      peg$c1373 = peg$otherExpectation("configuration"),
-      peg$c1374 = "MIT",
-      peg$c1375 = peg$literalExpectation("MIT", false),
-      peg$c1376 = "BSD 2-clause",
-      peg$c1377 = peg$literalExpectation("BSD 2-clause", false),
-      peg$c1378 = "BSD 3-clause",
-      peg$c1379 = peg$literalExpectation("BSD 3-clause", false),
-      peg$c1380 = "Apache 2.0",
-      peg$c1381 = peg$literalExpectation("Apache 2.0", false),
-      peg$c1382 = "Mozilla 2.0",
-      peg$c1383 = peg$literalExpectation("Mozilla 2.0", false),
-      peg$c1384 = "Public domain",
-      peg$c1385 = peg$literalExpectation("Public domain", false),
-      peg$c1386 = "GPL v2",
-      peg$c1387 = peg$literalExpectation("GPL v2", false),
-      peg$c1388 = "GPL v3",
-      peg$c1389 = peg$literalExpectation("GPL v3", false),
-      peg$c1390 = "LGPL v2.1",
-      peg$c1391 = peg$literalExpectation("LGPL v2.1", false),
-      peg$c1392 = "LGPL v3.0",
-      peg$c1393 = peg$literalExpectation("LGPL v3.0", false),
-      peg$c1394 = "Unknown",
-      peg$c1395 = peg$literalExpectation("Unknown", false),
-      peg$c1396 = peg$otherExpectation("direction"),
-      peg$c1397 = "up",
-      peg$c1398 = peg$literalExpectation("up", false),
-      peg$c1399 = "right",
-      peg$c1400 = peg$literalExpectation("right", false),
-      peg$c1401 = "down",
-      peg$c1402 = peg$literalExpectation("down", false),
-      peg$c1403 = "left",
-      peg$c1404 = peg$literalExpectation("left", false),
-      peg$c1405 = peg$otherExpectation("hook definition (open/closed)"),
-      peg$c1406 = "open",
-      peg$c1407 = peg$literalExpectation("open", false),
-      peg$c1408 = "closed",
-      peg$c1409 = peg$literalExpectation("closed", false),
-      peg$c1410 = "machine_author",
-      peg$c1411 = peg$literalExpectation("machine_author", false),
-      peg$c1412 = function(value) { return { key: "machine_author", value }; },
-      peg$c1413 = "machine_contributor",
-      peg$c1414 = peg$literalExpectation("machine_contributor", false),
-      peg$c1415 = function(value) { return { key: "machine_contributor", value }; },
-      peg$c1416 = "machine_comment",
-      peg$c1417 = peg$literalExpectation("machine_comment", false),
-      peg$c1418 = function(value) { return { key: "machine_comment", value }; },
-      peg$c1419 = "machine_definition",
-      peg$c1420 = peg$literalExpectation("machine_definition", false),
-      peg$c1421 = function(value) { return { key: "machine_definition", value }; },
-      peg$c1422 = "machine_name",
-      peg$c1423 = peg$literalExpectation("machine_name", false),
-      peg$c1424 = function(value) { return { key: "machine_name", value }; },
-      peg$c1425 = "machine_reference",
-      peg$c1426 = peg$literalExpectation("machine_reference", false),
-      peg$c1427 = function(value) { return { key: "machine_reference", value }; },
-      peg$c1428 = "machine_version",
-      peg$c1429 = peg$literalExpectation("machine_version", false),
-      peg$c1430 = function(value) { return { key: "machine_version", value }; },
-      peg$c1431 = "machine_license",
-      peg$c1432 = peg$literalExpectation("machine_license", false),
-      peg$c1433 = function(value) { return { key: "machine_license", value }; },
-      peg$c1434 = "machine_language",
-      peg$c1435 = peg$literalExpectation("machine_language", false),
-      peg$c1436 = function(value) { return { key: "machine_language", value }; },
-      peg$c1437 = "fsl_version",
-      peg$c1438 = peg$literalExpectation("fsl_version", false),
-      peg$c1439 = function(value) { return { key: "fsl_version", value }; },
-      peg$c1440 = "theme",
-      peg$c1441 = peg$literalExpectation("theme", false),
-      peg$c1442 = function(value) { return { key: "theme", value }; },
-      peg$c1443 = "flow",
-      peg$c1444 = peg$literalExpectation("flow", false),
-      peg$c1445 = function(value) { return { key: "flow", value }; },
-      peg$c1446 = "hooks",
-      peg$c1447 = peg$literalExpectation("hooks", false),
-      peg$c1448 = function(value) { return { key: "hook_definition", value }; },
-      peg$c1449 = "dot_preamble",
-      peg$c1450 = peg$literalExpectation("dot_preamble", false),
-      peg$c1451 = function(value) { return { key: "dot_preamble", value }; },
-      peg$c1452 = peg$otherExpectation("machine attribute"),
-      peg$c1453 = "label",
-      peg$c1454 = peg$literalExpectation("label", false),
-      peg$c1455 = function(value) { return { key:'state-label', value }; },
-      peg$c1456 = "color",
-      peg$c1457 = peg$literalExpectation("color", false),
-      peg$c1458 = function(value) { return { key:'color', value }; },
-      peg$c1459 = peg$otherExpectation("text color"),
-      peg$c1460 = "text-color",
-      peg$c1461 = peg$literalExpectation("text-color", false),
-      peg$c1462 = function(value) { return { key:'text-color', value }; },
-      peg$c1463 = peg$otherExpectation("background color"),
-      peg$c1464 = "background-color",
-      peg$c1465 = peg$literalExpectation("background-color", false),
-      peg$c1466 = function(value) { return { key:'background-color', value }; },
-      peg$c1467 = peg$otherExpectation("border color"),
-      peg$c1468 = "border-color",
-      peg$c1469 = peg$literalExpectation("border-color", false),
-      peg$c1470 = function(value) { return { key:'border-color', value }; },
-      peg$c1471 = peg$otherExpectation("shape"),
-      peg$c1472 = "shape",
-      peg$c1473 = peg$literalExpectation("shape", false),
-      peg$c1474 = function(value) { return { key:'shape', value }; },
-      peg$c1475 = peg$otherExpectation("corners"),
-      peg$c1476 = "corners",
-      peg$c1477 = peg$literalExpectation("corners", false),
-      peg$c1478 = function(value) { return { key:'corners', value }; },
-      peg$c1479 = peg$otherExpectation("linestyle"),
-      peg$c1480 = function(value) { return { key:'line-style', value }; },
-      peg$c1481 = "linestyle",
-      peg$c1482 = peg$literalExpectation("linestyle", false),
-      peg$c1483 = peg$otherExpectation("state property"),
-      peg$c1484 = "property",
-      peg$c1485 = peg$literalExpectation("property", false),
-      peg$c1486 = function(name, value) {
+      peg$c1358 = "graph_layout",
+      peg$c1359 = peg$literalExpectation("graph_layout", false),
+      peg$c1360 = function(value) { return { key: "graph_layout",    value: value }; },
+      peg$c1361 = "start_states",
+      peg$c1362 = peg$literalExpectation("start_states", false),
+      peg$c1363 = function(value) { return { key: "start_states",    value: value }; },
+      peg$c1364 = "end_states",
+      peg$c1365 = peg$literalExpectation("end_states", false),
+      peg$c1366 = function(value) { return { key: "end_states",      value: value }; },
+      peg$c1367 = "graph_bg_color",
+      peg$c1368 = peg$literalExpectation("graph_bg_color", false),
+      peg$c1369 = function(value) { return { key: "graph_bg_color",  value: value }; },
+      peg$c1370 = "allows_override",
+      peg$c1371 = peg$literalExpectation("allows_override", false),
+      peg$c1372 = function(value) { return { key: "allows_override", value: value }; },
+      peg$c1373 = function() { return true;      },
+      peg$c1374 = function() { return false;     },
+      peg$c1375 = peg$otherExpectation("configuration"),
+      peg$c1376 = "MIT",
+      peg$c1377 = peg$literalExpectation("MIT", false),
+      peg$c1378 = "BSD 2-clause",
+      peg$c1379 = peg$literalExpectation("BSD 2-clause", false),
+      peg$c1380 = "BSD 3-clause",
+      peg$c1381 = peg$literalExpectation("BSD 3-clause", false),
+      peg$c1382 = "Apache 2.0",
+      peg$c1383 = peg$literalExpectation("Apache 2.0", false),
+      peg$c1384 = "Mozilla 2.0",
+      peg$c1385 = peg$literalExpectation("Mozilla 2.0", false),
+      peg$c1386 = "Public domain",
+      peg$c1387 = peg$literalExpectation("Public domain", false),
+      peg$c1388 = "GPL v2",
+      peg$c1389 = peg$literalExpectation("GPL v2", false),
+      peg$c1390 = "GPL v3",
+      peg$c1391 = peg$literalExpectation("GPL v3", false),
+      peg$c1392 = "LGPL v2.1",
+      peg$c1393 = peg$literalExpectation("LGPL v2.1", false),
+      peg$c1394 = "LGPL v3.0",
+      peg$c1395 = peg$literalExpectation("LGPL v3.0", false),
+      peg$c1396 = "Unknown",
+      peg$c1397 = peg$literalExpectation("Unknown", false),
+      peg$c1398 = peg$otherExpectation("direction"),
+      peg$c1399 = "up",
+      peg$c1400 = peg$literalExpectation("up", false),
+      peg$c1401 = "right",
+      peg$c1402 = peg$literalExpectation("right", false),
+      peg$c1403 = "down",
+      peg$c1404 = peg$literalExpectation("down", false),
+      peg$c1405 = "left",
+      peg$c1406 = peg$literalExpectation("left", false),
+      peg$c1407 = peg$otherExpectation("hook definition (open/closed)"),
+      peg$c1408 = "open",
+      peg$c1409 = peg$literalExpectation("open", false),
+      peg$c1410 = "closed",
+      peg$c1411 = peg$literalExpectation("closed", false),
+      peg$c1412 = "machine_author",
+      peg$c1413 = peg$literalExpectation("machine_author", false),
+      peg$c1414 = function(value) { return { key: "machine_author", value }; },
+      peg$c1415 = "machine_contributor",
+      peg$c1416 = peg$literalExpectation("machine_contributor", false),
+      peg$c1417 = function(value) { return { key: "machine_contributor", value }; },
+      peg$c1418 = "machine_comment",
+      peg$c1419 = peg$literalExpectation("machine_comment", false),
+      peg$c1420 = function(value) { return { key: "machine_comment", value }; },
+      peg$c1421 = "machine_definition",
+      peg$c1422 = peg$literalExpectation("machine_definition", false),
+      peg$c1423 = function(value) { return { key: "machine_definition", value }; },
+      peg$c1424 = "machine_name",
+      peg$c1425 = peg$literalExpectation("machine_name", false),
+      peg$c1426 = function(value) { return { key: "machine_name", value }; },
+      peg$c1427 = "machine_reference",
+      peg$c1428 = peg$literalExpectation("machine_reference", false),
+      peg$c1429 = function(value) { return { key: "machine_reference", value }; },
+      peg$c1430 = "machine_version",
+      peg$c1431 = peg$literalExpectation("machine_version", false),
+      peg$c1432 = function(value) { return { key: "machine_version", value }; },
+      peg$c1433 = "machine_license",
+      peg$c1434 = peg$literalExpectation("machine_license", false),
+      peg$c1435 = function(value) { return { key: "machine_license", value }; },
+      peg$c1436 = "machine_language",
+      peg$c1437 = peg$literalExpectation("machine_language", false),
+      peg$c1438 = function(value) { return { key: "machine_language", value }; },
+      peg$c1439 = "fsl_version",
+      peg$c1440 = peg$literalExpectation("fsl_version", false),
+      peg$c1441 = function(value) { return { key: "fsl_version", value }; },
+      peg$c1442 = "theme",
+      peg$c1443 = peg$literalExpectation("theme", false),
+      peg$c1444 = function(value) { return { key: "theme", value }; },
+      peg$c1445 = "flow",
+      peg$c1446 = peg$literalExpectation("flow", false),
+      peg$c1447 = function(value) { return { key: "flow", value }; },
+      peg$c1448 = "hooks",
+      peg$c1449 = peg$literalExpectation("hooks", false),
+      peg$c1450 = function(value) { return { key: "hook_definition", value }; },
+      peg$c1451 = "dot_preamble",
+      peg$c1452 = peg$literalExpectation("dot_preamble", false),
+      peg$c1453 = function(value) { return { key: "dot_preamble", value }; },
+      peg$c1454 = peg$otherExpectation("machine attribute"),
+      peg$c1455 = "label",
+      peg$c1456 = peg$literalExpectation("label", false),
+      peg$c1457 = function(value) { return { key:'state-label', value }; },
+      peg$c1458 = "color",
+      peg$c1459 = peg$literalExpectation("color", false),
+      peg$c1460 = function(value) { return { key:'color', value }; },
+      peg$c1461 = peg$otherExpectation("text color"),
+      peg$c1462 = "text-color",
+      peg$c1463 = peg$literalExpectation("text-color", false),
+      peg$c1464 = function(value) { return { key:'text-color', value }; },
+      peg$c1465 = peg$otherExpectation("background color"),
+      peg$c1466 = "background-color",
+      peg$c1467 = peg$literalExpectation("background-color", false),
+      peg$c1468 = function(value) { return { key:'background-color', value }; },
+      peg$c1469 = peg$otherExpectation("border color"),
+      peg$c1470 = "border-color",
+      peg$c1471 = peg$literalExpectation("border-color", false),
+      peg$c1472 = function(value) { return { key:'border-color', value }; },
+      peg$c1473 = peg$otherExpectation("shape"),
+      peg$c1474 = "shape",
+      peg$c1475 = peg$literalExpectation("shape", false),
+      peg$c1476 = function(value) { return { key:'shape', value }; },
+      peg$c1477 = peg$otherExpectation("corners"),
+      peg$c1478 = "corners",
+      peg$c1479 = peg$literalExpectation("corners", false),
+      peg$c1480 = function(value) { return { key:'corners', value }; },
+      peg$c1481 = peg$otherExpectation("linestyle"),
+      peg$c1482 = function(value) { return { key:'line-style', value }; },
+      peg$c1483 = "linestyle",
+      peg$c1484 = peg$literalExpectation("linestyle", false),
+      peg$c1485 = peg$otherExpectation("state property"),
+      peg$c1486 = "property",
+      peg$c1487 = peg$literalExpectation("property", false),
+      peg$c1488 = function(name, value) {
           return { key: 'state_property', name, value }
         },
-      peg$c1487 = "required",
-      peg$c1488 = peg$literalExpectation("required", false),
-      peg$c1489 = function(name, value) {
+      peg$c1489 = "required",
+      peg$c1490 = peg$literalExpectation("required", false),
+      peg$c1491 = function(name, value) {
           return { key: 'state_property', name, value, required: true }
         },
-      peg$c1490 = function(name, value) { return { key:'state_declaration', name, value }; },
-      peg$c1491 = "&",
-      peg$c1492 = peg$literalExpectation("&", false),
-      peg$c1493 = function(name, value) { return { key:'named_list', name, value }; },
-      peg$c1494 = function(name, default_value) { return { key:'property_definition', name, default_value, required: true }; },
-      peg$c1495 = function(name) { return { key:'property_definition', name,                required: true }; },
-      peg$c1496 = function(name, default_value) { return { key:'property_definition', name, default_value                 }; },
-      peg$c1497 = function(name) { return { key:'property_definition', name                                }; },
-      peg$c1498 = "arrange",
-      peg$c1499 = peg$literalExpectation("arrange", false),
-      peg$c1500 = function(value) { return { key: 'arrange_declaration', value }; },
-      peg$c1501 = "arrange-start",
-      peg$c1502 = peg$literalExpectation("arrange-start", false),
-      peg$c1503 = function(value) { return { key: 'arrange_start_declaration', value }; },
-      peg$c1504 = "arrange-end",
-      peg$c1505 = peg$literalExpectation("arrange-end", false),
-      peg$c1506 = function(value) { return { key: 'arrange_end_declaration', value }; },
-      peg$c1507 = peg$otherExpectation("arrange declaration"),
+      peg$c1492 = function(name, value) { return { key:'state_declaration', name, value }; },
+      peg$c1493 = "&",
+      peg$c1494 = peg$literalExpectation("&", false),
+      peg$c1495 = function(name, value) { return { key:'named_list', name, value }; },
+      peg$c1496 = function(name, default_value) { return { key:'property_definition', name, default_value, required: true }; },
+      peg$c1497 = function(name) { return { key:'property_definition', name,                required: true }; },
+      peg$c1498 = function(name, default_value) { return { key:'property_definition', name, default_value                 }; },
+      peg$c1499 = function(name) { return { key:'property_definition', name                                }; },
+      peg$c1500 = "arrange",
+      peg$c1501 = peg$literalExpectation("arrange", false),
+      peg$c1502 = function(value) { return { key: 'arrange_declaration', value }; },
+      peg$c1503 = "arrange-start",
+      peg$c1504 = peg$literalExpectation("arrange-start", false),
+      peg$c1505 = function(value) { return { key: 'arrange_start_declaration', value }; },
+      peg$c1506 = "arrange-end",
+      peg$c1507 = peg$literalExpectation("arrange-end", false),
+      peg$c1508 = function(value) { return { key: 'arrange_end_declaration', value }; },
+      peg$c1509 = peg$otherExpectation("arrange declaration"),
 
       peg$currPos          = 0,
       peg$savedPos         = 0,
@@ -12191,6 +12193,15 @@ function peg$parse(input, options) {
             s0 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$c1327); }
           }
+          if (s0 === peg$FAILED) {
+            if (input.substr(peg$currPos, 5) === peg$c1328) {
+              s0 = peg$c1328;
+              peg$currPos += 5;
+            } else {
+              s0 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$c1329); }
+            }
+          }
         }
       }
     }
@@ -12224,12 +12235,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1328) {
-        s2 = peg$c1328;
+      if (input.substr(peg$currPos, 5) === peg$c1330) {
+        s2 = peg$c1330;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1329); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1331); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -12287,7 +12298,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1330(s8);
+                          s1 = peg$c1332(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -12346,12 +12357,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 11) === peg$c1331) {
-        s2 = peg$c1331;
+      if (input.substr(peg$currPos, 11) === peg$c1333) {
+        s2 = peg$c1333;
         peg$currPos += 11;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1332); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1334); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -12409,7 +12420,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1333(s8);
+                          s1 = peg$c1335(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -12468,12 +12479,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 9) === peg$c1334) {
-        s2 = peg$c1334;
+      if (input.substr(peg$currPos, 9) === peg$c1336) {
+        s2 = peg$c1336;
         peg$currPos += 9;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1335); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1337); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -12531,7 +12542,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1336(s8);
+                          s1 = peg$c1338(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -12590,12 +12601,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1337) {
-        s2 = peg$c1337;
+      if (input.substr(peg$currPos, 12) === peg$c1339) {
+        s2 = peg$c1339;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1338); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1340); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -12653,7 +12664,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1339(s8);
+                          s1 = peg$c1341(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -12712,12 +12723,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 14) === peg$c1340) {
-        s2 = peg$c1340;
+      if (input.substr(peg$currPos, 14) === peg$c1342) {
+        s2 = peg$c1342;
         peg$currPos += 14;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1341); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1343); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -12775,7 +12786,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1342(s8);
+                          s1 = peg$c1344(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -12834,12 +12845,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1343) {
-        s2 = peg$c1343;
+      if (input.substr(peg$currPos, 12) === peg$c1345) {
+        s2 = peg$c1345;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1344); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1346); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -12897,7 +12908,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1345(s8);
+                          s1 = peg$c1347(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -13018,7 +13029,7 @@ function peg$parse(input, options) {
           }
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c1346(s1, s3);
+            s1 = peg$c1348(s1, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -13066,12 +13077,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c1347) {
-        s2 = peg$c1347;
+      if (input.substr(peg$currPos, 6) === peg$c1349) {
+        s2 = peg$c1349;
         peg$currPos += 6;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1348); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1350); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13129,7 +13140,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1349(s8);
+                          s1 = peg$c1351(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -13227,7 +13238,7 @@ function peg$parse(input, options) {
           }
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c1350(s1, s3);
+            s1 = peg$c1352(s1, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -13326,7 +13337,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1352(s6);
+                      s1 = peg$c1354(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -13367,7 +13378,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1351); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1353); }
     }
 
     return s0;
@@ -13382,12 +13393,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 10) === peg$c1353) {
-        s2 = peg$c1353;
+      if (input.substr(peg$currPos, 10) === peg$c1355) {
+        s2 = peg$c1355;
         peg$currPos += 10;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1354); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1356); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13445,7 +13456,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1355(s8);
+                          s1 = peg$c1357(s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -13504,12 +13515,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1356) {
-        s2 = peg$c1356;
+      if (input.substr(peg$currPos, 12) === peg$c1358) {
+        s2 = peg$c1358;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1357); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1359); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13551,7 +13562,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1358(s6);
+                      s1 = peg$c1360(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -13602,12 +13613,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1359) {
-        s2 = peg$c1359;
+      if (input.substr(peg$currPos, 12) === peg$c1361) {
+        s2 = peg$c1361;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1360); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1362); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13649,7 +13660,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1361(s6);
+                      s1 = peg$c1363(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -13700,12 +13711,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 10) === peg$c1362) {
-        s2 = peg$c1362;
+      if (input.substr(peg$currPos, 10) === peg$c1364) {
+        s2 = peg$c1364;
         peg$currPos += 10;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1363); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1365); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13747,7 +13758,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1364(s6);
+                      s1 = peg$c1366(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -13798,12 +13809,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 14) === peg$c1365) {
-        s2 = peg$c1365;
+      if (input.substr(peg$currPos, 14) === peg$c1367) {
+        s2 = peg$c1367;
         peg$currPos += 14;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1366); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1368); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13845,7 +13856,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1367(s6);
+                      s1 = peg$c1369(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -13896,12 +13907,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 15) === peg$c1368) {
-        s2 = peg$c1368;
+      if (input.substr(peg$currPos, 15) === peg$c1370) {
+        s2 = peg$c1370;
         peg$currPos += 15;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1369); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1371); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -13943,7 +13954,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1370(s6);
+                      s1 = peg$c1372(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -13998,7 +14009,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c1371();
+      s1 = peg$c1373();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -14012,7 +14023,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c1372();
+        s1 = peg$c1374();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -14067,7 +14078,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1373); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1375); }
     }
 
     return s0;
@@ -14076,92 +14087,92 @@ function peg$parse(input, options) {
   function peg$parseLicenseOrLabelOrList() {
     var s0;
 
-    if (input.substr(peg$currPos, 3) === peg$c1374) {
-      s0 = peg$c1374;
+    if (input.substr(peg$currPos, 3) === peg$c1376) {
+      s0 = peg$c1376;
       peg$currPos += 3;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1375); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1377); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1376) {
-        s0 = peg$c1376;
+      if (input.substr(peg$currPos, 12) === peg$c1378) {
+        s0 = peg$c1378;
         peg$currPos += 12;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1377); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1379); }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 12) === peg$c1378) {
-          s0 = peg$c1378;
+        if (input.substr(peg$currPos, 12) === peg$c1380) {
+          s0 = peg$c1380;
           peg$currPos += 12;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c1379); }
+          if (peg$silentFails === 0) { peg$fail(peg$c1381); }
         }
         if (s0 === peg$FAILED) {
-          if (input.substr(peg$currPos, 10) === peg$c1380) {
-            s0 = peg$c1380;
+          if (input.substr(peg$currPos, 10) === peg$c1382) {
+            s0 = peg$c1382;
             peg$currPos += 10;
           } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c1381); }
+            if (peg$silentFails === 0) { peg$fail(peg$c1383); }
           }
           if (s0 === peg$FAILED) {
-            if (input.substr(peg$currPos, 11) === peg$c1382) {
-              s0 = peg$c1382;
+            if (input.substr(peg$currPos, 11) === peg$c1384) {
+              s0 = peg$c1384;
               peg$currPos += 11;
             } else {
               s0 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c1383); }
+              if (peg$silentFails === 0) { peg$fail(peg$c1385); }
             }
             if (s0 === peg$FAILED) {
-              if (input.substr(peg$currPos, 13) === peg$c1384) {
-                s0 = peg$c1384;
+              if (input.substr(peg$currPos, 13) === peg$c1386) {
+                s0 = peg$c1386;
                 peg$currPos += 13;
               } else {
                 s0 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c1385); }
+                if (peg$silentFails === 0) { peg$fail(peg$c1387); }
               }
               if (s0 === peg$FAILED) {
-                if (input.substr(peg$currPos, 6) === peg$c1386) {
-                  s0 = peg$c1386;
+                if (input.substr(peg$currPos, 6) === peg$c1388) {
+                  s0 = peg$c1388;
                   peg$currPos += 6;
                 } else {
                   s0 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c1387); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c1389); }
                 }
                 if (s0 === peg$FAILED) {
-                  if (input.substr(peg$currPos, 6) === peg$c1388) {
-                    s0 = peg$c1388;
+                  if (input.substr(peg$currPos, 6) === peg$c1390) {
+                    s0 = peg$c1390;
                     peg$currPos += 6;
                   } else {
                     s0 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$c1389); }
+                    if (peg$silentFails === 0) { peg$fail(peg$c1391); }
                   }
                   if (s0 === peg$FAILED) {
-                    if (input.substr(peg$currPos, 9) === peg$c1390) {
-                      s0 = peg$c1390;
+                    if (input.substr(peg$currPos, 9) === peg$c1392) {
+                      s0 = peg$c1392;
                       peg$currPos += 9;
                     } else {
                       s0 = peg$FAILED;
-                      if (peg$silentFails === 0) { peg$fail(peg$c1391); }
+                      if (peg$silentFails === 0) { peg$fail(peg$c1393); }
                     }
                     if (s0 === peg$FAILED) {
-                      if (input.substr(peg$currPos, 9) === peg$c1392) {
-                        s0 = peg$c1392;
+                      if (input.substr(peg$currPos, 9) === peg$c1394) {
+                        s0 = peg$c1394;
                         peg$currPos += 9;
                       } else {
                         s0 = peg$FAILED;
-                        if (peg$silentFails === 0) { peg$fail(peg$c1393); }
+                        if (peg$silentFails === 0) { peg$fail(peg$c1395); }
                       }
                       if (s0 === peg$FAILED) {
-                        if (input.substr(peg$currPos, 7) === peg$c1394) {
-                          s0 = peg$c1394;
+                        if (input.substr(peg$currPos, 7) === peg$c1396) {
+                          s0 = peg$c1396;
                           peg$currPos += 7;
                         } else {
                           s0 = peg$FAILED;
-                          if (peg$silentFails === 0) { peg$fail(peg$c1395); }
+                          if (peg$silentFails === 0) { peg$fail(peg$c1397); }
                         }
                         if (s0 === peg$FAILED) {
                           s0 = peg$parseLabel();
@@ -14187,36 +14198,36 @@ function peg$parse(input, options) {
     var s0, s1;
 
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c1397) {
-      s0 = peg$c1397;
+    if (input.substr(peg$currPos, 2) === peg$c1399) {
+      s0 = peg$c1399;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1398); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1400); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1399) {
-        s0 = peg$c1399;
+      if (input.substr(peg$currPos, 5) === peg$c1401) {
+        s0 = peg$c1401;
         peg$currPos += 5;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1400); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1402); }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 4) === peg$c1401) {
-          s0 = peg$c1401;
+        if (input.substr(peg$currPos, 4) === peg$c1403) {
+          s0 = peg$c1403;
           peg$currPos += 4;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c1402); }
+          if (peg$silentFails === 0) { peg$fail(peg$c1404); }
         }
         if (s0 === peg$FAILED) {
-          if (input.substr(peg$currPos, 4) === peg$c1403) {
-            s0 = peg$c1403;
+          if (input.substr(peg$currPos, 4) === peg$c1405) {
+            s0 = peg$c1405;
             peg$currPos += 4;
           } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c1404); }
+            if (peg$silentFails === 0) { peg$fail(peg$c1406); }
           }
         }
       }
@@ -14224,7 +14235,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1396); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1398); }
     }
 
     return s0;
@@ -14234,26 +14245,26 @@ function peg$parse(input, options) {
     var s0, s1;
 
     peg$silentFails++;
-    if (input.substr(peg$currPos, 4) === peg$c1406) {
-      s0 = peg$c1406;
+    if (input.substr(peg$currPos, 4) === peg$c1408) {
+      s0 = peg$c1408;
       peg$currPos += 4;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1407); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1409); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c1408) {
-        s0 = peg$c1408;
+      if (input.substr(peg$currPos, 6) === peg$c1410) {
+        s0 = peg$c1410;
         peg$currPos += 6;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1409); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1411); }
       }
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1405); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1407); }
     }
 
     return s0;
@@ -14268,12 +14279,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 14) === peg$c1410) {
-        s2 = peg$c1410;
+      if (input.substr(peg$currPos, 14) === peg$c1412) {
+        s2 = peg$c1412;
         peg$currPos += 14;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1411); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1413); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14315,7 +14326,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1412(s6);
+                      s1 = peg$c1414(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14366,12 +14377,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 19) === peg$c1413) {
-        s2 = peg$c1413;
+      if (input.substr(peg$currPos, 19) === peg$c1415) {
+        s2 = peg$c1415;
         peg$currPos += 19;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1414); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1416); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14413,7 +14424,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1415(s6);
+                      s1 = peg$c1417(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14464,12 +14475,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 15) === peg$c1416) {
-        s2 = peg$c1416;
+      if (input.substr(peg$currPos, 15) === peg$c1418) {
+        s2 = peg$c1418;
         peg$currPos += 15;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1417); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1419); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14511,7 +14522,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1418(s6);
+                      s1 = peg$c1420(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14562,12 +14573,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 18) === peg$c1419) {
-        s2 = peg$c1419;
+      if (input.substr(peg$currPos, 18) === peg$c1421) {
+        s2 = peg$c1421;
         peg$currPos += 18;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1420); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1422); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14609,7 +14620,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1421(s6);
+                      s1 = peg$c1423(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14660,12 +14671,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1422) {
-        s2 = peg$c1422;
+      if (input.substr(peg$currPos, 12) === peg$c1424) {
+        s2 = peg$c1424;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1423); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1425); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14707,7 +14718,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1424(s6);
+                      s1 = peg$c1426(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14758,12 +14769,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 17) === peg$c1425) {
-        s2 = peg$c1425;
+      if (input.substr(peg$currPos, 17) === peg$c1427) {
+        s2 = peg$c1427;
         peg$currPos += 17;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1426); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1428); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14805,7 +14816,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1427(s6);
+                      s1 = peg$c1429(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14856,12 +14867,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 15) === peg$c1428) {
-        s2 = peg$c1428;
+      if (input.substr(peg$currPos, 15) === peg$c1430) {
+        s2 = peg$c1430;
         peg$currPos += 15;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1429); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1431); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -14903,7 +14914,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1430(s6);
+                      s1 = peg$c1432(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -14954,12 +14965,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 15) === peg$c1431) {
-        s2 = peg$c1431;
+      if (input.substr(peg$currPos, 15) === peg$c1433) {
+        s2 = peg$c1433;
         peg$currPos += 15;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1432); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1434); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15001,7 +15012,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1433(s6);
+                      s1 = peg$c1435(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15052,12 +15063,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 16) === peg$c1434) {
-        s2 = peg$c1434;
+      if (input.substr(peg$currPos, 16) === peg$c1436) {
+        s2 = peg$c1436;
         peg$currPos += 16;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1435); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1437); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15099,7 +15110,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1436(s6);
+                      s1 = peg$c1438(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15150,12 +15161,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 11) === peg$c1437) {
-        s2 = peg$c1437;
+      if (input.substr(peg$currPos, 11) === peg$c1439) {
+        s2 = peg$c1439;
         peg$currPos += 11;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1438); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1440); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15197,7 +15208,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1439(s6);
+                      s1 = peg$c1441(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15248,12 +15259,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1440) {
-        s2 = peg$c1440;
+      if (input.substr(peg$currPos, 5) === peg$c1442) {
+        s2 = peg$c1442;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1441); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1443); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15295,7 +15306,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1442(s6);
+                      s1 = peg$c1444(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15346,12 +15357,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 4) === peg$c1443) {
-        s2 = peg$c1443;
+      if (input.substr(peg$currPos, 4) === peg$c1445) {
+        s2 = peg$c1445;
         peg$currPos += 4;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1444); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1446); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15393,7 +15404,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1445(s6);
+                      s1 = peg$c1447(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15444,12 +15455,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1446) {
-        s2 = peg$c1446;
+      if (input.substr(peg$currPos, 5) === peg$c1448) {
+        s2 = peg$c1448;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1447); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1449); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15491,7 +15502,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1448(s6);
+                      s1 = peg$c1450(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15542,12 +15553,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1449) {
-        s2 = peg$c1449;
+      if (input.substr(peg$currPos, 12) === peg$c1451) {
+        s2 = peg$c1451;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1450); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1452); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15589,7 +15600,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1451(s6);
+                      s1 = peg$c1453(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15675,7 +15686,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1452); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1454); }
     }
 
     return s0;
@@ -15711,12 +15722,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1453) {
-        s2 = peg$c1453;
+      if (input.substr(peg$currPos, 5) === peg$c1455) {
+        s2 = peg$c1455;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1454); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1456); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15758,7 +15769,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1455(s6);
+                      s1 = peg$c1457(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15815,12 +15826,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1456) {
-        s2 = peg$c1456;
+      if (input.substr(peg$currPos, 5) === peg$c1458) {
+        s2 = peg$c1458;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1457); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1459); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15862,7 +15873,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1458(s6);
+                      s1 = peg$c1460(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -15919,12 +15930,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 10) === peg$c1460) {
-        s2 = peg$c1460;
+      if (input.substr(peg$currPos, 10) === peg$c1462) {
+        s2 = peg$c1462;
         peg$currPos += 10;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1461); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1463); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -15966,7 +15977,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1462(s6);
+                      s1 = peg$c1464(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -16007,7 +16018,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1459); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1461); }
     }
 
     return s0;
@@ -16023,12 +16034,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 16) === peg$c1464) {
-        s2 = peg$c1464;
+      if (input.substr(peg$currPos, 16) === peg$c1466) {
+        s2 = peg$c1466;
         peg$currPos += 16;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1465); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1467); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -16070,7 +16081,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1466(s6);
+                      s1 = peg$c1468(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -16111,7 +16122,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1463); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1465); }
     }
 
     return s0;
@@ -16127,12 +16138,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 12) === peg$c1468) {
-        s2 = peg$c1468;
+      if (input.substr(peg$currPos, 12) === peg$c1470) {
+        s2 = peg$c1470;
         peg$currPos += 12;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1469); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1471); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -16174,7 +16185,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1470(s6);
+                      s1 = peg$c1472(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -16215,7 +16226,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1467); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1469); }
     }
 
     return s0;
@@ -16231,12 +16242,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1472) {
-        s2 = peg$c1472;
+      if (input.substr(peg$currPos, 5) === peg$c1474) {
+        s2 = peg$c1474;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1473); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1475); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -16278,7 +16289,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1474(s6);
+                      s1 = peg$c1476(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -16319,7 +16330,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1471); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1473); }
     }
 
     return s0;
@@ -16335,12 +16346,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 7) === peg$c1476) {
-        s2 = peg$c1476;
+      if (input.substr(peg$currPos, 7) === peg$c1478) {
+        s2 = peg$c1478;
         peg$currPos += 7;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1477); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1479); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -16382,7 +16393,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1478(s6);
+                      s1 = peg$c1480(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -16423,7 +16434,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1475); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1477); }
     }
 
     return s0;
@@ -16486,7 +16497,7 @@ function peg$parse(input, options) {
                     }
                     if (s9 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c1480(s6);
+                      s1 = peg$c1482(s6);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -16531,12 +16542,12 @@ function peg$parse(input, options) {
         s1 = null;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 9) === peg$c1481) {
-          s2 = peg$c1481;
+        if (input.substr(peg$currPos, 9) === peg$c1483) {
+          s2 = peg$c1483;
           peg$currPos += 9;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c1482); }
+          if (peg$silentFails === 0) { peg$fail(peg$c1484); }
         }
         if (s2 !== peg$FAILED) {
           s3 = peg$parseWS();
@@ -16578,7 +16589,7 @@ function peg$parse(input, options) {
                       }
                       if (s9 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$c1480(s6);
+                        s1 = peg$c1482(s6);
                         s0 = s1;
                       } else {
                         peg$currPos = s0;
@@ -16620,7 +16631,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1479); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1481); }
     }
 
     return s0;
@@ -16636,12 +16647,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 8) === peg$c1484) {
-        s2 = peg$c1484;
+      if (input.substr(peg$currPos, 8) === peg$c1486) {
+        s2 = peg$c1486;
         peg$currPos += 8;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1485); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1487); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -16687,7 +16698,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1486(s6, s8);
+                          s1 = peg$c1488(s6, s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -16740,12 +16751,12 @@ function peg$parse(input, options) {
         s1 = null;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 8) === peg$c1484) {
-          s2 = peg$c1484;
+        if (input.substr(peg$currPos, 8) === peg$c1486) {
+          s2 = peg$c1486;
           peg$currPos += 8;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c1485); }
+          if (peg$silentFails === 0) { peg$fail(peg$c1487); }
         }
         if (s2 !== peg$FAILED) {
           s3 = peg$parseWS();
@@ -16774,12 +16785,12 @@ function peg$parse(input, options) {
                     if (s8 !== peg$FAILED) {
                       s9 = peg$parseWS();
                       if (s9 !== peg$FAILED) {
-                        if (input.substr(peg$currPos, 8) === peg$c1487) {
-                          s10 = peg$c1487;
+                        if (input.substr(peg$currPos, 8) === peg$c1489) {
+                          s10 = peg$c1489;
                           peg$currPos += 8;
                         } else {
                           s10 = peg$FAILED;
-                          if (peg$silentFails === 0) { peg$fail(peg$c1488); }
+                          if (peg$silentFails === 0) { peg$fail(peg$c1490); }
                         }
                         if (s10 !== peg$FAILED) {
                           s11 = peg$parseWS();
@@ -16801,7 +16812,7 @@ function peg$parse(input, options) {
                               }
                               if (s13 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s1 = peg$c1489(s6, s8);
+                                s1 = peg$c1491(s6, s8);
                                 s0 = s1;
                               } else {
                                 peg$currPos = s0;
@@ -16859,7 +16870,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1483); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1485); }
     }
 
     return s0;
@@ -16970,12 +16981,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c1328) {
-        s2 = peg$c1328;
+      if (input.substr(peg$currPos, 5) === peg$c1330) {
+        s2 = peg$c1330;
         peg$currPos += 5;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1329); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1331); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -17021,7 +17032,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1490(s4, s8);
+                          s1 = peg$c1492(s4, s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -17081,11 +17092,11 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 38) {
-        s2 = peg$c1491;
+        s2 = peg$c1493;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1492); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1494); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -17134,7 +17145,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$c1493(s4, s8);
+                          s1 = peg$c1495(s4, s8);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -17193,12 +17204,12 @@ function peg$parse(input, options) {
       s1 = null;
     }
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 8) === peg$c1484) {
-        s2 = peg$c1484;
+      if (input.substr(peg$currPos, 8) === peg$c1486) {
+        s2 = peg$c1486;
         peg$currPos += 8;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c1485); }
+        if (peg$silentFails === 0) { peg$fail(peg$c1487); }
       }
       if (s2 !== peg$FAILED) {
         s3 = peg$parseWS();
@@ -17221,12 +17232,12 @@ function peg$parse(input, options) {
                   if (s8 !== peg$FAILED) {
                     s9 = peg$parseWS();
                     if (s9 !== peg$FAILED) {
-                      if (input.substr(peg$currPos, 8) === peg$c1487) {
-                        s10 = peg$c1487;
+                      if (input.substr(peg$currPos, 8) === peg$c1489) {
+                        s10 = peg$c1489;
                         peg$currPos += 8;
                       } else {
                         s10 = peg$FAILED;
-                        if (peg$silentFails === 0) { peg$fail(peg$c1488); }
+                        if (peg$silentFails === 0) { peg$fail(peg$c1490); }
                       }
                       if (s10 !== peg$FAILED) {
                         s11 = peg$parseWS();
@@ -17248,7 +17259,7 @@ function peg$parse(input, options) {
                             }
                             if (s13 !== peg$FAILED) {
                               peg$savedPos = s0;
-                              s1 = peg$c1494(s4, s8);
+                              s1 = peg$c1496(s4, s8);
                               s0 = s1;
                             } else {
                               peg$currPos = s0;
@@ -17309,12 +17320,12 @@ function peg$parse(input, options) {
         s1 = null;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 8) === peg$c1484) {
-          s2 = peg$c1484;
+        if (input.substr(peg$currPos, 8) === peg$c1486) {
+          s2 = peg$c1486;
           peg$currPos += 8;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c1485); }
+          if (peg$silentFails === 0) { peg$fail(peg$c1487); }
         }
         if (s2 !== peg$FAILED) {
           s3 = peg$parseWS();
@@ -17323,12 +17334,12 @@ function peg$parse(input, options) {
             if (s4 !== peg$FAILED) {
               s5 = peg$parseWS();
               if (s5 !== peg$FAILED) {
-                if (input.substr(peg$currPos, 8) === peg$c1487) {
-                  s6 = peg$c1487;
+                if (input.substr(peg$currPos, 8) === peg$c1489) {
+                  s6 = peg$c1489;
                   peg$currPos += 8;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c1488); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c1490); }
                 }
                 if (s6 !== peg$FAILED) {
                   s7 = peg$parseWS();
@@ -17350,7 +17361,7 @@ function peg$parse(input, options) {
                       }
                       if (s9 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$c1495(s4);
+                        s1 = peg$c1497(s4);
                         s0 = s1;
                       } else {
                         peg$currPos = s0;
@@ -17395,12 +17406,12 @@ function peg$parse(input, options) {
           s1 = null;
         }
         if (s1 !== peg$FAILED) {
-          if (input.substr(peg$currPos, 8) === peg$c1484) {
-            s2 = peg$c1484;
+          if (input.substr(peg$currPos, 8) === peg$c1486) {
+            s2 = peg$c1486;
             peg$currPos += 8;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c1485); }
+            if (peg$silentFails === 0) { peg$fail(peg$c1487); }
           }
           if (s2 !== peg$FAILED) {
             s3 = peg$parseWS();
@@ -17440,7 +17451,7 @@ function peg$parse(input, options) {
                             }
                             if (s11 !== peg$FAILED) {
                               peg$savedPos = s0;
-                              s1 = peg$c1496(s4, s8);
+                              s1 = peg$c1498(s4, s8);
                               s0 = s1;
                             } else {
                               peg$currPos = s0;
@@ -17493,12 +17504,12 @@ function peg$parse(input, options) {
             s1 = null;
           }
           if (s1 !== peg$FAILED) {
-            if (input.substr(peg$currPos, 8) === peg$c1484) {
-              s2 = peg$c1484;
+            if (input.substr(peg$currPos, 8) === peg$c1486) {
+              s2 = peg$c1486;
               peg$currPos += 8;
             } else {
               s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c1485); }
+              if (peg$silentFails === 0) { peg$fail(peg$c1487); }
             }
             if (s2 !== peg$FAILED) {
               s3 = peg$parseWS();
@@ -17524,7 +17535,7 @@ function peg$parse(input, options) {
                       }
                       if (s7 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$c1497(s4);
+                        s1 = peg$c1499(s4);
                         s0 = s1;
                       } else {
                         peg$currPos = s0;
@@ -17565,12 +17576,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 7) === peg$c1498) {
-      s1 = peg$c1498;
+    if (input.substr(peg$currPos, 7) === peg$c1500) {
+      s1 = peg$c1500;
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1499); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1501); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseWS();
@@ -17599,7 +17610,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c1500(s3);
+                s1 = peg$c1502(s3);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -17633,12 +17644,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 13) === peg$c1501) {
-      s1 = peg$c1501;
+    if (input.substr(peg$currPos, 13) === peg$c1503) {
+      s1 = peg$c1503;
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1502); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1504); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseWS();
@@ -17667,7 +17678,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c1503(s3);
+                s1 = peg$c1505(s3);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -17701,12 +17712,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 11) === peg$c1504) {
-      s1 = peg$c1504;
+    if (input.substr(peg$currPos, 11) === peg$c1506) {
+      s1 = peg$c1506;
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1505); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1507); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseWS();
@@ -17735,7 +17746,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c1506(s3);
+                s1 = peg$c1508(s3);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -17779,7 +17790,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c1507); }
+      if (peg$silentFails === 0) { peg$fail(peg$c1509); }
     }
 
     return s0;
diff --git a/src/ts/jssm_types.ts b/src/ts/jssm_types.ts
index 911303f3..23271bd3 100644
--- a/src/ts/jssm_types.ts
+++ b/src/ts/jssm_types.ts
@@ -48,7 +48,7 @@ type JssmShape          = "box" | "polygon" | "ellipse" | "oval" | "circle" | "p
 type JssmArrowDirection = 'left' | 'right' | 'both';
 type JssmArrowKind      = 'none' | 'legal' | 'main' | 'forced';
 
-type JssmLayout         = 'dot' | 'circo' | 'twopi' | 'fdp';  // todo add the rest
+type JssmLayout         = 'dot' | 'circo' | 'twopi' | 'fdp' | 'neato';  // todo add the rest
 
 type JssmCorner         = 'regular' | 'rounded' | 'lined';
 type JssmLineStyle      = 'solid' | 'dashed' | 'dotted';
diff --git a/src/ts/version.ts b/src/ts/version.ts
index 4e363e78..159d75bb 100644
--- a/src/ts/version.ts
+++ b/src/ts/version.ts
@@ -1,5 +1,5 @@
 
-const version    : string = "5.98.2",
-      build_time : number = 1714068061930;
+const version    : string = "5.98.3",
+      build_time : number = 1720291543436;
 
 export { version, build_time };