@knowvah/dot-engine 1.1.0 → 1.2.0

package/src/render/map.ts

@@ -167,10 +167,27 @@ function isEscapeAt(bytes: Uint8Array, i: number): boolean {
   return c !== undefined && 'EGHLNTlnr\\"'.includes(String.fromCharCode(c));
 }
 
+/**
+ * Canonicalize an attribute value for printing — cgraph's `agstrcanon`, which
+ * DISPATCHES on the html flag before falling back to the plain-string scan.
+ *
+ * An HTML-like value (`label=<<table…>>`) is emitted angle-bracket delimited
+ * and VERBATIM: no quoting, and no escaping of the `"` inside its markup.
+ * Routing it through `agstrcanonText` instead produces a quoted string with
+ * every attribute quote backslash-escaped, and leaks the port's marker byte.
+ *
+ * @see lib/cgraph/write.c:219 agstrcanon · :209 agcanonhtmlstr
+ */
+export function agstrcanon(arg: string): string {
+  if (isHtmlValue(arg)) return '<' + htmlValueContent(arg) + '>';
+  return agstrcanonText(arg);
+}
+
 /** The needs-quotes / numeral / escape state scan of `_agstrcanon`, over UTF-8
  * BYTES (C iterates bytes: cnt counts bytes for line breaking, and non-ascii
  * bytes are id chars). Returns the quoted buffer or the untouched input.
- * @see lib/cgraph/write.c:_agstrcanon */
+ * NOTE: this is `_agstrcanon`, the non-html half — call `agstrcanon` unless you
+ * know the value cannot be html. @see lib/cgraph/write.c:_agstrcanon */
 export function agstrcanonText(arg: string): string {
   if (arg.length === 0) return '""';
   const bytes = new TextEncoder().encode(arg);

package/src/render/svg-graph.ts

@@ -22,6 +22,7 @@ import { svgGraphId, svgGraphClass } from './svg-id.js';
 import { parseGradientSpec } from '../common/htmltable-emit-fill.js';
 import { findStopColor, parseStyleFlags } from '../common/style-resolve.js';
 import { cround } from '../common/arith.js';
+import { FontnameKind } from '../model/layoutParams.js';
 import {
   emitLinearGradient,
   emitRadialGradient,
@@ -323,6 +324,9 @@ function emitBgcolorBackground(g: Graph, bb: Box, bgcolorAttr: string | undefine
 export function svgBeginGraph(g: Graph, job: RenderJob): void {
   job.devscale = { x: 1, y: -1 };
   job.directed = g.kind === 'directed' || g.kind === 'strict-directed';
+  // C reads GD_fontnames(job->gvc->g) at each span; the port carries it on the
+  // job, set here alongside the other root-graph-derived fields.
+  job.fontnames = g.info.fontnames ?? FontnameKind.NativeFonts;
   // GD_drawing(root)->id — used as the `<gid>_` prefix for non-root object ids.
   job.drawingId = g.attrs.get('id') ?? '';
   job.write(SVG_XML_DECL);

package/src/render/svg-helpers.ts

@@ -330,7 +330,7 @@ export function svgTextspan(pos: Point, span: TextSpan, job: RenderJob): void {
   job.write('" y="');
   job.printDouble(y);
   job.write('"');
-  const ff = fontFamilyAttrs(span.fontName);
+  const ff = fontFamilyAttrs(span.fontName, job.fontnames);
   if (ff !== null) job.write(ff.attrs);
   else job.write(' font-family="' + escapeXml(span.fontName ?? 'Times,serif') + '"');
   emitFontAttrs(span.fontFlags, job, ff ?? { weight: false, style: false });