npm - @cristianormazabal/triton-latex - Versions diffs - 0.1.8 → 0.1.9 - Mend

@cristianormazabal/triton-latex 0.1.8 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cli.cjs CHANGED Viewed

@@ -1508,9 +1508,11 @@ function layoutFlowchart(ir, theme, options) {
     const toRect2 = nodePos.get(edge.to);
     if (!fromRect || !toRect2) continue;
     const dash = edge.style === "dotted" ? "6 3" : edge.style === "dashed" ? "8 4" : void 0;
+    const sw = edge.style === "thick" ? edgeTheme.strokeWidth * 2 : edgeTheme.strokeWidth;
+    const color = edge.style === "dotted" ? palette.textMuted : palette.primary;
     if (edge.from === edge.to) {
       const loop = selfLoopRoute(fromRect, isLR);
-      elements.push(p.path(loop.path, edge.kind === "async" ? palette.textMuted : palette.primary, edgeTheme.strokeWidth, {
+      elements.push(p.path(loop.path, color, sw, {
         ...dash !== void 0 ? { dash } : {},
         markerEnd: ARROW_MARKER_ID
       }));
@@ -1523,7 +1525,7 @@ function layoutFlowchart(ir, theme, options) {
     }
     if (backEdges.has(ei)) {
       const bow = backEdgeRoute(fromRect, toRect2, isLR);
-      elements.push(p.path(bow.path, edge.kind === "async" ? palette.textMuted : palette.primary, edgeTheme.strokeWidth, {
+      elements.push(p.path(bow.path, color, sw, {
         ...dash !== void 0 ? { dash } : {},
         markerEnd: ARROW_MARKER_ID
       }));
@@ -1548,7 +1550,7 @@ function layoutFlowchart(ir, theme, options) {
       fromDir: fromAnchor.portDir,
       toDir: toAnchor.portDir
     });
-    elements.push(p.path(route.path, edge.kind === "async" ? palette.textMuted : palette.primary, edgeTheme.strokeWidth, {
+    elements.push(p.path(route.path, color, sw, {
       ...dash !== void 0 ? { dash } : {},
       markerEnd: ARROW_MARKER_ID
     }));
@@ -1970,8 +1972,13 @@ function registerNode(rawId, label, shape) {
   }
   return id;
 }
-function addEdge(from, to, label, kind, style, ann) {
-  const e = { from, to, label: label || void 0, kind: kind || "sync", style: style || "solid" };
+function addEdge(from, to, label, style, ann, edgeProps) {
+  const e = { from, to, label: label || void 0, style: style || "solid" };
+  if (edgeProps) {
+    if (edgeProps.bidirectional) e.bidirectional = true;
+    if (edgeProps.undirected) e.undirected = true;
+    if (edgeProps.endMarker) e.endMarker = edgeProps.endMarker;
+  }
   if (ann) {
     if (ann.routing) e.routing = ann.routing;
     if (ann.exitWall) e.exitWall = ann.exitWall;
@@ -2130,59 +2137,65 @@ function peg$parse(input, options) {
   var peg$c13 = "]";
   var peg$c14 = "@";
   var peg$c15 = "|";
-  var peg$c16 = "<-.->";
-  var peg$c17 = "<-->";
-  var peg$c18 = "<==>";
-  var peg$c19 = "-..->";
-  var peg$c20 = "-.-> ";
-  var peg$c21 = "-.->";
-  var peg$c22 = "--->";
-  var peg$c23 = "-->";
-  var peg$c24 = "==>";
-  var peg$c25 = "--x";
-  var peg$c26 = "--o";
-  var peg$c27 = "-.-";
-  var peg$c28 = "===";
-  var peg$c29 = ":";
-  var peg$c30 = "straight";
-  var peg$c31 = "orthogonal";
-  var peg$c32 = "bezier";
-  var peg$c33 = "polyline";
-  var peg$c34 = "((";
-  var peg$c35 = "))";
-  var peg$c36 = "([";
-  var peg$c37 = "])";
-  var peg$c38 = "[[";
-  var peg$c39 = "]]";
-  var peg$c40 = "[(";
-  var peg$c41 = ")]";
-  var peg$c42 = "{{";
-  var peg$c43 = "}}";
-  var peg$c44 = "[/";
-  var peg$c45 = "/]";
-  var peg$c46 = "[\\";
-  var peg$c47 = "\\]";
-  var peg$c48 = ">";
-  var peg$c49 = "{";
-  var peg$c50 = "}";
-  var peg$c51 = "(";
-  var peg$c52 = ")";
-  var peg$c53 = "style";
-  var peg$c54 = "classDef";
-  var peg$c55 = "class";
-  var peg$c56 = "click";
-  var peg$c57 = "note";
-  var peg$c58 = '"';
-  var peg$c59 = "at";
-  var peg$c60 = "offset";
-  var peg$c61 = ",";
-  var peg$c62 = "-";
-  var peg$c63 = "legend";
-  var peg$c64 = "bottom-right";
-  var peg$c65 = "bottom-left";
-  var peg$c66 = "top-right";
-  var peg$c67 = "top-left";
-  var peg$c68 = "\r\n";
+  var peg$c16 = "<-~->";
+  var peg$c17 = "<-_->";
+  var peg$c18 = "<-.->";
+  var peg$c19 = "<==>";
+  var peg$c20 = "<-->";
+  var peg$c21 = "-~->";
+  var peg$c22 = "-_->";
+  var peg$c23 = "-..->";
+  var peg$c24 = "-.->";
+  var peg$c25 = "===>";
+  var peg$c26 = "==>";
+  var peg$c27 = "--->";
+  var peg$c28 = "-->";
+  var peg$c29 = "--x";
+  var peg$c30 = "--o";
+  var peg$c31 = "-~-";
+  var peg$c32 = "-_-";
+  var peg$c33 = "-.-";
+  var peg$c34 = "===";
+  var peg$c35 = ":";
+  var peg$c36 = "straight";
+  var peg$c37 = "orthogonal";
+  var peg$c38 = "bezier";
+  var peg$c39 = "polyline";
+  var peg$c40 = "((";
+  var peg$c41 = "))";
+  var peg$c42 = "([";
+  var peg$c43 = "])";
+  var peg$c44 = "[[";
+  var peg$c45 = "]]";
+  var peg$c46 = "[(";
+  var peg$c47 = ")]";
+  var peg$c48 = "{{";
+  var peg$c49 = "}}";
+  var peg$c50 = "[/";
+  var peg$c51 = "/]";
+  var peg$c52 = "[\\";
+  var peg$c53 = "\\]";
+  var peg$c54 = ">";
+  var peg$c55 = "{";
+  var peg$c56 = "}";
+  var peg$c57 = "(";
+  var peg$c58 = ")";
+  var peg$c59 = "style";
+  var peg$c60 = "classDef";
+  var peg$c61 = "class";
+  var peg$c62 = "click";
+  var peg$c63 = "note";
+  var peg$c64 = '"';
+  var peg$c65 = "at";
+  var peg$c66 = "offset";
+  var peg$c67 = ",";
+  var peg$c68 = "-";
+  var peg$c69 = "legend";
+  var peg$c70 = "bottom-right";
+  var peg$c71 = "bottom-left";
+  var peg$c72 = "top-right";
+  var peg$c73 = "top-left";
+  var peg$c74 = "\r\n";
   var peg$r0 = /^[^\n]/;
   var peg$r1 = /^[a-zA-Z_]/;
   var peg$r2 = /^[a-zA-Z0-9_]/;
@@ -2223,73 +2236,79 @@ function peg$parse(input, options) {
   var peg$e20 = peg$literalExpectation("@", false);
   var peg$e21 = peg$literalExpectation("|", false);
   var peg$e22 = peg$classExpectation(["|"], true, false);
-  var peg$e23 = peg$literalExpectation("<-.->", false);
-  var peg$e24 = peg$literalExpectation("<-->", false);
-  var peg$e25 = peg$literalExpectation("<==>", false);
-  var peg$e26 = peg$literalExpectation("-..->", false);
-  var peg$e27 = peg$literalExpectation("-.-> ", false);
-  var peg$e28 = peg$literalExpectation("-.->", false);
-  var peg$e29 = peg$literalExpectation("--->", false);
-  var peg$e30 = peg$literalExpectation("-->", false);
-  var peg$e31 = peg$literalExpectation("==>", false);
-  var peg$e32 = peg$literalExpectation("--x", false);
-  var peg$e33 = peg$literalExpectation("--o", false);
-  var peg$e34 = peg$literalExpectation("-.-", false);
-  var peg$e35 = peg$literalExpectation("===", false);
-  var peg$e36 = peg$literalExpectation(":", false);
-  var peg$e37 = peg$literalExpectation("straight", false);
-  var peg$e38 = peg$literalExpectation("orthogonal", false);
-  var peg$e39 = peg$literalExpectation("bezier", false);
-  var peg$e40 = peg$literalExpectation("polyline", false);
-  var peg$e41 = peg$classExpectation(["E", "N", "S", "W"], false, false);
-  var peg$e42 = peg$literalExpectation("((", false);
-  var peg$e43 = peg$classExpectation([")"], true, false);
-  var peg$e44 = peg$literalExpectation("))", false);
-  var peg$e45 = peg$literalExpectation("([", false);
-  var peg$e46 = peg$literalExpectation("])", false);
-  var peg$e47 = peg$literalExpectation("[[", false);
-  var peg$e48 = peg$literalExpectation("]]", false);
-  var peg$e49 = peg$literalExpectation("[(", false);
-  var peg$e50 = peg$literalExpectation(")]", false);
-  var peg$e51 = peg$literalExpectation("{{", false);
-  var peg$e52 = peg$classExpectation(["}"], true, false);
-  var peg$e53 = peg$literalExpectation("}}", false);
-  var peg$e54 = peg$literalExpectation("[/", false);
-  var peg$e55 = peg$classExpectation(["/"], true, false);
-  var peg$e56 = peg$literalExpectation("/]", false);
-  var peg$e57 = peg$literalExpectation("[\\", false);
-  var peg$e58 = peg$classExpectation(["\\"], true, false);
-  var peg$e59 = peg$literalExpectation("\\]", false);
-  var peg$e60 = peg$literalExpectation(">", false);
-  var peg$e61 = peg$literalExpectation("{", false);
-  var peg$e62 = peg$literalExpectation("}", false);
-  var peg$e63 = peg$literalExpectation("(", false);
-  var peg$e64 = peg$literalExpectation(")", false);
-  var peg$e65 = peg$literalExpectation("style", false);
-  var peg$e66 = peg$classExpectation(["\n", ";"], true, false);
-  var peg$e67 = peg$literalExpectation("classDef", false);
-  var peg$e68 = peg$literalExpectation("class", false);
-  var peg$e69 = peg$literalExpectation("click", false);
-  var peg$e70 = peg$literalExpectation("note", false);
-  var peg$e71 = peg$literalExpectation('"', false);
-  var peg$e72 = peg$classExpectation(['"'], true, false);
-  var peg$e73 = peg$literalExpectation("at", false);
-  var peg$e74 = peg$literalExpectation("offset", false);
-  var peg$e75 = peg$literalExpectation(",", false);
-  var peg$e76 = peg$literalExpectation("-", false);
-  var peg$e77 = peg$classExpectation([["0", "9"]], false, false);
-  var peg$e78 = peg$literalExpectation("legend", false);
-  var peg$e79 = peg$literalExpectation("bottom-right", false);
-  var peg$e80 = peg$literalExpectation("bottom-left", false);
-  var peg$e81 = peg$literalExpectation("top-right", false);
-  var peg$e82 = peg$literalExpectation("top-left", false);
-  var peg$e83 = peg$classExpectation([":", "\n"], true, false);
-  var peg$e84 = peg$otherExpectation("optional whitespace");
-  var peg$e85 = peg$classExpectation([" ", "	"], false, false);
-  var peg$e86 = peg$otherExpectation("required whitespace");
-  var peg$e87 = peg$otherExpectation("newline");
-  var peg$e88 = peg$literalExpectation("\r\n", false);
-  var peg$e89 = peg$classExpectation(["\n", "\r"], false, false);
+  var peg$e23 = peg$literalExpectation("<-~->", false);
+  var peg$e24 = peg$literalExpectation("<-_->", false);
+  var peg$e25 = peg$literalExpectation("<-.->", false);
+  var peg$e26 = peg$literalExpectation("<==>", false);
+  var peg$e27 = peg$literalExpectation("<-->", false);
+  var peg$e28 = peg$literalExpectation("-~->", false);
+  var peg$e29 = peg$literalExpectation("-_->", false);
+  var peg$e30 = peg$literalExpectation("-..->", false);
+  var peg$e31 = peg$literalExpectation("-.->", false);
+  var peg$e32 = peg$literalExpectation("===>", false);
+  var peg$e33 = peg$literalExpectation("==>", false);
+  var peg$e34 = peg$literalExpectation("--->", false);
+  var peg$e35 = peg$literalExpectation("-->", false);
+  var peg$e36 = peg$literalExpectation("--x", false);
+  var peg$e37 = peg$literalExpectation("--o", false);
+  var peg$e38 = peg$literalExpectation("-~-", false);
+  var peg$e39 = peg$literalExpectation("-_-", false);
+  var peg$e40 = peg$literalExpectation("-.-", false);
+  var peg$e41 = peg$literalExpectation("===", false);
+  var peg$e42 = peg$literalExpectation(":", false);
+  var peg$e43 = peg$literalExpectation("straight", false);
+  var peg$e44 = peg$literalExpectation("orthogonal", false);
+  var peg$e45 = peg$literalExpectation("bezier", false);
+  var peg$e46 = peg$literalExpectation("polyline", false);
+  var peg$e47 = peg$classExpectation(["E", "N", "S", "W"], false, false);
+  var peg$e48 = peg$literalExpectation("((", false);
+  var peg$e49 = peg$classExpectation([")"], true, false);
+  var peg$e50 = peg$literalExpectation("))", false);
+  var peg$e51 = peg$literalExpectation("([", false);
+  var peg$e52 = peg$literalExpectation("])", false);
+  var peg$e53 = peg$literalExpectation("[[", false);
+  var peg$e54 = peg$literalExpectation("]]", false);
+  var peg$e55 = peg$literalExpectation("[(", false);
+  var peg$e56 = peg$literalExpectation(")]", false);
+  var peg$e57 = peg$literalExpectation("{{", false);
+  var peg$e58 = peg$classExpectation(["}"], true, false);
+  var peg$e59 = peg$literalExpectation("}}", false);
+  var peg$e60 = peg$literalExpectation("[/", false);
+  var peg$e61 = peg$classExpectation(["/"], true, false);
+  var peg$e62 = peg$literalExpectation("/]", false);
+  var peg$e63 = peg$literalExpectation("[\\", false);
+  var peg$e64 = peg$classExpectation(["\\"], true, false);
+  var peg$e65 = peg$literalExpectation("\\]", false);
+  var peg$e66 = peg$literalExpectation(">", false);
+  var peg$e67 = peg$literalExpectation("{", false);
+  var peg$e68 = peg$literalExpectation("}", false);
+  var peg$e69 = peg$literalExpectation("(", false);
+  var peg$e70 = peg$literalExpectation(")", false);
+  var peg$e71 = peg$literalExpectation("style", false);
+  var peg$e72 = peg$classExpectation(["\n", ";"], true, false);
+  var peg$e73 = peg$literalExpectation("classDef", false);
+  var peg$e74 = peg$literalExpectation("class", false);
+  var peg$e75 = peg$literalExpectation("click", false);
+  var peg$e76 = peg$literalExpectation("note", false);
+  var peg$e77 = peg$literalExpectation('"', false);
+  var peg$e78 = peg$classExpectation(['"'], true, false);
+  var peg$e79 = peg$literalExpectation("at", false);
+  var peg$e80 = peg$literalExpectation("offset", false);
+  var peg$e81 = peg$literalExpectation(",", false);
+  var peg$e82 = peg$literalExpectation("-", false);
+  var peg$e83 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e84 = peg$literalExpectation("legend", false);
+  var peg$e85 = peg$literalExpectation("bottom-right", false);
+  var peg$e86 = peg$literalExpectation("bottom-left", false);
+  var peg$e87 = peg$literalExpectation("top-right", false);
+  var peg$e88 = peg$literalExpectation("top-left", false);
+  var peg$e89 = peg$classExpectation([":", "\n"], true, false);
+  var peg$e90 = peg$otherExpectation("optional whitespace");
+  var peg$e91 = peg$classExpectation([" ", "	"], false, false);
+  var peg$e92 = peg$otherExpectation("required whitespace");
+  var peg$e93 = peg$otherExpectation("newline");
+  var peg$e94 = peg$literalExpectation("\r\n", false);
+  var peg$e95 = peg$classExpectation(["\n", "\r"], false, false);
   var peg$f0 = function(frontmatter, header, statements) {
     return {
       version: "1.0",
@@ -2337,7 +2356,7 @@ function peg$parse(input, options) {
   var peg$f11 = function(head, rest) {
     let prev = head;
     for (const { edge, target, ann } of rest) {
-      addEdge(prev.id, target.id, edge.label, edge.kind, edge.style, ann);
+      addEdge(prev.id, target.id, edge.label, edge.style, ann, edge);
       prev = target;
     }
     return { type: "chain" };
@@ -2349,145 +2368,163 @@ function peg$parse(input, options) {
     return text2.trim();
   };
   var peg$f14 = function() {
-    return { kind: "async", style: "dotted" };
+    return { style: "wavy", bidirectional: true };
   };
   var peg$f15 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "dashed", bidirectional: true };
   };
   var peg$f16 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "dotted", bidirectional: true };
   };
   var peg$f17 = function() {
-    return { kind: "async", style: "dotted" };
+    return { style: "thick", bidirectional: true };
   };
   var peg$f18 = function() {
-    return { kind: "async", style: "dotted" };
+    return { style: "solid", bidirectional: true };
   };
   var peg$f19 = function() {
-    return { kind: "async", style: "dotted" };
+    return { style: "wavy" };
   };
   var peg$f20 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "dashed" };
   };
   var peg$f21 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "dotted" };
   };
   var peg$f22 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "dotted" };
   };
   var peg$f23 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "thick" };
   };
   var peg$f24 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "thick" };
   };
   var peg$f25 = function() {
-    return { kind: "async", style: "dotted" };
+    return { style: "solid" };
   };
   var peg$f26 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "solid" };
   };
   var peg$f27 = function() {
-    return { kind: "sync", style: "solid" };
+    return { style: "solid", endMarker: "cross" };
+  };
+  var peg$f28 = function() {
+    return { style: "solid", endMarker: "circle" };
+  };
+  var peg$f29 = function() {
+    return { style: "wavy", undirected: true };
+  };
+  var peg$f30 = function() {
+    return { style: "dashed", undirected: true };
+  };
+  var peg$f31 = function() {
+    return { style: "dotted", undirected: true };
+  };
+  var peg$f32 = function() {
+    return { style: "thick", undirected: true };
   };
-  var peg$f28 = function(route, walls) {
+  var peg$f33 = function() {
+    return { style: "solid", undirected: true };
+  };
+  var peg$f34 = function(route, walls) {
     return { routing: route, ...walls ? walls[1] : {} };
   };
-  var peg$f29 = function(walls) {
+  var peg$f35 = function(walls) {
     return walls;
   };
-  var peg$f30 = function() {
+  var peg$f36 = function() {
     return "straight";
   };
-  var peg$f31 = function() {
+  var peg$f37 = function() {
     return "orthogonal";
   };
-  var peg$f32 = function() {
+  var peg$f38 = function() {
     return "bezier";
   };
-  var peg$f33 = function() {
+  var peg$f39 = function() {
     return "polyline";
   };
-  var peg$f34 = function(exit, entry) {
+  var peg$f40 = function(exit, entry) {
     return { exitWall: exit, entryWall: entry };
   };
-  var peg$f35 = function(exit) {
+  var peg$f41 = function(exit) {
     return { exitWall: exit };
   };
-  var peg$f36 = function(w) {
+  var peg$f42 = function(w) {
     return w;
   };
-  var peg$f37 = function(id, shape) {
+  var peg$f43 = function(id, shape) {
     return { id: registerNode(id, shape ? shape.label : null, shape ? shape.shape : null) };
   };
-  var peg$f38 = function(ref) {
+  var peg$f44 = function(ref) {
     return { type: "node", ...ref };
   };
-  var peg$f39 = function(id) {
+  var peg$f45 = function(id) {
     return id;
   };
-  var peg$f40 = function(text2) {
+  var peg$f46 = function(text2) {
     return { shape: "circle", label: stripQuotes(text2.trim()) };
   };
-  var peg$f41 = function(text2) {
+  var peg$f47 = function(text2) {
     return { shape: "stadium", label: stripQuotes(text2.trim()) };
   };
-  var peg$f42 = function(text2) {
+  var peg$f48 = function(text2) {
     return { shape: "subroutine", label: stripQuotes(text2.trim()) };
   };
-  var peg$f43 = function(text2) {
+  var peg$f49 = function(text2) {
     return { shape: "cylinder", label: stripQuotes(text2.trim()) };
   };
-  var peg$f44 = function(text2) {
+  var peg$f50 = function(text2) {
     return { shape: "hexagon", label: stripQuotes(text2.trim()) };
   };
-  var peg$f45 = function(text2) {
+  var peg$f51 = function(text2) {
     return { shape: "parallelogram", label: stripQuotes(text2.trim()) };
   };
-  var peg$f46 = function(text2) {
+  var peg$f52 = function(text2) {
     return { shape: "parallelogram-alt", label: stripQuotes(text2.trim()) };
   };
-  var peg$f47 = function(text2) {
+  var peg$f53 = function(text2) {
     return { shape: "asymmetric", label: stripQuotes(text2.trim()) };
   };
-  var peg$f48 = function(text2) {
+  var peg$f54 = function(text2) {
     return { shape: "rect", label: stripQuotes(text2.trim()) };
   };
-  var peg$f49 = function(text2) {
+  var peg$f55 = function(text2) {
     return { shape: "diamond", label: stripQuotes(text2.trim()) };
   };
-  var peg$f50 = function(text2) {
+  var peg$f56 = function(text2) {
     return { shape: "rounded-rect", label: stripQuotes(text2.trim()) };
   };
-  var peg$f51 = function(content) {
+  var peg$f57 = function(content) {
     return { type: "style", raw: content };
   };
-  var peg$f52 = function(content) {
+  var peg$f58 = function(content) {
     return { type: "class", raw: content };
   };
-  var peg$f53 = function(content) {
+  var peg$f59 = function(content) {
     return { type: "click", raw: content };
   };
-  var peg$f54 = function(text2, target, offset2) {
+  var peg$f60 = function(text2, target, offset2) {
     const note = { type: "note", text: text2, target, offset: offset2 || void 0 };
     overlays.push(note);
     return note;
   };
-  var peg$f55 = function(dx, dy) {
+  var peg$f61 = function(dx, dy) {
     return { dx, dy };
   };
-  var peg$f56 = function(sign, digits) {
+  var peg$f62 = function(sign, digits) {
     return parseInt((sign || "") + digits, 10);
   };
-  var peg$f57 = function(corner, t) {
+  var peg$f63 = function(corner, t) {
     return t;
   };
-  var peg$f58 = function(corner, title, entries) {
+  var peg$f64 = function(corner, title, entries) {
     const legend = { type: "legend", corner, title: title || void 0, entries };
     overlays.push(legend);
     return legend;
   };
-  var peg$f59 = function(key, value) {
+  var peg$f65 = function(key, value) {
     return { key: key.trim(), value: value.trim() };
   };
   var peg$currPos = options.peg$currPos | 0;
@@ -3547,9 +3584,9 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 4) === peg$c17) {
+      if (input.substr(peg$currPos, 5) === peg$c17) {
         s1 = peg$c17;
-        peg$currPos += 4;
+        peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
@@ -3563,9 +3600,9 @@ function peg$parse(input, options) {
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 4) === peg$c18) {
+        if (input.substr(peg$currPos, 5) === peg$c18) {
           s1 = peg$c18;
-          peg$currPos += 4;
+          peg$currPos += 5;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
@@ -3579,9 +3616,9 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 5) === peg$c19) {
+          if (input.substr(peg$currPos, 4) === peg$c19) {
             s1 = peg$c19;
-            peg$currPos += 5;
+            peg$currPos += 4;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
@@ -3595,9 +3632,9 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 5) === peg$c20) {
+            if (input.substr(peg$currPos, 4) === peg$c20) {
               s1 = peg$c20;
-              peg$currPos += 5;
+              peg$currPos += 4;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) {
@@ -3643,9 +3680,9 @@ function peg$parse(input, options) {
                 s0 = s1;
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
-                  if (input.substr(peg$currPos, 3) === peg$c23) {
+                  if (input.substr(peg$currPos, 5) === peg$c23) {
                     s1 = peg$c23;
-                    peg$currPos += 3;
+                    peg$currPos += 5;
                   } else {
                     s1 = peg$FAILED;
                     if (peg$silentFails === 0) {
@@ -3659,9 +3696,9 @@ function peg$parse(input, options) {
                   s0 = s1;
                   if (s0 === peg$FAILED) {
                     s0 = peg$currPos;
-                    if (input.substr(peg$currPos, 3) === peg$c24) {
+                    if (input.substr(peg$currPos, 4) === peg$c24) {
                       s1 = peg$c24;
-                      peg$currPos += 3;
+                      peg$currPos += 4;
                     } else {
                       s1 = peg$FAILED;
                       if (peg$silentFails === 0) {
@@ -3675,9 +3712,9 @@ function peg$parse(input, options) {
                     s0 = s1;
                     if (s0 === peg$FAILED) {
                       s0 = peg$currPos;
-                      if (input.substr(peg$currPos, 3) === peg$c25) {
+                      if (input.substr(peg$currPos, 4) === peg$c25) {
                         s1 = peg$c25;
-                        peg$currPos += 3;
+                        peg$currPos += 4;
                       } else {
                         s1 = peg$FAILED;
                         if (peg$silentFails === 0) {
@@ -3707,9 +3744,9 @@ function peg$parse(input, options) {
                         s0 = s1;
                         if (s0 === peg$FAILED) {
                           s0 = peg$currPos;
-                          if (input.substr(peg$currPos, 3) === peg$c27) {
+                          if (input.substr(peg$currPos, 4) === peg$c27) {
                             s1 = peg$c27;
-                            peg$currPos += 3;
+                            peg$currPos += 4;
                           } else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
@@ -3723,13 +3760,13 @@ function peg$parse(input, options) {
                           s0 = s1;
                           if (s0 === peg$FAILED) {
                             s0 = peg$currPos;
-                            if (input.substr(peg$currPos, 3) === peg$c0) {
-                              s1 = peg$c0;
+                            if (input.substr(peg$currPos, 3) === peg$c28) {
+                              s1 = peg$c28;
                               peg$currPos += 3;
                             } else {
                               s1 = peg$FAILED;
                               if (peg$silentFails === 0) {
-                                peg$fail(peg$e0);
+                                peg$fail(peg$e35);
                               }
                             }
                             if (s1 !== peg$FAILED) {
@@ -3739,13 +3776,13 @@ function peg$parse(input, options) {
                             s0 = s1;
                             if (s0 === peg$FAILED) {
                               s0 = peg$currPos;
-                              if (input.substr(peg$currPos, 3) === peg$c28) {
-                                s1 = peg$c28;
+                              if (input.substr(peg$currPos, 3) === peg$c29) {
+                                s1 = peg$c29;
                                 peg$currPos += 3;
                               } else {
                                 s1 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                  peg$fail(peg$e35);
+                                  peg$fail(peg$e36);
                                 }
                               }
                               if (s1 !== peg$FAILED) {
@@ -3753,6 +3790,108 @@ function peg$parse(input, options) {
                                 s1 = peg$f27();
                               }
                               s0 = s1;
+                              if (s0 === peg$FAILED) {
+                                s0 = peg$currPos;
+                                if (input.substr(peg$currPos, 3) === peg$c30) {
+                                  s1 = peg$c30;
+                                  peg$currPos += 3;
+                                } else {
+                                  s1 = peg$FAILED;
+                                  if (peg$silentFails === 0) {
+                                    peg$fail(peg$e37);
+                                  }
+                                }
+                                if (s1 !== peg$FAILED) {
+                                  peg$savedPos = s0;
+                                  s1 = peg$f28();
+                                }
+                                s0 = s1;
+                                if (s0 === peg$FAILED) {
+                                  s0 = peg$currPos;
+                                  if (input.substr(peg$currPos, 3) === peg$c31) {
+                                    s1 = peg$c31;
+                                    peg$currPos += 3;
+                                  } else {
+                                    s1 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                      peg$fail(peg$e38);
+                                    }
+                                  }
+                                  if (s1 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s1 = peg$f29();
+                                  }
+                                  s0 = s1;
+                                  if (s0 === peg$FAILED) {
+                                    s0 = peg$currPos;
+                                    if (input.substr(peg$currPos, 3) === peg$c32) {
+                                      s1 = peg$c32;
+                                      peg$currPos += 3;
+                                    } else {
+                                      s1 = peg$FAILED;
+                                      if (peg$silentFails === 0) {
+                                        peg$fail(peg$e39);
+                                      }
+                                    }
+                                    if (s1 !== peg$FAILED) {
+                                      peg$savedPos = s0;
+                                      s1 = peg$f30();
+                                    }
+                                    s0 = s1;
+                                    if (s0 === peg$FAILED) {
+                                      s0 = peg$currPos;
+                                      if (input.substr(peg$currPos, 3) === peg$c33) {
+                                        s1 = peg$c33;
+                                        peg$currPos += 3;
+                                      } else {
+                                        s1 = peg$FAILED;
+                                        if (peg$silentFails === 0) {
+                                          peg$fail(peg$e40);
+                                        }
+                                      }
+                                      if (s1 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s1 = peg$f31();
+                                      }
+                                      s0 = s1;
+                                      if (s0 === peg$FAILED) {
+                                        s0 = peg$currPos;
+                                        if (input.substr(peg$currPos, 3) === peg$c34) {
+                                          s1 = peg$c34;
+                                          peg$currPos += 3;
+                                        } else {
+                                          s1 = peg$FAILED;
+                                          if (peg$silentFails === 0) {
+                                            peg$fail(peg$e41);
+                                          }
+                                        }
+                                        if (s1 !== peg$FAILED) {
+                                          peg$savedPos = s0;
+                                          s1 = peg$f32();
+                                        }
+                                        s0 = s1;
+                                        if (s0 === peg$FAILED) {
+                                          s0 = peg$currPos;
+                                          if (input.substr(peg$currPos, 3) === peg$c0) {
+                                            s1 = peg$c0;
+                                            peg$currPos += 3;
+                                          } else {
+                                            s1 = peg$FAILED;
+                                            if (peg$silentFails === 0) {
+                                              peg$fail(peg$e0);
+                                            }
+                                          }
+                                          if (s1 !== peg$FAILED) {
+                                            peg$savedPos = s0;
+                                            s1 = peg$f33();
+                                          }
+                                          s0 = s1;
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
                             }
                           }
                         }
@@ -3775,12 +3914,12 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c29;
+        s3 = peg$c35;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e36);
+          peg$fail(peg$e42);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -3800,7 +3939,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f28(s1, s2);
+      s0 = peg$f34(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3810,7 +3949,7 @@ function peg$parse(input, options) {
       s1 = peg$parseWallPair();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f29(s1);
+        s1 = peg$f35(s1);
       }
       s0 = s1;
     }
@@ -3819,66 +3958,66 @@ function peg$parse(input, options) {
   function peg$parseRouteWord() {
     var s0, s1;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 8) === peg$c30) {
-      s1 = peg$c30;
+    if (input.substr(peg$currPos, 8) === peg$c36) {
+      s1 = peg$c36;
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e37);
+        peg$fail(peg$e43);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f36();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 10) === peg$c31) {
-        s1 = peg$c31;
+      if (input.substr(peg$currPos, 10) === peg$c37) {
+        s1 = peg$c37;
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e38);
+          peg$fail(peg$e44);
         }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f31();
+        s1 = peg$f37();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 6) === peg$c32) {
-          s1 = peg$c32;
+        if (input.substr(peg$currPos, 6) === peg$c38) {
+          s1 = peg$c38;
           peg$currPos += 6;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e39);
+            peg$fail(peg$e45);
           }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f32();
+          s1 = peg$f38();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 8) === peg$c33) {
-            s1 = peg$c33;
+          if (input.substr(peg$currPos, 8) === peg$c39) {
+            s1 = peg$c39;
             peg$currPos += 8;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e40);
+              peg$fail(peg$e46);
             }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f33();
+            s1 = peg$f39();
           }
           s0 = s1;
         }
@@ -3894,7 +4033,7 @@ function peg$parse(input, options) {
       s2 = peg$parseWall();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f34(s1, s2);
+        s0 = peg$f40(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3908,7 +4047,7 @@ function peg$parse(input, options) {
       s1 = peg$parseWall();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f35(s1);
+        s1 = peg$f41(s1);
       }
       s0 = s1;
     }
@@ -3923,12 +4062,12 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e41);
+        peg$fail(peg$e47);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36(s1);
+      s1 = peg$f42(s1);
     }
     s0 = s1;
     return s0;
@@ -3943,7 +4082,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f37(s1, s2);
+      s0 = peg$f43(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3976,7 +4115,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f38(s1);
+        s0 = peg$f44(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4137,7 +4276,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f39(s3);
+          s0 = peg$f45(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4155,13 +4294,13 @@ function peg$parse(input, options) {
   function peg$parseShape() {
     var s0, s1, s2, s3, s4;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c34) {
-      s1 = peg$c34;
+    if (input.substr(peg$currPos, 2) === peg$c40) {
+      s1 = peg$c40;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e42);
+        peg$fail(peg$e48);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4173,7 +4312,7 @@ function peg$parse(input, options) {
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e43);
+          peg$fail(peg$e49);
         }
       }
       if (s4 !== peg$FAILED) {
@@ -4185,7 +4324,7 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e43);
+              peg$fail(peg$e49);
             }
           }
         }
@@ -4198,18 +4337,18 @@ function peg$parse(input, options) {
         s2 = s3;
       }
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c35) {
-          s3 = peg$c35;
+        if (input.substr(peg$currPos, 2) === peg$c41) {
+          s3 = peg$c41;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e44);
+            peg$fail(peg$e50);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f40(s2);
+          s0 = peg$f46(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4224,13 +4363,13 @@ function peg$parse(input, options) {
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c36) {
-        s1 = peg$c36;
+      if (input.substr(peg$currPos, 2) === peg$c42) {
+        s1 = peg$c42;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e45);
+          peg$fail(peg$e51);
         }
       }
       if (s1 !== peg$FAILED) {
@@ -4258,18 +4397,18 @@ function peg$parse(input, options) {
           }
         }
         s2 = input.substring(s2, peg$currPos);
-        if (input.substr(peg$currPos, 2) === peg$c37) {
-          s3 = peg$c37;
+        if (input.substr(peg$currPos, 2) === peg$c43) {
+          s3 = peg$c43;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e46);
+            peg$fail(peg$e52);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f41(s2);
+          s0 = peg$f47(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4280,13 +4419,13 @@ function peg$parse(input, options) {
       }
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c38) {
-          s1 = peg$c38;
+        if (input.substr(peg$currPos, 2) === peg$c44) {
+          s1 = peg$c44;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e47);
+            peg$fail(peg$e53);
           }
         }
         if (s1 !== peg$FAILED) {
@@ -4314,18 +4453,18 @@ function peg$parse(input, options) {
             }
           }
           s2 = input.substring(s2, peg$currPos);
-          if (input.substr(peg$currPos, 2) === peg$c39) {
-            s3 = peg$c39;
+          if (input.substr(peg$currPos, 2) === peg$c45) {
+            s3 = peg$c45;
             peg$currPos += 2;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e48);
+              peg$fail(peg$e54);
             }
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f42(s2);
+            s0 = peg$f48(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -4336,13 +4475,13 @@ function peg$parse(input, options) {
         }
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 2) === peg$c40) {
-            s1 = peg$c40;
+          if (input.substr(peg$currPos, 2) === peg$c46) {
+            s1 = peg$c46;
             peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e49);
+              peg$fail(peg$e55);
             }
           }
           if (s1 !== peg$FAILED) {
@@ -4354,7 +4493,7 @@ function peg$parse(input, options) {
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e43);
+                peg$fail(peg$e49);
               }
             }
             while (s4 !== peg$FAILED) {
@@ -4365,23 +4504,23 @@ function peg$parse(input, options) {
               } else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e43);
+                  peg$fail(peg$e49);
                 }
               }
             }
             s2 = input.substring(s2, peg$currPos);
-            if (input.substr(peg$currPos, 2) === peg$c41) {
-              s3 = peg$c41;
+            if (input.substr(peg$currPos, 2) === peg$c47) {
+              s3 = peg$c47;
               peg$currPos += 2;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e50);
+                peg$fail(peg$e56);
               }
             }
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f43(s2);
+              s0 = peg$f49(s2);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -4392,13 +4531,13 @@ function peg$parse(input, options) {
           }
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c42) {
-              s1 = peg$c42;
+            if (input.substr(peg$currPos, 2) === peg$c48) {
+              s1 = peg$c48;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e51);
+                peg$fail(peg$e57);
               }
             }
             if (s1 !== peg$FAILED) {
@@ -4410,7 +4549,7 @@ function peg$parse(input, options) {
               } else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e52);
+                  peg$fail(peg$e58);
                 }
               }
               while (s4 !== peg$FAILED) {
@@ -4421,23 +4560,23 @@ function peg$parse(input, options) {
                 } else {
                   s4 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e52);
+                    peg$fail(peg$e58);
                   }
                 }
               }
               s2 = input.substring(s2, peg$currPos);
-              if (input.substr(peg$currPos, 2) === peg$c43) {
-                s3 = peg$c43;
+              if (input.substr(peg$currPos, 2) === peg$c49) {
+                s3 = peg$c49;
                 peg$currPos += 2;
               } else {
                 s3 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e53);
+                  peg$fail(peg$e59);
                 }
               }
               if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f44(s2);
+                s0 = peg$f50(s2);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -4448,13 +4587,13 @@ function peg$parse(input, options) {
             }
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 2) === peg$c44) {
-                s1 = peg$c44;
+              if (input.substr(peg$currPos, 2) === peg$c50) {
+                s1 = peg$c50;
                 peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e54);
+                  peg$fail(peg$e60);
                 }
               }
               if (s1 !== peg$FAILED) {
@@ -4466,7 +4605,7 @@ function peg$parse(input, options) {
                 } else {
                   s4 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e55);
+                    peg$fail(peg$e61);
                   }
                 }
                 while (s4 !== peg$FAILED) {
@@ -4477,23 +4616,23 @@ function peg$parse(input, options) {
                   } else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e55);
+                      peg$fail(peg$e61);
                     }
                   }
                 }
                 s2 = input.substring(s2, peg$currPos);
-                if (input.substr(peg$currPos, 2) === peg$c45) {
-                  s3 = peg$c45;
+                if (input.substr(peg$currPos, 2) === peg$c51) {
+                  s3 = peg$c51;
                   peg$currPos += 2;
                 } else {
                   s3 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e56);
+                    peg$fail(peg$e62);
                   }
                 }
                 if (s3 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f45(s2);
+                  s0 = peg$f51(s2);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -4504,13 +4643,13 @@ function peg$parse(input, options) {
               }
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 2) === peg$c46) {
-                  s1 = peg$c46;
+                if (input.substr(peg$currPos, 2) === peg$c52) {
+                  s1 = peg$c52;
                   peg$currPos += 2;
                 } else {
                   s1 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e57);
+                    peg$fail(peg$e63);
                   }
                 }
                 if (s1 !== peg$FAILED) {
@@ -4522,7 +4661,7 @@ function peg$parse(input, options) {
                   } else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e58);
+                      peg$fail(peg$e64);
                     }
                   }
                   while (s4 !== peg$FAILED) {
@@ -4533,23 +4672,23 @@ function peg$parse(input, options) {
                     } else {
                       s4 = peg$FAILED;
                       if (peg$silentFails === 0) {
-                        peg$fail(peg$e58);
+                        peg$fail(peg$e64);
                       }
                     }
                   }
                   s2 = input.substring(s2, peg$currPos);
-                  if (input.substr(peg$currPos, 2) === peg$c47) {
-                    s3 = peg$c47;
+                  if (input.substr(peg$currPos, 2) === peg$c53) {
+                    s3 = peg$c53;
                     peg$currPos += 2;
                   } else {
                     s3 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e59);
+                      peg$fail(peg$e65);
                     }
                   }
                   if (s3 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f46(s2);
+                    s0 = peg$f52(s2);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -4561,12 +4700,12 @@ function peg$parse(input, options) {
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
                   if (input.charCodeAt(peg$currPos) === 62) {
-                    s1 = peg$c48;
+                    s1 = peg$c54;
                     peg$currPos++;
                   } else {
                     s1 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e60);
+                      peg$fail(peg$e66);
                     }
                   }
                   if (s1 !== peg$FAILED) {
@@ -4605,7 +4744,7 @@ function peg$parse(input, options) {
                     }
                     if (s3 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s0 = peg$f47(s2);
+                      s0 = peg$f53(s2);
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -4661,7 +4800,7 @@ function peg$parse(input, options) {
                       }
                       if (s3 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f48(s2);
+                        s0 = peg$f54(s2);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -4673,12 +4812,12 @@ function peg$parse(input, options) {
                     if (s0 === peg$FAILED) {
                       s0 = peg$currPos;
                       if (input.charCodeAt(peg$currPos) === 123) {
-                        s1 = peg$c49;
+                        s1 = peg$c55;
                         peg$currPos++;
                       } else {
                         s1 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                          peg$fail(peg$e61);
+                          peg$fail(peg$e67);
                         }
                       }
                       if (s1 !== peg$FAILED) {
@@ -4690,7 +4829,7 @@ function peg$parse(input, options) {
                         } else {
                           s4 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e52);
+                            peg$fail(peg$e58);
                           }
                         }
                         while (s4 !== peg$FAILED) {
@@ -4701,23 +4840,23 @@ function peg$parse(input, options) {
                           } else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e52);
+                              peg$fail(peg$e58);
                             }
                           }
                         }
                         s2 = input.substring(s2, peg$currPos);
                         if (input.charCodeAt(peg$currPos) === 125) {
-                          s3 = peg$c50;
+                          s3 = peg$c56;
                           peg$currPos++;
                         } else {
                           s3 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e62);
+                            peg$fail(peg$e68);
                           }
                         }
                         if (s3 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s0 = peg$f49(s2);
+                          s0 = peg$f55(s2);
                         } else {
                           peg$currPos = s0;
                           s0 = peg$FAILED;
@@ -4729,12 +4868,12 @@ function peg$parse(input, options) {
                       if (s0 === peg$FAILED) {
                         s0 = peg$currPos;
                         if (input.charCodeAt(peg$currPos) === 40) {
-                          s1 = peg$c51;
+                          s1 = peg$c57;
                           peg$currPos++;
                         } else {
                           s1 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e63);
+                            peg$fail(peg$e69);
                           }
                         }
                         if (s1 !== peg$FAILED) {
@@ -4746,7 +4885,7 @@ function peg$parse(input, options) {
                           } else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e43);
+                              peg$fail(peg$e49);
                             }
                           }
                           while (s4 !== peg$FAILED) {
@@ -4757,23 +4896,23 @@ function peg$parse(input, options) {
                             } else {
                               s4 = peg$FAILED;
                               if (peg$silentFails === 0) {
-                                peg$fail(peg$e43);
+                                peg$fail(peg$e49);
                               }
                             }
                           }
                           s2 = input.substring(s2, peg$currPos);
                           if (input.charCodeAt(peg$currPos) === 41) {
-                            s3 = peg$c52;
+                            s3 = peg$c58;
                             peg$currPos++;
                           } else {
                             s3 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e64);
+                              peg$fail(peg$e70);
                             }
                           }
                           if (s3 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f50(s2);
+                            s0 = peg$f56(s2);
                           } else {
                             peg$currPos = s0;
                             s0 = peg$FAILED;
@@ -4797,13 +4936,13 @@ function peg$parse(input, options) {
   function peg$parseStyleDirective() {
     var s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 5) === peg$c53) {
-      s1 = peg$c53;
+    if (input.substr(peg$currPos, 5) === peg$c59) {
+      s1 = peg$c59;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e65);
+        peg$fail(peg$e71);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4817,7 +4956,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e66);
+            peg$fail(peg$e72);
           }
         }
         if (s5 !== peg$FAILED) {
@@ -4829,7 +4968,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e66);
+                peg$fail(peg$e72);
               }
             }
           }
@@ -4843,7 +4982,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f51(s3);
+          s0 = peg$f57(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4861,23 +5000,23 @@ function peg$parse(input, options) {
   function peg$parseClassDirective() {
     var s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 8) === peg$c54) {
-      s1 = peg$c54;
+    if (input.substr(peg$currPos, 8) === peg$c60) {
+      s1 = peg$c60;
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e67);
+        peg$fail(peg$e73);
       }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c55) {
-        s1 = peg$c55;
+      if (input.substr(peg$currPos, 5) === peg$c61) {
+        s1 = peg$c61;
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e68);
+          peg$fail(peg$e74);
         }
       }
     }
@@ -4892,7 +5031,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e66);
+            peg$fail(peg$e72);
           }
         }
         if (s5 !== peg$FAILED) {
@@ -4904,7 +5043,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e66);
+                peg$fail(peg$e72);
               }
             }
           }
@@ -4918,7 +5057,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f52(s3);
+          s0 = peg$f58(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4936,13 +5075,13 @@ function peg$parse(input, options) {
   function peg$parseClickDirective() {
     var s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 5) === peg$c56) {
-      s1 = peg$c56;
+    if (input.substr(peg$currPos, 5) === peg$c62) {
+      s1 = peg$c62;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e69);
+        peg$fail(peg$e75);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4956,7 +5095,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e66);
+            peg$fail(peg$e72);
           }
         }
         if (s5 !== peg$FAILED) {
@@ -4968,7 +5107,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e66);
+                peg$fail(peg$e72);
               }
             }
           }
@@ -4982,7 +5121,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f53(s3);
+          s0 = peg$f59(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5000,25 +5139,25 @@ function peg$parse(input, options) {
   function peg$parseNoteDirective() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c57) {
-      s1 = peg$c57;
+    if (input.substr(peg$currPos, 4) === peg$c63) {
+      s1 = peg$c63;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e70);
+        peg$fail(peg$e76);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 34) {
-          s3 = peg$c58;
+          s3 = peg$c64;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e71);
+            peg$fail(peg$e77);
           }
         }
         if (s3 !== peg$FAILED) {
@@ -5030,7 +5169,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e72);
+              peg$fail(peg$e78);
             }
           }
           while (s6 !== peg$FAILED) {
@@ -5041,30 +5180,30 @@ function peg$parse(input, options) {
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e72);
+                peg$fail(peg$e78);
               }
             }
           }
           s4 = input.substring(s4, peg$currPos);
           if (input.charCodeAt(peg$currPos) === 34) {
-            s5 = peg$c58;
+            s5 = peg$c64;
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e71);
+              peg$fail(peg$e77);
             }
           }
           if (s5 !== peg$FAILED) {
             s6 = peg$parse__();
             if (s6 !== peg$FAILED) {
-              if (input.substr(peg$currPos, 2) === peg$c59) {
-                s7 = peg$c59;
+              if (input.substr(peg$currPos, 2) === peg$c65) {
+                s7 = peg$c65;
                 peg$currPos += 2;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e73);
+                  peg$fail(peg$e79);
                 }
               }
               if (s7 !== peg$FAILED) {
@@ -5121,7 +5260,7 @@ function peg$parse(input, options) {
                       s10 = null;
                     }
                     peg$savedPos = s0;
-                    s0 = peg$f54(s4, s9, s10);
+                    s0 = peg$f60(s4, s9, s10);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -5161,13 +5300,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse__();
     if (s1 !== peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c60) {
-        s2 = peg$c60;
+      if (input.substr(peg$currPos, 6) === peg$c66) {
+        s2 = peg$c66;
         peg$currPos += 6;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e74);
+          peg$fail(peg$e80);
         }
       }
       if (s2 !== peg$FAILED) {
@@ -5177,12 +5316,12 @@ function peg$parse(input, options) {
           if (s4 !== peg$FAILED) {
             s5 = peg$parse_();
             if (input.charCodeAt(peg$currPos) === 44) {
-              s6 = peg$c61;
+              s6 = peg$c67;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e75);
+                peg$fail(peg$e81);
               }
             }
             if (s6 !== peg$FAILED) {
@@ -5190,7 +5329,7 @@ function peg$parse(input, options) {
               s8 = peg$parseSignedInt();
               if (s8 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f55(s4, s8);
+                s0 = peg$f61(s4, s8);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -5221,12 +5360,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 45) {
-      s1 = peg$c62;
+      s1 = peg$c68;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e76);
+        peg$fail(peg$e82);
       }
     }
     if (s1 === peg$FAILED) {
@@ -5240,7 +5379,7 @@ function peg$parse(input, options) {
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e77);
+        peg$fail(peg$e83);
       }
     }
     if (s4 !== peg$FAILED) {
@@ -5252,7 +5391,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e77);
+            peg$fail(peg$e83);
           }
         }
       }
