@cristianormazabal/triton-latex 0.1.15 → 0.1.16

package/dist/cli.cjs

@@ -24,8 +24,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli.ts
-var import_node_fs2 = require("node:fs");
-var import_node_path3 = require("node:path");
+var import_node_fs4 = require("node:fs");
+var import_node_path5 = require("node:path");
 var import_node_url = require("node:url");
 
 // ../src/contracts/animations.ts
@@ -460,6 +460,147 @@ function resolveTheme(input, base) {
   };
 }
 
+// ../src/icons/resolver.ts
+var PREFIX_RE = /^[a-z][a-z0-9-]*$/;
+var NAME_RE = /^[a-z0-9][a-z0-9-]*$/;
+var DEFAULT_WIDTH = 16;
+var DEFAULT_HEIGHT = 16;
+var DEFAULT_LEFT = 0;
+var DEFAULT_TOP = 0;
+var MAX_ALIAS_DEPTH = 4;
+function parseIconRef(token) {
+  if (typeof token !== "string" || token.length === 0) {
+    return err("ICON_NOT_FOUND", `Icon token must be a non-empty string, got ${JSON.stringify(token)}`);
+  }
+  const colonIdx = token.indexOf(":");
+  if (colonIdx === -1) {
+    return err("ICON_NOT_FOUND", `Invalid icon token ${JSON.stringify(token)}: must be "prefix:name"`);
+  }
+  if (token.indexOf(":", colonIdx + 1) !== -1) {
+    return err(
+      "ICON_NOT_FOUND",
+      `Invalid icon token ${JSON.stringify(token)}: too many colons \u2014 expected "prefix:name"`
+    );
+  }
+  const prefix = token.slice(0, colonIdx);
+  const name = token.slice(colonIdx + 1);
+  if (!PREFIX_RE.test(prefix)) {
+    return err(
+      "ICON_NOT_FOUND",
+      `Invalid icon token ${JSON.stringify(token)}: prefix ${JSON.stringify(prefix)} must match ^[a-z][a-z0-9-]*$`
+    );
+  }
+  if (!NAME_RE.test(name)) {
+    return err(
+      "ICON_NOT_FOUND",
+      `Invalid icon token ${JSON.stringify(token)}: name ${JSON.stringify(name)} must match ^[a-z0-9][a-z0-9-]*$`
+    );
+  }
+  return ok({ prefix, name });
+}
+function detectColorMode(body) {
+  if (body.includes("<linearGradient") || body.includes("<radialGradient")) {
+    return "brand";
+  }
+  const ATTR_RE = /(?:fill|stroke)=["']([^"']+)["']/g;
+  const NEUTRAL = /* @__PURE__ */ new Set(["none", "currentcolor", "inherit"]);
+  let match;
+  while ((match = ATTR_RE.exec(body)) !== null) {
+    const value = match[1];
+    if (value === void 0) continue;
+    const lower = value.toLowerCase();
+    if (!NEUTRAL.has(lower)) {
+      return "brand";
+    }
+  }
+  return "monochrome";
+}
+function mergeViewBox(aliasLevel, iconLevel, packLevel) {
+  return {
+    width: aliasLevel.width ?? iconLevel.width ?? packLevel.width ?? DEFAULT_WIDTH,
+    height: aliasLevel.height ?? iconLevel.height ?? packLevel.height ?? DEFAULT_HEIGHT,
+    left: aliasLevel.left ?? iconLevel.left ?? packLevel.left ?? DEFAULT_LEFT,
+    top: aliasLevel.top ?? iconLevel.top ?? packLevel.top ?? DEFAULT_TOP
+  };
+}
+function composeTransforms(icon, alias) {
+  const iconRotate = icon.rotate ?? 0;
+  const iconHFlip = icon.hFlip ?? false;
+  const iconVFlip = icon.vFlip ?? false;
+  if (alias === null) {
+    return {
+      rotate: iconRotate,
+      hFlip: iconHFlip,
+      vFlip: iconVFlip
+    };
+  }
+  const aliasRotate = alias.rotate ?? 0;
+  const aliasHFlip = alias.hFlip ?? false;
+  const aliasVFlip = alias.vFlip ?? false;
+  return {
+    rotate: (iconRotate + aliasRotate) % 4,
+    hFlip: iconHFlip !== aliasHFlip,
+    // XOR
+    vFlip: iconVFlip !== aliasVFlip
+    // XOR
+  };
+}
+function resolveIcon(ref, packs) {
+  const pack = packs.get(ref.prefix);
+  if (pack === void 0) {
+    return err("ICON_NOT_FOUND", `Icon pack "${ref.prefix}" not loaded (looking up "${ref.prefix}:${ref.name}")`);
+  }
+  const directIcon = pack.icons[ref.name];
+  if (directIcon !== void 0) {
+    const viewBox = mergeViewBox({}, directIcon, pack);
+    const transforms = composeTransforms(directIcon, null);
+    return ok({
+      body: directIcon.body,
+      viewBox,
+      transforms,
+      colorMode: detectColorMode(directIcon.body)
+    });
+  }
+  const aliases = pack.aliases;
+  if (aliases === void 0 || !(ref.name in aliases)) {
+    return err(
+      "ICON_NOT_FOUND",
+      `Icon "${ref.name}" not found in pack "${ref.prefix}" (checked icons and aliases)`
+    );
+  }
+  let currentName = ref.name;
+  let currentAlias = aliases[ref.name] ?? null;
+  const topAlias = currentAlias;
+  for (let depth = 0; depth < MAX_ALIAS_DEPTH; depth++) {
+    if (currentAlias === null) break;
+    const parentName = currentAlias.parent;
+    const parentIcon = pack.icons[parentName];
+    if (parentIcon !== void 0) {
+      const viewBox = mergeViewBox(topAlias ?? {}, parentIcon, pack);
+      const transforms = composeTransforms(parentIcon, topAlias);
+      return ok({
+        body: parentIcon.body,
+        viewBox,
+        transforms,
+        colorMode: detectColorMode(parentIcon.body)
+      });
+    }
+    const parentAlias = aliases[parentName];
+    if (parentAlias === void 0) {
+      return err(
+        "ICON_NOT_FOUND",
+        `Alias "${currentName}" in pack "${ref.prefix}" points to parent "${parentName}" which does not exist`
+      );
+    }
+    currentName = parentName;
+    currentAlias = parentAlias;
+  }
+  return err(
+    "ICON_NOT_FOUND",
+    `Alias chain for "${ref.name}" in pack "${ref.prefix}" exceeds maximum depth of ${MAX_ALIAS_DEPTH}`
+  );
+}
+
 // ../src/routing/registry.ts
 var registry3 = /* @__PURE__ */ new Map();
 function registerRouter(style, router) {
@@ -1323,6 +1464,8 @@ function elementBoundsAt(el, ox, oy) {
     }
     case "path":
       return null;
+    case "icon":
+      return { x: el.x + ox, y: el.y + oy, width: el.size, height: el.size };
   }
 }
 function parseTranslate(transform) {
@@ -1451,14 +1594,234 @@ function pen(theme) {
         ...opts2.transform !== void 0 ? { transform: opts2.transform } : {},
         ...opts2.opacity !== void 0 ? { opacity: opts2.opacity } : {}
       };
+    },
+    icon(resolvedIcon, x, y, size, opts2 = {}) {
+      return {
+        type: "icon",
+        icon: resolvedIcon,
+        x,
+        y,
+        size,
+        ...opts2.color !== void 0 ? { color: opts2.color } : {},
+        ...opts2.opacity !== void 0 ? { opacity: opts2.opacity } : {}
+      };
     }
   };
 }
 
+// ../src/text/metrics.ts
+var ADVANCE = {
+  32: 0.2793,
+  33: 0.2793,
+  34: 0.3574,
+  35: 0.5576,
+  36: 0.5576,
+  37: 0.8906,
+  38: 0.6699,
+  39: 0.1914,
+  40: 0.334,
+  41: 0.334,
+  42: 0.3906,
+  43: 0.5859,
+  44: 0.2793,
+  45: 0.334,
+  46: 0.2793,
+  47: 0.3125,
+  48: 0.5576,
+  49: 0.5576,
+  50: 0.5576,
+  51: 0.5576,
+  52: 0.5576,
+  53: 0.5576,
+  54: 0.5576,
+  55: 0.5576,
+  56: 0.5576,
+  57: 0.5576,
+  58: 0.2793,
+  59: 0.2793,
+  60: 0.5859,
+  61: 0.5859,
+  62: 0.5859,
+  63: 0.5576,
+  64: 1.0186,
+  65: 0.6699,
+  66: 0.6699,
+  67: 0.7227,
+  68: 0.7227,
+  69: 0.6699,
+  70: 0.6133,
+  71: 0.7793,
+  72: 0.7227,
+  73: 0.2783,
+  74: 0.5,
+  75: 0.6699,
+  76: 0.5576,
+  77: 0.8359,
+  78: 0.7227,
+  79: 0.7793,
+  80: 0.6133,
+  81: 0.7793,
+  82: 0.7227,
+  83: 0.6133,
+  84: 0.6133,
+  85: 0.7227,
+  86: 0.6699,
+  87: 0.9453,
+  88: 0.6699,
+  89: 0.6699,
+  90: 0.6133,
+  91: 0.2793,
+  92: 0.3125,
+  93: 0.2793,
+  94: 0.5859,
+  95: 0.5576,
+  96: 0.334,
+  97: 0.5576,
+  98: 0.5576,
+  99: 0.5,
+  100: 0.5576,
+  101: 0.5576,
+  102: 0.2793,
+  103: 0.5576,
+  104: 0.5576,
+  105: 0.2217,
+  106: 0.2217,
+  107: 0.5,
+  108: 0.2217,
+  109: 0.8359,
+  110: 0.5576,
+  111: 0.5576,
+  112: 0.5576,
+  113: 0.5576,
+  114: 0.334,
+  115: 0.5,
+  116: 0.334,
+  117: 0.5576,
+  118: 0.5,
+  119: 0.7227,
+  120: 0.5,
+  121: 0.5,
+  122: 0.5,
+  123: 0.334,
+  124: 0.2598,
+  125: 0.334,
+  126: 0.5859
+};
+var DEFAULT_ADVANCE = 0.5576;
+var LINE_HEIGHT_FACTOR = 1.2;
+function measureText(text, fontSizePx) {
+  let totalEm = 0;
+  for (let i = 0; i < text.length; i++) {
+    const cp = text.codePointAt(i) ?? 32;
+    totalEm += ADVANCE[cp] ?? DEFAULT_ADVANCE;
+  }
+  return {
+    width: totalEm * fontSizePx,
+    height: fontSizePx * LINE_HEIGHT_FACTOR
+  };
+}
+
+// ../src/text/wrap.ts
+var ELLIPSIS = "\u2026";
+function wrapText2(text, fontSizePx, maxWidth, maxLines) {
+  if (!text || maxLines <= 0 || maxWidth <= 0) return { lines: [] };
+  const words = text.split(/\s+/).filter(Boolean);
+  if (words.length === 0) return { lines: [] };
+  const lines2 = [];
+  let current = "";
+  for (let wi = 0; wi < words.length; wi++) {
+    const word = words[wi];
+    const candidate = current ? `${current} ${word}` : word;
+    if (measureText(candidate, fontSizePx).width <= maxWidth) {
+      current = candidate;
+    } else {
+      if (current) {
+        if (lines2.length === maxLines - 1) {
+          const remaining = words.slice(wi).join(" ");
+          const full = current ? `${current} ${remaining}` : remaining;
+          lines2.push(truncateText(full, fontSizePx, maxWidth));
+          return { lines: lines2 };
+        }
+        lines2.push(current);
+        current = word;
+      } else {
+        if (lines2.length === maxLines - 1) {
+          lines2.push(truncateText(word, fontSizePx, maxWidth));
+          return { lines: lines2 };
+        }
+        lines2.push(truncateText(word, fontSizePx, maxWidth));
+        current = "";
+      }
+    }
+  }
+  if (current) {
+    if (lines2.length < maxLines) {
+      lines2.push(current);
+    } else {
+      const last = lines2[lines2.length - 1] ?? "";
+      lines2[lines2.length - 1] = truncateText(`${last} ${current}`, fontSizePx, maxWidth);
+    }
+  }
+  return { lines: lines2 };
+}
+function truncateText(text, fontSizePx, maxWidth) {
+  if (measureText(text, fontSizePx).width <= maxWidth) return text;
+  const ellipsisWidth = measureText(ELLIPSIS, fontSizePx).width;
+  const budget = maxWidth - ellipsisWidth;
+  if (budget <= 0) return ELLIPSIS;
+  let lo = 0;
+  let hi = text.length;
+  while (lo < hi) {
+    const mid = Math.floor((lo + hi + 1) / 2);
+    if (measureText(text.slice(0, mid), fontSizePx).width <= budget) {
+      lo = mid;
+    } else {
+      hi = mid - 1;
+    }
+  }
+  return text.slice(0, lo) + ELLIPSIS;
+}
+
 // ../src/diagrams/mermaid/flowchart/layout.ts
 var NODE_W = 120;
 var NODE_H = 40;
 var ARROW_MARKER_ID = "triton-arrow";
