@knowvah/dot-engine 2.12.0 → 2.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/builder.d.ts +7 -1
- package/dist/api/builder.d.ts.map +1 -1
- package/dist/api.js +14 -7
- package/dist/api.js.map +2 -2
- package/dist/common/edge-in-box.d.ts +6 -20
- package/dist/common/edge-in-box.d.ts.map +1 -1
- package/dist/common/edge-label-init.d.ts +26 -1
- package/dist/common/edge-label-init.d.ts.map +1 -1
- package/dist/common/emit-bb.d.ts +36 -0
- package/dist/common/emit-bb.d.ts.map +1 -0
- package/dist/common/nodeinit.d.ts +16 -2
- package/dist/common/nodeinit.d.ts.map +1 -1
- package/dist/common/splines-path-begin.d.ts.map +1 -1
- package/dist/common/splines-path-end.d.ts.map +1 -1
- package/dist/gvc/__fixtures__/subg-renders/subg-renders.d.ts +10 -0
- package/dist/gvc/__fixtures__/subg-renders/subg-renders.d.ts.map +1 -0
- package/dist/gvc/context.d.ts +8 -0
- package/dist/gvc/context.d.ts.map +1 -1
- package/dist/gvc/device.d.ts.map +1 -1
- package/dist/gvc/emit-gates.d.ts +5 -10
- package/dist/gvc/emit-gates.d.ts.map +1 -1
- package/dist/gvc/emit-xdot.d.ts +10 -0
- package/dist/gvc/emit-xdot.d.ts.map +1 -1
- package/dist/gvc/job.d.ts +5 -2
- package/dist/gvc/job.d.ts.map +1 -1
- package/dist/gvc/viewport.d.ts +10 -5
- package/dist/gvc/viewport.d.ts.map +1 -1
- package/dist/index.js +7617 -7334
- package/dist/index.js.map +4 -4
- package/dist/layout/dot/decomp.d.ts.map +1 -1
- package/dist/layout/dot/edge-route.d.ts +10 -11
- package/dist/layout/dot/edge-route.d.ts.map +1 -1
- package/dist/layout/dot/fastgr.d.ts +5 -3
- package/dist/layout/dot/fastgr.d.ts.map +1 -1
- package/dist/layout/dot/flat-adj-record.d.ts +22 -0
- package/dist/layout/dot/flat-adj-record.d.ts.map +1 -0
- package/dist/layout/dot/init.d.ts +65 -4
- package/dist/layout/dot/init.d.ts.map +1 -1
- package/dist/layout/dot/mincross-build.d.ts +6 -0
- package/dist/layout/dot/mincross-build.d.ts.map +1 -1
- package/dist/layout/dot/position-aux.d.ts +7 -1
- package/dist/layout/dot/position-aux.d.ts.map +1 -1
- package/dist/layout/dot/splines-clone.d.ts +2 -1
- package/dist/layout/dot/splines-clone.d.ts.map +1 -1
- package/dist/layout/dot/splines-flat-labeled.d.ts.map +1 -1
- package/dist/layout/dot/splines-flat.d.ts +18 -0
- package/dist/layout/dot/splines-flat.d.ts.map +1 -1
- package/dist/layout/dot/splines-groups.d.ts.map +1 -1
- package/dist/layout/dot/splines.d.ts +5 -3
- package/dist/layout/dot/splines.d.ts.map +1 -1
- package/dist/layout/fdp/ports.d.ts.map +1 -1
- package/dist/layout/neato/conjgrad-mkernel.d.ts.map +1 -1
- package/dist/layout/neato/fdp-adjust.d.ts.map +1 -1
- package/dist/layout/neato/sgd.d.ts.map +1 -1
- package/dist/layout/sfdp/spring-electrical.d.ts.map +1 -1
- package/dist/model/cgraph-ops.d.ts +10 -2
- package/dist/model/cgraph-ops.d.ts.map +1 -1
- package/dist/model/edge.d.ts +7 -2
- package/dist/model/edge.d.ts.map +1 -1
- package/dist/model/edgeInfo.d.ts +17 -2
- package/dist/model/edgeInfo.d.ts.map +1 -1
- package/dist/model/graph.d.ts +4 -3
- package/dist/model/graph.d.ts.map +1 -1
- package/dist/model/lazy-attrs.d.ts.map +1 -1
- package/dist/parser/builder.d.ts.map +1 -1
- package/dist/render/dot/agwrite-linelength.d.ts +25 -0
- package/dist/render/dot/agwrite-linelength.d.ts.map +1 -0
- package/dist/render/dot/agwrite.d.ts +9 -8
- package/dist/render/dot/agwrite.d.ts.map +1 -1
- package/dist/render/dot/attrs.d.ts +15 -4
- package/dist/render/dot/attrs.d.ts.map +1 -1
- package/dist/render/dot/write-back.d.ts +24 -0
- package/dist/render/dot/write-back.d.ts.map +1 -1
- package/dist/render/dot/xdot-ops.d.ts +20 -29
- package/dist/render/dot/xdot-ops.d.ts.map +1 -1
- package/dist/render/dot.d.ts +5 -4
- package/dist/render/dot.d.ts.map +1 -1
- package/dist/render/json-cluster-edge.d.ts +35 -0
- package/dist/render/json-cluster-edge.d.ts.map +1 -0
- package/dist/render/json-nonfinite.d.ts +17 -0
- package/dist/render/json-nonfinite.d.ts.map +1 -0
- package/dist/render/json.d.ts +4 -0
- package/dist/render/json.d.ts.map +1 -1
- package/dist/render/map.d.ts +3 -0
- package/dist/render/map.d.ts.map +1 -1
- package/dist/render/svg-graph.d.ts.map +1 -1
- package/dist/render/svg-id.d.ts +10 -1
- package/dist/render/svg-id.d.ts.map +1 -1
- package/dist/render/svg.d.ts +3 -1
- package/dist/render/svg.d.ts.map +1 -1
- package/dist/render.js +7657 -7374
- package/dist/render.js.map +4 -4
- package/dist/util/bsd-qsort.d.ts.map +1 -1
- package/dist/util/printf-round.d.ts.map +1 -1
- package/dist/xdot/parse.d.ts.map +1 -1
- package/dist/xdot/strtod.d.ts +23 -0
- package/dist/xdot/strtod.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/api/builder.ts +8 -2
- package/src/common/edge-in-box.ts +9 -24
- package/src/common/edge-label-init.ts +43 -17
- package/src/common/emit-bb.ts +128 -0
- package/src/common/nodeinit.ts +28 -8
- package/src/common/splines-path-begin.ts +4 -3
- package/src/common/splines-path-end.ts +4 -3
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.dot.nofree.1 +45 -0
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.dot.nofree.2 +45 -0
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.dot.nofree.3 +45 -0
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.xdot.nofree.1 +74 -0
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.xdot.nofree.2 +74 -0
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.xdot.nofree.3 +76 -0
- package/src/gvc/__fixtures__/rerender/nestedclust.gv +4 -0
- package/src/gvc/__fixtures__/rerender/regen.sh +5 -0
- package/src/gvc/__fixtures__/subg-renders/subg-renders.ts +48 -0
- package/src/gvc/context.ts +8 -0
- package/src/gvc/device.ts +28 -29
- package/src/gvc/emit-gates.ts +7 -16
- package/src/gvc/emit-xdot.ts +10 -12
- package/src/gvc/job.ts +5 -2
- package/src/gvc/viewport.ts +13 -7
- package/src/layout/dot/__fixtures__/flat-adj-aux-syms.native-16.1.json +1210 -0
- package/src/layout/dot/decomp.ts +23 -2
- package/src/layout/dot/edge-route.ts +52 -86
- package/src/layout/dot/fastgr.ts +9 -3
- package/src/layout/dot/flat-adj-record.ts +68 -0
- package/src/layout/dot/init.ts +84 -13
- package/src/layout/dot/mincross-build.ts +14 -1
- package/src/layout/dot/position-aux.ts +10 -3
- package/src/layout/dot/splines-clone.ts +8 -2
- package/src/layout/dot/splines-flat-labeled.ts +3 -2
- package/src/layout/dot/splines-flat.ts +11 -21
- package/src/layout/dot/splines-groups.ts +7 -5
- package/src/layout/dot/splines-route.ts +2 -2
- package/src/layout/dot/splines.ts +8 -8
- package/src/layout/fdp/ports.ts +6 -2
- package/src/layout/neato/conjgrad-mkernel.ts +6 -2
- package/src/layout/neato/conjgrad.ts +2 -2
- package/src/layout/neato/fdp-adjust.ts +1 -16
- package/src/layout/neato/sgd.ts +2 -1
- package/src/layout/sfdp/spring-electrical.ts +5 -3
- package/src/model/cgraph-ops.ts +4 -3
- package/src/model/edge.ts +11 -4
- package/src/model/edgeInfo.ts +18 -2
- package/src/model/graph.ts +4 -3
- package/src/model/lazy-attrs.ts +3 -1
- package/src/parser/builder.ts +12 -3
- package/src/render/dot/agwrite-linelength.ts +58 -0
- package/src/render/dot/agwrite.ts +23 -16
- package/src/render/dot/attrs.ts +45 -8
- package/src/render/dot/write-back.ts +48 -3
- package/src/render/dot/xdot-ops.ts +26 -57
- package/src/render/dot.ts +16 -20
- package/src/render/json-cluster-edge.ts +87 -0
- package/src/render/json-nonfinite.ts +51 -0
- package/src/render/json.ts +36 -42
- package/src/render/map.ts +6 -7
- package/src/render/svg-graph.ts +9 -8
- package/src/render/svg-id.ts +11 -2
- package/src/render/svg.ts +7 -4
- package/src/util/bsd-qsort.ts +2 -1
- package/src/util/printf-round.ts +16 -10
- package/src/xdot/parse.ts +9 -19
- package/src/xdot/strtod.ts +167 -0
- package/dist/layout/dot/edge-order.d.ts +0 -27
- package/dist/layout/dot/edge-order.d.ts.map +0 -1
- package/src/layout/dot/edge-order.ts +0 -62
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
digraph G {
|
|
2
|
+
graph [_draw_="c 9 -#fffffe00 C 7 -#ffffff P 4 0 0 0 220 300 220 300 0 ",
|
|
3
|
+
bb="0,0,300,220",
|
|
4
|
+
xdotversion=1.7
|
|
5
|
+
];
|
|
6
|
+
node [color="#00ff005f",
|
|
7
|
+
fillcolor="#00ff005f",
|
|
8
|
+
label="\N",
|
|
9
|
+
style=filled
|
|
10
|
+
];
|
|
11
|
+
{
|
|
12
|
+
subgraph cluster_ss81 {
|
|
13
|
+
graph [_draw_="c 7 -#000000 p 4 64 8 64 204 134 204 134 8 ",
|
|
14
|
+
bb="64,8,134,204"
|
|
15
|
+
];
|
|
16
|
+
a [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 99 178 27 18 ",
|
|
17
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 99 173.8 0 6.21 1 -a ",
|
|
18
|
+
height=0.5,
|
|
19
|
+
pos="99,178",
|
|
20
|
+
width=0.75];
|
|
21
|
+
b [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 99 106 27 18 ",
|
|
22
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 99 101.8 0 7 1 -b ",
|
|
23
|
+
height=0.5,
|
|
24
|
+
pos="99,106",
|
|
25
|
+
width=0.75];
|
|
26
|
+
a -> b [_draw_="c 7 -#000000 B 4 99 159.7 99 152.41 99 143.73 99 135.54 ",
|
|
27
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 102.5 135.62 99 125.62 95.5 135.62 ",
|
|
28
|
+
pos="e,99,124.1 99,159.7 99,152.41 99,143.73 99,135.54"];
|
|
29
|
+
c [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 99 34 27 18 ",
|
|
30
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 99 29.8 0 6.21 1 -c ",
|
|
31
|
+
height=0.5,
|
|
32
|
+
pos="99,34",
|
|
33
|
+
width=0.75];
|
|
34
|
+
b -> c [_draw_="c 7 -#000000 B 4 99 87.7 99 80.41 99 71.73 99 63.54 ",
|
|
35
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 102.5 63.62 99 53.62 95.5 63.62 ",
|
|
36
|
+
pos="e,99,52.104 99,87.697 99,80.407 99,71.726 99,63.536"];
|
|
37
|
+
}
|
|
38
|
+
e [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 27 178 27 18 ",
|
|
39
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 27 173.8 0 6.21 1 -e ",
|
|
40
|
+
height=0.5,
|
|
41
|
+
pos="27,178",
|
|
42
|
+
width=0.75];
|
|
43
|
+
f [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 27 106 27 18 ",
|
|
44
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 27 101.8 0 4.66 1 -f ",
|
|
45
|
+
height=0.5,
|
|
46
|
+
pos="27,106",
|
|
47
|
+
width=0.75];
|
|
48
|
+
e -> f [_draw_="c 7 -#000000 B 4 27 159.7 27 152.41 27 143.73 27 135.54 ",
|
|
49
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 30.5 135.62 27 125.62 23.5 135.62 ",
|
|
50
|
+
pos="e,27,124.1 27,159.7 27,152.41 27,143.73 27,135.54"];
|
|
51
|
+
}
|
|
52
|
+
{
|
|
53
|
+
subgraph cluster_x {
|
|
54
|
+
graph [_draw_="c 7 -#000000 p 4 142 144 142 212 292 212 292 144 ",
|
|
55
|
+
bb="142,144,292,212"
|
|
56
|
+
];
|
|
57
|
+
subgraph cluster_y {
|
|
58
|
+
graph [_draw_="c 7 -#000000 p 4 150 152 150 204 220 204 220 152 ",
|
|
59
|
+
bb="150,152,220,204"
|
|
60
|
+
];
|
|
61
|
+
y [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 185 178 27 18 ",
|
|
62
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 185 173.8 0 7 1 -y ",
|
|
63
|
+
height=0.5,
|
|
64
|
+
pos="185,178",
|
|
65
|
+
width=0.75];
|
|
66
|
+
}
|
|
67
|
+
x [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 257 178 27 18 ",
|
|
68
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 257 173.8 0 7 1 -x ",
|
|
69
|
+
height=0.5,
|
|
70
|
+
pos="257,178",
|
|
71
|
+
width=0.75];
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
digraph G {
|
|
2
|
+
graph [_draw_="c 9 -#fffffe00 C 7 -#ffffff P 4 0 0 0 220 300 220 300 0 c 9 -#fffffe00 C 7 -#ffffff P 4 0 0 0 220 300 220 300 0 ",
|
|
3
|
+
bb="0,0,300,220",
|
|
4
|
+
xdotversion=1.7
|
|
5
|
+
];
|
|
6
|
+
node [color="#00ff005f",
|
|
7
|
+
fillcolor="#00ff005f",
|
|
8
|
+
label="\N",
|
|
9
|
+
style=filled
|
|
10
|
+
];
|
|
11
|
+
{
|
|
12
|
+
subgraph cluster_ss81 {
|
|
13
|
+
graph [_draw_="c 7 -#000000 p 4 64 8 64 204 134 204 134 8 ",
|
|
14
|
+
bb="64,8,134,204"
|
|
15
|
+
];
|
|
16
|
+
a [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
17
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 6.21 1 -a ",
|
|
18
|
+
height=0.5,
|
|
19
|
+
pos="0,178",
|
|
20
|
+
width=0.75];
|
|
21
|
+
b [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 106 27 18 ",
|
|
22
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 101.8 0 7 1 -b ",
|
|
23
|
+
height=0.5,
|
|
24
|
+
pos="0,106",
|
|
25
|
+
width=0.75];
|
|
26
|
+
a -> b [_draw_="c 7 -#000000 B 4 99 159.7 99 152.41 99 143.73 99 135.54 ",
|
|
27
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 102.5 135.62 99 125.62 95.5 135.62 ",
|
|
28
|
+
pos="e,99,124.1 99,159.7 99,152.41 99,143.73 99,135.54"];
|
|
29
|
+
c [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 34 27 18 ",
|
|
30
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 29.8 0 6.21 1 -c ",
|
|
31
|
+
height=0.5,
|
|
32
|
+
pos="0,34",
|
|
33
|
+
width=0.75];
|
|
34
|
+
b -> c [_draw_="c 7 -#000000 B 4 99 87.7 99 80.41 99 71.73 99 63.54 ",
|
|
35
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 102.5 63.62 99 53.62 95.5 63.62 ",
|
|
36
|
+
pos="e,99,52.104 99,87.697 99,80.407 99,71.726 99,63.536"];
|
|
37
|
+
}
|
|
38
|
+
e [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
39
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 6.21 1 -e ",
|
|
40
|
+
height=0.5,
|
|
41
|
+
pos="0,178",
|
|
42
|
+
width=0.75];
|
|
43
|
+
f [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 1 106 27 18 ",
|
|
44
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 1 101.8 0 4.66 1 -f ",
|
|
45
|
+
height=0.5,
|
|
46
|
+
pos="1,106",
|
|
47
|
+
width=0.75];
|
|
48
|
+
e -> f [_draw_="c 7 -#000000 B 4 27 159.7 27 152.41 27 143.73 27 135.54 ",
|
|
49
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 30.5 135.62 27 125.62 23.5 135.62 ",
|
|
50
|
+
pos="e,27,124.1 27,159.7 27,152.41 27,143.73 27,135.54"];
|
|
51
|
+
}
|
|
52
|
+
{
|
|
53
|
+
subgraph cluster_x {
|
|
54
|
+
graph [_draw_="c 7 -#000000 p 4 142 144 142 212 292 212 292 144 ",
|
|
55
|
+
bb="142,144,292,212"
|
|
56
|
+
];
|
|
57
|
+
subgraph cluster_y {
|
|
58
|
+
graph [_draw_="c 7 -#000000 p 4 150 152 150 204 220 204 220 152 ",
|
|
59
|
+
bb="150,152,220,204"
|
|
60
|
+
];
|
|
61
|
+
y [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
62
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 7 1 -y ",
|
|
63
|
+
height=0.5,
|
|
64
|
+
pos="0,178",
|
|
65
|
+
width=0.75];
|
|
66
|
+
}
|
|
67
|
+
x [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
68
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 7 1 -x ",
|
|
69
|
+
height=0.5,
|
|
70
|
+
pos="0,178",
|
|
71
|
+
width=0.75];
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
digraph G {
|
|
2
|
+
graph [_draw_="c 9 -#fffffe00 C 7 -#ffffff P 4 0 0 0 220 300 220 300 0 c 9 -#fffffe00 C 7 -#ffffff P 4 0 0 0 220 300 220 300 0 c 9 -#fffffe00 C \
|
|
3
|
+
7 -#ffffff P 4 0 0 0 220 300 220 300 0 ",
|
|
4
|
+
bb="0,0,300,220",
|
|
5
|
+
xdotversion=1.7
|
|
6
|
+
];
|
|
7
|
+
node [color="#00ff005f",
|
|
8
|
+
fillcolor="#00ff005f",
|
|
9
|
+
label="\N",
|
|
10
|
+
style=filled
|
|
11
|
+
];
|
|
12
|
+
{
|
|
13
|
+
subgraph cluster_ss81 {
|
|
14
|
+
graph [_draw_="c 7 -#000000 p 4 64 8 64 204 134 204 134 8 ",
|
|
15
|
+
bb="64,8,134,204"
|
|
16
|
+
];
|
|
17
|
+
a [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
18
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 6.21 1 -a ",
|
|
19
|
+
height=0.5,
|
|
20
|
+
pos="0,178",
|
|
21
|
+
width=0.75];
|
|
22
|
+
b [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 106 27 18 ",
|
|
23
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 101.8 0 7 1 -b ",
|
|
24
|
+
height=0.5,
|
|
25
|
+
pos="0,106",
|
|
26
|
+
width=0.75];
|
|
27
|
+
a -> b [_draw_="c 7 -#000000 B 4 99 159.7 99 152.41 99 143.73 99 135.54 ",
|
|
28
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 102.5 135.62 99 125.62 95.5 135.62 ",
|
|
29
|
+
pos="e,99,124.1 99,159.7 99,152.41 99,143.73 99,135.54"];
|
|
30
|
+
c [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 34 27 18 ",
|
|
31
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 29.8 0 6.21 1 -c ",
|
|
32
|
+
height=0.5,
|
|
33
|
+
pos="0,34",
|
|
34
|
+
width=0.75];
|
|
35
|
+
b -> c [_draw_="c 7 -#000000 B 4 99 87.7 99 80.41 99 71.73 99 63.54 S 5 -solid c 7 -#000000 B 4 0 87.7 0 80.41 0 71.73 0 63.54 ",
|
|
36
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 102.5 63.62 99 53.62 95.5 63.62 S 5 -solid c 7 -#000000 C 7 -#000000 P 3 3.5 63.62 0 53.62 \
|
|
37
|
+
-3.5 63.62 ",
|
|
38
|
+
pos="e,99,52.104 99,87.697 99,80.407 99,71.726 99,63.536;e,0,52.104 0,87.697 0,80.407 0,71.726 0,63.536"];
|
|
39
|
+
}
|
|
40
|
+
e [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
41
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 6.21 1 -e ",
|
|
42
|
+
height=0.5,
|
|
43
|
+
pos="0,178",
|
|
44
|
+
width=0.75];
|
|
45
|
+
f [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 106 27 18 ",
|
|
46
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 101.8 0 4.66 1 -f ",
|
|
47
|
+
height=0.5,
|
|
48
|
+
pos="0,106",
|
|
49
|
+
width=0.75];
|
|
50
|
+
e -> f [_draw_="c 7 -#000000 B 4 27 159.7 27 152.41 27 143.73 27 135.54 ",
|
|
51
|
+
_hdraw_="S 5 -solid c 7 -#000000 C 7 -#000000 P 3 30.5 135.62 27 125.62 23.5 135.62 ",
|
|
52
|
+
pos="e,27,124.1 27,159.7 27,152.41 27,143.73 27,135.54"];
|
|
53
|
+
}
|
|
54
|
+
{
|
|
55
|
+
subgraph cluster_x {
|
|
56
|
+
graph [_draw_="c 7 -#000000 p 4 142 144 142 212 292 212 292 144 ",
|
|
57
|
+
bb="142,144,292,212"
|
|
58
|
+
];
|
|
59
|
+
subgraph cluster_y {
|
|
60
|
+
graph [_draw_="c 7 -#000000 p 4 150 152 150 204 220 204 220 152 ",
|
|
61
|
+
bb="150,152,220,204"
|
|
62
|
+
];
|
|
63
|
+
y [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
64
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 7 1 -y ",
|
|
65
|
+
height=0.5,
|
|
66
|
+
pos="0,178",
|
|
67
|
+
width=0.75];
|
|
68
|
+
}
|
|
69
|
+
x [_draw_="c 9 -#00ff005f C 9 -#00ff005f E 0 178 27 18 ",
|
|
70
|
+
_ldraw_="F 14 11 -Times-Roman c 7 -#000000 T 0 173.8 0 7 1 -x ",
|
|
71
|
+
height=0.5,
|
|
72
|
+
pos="0,178",
|
|
73
|
+
width=0.75];
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
@@ -58,6 +58,11 @@ for c in abom-shift abom-shift-parity abom-shift-pack; do
|
|
|
58
58
|
done
|
|
59
59
|
# tests/2368.dot: its third layout merges an edge flagged adjacent into a new reversed flat edge.
|
|
60
60
|
run flat-rev-stale dot plain nofree flat-rev-stale.dot.plain.nofree
|
|
61
|
+
# Part 11 T8: tests/graphs/nestedclust.gv. Layout 3 continues decompose's Cmark past layout 2's ND_mark, and
|
|
62
|
+
# dot_splines_ routes only the edges in the rank arrays.
|
|
63
|
+
for f in dot xdot; do
|
|
64
|
+
run nestedclust dot "$f" nofree "nestedclust.dot.$f.nofree"
|
|
65
|
+
done
|
|
61
66
|
for e in neato fdp circo; do
|
|
62
67
|
run filing dot plain "then:$e" "filing.dot.plain.then-$e"
|
|
63
68
|
rm -f "filing.dot.plain.then-$e.1"
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
// SPDX-License-Identifier: EPL-2.0
|
|
2
|
+
// The renders part-11 T7's harness compares with native (harness/T7/port-vs-native.ts):
|
|
3
|
+
// subg-after-free.c's modes on harness/T0/subg.gv, fdp and osage, xdot and svg.
|
|
4
|
+
// root: layout root, render, free; layout subgraph, render, free; layout root, render, free
|
|
5
|
+
// nofree: layout root, render; layout subgraph (no free), render, free
|
|
6
|
+
// Native refs: harness/T7b/noaddr (fdp's settled, ND_id-ordered class; regen.sh).
|
|
7
|
+
import { readFileSync } from 'node:fs';
|
|
8
|
+
import { parse } from '../../../parser/index.js';
|
|
9
|
+
import type { EngineName } from '../../context.js';
|
|
10
|
+
import { createDefaultContext } from '../../default-context.js';
|
|
11
|
+
import { render as deviceRender } from '../../device.js';
|
|
12
|
+
|
|
13
|
+
const HARNESS = new URL('../../../../plans/post-16-1-followups-11/harness/', import.meta.url);
|
|
14
|
+
const read = (name: string): string => readFileSync(new URL(name, HARNESS), 'latin1');
|
|
15
|
+
|
|
16
|
+
export type SubgMode = 'root' | 'nofree';
|
|
17
|
+
export type SubgFmt = 'xdot' | 'svg';
|
|
18
|
+
|
|
19
|
+
/** Native's renders of one case, in order (harness/T7b/noaddr). */
|
|
20
|
+
export function nativeSubgRenders(engine: EngineName, sub: string, mode: SubgMode, fmt: SubgFmt): string[] {
|
|
21
|
+
return read(`T7b/noaddr/subg-${engine}.${sub}.${mode}.${fmt}`).split(/^== render \d+\n/m).slice(1);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** The port's renders of one case, in the harness's order. */
|
|
25
|
+
export function portSubgRenders(engine: EngineName, sub: string, mode: SubgMode, fmt: SubgFmt): string[] {
|
|
26
|
+
const g = parse(read('T0/subg.gv'));
|
|
27
|
+
const s = g.subgraphs.get(sub);
|
|
28
|
+
if (s === undefined) throw new Error(`no subgraph ${sub}`);
|
|
29
|
+
const ctx = createDefaultContext();
|
|
30
|
+
const out: string[] = [];
|
|
31
|
+
ctx.layout(g, engine);
|
|
32
|
+
out.push(deviceRender(ctx, g, fmt));
|
|
33
|
+
if (mode !== 'nofree') ctx.freeLayout(g, engine);
|
|
34
|
+
ctx.layout(s, engine);
|
|
35
|
+
out.push(deviceRender(ctx, s, fmt));
|
|
36
|
+
ctx.freeLayout(s, engine);
|
|
37
|
+
if (mode === 'root') {
|
|
38
|
+
ctx.layout(g, engine);
|
|
39
|
+
out.push(deviceRender(ctx, g, fmt));
|
|
40
|
+
ctx.freeLayout(g, engine);
|
|
41
|
+
}
|
|
42
|
+
return out;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** svg's generator banner and `<svg>` tag layout differ from native's on every render; drop them. */
|
|
46
|
+
export function svgBody(svg: string): string {
|
|
47
|
+
return svg.slice(svg.indexOf('<g id="graph'));
|
|
48
|
+
}
|
package/src/gvc/context.ts
CHANGED
|
@@ -64,6 +64,14 @@ export interface RendererPlugin {
|
|
|
64
64
|
readonly type: string;
|
|
65
65
|
/** Capability quality — higher wins when multiple plugins match the same format. */
|
|
66
66
|
readonly quality: number;
|
|
67
|
+
/**
|
|
68
|
+
* The pad around the drawing, in graph units (points), when the graph sets no
|
|
69
|
+
* `pad=`. A renderer that omits it gets `DEFAULT_GRAPH_PAD`, as C's output
|
|
70
|
+
* languages that are not render plugins do.
|
|
71
|
+
* @see lib/gvc/gvcjob.h gvrender_features_t.default_pad
|
|
72
|
+
* @see lib/common/emit.c:3290-3304 init_job_pad
|
|
73
|
+
*/
|
|
74
|
+
readonly defaultPad?: number;
|
|
67
75
|
|
|
68
76
|
beginGraph(g: Graph, job: RenderJob): void;
|
|
69
77
|
endGraph(g: Graph, job: RenderJob): void;
|
package/src/gvc/device.ts
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
|
|
15
15
|
import { POINTS_PER_INCH } from '../model/geom.js';
|
|
16
16
|
import { lateDouble } from '../common/nodeinit.js';
|
|
17
|
-
import { parseDrawingSize, initJobViewportZoom, parseLandscape, parseGraphPad, parseGraphMargin,
|
|
17
|
+
import { parseDrawingSize, initJobViewportZoom, parseLandscape, parseGraphPad, parseGraphMargin, DEFAULT_GRAPH_PAD } from './viewport.js';
|
|
18
18
|
import type { Graph } from '../model/graph.js';
|
|
19
19
|
import type { Node } from '../model/node.js';
|
|
20
20
|
import type { Edge } from '../model/edge.js';
|
|
@@ -26,6 +26,7 @@ import type { ShapeDesc, TextlabelT } from '../common/types.js';
|
|
|
26
26
|
import { type LayerInfo, parseLayers } from '../common/layers.js';
|
|
27
27
|
import { RenderJob, EMIT_CLUSTERS_LAST, createObjState, ObjType, EmitState } from './job.js';
|
|
28
28
|
import { walkNodesAndEdges } from './emit-walk.js';
|
|
29
|
+
import { initBb } from '../common/emit-bb.js';
|
|
29
30
|
import { firstLayer, nextLayer, numPhysicalLayers, validLayer } from './first-layer.js';
|
|
30
31
|
import { polyInit } from '../common/poly-init.js';
|
|
31
32
|
import {
|
|
@@ -50,7 +51,7 @@ import {
|
|
|
50
51
|
import { emitRoundedBezier } from '../common/poly-shapes.js';
|
|
51
52
|
import { applyClusterObjState, clusterAttr, clusterStyle, clusterPeripheries, isStripedCluster, renderStripedClusterBox } from './device-cluster.js';
|
|
52
53
|
import { transformPoint } from './device-transform.js';
|
|
53
|
-
import { emitXdot } from './emit-xdot.js';
|
|
54
|
+
import { deviceClip, emitXdot } from './emit-xdot.js';
|
|
54
55
|
import { gvrenderSetStyle, edgeStyleResets } from './gvrender-set-style.js';
|
|
55
56
|
import { renderOneLabel, renderNodeXLabel, renderClusterLabel, reportEdgeLabelColors } from './device-labels.js';
|
|
56
57
|
export { transformPoint, applyRotation, applyScale, buildPoint } from './device-transform.js';
|
|
@@ -230,7 +231,7 @@ export function renderEdge(e: Edge, renderer: RendererPlugin, job: RenderJob): v
|
|
|
230
231
|
* @see lib/common/emit.c:emit_page (3656-3657)
|
|
231
232
|
*/
|
|
232
233
|
export function renderGraphLabel(g: Graph, renderer: RendererPlugin, job: RenderJob): void {
|
|
233
|
-
// @see lib/common/emit.c:emit_begin_graph / getObjId (
|
|
234
|
+
// @see lib/common/emit.c:emit_begin_graph / getObjId (graph being emitted → graph<AGSEQ>)
|
|
234
235
|
setHtmlAnchorObj(svgGraphId(g, job), labelTextOf(g.info.label), job.obj ?? undefined);
|
|
235
236
|
renderOneLabel(g.info.label as TextlabelT | undefined, renderer, job, false);
|
|
236
237
|
}
|
|
@@ -413,6 +414,15 @@ function renderPage(g: Graph, renderer: RendererPlugin, job: RenderJob, info: La
|
|
|
413
414
|
// render — top-level convenience
|
|
414
415
|
// ---------------------------------------------------------------------------
|
|
415
416
|
|
|
417
|
+
/** A job for `format` carrying the context's image hooks. */
|
|
418
|
+
function newRenderJob(ctx: GvcContext, format: string, inlineImages: boolean): RenderJob {
|
|
419
|
+
const job = new RenderJob(format, ctx.textMeasurer);
|
|
420
|
+
job.inlineImages = inlineImages;
|
|
421
|
+
if (ctx.imageResolver !== undefined) job.imageResolver = ctx.imageResolver;
|
|
422
|
+
if (ctx.imageSizer !== undefined) job.imageSizer = ctx.imageSizer;
|
|
423
|
+
return job;
|
|
424
|
+
}
|
|
425
|
+
|
|
416
426
|
/**
|
|
417
427
|
* Select renderer, create job, initialise bb from graph, then render.
|
|
418
428
|
*
|
|
@@ -430,38 +440,27 @@ export function render(ctx: GvcContext, g: Graph, format: string, inlineImages =
|
|
|
430
440
|
if (!(ctx instanceof GvcContext)) throw invalidArgType('ctx', 'GvcContext', ctx);
|
|
431
441
|
if (typeof g !== 'object' || g === null) throw invalidArgType('g', 'object', g);
|
|
432
442
|
const renderer = ctx.bestRenderer(format);
|
|
433
|
-
const job =
|
|
434
|
-
|
|
435
|
-
if (ctx.imageResolver !== undefined) job.imageResolver = ctx.imageResolver;
|
|
436
|
-
if (ctx.imageSizer !== undefined) job.imageSizer = ctx.imageSizer;
|
|
443
|
+
const job = newRenderJob(ctx, format, inlineImages);
|
|
444
|
+
initBb(g); // spl->bb for edge_in_box, before init_gvc. @see lib/common/emit.c:4216
|
|
437
445
|
// gvc->bb = GD_bb(g) verbatim -- no recompute fallback. Every layout engine
|
|
438
|
-
// sets g.info.bb itself before render() runs
|
|
439
|
-
//
|
|
440
|
-
//
|
|
441
|
-
//
|
|
442
|
-
// the
|
|
443
|
-
// excluding every node via node_in_box -- do not paper over that with a
|
|
444
|
-
// recompute, it is the mechanism that produces C's near-empty output.
|
|
446
|
+
// sets g.info.bb itself before render() runs; when a layout phase aborts
|
|
447
|
+
// before that point (2825: dot_position fails before set_aspect), C leaves
|
|
448
|
+
// GD_bb at its zero default and the degenerate box propagates into the clip
|
|
449
|
+
// below, excluding every node via node_in_box -- do not paper over that with
|
|
450
|
+
// a recompute, it is the mechanism that produces C's near-empty output.
|
|
445
451
|
// @see lib/common/emit.c:3272 init_gvc (gvc->bb = GD_bb(g))
|
|
446
452
|
job.bb = g.info.bb;
|
|
447
|
-
// init_job_pad:
|
|
448
|
-
// size= fit
|
|
449
|
-
// (emit.c:4289-4291) because the fit uses the padded bb.
|
|
453
|
+
// init_job_pad: job.pad from `pad=`, else the render device's default pad,
|
|
454
|
+
// before the size= fit, which uses the padded bb (emit.c:4289-4291).
|
|
450
455
|
// @see lib/common/emit.c:3241-3251 (attr read); :3290-3304 (fallback)
|
|
451
|
-
job.pad = parseGraphPad(g.attrs.get('pad'));
|
|
452
|
-
// init_job_margin
|
|
453
|
-
//
|
|
454
|
-
//
|
|
455
|
-
// read here and consumed later, after Z is known, by emitSvgTag/svgBeginPage
|
|
456
|
-
// (job.width/height and the page group translate), matching C's
|
|
457
|
-
// init_job_margin -> init_job_dpi -> init_job_viewport -> init_job_pagination
|
|
458
|
-
// order where margin is resolved before Z but only used after it.
|
|
456
|
+
job.pad = parseGraphPad(g.attrs.get('pad'), renderer.defaultPad ?? DEFAULT_GRAPH_PAD);
|
|
457
|
+
// init_job_margin, right after init_job_pad (emit.c:4290-4291). margin does
|
|
458
|
+
// not feed the size= fit (only pad does); emitSvgTag/svgBeginPage use it after
|
|
459
|
+
// Z is known, as C resolves it before init_job_viewport and uses it after.
|
|
459
460
|
// @see lib/common/emit.c:3229-3239 (attr read); :3309-3331 (fallback)
|
|
460
461
|
job.margin = parseGraphMargin(g.attrs.get('margin'));
|
|
461
462
|
// init_job_viewport: fit the drawing into size= via a zoom Z carried by the
|
|
462
|
-
// SVG group transform (D1: parse here, not graph_init).
|
|
463
|
-
//
|
|
464
|
-
// Correction to D3: only the trailing `!` on size= sets the *filled* flag
|
|
463
|
+
// SVG group transform (D1: parse here, not graph_init). Correction to D3: only the trailing `!` on size= sets the *filled* flag
|
|
465
464
|
// that init_job_viewport reads (input.c:694 GD_drawing->filled =
|
|
466
465
|
// getdoubles2ptf). `ratio=fill` instead sets ratio_kind=R_FILL (setRatio),
|
|
467
466
|
// which reshapes the *layout* (out of scope, D3) and does NOT feed
|
|
@@ -479,7 +478,7 @@ export function render(ctx: GvcContext, g: Graph, format: string, inlineImages =
|
|
|
479
478
|
// not job->zoom. job.scale is read only by the SVG group/dims.
|
|
480
479
|
const drawingSize = parseDrawingSize(g.attrs.get('size'));
|
|
481
480
|
const z = initJobViewportZoom(job.bb, drawingSize, job.pad);
|
|
482
|
-
job.clip =
|
|
481
|
+
job.clip = deviceClip(g, job); // @see lib/common/emit.c:1550-1564 setup_page
|
|
483
482
|
// init_job_dpi (emit.c:3333): GD_drawing->dpi = late_double(dpi, resolution, 0)
|
|
484
483
|
// (input.c:713). When >0 it becomes job->dpi; otherwise the SVG device's
|
|
485
484
|
// default_dpi = 72 (gvrender_core_svg.c:814) applies. init_job_viewport then
|
package/src/gvc/emit-gates.ts
CHANGED
|
@@ -31,27 +31,18 @@ function nodeBBox(n: Node): Box {
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
|
-
* node_in_box: is the node's own bbox within job's page
|
|
34
|
+
* node_in_box: is the node's own bbox within the job's page clip?
|
|
35
35
|
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
* port implements — Z and rotation cancel out of that derivation). This port
|
|
41
|
-
* has no separate `page=` pagination model, so `job.bb` padded by `job.pad`
|
|
42
|
-
* IS `job->clip` here.
|
|
36
|
+
* emit_node passes `job->clip`, which setup_page builds from the bb padded by
|
|
37
|
+
* the device's pad (see deviceClip). The edge gate, the clusters and the
|
|
38
|
+
* background read the same box, so `job.clip` has to be set before a node is
|
|
39
|
+
* rendered; `render` sets it.
|
|
43
40
|
*
|
|
44
41
|
* @see lib/common/emit.c:1636-1639 node_in_box
|
|
45
42
|
* @see lib/common/emit.c:1808 emit_node gate
|
|
46
|
-
* @see lib/common/emit.c:3356 init_job_viewport (job->bb = gvc->bb ± pad)
|
|
47
|
-
* @see lib/common/emit.c:1553-1564 setup_page (job->clip from focus/view)
|
|
48
43
|
*/
|
|
49
44
|
export function nodeInBox(n: Node, job: RenderJob): boolean {
|
|
50
|
-
|
|
51
|
-
ll: { x: job.bb.ll.x - job.pad.x, y: job.bb.ll.y - job.pad.y },
|
|
52
|
-
ur: { x: job.bb.ur.x + job.pad.x, y: job.bb.ur.y + job.pad.y },
|
|
53
|
-
};
|
|
54
|
-
return boxOverlap(nodeBBox(n), clip);
|
|
45
|
+
return boxOverlap(nodeBBox(n), job.clip);
|
|
55
46
|
}
|
|
56
47
|
|
|
57
48
|
/**
|
|
@@ -81,7 +72,7 @@ export function emitNodeComments(n: Node, renderer: RendererPlugin, job: RenderJ
|
|
|
81
72
|
* @see lib/common/emit.c:emit_edge (gvrender_comment x2)
|
|
82
73
|
*/
|
|
83
74
|
export function emitEdgeComments(e: Edge, renderer: RendererPlugin, job: RenderJob): void {
|
|
84
|
-
if (!edgeHasDrawableContent(e, job.
|
|
75
|
+
if (!edgeHasDrawableContent(e, job.clip)) return;
|
|
85
76
|
const kind = e.head.root.kind; // agisdirected(agraphof(aghead(e)))
|
|
86
77
|
const op = kind === 'directed' || kind === 'strict-directed' ? '->' : '--';
|
|
87
78
|
gvrenderComment(renderer, job, e.tail.name + op + e.head.name);
|
package/src/gvc/emit-xdot.ts
CHANGED
|
@@ -19,7 +19,7 @@ import { transformPoint } from './device-transform.js';
|
|
|
19
19
|
import { graphXdots } from './init-xdot.js';
|
|
20
20
|
import { gvrenderSetStyle } from './gvrender-set-style.js';
|
|
21
21
|
import type { ObjState, RenderJob } from './job.js';
|
|
22
|
-
import { initJobViewportZoom, parseDrawingSize,
|
|
22
|
+
import { initJobViewportZoom, parseDrawingSize, setupPageClip } from './viewport.js';
|
|
23
23
|
|
|
24
24
|
/** @see lib/common/const.h:48 */
|
|
25
25
|
const DEFAULT_COLOR = 'black';
|
|
@@ -30,18 +30,16 @@ const DEFAULT_FILL = 'lightgrey';
|
|
|
30
30
|
const DEFAULT_LINE_STYLE: readonly string[] = ['solid', 'setlinewidth(1)'];
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
|
-
* job->clip
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
* @see lib/common/emit.c:
|
|
33
|
+
* job->clip, computed in C's order, rounding included, from the bb and
|
|
34
|
+
* `job.pad`. init_job_pad has already made that pad the device's: with no
|
|
35
|
+
* `pad=` it is 4 on svg and map, and 0 on dot, xdot, plain and json, whose clip
|
|
36
|
+
* is then the bb.
|
|
37
|
+
* @see lib/common/emit.c:3290-3304 init_job_pad
|
|
38
|
+
* @see lib/common/emit.c:1550-1564 setup_page
|
|
38
39
|
*/
|
|
39
|
-
function deviceClip(g: Graph,
|
|
40
|
-
if (renderer.type === 'svg') return job.clip;
|
|
41
|
-
const attr = g.attrs.get('pad');
|
|
42
|
-
const pad = attr ? parseGraphPad(attr) : { x: 0, y: 0 };
|
|
40
|
+
export function deviceClip(g: Graph, job: RenderJob): Box {
|
|
43
41
|
const size = parseDrawingSize(g.attrs.get('size'));
|
|
44
|
-
return setupPageClip(job.bb, size, pad, initJobViewportZoom(job.bb, size, pad));
|
|
42
|
+
return setupPageClip(job.bb, size, job.pad, initJobViewportZoom(job.bb, size, job.pad));
|
|
45
43
|
}
|
|
46
44
|
|
|
47
45
|
/**
|
|
@@ -211,7 +209,7 @@ export function emitXdot(g: Graph, renderer: RendererPlugin, job: RenderJob): vo
|
|
|
211
209
|
const obj = job.obj;
|
|
212
210
|
if (xd === undefined || obj === null) return;
|
|
213
211
|
applyBackgroundState(g, renderer, obj);
|
|
214
|
-
const inClip = zeroBoxInClip(deviceClip(g,
|
|
212
|
+
const inClip = zeroBoxInClip(deviceClip(g, job));
|
|
215
213
|
const warned = { image: false };
|
|
216
214
|
let styled = false;
|
|
217
215
|
for (const op of xd.ops) {
|
package/src/gvc/job.ts
CHANGED
|
@@ -274,10 +274,13 @@ export class RenderJob {
|
|
|
274
274
|
readonly format: string;
|
|
275
275
|
|
|
276
276
|
bb: Box = { ll: { x: 0, y: 0 }, ur: { x: 0, y: 0 } };
|
|
277
|
+
/** `pad=`, or else the render device's default pad (`RendererPlugin.defaultPad`).
|
|
278
|
+
* @see lib/common/emit.c:3290-3304 init_job_pad */
|
|
277
279
|
pad: Point = { x: 0, y: 0 };
|
|
278
280
|
/** Current page clip in graph units, as setup_page computes it from the
|
|
279
|
-
* viewport focus/view (see setupPageClip). Read by the
|
|
280
|
-
*
|
|
281
|
+
* viewport focus/view (see setupPageClip). Read by the node and edge gates
|
|
282
|
+
* and by the SVG page translate and background.
|
|
283
|
+
* @see lib/gvc/gvcjob.h:GVJ_s.clip; lib/common/emit.c:setup_page */
|
|
281
284
|
clip: Box = { ll: { x: 0, y: 0 }, ur: { x: 0, y: 0 } };
|
|
282
285
|
/** Graph-level `margin=` (init_job_margin); page-pagination margin, distinct
|
|
283
286
|
* from node/cluster label margin. @see lib/common/emit.c:3309-3331 */
|
package/src/gvc/viewport.ts
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
|
|
27
27
|
import type { Box, Point } from '../model/geom.js';
|
|
28
28
|
import { POINTS_PER_INCH } from '../model/geom.js';
|
|
29
|
-
import {
|
|
29
|
+
import { SVG_MARGIN } from '../render/svg-helpers.js';
|
|
30
30
|
import type { Graph } from '../model/graph.js';
|
|
31
31
|
import { cround } from '../common/arith.js';
|
|
32
32
|
|
|
@@ -76,14 +76,20 @@ export function parseDrawingSize(raw: string | undefined): DrawingSize | null {
|
|
|
76
76
|
return null;
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
/**
|
|
80
|
+
* The pad init_job_pad gives an output language that is not a render plugin,
|
|
81
|
+
* in points. Here it is the pad of a renderer that states no `defaultPad`.
|
|
82
|
+
* @see lib/common/const.h:96
|
|
83
|
+
*/
|
|
84
|
+
export const DEFAULT_GRAPH_PAD = 4;
|
|
85
|
+
|
|
79
86
|
/**
|
|
80
87
|
* Port of the `pad=` graph-attribute parse: init_gvc reads it via
|
|
81
88
|
* `sscanf(p, "%lf,%lf", &xf, &yf)` (2 values matched → both axes
|
|
82
89
|
* independently; 1 value → y = x; 0 matched — attr absent or unparsable —
|
|
83
|
-
* leaves `graph_sets_pad` false) and init_job_pad
|
|
84
|
-
* plugin's `default_pad` (
|
|
85
|
-
*
|
|
86
|
-
* branches collapse to the same constant here (`SVG_PAD`).
|
|
90
|
+
* leaves `graph_sets_pad` false) and init_job_pad then takes `fallback` on
|
|
91
|
+
* both axes: the render plugin's `default_pad` (`RendererPlugin.defaultPad`),
|
|
92
|
+
* or `DEFAULT_GRAPH_PAD` where there is none.
|
|
87
93
|
*
|
|
88
94
|
* Unlike `size=`, pad values are NOT rounded (`xf * POINTS_PER_INCH`
|
|
89
95
|
* directly — no `POINTS()` macro) and are not required to be positive.
|
|
@@ -91,7 +97,7 @@ export function parseDrawingSize(raw: string | undefined): DrawingSize | null {
|
|
|
91
97
|
* @see lib/common/emit.c:3241-3251 init_gvc (pad attr read)
|
|
92
98
|
* @see lib/common/emit.c:3290-3304 init_job_pad (fallback)
|
|
93
99
|
*/
|
|
94
|
-
export function parseGraphPad(raw: string | undefined): Point {
|
|
100
|
+
export function parseGraphPad(raw: string | undefined, fallback: number): Point {
|
|
95
101
|
if (raw !== undefined) {
|
|
96
102
|
const xy = PAD_XY_RE.exec(raw);
|
|
97
103
|
if (xy) {
|
|
@@ -103,7 +109,7 @@ export function parseGraphPad(raw: string | undefined): Point {
|
|
|
103
109
|
return { x: v, y: v };
|
|
104
110
|
}
|
|
105
111
|
}
|
|
106
|
-
return { x:
|
|
112
|
+
return { x: fallback, y: fallback };
|
|
107
113
|
}
|
|
108
114
|
|
|
109
115
|
/**
|