@@ -5266,7 +5405,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f56(s1, s2);
+      s0 = peg$f62(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5276,13 +5415,13 @@ function peg$parse(input, options) {
   function peg$parseLegendBlock() {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c63) {
-      s1 = peg$c63;
+    if (input.substr(peg$currPos, 6) === peg$c69) {
+      s1 = peg$c69;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e78);
+        peg$fail(peg$e84);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5293,12 +5432,12 @@ function peg$parse(input, options) {
           s4 = peg$currPos;
           s5 = peg$parse_();
           if (input.charCodeAt(peg$currPos) === 34) {
-            s6 = peg$c58;
+            s6 = peg$c64;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e71);
+              peg$fail(peg$e77);
             }
           }
           if (s6 !== peg$FAILED) {
@@ -5310,7 +5449,7 @@ function peg$parse(input, options) {
             } else {
               s9 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e72);
+                peg$fail(peg$e78);
               }
             }
             while (s9 !== peg$FAILED) {
@@ -5321,23 +5460,23 @@ function peg$parse(input, options) {
               } else {
                 s9 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e72);
+                  peg$fail(peg$e78);
                 }
               }
             }
             s7 = input.substring(s7, peg$currPos);
             if (input.charCodeAt(peg$currPos) === 34) {
-              s8 = peg$c58;
+              s8 = peg$c64;
               peg$currPos++;
             } else {
               s8 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e71);