+var CARD_PAD = 8;
+var CARD_ICON_BOX = 40;
+var CARD_ICON_GAP = 12;
+var CARD_MIN_W = 192;
+var CARD_MAX_W = 400;
+var CARD_MAX_BODY_LINES = 3;
+function splitCardLabel(label) {
+  const idx = label.search(/\\n|\n/);
+  if (idx === -1) return { title: label.trim(), body: "" };
+  const sep = label[idx] === "\n" ? 1 : 2;
+  return { title: label.slice(0, idx).trim(), body: label.slice(idx + sep).trim() };
+}
+function measureCardNode(node, typography) {
+  const { title, body } = splitCardLabel(node.label);
+  const titleW = measureText(title, typography.baseFontSize).width * 1.1;
+  const titleLH = typography.baseFontSize * 1.2;
+  const maxRightW = CARD_MAX_W - CARD_ICON_BOX - CARD_ICON_GAP - 2 * CARD_PAD;
+  let bodyH = 0;
+  let bodyW = 0;
+  if (body) {
+    const wrapped = wrapText2(body, typography.smallFontSize, maxRightW, CARD_MAX_BODY_LINES);
+    bodyH = wrapped.lines.length * typography.smallFontSize * 1.2;
+    bodyW = wrapped.lines.reduce(
+      (mx, l) => Math.max(mx, measureText(l, typography.smallFontSize).width),
+      0
+    );
+  }
+  const textW = Math.max(titleW, bodyW);
+  const width = Math.min(CARD_MAX_W, Math.max(
+    CARD_MIN_W,
+    CARD_ICON_BOX + CARD_ICON_GAP + textW + 2 * CARD_PAD
+  ));
+  const textH = body ? titleLH + bodyH : titleLH;
+  const height = Math.max(CARD_ICON_BOX, textH) + 2 * CARD_PAD;
+  return { width, height };
+}
 function layoutFlowchart(ir, theme, options) {
   const { spacing, palette, typography, edges: edgeTheme } = theme;
   const p = pen(theme);
@@ -1473,6 +1836,13 @@ function layoutFlowchart(ir, theme, options) {
   const rowGap = spacing.nodeGap;
   let maxNodesInLayer = 0;
   for (const [, nodes] of orderedByLayer) maxNodesInLayer = Math.max(maxNodesInLayer, nodes.length);
+  const nodeSizeMap = /* @__PURE__ */ new Map();
+  for (const node of ir.nodes) {
+    nodeSizeMap.set(
+      node.id,
+      node.shape === "card" ? measureCardNode(node, typography) : { width: NODE_W, height: NODE_H }
+    );
+  }
   const nodePos = assignCoordinatesBK(
     orderedByLayer,
     ir.edges,
@@ -1484,7 +1854,8 @@ function layoutFlowchart(ir, theme, options) {
     NODE_H,
     colGap,
     rowGap,
-    margin
+    margin,
+    nodeSizeMap
   );
   const elements = [];
   if (ir.metadata.title) {
@@ -1560,14 +1931,67 @@ function layoutFlowchart(ir, theme, options) {
       elements.push(p.text(edge.label, lp.x, lp.y - 4, edgeTheme.labelFontSize, palette.textMuted, { anchor: "middle" }));
     }
   }
+  const icons = options?.icons;
   for (const node of ir.nodes) {
     const r = nodePos.get(node.id);
     if (!r) continue;
     const nodeElements = [];
     const fill = nodeStatusFill(node, palette);
     const stroke = palette.border;
-    nodeElements.push(...renderNodeShape(node, r, fill, stroke, edgeTheme.strokeWidth));
-    nodeElements.push(p.text(node.label, r.x + NODE_W / 2, r.y + NODE_H / 2 + typography.baseFontSize * 0.35, typography.baseFontSize, palette.text, { anchor: "middle" }));
+    const sw = edgeTheme.strokeWidth;
+    if (node.shape === "card") {
+      nodeElements.push(p.rect(r, fill, stroke, sw, { rx: 6, fillOpacity: 0.85 }));
+      const { title, body } = splitCardLabel(node.label);
+      const iconX = r.x + CARD_PAD;
+      const iconY = r.y + (r.height - CARD_ICON_BOX) / 2;
+      const textX = r.x + CARD_PAD + CARD_ICON_BOX + CARD_ICON_GAP;
+      const rightW = r.width - 2 * CARD_PAD - CARD_ICON_BOX - CARD_ICON_GAP;
+      if (node.icon !== void 0 && icons !== void 0) {
+        const resolved = resolveIcon(node.icon, icons);
+        if (resolved.ok) {
+          const glyphSize = CARD_ICON_BOX - 8;
+          const gx = iconX + (CARD_ICON_BOX - glyphSize) / 2;
+          const gy = iconY + (CARD_ICON_BOX - glyphSize) / 2;
+          nodeElements.push(p.icon(resolved.value, gx, gy, glyphSize, { color: palette.primary }));
+        }
+      }
+      const bodyText = body ? body.replace(/\\n|\n/g, " ").trim() : "";
+      const wrapped = bodyText ? wrapText2(bodyText, typography.smallFontSize, rightW, CARD_MAX_BODY_LINES) : { lines: [] };
+      const hasBody = wrapped.lines.length > 0;
+      const titleBaseY = hasBody ? r.y + CARD_PAD + typography.baseFontSize * 0.85 : r.y + r.height / 2 + typography.baseFontSize * 0.35;
+      nodeElements.push(
+        p.text(title, textX, titleBaseY, typography.baseFontSize, palette.text, { weight: "bold" })
+      );
+      if (hasBody) {
+        const titleLH = typography.baseFontSize * 1.2;
+        let bodyY = r.y + CARD_PAD + titleLH + typography.smallFontSize * 0.85;
+        for (const line of wrapped.lines) {
+          nodeElements.push(
+            p.text(line, textX, bodyY, typography.smallFontSize, palette.textMuted)
+          );
+          bodyY += typography.smallFontSize * 1.2;
+        }
+      }
+    } else {
+      nodeElements.push(...renderNodeShape(node, r, fill, stroke, sw));
+      nodeElements.push(p.text(
+        node.label,
+        r.x + r.width / 2,
+        r.y + r.height / 2 + typography.baseFontSize * 0.35,
+        typography.baseFontSize,
+        palette.text,
+        { anchor: "middle" }
+      ));
+      if (node.icon !== void 0 && icons !== void 0) {
+        const resolved = resolveIcon(node.icon, icons);
+        if (resolved.ok) {
+          const iconSize = NODE_H - 8;
+          const ix = r.x + 4;
+          const iy = r.y + (NODE_H - iconSize) / 2;
+          nodeElements.push(p.icon(resolved.value, ix, iy, iconSize, { color: palette.text }));
+        }
+      }
+    }
     elements.push(p.group(nodeElements, { id: node.id }));
   }
   const allRects = [...nodePos.values()];
@@ -1736,7 +2160,9 @@ function minimizeCrossings(byLayer, edges2, backEdgeSet) {
   }
   return order;
 }
-function assignCoordinatesBK(byLayer, edges2, backEdgeSet, isLR, isReverse, maxNodesInLayer, nodeW, nodeH, colGap, rowGap, margin) {
+function assignCoordinatesBK(byLayer, edges2, backEdgeSet, isLR, isReverse, maxNodesInLayer, nodeW, nodeH, colGap, rowGap, margin, nodeSizes) {
+  const getW = (id) => nodeSizes?.get(id)?.width ?? nodeW;
+  const getH = (id) => nodeSizes?.get(id)?.height ?? nodeH;
   const predMap = /* @__PURE__ */ new Map();
   const succMap = /* @__PURE__ */ new Map();
   for (const [, nodes] of byLayer) {
@@ -1752,12 +2178,31 @@ function assignCoordinatesBK(byLayer, edges2, backEdgeSet, isLR, isReverse, maxN
   });
   const layerKeys = [...byLayer.keys()].sort((a, b) => a - b);
   const numLayers = layerKeys.length;
-  const crossSize = isLR ? nodeH : nodeW;
-  const mainSize = isLR ? nodeW : nodeH;
   const crossGap = isLR ? rowGap : colGap;
   const mainGap = isLR ? colGap : rowGap;
-  const crossStep = crossSize + crossGap;
-  const mainStep = mainSize + mainGap;
+  let globalCrossSize = isLR ? nodeH : nodeW;
+  for (const [, nodes] of byLayer) {
+    for (const n of nodes) {
+      const cs = isLR ? getH(n.id) : getW(n.id);
+      if (cs > globalCrossSize) globalCrossSize = cs;
+    }
+  }
+  const crossStep = globalCrossSize + crossGap;
+  const layerMainSizes = layerKeys.map((lk) => {
+    const nodes = byLayer.get(lk);
+    let mx = isLR ? nodeW : nodeH;
+    for (const n of nodes) {
+      const ms = isLR ? getW(n.id) : getH(n.id);
+      if (ms > mx) mx = ms;
+    }
+    return mx;
+  });
+  const fwdMainPos = [];
+  let cumMain = margin;
+  for (let li = 0; li < numLayers; li++) {
+    fwdMainPos.push(cumMain);
+    cumMain += layerMainSizes[li] + mainGap;
+  }
   function onePass(topDown) {
     const crossPos = /* @__PURE__ */ new Map();
     const neighborMap = topDown ? predMap : succMap;
@@ -1788,18 +2233,22 @@ function assignCoordinatesBK(byLayer, edges2, backEdgeSet, isLR, isReverse, maxN
   const nodePos = /* @__PURE__ */ new Map();
   for (let li = 0; li < numLayers; li++) {
     const layerIdx = layerKeys[li];
-    const layerNum = isReverse ? numLayers - 1 - li : li;
     const nodes = byLayer.get(layerIdx);
-    const mainPos = margin + layerNum * mainStep;
+    const layerMainSz = layerMainSizes[li];
+    const mainPos = isReverse ? fwdMainPos[numLayers - 1 - li] : fwdMainPos[li];
     for (const node of nodes) {
       const c1 = pass1.get(node.id) ?? margin;
       const c2 = pass2.get(node.id) ?? margin;
-      const crossP = (c1 + c2) / 2;
+      const slotLeft = (c1 + c2) / 2;
+      const nw = getW(node.id);
+      const nh = getH(node.id);
+      const crossOffset = (globalCrossSize - (isLR ? nh : nw)) / 2;
+      const mainOffset = (layerMainSz - (isLR ? nw : nh)) / 2;
       nodePos.set(node.id, {
-        x: isLR ? mainPos : crossP,
-        y: isLR ? crossP : mainPos,
-        width: nodeW,
-        height: nodeH
+        x: isLR ? mainPos + mainOffset : slotLeft + crossOffset,
+        y: isLR ? slotLeft + crossOffset : mainPos + mainOffset,
+        width: nw,
+        height: nh
       });
     }
   }
@@ -1822,6 +2271,8 @@ function renderNodeShape(node, r, fill, stroke, sw) {
         { type: "rect", bounds: r, fill, stroke, strokeWidth: sw },
         { type: "rect", bounds: { x: x + 6, y, width: w - 12, height: h2 }, fill: "none", stroke, strokeWidth: sw * 0.5 }
       ];
+    case "card":
+      return [{ type: "rect", bounds: r, fill, stroke, strokeWidth: sw, rx: 6 }];
     default:
       return [{ type: "rect", bounds: r, fill, stroke, strokeWidth: sw, rx: 2 }];
   }
@@ -1851,14 +2302,14 @@ function edgeAnchor(r, dir, role, peer) {
   if (isLR) {
     const offAxis = Math.abs(dy);
     const onAxis = Math.abs(dx);
-    if (offAxis > onAxis && offAxis > r.height / 2) {
+    if (offAxis > onAxis && offAxis > r.height / 2 && onAxis < r.width) {
       return dy > 0 ? { point: { x: cx, y: r.y + r.height }, portDir: "S" } : { point: { x: cx, y: r.y }, portDir: "N" };
     }
     return role === "exit" ? { point: { x: r.x + r.width, y: cy }, portDir: "E" } : { point: { x: r.x, y: cy }, portDir: "W" };
   } else {
     const offAxis = Math.abs(dx);
     const onAxis = Math.abs(dy);
-    if (offAxis > onAxis && offAxis > r.width / 2) {
+    if (offAxis > onAxis && offAxis > r.width / 2 && onAxis < r.height) {
       return dx > 0 ? { point: { x: r.x + r.width, y: cy }, portDir: "E" } : { point: { x: r.x, y: cy }, portDir: "W" };
     }
     return role === "exit" ? { point: { x: cx, y: r.y + r.height }, portDir: "S" } : { point: { x: cx, y: r.y }, portDir: "N" };
@@ -2162,31 +2613,31 @@ function peg$parse(input, options) {
   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$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 = ")";
+  var peg$c60 = "style";
+  var peg$c61 = "classDef";
+  var peg$c62 = "class";
+  var peg$c63 = "click";
+  var peg$c64 = "note";
   var peg$c65 = "at";
   var peg$c66 = "offset";
   var peg$c67 = ",";
@@ -2204,16 +2655,19 @@ function peg$parse(input, options) {
   var peg$r4 = /^[^\n%]/;
   var peg$r5 = /^[^|]/;
   var peg$r6 = /^[ENSW]/;
-  var peg$r7 = /^[^)]/;
-  var peg$r8 = /^[^}]/;
-  var peg$r9 = /^[^\/]/;
-  var peg$r10 = /^[^\\]/;
-  var peg$r11 = /^[^\n;]/;
-  var peg$r12 = /^[^"]/;
-  var peg$r13 = /^[0-9]/;
-  var peg$r14 = /^[^:\n]/;
-  var peg$r15 = /^[ \t]/;
-  var peg$r16 = /^[\n\r]/;
+  var peg$r7 = /^[a-z]/;
+  var peg$r8 = /^[a-z0-9\-]/;
+  var peg$r9 = /^[^"]/;
+  var peg$r10 = /^[^ \t\r\n@[\](){};]/;
+  var peg$r11 = /^[^)]/;
+  var peg$r12 = /^[^}]/;
+  var peg$r13 = /^[^\/]/;
+  var peg$r14 = /^[^\\]/;
+  var peg$r15 = /^[^\n;]/;
+  var peg$r16 = /^[0-9]/;
+  var peg$r17 = /^[^:\n]/;
+  var peg$r18 = /^[ \t]/;
+  var peg$r19 = /^[\n\r]/;
   var peg$e0 = peg$literalExpectation("---", false);
   var peg$e1 = peg$classExpectation(["\n"], true, false);
   var peg$e2 = peg$literalExpectation("flowchart", false);
@@ -2262,54 +2716,57 @@ function peg$parse(input, options) {
   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$e48 = peg$classExpectation([["a", "z"]], false, false);
+  var peg$e49 = peg$classExpectation([["a", "z"], ["0", "9"], "-"], false, false);
+  var peg$e50 = peg$literalExpectation('"', false);
+  var peg$e51 = peg$classExpectation(['"'], true, false);
+  var peg$e52 = peg$classExpectation([" ", "	", "\r", "\n", "@", "[", "]", "(", ")", "{", "}", ";"], true, false);
+  var peg$e53 = peg$literalExpectation("((", false);
+  var peg$e54 = peg$classExpectation([")"], true, false);
+  var peg$e55 = peg$literalExpectation("))", false);
+  var peg$e56 = peg$literalExpectation("([", false);
+  var peg$e57 = peg$literalExpectation("])", false);
+  var peg$e58 = peg$literalExpectation("[[", 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$classExpectation(["}"], true, false);
+  var peg$e64 = peg$literalExpectation("}}", false);
+  var peg$e65 = peg$literalExpectation("[/", false);
+  var peg$e66 = peg$classExpectation(["/"], true, false);
+  var peg$e67 = peg$literalExpectation("/]", false);
+  var peg$e68 = peg$literalExpectation("[\\", false);
+  var peg$e69 = peg$classExpectation(["\\"], true, false);
+  var peg$e70 = peg$literalExpectation("\\]", false);
+  var peg$e71 = peg$literalExpectation(">", false);
+  var peg$e72 = peg$literalExpectation("{", false);
+  var peg$e73 = peg$literalExpectation("}", false);
+  var peg$e74 = peg$literalExpectation("(", false);
+  var peg$e75 = peg$literalExpectation(")", false);
+  var peg$e76 = peg$literalExpectation("style", false);
+  var peg$e77 = peg$classExpectation(["\n", ";"], true, false);
+  var peg$e78 = peg$literalExpectation("classDef", false);
+  var peg$e79 = peg$literalExpectation("class", false);
+  var peg$e80 = peg$literalExpectation("click", false);
+  var peg$e81 = peg$literalExpectation("note", false);
+  var peg$e82 = peg$literalExpectation("at", false);
+  var peg$e83 = peg$literalExpectation("offset", false);
+  var peg$e84 = peg$literalExpectation(",", false);
+  var peg$e85 = peg$literalExpectation("-", false);
+  var peg$e86 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e87 = peg$literalExpectation("legend", false);
+  var peg$e88 = peg$literalExpectation("bottom-right", false);
+  var peg$e89 = peg$literalExpectation("bottom-left", false);
+  var peg$e90 = peg$literalExpectation("top-right", false);
+  var peg$e91 = peg$literalExpectation("top-left", false);
+  var peg$e92 = peg$classExpectation([":", "\n"], true, false);
+  var peg$e93 = peg$otherExpectation("optional whitespace");
+  var peg$e94 = peg$classExpectation([" ", "	"], false, false);
+  var peg$e95 = peg$otherExpectation("required whitespace");
+  var peg$e96 = peg$otherExpectation("newline");
+  var peg$e97 = peg$literalExpectation("\r\n", false);
+  var peg$e98 = peg$classExpectation(["\n", "\r"], false, false);
   var peg$f0 = function(frontmatter, header, statements) {
     return {
       version: "1.0",
@@ -2458,74 +2915,89 @@ function peg$parse(input, options) {
   var peg$f43 = function(id, shape) {
     return { id: registerNode(id, shape ? shape.label : null, shape ? shape.shape : null) };
   };
-  var peg$f44 = function(ref) {
+  var peg$f44 = function(ref, key, value) {
+    return { key, value };
+  };
+  var peg$f45 = function(ref, anns) {
+    if (anns.length > 0) {
+      const node = nodeMap.get(ref.id);
+      if (node) {
+        for (const ann of anns) {
+          if (ann.key === "shape") node.shape = ann.value;
+          if (ann.key === "icon") node.iconToken = ann.value;
+        }
+      }
+    }
     return { type: "node", ...ref };
   };
-  var peg$f45 = function(id) {
+  var peg$f46 = function(val) {
+    return val;
+  };
+  var peg$f47 = function(id) {
     return id;
   };
-  var peg$f46 = function(text2) {
+  var peg$f48 = function(text2) {
     return { shape: "circle", label: stripQuotes(text2.trim()) };
   };
-  var peg$f47 = function(text2) {
+  var peg$f49 = function(text2) {
     return { shape: "stadium", label: stripQuotes(text2.trim()) };
   };
-  var peg$f48 = function(text2) {
+  var peg$f50 = function(text2) {
     return { shape: "subroutine", label: stripQuotes(text2.trim()) };
   };
-  var peg$f49 = function(text2) {
+  var peg$f51 = function(text2) {
     return { shape: "cylinder", label: stripQuotes(text2.trim()) };
   };
-  var peg$f50 = function(text2) {
+  var peg$f52 = function(text2) {
     return { shape: "hexagon", label: stripQuotes(text2.trim()) };
   };
-  var peg$f51 = function(text2) {
+  var peg$f53 = function(text2) {
     return { shape: "parallelogram", label: stripQuotes(text2.trim()) };
   };
-  var peg$f52 = function(text2) {
+  var peg$f54 = function(text2) {
     return { shape: "parallelogram-alt", label: stripQuotes(text2.trim()) };
   };
-  var peg$f53 = function(text2) {
+  var peg$f55 = function(text2) {
     return { shape: "asymmetric", label: stripQuotes(text2.trim()) };
   };
-  var peg$f54 = function(text2) {
+  var peg$f56 = function(text2) {
     return { shape: "rect", label: stripQuotes(text2.trim()) };
   };
-  var peg$f55 = function(text2) {
+  var peg$f57 = function(text2) {
     return { shape: "diamond", label: stripQuotes(text2.trim()) };
   };
-  var peg$f56 = function(text2) {
+  var peg$f58 = function(text2) {
     return { shape: "rounded-rect", label: stripQuotes(text2.trim()) };
   };
-  var peg$f57 = function(content) {
+  var peg$f59 = function(content) {
     return { type: "style", raw: content };
   };
-  var peg$f58 = function(content) {
+  var peg$f60 = function(content) {
     return { type: "class", raw: content };
   };
-  var peg$f59 = function(content) {
+  var peg$f61 = function(content) {
     return { type: "click", raw: content };
   };
-  var peg$f60 = function(text2, target, offset2) {
+  var peg$f62 = function(text2, target, offset2) {
     const note = { type: "note", text: text2, target, offset: offset2 || void 0 };
     overlays.push(note);
     return note;
   };
-  var peg$f61 = function(dx, dy) {
+  var peg$f63 = function(dx, dy) {
     return { dx, dy };
   };
-  var peg$f62 = function(sign, digits) {
+  var peg$f64 = function(sign, digits) {
     return parseInt((sign || "") + digits, 10);
   };
-  var peg$f63 = function(corner, t) {
+  var peg$f65 = function(corner, t) {
     return t;
   };
-  var peg$f64 = function(corner, title, entries) {
+  var peg$f66 = function(corner, title, entries) {
     const legend = { type: "legend", corner, title: title || void 0, entries };
     overlays.push(legend);
     return legend;
   };
-  var peg$f65 = function(key, value) {
+  var peg$f67 = function(key, value) {
     return { key: key.trim(), value: value.trim() };
   };
   var peg$currPos = options.peg$currPos | 0;
@@ -4074,16 +4546,17 @@ function peg$parse(input, options) {
     return s0;
   }
   function peg$parseNodeRef() {
-    var s0, s1, s2;
+    var s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = peg$parseNodeId();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parseShape();
-      if (s2 === peg$FAILED) {
-        s2 = null;
+      s2 = peg$parse_();
+      s3 = peg$parseShape();
+      if (s3 === peg$FAILED) {
+        s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f43(s1, s2);
+      s0 = peg$f43(s1, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4091,32 +4564,271 @@ function peg$parse(input, options) {
     return s0;
   }
   function peg$parseNodeDecl() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
     s0 = peg$currPos;
     s1 = peg$parseNodeRef();
     if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
+      s2 = [];
       s3 = peg$currPos;
       s4 = peg$parse_();
-      s5 = peg$parseEdgeArrow();
+      if (input.charCodeAt(peg$currPos) === 64) {
+        s5 = peg$c14;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e20);
+        }
+      }
       if (s5 !== peg$FAILED) {
-        s4 = [s4, s5];
-        s3 = s4;
+        s6 = peg$currPos;
+        s7 = peg$currPos;
+        s8 = input.charAt(peg$currPos);
+        if (peg$r7.test(s8)) {
+          peg$currPos++;
+        } else {
+          s8 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e48);
+          }
+        }
+        if (s8 !== peg$FAILED) {
+          s9 = [];
+          s10 = input.charAt(peg$currPos);
+          if (peg$r8.test(s10)) {
+            peg$currPos++;
+          } else {
+            s10 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e49);
+            }
+          }
+          while (s10 !== peg$FAILED) {
+            s9.push(s10);
+            s10 = input.charAt(peg$currPos);
+            if (peg$r8.test(s10)) {
+              peg$currPos++;
+            } else {
+              s10 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e49);
+              }
+            }
+          }
+          s8 = [s8, s9];
+          s7 = s8;
+        } else {
+          peg$currPos = s7;
+          s7 = peg$FAILED;
+        }
+        if (s7 !== peg$FAILED) {
+          s6 = input.substring(s6, peg$currPos);
+        } else {
+          s6 = s7;
+        }
+        if (s6 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 58) {
+            s7 = peg$c35;
+            peg$currPos++;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e42);
+            }
+          }
+          if (s7 !== peg$FAILED) {
+            s8 = peg$parseAnnotationValue();
+            if (s8 !== peg$FAILED) {
+              peg$savedPos = s3;
+              s3 = peg$f44(s1, s6, s8);
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
       } else {
         peg$currPos = s3;
         s3 = peg$FAILED;
       }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.charCodeAt(peg$currPos) === 64) {
+          s5 = peg$c14;
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e20);
+          }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$currPos;
+          s7 = peg$currPos;
+          s8 = input.charAt(peg$currPos);
+          if (peg$r7.test(s8)) {
+            peg$currPos++;
+          } else {
+            s8 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e48);
+            }
+          }
+          if (s8 !== peg$FAILED) {
+            s9 = [];
+            s10 = input.charAt(peg$currPos);
+            if (peg$r8.test(s10)) {
+              peg$currPos++;
+            } else {
+              s10 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e49);
+              }
+            }
+            while (s10 !== peg$FAILED) {
+              s9.push(s10);
+              s10 = input.charAt(peg$currPos);
+              if (peg$r8.test(s10)) {
+                peg$currPos++;
+              } else {
+                s10 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e49);
+                }
+              }
+            }
+            s8 = [s8, s9];
+            s7 = s8;
+          } else {
+            peg$currPos = s7;
+            s7 = peg$FAILED;
+          }
+          if (s7 !== peg$FAILED) {
+            s6 = input.substring(s6, peg$currPos);
+          } else {
+            s6 = s7;
+          }
+          if (s6 !== peg$FAILED) {
+            if (input.charCodeAt(peg$currPos) === 58) {
+              s7 = peg$c35;
+              peg$currPos++;
+            } else {
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e42);
+              }
+            }
+            if (s7 !== peg$FAILED) {
+              s8 = peg$parseAnnotationValue();
+              if (s8 !== peg$FAILED) {
+                peg$savedPos = s3;
+                s3 = peg$f44(s1, s6, s8);
+              } else {
+                peg$currPos = s3;
+                s3 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      s3 = peg$currPos;
+      peg$silentFails++;
+      s4 = peg$currPos;
+      s5 = peg$parse_();
+      s6 = peg$parseEdgeArrow();
+      if (s6 !== peg$FAILED) {
+        s5 = [s5, s6];
+        s4 = s5;
+      } else {
+        peg$currPos = s4;
+        s4 = peg$FAILED;
+      }
       peg$silentFails--;
-      if (s3 === peg$FAILED) {
-        s2 = void 0;
+      if (s4 === peg$FAILED) {
+        s3 = void 0;
       } else {
-        peg$currPos = s2;
-        s2 = peg$FAILED;
+        peg$currPos = s3;
+        s3 = peg$FAILED;
       }
-      if (s2 !== peg$FAILED) {
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f45(s1, s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  function peg$parseAnnotationValue() {
+    var s0, s1, s2, s3, s4;
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 34) {
+      s1 = peg$c40;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e50);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      s3 = [];
+      s4 = input.charAt(peg$currPos);
+      if (peg$r9.test(s4)) {
+        peg$currPos++;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e51);
+        }
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = input.charAt(peg$currPos);
+        if (peg$r9.test(s4)) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e51);
+          }
+        }
+      }
+      s2 = input.substring(s2, peg$currPos);
+      if (input.charCodeAt(peg$currPos) === 34) {
+        s3 = peg$c40;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e50);
+        }
+      }
+      if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f44(s1);
+        s0 = peg$f46(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4125,6 +4837,40 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = [];
+      s2 = input.charAt(peg$currPos);
+      if (peg$r10.test(s2)) {
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e52);
+        }
+      }
+      if (s2 !== peg$FAILED) {
+        while (s2 !== peg$FAILED) {
+          s1.push(s2);
+          s2 = input.charAt(peg$currPos);
+          if (peg$r10.test(s2)) {
+            peg$currPos++;
+          } else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e52);
+            }
+          }
+        }
+      } else {
+        s1 = peg$FAILED;
+      }
+      if (s1 !== peg$FAILED) {
+        s0 = input.substring(s0, peg$currPos);
+      } else {
+        s0 = s1;
+      }
+    }
     return s0;
   }
   function peg$parseNodeId() {
@@ -4277,7 +5023,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f45(s3);
+          s0 = peg$f47(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4295,37 +5041,37 @@ function peg$parse(input, options) {
   function peg$parseShape() {
     var s0, s1, s2, s3, s4;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c40) {
-      s1 = peg$c40;
+    if (input.substr(peg$currPos, 2) === peg$c41) {
+      s1 = peg$c41;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e48);
+        peg$fail(peg$e53);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r7.test(s4)) {
+      if (peg$r11.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e49);
+          peg$fail(peg$e54);
         }
       }
       if (s4 !== peg$FAILED) {
         while (s4 !== peg$FAILED) {
           s3.push(s4);
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r11.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e49);
+              peg$fail(peg$e54);
             }
           }
         }
@@ -4338,18 +5084,18 @@ function peg$parse(input, options) {
         s2 = s3;
       }
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c41) {
-          s3 = peg$c41;
+        if (input.substr(peg$currPos, 2) === peg$c42) {
+          s3 = peg$c42;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e50);
+            peg$fail(peg$e55);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f46(s2);
+          s0 = peg$f48(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4364,13 +5110,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$c43) {
+        s1 = peg$c43;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e51);
+          peg$fail(peg$e56);
         }
       }
       if (s1 !== peg$FAILED) {
@@ -4398,18 +5144,18 @@ function peg$parse(input, options) {
           }
         }
         s2 = input.substring(s2, peg$currPos);
-        if (input.substr(peg$currPos, 2) === peg$c43) {
-          s3 = peg$c43;
+        if (input.substr(peg$currPos, 2) === peg$c44) {
+          s3 = peg$c44;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e52);
+            peg$fail(peg$e57);
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f47(s2);
+          s0 = peg$f49(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4420,13 +5166,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$c45) {
+          s1 = peg$c45;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e53);
+            peg$fail(peg$e58);
           }
         }
         if (s1 !== peg$FAILED) {
@@ -4454,18 +5200,18 @@ function peg$parse(input, options) {
             }
           }
           s2 = input.substring(s2, peg$currPos);
-          if (input.substr(peg$currPos, 2) === peg$c45) {
-            s3 = peg$c45;
+          if (input.substr(peg$currPos, 2) === peg$c46) {
+            s3 = peg$c46;
             peg$currPos += 2;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e54);
+              peg$fail(peg$e59);
             }
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f48(s2);
+            s0 = peg$f50(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -4476,52 +5222,52 @@ 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$c47) {
+            s1 = peg$c47;
             peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e55);
+              peg$fail(peg$e60);
             }
           }
           if (s1 !== peg$FAILED) {
             s2 = peg$currPos;
             s3 = [];
             s4 = input.charAt(peg$currPos);
-            if (peg$r7.test(s4)) {
+            if (peg$r11.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e49);
+                peg$fail(peg$e54);
               }
             }
             while (s4 !== peg$FAILED) {
               s3.push(s4);
               s4 = input.charAt(peg$currPos);
-              if (peg$r7.test(s4)) {
+              if (peg$r11.test(s4)) {
                 peg$currPos++;
               } else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e49);
+                  peg$fail(peg$e54);
                 }
               }
             }
             s2 = input.substring(s2, peg$currPos);
-            if (input.substr(peg$currPos, 2) === peg$c47) {
-              s3 = peg$c47;
+            if (input.substr(peg$currPos, 2) === peg$c48) {
+              s3 = peg$c48;
               peg$currPos += 2;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e56);
+                peg$fail(peg$e61);
               }
             }
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f49(s2);
+              s0 = peg$f51(s2);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -4532,52 +5278,52 @@ function peg$parse(input, options) {
           }
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c48) {
-              s1 = peg$c48;
+            if (input.substr(peg$currPos, 2) === peg$c49) {
+              s1 = peg$c49;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e57);
+                peg$fail(peg$e62);
               }
             }
             if (s1 !== peg$FAILED) {
               s2 = peg$currPos;
               s3 = [];
               s4 = input.charAt(peg$currPos);
-              if (peg$r8.test(s4)) {
+              if (peg$r12.test(s4)) {
                 peg$currPos++;
               } else {
                 s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e58);
+                  peg$fail(peg$e63);
                 }
               }
               while (s4 !== peg$FAILED) {
                 s3.push(s4);
                 s4 = input.charAt(peg$currPos);
-                if (peg$r8.test(s4)) {
+                if (peg$r12.test(s4)) {
                   peg$currPos++;
                 } else {
                   s4 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e58);
+                    peg$fail(peg$e63);
                   }
                 }
               }
               s2 = input.substring(s2, peg$currPos);
-              if (input.substr(peg$currPos, 2) === peg$c49) {
-                s3 = peg$c49;
+              if (input.substr(peg$currPos, 2) === peg$c50) {
+                s3 = peg$c50;
                 peg$currPos += 2;
               } else {
                 s3 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e59);
+                  peg$fail(peg$e64);
                 }
               }
               if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f50(s2);
+                s0 = peg$f52(s2);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -4588,52 +5334,52 @@ function peg$parse(input, options) {
             }
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 2) === peg$c50) {
-                s1 = peg$c50;
+              if (input.substr(peg$currPos, 2) === peg$c51) {
+                s1 = peg$c51;
                 peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e60);
+                  peg$fail(peg$e65);
                 }
               }
               if (s1 !== peg$FAILED) {
                 s2 = peg$currPos;
                 s3 = [];
                 s4 = input.charAt(peg$currPos);
-                if (peg$r9.test(s4)) {
+                if (peg$r13.test(s4)) {
                   peg$currPos++;
                 } else {
                   s4 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e61);
+                    peg$fail(peg$e66);
                   }
                 }
                 while (s4 !== peg$FAILED) {
                   s3.push(s4);
                   s4 = input.charAt(peg$currPos);
-                  if (peg$r9.test(s4)) {
+                  if (peg$r13.test(s4)) {
                     peg$currPos++;
                   } else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e61);
+                      peg$fail(peg$e66);
                     }
                   }
                 }
                 s2 = input.substring(s2, peg$currPos);
