@knowvah/dot-engine 2.6.12 → 2.7.1

package/src/parser/dot.js

@@ -289,7 +289,7 @@ function peg$parse(input, options) {
   function peg$f13(t, m, attrs) {
     // grammar.y:attrstmt calls nomacros() when a macro name is present;
     // the attributes are still applied unchanged.
-    if (m) agwarningf("attribute macros not implemented", "error");
+    if (m) agwarningf("attribute macros not implemented");
     return { type: "attr", target: t, attrs: attrs };
   }
   function peg$f14(a) {    return { type: "assign", key: a.key, value: a.value };  }

package/src/parser/dot.pegjs

@@ -75,7 +75,7 @@ AttrStmt
     {
       // grammar.y:attrstmt calls nomacros() when a macro name is present;
       // the attributes are still applied unchanged.
-      if (m) agwarningf("attribute macros not implemented", "error");
+      if (m) agwarningf("attribute macros not implemented");
       return { type: "attr", target: t, attrs: attrs };
     }
   / a:AttrAssignment

package/src/parser/index.ts

@@ -234,7 +234,7 @@ export function isPeggyError(err: unknown): err is {
 function warnNumberAmbiguities(src: string, upTo: number): void {
   for (const a of scanNumberAmbiguities(src, Stripper.strip(src))) {
     if (a.offset > upTo) break;
-    agerrFinished(numberAmbiguityMessage(a), 'error');
+    agerrFinished(numberAmbiguityMessage(a));
   }
 }
 

package/src/render/color-resolve.ts

@@ -26,7 +26,7 @@ import {
 import type { Edge } from '../model/edge.js';
 import { registerRenderState } from '../common/render-state.js';
 import { agerrorf, agwarningf } from '../common/agerr.js';
-import { parseSegs } from '../common/multicolor.js';
+import { parseSegsSilent } from '../common/multicolor.js';
 import { findStopColor, styleTokens } from '../common/style-resolve.js';
 import { emitOnce } from '../common/emit-once.js';
 
@@ -282,7 +282,7 @@ function multicolorNames(
   color: string,
   arrows: readonly EdgeArrowFlags[],
 ): string[] | null {
-  const { segs, error } = parseSegs(color);
+  const { segs, error } = parseSegsSilent(color);
   if (error === 1 || error === 2) return null;
   const out: string[] = [];
   const front = segs[0]?.color ?? null;

package/src/render/dot/edge-draw.ts

@@ -23,11 +23,12 @@ import { resolveRenderColor } from '../color-resolve.js';
 import { taper, taperfun } from '../../common/taper.js';
 import { orthoRoundedRadius } from '../svg-helpers.js';
 import { orthoRoundedPolylines } from '../svg-edge-ortho-radius.js';
-import { parseSegs } from '../../common/multicolor.js';
+import { edgeSegsContext, parseSegs, parseSegsSilent } from '../../common/multicolor.js';
 import { splitSplineByColor } from '../svg-edge-split.js';
 import { buildOffsetLists, advanceTmpList } from '../../common/edge-offset.js';
 import { xdotFillColor, xdotNum, xdotPenColor, xdotPoint, xdotPoints, xdotStrOp, trimFixed3 } from './xdot-ops.js';
 import { DotWriterBase } from './agwrite.js';
+import { gvrenderSetStyle } from '../../gvc/gvrender-set-style.js';
 
 /** Pen colour when a colour-list entry is empty. @see lib/common/emit.c:2485 */
 const DEFAULT_COLOR = 'black';
@@ -81,6 +82,7 @@ export abstract class EdgeDrawBase extends DotWriterBase {
    */
   attachmentPolyline(pts: Point[], pencolor: string, job: RenderJob): void {
     const obj = job.obj;
+    gvrenderSetStyle(DEFAULT_LINE_STYLE);
     if (obj !== null) {
       obj.rawStyle = [...DEFAULT_LINE_STYLE];
       obj.pen = PenType.Solid;
@@ -147,11 +149,12 @@ export abstract class EdgeDrawBase extends DotWriterBase {
    */
   protected emitSplitSpline(
     bzList: (Bezier | undefined)[],
+    e: Edge,
     colorAttr: string,
     edraw: string[],
     job: RenderJob,
   ): { firstColor: string; endColor: string } {
-    const segs = parseSegs(colorAttr).segs;
+    const segs = parseSegs(colorAttr, edgeSegsContext(e)).segs;
     const firstColor = segs[0]?.color ?? DEFAULT_COLOR;
     let endColor = firstColor;
     for (const bz of bzList) {
@@ -183,7 +186,7 @@ export abstract class EdgeDrawBase extends DotWriterBase {
         ? buildOffsetLists(bz.list, (2 + numc) / 2)
         : { offlist: [] as Point[], tmplist: [] as Point[] },
     );
-    const colors = parseSegs(colorAttr).segs.map((s) => s.color ?? DEFAULT_COLOR);
+    const colors = parseSegsSilent(colorAttr).segs.map((s) => s.color ?? DEFAULT_COLOR);
     for (const color of colors) {
       const pen = xdotPenColor(resolveRenderColor(color));
       for (const sd of segData) {

package/src/render/dot.ts

@@ -215,7 +215,7 @@ export class XdotRenderer extends EdgeDrawBase implements RendererPlugin {
       // color segment, split along the spline's arc length. Takes precedence
       // over tapered / `:` parallel, matching C's `if (numsemi && numc)` order.
       // @see lib/common/emit.c:2389 multicolor
-      const c = this.emitSplitSpline(spl.list as (Bezier | undefined)[], colorAttr, edraw, job);
+      const c = this.emitSplitSpline(spl.list as (Bezier | undefined)[], e, colorAttr, edraw, job);
       tailArrowColor = c.firstColor;
       headArrowColor = c.endColor;
     } else if (edgeIsTapered(e)) {

package/src/render/svg-edge-split.ts

@@ -21,7 +21,7 @@ import type { RenderJob } from '../gvc/job.js';
 import type { Point, Bezier } from '../model/geom.js';
 import { bezier } from '../common/bezier.js';
 import { dist2 } from '../common/spline-midpoint.js';
-import { parseSegs } from '../common/multicolor.js';
+import { edgeSegsContext, parseSegs } from '../common/multicolor.js';
 import { transformPoint } from '../gvc/device.js';
 import { emitBezierPath, emitDash, emitPenWidth } from './svg-helpers.js';
 import { resolveRenderColor, colorPaint } from './color-resolve.js';
@@ -160,7 +160,7 @@ export function emitSplitEdgePaths(
   job: RenderJob,
   colorList: string,
 ): { firstColor: string; endColor: string } {
-  const segs = parseSegs(colorList).segs;
+  const segs = parseSegs(colorList, edgeSegsContext(e)).segs;
   const firstColor = segs[0]?.color ?? DEFAULT_COLOR;
   const spl = e.info.spl;
   let endColor = firstColor;

package/src/render/svg-multicolor.ts

@@ -231,8 +231,9 @@ function drawWedge(seg: WedgeSeg, e: EllipseParams, ctx: RenderCtx): number {
  */
 export function wedgedEllipse(
   job: RenderJob, pf: Point[], clrs: string, renderer: RendererPlugin,
+  context?: () => string,
 ): number {
-  const { segs, error } = parseSegs(clrs);
+  const { segs, error } = parseSegs(clrs, context);
   if (error === 1 || error === 2) return error;
   const ctrX = (pf[0]!.x + pf[1]!.x) / 2;
   const ctrY = (pf[0]!.y + pf[1]!.y) / 2;
@@ -286,9 +287,9 @@ function drawBand(p: Point[], seg: BandSeg, ctx: RenderCtx): void {
  */
 export function stripedBox(
   job: RenderJob, pts: Point[], clrs: string,
-  rotate: boolean, renderer: RendererPlugin,
+  rotate: boolean, renderer: RendererPlugin, context?: () => string,
 ): number {
-  const { segs, error } = parseSegs(clrs);
+  const { segs, error } = parseSegs(clrs, context);
   if (error === 1 || error === 2) return error;
   // @see lib/common/emit.c:605-615 rotate swap
   const p: Point[] = rotate

package/src/render/svg-parallel-edge.ts

@@ -27,7 +27,7 @@ import { buildOffsetLists, advanceTmpList } from '../common/edge-offset.js';
 import { transformPoint } from '../gvc/device.js';
 import { emitBezierPath, emitDash, emitPenWidth } from './svg-helpers.js';
 import { resolveRenderColor, colorPaint, colorOpacity } from './color-resolve.js';
-import { parseSegs } from '../common/multicolor.js';
+import { parseSegsSilent } from '../common/multicolor.js';
 
 const PENWIDTH_NORMAL = 1.0;
 const PENWIDTH_THRESHOLD = 0.005;
@@ -114,7 +114,7 @@ export function emitParallelEdgePaths(
   // parseSegs strips any ';weight', so the semicolon syntax (which C routes
   // to split-along-length multicolor — a follow-up) at least yields valid
   // parallel colors instead of an invalid "red;0.5" stroke.
-  const colors = parseSegs(colorList).segs.map((s) => s.color ?? DEFAULT_COLOR);
+  const colors = parseSegsSilent(colorList).segs.map((s) => s.color ?? DEFAULT_COLOR);
   emitColorPasses(segData, colors, job);
   return {
     headColor: colors[0] ?? DEFAULT_COLOR,