+                peg$fail(peg$e77);
               }
             }
             if (s8 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f57(s3, s7);
+              s4 = peg$f63(s3, s7);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -5370,7 +5509,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f58(s3, s4, s7);
+              s0 = peg$f64(s3, s4, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -5395,43 +5534,43 @@ function peg$parse(input, options) {
   }
   function peg$parseLegendCorner() {
     var s0;
-    if (input.substr(peg$currPos, 12) === peg$c64) {
-      s0 = peg$c64;
+    if (input.substr(peg$currPos, 12) === peg$c70) {
+      s0 = peg$c70;
       peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e79);
+        peg$fail(peg$e85);
       }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 11) === peg$c65) {
-        s0 = peg$c65;
+      if (input.substr(peg$currPos, 11) === peg$c71) {
+        s0 = peg$c71;
         peg$currPos += 11;
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e80);
+          peg$fail(peg$e86);
         }
       }
       if (s0 === peg$FAILED) {
-        if (input.substr(peg$currPos, 9) === peg$c66) {
-          s0 = peg$c66;
+        if (input.substr(peg$currPos, 9) === peg$c72) {
+          s0 = peg$c72;
           peg$currPos += 9;
         } else {
           s0 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e81);
+            peg$fail(peg$e87);
           }
         }
         if (s0 === peg$FAILED) {
-          if (input.substr(peg$currPos, 8) === peg$c67) {
-            s0 = peg$c67;
+          if (input.substr(peg$currPos, 8) === peg$c73) {
+            s0 = peg$c73;
             peg$currPos += 8;
           } else {
             s0 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e82);
+              peg$fail(peg$e88);
             }
           }
         }