-                if (input.substr(peg$currPos, 2) === peg$c51) {
-                  s3 = peg$c51;
+                if (input.substr(peg$currPos, 2) === peg$c52) {
+                  s3 = peg$c52;
                   peg$currPos += 2;
                 } else {
                   s3 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e62);
+                    peg$fail(peg$e67);
                   }
                 }
                 if (s3 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f51(s2);
+                  s0 = peg$f53(s2);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -4644,52 +5390,52 @@ function peg$parse(input, options) {
               }
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 2) === peg$c52) {
-                  s1 = peg$c52;
+                if (input.substr(peg$currPos, 2) === peg$c53) {
+                  s1 = peg$c53;
                   peg$currPos += 2;
                 } else {
                   s1 = peg$FAILED;
                   if (peg$silentFails === 0) {
-                    peg$fail(peg$e63);
+                    peg$fail(peg$e68);
                   }
                 }
                 if (s1 !== peg$FAILED) {
                   s2 = peg$currPos;
                   s3 = [];
                   s4 = input.charAt(peg$currPos);
-                  if (peg$r10.test(s4)) {
+                  if (peg$r14.test(s4)) {
                     peg$currPos++;
                   } else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e64);
+                      peg$fail(peg$e69);
                     }
                   }
                   while (s4 !== peg$FAILED) {
                     s3.push(s4);
                     s4 = input.charAt(peg$currPos);
-                    if (peg$r10.test(s4)) {
+                    if (peg$r14.test(s4)) {
                       peg$currPos++;
                     } else {
                       s4 = peg$FAILED;
                       if (peg$silentFails === 0) {
-                        peg$fail(peg$e64);
+                        peg$fail(peg$e69);
                       }
                     }
                   }
                   s2 = input.substring(s2, peg$currPos);
-                  if (input.substr(peg$currPos, 2) === peg$c53) {
-                    s3 = peg$c53;
+                  if (input.substr(peg$currPos, 2) === peg$c54) {
+                    s3 = peg$c54;
                     peg$currPos += 2;
                   } else {
                     s3 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e65);
+                      peg$fail(peg$e70);
                     }
                   }
                   if (s3 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f52(s2);
+                    s0 = peg$f54(s2);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -4701,12 +5447,12 @@ function peg$parse(input, options) {
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
                   if (input.charCodeAt(peg$currPos) === 62) {
-                    s1 = peg$c54;
+                    s1 = peg$c55;
                     peg$currPos++;
                   } else {
                     s1 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$e66);
+                      peg$fail(peg$e71);
                     }
                   }
                   if (s1 !== peg$FAILED) {
@@ -4745,7 +5491,7 @@ function peg$parse(input, options) {
                     }
                     if (s3 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s0 = peg$f53(s2);
+                      s0 = peg$f55(s2);
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -4801,7 +5547,7 @@ function peg$parse(input, options) {
                       }
                       if (s3 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f54(s2);
+                        s0 = peg$f56(s2);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -4813,51 +5559,51 @@ function peg$parse(input, options) {
                     if (s0 === peg$FAILED) {
                       s0 = peg$currPos;
                       if (input.charCodeAt(peg$currPos) === 123) {
-                        s1 = peg$c55;
+                        s1 = peg$c56;
                         peg$currPos++;
                       } else {
                         s1 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                          peg$fail(peg$e67);
+                          peg$fail(peg$e72);
                         }
                       }
                       if (s1 !== peg$FAILED) {
                         s2 = peg$currPos;
                         s3 = [];
                         s4 = input.charAt(peg$currPos);
-                        if (peg$r8.test(s4)) {
+                        if (peg$r12.test(s4)) {
                           peg$currPos++;
                         } else {
                           s4 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e58);
+                            peg$fail(peg$e63);
                           }
                         }
                         while (s4 !== peg$FAILED) {
                           s3.push(s4);
                           s4 = input.charAt(peg$currPos);
-                          if (peg$r8.test(s4)) {
+                          if (peg$r12.test(s4)) {
                             peg$currPos++;
                           } else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e58);
+                              peg$fail(peg$e63);
                             }
                           }
                         }
                         s2 = input.substring(s2, peg$currPos);
                         if (input.charCodeAt(peg$currPos) === 125) {
-                          s3 = peg$c56;
+                          s3 = peg$c57;
                           peg$currPos++;
                         } else {
                           s3 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e68);
+                            peg$fail(peg$e73);
                           }
                         }
                         if (s3 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s0 = peg$f55(s2);
+                          s0 = peg$f57(s2);
                         } else {
                           peg$currPos = s0;
                           s0 = peg$FAILED;
@@ -4869,51 +5615,51 @@ function peg$parse(input, options) {
                       if (s0 === peg$FAILED) {
                         s0 = peg$currPos;
                         if (input.charCodeAt(peg$currPos) === 40) {
-                          s1 = peg$c57;
+                          s1 = peg$c58;
                           peg$currPos++;
                         } else {
                           s1 = peg$FAILED;
                           if (peg$silentFails === 0) {
-                            peg$fail(peg$e69);
+                            peg$fail(peg$e74);
                           }
                         }
                         if (s1 !== peg$FAILED) {
                           s2 = peg$currPos;
                           s3 = [];
                           s4 = input.charAt(peg$currPos);
-                          if (peg$r7.test(s4)) {
+                          if (peg$r11.test(s4)) {
                             peg$currPos++;
                           } else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e49);
+                              peg$fail(peg$e54);
                             }
                           }
                           while (s4 !== peg$FAILED) {
                             s3.push(s4);
                             s4 = input.charAt(peg$currPos);
-                            if (peg$r7.test(s4)) {
+                            if (peg$r11.test(s4)) {
                               peg$currPos++;
                             } else {
                               s4 = peg$FAILED;
                               if (peg$silentFails === 0) {
-                                peg$fail(peg$e49);
+                                peg$fail(peg$e54);
                               }
                             }
                           }
                           s2 = input.substring(s2, peg$currPos);
                           if (input.charCodeAt(peg$currPos) === 41) {
-                            s3 = peg$c58;
+                            s3 = peg$c59;
                             peg$currPos++;
                           } else {
                             s3 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                              peg$fail(peg$e70);
+                              peg$fail(peg$e75);
                             }
                           }
                           if (s3 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f56(s2);
+                            s0 = peg$f58(s2);
                           } else {
                             peg$currPos = s0;
                             s0 = peg$FAILED;
@@ -4937,13 +5683,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$c59) {
-      s1 = peg$c59;
+    if (input.substr(peg$currPos, 5) === peg$c60) {
+      s1 = peg$c60;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e71);
+        peg$fail(peg$e76);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4952,24 +5698,24 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = [];
         s5 = input.charAt(peg$currPos);
-        if (peg$r11.test(s5)) {
+        if (peg$r15.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e72);
+            peg$fail(peg$e77);
           }
         }
         if (s5 !== peg$FAILED) {
           while (s5 !== peg$FAILED) {
             s4.push(s5);
             s5 = input.charAt(peg$currPos);
-            if (peg$r11.test(s5)) {
+            if (peg$r15.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e72);
+                peg$fail(peg$e77);
               }
             }
           }
@@ -4983,7 +5729,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f57(s3);
+          s0 = peg$f59(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5001,23 +5747,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$c60) {
-      s1 = peg$c60;
+    if (input.substr(peg$currPos, 8) === peg$c61) {
+      s1 = peg$c61;
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e73);
+        peg$fail(peg$e78);
       }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 5) === peg$c61) {
-        s1 = peg$c61;
+      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$e74);
+          peg$fail(peg$e79);
         }
       }
     }
