schematex 0.8.0 → 0.8.2

package/dist/{chunk-XI5QP7LM.js → chunk-LM5X7ZNR.js}

@@ -2,8 +2,8 @@ import { orgchart } from './chunk-E3CAJGJM.js';
 import { circuit } from './chunk-T3GV7OVF.js';
 import { blockdiagram } from './chunk-DX44TBFZ.js';
 import { ladder } from './chunk-JGCKW5RS.js';
-import { sld } from './chunk-6DVK5M2J.js';
-import { entity } from './chunk-WNGOG4CI.js';
+import { sld } from './chunk-KF3DFASA.js';
+import { entity } from './chunk-GDZNTILD.js';
 import { fishbone } from './chunk-YTGOLTLJ.js';
 import { venn } from './chunk-UOM3EDE6.js';
 import { flowchart, layoutFlowchart } from './chunk-HPEAE3JM.js';
@@ -142,8 +142,8 @@ function parseInfluence(src, title2) {
         const key = tok.slice(0, eq).toLowerCase();
         const value = tok.slice(eq + 1);
         if (key === "utility" || key === "payoff" || key === "value") {
-          const num3 = Number(value);
-          if (!Number.isNaN(num3)) utility = num3;
+          const num4 = Number(value);
+          if (!Number.isNaN(num4)) utility = num4;
         } else if (key === "kind") {
           const resolved = toKind(value.toLowerCase());
           if (!resolved) throw new DTreeParseError(`Unknown node kind "${value}"`, line2);
@@ -11642,8 +11642,8 @@ var SequenceLayout = class {
       }
     }
     const row = { message: m, y, x1, x2, self };
-    const num3 = this.nextNumber();
-    if (num3 !== void 0) row.number = num3;
+    const num4 = this.nextNumber();
+    if (num4 !== void 0) row.number = num4;
     if (self) {
       row.selfBottomY = y + SEQ_CONST.SELF_GAP;
       this.y = row.selfBottomY;
@@ -12411,7 +12411,7 @@ function parseMarking(body, lineNo, ast, placeIds) {
     if (!placeIds.has(id)) {
       throw new PetriParseError(`marking references unknown place "${id}"`, lineNo);
     }
-    const place = ast.places.find((pl) => pl.id === id);
+    const place = ast.places.find((pl2) => pl2.id === id);
     if (place) place.tokens = n;
   }
 }
@@ -21561,7 +21561,7 @@ function classPeriod(P, states) {
   level.set(start, 0);
   const queue = [start];
   let g = 0;
-  const gcd = (a, b) => b === 0 ? a : gcd(b, a % b);
+  const gcd2 = (a, b) => b === 0 ? a : gcd2(b, a % b);
   while (queue.length > 0) {
     const u = queue.shift();
     const lu = level.get(u);
@@ -21572,7 +21572,7 @@ function classPeriod(P, states) {
         queue.push(j);
       } else {
         const diff = lu + 1 - level.get(j);
-        g = gcd(g, Math.abs(diff));
+        g = gcd2(g, Math.abs(diff));
       }
     }
   }
@@ -24359,9 +24359,9 @@ function nodePrefix(node) {
   const m = /^([A-Za-z]+)(-?\d+)?$/.exec(node.trim());
   if (!m) return node;
   const letters = m[1];
-  const num3 = m[2];
-  if (num3 === void 0 || num3 === "0" || num3 === "-0") return letters;
-  return `${letters}${num3}`;
+  const num4 = m[2];
+  if (num4 === void 0 || num4 === "0" || num4 === "-0") return letters;
+  return `${letters}${num4}`;
 }
 function assignIcomCodes(ast) {
   const counters = { I: 0, C: 0, O: 0, M: 0 };
@@ -25646,6 +25646,560 @@ var threatmodel = {
   }
 };
 
+// src/diagrams/welding/types.ts
+var GROOVE_TYPES = /* @__PURE__ */ new Set([
+  "square",
+  "vgroove",
+  "bevel",
+  "ugroove",
+  "jgroove",
+  "flarev",
+  "flarebevel"
+]);
+var WELD_TYPE_NAMES = {
+  fillet: "fillet weld",
+  square: "square-groove weld",
+  vgroove: "V-groove weld",
+  bevel: "bevel-groove weld",
+  ugroove: "U-groove weld",
+  jgroove: "J-groove weld",
+  flarev: "flare-V-groove weld",
+  flarebevel: "flare-bevel-groove weld",
+  plug: "plug weld",
+  slot: "slot weld",
+  spot: "spot weld",
+  seam: "seam weld",
+  back: "back weld",
+  backing: "backing weld",
+  surfacing: "surfacing weld",
+  edge: "edge weld"
+};
+function validateWelding(ast) {
+  const warnings = [];
+  ast.joints.forEach((j, i) => {
+    const id = j.label ? `joint "${j.label}"` : `joint ${i + 1}`;
+    if (!j.arrow && !j.other) {
+      warnings.push(`${id}: no weld declared (add arrow:, other:, or both:).`);
+    }
+    for (const [side, spec] of [
+      ["arrow", j.arrow],
+      ["other", j.other]
+    ]) {
+      if (!spec) continue;
+      if (spec.type === "fillet" && spec.size === void 0) {
+        warnings.push(`${id} ${side}: a fillet weld needs a leg size (size=\u2026).`);
+      }
+      if ((spec.type === "plug" || spec.type === "slot") && spec.size === void 0) {
+        warnings.push(`${id} ${side}: a ${spec.type} weld needs a diameter (size=\u2026).`);
+      }
+      if (spec.type === "surfacing" && spec.throat === void 0) {
+        warnings.push(`${id} ${side}: a surfacing weld needs a build-up height (throat=\u2026).`);
+      }
+      if (spec.angle !== void 0 && !GROOVE_TYPES.has(spec.type)) {
+        warnings.push(`${id} ${side}: angle= only applies to groove welds, not a ${spec.type}.`);
+      }
+      if (spec.pitch !== void 0 && spec.length === void 0) {
+        warnings.push(`${id} ${side}: pitch= needs a length= (an intermittent weld is length-pitch).`);
+      }
+      if (spec.angle !== void 0 && (spec.angle <= 0 || spec.angle >= 180)) {
+        warnings.push(`${id} ${side}: groove angle ${spec.angle}\xB0 is out of range (0\u2013180).`);
+      }
+    }
+    if (j.other?.type === "surfacing") {
+      warnings.push(`${id}: a surfacing weld is arrow-side only.`);
+    }
+  });
+  return warnings;
+}
+
+// src/diagrams/welding/parser.ts
+var WELD_TYPES = /* @__PURE__ */ new Set([
+  "fillet",
+  "square",
+  "vgroove",
+  "bevel",
+  "ugroove",
+  "jgroove",
+  "flarev",
+  "flarebevel",
+  "plug",
+  "slot",
+  "spot",
+  "seam",
+  "back",
+  "backing",
+  "surfacing",
+  "edge"
+]);
+var TYPE_ALIAS = {
+  v: "vgroove",
+  "v-groove": "vgroove",
+  u: "ugroove",
+  "u-groove": "ugroove",
+  j: "jgroove",
+  "j-groove": "jgroove",
+  "flare-v": "flarev",
+  "flare-bevel": "flarebevel",
+  groove: "vgroove"
+};
+var CONTOURS = /* @__PURE__ */ new Set(["flush", "convex", "concave"]);
+var FINISHES = /* @__PURE__ */ new Set(["G", "M", "C", "R", "H", "U"]);
+function stripQuotes5(s) {
+  const t = s.trim();
+  const pairs = [['"', '"'], ["'", "'"], ["\u201C", "\u201D"], ["\u2018", "\u2019"]];
+  for (const [a, b] of pairs) {
+    if (t.startsWith(a) && t.endsWith(b) && t.length >= 2) return t.slice(1, -1);
+  }
+  return t;
+}
+function num3(v) {
+  const n = Number(v);
+  return Number.isFinite(n) ? n : void 0;
+}
+function parseWeldSpec(raw) {
+  const tokens = raw.trim().split(/\s+/);
+  if (tokens.length === 0) return void 0;
+  const head = tokens[0].toLowerCase();
+  const type = WELD_TYPES.has(head) ? head : TYPE_ALIAS[head];
+  if (!type) return void 0;
+  const spec = { type };
+  for (let i = 1; i < tokens.length; i++) {
+    const m = tokens[i].match(/^([a-zA-Z]+)\s*[=:]\s*(.+)$/);
+    if (!m) continue;
+    const key = m[1].toLowerCase();
+    const val = m[2];
+    switch (key) {
+      case "size":
+      case "leg":
+      case "s":
+        spec.size = num3(val);
+        break;
+      case "len":
+      case "length":
+      case "l":
+        spec.length = num3(val);
+        break;
+      case "pitch":
+      case "p":
+        spec.pitch = num3(val);
+        break;
+      case "count":
+      case "n":
+        spec.count = num3(val);
+        break;
+      case "angle":
+      case "a":
+      case "deg":
+        spec.angle = num3(val);
+        break;
+      case "root":
+      case "gap":
+      case "r":
+        spec.root = num3(val);
+        break;
+      case "throat":
+      case "e":
+      case "t":
+        spec.throat = num3(val);
+        break;
+      case "contour":
+      case "c":
+        if (CONTOURS.has(val.toLowerCase())) spec.contour = val.toLowerCase();
+        break;
+      case "finish":
+      case "f": {
+        const u = val.toUpperCase();
+        if (FINISHES.has(u)) spec.finish = u;
+        break;
+      }
+    }
+  }
+  return spec;
+}
+function emptyJoint() {
+  return { around: false, field: false };
+}
+function stripComment13(line2) {
+  const hash = line2.indexOf("#");
+  if (hash >= 0 && (line2.slice(0, hash).match(/["'“‘]/g)?.length ?? 0) % 2 === 0) {
+    return line2.slice(0, hash);
+  }
+  return line2;
+}
+var DIR_BOUNDARY = "(?:arrow|other|both|tail|label)\\s*[:=]|(?:around|all-?around|field|site)\\b";
+function parseJointBody(body, joint) {
+  const dirRe = new RegExp(`\\b(arrow|other|both|tail|label)\\s*[:=]\\s*([\\s\\S]*?)(?=\\b(?:${DIR_BOUNDARY})|$)`, "gi");
+  for (const m of body.matchAll(dirRe)) {
+    const key = m[1].toLowerCase();
+    const val = m[2].trim();
+    if (key === "arrow") joint.arrow = parseWeldSpec(val);
+    else if (key === "other") joint.other = parseWeldSpec(val);
+    else if (key === "both") {
+      const spec = parseWeldSpec(val);
+      if (spec) {
+        joint.arrow = spec;
+        joint.other = { ...spec };
+      }
+    } else if (key === "tail") joint.tail = stripQuotes5(val);
+    else if (key === "label") joint.label = stripQuotes5(val);
+  }
+  if (/\b(around|all-?around)\b/i.test(body)) joint.around = true;
+  if (/\b(field|site)\b/i.test(body)) joint.field = true;
+}
+function parseWelding(text2) {
+  const ast = { type: "welding", standard: "aws", joints: [], warnings: [] };
+  const src = text2.split(/\r?\n/).map(stripComment13).join("\n");
+  const headEnd = src.search(/\bjoint\b/i);
+  const headerScope = headEnd >= 0 ? src.slice(0, headEnd) : src;
+  const header = headerScope.match(/welding\b([^\n]*)/i);
+  if (header) {
+    const rest = header[1].trim();
+    const std = rest.match(/standard\s*[:=]\s*([a-zA-Z-]+)/i);
+    if (std) {
+      const s = std[1].toLowerCase();
+      if (s === "aws" || s === "iso-a" || s === "iso-b") ast.standard = s;
+      else if (s === "iso") ast.standard = "iso-a";
+    }
+    const titleM = rest.replace(/standard\s*[:=]\s*[a-zA-Z-]+/i, "").trim();
+    if (titleM) ast.title = stripQuotes5(titleM);
+  }
+  const jointRe = /\bjoint\b([^{]*)\{([\s\S]*?)\}/gi;
+  for (const m of src.matchAll(jointRe)) {
+    const joint = emptyJoint();
+    const labelRaw = m[1].trim();
+    if (labelRaw) joint.label = stripQuotes5(labelRaw);
+    parseJointBody(m[2], joint);
+    ast.joints.push(joint);
+  }
+  const opens = (src.match(/\{/g) ?? []).length;
+  const closes = (src.match(/\}/g) ?? []).length;
+  const tail = opens > closes ? src.match(/\bjoint\b([^{]*)\{([^}]*)$/i) : null;
+  if (tail) {
+    const joint = emptyJoint();
+    const labelRaw = tail[1].trim();
+    if (labelRaw) joint.label = stripQuotes5(labelRaw);
+    parseJointBody(tail[2], joint);
+    ast.joints.push(joint);
+  }
+  ast.warnings = validateWelding(ast);
+  return ast;
+}
+
+// src/diagrams/welding/layout.ts
+var PAD = 22;
+var BAND_H = 132;
+var REF_X0 = 150;
+var REF_LEN = 168;
+var SYMBOL_DX = 96;
+var REF_Y_OFFSET = 60;
+var CANVAS_W = 470;
+function layoutWelding(ast) {
+  const titleH = ast.title ? 38 : 0;
+  const nJoints = Math.max(1, ast.joints.length);
+  const bandsBottom = titleH + nJoints * BAND_H;
+  const warningsY = ast.warnings.length > 0 ? bandsBottom + 6 : 0;
+  const warningsH = ast.warnings.length > 0 ? 20 + ast.warnings.length * 16 : 0;
+  return {
+    canvasWidth: CANVAS_W,
+    canvasHeight: bandsBottom + warningsH + PAD,
+    titleH,
+    bandH: BAND_H,
+    refX0: REF_X0,
+    refX1: REF_X0 + REF_LEN,
+    symbolX: REF_X0 + SYMBOL_DX,
+    refYOffset: REF_Y_OFFSET,
+    warningsY
+  };
+}
+
+// src/diagrams/welding/symbols.ts
+var W = 18;
+var H = 15;
+function pl(points, cls) {
+  return polygon({ points: points.map((p) => `${round9(p[0])},${round9(p[1])}`).join(" "), class: cls, fill: "none" });
+}
+function round9(n) {
+  return Math.round(n * 100) / 100;
+}
+function weldGlyph(type, cx, y, dir, cls) {
+  const x0 = cx - W / 2;
+  const x1 = cx + W / 2;
+  const yb = y + dir * H;
+  switch (type) {
+    case "fillet":
+      return [pl([[x0, y], [x0, yb], [x1, y]], cls)];
+    case "square":
+      return [
+        line({ x1: cx - 3, y1: y, x2: cx - 3, y2: yb, class: cls }),
+        line({ x1: cx + 3, y1: y, x2: cx + 3, y2: yb, class: cls })
+      ];
+    case "vgroove":
+      return [path({ d: `M ${round9(x0)} ${round9(yb)} L ${round9(cx)} ${round9(y)} L ${round9(x1)} ${round9(yb)}`, class: cls, fill: "none" })];
+    case "bevel":
+      return [
+        line({ x1: cx - 4, y1: y, x2: cx - 4, y2: yb, class: cls }),
+        line({ x1: cx - 4, y1: y, x2: x1, y2: yb, class: cls })
+      ];
+    case "ugroove":
+      return [
+        path({
+          d: `M ${round9(x0)} ${round9(y)} L ${round9(x0)} ${round9(y + dir * H * 0.45)} Q ${round9(x0)} ${round9(yb)} ${round9(cx)} ${round9(yb)} Q ${round9(x1)} ${round9(yb)} ${round9(x1)} ${round9(y + dir * H * 0.45)} L ${round9(x1)} ${round9(y)}`,
+          class: cls,
+          fill: "none"
+        })
+      ];
+    case "jgroove":
+      return [
+        path({
+          d: `M ${round9(cx - 4)} ${round9(y)} L ${round9(cx - 4)} ${round9(y + dir * H * 0.45)} Q ${round9(cx - 4)} ${round9(yb)} ${round9(x1)} ${round9(yb)}`,
+          class: cls,
+          fill: "none"
+        })
+      ];
+    case "flarev":
+      return [
+        path({ d: `M ${round9(x0)} ${round9(yb)} Q ${round9(cx - 2)} ${round9(yb)} ${round9(cx)} ${round9(y)}`, class: cls, fill: "none" }),
+        path({ d: `M ${round9(x1)} ${round9(yb)} Q ${round9(cx + 2)} ${round9(yb)} ${round9(cx)} ${round9(y)}`, class: cls, fill: "none" })
+      ];
+    case "flarebevel":
+      return [
+        line({ x1: cx - 4, y1: y, x2: cx - 4, y2: yb, class: cls }),
+        path({ d: `M ${round9(cx - 4)} ${round9(y)} Q ${round9(x1)} ${round9(y)} ${round9(x1)} ${round9(yb)}`, class: cls, fill: "none" })
+      ];
+    case "plug":
+    case "slot": {
+      const ry = dir > 0 ? y : y - H * 0.7;
+      return [rect({ x: x0, y: ry, width: W, height: H * 0.7, class: cls, fill: "none" })];
+    }
+    case "spot":
+      return [circle({ cx, cy: y, r: W * 0.42, class: cls, fill: "none" })];
+    case "seam":
+      return [
+        circle({ cx, cy: y, r: W * 0.42, class: cls, fill: "none" }),
+        line({ x1: cx - W * 0.42, y1: y, x2: cx + W * 0.42, y2: y, class: cls })
+      ];
+    case "back":
+    case "backing": {
+      const rr = W * 0.45;
+      const sweep = dir > 0 ? 1 : 0;
+      return [path({ d: `M ${round9(cx - rr)} ${round9(y)} A ${round9(rr)} ${round9(rr)} 0 0 ${sweep} ${round9(cx + rr)} ${round9(y)}`, class: cls, fill: "none" })];
+    }
+    case "surfacing": {
+      const r6 = W / 4;
+      const yy = y + dir * 3;
+      const bump = (off) => path({ d: `M ${round9(cx - W / 2)} ${round9(off)} a ${round9(r6)} ${round9(r6)} 0 0 ${dir > 0 ? 1 : 0} ${round9(W / 2)} 0 a ${round9(r6)} ${round9(r6)} 0 0 ${dir > 0 ? 1 : 0} ${round9(W / 2)} 0`, class: cls, fill: "none" });
+      return [bump(y), bump(yy)];
+    }
+    case "edge":
+      return [
+        line({ x1: cx - 3, y1: y, x2: cx - 3, y2: yb, class: cls }),
+        line({ x1: cx + 3, y1: y, x2: cx + 3, y2: yb, class: cls })
+      ];
+  }
+}
+function contourGlyph(contour, cx, y, dir, cls) {
+  const yy = y + dir * (H + 5);
+  const half = W / 2;
+  if (contour === "flush") {
+    return line({ x1: cx - half, y1: yy, x2: cx + half, y2: yy, class: cls });
+  }
+  const bulge = contour === "convex" ? dir : -dir;
+  return path({
+    d: `M ${round9(cx - half)} ${round9(yy)} Q ${round9(cx)} ${round9(yy + bulge * 5)} ${round9(cx + half)} ${round9(yy)}`,
+    class: cls,
+    fill: "none"
+  });
+}
+var WELD_GLYPH_W = W;
+var WELD_GLYPH_H = H;
+
+// src/diagrams/welding/renderer.ts
+var CSS = `
+.sx-welding { font-family: system-ui, -apple-system, "Segoe UI", sans-serif; }
+.sx-welding-title { font: 600 16px sans-serif; fill: #111; text-anchor: middle; }
+.sx-weld-ref { stroke: #1e3a5f; stroke-width: 1.6; fill: none; }
+.sx-weld-ref-dashed { stroke: #1e3a5f; stroke-width: 1.4; fill: none; stroke-dasharray: 5 3; }
+.sx-weld-leader { stroke: #1e3a5f; stroke-width: 1.6; fill: none; }
+.sx-weld-arrowhead { fill: #1e3a5f; }
+.sx-weld-glyph { stroke: #1d4ed8; stroke-width: 1.8; fill: none; stroke-linejoin: round; stroke-linecap: round; }
+.sx-weld-supp { stroke: #1d4ed8; stroke-width: 1.5; fill: none; }
+.sx-weld-allaround { stroke: #1e3a5f; stroke-width: 1.6; fill: none; }
+.sx-weld-flag { fill: #1e3a5f; stroke: #1e3a5f; stroke-width: 1; }
+.sx-weld-dim { font: 600 12px ui-monospace, Menlo, monospace; fill: #0f172a; }
+.sx-weld-angle { font: 600 11px ui-monospace, Menlo, monospace; fill: #475569; }
+.sx-weld-finish { font: 700 11px sans-serif; fill: #1d4ed8; text-anchor: middle; }
+.sx-weld-tailtext { font: 500 11px sans-serif; fill: #334155; text-anchor: end; dominant-baseline: central; }
+.sx-weld-label { font: 600 12.5px sans-serif; fill: #1f2937; text-anchor: middle; }
+.sx-weld-warn { font: 500 11.5px sans-serif; fill: #b45309; }
+.sx-weld-warn-head { font: 700 11.5px sans-serif; fill: #b45309; }
+`;
+function r23(n) {
+  return Math.round(n * 100) / 100;
+}
+function sizeText(spec) {
+  if (spec.size === void 0 && spec.throat === void 0) return "";
+  const parts = [];
+  if (spec.size !== void 0) parts.push(String(spec.size));
+  if (spec.throat !== void 0) parts.push(`(${spec.throat})`);
+  return parts.join(" ");
+}
+function lengthText(spec) {
+  if (spec.length === void 0) return "";
+  if (spec.pitch !== void 0) {
+    return spec.count !== void 0 ? `${spec.count}\xD7${spec.length} (${spec.pitch})` : `${spec.length}-${spec.pitch}`;
+  }
+  return String(spec.length);
+}
+function renderSide(spec, symbolX, refY, dir) {
+  const nodes = [];
+  nodes.push(...weldGlyph(spec.type, symbolX, refY, dir, "sx-weld-glyph"));
+  const midY = refY + dir * (WELD_GLYPH_H / 2);
+  const leftX = symbolX - WELD_GLYPH_W / 2;
+  const rightX = symbolX + WELD_GLYPH_W / 2;
+  const sz = sizeText(spec);
+  if (sz) {
+    nodes.push(
+      text({ x: r23(leftX - 5), y: r23(midY), class: "sx-weld-dim", "text-anchor": "end", "dominant-baseline": "central" }, sz)
+    );
+  }
+  const len = lengthText(spec);
+  if (len) {
+    nodes.push(
+      text({ x: r23(rightX + 5), y: r23(midY), class: "sx-weld-dim", "text-anchor": "start", "dominant-baseline": "central" }, len)
+    );
+  }
+  if (spec.angle !== void 0) {
+    nodes.push(
+      text({ x: r23(symbolX), y: r23(refY + dir * (WELD_GLYPH_H + 11)), class: "sx-weld-angle", "text-anchor": "middle" }, `${spec.angle}\xB0`)
+    );
+  }
+  if (spec.root !== void 0) {
+    nodes.push(
+      text({ x: r23(rightX + 5), y: r23(refY + dir * 5), class: "sx-weld-angle", "text-anchor": "start", "dominant-baseline": "central" }, `root ${spec.root}`)
+    );
+  }
+  if (spec.contour) {
+    nodes.push(contourGlyph(spec.contour, symbolX, refY, dir, "sx-weld-supp"));
+  }
+  if (spec.finish) {
+    nodes.push(
+      text({ x: r23(symbolX), y: r23(refY + dir * (WELD_GLYPH_H + 13)), class: "sx-weld-finish" }, spec.finish)
+    );
+  }
+  return nodes;
+}
+function renderJoint(joint, ast, bandTop, lay) {
+  const refY = bandTop + lay.refYOffset;
+  const { refX0, refX1, symbolX } = lay;
+  const iso = ast.standard === "iso-a";
+  const nodes = [];
+  nodes.push(line({ x1: refX0, y1: refY, x2: refX1, y2: refY, class: "sx-weld-ref" }));
+  const symmetric = iso && joint.arrow && joint.other && joint.arrow.type === joint.other.type;
+  if (iso && !symmetric) {
+    nodes.push(line({ x1: refX0, y1: refY - 6, x2: refX1, y2: refY - 6, class: "sx-weld-ref-dashed" }));
+  }
+  const lx = refX1 + 34;
+  const ly = refY + 44;
+  nodes.push(line({ x1: refX1, y1: refY, x2: lx, y2: ly, class: "sx-weld-leader" }));
+  const ah = 8;
+  const angle = Math.atan2(ly - refY, lx - refX1);
+  const a1 = angle + 2.7;
+  const a2 = angle - 2.7;
+  nodes.push(
+    polygon({
+      points: `${r23(lx)},${r23(ly)} ${r23(lx + ah * Math.cos(a1))},${r23(ly + ah * Math.sin(a1))} ${r23(lx + ah * Math.cos(a2))},${r23(ly + ah * Math.sin(a2))}`,
+      class: "sx-weld-arrowhead"
+    })
+  );
+  if (joint.arrow) {
+    nodes.push(...renderSide(joint.arrow, symbolX, refY, 1));
+  }
+  if (joint.other && !symmetric) {
+    const oy = iso ? refY - 6 : refY;
+    nodes.push(...renderSide(joint.other, symbolX, oy, -1));
+  }
+  if (joint.around) {
+    nodes.push(circle({ cx: refX1, cy: refY, r: 5, class: "sx-weld-allaround" }));
+  }
+  if (joint.field) {
+    const fx = refX1;
+    const fy = refY;
+    nodes.push(line({ x1: fx, y1: fy, x2: fx, y2: fy - 14, class: "sx-weld-flag" }));
+    nodes.push(polygon({ points: `${fx},${fy - 14} ${fx},${fy - 6} ${fx - 11},${fy - 10}`, class: "sx-weld-flag" }));
+  }
+  if (joint.tail) {
+    nodes.push(line({ x1: refX0, y1: refY, x2: refX0 - 12, y2: refY - 7, class: "sx-weld-ref" }));
+    nodes.push(line({ x1: refX0, y1: refY, x2: refX0 - 12, y2: refY + 7, class: "sx-weld-ref" }));
+    nodes.push(text({ x: refX0 - 16, y: refY, class: "sx-weld-tailtext" }, joint.tail));
+  }
+  if (joint.label) {
+    nodes.push(text({ x: symbolX, y: r23(bandTop + lay.bandH - 16), class: "sx-weld-label" }, joint.label));
+  }
+  const desc2 = describeJoint(joint);
+  return group({ class: "sx-weld-joint", "data-joint": joint.label ?? "" }, [title(desc2), ...nodes]);
+}
+function describeJoint(j) {
+  const sides = [];
+  if (j.arrow) sides.push(`arrow side: ${WELD_TYPE_NAMES[j.arrow.type]}${j.arrow.size !== void 0 ? ` size ${j.arrow.size}` : ""}`);
+  if (j.other) sides.push(`other side: ${WELD_TYPE_NAMES[j.other.type]}`);
+  const extra = [j.around ? "all-around" : "", j.field ? "field weld" : "", j.tail ? `tail ${j.tail}` : ""].filter(Boolean);
+  return `${j.label ? `${j.label} \u2014 ` : ""}${sides.join("; ")}${extra.length ? `; ${extra.join("; ")}` : ""}`;
+}
+function renderWeldingAST(ast) {
+  const lay = layoutWelding(ast);
+  const body = [];
+  if (ast.title) {
+    body.push(text({ x: lay.canvasWidth / 2, y: 26, class: "sx-welding-title" }, ast.title));
+  }
+  ast.joints.forEach((joint, i) => {
+    const bandTop = lay.titleH + i * lay.bandH;
+    body.push(renderJoint(joint, ast, bandTop, lay));
+  });
+  if (ast.joints.length === 0) {
+    body.push(
+      text({ x: lay.canvasWidth / 2, y: 70, class: "sx-weld-label" }, 'Add a joint, e.g.  joint "plate" { arrow: fillet size=8 }')
+    );
+  }
+  if (ast.warnings.length > 0) {
+    body.push(text({ x: 22, y: lay.warningsY + 14, class: "sx-weld-warn-head" }, "\u26A0 Validation:"));
+    ast.warnings.forEach((w, i) => {
+      body.push(text({ x: 22, y: lay.warningsY + 32 + i * 16, class: "sx-weld-warn" }, w));
+    });
+  }
+  return svgRoot(
+    {
+      class: "sx-welding",
+      "data-diagram-type": "welding",
+      "data-standard": ast.standard,
+      width: lay.canvasWidth,
+      height: lay.canvasHeight,
+      viewBox: `0 0 ${lay.canvasWidth} ${lay.canvasHeight}`,
+      role: "graphics-document"
+    },
+    [
+      title(ast.title ? `Welding symbols \u2014 ${escapeXml(ast.title)}` : "Welding symbols"),
+      desc(
+        `Welding-symbol diagram (${ast.standard.toUpperCase()}) \u2014 ${ast.joints.length} joint(s): ${ast.joints.map(describeJoint).join(" \xB7 ")}`
+      ),
+      defs([el("style", {}, CSS)]),
+      ...body
+    ]
+  );
+}
+function renderWelding(text2, _config) {
+  return renderWeldingAST(parseWelding(text2));
+}
+
+// src/diagrams/welding/index.ts
+var welding = {
+  type: "welding",
+  detect: (t) => /^\s*welding\b/i.test(t),
+  parse: parseWelding,
+  render(text2, config) {
+    return renderWelding(text2);
+  }
+};
+
 // src/core/diagnostics.ts
 var ENGINE_BUG_NAMES = /* @__PURE__ */ new Set([
   "ReferenceError",
@@ -27006,7 +27560,7 @@ function newAST() {
     config: { ...DEFAULT_CONFIG }
   };
 }
-function stripQuotes5(s) {
+function stripQuotes6(s) {
   const t = s.trim();
   if (t.startsWith('"') && t.endsWith('"') || t.startsWith("'") && t.endsWith("'")) {
     return t.slice(1, -1);
@@ -27042,7 +27596,7 @@ function parseAxis(raw) {
 function parseNumberList2(raw) {
   const t = raw.trim();
   const inner = t.startsWith("[") && t.endsWith("]") ? t.slice(1, -1) : t;
-  return inner.split(",").map((s) => stripQuotes5(s.trim())).filter((s) => s.length > 0);
+  return inner.split(",").map((s) => stripQuotes6(s.trim())).filter((s) => s.length > 0);
 }
 function parseProperties2(raw, point) {
   let i = 0;
@@ -27215,6 +27769,41 @@ function parseQfdLine(line2, ast) {
   }
   return false;
 }
+function parseGenotype(token) {
+  const t = token.trim();
+  if (t.length === 0 || t.length % 2 !== 0) return null;
+  const loci = [];
+  for (let i = 0; i < t.length; i += 2) {
+    const a = t[i];
+    const b = t[i + 1];
+    if (!/[A-Za-z]/.test(a) || !/[A-Za-z]/.test(b)) return null;
+    if (a.toUpperCase() !== b.toUpperCase()) return null;
+    loci.push({ letter: a.toUpperCase(), alleles: [a, b] });
+  }
+  return loci;
+}
+function parsePunnettLine(line2, st) {
+  if (!st.punnett) return false;
+  const crossMatch = line2.match(/^(?:cross|parents?)\s*:\s*(.+)$/i);
+  if (crossMatch) {
+    const parts = crossMatch[1].split(/\s*[x×*]\s*/i);
+    if (parts.length === 2) {
+      st.punnett.p1raw = parts[0].trim();
+      st.punnett.p2raw = parts[1].trim();
+    }
+    return true;
+  }
+  const traitMatch = line2.match(/^trait\s+([A-Za-z])\s*:\s*(.+)$/i);
+  if (traitMatch) {
+    const letter = traitMatch[1].toUpperCase();
+    const slash = traitMatch[2].split("/");
+    const dominant = stripQuotes6(slash[0] ?? "");
+    const recessive = slash[1] !== void 0 ? stripQuotes6(slash[1]) : void 0;
+    st.punnett.traits[letter] = { dominant, recessive };
+    return true;
+  }
+  return false;
+}
 function parseConfigLine(key, value, ast) {
   const k = key.trim().toLowerCase();
   const v = value.trim();
@@ -27242,7 +27831,7 @@ function parseHeader2(line2, ast) {
     ast.cols = Number(heatMatch[1]);
     ast.rows = Number(heatMatch[2]);
     const title2 = heatMatch[3].trim();
-    if (title2) ast.title = stripQuotes5(title2);
+    if (title2) ast.title = stripQuotes6(title2);
     return void 0;
   }
   const corrMatch = rest.match(/^correlation\s*(?:(\d+)\s*x\s*(\d+))?\s*(.*)$/i);
@@ -27254,7 +27843,7 @@ function parseHeader2(line2, ast) {
       ast.rows = Number(corrMatch[2]);
     }
     const title2 = corrMatch[3].trim();
-    if (title2) ast.title = stripQuotes5(title2);
+    if (title2) ast.title = stripQuotes6(title2);
     return void 0;
   }
   const sipocMatch = rest.match(/^sipoc\b\s*(.*)$/i);
@@ -27265,7 +27854,7 @@ function parseHeader2(line2, ast) {
     ast.rows = 0;
     ast.sipoc = emptySipoc();
     const title2 = sipocMatch[1].trim();
-    if (title2) ast.title = stripQuotes5(title2);
+    if (title2) ast.title = stripQuotes6(title2);
     return void 0;
   }
   const qfdMatch = rest.match(/^qfd\b\s*(.*)$/i);
@@ -27274,7 +27863,16 @@ function parseHeader2(line2, ast) {
     ast.grid = "NxM";
     ast.qfd = emptyQfd();
     const title2 = qfdMatch[1].trim();
-    if (title2) ast.title = stripQuotes5(title2);
+    if (title2) ast.title = stripQuotes6(title2);
+    return void 0;
+  }
+  const punnettMatch = rest.match(/^punnett\b\s*(.*)$/i);
+  if (punnettMatch) {
+    ast.mode = "punnett";
+    ast.grid = "NxM";
+    ast.punnett = { genes: [], parent1: [], parent2: [] };
+    const title2 = punnettMatch[1].trim();
+    if (title2) ast.title = stripQuotes6(title2);
     return void 0;
   }
   const tokenMatch = rest.match(/^([a-zA-Z0-9_-]+)\s*(.*)$/);
@@ -27282,13 +27880,13 @@ function parseHeader2(line2, ast) {
     const tok = tokenMatch[1].toLowerCase();
     const remainder = tokenMatch[2].trim();
     if (TEMPLATE_NAMES.has(tok)) {
-      if (remainder) ast.title = stripQuotes5(remainder);
+      if (remainder) ast.title = stripQuotes6(remainder);
       return tok;
     }
     if (rest.startsWith('"') || rest.startsWith("'")) {
-      ast.title = stripQuotes5(rest);
+      ast.title = stripQuotes6(rest);
     } else if (rest.length > 0) {
-      ast.title = stripQuotes5(rest);
+      ast.title = stripQuotes6(rest);
     }
   }
   return void 0;
@@ -27309,6 +27907,7 @@ function parseMatrix(text2) {
     }
     if (/^matrix\b/i.test(line2)) {
       templateName = parseHeader2(line2, st.ast);
+      if (st.ast.mode === "punnett" && !st.punnett) st.punnett = { traits: {} };
       continue;
     }
     if (/^config\s*:/i.test(line2)) {
@@ -27324,11 +27923,12 @@ function parseMatrix(text2) {
       inConfig = false;
     }
     if (/^title\s*:/i.test(line2)) {
-      st.ast.title = stripQuotes5(line2.replace(/^title\s*:\s*/i, ""));
+      st.ast.title = stripQuotes6(line2.replace(/^title\s*:\s*/i, ""));
       continue;
     }
     if (st.ast.mode === "sipoc" && parseSipocLine(line2, st.ast)) continue;
     if (st.ast.mode === "qfd" && parseQfdLine(line2, st.ast)) continue;
+    if (st.ast.mode === "punnett" && parsePunnettLine(line2, st)) continue;
     if (/^x-axis\s*:/i.test(line2)) {
       st.ast.xAxis = parseAxis(line2.replace(/^x-axis\s*:\s*/i, ""));
       continue;
@@ -27411,7 +28011,7 @@ function parseMatrix(text2) {
     if (qShort) {
       const q = Number(qShort[1]);
       const labelRaw = qShort[2].trim();
-      const label = stripQuotes5(labelRaw);
+      const label = stripQuotes6(labelRaw);
       const cell = quadrantToCell(q);
       st.ast.cellLabels.push({ col: cell.col, row: cell.row, label });
       continue;
@@ -27430,7 +28030,7 @@ function parseMatrix(text2) {
   if (st.ast.cols === 3 && st.ast.rows === 3 && st.ast.grid !== "NxM" && st.ast.mode !== "sipoc" && st.ast.mode !== "qfd") {
     st.ast.grid = "3x3";
   }
-  if (st.ast.mode === "heatmap" || st.ast.mode === "correlation" || st.ast.mode === "sipoc" || st.ast.mode === "qfd") {
+  if (st.ast.mode === "heatmap" || st.ast.mode === "correlation" || st.ast.mode === "sipoc" || st.ast.mode === "qfd" || st.ast.mode === "punnett") {
     st.ast.grid = "NxM";
   }
   if (st.ast.mode === "sipoc" && st.ast.sipoc) {
@@ -27448,6 +28048,31 @@ function parseMatrix(text2) {
     st.ast.cols = st.ast.qfd.hows.length;
     st.ast.rows = st.ast.qfd.whats.length;
   }
+  if (st.ast.mode === "punnett" && st.punnett && st.ast.punnett) {
+    const sc = st.punnett;
+    const loci1 = sc.p1raw ? parseGenotype(sc.p1raw) : null;
+    const loci2 = sc.p2raw ? parseGenotype(sc.p2raw) : null;
+    if (loci1 && loci2 && loci1.length > 0) {
+      const genes = loci1.map((l) => {
+        const t = sc.traits[l.letter];
+        return {
+          dominant: l.letter,
+          recessive: l.letter.toLowerCase(),
+          ...t?.dominant ? { dominantTrait: t.dominant } : {},
+          ...t?.recessive ? { recessiveTrait: t.recessive } : {}
+        };
+      });
+      const parent1 = loci1.map((l) => [l.alleles[0], l.alleles[1]]);
+      const parent2 = genes.map((g) => {
+        const found = loci2.find((l) => l.letter === g.dominant);
+        return found ? [found.alleles[0], found.alleles[1]] : [g.dominant, g.recessive];
+      });
+      st.ast.punnett = { genes, parent1, parent2 };
+      const dim = Math.pow(2, genes.length);
+      st.ast.cols = dim;
+      st.ast.rows = dim;
+    }
+  }
   return st.ast;
 }
 function findCommentStart(line2) {
@@ -27466,6 +28091,82 @@ function findCommentStart(line2) {
 }
 
 // src/diagrams/matrix/types.ts
+function gametesOf(parent) {
+  let acc = [""];
+  for (const pair of parent) {
+    const a0 = pair[0] ?? "";
+    const a1 = pair[1] ?? a0;
+    const next = [];
+    for (const g of acc) {
+      next.push(g + a0);
+      next.push(g + a1);
+    }
+    acc = next;
+  }
+  return acc;
+}
+function combineGametes(g1, g2, genes) {
+  let genotype = "";
+  let phenotypeKey = "";
+  for (let i = 0; i < genes.length; i++) {
+    const dom = genes[i].dominant;
+    const rec = genes[i].recessive;
+    const a = g1[i] ?? rec;
+    const b = g2[i] ?? rec;
+    const hasDom = a === dom || b === dom;
+    const pair = a === dom ? [a, b] : b === dom ? [b, a] : [a, b];
+    genotype += pair.join("");
+    phenotypeKey += hasDom ? dom : rec;
+  }
+  return { genotype, phenotypeKey };
+}
+function phenotypeLabel(key, genes) {
+  const parts = [];
+  for (let i = 0; i < genes.length; i++) {
+    const ch = key[i];
+    const g = genes[i];
+    if (ch === g.dominant) parts.push(g.dominantTrait ?? `${g.dominant}_`);
+    else parts.push(g.recessiveTrait ?? `${g.recessive}${g.recessive}`);
+  }
+  return parts.join(", ");
+}
+function computePunnett(data) {
+  const genes = data.genes;
+  const gametes1 = gametesOf(data.parent1);
+  const gametes2 = gametesOf(data.parent2);
+  const grid = [];
+  const genoCount = /* @__PURE__ */ new Map();
+  const phenoCount = /* @__PURE__ */ new Map();
+  for (const g2 of gametes2) {
+    const row = [];
+    for (const g1 of gametes1) {
+      const cell = combineGametes(g1, g2, genes);
+      row.push(cell);
+      genoCount.set(cell.genotype, (genoCount.get(cell.genotype) ?? 0) + 1);
+      phenoCount.set(cell.phenotypeKey, (phenoCount.get(cell.phenotypeKey) ?? 0) + 1);
+    }
+    grid.push(row);
+  }
+  const genotypeRatio = [...genoCount.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([genotype, count]) => ({ key: genotype, label: genotype, count }));
+  const phenotypeRatio = [...phenoCount.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([key, count]) => ({ key, label: phenotypeLabel(key, genes), count }));
+  return { gametes1, gametes2, grid, genotypeRatio, phenotypeRatio };
+}
+function gcd(a, b) {
+  return b === 0 ? a : gcd(b, a % b);
+}
+function reduceRatio(counts) {
+  const divisor = counts.reduce((acc, c) => gcd(acc, c), 0) || 1;
+  return counts.map((c) => c / divisor).join(":");
+}
+function punnettFooter(result) {
+  const enumerate = result.genotypeRatio.length <= 4;
+  return {
+    phenotypeRatio: reduceRatio(result.phenotypeRatio.map((p) => p.count)),
+    legend: result.phenotypeRatio,
+    genotypeRatio: reduceRatio(result.genotypeRatio.map((e) => e.count)),
+    genotypeDetail: enumerate ? result.genotypeRatio.map((e) => `${e.count} ${e.label}`).join(", ") : `${result.genotypeRatio.length} distinct genotypes`
+  };
+}
 function computeQfdImportance(qfd) {
   const raw = qfd.hows.map(() => 0);
   for (const r6 of qfd.relationships) {
@@ -27483,7 +28184,7 @@ function computeQfdImportance(qfd) {
 }
 
 // src/diagrams/matrix/layout.ts
-var CANVAS_W = 720;
+var CANVAS_W2 = 720;
 var CANVAS_H = 560;
 var PADDING_X = 110;
 var PADDING_Y = 90;
@@ -27542,21 +28243,21 @@ function resolveLabelCollisions(points, plot, mode) {
     }
     return;
   }
-  const PAD = 3;
+  const PAD2 = 3;
   for (let iter = 0; iter < 30; iter++) {
     let moved = false;
     for (let i = 0; i < points.length; i++) {
       for (let j = i + 1; j < points.length; j++) {
         const a = points[i].label;
         const b = points[j].label;
-        const ax0 = a.lx - a.width / 2 - PAD;
-        const ax1 = a.lx + a.width / 2 + PAD;
-        const ay0 = a.ly - a.height / 2 - PAD;
-        const ay1 = a.ly + a.height / 2 + PAD;
-        const bx0 = b.lx - b.width / 2 - PAD;
-        const bx1 = b.lx + b.width / 2 + PAD;
-        const by0 = b.ly - b.height / 2 - PAD;
-        const by1 = b.ly + b.height / 2 + PAD;
+        const ax0 = a.lx - a.width / 2 - PAD2;
+        const ax1 = a.lx + a.width / 2 + PAD2;
+        const ay0 = a.ly - a.height / 2 - PAD2;
+        const ay1 = a.ly + a.height / 2 + PAD2;
+        const bx0 = b.lx - b.width / 2 - PAD2;
+        const bx1 = b.lx + b.width / 2 + PAD2;
+        const by0 = b.ly - b.height / 2 - PAD2;
+        const by1 = b.ly + b.height / 2 + PAD2;
         const overlapX = Math.min(ax1, bx1) - Math.max(ax0, bx0);
         const overlapY = Math.min(ay1, by1) - Math.max(ay0, by0);
         if (overlapX > 0 && overlapY > 0) {
@@ -27650,8 +28351,51 @@ function layoutQfd(ast) {
     footerH
   };
 }
+var PUNNETT_PAD = 24;
+function layoutPunnett(ast) {
+  const pd = ast.punnett;
+  const genes = pd?.genes ?? [];
+  const g = Math.max(1, genes.length);
+  const dim = Math.pow(2, g);
+  const genoChars = g * 2;
+  const cell = Math.max(52, genoChars * 11 + 18);
+  const titleH = ast.title ? 40 : 0;
+  const x0 = PUNNETT_PAD;
+  const y0 = PUNNETT_PAD + titleH;
+  const gridRight = x0 + cell + dim * cell;
+  const gridBottom = y0 + cell + dim * cell;
+  const result = pd && genes.length > 0 ? computePunnett(pd) : null;
+  const phenoLines = result ? Math.max(1, result.phenotypeRatio.length) : 1;
+  const footerY = gridBottom + 18;
+  const footerH = 30 + phenoLines * 22 + 26;
+  let footerW = 0;
+  if (result) {
+    const f = punnettFooter(result);
+    const longest = Math.max(
+      `Phenotype ratio  ${f.phenotypeRatio}`.length,
+      `Genotype ratio  ${f.genotypeRatio}  \u2014  ${f.genotypeDetail}`.length,
+      ...f.legend.map((p) => `${p.count} \xD7 ${p.label}`.length + 4)
+    );
+    footerW = x0 + longest * 6.7 + PUNNETT_PAD;
+  }
+  const canvasWidth = Math.max(gridRight + PUNNETT_PAD, footerW, 360);
+  const canvasHeight = footerY + footerH + PUNNETT_PAD;
+  return {
+    canvasWidth,
+    canvasHeight,
+    x0,
+    y0,
+    headerW: cell,
+    headerH: cell,
+    cellW: cell,
+    cellH: cell,
+    dim,
+    footerY,
+    footerH
+  };
+}
 function layoutMatrix(ast) {
-  const canvasWidth = CANVAS_W;
+  const canvasWidth = CANVAS_W2;
   const canvasHeight = CANVAS_H;
   const plot = {
     x0: PADDING_X,
@@ -27722,7 +28466,7 @@ var HEAT_RAMP = [
   "#ef4444",
   "#b91c1c"
 ];
-var CSS = `
+var CSS2 = `
 .sx-matrix { font-family: system-ui, -apple-system, "Segoe UI", sans-serif; }
 .sx-matrix-title { font: 600 16px sans-serif; fill: #111; }
 .sx-matrix-grid { stroke: #e5e7eb; stroke-width: 1; fill: none; }
@@ -27778,6 +28522,18 @@ var CSS = `
 .sx-qfd-imp-value { font: 700 13px sans-serif; fill: #1e3a8a; text-anchor: middle; dominant-baseline: central; }
 .sx-qfd-imp-value-top { font: 800 14px sans-serif; fill: #dc2626; text-anchor: middle; dominant-baseline: central; }
 .sx-qfd-dir { font: 700 13px sans-serif; fill: #475569; text-anchor: middle; dominant-baseline: central; }
+.sx-punnett-corner { fill: #f1f5f9; stroke: #94a3b8; stroke-width: 1; }
+.sx-punnett-cornerline { stroke: #cbd5e1; stroke-width: 1; }
+.sx-punnett-corner-p1 { font: 600 11px sans-serif; fill: #1e3a8a; dominant-baseline: hanging; }
+.sx-punnett-corner-p2 { font: 600 11px sans-serif; fill: #1e3a8a; }
+.sx-punnett-header { fill: #e2e8f0; stroke: #94a3b8; stroke-width: 1; }
+.sx-punnett-gamete { font: 700 14px ui-monospace, "SF Mono", Menlo, monospace; fill: #0f172a; text-anchor: middle; dominant-baseline: central; }
+.sx-punnett-cell { stroke: #94a3b8; stroke-width: 1; }
+.sx-punnett-genotype { font: 700 15px ui-monospace, "SF Mono", Menlo, monospace; fill: #0f172a; text-anchor: middle; dominant-baseline: central; }
+.sx-punnett-footer-head { font: 700 13px sans-serif; fill: #111; }
+.sx-punnett-legend { font: 500 12.5px sans-serif; fill: #1f2937; dominant-baseline: central; }
+.sx-punnett-geno-ratio { font: 500 12px sans-serif; fill: #475569; }
+.sx-punnett-hint { font: 500 13px sans-serif; fill: #64748b; text-anchor: middle; }
 `.trim();
 function axisArrow() {
   return el(
@@ -28437,8 +29193,8 @@ function renderPoints(ast, lay) {
   }
   return group({ id: "sx-matrix-points" }, nodes);
 }
-function renderOnePoint(pl, categories) {
-  const p = pl.point;
+function renderOnePoint(pl2, categories) {
+  const p = pl2.point;
   const color = bubbleFill(p, categories);
   const shape = p.shape ?? "circle";
   let shapeEl;
@@ -28447,9 +29203,9 @@ function renderOnePoint(pl, categories) {
   const fillOpacity = p.size !== void 0 ? 0.45 : 0.75;
   if (shape === "circle") {
     shapeEl = circle({
-      cx: pl.px,
-      cy: pl.py,
-      r: pl.r,
+      cx: pl2.px,
+      cy: pl2.py,
+      r: pl2.r,
       fill: color,
       "fill-opacity": fillOpacity,
       stroke,
@@ -28458,10 +29214,10 @@ function renderOnePoint(pl, categories) {
     });
   } else if (shape === "square") {
     shapeEl = rect({
-      x: pl.px - pl.r,
-      y: pl.py - pl.r,
-      width: pl.r * 2,
-      height: pl.r * 2,
+      x: pl2.px - pl2.r,
+      y: pl2.py - pl2.r,
+      width: pl2.r * 2,
+      height: pl2.r * 2,
       fill: color,
       "fill-opacity": fillOpacity,
       stroke,
@@ -28469,9 +29225,9 @@ function renderOnePoint(pl, categories) {
       class: "sx-matrix-bubble"
     });
   } else if (shape === "diamond") {
-    const r6 = pl.r;
+    const r6 = pl2.r;
     shapeEl = polygon({
-      points: `${pl.px},${pl.py - r6} ${pl.px + r6},${pl.py} ${pl.px},${pl.py + r6} ${pl.px - r6},${pl.py}`,
+      points: `${pl2.px},${pl2.py - r6} ${pl2.px + r6},${pl2.py} ${pl2.px},${pl2.py + r6} ${pl2.px - r6},${pl2.py}`,
       fill: color,
       "fill-opacity": fillOpacity,
       stroke,
@@ -28479,9 +29235,9 @@ function renderOnePoint(pl, categories) {
       class: "sx-matrix-bubble"
     });
   } else {
-    const r6 = pl.r;
+    const r6 = pl2.r;
     shapeEl = polygon({
-      points: `${pl.px},${pl.py - r6} ${pl.px + r6},${pl.py + r6 * 0.8} ${pl.px - r6},${pl.py + r6 * 0.8}`,
+      points: `${pl2.px},${pl2.py - r6} ${pl2.px + r6},${pl2.py + r6 * 0.8} ${pl2.px - r6},${pl2.py + r6 * 0.8}`,
       fill: color,
       "fill-opacity": fillOpacity,
       stroke,
@@ -28489,23 +29245,23 @@ function renderOnePoint(pl, categories) {
       class: "sx-matrix-bubble"
     });
   }
-  const leader = pl.label.external ? line({
-    x1: pl.px,
-    y1: pl.py,
-    x2: pl.label.lx,
-    y2: pl.label.ly,
+  const leader = pl2.label.external ? line({
+    x1: pl2.px,
+    y1: pl2.py,
+    x2: pl2.label.lx,
+    y2: pl2.label.ly,
     class: "sx-matrix-leader"
   }) : "";
   const label = text(
-    { x: pl.label.lx, y: pl.label.ly, class: "sx-matrix-label" },
-    pl.label.text
+    { x: pl2.label.lx, y: pl2.label.ly, class: "sx-matrix-label" },
+    pl2.label.text
   );
   let badge = "";
   if (p.offChart) {
-    const bx = pl.px;
-    const by = pl.py;
+    const bx = pl2.px;
+    const by = pl2.py;
     badge = text(
-      { x: bx + pl.r + 4, y: by - pl.r - 2, class: "sx-matrix-offchart", "font-size": 14, "font-weight": 700 },
+      { x: bx + pl2.r + 4, y: by - pl2.r - 2, class: "sx-matrix-offchart", "font-size": 14, "font-weight": 700 },
       "\u2197"
     );
   }
@@ -28660,7 +29416,7 @@ function renderSipocAST(ast) {
       desc(
         `SIPOC scoping table \u2014 ${sipoc.suppliers.length} supplier(s), ${sipoc.inputs.length} input(s), ${sipoc.process.length} process step(s), ${sipoc.outputs.length} output(s), ${sipoc.customers.length} customer(s)`
       ),
-      defs([el("style", {}, CSS)]),
+      defs([el("style", {}, CSS2)]),
       ...nodes
     ]
   );
@@ -28889,14 +29645,135 @@ function renderQfdAST(ast) {
       desc(
         `QFD House of Quality \u2014 ${qfd.whats.length} customer requirement(s), ${qfd.hows.length} engineering characteristic(s), ${qfd.relationships.length} relationship(s); technical importance computed per column`
       ),
-      defs([el("style", {}, CSS)]),
+      defs([el("style", {}, CSS2)]),
       ...nodes
     ]
   );
 }
+var PUNNETT_TINTS = ["#dbeafe", "#dcfce7", "#fef9c3", "#fed7aa", "#fae8ff", "#cffafe", "#fee2e2", "#e0e7ff"];
+var PUNNETT_STRONG = ["#2563eb", "#16a34a", "#ca8a04", "#ea580c", "#9333ea", "#0891b2", "#dc2626", "#4f46e5"];
+function genotypeText(parent, genes) {
+  return parent.map((pair, i) => {
+    const dom = genes[i]?.dominant;
+    const [a, b] = [pair[0] ?? "", pair[1] ?? ""];
+    return a === dom ? a + b : b === dom ? b + a : a + b;
+  }).join("");
+}
+function renderPunnettAST(ast) {
+  const pd = ast.punnett;
+  const lay = layoutPunnett(ast);
+  const svgWrap = (body, descText2) => svgRoot(
+    {
+      class: "sx-matrix sx-punnett",
+      "data-diagram-type": "matrix",
+      "data-mode": "punnett",
+      width: lay.canvasWidth,
+      height: lay.canvasHeight,
+      viewBox: `0 0 ${lay.canvasWidth} ${lay.canvasHeight}`,
+      role: "graphics-document"
+    },
+    [
+      title(ast.title ? `Punnett square \u2014 ${escapeXml(ast.title)}` : "Punnett square"),
+      desc(descText2),
+      defs([el("style", {}, CSS2)]),
+      ...body
+    ]
+  );
+  if (!pd || pd.genes.length === 0) {
+    return svgWrap(
+      [
+        text(
+          { x: lay.canvasWidth / 2, y: 44, class: "sx-matrix-title", "text-anchor": "middle" },
+          ast.title ?? "Punnett square"
+        ),
+        text({ x: lay.canvasWidth / 2, y: 84, class: "sx-punnett-hint" }, "Add a cross, e.g.  cross: Bb x Bb")
+      ],
+      "Empty Punnett square \u2014 no cross specified"
+    );
+  }
+  const result = computePunnett(pd);
+  const phenoColor = /* @__PURE__ */ new Map();
+  result.phenotypeRatio.forEach((p, i) => {
+    phenoColor.set(p.key, {
+      tint: PUNNETT_TINTS[i % PUNNETT_TINTS.length],
+      strong: PUNNETT_STRONG[i % PUNNETT_STRONG.length]
+    });
+  });
+  const nodes = [];
+  if (ast.title) {
+    nodes.push(
+      text(
+        { x: lay.canvasWidth / 2, y: 24, class: "sx-matrix-title", "text-anchor": "middle" },
+        ast.title
+      )
+    );
+  }
+  const gx0 = lay.x0 + lay.headerW;
+  const gy0 = lay.y0 + lay.headerH;
+  nodes.push(rect({ x: lay.x0, y: lay.y0, width: lay.headerW, height: lay.headerH, class: "sx-punnett-corner" }));
+  nodes.push(
+    line({ x1: lay.x0, y1: lay.y0, x2: lay.x0 + lay.headerW, y2: lay.y0 + lay.headerH, class: "sx-punnett-cornerline" })
+  );
+  nodes.push(
+    text(
+      { x: lay.x0 + lay.headerW - 6, y: lay.y0 + 8, class: "sx-punnett-corner-p1", "text-anchor": "end" },
+      genotypeText(pd.parent1, pd.genes)
+    )
+  );
+  nodes.push(
+    text(
+      { x: lay.x0 + 6, y: lay.y0 + lay.headerH - 8, class: "sx-punnett-corner-p2", "text-anchor": "start" },
+      genotypeText(pd.parent2, pd.genes)
+    )
+  );
+  result.gametes1.forEach((g, c) => {
+    const cx = gx0 + c * lay.cellW;
+    nodes.push(rect({ x: cx, y: lay.y0, width: lay.cellW, height: lay.headerH, class: "sx-punnett-header" }));
+    nodes.push(text({ x: cx + lay.cellW / 2, y: lay.y0 + lay.headerH / 2, class: "sx-punnett-gamete" }, g));
+  });
+  result.gametes2.forEach((g, r6) => {
+    const cy = gy0 + r6 * lay.cellH;
+    nodes.push(rect({ x: lay.x0, y: cy, width: lay.headerW, height: lay.cellH, class: "sx-punnett-header" }));
+    nodes.push(text({ x: lay.x0 + lay.headerW / 2, y: cy + lay.cellH / 2, class: "sx-punnett-gamete" }, g));
+  });
+  for (let r6 = 0; r6 < result.grid.length; r6++) {
+    const row = result.grid[r6];
+    for (let c = 0; c < row.length; c++) {
+      const cell = row[c];
+      const color = phenoColor.get(cell.phenotypeKey);
+      const cx = gx0 + c * lay.cellW;
+      const cy = gy0 + r6 * lay.cellH;
+      nodes.push(rect({ x: cx, y: cy, width: lay.cellW, height: lay.cellH, fill: color.tint, class: "sx-punnett-cell" }));
+      nodes.push(text({ x: cx + lay.cellW / 2, y: cy + lay.cellH / 2, class: "sx-punnett-genotype" }, cell.genotype));
+    }
+  }
+  const footer = punnettFooter(result);
+  let fy = lay.footerY + 18;
+  nodes.push(
+    text({ x: lay.x0, y: fy, class: "sx-punnett-footer-head" }, `Phenotype ratio  ${footer.phenotypeRatio}`)
+  );
+  fy += 22;
+  for (const p of footer.legend) {
+    const color = phenoColor.get(p.key);
+    nodes.push(
+      rect({ x: lay.x0, y: fy - 8, width: 14, height: 14, fill: color.tint, stroke: color.strong, "stroke-width": 1.4 })
+    );
+    nodes.push(text({ x: lay.x0 + 22, y: fy, class: "sx-punnett-legend" }, `${p.count} \xD7 ${p.label}`));
+    fy += 22;
+  }
+  nodes.push(
+    text(
+      { x: lay.x0, y: fy + 4, class: "sx-punnett-geno-ratio" },
+      `Genotype ratio  ${footer.genotypeRatio}  \u2014  ${footer.genotypeDetail}`
+    )
+  );
+  const descText = `Punnett square \u2014 ${pd.genes.length === 1 ? "monohybrid" : pd.genes.length === 2 ? "dihybrid" : `${pd.genes.length}-gene`} cross ${genotypeText(pd.parent1, pd.genes)} \xD7 ${genotypeText(pd.parent2, pd.genes)}; phenotype ratio ${footer.phenotypeRatio}`;
+  return svgWrap(nodes, descText);
+}
 function renderMatrixAST(ast) {
   if (ast.mode === "sipoc") return renderSipocAST(ast);
   if (ast.mode === "qfd") return renderQfdAST(ast);
+  if (ast.mode === "punnett") return renderPunnettAST(ast);
   const lay = layoutMatrix(ast);
   const needsLegendSpace = lay.categories.length > 0 || ast.mode === "correlation";
   const extraWidth = needsLegendSpace && lay.plot.x0 + lay.plot.w + 140 > lay.canvasWidth ? 160 : 0;
@@ -28930,7 +29807,7 @@ function renderMatrixAST(ast) {
       desc(
         `Matrix diagram${ast.template ? ` (${ast.template} template)` : ""}, ${ast.mode} mode, ${ast.points.length} point(s)`
       ),
-      defs([el("style", {}, CSS), axisArrow()]),
+      defs([el("style", {}, CSS2), axisArrow()]),
       ...body
     ]
   );
@@ -28962,7 +29839,7 @@ var ErdParseError = class extends Error {
   }
   lineNumber;
 };
-function stripComment13(s) {
+function stripComment14(s) {
   let out = "";
   let inQuote = false;
   for (let i = 0; i < s.length; i++) {
@@ -29016,7 +29893,7 @@ function parseCardToken(raw, side) {
 }
 function lex(text2) {
   return text2.split(/\r?\n/).map((raw, i) => ({
-    text: stripComment13(raw).trim(),
+    text: stripComment14(raw).trim(),
     lineNumber: i + 1
   })).filter((l) => l.text.length > 0);
 }
@@ -30143,7 +31020,7 @@ var BreadboardParseError = class extends Error {
   }
   lineNumber;
 };
-function stripComment14(s) {
+function stripComment15(s) {
   let out = "";
   let inQuote = false;
   for (let i = 0; i < s.length; i++) {
@@ -30164,7 +31041,7 @@ function unquote8(v) {
 }
 function lex2(text2) {
   return text2.split(/\r?\n/).map((raw, i) => ({
-    text: stripComment14(raw).trimEnd().replace(/^\s+/, ""),
+    text: stripComment15(raw).trimEnd().replace(/^\s+/, ""),
     lineNumber: i + 1
   })).filter((l) => l.text.length > 0);
 }
@@ -30505,9 +31382,9 @@ function resistorBands(value) {
   const s = String(value).replace(/[^\d.kKmMrRΩ]/g, "");
   const m = s.match(/^([\d.]+)\s*([kKmM]?)/);
   if (!m) return ["#92400e", "#92400e", "#1f2937", "#facc15"];
-  const num3 = parseFloat(m[1]);
+  const num4 = parseFloat(m[1]);
   const mult = m[2] === "k" || m[2] === "K" ? 1e3 : m[2] === "m" || m[2] === "M" ? 1e6 : 1;
-  const ohms = Math.round(num3 * mult);
+  const ohms = Math.round(num4 * mult);
   if (!Number.isFinite(ohms) || ohms <= 0) return ["#92400e", "#92400e", "#1f2937", "#facc15"];
   const str = String(ohms);
   if (str.length <= 1) return [BAND_COLORS["0"], BAND_COLORS[str[0]], BAND_COLORS["0"], "#facc15"];
@@ -32178,7 +33055,7 @@ function renderBpmnLayout(layout, _config) {
   out.push(title(ast.title ?? "BPMN diagram"));
   out.push(desc(`BPMN ${ast.direction} \u2014 ${ast.pools.length} pool(s), ${layout.objects.length} flow object(s).`));
   out.push(buildDefs());
-  for (const pl of layout.pools) out.push(renderPool(pl));
+  for (const pl2 of layout.pools) out.push(renderPool(pl2));
   for (const lan of layout.lanes) {
     out.push(
       group({ class: "schematex-bpmn-lane" }, [
@@ -32288,25 +33165,25 @@ function buildDefs() {
     )
   ]);
 }
-function renderPool(pl) {
-  const labelCx = pl.labelX + pl.labelWidth / 2;
-  const labelCy = pl.labelY + pl.height / 2;
-  if (pl.pool.blackbox) {
+function renderPool(pl2) {
+  const labelCx = pl2.labelX + pl2.labelWidth / 2;
+  const labelCy = pl2.labelY + pl2.height / 2;
+  if (pl2.pool.blackbox) {
     return group({ class: "schematex-bpmn-pool blackbox" }, [
       rect({
-        x: pl.x,
-        y: pl.y,
-        width: pl.width,
-        height: pl.height,
+        x: pl2.x,
+        y: pl2.y,
+        width: pl2.width,
+        height: pl2.height,
         fill: POOL_FILL,
         stroke: STROKE,
         "stroke-width": 1.5
       }),
       rect({
-        x: pl.x,
-        y: pl.y,
-        width: pl.labelWidth,
-        height: pl.height,
+        x: pl2.x,
+        y: pl2.y,
+        width: pl2.labelWidth,
+        height: pl2.height,
         fill: LABEL_BAND_FILL,
         stroke: STROKE,
         "stroke-width": 1
@@ -32323,25 +33200,25 @@ function renderPool(pl) {
           "font-weight": "bold",
           fill: STROKE
         },
-        pl.pool.label
+        pl2.pool.label
       )
     ]);
   }
   return group({ class: "schematex-bpmn-pool" }, [
     rect({
-      x: pl.x,
-      y: pl.y,
-      width: pl.width,
-      height: pl.height,
+      x: pl2.x,
+      y: pl2.y,
+      width: pl2.width,
+      height: pl2.height,
       fill: POOL_FILL,
       stroke: STROKE,
       "stroke-width": 1.5
     }),
     rect({
-      x: pl.x,
-      y: pl.y,
-      width: pl.labelWidth,
-      height: pl.height,
+      x: pl2.x,
+      y: pl2.y,
+      width: pl2.labelWidth,
+      height: pl2.height,
       fill: LABEL_BAND_FILL,
       stroke: STROKE,
       "stroke-width": 1
@@ -32358,7 +33235,7 @@ function renderPool(pl) {
         "font-weight": "bold",
         fill: STROKE
       },
-      pl.pool.label
+      pl2.pool.label
     )
   ]);
 }
@@ -35090,7 +35967,8 @@ var plugins = [
   gitgraph,
   epc,
   idef0,
-  threatmodel
+  threatmodel,
+  welding
 ];
 function detectPlugin(text2, config) {
   if (config?.type) {
@@ -35238,6 +36116,6 @@ function renderWithPlugin(prepared, plugin, config) {
   return plugin.render(prepared, renderConfig);
 }
 
-export { GEOMETRY, bowtie2 as bowtie, causalloop, decisiontree, drawDeviceIcon, epc, eventtree, faulttree, fmea, gitgraph, iconSize, idef0, markov, network, parse, parseResult, pert, petri, pid, prisma, render, renderEquip, renderPreview, renderResult, sequence, state, threatmodel, timeline, umlclass, usecase };
-//# sourceMappingURL=chunk-XI5QP7LM.js.map
-//# sourceMappingURL=chunk-XI5QP7LM.js.map
+export { GEOMETRY, bowtie2 as bowtie, causalloop, decisiontree, drawDeviceIcon, epc, eventtree, faulttree, fmea, gitgraph, iconSize, idef0, markov, network, parse, parseResult, pert, petri, pid, prisma, render, renderEquip, renderPreview, renderResult, sequence, state, threatmodel, timeline, umlclass, usecase, welding };
+//# sourceMappingURL=chunk-LM5X7ZNR.js.map
+//# sourceMappingURL=chunk-LM5X7ZNR.js.map