@@ -5501,7 +5640,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e83);
+          peg$fail(peg$e89);
         }
       }
       if (s5 !== peg$FAILED) {
@@ -5513,7 +5652,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e83);
+              peg$fail(peg$e89);
             }
           }
         }
@@ -5527,12 +5666,12 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 58) {
-          s4 = peg$c29;
+          s4 = peg$c35;
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e36);
+            peg$fail(peg$e42);
           }
         }
         if (s4 !== peg$FAILED) {
@@ -5572,7 +5711,7 @@ function peg$parse(input, options) {
             s6 = peg$parseNL();
             if (s6 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f59(s3, s5);
+              s0 = peg$f65(s3, s5);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -5605,7 +5744,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e85);
+        peg$fail(peg$e91);
       }
     }
     while (s1 !== peg$FAILED) {
@@ -5616,14 +5755,14 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e85);
+          peg$fail(peg$e91);
         }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
     if (peg$silentFails === 0) {
-      peg$fail(peg$e84);
+      peg$fail(peg$e90);
     }
     return s0;
   }
@@ -5637,7 +5776,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e85);
+        peg$fail(peg$e91);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5649,7 +5788,7 @@ function peg$parse(input, options) {
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e85);
+            peg$fail(peg$e91);
           }
         }
       }
@@ -5660,7 +5799,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e86);
+        peg$fail(peg$e92);
       }
     }
     return s0;
@@ -5668,13 +5807,13 @@ function peg$parse(input, options) {
   function peg$parseNL() {
     var s0, s1;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c68) {
-      s0 = peg$c68;
+    if (input.substr(peg$currPos, 2) === peg$c74) {
+      s0 = peg$c74;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e88);
+        peg$fail(peg$e94);
       }
     }
     if (s0 === peg$FAILED) {
@@ -5684,7 +5823,7 @@ function peg$parse(input, options) {
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e89);
+          peg$fail(peg$e95);
         }
       }
     }
@@ -5692,7 +5831,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e87);
+        peg$fail(peg$e93);
       }
     }
     return s0;
@@ -6005,8 +6144,8 @@ function rhuInt(v) {
   return Math.floor(v + 0.5);
 }
 function rhu(v, decimals = 2) {
-  const f = 10 ** decimals;
-  return Math.floor(v * f + 0.5) / f;
+  const f2 = 10 ** decimals;
+  return Math.floor(v * f2 + 0.5) / f2;
 }
 // ../src/text/metrics.ts
@@ -9560,6 +9699,98 @@ var timeline = {
   }
 };
+// ../src/crosslink/render.ts
+function wavifyPath(points, amplitude, wavelength) {
+  if (points.length < 2) {
+    return points.map((p, i) => `${i === 0 ? "M" : "L"} ${p.x} ${p.y}`).join(" ");
+  }
+  const sampleInterval = wavelength / 4;
+  const arcLen = [0];
+  for (let i = 1; i < points.length; i++) {
+    const a = points[i - 1], b = points[i];
+    const dx = b.x - a.x, dy = b.y - a.y;
+    arcLen.push(arcLen[i - 1] + Math.sqrt(dx * dx + dy * dy));
+  }
+  const totalLen = arcLen[arcLen.length - 1];
+  if (totalLen < 1) {
+    return `M ${points[0].x} ${points[0].y}`;
+  }
+  const sampleCount = Math.max(2, Math.ceil(totalLen / sampleInterval) + 1);
+  const samples = [];
+  const sampleArcLens = [];
+  function polylineAt(s) {
+    s = Math.max(0, Math.min(s, totalLen));
+    for (let i = 1; i < points.length; i++) {
+      if (arcLen[i] >= s - 1e-9) {
+        const segStart = arcLen[i - 1];
+        const segEnd = arcLen[i];
+        const segLen = segEnd - segStart;
+        const t = segLen < 1e-9 ? 0 : (s - segStart) / segLen;
+        const a = points[i - 1], b = points[i];
+        const pt = { x: a.x + t * (b.x - a.x), y: a.y + t * (b.y - a.y) };
+        const dx2 = b.x - a.x, dy2 = b.y - a.y;
+        const len2 = Math.sqrt(dx2 * dx2 + dy2 * dy2);
+        const tx = len2 > 1e-9 ? dx2 / len2 : 1;
+        const ty = len2 > 1e-9 ? dy2 / len2 : 0;
+        return { pt, tangentX: tx, tangentY: ty };
+      }
+    }
+    const last = points[points.length - 1], prev = points[points.length - 2];
+    const dx = last.x - prev.x, dy = last.y - prev.y;
+    const len = Math.sqrt(dx * dx + dy * dy);
+    return { pt: last, tangentX: len > 1e-9 ? dx / len : 1, tangentY: len > 1e-9 ? dy / len : 0 };
+  }
+  const cornerArcLens = [];
+  for (let i = 1; i < points.length - 1; i++) {
+    const a = points[i - 1], b = points[i], c = points[i + 1];
+    const d1x = b.x - a.x, d1y = b.y - a.y;
+    const d2x = c.x - b.x, d2y = c.y - b.y;
+    const len1 = Math.sqrt(d1x * d1x + d1y * d1y);
+    const len2 = Math.sqrt(d2x * d2x + d2y * d2y);
+    if (len1 < 1e-9 || len2 < 1e-9) continue;
+    const dot = d1x / len1 * (d2x / len2) + d1y / len1 * (d2y / len2);
+    if (dot < 0.7) {
+      cornerArcLens.push(arcLen[i]);
+    }
+  }
+  function cornerAmplitudeFactor(s) {
+    let minDist = Infinity;
+    for (const cs of cornerArcLens) {
+      minDist = Math.min(minDist, Math.abs(s - cs));
+    }
+    if (minDist >= wavelength) return 1;
+    return minDist / wavelength;
+  }
+  for (let k = 0; k < sampleCount; k++) {
+    const s = k / (sampleCount - 1) * totalLen;
+    const { pt, tangentX, tangentY } = polylineAt(s);
+    const nx = -tangentY;
+    const ny = tangentX;
+    const phase = 2 * Math.PI * s / wavelength;
+    const cornerFactor = cornerAmplitudeFactor(s);
+    const displacement = amplitude * cornerFactor * Math.sin(phase);
+    samples.push({ x: pt.x + nx * displacement, y: pt.y + ny * displacement });
+    sampleArcLens.push(s);
+  }
+  const tension = 0.5;
+  let d = `M ${f(samples[0].x)} ${f(samples[0].y)}`;
+  for (let i = 1; i < samples.length; i++) {
+    const p0 = samples[Math.max(0, i - 2)];
+    const p1 = samples[i - 1];
+    const p2 = samples[i];
+    const p3 = samples[Math.min(samples.length - 1, i + 1)];
+    const cp1x = p1.x + (p2.x - p0.x) * tension / 3;
+    const cp1y = p1.y + (p2.y - p0.y) * tension / 3;
+    const cp2x = p2.x - (p3.x - p1.x) * tension / 3;
+    const cp2y = p2.y - (p3.y - p1.y) * tension / 3;
+    d += ` C ${f(cp1x)} ${f(cp1y)} ${f(cp2x)} ${f(cp2y)} ${f(p2.x)} ${f(p2.y)}`;
+  }
+  return d;
+}
+function f(n) {
+  return Math.round(n * 100) / 100 + "";
+}
 // ../src/crosslink/engine3.ts
 var W_CROSS = 1e4;
 var W_INTER = 3e3;