@@ -5027,24 +5773,24 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = [];
         s5 = input.charAt(peg$currPos);
-        if (peg$r11.test(s5)) {
+        if (peg$r15.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e72);
+            peg$fail(peg$e77);
           }
         }
         if (s5 !== peg$FAILED) {
           while (s5 !== peg$FAILED) {
             s4.push(s5);
             s5 = input.charAt(peg$currPos);
-            if (peg$r11.test(s5)) {
+            if (peg$r15.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e72);
+                peg$fail(peg$e77);
               }
             }
           }
@@ -5058,7 +5804,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f58(s3);
+          s0 = peg$f60(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5076,13 +5822,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$c62) {
-      s1 = peg$c62;
+    if (input.substr(peg$currPos, 5) === peg$c63) {
+      s1 = peg$c63;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e75);
+        peg$fail(peg$e80);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5091,24 +5837,24 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = [];
         s5 = input.charAt(peg$currPos);
-        if (peg$r11.test(s5)) {
+        if (peg$r15.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e72);
+            peg$fail(peg$e77);
           }
         }
         if (s5 !== peg$FAILED) {
           while (s5 !== peg$FAILED) {
             s4.push(s5);
             s5 = input.charAt(peg$currPos);
-            if (peg$r11.test(s5)) {
+            if (peg$r15.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e72);
+                peg$fail(peg$e77);
               }
             }
           }
