@graphty/graph-io 0.3.49 → 0.3.50

package/dist/chunks/{importer-vRq4h3j5.js → importer-DgG4v1Ms.js}

@@ -7,10 +7,10 @@ import { i as inferTextDtype, W as WIDENING_UNSUPPORTED_CODE, a as isNumericText
 import { j as joinText, e as encodeChunks } from "./writer-DxjgHwSe.js";
 import { p as postscriptFont, f as graphvizFontName, i as importChosenGraph } from "./choose-CczZJaX_.js";
 import { L as LineReader, b as throwIfAborted } from "./input-CAxt_aV-.js";
-import { A as writeStyleBlock, B as styleBlockLosses, h as StyleNotes, p as plainCell, f as canonText, a as canonEnum, d as canonColor, e as colorOpacity, c as canonNumber, n as noteAt, b as STYLE_ISSUE, y as toolDefaults, L as DVIPS_COLORS } from "./block-iptrlMBb.js";
-import { S as StyleApproximations } from "./approximations-Bzn3L-je.js";
-import { e as elementValues, t as takeFromBlock } from "./round-trip-Zm3_ivgq.js";
-import { v as valueColumns } from "./styles-yed-UMFdNqze.js";
+import { A as writeStyleBlock, B as styleBlockLosses, h as StyleNotes, p as plainCell, f as canonText, a as canonEnum, d as canonColor, e as colorOpacity, c as canonNumber, n as noteAt, b as STYLE_ISSUE, y as toolDefaults, L as DVIPS_COLORS } from "./block-yl0f_qLO.js";
+import { S as StyleApproximations } from "./approximations-BRXsll0T.js";
+import { e as elementValues, t as takeFromBlock } from "./round-trip-Cy3_SHRZ.js";
+import { v as valueColumns } from "./styles-yed-XeFBQ6VS.js";
 const PAJEK_WINDOW = 500;
 function resolvePajekDraw(option) {
   if (option === void 0) {
@@ -59,6 +59,9 @@ function flag(draw, name) {
 function drawsLineLabels(draw) {
   return draw !== null && flag(draw, "Form8.withLabels1");
 }
+function drawsStraightLines(draw) {
+  return draw !== null && flag(draw, "Form10.StraightLinesOnly1");
+}
 function iniNumber(draw, name) {
   const v = draw.ini.get(name);
   const n = v === void 0 || v.trim() === "" ? Number.NaN : Number(v);
@@ -624,6 +627,7 @@ const PAJEK_STYLE_CAPABILITIES = Object.freeze({
     "lineStyle",
     "sourceArrow",
     "targetArrow",
+    "arrowSize",
     "arrowPosition",
     "label",
     "labelColor",
@@ -637,6 +641,7 @@ const PAJEK_FIGURES = /* @__PURE__ */ new Map([
   ["other:man", [2.502, 6.487]],
   ["other:woman", [3.003, 6.478]]
 ]);
+const PAJEK_FIGURE_UNSET_FACTOR = 0.3;
 const PAJEK_POINTS_PER_UNIT = 500;
 const NODE_KEYS = [
   "ic",
@@ -659,7 +664,7 @@ const CARRIED = {
   node: [SHAPE_COLUMN, ...NODE_KEYS],
   edge: ["c", "w", "p", "s", "ap"]
 };
-const CARRIED_LINE = CARRIED.edge.filter((key) => key !== "p");
+const CARRIED_LINE = CARRIED.edge.filter((key) => key !== "p" && key !== "ap");
 const EDGE_WIDTH_PER_W = 2;
 const ARC_DEFAULTS = { color: "#999999", width: 1 };
 function carriedParams(keys, whole) {
@@ -871,7 +876,8 @@ function readSize(get, put, at, figure) {
     if (f === null && figure === void 0) {
       continue;
     }
-    const factor = f === null ? 1 : canonNumber(f, at(property));
+    const unset = figure === void 0 ? 1 : PAJEK_FIGURE_UNSET_FACTOR;
+    const factor = f === null ? unset : canonNumber(f, at(property));
     const over = figure?.[k] ?? 1;
     put(property, factor === null ? null : Number((PAJEK_VERTEX_SIZE * factor * over).toPrecision(15)));
   }
@@ -942,7 +948,7 @@ function readLine(get, put, at, directed, labels = true, run = null, loop = null
     put("lineStyle", "solid");
   }
   readNumber(get("s"), "arrowSize", put, at);
-  readArrowPosition(get("ap"), put, at);
+  readArrowPosition(get("ap"), put, at, run);
   const line = loop === null ? get : loopParam(get);
   const controls = loop === null ? null : readLoop(line, put, loop);
   if (labels) {
@@ -1041,21 +1047,22 @@ function readBezier(get, put, run) {
   put("bendCurve", "bezier");
   put("bends", controls.map(([along, across]) => `${fraction(along)},${fraction(across)}`).join(" "));
 }
+const PAJEK_TIP_BACK = 1.5;
 function readArcEnd(get, put, run, target) {
   const ap = numberOrNull(get("ap")) ?? 0;
   const length = Math.hypot(run[0], run[1]);
   if (ap !== 0 || length === 0 || bezierControls(get, run) === null) {
-    return;
+    return false;
   }
   const [ux, uy] = [run[0] / length, run[1] / length];
   const r = 1 / Math.hypot(ux / (target[0] / 2), uy / (target[1] / 2));
-  const back = 1.5 + 5 * (numberOrNull(get("s")) ?? 1);
+  const back = PAJEK_TIP_BACK + 5 * (numberOrNull(get("s")) ?? 1);
   const turn = -(numberOrNull(get("a2")) ?? 0) * Math.PI / 180;
   const [c, s] = [Math.cos(turn), Math.sin(turn)];
   const end = [run[0] - r * ux - back * (ux * c - uy * s), run[1] - r * uy - back * (ux * s + uy * c)];
   const controls = bezierControls(get, end);
   if (controls === null) {
-    return;
+    return false;
   }
   const L2 = length * length;
   const fraction = (x) => String(Math.round(x * 1e4) / 1e4 || 0);
@@ -1064,6 +1071,16 @@ function readArcEnd(get, put, run, target) {
     return `${fraction((x * run[0] + y * run[1]) / L2)},${fraction((x * run[1] - y * run[0]) / L2)}`;
   });
   put("bends", bends.join(" "));
+  const tip = [-r * ux - PAJEK_TIP_BACK * (ux * c - uy * s), -r * uy - PAJEK_TIP_BACK * (ux * s + uy * c)];
+  put("targetPort", `${fraction(tip[0] / (target[0] / 2))},${fraction(-tip[1] / (target[1] / 2))}`);
+  return true;
+}
+const PAJEK_TIP_GAP = 1;
+function readTipGap(get, put) {
+  const s = numberOrNull(get("s")) ?? 1;
+  if (s > 0) {
+    put("targetArrowGap", Number((PAJEK_TIP_GAP / (6 * s)).toPrecision(6)));
+  }
 }
 function bezierControls(get, run) {
   const [a1, k1, a2, k2] = ["a1", "k1", "a2", "k2"].map((key) => numberOrNull(get(key)));
@@ -1149,13 +1166,18 @@ function numberOrNull(raw) {
   }
   return typeof raw === "number" && Number.isFinite(raw) ? raw : null;
 }
-function readArrowPosition(raw, put, at) {
+function readArrowPosition(raw, put, at, run = null) {
   if (raw === null) {
     return;
   }
   const ap = canonNumber(raw, at("arrowPosition"));
+  const length = run === null ? 0 : Math.hypot(run[0], run[1]);
   if (ap !== null && ap > 1) {
-    noteAt(at("arrowPosition"), STYLE_ISSUE.NOT_CARRIED, `ap ${String(ap)}`);
+    if (length > 0) {
+      put("arrowPosition", Number(Math.min(1, ap / length).toPrecision(6)));
+    } else {
+      noteAt(at("arrowPosition"), STYLE_ISSUE.NOT_CARRIED, `ap ${String(ap)}`);
+    }
     return;
   }
   if (ap !== 0) {
@@ -1180,6 +1202,40 @@ function directedEdges(snapshot) {
   }
   return out;
 }
+const SHARED_ARC_BOW = { a1: 15, k1: 0.25, a2: 15, k2: 0.25 };
+function sharedArcBows(snapshot, directed) {
+  const byPair = /* @__PURE__ */ new Map();
+  for (let e = 0; e < snapshot.edgeCount; e++) {
+    const [u, v] = [snapshot.edgeSource(e), snapshot.edgeTarget(e)];
+    if (directed[e] && u !== v) {
+      const key = u < v ? `${String(u)} ${String(v)}` : `${String(v)} ${String(u)}`;
+      byPair.set(key, [...byPair.get(key) ?? [], e]);
+    }
+  }
+  const out = /* @__PURE__ */ new Map();
+  for (const arcs of byPair.values()) {
+    if (arcs.length < 2) {
+      continue;
+    }
+    for (const e of arcs) {
+      const same = arcs.filter((x) => snapshot.edgeSource(x) === snapshot.edgeSource(e));
+      out.set(e, (same.length - 1 - same.indexOf(e)) % 2 === 0 ? 1 : -1);
+    }
+  }
+  return out;
+}
+function bowedParams(get, side) {
+  if (Object.keys(SHARED_ARC_BOW).some((key) => get(key) !== null)) {
+    return get;
+  }
+  return (key) => {
+    const bow = SHARED_ARC_BOW[key];
+    if (bow === void 0) {
+      return get(key);
+    }
+    return key.startsWith("a") ? side * bow : bow;
+  };
+}
 function styleColumns(table, keys) {
   return keys.filter((k) => table.has(k));
 }
@@ -1221,14 +1277,18 @@ function pajekStyles(snapshot, context) {
     const loop = run !== null && block === null && snapshot.edgeSource(i) === snapshot.edgeTarget(i) ? (controls) => {
       loops.set(i, controls);
     } : null;
-    readLine(get, put, at, directed[i], labels, run, loop);
-    if (directed[i] && loop === null && run !== null) {
-      readArcEnd(get, put, run, targetSize(snapshot.edgeTarget(i)));
+    const bow = bows.get(i);
+    const line = bow === void 0 ? get : bowedParams(get, bow);
+    readLine(line, put, at, directed[i], labels, run, loop);
+    const ported = directed[i] && run !== null && readArcEnd(line, put, run, targetSize(snapshot.edgeTarget(i)));
+    if (directed[i] && loop === null && !ported && block === null) {
+      readTipGap(get, put);
     }
     readLineValue(lineValue(i), get, put, directed[i]);
     readHooks(get, put, keywords[snapshot.edgeSource(i)], keywords[snapshot.edgeTarget(i)]);
   };
   const directed = directedEdges(snapshot);
+  const bows = drawsStraightLines(draw) || block !== null ? /* @__PURE__ */ new Map() : sharedArcBows(snapshot, directed);
   const keywords = [];
   const weights = explicitWeights(snapshot);
   const lineValue = (e) => weights.isExplicit(e) ? weights.value(e) : numberOrNull(cells(snapshot.edges, e)(VALUE_COLUMN));
@@ -1497,10 +1557,7 @@ function lineParams(get, directed, approximate) {
   if (typeof lineStyle === "string" && lineStyle !== "solid" && pajekDots(lineStyle, out, directed, approximate)) {
     out.set("p", "Dots");
   }
-  const position = get("arrowPosition");
-  if (typeof position === "number" && position > 0) {
-    out.set("ap", position);
-  }
+  arrowParams(get, out);
   lineLabelParams(get, out, approximate);
   const target = get("targetArrow");
   if (target !== null && target !== (directed ? "triangle" : "none")) {
@@ -1512,6 +1569,16 @@ function lineParams(get, directed, approximate) {
   }
   return out;
 }
+function arrowParams(get, out) {
+  const arrowSize = get("arrowSize");
+  if (typeof arrowSize === "number" && arrowSize !== 1) {
+    out.set("s", arrowSize);
+  }
+  const position = get("arrowPosition");
+  if (typeof position === "number" && position > 0) {
+    out.set("ap", position);
+  }
+}
 function lineLabelParams(get, out, approximate) {
   const label = get("label");
   if (typeof label === "string" && label !== "") {
@@ -1700,6 +1767,8 @@ function lineRestated(key, directed) {
       return directed ? Number(defaults.width) : Number(defaults.width) / EDGE_WIDTH_PER_W;
     case "p":
       return "Solid";
+    case "s":
+      return 1;
     default:
       return 0;
   }
@@ -4292,4 +4361,4 @@ export {
   pajekImporter as d,
   pajekExporter as p
 };
-//# sourceMappingURL=importer-vRq4h3j5.js.map
+//# sourceMappingURL=importer-DgG4v1Ms.js.map