@@ -9627,7 +9858,7 @@ function routeAndRenderCrossLinks3(links2, theme, anchors, intraPorts, occupiedR
       explicitColorIdx++;
     }
     const dash = edgeStyleToDash(link.style);
-    const animation = link.animation === "none" ? void 0 : isRenderedConnectorAnimation(link.animation) ? link.animation : dash ? "march" : void 0;
+    const animation = link.animation === "none" ? void 0 : isRenderedConnectorAnimation(link.animation) ? link.animation : void 0;
     let markerEnd;
     let markerStart;
     if (link.direction === "directed") {
@@ -9636,12 +9867,18 @@ function routeAndRenderCrossLinks3(links2, theme, anchors, intraPorts, occupiedR
       markerEnd = ARROW_ID;
       markerStart = BI_ARROW_ID;
     }
+    const strokeWidth = link.style === "thick" ? (edgeTheme.strokeWidth + 0.5) * 2 : void 0;
+    const isWavy = link.style === "wavy";
+    const wavyAmp = link.props?.amplitude ?? 3;
+    const wavyLambda = link.props?.wavelength ?? 12;
     const origIdx = links2.indexOf(link);
     workingByOriginalIdx.set(origIdx >= 0 ? origIdx : workingByOriginalIdx.size, {
       points: [...best.rawPts],
       ...best.committed.isBezier ? { isBezier: true } : {},
       color,
       ...dash ? { dash } : {},
+      ...strokeWidth ? { strokeWidth } : {},
+      ...isWavy ? { isWavy: true, wavyAmplitude: wavyAmp, wavyWavelength: wavyLambda } : {},
       ...animation ? { animation } : {},
       ...markerEnd ? { markerEnd } : {},
       ...markerStart ? { markerStart } : {},
@@ -9691,14 +9928,17 @@ function routeAndRenderCrossLinks3(links2, theme, anchors, intraPorts, occupiedR
   const pendingLabels = [];
   for (let i = 0; i < workingRoutes.length; i++) {
     const wr = workingRoutes[i];
-    const path = wr.isBezier ? `M ${wr.points[0].x} ${wr.points[0].y} C ${wr.points[1].x} ${wr.points[1].y} ${wr.points[2].x} ${wr.points[2].y} ${wr.points[3].x} ${wr.points[3].y}` : wr.points.map((p, pi) => `${pi === 0 ? "M" : "L"} ${p.x} ${p.y}`).join(" ");
+    let path = wr.isBezier ? `M ${wr.points[0].x} ${wr.points[0].y} C ${wr.points[1].x} ${wr.points[1].y} ${wr.points[2].x} ${wr.points[2].y} ${wr.points[3].x} ${wr.points[3].y}` : wr.points.map((p, pi) => `${pi === 0 ? "M" : "L"} ${p.x} ${p.y}`).join(" ");
+    if (wr.isWavy) {
+      path = wavifyPath([...wr.points], wr.wavyAmplitude ?? 3, wr.wavyWavelength ?? 12);
+    }
     if (wr.markerEnd === ARROW_ID) needsArrow = true;
     if (wr.markerStart === BI_ARROW_ID) needsBiArrow = true;
     elements.push({
       type: "path",
       d: path,
       stroke: wr.color,
-      strokeWidth: edgeTheme.strokeWidth + 0.5,
+      strokeWidth: wr.strokeWidth ?? edgeTheme.strokeWidth + 0.5,
       ...wr.dash ? { strokeDasharray: wr.dash } : {},
       ...wr.animation ? { animated: wr.animation } : {},
       ...wr.markerEnd ? { markerEnd: wr.markerEnd } : {},
@@ -10240,8 +10480,8 @@ function labelAnchor(pts) {
   return hMid ?? anyMid;
 }
 function edgeStyleToDash(style) {
+  if (style === "dotted") return "4 3";
   if (style === "dashed") return "8 4";
-  if (style === "dotted") return "3 4";
   return void 0;
 }
 function nudgeOffBorders(routes, borders) {
@@ -11117,6 +11357,14 @@ function layoutPoster(ir, theme) {
     for (const op of result.occupiedPorts ?? []) {
       allOccupiedPorts.push({ ...op, nodeKey: `${cellId}.${op.nodeKey}` });
     }
+    for (const cr of result.chromeRects ?? []) {
+      textOccupied.push({
+        x: cr.x * scale + offsetX,
+        y: cr.y * scale + offsetY,
+        width: cr.width * scale,
+        height: cr.height * scale
+      });
+    }
   }
   const totalW = padding * 2 + sumWithGaps(colWidths, 0, grid.columns, gap) - gap;
   const totalH = padding * 2 + headerH + sumWithGaps(rowHeights, 0, numRows, gap) - gap;
@@ -11603,26 +11851,45 @@ function peg$parse3(input, options) {
   var peg$c16 = "text";
   var peg$c17 = "link";
   var peg$c18 = "@";
-  var peg$c19 = ":";
-  var peg$c20 = "straight";
-  var peg$c21 = "orthogonal";
-  var peg$c22 = "bezier";
-  var peg$c23 = "polyline";
-  var peg$c24 = "{";
-  var peg$c25 = ",";
-  var peg$c26 = "}";
-  var peg$c27 = ".";
-  var peg$c28 = "<-->";
-  var peg$c29 = "<-.->";
-  var peg$c30 = "<..>";
-  var peg$c31 = "-->";
-  var peg$c32 = "-.->";
-  var peg$c33 = "..>";
-  var peg$c34 = "-.-";
-  var peg$c35 = "...";
-  var peg$c36 = '"';
-  var peg$c37 = "%%";
-  var peg$c38 = "\r\n";
+  var peg$c19 = "anim:";
+  var peg$c20 = ":";
+  var peg$c21 = "march";
+  var peg$c22 = "particle";
+  var peg$c23 = "draw";
+  var peg$c24 = "pulse";
+  var peg$c25 = "glow";
+  var peg$c26 = "comet";
+  var peg$c27 = "stream";
+  var peg$c28 = "colorcycle";
+  var peg$c29 = "none";
+  var peg$c30 = "straight";
+  var peg$c31 = "orthogonal";
+  var peg$c32 = "bezier";
+  var peg$c33 = "polyline";
+  var peg$c34 = "{";
+  var peg$c35 = ",";
+  var peg$c36 = "}";
+  var peg$c37 = ".";
+  var peg$c38 = "<-~->";
+  var peg$c39 = "<-_->";
+  var peg$c40 = "<-.->";
+  var peg$c41 = "<==>";
+  var peg$c42 = "<-->";
+  var peg$c43 = "-~->";
+  var peg$c44 = "-_->";
+  var peg$c45 = "-..->";
+  var peg$c46 = "-.->";
+  var peg$c47 = "===>";
+  var peg$c48 = "==>";
+  var peg$c49 = "--->";
+  var peg$c50 = "-->";
+  var peg$c51 = "-~-";
+  var peg$c52 = "-_-";
+  var peg$c53 = "-.-";
+  var peg$c54 = "===";
+  var peg$c55 = '"';
+  var peg$c56 = "%%";
+  var peg$c57 = "\r\n";
   var peg$r0 = /^[^\n]/;
   var peg$r1 = /^[ENSW]/;
   var peg$r2 = /^[0-9]/;
@@ -11652,35 +11919,54 @@ function peg$parse3(input, options) {
   var peg$e17 = peg$literalExpectation("text", false);
   var peg$e18 = peg$literalExpectation("link", false);
   var peg$e19 = peg$literalExpectation("@", false);
-  var peg$e20 = peg$literalExpectation(":", false);
-  var peg$e21 = peg$literalExpectation("straight", false);
-  var peg$e22 = peg$literalExpectation("orthogonal", false);
-  var peg$e23 = peg$literalExpectation("bezier", false);
-  var peg$e24 = peg$literalExpectation("polyline", false);
-  var peg$e25 = peg$classExpectation(["E", "N", "S", "W"], false, false);
-  var peg$e26 = peg$literalExpectation("{", false);
-  var peg$e27 = peg$literalExpectation(",", false);
-  var peg$e28 = peg$literalExpectation("}", false);
-  var peg$e29 = peg$classExpectation([["0", "9"]], false, false);
-  var peg$e30 = peg$literalExpectation(".", false);
-  var peg$e31 = peg$literalExpectation("<-->", false);
-  var peg$e32 = peg$literalExpectation("<-.->", false);
-  var peg$e33 = peg$literalExpectation("<..>", false);
-  var peg$e34 = peg$literalExpectation("-->", false);
-  var peg$e35 = peg$literalExpectation("-.->", false);
-  var peg$e36 = peg$literalExpectation("..>", false);
-  var peg$e37 = peg$literalExpectation("-.-", false);
-  var peg$e38 = peg$literalExpectation("...", false);
-  var peg$e39 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false);
-  var peg$e40 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false);
-  var peg$e41 = peg$anyExpectation();
-  var peg$e42 = peg$literalExpectation('"', false);
-  var peg$e43 = peg$classExpectation(['"'], true, false);
-  var peg$e44 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e45 = peg$literalExpectation("%%", false);
-  var peg$e46 = peg$classExpectation([" ", "	"], false, false);
-  var peg$e47 = peg$literalExpectation("\r\n", false);
-  var peg$e48 = peg$classExpectation(["\n", "\r"], false, false);
+  var peg$e20 = peg$literalExpectation("anim:", false);
+  var peg$e21 = peg$literalExpectation(":", false);
+  var peg$e22 = peg$literalExpectation("march", false);
+  var peg$e23 = peg$literalExpectation("particle", false);
+  var peg$e24 = peg$literalExpectation("draw", false);
+  var peg$e25 = peg$literalExpectation("pulse", false);
+  var peg$e26 = peg$literalExpectation("glow", false);
+  var peg$e27 = peg$literalExpectation("comet", false);
+  var peg$e28 = peg$literalExpectation("stream", false);
+  var peg$e29 = peg$literalExpectation("colorcycle", false);
+  var peg$e30 = peg$literalExpectation("none", false);
+  var peg$e31 = peg$literalExpectation("straight", false);
+  var peg$e32 = peg$literalExpectation("orthogonal", false);
+  var peg$e33 = peg$literalExpectation("bezier", false);
+  var peg$e34 = peg$literalExpectation("polyline", false);
+  var peg$e35 = peg$classExpectation(["E", "N", "S", "W"], false, false);
+  var peg$e36 = peg$literalExpectation("{", false);
+  var peg$e37 = peg$literalExpectation(",", false);
+  var peg$e38 = peg$literalExpectation("}", false);
+  var peg$e39 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e40 = peg$literalExpectation(".", false);
+  var peg$e41 = peg$literalExpectation("<-~->", false);
+  var peg$e42 = peg$literalExpectation("<-_->", false);
+  var peg$e43 = peg$literalExpectation("<-.->", false);
+  var peg$e44 = peg$literalExpectation("<==>", false);
+  var peg$e45 = peg$literalExpectation("<-->", false);
+  var peg$e46 = peg$literalExpectation("-~->", false);
+  var peg$e47 = peg$literalExpectation("-_->", false);
+  var peg$e48 = peg$literalExpectation("-..->", false);
+  var peg$e49 = peg$literalExpectation("-.->", false);
+  var peg$e50 = peg$literalExpectation("===>", false);
+  var peg$e51 = peg$literalExpectation("==>", false);
+  var peg$e52 = peg$literalExpectation("--->", false);
+  var peg$e53 = peg$literalExpectation("-->", false);
+  var peg$e54 = peg$literalExpectation("-~-", false);
+  var peg$e55 = peg$literalExpectation("-_-", false);
+  var peg$e56 = peg$literalExpectation("-.-", false);
+  var peg$e57 = peg$literalExpectation("===", false);
+  var peg$e58 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false);
+  var peg$e59 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false);
+  var peg$e60 = peg$anyExpectation();
+  var peg$e61 = peg$literalExpectation('"', false);
+  var peg$e62 = peg$classExpectation(['"'], true, false);
+  var peg$e63 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e64 = peg$literalExpectation("%%", false);
+  var peg$e65 = peg$classExpectation([" ", "	"], false, false);
+  var peg$e66 = peg$literalExpectation("\r\n", false);
+  var peg$e67 = peg$classExpectation(["\n", "\r"], false, false);
   var peg$f0 = function(frontmatter, header, directives, body) {
     const columns = (directives.find((d) => d.key === "columns") || {}).value || 2;
     return {
@@ -11739,9 +12025,8 @@ function peg$parse3(input, options) {
   var peg$f14 = function(cols) {
     return { colSpan: cols, rowSpan: 1 };
   };
-  var peg$f15 = function(from, arrow, to, label, ann, block2) {
+  var peg$f15 = function(from, arrow, to, label, anns, block2) {
     const result = {};
-    if (ann) Object.assign(result, ann[2]);
     if (block2) {
       const b = block2[1];
       if (b.route) {
@@ -11762,37 +12047,49 @@ function peg$parse3(input, options) {
       }
       if (Object.keys(b).length > 0) result.props = b;
     }
+    for (const ann of anns) {
+      Object.assign(result, ann[2]);
+    }
     addLink(from, arrow, to, label ? label[1] : null, Object.keys(result).length > 0 ? result : null);
     return { type: "link" };
   };
-  var peg$f16 = function(route, walls) {
+  var peg$f16 = function(value) {
+    return { animation: value };
+  };
+  var peg$f17 = function(route, walls) {
     return { routing: route, ...walls ? walls[1] : {} };
   };
-  var peg$f17 = function(walls) {
+  var peg$f18 = function(walls) {
     return walls;
   };
-  var peg$f18 = function() {
+  var peg$f19 = function(route, walls) {
+    return { routing: route, ...walls ? walls[1] : {} };
+  };
+  var peg$f20 = function(walls) {
+    return walls;
+  };
+  var peg$f21 = function() {
     return "straight";
   };
-  var peg$f19 = function() {
+  var peg$f22 = function() {
     return "orthogonal";
   };
-  var peg$f20 = function() {
+  var peg$f23 = function() {
     return "bezier";
   };
-  var peg$f21 = function() {
+  var peg$f24 = function() {
     return "polyline";
   };
-  var peg$f22 = function(exit, entry) {
+  var peg$f25 = function(exit, entry) {
     return { exitWall: exit, entryWall: entry };
   };
-  var peg$f23 = function(exit) {
+  var peg$f26 = function(exit) {
     return { exitWall: exit };
   };
-  var peg$f24 = function(w) {
+  var peg$f27 = function(w) {
     return w;
   };
-  var peg$f25 = function(first, rest) {
+  var peg$f28 = function(first, rest) {
     const result = {};
     result[first.key] = first.value;
     for (const r of rest) {
@@ -11800,61 +12097,88 @@ function peg$parse3(input, options) {
     }
     return result;
   };
-  var peg$f26 = function(key, value) {
+  var peg$f29 = function(key, value) {
     return { key, value };
   };
-  var peg$f27 = function(num) {
+  var peg$f30 = function(num) {
     return parseFloat(num);
   };
-  var peg$f28 = function() {
-    return { direction: "bidirectional", style: "solid" };
+  var peg$f31 = function() {
+    return { direction: "bidirectional", style: "wavy" };
   };
-  var peg$f29 = function() {
+  var peg$f32 = function() {
     return { direction: "bidirectional", style: "dashed" };
   };
-  var peg$f30 = function() {
+  var peg$f33 = function() {
     return { direction: "bidirectional", style: "dotted" };
   };
-  var peg$f31 = function() {
-    return { direction: "directed", style: "solid" };
+  var peg$f34 = function() {
+    return { direction: "bidirectional", style: "thick" };
   };
-  var peg$f32 = function() {
+  var peg$f35 = function() {
+    return { direction: "bidirectional", style: "solid" };
+  };
+  var peg$f36 = function() {
+    return { direction: "directed", style: "wavy" };
+  };
+  var peg$f37 = function() {
     return { direction: "directed", style: "dashed" };
   };
-  var peg$f33 = function() {
+  var peg$f38 = function() {
     return { direction: "directed", style: "dotted" };
   };
-  var peg$f34 = function() {
-    return { direction: "undirected", style: "solid" };
+  var peg$f39 = function() {
+    return { direction: "directed", style: "dotted" };
   };
-  var peg$f35 = function() {
+  var peg$f40 = function() {
+    return { direction: "directed", style: "thick" };
+  };
+  var peg$f41 = function() {
+    return { direction: "directed", style: "thick" };
+  };
+  var peg$f42 = function() {
+    return { direction: "directed", style: "solid" };
+  };
+  var peg$f43 = function() {
+    return { direction: "directed", style: "solid" };
+  };
+  var peg$f44 = function() {
+    return { direction: "undirected", style: "wavy" };
+  };
+  var peg$f45 = function() {
     return { direction: "undirected", style: "dashed" };
   };
-  var peg$f36 = function() {
+  var peg$f46 = function() {
     return { direction: "undirected", style: "dotted" };
   };
-  var peg$f37 = function(cell, index) {
+  var peg$f47 = function() {
+    return { direction: "undirected", style: "thick" };
+  };
+  var peg$f48 = function() {
+    return { direction: "undirected", style: "solid" };
+  };
+  var peg$f49 = function(cell, index) {
     return { cellPath: [cell], nodeId: "", elementIndex: index };
   };
-  var peg$f38 = function(cell, node) {
+  var peg$f50 = function(cell, node) {
     return { cellPath: [cell], nodeId: node };
   };
-  var peg$f39 = function(line) {
+  var peg$f51 = function(line) {
     return line;
   };
-  var peg$f40 = function(lines2) {
+  var peg$f52 = function(lines2) {
     return lines2.join("\n");
   };
-  var peg$f41 = function(text2) {
+  var peg$f53 = function(text2) {
     return text2;
   };
-  var peg$f42 = function(digits) {
+  var peg$f54 = function(digits) {
     return parseInt(digits, 10);
   };
-  var peg$f43 = function(sign, digits) {
+  var peg$f55 = function(sign, digits) {
     return parseInt((sign || "") + digits, 10);
   };
-  var peg$f44 = function() {
+  var peg$f56 = function() {
     return null;
   };
   var peg$currPos = options.peg$currPos | 0;
@@ -12728,7 +13052,7 @@ function peg$parse3(input, options) {
     return s0;
   }
   function peg$parseLinkDecl() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
     s0 = peg$currPos;
     s1 = peg$parse_();
     if (input.substr(peg$currPos, 4) === peg$c17) {
@@ -12766,32 +13090,57 @@ function peg$parse3(input, options) {
                   if (s9 === peg$FAILED) {
                     s9 = null;
                   }
-                  s10 = peg$currPos;
-                  s11 = peg$parse_();
+                  s10 = [];
+                  s11 = peg$currPos;
+                  s12 = peg$parse_();
                   if (input.charCodeAt(peg$currPos) === 64) {
-                    s12 = peg$c18;
+                    s13 = peg$c18;
                     peg$currPos++;
                   } else {
-                    s12 = peg$FAILED;
+                    s13 = peg$FAILED;
                     if (peg$silentFails === 0) {
                       peg$fail(peg$e19);
                     }
                   }
-                  if (s12 !== peg$FAILED) {
-                    s13 = peg$parseRouteAnnotation();
-                    if (s13 !== peg$FAILED) {
-                      s11 = [s11, s12, s13];
-                      s10 = s11;
+                  if (s13 !== peg$FAILED) {
+                    s14 = peg$parseAnnotation();
+                    if (s14 !== peg$FAILED) {
+                      s12 = [s12, s13, s14];
+                      s11 = s12;
                     } else {
-                      peg$currPos = s10;
-                      s10 = peg$FAILED;
+                      peg$currPos = s11;
+                      s11 = peg$FAILED;
                     }
                   } else {
-                    peg$currPos = s10;
-                    s10 = peg$FAILED;
+                    peg$currPos = s11;
+                    s11 = peg$FAILED;
                   }
-                  if (s10 === peg$FAILED) {
-                    s10 = null;
+                  while (s11 !== peg$FAILED) {
+                    s10.push(s11);
+                    s11 = peg$currPos;
+                    s12 = peg$parse_();
+                    if (input.charCodeAt(peg$currPos) === 64) {
+                      s13 = peg$c18;
+                      peg$currPos++;
+                    } else {
+                      s13 = peg$FAILED;
+                      if (peg$silentFails === 0) {
+                        peg$fail(peg$e19);
+                      }
+                    }
+                    if (s13 !== peg$FAILED) {
+                      s14 = peg$parseAnnotation();
+                      if (s14 !== peg$FAILED) {
+                        s12 = [s12, s13, s14];
+                        s11 = s12;
+                      } else {
+                        peg$currPos = s11;
+                        s11 = peg$FAILED;
+                      }
+                    } else {
+                      peg$currPos = s11;
+                      s11 = peg$FAILED;
+                    }
                   }
                   s11 = peg$currPos;
                   s12 = peg$parse_();
@@ -12845,6 +13194,191 @@ function peg$parse3(input, options) {
     }
     return s0;
   }
+  function peg$parseAnnotation() {
+    var s0, s1, s2, s3, s4;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 5) === peg$c19) {
+      s1 = peg$c19;
+      peg$currPos += 5;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e20);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseAnimValue();
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f16(s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parseRouteWord();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 58) {
+          s3 = peg$c20;
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e21);
+          }
+        }
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parseWallPair();
+          if (s4 !== peg$FAILED) {
+            s3 = [s3, s4];
+            s2 = s3;
+          } else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+        if (s2 === peg$FAILED) {
+          s2 = null;
+        }
+        peg$savedPos = s0;
+        s0 = peg$f17(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        s1 = peg$parseWallPair();
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f18(s1);
+        }
+        s0 = s1;
+      }
+    }
+    return s0;
+  }
+  function peg$parseAnimValue() {
+    var s0;
+    if (input.substr(peg$currPos, 5) === peg$c21) {
+      s0 = peg$c21;
+      peg$currPos += 5;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e22);
+      }
+    }
+    if (s0 === peg$FAILED) {
+      if (input.substr(peg$currPos, 8) === peg$c22) {
+        s0 = peg$c22;
+        peg$currPos += 8;
+      } else {
+        s0 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e23);
+        }
+      }
+      if (s0 === peg$FAILED) {
+        if (input.substr(peg$currPos, 4) === peg$c23) {
+          s0 = peg$c23;
+          peg$currPos += 4;
+        } else {
+          s0 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e24);
+          }
+        }
+        if (s0 === peg$FAILED) {
+          if (input.substr(peg$currPos, 5) === peg$c24) {
+            s0 = peg$c24;
+            peg$currPos += 5;
+          } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e25);
+            }
+          }
+          if (s0 === peg$FAILED) {
+            if (input.substr(peg$currPos, 4) === peg$c25) {
+              s0 = peg$c25;
+              peg$currPos += 4;
+            } else {
+              s0 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e26);
+              }
+            }
+            if (s0 === peg$FAILED) {
+              if (input.substr(peg$currPos, 5) === peg$c26) {
+                s0 = peg$c26;
+                peg$currPos += 5;
+              } else {
+                s0 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e27);
+                }
+              }
+              if (s0 === peg$FAILED) {
+                if (input.substr(peg$currPos, 6) === peg$c27) {
+                  s0 = peg$c27;
+                  peg$currPos += 6;
+                } else {
+                  s0 = peg$FAILED;
+                  if (peg$silentFails === 0) {
+                    peg$fail(peg$e28);
+                  }
+                }
+                if (s0 === peg$FAILED) {
+                  if (input.substr(peg$currPos, 4) === peg$c13) {
+                    s0 = peg$c13;
+                    peg$currPos += 4;
+                  } else {
+                    s0 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                      peg$fail(peg$e14);
+                    }
+                  }
+                  if (s0 === peg$FAILED) {
+                    if (input.substr(peg$currPos, 10) === peg$c28) {
+                      s0 = peg$c28;
+                      peg$currPos += 10;
+                    } else {
+                      s0 = peg$FAILED;
+                      if (peg$silentFails === 0) {
+                        peg$fail(peg$e29);
+                      }
+                    }
+                    if (s0 === peg$FAILED) {
+                      if (input.substr(peg$currPos, 4) === peg$c29) {
+                        s0 = peg$c29;
+                        peg$currPos += 4;
+                      } else {
+                        s0 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                          peg$fail(peg$e30);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    return s0;
+  }
   function peg$parseRouteAnnotation() {
     var s0, s1, s2, s3, s4;
     s0 = peg$currPos;
@@ -12852,12 +13386,12 @@ function peg$parse3(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c19;
+        s3 = peg$c20;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e20);
+          peg$fail(peg$e21);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -12877,7 +13411,7 @@ function peg$parse3(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f16(s1, s2);
+      s0 = peg$f19(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12887,7 +13421,7 @@ function peg$parse3(input, options) {
       s1 = peg$parseWallPair();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f17(s1);
+        s1 = peg$f20(s1);
       }
       s0 = s1;
     }
@@ -12896,66 +13430,66 @@ function peg$parse3(input, options) {
   function peg$parseRouteWord() {
     var s0, s1;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 8) === peg$c20) {
-      s1 = peg$c20;
+    if (input.substr(peg$currPos, 8) === peg$c30) {
+      s1 = peg$c30;
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e21);
+        peg$fail(peg$e31);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f21();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 10) === peg$c21) {
-        s1 = peg$c21;
+      if (input.substr(peg$currPos, 10) === peg$c31) {
+        s1 = peg$c31;
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e22);
+          peg$fail(peg$e32);
         }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f19();
+        s1 = peg$f22();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 6) === peg$c22) {
-          s1 = peg$c22;
+        if (input.substr(peg$currPos, 6) === peg$c32) {
+          s1 = peg$c32;
           peg$currPos += 6;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e33);
           }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f20();
+          s1 = peg$f23();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 8) === peg$c23) {
-            s1 = peg$c23;
+          if (input.substr(peg$currPos, 8) === peg$c33) {
+            s1 = peg$c33;
             peg$currPos += 8;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e34);
             }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f21();
+            s1 = peg$f24();
           }
           s0 = s1;
         }
@@ -12971,7 +13505,7 @@ function peg$parse3(input, options) {
       s2 = peg$parseWall();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f22(s1, s2);
+        s0 = peg$f25(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12985,7 +13519,7 @@ function peg$parse3(input, options) {
       s1 = peg$parseWall();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f23(s1);
+        s1 = peg$f26(s1);
       }
       s0 = s1;
     }
@@ -13000,12 +13534,12 @@ function peg$parse3(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e25);
+        peg$fail(peg$e35);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24(s1);
+      s1 = peg$f27(s1);
     }
     s0 = s1;
     return s0;
@@ -13014,12 +13548,12 @@ function peg$parse3(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
-      s1 = peg$c24;
+      s1 = peg$c34;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e26);
+        peg$fail(peg$e36);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -13030,12 +13564,12 @@ function peg$parse3(input, options) {
         s5 = peg$currPos;
         s6 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s7 = peg$c25;
+          s7 = peg$c35;
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e27);
+            peg$fail(peg$e37);
           }
         }
         if (s7 !== peg$FAILED) {
@@ -13057,12 +13591,12 @@ function peg$parse3(input, options) {
           s5 = peg$currPos;
           s6 = peg$parse_();
           if (input.charCodeAt(peg$currPos) === 44) {
-            s7 = peg$c25;
+            s7 = peg$c35;
             peg$currPos++;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e37);
             }
           }
           if (s7 !== peg$FAILED) {
@@ -13082,17 +13616,17 @@ function peg$parse3(input, options) {
         }
         s5 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 125) {
-          s6 = peg$c26;
+          s6 = peg$c36;
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e28);
+            peg$fail(peg$e38);
           }
         }
         if (s6 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f25(s3, s4);
+          s0 = peg$f28(s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13114,12 +13648,12 @@ function peg$parse3(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parse_();
       if (input.charCodeAt(peg$currPos) === 58) {
-        s3 = peg$c19;
+        s3 = peg$c20;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e20);
+          peg$fail(peg$e21);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -13127,7 +13661,7 @@ function peg$parse3(input, options) {
         s5 = peg$parsePropValue();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f26(s1, s5);
+          s0 = peg$f29(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13154,7 +13688,7 @@ function peg$parse3(input, options) {
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e29);
+        peg$fail(peg$e39);
       }
     }
     if (s4 !== peg$FAILED) {
@@ -13166,7 +13700,7 @@ function peg$parse3(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e39);
           }
         }
       }
@@ -13176,12 +13710,12 @@ function peg$parse3(input, options) {
     if (s3 !== peg$FAILED) {
       s4 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 46) {
-        s5 = peg$c27;
+        s5 = peg$c37;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e30);
+          peg$fail(peg$e40);
         }
       }
       if (s5 !== peg$FAILED) {
@@ -13192,7 +13726,7 @@ function peg$parse3(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e39);
           }
         }
         if (s7 !== peg$FAILED) {
@@ -13204,7 +13738,7 @@ function peg$parse3(input, options) {
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e29);
+                peg$fail(peg$e39);
               }
             }
           }
@@ -13238,7 +13772,7 @@ function peg$parse3(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f27(s1);
+      s1 = peg$f30(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -13252,148 +13786,301 @@ function peg$parse3(input, options) {
   function peg$parseArrow() {
     var s0, s1;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c28) {
-      s1 = peg$c28;
-      peg$currPos += 4;
+    if (input.substr(peg$currPos, 5) === peg$c38) {
+      s1 = peg$c38;
+      peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e31);
+        peg$fail(peg$e41);
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f28();
+      s1 = peg$f31();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 5) === peg$c29) {
-        s1 = peg$c29;
+      if (input.substr(peg$currPos, 5) === peg$c39) {
+        s1 = peg$c39;
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e32);
+          peg$fail(peg$e42);
         }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f29();
+        s1 = peg$f32();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 4) === peg$c30) {
-          s1 = peg$c30;
-          peg$currPos += 4;
+        if (input.substr(peg$currPos, 5) === peg$c40) {
+          s1 = peg$c40;
+          peg$currPos += 5;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e43);
           }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f30();
+          s1 = peg$f33();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 3) === peg$c31) {
-            s1 = peg$c31;
-            peg$currPos += 3;
+          if (input.substr(peg$currPos, 4) === peg$c41) {
+            s1 = peg$c41;
+            peg$currPos += 4;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e44);
             }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f31();
+            s1 = peg$f34();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 4) === peg$c32) {
-              s1 = peg$c32;
+            if (input.substr(peg$currPos, 4) === peg$c42) {
+              s1 = peg$c42;
               peg$currPos += 4;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e35);
+                peg$fail(peg$e45);
               }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f32();
+              s1 = peg$f35();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 3) === peg$c33) {
-                s1 = peg$c33;
-                peg$currPos += 3;
+              if (input.substr(peg$currPos, 4) === peg$c43) {
+                s1 = peg$c43;
+                peg$currPos += 4;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e36);
+                  peg$fail(peg$e46);
                 }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f33();
+                s1 = peg$f36();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 3) === peg$c0) {
-                  s1 = peg$c0;
-                  peg$currPos += 3;
+                if (input.substr(peg$currPos, 4) === peg$c44) {
+                  s1 = peg$c44;
+                  peg$currPos += 4;
                 } else {
                   s1 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e0);
+                    peg$fail(peg$e47);
                   }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f34();
+                  s1 = peg$f37();
                 }
                 s0 = s1;
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
-                  if (input.substr(peg$currPos, 3) === peg$c34) {
-                    s1 = peg$c34;
-                    peg$currPos += 3;
+                  if (input.substr(peg$currPos, 5) === peg$c45) {
+                    s1 = peg$c45;
+                    peg$currPos += 5;
                   } else {
                     s1 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e37);
+                      peg$fail(peg$e48);
                     }
                   }
                   if (s1 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$f35();
+                    s1 = peg$f38();
                   }
                   s0 = s1;
                   if (s0 === peg$FAILED) {
                     s0 = peg$currPos;
-                    if (input.substr(peg$currPos, 3) === peg$c35) {
-                      s1 = peg$c35;
-                      peg$currPos += 3;
+                    if (input.substr(peg$currPos, 4) === peg$c46) {
+                      s1 = peg$c46;
+                      peg$currPos += 4;
                     } else {
                       s1 = peg$FAILED;
                       if (peg$silentFails === 0) {
-                        peg$fail(peg$e38);
+                        peg$fail(peg$e49);
                       }
                     }
                     if (s1 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$f36();
+                      s1 = peg$f39();
                     }
                     s0 = s1;
+                    if (s0 === peg$FAILED) {
+                      s0 = peg$currPos;
+                      if (input.substr(peg$currPos, 4) === peg$c47) {
+                        s1 = peg$c47;
+                        peg$currPos += 4;
+                      } else {
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                          peg$fail(peg$e50);
+                        }
+                      }
+                      if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$f40();
+                      }
+                      s0 = s1;
+                      if (s0 === peg$FAILED) {
+                        s0 = peg$currPos;
+                        if (input.substr(peg$currPos, 3) === peg$c48) {
+                          s1 = peg$c48;
+                          peg$currPos += 3;
+                        } else {
+                          s1 = peg$FAILED;
+                          if (peg$silentFails === 0) {
+                            peg$fail(peg$e51);
+                          }
+                        }
+                        if (s1 !== peg$FAILED) {
+                          peg$savedPos = s0;
+                          s1 = peg$f41();
+                        }
+                        s0 = s1;
+                        if (s0 === peg$FAILED) {
+                          s0 = peg$currPos;
+                          if (input.substr(peg$currPos, 4) === peg$c49) {
+                            s1 = peg$c49;
+                            peg$currPos += 4;
+                          } else {
+                            s1 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                              peg$fail(peg$e52);
+                            }
+                          }
+                          if (s1 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$f42();
+                          }
+                          s0 = s1;
+                          if (s0 === peg$FAILED) {
+                            s0 = peg$currPos;
+                            if (input.substr(peg$currPos, 3) === peg$c50) {
+                              s1 = peg$c50;
+                              peg$currPos += 3;
+                            } else {
+                              s1 = peg$FAILED;
+                              if (peg$silentFails === 0) {
+                                peg$fail(peg$e53);
+                              }
+                            }
+                            if (s1 !== peg$FAILED) {
+                              peg$savedPos = s0;
+                              s1 = peg$f43();
+                            }
+                            s0 = s1;
+                            if (s0 === peg$FAILED) {
+                              s0 = peg$currPos;
+                              if (input.substr(peg$currPos, 3) === peg$c51) {
+                                s1 = peg$c51;
+                                peg$currPos += 3;
+                              } else {
+                                s1 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                  peg$fail(peg$e54);
+                                }
+                              }
+                              if (s1 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$f44();
+                              }
+                              s0 = s1;
+                              if (s0 === peg$FAILED) {
+                                s0 = peg$currPos;
+                                if (input.substr(peg$currPos, 3) === peg$c52) {
+                                  s1 = peg$c52;
+                                  peg$currPos += 3;
+                                } else {
+                                  s1 = peg$FAILED;
+                                  if (peg$silentFails === 0) {
+                                    peg$fail(peg$e55);
+                                  }
+                                }
+                                if (s1 !== peg$FAILED) {
+                                  peg$savedPos = s0;
+                                  s1 = peg$f45();
+                                }
+                                s0 = s1;
+                                if (s0 === peg$FAILED) {
+                                  s0 = peg$currPos;
+                                  if (input.substr(peg$currPos, 3) === peg$c53) {
+                                    s1 = peg$c53;
+                                    peg$currPos += 3;
+                                  } else {
+                                    s1 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                      peg$fail(peg$e56);
+                                    }
+                                  }
+                                  if (s1 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s1 = peg$f46();
+                                  }
+                                  s0 = s1;
+                                  if (s0 === peg$FAILED) {
+                                    s0 = peg$currPos;
+                                    if (input.substr(peg$currPos, 3) === peg$c54) {
+                                      s1 = peg$c54;
+                                      peg$currPos += 3;
+                                    } else {
+                                      s1 = peg$FAILED;
+                                      if (peg$silentFails === 0) {
+                                        peg$fail(peg$e57);
+                                      }
+                                    }
+                                    if (s1 !== peg$FAILED) {
+                                      peg$savedPos = s0;
+                                      s1 = peg$f47();
+                                    }
+                                    s0 = s1;
+                                    if (s0 === peg$FAILED) {
+                                      s0 = peg$currPos;
+                                      if (input.substr(peg$currPos, 3) === peg$c0) {
+                                        s1 = peg$c0;
+                                        peg$currPos += 3;
+                                      } else {
+                                        s1 = peg$FAILED;
+                                        if (peg$silentFails === 0) {
+                                          peg$fail(peg$e0);
+                                        }
+                                      }
+                                      if (s1 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s1 = peg$f48();
+                                      }
+                                      s0 = s1;
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
                   }
                 }
               }
@@ -13432,7 +14119,7 @@ function peg$parse3(input, options) {
           }
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f37(s1, s3);
+            s0 = peg$f49(s1, s3);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -13454,19 +14141,19 @@ function peg$parse3(input, options) {
       s1 = peg$parseIdentifier();
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 46) {
-          s2 = peg$c27;
+          s2 = peg$c37;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e40);
           }
         }
         if (s2 !== peg$FAILED) {
           s3 = peg$parseIdentifier();
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f38(s1, s3);
+            s0 = peg$f50(s1, s3);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -13492,7 +14179,7 @@ function peg$parse3(input, options) {
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e39);
+        peg$fail(peg$e58);
       }
     }
     if (s2 !== peg$FAILED) {
@@ -13503,7 +14190,7 @@ function peg$parse3(input, options) {
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e40);
+          peg$fail(peg$e59);
         }
       }
       while (s4 !== peg$FAILED) {
@@ -13514,7 +14201,7 @@ function peg$parse3(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e40);
+            peg$fail(peg$e59);
           }
         }
       }
@@ -13561,7 +14248,7 @@ function peg$parse3(input, options) {
         } else {
           s9 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e41);
+            peg$fail(peg$e60);
           }
         }
         peg$silentFails--;
@@ -13618,7 +14305,7 @@ function peg$parse3(input, options) {
       s5 = peg$parseNL();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s2;
-        s2 = peg$f39(s4);
+        s2 = peg$f51(s4);
       } else {
         peg$currPos = s2;
         s2 = peg$FAILED;
@@ -13655,7 +14342,7 @@ function peg$parse3(input, options) {
           } else {
             s9 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e41);
+              peg$fail(peg$e60);
             }
           }
           peg$silentFails--;
@@ -13712,7 +14399,7 @@ function peg$parse3(input, options) {
         s5 = peg$parseNL();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s2;
-          s2 = peg$f39(s4);
+          s2 = peg$f51(s4);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -13723,7 +14410,7 @@ function peg$parse3(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f40(s1);
+    s1 = peg$f52(s1);
     s0 = s1;
     return s0;
   }
@@ -13731,12 +14418,12 @@ function peg$parse3(input, options) {
     var s0, s1, s2, s3, s4;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c36;
+      s1 = peg$c55;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e42);
+        peg$fail(peg$e61);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -13748,7 +14435,7 @@ function peg$parse3(input, options) {
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e43);
+          peg$fail(peg$e62);
         }
       }
       while (s4 !== peg$FAILED) {
@@ -13759,23 +14446,23 @@ function peg$parse3(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e43);
+            peg$fail(peg$e62);
           }
         }
       }
       s2 = input.substring(s2, peg$currPos);
       if (input.charCodeAt(peg$currPos) === 34) {
-        s3 = peg$c36;
+        s3 = peg$c55;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e42);
+          peg$fail(peg$e61);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f41(s2);
+        s0 = peg$f53(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13797,7 +14484,7 @@ function peg$parse3(input, options) {
     } else {
       s3 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e29);
+        peg$fail(peg$e39);
       }
     }
     if (s3 !== peg$FAILED) {
@@ -13809,7 +14496,7 @@ function peg$parse3(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e39);
           }
         }
       }
@@ -13823,7 +14510,7 @@ function peg$parse3(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42(s1);
+      s1 = peg$f54(s1);
     }
     s0 = s1;
     return s0;
@@ -13837,7 +14524,7 @@ function peg$parse3(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e44);
+        peg$fail(peg$e63);
       }
     }
     if (s1 === peg$FAILED) {
@@ -13851,7 +14538,7 @@ function peg$parse3(input, options) {
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e29);
+        peg$fail(peg$e39);
       }
     }
     if (s4 !== peg$FAILED) {
@@ -13863,7 +14550,7 @@ function peg$parse3(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e39);
           }
         }
       }