@@ -5122,7 +5868,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f59(s3);
+          s0 = peg$f61(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5140,59 +5886,59 @@ 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$c63) {
-      s1 = peg$c63;
+    if (input.substr(peg$currPos, 4) === peg$c64) {
+      s1 = peg$c64;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e76);
+        peg$fail(peg$e81);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 34) {
-          s3 = peg$c64;
+          s3 = peg$c40;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e77);
+            peg$fail(peg$e50);
           }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$currPos;
           s5 = [];
           s6 = input.charAt(peg$currPos);
-          if (peg$r12.test(s6)) {
+          if (peg$r9.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e78);
+              peg$fail(peg$e51);
             }
           }
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r12.test(s6)) {
+            if (peg$r9.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e78);
+                peg$fail(peg$e51);
               }
             }
           }
           s4 = input.substring(s4, peg$currPos);
           if (input.charCodeAt(peg$currPos) === 34) {
-            s5 = peg$c64;
+            s5 = peg$c40;
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e77);
+              peg$fail(peg$e50);
             }
           }
           if (s5 !== peg$FAILED) {
@@ -5204,7 +5950,7 @@ function peg$parse(input, options) {
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e79);
+                  peg$fail(peg$e82);
                 }
               }
               if (s7 !== peg$FAILED) {
@@ -5261,7 +6007,7 @@ function peg$parse(input, options) {
                       s10 = null;
                     }
                     peg$savedPos = s0;
-                    s0 = peg$f60(s4, s9, s10);
+                    s0 = peg$f62(s4, s9, s10);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -5307,7 +6053,7 @@ function peg$parse(input, options) {
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e80);
+          peg$fail(peg$e83);
         }
       }
       if (s2 !== peg$FAILED) {
@@ -5322,7 +6068,7 @@ function peg$parse(input, options) {
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e81);
+                peg$fail(peg$e84);
               }
             }
             if (s6 !== peg$FAILED) {
@@ -5330,7 +6076,7 @@ function peg$parse(input, options) {
               s8 = peg$parseSignedInt();
               if (s8 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f61(s4, s8);
+                s0 = peg$f63(s4, s8);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -5366,7 +6112,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e82);
+        peg$fail(peg$e85);
       }
     }
     if (s1 === peg$FAILED) {
@@ -5375,24 +6121,24 @@ function peg$parse(input, options) {
     s2 = peg$currPos;
     s3 = [];
     s4 = input.charAt(peg$currPos);
-    if (peg$r13.test(s4)) {
+    if (peg$r16.test(s4)) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e83);
+        peg$fail(peg$e86);
       }
     }
     if (s4 !== peg$FAILED) {
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r13.test(s4)) {
+        if (peg$r16.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e83);
+            peg$fail(peg$e86);
           }
         }
       }
@@ -5406,7 +6152,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f62(s1, s2);
+      s0 = peg$f64(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5422,7 +6168,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e84);
+        peg$fail(peg$e87);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5433,51 +6179,51 @@ function peg$parse(input, options) {
           s4 = peg$currPos;
           s5 = peg$parse_();
           if (input.charCodeAt(peg$currPos) === 34) {
-            s6 = peg$c64;
+            s6 = peg$c40;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e77);
+              peg$fail(peg$e50);
             }
           }
           if (s6 !== peg$FAILED) {
             s7 = peg$currPos;
             s8 = [];
             s9 = input.charAt(peg$currPos);
-            if (peg$r12.test(s9)) {
+            if (peg$r9.test(s9)) {
               peg$currPos++;
             } else {
               s9 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e78);
+                peg$fail(peg$e51);
               }
             }
             while (s9 !== peg$FAILED) {
               s8.push(s9);
               s9 = input.charAt(peg$currPos);
-              if (peg$r12.test(s9)) {
+              if (peg$r9.test(s9)) {
                 peg$currPos++;
               } else {
                 s9 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e78);
+                  peg$fail(peg$e51);
                 }
               }
             }
             s7 = input.substring(s7, peg$currPos);
             if (input.charCodeAt(peg$currPos) === 34) {
-              s8 = peg$c64;
+              s8 = peg$c40;
               peg$currPos++;
             } else {
               s8 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e77);
