@knowvah/dot-engine 2.6.9 → 2.6.10

package/dist/index.js

@@ -9431,250 +9431,35 @@ function underlineDraw(ring, coord, filled, ctx) {
   renderShapePolyline([ring[2], ring[3]], coord, ctx);
 }
 
-// src/common/multicolor.ts
-var EPS = 1e-5;
-function aeq0(x) {
-  return x < EPS && x > -EPS;
-}
-function getSegLen(token) {
-  const semi = token.indexOf(";");
-  if (semi === -1) return { color: token, v: 0 };
-  const color = token.slice(0, semi);
-  const rest = token.slice(semi + 1);
-  if (rest.length === 0) return { color, v: -1 };
-  const parsed = parseFloat(rest);
-  return !isNaN(parsed) && parsed >= 0 ? { color, v: parsed } : { color, v: -1 };
-}
-function appendSeg(token, left2, segs, warnedExceeded) {
-  const { color, v } = getSegLen(token);
-  if (v < 0) return null;
-  let t = v;
-  let rval = 0;
-  const del = t - left2;
-  if (del > 0) {
-    if (!aeq0(del) && !warnedExceeded.v) {
-      warnedExceeded.v = true;
-      rval = 3;
-    }
-    t = left2;
-  }
-  left2 -= t;
-  segs.push({ color: color.length > 0 ? color : null, t, hasFraction: t > 0 && v > 0 });
-  return { left: left2, rval };
-}
-function distributeLeft(segs, left2) {
-  if (left2 <= 0) return;
-  const zeroCount = segs.filter((s) => s.t <= 0).length;
-  if (zeroCount > 0) {
-    const delta2 = left2 / zeroCount;
-    for (const s of segs) {
-      if (s.t <= 0) s.t = delta2;
-    }
-  } else if (segs.length > 0) {
-    segs[segs.length - 1].t += left2;
-  }
-}
-function trimTrailing(segs) {
-  while (segs.length > 0 && (segs[segs.length - 1]?.t ?? 0) <= 0) {
-    segs.pop();
-  }
-}
-function parseSegs(colorlist) {
-  const segs = [];
-  let left2 = 1;
-  let rval = 0;
-  let badFloatCount = 0;
-  const warnedExceeded = { v: false };
-  for (const token of colorlist.split(":")) {
-    const result = appendSeg(token, left2, segs, warnedExceeded);
-    if (result === null) {
-      const errCode = badFloatCount === 0 ? 2 : 1;
-      badFloatCount++;
-      return { segs: [], error: errCode };
-    }
-    if (result.rval === 3) rval = 3;
-    left2 = result.left;
-    if (aeq0(left2)) {
-      left2 = 0;
-      break;
-    }
-  }
-  distributeLeft(segs, left2);
-  trimTrailing(segs);
-  return { segs, error: rval };
-}
-
-// src/common/style-resolve.ts
-var DEFAULT_COLOR = "black";
-var DEFAULT_FILL = "lightgrey";
-var PENWIDTH_BOLD = 2;
-var TOKEN_FLAG = {
-  filled: "filled",
-  dashed: "dashed",
-  dotted: "dotted",
-  bold: "bold",
-  invis: "invis",
-  diagonals: "diagonals",
-  rounded: "rounded",
-  striped: "striped",
-  wedged: "wedged",
-  underline: "underline"
-};
-function zeroFlags() {
-  return {
-    filled: false,
-    dashed: false,
-    dotted: false,
-    bold: false,
-    invis: false,
-    diagonals: false,
-    rounded: false,
-    radial: false,
-    striped: false,
-    wedged: false,
-    underline: false,
-    setLineWidth: null
-  };
-}
-var FUNLIMIT = 64;
-function styleTokens(style2) {
-  if (!style2) return [];
-  const out = [];
-  let fun = 0;
-  for (const raw of style2.split(",")) {
-    const token = raw.trim();
-    if (token.length === 0) continue;
-    if (fun === FUNLIMIT - 1) return [];
-    fun++;
-    out.push(token);
-  }
-  return out;
-}
-function parseSetLineWidth(token) {
-  const m = /^setlinewidth\s*\(\s*([^)]*)\)\s*$/.exec(token);
-  if (m === null) return null;
-  const v = parseFloat(m[1]);
-  return Number.isNaN(v) ? 0 : v;
-}
-function applyToken(flags, token) {
-  if (token === "radial") {
-    flags.radial = true;
-    flags.filled = true;
-    return;
-  }
-  const key = TOKEN_FLAG[token];
-  if (key !== void 0) flags[key] = true;
-}
-function nonEmpty(s) {
-  return s !== void 0 && s.length > 0;
-}
-function orElse(s, fallback) {
-  return nonEmpty(s) ? s : fallback;
-}
-function firstSolidColor(raw) {
-  const grad = parseGradientSpec(raw);
-  return grad !== null ? grad[0] : raw;
-}
-function parseStyleFlags(style2) {
-  const flags = zeroFlags();
-  if (!style2) return flags;
-  let fun = 0;
-  for (const raw of style2.split(",")) {
-    const token = raw.trim();
-    if (token.length === 0) continue;
-    if (fun === FUNLIMIT - 1) return zeroFlags();
-    fun++;
-    const lw = parseSetLineWidth(token);
-    if (lw !== null) {
-      flags.setLineWidth = lw;
-      continue;
+// src/common/htmltable-style.ts
+function htmlStyle(style2) {
+  const s = { radial: false, rounded: false, invisible: false, dotted: false, dashed: false };
+  if (style2 === void 0) return s;
+  for (const tk of style2.split(/[ ,]+/)) {
+    switch (tk.toUpperCase()) {
+      case "ROUNDED":
+        s.rounded = true;
+        break;
+      case "RADIAL":
+        s.radial = true;
+        break;
+      case "SOLID":
+        s.dotted = false;
+        s.dashed = false;
+        break;
+      case "INVISIBLE":
+      case "INVIS":
+        s.invisible = true;
+        break;
+      case "DOTTED":
+        s.dotted = true;
+        break;
+      case "DASHED":
+        s.dashed = true;
+        break;
     }
-    if (!token.includes("(")) applyToken(flags, token);
   }
-  return flags;
-}
-function styleHasInvisibleAlias(style2) {
-  if (!style2) return false;
-  let fun = 0;
-  for (const raw of style2.split(",")) {
-    const token = raw.trim();
-    if (token.length === 0) continue;
-    if (fun === FUNLIMIT - 1) return false;
-    fun++;
-    if (token === "invisible") return true;
-  }
-  return false;
-}
-function resolvePenType(flags) {
-  if (flags.invis) return 0 /* None */;
-  if (flags.dashed) return 1 /* Dashed */;
-  if (flags.dotted) return 2 /* Dotted */;
-  return 3 /* Solid */;
-}
-function resolvePenWidth(flags, penwidthAttr) {
-  if (penwidthAttr && penwidthAttr.length > 0) {
-    const v = parseFloat(penwidthAttr);
-    if (isFinite(v)) return v;
-  }
-  if (flags.setLineWidth !== null) return flags.setLineWidth;
-  if (flags.bold) return PENWIDTH_BOLD;
-  return 1;
-}
-function resolvePenColor(colorAttr) {
-  if (!colorAttr || colorAttr.length === 0) return DEFAULT_COLOR;
-  return firstSolidColor(colorAttr);
-}
-function clusterColorAttrs(attrs) {
-  const base = nonEmpty(attrs.color) ? attrs.color : void 0;
-  const pencolor = orElse(attrs.pencolor, base ?? "");
-  const fillcolor = orElse(attrs.fillcolor, base ?? "");
-  return {
-    fillcolor: nonEmpty(fillcolor) ? fillcolor : void 0,
-    pencolor: nonEmpty(pencolor) ? pencolor : void 0
-  };
-}
-function applyBgcolor(attrs, filled, fillcolor) {
-  if ((!filled || !fillcolor) && nonEmpty(attrs.bgcolor)) {
-    return { filled: true, fillcolor: attrs.bgcolor };
-  }
-  return { filled, fillcolor };
-}
-function findStopColor(colorlist) {
-  const { segs, error } = parseSegs(colorlist);
-  if (error === 1 || error === 2) return null;
-  if (segs.length < 2) return null;
-  const seg0 = segs[0];
-  const seg1 = segs[1];
-  if (seg0.color === null) return null;
-  const fillColor = seg0.color;
-  const stopColor = seg1.color ?? DEFAULT_COLOR;
-  const frac = seg0.hasFraction ? seg0.t : seg1.hasFraction ? 1 - seg1.t : 0;
-  return { fillColor, stopColor, frac };
-}
-function parseAngle(gradientangle2) {
-  if (!gradientangle2 || gradientangle2.length === 0) return 0;
-  const v = parseInt(gradientangle2, 10);
-  return isFinite(v) ? v : 0;
-}
-function buildResolvedFill(rawColor, flags, angle) {
-  const stop = findStopColor(rawColor);
-  if (stop === null) return { kind: "solid", color: rawColor };
-  const kind = flags.radial ? "radial" : "linear";
-  return { kind, fillColor: stop.fillColor, stopColor: stop.stopColor, frac: stop.frac, angle };
-}
-function resolveNodeFillEx(attrs) {
-  const flags = parseStyleFlags(attrs.style);
-  if (!flags.filled) return { kind: "none" };
-  const raw = nonEmpty(attrs.fillcolor) ? attrs.fillcolor : nonEmpty(attrs.color) ? attrs.color : DEFAULT_FILL;
-  return buildResolvedFill(raw, flags, parseAngle(attrs.gradientangle));
-}
-function resolveClusterFillEx(attrs) {
-  const flags = parseStyleFlags(attrs.style);
-  const colors = clusterColorAttrs(attrs);
-  const bg = applyBgcolor(attrs, flags.filled, colors.fillcolor);
-  if (!bg.filled) return { kind: "none" };
-  const raw = bg.fillcolor ?? DEFAULT_FILL;
-  return buildResolvedFill(raw, flags, parseAngle(attrs.gradientangle));
+  return s;
 }
 
 // src/common/htmltable-types.ts
@@ -9759,8 +9544,9 @@ function resetHtmlFillPenWidth() {
   htmlFillPen = 1;
 }
 function penTypeOf(style2) {
-  if (style2 !== void 0 && style2.includes("dashed")) return 1 /* Dashed */;
-  if (style2 !== void 0 && style2.includes("dotted")) return 2 /* Dotted */;
+  const st = htmlStyle(style2);
+  if (st.dashed) return 1 /* Dashed */;
+  if (st.dotted) return 2 /* Dotted */;
   return 3 /* Solid */;
 }
 function withHtmlPaint(paint, job, drawFn) {
@@ -9827,7 +9613,7 @@ function doBorder(spec, renderer, job) {
   const { box, pos, border: border2, color, sides: sides2, style: style2 } = spec;
   htmlFillPen = border2;
   withHtmlPaint({ pen: color, penWidth: border2, penStyle: style2 }, job, () => {
-    if (parseStyleFlags(style2).rounded) {
+    if (htmlStyle(style2).rounded) {
       emitRoundedBezier(mkPts(box, border2, pos), { x: 0, y: 0 }, false, { renderer, job });
       return;
     }
@@ -10032,14 +9818,14 @@ function bgFillPaint(ctx) {
     fill: spec[0],
     stop: spec[1],
     gradientAngle: ctx.gradientangle ?? 0,
-    radial: ctx.style !== void 0 && ctx.style.includes("radial"),
+    radial: htmlStyle(ctx.style).radial,
     penWidth
   };
 }
 function emitBgFill(ctx) {
   const { box, pos, border: border2, renderer, job } = ctx;
   withHtmlPaint(bgFillPaint(ctx), job, () => {
-    if (parseStyleFlags(ctx.style).rounded) {
+    if (htmlStyle(ctx.style).rounded) {
       emitRoundedBezier(mkPts(box, border2, pos), { x: 0, y: 0 }, true, { renderer, job });
       return;
     }
@@ -10105,13 +9891,6 @@ function emitHtmlImg(img, pos, renderer, job) {
   }
   renderer.usershape?.(img.src, b, job);
 }
-function htmlStyleInvisible(style2) {
-  if (style2 === void 0) return false;
-  return style2.split(/[ ,]+/).some((tok) => {
-    const t = tok.toUpperCase();
-    return t === "INVIS" || t === "INVISIBLE";
-  });
-}
 function emitHtmlCell(cell2, pos, renderer, job) {
   const inAnchor = initHtmlAnchor(
     { href: cell2.href, title: cell2.title, target: cell2.target, id: cell2.id },
@@ -10119,7 +9898,7 @@ function emitHtmlCell(cell2, pos, renderer, job) {
     renderer,
     job
   );
-  if (htmlStyleInvisible(cell2.style)) {
+  if (htmlStyle(cell2.style).invisible) {
     if (inAnchor) endHtmlAnchor(renderer, job);
     return;
   }
@@ -10155,7 +9934,7 @@ function emitHtmlLabel(placed, pos, renderer, job) {
   const tblBox = absBox(placed.box, pos);
   const clustersLast = (job.flags & EMIT_CLUSTERS_LAST) !== 0;
   const inAnchor = clustersLast ? false : initHtmlAnchor(anchorData, tblBox, renderer, job);
-  const tblInvisible = htmlStyleInvisible(placed.style);
+  const tblInvisible = htmlStyle(placed.style).invisible;
   if (!tblInvisible) {
     if (placed.bgcolor !== void 0) {
       emitBgFill({
@@ -10232,7 +10011,7 @@ var sides = (v) => {
 };
 var STYLE_WORDS = ["rounded", "radial", "solid", "invisible", "invis", "dotted", "dashed"];
 var STYLE_DELIM = " ,";
-function styleTokens2(v) {
+function styleTokens(v) {
   const out = [];
   const span = (from, member) => {
     let i = from;
@@ -10251,7 +10030,7 @@ function styleTokens2(v) {
 var style = (v) => {
   const legal = [];
   const text = [];
-  for (const tk of styleTokens2(v)) {
+  for (const tk of styleTokens(v)) {
     if (STYLE_WORDS.includes(lower(tk))) legal.push(tk);
     else text.push(warning(`Illegal value ${tk} for STYLE - ignored
 `));
@@ -17996,7 +17775,7 @@ function preprocessTooltip(s) {
 // src/common/make-label.ts
 var DEFAULT_FONTSIZE2 = 14;
 var DEFAULT_FONTNAME = "Times-Roman";
-var DEFAULT_COLOR2 = "black";
+var DEFAULT_COLOR = "black";
 function getPenColor(obj) {
   if (obj === void 0) return void 0;
   const pc = obj.attrs.get("pencolor");
@@ -18618,6 +18397,252 @@ function assembleResult(p, dimen, grown, fixedshape) {
   };
 }
 
+// src/common/multicolor.ts
+var EPS = 1e-5;
+function aeq0(x) {
+  return x < EPS && x > -EPS;
+}
+function getSegLen(token) {
+  const semi = token.indexOf(";");
+  if (semi === -1) return { color: token, v: 0 };
+  const color = token.slice(0, semi);
+  const rest = token.slice(semi + 1);
+  if (rest.length === 0) return { color, v: -1 };
+  const parsed = parseFloat(rest);
+  return !isNaN(parsed) && parsed >= 0 ? { color, v: parsed } : { color, v: -1 };
+}
+function appendSeg(token, left2, segs, warnedExceeded) {
+  const { color, v } = getSegLen(token);
+  if (v < 0) return null;
+  let t = v;
+  let rval = 0;
+  const del = t - left2;
+  if (del > 0) {
+    if (!aeq0(del) && !warnedExceeded.v) {
+      warnedExceeded.v = true;
+      rval = 3;
+    }
+    t = left2;
+  }
+  left2 -= t;
+  segs.push({ color: color.length > 0 ? color : null, t, hasFraction: t > 0 && v > 0 });
+  return { left: left2, rval };
+}
+function distributeLeft(segs, left2) {
+  if (left2 <= 0) return;
+  const zeroCount = segs.filter((s) => s.t <= 0).length;
+  if (zeroCount > 0) {
+    const delta2 = left2 / zeroCount;
+    for (const s of segs) {
+      if (s.t <= 0) s.t = delta2;
+    }
+  } else if (segs.length > 0) {
+    segs[segs.length - 1].t += left2;
+  }
+}
+function trimTrailing(segs) {
+  while (segs.length > 0 && (segs[segs.length - 1]?.t ?? 0) <= 0) {
+    segs.pop();
+  }
+}
+function parseSegs(colorlist) {
+  const segs = [];
+  let left2 = 1;
+  let rval = 0;
+  let badFloatCount = 0;
+  const warnedExceeded = { v: false };
+  for (const token of colorlist.split(":")) {
+    const result = appendSeg(token, left2, segs, warnedExceeded);
+    if (result === null) {
+      const errCode = badFloatCount === 0 ? 2 : 1;
+      badFloatCount++;
+      return { segs: [], error: errCode };
+    }
+    if (result.rval === 3) rval = 3;
+    left2 = result.left;
+    if (aeq0(left2)) {
+      left2 = 0;
+      break;
+    }
+  }
+  distributeLeft(segs, left2);
+  trimTrailing(segs);
+  return { segs, error: rval };
+}
+
+// src/common/style-resolve.ts
+var DEFAULT_COLOR2 = "black";
+var DEFAULT_FILL = "lightgrey";
+var PENWIDTH_BOLD = 2;
+var TOKEN_FLAG = {
+  filled: "filled",
+  dashed: "dashed",
+  dotted: "dotted",
+  bold: "bold",
+  invis: "invis",
+  diagonals: "diagonals",
+  rounded: "rounded",
+  striped: "striped",
+  wedged: "wedged",
+  underline: "underline"
+};
+function zeroFlags() {
+  return {
+    filled: false,
+    dashed: false,
+    dotted: false,
+    bold: false,
+    invis: false,
+    diagonals: false,
+    rounded: false,
+    radial: false,
+    striped: false,
+    wedged: false,
+    underline: false,
+    setLineWidth: null
+  };
+}
+var FUNLIMIT = 64;
+function styleTokens2(style2) {
+  if (!style2) return [];
+  const out = [];
+  let fun = 0;
+  for (const raw of style2.split(",")) {
+    const token = raw.trim();
+    if (token.length === 0) continue;
+    if (fun === FUNLIMIT - 1) return [];
+    fun++;
+    out.push(token);
+  }
+  return out;
+}
+function parseSetLineWidth(token) {
+  const m = /^setlinewidth\s*\(\s*([^)]*)\)\s*$/.exec(token);
+  if (m === null) return null;
+  const v = parseFloat(m[1]);
+  return Number.isNaN(v) ? 0 : v;
+}
+function applyToken(flags, token) {
+  if (token === "radial") {
+    flags.radial = true;
+    flags.filled = true;
+    return;
+  }
+  const key = TOKEN_FLAG[token];
+  if (key !== void 0) flags[key] = true;
+}
+function nonEmpty(s) {
+  return s !== void 0 && s.length > 0;
+}
+function orElse(s, fallback) {
+  return nonEmpty(s) ? s : fallback;
+}
+function firstSolidColor(raw) {
+  const grad = parseGradientSpec(raw);
+  return grad !== null ? grad[0] : raw;
+}
+function parseStyleFlags(style2) {
+  const flags = zeroFlags();
+  if (!style2) return flags;
+  let fun = 0;
+  for (const raw of style2.split(",")) {
+    const token = raw.trim();
+    if (token.length === 0) continue;
+    if (fun === FUNLIMIT - 1) return zeroFlags();
+    fun++;
+    const lw = parseSetLineWidth(token);
+    if (lw !== null) {
+      flags.setLineWidth = lw;
+      continue;
+    }
+    if (!token.includes("(")) applyToken(flags, token);
+  }
+  return flags;
+}
+function styleHasInvisibleAlias(style2) {
+  if (!style2) return false;
+  let fun = 0;
+  for (const raw of style2.split(",")) {
+    const token = raw.trim();
+    if (token.length === 0) continue;
+    if (fun === FUNLIMIT - 1) return false;
+    fun++;
+    if (token === "invisible") return true;
+  }
+  return false;
+}
+function resolvePenType(flags) {
+  if (flags.invis) return 0 /* None */;
+  if (flags.dashed) return 1 /* Dashed */;
+  if (flags.dotted) return 2 /* Dotted */;
+  return 3 /* Solid */;
+}
+function resolvePenWidth(flags, penwidthAttr) {
+  if (penwidthAttr && penwidthAttr.length > 0) {
+    const v = parseFloat(penwidthAttr);
+    if (isFinite(v)) return v;
+  }
+  if (flags.setLineWidth !== null) return flags.setLineWidth;
+  if (flags.bold) return PENWIDTH_BOLD;
+  return 1;
+}
+function resolvePenColor(colorAttr) {
+  if (!colorAttr || colorAttr.length === 0) return DEFAULT_COLOR2;
+  return firstSolidColor(colorAttr);
+}
+function clusterColorAttrs(attrs) {
+  const base = nonEmpty(attrs.color) ? attrs.color : void 0;
+  const pencolor = orElse(attrs.pencolor, base ?? "");
+  const fillcolor = orElse(attrs.fillcolor, base ?? "");
+  return {
+    fillcolor: nonEmpty(fillcolor) ? fillcolor : void 0,
+    pencolor: nonEmpty(pencolor) ? pencolor : void 0
+  };
+}
+function applyBgcolor(attrs, filled, fillcolor) {
+  if ((!filled || !fillcolor) && nonEmpty(attrs.bgcolor)) {
+    return { filled: true, fillcolor: attrs.bgcolor };
+  }
+  return { filled, fillcolor };
+}
+function findStopColor(colorlist) {
+  const { segs, error } = parseSegs(colorlist);
+  if (error === 1 || error === 2) return null;
+  if (segs.length < 2) return null;
+  const seg0 = segs[0];
+  const seg1 = segs[1];
+  if (seg0.color === null) return null;
+  const fillColor = seg0.color;
+  const stopColor = seg1.color ?? DEFAULT_COLOR2;
+  const frac = seg0.hasFraction ? seg0.t : seg1.hasFraction ? 1 - seg1.t : 0;
+  return { fillColor, stopColor, frac };
+}
+function parseAngle(gradientangle2) {
+  if (!gradientangle2 || gradientangle2.length === 0) return 0;
+  const v = parseInt(gradientangle2, 10);
+  return isFinite(v) ? v : 0;
+}
+function buildResolvedFill(rawColor, flags, angle) {
+  const stop = findStopColor(rawColor);
+  if (stop === null) return { kind: "solid", color: rawColor };
+  const kind = flags.radial ? "radial" : "linear";
+  return { kind, fillColor: stop.fillColor, stopColor: stop.stopColor, frac: stop.frac, angle };
+}
+function resolveNodeFillEx(attrs) {
+  const flags = parseStyleFlags(attrs.style);
+  if (!flags.filled) return { kind: "none" };
+  const raw = nonEmpty(attrs.fillcolor) ? attrs.fillcolor : nonEmpty(attrs.color) ? attrs.color : DEFAULT_FILL;
+  return buildResolvedFill(raw, flags, parseAngle(attrs.gradientangle));
+}
+function resolveClusterFillEx(attrs) {
+  const flags = parseStyleFlags(attrs.style);
+  const colors = clusterColorAttrs(attrs);
+  const bg = applyBgcolor(attrs, flags.filled, colors.fillcolor);
+  if (!bg.filled) return { kind: "none" };
+  const raw = bg.fillcolor ?? DEFAULT_FILL;
+  return buildResolvedFill(raw, flags, parseAngle(attrs.gradientangle));
+}
+
 // src/layout/dot/fastgr.ts
 var VIRTUAL = 1;
 var NORMAL = 0;
@@ -20727,7 +20752,7 @@ function readFontParams(sg) {
   return {
     fontsize: parseFloat(graphAttrInherited(sg, "fontsize") ?? "") || DEFAULT_FONTSIZE2,
     fontname: graphAttrInherited(sg, "fontname") ?? DEFAULT_FONTNAME,
-    fontcolor: graphAttrInherited(sg, "fontcolor") ?? DEFAULT_COLOR2
+    fontcolor: graphAttrInherited(sg, "fontcolor") ?? DEFAULT_COLOR
   };
 }
 function applyLabelBorder(sg, dimen) {
@@ -24644,7 +24669,7 @@ function readFontAttrs(n, g) {
   return {
     fontname: nodeAttr(n, g, "fontname") ?? DEFAULT_FONTNAME,
     fontsize: parseFloat(nodeAttr(n, g, "fontsize") ?? String(DEFAULT_FONTSIZE2)),
-    fontcolor: nodeAttr(n, g, "fontcolor") ?? DEFAULT_COLOR2
+    fontcolor: nodeAttr(n, g, "fontcolor") ?? DEFAULT_COLOR
   };
 }
 function assignShapeInfo(n, polyDesc) {
@@ -25234,7 +25259,7 @@ function applyPenState(obj, styleAttr, colorAttr, penwidthAttr) {
   obj.penColor = resolveRenderColor(resolvePenColor(colorAttr));
   obj.pen = resolvePenType(flags);
   obj.penWidth = resolvePenWidth(flags, penwidthAttr);
-  obj.rawStyle = styleTokens(styleAttr);
+  obj.rawStyle = styleTokens2(styleAttr);
 }
 function applyNodeStyle(obj, n, job) {
   const styleAttr = nodeAttr(n, n.root, "style");
@@ -25457,7 +25482,7 @@ function initFontEdgeAttr(e) {
   return {
     fontsize: lateDouble(e.attrs.get("fontsize"), DEFAULT_FONTSIZE2, MIN_FONTSIZE),
     fontname: e.attrs.get("fontname") || DEFAULT_FONTNAME,
-    fontcolor: e.attrs.get("fontcolor") || DEFAULT_COLOR2
+    fontcolor: e.attrs.get("fontcolor") || DEFAULT_COLOR
   };
 }
 function initFontLabelEdgeAttr(e, fi) {
@@ -28266,7 +28291,7 @@ function setEdgePen(e, job) {
   );
   obj.pen = resolvePenType(flags);
   obj.penWidth = resolvePenWidth(flags, e.attrs.get("penwidth"));
-  obj.rawStyle = styleTokens(e.attrs.get("style"));
+  obj.rawStyle = styleTokens2(e.attrs.get("style"));
 }
 function renderEdge(e, renderer, job) {
   emitEdgeComments(e, renderer, job);