@@ -13877,7 +14564,7 @@ function peg$parse3(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f43(s1, s2);
+      s0 = peg$f55(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -13895,7 +14582,7 @@ function peg$parse3(input, options) {
     s3 = peg$parseNL();
     if (s3 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f44();
+      s0 = peg$f56();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -13905,13 +14592,13 @@ function peg$parse3(input, options) {
   function peg$parseComment() {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c37) {
-      s1 = peg$c37;
+    if (input.substr(peg$currPos, 2) === peg$c56) {
+      s1 = peg$c56;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e45);
+        peg$fail(peg$e64);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -13954,7 +14641,7 @@ function peg$parse3(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e46);
+        peg$fail(peg$e65);
       }
     }
     while (s1 !== peg$FAILED) {
@@ -13965,7 +14652,7 @@ function peg$parse3(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e46);
+          peg$fail(peg$e65);
         }
       }
     }
@@ -13980,7 +14667,7 @@ function peg$parse3(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e46);
+        peg$fail(peg$e65);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -13992,7 +14679,7 @@ function peg$parse3(input, options) {
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e46);
+            peg$fail(peg$e65);
           }
         }
       }
@@ -14003,13 +14690,13 @@ function peg$parse3(input, options) {
   }
   function peg$parseNL() {
     var s0;
-    if (input.substr(peg$currPos, 2) === peg$c38) {
-      s0 = peg$c38;
+    if (input.substr(peg$currPos, 2) === peg$c57) {
+      s0 = peg$c57;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e47);
+        peg$fail(peg$e66);
       }
     }
     if (s0 === peg$FAILED) {
@@ -14019,7 +14706,7 @@ function peg$parse3(input, options) {
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e48);
+          peg$fail(peg$e67);
         }
       }
     }