+                peg$fail(peg$e50);
               }
             }
             if (s8 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f63(s3, s7);
+              s4 = peg$f65(s3, s7);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -5510,7 +6256,7 @@ function peg$parse(input, options) {
             }
             if (s9 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f64(s3, s4, s7);
+              s0 = peg$f66(s3, s4, s7);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -5541,7 +6287,7 @@ function peg$parse(input, options) {
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e85);
+        peg$fail(peg$e88);
       }
     }
     if (s0 === peg$FAILED) {
@@ -5551,7 +6297,7 @@ function peg$parse(input, options) {
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e86);
+          peg$fail(peg$e89);
         }
       }
       if (s0 === peg$FAILED) {
@@ -5561,7 +6307,7 @@ function peg$parse(input, options) {
         } else {
           s0 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e87);
+            peg$fail(peg$e90);
           }
         }
         if (s0 === peg$FAILED) {
@@ -5571,7 +6317,7 @@ function peg$parse(input, options) {
           } else {
             s0 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e88);
+              peg$fail(peg$e91);
             }
           }
         }
@@ -5636,24 +6382,24 @@ function peg$parse(input, options) {
       s3 = peg$currPos;
       s4 = [];
       s5 = input.charAt(peg$currPos);
-      if (peg$r14.test(s5)) {
+      if (peg$r17.test(s5)) {
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e89);
+          peg$fail(peg$e92);
         }
       }
       if (s5 !== peg$FAILED) {
         while (s5 !== peg$FAILED) {
           s4.push(s5);
           s5 = input.charAt(peg$currPos);
-          if (peg$r14.test(s5)) {
+          if (peg$r17.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e89);
+              peg$fail(peg$e92);
             }
           }
         }
@@ -5712,7 +6458,7 @@ function peg$parse(input, options) {
             s6 = peg$parseNL();
             if (s6 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f65(s3, s5);
+              s0 = peg$f67(s3, s5);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -5740,30 +6486,30 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r15.test(s1)) {
+    if (peg$r18.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e91);
+        peg$fail(peg$e94);
       }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r15.test(s1)) {
+      if (peg$r18.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e91);
+          peg$fail(peg$e94);
         }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
     if (peg$silentFails === 0) {
-      peg$fail(peg$e90);
+      peg$fail(peg$e93);
     }
     return s0;
   }
@@ -5772,24 +6518,24 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r15.test(s1)) {
+    if (peg$r18.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e91);
+        peg$fail(peg$e94);
       }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
         s0.push(s1);
         s1 = input.charAt(peg$currPos);
-        if (peg$r15.test(s1)) {
+        if (peg$r18.test(s1)) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e91);
+            peg$fail(peg$e94);
           }
         }
       }
@@ -5800,7 +6546,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e92);
+        peg$fail(peg$e95);
       }
     }
     return s0;
@@ -5814,17 +6560,17 @@ function peg$parse(input, options) {
     } else {
       s0 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e94);
+        peg$fail(peg$e97);
       }
     }
     if (s0 === peg$FAILED) {
       s0 = input.charAt(peg$currPos);
-      if (peg$r16.test(s0)) {
+      if (peg$r19.test(s0)) {
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e95);
+          peg$fail(peg$e98);
         }
       }
     }
@@ -5832,7 +6578,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e93);
+        peg$fail(peg$e96);
       }
     }
     return s0;
@@ -5869,11 +6615,28 @@ function peg$parse(input, options) {
 var flowchart = {
   parseMermaid(input) {
     const raw = peg$parse(input);
+    const nodes = raw.flow.nodes.map((n) => {
+      const base = {
+        id: n.id,
+        label: n.label,
+        shape: n.shape || "rect",
+        status: n.status || "default",
+        ...n.subgraph !== void 0 ? { subgraph: n.subgraph } : {}
+      };
+      if (n.iconToken !== void 0) {
+        const result = parseIconRef(String(n.iconToken));
+        if (!result.ok) {
+          throw new Error(`Flowchart parse error: invalid @icon value "${n.iconToken}": ${result.error.message}`);
+        }
+        return { ...base, icon: result.value };
+      }
+      return base;
+    });
     return {
       version: raw.version,
       metadata: raw.metadata ?? {},
       direction: raw.direction,
-      nodes: raw.flow.nodes,
+      nodes,
       edges: raw.flow.edges,
       subgraphs: raw.subgraphs ?? [],
       overlays: raw.overlays?.length > 0 ? raw.overlays : void 0
@@ -6149,179 +6912,6 @@ function rhu(v, decimals = 2) {
   return Math.floor(v * f2 + 0.5) / f2;
 }
 
-// ../src/text/metrics.ts
-var ADVANCE = {
-  32: 0.2793,
-  33: 0.2793,
-  34: 0.3574,
-  35: 0.5576,
-  36: 0.5576,
-  37: 0.8906,
-  38: 0.6699,
-  39: 0.1914,
-  40: 0.334,
-  41: 0.334,
-  42: 0.3906,
-  43: 0.5859,
-  44: 0.2793,
-  45: 0.334,
-  46: 0.2793,
-  47: 0.3125,
-  48: 0.5576,
-  49: 0.5576,
-  50: 0.5576,
-  51: 0.5576,
-  52: 0.5576,
-  53: 0.5576,
-  54: 0.5576,
-  55: 0.5576,
-  56: 0.5576,
-  57: 0.5576,
-  58: 0.2793,
-  59: 0.2793,
-  60: 0.5859,
-  61: 0.5859,
-  62: 0.5859,
-  63: 0.5576,
-  64: 1.0186,
-  65: 0.6699,
-  66: 0.6699,
-  67: 0.7227,
-  68: 0.7227,
-  69: 0.6699,
-  70: 0.6133,
-  71: 0.7793,
-  72: 0.7227,
-  73: 0.2783,
-  74: 0.5,
-  75: 0.6699,
-  76: 0.5576,
-  77: 0.8359,
-  78: 0.7227,
-  79: 0.7793,
-  80: 0.6133,
-  81: 0.7793,
-  82: 0.7227,
-  83: 0.6133,
-  84: 0.6133,
-  85: 0.7227,
-  86: 0.6699,
-  87: 0.9453,
-  88: 0.6699,
-  89: 0.6699,
-  90: 0.6133,
-  91: 0.2793,
-  92: 0.3125,
-  93: 0.2793,
-  94: 0.5859,
-  95: 0.5576,
-  96: 0.334,
-  97: 0.5576,
-  98: 0.5576,
-  99: 0.5,
-  100: 0.5576,
-  101: 0.5576,
-  102: 0.2793,
-  103: 0.5576,
-  104: 0.5576,
-  105: 0.2217,
-  106: 0.2217,
-  107: 0.5,
-  108: 0.2217,
-  109: 0.8359,
-  110: 0.5576,
-  111: 0.5576,
-  112: 0.5576,
-  113: 0.5576,
-  114: 0.334,
-  115: 0.5,
-  116: 0.334,
-  117: 0.5576,
-  118: 0.5,
-  119: 0.7227,
-  120: 0.5,
-  121: 0.5,
-  122: 0.5,
-  123: 0.334,
-  124: 0.2598,
-  125: 0.334,
-  126: 0.5859
-};
-var DEFAULT_ADVANCE = 0.5576;
-var LINE_HEIGHT_FACTOR = 1.2;
-function measureText(text, fontSizePx) {
-  let totalEm = 0;
-  for (let i = 0; i < text.length; i++) {
-    const cp = text.codePointAt(i) ?? 32;
-    totalEm += ADVANCE[cp] ?? DEFAULT_ADVANCE;
-  }
-  return {
-    width: totalEm * fontSizePx,
-    height: fontSizePx * LINE_HEIGHT_FACTOR
-  };
-}
-
-// ../src/text/wrap.ts
-var ELLIPSIS = "\u2026";
-function wrapText2(text, fontSizePx, maxWidth, maxLines) {
-  if (!text || maxLines <= 0 || maxWidth <= 0) return { lines: [] };
-  const words = text.split(/\s+/).filter(Boolean);
-  if (words.length === 0) return { lines: [] };
-  const lines2 = [];
-  let current = "";
-  for (let wi = 0; wi < words.length; wi++) {
-    const word = words[wi];
-    const candidate = current ? `${current} ${word}` : word;
-    if (measureText(candidate, fontSizePx).width <= maxWidth) {
-      current = candidate;
-    } else {
-      if (current) {
-        if (lines2.length === maxLines - 1) {
-          const remaining = words.slice(wi).join(" ");
-          const full = current ? `${current} ${remaining}` : remaining;
-          lines2.push(truncateText(full, fontSizePx, maxWidth));
-          return { lines: lines2 };
-        }
-        lines2.push(current);
-        current = word;
-      } else {
-        if (lines2.length === maxLines - 1) {
-          lines2.push(truncateText(word, fontSizePx, maxWidth));
-          return { lines: lines2 };
-        }
-        lines2.push(truncateText(word, fontSizePx, maxWidth));
-        current = "";
-      }
-    }
-  }
-  if (current) {
-    if (lines2.length < maxLines) {
-      lines2.push(current);
-    } else {
-      const last = lines2[lines2.length - 1] ?? "";
-      lines2[lines2.length - 1] = truncateText(`${last} ${current}`, fontSizePx, maxWidth);
-    }
-  }
-  return { lines: lines2 };
-}
-function truncateText(text, fontSizePx, maxWidth) {
-  if (measureText(text, fontSizePx).width <= maxWidth) return text;
-  const ellipsisWidth = measureText(ELLIPSIS, fontSizePx).width;
-  const budget = maxWidth - ellipsisWidth;
-  if (budget <= 0) return ELLIPSIS;
-  let lo = 0;
-  let hi = text.length;
-  while (lo < hi) {
-    const mid = Math.floor((lo + hi + 1) / 2);
-    if (measureText(text.slice(0, mid), fontSizePx).width <= budget) {
-      lo = mid;
-    } else {
-      hi = mid - 1;
-    }
-  }
-  return text.slice(0, lo) + ELLIPSIS;
-}
-
 // ../src/palette/categorical.ts
 var CATEGORICAL_HUES = [
   "#7C3AED",
@@ -11191,6 +11781,8 @@ function translateElement(element, dx, dy) {
       return { ...element, position: { x: rhu(element.position.x + dx), y: rhu(element.position.y + dy) } };
     case "group":
       return { ...element, children: translateElements(element.children, dx, dy) };
+    case "icon":
+      return { ...element, x: rhu(element.x + dx), y: rhu(element.y + dy) };
   }
 }
 function translateAnchors(anchors, dx, dy) {
@@ -42634,6 +43226,8 @@ function translateElement2(element, dx, dy) {
       return { ...element, position: { x: rhu(element.position.x + dx), y: rhu(element.position.y + dy) } };
     case "group":
       return { ...element, children: translateElements2(element.children, dx, dy) };
+    case "icon":
+      return { ...element, x: rhu(element.x + dx), y: rhu(element.y + dy) };
   }
 }
 function translateAnchors2(anchors, dx, dy) {
@@ -43946,6 +44540,9 @@ ${circles}`;
       }
       return `${attrs} />`;
     }
+    case "icon": {
+      return renderIcon(el, depth);
+    }
     case "group": {
       const id = el.id != null ? ` id="${escapeAttr(el.id)}"` : "";
       const transform = el.transform != null ? ` transform="${escapeAttr(el.transform)}"` : "";
@@ -43960,6 +44557,66 @@ ${pad}</g>`;
     }
   }
 }
+var iconEmitCounter = 0;
+function renderIcon(el, depth) {
+  const pad = "  ".repeat(depth);
+  const { icon, x, y, size } = el;
+  const { viewBox, transforms, colorMode } = icon;
+  const vbW = viewBox.width;
+  const vbH = viewBox.height;
+  const vbL = viewBox.left;
+  const vbT = viewBox.top;
+  const scale = Math.min(size / vbW, size / vbH);
+  const scaledW = formatNum(vbW * scale);
+  const scaledH = formatNum(vbH * scale);
+  const offX = formatNum(x + (size - vbW * scale) / 2);
+  const offY = formatNum(y + (size - vbH * scale) / 2);
+  const styleAttr = colorMode === "monochrome" && el.color ? ` style="color:${escapeAttr(el.color)}"` : "";
+  const opacityAttr = el.opacity != null ? ` opacity="${el.opacity}"` : "";
+  const body = colorMode === "brand" ? namespaceIconIds(icon.body, `icn${iconEmitCounter++}`) : icon.body;
+  const cx = vbL + vbW / 2;
+  const cy = vbT + vbH / 2;
+  const innerTransform = buildIconTransform(transforms, cx, cy);
+  const vbAttr = `${vbL} ${vbT} ${formatNum(vbW)} ${formatNum(vbH)}`;
+  const inner = innerTransform ? `${pad}  <g transform="${innerTransform}">${body}</g>` : `${pad}  ${body}`;
+  return [
+    `${pad}<svg x="${offX}" y="${offY}" width="${scaledW}" height="${scaledH}" viewBox="${vbAttr}"${styleAttr}${opacityAttr}>`,
+    inner,
+    `${pad}</svg>`
+  ].join("\n");
+}
+function buildIconTransform(t, cx, cy) {
+  if (t.rotate === 0 && !t.hFlip && !t.vFlip) return null;
+  const deg = t.rotate * 90;
+  const sf = t.hFlip ? -1 : 1;
+  const vf = t.vFlip ? -1 : 1;
+  const cxs = formatNum(cx);
+  const cys = formatNum(cy);
+  const parts = [];
+  parts.push(`translate(${cxs} ${cys})`);
+  if (t.hFlip || t.vFlip) parts.push(`scale(${sf} ${vf})`);
+  if (t.rotate !== 0) parts.push(`rotate(${deg})`);
+  parts.push(`translate(${formatNum(-cx)} ${formatNum(-cy)})`);
+  return parts.join(" ");
+}
+function namespaceIconIds(body, prefix) {
+  const idRe = /\bid="([^"]+)"/g;
+  const ids = /* @__PURE__ */ new Set();
+  let m;
+  while ((m = idRe.exec(body)) !== null) {
+    ids.add(m[1]);
+  }
+  if (ids.size === 0) return body;
+  let result = body;
+  for (const id of ids) {
+    const newId = `${prefix}-${id}`;
+    result = result.split(`id="${id}"`).join(`id="${newId}"`);
+    result = result.split(`url(#${id})`).join(`url(#${newId})`);
+    result = result.split(`href="#${id}"`).join(`href="#${newId}"`);
+    result = result.split(`href='#${id}'`).join(`href='#${newId}'`);
+  }
+  return result;
+}
 function parseDasharrayPeriod(dasharray) {
   return dasharray.trim().split(/[\s,]+/).map(Number).filter((n) => !isNaN(n) && n > 0).reduce((sum, n) => sum + n, 0);
 }