@@ -20237,7 +20924,7 @@ function layoutJourney(ir, theme) {
     elements.push(p.text(String(s), plotLeft - 10, y + typography.smallFontSize * 0.35, typography.smallFontSize, palette.textMuted, { anchor: "end" }));
   }
   ir.sections.forEach((sec, si) => {
-    const idxs = flat2.map((f, i) => ({ f, i })).filter(({ f }) => f.section === si).map(({ i }) => i);
+    const idxs = flat2.map((f2, i) => ({ f: f2, i })).filter(({ f: f2 }) => f2.section === si).map(({ i }) => i);
     if (idxs.length === 0) return;
     const x0 = taskX(idxs[0]) - step / 2;
     const x1 = taskX(idxs[idxs.length - 1]) + step / 2;
@@ -20245,21 +20932,21 @@ function layoutJourney(ir, theme) {
     elements.push(p.rect({ x: rhu(x0), y: margin + titleH, width: rhu(x1 - x0 - 6), height: sectionBandH }, hue, hue, 0, { rx: 6 }));
     elements.push(p.text(sec.label, rhuInt((x0 + x1) / 2 - 3), margin + titleH + sectionBandH / 2 + typography.baseFontSize * 0.35, typography.baseFontSize, "#FFFFFF", { weight: "bold", anchor: "middle" }));
   });
-  const nodePts = flat2.map((f, i) => ({ x: rhu(taskX(i)), y: scoreY(f.score) }));
+  const nodePts = flat2.map((f2, i) => ({ x: rhu(taskX(i)), y: scoreY(f2.score) }));
   if (nodePts.length > 1) {
     elements.push(p.path(`M ${nodePts.map((pt) => `${pt.x} ${pt.y}`).join(" L ")}`, palette.textMuted, 2, { opacity: 0.6 }));
   }
-  flat2.forEach((f, i) => {
-    const x = rhu(taskX(i)), y = scoreY(f.score);
-    const color = scoreColor(f.score);
+  flat2.forEach((f2, i) => {
+    const x = rhu(taskX(i)), y = scoreY(f2.score);
+    const color = scoreColor(f2.score);
     elements.push(p.circle({ x, y }, 16, color, palette.background, 2));
-    elements.push(p.text(String(f.score), x, y + typography.baseFontSize * 0.35, typography.baseFontSize, "#FFFFFF", { weight: "bold", anchor: "middle" }));
-    elements.push(p.text(f.label, x, plotBottom + typography.smallFontSize + 10, typography.smallFontSize, palette.text, { anchor: "middle", weight: "bold" }));
-    f.actors.forEach((a, ai) => {
+    elements.push(p.text(String(f2.score), x, y + typography.baseFontSize * 0.35, typography.baseFontSize, "#FFFFFF", { weight: "bold", anchor: "middle" }));
+    elements.push(p.text(f2.label, x, plotBottom + typography.smallFontSize + 10, typography.smallFontSize, palette.text, { anchor: "middle", weight: "bold" }));
+    f2.actors.forEach((a, ai) => {
       elements.push(p.text(a, x, plotBottom + typography.smallFontSize + 10 + (ai + 1) * (typography.smallFontSize + 4), typography.smallFontSize, palette.textMuted, { anchor: "middle" }));
     });
   });
-  const maxActors = Math.max(1, ...flat2.map((f) => f.actors.length));
+  const maxActors = Math.max(1, ...flat2.map((f2) => f2.actors.length));
   const totalW = rhuInt(plotRight + margin);
   const totalH = rhuInt(plotBottom + typography.smallFontSize + 10 + (maxActors + 1) * (typography.smallFontSize + 4) + margin);
   const scene = applyOverlays({
@@ -22051,14 +22738,14 @@ function layoutSequence(ir, theme) {
       fragStack.push({ type: ev.type, label: ev.label, top: y - 24, left: minX, right: maxX, elses: [] });
       y += 14;
     } else if (ev.kind === "frag-else") {
-      const f = fragStack[fragStack.length - 1];
-      if (f) f.elses.push({ y: y - 18, label: ev.label });
+      const f2 = fragStack[fragStack.length - 1];
+      if (f2) f2.elses.push({ y: y - 18, label: ev.label });
       y += 10;
     } else if (ev.kind === "frag-end") {
-      const f = fragStack.pop();
-      if (f) {
-        f.right = maxX;
-        fragBoxes.push({ ...f, top: f.top, left: minX - colW / 2 - 16, right: maxX + colW / 2 + 16 });
+      const f2 = fragStack.pop();
+      if (f2) {
+        f2.right = maxX;
+        fragBoxes.push({ ...f2, top: f2.top, left: minX - colW / 2 - 16, right: maxX + colW / 2 + 16 });
       }
       y += 6;
     }
@@ -22069,14 +22756,14 @@ function layoutSequence(ir, theme) {
   }
   const bodyBottom = y + 6;
   const fragEls = [];
-  for (const f of fragBoxes) {
-    const top = f.top, left = f.left, right = f.right;
+  for (const f2 of fragBoxes) {
+    const top = f2.top, left = f2.left, right = f2.right;
     fragEls.push(p.rect({ x: rhu(left), y: rhu(top), width: rhu(right - left), height: rhu(bodyBottom - top) }, "none", palette.border, 1.2, { rx: 4 }));
-    const tabW = measureText(f.type.toUpperCase(), typography.smallFontSize).width + 16;
+    const tabW = measureText(f2.type.toUpperCase(), typography.smallFontSize).width + 16;
     fragEls.push(p.rect({ x: rhu(left), y: rhu(top), width: rhu(tabW), height: 18 }, palette.border, palette.border, 0));
-    fragEls.push(p.text(f.type.toUpperCase(), rhu(left + 8), rhu(top + 13), typography.smallFontSize, palette.background, { weight: "bold" }));
-    if (f.label) fragEls.push(p.text(`[${f.label}]`, rhu(left + tabW + 8), rhu(top + 13), typography.smallFontSize, palette.text, { weight: "bold" }));
-    for (const e of f.elses) {
+    fragEls.push(p.text(f2.type.toUpperCase(), rhu(left + 8), rhu(top + 13), typography.smallFontSize, palette.background, { weight: "bold" }));
+    if (f2.label) fragEls.push(p.text(`[${f2.label}]`, rhu(left + tabW + 8), rhu(top + 13), typography.smallFontSize, palette.text, { weight: "bold" }));
+    for (const e of f2.elses) {
       fragEls.push(p.path(`M ${rhu(left)} ${rhu(e.y)} L ${rhu(right)} ${rhu(e.y)}`, palette.border, 1, { dash: "4 3" }));
       if (e.label) fragEls.push(p.text(`[${e.label}]`, rhu(left + 8), rhu(e.y + 13), typography.smallFontSize, palette.text));
     }
@@ -27065,9 +27752,9 @@ function collect(stmts, states, transitions, composites) {
       ensure(st.id, st.label || st.id, "normal");
       localIds.add(st.id);
     } else if (st.t === "trans") {
-      const f = ref(st.from, "from"), to = ref(st.to, "to");
-      transitions.push({ from: f, to, ...st.label ? { label: st.label } : {} });
-      if (f !== "__start__" && f !== "__end__") localIds.add(f);
+      const f2 = ref(st.from, "from"), to = ref(st.to, "to");
+      transitions.push({ from: f2, to, ...st.label ? { label: st.label } : {} });
+      if (f2 !== "__start__" && f2 !== "__end__") localIds.add(f2);
       if (to !== "__start__" && to !== "__end__") localIds.add(to);
     } else if (st.t === "block") {
       ensure(st.name, st.name, "normal");
@@ -31085,8 +31772,8 @@ function layoutRequirement(ir, theme) {
   const prepared = /* @__PURE__ */ new Map();
   const sizeOf = (n) => {
     const lines2 = [];
-    for (const f of n.fields) {
-      const wrapped = wrapText2(`${f.key}: ${f.value}`, fieldFont, BOX_W - 20, 3).lines;
+    for (const f2 of n.fields) {
+      const wrapped = wrapText2(`${f2.key}: ${f2.value}`, fieldFont, BOX_W - 20, 3).lines;
       lines2.push(...wrapped);
     }
     const headH = rhuInt(nameFont * 1.5) + fieldFont + 8;
@@ -38301,7 +38988,7 @@ function layoutPacket(ir, theme) {
   const p = pen(theme);
   const margin = spacing.diagramMargin;
   const fields = [...ir.fields].sort((a, b) => a.start - b.start);
-  const maxBit = Math.max(0, ...fields.map((f) => f.end));
+  const maxBit = Math.max(0, ...fields.map((f2) => f2.end));
   const numRows = Math.floor(maxBit / BITS_PER_ROW) + 1;
   const bitW = 26;
   const rowH = 46;
@@ -38322,19 +39009,19 @@ function layoutPacket(ir, theme) {
       if (c < BITS_PER_ROW) elements.push(p.text(String(bit), rhu(x + 2), rhu(rowTop(r) - 6), bitFont, palette.textMuted));
     }
   }
-  fields.forEach((f, i) => {
+  fields.forEach((f2, i) => {
     const hue = categoricalHue(i);
-    for (let r = Math.floor(f.start / BITS_PER_ROW); r <= Math.floor(f.end / BITS_PER_ROW); r++) {
+    for (let r = Math.floor(f2.start / BITS_PER_ROW); r <= Math.floor(f2.end / BITS_PER_ROW); r++) {
       const rowStartBit = r * BITS_PER_ROW;
-      const cStart = Math.max(f.start, rowStartBit) - rowStartBit;
-      const cEnd = Math.min(f.end, rowStartBit + BITS_PER_ROW - 1) - rowStartBit;
+      const cStart = Math.max(f2.start, rowStartBit) - rowStartBit;
+      const cEnd = Math.min(f2.end, rowStartBit + BITS_PER_ROW - 1) - rowStartBit;
       const x = gridLeft + cStart * bitW;
       const w = (cEnd - cStart + 1) * bitW;
       const y = rowTop(r);
       elements.push(p.rect({ x: rhu(x), y: rhu(y), width: rhu(w), height: rowH }, hue + "33", hue, 1.4, { rx: 3 }));
-      const label = truncateText(f.label, labelFont, w - 6);
+      const label = truncateText(f2.label, labelFont, w - 6);
       elements.push(p.text(label, rhuInt(x + w / 2), rhu(y + rowH / 2 + labelFont * 0.35), labelFont, palette.text, { weight: "bold", anchor: "middle" }));
-      elements.push(p.text(String(f.start), rhu(x + 3), rhu(y + bitFont + 1), bitFont, palette.textMuted));
+      elements.push(p.text(String(f2.start), rhu(x + 3), rhu(y + bitFont + 1), bitFont, palette.textMuted));
     }
   });
   const totalW = rhuInt(gridLeft + BITS_PER_ROW * bitW + margin);
@@ -41560,7 +42247,7 @@ function layoutMemory(doc, theme) {
       return { w: Math.max(130, measureText(item.name, font).width + 56), h: 34 };
     }
     const titleW = measureText(item.title, font).width;
-    const fieldW = Math.max(0, ...item.fields.map((f) => measureText(`${f.k}: ${f.v}`, small).width));
+    const fieldW = Math.max(0, ...item.fields.map((f2) => measureText(`${f2.k}: ${f2.v}`, small).width));
     return { w: Math.max(120, titleW + 24, fieldW + 24), h: 24 + item.fields.length * 20 + 8 };
   };
   const elements = [];
@@ -41601,8 +42288,8 @@ function layoutMemory(doc, theme) {
       } else {
         elements.push(p.rect(box, palette.surface, palette.primary, 2, { rx: 6, fillOpacity: OBJECT_FILL_OPACITY }));
         elements.push(p.text(item.title, box.x + 12, box.y + 18, font, palette.primary, { weight: "bold" }));
-        item.fields.forEach((f, fi) => {
-          elements.push(p.text(`${f.k}: ${f.v}`, box.x + 12, box.y + 24 + (fi + 1) * 18, small, palette.text));
+        item.fields.forEach((f2, fi) => {
+          elements.push(p.text(`${f2.k}: ${f2.v}`, box.x + 12, box.y + 24 + (fi + 1) * 18, small, palette.text));
         });
         idBox.set(item.id, box);
         anchors[item.id] = { bounds: box };
@@ -41736,7 +42423,8 @@ function layoutPage(doc, theme) {
     elements,
     defs: [arrowDef(palette.textMuted)]
   };
-  return { scene, anchors };
+  const chromeRects = [{ x: px, y: py, width: pageW, height: HEADER }];
+  return { scene, anchors, chromeRects };
 }
 function pxForCenteredContent(innerLeft, innerW, contentW) {
   return innerLeft + Math.max(0, (innerW - contentW) / 2);
@@ -42107,13 +42795,13 @@ function parse6(input) {
   const firstFilled = padded.findIndex((c) => c !== null);
   let lastFilled = -1;
   for (let i = 0; i < padded.length; i++) if (padded[i] !== null) lastFilled = i;
-  const f = front ?? (firstFilled >= 0 ? firstFilled : 0);
+  const f2 = front ?? (firstFilled >= 0 ? firstFilled : 0);
   const r = rear ?? (lastFilled >= 0 ? lastFilled : 0);
   return {
     ...title !== void 0 ? { title } : {},
     capacity: cap,
     cells: padded,
-    front: f,
+    front: f2,
     rear: r,
     axis
   };
@@ -43610,9 +44298,9 @@ async function renderFile(inputPath, outPath, themeName, scale) {
 }
 async function renderDir(srcDir, outDir, themeName, scale) {
   (0, import_node_fs.mkdirSync)(outDir, { recursive: true });
-  const entries = (0, import_node_fs.readdirSync)(srcDir).filter((f) => {
-    const full = (0, import_node_path.join)(srcDir, f);
-    return (0, import_node_fs.statSync)(full).isFile() && DIAGRAM_EXTS.has((0, import_node_path.extname)(f).toLowerCase());
+  const entries = (0, import_node_fs.readdirSync)(srcDir).filter((f2) => {
+    const full = (0, import_node_path.join)(srcDir, f2);
+    return (0, import_node_fs.statSync)(full).isFile() && DIAGRAM_EXTS.has((0, import_node_path.extname)(f2).toLowerCase());
   });
   let rendered = 0;
   const failed = [];