@@ -44354,7 +45011,7 @@ registerRouter("straight", straightRouter);
 registerRouter("orthogonal", orthogonalRouter);
 registerRouter("bezier", bezierRouter);
 registerRouter("polyline", polylineRouter);
-function compileSync(input, themeInput, forcedThemeName) {
+function compileSync(input, themeInput, forcedThemeName, icons) {
   const cleaned = stripComments(input);
   const { format, diagramType } = detect(cleaned);
   const module2 = getModule(diagramType);
@@ -44367,15 +45024,16 @@ function compileSync(input, themeInput, forcedThemeName) {
     const base = resolveTheme(themeInput ?? {}, getThemePreset(forcedThemeName ?? themeName));
     const withModuleDefaults = module2.defaultThemeOverride ? resolveTheme(module2.defaultThemeOverride, base) : base;
     const finalTheme = ir.themeOverride ? resolveTheme(ir.themeOverride, withModuleDefaults) : withModuleDefaults;
-    const result = module2.layout(ir, finalTheme);
+    const layoutOptions = icons !== void 0 ? { icons } : void 0;
+    const result = module2.layout(ir, finalTheme, layoutOptions);
     return ok(result);
   } catch (cause) {
     const message = cause instanceof Error ? cause.message : String(cause);
     return err("PARSE_ERROR", message, cause);
   }
 }
-function renderSync(input, themeInput, rendererName = "svg", forcedThemeName) {
-  const compileResult = compileSync(input, themeInput, forcedThemeName);
+function renderSync(input, themeInput, rendererName = "svg", forcedThemeName, icons) {
+  const compileResult = compileSync(input, themeInput, forcedThemeName, icons);
   if (!compileResult.ok) return compileResult;
   const renderer = getRenderer(rendererName);
   if (!renderer) {
@@ -44565,6 +45223,341 @@ function resolveCliTheme(args, inputDir) {
   return void 0;
 }
 
+// src/icon-resolve.ts
+var import_node_fs3 = require("node:fs");
+var import_node_path4 = require("node:path");
+
+// ../src/icons/discover.ts
+var import_node_fs2 = require("node:fs");
+var import_node_path3 = require("node:path");
+
+// ../src/icons/validate.ts
+var TOP_LEVEL_KEYS2 = /* @__PURE__ */ new Set([
+  "prefix",
+  "icons",
+  "aliases",
+  "width",
+  "height",
+  "left",
+  "top"
+]);
+var ICON_DATA_KEYS = /* @__PURE__ */ new Set([
+  "body",
+  "width",
+  "height",
+  "left",
+  "top",
+  "rotate",
+  "hFlip",
+  "vFlip"
+]);
+var ICON_ALIAS_KEYS = /* @__PURE__ */ new Set([
+  "parent",
+  "rotate",
+  "hFlip",
+  "vFlip",
+  "width",
+  "height",
+  "left",
+  "top"
+]);
+var PREFIX_RE2 = /^[a-z][a-z0-9-]*$/;
+var NAME_RE2 = /^[a-z0-9][a-z0-9-]*$/;
+var VALID_ROTATE = /* @__PURE__ */ new Set([0, 1, 2, 3]);
+function isPlainObject2(v) {
+  return v !== null && typeof v === "object" && !Array.isArray(v);
+}
+function fail2(message) {
+  return err("ICON_VALIDATION_ERROR", message);
+}
+function validateIconData(iconName, obj) {
+  const ctx = `icons["${iconName}"]`;
+  if (!isPlainObject2(obj)) {
+    return fail2(`${ctx} must be a plain object`);
+  }
+  for (const key of Object.keys(obj)) {
+    if (!ICON_DATA_KEYS.has(key)) {
+      return fail2(`Unknown key in ${ctx}: "${key}"`);
+    }
+  }
+  if (!("body" in obj)) {
+    return fail2(`${ctx} is missing required field "body"`);
+  }
+  const body = obj["body"];
+  if (typeof body !== "string" || body.length === 0) {
+    return fail2(`${ctx}.body must be a non-empty string, got ${JSON.stringify(body)}`);
+  }
+  for (const dim of ["width", "height"]) {
+    if (dim in obj) {
+      const val = obj[dim];
+      if (typeof val !== "number" || val <= 0) {
+        return fail2(`${ctx}.${dim} must be a positive number, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  for (const origin of ["left", "top"]) {
+    if (origin in obj) {
+      const val = obj[origin];
+      if (typeof val !== "number") {
+        return fail2(`${ctx}.${origin} must be a number, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  if ("rotate" in obj) {
+    const val = obj["rotate"];
+    if (!VALID_ROTATE.has(val)) {
+      return fail2(`${ctx}.rotate must be 0, 1, 2, or 3, got ${JSON.stringify(val)}`);
+    }
+  }
+  for (const flip2 of ["hFlip", "vFlip"]) {
+    if (flip2 in obj) {
+      const val = obj[flip2];
+      if (typeof val !== "boolean") {
+        return fail2(`${ctx}.${flip2} must be a boolean, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  return ok(obj);
+}
+function validateIconAlias(aliasName, obj) {
+  const ctx = `aliases["${aliasName}"]`;
+  if (!isPlainObject2(obj)) {
+    return fail2(`${ctx} must be a plain object`);
+  }
+  for (const key of Object.keys(obj)) {
+    if (!ICON_ALIAS_KEYS.has(key)) {
+      return fail2(`Unknown key in ${ctx}: "${key}"`);
+    }
+  }
+  if (!("parent" in obj)) {
+    return fail2(`${ctx} is missing required field "parent"`);
+  }
+  const parent = obj["parent"];
+  if (typeof parent !== "string" || parent.length === 0) {
+    return fail2(`${ctx}.parent must be a non-empty string, got ${JSON.stringify(parent)}`);
+  }
+  if ("rotate" in obj) {
+    const val = obj["rotate"];
+    if (!VALID_ROTATE.has(val)) {
+      return fail2(`${ctx}.rotate must be 0, 1, 2, or 3, got ${JSON.stringify(val)}`);
+    }
+  }
+  for (const flip2 of ["hFlip", "vFlip"]) {
+    if (flip2 in obj) {
+      const val = obj[flip2];
+      if (typeof val !== "boolean") {
+        return fail2(`${ctx}.${flip2} must be a boolean, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  for (const dim of ["width", "height"]) {
+    if (dim in obj) {
+      const val = obj[dim];
+      if (typeof val !== "number" || val <= 0) {
+        return fail2(`${ctx}.${dim} must be a positive number, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  for (const origin of ["left", "top"]) {
+    if (origin in obj) {
+      const val = obj[origin];
+      if (typeof val !== "number") {
+        return fail2(`${ctx}.${origin} must be a number, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  return ok(obj);
+}
+function validateIconPack(json) {
+  if (!isPlainObject2(json)) {
+    return fail2(
+      `IconifyJSON must be a non-null plain object, got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`
+    );
+  }
+  for (const key of Object.keys(json)) {
+    if (!TOP_LEVEL_KEYS2.has(key)) {
+      return fail2(`Unknown top-level key: "${key}"`);
+    }
+  }
+  if (!("prefix" in json)) {
+    return fail2('Missing required field "prefix"');
+  }
+  const prefix = json["prefix"];
+  if (typeof prefix !== "string") {
+    return fail2(`"prefix" must be a string, got ${JSON.stringify(prefix)}`);
+  }
+  if (!PREFIX_RE2.test(prefix)) {
+    return fail2(
+      `"prefix" must match ^[a-z][a-z0-9-]*$ (lowercase letter start, then lowercase alnum/hyphens), got ${JSON.stringify(prefix)}`
+    );
+  }
+  if (!("icons" in json)) {
+    return fail2('Missing required field "icons"');
+  }
+  const iconsRaw = json["icons"];
+  if (!isPlainObject2(iconsRaw)) {
+    return fail2('"icons" must be a plain object');
+  }
+  const iconNames = Object.keys(iconsRaw);
+  if (iconNames.length === 0) {
+    return fail2('"icons" must contain at least one icon entry');
+  }
+  const icons = {};
+  for (const name of iconNames) {
+    if (!NAME_RE2.test(name)) {
+      return fail2(
+        `Icon name ${JSON.stringify(name)} must match ^[a-z0-9][a-z0-9-]*$ (lowercase alnum start, then lowercase alnum/hyphens)`
+      );
+    }
+    const r = validateIconData(name, iconsRaw[name]);
+    if (!r.ok) return r;
+    icons[name] = r.value;
+  }
+  let aliases;
+  if ("aliases" in json) {
+    const aliasesRaw = json["aliases"];
+    if (!isPlainObject2(aliasesRaw)) {
+      return fail2('"aliases" must be a plain object');
+    }
+    aliases = {};
+    for (const aliasName of Object.keys(aliasesRaw)) {
+      if (!NAME_RE2.test(aliasName)) {
+        return fail2(
+          `Alias name ${JSON.stringify(aliasName)} must match ^[a-z0-9][a-z0-9-]*$`
+        );
+      }
+      const r = validateIconAlias(aliasName, aliasesRaw[aliasName]);
+      if (!r.ok) return r;
+      aliases[aliasName] = r.value;
+    }
+  }
+  for (const dim of ["width", "height"]) {
+    if (dim in json) {
+      const val = json[dim];
+      if (typeof val !== "number" || val <= 0) {
+        return fail2(`"${dim}" must be a positive number, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  for (const origin of ["left", "top"]) {
+    if (origin in json) {
+      const val = json[origin];
+      if (typeof val !== "number") {
+        return fail2(`"${origin}" must be a number, got ${JSON.stringify(val)}`);
+      }
+    }
+  }
+  const result = {
+    prefix,
+    icons,
+    ...aliases !== void 0 ? { aliases } : {},
+    ..."width" in json ? { width: json["width"] } : {},
+    ..."height" in json ? { height: json["height"] } : {},
+    ..."left" in json ? { left: json["left"] } : {},
+    ..."top" in json ? { top: json["top"] } : {}
+  };
+  return ok(result);
+}
+
+// ../src/icons/discover.ts
+var ICON_SUFFIX = ".triton-icons.json";
+function discoverIconPacks(dir) {
+  const map = /* @__PURE__ */ new Map();
+  const warnings = [];
+  let entries;
+  try {
+    entries = (0, import_node_fs2.readdirSync)(dir);
+  } catch (cause) {
+    warnings.push(`Cannot read icons directory "${dir}": ${String(cause)}`);
+    return { map, warnings };
+  }
+  const iconFiles = entries.filter((e) => e.endsWith(ICON_SUFFIX));
+  for (const filename of iconFiles) {
+    const filePath = (0, import_node_path3.join)(dir, filename);
+    let raw;
+    try {
+      raw = (0, import_node_fs2.readFileSync)(filePath, "utf8");
+    } catch (cause) {
+      warnings.push(`Cannot read icon pack file "${filePath}": ${String(cause)}`);
+      continue;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch (cause) {
+      warnings.push(`Invalid JSON in icon pack file "${filePath}": ${String(cause)}`);
+      continue;
+    }
+    const result = validateIconPack(parsed);
+    if (!result.ok) {
+      warnings.push(`Icon pack file "${filePath}" failed validation: ${result.error.message}`);
+      continue;
+    }
+    const pack = result.value;
+    if (map.has(pack.prefix)) {
+      warnings.push(
+        `Duplicate icon pack prefix "${pack.prefix}": "${filename}" overrides an earlier definition`
+      );
+    }
+    map.set(pack.prefix, pack);
+  }
+  return { map, warnings };
+}
+function findTritonIconsDir(startDir) {
+  const MAX_LEVELS = 10;
+  let current = (0, import_node_path3.resolve)(startDir);
+  for (let level = 0; level < MAX_LEVELS; level++) {
+    const candidate = (0, import_node_path3.join)(current, ".triton", "icons");
+    try {
+      if ((0, import_node_fs2.existsSync)(candidate) && (0, import_node_fs2.statSync)(candidate).isDirectory()) {
+        return candidate;
+      }
+    } catch {
+    }
+    const parent = (0, import_node_path3.resolve)((0, import_node_path3.join)(current, ".."));
+    if (parent === current) break;
+    current = parent;
+  }
+  return void 0;
+}
+
+// src/icon-resolve.ts
+function resolveCliIcons(args, inputDir) {
+  const merged = /* @__PURE__ */ new Map();
+  const autoDir = findTritonIconsDir(inputDir);
+  if (autoDir) {
+    const { map, warnings } = discoverIconPacks(autoDir);
+    for (const [prefix, pack] of map) merged.set(prefix, pack);
+    for (const w of warnings) console.error(`warning: ${w}`);
+  }
+  if (args.iconsDir) {
+    const { map, warnings } = discoverIconPacks((0, import_node_path4.resolve)(args.iconsDir));
+    for (const [prefix, pack] of map) merged.set(prefix, pack);
+    for (const w of warnings) console.error(`warning: ${w}`);
+  }
+  if (args.iconPack) {
+    const packPath = (0, import_node_path4.resolve)(args.iconPack);
+    let raw;
+    try {
+      raw = (0, import_node_fs3.readFileSync)(packPath, "utf8");
+    } catch (cause) {
+      throw new Error(`--icon-pack: cannot read "${packPath}": ${cause.message}`);
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch (cause) {
+      throw new Error(`--icon-pack: invalid JSON in "${packPath}": ${cause.message}`);
+    }
+    const result = validateIconPack(parsed);
+    if (!result.ok) {
+      throw new Error(`--icon-pack: "${packPath}" failed validation: ${result.error.message}`);
+    }
+    merged.set(result.value.prefix, result.value);
+  }
+  return merged;
+}
+
 // src/cli.ts
 var import_meta = {};
 function parseArgs(argv) {
@@ -44573,6 +45566,8 @@ function parseArgs(argv) {
   let theme;
   let themeFile;
   let themesDir;
+  let iconPack;
+  let iconsDir;
   let scale = 1;
   let help = false;
   for (let i = 0; i < argv.length; i++) {
@@ -44591,6 +45586,12 @@ function parseArgs(argv) {
       case "--themes-dir":
         themesDir = argv[++i];
         break;
+      case "--icon-pack":
+        iconPack = argv[++i];
+        break;
+      case "--icons-dir":
+        iconsDir = argv[++i];
+        break;
       case "--scale":
         scale = Number(argv[++i]) || 1;
         break;
@@ -44602,7 +45603,7 @@ function parseArgs(argv) {
         positionals.push(a);
     }
   }
-  return { command: positionals.shift(), positionals, out, theme, themeFile, themesDir, scale, help };
+  return { command: positionals.shift(), positionals, out, theme, themeFile, themesDir, iconPack, iconsDir, scale, help };
 }
 var USAGE = `triton-latex \u2014 render Triton diagrams to vector PDF for LaTeX.
 
@@ -44619,6 +45620,12 @@ Options:
   --themes-dir <dir>        Directory of .triton-theme.json files to register; merged
                             on top of auto-discovered .triton/themes/ (overrides on
                             name collision). Use with --theme <name>.
+  --icon-pack <path>        Path to a .triton-icons.json icon pack file. Loaded at
+                            highest precedence (overrides --icons-dir and auto-discovery
+                            on duplicate prefix). Fails loudly on load or validation error.
+  --icons-dir <dir>         Directory of .triton-icons.json files to register; merged
+                            on top of auto-discovered .triton/icons/ (overrides on
+                            duplicate prefix). Use alongside --icon-pack as needed.
   --scale <number>          Uniform scale for the PDF page box (default 1).
   -h, --help                Show this help.
 
@@ -44628,46 +45635,54 @@ Theme resolution order:
      --theme <name>          \u2192 look up name in registry, then fall back to built-in preset
   3. No theme flags          \u2192 core uses diagram frontmatter / default preset
 
+Icon resolution order:
+  1. --icon-pack <path>     \u2192 load that exact file (errors are fatal); highest precedence
+  2. --icons-dir <dir>      \u2192 discover packs in dir, merged over auto-discovery
+  3. Auto-discovery          \u2192 walk up from input file looking for .triton/icons/
+  (No icon flags + no .triton/icons/ found \u2192 no custom icon packs loaded)
+
 Examples:
   triton-latex render diagram.mmd -o figures/diagram.pdf
   triton-latex render diagram.mmd -o diagram.svg                        # SVG pass-through
   triton-latex render diagram.mmd -o out.pdf --theme-file my.triton-theme.json
   triton-latex render diagram.mmd -o out.pdf --themes-dir .triton/themes --theme acme
+  triton-latex render diagram.mmd -o out.pdf --icon-pack icons/azure.triton-icons.json
+  triton-latex render diagram.mmd -o out.pdf --icons-dir .triton/icons
   triton-latex render-dir diagrams/ -o figures/                         # batch \u2192 *.pdf
 `;
 var DIAGRAM_EXTS = /* @__PURE__ */ new Set([".triton", ".mmd"]);
-function renderToSvg(source, themeInput) {
-  const result = renderSync(source, themeInput);
+function renderToSvg(source, themeInput, icons) {
+  const result = renderSync(source, themeInput, void 0, void 0, icons);
   if (!result.ok) {
     throw new Error(`${result.error.code}: ${result.error.message}`);
   }
   return result.value;
 }
-async function renderFile(inputPath, outPath, themeInput, scale) {
-  const source = (0, import_node_fs2.readFileSync)(inputPath, "utf8");
-  const svg = renderToSvg(source, themeInput);
-  (0, import_node_fs2.mkdirSync)((0, import_node_path3.dirname)((0, import_node_path3.resolve)(outPath)), { recursive: true });
-  if ((0, import_node_path3.extname)(outPath).toLowerCase() === ".svg") {
-    (0, import_node_fs2.writeFileSync)(outPath, svg, "utf8");
+async function renderFile(inputPath, outPath, themeInput, icons, scale) {
+  const source = (0, import_node_fs4.readFileSync)(inputPath, "utf8");
+  const svg = renderToSvg(source, themeInput, icons);
+  (0, import_node_fs4.mkdirSync)((0, import_node_path5.dirname)((0, import_node_path5.resolve)(outPath)), { recursive: true });
+  if ((0, import_node_path5.extname)(outPath).toLowerCase() === ".svg") {
+    (0, import_node_fs4.writeFileSync)(outPath, svg, "utf8");
     return;
   }
   const pdf = await svgToPdf(svg, { scale });
-  (0, import_node_fs2.writeFileSync)(outPath, pdf);
+  (0, import_node_fs4.writeFileSync)(outPath, pdf);
 }
-async function renderDir(srcDir, outDir, themeInput, scale) {
-  (0, import_node_fs2.mkdirSync)(outDir, { recursive: true });
-  const entries = (0, import_node_fs2.readdirSync)(srcDir).filter((f2) => {
-    const full = (0, import_node_path3.join)(srcDir, f2);
-    return (0, import_node_fs2.statSync)(full).isFile() && DIAGRAM_EXTS.has((0, import_node_path3.extname)(f2).toLowerCase());
+async function renderDir(srcDir, outDir, themeInput, icons, scale) {
+  (0, import_node_fs4.mkdirSync)(outDir, { recursive: true });
+  const entries = (0, import_node_fs4.readdirSync)(srcDir).filter((f2) => {
+    const full = (0, import_node_path5.join)(srcDir, f2);
+    return (0, import_node_fs4.statSync)(full).isFile() && DIAGRAM_EXTS.has((0, import_node_path5.extname)(f2).toLowerCase());
   });
   let rendered = 0;
   const failed = [];
   for (const file of entries) {
-    const inputPath = (0, import_node_path3.join)(srcDir, file);
-    const name = (0, import_node_path3.basename)(file, (0, import_node_path3.extname)(file));
-    const outPath = (0, import_node_path3.join)(outDir, `${name}.pdf`);
+    const inputPath = (0, import_node_path5.join)(srcDir, file);
+    const name = (0, import_node_path5.basename)(file, (0, import_node_path5.extname)(file));
+    const outPath = (0, import_node_path5.join)(outDir, `${name}.pdf`);
     try {
-      await renderFile(inputPath, outPath, themeInput, scale);
+      await renderFile(inputPath, outPath, themeInput, icons, scale);
       console.log(`  \u2713 ${file} \u2192 ${name}.pdf`);
       rendered++;
     } catch (cause) {
@@ -44691,15 +45706,22 @@ async function main() {
       console.error(USAGE);
       return 1;
     }
-    const inputPath = (0, import_node_path3.resolve)(input);
+    const inputPath = (0, import_node_path5.resolve)(input);
     let themeInput;
+    let icons;
+    try {
+      themeInput = resolveCliTheme(args, (0, import_node_path5.dirname)(inputPath));
+    } catch (e) {
+      console.error(`error: ${e.message}`);
+      return 1;
+    }
     try {
-      themeInput = resolveCliTheme(args, (0, import_node_path3.dirname)(inputPath));
+      icons = resolveCliIcons(args, (0, import_node_path5.dirname)(inputPath));
     } catch (e) {
       console.error(`error: ${e.message}`);
       return 1;
     }
-    await renderFile(inputPath, (0, import_node_path3.resolve)(args.out), themeInput, args.scale);
+    await renderFile(inputPath, (0, import_node_path5.resolve)(args.out), themeInput, icons, args.scale);
     console.log(`\u2713 ${input} \u2192 ${args.out}`);
     return 0;
   }
@@ -44710,18 +45732,26 @@ async function main() {
       console.error(USAGE);
       return 1;
     }
-    const resolvedSrcDir = (0, import_node_path3.resolve)(srcDir);
+    const resolvedSrcDir = (0, import_node_path5.resolve)(srcDir);
     let themeInput;
+    let icons;
     try {
       themeInput = resolveCliTheme(args, resolvedSrcDir);
     } catch (e) {
       console.error(`error: ${e.message}`);
       return 1;
     }
+    try {
+      icons = resolveCliIcons(args, resolvedSrcDir);
+    } catch (e) {
+      console.error(`error: ${e.message}`);
+      return 1;
+    }
     const { rendered, failed } = await renderDir(
       resolvedSrcDir,
-      (0, import_node_path3.resolve)(args.out),
+      (0, import_node_path5.resolve)(args.out),
       themeInput,
+      icons,
       args.scale
     );
     console.log(`