diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index e77198de2..6e6703812 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -7,6 +7,8 @@ #### Improvements 🧹 - `dagre` layouts that have a connection where one endpoint is a container is much improved. [#1011](https://github.com/terrastruct/d2/pull/1011) +- `elk` layouts favor balance over straight edges. [#1028](https://github.com/terrastruct/d2/pull/1028) +- `elk` layouts have nicer margins between node boundaries and edges. [#1028](https://github.com/terrastruct/d2/pull/1028) - `sketch` draws connections with less roughness, which especially improves look of corner bends in ELK. [#1014](https://github.com/terrastruct/d2/pull/1014) - CSS in SVGs are diagram-specific, which means you can embed multiple D2 diagrams on a web page without fear of style conflicts. [#1016](https://github.com/terrastruct/d2/pull/1016) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 53e0c4395..7cf396ffe 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -8,6 +8,7 @@ import ( "context" _ "embed" "encoding/json" + "errors" "fmt" "math" "strings" @@ -97,6 +98,8 @@ var DefaultOpts = ConfigurableOpts{ var port_spacing = 40. type elkOpts struct { + EdgeNode int `json:"elk.spacing.edgeNode,omitempty"` + FixedAlignment string `json:"elk.layered.nodePlacement.bk.fixedAlignment,omitempty"` Thoroughness int `json:"elk.layered.thoroughness,omitempty"` EdgeEdgeBetweenLayersSpacing int `json:"elk.layered.spacing.edgeEdgeBetweenLayers,omitempty"` Direction string `json:"elk.direction"` @@ -140,7 +143,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err LayoutOptions: &elkOpts{ Thoroughness: 8, EdgeEdgeBetweenLayersSpacing: 50, + EdgeNode: 40, HierarchyHandling: "INCLUDE_CHILDREN", + FixedAlignment: "BALANCED", ConsiderModelOrder: "NODES_AND_EDGES", ConfigurableOpts: ConfigurableOpts{ Algorithm: opts.Algorithm, @@ -218,6 +223,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err Thoroughness: 8, EdgeEdgeBetweenLayersSpacing: 50, HierarchyHandling: "INCLUDE_CHILDREN", + FixedAlignment: "BALANCED", + EdgeNode: 40, ConsiderModelOrder: "NODES_AND_EDGES", // Why is it (height, width)? I have no clue, but it works. NodeSizeMinimum: fmt.Sprintf("(%d, %d)", int(math.Ceil(height)), int(math.Ceil(width))), @@ -252,6 +259,10 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err paddingTop, ) } + } else { + n.LayoutOptions = &elkOpts{ + // Margins: "[top=100,left=100,bottom=100,right=100]", + } } if obj.LabelWidth != nil && obj.LabelHeight != nil { @@ -303,7 +314,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err val, err := vm.RunString(`elk.layout(graph) .then(s => s) -.catch(s => s) +.catch(err => err.message) `) if err != nil { @@ -324,7 +335,21 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err continue } - jsonOut := promise.Result().Export().(map[string]interface{}) + if promise.State() == goja.PromiseStateRejected { + return errors.New("ELK: something went wrong") + } + + result := promise.Result().Export() + + var jsonOut map[string]interface{} + switch out := result.(type) { + case string: + return fmt.Errorf("ELK layout error: %s", out) + case map[string]interface{}: + jsonOut = out + default: + return fmt.Errorf("ELK unexpected return: %v", out) + } jsonBytes, err := json.Marshal(jsonOut) if err != nil { diff --git a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg index 584af2552..c110ca200 100644 --- a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1972917360 .fill-N1{fill:#0A0F25;} + .d2-1972917360 .fill-N2{fill:#676C7E;} + .d2-1972917360 .fill-N3{fill:#9499AB;} + .d2-1972917360 .fill-N4{fill:#CFD2DD;} + .d2-1972917360 .fill-N5{fill:#DEE1EB;} + .d2-1972917360 .fill-N6{fill:#EEF1F8;} + .d2-1972917360 .fill-N7{fill:#FFFFFF;} + .d2-1972917360 .fill-B1{fill:#0D32B2;} + .d2-1972917360 .fill-B2{fill:#0D32B2;} + .d2-1972917360 .fill-B3{fill:#E3E9FD;} + .d2-1972917360 .fill-B4{fill:#E3E9FD;} + .d2-1972917360 .fill-B5{fill:#EDF0FD;} + .d2-1972917360 .fill-B6{fill:#F7F8FE;} + .d2-1972917360 .fill-AA2{fill:#4A6FF3;} + .d2-1972917360 .fill-AA4{fill:#EDF0FD;} + .d2-1972917360 .fill-AA5{fill:#F7F8FE;} + .d2-1972917360 .fill-AB4{fill:#EDF0FD;} + .d2-1972917360 .fill-AB5{fill:#F7F8FE;} + .d2-1972917360 .stroke-N1{stroke:#0A0F25;} + .d2-1972917360 .stroke-N2{stroke:#676C7E;} + .d2-1972917360 .stroke-N3{stroke:#9499AB;} + .d2-1972917360 .stroke-N4{stroke:#CFD2DD;} + .d2-1972917360 .stroke-N5{stroke:#DEE1EB;} + .d2-1972917360 .stroke-N6{stroke:#EEF1F8;} + .d2-1972917360 .stroke-N7{stroke:#FFFFFF;} + .d2-1972917360 .stroke-B1{stroke:#0D32B2;} + .d2-1972917360 .stroke-B2{stroke:#0D32B2;} + .d2-1972917360 .stroke-B3{stroke:#E3E9FD;} + .d2-1972917360 .stroke-B4{stroke:#E3E9FD;} + .d2-1972917360 .stroke-B5{stroke:#EDF0FD;} + .d2-1972917360 .stroke-B6{stroke:#F7F8FE;} + .d2-1972917360 .stroke-AA2{stroke:#4A6FF3;} + .d2-1972917360 .stroke-AA4{stroke:#EDF0FD;} + .d2-1972917360 .stroke-AA5{stroke:#F7F8FE;} + .d2-1972917360 .stroke-AB4{stroke:#EDF0FD;} + .d2-1972917360 .stroke-AB5{stroke:#F7F8FE;} + .d2-1972917360 .background-color-N1{background-color:#0A0F25;} + .d2-1972917360 .background-color-N2{background-color:#676C7E;} + .d2-1972917360 .background-color-N3{background-color:#9499AB;} + .d2-1972917360 .background-color-N4{background-color:#CFD2DD;} + .d2-1972917360 .background-color-N5{background-color:#DEE1EB;} + .d2-1972917360 .background-color-N6{background-color:#EEF1F8;} + .d2-1972917360 .background-color-N7{background-color:#FFFFFF;} + .d2-1972917360 .background-color-B1{background-color:#0D32B2;} + .d2-1972917360 .background-color-B2{background-color:#0D32B2;} + .d2-1972917360 .background-color-B3{background-color:#E3E9FD;} + .d2-1972917360 .background-color-B4{background-color:#E3E9FD;} + .d2-1972917360 .background-color-B5{background-color:#EDF0FD;} + .d2-1972917360 .background-color-B6{background-color:#F7F8FE;} + .d2-1972917360 .background-color-AA2{background-color:#4A6FF3;} + .d2-1972917360 .background-color-AA4{background-color:#EDF0FD;} + .d2-1972917360 .background-color-AA5{background-color:#F7F8FE;} + .d2-1972917360 .background-color-AB4{background-color:#EDF0FD;} + .d2-1972917360 .background-color-AB5{background-color:#F7F8FE;} + .d2-1972917360 .color-N1{color:#0A0F25;} + .d2-1972917360 .color-N2{color:#676C7E;} + .d2-1972917360 .color-N3{color:#9499AB;} + .d2-1972917360 .color-N4{color:#CFD2DD;} + .d2-1972917360 .color-N5{color:#DEE1EB;} + .d2-1972917360 .color-N6{color:#EEF1F8;} + .d2-1972917360 .color-N7{color:#FFFFFF;} + .d2-1972917360 .color-B1{color:#0D32B2;} + .d2-1972917360 .color-B2{color:#0D32B2;} + .d2-1972917360 .color-B3{color:#E3E9FD;} + .d2-1972917360 .color-B4{color:#E3E9FD;} + .d2-1972917360 .color-B5{color:#EDF0FD;} + .d2-1972917360 .color-B6{color:#F7F8FE;} + .d2-1972917360 .color-AA2{color:#4A6FF3;} + .d2-1972917360 .color-AA4{color:#EDF0FD;} + .d2-1972917360 .color-AA5{color:#F7F8FE;} + .d2-1972917360 .color-AB4{color:#EDF0FD;} + .d2-1972917360 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,7 +97,7 @@ -abc - +abc + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 126a7be2a..b6adf0671 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json index a54244205..ad7c9469f 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 184, "y": 373 }, - "width": 421, + "width": 481, "height": 527, "opacity": 1, "strokeDash": 0, @@ -130,7 +130,7 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 235, + "x": 257, "y": 679 }, "width": 293, @@ -171,7 +171,7 @@ "id": "a.f.i", "type": "rectangle", "pos": { - "x": 285, + "x": 307, "y": 729 }, "width": 49, @@ -212,7 +212,7 @@ "id": "a.f.g", "type": "rectangle", "pos": { - "x": 354, + "x": 376, "y": 729 }, "width": 54, @@ -253,7 +253,7 @@ "id": "s", "type": "rectangle", "pos": { - "x": 277, + "x": 288, "y": 1401 }, "width": 424, @@ -294,7 +294,7 @@ "id": "s.n", "type": "rectangle", "pos": { - "x": 327, + "x": 338, "y": 1453 }, "width": 151, @@ -417,7 +417,7 @@ "id": "u", "type": "rectangle", "pos": { - "x": 254, + "x": 276, "y": 1040 }, "width": 397, @@ -458,7 +458,7 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 304, + "x": 326, "y": 1095 }, "width": 54, @@ -499,7 +499,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 269, + "x": 299, "y": 12 }, "width": 252, @@ -540,7 +540,7 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 319, + "x": 349, "y": 62 }, "width": 152, @@ -581,7 +581,7 @@ "id": "h.m.s", "type": "rectangle", "pos": { - "x": 369, + "x": 399, "y": 112 }, "width": 52, @@ -622,7 +622,7 @@ "id": "a.f.j", "type": "rectangle", "pos": { - "x": 428, + "x": 450, "y": 729 }, "width": 50, @@ -663,7 +663,7 @@ "id": "u.s", "type": "rectangle", "pos": { - "x": 378, + "x": 400, "y": 1095 }, "width": 150, @@ -704,7 +704,7 @@ "id": "u.s.j", "type": "rectangle", "pos": { - "x": 428, + "x": 450, "y": 1145 }, "width": 50, @@ -745,7 +745,7 @@ "id": "u.c", "type": "rectangle", "pos": { - "x": 548, + "x": 570, "y": 1195 }, "width": 53, @@ -786,7 +786,7 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 498, + "x": 509, "y": 1456 }, "width": 153, @@ -827,7 +827,7 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 548, + "x": 559, "y": 1506 }, "width": 53, @@ -868,7 +868,7 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 377, + "x": 388, "y": 1503 }, "width": 51, @@ -909,7 +909,7 @@ "id": "y", "type": "rectangle", "pos": { - "x": 327, + "x": 338, "y": 1752 }, "width": 151, @@ -950,7 +950,7 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 377, + "x": 388, "y": 1802 }, "width": 51, @@ -991,7 +991,7 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 406, + "x": 466, "y": 428 }, "width": 149, @@ -1032,7 +1032,7 @@ "id": "a.g.i", "type": "rectangle", "pos": { - "x": 456, + "x": 516, "y": 478 }, "width": 49, @@ -1103,6 +1103,14 @@ }, { "x": 309.5, + "y": 634 + }, + { + "x": 331.5, + "y": 634 + }, + { + "x": 331.5, "y": 729 } ], @@ -1138,27 +1146,27 @@ "labelPercentage": 0, "route": [ { - "x": 381, + "x": 403, "y": 795 }, { - "x": 381, + "x": 403, "y": 945 }, { - "x": 243, + "x": 235, "y": 945 }, { - "x": 243, + "x": 235, "y": 1356 }, { - "x": 402.5, + "x": 413.75, "y": 1356 }, { - "x": 402.5, + "x": 413.75, "y": 1453.5 } ], @@ -1202,11 +1210,11 @@ "y": 995 }, { - "x": 331, + "x": 353, "y": 995 }, { - "x": 331, + "x": 353, "y": 1095 } ], @@ -1242,19 +1250,19 @@ "labelPercentage": 0, "route": [ { - "x": 395, + "x": 425, "y": 178 }, { - "x": 395, + "x": 425, "y": 634 }, { - "x": 381, + "x": 403, "y": 634 }, { - "x": 381, + "x": 403, "y": 729 } ], @@ -1290,11 +1298,11 @@ "labelPercentage": 0, "route": [ { - "x": 453, + "x": 475, "y": 795 }, { - "x": 453, + "x": 475, "y": 1145 } ], @@ -1330,11 +1338,19 @@ "labelPercentage": 0, "route": [ { - "x": 574.5, + "x": 596.5, "y": 1261 }, { - "x": 574.5, + "x": 596.5, + "y": 1356 + }, + { + "x": 585.75, + "y": 1356 + }, + { + "x": 585.75, "y": 1506 } ], @@ -1370,11 +1386,11 @@ "labelPercentage": 0, "route": [ { - "x": 402.5, + "x": 413.75, "y": 1619.5 }, { - "x": 402.5, + "x": 413.75, "y": 1802 } ], @@ -1410,27 +1426,27 @@ "labelPercentage": 0, "route": [ { - "x": 402.5, + "x": 413.75, "y": 1868 }, { - "x": 402.5, + "x": 413.75, "y": 1963 }, { - "x": 711, + "x": 814.25, "y": 1963 }, { - "x": 711, + "x": 814.25, "y": 328 }, { - "x": 480.5, + "x": 540.5, "y": 328 }, { - "x": 480.5, + "x": 540.5, "y": 478 } ], diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index 4c91b0f93..1156b4555 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 - - + .d2-3494148965 .fill-N1{fill:#0A0F25;} + .d2-3494148965 .fill-N2{fill:#676C7E;} + .d2-3494148965 .fill-N3{fill:#9499AB;} + .d2-3494148965 .fill-N4{fill:#CFD2DD;} + .d2-3494148965 .fill-N5{fill:#DEE1EB;} + .d2-3494148965 .fill-N6{fill:#EEF1F8;} + .d2-3494148965 .fill-N7{fill:#FFFFFF;} + .d2-3494148965 .fill-B1{fill:#0D32B2;} + .d2-3494148965 .fill-B2{fill:#0D32B2;} + .d2-3494148965 .fill-B3{fill:#E3E9FD;} + .d2-3494148965 .fill-B4{fill:#E3E9FD;} + .d2-3494148965 .fill-B5{fill:#EDF0FD;} + .d2-3494148965 .fill-B6{fill:#F7F8FE;} + .d2-3494148965 .fill-AA2{fill:#4A6FF3;} + .d2-3494148965 .fill-AA4{fill:#EDF0FD;} + .d2-3494148965 .fill-AA5{fill:#F7F8FE;} + .d2-3494148965 .fill-AB4{fill:#EDF0FD;} + .d2-3494148965 .fill-AB5{fill:#F7F8FE;} + .d2-3494148965 .stroke-N1{stroke:#0A0F25;} + .d2-3494148965 .stroke-N2{stroke:#676C7E;} + .d2-3494148965 .stroke-N3{stroke:#9499AB;} + .d2-3494148965 .stroke-N4{stroke:#CFD2DD;} + .d2-3494148965 .stroke-N5{stroke:#DEE1EB;} + .d2-3494148965 .stroke-N6{stroke:#EEF1F8;} + .d2-3494148965 .stroke-N7{stroke:#FFFFFF;} + .d2-3494148965 .stroke-B1{stroke:#0D32B2;} + .d2-3494148965 .stroke-B2{stroke:#0D32B2;} + .d2-3494148965 .stroke-B3{stroke:#E3E9FD;} + .d2-3494148965 .stroke-B4{stroke:#E3E9FD;} + .d2-3494148965 .stroke-B5{stroke:#EDF0FD;} + .d2-3494148965 .stroke-B6{stroke:#F7F8FE;} + .d2-3494148965 .stroke-AA2{stroke:#4A6FF3;} + .d2-3494148965 .stroke-AA4{stroke:#EDF0FD;} + .d2-3494148965 .stroke-AA5{stroke:#F7F8FE;} + .d2-3494148965 .stroke-AB4{stroke:#EDF0FD;} + .d2-3494148965 .stroke-AB5{stroke:#F7F8FE;} + .d2-3494148965 .background-color-N1{background-color:#0A0F25;} + .d2-3494148965 .background-color-N2{background-color:#676C7E;} + .d2-3494148965 .background-color-N3{background-color:#9499AB;} + .d2-3494148965 .background-color-N4{background-color:#CFD2DD;} + .d2-3494148965 .background-color-N5{background-color:#DEE1EB;} + .d2-3494148965 .background-color-N6{background-color:#EEF1F8;} + .d2-3494148965 .background-color-N7{background-color:#FFFFFF;} + .d2-3494148965 .background-color-B1{background-color:#0D32B2;} + .d2-3494148965 .background-color-B2{background-color:#0D32B2;} + .d2-3494148965 .background-color-B3{background-color:#E3E9FD;} + .d2-3494148965 .background-color-B4{background-color:#E3E9FD;} + .d2-3494148965 .background-color-B5{background-color:#EDF0FD;} + .d2-3494148965 .background-color-B6{background-color:#F7F8FE;} + .d2-3494148965 .background-color-AA2{background-color:#4A6FF3;} + .d2-3494148965 .background-color-AA4{background-color:#EDF0FD;} + .d2-3494148965 .background-color-AA5{background-color:#F7F8FE;} + .d2-3494148965 .background-color-AB4{background-color:#EDF0FD;} + .d2-3494148965 .background-color-AB5{background-color:#F7F8FE;} + .d2-3494148965 .color-N1{color:#0A0F25;} + .d2-3494148965 .color-N2{color:#676C7E;} + .d2-3494148965 .color-N3{color:#9499AB;} + .d2-3494148965 .color-N4{color:#CFD2DD;} + .d2-3494148965 .color-N5{color:#DEE1EB;} + .d2-3494148965 .color-N6{color:#EEF1F8;} + .d2-3494148965 .color-N7{color:#FFFFFF;} + .d2-3494148965 .color-B1{color:#0D32B2;} + .d2-3494148965 .color-B2{color:#0D32B2;} + .d2-3494148965 .color-B3{color:#E3E9FD;} + .d2-3494148965 .color-B4{color:#E3E9FD;} + .d2-3494148965 .color-B5{color:#EDF0FD;} + .d2-3494148965 .color-B6{color:#F7F8FE;} + .d2-3494148965 .color-AA2{color:#4A6FF3;} + .d2-3494148965 .color-AA4{color:#EDF0FD;} + .d2-3494148965 .color-AA5{color:#F7F8FE;} + .d2-3494148965 .color-AB4{color:#EDF0FD;} + .d2-3494148965 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsczrgtigsjjcfi 1234 + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json index b61bb453c..b211ecf77 100644 --- a/e2etests/testdata/regression/elk_order/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json @@ -414,7 +414,7 @@ "id": "m5_desc", "type": "text", "pos": { - "x": 425, + "x": 456, "y": 36 }, "width": 90, @@ -454,7 +454,7 @@ "id": "m6_desc", "type": "text", "pos": { - "x": 535, + "x": 566, "y": 12 }, "width": 140, @@ -599,11 +599,11 @@ "labelPercentage": 0, "route": [ { - "x": 470.5, + "x": 501.75, "y": 60 }, { - "x": 470.5, + "x": 501.75, "y": 100 }, { @@ -647,9 +647,17 @@ "labelPercentage": 0, "route": [ { - "x": 605.5, + "x": 636.75, "y": 60 }, + { + "x": 636.75, + "y": 100 + }, + { + "x": 605.5, + "y": 100 + }, { "x": 605.5, "y": 195 diff --git a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg index 62d5c2d98..550aba88d 100644 --- a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -

Oldest message

Offset

-

Last message

-

Next message will be
+

Last message

+

Next message will be
inserted here

-
M0M1M2M3M4M5M6 - +M0M1M2M3M4M5M6 + \ No newline at end of file diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json index a7c33fb48..e93e1c37d 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json @@ -294,8 +294,8 @@ "id": "osvc", "type": "rectangle", "pos": { - "x": 301, - "y": 399 + "x": 373, + "y": 409 }, "width": 272, "height": 166, @@ -335,8 +335,8 @@ "id": "osvc.vm1", "type": "rectangle", "pos": { - "x": 351, - "y": 449 + "x": 423, + "y": 459 }, "width": 76, "height": 66, @@ -376,8 +376,8 @@ "id": "osvc.vm2", "type": "rectangle", "pos": { - "x": 447, - "y": 449 + "x": 519, + "y": 459 }, "width": 76, "height": 66, @@ -447,15 +447,23 @@ }, { "x": 211, - "y": 309 + "y": 218 }, { - "x": 355.59999999999997, - "y": 309 + "x": 274, + "y": 218 }, { - "x": 355.59999999999997, - "y": 399 + "x": 274, + "y": 369 + }, + { + "x": 427.9, + "y": 369 + }, + { + "x": 427.9, + "y": 409 } ], "animated": false, @@ -495,7 +503,15 @@ }, { "x": 410, - "y": 399 + "y": 319 + }, + { + "x": 482.3, + "y": 319 + }, + { + "x": 482.3, + "y": 409 } ], "animated": false, @@ -535,15 +551,15 @@ }, { "x": 609, - "y": 309 + "y": 319 }, { - "x": 464.4, - "y": 309 + "x": 536.7, + "y": 319 }, { - "x": 464.4, - "y": 399 + "x": 536.7, + "y": 409 } ], "animated": false, @@ -583,15 +599,23 @@ }, { "x": 808, - "y": 359 + "y": 218 }, { - "x": 518.8, - "y": 359 + "x": 735.7, + "y": 218 }, { - "x": 518.8, - "y": 399 + "x": 735.7, + "y": 369 + }, + { + "x": 591.1, + "y": 369 + }, + { + "x": 591.1, + "y": 409 } ], "animated": false, diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg index b536c67ad..001be9e92 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault - - - - - + .d2-2727049275 .fill-N1{fill:#0A0F25;} + .d2-2727049275 .fill-N2{fill:#676C7E;} + .d2-2727049275 .fill-N3{fill:#9499AB;} + .d2-2727049275 .fill-N4{fill:#CFD2DD;} + .d2-2727049275 .fill-N5{fill:#DEE1EB;} + .d2-2727049275 .fill-N6{fill:#EEF1F8;} + .d2-2727049275 .fill-N7{fill:#FFFFFF;} + .d2-2727049275 .fill-B1{fill:#0D32B2;} + .d2-2727049275 .fill-B2{fill:#0D32B2;} + .d2-2727049275 .fill-B3{fill:#E3E9FD;} + .d2-2727049275 .fill-B4{fill:#E3E9FD;} + .d2-2727049275 .fill-B5{fill:#EDF0FD;} + .d2-2727049275 .fill-B6{fill:#F7F8FE;} + .d2-2727049275 .fill-AA2{fill:#4A6FF3;} + .d2-2727049275 .fill-AA4{fill:#EDF0FD;} + .d2-2727049275 .fill-AA5{fill:#F7F8FE;} + .d2-2727049275 .fill-AB4{fill:#EDF0FD;} + .d2-2727049275 .fill-AB5{fill:#F7F8FE;} + .d2-2727049275 .stroke-N1{stroke:#0A0F25;} + .d2-2727049275 .stroke-N2{stroke:#676C7E;} + .d2-2727049275 .stroke-N3{stroke:#9499AB;} + .d2-2727049275 .stroke-N4{stroke:#CFD2DD;} + .d2-2727049275 .stroke-N5{stroke:#DEE1EB;} + .d2-2727049275 .stroke-N6{stroke:#EEF1F8;} + .d2-2727049275 .stroke-N7{stroke:#FFFFFF;} + .d2-2727049275 .stroke-B1{stroke:#0D32B2;} + .d2-2727049275 .stroke-B2{stroke:#0D32B2;} + .d2-2727049275 .stroke-B3{stroke:#E3E9FD;} + .d2-2727049275 .stroke-B4{stroke:#E3E9FD;} + .d2-2727049275 .stroke-B5{stroke:#EDF0FD;} + .d2-2727049275 .stroke-B6{stroke:#F7F8FE;} + .d2-2727049275 .stroke-AA2{stroke:#4A6FF3;} + .d2-2727049275 .stroke-AA4{stroke:#EDF0FD;} + .d2-2727049275 .stroke-AA5{stroke:#F7F8FE;} + .d2-2727049275 .stroke-AB4{stroke:#EDF0FD;} + .d2-2727049275 .stroke-AB5{stroke:#F7F8FE;} + .d2-2727049275 .background-color-N1{background-color:#0A0F25;} + .d2-2727049275 .background-color-N2{background-color:#676C7E;} + .d2-2727049275 .background-color-N3{background-color:#9499AB;} + .d2-2727049275 .background-color-N4{background-color:#CFD2DD;} + .d2-2727049275 .background-color-N5{background-color:#DEE1EB;} + .d2-2727049275 .background-color-N6{background-color:#EEF1F8;} + .d2-2727049275 .background-color-N7{background-color:#FFFFFF;} + .d2-2727049275 .background-color-B1{background-color:#0D32B2;} + .d2-2727049275 .background-color-B2{background-color:#0D32B2;} + .d2-2727049275 .background-color-B3{background-color:#E3E9FD;} + .d2-2727049275 .background-color-B4{background-color:#E3E9FD;} + .d2-2727049275 .background-color-B5{background-color:#EDF0FD;} + .d2-2727049275 .background-color-B6{background-color:#F7F8FE;} + .d2-2727049275 .background-color-AA2{background-color:#4A6FF3;} + .d2-2727049275 .background-color-AA4{background-color:#EDF0FD;} + .d2-2727049275 .background-color-AA5{background-color:#F7F8FE;} + .d2-2727049275 .background-color-AB4{background-color:#EDF0FD;} + .d2-2727049275 .background-color-AB5{background-color:#F7F8FE;} + .d2-2727049275 .color-N1{color:#0A0F25;} + .d2-2727049275 .color-N2{color:#676C7E;} + .d2-2727049275 .color-N3{color:#9499AB;} + .d2-2727049275 .color-N4{color:#CFD2DD;} + .d2-2727049275 .color-N5{color:#DEE1EB;} + .d2-2727049275 .color-N6{color:#EEF1F8;} + .d2-2727049275 .color-N7{color:#FFFFFF;} + .d2-2727049275 .color-B1{color:#0D32B2;} + .d2-2727049275 .color-B2{color:#0D32B2;} + .d2-2727049275 .color-B3{color:#E3E9FD;} + .d2-2727049275 .color-B4{color:#E3E9FD;} + .d2-2727049275 .color-B5{color:#EDF0FD;} + .d2-2727049275 .color-B6{color:#F7F8FE;} + .d2-2727049275 .color-AA2{color:#4A6FF3;} + .d2-2727049275 .color-AA4{color:#EDF0FD;} + .d2-2727049275 .color-AA5{color:#F7F8FE;} + .d2-2727049275 .color-AB4{color:#EDF0FD;} + .d2-2727049275 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json index 3bb0051cd..45bb8da56 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 148 + "y": 267 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 234 + "y": 353 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 62 + "y": 181 }, "width": 53, "height": 66, @@ -131,9 +131,9 @@ "type": "rectangle", "pos": { "x": 140, - "y": 12 + "y": 131 }, - "width": 233, + "width": 283, "height": 338, "opacity": 1, "strokeDash": 0, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 190, - "y": 62 + "y": 181 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 190, - "y": 148 + "y": 267 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 190, - "y": 234 + "y": 353 }, "width": 53, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 513, - "y": 98 + "y": 12 }, "width": 153, "height": 166, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 148 + "y": 62 }, "width": 53, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 513, - "y": 470 + "y": 434 }, "width": 153, "height": 166, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 520 + "y": 484 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 513, - "y": 284 + "y": 198 }, "width": 153, "height": 166, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 334 + "y": 248 }, "width": 53, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 756, - "y": 98 + "y": 62 }, "width": 153, "height": 252, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 806, - "y": 148 + "y": 112 }, "width": 53, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 806, - "y": 234 + "y": 198 }, "width": 53, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": 756, - "y": 470 + "y": 434 }, "width": 153, "height": 166, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 806, - "y": 520 + "y": 484 }, "width": 53, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 999, - "y": 48 + "y": 12 }, "width": 258, "height": 638, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 98 + "y": 62 }, "width": 153, "height": 166, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 1104, - "y": 148 + "y": 112 }, "width": 53, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 284 + "y": 248 }, "width": 153, "height": 166, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 1104, - "y": 334 + "y": 298 }, "width": 53, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 1054, - "y": 470 + "y": 434 }, "width": 153, "height": 166, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 1104, - "y": 520 + "y": 484 }, "width": 53, "height": 66, @@ -1058,11 +1058,11 @@ "route": [ { "x": 65, - "y": 95 + "y": 214 }, { "x": 190, - "y": 95 + "y": 214 } ], "animated": false, @@ -1098,11 +1098,11 @@ "route": [ { "x": 65, - "y": 181 + "y": 300 }, { "x": 190, - "y": 181 + "y": 300 } ], "animated": false, @@ -1138,11 +1138,11 @@ "route": [ { "x": 65, - "y": 267 + "y": 386 }, { "x": 190, - "y": 267 + "y": 386 } ], "animated": false, @@ -1178,11 +1178,27 @@ "route": [ { "x": 243, - "y": 181 + "y": 300 + }, + { + "x": 283, + "y": 300 + }, + { + "x": 283, + "y": 252 + }, + { + "x": 468, + "y": 252 + }, + { + "x": 468, + "y": 95 }, { "x": 563, - "y": 181 + "y": 95 } ], "animated": false, @@ -1218,19 +1234,19 @@ "route": [ { "x": 243, - "y": 267 + "y": 386 }, { - "x": 418, - "y": 267 + "x": 468, + "y": 386 }, { - "x": 418, - "y": 553 + "x": 468, + "y": 517 }, { "x": 563, - "y": 553 + "y": 517 } ], "animated": false, @@ -1266,27 +1282,27 @@ "route": [ { "x": 243, - "y": 95 + "y": 214 }, { - "x": 283, - "y": 95 + "x": 333, + "y": 214 }, { - "x": 283, - "y": 191 + "x": 333, + "y": 262 }, { "x": 468, - "y": 191 + "y": 262 }, { "x": 468, - "y": 367 + "y": 281 }, { "x": 563, - "y": 367 + "y": 281 } ], "animated": false, @@ -1322,11 +1338,19 @@ "route": [ { "x": 616, - "y": 181 + "y": 95 + }, + { + "x": 711, + "y": 95 + }, + { + "x": 711, + "y": 145 }, { "x": 806, - "y": 181 + "y": 145 } ], "animated": false, @@ -1362,19 +1386,19 @@ "route": [ { "x": 616, - "y": 367 + "y": 281 }, { "x": 711, - "y": 367 + "y": 281 }, { "x": 711, - "y": 267 + "y": 231 }, { "x": 806, - "y": 267 + "y": 231 } ], "animated": false, @@ -1410,11 +1434,11 @@ "route": [ { "x": 616, - "y": 553 + "y": 517 }, { "x": 806, - "y": 553 + "y": 517 } ], "animated": false, @@ -1450,11 +1474,11 @@ "route": [ { "x": 859, - "y": 181 + "y": 145 }, { "x": 1104, - "y": 181 + "y": 145 } ], "animated": false, @@ -1490,19 +1514,19 @@ "route": [ { "x": 859, - "y": 267 + "y": 231 }, { "x": 954, - "y": 267 + "y": 231 }, { "x": 954, - "y": 367 + "y": 331 }, { "x": 1104, - "y": 367 + "y": 331 } ], "animated": false, @@ -1538,11 +1562,11 @@ "route": [ { "x": 859, - "y": 553 + "y": 517 }, { "x": 1104, - "y": 553 + "y": 517 } ], "animated": false, diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg index c254cfe19..45e9b2867 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + .d2-1359383859 .fill-N1{fill:#0A0F25;} + .d2-1359383859 .fill-N2{fill:#676C7E;} + .d2-1359383859 .fill-N3{fill:#9499AB;} + .d2-1359383859 .fill-N4{fill:#CFD2DD;} + .d2-1359383859 .fill-N5{fill:#DEE1EB;} + .d2-1359383859 .fill-N6{fill:#EEF1F8;} + .d2-1359383859 .fill-N7{fill:#FFFFFF;} + .d2-1359383859 .fill-B1{fill:#0D32B2;} + .d2-1359383859 .fill-B2{fill:#0D32B2;} + .d2-1359383859 .fill-B3{fill:#E3E9FD;} + .d2-1359383859 .fill-B4{fill:#E3E9FD;} + .d2-1359383859 .fill-B5{fill:#EDF0FD;} + .d2-1359383859 .fill-B6{fill:#F7F8FE;} + .d2-1359383859 .fill-AA2{fill:#4A6FF3;} + .d2-1359383859 .fill-AA4{fill:#EDF0FD;} + .d2-1359383859 .fill-AA5{fill:#F7F8FE;} + .d2-1359383859 .fill-AB4{fill:#EDF0FD;} + .d2-1359383859 .fill-AB5{fill:#F7F8FE;} + .d2-1359383859 .stroke-N1{stroke:#0A0F25;} + .d2-1359383859 .stroke-N2{stroke:#676C7E;} + .d2-1359383859 .stroke-N3{stroke:#9499AB;} + .d2-1359383859 .stroke-N4{stroke:#CFD2DD;} + .d2-1359383859 .stroke-N5{stroke:#DEE1EB;} + .d2-1359383859 .stroke-N6{stroke:#EEF1F8;} + .d2-1359383859 .stroke-N7{stroke:#FFFFFF;} + .d2-1359383859 .stroke-B1{stroke:#0D32B2;} + .d2-1359383859 .stroke-B2{stroke:#0D32B2;} + .d2-1359383859 .stroke-B3{stroke:#E3E9FD;} + .d2-1359383859 .stroke-B4{stroke:#E3E9FD;} + .d2-1359383859 .stroke-B5{stroke:#EDF0FD;} + .d2-1359383859 .stroke-B6{stroke:#F7F8FE;} + .d2-1359383859 .stroke-AA2{stroke:#4A6FF3;} + .d2-1359383859 .stroke-AA4{stroke:#EDF0FD;} + .d2-1359383859 .stroke-AA5{stroke:#F7F8FE;} + .d2-1359383859 .stroke-AB4{stroke:#EDF0FD;} + .d2-1359383859 .stroke-AB5{stroke:#F7F8FE;} + .d2-1359383859 .background-color-N1{background-color:#0A0F25;} + .d2-1359383859 .background-color-N2{background-color:#676C7E;} + .d2-1359383859 .background-color-N3{background-color:#9499AB;} + .d2-1359383859 .background-color-N4{background-color:#CFD2DD;} + .d2-1359383859 .background-color-N5{background-color:#DEE1EB;} + .d2-1359383859 .background-color-N6{background-color:#EEF1F8;} + .d2-1359383859 .background-color-N7{background-color:#FFFFFF;} + .d2-1359383859 .background-color-B1{background-color:#0D32B2;} + .d2-1359383859 .background-color-B2{background-color:#0D32B2;} + .d2-1359383859 .background-color-B3{background-color:#E3E9FD;} + .d2-1359383859 .background-color-B4{background-color:#E3E9FD;} + .d2-1359383859 .background-color-B5{background-color:#EDF0FD;} + .d2-1359383859 .background-color-B6{background-color:#F7F8FE;} + .d2-1359383859 .background-color-AA2{background-color:#4A6FF3;} + .d2-1359383859 .background-color-AA4{background-color:#EDF0FD;} + .d2-1359383859 .background-color-AA5{background-color:#F7F8FE;} + .d2-1359383859 .background-color-AB4{background-color:#EDF0FD;} + .d2-1359383859 .background-color-AB5{background-color:#F7F8FE;} + .d2-1359383859 .color-N1{color:#0A0F25;} + .d2-1359383859 .color-N2{color:#676C7E;} + .d2-1359383859 .color-N3{color:#9499AB;} + .d2-1359383859 .color-N4{color:#CFD2DD;} + .d2-1359383859 .color-N5{color:#DEE1EB;} + .d2-1359383859 .color-N6{color:#EEF1F8;} + .d2-1359383859 .color-N7{color:#FFFFFF;} + .d2-1359383859 .color-B1{color:#0D32B2;} + .d2-1359383859 .color-B2{color:#0D32B2;} + .d2-1359383859 .color-B3{color:#E3E9FD;} + .d2-1359383859 .color-B4{color:#E3E9FD;} + .d2-1359383859 .color-B5{color:#EDF0FD;} + .d2-1359383859 .color-B6{color:#F7F8FE;} + .d2-1359383859 .color-AA2{color:#4A6FF3;} + .d2-1359383859 .color-AA4{color:#EDF0FD;} + .d2-1359383859 .color-AA5{color:#F7F8FE;} + .d2-1359383859 .color-AB4{color:#EDF0FD;} + .d2-1359383859 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json index 68b550d1e..d7467cf90 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 103, - "y": 75 + "y": 115 }, "width": 135, "height": 120, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 390, - "y": 72 + "y": 74 }, "width": 159, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 368, - "y": 158 + "y": 170 }, "width": 204, "height": 66, @@ -133,8 +133,8 @@ "x": 652, "y": 12 }, - "width": 890, - "height": 358, + "width": 940, + "height": 383, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 746, - "y": 72 + "y": 97 }, "width": 94, "height": 120, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 970, - "y": 62 + "y": 61 }, "width": 120, "height": 80, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 1170, - "y": 99 + "y": 129 }, "width": 120, "height": 80, @@ -294,8 +294,8 @@ "id": "Gos Warehouse.Regional-N", "type": "rectangle", "pos": { - "x": 1370, - "y": 99 + "x": 1420, + "y": 124 }, "width": 122, "height": 80, @@ -336,7 +336,7 @@ "type": "text", "pos": { "x": 702, - "y": 212 + "y": 237 }, "width": 138, "height": 108, @@ -376,7 +376,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 215 + "y": 255 }, "width": 226, "height": 252, @@ -417,7 +417,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 265 + "y": 305 }, "width": 126, "height": 66, @@ -458,7 +458,7 @@ "type": "rectangle", "pos": { "x": 73, - "y": 351 + "y": 391 }, "width": 103, "height": 66, @@ -498,7 +498,7 @@ "id": "title", "type": "text", "pos": { - "x": 457, + "x": 482, "y": -59 }, "width": 639, @@ -565,11 +565,19 @@ "route": [ { "x": 238, - "y": 105 + "y": 145.75 + }, + { + "x": 278, + "y": 145.75 + }, + { + "x": 278, + "y": 107.875 }, { "x": 390.5, - "y": 105 + "y": 107.875 } ], "animated": false, @@ -605,19 +613,19 @@ "route": [ { "x": 238, - "y": 135 + "y": 175.75 }, { "x": 328, - "y": 135 + "y": 175.75 }, { "x": 328, - "y": 191 + "y": 203.75 }, { "x": 368, - "y": 191 + "y": 203.75 } ], "animated": false, @@ -653,27 +661,27 @@ "route": [ { "x": 238, - "y": 165 + "y": 205.75 }, { "x": 278, - "y": 165 + "y": 205.75 }, { "x": 278, - "y": 234 + "y": 288.1875 }, { "x": 612, - "y": 234 + "y": 288.1875 }, { "x": 612, - "y": 280.5 + "y": 299.625 }, { "x": 652, - "y": 280.5 + "y": 299.625 } ], "animated": false, @@ -709,6 +717,14 @@ "route": [ { "x": 840, + "y": 127.5 + }, + { + "x": 880, + "y": 127.5 + }, + { + "x": 880, "y": 102 }, { @@ -749,19 +765,19 @@ "route": [ { "x": 840, - "y": 132 + "y": 157.5 }, { "x": 930, - "y": 132 + "y": 157.5 }, { "x": 930, - "y": 153 + "y": 183 }, { "x": 1170, - "y": 153 + "y": 183 } ], "animated": false, @@ -797,27 +813,27 @@ "route": [ { "x": 840, - "y": 162 + "y": 187.5 }, { "x": 880, - "y": 162 + "y": 187.5 }, { "x": 880, - "y": 189.66666666666669 + "y": 249.66666666666669 }, { - "x": 1330, - "y": 189.66666666666669 + "x": 1380, + "y": 249.66666666666669 }, { - "x": 1330, - "y": 159.66666666666669 + "x": 1380, + "y": 184.66666666666669 }, { - "x": 1370, - "y": 159.66666666666669 + "x": 1420, + "y": 184.66666666666669 } ], "animated": false, @@ -853,19 +869,19 @@ "route": [ { "x": 1090, - "y": 115.33333333333334 + "y": 115.33333333333333 }, { "x": 1130, - "y": 115.33333333333334 + "y": 115.33333333333333 }, { "x": 1130, - "y": 126.33333333333334 + "y": 156.33333333333334 }, { "x": 1170, - "y": 126.33333333333334 + "y": 156.33333333333334 } ], "animated": false, @@ -901,11 +917,19 @@ "route": [ { "x": 1290, - "y": 139.66666666666669 + "y": 169.66666666666669 }, { - "x": 1370, - "y": 139.66666666666669 + "x": 1330, + "y": 169.66666666666669 + }, + { + "x": 1330, + "y": 164.66666666666669 + }, + { + "x": 1420, + "y": 164.66666666666669 } ], "animated": false, @@ -940,20 +964,20 @@ "labelPercentage": 0, "route": [ { - "x": 1370, - "y": 119.66666666666667 + "x": 1420, + "y": 144.66666666666669 }, { "x": 1330, - "y": 119.66666666666667 + "y": 144.66666666666669 }, { "x": 1330, - "y": 88.66666666666667 + "y": 88.66666666666666 }, { "x": 1090, - "y": 88.66666666666667 + "y": 88.66666666666666 } ], "animated": false, @@ -989,19 +1013,11 @@ "route": [ { "x": 549.5, - "y": 105 - }, - { - "x": 612, - "y": 105 - }, - { - "x": 612, - "y": 101.5 + "y": 107.875 }, { "x": 652, - "y": 101.5 + "y": 107.875 } ], "animated": false, @@ -1037,11 +1053,11 @@ "route": [ { "x": 572, - "y": 191 + "y": 203.75 }, { "x": 652, - "y": 191 + "y": 203.75 } ], "animated": false, diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index e51e7a823..8736efd7b 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    InstallationSupport - +
InstallationSupport + \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json index d457178fb..f27f1d7a5 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 58, + "x": 35, "y": 12 }, "width": 80, @@ -155,11 +155,11 @@ "labelPercentage": 0, "route": [ { - "x": 84.83333333333333, + "x": 61.666666666666664, "y": 78 }, { - "x": 84.83333333333333, + "x": 61.666666666666664, "y": 118 }, { @@ -203,9 +203,17 @@ "labelPercentage": 0, "route": [ { - "x": 111.5, + "x": 88.33333333333333, "y": 78 }, + { + "x": 88.33333333333333, + "y": 118 + }, + { + "x": 111.5, + "y": 118 + }, { "x": 111.5, "y": 158 diff --git a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg index f9bcb5697..670b904e1 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-1925452413 .fill-N1{fill:#0A0F25;} + .d2-1925452413 .fill-N2{fill:#676C7E;} + .d2-1925452413 .fill-N3{fill:#9499AB;} + .d2-1925452413 .fill-N4{fill:#CFD2DD;} + .d2-1925452413 .fill-N5{fill:#DEE1EB;} + .d2-1925452413 .fill-N6{fill:#EEF1F8;} + .d2-1925452413 .fill-N7{fill:#FFFFFF;} + .d2-1925452413 .fill-B1{fill:#0D32B2;} + .d2-1925452413 .fill-B2{fill:#0D32B2;} + .d2-1925452413 .fill-B3{fill:#E3E9FD;} + .d2-1925452413 .fill-B4{fill:#E3E9FD;} + .d2-1925452413 .fill-B5{fill:#EDF0FD;} + .d2-1925452413 .fill-B6{fill:#F7F8FE;} + .d2-1925452413 .fill-AA2{fill:#4A6FF3;} + .d2-1925452413 .fill-AA4{fill:#EDF0FD;} + .d2-1925452413 .fill-AA5{fill:#F7F8FE;} + .d2-1925452413 .fill-AB4{fill:#EDF0FD;} + .d2-1925452413 .fill-AB5{fill:#F7F8FE;} + .d2-1925452413 .stroke-N1{stroke:#0A0F25;} + .d2-1925452413 .stroke-N2{stroke:#676C7E;} + .d2-1925452413 .stroke-N3{stroke:#9499AB;} + .d2-1925452413 .stroke-N4{stroke:#CFD2DD;} + .d2-1925452413 .stroke-N5{stroke:#DEE1EB;} + .d2-1925452413 .stroke-N6{stroke:#EEF1F8;} + .d2-1925452413 .stroke-N7{stroke:#FFFFFF;} + .d2-1925452413 .stroke-B1{stroke:#0D32B2;} + .d2-1925452413 .stroke-B2{stroke:#0D32B2;} + .d2-1925452413 .stroke-B3{stroke:#E3E9FD;} + .d2-1925452413 .stroke-B4{stroke:#E3E9FD;} + .d2-1925452413 .stroke-B5{stroke:#EDF0FD;} + .d2-1925452413 .stroke-B6{stroke:#F7F8FE;} + .d2-1925452413 .stroke-AA2{stroke:#4A6FF3;} + .d2-1925452413 .stroke-AA4{stroke:#EDF0FD;} + .d2-1925452413 .stroke-AA5{stroke:#F7F8FE;} + .d2-1925452413 .stroke-AB4{stroke:#EDF0FD;} + .d2-1925452413 .stroke-AB5{stroke:#F7F8FE;} + .d2-1925452413 .background-color-N1{background-color:#0A0F25;} + .d2-1925452413 .background-color-N2{background-color:#676C7E;} + .d2-1925452413 .background-color-N3{background-color:#9499AB;} + .d2-1925452413 .background-color-N4{background-color:#CFD2DD;} + .d2-1925452413 .background-color-N5{background-color:#DEE1EB;} + .d2-1925452413 .background-color-N6{background-color:#EEF1F8;} + .d2-1925452413 .background-color-N7{background-color:#FFFFFF;} + .d2-1925452413 .background-color-B1{background-color:#0D32B2;} + .d2-1925452413 .background-color-B2{background-color:#0D32B2;} + .d2-1925452413 .background-color-B3{background-color:#E3E9FD;} + .d2-1925452413 .background-color-B4{background-color:#E3E9FD;} + .d2-1925452413 .background-color-B5{background-color:#EDF0FD;} + .d2-1925452413 .background-color-B6{background-color:#F7F8FE;} + .d2-1925452413 .background-color-AA2{background-color:#4A6FF3;} + .d2-1925452413 .background-color-AA4{background-color:#EDF0FD;} + .d2-1925452413 .background-color-AA5{background-color:#F7F8FE;} + .d2-1925452413 .background-color-AB4{background-color:#EDF0FD;} + .d2-1925452413 .background-color-AB5{background-color:#F7F8FE;} + .d2-1925452413 .color-N1{color:#0A0F25;} + .d2-1925452413 .color-N2{color:#676C7E;} + .d2-1925452413 .color-N3{color:#9499AB;} + .d2-1925452413 .color-N4{color:#CFD2DD;} + .d2-1925452413 .color-N5{color:#DEE1EB;} + .d2-1925452413 .color-N6{color:#EEF1F8;} + .d2-1925452413 .color-N7{color:#FFFFFF;} + .d2-1925452413 .color-B1{color:#0D32B2;} + .d2-1925452413 .color-B2{color:#0D32B2;} + .d2-1925452413 .color-B3{color:#E3E9FD;} + .d2-1925452413 .color-B4{color:#E3E9FD;} + .d2-1925452413 .color-B5{color:#EDF0FD;} + .d2-1925452413 .color-B6{color:#F7F8FE;} + .d2-1925452413 .color-AA2{color:#4A6FF3;} + .d2-1925452413 .color-AA4{color:#EDF0FD;} + .d2-1925452413 .color-AA5{color:#F7F8FE;} + .d2-1925452413 .color-AB4{color:#EDF0FD;} + .d2-1925452413 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc \ No newline at end of file diff --git a/e2etests/testdata/stable/animated/elk/board.exp.json b/e2etests/testdata/stable/animated/elk/board.exp.json index 3144cd9d5..f7821a742 100644 --- a/e2etests/testdata/stable/animated/elk/board.exp.json +++ b/e2etests/testdata/stable/animated/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "your love life will be", "type": "rectangle", "pos": { - "x": 61, + "x": 21, "y": 12 }, "width": 187, @@ -253,7 +253,7 @@ "id": "Monday", "type": "rectangle", "pos": { - "x": 422, + "x": 421, "y": 158 }, "width": 101, @@ -565,11 +565,11 @@ "labelPercentage": 0, "route": [ { - "x": 123.66666666666674, + "x": 83.83333333333337, "y": 78 }, { - "x": 123.66666666666674, + "x": 83.83333333333337, "y": 118 }, { @@ -613,9 +613,17 @@ "labelPercentage": 0, "route": [ { - "x": 186, + "x": 146.16666666666663, "y": 78 }, + { + "x": 146.16666666666663, + "y": 118 + }, + { + "x": 186, + "y": 118 + }, { "x": 186, "y": 158 @@ -693,11 +701,11 @@ "labelPercentage": 0, "route": [ { - "x": 472.5, + "x": 472.49999999999994, "y": 78 }, { - "x": 472.5, + "x": 472.49999999999994, "y": 158 } ], diff --git a/e2etests/testdata/stable/animated/elk/sketch.exp.svg b/e2etests/testdata/stable/animated/elk/sketch.exp.svg index 780ed3dc7..d3ce0e5b2 100644 --- a/e2etests/testdata/stable/animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/elk/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-730234807 .fill-N1{fill:#0A0F25;} + .d2-730234807 .fill-N2{fill:#676C7E;} + .d2-730234807 .fill-N3{fill:#9499AB;} + .d2-730234807 .fill-N4{fill:#CFD2DD;} + .d2-730234807 .fill-N5{fill:#DEE1EB;} + .d2-730234807 .fill-N6{fill:#EEF1F8;} + .d2-730234807 .fill-N7{fill:#FFFFFF;} + .d2-730234807 .fill-B1{fill:#0D32B2;} + .d2-730234807 .fill-B2{fill:#0D32B2;} + .d2-730234807 .fill-B3{fill:#E3E9FD;} + .d2-730234807 .fill-B4{fill:#E3E9FD;} + .d2-730234807 .fill-B5{fill:#EDF0FD;} + .d2-730234807 .fill-B6{fill:#F7F8FE;} + .d2-730234807 .fill-AA2{fill:#4A6FF3;} + .d2-730234807 .fill-AA4{fill:#EDF0FD;} + .d2-730234807 .fill-AA5{fill:#F7F8FE;} + .d2-730234807 .fill-AB4{fill:#EDF0FD;} + .d2-730234807 .fill-AB5{fill:#F7F8FE;} + .d2-730234807 .stroke-N1{stroke:#0A0F25;} + .d2-730234807 .stroke-N2{stroke:#676C7E;} + .d2-730234807 .stroke-N3{stroke:#9499AB;} + .d2-730234807 .stroke-N4{stroke:#CFD2DD;} + .d2-730234807 .stroke-N5{stroke:#DEE1EB;} + .d2-730234807 .stroke-N6{stroke:#EEF1F8;} + .d2-730234807 .stroke-N7{stroke:#FFFFFF;} + .d2-730234807 .stroke-B1{stroke:#0D32B2;} + .d2-730234807 .stroke-B2{stroke:#0D32B2;} + .d2-730234807 .stroke-B3{stroke:#E3E9FD;} + .d2-730234807 .stroke-B4{stroke:#E3E9FD;} + .d2-730234807 .stroke-B5{stroke:#EDF0FD;} + .d2-730234807 .stroke-B6{stroke:#F7F8FE;} + .d2-730234807 .stroke-AA2{stroke:#4A6FF3;} + .d2-730234807 .stroke-AA4{stroke:#EDF0FD;} + .d2-730234807 .stroke-AA5{stroke:#F7F8FE;} + .d2-730234807 .stroke-AB4{stroke:#EDF0FD;} + .d2-730234807 .stroke-AB5{stroke:#F7F8FE;} + .d2-730234807 .background-color-N1{background-color:#0A0F25;} + .d2-730234807 .background-color-N2{background-color:#676C7E;} + .d2-730234807 .background-color-N3{background-color:#9499AB;} + .d2-730234807 .background-color-N4{background-color:#CFD2DD;} + .d2-730234807 .background-color-N5{background-color:#DEE1EB;} + .d2-730234807 .background-color-N6{background-color:#EEF1F8;} + .d2-730234807 .background-color-N7{background-color:#FFFFFF;} + .d2-730234807 .background-color-B1{background-color:#0D32B2;} + .d2-730234807 .background-color-B2{background-color:#0D32B2;} + .d2-730234807 .background-color-B3{background-color:#E3E9FD;} + .d2-730234807 .background-color-B4{background-color:#E3E9FD;} + .d2-730234807 .background-color-B5{background-color:#EDF0FD;} + .d2-730234807 .background-color-B6{background-color:#F7F8FE;} + .d2-730234807 .background-color-AA2{background-color:#4A6FF3;} + .d2-730234807 .background-color-AA4{background-color:#EDF0FD;} + .d2-730234807 .background-color-AA5{background-color:#F7F8FE;} + .d2-730234807 .background-color-AB4{background-color:#EDF0FD;} + .d2-730234807 .background-color-AB5{background-color:#F7F8FE;} + .d2-730234807 .color-N1{color:#0A0F25;} + .d2-730234807 .color-N2{color:#676C7E;} + .d2-730234807 .color-N3{color:#9499AB;} + .d2-730234807 .color-N4{color:#CFD2DD;} + .d2-730234807 .color-N5{color:#DEE1EB;} + .d2-730234807 .color-N6{color:#EEF1F8;} + .d2-730234807 .color-N7{color:#FFFFFF;} + .d2-730234807 .color-B1{color:#0D32B2;} + .d2-730234807 .color-B2{color:#0D32B2;} + .d2-730234807 .color-B3{color:#E3E9FD;} + .d2-730234807 .color-B4{color:#E3E9FD;} + .d2-730234807 .color-B5{color:#EDF0FD;} + .d2-730234807 .color-B6{color:#F7F8FE;} + .d2-730234807 .color-AA2{color:#4A6FF3;} + .d2-730234807 .color-AA4{color:#EDF0FD;} + .d2-730234807 .color-AA5{color:#F7F8FE;} + .d2-730234807 .color-AB4{color:#EDF0FD;} + .d2-730234807 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json index 58486fe42..3f02ac582 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 73, + "x": 63, "y": 12 }, "width": 80, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 66, - "y": 544 + "x": 55, + "y": 494 }, "width": 80, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "document", "pos": { - "x": 79, - "y": 388 + "x": 108, + "y": 338 }, "width": 80, "height": 76, @@ -130,8 +130,8 @@ "id": "Oval", "type": "oval", "pos": { - "x": 23, - "y": 208 + "x": 53, + "y": 158 }, "width": 100, "height": 100, @@ -195,11 +195,11 @@ "labelPercentage": 0, "route": [ { - "x": 93, + "x": 83, "y": 78 }, { - "x": 93, + "x": 83, "y": 118 }, { @@ -208,15 +208,15 @@ }, { "x": 12, - "y": 504 + "y": 454 }, { - "x": 93, - "y": 504 + "x": 82.5, + "y": 454 }, { - "x": 93, - "y": 544 + "x": 82.5, + "y": 494 } ], "animated": false, @@ -251,12 +251,20 @@ "labelPercentage": 0, "route": [ { - "x": 120, - "y": 453 + "x": 148, + "y": 403 }, { - "x": 119.66666666666666, - "y": 544 + "x": 148, + "y": 454 + }, + { + "x": 109.16666666666667, + "y": 454 + }, + { + "x": 109.16666666666667, + "y": 494 } ], "animated": false, @@ -291,20 +299,12 @@ "labelPercentage": 0, "route": [ { - "x": 113, + "x": 103, "y": 78 }, { - "x": 113, - "y": 168 - }, - { - "x": 73, - "y": 168 - }, - { - "x": 73, - "y": 208 + "x": 103, + "y": 158 } ], "animated": false, @@ -339,11 +339,27 @@ "labelPercentage": 0, "route": [ { - "x": 133, - "y": 388 + "x": 161, + "y": 338 }, { - "x": 133, + "x": 161.33333333333334, + "y": 298 + }, + { + "x": 193, + "y": 298 + }, + { + "x": 193, + "y": 118 + }, + { + "x": 123, + "y": 118 + }, + { + "x": 123, "y": 78 } ], @@ -379,20 +395,20 @@ "labelPercentage": 0, "route": [ { - "x": 73, - "y": 308 + "x": 103, + "y": 258 }, { - "x": 73, - "y": 348 + "x": 103, + "y": 298 }, { - "x": 106.33333333333333, - "y": 348 + "x": 134.66666666666669, + "y": 298 }, { - "x": 106, - "y": 388 + "x": 135, + "y": 338 } ], "animated": false, diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index 4d306d4b3..f51594f93 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abc * - + .d2-568594280 .fill-N1{fill:#0A0F25;} + .d2-568594280 .fill-N2{fill:#676C7E;} + .d2-568594280 .fill-N3{fill:#9499AB;} + .d2-568594280 .fill-N4{fill:#CFD2DD;} + .d2-568594280 .fill-N5{fill:#DEE1EB;} + .d2-568594280 .fill-N6{fill:#EEF1F8;} + .d2-568594280 .fill-N7{fill:#FFFFFF;} + .d2-568594280 .fill-B1{fill:#0D32B2;} + .d2-568594280 .fill-B2{fill:#0D32B2;} + .d2-568594280 .fill-B3{fill:#E3E9FD;} + .d2-568594280 .fill-B4{fill:#E3E9FD;} + .d2-568594280 .fill-B5{fill:#EDF0FD;} + .d2-568594280 .fill-B6{fill:#F7F8FE;} + .d2-568594280 .fill-AA2{fill:#4A6FF3;} + .d2-568594280 .fill-AA4{fill:#EDF0FD;} + .d2-568594280 .fill-AA5{fill:#F7F8FE;} + .d2-568594280 .fill-AB4{fill:#EDF0FD;} + .d2-568594280 .fill-AB5{fill:#F7F8FE;} + .d2-568594280 .stroke-N1{stroke:#0A0F25;} + .d2-568594280 .stroke-N2{stroke:#676C7E;} + .d2-568594280 .stroke-N3{stroke:#9499AB;} + .d2-568594280 .stroke-N4{stroke:#CFD2DD;} + .d2-568594280 .stroke-N5{stroke:#DEE1EB;} + .d2-568594280 .stroke-N6{stroke:#EEF1F8;} + .d2-568594280 .stroke-N7{stroke:#FFFFFF;} + .d2-568594280 .stroke-B1{stroke:#0D32B2;} + .d2-568594280 .stroke-B2{stroke:#0D32B2;} + .d2-568594280 .stroke-B3{stroke:#E3E9FD;} + .d2-568594280 .stroke-B4{stroke:#E3E9FD;} + .d2-568594280 .stroke-B5{stroke:#EDF0FD;} + .d2-568594280 .stroke-B6{stroke:#F7F8FE;} + .d2-568594280 .stroke-AA2{stroke:#4A6FF3;} + .d2-568594280 .stroke-AA4{stroke:#EDF0FD;} + .d2-568594280 .stroke-AA5{stroke:#F7F8FE;} + .d2-568594280 .stroke-AB4{stroke:#EDF0FD;} + .d2-568594280 .stroke-AB5{stroke:#F7F8FE;} + .d2-568594280 .background-color-N1{background-color:#0A0F25;} + .d2-568594280 .background-color-N2{background-color:#676C7E;} + .d2-568594280 .background-color-N3{background-color:#9499AB;} + .d2-568594280 .background-color-N4{background-color:#CFD2DD;} + .d2-568594280 .background-color-N5{background-color:#DEE1EB;} + .d2-568594280 .background-color-N6{background-color:#EEF1F8;} + .d2-568594280 .background-color-N7{background-color:#FFFFFF;} + .d2-568594280 .background-color-B1{background-color:#0D32B2;} + .d2-568594280 .background-color-B2{background-color:#0D32B2;} + .d2-568594280 .background-color-B3{background-color:#E3E9FD;} + .d2-568594280 .background-color-B4{background-color:#E3E9FD;} + .d2-568594280 .background-color-B5{background-color:#EDF0FD;} + .d2-568594280 .background-color-B6{background-color:#F7F8FE;} + .d2-568594280 .background-color-AA2{background-color:#4A6FF3;} + .d2-568594280 .background-color-AA4{background-color:#EDF0FD;} + .d2-568594280 .background-color-AA5{background-color:#F7F8FE;} + .d2-568594280 .background-color-AB4{background-color:#EDF0FD;} + .d2-568594280 .background-color-AB5{background-color:#F7F8FE;} + .d2-568594280 .color-N1{color:#0A0F25;} + .d2-568594280 .color-N2{color:#676C7E;} + .d2-568594280 .color-N3{color:#9499AB;} + .d2-568594280 .color-N4{color:#CFD2DD;} + .d2-568594280 .color-N5{color:#DEE1EB;} + .d2-568594280 .color-N6{color:#EEF1F8;} + .d2-568594280 .color-N7{color:#FFFFFF;} + .d2-568594280 .color-B1{color:#0D32B2;} + .d2-568594280 .color-B2{color:#0D32B2;} + .d2-568594280 .color-B3{color:#E3E9FD;} + .d2-568594280 .color-B4{color:#E3E9FD;} + .d2-568594280 .color-B5{color:#EDF0FD;} + .d2-568594280 .color-B6{color:#F7F8FE;} + .d2-568594280 .color-AA2{color:#4A6FF3;} + .d2-568594280 .color-AA4{color:#EDF0FD;} + .d2-568594280 .color-AA5{color:#F7F8FE;} + .d2-568594280 .color-AB4{color:#EDF0FD;} + .d2-568594280 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc * + \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json index b1d4140e3..9bc34da8f 100644 --- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 463, + "x": 250, "y": 12 }, "width": 80, @@ -48,7 +48,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 183, + "x": 104, "y": 158 }, "width": 80, @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 476, + "x": 392, "y": 158 }, "width": 80, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 56, + "x": 34, "y": 304 }, "width": 80, @@ -171,7 +171,7 @@ "id": "e", "type": "rectangle", "pos": { - "x": 197, + "x": 174, "y": 304 }, "width": 80, @@ -212,7 +212,7 @@ "id": "f", "type": "rectangle", "pos": { - "x": 341, + "x": 317, "y": 304 }, "width": 80, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 489, + "x": 466, "y": 304 }, "width": 80, @@ -417,7 +417,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 224, + "x": 223, "y": 450 }, "width": 53, @@ -647,19 +647,19 @@ "labelPercentage": 0, "route": [ { - "x": 489.6666666666667, + "x": 277.41666666666663, "y": 78 }, { - "x": 489.6666666666667, + "x": 277.41666666666663, "y": 118 }, { - "x": 223.83333333333331, + "x": 144.49999999999994, "y": 118 }, { - "x": 223.83333333333331, + "x": 144.49999999999994, "y": 158 } ], @@ -695,11 +695,19 @@ "labelPercentage": 0, "route": [ { - "x": 516.3333333333334, + "x": 304.0833333333333, "y": 78 }, { - "x": 516.3333333333334, + "x": 304.0833333333333, + "y": 118 + }, + { + "x": 432.24999999999994, + "y": 118 + }, + { + "x": 432.24999999999994, "y": 158 } ], @@ -735,19 +743,19 @@ "labelPercentage": 0, "route": [ { - "x": 210.49999999999997, + "x": 131.16666666666663, "y": 224 }, { - "x": 210.49999999999997, + "x": 131.16666666666663, "y": 264 }, { - "x": 96.16666666666669, + "x": 74, "y": 264 }, { - "x": 96.16666666666669, + "x": 74, "y": 304 } ], @@ -783,11 +791,19 @@ "labelPercentage": 0, "route": [ { - "x": 237.16666666666666, + "x": 157.83333333333326, "y": 224 }, { - "x": 237.16666666666663, + "x": 157.83333333333326, + "y": 264 + }, + { + "x": 214.74999999999994, + "y": 264 + }, + { + "x": 214.74999999999994, "y": 304 } ], @@ -823,19 +839,19 @@ "labelPercentage": 0, "route": [ { - "x": 503, + "x": 418.91666666666663, "y": 224 }, { - "x": 503, + "x": 418.91666666666663, "y": 264 }, { - "x": 381.16666666666663, + "x": 357.99999999999994, "y": 264 }, { - "x": 381.16666666666663, + "x": 357.99999999999994, "y": 304 } ], @@ -871,11 +887,19 @@ "labelPercentage": 0, "route": [ { - "x": 529.6666666666666, + "x": 445.5833333333333, "y": 224 }, { - "x": 529.6666666666666, + "x": 445.5833333333333, + "y": 264 + }, + { + "x": 506.24999999999994, + "y": 264 + }, + { + "x": 506.24999999999994, "y": 304 } ], @@ -911,11 +935,11 @@ "labelPercentage": 0, "route": [ { - "x": 82.83333333333337, + "x": 60.666666666666686, "y": 370 }, { - "x": 82.83333333333337, + "x": 60.666666666666686, "y": 410 }, { @@ -959,9 +983,17 @@ "labelPercentage": 0, "route": [ { - "x": 109.5, + "x": 87.33333333333331, "y": 370 }, + { + "x": 87.33333333333331, + "y": 410 + }, + { + "x": 109.5, + "y": 410 + }, { "x": 109.5, "y": 450 @@ -999,11 +1031,11 @@ "labelPercentage": 0, "route": [ { - "x": 223.8333333333333, + "x": 201.41666666666663, "y": 370 }, { - "x": 223.8333333333333, + "x": 201.41666666666663, "y": 410 }, { @@ -1047,11 +1079,19 @@ "labelPercentage": 0, "route": [ { - "x": 250.49999999999997, + "x": 228.0833333333333, "y": 370 }, { - "x": 250.5, + "x": 228.0833333333333, + "y": 410 + }, + { + "x": 250.49999999999997, + "y": 410 + }, + { + "x": 250.49999999999997, "y": 450 } ], @@ -1087,11 +1127,11 @@ "labelPercentage": 0, "route": [ { - "x": 367.8333333333333, + "x": 344.66666666666663, "y": 370 }, { - "x": 367.8333333333333, + "x": 344.66666666666663, "y": 410 }, { @@ -1135,9 +1175,17 @@ "labelPercentage": 0, "route": [ { - "x": 394.5, + "x": 371.33333333333326, "y": 370 }, + { + "x": 371.33333333333326, + "y": 410 + }, + { + "x": 394.5, + "y": 410 + }, { "x": 394.5, "y": 450 @@ -1175,11 +1223,11 @@ "labelPercentage": 0, "route": [ { - "x": 516.3333333333334, + "x": 492.91666666666663, "y": 370 }, { - "x": 516.3333333333334, + "x": 492.91666666666663, "y": 410 }, { @@ -1223,9 +1271,17 @@ "labelPercentage": 0, "route": [ { - "x": 543, + "x": 519.5833333333333, "y": 370 }, + { + "x": 519.5833333333333, + "y": 410 + }, + { + "x": 543, + "y": 410 + }, { "x": 543, "y": 450 diff --git a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg index 4c4cf4f5f..6bebac46d 100644 --- a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-3462149843 .fill-N1{fill:#0A0F25;} + .d2-3462149843 .fill-N2{fill:#676C7E;} + .d2-3462149843 .fill-N3{fill:#9499AB;} + .d2-3462149843 .fill-N4{fill:#CFD2DD;} + .d2-3462149843 .fill-N5{fill:#DEE1EB;} + .d2-3462149843 .fill-N6{fill:#EEF1F8;} + .d2-3462149843 .fill-N7{fill:#FFFFFF;} + .d2-3462149843 .fill-B1{fill:#0D32B2;} + .d2-3462149843 .fill-B2{fill:#0D32B2;} + .d2-3462149843 .fill-B3{fill:#E3E9FD;} + .d2-3462149843 .fill-B4{fill:#E3E9FD;} + .d2-3462149843 .fill-B5{fill:#EDF0FD;} + .d2-3462149843 .fill-B6{fill:#F7F8FE;} + .d2-3462149843 .fill-AA2{fill:#4A6FF3;} + .d2-3462149843 .fill-AA4{fill:#EDF0FD;} + .d2-3462149843 .fill-AA5{fill:#F7F8FE;} + .d2-3462149843 .fill-AB4{fill:#EDF0FD;} + .d2-3462149843 .fill-AB5{fill:#F7F8FE;} + .d2-3462149843 .stroke-N1{stroke:#0A0F25;} + .d2-3462149843 .stroke-N2{stroke:#676C7E;} + .d2-3462149843 .stroke-N3{stroke:#9499AB;} + .d2-3462149843 .stroke-N4{stroke:#CFD2DD;} + .d2-3462149843 .stroke-N5{stroke:#DEE1EB;} + .d2-3462149843 .stroke-N6{stroke:#EEF1F8;} + .d2-3462149843 .stroke-N7{stroke:#FFFFFF;} + .d2-3462149843 .stroke-B1{stroke:#0D32B2;} + .d2-3462149843 .stroke-B2{stroke:#0D32B2;} + .d2-3462149843 .stroke-B3{stroke:#E3E9FD;} + .d2-3462149843 .stroke-B4{stroke:#E3E9FD;} + .d2-3462149843 .stroke-B5{stroke:#EDF0FD;} + .d2-3462149843 .stroke-B6{stroke:#F7F8FE;} + .d2-3462149843 .stroke-AA2{stroke:#4A6FF3;} + .d2-3462149843 .stroke-AA4{stroke:#EDF0FD;} + .d2-3462149843 .stroke-AA5{stroke:#F7F8FE;} + .d2-3462149843 .stroke-AB4{stroke:#EDF0FD;} + .d2-3462149843 .stroke-AB5{stroke:#F7F8FE;} + .d2-3462149843 .background-color-N1{background-color:#0A0F25;} + .d2-3462149843 .background-color-N2{background-color:#676C7E;} + .d2-3462149843 .background-color-N3{background-color:#9499AB;} + .d2-3462149843 .background-color-N4{background-color:#CFD2DD;} + .d2-3462149843 .background-color-N5{background-color:#DEE1EB;} + .d2-3462149843 .background-color-N6{background-color:#EEF1F8;} + .d2-3462149843 .background-color-N7{background-color:#FFFFFF;} + .d2-3462149843 .background-color-B1{background-color:#0D32B2;} + .d2-3462149843 .background-color-B2{background-color:#0D32B2;} + .d2-3462149843 .background-color-B3{background-color:#E3E9FD;} + .d2-3462149843 .background-color-B4{background-color:#E3E9FD;} + .d2-3462149843 .background-color-B5{background-color:#EDF0FD;} + .d2-3462149843 .background-color-B6{background-color:#F7F8FE;} + .d2-3462149843 .background-color-AA2{background-color:#4A6FF3;} + .d2-3462149843 .background-color-AA4{background-color:#EDF0FD;} + .d2-3462149843 .background-color-AA5{background-color:#F7F8FE;} + .d2-3462149843 .background-color-AB4{background-color:#EDF0FD;} + .d2-3462149843 .background-color-AB5{background-color:#F7F8FE;} + .d2-3462149843 .color-N1{color:#0A0F25;} + .d2-3462149843 .color-N2{color:#676C7E;} + .d2-3462149843 .color-N3{color:#9499AB;} + .d2-3462149843 .color-N4{color:#CFD2DD;} + .d2-3462149843 .color-N5{color:#DEE1EB;} + .d2-3462149843 .color-N6{color:#EEF1F8;} + .d2-3462149843 .color-N7{color:#FFFFFF;} + .d2-3462149843 .color-B1{color:#0D32B2;} + .d2-3462149843 .color-B2{color:#0D32B2;} + .d2-3462149843 .color-B3{color:#E3E9FD;} + .d2-3462149843 .color-B4{color:#E3E9FD;} + .d2-3462149843 .color-B5{color:#EDF0FD;} + .d2-3462149843 .color-B6{color:#F7F8FE;} + .d2-3462149843 .color-AA2{color:#4A6FF3;} + .d2-3462149843 .color-AA4{color:#EDF0FD;} + .d2-3462149843 .color-AA5{color:#F7F8FE;} + .d2-3462149843 .color-AB4{color:#EDF0FD;} + .d2-3462149843 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmno \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index 7bf89c7e8..8dce06233 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 694, + "width": 701, "height": 1812, "opacity": 1, "strokeDash": 0, @@ -51,7 +51,7 @@ "x": 62, "y": 612 }, - "width": 548, + "width": 525, "height": 1067, "opacity": 1, "strokeDash": 0, @@ -89,10 +89,10 @@ "id": "aa.bb.cc", "type": "rectangle", "pos": { - "x": 256, + "x": 203, "y": 939 }, - "width": 304, + "width": 334, "height": 690, "opacity": 1, "strokeDash": 0, @@ -130,7 +130,7 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 306, + "x": 253, "y": 989 }, "width": 193, @@ -171,7 +171,7 @@ "id": "aa.bb.cc.dd.ee", "type": "text", "pos": { - "x": 356, + "x": 303, "y": 1084 }, "width": 16, @@ -211,7 +211,7 @@ "id": "aa.bb.cc.dd.ff", "type": "rectangle", "pos": { - "x": 392, + "x": 339, "y": 1039 }, "width": 57, @@ -252,7 +252,7 @@ "id": "aa.bb.cc.gg", "type": "text", "pos": { - "x": 337, + "x": 358, "y": 1331 }, "width": 80, @@ -292,7 +292,7 @@ "id": "aa.bb.cc.hh", "type": "rectangle", "pos": { - "x": 345, + "x": 367, "y": 1513 }, "width": 63, @@ -415,7 +415,7 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 282, + "x": 285, "y": 721 }, "width": 74, @@ -456,8 +456,8 @@ "id": "aa.ll", "type": "rectangle", "pos": { - "x": 395, - "y": 260 + "x": 459, + "y": 310 }, "width": 120, "height": 66, @@ -497,7 +497,7 @@ "id": "aa.mm", "type": "cylinder", "pos": { - "x": 270, + "x": 287, "y": 62 }, "width": 160, @@ -538,7 +538,7 @@ "id": "aa.nn", "type": "text", "pos": { - "x": 450, + "x": 467, "y": 110 }, "width": 16, @@ -578,7 +578,7 @@ "id": "aa.oo", "type": "rectangle", "pos": { - "x": 486, + "x": 503, "y": 88 }, "width": 63, @@ -644,11 +644,19 @@ "labelPercentage": 0, "route": [ { - "x": 364, + "x": 311, "y": 1105 }, { - "x": 364, + "x": 311, + "y": 1291 + }, + { + "x": 385.16666666666663, + "y": 1291 + }, + { + "x": 385.16666666666663, "y": 1331 } ], @@ -684,11 +692,11 @@ "labelPercentage": 0, "route": [ { - "x": 377.3333333333333, + "x": 398.5, "y": 1352 }, { - "x": 377.3333333333333, + "x": 398.5, "y": 1513 } ], @@ -732,11 +740,11 @@ "y": 894 }, { - "x": 356, + "x": 321, "y": 894 }, { - "x": 356, + "x": 321, "y": 989 } ], @@ -772,19 +780,27 @@ "labelPercentage": 0, "route": [ { - "x": 419, - "y": 326 + "x": 483.25, + "y": 376 }, { - "x": 419, - "y": 517 + "x": 483.25, + "y": 416 }, { - "x": 376, - "y": 517 + "x": 443.75, + "y": 416 }, { - "x": 376, + "x": 443.75, + "y": 567 + }, + { + "x": 413.5, + "y": 567 + }, + { + "x": 413.5, "y": 612 } ], @@ -820,11 +836,19 @@ "labelPercentage": 0, "route": [ { - "x": 366, + "x": 384, "y": 180 }, { - "x": 366, + "x": 383.75, + "y": 567 + }, + { + "x": 403.5, + "y": 567 + }, + { + "x": 403.5, "y": 939 } ], @@ -860,20 +884,20 @@ "labelPercentage": 0, "route": [ { - "x": 398, + "x": 416, "y": 176 }, { - "x": 398, + "x": 415.75, "y": 220 }, { - "x": 455, + "x": 519.25, "y": 220 }, { - "x": 455, - "y": 260 + "x": 519.25, + "y": 310 } ], "animated": false, @@ -908,19 +932,19 @@ "labelPercentage": 0, "route": [ { - "x": 334, + "x": 352, "y": 180 }, { - "x": 334, - "y": 567 + "x": 351.75, + "y": 270 }, { - "x": 197, - "y": 567 + "x": 295.25, + "y": 270 }, { - "x": 197, + "x": 295.25, "y": 612 } ], @@ -956,27 +980,35 @@ "labelPercentage": 0, "route": [ { - "x": 443, - "y": 326 + "x": 507.25, + "y": 376 }, { - "x": 443, - "y": 517 + "x": 507.25, + "y": 466 }, { - "x": 509, - "y": 517 + "x": 494.25, + "y": 466 }, { - "x": 509, + "x": 494.25, + "y": 567 + }, + { + "x": 486, + "y": 567 + }, + { + "x": 486, "y": 1291 }, { - "x": 390.6666666666667, + "x": 411.8333333333333, "y": 1291 }, { - "x": 390.6666666666667, + "x": 411.8333333333333, "y": 1331 } ], @@ -1012,16 +1044,24 @@ "labelPercentage": 0, "route": [ { - "x": 302, + "x": 320, "y": 176 }, { - "x": 302, - "y": 517 + "x": 319.75, + "y": 220 + }, + { + "x": 221.25, + "y": 220 + }, + { + "x": 221.25, + "y": 567 }, { "x": 187, - "y": 517 + "y": 567 }, { "x": 187, @@ -1060,28 +1100,28 @@ "labelPercentage": 0, "route": [ { - "x": 306, + "x": 342.8333333333333, "y": 1629 }, { - "x": 306, + "x": 342.8333333333333, "y": 1724 }, { - "x": 620, + "x": 627, "y": 1724 }, { - "x": 620, - "y": 416 + "x": 627, + "y": 466 }, { - "x": 467, - "y": 416 + "x": 531.25, + "y": 466 }, { - "x": 467, - "y": 326 + "x": 531.25, + "y": 376 } ], "animated": false, @@ -1124,20 +1164,20 @@ "y": 1774 }, { - "x": 647, + "x": 654, "y": 1774 }, { - "x": 647, - "y": 366 + "x": 654, + "y": 416 }, { - "x": 491, - "y": 366 + "x": 555.25, + "y": 416 }, { - "x": 491, - "y": 326 + "x": 555.25, + "y": 376 } ], "animated": false, diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index e7d2b79bb..c3ff5dc94 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index 1a843e6a7..0354534e1 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 21, + "x": 25, "y": 12 }, "width": 53, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 158 + "y": 208 }, "width": 80, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 21, - "y": 304 + "x": 25, + "y": 404 }, "width": 53, "height": 66, @@ -155,12 +155,20 @@ "labelPercentage": 0, "route": [ { - "x": 38.66666666666667, + "x": 43.16666666666667, "y": 78 }, + { + "x": 43.16666666666667, + "y": 168 + }, { "x": 38.66666666666667, - "y": 158 + "y": 168 + }, + { + "x": 38.66666666666667, + "y": 208 } ], "animated": false, @@ -196,11 +204,19 @@ "route": [ { "x": 38.66666666666667, - "y": 224 + "y": 274 }, { "x": 38.66666666666667, - "y": 304 + "y": 364 + }, + { + "x": 43.16666666666667, + "y": 364 + }, + { + "x": 43.16666666666667, + "y": 404 } ], "animated": false, @@ -235,20 +251,20 @@ "labelPercentage": 0, "route": [ { - "x": 56.333333333333336, - "y": 304 + "x": 60.833333333333336, + "y": 404 }, { - "x": 56.333333333333336, - "y": 264 + "x": 60.833333333333336, + "y": 314 }, { "x": 65.33333333333334, - "y": 264 + "y": 314 }, { "x": 65.33333333333334, - "y": 224 + "y": 274 } ], "animated": false, @@ -284,18 +300,18 @@ "route": [ { "x": 65.33333333333334, - "y": 158 + "y": 208 }, { "x": 65.33333333333334, "y": 118 }, { - "x": 56.333333333333336, + "x": 60.833333333333336, "y": 118 }, { - "x": 56.333333333333336, + "x": 60.833333333333336, "y": 78 } ], diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index 38635acea..70c51eb60 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc - + .d2-2769259700 .fill-N1{fill:#0A0F25;} + .d2-2769259700 .fill-N2{fill:#676C7E;} + .d2-2769259700 .fill-N3{fill:#9499AB;} + .d2-2769259700 .fill-N4{fill:#CFD2DD;} + .d2-2769259700 .fill-N5{fill:#DEE1EB;} + .d2-2769259700 .fill-N6{fill:#EEF1F8;} + .d2-2769259700 .fill-N7{fill:#FFFFFF;} + .d2-2769259700 .fill-B1{fill:#0D32B2;} + .d2-2769259700 .fill-B2{fill:#0D32B2;} + .d2-2769259700 .fill-B3{fill:#E3E9FD;} + .d2-2769259700 .fill-B4{fill:#E3E9FD;} + .d2-2769259700 .fill-B5{fill:#EDF0FD;} + .d2-2769259700 .fill-B6{fill:#F7F8FE;} + .d2-2769259700 .fill-AA2{fill:#4A6FF3;} + .d2-2769259700 .fill-AA4{fill:#EDF0FD;} + .d2-2769259700 .fill-AA5{fill:#F7F8FE;} + .d2-2769259700 .fill-AB4{fill:#EDF0FD;} + .d2-2769259700 .fill-AB5{fill:#F7F8FE;} + .d2-2769259700 .stroke-N1{stroke:#0A0F25;} + .d2-2769259700 .stroke-N2{stroke:#676C7E;} + .d2-2769259700 .stroke-N3{stroke:#9499AB;} + .d2-2769259700 .stroke-N4{stroke:#CFD2DD;} + .d2-2769259700 .stroke-N5{stroke:#DEE1EB;} + .d2-2769259700 .stroke-N6{stroke:#EEF1F8;} + .d2-2769259700 .stroke-N7{stroke:#FFFFFF;} + .d2-2769259700 .stroke-B1{stroke:#0D32B2;} + .d2-2769259700 .stroke-B2{stroke:#0D32B2;} + .d2-2769259700 .stroke-B3{stroke:#E3E9FD;} + .d2-2769259700 .stroke-B4{stroke:#E3E9FD;} + .d2-2769259700 .stroke-B5{stroke:#EDF0FD;} + .d2-2769259700 .stroke-B6{stroke:#F7F8FE;} + .d2-2769259700 .stroke-AA2{stroke:#4A6FF3;} + .d2-2769259700 .stroke-AA4{stroke:#EDF0FD;} + .d2-2769259700 .stroke-AA5{stroke:#F7F8FE;} + .d2-2769259700 .stroke-AB4{stroke:#EDF0FD;} + .d2-2769259700 .stroke-AB5{stroke:#F7F8FE;} + .d2-2769259700 .background-color-N1{background-color:#0A0F25;} + .d2-2769259700 .background-color-N2{background-color:#676C7E;} + .d2-2769259700 .background-color-N3{background-color:#9499AB;} + .d2-2769259700 .background-color-N4{background-color:#CFD2DD;} + .d2-2769259700 .background-color-N5{background-color:#DEE1EB;} + .d2-2769259700 .background-color-N6{background-color:#EEF1F8;} + .d2-2769259700 .background-color-N7{background-color:#FFFFFF;} + .d2-2769259700 .background-color-B1{background-color:#0D32B2;} + .d2-2769259700 .background-color-B2{background-color:#0D32B2;} + .d2-2769259700 .background-color-B3{background-color:#E3E9FD;} + .d2-2769259700 .background-color-B4{background-color:#E3E9FD;} + .d2-2769259700 .background-color-B5{background-color:#EDF0FD;} + .d2-2769259700 .background-color-B6{background-color:#F7F8FE;} + .d2-2769259700 .background-color-AA2{background-color:#4A6FF3;} + .d2-2769259700 .background-color-AA4{background-color:#EDF0FD;} + .d2-2769259700 .background-color-AA5{background-color:#F7F8FE;} + .d2-2769259700 .background-color-AB4{background-color:#EDF0FD;} + .d2-2769259700 .background-color-AB5{background-color:#F7F8FE;} + .d2-2769259700 .color-N1{color:#0A0F25;} + .d2-2769259700 .color-N2{color:#676C7E;} + .d2-2769259700 .color-N3{color:#9499AB;} + .d2-2769259700 .color-N4{color:#CFD2DD;} + .d2-2769259700 .color-N5{color:#DEE1EB;} + .d2-2769259700 .color-N6{color:#EEF1F8;} + .d2-2769259700 .color-N7{color:#FFFFFF;} + .d2-2769259700 .color-B1{color:#0D32B2;} + .d2-2769259700 .color-B2{color:#0D32B2;} + .d2-2769259700 .color-B3{color:#E3E9FD;} + .d2-2769259700 .color-B4{color:#E3E9FD;} + .d2-2769259700 .color-B5{color:#EDF0FD;} + .d2-2769259700 .color-B6{color:#F7F8FE;} + .d2-2769259700 .color-AA2{color:#4A6FF3;} + .d2-2769259700 .color-AA4{color:#EDF0FD;} + .d2-2769259700 .color-AA5{color:#F7F8FE;} + .d2-2769259700 .color-AB4{color:#EDF0FD;} + .d2-2769259700 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc + \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json index e2d30d5bd..30d2251bd 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "poll the people", "type": "rectangle", "pos": { - "x": 61, + "x": 110, "y": 12 }, "width": 150, @@ -278,9 +278,17 @@ "labelPercentage": 0, "route": [ { - "x": 111, + "x": 160.16666666666666, "y": 78 }, + { + "x": 160.16666666666666, + "y": 118 + }, + { + "x": 111, + "y": 118 + }, { "x": 111, "y": 158 @@ -366,7 +374,7 @@ "labelPercentage": 0, "route": [ { - "x": 259.3333333333333, + "x": 259.33333333333337, "y": 304 }, { @@ -374,11 +382,11 @@ "y": 118 }, { - "x": 161, + "x": 210.16666666666666, "y": 118 }, { - "x": 161, + "x": 210.16666666666666, "y": 78 } ], diff --git a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg index da65e4222..ea8fad748 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 +poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

+
 \ No newline at end of file diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 0d67c3192..734441d20 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 112, + "x": 94, "y": 12 }, "width": 53, @@ -48,7 +48,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 62, + "x": 44, "y": 213 }, "width": 226, @@ -89,7 +89,7 @@ "id": "g.b", "type": "rectangle", "pos": { - "x": 112, + "x": 94, "y": 263 }, "width": 53, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 469 + "y": 519 }, "width": 253, "height": 271, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 524 + "y": 574 }, "width": 153, "height": 166, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 574 + "y": 624 }, "width": 53, "height": 66, @@ -253,7 +253,7 @@ "id": "g.e", "type": "rectangle", "pos": { - "x": 185, + "x": 167, "y": 263 }, "width": 53, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 469 + "y": 519 }, "width": 51, "height": 66, @@ -360,11 +360,11 @@ "labelPercentage": 0, "route": [ { - "x": 138.5, + "x": 120.75, "y": 78 }, { - "x": 138.5, + "x": 120.75, "y": 263 } ], @@ -400,12 +400,20 @@ "labelPercentage": 0, "route": [ { - "x": 138.5, + "x": 120.75, "y": 329 }, + { + "x": 120.75, + "y": 474 + }, { "x": 138.5, - "y": 574 + "y": 474 + }, + { + "x": 138.5, + "y": 624 } ], "animated": false, @@ -441,26 +449,26 @@ "route": [ { "x": 62, - "y": 740 + "y": 790 }, { "x": 62, - "y": 780 + "y": 830 }, { - "x": 346, - "y": 780 + "x": 376, + "y": 830 }, { - "x": 346, + "x": 376, "y": 118 }, { - "x": 211.5, + "x": 193.75, "y": 118 }, { - "x": 211.5, + "x": 193.75, "y": 263 } ], @@ -496,11 +504,11 @@ "labelPercentage": 0, "route": [ { - "x": 211.5, + "x": 193.75, "y": 329 }, { - "x": 211.5, + "x": 193.75, "y": 424 }, { @@ -509,7 +517,7 @@ }, { "x": 302, - "y": 469 + "y": 519 } ], "animated": false, @@ -545,18 +553,18 @@ "route": [ { "x": 319, - "y": 469 + "y": 519 }, { "x": 319, "y": 168 }, { - "x": 221.5, + "x": 203.75, "y": 168 }, { - "x": 221.5, + "x": 203.75, "y": 213 } ], @@ -592,12 +600,20 @@ "labelPercentage": 0, "route": [ { - "x": 148.5, + "x": 157.25, "y": 379 }, + { + "x": 157.25, + "y": 424 + }, { "x": 148.5, - "y": 524 + "y": 424 + }, + { + "x": 148.5, + "y": 574 } ], "animated": false, diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index 05ab0951c..c1be090d9 100644 --- a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec - + .d2-4156255752 .fill-N1{fill:#0A0F25;} + .d2-4156255752 .fill-N2{fill:#676C7E;} + .d2-4156255752 .fill-N3{fill:#9499AB;} + .d2-4156255752 .fill-N4{fill:#CFD2DD;} + .d2-4156255752 .fill-N5{fill:#DEE1EB;} + .d2-4156255752 .fill-N6{fill:#EEF1F8;} + .d2-4156255752 .fill-N7{fill:#FFFFFF;} + .d2-4156255752 .fill-B1{fill:#0D32B2;} + .d2-4156255752 .fill-B2{fill:#0D32B2;} + .d2-4156255752 .fill-B3{fill:#E3E9FD;} + .d2-4156255752 .fill-B4{fill:#E3E9FD;} + .d2-4156255752 .fill-B5{fill:#EDF0FD;} + .d2-4156255752 .fill-B6{fill:#F7F8FE;} + .d2-4156255752 .fill-AA2{fill:#4A6FF3;} + .d2-4156255752 .fill-AA4{fill:#EDF0FD;} + .d2-4156255752 .fill-AA5{fill:#F7F8FE;} + .d2-4156255752 .fill-AB4{fill:#EDF0FD;} + .d2-4156255752 .fill-AB5{fill:#F7F8FE;} + .d2-4156255752 .stroke-N1{stroke:#0A0F25;} + .d2-4156255752 .stroke-N2{stroke:#676C7E;} + .d2-4156255752 .stroke-N3{stroke:#9499AB;} + .d2-4156255752 .stroke-N4{stroke:#CFD2DD;} + .d2-4156255752 .stroke-N5{stroke:#DEE1EB;} + .d2-4156255752 .stroke-N6{stroke:#EEF1F8;} + .d2-4156255752 .stroke-N7{stroke:#FFFFFF;} + .d2-4156255752 .stroke-B1{stroke:#0D32B2;} + .d2-4156255752 .stroke-B2{stroke:#0D32B2;} + .d2-4156255752 .stroke-B3{stroke:#E3E9FD;} + .d2-4156255752 .stroke-B4{stroke:#E3E9FD;} + .d2-4156255752 .stroke-B5{stroke:#EDF0FD;} + .d2-4156255752 .stroke-B6{stroke:#F7F8FE;} + .d2-4156255752 .stroke-AA2{stroke:#4A6FF3;} + .d2-4156255752 .stroke-AA4{stroke:#EDF0FD;} + .d2-4156255752 .stroke-AA5{stroke:#F7F8FE;} + .d2-4156255752 .stroke-AB4{stroke:#EDF0FD;} + .d2-4156255752 .stroke-AB5{stroke:#F7F8FE;} + .d2-4156255752 .background-color-N1{background-color:#0A0F25;} + .d2-4156255752 .background-color-N2{background-color:#676C7E;} + .d2-4156255752 .background-color-N3{background-color:#9499AB;} + .d2-4156255752 .background-color-N4{background-color:#CFD2DD;} + .d2-4156255752 .background-color-N5{background-color:#DEE1EB;} + .d2-4156255752 .background-color-N6{background-color:#EEF1F8;} + .d2-4156255752 .background-color-N7{background-color:#FFFFFF;} + .d2-4156255752 .background-color-B1{background-color:#0D32B2;} + .d2-4156255752 .background-color-B2{background-color:#0D32B2;} + .d2-4156255752 .background-color-B3{background-color:#E3E9FD;} + .d2-4156255752 .background-color-B4{background-color:#E3E9FD;} + .d2-4156255752 .background-color-B5{background-color:#EDF0FD;} + .d2-4156255752 .background-color-B6{background-color:#F7F8FE;} + .d2-4156255752 .background-color-AA2{background-color:#4A6FF3;} + .d2-4156255752 .background-color-AA4{background-color:#EDF0FD;} + .d2-4156255752 .background-color-AA5{background-color:#F7F8FE;} + .d2-4156255752 .background-color-AB4{background-color:#EDF0FD;} + .d2-4156255752 .background-color-AB5{background-color:#F7F8FE;} + .d2-4156255752 .color-N1{color:#0A0F25;} + .d2-4156255752 .color-N2{color:#676C7E;} + .d2-4156255752 .color-N3{color:#9499AB;} + .d2-4156255752 .color-N4{color:#CFD2DD;} + .d2-4156255752 .color-N5{color:#DEE1EB;} + .d2-4156255752 .color-N6{color:#EEF1F8;} + .d2-4156255752 .color-N7{color:#FFFFFF;} + .d2-4156255752 .color-B1{color:#0D32B2;} + .d2-4156255752 .color-B2{color:#0D32B2;} + .d2-4156255752 .color-B3{color:#E3E9FD;} + .d2-4156255752 .color-B4{color:#E3E9FD;} + .d2-4156255752 .color-B5{color:#EDF0FD;} + .d2-4156255752 .color-B6{color:#F7F8FE;} + .d2-4156255752 .color-AA2{color:#4A6FF3;} + .d2-4156255752 .color-AA4{color:#EDF0FD;} + .d2-4156255752 .color-AA5{color:#F7F8FE;} + .d2-4156255752 .color-AB4{color:#EDF0FD;} + .d2-4156255752 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>agdfbhec + \ No newline at end of file diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json index c048f8b99..7999c5f00 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "a", "type": "rectangle", "pos": { - "x": 359, - "y": 208 + "x": 155, + "y": 158 }, "width": 53, "height": 66, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 245, - "y": 354 + "x": 40, + "y": 304 }, "width": 280, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 286, - "y": 208 + "x": 82, + "y": 158 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 318, - "y": 700 + "x": 362, + "y": 500 }, "width": 120, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 277, - "y": 1192 + "x": 384, + "y": 942 }, "width": 120, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 70, - "y": 946 + "x": 139, + "y": 696 }, "width": 80, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 97, - "y": 700 + "x": 187, + "y": 500 }, "width": 54, "height": 66, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 23, - "y": 700 + "x": 53, + "y": 500 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "i", "type": "rectangle", "pos": { - "x": 144, - "y": 1338 + "x": 79, + "y": 1088 }, "width": 80, "height": 66, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 362, + "x": 141, "y": 12 }, "width": 80, @@ -417,8 +417,8 @@ "id": "k", "type": "rectangle", "pos": { - "x": 157, - "y": 1474 + "x": 92, + "y": 1224 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l", "type": "rectangle", "pos": { - "x": 348, - "y": 946 + "x": 511, + "y": 696 }, "width": 120, "height": 66, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 171, - "y": 700 + "x": 261, + "y": 500 }, "width": 80, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 137, - "y": 1192 + "x": 197, + "y": 942 }, "width": 120, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 458, - "y": 700 + "x": 502, + "y": 500 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 532, - "y": 700 + "x": 576, + "y": 500 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 310, - "y": 1338 + "x": 417, + "y": 1088 }, "width": 54, "height": 66, @@ -729,12 +729,20 @@ "labelPercentage": 0, "route": [ { - "x": 385.6666666666667, - "y": 274 + "x": 181.5, + "y": 224 }, { - "x": 385.6666666666667, - "y": 354 + "x": 181.5, + "y": 264 + }, + { + "x": 180, + "y": 264 + }, + { + "x": 180, + "y": 304 } ], "animated": false, @@ -769,20 +777,20 @@ "labelPercentage": 0, "route": [ { - "x": 312.6666666666667, - "y": 274 + "x": 108.5, + "y": 224 }, { - "x": 312.6666666666667, - "y": 314 + "x": 108.5, + "y": 264 }, { - "x": 315.6666666666667, - "y": 314 + "x": 110, + "y": 264 }, { - "x": 315.6666666666667, - "y": 354 + "x": 110, + "y": 304 } ], "animated": false, @@ -817,20 +825,28 @@ "labelPercentage": 0, "route": [ { - "x": 378.6666666666667, - "y": 766 + "x": 422.75, + "y": 566 }, { - "x": 378.6666666666667, - "y": 856 + "x": 422.75, + "y": 606 }, { - "x": 337.6666666666667, - "y": 856 + "x": 421, + "y": 606 }, { - "x": 337.6666666666667, - "y": 1192 + "x": 421, + "y": 802 + }, + { + "x": 444.3333333333333, + "y": 802 + }, + { + "x": 444.3333333333333, + "y": 942 } ], "animated": false, @@ -865,20 +881,20 @@ "labelPercentage": 0, "route": [ { - "x": 124.00000000000003, - "y": 1012 + "x": 192.66666666666657, + "y": 762 }, { - "x": 124.00000000000003, - "y": 1102 + "x": 192.66666666666657, + "y": 852 }, { - "x": 307.6666666666667, - "y": 1102 + "x": 414.3333333333333, + "y": 852 }, { - "x": 307.6666666666667, - "y": 1192 + "x": 414.3333333333333, + "y": 942 } ], "animated": false, @@ -913,28 +929,28 @@ "labelPercentage": 0, "route": [ { - "x": 365.6666666666667, - "y": 420 + "x": 160, + "y": 370 }, { - "x": 365.6666666666667, - "y": 560 + "x": 160, + "y": 410 }, { - "x": 86, - "y": 560 + "x": 146, + "y": 410 }, { - "x": 86, - "y": 806 + "x": 146, + "y": 606 }, { - "x": 97.33333333333337, - "y": 806 + "x": 165.99999999999994, + "y": 606 }, { - "x": 97.33333333333337, - "y": 946 + "x": 165.99999999999994, + "y": 696 } ], "animated": false, @@ -969,20 +985,20 @@ "labelPercentage": 0, "route": [ { - "x": 405.6666666666667, - "y": 420 + "x": 200, + "y": 370 }, { - "x": 405.6666666666667, - "y": 610 + "x": 200, + "y": 410 }, { - "x": 124, - "y": 610 + "x": 214, + "y": 410 }, { - "x": 124, - "y": 700 + "x": 214, + "y": 500 } ], "animated": false, @@ -1017,12 +1033,20 @@ "labelPercentage": 0, "route": [ { - "x": 124, - "y": 766 + "x": 214, + "y": 566 }, { - "x": 124.00000000000003, - "y": 946 + "x": 214, + "y": 606 + }, + { + "x": 192.66666666666657, + "y": 606 + }, + { + "x": 192.66666666666657, + "y": 696 } ], "animated": false, @@ -1057,20 +1081,20 @@ "labelPercentage": 0, "route": [ { - "x": 325.6666666666667, - "y": 420 + "x": 120, + "y": 370 }, { - "x": 325.6666666666667, - "y": 510 + "x": 120, + "y": 460 }, { - "x": 49.5, - "y": 510 + "x": 79.5, + "y": 460 }, { - "x": 49.5, - "y": 700 + "x": 79.5, + "y": 500 } ], "animated": false, @@ -1105,28 +1129,28 @@ "labelPercentage": 0, "route": [ { - "x": 285.6666666666667, - "y": 420 + "x": 80, + "y": 370 }, { - "x": 285.6666666666667, - "y": 460 + "x": 80, + "y": 410 }, { "x": 12, - "y": 460 + "y": 410 }, { "x": 12, - "y": 1298 + "y": 1048 }, { - "x": 171, - "y": 1298 + "x": 106.08333333333331, + "y": 1048 }, { - "x": 171, - "y": 1338 + "x": 106.08333333333331, + "y": 1088 } ], "animated": false, @@ -1161,20 +1185,20 @@ "labelPercentage": 0, "route": [ { - "x": 445.6666666666667, - "y": 420 + "x": 240, + "y": 370 }, { - "x": 445.6666666666667, - "y": 660 + "x": 240, + "y": 460 }, { - "x": 378.6666666666667, - "y": 660 + "x": 422.75, + "y": 460 }, { - "x": 378.6666666666667, - "y": 700 + "x": 422.75, + "y": 500 } ], "animated": false, @@ -1209,20 +1233,20 @@ "labelPercentage": 0, "route": [ { - "x": 382.1666666666667, + "x": 161.5, "y": 78 }, { - "x": 382.1666666666667, + "x": 161.5, "y": 118 }, { - "x": 312.6666666666667, + "x": 108.5, "y": 118 }, { - "x": 312.6666666666667, - "y": 208 + "x": 108.5, + "y": 158 } ], "animated": false, @@ -1257,20 +1281,12 @@ "labelPercentage": 0, "route": [ { - "x": 402.1666666666667, + "x": 181.5, "y": 78 }, { - "x": 402.1666666666667, - "y": 168 - }, - { - "x": 385.6666666666667, - "y": 168 - }, - { - "x": 385.6666666666667, - "y": 208 + "x": 181.5, + "y": 158 } ], "animated": false, @@ -1305,19 +1321,19 @@ "labelPercentage": 0, "route": [ { - "x": 455.6666666666667, - "y": 354 + "x": 250, + "y": 304 }, { - "x": 455.6666666666667, - "y": 314 + "x": 249.99999999999997, + "y": 118 }, { - "x": 422.1666666666667, - "y": 314 + "x": 201.5, + "y": 118 }, { - "x": 422.1666666666667, + "x": 201.5, "y": 78 } ], @@ -1353,12 +1369,12 @@ "labelPercentage": 0, "route": [ { - "x": 184.33333333333334, - "y": 1404 + "x": 119.41666666666663, + "y": 1154 }, { - "x": 184.33333333333334, - "y": 1474 + "x": 119.41666666666663, + "y": 1224 } ], "animated": false, @@ -1393,12 +1409,20 @@ "labelPercentage": 0, "route": [ { - "x": 408.6666666666667, - "y": 766 + "x": 452.75, + "y": 566 }, { - "x": 408.6666666666667, - "y": 946 + "x": 452.75, + "y": 606 + }, + { + "x": 571.5, + "y": 606 + }, + { + "x": 571.5, + "y": 696 } ], "animated": false, @@ -1433,20 +1457,20 @@ "labelPercentage": 0, "route": [ { - "x": 408.6666666666667, - "y": 1012 + "x": 571.5, + "y": 762 }, { - "x": 408.6666666666667, - "y": 1052 + "x": 571.5, + "y": 802 }, { - "x": 367.6666666666667, - "y": 1052 + "x": 474.3333333333333, + "y": 802 }, { - "x": 367.6666666666667, - "y": 1192 + "x": 474.3333333333333, + "y": 942 } ], "animated": false, @@ -1481,20 +1505,20 @@ "labelPercentage": 0, "route": [ { - "x": 224.33333333333334, - "y": 766 + "x": 314.3333333333333, + "y": 566 }, { - "x": 224.33333333333334, - "y": 906 + "x": 314.3333333333333, + "y": 656 }, { - "x": 378.6666666666667, - "y": 906 + "x": 541.5, + "y": 656 }, { - "x": 378.6666666666667, - "y": 946 + "x": 541.5, + "y": 696 } ], "animated": false, @@ -1529,12 +1553,20 @@ "labelPercentage": 0, "route": [ { - "x": 197.66666666666666, - "y": 766 + "x": 287.66666666666663, + "y": 566 }, { - "x": 197.66666666666669, - "y": 1192 + "x": 287.66666666666663, + "y": 802 + }, + { + "x": 257.25, + "y": 802 + }, + { + "x": 257.25, + "y": 942 } ], "animated": false, @@ -1569,12 +1601,20 @@ "labelPercentage": 0, "route": [ { - "x": 197.66666666666669, - "y": 1258 + "x": 257.25, + "y": 1008 }, { - "x": 197.66666666666669, - "y": 1338 + "x": 257.25, + "y": 1048 + }, + { + "x": 132.74999999999994, + "y": 1048 + }, + { + "x": 132.74999999999994, + "y": 1088 } ], "animated": false, @@ -1609,28 +1649,28 @@ "labelPercentage": 0, "route": [ { - "x": 348.6666666666667, - "y": 766 + "x": 392.75, + "y": 566 }, { - "x": 348.6666666666667, - "y": 806 + "x": 392.75, + "y": 606 }, { - "x": 326.6666666666667, - "y": 806 + "x": 353.41666666666663, + "y": 606 }, { - "x": 326.6666666666667, - "y": 1052 + "x": 353.41666666666663, + "y": 902 }, { - "x": 227.66666666666669, - "y": 1052 + "x": 287.25, + "y": 902 }, { - "x": 227.66666666666669, - "y": 1192 + "x": 287.25, + "y": 942 } ], "animated": false, @@ -1665,20 +1705,20 @@ "labelPercentage": 0, "route": [ { - "x": 97.33333333333337, - "y": 1012 + "x": 165.99999999999994, + "y": 762 }, { - "x": 97.33333333333337, - "y": 1152 + "x": 165.99999999999994, + "y": 902 }, { - "x": 167.66666666666669, - "y": 1152 + "x": 227.25, + "y": 902 }, { - "x": 167.66666666666669, - "y": 1192 + "x": 227.25, + "y": 942 } ], "animated": false, @@ -1713,12 +1753,20 @@ "labelPercentage": 0, "route": [ { - "x": 485.6666666666667, - "y": 420 + "x": 280, + "y": 370 }, { - "x": 485.6666666666667, - "y": 700 + "x": 280, + "y": 410 + }, + { + "x": 529.75, + "y": 410 + }, + { + "x": 529.75, + "y": 500 } ], "animated": false, @@ -1753,20 +1801,20 @@ "labelPercentage": 0, "route": [ { - "x": 559.1666666666667, - "y": 766 + "x": 603.25, + "y": 566 }, { - "x": 559.1666666666667, - "y": 806 + "x": 603.25, + "y": 606 }, { - "x": 438.6666666666667, - "y": 806 + "x": 601.5, + "y": 606 }, { - "x": 438.6666666666667, - "y": 946 + "x": 601.5, + "y": 696 } ], "animated": false, @@ -1801,12 +1849,12 @@ "labelPercentage": 0, "route": [ { - "x": 337.6666666666667, - "y": 1258 + "x": 444.3333333333333, + "y": 1008 }, { - "x": 337.6666666666667, - "y": 1338 + "x": 444.3333333333333, + "y": 1088 } ], "animated": false, diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index 499a47d8e..36412a1a3 100644 --- a/e2etests/testdata/stable/dense/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq - + .d2-2875301911 .fill-N1{fill:#0A0F25;} + .d2-2875301911 .fill-N2{fill:#676C7E;} + .d2-2875301911 .fill-N3{fill:#9499AB;} + .d2-2875301911 .fill-N4{fill:#CFD2DD;} + .d2-2875301911 .fill-N5{fill:#DEE1EB;} + .d2-2875301911 .fill-N6{fill:#EEF1F8;} + .d2-2875301911 .fill-N7{fill:#FFFFFF;} + .d2-2875301911 .fill-B1{fill:#0D32B2;} + .d2-2875301911 .fill-B2{fill:#0D32B2;} + .d2-2875301911 .fill-B3{fill:#E3E9FD;} + .d2-2875301911 .fill-B4{fill:#E3E9FD;} + .d2-2875301911 .fill-B5{fill:#EDF0FD;} + .d2-2875301911 .fill-B6{fill:#F7F8FE;} + .d2-2875301911 .fill-AA2{fill:#4A6FF3;} + .d2-2875301911 .fill-AA4{fill:#EDF0FD;} + .d2-2875301911 .fill-AA5{fill:#F7F8FE;} + .d2-2875301911 .fill-AB4{fill:#EDF0FD;} + .d2-2875301911 .fill-AB5{fill:#F7F8FE;} + .d2-2875301911 .stroke-N1{stroke:#0A0F25;} + .d2-2875301911 .stroke-N2{stroke:#676C7E;} + .d2-2875301911 .stroke-N3{stroke:#9499AB;} + .d2-2875301911 .stroke-N4{stroke:#CFD2DD;} + .d2-2875301911 .stroke-N5{stroke:#DEE1EB;} + .d2-2875301911 .stroke-N6{stroke:#EEF1F8;} + .d2-2875301911 .stroke-N7{stroke:#FFFFFF;} + .d2-2875301911 .stroke-B1{stroke:#0D32B2;} + .d2-2875301911 .stroke-B2{stroke:#0D32B2;} + .d2-2875301911 .stroke-B3{stroke:#E3E9FD;} + .d2-2875301911 .stroke-B4{stroke:#E3E9FD;} + .d2-2875301911 .stroke-B5{stroke:#EDF0FD;} + .d2-2875301911 .stroke-B6{stroke:#F7F8FE;} + .d2-2875301911 .stroke-AA2{stroke:#4A6FF3;} + .d2-2875301911 .stroke-AA4{stroke:#EDF0FD;} + .d2-2875301911 .stroke-AA5{stroke:#F7F8FE;} + .d2-2875301911 .stroke-AB4{stroke:#EDF0FD;} + .d2-2875301911 .stroke-AB5{stroke:#F7F8FE;} + .d2-2875301911 .background-color-N1{background-color:#0A0F25;} + .d2-2875301911 .background-color-N2{background-color:#676C7E;} + .d2-2875301911 .background-color-N3{background-color:#9499AB;} + .d2-2875301911 .background-color-N4{background-color:#CFD2DD;} + .d2-2875301911 .background-color-N5{background-color:#DEE1EB;} + .d2-2875301911 .background-color-N6{background-color:#EEF1F8;} + .d2-2875301911 .background-color-N7{background-color:#FFFFFF;} + .d2-2875301911 .background-color-B1{background-color:#0D32B2;} + .d2-2875301911 .background-color-B2{background-color:#0D32B2;} + .d2-2875301911 .background-color-B3{background-color:#E3E9FD;} + .d2-2875301911 .background-color-B4{background-color:#E3E9FD;} + .d2-2875301911 .background-color-B5{background-color:#EDF0FD;} + .d2-2875301911 .background-color-B6{background-color:#F7F8FE;} + .d2-2875301911 .background-color-AA2{background-color:#4A6FF3;} + .d2-2875301911 .background-color-AA4{background-color:#EDF0FD;} + .d2-2875301911 .background-color-AA5{background-color:#F7F8FE;} + .d2-2875301911 .background-color-AB4{background-color:#EDF0FD;} + .d2-2875301911 .background-color-AB5{background-color:#F7F8FE;} + .d2-2875301911 .color-N1{color:#0A0F25;} + .d2-2875301911 .color-N2{color:#676C7E;} + .d2-2875301911 .color-N3{color:#9499AB;} + .d2-2875301911 .color-N4{color:#CFD2DD;} + .d2-2875301911 .color-N5{color:#DEE1EB;} + .d2-2875301911 .color-N6{color:#EEF1F8;} + .d2-2875301911 .color-N7{color:#FFFFFF;} + .d2-2875301911 .color-B1{color:#0D32B2;} + .d2-2875301911 .color-B2{color:#0D32B2;} + .d2-2875301911 .color-B3{color:#E3E9FD;} + .d2-2875301911 .color-B4{color:#E3E9FD;} + .d2-2875301911 .color-B5{color:#EDF0FD;} + .d2-2875301911 .color-B6{color:#F7F8FE;} + .d2-2875301911 .color-AA2{color:#4A6FF3;} + .d2-2875301911 .color-AA4{color:#EDF0FD;} + .d2-2875301911 .color-AA5{color:#F7F8FE;} + .d2-2875301911 .color-AB4{color:#EDF0FD;} + .d2-2875301911 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopq + \ No newline at end of file diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index d1c97c816..bea07e5b9 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 269, + "x": 199, "y": 530 }, "width": 120, @@ -48,8 +48,8 @@ "id": "tree", "type": "rectangle", "pos": { - "x": 102, - "y": 726 + "x": 64, + "y": 676 }, "width": 80, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 223, - "y": 726 + "y": 676 }, "width": 72, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 315, - "y": 726 + "y": 676 }, "width": 87, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 218, - "y": 872 + "y": 822 }, "width": 83, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 872 + "y": 822 }, "width": 81, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 113, - "y": 872 + "y": 822 }, "width": 85, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 422, - "y": 726 + "y": 676 }, "width": 76, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 424, - "y": 872 + "y": 822 }, "width": 72, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 518, - "y": 726 + "y": 676 }, "width": 113, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 697, - "y": 726 + "y": 676 }, "width": 103, "height": 66, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 719, - "y": 872 + "y": 822 }, "width": 60, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": 955, - "y": 726 + "y": 676 }, "width": 82, "height": 66, @@ -704,7 +704,7 @@ "id": "finally.a", "type": "rectangle", "pos": { - "x": 732, + "x": 766, "y": 198 }, "width": 80, @@ -786,7 +786,7 @@ "id": "finally.inside", "type": "rectangle", "pos": { - "x": 728, + "x": 762, "y": 62 }, "width": 88, @@ -934,20 +934,20 @@ "labelPercentage": 0, "route": [ { - "x": 299, + "x": 229.5, "y": 596 }, { - "x": 299, + "x": 229.5, "y": 636 }, { - "x": 142.16666666666663, + "x": 104, "y": 636 }, { - "x": 142.16666666666663, - "y": 726 + "x": 104, + "y": 676 } ], "animated": false, @@ -982,20 +982,12 @@ "labelPercentage": 0, "route": [ { - "x": 329, + "x": 259.5, "y": 596 }, - { - "x": 329, - "y": 686 - }, { "x": 259.5, - "y": 686 - }, - { - "x": 259.5, - "y": 726 + "y": 676 } ], "animated": false, @@ -1030,12 +1022,20 @@ "labelPercentage": 0, "route": [ { - "x": 359, + "x": 289.5, "y": 596 }, + { + "x": 289.5, + "y": 636 + }, { "x": 359, - "y": 726 + "y": 636 + }, + { + "x": 359, + "y": 676 } ], "animated": false, @@ -1071,11 +1071,11 @@ "route": [ { "x": 259.5, - "y": 792 + "y": 742 }, { "x": 259.5, - "y": 872 + "y": 822 } ], "animated": false, @@ -1110,20 +1110,20 @@ "labelPercentage": 0, "route": [ { - "x": 128.83333333333326, - "y": 792 + "x": 90.66666666666663, + "y": 742 }, { - "x": 128.83333333333326, - "y": 832 + "x": 90.66666666666663, + "y": 782 }, { "x": 52.5, - "y": 832 + "y": 782 }, { "x": 52.5, - "y": 872 + "y": 822 } ], "animated": false, @@ -1158,12 +1158,20 @@ "labelPercentage": 0, "route": [ { - "x": 155.5, - "y": 792 + "x": 117.33333333333337, + "y": 742 + }, + { + "x": 117.33333333333337, + "y": 782 }, { "x": 155.5, - "y": 872 + "y": 782 + }, + { + "x": 155.5, + "y": 822 } ], "animated": false, @@ -1203,7 +1211,7 @@ }, { "x": 460.5, - "y": 726 + "y": 676 } ], "animated": false, @@ -1239,11 +1247,11 @@ "route": [ { "x": 460.5, - "y": 792 + "y": 742 }, { "x": 460.5, - "y": 872 + "y": 822 } ], "animated": false, @@ -1283,7 +1291,7 @@ }, { "x": 593.8333333333334, - "y": 726 + "y": 676 } ], "animated": false, @@ -1331,7 +1339,7 @@ }, { "x": 556.1666666666667, - "y": 726 + "y": 676 } ], "animated": false, @@ -1371,7 +1379,7 @@ }, { "x": 749, - "y": 726 + "y": 676 } ], "animated": false, @@ -1407,11 +1415,11 @@ "route": [ { "x": 749, - "y": 792 + "y": 742 }, { "x": 749, - "y": 872 + "y": 822 } ], "animated": false, @@ -1446,12 +1454,12 @@ "labelPercentage": 0, "route": [ { - "x": 1010.3333333333333, + "x": 1010.3333333333334, "y": 596 }, { - "x": 1010.3333333333333, - "y": 726 + "x": 1010.3333333333334, + "y": 676 } ], "animated": false, @@ -1486,11 +1494,11 @@ "labelPercentage": 0, "route": [ { - "x": 845.1666666666666, + "x": 845.1666666666667, "y": 596 }, { - "x": 845.1666666666666, + "x": 845.1666666666667, "y": 636 }, { @@ -1499,7 +1507,7 @@ }, { "x": 983, - "y": 726 + "y": 676 } ], "animated": false, @@ -1534,11 +1542,19 @@ "labelPercentage": 0, "route": [ { - "x": 759.3333333333333, + "x": 793.25, "y": 264 }, { - "x": 759.3333333333333, + "x": 793.25, + "y": 304 + }, + { + "x": 759.3333333333334, + "y": 304 + }, + { + "x": 759.3333333333334, "y": 344 } ], @@ -1574,11 +1590,11 @@ "labelPercentage": 0, "route": [ { - "x": 772.6666666666666, + "x": 806.5833333333334, "y": 128 }, { - "x": 772.6666666666666, + "x": 806.5833333333334, "y": 198 } ], @@ -1614,11 +1630,11 @@ "labelPercentage": 0, "route": [ { - "x": 759.3333333333333, + "x": 759.3333333333334, "y": 410 }, { - "x": 759.3333333333333, + "x": 759.3333333333334, "y": 480 } ], @@ -1654,19 +1670,19 @@ "labelPercentage": 0, "route": [ { - "x": 786, + "x": 819.9166666666667, "y": 264 }, { - "x": 786, + "x": 819.9166666666667, "y": 304 }, { - "x": 853.8333333333333, + "x": 853.8333333333334, "y": 304 }, { - "x": 853.8333333333333, + "x": 853.8333333333334, "y": 344 } ], diff --git a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg index df280dba5..ab6b45684 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - + .d2-4015186878 .fill-N1{fill:#0A0F25;} + .d2-4015186878 .fill-N2{fill:#676C7E;} + .d2-4015186878 .fill-N3{fill:#9499AB;} + .d2-4015186878 .fill-N4{fill:#CFD2DD;} + .d2-4015186878 .fill-N5{fill:#DEE1EB;} + .d2-4015186878 .fill-N6{fill:#EEF1F8;} + .d2-4015186878 .fill-N7{fill:#FFFFFF;} + .d2-4015186878 .fill-B1{fill:#0D32B2;} + .d2-4015186878 .fill-B2{fill:#0D32B2;} + .d2-4015186878 .fill-B3{fill:#E3E9FD;} + .d2-4015186878 .fill-B4{fill:#E3E9FD;} + .d2-4015186878 .fill-B5{fill:#EDF0FD;} + .d2-4015186878 .fill-B6{fill:#F7F8FE;} + .d2-4015186878 .fill-AA2{fill:#4A6FF3;} + .d2-4015186878 .fill-AA4{fill:#EDF0FD;} + .d2-4015186878 .fill-AA5{fill:#F7F8FE;} + .d2-4015186878 .fill-AB4{fill:#EDF0FD;} + .d2-4015186878 .fill-AB5{fill:#F7F8FE;} + .d2-4015186878 .stroke-N1{stroke:#0A0F25;} + .d2-4015186878 .stroke-N2{stroke:#676C7E;} + .d2-4015186878 .stroke-N3{stroke:#9499AB;} + .d2-4015186878 .stroke-N4{stroke:#CFD2DD;} + .d2-4015186878 .stroke-N5{stroke:#DEE1EB;} + .d2-4015186878 .stroke-N6{stroke:#EEF1F8;} + .d2-4015186878 .stroke-N7{stroke:#FFFFFF;} + .d2-4015186878 .stroke-B1{stroke:#0D32B2;} + .d2-4015186878 .stroke-B2{stroke:#0D32B2;} + .d2-4015186878 .stroke-B3{stroke:#E3E9FD;} + .d2-4015186878 .stroke-B4{stroke:#E3E9FD;} + .d2-4015186878 .stroke-B5{stroke:#EDF0FD;} + .d2-4015186878 .stroke-B6{stroke:#F7F8FE;} + .d2-4015186878 .stroke-AA2{stroke:#4A6FF3;} + .d2-4015186878 .stroke-AA4{stroke:#EDF0FD;} + .d2-4015186878 .stroke-AA5{stroke:#F7F8FE;} + .d2-4015186878 .stroke-AB4{stroke:#EDF0FD;} + .d2-4015186878 .stroke-AB5{stroke:#F7F8FE;} + .d2-4015186878 .background-color-N1{background-color:#0A0F25;} + .d2-4015186878 .background-color-N2{background-color:#676C7E;} + .d2-4015186878 .background-color-N3{background-color:#9499AB;} + .d2-4015186878 .background-color-N4{background-color:#CFD2DD;} + .d2-4015186878 .background-color-N5{background-color:#DEE1EB;} + .d2-4015186878 .background-color-N6{background-color:#EEF1F8;} + .d2-4015186878 .background-color-N7{background-color:#FFFFFF;} + .d2-4015186878 .background-color-B1{background-color:#0D32B2;} + .d2-4015186878 .background-color-B2{background-color:#0D32B2;} + .d2-4015186878 .background-color-B3{background-color:#E3E9FD;} + .d2-4015186878 .background-color-B4{background-color:#E3E9FD;} + .d2-4015186878 .background-color-B5{background-color:#EDF0FD;} + .d2-4015186878 .background-color-B6{background-color:#F7F8FE;} + .d2-4015186878 .background-color-AA2{background-color:#4A6FF3;} + .d2-4015186878 .background-color-AA4{background-color:#EDF0FD;} + .d2-4015186878 .background-color-AA5{background-color:#F7F8FE;} + .d2-4015186878 .background-color-AB4{background-color:#EDF0FD;} + .d2-4015186878 .background-color-AB5{background-color:#F7F8FE;} + .d2-4015186878 .color-N1{color:#0A0F25;} + .d2-4015186878 .color-N2{color:#676C7E;} + .d2-4015186878 .color-N3{color:#9499AB;} + .d2-4015186878 .color-N4{color:#CFD2DD;} + .d2-4015186878 .color-N5{color:#DEE1EB;} + .d2-4015186878 .color-N6{color:#EEF1F8;} + .d2-4015186878 .color-N7{color:#FFFFFF;} + .d2-4015186878 .color-B1{color:#0D32B2;} + .d2-4015186878 .color-B2{color:#0D32B2;} + .d2-4015186878 .color-B3{color:#E3E9FD;} + .d2-4015186878 .color-B4{color:#E3E9FD;} + .d2-4015186878 .color-B5{color:#EDF0FD;} + .d2-4015186878 .color-B6{color:#F7F8FE;} + .d2-4015186878 .color-AA2{color:#4A6FF3;} + .d2-4015186878 .color-AA4{color:#EDF0FD;} + .d2-4015186878 .color-AA5{color:#F7F8FE;} + .d2-4015186878 .color-AB4{color:#EDF0FD;} + .d2-4015186878 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json b/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json index f63d00890..e64b72711 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json @@ -278,11 +278,11 @@ "labelPercentage": 0, "route": [ { - "x": 117.83333333333334, + "x": 117.83333333333333, "y": 78 }, { - "x": 117.83333333333334, + "x": 117.83333333333333, "y": 118 }, { @@ -325,11 +325,11 @@ "labelPercentage": 0, "route": [ { - "x": 151.16666666666669, + "x": 151.16666666666666, "y": 78 }, { - "x": 151.16666666666669, + "x": 151.16666666666666, "y": 168 }, { diff --git a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg index 0fa734ceb..b4e5d2301 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-1677059962 .fill-N1{fill:#0A0F25;} + .d2-1677059962 .fill-N2{fill:#676C7E;} + .d2-1677059962 .fill-N3{fill:#9499AB;} + .d2-1677059962 .fill-N4{fill:#CFD2DD;} + .d2-1677059962 .fill-N5{fill:#DEE1EB;} + .d2-1677059962 .fill-N6{fill:#EEF1F8;} + .d2-1677059962 .fill-N7{fill:#FFFFFF;} + .d2-1677059962 .fill-B1{fill:#0D32B2;} + .d2-1677059962 .fill-B2{fill:#0D32B2;} + .d2-1677059962 .fill-B3{fill:#E3E9FD;} + .d2-1677059962 .fill-B4{fill:#E3E9FD;} + .d2-1677059962 .fill-B5{fill:#EDF0FD;} + .d2-1677059962 .fill-B6{fill:#F7F8FE;} + .d2-1677059962 .fill-AA2{fill:#4A6FF3;} + .d2-1677059962 .fill-AA4{fill:#EDF0FD;} + .d2-1677059962 .fill-AA5{fill:#F7F8FE;} + .d2-1677059962 .fill-AB4{fill:#EDF0FD;} + .d2-1677059962 .fill-AB5{fill:#F7F8FE;} + .d2-1677059962 .stroke-N1{stroke:#0A0F25;} + .d2-1677059962 .stroke-N2{stroke:#676C7E;} + .d2-1677059962 .stroke-N3{stroke:#9499AB;} + .d2-1677059962 .stroke-N4{stroke:#CFD2DD;} + .d2-1677059962 .stroke-N5{stroke:#DEE1EB;} + .d2-1677059962 .stroke-N6{stroke:#EEF1F8;} + .d2-1677059962 .stroke-N7{stroke:#FFFFFF;} + .d2-1677059962 .stroke-B1{stroke:#0D32B2;} + .d2-1677059962 .stroke-B2{stroke:#0D32B2;} + .d2-1677059962 .stroke-B3{stroke:#E3E9FD;} + .d2-1677059962 .stroke-B4{stroke:#E3E9FD;} + .d2-1677059962 .stroke-B5{stroke:#EDF0FD;} + .d2-1677059962 .stroke-B6{stroke:#F7F8FE;} + .d2-1677059962 .stroke-AA2{stroke:#4A6FF3;} + .d2-1677059962 .stroke-AA4{stroke:#EDF0FD;} + .d2-1677059962 .stroke-AA5{stroke:#F7F8FE;} + .d2-1677059962 .stroke-AB4{stroke:#EDF0FD;} + .d2-1677059962 .stroke-AB5{stroke:#F7F8FE;} + .d2-1677059962 .background-color-N1{background-color:#0A0F25;} + .d2-1677059962 .background-color-N2{background-color:#676C7E;} + .d2-1677059962 .background-color-N3{background-color:#9499AB;} + .d2-1677059962 .background-color-N4{background-color:#CFD2DD;} + .d2-1677059962 .background-color-N5{background-color:#DEE1EB;} + .d2-1677059962 .background-color-N6{background-color:#EEF1F8;} + .d2-1677059962 .background-color-N7{background-color:#FFFFFF;} + .d2-1677059962 .background-color-B1{background-color:#0D32B2;} + .d2-1677059962 .background-color-B2{background-color:#0D32B2;} + .d2-1677059962 .background-color-B3{background-color:#E3E9FD;} + .d2-1677059962 .background-color-B4{background-color:#E3E9FD;} + .d2-1677059962 .background-color-B5{background-color:#EDF0FD;} + .d2-1677059962 .background-color-B6{background-color:#F7F8FE;} + .d2-1677059962 .background-color-AA2{background-color:#4A6FF3;} + .d2-1677059962 .background-color-AA4{background-color:#EDF0FD;} + .d2-1677059962 .background-color-AA5{background-color:#F7F8FE;} + .d2-1677059962 .background-color-AB4{background-color:#EDF0FD;} + .d2-1677059962 .background-color-AB5{background-color:#F7F8FE;} + .d2-1677059962 .color-N1{color:#0A0F25;} + .d2-1677059962 .color-N2{color:#676C7E;} + .d2-1677059962 .color-N3{color:#9499AB;} + .d2-1677059962 .color-N4{color:#CFD2DD;} + .d2-1677059962 .color-N5{color:#DEE1EB;} + .d2-1677059962 .color-N6{color:#EEF1F8;} + .d2-1677059962 .color-N7{color:#FFFFFF;} + .d2-1677059962 .color-B1{color:#0D32B2;} + .d2-1677059962 .color-B2{color:#0D32B2;} + .d2-1677059962 .color-B3{color:#E3E9FD;} + .d2-1677059962 .color-B4{color:#E3E9FD;} + .d2-1677059962 .color-B5{color:#EDF0FD;} + .d2-1677059962 .color-B6{color:#F7F8FE;} + .d2-1677059962 .color-AA2{color:#4A6FF3;} + .d2-1677059962 .color-AA4{color:#EDF0FD;} + .d2-1677059962 .color-AA5{color:#F7F8FE;} + .d2-1677059962 .color-AB4{color:#EDF0FD;} + .d2-1677059962 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcefg \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 8bb03c0e1..0889b4bf4 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "aa", "type": "step", "pos": { - "x": 70, + "x": 195, "y": 12 }, "width": 102, @@ -48,7 +48,7 @@ "id": "bb", "type": "step", "pos": { - "x": 155, + "x": 245, "y": 193 }, "width": 103, @@ -89,7 +89,7 @@ "id": "cc", "type": "step", "pos": { - "x": 138, + "x": 185, "y": 374 }, "width": 101, @@ -130,11 +130,11 @@ "id": "dd", "type": "rectangle", "pos": { - "x": 22, + "x": 68, "y": 641 }, "width": 250, - "height": 272, + "height": 322, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,7 +171,7 @@ "id": "dd.ee", "type": "diamond", "pos": { - "x": 72, + "x": 118, "y": 691 }, "width": 64, @@ -212,11 +212,11 @@ "id": "ff", "type": "rectangle", "pos": { - "x": 289, - "y": 1839 + "x": 273, + "y": 1889 }, - "width": 283, - "height": 338, + "width": 281, + "height": 388, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -253,8 +253,8 @@ "id": "ff.gg", "type": "diamond", "pos": { - "x": 342, - "y": 1889 + "x": 323, + "y": 1939 }, "width": 80, "height": 92, @@ -294,7 +294,7 @@ "id": "dd.hh", "type": "diamond", "pos": { - "x": 156, + "x": 202, "y": 691 }, "width": 66, @@ -335,8 +335,8 @@ "id": "ii", "type": "rectangle", "pos": { - "x": 303, - "y": 998 + "x": 208, + "y": 1048 }, "width": 54, "height": 66, @@ -376,8 +376,8 @@ "id": "jj", "type": "rectangle", "pos": { - "x": 303, - "y": 1189 + "x": 207, + "y": 1239 }, "width": 55, "height": 66, @@ -417,8 +417,8 @@ "id": "kk", "type": "rectangle", "pos": { - "x": 290, - "y": 1451 + "x": 195, + "y": 1501 }, "width": 80, "height": 66, @@ -458,8 +458,8 @@ "id": "ll", "type": "rectangle", "pos": { - "x": 249, - "y": 2358 + "x": 251, + "y": 2468 }, "width": 265, "height": 317, @@ -499,8 +499,8 @@ "id": "ll.mm", "type": "oval", "pos": { - "x": 299, - "y": 2408 + "x": 301, + "y": 2518 }, "width": 81, "height": 81, @@ -540,8 +540,8 @@ "id": "ff.mm", "type": "oval", "pos": { - "x": 442, - "y": 1894 + "x": 423, + "y": 1944 }, "width": 81, "height": 81, @@ -581,8 +581,8 @@ "id": "nn", "type": "cylinder", "pos": { - "x": 12, - "y": 3259 + "x": 79, + "y": 3469 }, "width": 327, "height": 166, @@ -622,8 +622,8 @@ "id": "nn.oo", "type": "rectangle", "pos": { - "x": 62, - "y": 3309 + "x": 129, + "y": 3519 }, "width": 63, "height": 66, @@ -663,8 +663,8 @@ "id": "ff.pp", "type": "rectangle", "pos": { - "x": 350, - "y": 2061 + "x": 402, + "y": 2161 }, "width": 63, "height": 66, @@ -704,8 +704,8 @@ "id": "ll.qq", "type": "rectangle", "pos": { - "x": 400, - "y": 2415 + "x": 402, + "y": 2525 }, "width": 64, "height": 66, @@ -745,8 +745,8 @@ "id": "ll.rr", "type": "rectangle", "pos": { - "x": 403, - "y": 2559 + "x": 405, + "y": 2669 }, "width": 58, "height": 66, @@ -786,8 +786,8 @@ "id": "ss", "type": "rectangle", "pos": { - "x": 110, - "y": 1139 + "x": 14, + "y": 1189 }, "width": 158, "height": 166, @@ -827,8 +827,8 @@ "id": "ss.tt", "type": "rectangle", "pos": { - "x": 160, - "y": 1189 + "x": 64, + "y": 1239 }, "width": 58, "height": 66, @@ -868,8 +868,8 @@ "id": "uu", "type": "rectangle", "pos": { - "x": 107, - "y": 1385 + "x": 12, + "y": 1435 }, "width": 163, "height": 166, @@ -909,8 +909,8 @@ "id": "uu.vv", "type": "rectangle", "pos": { - "x": 157, - "y": 1435 + "x": 62, + "y": 1485 }, "width": 63, "height": 66, @@ -950,8 +950,8 @@ "id": "ww", "type": "queue", "pos": { - "x": 139, - "y": 1636 + "x": 103, + "y": 1686 }, "width": 149, "height": 118, @@ -1003,8 +1003,8 @@ "id": "rm", "type": "rectangle", "pos": { - "x": 149, - "y": 2525 + "x": 113, + "y": 2635 }, "width": 80, "height": 66, @@ -1044,8 +1044,8 @@ "id": "nn.xx", "type": "rectangle", "pos": { - "x": 145, - "y": 3309 + "x": 212, + "y": 3519 }, "width": 62, "height": 66, @@ -1085,8 +1085,8 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 290, - "y": 2815 + "x": 309, + "y": 2975 }, "width": 238, "height": 354, @@ -1126,8 +1126,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 340, - "y": 2865 + "x": 359, + "y": 3025 }, "width": 138, "height": 118, @@ -1179,8 +1179,8 @@ "id": "yy.ab", "type": "rectangle", "pos": { - "x": 377, - "y": 3053 + "x": 397, + "y": 3213 }, "width": 63, "height": 66, @@ -1220,8 +1220,8 @@ "id": "nn.ac", "type": "rectangle", "pos": { - "x": 227, - "y": 3309 + "x": 294, + "y": 3519 }, "width": 62, "height": 66, @@ -1261,8 +1261,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 200, - "y": 3500 + "x": 267, + "y": 3710 }, "width": 115, "height": 66, @@ -1327,19 +1327,19 @@ "labelPercentage": 0, "route": [ { - "x": 138, + "x": 263, "y": 111 }, { - "x": 138.33333333333334, + "x": 263.08333333333337, "y": 153 }, { - "x": 206.5, + "x": 297.16666666666663, "y": 153 }, { - "x": 207, + "x": 297, "y": 193 } ], @@ -1375,11 +1375,19 @@ "labelPercentage": 0, "route": [ { - "x": 189, + "x": 280, "y": 294 }, { - "x": 189, + "x": 280, + "y": 334 + }, + { + "x": 235.66666666666669, + "y": 334 + }, + { + "x": 236, "y": 374 } ], @@ -1415,11 +1423,19 @@ "labelPercentage": 0, "route": [ { - "x": 104, + "x": 229, "y": 113 }, { - "x": 104, + "x": 229.08333333333334, + "y": 153 + }, + { + "x": 150.66666666666669, + "y": 153 + }, + { + "x": 151, "y": 691 } ], @@ -1455,20 +1471,20 @@ "labelPercentage": 0, "route": [ { - "x": 224, - "y": 293 + "x": 314, + "y": 294 }, { - "x": 223.66666666666666, + "x": 314.33333333333337, "y": 334 }, { - "x": 395.66666666666663, + "x": 376.5, "y": 334 }, { - "x": 396, - "y": 1904 + "x": 377, + "y": 1955 } ], "animated": false, @@ -1503,11 +1519,11 @@ "labelPercentage": 0, "route": [ { - "x": 189, + "x": 236, "y": 475 }, { - "x": 189, + "x": 236, "y": 691 } ], @@ -1543,28 +1559,28 @@ "labelPercentage": 0, "route": [ { - "x": 104, + "x": 151, "y": 783 }, { - "x": 104.33333333333334, - "y": 823 + "x": 150.66666666666669, + "y": 873 }, { - "x": 199.33333333333334, - "y": 823 + "x": 198.16666666666669, + "y": 873 }, { - "x": 199.33333333333334, - "y": 958 + "x": 198.16666666666666, + "y": 1008 }, { - "x": 330.83333333333337, - "y": 958 + "x": 235, + "y": 1008 }, { - "x": 330.83333333333337, - "y": 998 + "x": 235, + "y": 1048 } ], "animated": false, @@ -1599,12 +1615,12 @@ "labelPercentage": 0, "route": [ { - "x": 330.83333333333337, - "y": 1064 + "x": 235, + "y": 1114 }, { - "x": 330.83333333333337, - "y": 1189 + "x": 235, + "y": 1239 } ], "animated": false, @@ -1639,12 +1655,12 @@ "labelPercentage": 0, "route": [ { - "x": 330.83333333333337, - "y": 1255 + "x": 235, + "y": 1305 }, { - "x": 330.83333333333337, - "y": 1451.6666666666667 + "x": 235, + "y": 1501.6666666666667 } ], "animated": false, @@ -1679,20 +1695,28 @@ "labelPercentage": 0, "route": [ { - "x": 344.1666666666667, - "y": 1517.6666666666667 + "x": 248.33333333333334, + "y": 1567.6666666666667 }, { - "x": 344.1666666666667, - "y": 1596 + "x": 248.33333333333334, + "y": 1646 }, { - "x": 482.8333333333333, - "y": 1596 + "x": 442.58333333333337, + "y": 1646 }, { - "x": 483, - "y": 1895 + "x": 442.58333333333337, + "y": 1844 + }, + { + "x": 463.66666666666663, + "y": 1844 + }, + { + "x": 464, + "y": 1945 } ], "animated": false, @@ -1727,20 +1751,36 @@ "labelPercentage": 0, "route": [ { - "x": 483, - "y": 1976 + "x": 464, + "y": 2026 }, { - "x": 482.8333333333333, - "y": 2021 + "x": 463.66666666666663, + "y": 2121 }, { - "x": 339.8333333333333, - "y": 2021 + "x": 361.66666666666663, + "y": 2121 }, { - "x": 340, - "y": 2408 + "x": 361.66666666666663, + "y": 2322 + }, + { + "x": 351.66666666666663, + "y": 2322 + }, + { + "x": 351.66666666666663, + "y": 2423 + }, + { + "x": 341.66666666666663, + "y": 2423 + }, + { + "x": 342, + "y": 2518 } ], "animated": false, @@ -1775,20 +1815,28 @@ "labelPercentage": 0, "route": [ { - "x": 340, - "y": 2489 + "x": 342, + "y": 2599 }, { - "x": 339.8333333333333, - "y": 2720 + "x": 341.66666666666663, + "y": 2880 }, { - "x": 93.5, - "y": 2720 + "x": 94.66666666666666, + "y": 2880 }, { - "x": 93.5, - "y": 3309 + "x": 94.66666666666666, + "y": 3424 + }, + { + "x": 160.58333333333331, + "y": 3424 + }, + { + "x": 160.58333333333331, + "y": 3519 } ], "animated": false, @@ -1823,12 +1871,20 @@ "labelPercentage": 0, "route": [ { - "x": 382, - "y": 1981 + "x": 363, + "y": 2031 }, { - "x": 382.3333333333333, - "y": 2061 + "x": 363.16666666666663, + "y": 2071 + }, + { + "x": 434.16666666666663, + "y": 2071 + }, + { + "x": 434.16666666666663, + "y": 2161 } ], "animated": false, @@ -1863,20 +1919,12 @@ "labelPercentage": 0, "route": [ { - "x": 382.3333333333333, - "y": 2127 + "x": 434.16666666666663, + "y": 2227 }, { - "x": 382.3333333333333, - "y": 2222 - }, - { - "x": 432.3333333333333, - "y": 2222 - }, - { - "x": 432.3333333333333, - "y": 2415.5 + "x": 434.16666666666663, + "y": 2525.5 } ], "animated": false, @@ -1911,12 +1959,12 @@ "labelPercentage": 0, "route": [ { - "x": 432.3333333333333, - "y": 2481.5 + "x": 434.16666666666663, + "y": 2591.5 }, { - "x": 432.3333333333333, - "y": 2559 + "x": 434.16666666666663, + "y": 2669 } ], "animated": false, @@ -1951,12 +1999,28 @@ "labelPercentage": 0, "route": [ { - "x": 189, + "x": 236, "y": 783 }, { - "x": 189.33333333333334, - "y": 1189 + "x": 235.66666666666669, + "y": 823 + }, + { + "x": 188.16666666666669, + "y": 823 + }, + { + "x": 188.16666666666666, + "y": 1008 + }, + { + "x": 93.49999999999999, + "y": 1008 + }, + { + "x": 93.5, + "y": 1239 } ], "animated": false, @@ -1991,12 +2055,12 @@ "labelPercentage": 0, "route": [ { - "x": 189.33333333333334, - "y": 1255 + "x": 93.5, + "y": 1305 }, { - "x": 189.33333333333334, - "y": 1435 + "x": 93.5, + "y": 1485 } ], "animated": false, @@ -2031,20 +2095,20 @@ "labelPercentage": 0, "route": [ { - "x": 317.50000000000006, - "y": 1517.6666666666667 + "x": 221.66666666666669, + "y": 1567.6666666666667 }, { - "x": 317.50000000000006, - "y": 1596 + "x": 221.66666666666669, + "y": 1646 }, { - "x": 239, - "y": 1596 + "x": 202.66666666666669, + "y": 1646 }, { - "x": 239, - "y": 1636 + "x": 203, + "y": 1686 } ], "animated": false, @@ -2079,12 +2143,20 @@ "labelPercentage": 0, "route": [ { - "x": 189.33333333333334, - "y": 1501 + "x": 93.5, + "y": 1551 }, { - "x": 189, - "y": 1636 + "x": 93.5, + "y": 1646 + }, + { + "x": 153.00000000000003, + "y": 1646 + }, + { + "x": 153, + "y": 1686 } ], "animated": false, @@ -2119,12 +2191,12 @@ "labelPercentage": 0, "route": [ { - "x": 189, - "y": 1754 + "x": 153, + "y": 1804 }, { - "x": 189.33333333333331, - "y": 2525.3333333333335 + "x": 153, + "y": 2635.3333333333335 } ], "animated": false, @@ -2159,12 +2231,28 @@ "labelPercentage": 0, "route": [ { - "x": 175.99999999999997, - "y": 2591.3333333333335 + "x": 139.66666666666666, + "y": 2701.3333333333335 }, { - "x": 176, - "y": 3309 + "x": 139.66666666666666, + "y": 2930 + }, + { + "x": 148.33333333333334, + "y": 2930 + }, + { + "x": 148.33333333333334, + "y": 3374 + }, + { + "x": 243.08333333333331, + "y": 3374 + }, + { + "x": 243.08333333333331, + "y": 3519 } ], "animated": false, @@ -2199,12 +2287,20 @@ "labelPercentage": 0, "route": [ { - "x": 432.3333333333333, - "y": 2625 + "x": 434.16666666666663, + "y": 2735 }, { - "x": 432, - "y": 2865 + "x": 434.16666666666663, + "y": 2830 + }, + { + "x": 451.8333333333333, + "y": 2830 + }, + { + "x": 452, + "y": 3025 } ], "animated": false, @@ -2239,20 +2335,20 @@ "labelPercentage": 0, "route": [ { - "x": 202.66666666666666, - "y": 2591.3333333333335 + "x": 166.33333333333334, + "y": 2701.3333333333335 }, { - "x": 202.66666666666666, - "y": 2770 + "x": 166.33333333333334, + "y": 2830 }, { - "x": 386.3333333333333, - "y": 2770 + "x": 405.83333333333337, + "y": 2830 }, { - "x": 386, - "y": 2865 + "x": 406, + "y": 3025 } ], "animated": false, @@ -2287,12 +2383,12 @@ "labelPercentage": 0, "route": [ { - "x": 409, - "y": 2983 + "x": 429, + "y": 3143 }, { - "x": 409.3333333333333, - "y": 3053 + "x": 428.83333333333337, + "y": 3213 } ], "animated": false, @@ -2327,20 +2423,20 @@ "labelPercentage": 0, "route": [ { - "x": 409.3333333333333, - "y": 3119 + "x": 428.83333333333337, + "y": 3279 }, { - "x": 409.3333333333333, - "y": 3214 + "x": 428.83333333333337, + "y": 3374 }, { - "x": 258, - "y": 3214 + "x": 325.08333333333337, + "y": 3374 }, { - "x": 258, - "y": 3309 + "x": 325.08333333333337, + "y": 3519 } ], "animated": false, @@ -2375,12 +2471,12 @@ "labelPercentage": 0, "route": [ { - "x": 258, - "y": 3375 + "x": 325.0833333333333, + "y": 3585 }, { - "x": 258, - "y": 3500 + "x": 325, + "y": 3710 } ], "animated": false, @@ -2415,20 +2511,20 @@ "labelPercentage": 0, "route": [ { - "x": 239, - "y": 1754 + "x": 203, + "y": 1804 }, { - "x": 239, - "y": 1794 + "x": 202.66666666666669, + "y": 1844 }, { - "x": 369, - "y": 1794 + "x": 349.83333333333337, + "y": 1844 }, { - "x": 369, - "y": 1904 + "x": 350, + "y": 1953 } ], "animated": false, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index 5935115a5..cff36b15f 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 - - - - - - - + .d2-890461011 .fill-N1{fill:#0A0F25;} + .d2-890461011 .fill-N2{fill:#676C7E;} + .d2-890461011 .fill-N3{fill:#9499AB;} + .d2-890461011 .fill-N4{fill:#CFD2DD;} + .d2-890461011 .fill-N5{fill:#DEE1EB;} + .d2-890461011 .fill-N6{fill:#EEF1F8;} + .d2-890461011 .fill-N7{fill:#FFFFFF;} + .d2-890461011 .fill-B1{fill:#0D32B2;} + .d2-890461011 .fill-B2{fill:#0D32B2;} + .d2-890461011 .fill-B3{fill:#E3E9FD;} + .d2-890461011 .fill-B4{fill:#E3E9FD;} + .d2-890461011 .fill-B5{fill:#EDF0FD;} + .d2-890461011 .fill-B6{fill:#F7F8FE;} + .d2-890461011 .fill-AA2{fill:#4A6FF3;} + .d2-890461011 .fill-AA4{fill:#EDF0FD;} + .d2-890461011 .fill-AA5{fill:#F7F8FE;} + .d2-890461011 .fill-AB4{fill:#EDF0FD;} + .d2-890461011 .fill-AB5{fill:#F7F8FE;} + .d2-890461011 .stroke-N1{stroke:#0A0F25;} + .d2-890461011 .stroke-N2{stroke:#676C7E;} + .d2-890461011 .stroke-N3{stroke:#9499AB;} + .d2-890461011 .stroke-N4{stroke:#CFD2DD;} + .d2-890461011 .stroke-N5{stroke:#DEE1EB;} + .d2-890461011 .stroke-N6{stroke:#EEF1F8;} + .d2-890461011 .stroke-N7{stroke:#FFFFFF;} + .d2-890461011 .stroke-B1{stroke:#0D32B2;} + .d2-890461011 .stroke-B2{stroke:#0D32B2;} + .d2-890461011 .stroke-B3{stroke:#E3E9FD;} + .d2-890461011 .stroke-B4{stroke:#E3E9FD;} + .d2-890461011 .stroke-B5{stroke:#EDF0FD;} + .d2-890461011 .stroke-B6{stroke:#F7F8FE;} + .d2-890461011 .stroke-AA2{stroke:#4A6FF3;} + .d2-890461011 .stroke-AA4{stroke:#EDF0FD;} + .d2-890461011 .stroke-AA5{stroke:#F7F8FE;} + .d2-890461011 .stroke-AB4{stroke:#EDF0FD;} + .d2-890461011 .stroke-AB5{stroke:#F7F8FE;} + .d2-890461011 .background-color-N1{background-color:#0A0F25;} + .d2-890461011 .background-color-N2{background-color:#676C7E;} + .d2-890461011 .background-color-N3{background-color:#9499AB;} + .d2-890461011 .background-color-N4{background-color:#CFD2DD;} + .d2-890461011 .background-color-N5{background-color:#DEE1EB;} + .d2-890461011 .background-color-N6{background-color:#EEF1F8;} + .d2-890461011 .background-color-N7{background-color:#FFFFFF;} + .d2-890461011 .background-color-B1{background-color:#0D32B2;} + .d2-890461011 .background-color-B2{background-color:#0D32B2;} + .d2-890461011 .background-color-B3{background-color:#E3E9FD;} + .d2-890461011 .background-color-B4{background-color:#E3E9FD;} + .d2-890461011 .background-color-B5{background-color:#EDF0FD;} + .d2-890461011 .background-color-B6{background-color:#F7F8FE;} + .d2-890461011 .background-color-AA2{background-color:#4A6FF3;} + .d2-890461011 .background-color-AA4{background-color:#EDF0FD;} + .d2-890461011 .background-color-AA5{background-color:#F7F8FE;} + .d2-890461011 .background-color-AB4{background-color:#EDF0FD;} + .d2-890461011 .background-color-AB5{background-color:#F7F8FE;} + .d2-890461011 .color-N1{color:#0A0F25;} + .d2-890461011 .color-N2{color:#676C7E;} + .d2-890461011 .color-N3{color:#9499AB;} + .d2-890461011 .color-N4{color:#CFD2DD;} + .d2-890461011 .color-N5{color:#DEE1EB;} + .d2-890461011 .color-N6{color:#EEF1F8;} + .d2-890461011 .color-N7{color:#FFFFFF;} + .d2-890461011 .color-B1{color:#0D32B2;} + .d2-890461011 .color-B2{color:#0D32B2;} + .d2-890461011 .color-B3{color:#E3E9FD;} + .d2-890461011 .color-B4{color:#E3E9FD;} + .d2-890461011 .color-B5{color:#EDF0FD;} + .d2-890461011 .color-B6{color:#F7F8FE;} + .d2-890461011 .color-AA2{color:#4A6FF3;} + .d2-890461011 .color-AA4{color:#EDF0FD;} + .d2-890461011 .color-AA5{color:#F7F8FE;} + .d2-890461011 .color-AB4{color:#EDF0FD;} + .d2-890461011 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index cbe88240f..b4ffe6b6b 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 322, - "y": 1768 + "x": 417, + "y": 1718 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 395, - "y": 1768 + "x": 490, + "y": 1718 }, "width": 54, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 395, - "y": 1904 + "x": 490, + "y": 1854 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 469, - "y": 1768 + "x": 564, + "y": 1718 }, "width": 51, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 198, - "y": 1768 + "x": 170, + "y": 1718 }, "width": 80, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 238, - "y": 1061 + "y": 1011 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "i", "type": "rectangle", "pos": { - "x": 311, - "y": 1061 + "x": 403, + "y": 1011 }, "width": 546, "height": 522, @@ -376,8 +376,8 @@ "id": "i.j", "type": "rectangle", "pos": { - "x": 583, - "y": 1111 + "x": 675, + "y": 1061 }, "width": 222, "height": 166, @@ -417,8 +417,8 @@ "id": "i.j.k", "type": "rectangle", "pos": { - "x": 633, - "y": 1161 + "x": 725, + "y": 1111 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "i.j.l", "type": "rectangle", "pos": { - "x": 706, - "y": 1161 + "x": 798, + "y": 1111 }, "width": 49, "height": 66, @@ -499,8 +499,8 @@ "id": "i.m", "type": "rectangle", "pos": { - "x": 361, - "y": 1427 + "x": 453, + "y": 1377 }, "width": 200, "height": 66, @@ -540,8 +540,8 @@ "id": "i.n", "type": "rectangle", "pos": { - "x": 581, - "y": 1467 + "x": 673, + "y": 1417 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "i.o", "type": "rectangle", "pos": { - "x": 654, - "y": 1367 + "x": 746, + "y": 1317 }, "width": 153, "height": 166, @@ -622,8 +622,8 @@ "id": "i.o.p", "type": "rectangle", "pos": { - "x": 704, - "y": 1417 + "x": 796, + "y": 1367 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 807, - "y": 1768 + "x": 895, + "y": 1718 }, "width": 80, "height": 66, @@ -1385,20 +1385,20 @@ "labelPercentage": 0, "route": [ { - "x": 660, - "y": 1227 + "x": 751.5833333333333, + "y": 1177 }, { - "x": 660, - "y": 1322 + "x": 751.5833333333333, + "y": 1272 }, { - "x": 511.5, - "y": 1322 + "x": 603.0833333333333, + "y": 1272 }, { - "x": 511.5, - "y": 1427.625 + "x": 603.0833333333333, + "y": 1377.625 } ], "animated": false, @@ -1433,12 +1433,12 @@ "labelPercentage": 0, "route": [ { - "x": 731, - "y": 1227 + "x": 822.5833333333333, + "y": 1177 }, { - "x": 731, - "y": 1417 + "x": 822.5833333333333, + "y": 1367 } ], "animated": false, @@ -1473,20 +1473,28 @@ "labelPercentage": 0, "route": [ { - "x": 867.5, - "y": 1768 + "x": 955.75, + "y": 1718 }, { - "x": 867.5, - "y": 1016 + "x": 955.75, + "y": 1578 }, { - "x": 461.5, - "y": 1016 + "x": 989.0833333333333, + "y": 1578 }, { - "x": 461.5, - "y": 1427.625 + "x": 989.0833333333333, + "y": 966 + }, + { + "x": 553.0833333333333, + "y": 966 + }, + { + "x": 553.0833333333333, + "y": 1377.625 } ], "animated": false, @@ -1521,20 +1529,20 @@ "labelPercentage": 0, "route": [ { - "x": 528.1666666666666, - "y": 1493.625 + "x": 619.7499999999999, + "y": 1443.625 }, { - "x": 528.1666666666666, - "y": 1678 + "x": 619.7499999999999, + "y": 1628 }, { - "x": 827.5, - "y": 1678 + "x": 915.75, + "y": 1628 }, { - "x": 827.5, - "y": 1768 + "x": 915.75, + "y": 1718 } ], "animated": false, @@ -1569,20 +1577,20 @@ "labelPercentage": 0, "route": [ { - "x": 608, - "y": 1533 + "x": 699.5833333333333, + "y": 1483 }, { - "x": 608, - "y": 1628 + "x": 699.5833333333333, + "y": 1578 }, { - "x": 847.5, - "y": 1628 + "x": 935.75, + "y": 1578 }, { - "x": 847.5, - "y": 1768 + "x": 935.75, + "y": 1718 } ], "animated": false, @@ -1617,20 +1625,20 @@ "labelPercentage": 0, "route": [ { - "x": 428.16666666666663, - "y": 1493.625 + "x": 519.7499999999999, + "y": 1443.625 }, { - "x": 428.16666666666663, - "y": 1678 + "x": 519.7499999999999, + "y": 1628 }, { - "x": 348.8333333333333, - "y": 1678 + "x": 443.91666666666663, + "y": 1628 }, { - "x": 348.8333333333333, - "y": 1768 + "x": 443.91666666666663, + "y": 1718 } ], "animated": false, @@ -1665,20 +1673,20 @@ "labelPercentage": 0, "route": [ { - "x": 461.5, - "y": 1493.625 + "x": 553.0833333333333, + "y": 1443.625 }, { - "x": 461.5, - "y": 1728 + "x": 553.0833333333333, + "y": 1678 }, { - "x": 422.3333333333333, - "y": 1728 + "x": 517.4166666666666, + "y": 1678 }, { - "x": 422.3333333333333, - "y": 1768 + "x": 517.4166666666666, + "y": 1718 } ], "animated": false, @@ -1713,20 +1721,20 @@ "labelPercentage": 0, "route": [ { - "x": 394.8333333333333, - "y": 1493.625 + "x": 486.4166666666666, + "y": 1443.625 }, { - "x": 394.8333333333333, - "y": 1628 + "x": 486.4166666666666, + "y": 1578 }, { - "x": 251.66666666666674, - "y": 1628 + "x": 224.16666666666663, + "y": 1578 }, { - "x": 251.66666666666674, - "y": 1768 + "x": 224.16666666666663, + "y": 1718 } ], "animated": false, @@ -1761,12 +1769,20 @@ "labelPercentage": 0, "route": [ { - "x": 494.8333333333333, - "y": 1493.625 + "x": 586.4166666666665, + "y": 1443.625 }, { - "x": 494.8333333333333, - "y": 1768 + "x": 586.4166666666665, + "y": 1578 + }, + { + "x": 589.9166666666666, + "y": 1578 + }, + { + "x": 589.9166666666666, + "y": 1718 } ], "animated": false, @@ -1801,12 +1817,12 @@ "labelPercentage": 0, "route": [ { - "x": 422.3333333333333, - "y": 1834 + "x": 517.4166666666666, + "y": 1784 }, { - "x": 422.3333333333333, - "y": 1904 + "x": 517.4166666666666, + "y": 1854 } ], "animated": false, @@ -2065,12 +2081,12 @@ "y": 966 }, { - "x": 411.5, + "x": 503.08333333333326, "y": 966 }, { - "x": 411.5, - "y": 1427.625 + "x": 503.08333333333326, + "y": 1377.625 } ], "animated": false, @@ -2110,7 +2126,15 @@ }, { "x": 225, - "y": 1768 + "y": 966 + }, + { + "x": 197.5, + "y": 966 + }, + { + "x": 197.4999999999999, + "y": 1718 } ], "animated": false, @@ -2150,7 +2174,7 @@ }, { "x": 265, - "y": 1061 + "y": 1011 } ], "animated": false, diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 83be1966d..129050c4a 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - + .d2-2860125219 .fill-N1{fill:#0A0F25;} + .d2-2860125219 .fill-N2{fill:#676C7E;} + .d2-2860125219 .fill-N3{fill:#9499AB;} + .d2-2860125219 .fill-N4{fill:#CFD2DD;} + .d2-2860125219 .fill-N5{fill:#DEE1EB;} + .d2-2860125219 .fill-N6{fill:#EEF1F8;} + .d2-2860125219 .fill-N7{fill:#FFFFFF;} + .d2-2860125219 .fill-B1{fill:#0D32B2;} + .d2-2860125219 .fill-B2{fill:#0D32B2;} + .d2-2860125219 .fill-B3{fill:#E3E9FD;} + .d2-2860125219 .fill-B4{fill:#E3E9FD;} + .d2-2860125219 .fill-B5{fill:#EDF0FD;} + .d2-2860125219 .fill-B6{fill:#F7F8FE;} + .d2-2860125219 .fill-AA2{fill:#4A6FF3;} + .d2-2860125219 .fill-AA4{fill:#EDF0FD;} + .d2-2860125219 .fill-AA5{fill:#F7F8FE;} + .d2-2860125219 .fill-AB4{fill:#EDF0FD;} + .d2-2860125219 .fill-AB5{fill:#F7F8FE;} + .d2-2860125219 .stroke-N1{stroke:#0A0F25;} + .d2-2860125219 .stroke-N2{stroke:#676C7E;} + .d2-2860125219 .stroke-N3{stroke:#9499AB;} + .d2-2860125219 .stroke-N4{stroke:#CFD2DD;} + .d2-2860125219 .stroke-N5{stroke:#DEE1EB;} + .d2-2860125219 .stroke-N6{stroke:#EEF1F8;} + .d2-2860125219 .stroke-N7{stroke:#FFFFFF;} + .d2-2860125219 .stroke-B1{stroke:#0D32B2;} + .d2-2860125219 .stroke-B2{stroke:#0D32B2;} + .d2-2860125219 .stroke-B3{stroke:#E3E9FD;} + .d2-2860125219 .stroke-B4{stroke:#E3E9FD;} + .d2-2860125219 .stroke-B5{stroke:#EDF0FD;} + .d2-2860125219 .stroke-B6{stroke:#F7F8FE;} + .d2-2860125219 .stroke-AA2{stroke:#4A6FF3;} + .d2-2860125219 .stroke-AA4{stroke:#EDF0FD;} + .d2-2860125219 .stroke-AA5{stroke:#F7F8FE;} + .d2-2860125219 .stroke-AB4{stroke:#EDF0FD;} + .d2-2860125219 .stroke-AB5{stroke:#F7F8FE;} + .d2-2860125219 .background-color-N1{background-color:#0A0F25;} + .d2-2860125219 .background-color-N2{background-color:#676C7E;} + .d2-2860125219 .background-color-N3{background-color:#9499AB;} + .d2-2860125219 .background-color-N4{background-color:#CFD2DD;} + .d2-2860125219 .background-color-N5{background-color:#DEE1EB;} + .d2-2860125219 .background-color-N6{background-color:#EEF1F8;} + .d2-2860125219 .background-color-N7{background-color:#FFFFFF;} + .d2-2860125219 .background-color-B1{background-color:#0D32B2;} + .d2-2860125219 .background-color-B2{background-color:#0D32B2;} + .d2-2860125219 .background-color-B3{background-color:#E3E9FD;} + .d2-2860125219 .background-color-B4{background-color:#E3E9FD;} + .d2-2860125219 .background-color-B5{background-color:#EDF0FD;} + .d2-2860125219 .background-color-B6{background-color:#F7F8FE;} + .d2-2860125219 .background-color-AA2{background-color:#4A6FF3;} + .d2-2860125219 .background-color-AA4{background-color:#EDF0FD;} + .d2-2860125219 .background-color-AA5{background-color:#F7F8FE;} + .d2-2860125219 .background-color-AB4{background-color:#EDF0FD;} + .d2-2860125219 .background-color-AB5{background-color:#F7F8FE;} + .d2-2860125219 .color-N1{color:#0A0F25;} + .d2-2860125219 .color-N2{color:#676C7E;} + .d2-2860125219 .color-N3{color:#9499AB;} + .d2-2860125219 .color-N4{color:#CFD2DD;} + .d2-2860125219 .color-N5{color:#DEE1EB;} + .d2-2860125219 .color-N6{color:#EEF1F8;} + .d2-2860125219 .color-N7{color:#FFFFFF;} + .d2-2860125219 .color-B1{color:#0D32B2;} + .d2-2860125219 .color-B2{color:#0D32B2;} + .d2-2860125219 .color-B3{color:#E3E9FD;} + .d2-2860125219 .color-B4{color:#E3E9FD;} + .d2-2860125219 .color-B5{color:#EDF0FD;} + .d2-2860125219 .color-B6{color:#F7F8FE;} + .d2-2860125219 .color-AA2{color:#4A6FF3;} + .d2-2860125219 .color-AA4{color:#EDF0FD;} + .d2-2860125219 .color-AA5{color:#F7F8FE;} + .d2-2860125219 .color-AB4{color:#EDF0FD;} + .d2-2860125219 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + \ No newline at end of file diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index ee3accde9..b54e1f4aa 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -87,7 +87,7 @@ "id": "z", "type": "text", "pos": { - "x": 143, + "x": 235, "y": 12 }, "width": 179, @@ -275,9 +275,17 @@ "labelPercentage": 0, "route": [ { - "x": 203, + "x": 294.9166666666667, "y": 63 }, + { + "x": 294.9166666666667, + "y": 103 + }, + { + "x": 203, + "y": 103 + }, { "x": 203, "y": 143 @@ -315,11 +323,11 @@ "labelPercentage": 0, "route": [ { - "x": 262.6666666666667, + "x": 354.5833333333333, "y": 63 }, { - "x": 262.6666666666667, + "x": 354.5833333333333, "y": 103 }, { diff --git a/e2etests/testdata/stable/latex/elk/sketch.exp.svg b/e2etests/testdata/stable/latex/elk/sketch.exp.svg index ed952957e..6c12727d1 100644 --- a/e2etests/testdata/stable/latex/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/elk/board.exp.json b/e2etests/testdata/stable/mono-font/elk/board.exp.json index 508431842..39ab35100 100644 --- a/e2etests/testdata/stable/mono-font/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-font/elk/board.exp.json @@ -48,7 +48,7 @@ "id": "transmitter", "type": "rectangle", "pos": { - "x": 24, + "x": 17, "y": 259 }, "width": 151, @@ -119,14 +119,22 @@ }, { "x": 52.25, + "y": 118 + }, + { + "x": 44.5, + "y": 118 + }, + { + "x": 44.5, "y": 219 }, { - "x": 62.5, + "x": 54.75, "y": 219 }, { - "x": 62.5, + "x": 54.75, "y": 259 } ], @@ -167,14 +175,6 @@ }, { "x": 92.5, - "y": 118 - }, - { - "x": 100.25, - "y": 118 - }, - { - "x": 100.25, "y": 259 } ], @@ -218,19 +218,19 @@ "y": 118 }, { - "x": 148.25, + "x": 140.5, "y": 118 }, { - "x": 148.25, + "x": 140.5, "y": 219 }, { - "x": 138, + "x": 130.25, "y": 219 }, { - "x": 138, + "x": 130.25, "y": 259 } ], diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index 09f9054c9..591742c9c 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-1369583606 .fill-N1{fill:#0A0F25;} + .d2-1369583606 .fill-N2{fill:#676C7E;} + .d2-1369583606 .fill-N3{fill:#9499AB;} + .d2-1369583606 .fill-N4{fill:#CFD2DD;} + .d2-1369583606 .fill-N5{fill:#DEE1EB;} + .d2-1369583606 .fill-N6{fill:#EEF1F8;} + .d2-1369583606 .fill-N7{fill:#FFFFFF;} + .d2-1369583606 .fill-B1{fill:#0D32B2;} + .d2-1369583606 .fill-B2{fill:#0D32B2;} + .d2-1369583606 .fill-B3{fill:#E3E9FD;} + .d2-1369583606 .fill-B4{fill:#E3E9FD;} + .d2-1369583606 .fill-B5{fill:#EDF0FD;} + .d2-1369583606 .fill-B6{fill:#F7F8FE;} + .d2-1369583606 .fill-AA2{fill:#4A6FF3;} + .d2-1369583606 .fill-AA4{fill:#EDF0FD;} + .d2-1369583606 .fill-AA5{fill:#F7F8FE;} + .d2-1369583606 .fill-AB4{fill:#EDF0FD;} + .d2-1369583606 .fill-AB5{fill:#F7F8FE;} + .d2-1369583606 .stroke-N1{stroke:#0A0F25;} + .d2-1369583606 .stroke-N2{stroke:#676C7E;} + .d2-1369583606 .stroke-N3{stroke:#9499AB;} + .d2-1369583606 .stroke-N4{stroke:#CFD2DD;} + .d2-1369583606 .stroke-N5{stroke:#DEE1EB;} + .d2-1369583606 .stroke-N6{stroke:#EEF1F8;} + .d2-1369583606 .stroke-N7{stroke:#FFFFFF;} + .d2-1369583606 .stroke-B1{stroke:#0D32B2;} + .d2-1369583606 .stroke-B2{stroke:#0D32B2;} + .d2-1369583606 .stroke-B3{stroke:#E3E9FD;} + .d2-1369583606 .stroke-B4{stroke:#E3E9FD;} + .d2-1369583606 .stroke-B5{stroke:#EDF0FD;} + .d2-1369583606 .stroke-B6{stroke:#F7F8FE;} + .d2-1369583606 .stroke-AA2{stroke:#4A6FF3;} + .d2-1369583606 .stroke-AA4{stroke:#EDF0FD;} + .d2-1369583606 .stroke-AA5{stroke:#F7F8FE;} + .d2-1369583606 .stroke-AB4{stroke:#EDF0FD;} + .d2-1369583606 .stroke-AB5{stroke:#F7F8FE;} + .d2-1369583606 .background-color-N1{background-color:#0A0F25;} + .d2-1369583606 .background-color-N2{background-color:#676C7E;} + .d2-1369583606 .background-color-N3{background-color:#9499AB;} + .d2-1369583606 .background-color-N4{background-color:#CFD2DD;} + .d2-1369583606 .background-color-N5{background-color:#DEE1EB;} + .d2-1369583606 .background-color-N6{background-color:#EEF1F8;} + .d2-1369583606 .background-color-N7{background-color:#FFFFFF;} + .d2-1369583606 .background-color-B1{background-color:#0D32B2;} + .d2-1369583606 .background-color-B2{background-color:#0D32B2;} + .d2-1369583606 .background-color-B3{background-color:#E3E9FD;} + .d2-1369583606 .background-color-B4{background-color:#E3E9FD;} + .d2-1369583606 .background-color-B5{background-color:#EDF0FD;} + .d2-1369583606 .background-color-B6{background-color:#F7F8FE;} + .d2-1369583606 .background-color-AA2{background-color:#4A6FF3;} + .d2-1369583606 .background-color-AA4{background-color:#EDF0FD;} + .d2-1369583606 .background-color-AA5{background-color:#F7F8FE;} + .d2-1369583606 .background-color-AB4{background-color:#EDF0FD;} + .d2-1369583606 .background-color-AB5{background-color:#F7F8FE;} + .d2-1369583606 .color-N1{color:#0A0F25;} + .d2-1369583606 .color-N2{color:#676C7E;} + .d2-1369583606 .color-N3{color:#9499AB;} + .d2-1369583606 .color-N4{color:#CFD2DD;} + .d2-1369583606 .color-N5{color:#DEE1EB;} + .d2-1369583606 .color-N6{color:#EEF1F8;} + .d2-1369583606 .color-N7{color:#FFFFFF;} + .d2-1369583606 .color-B1{color:#0D32B2;} + .d2-1369583606 .color-B2{color:#0D32B2;} + .d2-1369583606 .color-B3{color:#E3E9FD;} + .d2-1369583606 .color-B4{color:#E3E9FD;} + .d2-1369583606 .color-B5{color:#EDF0FD;} + .d2-1369583606 .color-B6{color:#F7F8FE;} + .d2-1369583606 .color-AA2{color:#4A6FF3;} + .d2-1369583606 .color-AA4{color:#EDF0FD;} + .d2-1369583606 .color-AA5{color:#F7F8FE;} + .d2-1369583606 .color-AB4{color:#EDF0FD;} + .d2-1369583606 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SATELLITESTRANSMITTER SENDSENDSEND - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json index 5bc0dc22e..dd3d5dded 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 382, + "x": 310, "y": 294 }, "width": 240, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 46, - "y": 540 + "x": 29, + "y": 590 }, "width": 120, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 186, - "y": 540 + "x": 169, + "y": 590 }, "width": 80, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 333, - "y": 540 + "x": 317, + "y": 590 }, "width": 80, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 479, - "y": 540 + "x": 463, + "y": 590 }, "width": 80, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 623, - "y": 540 + "x": 607, + "y": 590 }, "width": 80, "height": 66, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 462, + "x": 390, "y": 158 }, "width": 80, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 723, - "y": 540 + "x": 707, + "y": 590 }, "width": 120, "height": 66, @@ -417,7 +417,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 489, + "x": 439, "y": 12 }, "width": 53, @@ -458,7 +458,7 @@ "id": "l", "type": "rectangle", "pos": { - "x": 420, + "x": 370, "y": 12 }, "width": 49, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 136, - "y": 686 + "x": 143, + "y": 736 }, "width": 57, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 213, - "y": 686 + "x": 220, + "y": 736 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 286, - "y": 686 + "x": 293, + "y": 736 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 360, - "y": 686 + "x": 367, + "y": 736 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 433, - "y": 686 + "x": 440, + "y": 736 }, "width": 54, "height": 66, @@ -704,8 +704,8 @@ "id": "r", "type": "rectangle", "pos": { - "x": 507, - "y": 686 + "x": 514, + "y": 736 }, "width": 51, "height": 66, @@ -745,8 +745,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 360, - "y": 822 + "x": 367, + "y": 872 }, "width": 52, "height": 66, @@ -786,8 +786,8 @@ "id": "t", "type": "rectangle", "pos": { - "x": 578, - "y": 686 + "x": 585, + "y": 736 }, "width": 51, "height": 66, @@ -827,8 +827,8 @@ "id": "u", "type": "rectangle", "pos": { - "x": 649, - "y": 686 + "x": 656, + "y": 736 }, "width": 54, "height": 66, @@ -868,7 +868,7 @@ "id": "v", "type": "rectangle", "pos": { - "x": 710, + "x": 717, "y": 294 }, "width": 54, @@ -909,7 +909,7 @@ "id": "w", "type": "rectangle", "pos": { - "x": 784, + "x": 791, "y": 294 }, "width": 58, @@ -975,20 +975,20 @@ "labelPercentage": 0, "route": [ { - "x": 416.64285714285717, + "x": 344.2857142857143, "y": 360 }, { - "x": 416.64285714285717, - "y": 400 + "x": 344.2857142857143, + "y": 450 }, { - "x": 136.5, - "y": 400 + "x": 119.25, + "y": 450 }, { - "x": 136.5, - "y": 540 + "x": 119.25, + "y": 590 } ], "animated": false, @@ -1023,20 +1023,20 @@ "labelPercentage": 0, "route": [ { - "x": 450.92857142857144, + "x": 378.57142857142856, "y": 360 }, { - "x": 450.92857142857144, - "y": 450 + "x": 378.57142857142856, + "y": 500 }, { - "x": 226.5, - "y": 450 + "x": 209.25, + "y": 500 }, { - "x": 226.5, - "y": 540 + "x": 209.25, + "y": 590 } ], "animated": false, @@ -1071,20 +1071,20 @@ "labelPercentage": 0, "route": [ { - "x": 485.2142857142858, + "x": 412.8571428571429, "y": 360 }, { - "x": 485.2142857142858, - "y": 500 + "x": 412.8571428571429, + "y": 550 }, { - "x": 373.50000000000006, - "y": 500 + "x": 357, + "y": 550 }, { - "x": 373.50000000000006, - "y": 540 + "x": 357, + "y": 590 } ], "animated": false, @@ -1119,12 +1119,20 @@ "labelPercentage": 0, "route": [ { - "x": 519.5, + "x": 447.1428571428571, "y": 360 }, { - "x": 519.5, - "y": 540 + "x": 447.1428571428571, + "y": 550 + }, + { + "x": 503.5, + "y": 550 + }, + { + "x": 503.5, + "y": 590 } ], "animated": false, @@ -1159,20 +1167,20 @@ "labelPercentage": 0, "route": [ { - "x": 553.7857142857143, + "x": 481.42857142857144, "y": 360 }, { - "x": 553.7857142857143, + "x": 481.42857142857144, "y": 500 }, { - "x": 663, + "x": 647, "y": 500 }, { - "x": 663, - "y": 540 + "x": 647, + "y": 590 } ], "animated": false, @@ -1207,11 +1215,11 @@ "labelPercentage": 0, "route": [ { - "x": 502.3571428571429, + "x": 430, "y": 224 }, { - "x": 502.3571428571429, + "x": 430, "y": 294 } ], @@ -1247,20 +1255,20 @@ "labelPercentage": 0, "route": [ { - "x": 588.0714285714286, + "x": 515.7142857142857, "y": 360 }, { - "x": 588.0714285714286, + "x": 515.7142857142857, "y": 450 }, { - "x": 753, + "x": 737, "y": 450 }, { - "x": 753, - "y": 540 + "x": 737, + "y": 590 } ], "animated": false, @@ -1300,7 +1308,15 @@ }, { "x": 106.5, - "y": 540 + "y": 400 + }, + { + "x": 89.25, + "y": 400 + }, + { + "x": 89.25, + "y": 590 } ], "animated": false, @@ -1343,12 +1359,12 @@ "y": 400 }, { - "x": 76.5, + "x": 59.25, "y": 400 }, { - "x": 76.5, - "y": 540 + "x": 59.25, + "y": 590 } ], "animated": false, @@ -1383,11 +1399,19 @@ "labelPercentage": 0, "route": [ { - "x": 515.6904761904763, + "x": 465.5, "y": 78 }, { - "x": 515.6904761904763, + "x": 465.5, + "y": 118 + }, + { + "x": 443.3333333333333, + "y": 118 + }, + { + "x": 443.3333333333333, "y": 158 } ], @@ -1423,19 +1447,19 @@ "labelPercentage": 0, "route": [ { - "x": 444.69047619047626, + "x": 394.5, "y": 78 }, { - "x": 444.69047619047626, + "x": 394.5, "y": 118 }, { - "x": 489.0238095238095, + "x": 416.6666666666667, "y": 118 }, { - "x": 489.0238095238095, + "x": 416.6666666666667, "y": 158 } ], @@ -1471,20 +1495,20 @@ "labelPercentage": 0, "route": [ { - "x": 213.16666666666669, - "y": 606 + "x": 195.91666666666663, + "y": 656 }, { - "x": 213.16666666666669, - "y": 646 + "x": 195.91666666666663, + "y": 696 }, { - "x": 164.83333333333326, - "y": 646 + "x": 171.75, + "y": 696 }, { - "x": 164.83333333333326, - "y": 686 + "x": 171.75, + "y": 736 } ], "animated": false, @@ -1519,12 +1543,20 @@ "labelPercentage": 0, "route": [ { - "x": 239.83333333333331, - "y": 606 + "x": 222.58333333333331, + "y": 656 }, { - "x": 239.83333333333331, - "y": 686 + "x": 222.58333333333331, + "y": 696 + }, + { + "x": 246.75, + "y": 696 + }, + { + "x": 246.75, + "y": 736 } ], "animated": false, @@ -1559,20 +1591,20 @@ "labelPercentage": 0, "route": [ { - "x": 360.16666666666674, - "y": 606 + "x": 343.6666666666667, + "y": 656 }, { - "x": 360.16666666666674, - "y": 646 + "x": 343.6666666666667, + "y": 696 }, { - "x": 313.33333333333337, - "y": 646 + "x": 320.25, + "y": 696 }, { - "x": 313.33333333333337, - "y": 686 + "x": 320.25, + "y": 736 } ], "animated": false, @@ -1607,12 +1639,20 @@ "labelPercentage": 0, "route": [ { - "x": 386.83333333333337, - "y": 606 + "x": 370.3333333333333, + "y": 656 }, { - "x": 386.83333333333337, - "y": 686 + "x": 370.3333333333333, + "y": 696 + }, + { + "x": 393.75, + "y": 696 + }, + { + "x": 393.75, + "y": 736 } ], "animated": false, @@ -1647,20 +1687,20 @@ "labelPercentage": 0, "route": [ { - "x": 506.1666666666667, - "y": 606 + "x": 490.16666666666663, + "y": 656 }, { - "x": 506.1666666666667, - "y": 646 + "x": 490.16666666666663, + "y": 696 }, { - "x": 460.33333333333337, - "y": 646 + "x": 467.25, + "y": 696 }, { - "x": 460.33333333333337, - "y": 686 + "x": 467.25, + "y": 736 } ], "animated": false, @@ -1695,12 +1735,20 @@ "labelPercentage": 0, "route": [ { - "x": 532.8333333333334, - "y": 606 + "x": 516.8333333333334, + "y": 656 }, { - "x": 532.8333333333334, - "y": 686 + "x": 516.8333333333334, + "y": 696 + }, + { + "x": 539.75, + "y": 696 + }, + { + "x": 539.75, + "y": 736 } ], "animated": false, @@ -1735,12 +1783,12 @@ "labelPercentage": 0, "route": [ { - "x": 386.83333333333337, - "y": 752 + "x": 393.75, + "y": 802 }, { - "x": 386.83333333333337, - "y": 822 + "x": 393.75, + "y": 872 } ], "animated": false, @@ -1775,20 +1823,20 @@ "labelPercentage": 0, "route": [ { - "x": 649.6666666666666, - "y": 606 + "x": 633.6666666666666, + "y": 656 }, { - "x": 649.6666666666666, - "y": 646 + "x": 633.6666666666666, + "y": 696 }, { - "x": 603.8333333333334, - "y": 646 + "x": 610.75, + "y": 696 }, { - "x": 603.8333333333334, - "y": 686 + "x": 610.75, + "y": 736 } ], "animated": false, @@ -1823,12 +1871,20 @@ "labelPercentage": 0, "route": [ { - "x": 676.3333333333334, - "y": 606 + "x": 660.3333333333334, + "y": 656 }, { - "x": 676.3333333333334, - "y": 686 + "x": 660.3333333333334, + "y": 696 + }, + { + "x": 683.25, + "y": 696 + }, + { + "x": 683.25, + "y": 736 } ], "animated": false, @@ -1863,20 +1919,20 @@ "labelPercentage": 0, "route": [ { - "x": 737, + "x": 744.5, "y": 360 }, { - "x": 737, + "x": 744.5, "y": 400 }, { - "x": 783, + "x": 767, "y": 400 }, { - "x": 783, - "y": 540 + "x": 767, + "y": 590 } ], "animated": false, @@ -1911,12 +1967,20 @@ "labelPercentage": 0, "route": [ { - "x": 813, + "x": 820.5, "y": 360 }, { - "x": 813, - "y": 540 + "x": 820.5, + "y": 400 + }, + { + "x": 797, + "y": 400 + }, + { + "x": 797, + "y": 590 } ], "animated": false, diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index 4a0980390..b42e542ed 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw - + .d2-393352562 .fill-N1{fill:#0A0F25;} + .d2-393352562 .fill-N2{fill:#676C7E;} + .d2-393352562 .fill-N3{fill:#9499AB;} + .d2-393352562 .fill-N4{fill:#CFD2DD;} + .d2-393352562 .fill-N5{fill:#DEE1EB;} + .d2-393352562 .fill-N6{fill:#EEF1F8;} + .d2-393352562 .fill-N7{fill:#FFFFFF;} + .d2-393352562 .fill-B1{fill:#0D32B2;} + .d2-393352562 .fill-B2{fill:#0D32B2;} + .d2-393352562 .fill-B3{fill:#E3E9FD;} + .d2-393352562 .fill-B4{fill:#E3E9FD;} + .d2-393352562 .fill-B5{fill:#EDF0FD;} + .d2-393352562 .fill-B6{fill:#F7F8FE;} + .d2-393352562 .fill-AA2{fill:#4A6FF3;} + .d2-393352562 .fill-AA4{fill:#EDF0FD;} + .d2-393352562 .fill-AA5{fill:#F7F8FE;} + .d2-393352562 .fill-AB4{fill:#EDF0FD;} + .d2-393352562 .fill-AB5{fill:#F7F8FE;} + .d2-393352562 .stroke-N1{stroke:#0A0F25;} + .d2-393352562 .stroke-N2{stroke:#676C7E;} + .d2-393352562 .stroke-N3{stroke:#9499AB;} + .d2-393352562 .stroke-N4{stroke:#CFD2DD;} + .d2-393352562 .stroke-N5{stroke:#DEE1EB;} + .d2-393352562 .stroke-N6{stroke:#EEF1F8;} + .d2-393352562 .stroke-N7{stroke:#FFFFFF;} + .d2-393352562 .stroke-B1{stroke:#0D32B2;} + .d2-393352562 .stroke-B2{stroke:#0D32B2;} + .d2-393352562 .stroke-B3{stroke:#E3E9FD;} + .d2-393352562 .stroke-B4{stroke:#E3E9FD;} + .d2-393352562 .stroke-B5{stroke:#EDF0FD;} + .d2-393352562 .stroke-B6{stroke:#F7F8FE;} + .d2-393352562 .stroke-AA2{stroke:#4A6FF3;} + .d2-393352562 .stroke-AA4{stroke:#EDF0FD;} + .d2-393352562 .stroke-AA5{stroke:#F7F8FE;} + .d2-393352562 .stroke-AB4{stroke:#EDF0FD;} + .d2-393352562 .stroke-AB5{stroke:#F7F8FE;} + .d2-393352562 .background-color-N1{background-color:#0A0F25;} + .d2-393352562 .background-color-N2{background-color:#676C7E;} + .d2-393352562 .background-color-N3{background-color:#9499AB;} + .d2-393352562 .background-color-N4{background-color:#CFD2DD;} + .d2-393352562 .background-color-N5{background-color:#DEE1EB;} + .d2-393352562 .background-color-N6{background-color:#EEF1F8;} + .d2-393352562 .background-color-N7{background-color:#FFFFFF;} + .d2-393352562 .background-color-B1{background-color:#0D32B2;} + .d2-393352562 .background-color-B2{background-color:#0D32B2;} + .d2-393352562 .background-color-B3{background-color:#E3E9FD;} + .d2-393352562 .background-color-B4{background-color:#E3E9FD;} + .d2-393352562 .background-color-B5{background-color:#EDF0FD;} + .d2-393352562 .background-color-B6{background-color:#F7F8FE;} + .d2-393352562 .background-color-AA2{background-color:#4A6FF3;} + .d2-393352562 .background-color-AA4{background-color:#EDF0FD;} + .d2-393352562 .background-color-AA5{background-color:#F7F8FE;} + .d2-393352562 .background-color-AB4{background-color:#EDF0FD;} + .d2-393352562 .background-color-AB5{background-color:#F7F8FE;} + .d2-393352562 .color-N1{color:#0A0F25;} + .d2-393352562 .color-N2{color:#676C7E;} + .d2-393352562 .color-N3{color:#9499AB;} + .d2-393352562 .color-N4{color:#CFD2DD;} + .d2-393352562 .color-N5{color:#DEE1EB;} + .d2-393352562 .color-N6{color:#EEF1F8;} + .d2-393352562 .color-N7{color:#FFFFFF;} + .d2-393352562 .color-B1{color:#0D32B2;} + .d2-393352562 .color-B2{color:#0D32B2;} + .d2-393352562 .color-B3{color:#E3E9FD;} + .d2-393352562 .color-B4{color:#E3E9FD;} + .d2-393352562 .color-B5{color:#EDF0FD;} + .d2-393352562 .color-B6{color:#F7F8FE;} + .d2-393352562 .color-AA2{color:#4A6FF3;} + .d2-393352562 .color-AA4{color:#EDF0FD;} + .d2-393352562 .color-AA5{color:#F7F8FE;} + .d2-393352562 .color-AB4{color:#EDF0FD;} + .d2-393352562 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstuvw + \ No newline at end of file diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json index 15de54e45..7d091e448 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "a", "type": "rectangle", "pos": { - "x": 283, - "y": 832 + "x": 413, + "y": 882 }, "width": 160, "height": 66, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 393, - "y": 1124 + "x": 553, + "y": 1174 }, "width": 120, "height": 66, @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 319, + "x": 464, "y": 294 }, "width": 120, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 393, + "x": 553, "y": 686 }, "width": 120, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 506, - "y": 832 + "x": 666, + "y": 882 }, "width": 80, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 536, - "y": 978 + "x": 726, + "y": 1028 }, "width": 120, "height": 66, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 352, + "x": 658, "y": 12 }, "width": 80, @@ -294,7 +294,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 621, + "x": 840, "y": 158 }, "width": 53, @@ -335,7 +335,7 @@ "id": "i", "type": "rectangle", "pos": { - "x": 623, + "x": 842, "y": 294 }, "width": 49, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 607, + "x": 827, "y": 540 }, "width": 80, @@ -417,7 +417,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 533, + "x": 693, "y": 686 }, "width": 53, @@ -458,8 +458,8 @@ "id": "l", "type": "rectangle", "pos": { - "x": 18, - "y": 832 + "x": 12, + "y": 882 }, "width": 80, "height": 66, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 51, - "y": 1124 + "x": 75, + "y": 1174 }, "width": 120, "height": 66, @@ -540,7 +540,7 @@ "id": "n", "type": "rectangle", "pos": { - "x": 12, + "x": 22, "y": 686 }, "width": 200, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 156, - "y": 832 + "x": 196, + "y": 882 }, "width": 80, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 136, - "y": 978 + "x": 173, + "y": 1028 }, "width": 120, "height": 66, @@ -663,7 +663,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 85, + "x": 217, "y": 12 }, "width": 80, @@ -704,7 +704,7 @@ "id": "r", "type": "rectangle", "pos": { - "x": 234, + "x": 354, "y": 158 }, "width": 51, @@ -745,7 +745,7 @@ "id": "s", "type": "rectangle", "pos": { - "x": 219, + "x": 340, "y": 294 }, "width": 80, @@ -786,7 +786,7 @@ "id": "t", "type": "rectangle", "pos": { - "x": 219, + "x": 315, "y": 540 }, "width": 80, @@ -827,7 +827,7 @@ "id": "u", "type": "rectangle", "pos": { - "x": 257, + "x": 357, "y": 686 }, "width": 80, @@ -893,20 +893,20 @@ "labelPercentage": 0, "route": [ { - "x": 363.3333333333333, - "y": 898 + "x": 493.33333333333326, + "y": 948 }, { - "x": 363.3333333333333, - "y": 1084 + "x": 493.33333333333326, + "y": 1134 }, { - "x": 423.3333333333333, - "y": 1084 + "x": 583.3333333333333, + "y": 1134 }, { - "x": 423.3333333333333, - "y": 1124 + "x": 583.3333333333333, + "y": 1174 } ], "animated": false, @@ -941,20 +941,20 @@ "labelPercentage": 0, "route": [ { - "x": 379.66666666666663, + "x": 524.3333333333333, "y": 360 }, { - "x": 379.66666666666663, - "y": 792 + "x": 524.3333333333333, + "y": 500 }, { - "x": 379.3333333333333, - "y": 792 + "x": 509.33333333333326, + "y": 500 }, { - "x": 379.3333333333333, - "y": 832 + "x": 509.33333333333326, + "y": 882 } ], "animated": false, @@ -989,20 +989,20 @@ "labelPercentage": 0, "route": [ { - "x": 423.3333333333333, + "x": 583.3333333333333, "y": 752 }, { - "x": 423.3333333333333, + "x": 583.3333333333333, "y": 792 }, { - "x": 411.3333333333333, + "x": 541.3333333333333, "y": 792 }, { - "x": 411.3333333333333, - "y": 832 + "x": 541.3333333333333, + "y": 882 } ], "animated": false, @@ -1037,12 +1037,12 @@ "labelPercentage": 0, "route": [ { - "x": 453.3333333333333, + "x": 613.3333333333333, "y": 752 }, { - "x": 453.3333333333333, - "y": 1124 + "x": 613.3333333333333, + "y": 1174 } ], "animated": false, @@ -1077,20 +1077,20 @@ "labelPercentage": 0, "route": [ { - "x": 483.3333333333333, + "x": 643.3333333333333, "y": 752 }, { - "x": 483.3333333333333, + "x": 643.3333333333333, "y": 792 }, { - "x": 533.1666666666666, + "x": 693.1666666666666, "y": 792 }, { - "x": 533.1666666666666, - "y": 832 + "x": 693.1666666666666, + "y": 882 } ], "animated": false, @@ -1125,20 +1125,20 @@ "labelPercentage": 0, "route": [ { - "x": 546.5, - "y": 898 + "x": 706.5, + "y": 948 }, { - "x": 546.5, - "y": 938 + "x": 706.5, + "y": 988 }, { - "x": 566.5, - "y": 938 + "x": 756.4999999999999, + "y": 988 }, { - "x": 566.5, - "y": 978 + "x": 756.4999999999999, + "y": 1028 } ], "animated": false, @@ -1173,20 +1173,20 @@ "labelPercentage": 0, "route": [ { - "x": 596.5, - "y": 1044 + "x": 786.4999999999999, + "y": 1094 }, { - "x": 596.5, - "y": 1084 + "x": 786.4999999999999, + "y": 1134 }, { - "x": 483.3333333333333, - "y": 1084 + "x": 643.3333333333333, + "y": 1134 }, { - "x": 483.3333333333333, - "y": 1124 + "x": 643.3333333333333, + "y": 1174 } ], "animated": false, @@ -1221,20 +1221,20 @@ "labelPercentage": 0, "route": [ { - "x": 409.66666666666663, + "x": 554.3333333333333, "y": 360 }, { - "x": 409.66666666666663, + "x": 554.3333333333333, "y": 400 }, { - "x": 596.5, + "x": 786.4999999999999, "y": 400 }, { - "x": 596.5, - "y": 978 + "x": 786.4999999999999, + "y": 1028 } ], "animated": false, @@ -1269,11 +1269,19 @@ "labelPercentage": 0, "route": [ { - "x": 379.66666666666663, + "x": 685.0833333333333, "y": 78 }, { - "x": 379.66666666666663, + "x": 685.0833333333333, + "y": 118 + }, + { + "x": 524.3333333333333, + "y": 118 + }, + { + "x": 524.3333333333333, "y": 294 } ], @@ -1309,19 +1317,19 @@ "labelPercentage": 0, "route": [ { - "x": 406.33333333333326, + "x": 711.75, "y": 78 }, { - "x": 406.33333333333326, + "x": 711.75, "y": 118 }, { - "x": 647.5, + "x": 867.4999999999999, "y": 118 }, { - "x": 647.5, + "x": 867.4999999999999, "y": 158 } ], @@ -1357,11 +1365,11 @@ "labelPercentage": 0, "route": [ { - "x": 647.5, + "x": 867.4999999999999, "y": 224 }, { - "x": 647.5, + "x": 867.4999999999999, "y": 294 } ], @@ -1397,11 +1405,11 @@ "labelPercentage": 0, "route": [ { - "x": 647.5, + "x": 867.4999999999999, "y": 360 }, { - "x": 647.5, + "x": 867.4999999999999, "y": 540 } ], @@ -1437,19 +1445,19 @@ "labelPercentage": 0, "route": [ { - "x": 634.1666666666666, + "x": 854.1666666666666, "y": 606 }, { - "x": 634.1666666666666, + "x": 854.1666666666666, "y": 646 }, { - "x": 559.8333333333333, + "x": 719.8333333333333, "y": 646 }, { - "x": 559.8333333333333, + "x": 719.8333333333333, "y": 686 } ], @@ -1485,12 +1493,12 @@ "labelPercentage": 0, "route": [ { - "x": 559.8333333333333, + "x": 719.8333333333333, "y": 752 }, { - "x": 559.8333333333333, - "y": 832 + "x": 719.8333333333333, + "y": 882 } ], "animated": false, @@ -1525,20 +1533,20 @@ "labelPercentage": 0, "route": [ { - "x": 660.8333333333334, + "x": 880.8333333333333, "y": 606 }, { - "x": 660.8333333333334, - "y": 938 + "x": 880.8333333333333, + "y": 988 }, { - "x": 626.5, - "y": 938 + "x": 816.4999999999999, + "y": 988 }, { - "x": 626.5, - "y": 978 + "x": 816.4999999999999, + "y": 1028 } ], "animated": false, @@ -1573,20 +1581,20 @@ "labelPercentage": 0, "route": [ { - "x": 58.66666666666666, - "y": 898 + "x": 52, + "y": 948 }, { - "x": 58.66666666666666, - "y": 1084 + "x": 52, + "y": 1134 }, { - "x": 81.99999999999999, - "y": 1084 + "x": 105.33333333333326, + "y": 1134 }, { - "x": 81.99999999999999, - "y": 1124 + "x": 105.33333333333326, + "y": 1174 } ], "animated": false, @@ -1621,12 +1629,20 @@ "labelPercentage": 0, "route": [ { - "x": 45.33333333333333, + "x": 55.33333333333337, "y": 752 }, { - "x": 45.33333333333333, - "y": 832 + "x": 55.33333333333337, + "y": 792 + }, + { + "x": 38.66666666666663, + "y": 792 + }, + { + "x": 38.66666666666663, + "y": 882 } ], "animated": false, @@ -1661,20 +1677,20 @@ "labelPercentage": 0, "route": [ { - "x": 78.66666666666666, + "x": 88.66666666666663, "y": 752 }, { - "x": 78.66666666666666, - "y": 792 + "x": 88.66666666666663, + "y": 842 }, { - "x": 72, - "y": 792 + "x": 65.33333333333337, + "y": 842 }, { - "x": 72, - "y": 832 + "x": 65.33333333333337, + "y": 882 } ], "animated": false, @@ -1709,12 +1725,28 @@ "labelPercentage": 0, "route": [ { - "x": 111.99999999999999, + "x": 122, "y": 752 }, { - "x": 111.99999999999999, - "y": 1124 + "x": 122, + "y": 842 + }, + { + "x": 132, + "y": 842 + }, + { + "x": 132, + "y": 1134 + }, + { + "x": 135.33333333333326, + "y": 1134 + }, + { + "x": 135.33333333333326, + "y": 1174 } ], "animated": false, @@ -1749,20 +1781,20 @@ "labelPercentage": 0, "route": [ { - "x": 178.66666666666663, + "x": 188.66666666666663, "y": 752 }, { - "x": 178.66666666666663, + "x": 188.66666666666663, "y": 792 }, { - "x": 182.99999999999997, + "x": 222.9999999999999, "y": 792 }, { - "x": 182.99999999999997, - "y": 832 + "x": 222.9999999999999, + "y": 882 } ], "animated": false, @@ -1797,12 +1829,20 @@ "labelPercentage": 0, "route": [ { - "x": 196.33333333333331, - "y": 898 + "x": 236.33333333333326, + "y": 948 }, { - "x": 196.33333333333331, - "y": 978 + "x": 236.33333333333326, + "y": 988 + }, + { + "x": 233, + "y": 988 + }, + { + "x": 233, + "y": 1028 } ], "animated": false, @@ -1837,20 +1877,20 @@ "labelPercentage": 0, "route": [ { - "x": 196.33333333333331, - "y": 1044 + "x": 233, + "y": 1094 }, { - "x": 196.33333333333331, - "y": 1084 + "x": 233, + "y": 1134 }, { - "x": 142, - "y": 1084 + "x": 165.33333333333326, + "y": 1134 }, { - "x": 142, - "y": 1124 + "x": 165.33333333333326, + "y": 1174 } ], "animated": false, @@ -1885,20 +1925,28 @@ "labelPercentage": 0, "route": [ { - "x": 145.33333333333331, + "x": 155.33333333333326, "y": 752 }, { - "x": 145.33333333333331, - "y": 938 + "x": 155.33333333333326, + "y": 792 }, { - "x": 166.33333333333331, - "y": 938 + "x": 150.83333333333326, + "y": 792 }, { - "x": 166.33333333333331, - "y": 978 + "x": 150.83333333333326, + "y": 988 + }, + { + "x": 203, + "y": 988 + }, + { + "x": 203, + "y": 1028 } ], "animated": false, @@ -1933,11 +1981,19 @@ "labelPercentage": 0, "route": [ { - "x": 112, + "x": 243.9999999999999, "y": 78 }, { - "x": 112, + "x": 243.9999999999999, + "y": 118 + }, + { + "x": 122, + "y": 118 + }, + { + "x": 122, "y": 686 } ], @@ -1973,19 +2029,19 @@ "labelPercentage": 0, "route": [ { - "x": 138.66666666666666, + "x": 270.66666666666663, "y": 78 }, { - "x": 138.66666666666666, + "x": 270.66666666666663, "y": 118 }, { - "x": 259.66666666666663, + "x": 380, "y": 118 }, { - "x": 259.66666666666663, + "x": 380, "y": 158 } ], @@ -2021,11 +2077,11 @@ "labelPercentage": 0, "route": [ { - "x": 259.66666666666663, + "x": 380, "y": 224 }, { - "x": 259.66666666666663, + "x": 380, "y": 294 } ], @@ -2061,11 +2117,19 @@ "labelPercentage": 0, "route": [ { - "x": 246.33333333333331, + "x": 366.6666666666667, "y": 360 }, { - "x": 246.33333333333331, + "x": 366.6666666666667, + "y": 400 + }, + { + "x": 341.8333333333333, + "y": 400 + }, + { + "x": 341.8333333333333, "y": 540 } ], @@ -2101,19 +2165,19 @@ "labelPercentage": 0, "route": [ { - "x": 273, + "x": 368.49999999999994, "y": 606 }, { - "x": 273, + "x": 368.49999999999994, "y": 646 }, { - "x": 297.3333333333333, + "x": 397.33333333333326, "y": 646 }, { - "x": 297.3333333333333, + "x": 397.33333333333326, "y": 686 } ], @@ -2149,20 +2213,20 @@ "labelPercentage": 0, "route": [ { - "x": 284, + "x": 383.99999999999994, "y": 752 }, { - "x": 284, + "x": 383.99999999999994, "y": 792 }, { - "x": 209.66666666666666, + "x": 249.66666666666663, "y": 792 }, { - "x": 209.66666666666666, - "y": 832 + "x": 249.66666666666663, + "y": 882 } ], "animated": false, @@ -2197,20 +2261,28 @@ "labelPercentage": 0, "route": [ { - "x": 246.33333333333331, + "x": 341.8333333333333, "y": 606 }, { - "x": 246.33333333333331, - "y": 938 + "x": 341.8333333333333, + "y": 646 }, { - "x": 226.33333333333331, - "y": 938 + "x": 316.33333333333326, + "y": 646 }, { - "x": 226.33333333333331, - "y": 978 + "x": 316.33333333333326, + "y": 988 + }, + { + "x": 263, + "y": 988 + }, + { + "x": 263, + "y": 1028 } ], "animated": false, @@ -2245,19 +2317,19 @@ "labelPercentage": 0, "route": [ { - "x": 349.66666666666663, + "x": 494.3333333333333, "y": 360 }, { - "x": 349.66666666666663, + "x": 494.3333333333333, "y": 450 }, { - "x": 273, + "x": 368.49999999999994, "y": 450 }, { - "x": 273, + "x": 368.49999999999994, "y": 540 } ], @@ -2293,28 +2365,20 @@ "labelPercentage": 0, "route": [ { - "x": 273, + "x": 393.3333333333333, "y": 360 }, { - "x": 273, - "y": 400 - }, - { - "x": 310.16666666666663, - "y": 400 - }, - { - "x": 310.16666666666663, + "x": 393.3333333333333, "y": 500 }, { - "x": 347.3333333333333, + "x": 477.33333333333326, "y": 500 }, { - "x": 347.3333333333333, - "y": 832 + "x": 477.33333333333326, + "y": 882 } ], "animated": false, @@ -2349,20 +2413,20 @@ "labelPercentage": 0, "route": [ { - "x": 310.66666666666663, + "x": 410.6666666666666, "y": 752 }, { - "x": 310.66666666666663, + "x": 410.6666666666666, "y": 792 }, { - "x": 315.3333333333333, + "x": 445.33333333333326, "y": 792 }, { - "x": 315.3333333333333, - "y": 832 + "x": 445.33333333333326, + "y": 882 } ], "animated": false, diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index 9df1e922d..1bcdeff99 100644 --- a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu - + .d2-3394510602 .fill-N1{fill:#0A0F25;} + .d2-3394510602 .fill-N2{fill:#676C7E;} + .d2-3394510602 .fill-N3{fill:#9499AB;} + .d2-3394510602 .fill-N4{fill:#CFD2DD;} + .d2-3394510602 .fill-N5{fill:#DEE1EB;} + .d2-3394510602 .fill-N6{fill:#EEF1F8;} + .d2-3394510602 .fill-N7{fill:#FFFFFF;} + .d2-3394510602 .fill-B1{fill:#0D32B2;} + .d2-3394510602 .fill-B2{fill:#0D32B2;} + .d2-3394510602 .fill-B3{fill:#E3E9FD;} + .d2-3394510602 .fill-B4{fill:#E3E9FD;} + .d2-3394510602 .fill-B5{fill:#EDF0FD;} + .d2-3394510602 .fill-B6{fill:#F7F8FE;} + .d2-3394510602 .fill-AA2{fill:#4A6FF3;} + .d2-3394510602 .fill-AA4{fill:#EDF0FD;} + .d2-3394510602 .fill-AA5{fill:#F7F8FE;} + .d2-3394510602 .fill-AB4{fill:#EDF0FD;} + .d2-3394510602 .fill-AB5{fill:#F7F8FE;} + .d2-3394510602 .stroke-N1{stroke:#0A0F25;} + .d2-3394510602 .stroke-N2{stroke:#676C7E;} + .d2-3394510602 .stroke-N3{stroke:#9499AB;} + .d2-3394510602 .stroke-N4{stroke:#CFD2DD;} + .d2-3394510602 .stroke-N5{stroke:#DEE1EB;} + .d2-3394510602 .stroke-N6{stroke:#EEF1F8;} + .d2-3394510602 .stroke-N7{stroke:#FFFFFF;} + .d2-3394510602 .stroke-B1{stroke:#0D32B2;} + .d2-3394510602 .stroke-B2{stroke:#0D32B2;} + .d2-3394510602 .stroke-B3{stroke:#E3E9FD;} + .d2-3394510602 .stroke-B4{stroke:#E3E9FD;} + .d2-3394510602 .stroke-B5{stroke:#EDF0FD;} + .d2-3394510602 .stroke-B6{stroke:#F7F8FE;} + .d2-3394510602 .stroke-AA2{stroke:#4A6FF3;} + .d2-3394510602 .stroke-AA4{stroke:#EDF0FD;} + .d2-3394510602 .stroke-AA5{stroke:#F7F8FE;} + .d2-3394510602 .stroke-AB4{stroke:#EDF0FD;} + .d2-3394510602 .stroke-AB5{stroke:#F7F8FE;} + .d2-3394510602 .background-color-N1{background-color:#0A0F25;} + .d2-3394510602 .background-color-N2{background-color:#676C7E;} + .d2-3394510602 .background-color-N3{background-color:#9499AB;} + .d2-3394510602 .background-color-N4{background-color:#CFD2DD;} + .d2-3394510602 .background-color-N5{background-color:#DEE1EB;} + .d2-3394510602 .background-color-N6{background-color:#EEF1F8;} + .d2-3394510602 .background-color-N7{background-color:#FFFFFF;} + .d2-3394510602 .background-color-B1{background-color:#0D32B2;} + .d2-3394510602 .background-color-B2{background-color:#0D32B2;} + .d2-3394510602 .background-color-B3{background-color:#E3E9FD;} + .d2-3394510602 .background-color-B4{background-color:#E3E9FD;} + .d2-3394510602 .background-color-B5{background-color:#EDF0FD;} + .d2-3394510602 .background-color-B6{background-color:#F7F8FE;} + .d2-3394510602 .background-color-AA2{background-color:#4A6FF3;} + .d2-3394510602 .background-color-AA4{background-color:#EDF0FD;} + .d2-3394510602 .background-color-AA5{background-color:#F7F8FE;} + .d2-3394510602 .background-color-AB4{background-color:#EDF0FD;} + .d2-3394510602 .background-color-AB5{background-color:#F7F8FE;} + .d2-3394510602 .color-N1{color:#0A0F25;} + .d2-3394510602 .color-N2{color:#676C7E;} + .d2-3394510602 .color-N3{color:#9499AB;} + .d2-3394510602 .color-N4{color:#CFD2DD;} + .d2-3394510602 .color-N5{color:#DEE1EB;} + .d2-3394510602 .color-N6{color:#EEF1F8;} + .d2-3394510602 .color-N7{color:#FFFFFF;} + .d2-3394510602 .color-B1{color:#0D32B2;} + .d2-3394510602 .color-B2{color:#0D32B2;} + .d2-3394510602 .color-B3{color:#E3E9FD;} + .d2-3394510602 .color-B4{color:#E3E9FD;} + .d2-3394510602 .color-B5{color:#EDF0FD;} + .d2-3394510602 .color-B6{color:#F7F8FE;} + .d2-3394510602 .color-AA2{color:#4A6FF3;} + .d2-3394510602 .color-AA4{color:#EDF0FD;} + .d2-3394510602 .color-AA5{color:#F7F8FE;} + .d2-3394510602 .color-AB4{color:#EDF0FD;} + .d2-3394510602 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstu + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index ac2b9d79d..aac27377d 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 39, - "y": 731 + "x": 82, + "y": 781 }, "width": 120, "height": 66, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 72, + "x": 121, "y": 585 }, "width": 54, @@ -171,7 +171,7 @@ "id": "e", "type": "rectangle", "pos": { - "x": 145, + "x": 194, "y": 449 }, "width": 53, @@ -212,7 +212,7 @@ "id": "f", "type": "rectangle", "pos": { - "x": 74, + "x": 123, "y": 449 }, "width": 51, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 72, + "x": 121, "y": 313 }, "width": 54, @@ -368,20 +368,20 @@ "y": 223 }, { - "x": 61.5, + "x": 78.25, "y": 223 }, { - "x": 61.5, + "x": 78.25, "y": 691 }, { - "x": 69.5, + "x": 112.5, "y": 691 }, { - "x": 69.5, - "y": 731 + "x": 112.5, + "y": 781 } ], "animated": false, @@ -416,12 +416,20 @@ "labelPercentage": 0, "route": [ { - "x": 99.5, + "x": 148.75, "y": 651 }, { - "x": 99.5, - "y": 731 + "x": 148.75, + "y": 691 + }, + { + "x": 142.5, + "y": 691 + }, + { + "x": 142.5, + "y": 781 } ], "animated": false, @@ -456,20 +464,20 @@ "labelPercentage": 0, "route": [ { - "x": 171.5, + "x": 220.75, "y": 515 }, { - "x": 171.5, - "y": 691 + "x": 220.75, + "y": 741 }, { - "x": 129.5, - "y": 691 + "x": 172.5, + "y": 741 }, { - "x": 129.5, - "y": 731 + "x": 172.5, + "y": 781 } ], "animated": false, @@ -504,11 +512,11 @@ "labelPercentage": 0, "route": [ { - "x": 99.5, + "x": 148.75, "y": 515 }, { - "x": 99.5, + "x": 148.75, "y": 585 } ], @@ -549,6 +557,14 @@ }, { "x": 171.5, + "y": 223 + }, + { + "x": 220.75, + "y": 223 + }, + { + "x": 220.75, "y": 449 } ], @@ -584,11 +600,11 @@ "labelPercentage": 0, "route": [ { - "x": 99.5, + "x": 148.75, "y": 379 }, { - "x": 99.5, + "x": 148.75, "y": 449 } ], @@ -632,11 +648,11 @@ "y": 273 }, { - "x": 99.5, + "x": 148.75, "y": 273 }, { - "x": 99.5, + "x": 148.75, "y": 313 } ], diff --git a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg index a2b01c401..5f3cbdc10 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh - + .d2-701430010 .fill-N1{fill:#0A0F25;} + .d2-701430010 .fill-N2{fill:#676C7E;} + .d2-701430010 .fill-N3{fill:#9499AB;} + .d2-701430010 .fill-N4{fill:#CFD2DD;} + .d2-701430010 .fill-N5{fill:#DEE1EB;} + .d2-701430010 .fill-N6{fill:#EEF1F8;} + .d2-701430010 .fill-N7{fill:#FFFFFF;} + .d2-701430010 .fill-B1{fill:#0D32B2;} + .d2-701430010 .fill-B2{fill:#0D32B2;} + .d2-701430010 .fill-B3{fill:#E3E9FD;} + .d2-701430010 .fill-B4{fill:#E3E9FD;} + .d2-701430010 .fill-B5{fill:#EDF0FD;} + .d2-701430010 .fill-B6{fill:#F7F8FE;} + .d2-701430010 .fill-AA2{fill:#4A6FF3;} + .d2-701430010 .fill-AA4{fill:#EDF0FD;} + .d2-701430010 .fill-AA5{fill:#F7F8FE;} + .d2-701430010 .fill-AB4{fill:#EDF0FD;} + .d2-701430010 .fill-AB5{fill:#F7F8FE;} + .d2-701430010 .stroke-N1{stroke:#0A0F25;} + .d2-701430010 .stroke-N2{stroke:#676C7E;} + .d2-701430010 .stroke-N3{stroke:#9499AB;} + .d2-701430010 .stroke-N4{stroke:#CFD2DD;} + .d2-701430010 .stroke-N5{stroke:#DEE1EB;} + .d2-701430010 .stroke-N6{stroke:#EEF1F8;} + .d2-701430010 .stroke-N7{stroke:#FFFFFF;} + .d2-701430010 .stroke-B1{stroke:#0D32B2;} + .d2-701430010 .stroke-B2{stroke:#0D32B2;} + .d2-701430010 .stroke-B3{stroke:#E3E9FD;} + .d2-701430010 .stroke-B4{stroke:#E3E9FD;} + .d2-701430010 .stroke-B5{stroke:#EDF0FD;} + .d2-701430010 .stroke-B6{stroke:#F7F8FE;} + .d2-701430010 .stroke-AA2{stroke:#4A6FF3;} + .d2-701430010 .stroke-AA4{stroke:#EDF0FD;} + .d2-701430010 .stroke-AA5{stroke:#F7F8FE;} + .d2-701430010 .stroke-AB4{stroke:#EDF0FD;} + .d2-701430010 .stroke-AB5{stroke:#F7F8FE;} + .d2-701430010 .background-color-N1{background-color:#0A0F25;} + .d2-701430010 .background-color-N2{background-color:#676C7E;} + .d2-701430010 .background-color-N3{background-color:#9499AB;} + .d2-701430010 .background-color-N4{background-color:#CFD2DD;} + .d2-701430010 .background-color-N5{background-color:#DEE1EB;} + .d2-701430010 .background-color-N6{background-color:#EEF1F8;} + .d2-701430010 .background-color-N7{background-color:#FFFFFF;} + .d2-701430010 .background-color-B1{background-color:#0D32B2;} + .d2-701430010 .background-color-B2{background-color:#0D32B2;} + .d2-701430010 .background-color-B3{background-color:#E3E9FD;} + .d2-701430010 .background-color-B4{background-color:#E3E9FD;} + .d2-701430010 .background-color-B5{background-color:#EDF0FD;} + .d2-701430010 .background-color-B6{background-color:#F7F8FE;} + .d2-701430010 .background-color-AA2{background-color:#4A6FF3;} + .d2-701430010 .background-color-AA4{background-color:#EDF0FD;} + .d2-701430010 .background-color-AA5{background-color:#F7F8FE;} + .d2-701430010 .background-color-AB4{background-color:#EDF0FD;} + .d2-701430010 .background-color-AB5{background-color:#F7F8FE;} + .d2-701430010 .color-N1{color:#0A0F25;} + .d2-701430010 .color-N2{color:#676C7E;} + .d2-701430010 .color-N3{color:#9499AB;} + .d2-701430010 .color-N4{color:#CFD2DD;} + .d2-701430010 .color-N5{color:#DEE1EB;} + .d2-701430010 .color-N6{color:#EEF1F8;} + .d2-701430010 .color-N7{color:#FFFFFF;} + .d2-701430010 .color-B1{color:#0D32B2;} + .d2-701430010 .color-B2{color:#0D32B2;} + .d2-701430010 .color-B3{color:#E3E9FD;} + .d2-701430010 .color-B4{color:#E3E9FD;} + .d2-701430010 .color-B5{color:#EDF0FD;} + .d2-701430010 .color-B6{color:#F7F8FE;} + .d2-701430010 .color-AA2{color:#4A6FF3;} + .d2-701430010 .color-AA4{color:#EDF0FD;} + .d2-701430010 .color-AA5{color:#F7F8FE;} + .d2-701430010 .color-AB4{color:#EDF0FD;} + .d2-701430010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acdefgbh + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json index 7a28c350e..b8187362c 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json @@ -89,8 +89,8 @@ "id": "a", "type": "rectangle", "pos": { - "x": 65, - "y": 313 + "x": 22, + "y": 263 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 138, - "y": 313 + "x": 95, + "y": 263 }, "width": 53, "height": 66, @@ -171,8 +171,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 211, - "y": 313 + "x": 168, + "y": 263 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "bottom", "type": "rectangle", "pos": { - "x": 55, - "y": 464 + "x": 12, + "y": 414 }, "width": 220, "height": 166, @@ -253,8 +253,8 @@ "id": "bottom.end", "type": "rectangle", "pos": { - "x": 105, - "y": 514 + "x": 62, + "y": 464 }, "width": 120, "height": 66, @@ -324,7 +324,15 @@ }, { "x": 92, - "y": 313 + "y": 223 + }, + { + "x": 49, + "y": 223 + }, + { + "x": 49, + "y": 263 } ], "animated": false, @@ -364,15 +372,7 @@ }, { "x": 122, - "y": 273 - }, - { - "x": 165, - "y": 273 - }, - { - "x": 165, - "y": 313 + "y": 263 } ], "animated": false, @@ -415,12 +415,12 @@ "y": 223 }, { - "x": 238, + "x": 195, "y": 223 }, { - "x": 238, - "y": 313 + "x": 195, + "y": 263 } ], "animated": false, @@ -455,20 +455,20 @@ "labelPercentage": 0, "route": [ { - "x": 92, - "y": 379 + "x": 49, + "y": 329 + }, + { + "x": 49, + "y": 369 }, { "x": 92, - "y": 419 + "y": 369 }, { - "x": 135, - "y": 419 - }, - { - "x": 135, - "y": 514 + "x": 92, + "y": 464 } ], "animated": false, @@ -503,12 +503,12 @@ "labelPercentage": 0, "route": [ { - "x": 165, - "y": 379 + "x": 122, + "y": 329 }, { - "x": 165, - "y": 514 + "x": 122, + "y": 464 } ], "animated": false, @@ -543,20 +543,20 @@ "labelPercentage": 0, "route": [ { - "x": 238, - "y": 379 - }, - { - "x": 238, - "y": 419 + "x": 195, + "y": 329 }, { "x": 195, - "y": 419 + "y": 369 }, { - "x": 195, - "y": 514 + "x": 152, + "y": 369 + }, + { + "x": 152, + "y": 464 } ], "animated": false, diff --git a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg index ef3697ab3..03db49f48 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -top2abcbottomstartend - + .d2-1537556023 .fill-N1{fill:#0A0F25;} + .d2-1537556023 .fill-N2{fill:#676C7E;} + .d2-1537556023 .fill-N3{fill:#9499AB;} + .d2-1537556023 .fill-N4{fill:#CFD2DD;} + .d2-1537556023 .fill-N5{fill:#DEE1EB;} + .d2-1537556023 .fill-N6{fill:#EEF1F8;} + .d2-1537556023 .fill-N7{fill:#FFFFFF;} + .d2-1537556023 .fill-B1{fill:#0D32B2;} + .d2-1537556023 .fill-B2{fill:#0D32B2;} + .d2-1537556023 .fill-B3{fill:#E3E9FD;} + .d2-1537556023 .fill-B4{fill:#E3E9FD;} + .d2-1537556023 .fill-B5{fill:#EDF0FD;} + .d2-1537556023 .fill-B6{fill:#F7F8FE;} + .d2-1537556023 .fill-AA2{fill:#4A6FF3;} + .d2-1537556023 .fill-AA4{fill:#EDF0FD;} + .d2-1537556023 .fill-AA5{fill:#F7F8FE;} + .d2-1537556023 .fill-AB4{fill:#EDF0FD;} + .d2-1537556023 .fill-AB5{fill:#F7F8FE;} + .d2-1537556023 .stroke-N1{stroke:#0A0F25;} + .d2-1537556023 .stroke-N2{stroke:#676C7E;} + .d2-1537556023 .stroke-N3{stroke:#9499AB;} + .d2-1537556023 .stroke-N4{stroke:#CFD2DD;} + .d2-1537556023 .stroke-N5{stroke:#DEE1EB;} + .d2-1537556023 .stroke-N6{stroke:#EEF1F8;} + .d2-1537556023 .stroke-N7{stroke:#FFFFFF;} + .d2-1537556023 .stroke-B1{stroke:#0D32B2;} + .d2-1537556023 .stroke-B2{stroke:#0D32B2;} + .d2-1537556023 .stroke-B3{stroke:#E3E9FD;} + .d2-1537556023 .stroke-B4{stroke:#E3E9FD;} + .d2-1537556023 .stroke-B5{stroke:#EDF0FD;} + .d2-1537556023 .stroke-B6{stroke:#F7F8FE;} + .d2-1537556023 .stroke-AA2{stroke:#4A6FF3;} + .d2-1537556023 .stroke-AA4{stroke:#EDF0FD;} + .d2-1537556023 .stroke-AA5{stroke:#F7F8FE;} + .d2-1537556023 .stroke-AB4{stroke:#EDF0FD;} + .d2-1537556023 .stroke-AB5{stroke:#F7F8FE;} + .d2-1537556023 .background-color-N1{background-color:#0A0F25;} + .d2-1537556023 .background-color-N2{background-color:#676C7E;} + .d2-1537556023 .background-color-N3{background-color:#9499AB;} + .d2-1537556023 .background-color-N4{background-color:#CFD2DD;} + .d2-1537556023 .background-color-N5{background-color:#DEE1EB;} + .d2-1537556023 .background-color-N6{background-color:#EEF1F8;} + .d2-1537556023 .background-color-N7{background-color:#FFFFFF;} + .d2-1537556023 .background-color-B1{background-color:#0D32B2;} + .d2-1537556023 .background-color-B2{background-color:#0D32B2;} + .d2-1537556023 .background-color-B3{background-color:#E3E9FD;} + .d2-1537556023 .background-color-B4{background-color:#E3E9FD;} + .d2-1537556023 .background-color-B5{background-color:#EDF0FD;} + .d2-1537556023 .background-color-B6{background-color:#F7F8FE;} + .d2-1537556023 .background-color-AA2{background-color:#4A6FF3;} + .d2-1537556023 .background-color-AA4{background-color:#EDF0FD;} + .d2-1537556023 .background-color-AA5{background-color:#F7F8FE;} + .d2-1537556023 .background-color-AB4{background-color:#EDF0FD;} + .d2-1537556023 .background-color-AB5{background-color:#F7F8FE;} + .d2-1537556023 .color-N1{color:#0A0F25;} + .d2-1537556023 .color-N2{color:#676C7E;} + .d2-1537556023 .color-N3{color:#9499AB;} + .d2-1537556023 .color-N4{color:#CFD2DD;} + .d2-1537556023 .color-N5{color:#DEE1EB;} + .d2-1537556023 .color-N6{color:#EEF1F8;} + .d2-1537556023 .color-N7{color:#FFFFFF;} + .d2-1537556023 .color-B1{color:#0D32B2;} + .d2-1537556023 .color-B2{color:#0D32B2;} + .d2-1537556023 .color-B3{color:#E3E9FD;} + .d2-1537556023 .color-B4{color:#E3E9FD;} + .d2-1537556023 .color-B5{color:#EDF0FD;} + .d2-1537556023 .color-B6{color:#F7F8FE;} + .d2-1537556023 .color-AA2{color:#4A6FF3;} + .d2-1537556023 .color-AA4{color:#EDF0FD;} + .d2-1537556023 .color-AA5{color:#F7F8FE;} + .d2-1537556023 .color-AB4{color:#EDF0FD;} + .d2-1537556023 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>top2abcbottomstartend + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json index 213929710..3a1b6921d 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "root", "type": "image", "pos": { - "x": 204, + "x": 484, "y": 12 }, "width": 128, @@ -64,7 +64,7 @@ "y": 241 }, "width": 1072, - "height": 1124, + "height": 1114, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -101,7 +101,7 @@ "id": "container.root", "type": "image", "pos": { - "x": 204, + "x": 484, "y": 291 }, "width": 128, @@ -158,7 +158,7 @@ "y": 621 }, "width": 476, - "height": 694, + "height": 684, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -195,7 +195,7 @@ "id": "container.left2.root", "type": "image", "pos": { - "x": 183, + "x": 236, "y": 671 }, "width": 128, @@ -249,7 +249,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 1011 + "y": 1001 }, "width": 376, "height": 254, @@ -290,7 +290,7 @@ "type": "image", "pos": { "x": 162, - "y": 1061 + "y": 1051 }, "width": 128, "height": 128, @@ -343,7 +343,7 @@ "type": "image", "pos": { "x": 310, - "y": 1061 + "y": 1051 }, "width": 128, "height": 128, @@ -399,7 +399,7 @@ "y": 621 }, "width": 476, - "height": 694, + "height": 684, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -436,7 +436,7 @@ "id": "container.right.root", "type": "image", "pos": { - "x": 679, + "x": 732, "y": 671 }, "width": 128, @@ -490,7 +490,7 @@ "type": "rectangle", "pos": { "x": 608, - "y": 1011 + "y": 1001 }, "width": 376, "height": 254, @@ -531,7 +531,7 @@ "type": "image", "pos": { "x": 658, - "y": 1061 + "y": 1051 }, "width": 128, "height": 128, @@ -584,7 +584,7 @@ "type": "image", "pos": { "x": 806, - "y": 1061 + "y": 1051 }, "width": 128, "height": 128, @@ -661,11 +661,11 @@ "labelPercentage": 0, "route": [ { - "x": 268.6666666666667, + "x": 548, "y": 166 }, { - "x": 268.6666666666667, + "x": 548, "y": 291 } ], @@ -701,12 +701,20 @@ "labelPercentage": 0, "route": [ { - "x": 226, + "x": 278.6666666666667, "y": 825 }, + { + "x": 278.6666666666667, + "y": 865 + }, { "x": 226, - "y": 1061 + "y": 865 + }, + { + "x": 226, + "y": 1051 } ], "animated": false, @@ -741,28 +749,20 @@ "labelPercentage": 0, "route": [ { - "x": 268.6666666666667, + "x": 321.33333333333337, "y": 825 }, { - "x": 268.6666666666667, + "x": 321.33333333333337, "y": 865 }, { - "x": 322, + "x": 374, "y": 865 }, - { - "x": 322, - "y": 966 - }, { "x": 374, - "y": 966 - }, - { - "x": 374, - "y": 1061 + "y": 1051 } ], "animated": false, @@ -797,12 +797,20 @@ "labelPercentage": 0, "route": [ { - "x": 722, + "x": 774.6666666666667, "y": 825 }, + { + "x": 774.6666666666667, + "y": 865 + }, { "x": 722, - "y": 1061 + "y": 865 + }, + { + "x": 722, + "y": 1051 } ], "animated": false, @@ -837,28 +845,20 @@ "labelPercentage": 0, "route": [ { - "x": 764.6666666666667, + "x": 817.3333333333334, "y": 825 }, { - "x": 764.6666666666667, + "x": 817.3333333333334, "y": 865 }, { - "x": 818, + "x": 870, "y": 865 }, - { - "x": 818, - "y": 966 - }, { "x": 870, - "y": 966 - }, - { - "x": 870, - "y": 1061 + "y": 1051 } ], "animated": false, @@ -893,11 +893,19 @@ "labelPercentage": 0, "route": [ { - "x": 247.33333333333334, + "x": 526.6666666666667, "y": 445 }, { - "x": 247.33333333333334, + "x": 526.6666666666667, + "y": 485 + }, + { + "x": 300, + "y": 485 + }, + { + "x": 300, "y": 671 } ], @@ -933,19 +941,19 @@ "labelPercentage": 0, "route": [ { - "x": 290, + "x": 569.3333333333334, "y": 445 }, { - "x": 290, + "x": 569.3333333333334, "y": 485 }, { - "x": 743.3333333333334, + "x": 796, "y": 485 }, { - "x": 743.3333333333334, + "x": 796, "y": 671 } ], diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg index e34874fad..f69803649 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root - - - - - - - + .d2-744376889 .fill-N1{fill:#0A0F25;} + .d2-744376889 .fill-N2{fill:#676C7E;} + .d2-744376889 .fill-N3{fill:#9499AB;} + .d2-744376889 .fill-N4{fill:#CFD2DD;} + .d2-744376889 .fill-N5{fill:#DEE1EB;} + .d2-744376889 .fill-N6{fill:#EEF1F8;} + .d2-744376889 .fill-N7{fill:#FFFFFF;} + .d2-744376889 .fill-B1{fill:#0D32B2;} + .d2-744376889 .fill-B2{fill:#0D32B2;} + .d2-744376889 .fill-B3{fill:#E3E9FD;} + .d2-744376889 .fill-B4{fill:#E3E9FD;} + .d2-744376889 .fill-B5{fill:#EDF0FD;} + .d2-744376889 .fill-B6{fill:#F7F8FE;} + .d2-744376889 .fill-AA2{fill:#4A6FF3;} + .d2-744376889 .fill-AA4{fill:#EDF0FD;} + .d2-744376889 .fill-AA5{fill:#F7F8FE;} + .d2-744376889 .fill-AB4{fill:#EDF0FD;} + .d2-744376889 .fill-AB5{fill:#F7F8FE;} + .d2-744376889 .stroke-N1{stroke:#0A0F25;} + .d2-744376889 .stroke-N2{stroke:#676C7E;} + .d2-744376889 .stroke-N3{stroke:#9499AB;} + .d2-744376889 .stroke-N4{stroke:#CFD2DD;} + .d2-744376889 .stroke-N5{stroke:#DEE1EB;} + .d2-744376889 .stroke-N6{stroke:#EEF1F8;} + .d2-744376889 .stroke-N7{stroke:#FFFFFF;} + .d2-744376889 .stroke-B1{stroke:#0D32B2;} + .d2-744376889 .stroke-B2{stroke:#0D32B2;} + .d2-744376889 .stroke-B3{stroke:#E3E9FD;} + .d2-744376889 .stroke-B4{stroke:#E3E9FD;} + .d2-744376889 .stroke-B5{stroke:#EDF0FD;} + .d2-744376889 .stroke-B6{stroke:#F7F8FE;} + .d2-744376889 .stroke-AA2{stroke:#4A6FF3;} + .d2-744376889 .stroke-AA4{stroke:#EDF0FD;} + .d2-744376889 .stroke-AA5{stroke:#F7F8FE;} + .d2-744376889 .stroke-AB4{stroke:#EDF0FD;} + .d2-744376889 .stroke-AB5{stroke:#F7F8FE;} + .d2-744376889 .background-color-N1{background-color:#0A0F25;} + .d2-744376889 .background-color-N2{background-color:#676C7E;} + .d2-744376889 .background-color-N3{background-color:#9499AB;} + .d2-744376889 .background-color-N4{background-color:#CFD2DD;} + .d2-744376889 .background-color-N5{background-color:#DEE1EB;} + .d2-744376889 .background-color-N6{background-color:#EEF1F8;} + .d2-744376889 .background-color-N7{background-color:#FFFFFF;} + .d2-744376889 .background-color-B1{background-color:#0D32B2;} + .d2-744376889 .background-color-B2{background-color:#0D32B2;} + .d2-744376889 .background-color-B3{background-color:#E3E9FD;} + .d2-744376889 .background-color-B4{background-color:#E3E9FD;} + .d2-744376889 .background-color-B5{background-color:#EDF0FD;} + .d2-744376889 .background-color-B6{background-color:#F7F8FE;} + .d2-744376889 .background-color-AA2{background-color:#4A6FF3;} + .d2-744376889 .background-color-AA4{background-color:#EDF0FD;} + .d2-744376889 .background-color-AA5{background-color:#F7F8FE;} + .d2-744376889 .background-color-AB4{background-color:#EDF0FD;} + .d2-744376889 .background-color-AB5{background-color:#F7F8FE;} + .d2-744376889 .color-N1{color:#0A0F25;} + .d2-744376889 .color-N2{color:#676C7E;} + .d2-744376889 .color-N3{color:#9499AB;} + .d2-744376889 .color-N4{color:#CFD2DD;} + .d2-744376889 .color-N5{color:#DEE1EB;} + .d2-744376889 .color-N6{color:#EEF1F8;} + .d2-744376889 .color-N7{color:#FFFFFF;} + .d2-744376889 .color-B1{color:#0D32B2;} + .d2-744376889 .color-B2{color:#0D32B2;} + .d2-744376889 .color-B3{color:#E3E9FD;} + .d2-744376889 .color-B4{color:#E3E9FD;} + .d2-744376889 .color-B5{color:#EDF0FD;} + .d2-744376889 .color-B6{color:#F7F8FE;} + .d2-744376889 .color-AA2{color:#4A6FF3;} + .d2-744376889 .color-AA4{color:#EDF0FD;} + .d2-744376889 .color-AA5{color:#F7F8FE;} + .d2-744376889 .color-AB4{color:#EDF0FD;} + .d2-744376889 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json index 7bc8f2c55..6d7b33a30 100644 --- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json +++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json @@ -48,7 +48,7 @@ "id": "y", "type": "rectangle", "pos": { - "x": 105, + "x": 194, "y": 158 }, "width": 80, @@ -256,6 +256,14 @@ }, { "x": 132, + "y": 118 + }, + { + "x": 221.16666666666663, + "y": 118 + }, + { + "x": 221.16666666666663, "y": 158 } ], @@ -299,11 +307,11 @@ "y": 118 }, { - "x": 158.66666666666666, + "x": 247.83333333333331, "y": 118 }, { - "x": 158.66666666666666, + "x": 247.83333333333331, "y": 158 } ], diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg index 99e7a926a..1a4fbc1bf 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-2213813808 .fill-N1{fill:#0A0F25;} + .d2-2213813808 .fill-N2{fill:#676C7E;} + .d2-2213813808 .fill-N3{fill:#9499AB;} + .d2-2213813808 .fill-N4{fill:#CFD2DD;} + .d2-2213813808 .fill-N5{fill:#DEE1EB;} + .d2-2213813808 .fill-N6{fill:#EEF1F8;} + .d2-2213813808 .fill-N7{fill:#FFFFFF;} + .d2-2213813808 .fill-B1{fill:#0D32B2;} + .d2-2213813808 .fill-B2{fill:#0D32B2;} + .d2-2213813808 .fill-B3{fill:#E3E9FD;} + .d2-2213813808 .fill-B4{fill:#E3E9FD;} + .d2-2213813808 .fill-B5{fill:#EDF0FD;} + .d2-2213813808 .fill-B6{fill:#F7F8FE;} + .d2-2213813808 .fill-AA2{fill:#4A6FF3;} + .d2-2213813808 .fill-AA4{fill:#EDF0FD;} + .d2-2213813808 .fill-AA5{fill:#F7F8FE;} + .d2-2213813808 .fill-AB4{fill:#EDF0FD;} + .d2-2213813808 .fill-AB5{fill:#F7F8FE;} + .d2-2213813808 .stroke-N1{stroke:#0A0F25;} + .d2-2213813808 .stroke-N2{stroke:#676C7E;} + .d2-2213813808 .stroke-N3{stroke:#9499AB;} + .d2-2213813808 .stroke-N4{stroke:#CFD2DD;} + .d2-2213813808 .stroke-N5{stroke:#DEE1EB;} + .d2-2213813808 .stroke-N6{stroke:#EEF1F8;} + .d2-2213813808 .stroke-N7{stroke:#FFFFFF;} + .d2-2213813808 .stroke-B1{stroke:#0D32B2;} + .d2-2213813808 .stroke-B2{stroke:#0D32B2;} + .d2-2213813808 .stroke-B3{stroke:#E3E9FD;} + .d2-2213813808 .stroke-B4{stroke:#E3E9FD;} + .d2-2213813808 .stroke-B5{stroke:#EDF0FD;} + .d2-2213813808 .stroke-B6{stroke:#F7F8FE;} + .d2-2213813808 .stroke-AA2{stroke:#4A6FF3;} + .d2-2213813808 .stroke-AA4{stroke:#EDF0FD;} + .d2-2213813808 .stroke-AA5{stroke:#F7F8FE;} + .d2-2213813808 .stroke-AB4{stroke:#EDF0FD;} + .d2-2213813808 .stroke-AB5{stroke:#F7F8FE;} + .d2-2213813808 .background-color-N1{background-color:#0A0F25;} + .d2-2213813808 .background-color-N2{background-color:#676C7E;} + .d2-2213813808 .background-color-N3{background-color:#9499AB;} + .d2-2213813808 .background-color-N4{background-color:#CFD2DD;} + .d2-2213813808 .background-color-N5{background-color:#DEE1EB;} + .d2-2213813808 .background-color-N6{background-color:#EEF1F8;} + .d2-2213813808 .background-color-N7{background-color:#FFFFFF;} + .d2-2213813808 .background-color-B1{background-color:#0D32B2;} + .d2-2213813808 .background-color-B2{background-color:#0D32B2;} + .d2-2213813808 .background-color-B3{background-color:#E3E9FD;} + .d2-2213813808 .background-color-B4{background-color:#E3E9FD;} + .d2-2213813808 .background-color-B5{background-color:#EDF0FD;} + .d2-2213813808 .background-color-B6{background-color:#F7F8FE;} + .d2-2213813808 .background-color-AA2{background-color:#4A6FF3;} + .d2-2213813808 .background-color-AA4{background-color:#EDF0FD;} + .d2-2213813808 .background-color-AA5{background-color:#F7F8FE;} + .d2-2213813808 .background-color-AB4{background-color:#EDF0FD;} + .d2-2213813808 .background-color-AB5{background-color:#F7F8FE;} + .d2-2213813808 .color-N1{color:#0A0F25;} + .d2-2213813808 .color-N2{color:#676C7E;} + .d2-2213813808 .color-N3{color:#9499AB;} + .d2-2213813808 .color-N4{color:#CFD2DD;} + .d2-2213813808 .color-N5{color:#DEE1EB;} + .d2-2213813808 .color-N6{color:#EEF1F8;} + .d2-2213813808 .color-N7{color:#FFFFFF;} + .d2-2213813808 .color-B1{color:#0D32B2;} + .d2-2213813808 .color-B2{color:#0D32B2;} + .d2-2213813808 .color-B3{color:#E3E9FD;} + .d2-2213813808 .color-B4{color:#E3E9FD;} + .d2-2213813808 .color-B5{color:#EDF0FD;} + .d2-2213813808 .color-B6{color:#F7F8FE;} + .d2-2213813808 .color-AA2{color:#4A6FF3;} + .d2-2213813808 .color-AA4{color:#EDF0FD;} + .d2-2213813808 .color-AA5{color:#F7F8FE;} + .d2-2213813808 .color-AB4{color:#EDF0FD;} + .d2-2213813808 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz hello \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 6cb17ca83..831efef63 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a_shape", "type": "oval", "pos": { - "x": 459, + "x": 1453, "y": 12 }, "width": 120, @@ -49,7 +49,7 @@ "type": "sequence_diagram", "pos": { "x": 12, - "y": 302 + "y": 252 }, "width": 954, "height": 1146, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 24, - "y": 390 + "y": 340 }, "width": 100, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 68, - "y": 516 + "y": 466 }, "width": 12, "height": 860, @@ -171,7 +171,7 @@ "type": "rectangle", "pos": { "x": 164, - "y": 390 + "y": 340 }, "width": 140, "height": 66, @@ -212,7 +212,7 @@ "type": "rectangle", "pos": { "x": 228, - "y": 516 + "y": 466 }, "width": 12, "height": 90, @@ -252,7 +252,7 @@ "type": "rectangle", "pos": { "x": 334, - "y": 390 + "y": 340 }, "width": 100, "height": 66, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 378, - "y": 656 + "y": 606 }, "width": 12, "height": 90, @@ -333,7 +333,7 @@ "type": "rectangle", "pos": { "x": 474, - "y": 390 + "y": 340 }, "width": 126, "height": 66, @@ -374,7 +374,7 @@ "type": "rectangle", "pos": { "x": 531, - "y": 796 + "y": 746 }, "width": 12, "height": 230, @@ -414,7 +414,7 @@ "type": "rectangle", "pos": { "x": 527, - "y": 866 + "y": 816 }, "width": 20, "height": 90, @@ -454,7 +454,7 @@ "type": "rectangle", "pos": { "x": 677, - "y": 390 + "y": 340 }, "width": 100, "height": 66, @@ -495,7 +495,7 @@ "type": "rectangle", "pos": { "x": 721, - "y": 936 + "y": 886 }, "width": 12, "height": 30, @@ -535,7 +535,7 @@ "type": "rectangle", "pos": { "x": 817, - "y": 390 + "y": 340 }, "width": 137, "height": 66, @@ -576,7 +576,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 1076 + "y": 1026 }, "width": 12, "height": 30, @@ -616,7 +616,7 @@ "type": "rectangle", "pos": { "x": 378, - "y": 1146 + "y": 1096 }, "width": 12, "height": 30, @@ -656,7 +656,7 @@ "type": "rectangle", "pos": { "x": 378, - "y": 1216 + "y": 1166 }, "width": 12, "height": 30, @@ -696,7 +696,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 1286 + "y": 1236 }, "width": 12, "height": 30, @@ -736,7 +736,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 1356 + "y": 1306 }, "width": 12, "height": 30, @@ -776,7 +776,7 @@ "type": "rectangle", "pos": { "x": 986, - "y": 255 + "y": 205 }, "width": 1054, "height": 1241, @@ -817,7 +817,7 @@ "type": "sequence_diagram", "pos": { "x": 1036, - "y": 305 + "y": 255 }, "width": 954, "height": 1141, @@ -858,7 +858,7 @@ "type": "rectangle", "pos": { "x": 1048, - "y": 388 + "y": 338 }, "width": 100, "height": 66, @@ -899,7 +899,7 @@ "type": "rectangle", "pos": { "x": 1092, - "y": 514 + "y": 464 }, "width": 12, "height": 860, @@ -939,7 +939,7 @@ "type": "rectangle", "pos": { "x": 1188, - "y": 388 + "y": 338 }, "width": 140, "height": 66, @@ -980,7 +980,7 @@ "type": "rectangle", "pos": { "x": 1252, - "y": 514 + "y": 464 }, "width": 12, "height": 90, @@ -1020,7 +1020,7 @@ "type": "rectangle", "pos": { "x": 1358, - "y": 388 + "y": 338 }, "width": 100, "height": 66, @@ -1061,7 +1061,7 @@ "type": "rectangle", "pos": { "x": 1402, - "y": 654 + "y": 604 }, "width": 12, "height": 90, @@ -1101,7 +1101,7 @@ "type": "rectangle", "pos": { "x": 1498, - "y": 388 + "y": 338 }, "width": 126, "height": 66, @@ -1142,7 +1142,7 @@ "type": "rectangle", "pos": { "x": 1555, - "y": 794 + "y": 744 }, "width": 12, "height": 230, @@ -1182,7 +1182,7 @@ "type": "rectangle", "pos": { "x": 1551, - "y": 864 + "y": 814 }, "width": 20, "height": 90, @@ -1222,7 +1222,7 @@ "type": "rectangle", "pos": { "x": 1701, - "y": 388 + "y": 338 }, "width": 100, "height": 66, @@ -1263,7 +1263,7 @@ "type": "rectangle", "pos": { "x": 1745, - "y": 934 + "y": 884 }, "width": 12, "height": 30, @@ -1303,7 +1303,7 @@ "type": "rectangle", "pos": { "x": 1841, - "y": 388 + "y": 338 }, "width": 137, "height": 66, @@ -1344,7 +1344,7 @@ "type": "rectangle", "pos": { "x": 1903, - "y": 1074 + "y": 1024 }, "width": 12, "height": 30, @@ -1384,7 +1384,7 @@ "type": "rectangle", "pos": { "x": 1402, - "y": 1144 + "y": 1094 }, "width": 12, "height": 30, @@ -1424,7 +1424,7 @@ "type": "rectangle", "pos": { "x": 1402, - "y": 1214 + "y": 1164 }, "width": 12, "height": 30, @@ -1464,7 +1464,7 @@ "type": "rectangle", "pos": { "x": 1903, - "y": 1284 + "y": 1234 }, "width": 12, "height": 30, @@ -1504,7 +1504,7 @@ "type": "rectangle", "pos": { "x": 1903, - "y": 1354 + "y": 1304 }, "width": 12, "height": 30, @@ -1544,7 +1544,7 @@ "type": "rectangle", "pos": { "x": 433, - "y": 1586 + "y": 1536 }, "width": 112, "height": 66, @@ -1584,8 +1584,8 @@ "id": "finally", "type": "queue", "pos": { - "x": 996, - "y": 1586 + "x": 1274, + "y": 1536 }, "width": 1034, "height": 891, @@ -1625,8 +1625,8 @@ "id": "finally.sequence", "type": "sequence_diagram", "pos": { - "x": 1046, - "y": 1636 + "x": 1324, + "y": 1586 }, "width": 934, "height": 791, @@ -1666,8 +1666,8 @@ "id": "finally.sequence.scorer", "type": "rectangle", "pos": { - "x": 1058, - "y": 1719 + "x": 1336, + "y": 1669 }, "width": 100, "height": 66, @@ -1707,8 +1707,8 @@ "id": "finally.sequence.concept", "type": "rectangle", "pos": { - "x": 1208, - "y": 1719 + "x": 1486, + "y": 1669 }, "width": 100, "height": 66, @@ -1748,8 +1748,8 @@ "id": "finally.sequence.essayRubric", "type": "rectangle", "pos": { - "x": 1348, - "y": 1719 + "x": 1626, + "y": 1669 }, "width": 126, "height": 66, @@ -1789,8 +1789,8 @@ "id": "finally.sequence.item", "type": "rectangle", "pos": { - "x": 1511, - "y": 1719 + "x": 1789, + "y": 1669 }, "width": 100, "height": 66, @@ -1830,8 +1830,8 @@ "id": "finally.sequence.itemOutcome", "type": "rectangle", "pos": { - "x": 1651, - "y": 1719 + "x": 1929, + "y": 1669 }, "width": 137, "height": 66, @@ -1871,8 +1871,8 @@ "id": "finally.sequence.itemResponse", "type": "rectangle", "pos": { - "x": 1828, - "y": 1719 + "x": 2106, + "y": 1669 }, "width": 140, "height": 66, @@ -1912,8 +1912,8 @@ "id": "finally.sequence.itemResponse.a", "type": "rectangle", "pos": { - "x": 1892, - "y": 1845 + "x": 2170, + "y": 1795 }, "width": 12, "height": 30, @@ -1952,8 +1952,8 @@ "id": "finally.sequence.item.a", "type": "rectangle", "pos": { - "x": 1555, - "y": 1835 + "x": 1833, + "y": 1785 }, "width": 12, "height": 380, @@ -1992,8 +1992,8 @@ "id": "finally.sequence.item.a.b", "type": "rectangle", "pos": { - "x": 1551, - "y": 1845 + "x": 1829, + "y": 1795 }, "width": 20, "height": 90, @@ -2032,8 +2032,8 @@ "id": "finally.sequence.essayRubric.a", "type": "rectangle", "pos": { - "x": 1405, - "y": 1895 + "x": 1683, + "y": 1845 }, "width": 12, "height": 190, @@ -2072,8 +2072,8 @@ "id": "finally.sequence.essayRubric.a.b", "type": "rectangle", "pos": { - "x": 1401, - "y": 1905 + "x": 1679, + "y": 1855 }, "width": 20, "height": 170, @@ -2112,8 +2112,8 @@ "id": "finally.sequence.essayRubric.a.b.c", "type": "rectangle", "pos": { - "x": 1397, - "y": 1915 + "x": 1675, + "y": 1865 }, "width": 28, "height": 90, @@ -2152,8 +2152,8 @@ "id": "finally.sequence.concept.a", "type": "rectangle", "pos": { - "x": 1252, - "y": 1955 + "x": 1530, + "y": 1905 }, "width": 12, "height": 220, @@ -2192,8 +2192,8 @@ "id": "finally.sequence.concept.a.b", "type": "rectangle", "pos": { - "x": 1248, - "y": 1965 + "x": 1526, + "y": 1915 }, "width": 20, "height": 200, @@ -2232,8 +2232,8 @@ "id": "finally.sequence.concept.a.b.c", "type": "rectangle", "pos": { - "x": 1244, - "y": 1975 + "x": 1522, + "y": 1925 }, "width": 28, "height": 180, @@ -2272,8 +2272,8 @@ "id": "finally.sequence.concept.a.b.c.d", "type": "rectangle", "pos": { - "x": 1240, - "y": 1985 + "x": 1518, + "y": 1935 }, "width": 36, "height": 160, @@ -2312,8 +2312,8 @@ "id": "finally.sequence.itemOutcome.a", "type": "rectangle", "pos": { - "x": 1713, - "y": 2085 + "x": 1992, + "y": 2035 }, "width": 12, "height": 240, @@ -2352,8 +2352,8 @@ "id": "finally.sequence.itemOutcome.a.b", "type": "rectangle", "pos": { - "x": 1709, - "y": 2095 + "x": 1988, + "y": 2045 }, "width": 20, "height": 220, @@ -2392,8 +2392,8 @@ "id": "finally.sequence.itemOutcome.a.b.c", "type": "rectangle", "pos": { - "x": 1705, - "y": 2105 + "x": 1984, + "y": 2055 }, "width": 28, "height": 200, @@ -2432,8 +2432,8 @@ "id": "finally.sequence.itemOutcome.a.b.c.d", "type": "rectangle", "pos": { - "x": 1701, - "y": 2115 + "x": 1980, + "y": 2065 }, "width": 36, "height": 180, @@ -2472,8 +2472,8 @@ "id": "finally.sequence.itemOutcome.a.b.c.d.e", "type": "rectangle", "pos": { - "x": 1697, - "y": 2125 + "x": 1976, + "y": 2075 }, "width": 44, "height": 160, @@ -2512,8 +2512,8 @@ "id": "finally.sequence.scorer.abc", "type": "rectangle", "pos": { - "x": 1102, - "y": 2195 + "x": 1380, + "y": 2145 }, "width": 12, "height": 30, @@ -2552,8 +2552,8 @@ "id": "finally.sequence.itemResponse.c", "type": "rectangle", "pos": { - "x": 1892, - "y": 2335 + "x": 2170, + "y": 2285 }, "width": 12, "height": 30, @@ -2618,11 +2618,11 @@ "route": [ { "x": 80, - "y": 526.5 + "y": 476.5 }, { "x": 228, - "y": 526.5 + "y": 476.5 } ], "animated": false, @@ -2658,11 +2658,11 @@ "route": [ { "x": 80, - "y": 596.5 + "y": 546.5 }, { "x": 228, - "y": 596.5 + "y": 546.5 } ], "animated": false, @@ -2698,11 +2698,11 @@ "route": [ { "x": 80, - "y": 666.5 + "y": 616.5 }, { "x": 378, - "y": 666.5 + "y": 616.5 } ], "animated": false, @@ -2738,11 +2738,11 @@ "route": [ { "x": 80, - "y": 736.5 + "y": 686.5 }, { "x": 378, - "y": 736.5 + "y": 686.5 } ], "animated": false, @@ -2778,11 +2778,11 @@ "route": [ { "x": 80, - "y": 806.5 + "y": 756.5 }, { "x": 531, - "y": 806.5 + "y": 756.5 } ], "animated": false, @@ -2818,11 +2818,11 @@ "route": [ { "x": 234, - "y": 876.5 + "y": 826.5 }, { "x": 527, - "y": 876.5 + "y": 826.5 } ], "animated": false, @@ -2858,11 +2858,11 @@ "route": [ { "x": 547, - "y": 946.5 + "y": 896.5 }, { "x": 721, - "y": 946.5 + "y": 896.5 } ], "animated": false, @@ -2898,11 +2898,11 @@ "route": [ { "x": 74, - "y": 1016.5 + "y": 966.5 }, { "x": 531, - "y": 1016.5 + "y": 966.5 } ], "animated": false, @@ -2938,11 +2938,11 @@ "route": [ { "x": 80, - "y": 1086.5 + "y": 1036.5 }, { "x": 879.5, - "y": 1086.5 + "y": 1036.5 } ], "animated": false, @@ -2978,11 +2978,11 @@ "route": [ { "x": 80, - "y": 1156.5 + "y": 1106.5 }, { "x": 378, - "y": 1156.5 + "y": 1106.5 } ], "animated": false, @@ -3018,11 +3018,11 @@ "route": [ { "x": 80, - "y": 1226.5 + "y": 1176.5 }, { "x": 378, - "y": 1226.5 + "y": 1176.5 } ], "animated": false, @@ -3058,11 +3058,11 @@ "route": [ { "x": 80, - "y": 1296.5 + "y": 1246.5 }, { "x": 879.5, - "y": 1296.5 + "y": 1246.5 } ], "animated": false, @@ -3098,11 +3098,11 @@ "route": [ { "x": 80, - "y": 1366.5 + "y": 1316.5 }, { "x": 879.5, - "y": 1366.5 + "y": 1316.5 } ], "animated": false, @@ -3138,11 +3138,11 @@ "route": [ { "x": 1104, - "y": 524 + "y": 474 }, { "x": 1252, - "y": 524 + "y": 474 } ], "animated": false, @@ -3178,11 +3178,11 @@ "route": [ { "x": 1104, - "y": 594 + "y": 544 }, { "x": 1252, - "y": 594 + "y": 544 } ], "animated": false, @@ -3218,11 +3218,11 @@ "route": [ { "x": 1104, - "y": 664 + "y": 614 }, { "x": 1402, - "y": 664 + "y": 614 } ], "animated": false, @@ -3258,11 +3258,11 @@ "route": [ { "x": 1104, - "y": 734 + "y": 684 }, { "x": 1402, - "y": 734 + "y": 684 } ], "animated": false, @@ -3298,11 +3298,11 @@ "route": [ { "x": 1104, - "y": 804 + "y": 754 }, { "x": 1555, - "y": 804 + "y": 754 } ], "animated": false, @@ -3338,11 +3338,11 @@ "route": [ { "x": 1258, - "y": 874 + "y": 824 }, { "x": 1551, - "y": 874 + "y": 824 } ], "animated": false, @@ -3378,11 +3378,11 @@ "route": [ { "x": 1571, - "y": 944 + "y": 894 }, { "x": 1745, - "y": 944 + "y": 894 } ], "animated": false, @@ -3418,11 +3418,11 @@ "route": [ { "x": 1098, - "y": 1014 + "y": 964 }, { "x": 1555, - "y": 1014 + "y": 964 } ], "animated": false, @@ -3458,11 +3458,11 @@ "route": [ { "x": 1104, - "y": 1084 + "y": 1034 }, { "x": 1903.5, - "y": 1084 + "y": 1034 } ], "animated": false, @@ -3498,11 +3498,11 @@ "route": [ { "x": 1104, - "y": 1154 + "y": 1104 }, { "x": 1402, - "y": 1154 + "y": 1104 } ], "animated": false, @@ -3538,11 +3538,11 @@ "route": [ { "x": 1104, - "y": 1224 + "y": 1174 }, { "x": 1402, - "y": 1224 + "y": 1174 } ], "animated": false, @@ -3578,11 +3578,11 @@ "route": [ { "x": 1104, - "y": 1294 + "y": 1244 }, { "x": 1903.5, - "y": 1294 + "y": 1244 } ], "animated": false, @@ -3618,11 +3618,11 @@ "route": [ { "x": 1104, - "y": 1364 + "y": 1314 }, { "x": 1903.5, - "y": 1364 + "y": 1314 } ], "animated": false, @@ -3657,12 +3657,20 @@ "labelPercentage": 0, "route": [ { - "x": 489, + "x": 1483, "y": 113 }, + { + "x": 1483, + "y": 160 + }, { "x": 489, - "y": 302.5 + "y": 160 + }, + { + "x": 489, + "y": 252.5 } ], "animated": false, @@ -3697,20 +3705,12 @@ "labelPercentage": 0, "route": [ { - "x": 519, + "x": 1513, "y": 120 }, - { - "x": 519, - "y": 210 - }, { "x": 1513, - "y": 210 - }, - { - "x": 1513, - "y": 305 + "y": 255 } ], "animated": false, @@ -3746,11 +3746,11 @@ "route": [ { "x": 489, - "y": 1448.5 + "y": 1398.5 }, { "x": 489, - "y": 1586 + "y": 1536 } ], "animated": false, @@ -3786,11 +3786,19 @@ "route": [ { "x": 1513, - "y": 1446 + "y": 1396 }, { "x": 1513, - "y": 1636 + "y": 1491 + }, + { + "x": 1791.5, + "y": 1491 + }, + { + "x": 1791.5, + "y": 1586 } ], "animated": false, @@ -3825,28 +3833,28 @@ "labelPercentage": 0, "route": [ { - "x": 549, + "x": 1543, "y": 113 }, { - "x": 549, + "x": 1543, "y": 160 }, { - "x": 2050, + "x": 2080, "y": 160 }, { - "x": 2050, - "y": 1541 + "x": 2080, + "y": 1491 }, { - "x": 1523, - "y": 1541 + "x": 1801.5, + "y": 1491 }, { - "x": 1523, - "y": 1586 + "x": 1802, + "y": 1536 } ], "animated": false, @@ -3881,12 +3889,12 @@ "labelPercentage": 0, "route": [ { - "x": 1892, - "y": 1855 + "x": 2170.5, + "y": 1805 }, { - "x": 1571, - "y": 1855 + "x": 1849.5, + "y": 1805 } ], "animated": false, @@ -3921,12 +3929,12 @@ "labelPercentage": 0, "route": [ { - "x": 1551, - "y": 1925 + "x": 1829.5, + "y": 1875 }, { - "x": 1425, - "y": 1925 + "x": 1703.5, + "y": 1875 } ], "animated": false, @@ -3961,12 +3969,12 @@ "labelPercentage": 0, "route": [ { - "x": 1397, - "y": 1995 + "x": 1675.5, + "y": 1945 }, { - "x": 1276, - "y": 1995 + "x": 1554.5, + "y": 1945 } ], "animated": false, @@ -4001,12 +4009,12 @@ "labelPercentage": 0, "route": [ { - "x": 1555, - "y": 2065 + "x": 1833.5, + "y": 2015 }, { - "x": 1421, - "y": 2065 + "x": 1699.5, + "y": 2015 } ], "animated": false, @@ -4041,12 +4049,12 @@ "labelPercentage": 0, "route": [ { - "x": 1276, - "y": 2135 + "x": 1554.5, + "y": 2085 }, { - "x": 1697.5, - "y": 2135 + "x": 1976, + "y": 2085 } ], "animated": false, @@ -4081,12 +4089,12 @@ "labelPercentage": 0, "route": [ { - "x": 1114, - "y": 2205 + "x": 1392.5, + "y": 2155 }, { - "x": 1555, - "y": 2205 + "x": 1833.5, + "y": 2155 } ], "animated": false, @@ -4121,12 +4129,12 @@ "labelPercentage": 0, "route": [ { - "x": 1697.5, - "y": 2275 + "x": 1976, + "y": 2225 }, { - "x": 1108, - "y": 2275 + "x": 1386.5, + "y": 2225 } ], "animated": false, @@ -4161,12 +4169,12 @@ "labelPercentage": 0, "route": [ { - "x": 1108, - "y": 2345 + "x": 1386.5, + "y": 2295 }, { - "x": 1892, - "y": 2345 + "x": 2170.5, + "y": 2295 } ], "animated": false, @@ -4202,11 +4210,11 @@ "route": [ { "x": 74, - "y": 456.5 + "y": 406.5 }, { "x": 74, - "y": 1436.5 + "y": 1386.5 } ], "animated": false, @@ -4242,11 +4250,11 @@ "route": [ { "x": 234, - "y": 456.5 + "y": 406.5 }, { "x": 234, - "y": 1436.5 + "y": 1386.5 } ], "animated": false, @@ -4282,11 +4290,11 @@ "route": [ { "x": 384, - "y": 456.5 + "y": 406.5 }, { "x": 384, - "y": 1436.5 + "y": 1386.5 } ], "animated": false, @@ -4322,11 +4330,11 @@ "route": [ { "x": 537, - "y": 456.5 + "y": 406.5 }, { "x": 537, - "y": 1436.5 + "y": 1386.5 } ], "animated": false, @@ -4362,11 +4370,11 @@ "route": [ { "x": 727, - "y": 456.5 + "y": 406.5 }, { "x": 727, - "y": 1436.5 + "y": 1386.5 } ], "animated": false, @@ -4402,11 +4410,11 @@ "route": [ { "x": 885.5, - "y": 456.5 + "y": 406.5 }, { "x": 885.5, - "y": 1436.5 + "y": 1386.5 } ], "animated": false, @@ -4442,11 +4450,11 @@ "route": [ { "x": 1098, - "y": 454 + "y": 404 }, { "x": 1098, - "y": 1434 + "y": 1384 } ], "animated": false, @@ -4482,11 +4490,11 @@ "route": [ { "x": 1258, - "y": 454 + "y": 404 }, { "x": 1258, - "y": 1434 + "y": 1384 } ], "animated": false, @@ -4522,11 +4530,11 @@ "route": [ { "x": 1408, - "y": 454 + "y": 404 }, { "x": 1408, - "y": 1434 + "y": 1384 } ], "animated": false, @@ -4562,11 +4570,11 @@ "route": [ { "x": 1561, - "y": 454 + "y": 404 }, { "x": 1561, - "y": 1434 + "y": 1384 } ], "animated": false, @@ -4602,11 +4610,11 @@ "route": [ { "x": 1751, - "y": 454 + "y": 404 }, { "x": 1751, - "y": 1434 + "y": 1384 } ], "animated": false, @@ -4642,11 +4650,11 @@ "route": [ { "x": 1909.5, - "y": 454 + "y": 404 }, { "x": 1909.5, - "y": 1434 + "y": 1384 } ], "animated": false, @@ -4681,12 +4689,12 @@ "labelPercentage": 0, "route": [ { - "x": 1108, - "y": 1785 + "x": 1386.5, + "y": 1735 }, { - "x": 1108, - "y": 2415 + "x": 1386.5, + "y": 2365 } ], "animated": false, @@ -4721,12 +4729,12 @@ "labelPercentage": 0, "route": [ { - "x": 1258, - "y": 1785 + "x": 1536.5, + "y": 1735 }, { - "x": 1258, - "y": 2415 + "x": 1536.5, + "y": 2365 } ], "animated": false, @@ -4761,12 +4769,12 @@ "labelPercentage": 0, "route": [ { - "x": 1411, - "y": 1785 + "x": 1689.5, + "y": 1735 }, { - "x": 1411, - "y": 2415 + "x": 1689.5, + "y": 2365 } ], "animated": false, @@ -4801,12 +4809,12 @@ "labelPercentage": 0, "route": [ { - "x": 1561, - "y": 1785 + "x": 1839.5, + "y": 1735 }, { - "x": 1561, - "y": 2415 + "x": 1839.5, + "y": 2365 } ], "animated": false, @@ -4841,12 +4849,12 @@ "labelPercentage": 0, "route": [ { - "x": 1719.5, - "y": 1785 + "x": 1998, + "y": 1735 }, { - "x": 1719.5, - "y": 2415 + "x": 1998, + "y": 2365 } ], "animated": false, @@ -4881,12 +4889,12 @@ "labelPercentage": 0, "route": [ { - "x": 1898, - "y": 1785 + "x": 2176.5, + "y": 1735 }, { - "x": 1898, - "y": 2415 + "x": 2176.5, + "y": 2365 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 9e6d165d4..d8f357d75 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3726828926 .fill-N1{fill:#0A0F25;} + .d2-3726828926 .fill-N2{fill:#676C7E;} + .d2-3726828926 .fill-N3{fill:#9499AB;} + .d2-3726828926 .fill-N4{fill:#CFD2DD;} + .d2-3726828926 .fill-N5{fill:#DEE1EB;} + .d2-3726828926 .fill-N6{fill:#EEF1F8;} + .d2-3726828926 .fill-N7{fill:#FFFFFF;} + .d2-3726828926 .fill-B1{fill:#0D32B2;} + .d2-3726828926 .fill-B2{fill:#0D32B2;} + .d2-3726828926 .fill-B3{fill:#E3E9FD;} + .d2-3726828926 .fill-B4{fill:#E3E9FD;} + .d2-3726828926 .fill-B5{fill:#EDF0FD;} + .d2-3726828926 .fill-B6{fill:#F7F8FE;} + .d2-3726828926 .fill-AA2{fill:#4A6FF3;} + .d2-3726828926 .fill-AA4{fill:#EDF0FD;} + .d2-3726828926 .fill-AA5{fill:#F7F8FE;} + .d2-3726828926 .fill-AB4{fill:#EDF0FD;} + .d2-3726828926 .fill-AB5{fill:#F7F8FE;} + .d2-3726828926 .stroke-N1{stroke:#0A0F25;} + .d2-3726828926 .stroke-N2{stroke:#676C7E;} + .d2-3726828926 .stroke-N3{stroke:#9499AB;} + .d2-3726828926 .stroke-N4{stroke:#CFD2DD;} + .d2-3726828926 .stroke-N5{stroke:#DEE1EB;} + .d2-3726828926 .stroke-N6{stroke:#EEF1F8;} + .d2-3726828926 .stroke-N7{stroke:#FFFFFF;} + .d2-3726828926 .stroke-B1{stroke:#0D32B2;} + .d2-3726828926 .stroke-B2{stroke:#0D32B2;} + .d2-3726828926 .stroke-B3{stroke:#E3E9FD;} + .d2-3726828926 .stroke-B4{stroke:#E3E9FD;} + .d2-3726828926 .stroke-B5{stroke:#EDF0FD;} + .d2-3726828926 .stroke-B6{stroke:#F7F8FE;} + .d2-3726828926 .stroke-AA2{stroke:#4A6FF3;} + .d2-3726828926 .stroke-AA4{stroke:#EDF0FD;} + .d2-3726828926 .stroke-AA5{stroke:#F7F8FE;} + .d2-3726828926 .stroke-AB4{stroke:#EDF0FD;} + .d2-3726828926 .stroke-AB5{stroke:#F7F8FE;} + .d2-3726828926 .background-color-N1{background-color:#0A0F25;} + .d2-3726828926 .background-color-N2{background-color:#676C7E;} + .d2-3726828926 .background-color-N3{background-color:#9499AB;} + .d2-3726828926 .background-color-N4{background-color:#CFD2DD;} + .d2-3726828926 .background-color-N5{background-color:#DEE1EB;} + .d2-3726828926 .background-color-N6{background-color:#EEF1F8;} + .d2-3726828926 .background-color-N7{background-color:#FFFFFF;} + .d2-3726828926 .background-color-B1{background-color:#0D32B2;} + .d2-3726828926 .background-color-B2{background-color:#0D32B2;} + .d2-3726828926 .background-color-B3{background-color:#E3E9FD;} + .d2-3726828926 .background-color-B4{background-color:#E3E9FD;} + .d2-3726828926 .background-color-B5{background-color:#EDF0FD;} + .d2-3726828926 .background-color-B6{background-color:#F7F8FE;} + .d2-3726828926 .background-color-AA2{background-color:#4A6FF3;} + .d2-3726828926 .background-color-AA4{background-color:#EDF0FD;} + .d2-3726828926 .background-color-AA5{background-color:#F7F8FE;} + .d2-3726828926 .background-color-AB4{background-color:#EDF0FD;} + .d2-3726828926 .background-color-AB5{background-color:#F7F8FE;} + .d2-3726828926 .color-N1{color:#0A0F25;} + .d2-3726828926 .color-N2{color:#676C7E;} + .d2-3726828926 .color-N3{color:#9499AB;} + .d2-3726828926 .color-N4{color:#CFD2DD;} + .d2-3726828926 .color-N5{color:#DEE1EB;} + .d2-3726828926 .color-N6{color:#EEF1F8;} + .d2-3726828926 .color-N7{color:#FFFFFF;} + .d2-3726828926 .color-B1{color:#0D32B2;} + .d2-3726828926 .color-B2{color:#0D32B2;} + .d2-3726828926 .color-B3{color:#E3E9FD;} + .d2-3726828926 .color-B4{color:#E3E9FD;} + .d2-3726828926 .color-B5{color:#EDF0FD;} + .d2-3726828926 .color-B6{color:#F7F8FE;} + .d2-3726828926 .color-AA2{color:#4A6FF3;} + .d2-3726828926 .color-AA4{color:#EDF0FD;} + .d2-3726828926 .color-AA5{color:#F7F8FE;} + .d2-3726828926 .color-AB4{color:#EDF0FD;} + .d2-3726828926 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index 87b05338c..9a7aeb0b5 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 135, + "x": 250, "y": 12 }, "width": 53, @@ -48,7 +48,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 208, + "x": 323, "y": 12 }, "width": 53, @@ -89,7 +89,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 62, + "x": 177, "y": 12 }, "width": 53, @@ -130,11 +130,11 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 12, + "x": 127, "y": 153 }, "width": 299, - "height": 246, + "height": 296, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,7 +171,7 @@ "id": "l1.b", "type": "rectangle", "pos": { - "x": 62, + "x": 177, "y": 203 }, "width": 53, @@ -212,7 +212,7 @@ "id": "l1.a", "type": "rectangle", "pos": { - "x": 135, + "x": 250, "y": 203 }, "width": 53, @@ -253,7 +253,7 @@ "id": "l1.c", "type": "rectangle", "pos": { - "x": 208, + "x": 323, "y": 203 }, "width": 53, @@ -294,7 +294,7 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 85, + "x": 12, "y": 539 }, "width": 153, @@ -335,7 +335,7 @@ "id": "l2c1.a", "type": "rectangle", "pos": { - "x": 135, + "x": 62, "y": 589 }, "width": 53, @@ -376,7 +376,7 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 431, + "x": 408, "y": 539 }, "width": 153, @@ -417,7 +417,7 @@ "id": "l2c3.c", "type": "rectangle", "pos": { - "x": 481, + "x": 458, "y": 589 }, "width": 53, @@ -458,7 +458,7 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 258, + "x": 185, "y": 539 }, "width": 153, @@ -499,7 +499,7 @@ "id": "l2c2.b", "type": "rectangle", "pos": { - "x": 308, + "x": 235, "y": 589 }, "width": 53, @@ -540,7 +540,7 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 85, + "x": 62, "y": 795 }, "width": 226, @@ -581,7 +581,7 @@ "id": "l3c1.a", "type": "rectangle", "pos": { - "x": 135, + "x": 112, "y": 845 }, "width": 53, @@ -622,7 +622,7 @@ "id": "l3c1.b", "type": "rectangle", "pos": { - "x": 208, + "x": 185, "y": 845 }, "width": 53, @@ -663,7 +663,7 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 431, + "x": 408, "y": 795 }, "width": 153, @@ -704,7 +704,7 @@ "id": "l3c2.c", "type": "rectangle", "pos": { - "x": 481, + "x": 458, "y": 845 }, "width": 53, @@ -745,7 +745,7 @@ "id": "l4", "type": "rectangle", "pos": { - "x": 35, + "x": 12, "y": 1051 }, "width": 599, @@ -786,7 +786,7 @@ "id": "l4.c1", "type": "rectangle", "pos": { - "x": 85, + "x": 62, "y": 1106 }, "width": 153, @@ -827,7 +827,7 @@ "id": "l4.c1.a", "type": "rectangle", "pos": { - "x": 135, + "x": 112, "y": 1156 }, "width": 53, @@ -868,7 +868,7 @@ "id": "l4.c2", "type": "rectangle", "pos": { - "x": 258, + "x": 235, "y": 1106 }, "width": 153, @@ -909,7 +909,7 @@ "id": "l4.c2.b", "type": "rectangle", "pos": { - "x": 308, + "x": 285, "y": 1156 }, "width": 53, @@ -950,7 +950,7 @@ "id": "l4.c3", "type": "rectangle", "pos": { - "x": 431, + "x": 408, "y": 1106 }, "width": 153, @@ -991,7 +991,7 @@ "id": "l4.c3.c", "type": "rectangle", "pos": { - "x": 481, + "x": 458, "y": 1156 }, "width": 53, @@ -1057,11 +1057,11 @@ "labelPercentage": 0, "route": [ { - "x": 88.5, + "x": 204.25, "y": 78 }, { - "x": 88.5, + "x": 204.25, "y": 203 } ], @@ -1097,11 +1097,11 @@ "labelPercentage": 0, "route": [ { - "x": 161.5, + "x": 277.25, "y": 78 }, { - "x": 161.5, + "x": 277.25, "y": 203 } ], @@ -1137,11 +1137,11 @@ "labelPercentage": 0, "route": [ { - "x": 234.5, + "x": 350.25, "y": 78 }, { - "x": 234.5, + "x": 350.25, "y": 203 } ], @@ -1177,11 +1177,27 @@ "labelPercentage": 0, "route": [ { - "x": 161.5, + "x": 277.25, "y": 269 }, { - "x": 161.5, + "x": 277.25, + "y": 309 + }, + { + "x": 235.75, + "y": 309 + }, + { + "x": 235.75, + "y": 494 + }, + { + "x": 88.5, + "y": 494 + }, + { + "x": 88.5, "y": 589 } ], @@ -1217,19 +1233,19 @@ "labelPercentage": 0, "route": [ { - "x": 234.5, + "x": 350.25, "y": 269 }, { - "x": 234.5, - "y": 444 + "x": 350.25, + "y": 494 }, { - "x": 507.5, - "y": 444 + "x": 484.5, + "y": 494 }, { - "x": 507.5, + "x": 484.5, "y": 589 } ], @@ -1265,27 +1281,27 @@ "labelPercentage": 0, "route": [ { - "x": 88.5, + "x": 204.25, "y": 269 }, { - "x": 88.5, - "y": 309 + "x": 204.25, + "y": 359 }, { - "x": 171.5, - "y": 309 + "x": 245.75, + "y": 359 }, { - "x": 171.5, + "x": 245.75, "y": 494 }, { - "x": 334.5, + "x": 261.5, "y": 494 }, { - "x": 334.5, + "x": 261.5, "y": 589 } ], @@ -1321,11 +1337,19 @@ "labelPercentage": 0, "route": [ { - "x": 161.5, + "x": 88.5, "y": 655 }, { - "x": 161.5, + "x": 88.5, + "y": 750 + }, + { + "x": 138.5, + "y": 750 + }, + { + "x": 138.5, "y": 845 } ], @@ -1361,19 +1385,19 @@ "labelPercentage": 0, "route": [ { - "x": 334.5, + "x": 261.5, "y": 655 }, { - "x": 334.5, + "x": 261.5, "y": 750 }, { - "x": 234.5, + "x": 211.5, "y": 750 }, { - "x": 234.5, + "x": 211.5, "y": 845 } ], @@ -1409,11 +1433,11 @@ "labelPercentage": 0, "route": [ { - "x": 507.5, + "x": 484.5, "y": 655 }, { - "x": 507.5, + "x": 484.5, "y": 845 } ], @@ -1449,11 +1473,11 @@ "labelPercentage": 0, "route": [ { - "x": 161.5, + "x": 138.5, "y": 911 }, { - "x": 161.5, + "x": 138.5, "y": 1156 } ], @@ -1489,19 +1513,19 @@ "labelPercentage": 0, "route": [ { - "x": 234.5, + "x": 211.5, "y": 911 }, { - "x": 234.5, + "x": 211.5, "y": 1006 }, { - "x": 334.5, + "x": 311.5, "y": 1006 }, { - "x": 334.5, + "x": 311.5, "y": 1156 } ], @@ -1537,11 +1561,11 @@ "labelPercentage": 0, "route": [ { - "x": 507.5, + "x": 484.5, "y": 911 }, { - "x": 507.5, + "x": 484.5, "y": 1156 } ], diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg index b02a61a37..728ebfa59 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + .d2-1856317538 .fill-N1{fill:#0A0F25;} + .d2-1856317538 .fill-N2{fill:#676C7E;} + .d2-1856317538 .fill-N3{fill:#9499AB;} + .d2-1856317538 .fill-N4{fill:#CFD2DD;} + .d2-1856317538 .fill-N5{fill:#DEE1EB;} + .d2-1856317538 .fill-N6{fill:#EEF1F8;} + .d2-1856317538 .fill-N7{fill:#FFFFFF;} + .d2-1856317538 .fill-B1{fill:#0D32B2;} + .d2-1856317538 .fill-B2{fill:#0D32B2;} + .d2-1856317538 .fill-B3{fill:#E3E9FD;} + .d2-1856317538 .fill-B4{fill:#E3E9FD;} + .d2-1856317538 .fill-B5{fill:#EDF0FD;} + .d2-1856317538 .fill-B6{fill:#F7F8FE;} + .d2-1856317538 .fill-AA2{fill:#4A6FF3;} + .d2-1856317538 .fill-AA4{fill:#EDF0FD;} + .d2-1856317538 .fill-AA5{fill:#F7F8FE;} + .d2-1856317538 .fill-AB4{fill:#EDF0FD;} + .d2-1856317538 .fill-AB5{fill:#F7F8FE;} + .d2-1856317538 .stroke-N1{stroke:#0A0F25;} + .d2-1856317538 .stroke-N2{stroke:#676C7E;} + .d2-1856317538 .stroke-N3{stroke:#9499AB;} + .d2-1856317538 .stroke-N4{stroke:#CFD2DD;} + .d2-1856317538 .stroke-N5{stroke:#DEE1EB;} + .d2-1856317538 .stroke-N6{stroke:#EEF1F8;} + .d2-1856317538 .stroke-N7{stroke:#FFFFFF;} + .d2-1856317538 .stroke-B1{stroke:#0D32B2;} + .d2-1856317538 .stroke-B2{stroke:#0D32B2;} + .d2-1856317538 .stroke-B3{stroke:#E3E9FD;} + .d2-1856317538 .stroke-B4{stroke:#E3E9FD;} + .d2-1856317538 .stroke-B5{stroke:#EDF0FD;} + .d2-1856317538 .stroke-B6{stroke:#F7F8FE;} + .d2-1856317538 .stroke-AA2{stroke:#4A6FF3;} + .d2-1856317538 .stroke-AA4{stroke:#EDF0FD;} + .d2-1856317538 .stroke-AA5{stroke:#F7F8FE;} + .d2-1856317538 .stroke-AB4{stroke:#EDF0FD;} + .d2-1856317538 .stroke-AB5{stroke:#F7F8FE;} + .d2-1856317538 .background-color-N1{background-color:#0A0F25;} + .d2-1856317538 .background-color-N2{background-color:#676C7E;} + .d2-1856317538 .background-color-N3{background-color:#9499AB;} + .d2-1856317538 .background-color-N4{background-color:#CFD2DD;} + .d2-1856317538 .background-color-N5{background-color:#DEE1EB;} + .d2-1856317538 .background-color-N6{background-color:#EEF1F8;} + .d2-1856317538 .background-color-N7{background-color:#FFFFFF;} + .d2-1856317538 .background-color-B1{background-color:#0D32B2;} + .d2-1856317538 .background-color-B2{background-color:#0D32B2;} + .d2-1856317538 .background-color-B3{background-color:#E3E9FD;} + .d2-1856317538 .background-color-B4{background-color:#E3E9FD;} + .d2-1856317538 .background-color-B5{background-color:#EDF0FD;} + .d2-1856317538 .background-color-B6{background-color:#F7F8FE;} + .d2-1856317538 .background-color-AA2{background-color:#4A6FF3;} + .d2-1856317538 .background-color-AA4{background-color:#EDF0FD;} + .d2-1856317538 .background-color-AA5{background-color:#F7F8FE;} + .d2-1856317538 .background-color-AB4{background-color:#EDF0FD;} + .d2-1856317538 .background-color-AB5{background-color:#F7F8FE;} + .d2-1856317538 .color-N1{color:#0A0F25;} + .d2-1856317538 .color-N2{color:#676C7E;} + .d2-1856317538 .color-N3{color:#9499AB;} + .d2-1856317538 .color-N4{color:#CFD2DD;} + .d2-1856317538 .color-N5{color:#DEE1EB;} + .d2-1856317538 .color-N6{color:#EEF1F8;} + .d2-1856317538 .color-N7{color:#FFFFFF;} + .d2-1856317538 .color-B1{color:#0D32B2;} + .d2-1856317538 .color-B2{color:#0D32B2;} + .d2-1856317538 .color-B3{color:#E3E9FD;} + .d2-1856317538 .color-B4{color:#E3E9FD;} + .d2-1856317538 .color-B5{color:#EDF0FD;} + .d2-1856317538 .color-B6{color:#F7F8FE;} + .d2-1856317538 .color-AA2{color:#4A6FF3;} + .d2-1856317538 .color-AA4{color:#EDF0FD;} + .d2-1856317538 .color-AA5{color:#F7F8FE;} + .d2-1856317538 .color-AB4{color:#EDF0FD;} + .d2-1856317538 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + \ No newline at end of file diff --git a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json index d4fa541ac..d0658b553 100644 --- a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json +++ b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "bear", "type": "text", "pos": { - "x": 52, + "x": 116, "y": 133 }, "width": 80, @@ -157,6 +157,14 @@ }, { "x": 79.5, + "y": 93 + }, + { + "x": 143.41666666666666, + "y": 93 + }, + { + "x": 143.41666666666666, "y": 133 } ], @@ -200,11 +208,11 @@ "y": 93 }, { - "x": 106.16666666666666, + "x": 170.08333333333334, "y": 93 }, { - "x": 106.16666666666666, + "x": 170.08333333333334, "y": 133 } ], diff --git a/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg index b6f4cbc0f..51e087a03 100644 --- a/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg @@ -1,26 +1,26 @@ -bearmama bearpapa bear +bearmama bearpapa bear \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 67d40b383..a5aaa99c4 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "AL", "type": "rectangle", "pos": { - "x": 486, + "x": 559, "y": 148 }, "width": 64, @@ -48,7 +48,7 @@ "id": "FL", "type": "rectangle", "pos": { - "x": 478, + "x": 551, "y": 294 }, "width": 80, @@ -89,8 +89,8 @@ "id": "GA", "type": "rectangle", "pos": { - "x": 478, - "y": 640 + "x": 551, + "y": 590 }, "width": 80, "height": 66, @@ -130,8 +130,8 @@ "id": "MS", "type": "rectangle", "pos": { - "x": 361, - "y": 786 + "x": 405, + "y": 836 }, "width": 160, "height": 66, @@ -171,8 +171,8 @@ "id": "TN", "type": "rectangle", "pos": { - "x": 413, - "y": 2916 + "x": 524, + "y": 3116 }, "width": 280, "height": 66, @@ -212,7 +212,7 @@ "id": "AK", "type": "rectangle", "pos": { - "x": 1251, + "x": 1003, "y": 12 }, "width": 66, @@ -253,8 +253,8 @@ "id": "AZ", "type": "rectangle", "pos": { - "x": 1395, - "y": 786 + "x": 1724, + "y": 836 }, "width": 65, "height": 66, @@ -294,8 +294,8 @@ "id": "CA", "type": "rectangle", "pos": { - "x": 1388, - "y": 1132 + "x": 1716, + "y": 1232 }, "width": 80, "height": 66, @@ -335,8 +335,8 @@ "id": "NV", "type": "rectangle", "pos": { - "x": 1334, - "y": 1528 + "x": 1656, + "y": 1628 }, "width": 160, "height": 66, @@ -376,8 +376,8 @@ "id": "NM", "type": "rectangle", "pos": { - "x": 944, - "y": 1874 + "x": 1121, + "y": 1974 }, "width": 120, "height": 66, @@ -417,8 +417,8 @@ "id": "UT", "type": "rectangle", "pos": { - "x": 1288, - "y": 2916 + "x": 1522, + "y": 3116 }, "width": 160, "height": 66, @@ -458,7 +458,7 @@ "id": "AR", "type": "rectangle", "pos": { - "x": 381, + "x": 425, "y": 294 }, "width": 66, @@ -499,8 +499,8 @@ "id": "LA", "type": "rectangle", "pos": { - "x": 374, - "y": 640 + "x": 418, + "y": 590 }, "width": 80, "height": 66, @@ -540,8 +540,8 @@ "id": "MO", "type": "rectangle", "pos": { - "x": 889, - "y": 1132 + "x": 1151, + "y": 1232 }, "width": 240, "height": 66, @@ -581,8 +581,8 @@ "id": "OK", "type": "rectangle", "pos": { - "x": 591, - "y": 2420 + "x": 719, + "y": 2520 }, "width": 200, "height": 66, @@ -622,8 +622,8 @@ "id": "TX", "type": "rectangle", "pos": { - "x": 281, - "y": 3212 + "x": 387, + "y": 3362 }, "width": 160, "height": 66, @@ -663,8 +663,8 @@ "id": "OR", "type": "rectangle", "pos": { - "x": 1368, - "y": 1874 + "x": 1692, + "y": 1974 }, "width": 120, "height": 66, @@ -704,8 +704,8 @@ "id": "CO", "type": "rectangle", "pos": { - "x": 793, - "y": 640 + "x": 794, + "y": 590 }, "width": 66, "height": 66, @@ -745,8 +745,8 @@ "id": "KS", "type": "rectangle", "pos": { - "x": 786, - "y": 786 + "x": 1018, + "y": 836 }, "width": 80, "height": 66, @@ -786,8 +786,8 @@ "id": "NE", "type": "rectangle", "pos": { - "x": 884, - "y": 1528 + "x": 1061, + "y": 1628 }, "width": 200, "height": 66, @@ -827,8 +827,8 @@ "id": "WY", "type": "rectangle", "pos": { - "x": 1191, - "y": 3458 + "x": 1446, + "y": 3708 }, "width": 240, "height": 66, @@ -868,8 +868,8 @@ "id": "CT", "type": "rectangle", "pos": { - "x": 105, - "y": 1132 + "x": 120, + "y": 1232 }, "width": 64, "height": 66, @@ -909,8 +909,8 @@ "id": "MA", "type": "rectangle", "pos": { - "x": 97, - "y": 1528 + "x": 112, + "y": 1628 }, "width": 80, "height": 66, @@ -950,8 +950,8 @@ "id": "NY", "type": "rectangle", "pos": { - "x": 70, - "y": 2420 + "x": 85, + "y": 2520 }, "width": 160, "height": 66, @@ -991,8 +991,8 @@ "id": "RI", "type": "rectangle", "pos": { - "x": 74, - "y": 3212 + "x": 87, + "y": 3362 }, "width": 120, "height": 66, @@ -1032,8 +1032,8 @@ "id": "DE", "type": "rectangle", "pos": { - "x": 273, - "y": 1132 + "x": 259, + "y": 1232 }, "width": 63, "height": 66, @@ -1073,8 +1073,8 @@ "id": "MD", "type": "rectangle", "pos": { - "x": 265, - "y": 1528 + "x": 250, + "y": 1628 }, "width": 80, "height": 66, @@ -1114,8 +1114,8 @@ "id": "NJ", "type": "rectangle", "pos": { - "x": 192, - "y": 1874 + "x": 237, + "y": 1974 }, "width": 80, "height": 66, @@ -1155,8 +1155,8 @@ "id": "PA", "type": "rectangle", "pos": { - "x": 145, - "y": 2916 + "x": 190, + "y": 3116 }, "width": 200, "height": 66, @@ -1196,8 +1196,8 @@ "id": "NC", "type": "rectangle", "pos": { - "x": 491, - "y": 1874 + "x": 565, + "y": 1974 }, "width": 80, "height": 66, @@ -1237,8 +1237,8 @@ "id": "SC", "type": "rectangle", "pos": { - "x": 491, - "y": 2420 + "x": 565, + "y": 2520 }, "width": 80, "height": 66, @@ -1278,7 +1278,7 @@ "id": "HI", "type": "rectangle", "pos": { - "x": 1172, + "x": 924, "y": 12 }, "width": 59, @@ -1319,8 +1319,8 @@ "id": "ID", "type": "rectangle", "pos": { - "x": 1316, - "y": 786 + "x": 1576, + "y": 836 }, "width": 59, "height": 66, @@ -1360,8 +1360,8 @@ "id": "MT", "type": "rectangle", "pos": { - "x": 1165, - "y": 1132 + "x": 1465, + "y": 1232 }, "width": 80, "height": 66, @@ -1401,8 +1401,8 @@ "id": "WA", "type": "rectangle", "pos": { - "x": 1405, - "y": 3212 + "x": 1724, + "y": 3362 }, "width": 80, "height": 66, @@ -1442,7 +1442,7 @@ "id": "IL", "type": "rectangle", "pos": { - "x": 1337, + "x": 1089, "y": 12 }, "width": 57, @@ -1483,7 +1483,7 @@ "id": "IN", "type": "rectangle", "pos": { - "x": 1326, + "x": 1077, "y": 148 }, "width": 80, @@ -1524,7 +1524,7 @@ "id": "IA", "type": "rectangle", "pos": { - "x": 1339, + "x": 1425, "y": 294 }, "width": 80, @@ -1565,8 +1565,8 @@ "id": "MI", "type": "rectangle", "pos": { - "x": 879, - "y": 640 + "x": 880, + "y": 590 }, "width": 120, "height": 66, @@ -1606,7 +1606,7 @@ "id": "KY", "type": "rectangle", "pos": { - "x": 1199, + "x": 997, "y": 294 }, "width": 120, @@ -1647,8 +1647,8 @@ "id": "WI", "type": "rectangle", "pos": { - "x": 853, - "y": 2420 + "x": 1281, + "y": 2520 }, "width": 160, "height": 66, @@ -1688,8 +1688,8 @@ "id": "OH", "type": "rectangle", "pos": { - "x": 741, - "y": 1528 + "x": 899, + "y": 1628 }, "width": 120, "height": 66, @@ -1729,8 +1729,8 @@ "id": "MN", "type": "rectangle", "pos": { - "x": 1165, - "y": 786 + "x": 1385, + "y": 836 }, "width": 120, "height": 66, @@ -1770,8 +1770,8 @@ "id": "SD", "type": "rectangle", "pos": { - "x": 1105, - "y": 1874 + "x": 1405, + "y": 1974 }, "width": 200, "height": 66, @@ -1811,8 +1811,8 @@ "id": "VA", "type": "rectangle", "pos": { - "x": 461, - "y": 3212 + "x": 620, + "y": 3362 }, "width": 160, "height": 66, @@ -1852,8 +1852,8 @@ "id": "WV", "type": "rectangle", "pos": { - "x": 401, - "y": 3458 + "x": 522, + "y": 3708 }, "width": 200, "height": 66, @@ -1894,7 +1894,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 1528 + "y": 1628 }, "width": 65, "height": 66, @@ -1935,7 +1935,7 @@ "type": "rectangle", "pos": { "x": 17, - "y": 1874 + "y": 1974 }, "width": 80, "height": 66, @@ -1975,8 +1975,8 @@ "id": "VT", "type": "rectangle", "pos": { - "x": 54, - "y": 3458 + "x": 42, + "y": 3708 }, "width": 120, "height": 66, @@ -2016,8 +2016,8 @@ "id": "ND", "type": "rectangle", "pos": { - "x": 1175, - "y": 1528 + "x": 1478, + "y": 1628 }, "width": 120, "height": 66, @@ -2082,11 +2082,11 @@ "labelPercentage": 0, "route": [ { - "x": 518.3333333333333, + "x": 591.8333333333333, "y": 214 }, { - "x": 518.3333333333333, + "x": 591.8333333333333, "y": 294 } ], @@ -2122,12 +2122,12 @@ "labelPercentage": 0, "route": [ { - "x": 504.9999999999999, + "x": 578.4999999999999, "y": 360 }, { - "x": 504.9999999999999, - "y": 640 + "x": 578.4999999999999, + "y": 590 } ], "animated": false, @@ -2162,20 +2162,20 @@ "labelPercentage": 0, "route": [ { - "x": 504.9999999999999, - "y": 706 + "x": 578.4999999999999, + "y": 656 }, { - "x": 504.9999999999999, - "y": 746 + "x": 578.4999999999999, + "y": 696 }, { - "x": 481.6666666666665, - "y": 746 + "x": 525.1666666666665, + "y": 696 }, { - "x": 481.6666666666665, - "y": 786 + "x": 525.1666666666665, + "y": 836 } ], "animated": false, @@ -2210,20 +2210,20 @@ "labelPercentage": 0, "route": [ { - "x": 425.6666666666665, - "y": 852 + "x": 469.1666666666665, + "y": 902 }, { - "x": 425.6666666666665, - "y": 2726 + "x": 469.1666666666665, + "y": 2776 }, { - "x": 448.33333333333326, - "y": 2726 + "x": 559.3690476190477, + "y": 2776 }, { - "x": 448.33333333333326, - "y": 2916 + "x": 559.3690476190477, + "y": 3116 } ], "animated": false, @@ -2258,12 +2258,12 @@ "labelPercentage": 0, "route": [ { - "x": 1428.2142857142856, - "y": 852 + "x": 1756.6666666666667, + "y": 902 }, { - "x": 1428.2142857142856, - "y": 1132 + "x": 1756.6666666666667, + "y": 1232 } ], "animated": false, @@ -2298,12 +2298,20 @@ "labelPercentage": 0, "route": [ { - "x": 1414.8809523809523, - "y": 1198 + "x": 1743.3333333333333, + "y": 1298 }, { - "x": 1414.8809523809523, - "y": 1528 + "x": 1743.3333333333333, + "y": 1338 + }, + { + "x": 1736.6666666666665, + "y": 1338 + }, + { + "x": 1736.6666666666665, + "y": 1628 } ], "animated": false, @@ -2338,20 +2346,20 @@ "labelPercentage": 0, "route": [ { - "x": 1366.8809523809523, - "y": 1594 + "x": 1688.6666666666665, + "y": 1694 }, { - "x": 1366.8809523809523, - "y": 1734 + "x": 1688.6666666666665, + "y": 1834 }, { - "x": 1024.7142857142858, - "y": 1734 + "x": 1201.1666666666667, + "y": 1834 }, { - "x": 1024.7142857142858, - "y": 1874 + "x": 1201.1666666666667, + "y": 1974 } ], "animated": false, @@ -2386,20 +2394,20 @@ "labelPercentage": 0, "route": [ { - "x": 1034.7142857142858, - "y": 1940 + "x": 1211.1666666666667, + "y": 2040 }, { - "x": 1034.7142857142858, - "y": 2526 + "x": 1211.1666666666667, + "y": 2480 }, { - "x": 1352.8809523809523, - "y": 2526 + "x": 1586.4166666666667, + "y": 2480 }, { - "x": 1352.8809523809523, - "y": 2916 + "x": 1586.4166666666667, + "y": 3116 } ], "animated": false, @@ -2434,12 +2442,12 @@ "labelPercentage": 0, "route": [ { - "x": 414.9999999999999, + "x": 458.5, "y": 360 }, { - "x": 414.9999999999999, - "y": 640 + "x": 458.5, + "y": 590 } ], "animated": false, @@ -2474,12 +2482,12 @@ "labelPercentage": 0, "route": [ { - "x": 401.6666666666665, - "y": 706 + "x": 445.16666666666674, + "y": 656 }, { - "x": 401.6666666666665, - "y": 786 + "x": 445.1666666666665, + "y": 836 } ], "animated": false, @@ -2514,20 +2522,20 @@ "labelPercentage": 0, "route": [ { - "x": 489.6666666666665, - "y": 852 + "x": 533.1666666666665, + "y": 902 }, { - "x": 489.6666666666665, - "y": 992 + "x": 533.1666666666665, + "y": 1042 }, { - "x": 929, - "y": 992 + "x": 1191.4761904761904, + "y": 1042 }, { - "x": 929, - "y": 1132 + "x": 1191.4761904761904, + "y": 1232 } ], "animated": false, @@ -2562,28 +2570,28 @@ "labelPercentage": 0, "route": [ { - "x": 923.2857142857142, - "y": 1198 + "x": 1185.7619047619048, + "y": 1298 }, { - "x": 923.2857142857142, - "y": 1238 + "x": 1185.7619047619048, + "y": 1338 }, { - "x": 669.6666666666666, - "y": 1238 + "x": 774.8333333333334, + "y": 1338 }, { - "x": 669.6666666666666, - "y": 1980 + "x": 774.8333333333334, + "y": 2080 }, { - "x": 625, - "y": 1980 + "x": 752.5000000000001, + "y": 2080 }, { - "x": 625, - "y": 2420 + "x": 752.5000000000001, + "y": 2520 } ], "animated": false, @@ -2618,20 +2626,20 @@ "labelPercentage": 0, "route": [ { - "x": 691.6666666666666, - "y": 2486 + "x": 819.1666666666667, + "y": 2586 }, { - "x": 691.6666666666666, - "y": 2726 + "x": 819.1666666666667, + "y": 2926 }, { - "x": 588.3333333333333, - "y": 2726 + "x": 699.3690476190477, + "y": 2926 }, { - "x": 588.3333333333333, - "y": 2916 + "x": 699.3690476190477, + "y": 3116 } ], "animated": false, @@ -2666,20 +2674,20 @@ "labelPercentage": 0, "route": [ { - "x": 469.33333333333326, - "y": 2982 + "x": 580.3690476190477, + "y": 3182 }, { - "x": 469.33333333333326, - "y": 3022 + "x": 580.3690476190477, + "y": 3222 }, { - "x": 409.33333333333326, - "y": 3022 + "x": 515.3690476190475, + "y": 3222 }, { - "x": 409.33333333333326, - "y": 3212 + "x": 515.3690476190475, + "y": 3362 } ], "animated": false, @@ -2714,20 +2722,20 @@ "labelPercentage": 0, "route": [ { - "x": 1441.547619047619, - "y": 1198 + "x": 1770, + "y": 1298 }, { - "x": 1441.547619047619, - "y": 1238 + "x": 1770, + "y": 1338 }, { - "x": 1454.8809523809523, - "y": 1238 + "x": 1776.6666666666665, + "y": 1338 }, { - "x": 1454.8809523809523, - "y": 1528 + "x": 1776.6666666666665, + "y": 1628 } ], "animated": false, @@ -2762,12 +2770,20 @@ "labelPercentage": 0, "route": [ { - "x": 1398.8809523809523, - "y": 1594 + "x": 1720.6666666666665, + "y": 1694 }, { - "x": 1398.8809523809523, - "y": 1874 + "x": 1720.6666666666665, + "y": 1734 + }, + { + "x": 1722.6666666666665, + "y": 1734 + }, + { + "x": 1722.6666666666665, + "y": 1974 } ], "animated": false, @@ -2802,12 +2818,20 @@ "labelPercentage": 0, "route": [ { - "x": 826, - "y": 706 + "x": 827.6428571428571, + "y": 656 }, { - "x": 826, - "y": 786 + "x": 827.6428571428571, + "y": 746 + }, + { + "x": 1058.4761904761904, + "y": 746 + }, + { + "x": 1058.4761904761904, + "y": 836 } ], "animated": false, @@ -2842,20 +2866,20 @@ "labelPercentage": 0, "route": [ { - "x": 812.6666666666666, - "y": 852 + "x": 1045.142857142857, + "y": 902 }, { - "x": 812.6666666666666, - "y": 1288 + "x": 1045.142857142857, + "y": 1438 }, { - "x": 924.7142857142857, - "y": 1288 + "x": 1101.1666666666667, + "y": 1438 }, { - "x": 924.7142857142857, - "y": 1528 + "x": 1101.1666666666667, + "y": 1628 } ], "animated": false, @@ -2890,12 +2914,12 @@ "labelPercentage": 0, "route": [ { - "x": 984.7142857142857, - "y": 1594 + "x": 1161.1666666666667, + "y": 1694 }, { - "x": 984.7142857142857, - "y": 1874 + "x": 1161.1666666666667, + "y": 1974 } ], "animated": false, @@ -2930,20 +2954,20 @@ "labelPercentage": 0, "route": [ { - "x": 974.7142857142857, - "y": 1940 + "x": 1151.1666666666667, + "y": 2040 }, { - "x": 974.7142857142857, - "y": 1980 + "x": 1151.1666666666667, + "y": 2080 }, { - "x": 725, - "y": 1980 + "x": 852.5, + "y": 2080 }, { - "x": 725, - "y": 2420 + "x": 852.5, + "y": 2520 } ], "animated": false, @@ -2978,20 +3002,20 @@ "labelPercentage": 0, "route": [ { - "x": 758.3333333333333, - "y": 2486 + "x": 885.8333333333334, + "y": 2586 }, { - "x": 758.3333333333333, - "y": 2876 + "x": 885.8333333333334, + "y": 3076 }, { - "x": 1320.8809523809523, - "y": 2876 + "x": 1554.4166666666667, + "y": 3076 }, { - "x": 1320.8809523809523, - "y": 2916 + "x": 1554.4166666666667, + "y": 3116 } ], "animated": false, @@ -3026,12 +3050,28 @@ "labelPercentage": 0, "route": [ { - "x": 1328.8809523809523, - "y": 2982 + "x": 1562.4166666666667, + "y": 3182 }, { - "x": 1328.8809523809523, - "y": 3458 + "x": 1562.4166666666667, + "y": 3222 + }, + { + "x": 1559.1666666666667, + "y": 3222 + }, + { + "x": 1559.1666666666667, + "y": 3518 + }, + { + "x": 1583.7142857142858, + "y": 3518 + }, + { + "x": 1583.7142857142858, + "y": 3708 } ], "animated": false, @@ -3066,12 +3106,12 @@ "labelPercentage": 0, "route": [ { - "x": 137, - "y": 1198 + "x": 152.16666666666674, + "y": 1298 }, { - "x": 137, - "y": 1528 + "x": 152.16666666666674, + "y": 1628 } ], "animated": false, @@ -3106,12 +3146,12 @@ "labelPercentage": 0, "route": [ { - "x": 150.33333333333326, - "y": 1594 + "x": 165.5, + "y": 1694 }, { - "x": 150.33333333333326, - "y": 2420 + "x": 165.5, + "y": 2520 } ], "animated": false, @@ -3146,20 +3186,28 @@ "labelPercentage": 0, "route": [ { - "x": 102.33333333333326, - "y": 2486 + "x": 117.5, + "y": 2586 }, { - "x": 102.33333333333326, - "y": 3022 + "x": 117.5, + "y": 2626 }, { - "x": 104.33333333333326, - "y": 3022 + "x": 116.5, + "y": 2626 }, { - "x": 104.33333333333326, - "y": 3212 + "x": 116.5, + "y": 3222 + }, + { + "x": 117.5, + "y": 3222 + }, + { + "x": 117.5, + "y": 3362 } ], "animated": false, @@ -3194,12 +3242,12 @@ "labelPercentage": 0, "route": [ { - "x": 305.33333333333326, - "y": 1198 + "x": 290.5, + "y": 1298 }, { - "x": 305.33333333333326, - "y": 1528 + "x": 290.5, + "y": 1628 } ], "animated": false, @@ -3234,20 +3282,12 @@ "labelPercentage": 0, "route": [ { - "x": 292, - "y": 1594 + "x": 277.16666666666674, + "y": 1694 }, { - "x": 292, - "y": 1634 - }, - { - "x": 232, - "y": 1634 - }, - { - "x": 232, - "y": 1874 + "x": 277.1666666666665, + "y": 1974 } ], "animated": false, @@ -3282,12 +3322,12 @@ "labelPercentage": 0, "route": [ { - "x": 245.33333333333326, - "y": 1940 + "x": 290.4999999999998, + "y": 2040 }, { - "x": 245.33333333333326, - "y": 2916 + "x": 290.5, + "y": 3116 } ], "animated": false, @@ -3322,12 +3362,12 @@ "labelPercentage": 0, "route": [ { - "x": 531.6666666666666, + "x": 605.1666666666666, "y": 360 }, { - "x": 531.6666666666666, - "y": 640 + "x": 605.1666666666666, + "y": 590 } ], "animated": false, @@ -3362,12 +3402,12 @@ "labelPercentage": 0, "route": [ { - "x": 531.6666666666666, - "y": 706 + "x": 605.1666666666666, + "y": 656 }, { - "x": 531.6666666666665, - "y": 1874 + "x": 605.1666666666666, + "y": 1974 } ], "animated": false, @@ -3402,12 +3442,12 @@ "labelPercentage": 0, "route": [ { - "x": 518.3333333333331, - "y": 1940 + "x": 591.8333333333333, + "y": 2040 }, { - "x": 518.3333333333331, - "y": 2420 + "x": 591.8333333333333, + "y": 2520 } ], "animated": false, @@ -3442,12 +3482,20 @@ "labelPercentage": 0, "route": [ { - "x": 518.3333333333331, - "y": 2486 + "x": 591.8333333333333, + "y": 2586 }, { - "x": 518.3333333333333, - "y": 2916 + "x": 591.8333333333333, + "y": 2676 + }, + { + "x": 629.3690476190477, + "y": 2676 + }, + { + "x": 629.3690476190477, + "y": 3116 } ], "animated": false, @@ -3482,20 +3530,20 @@ "labelPercentage": 0, "route": [ { - "x": 1346.2142857142856, - "y": 852 + "x": 1605.8333333333333, + "y": 902 }, { - "x": 1346.2142857142856, - "y": 1092 + "x": 1605.8333333333333, + "y": 1142 }, { - "x": 1205.7142857142856, - "y": 1092 + "x": 1505.5833333333333, + "y": 1142 }, { - "x": 1205.7142857142856, - "y": 1132 + "x": 1505.5833333333333, + "y": 1232 } ], "animated": false, @@ -3530,20 +3578,20 @@ "labelPercentage": 0, "route": [ { - "x": 1219.047619047619, - "y": 1198 + "x": 1518.9166666666667, + "y": 1298 }, { - "x": 1219.047619047619, - "y": 1238 + "x": 1518.9166666666667, + "y": 1338 }, { - "x": 1374.8809523809523, - "y": 1238 + "x": 1696.6666666666665, + "y": 1338 }, { - "x": 1374.8809523809523, - "y": 1528 + "x": 1696.6666666666665, + "y": 1628 } ], "animated": false, @@ -3578,20 +3626,12 @@ "labelPercentage": 0, "route": [ { - "x": 1430.8809523809523, - "y": 1594 + "x": 1752.6666666666665, + "y": 1694 }, { - "x": 1430.8809523809523, - "y": 1634 - }, - { - "x": 1428.8809523809523, - "y": 1634 - }, - { - "x": 1428.8809523809523, - "y": 1874 + "x": 1752.6666666666665, + "y": 1974 } ], "animated": false, @@ -3626,20 +3666,20 @@ "labelPercentage": 0, "route": [ { - "x": 1398.8809523809523, - "y": 1940 + "x": 1722.6666666666665, + "y": 2040 }, { - "x": 1398.8809523809523, - "y": 1980 + "x": 1722.6666666666665, + "y": 2430 }, { - "x": 1384.8809523809523, - "y": 1980 + "x": 1618.4166666666667, + "y": 2430 }, { - "x": 1384.8809523809523, - "y": 2916 + "x": 1618.4166666666667, + "y": 3116 } ], "animated": false, @@ -3674,20 +3714,20 @@ "labelPercentage": 0, "route": [ { - "x": 1408.8809523809523, - "y": 2982 + "x": 1642.4166666666667, + "y": 3182 }, { - "x": 1408.8809523809523, - "y": 3022 + "x": 1642.4166666666667, + "y": 3222 }, { - "x": 1432.2142857142856, - "y": 3022 + "x": 1751.1666666666667, + "y": 3222 }, { - "x": 1432.2142857142856, - "y": 3212 + "x": 1751.1666666666667, + "y": 3362 } ], "animated": false, @@ -3722,20 +3762,20 @@ "labelPercentage": 0, "route": [ { - "x": 1445.547619047619, - "y": 3278 + "x": 1764.5, + "y": 3428 }, { - "x": 1445.547619047619, - "y": 3318 + "x": 1764.5, + "y": 3468 }, { - "x": 1397.452380952381, - "y": 3318 + "x": 1652.2857142857142, + "y": 3468 }, { - "x": 1397.452380952381, - "y": 3458 + "x": 1652.2857142857142, + "y": 3708 } ], "animated": false, @@ -3770,11 +3810,11 @@ "labelPercentage": 0, "route": [ { - "x": 1366.3809523809523, + "x": 1117.702380952381, "y": 78 }, { - "x": 1366.3809523809523, + "x": 1117.702380952381, "y": 148 } ], @@ -3810,11 +3850,19 @@ "labelPercentage": 0, "route": [ { - "x": 1379.7142857142856, + "x": 1131.0357142857142, "y": 214 }, { - "x": 1379.7142857142856, + "x": 1131.0357142857142, + "y": 254 + }, + { + "x": 1465.6666666666665, + "y": 254 + }, + { + "x": 1465.6666666666665, "y": 294 } ], @@ -3850,20 +3898,20 @@ "labelPercentage": 0, "route": [ { - "x": 1366.3809523809523, + "x": 1452.3333333333333, "y": 360 }, { - "x": 1366.3809523809523, + "x": 1452.3333333333333, "y": 500 }, { - "x": 969, + "x": 970.6428571428571, "y": 500 }, { - "x": 969, - "y": 640 + "x": 970.6428571428571, + "y": 590 } ], "animated": false, @@ -3898,19 +3946,19 @@ "labelPercentage": 0, "route": [ { - "x": 939, - "y": 640 + "x": 940.6428571428571, + "y": 590 }, { - "x": 939, + "x": 940.6428571428571, "y": 450 }, { - "x": 1247.7142857142856, + "x": 1045.702380952381, "y": 450 }, { - "x": 1247.7142857142856, + "x": 1045.702380952381, "y": 360 } ], @@ -3946,20 +3994,20 @@ "labelPercentage": 0, "route": [ { - "x": 1271.7142857142856, + "x": 1069.702380952381, "y": 360 }, { - "x": 1271.7142857142856, + "x": 1069.702380952381, "y": 550 }, { - "x": 1009, + "x": 1271.4761904761904, "y": 550 }, { - "x": 1009, - "y": 1132 + "x": 1271.4761904761904, + "y": 1232 } ], "animated": false, @@ -3994,20 +4042,28 @@ "labelPercentage": 0, "route": [ { - "x": 1094.7142857142856, - "y": 1198 + "x": 1357.1904761904761, + "y": 1298 }, { - "x": 1094.7142857142856, - "y": 2180 + "x": 1357.1904761904761, + "y": 1588 }, { - "x": 885.7142857142857, - "y": 2180 + "x": 1301.1666666666667, + "y": 1588 }, { - "x": 885.7142857142857, - "y": 2420 + "x": 1301.1666666666667, + "y": 2280 + }, + { + "x": 1313.4166666666667, + "y": 2280 + }, + { + "x": 1313.4166666666667, + "y": 2520 } ], "animated": false, @@ -4042,19 +4098,19 @@ "labelPercentage": 0, "route": [ { - "x": 1353.047619047619, + "x": 1104.3690476190477, "y": 214 }, { - "x": 1353.047619047619, + "x": 1104.3690476190477, "y": 254 }, { - "x": 1259.7142857142856, + "x": 1057.702380952381, "y": 254 }, { - "x": 1259.7142857142856, + "x": 1057.702380952381, "y": 294 } ], @@ -4090,20 +4146,20 @@ "labelPercentage": 0, "route": [ { - "x": 1223.7142857142856, + "x": 1021.702380952381, "y": 360 }, { - "x": 1223.7142857142856, + "x": 1021.702380952381, "y": 400 }, { - "x": 909, + "x": 910.6428571428571, "y": 400 }, { - "x": 909, - "y": 640 + "x": 910.6428571428571, + "y": 590 } ], "animated": false, @@ -4138,28 +4194,28 @@ "labelPercentage": 0, "route": [ { - "x": 919, - "y": 706 + "x": 920.6428571428571, + "y": 656 }, { - "x": 919, - "y": 746 + "x": 920.6428571428571, + "y": 796 }, { - "x": 775, - "y": 746 + "x": 833.6428571428572, + "y": 796 }, { - "x": 775, - "y": 1288 + "x": 833.6428571428572, + "y": 1388 }, { - "x": 771.6666666666666, - "y": 1288 + "x": 929.1666666666667, + "y": 1388 }, { - "x": 771.6666666666666, - "y": 1528 + "x": 929.1666666666667, + "y": 1628 } ], "animated": false, @@ -4194,20 +4250,20 @@ "labelPercentage": 0, "route": [ { - "x": 1393.047619047619, + "x": 1479, "y": 360 }, { - "x": 1393.047619047619, - "y": 600 + "x": 1479, + "y": 550 }, { - "x": 1245.7142857142856, - "y": 600 + "x": 1465.3333333333333, + "y": 550 }, { - "x": 1245.7142857142856, - "y": 786 + "x": 1465.3333333333333, + "y": 836 } ], "animated": false, @@ -4242,20 +4298,20 @@ "labelPercentage": 0, "route": [ { - "x": 1225.7142857142856, - "y": 852 + "x": 1445.3333333333333, + "y": 902 }, { - "x": 1225.7142857142856, - "y": 992 + "x": 1445.3333333333333, + "y": 1042 }, { - "x": 1049, - "y": 992 + "x": 1311.4761904761904, + "y": 1042 }, { - "x": 1049, - "y": 1132 + "x": 1311.4761904761904, + "y": 1232 } ], "animated": false, @@ -4290,20 +4346,20 @@ "labelPercentage": 0, "route": [ { - "x": 991.8571428571428, - "y": 1198 + "x": 1254.3333333333335, + "y": 1298 }, { - "x": 991.8571428571428, - "y": 1388 + "x": 1254.3333333333335, + "y": 1438 }, { - "x": 964.7142857142857, - "y": 1388 + "x": 1141.1666666666667, + "y": 1438 }, { - "x": 964.7142857142857, - "y": 1528 + "x": 1141.1666666666667, + "y": 1628 } ], "animated": false, @@ -4338,20 +4394,20 @@ "labelPercentage": 0, "route": [ { - "x": 1018.047619047619, - "y": 1594 + "x": 1194.5, + "y": 1694 }, { - "x": 1018.047619047619, - "y": 1684 + "x": 1194.5, + "y": 1784 }, { - "x": 1139.047619047619, - "y": 1684 + "x": 1438.9166666666665, + "y": 1784 }, { - "x": 1139.047619047619, - "y": 1874 + "x": 1438.9166666666665, + "y": 1974 } ], "animated": false, @@ -4386,20 +4442,20 @@ "labelPercentage": 0, "route": [ { - "x": 1205.7142857142856, - "y": 1940 + "x": 1505.5833333333333, + "y": 2040 }, { - "x": 1205.7142857142856, - "y": 2230 + "x": 1505.5833333333333, + "y": 2280 }, { - "x": 917.7142857142857, - "y": 2230 + "x": 1345.4166666666667, + "y": 2280 }, { - "x": 917.7142857142857, - "y": 2420 + "x": 1345.4166666666667, + "y": 2520 } ], "animated": false, @@ -4434,20 +4490,20 @@ "labelPercentage": 0, "route": [ { - "x": 839.3333333333333, - "y": 852 + "x": 1071.8095238095239, + "y": 902 }, { - "x": 839.3333333333333, - "y": 892 + "x": 1071.8095238095239, + "y": 942 }, { - "x": 969, - "y": 892 + "x": 1231.4761904761904, + "y": 942 }, { - "x": 969, - "y": 1132 + "x": 1231.4761904761904, + "y": 1232 } ], "animated": false, @@ -4482,20 +4538,20 @@ "labelPercentage": 0, "route": [ { - "x": 1026.142857142857, - "y": 1198 + "x": 1288.6190476190477, + "y": 1298 }, { - "x": 1026.142857142857, - "y": 1438 + "x": 1288.6190476190477, + "y": 1488 }, { - "x": 1004.7142857142857, - "y": 1438 + "x": 1181.1666666666667, + "y": 1488 }, { - "x": 1004.7142857142857, - "y": 1528 + "x": 1181.1666666666667, + "y": 1628 } ], "animated": false, @@ -4530,28 +4586,28 @@ "labelPercentage": 0, "route": [ { - "x": 918.047619047619, - "y": 1594 + "x": 1094.5, + "y": 1694 }, { - "x": 918.047619047619, - "y": 1684 + "x": 1094.5, + "y": 1784 }, { - "x": 680.6666666666666, - "y": 1684 + "x": 797, + "y": 1784 }, { - "x": 680.6666666666666, - "y": 2030 + "x": 797, + "y": 2130 }, { - "x": 658.3333333333333, - "y": 2030 + "x": 785.8333333333334, + "y": 2130 }, { - "x": 658.3333333333333, - "y": 2420 + "x": 785.8333333333334, + "y": 2520 } ], "animated": false, @@ -4586,20 +4642,28 @@ "labelPercentage": 0, "route": [ { - "x": 1295.7142857142856, + "x": 1093.702380952381, "y": 360 }, { - "x": 1295.7142857142856, - "y": 1042 + "x": 1093.702380952381, + "y": 400 }, { - "x": 1089, - "y": 1042 + "x": 1545.3333333333333, + "y": 400 }, { - "x": 1089, - "y": 1132 + "x": 1545.3333333333333, + "y": 1092 + }, + { + "x": 1351.4761904761904, + "y": 1092 + }, + { + "x": 1351.4761904761904, + "y": 1232 } ], "animated": false, @@ -4634,20 +4698,20 @@ "labelPercentage": 0, "route": [ { - "x": 957.5714285714284, - "y": 1198 + "x": 1220.047619047619, + "y": 1298 }, { - "x": 957.5714285714284, - "y": 1338 + "x": 1220.047619047619, + "y": 1388 }, { - "x": 831.6666666666666, - "y": 1338 + "x": 989.1666666666667, + "y": 1388 }, { - "x": 831.6666666666666, - "y": 1528 + "x": 989.1666666666667, + "y": 1628 } ], "animated": false, @@ -4682,20 +4746,20 @@ "labelPercentage": 0, "route": [ { - "x": 801.6666666666666, - "y": 1594 + "x": 959.1666666666667, + "y": 1694 }, { - "x": 801.6666666666666, - "y": 2826 + "x": 959.1666666666667, + "y": 3026 }, { - "x": 658.3333333333333, - "y": 2826 + "x": 769.3690476190477, + "y": 3026 }, { - "x": 658.3333333333333, - "y": 2916 + "x": 769.3690476190477, + "y": 3116 } ], "animated": false, @@ -4730,12 +4794,20 @@ "labelPercentage": 0, "route": [ { - "x": 525.3333333333333, - "y": 2982 + "x": 636.3690476190477, + "y": 3182 }, { - "x": 525.3333333333333, - "y": 3212 + "x": 636.3690476190477, + "y": 3272 + }, + { + "x": 684.3690476190476, + "y": 3272 + }, + { + "x": 684.3690476190476, + "y": 3362 } ], "animated": false, @@ -4770,12 +4842,20 @@ "labelPercentage": 0, "route": [ { - "x": 501.33333333333326, - "y": 3278 + "x": 660.3690476190476, + "y": 3428 }, { - "x": 501.33333333333326, - "y": 3458 + "x": 660.3690476190476, + "y": 3468 + }, + { + "x": 622.0357142857142, + "y": 3468 + }, + { + "x": 622.0357142857142, + "y": 3708 } ], "animated": false, @@ -4810,20 +4890,20 @@ "labelPercentage": 0, "route": [ { - "x": 428.33333333333326, - "y": 706 + "x": 471.83333333333326, + "y": 656 }, { - "x": 428.33333333333326, - "y": 746 + "x": 471.83333333333326, + "y": 696 }, { - "x": 441.6666666666665, - "y": 746 + "x": 485.1666666666665, + "y": 696 }, { - "x": 441.6666666666665, - "y": 786 + "x": 485.1666666666665, + "y": 836 } ], "animated": false, @@ -4858,28 +4938,28 @@ "labelPercentage": 0, "route": [ { - "x": 393.6666666666665, - "y": 852 + "x": 437.1666666666665, + "y": 902 }, { - "x": 393.6666666666665, - "y": 892 + "x": 437.1666666666665, + "y": 942 }, { - "x": 355.33333333333326, - "y": 892 + "x": 430.5, + "y": 942 }, { - "x": 355.33333333333326, - "y": 3122 + "x": 430.5, + "y": 3222 }, { - "x": 313.33333333333326, - "y": 3122 + "x": 419.3690476190475, + "y": 3222 }, { - "x": 313.33333333333326, - "y": 3212 + "x": 419.3690476190475, + "y": 3362 } ], "animated": false, @@ -4915,11 +4995,11 @@ "route": [ { "x": 44.5, - "y": 1594 + "y": 1694 }, { "x": 44.5, - "y": 1874 + "y": 1974 } ], "animated": false, @@ -4954,20 +5034,28 @@ "labelPercentage": 0, "route": [ { - "x": 318.66666666666663, - "y": 1594 + "x": 303.83333333333326, + "y": 1694 }, { - "x": 318.66666666666663, - "y": 2526 + "x": 303.83333333333326, + "y": 1734 }, { - "x": 278.6666666666665, - "y": 2526 + "x": 357.1666666666665, + "y": 1734 }, { - "x": 278.6666666666665, - "y": 2916 + "x": 357.1666666666665, + "y": 2626 + }, + { + "x": 323.83333333333326, + "y": 2626 + }, + { + "x": 323.83333333333326, + "y": 3116 } ], "animated": false, @@ -5002,20 +5090,20 @@ "labelPercentage": 0, "route": [ { - "x": 305.33333333333326, - "y": 2982 + "x": 350.5, + "y": 3182 }, { - "x": 305.33333333333326, - "y": 3072 + "x": 350.5, + "y": 3322 }, { - "x": 493.33333333333326, - "y": 3072 + "x": 652.3690476190476, + "y": 3322 }, { - "x": 493.33333333333326, - "y": 3212 + "x": 652.3690476190476, + "y": 3362 } ], "animated": false, @@ -5050,20 +5138,20 @@ "labelPercentage": 0, "route": [ { - "x": 541.3333333333333, - "y": 3278 + "x": 700.3690476190476, + "y": 3428 }, { - "x": 541.3333333333333, - "y": 3318 + "x": 700.3690476190476, + "y": 3518 }, { - "x": 534.6666666666665, - "y": 3318 + "x": 655.3690476190475, + "y": 3518 }, { - "x": 534.6666666666665, - "y": 3458 + "x": 655.3690476190475, + "y": 3708 } ], "animated": false, @@ -5098,20 +5186,20 @@ "labelPercentage": 0, "route": [ { - "x": 123.66666666666674, - "y": 1594 + "x": 138.83333333333348, + "y": 1694 }, { - "x": 123.66666666666674, - "y": 1634 + "x": 138.83333333333348, + "y": 1734 }, { "x": 71.16666666666652, - "y": 1634 + "y": 1734 }, { "x": 71.16666666666652, - "y": 1874 + "y": 1974 } ], "animated": false, @@ -5147,19 +5235,19 @@ "route": [ { "x": 71.16666666666652, - "y": 1940 + "y": 2040 }, { "x": 71.16666666666652, - "y": 1980 + "y": 2080 }, { - "x": 110.33333333333326, - "y": 1980 + "x": 125.5, + "y": 2080 }, { - "x": 110.33333333333326, - "y": 2420 + "x": 125.5, + "y": 2520 } ], "animated": false, @@ -5194,12 +5282,20 @@ "labelPercentage": 0, "route": [ { - "x": 134.33333333333326, - "y": 2486 + "x": 149.5, + "y": 2586 }, { - "x": 134.33333333333326, - "y": 3212 + "x": 149.5, + "y": 3222 + }, + { + "x": 147.5, + "y": 3222 + }, + { + "x": 147.5, + "y": 3362 } ], "animated": false, @@ -5234,12 +5330,20 @@ "labelPercentage": 0, "route": [ { - "x": 114.33333333333326, - "y": 3278 + "x": 127.5, + "y": 3428 }, { - "x": 114.33333333333326, - "y": 3458 + "x": 127.5, + "y": 3468 + }, + { + "x": 102, + "y": 3468 + }, + { + "x": 102, + "y": 3708 } ], "animated": false, @@ -5274,20 +5378,20 @@ "labelPercentage": 0, "route": [ { - "x": 959, - "y": 706 + "x": 960.6428571428571, + "y": 656 }, { - "x": 959, - "y": 746 + "x": 960.6428571428571, + "y": 696 }, { - "x": 1205.7142857142856, - "y": 746 + "x": 1425.3333333333333, + "y": 696 }, { - "x": 1205.7142857142856, - "y": 786 + "x": 1425.3333333333333, + "y": 836 } ], "animated": false, @@ -5322,20 +5426,20 @@ "labelPercentage": 0, "route": [ { - "x": 1195.7142857142856, - "y": 852 + "x": 1415.3333333333333, + "y": 902 }, { - "x": 1195.7142857142856, - "y": 942 + "x": 1415.3333333333333, + "y": 992 }, { - "x": 801.6666666666666, - "y": 942 + "x": 959.1666666666667, + "y": 992 }, { - "x": 801.6666666666666, - "y": 1528 + "x": 959.1666666666667, + "y": 1628 } ], "animated": false, @@ -5370,28 +5474,28 @@ "labelPercentage": 0, "route": [ { - "x": 831.6666666666666, - "y": 1594 + "x": 989.1666666666667, + "y": 1694 }, { - "x": 831.6666666666666, - "y": 1834 + "x": 989.1666666666667, + "y": 1934 }, { - "x": 1357.8809523809523, - "y": 1834 + "x": 1651.6666666666665, + "y": 1934 }, { - "x": 1357.8809523809523, - "y": 2330 + "x": 1651.6666666666665, + "y": 2380 }, { - "x": 981.7142857142857, - "y": 2330 + "x": 1409.4166666666667, + "y": 2380 }, { - "x": 981.7142857142857, - "y": 2420 + "x": 1409.4166666666667, + "y": 2520 } ], "animated": false, @@ -5426,12 +5530,28 @@ "labelPercentage": 0, "route": [ { - "x": 1255.7142857142856, - "y": 852 + "x": 1475.3333333333333, + "y": 902 }, { - "x": 1255.7142857142856, - "y": 1528 + "x": 1475.3333333333333, + "y": 1192 + }, + { + "x": 1585.5833333333333, + "y": 1192 + }, + { + "x": 1585.5833333333333, + "y": 1388 + }, + { + "x": 1558.9166666666667, + "y": 1388 + }, + { + "x": 1558.9166666666667, + "y": 1628 } ], "animated": false, @@ -5466,12 +5586,20 @@ "labelPercentage": 0, "route": [ { - "x": 1205.7142857142856, - "y": 1594 + "x": 1508.9166666666667, + "y": 1694 }, { - "x": 1205.7142857142856, - "y": 1874 + "x": 1508.9166666666667, + "y": 1884 + }, + { + "x": 1505.5833333333333, + "y": 1884 + }, + { + "x": 1505.5833333333333, + "y": 1974 } ], "animated": false, @@ -5506,20 +5634,20 @@ "labelPercentage": 0, "route": [ { - "x": 1239.047619047619, - "y": 1940 + "x": 1538.9166666666665, + "y": 2040 }, { - "x": 1239.047619047619, - "y": 2280 + "x": 1538.9166666666665, + "y": 2330 }, { - "x": 949.7142857142857, - "y": 2280 + "x": 1377.4166666666667, + "y": 2330 }, { - "x": 949.7142857142857, - "y": 2420 + "x": 1377.4166666666667, + "y": 2520 } ], "animated": false, @@ -5554,20 +5682,20 @@ "labelPercentage": 0, "route": [ { - "x": 457.6666666666665, - "y": 852 + "x": 501.1666666666665, + "y": 902 }, { - "x": 457.6666666666665, - "y": 2526 + "x": 501.1666666666665, + "y": 2726 }, { - "x": 483.33333333333326, - "y": 2526 + "x": 594.3690476190477, + "y": 2726 }, { - "x": 483.33333333333326, - "y": 2916 + "x": 594.3690476190477, + "y": 3116 } ], "animated": false, @@ -5602,20 +5730,20 @@ "labelPercentage": 0, "route": [ { - "x": 1060.4285714285713, - "y": 1198 + "x": 1322.904761904762, + "y": 1298 }, { - "x": 1060.4285714285713, - "y": 1488 + "x": 1322.904761904762, + "y": 1538 }, { - "x": 1044.7142857142858, - "y": 1488 + "x": 1221.1666666666667, + "y": 1538 }, { - "x": 1044.7142857142858, - "y": 1528 + "x": 1221.1666666666667, + "y": 1628 } ], "animated": false, @@ -5650,20 +5778,20 @@ "labelPercentage": 0, "route": [ { - "x": 951.3809523809523, - "y": 1594 + "x": 1127.8333333333335, + "y": 1694 }, { - "x": 951.3809523809523, - "y": 1734 + "x": 1127.8333333333335, + "y": 1834 }, { - "x": 691.6666666666666, - "y": 1734 + "x": 819.1666666666667, + "y": 1834 }, { - "x": 691.6666666666666, - "y": 2420 + "x": 819.1666666666667, + "y": 2520 } ], "animated": false, @@ -5698,20 +5826,20 @@ "labelPercentage": 0, "route": [ { - "x": 725, - "y": 2486 + "x": 852.5, + "y": 2586 }, { - "x": 725, - "y": 2776 + "x": 852.5, + "y": 2976 }, { - "x": 623.3333333333333, - "y": 2776 + "x": 734.3690476190477, + "y": 2976 }, { - "x": 623.3333333333333, - "y": 2916 + "x": 734.3690476190477, + "y": 3116 } ], "animated": false, @@ -5746,20 +5874,20 @@ "labelPercentage": 0, "route": [ { - "x": 1192.3809523809523, - "y": 1198 + "x": 1492.25, + "y": 1298 }, { - "x": 1192.3809523809523, - "y": 1288 + "x": 1492.25, + "y": 1388 }, { - "x": 1215.7142857142856, - "y": 1288 + "x": 1518.9166666666667, + "y": 1388 }, { - "x": 1215.7142857142856, - "y": 1528 + "x": 1518.9166666666667, + "y": 1628 } ], "animated": false, @@ -5794,20 +5922,12 @@ "labelPercentage": 0, "route": [ { - "x": 1235.7142857142856, - "y": 1594 + "x": 1538.9166666666667, + "y": 1694 }, { - "x": 1235.7142857142856, - "y": 1784 - }, - { - "x": 1239.047619047619, - "y": 1784 - }, - { - "x": 1239.047619047619, - "y": 1874 + "x": 1538.9166666666665, + "y": 1974 } ], "animated": false, @@ -5842,28 +5962,28 @@ "labelPercentage": 0, "route": [ { - "x": 1139.047619047619, - "y": 1940 + "x": 1438.9166666666665, + "y": 2040 }, { - "x": 1139.047619047619, - "y": 2080 + "x": 1438.9166666666665, + "y": 2180 }, { - "x": 831.7142857142857, - "y": 2080 + "x": 1116.9166666666667, + "y": 2180 }, { - "x": 831.7142857142857, - "y": 3418 + "x": 1116.9166666666667, + "y": 3668 }, { - "x": 1226.0238095238094, - "y": 3418 + "x": 1480.857142857143, + "y": 3668 }, { - "x": 1226.0238095238094, - "y": 3458 + "x": 1480.857142857143, + "y": 3708 } ], "animated": false, @@ -5898,20 +6018,20 @@ "labelPercentage": 0, "route": [ { - "x": 1051.3809523809523, - "y": 1594 + "x": 1227.8333333333333, + "y": 1694 }, { - "x": 1051.3809523809523, - "y": 1634 + "x": 1227.8333333333333, + "y": 1734 }, { - "x": 1172.3809523809523, - "y": 1634 + "x": 1472.25, + "y": 1734 }, { - "x": 1172.3809523809523, - "y": 1874 + "x": 1472.25, + "y": 1974 } ], "animated": false, @@ -5946,28 +6066,28 @@ "labelPercentage": 0, "route": [ { - "x": 1172.3809523809523, - "y": 1940 + "x": 1472.25, + "y": 2040 }, { - "x": 1172.3809523809523, - "y": 2130 + "x": 1472.25, + "y": 2230 }, { - "x": 842.7142857142857, - "y": 2130 + "x": 1139.5595238095239, + "y": 2230 }, { - "x": 842.7142857142857, - "y": 3368 + "x": 1139.5595238095239, + "y": 3618 }, { - "x": 1260.3095238095239, - "y": 3368 + "x": 1515.142857142857, + "y": 3618 }, { - "x": 1260.3095238095239, - "y": 3458 + "x": 1515.142857142857, + "y": 3708 } ], "animated": false, @@ -6002,20 +6122,20 @@ "labelPercentage": 0, "route": [ { - "x": 1462.8809523809523, - "y": 1594 + "x": 1784.6666666666665, + "y": 1694 }, { - "x": 1462.8809523809523, - "y": 1634 + "x": 1784.6666666666665, + "y": 1734 }, { - "x": 1458.8809523809523, - "y": 1634 + "x": 1782.6666666666665, + "y": 1734 }, { - "x": 1458.8809523809523, - "y": 1874 + "x": 1782.6666666666665, + "y": 1974 } ], "animated": false, @@ -6050,20 +6170,20 @@ "labelPercentage": 0, "route": [ { - "x": 1428.8809523809523, - "y": 1940 + "x": 1752.6666666666665, + "y": 2040 }, { - "x": 1428.8809523809523, - "y": 2526 + "x": 1752.6666666666665, + "y": 2626 }, { - "x": 1416.8809523809523, - "y": 2526 + "x": 1650.4166666666667, + "y": 2626 }, { - "x": 1416.8809523809523, - "y": 2916 + "x": 1650.4166666666667, + "y": 3116 } ], "animated": false, @@ -6099,19 +6219,19 @@ "route": [ { "x": 44.5, - "y": 1940 + "y": 2040 }, { "x": 44.5, - "y": 3318 + "y": 3468 }, { - "x": 84.33333333333326, - "y": 3318 + "x": 72, + "y": 3468 }, { - "x": 84.33333333333326, - "y": 3458 + "x": 72, + "y": 3708 } ], "animated": false, @@ -6146,20 +6266,20 @@ "labelPercentage": 0, "route": [ { - "x": 218.66666666666674, - "y": 1940 + "x": 263.83333333333326, + "y": 2040 }, { - "x": 218.66666666666674, - "y": 1980 + "x": 263.83333333333326, + "y": 2080 }, { - "x": 190.33333333333326, - "y": 1980 + "x": 205.5, + "y": 2080 }, { - "x": 190.33333333333326, - "y": 2420 + "x": 205.5, + "y": 2520 } ], "animated": false, @@ -6194,20 +6314,20 @@ "labelPercentage": 0, "route": [ { - "x": 166.33333333333326, - "y": 2486 + "x": 181.5, + "y": 2586 }, { - "x": 166.33333333333326, - "y": 2576 + "x": 181.5, + "y": 2676 }, { - "x": 178.66666666666652, - "y": 2576 + "x": 223.83333333333326, + "y": 2676 }, { - "x": 178.66666666666652, - "y": 2916 + "x": 223.83333333333326, + "y": 3116 } ], "animated": false, @@ -6242,20 +6362,20 @@ "labelPercentage": 0, "route": [ { - "x": 1004.7142857142857, - "y": 1940 + "x": 1181.1666666666667, + "y": 2040 }, { - "x": 1004.7142857142857, - "y": 2030 + "x": 1181.1666666666667, + "y": 2130 }, { - "x": 758.3333333333333, - "y": 2030 + "x": 885.8333333333334, + "y": 2130 }, { - "x": 758.3333333333333, - "y": 2420 + "x": 885.8333333333334, + "y": 2520 } ], "animated": false, @@ -6290,28 +6410,28 @@ "labelPercentage": 0, "route": [ { - "x": 625, - "y": 2486 + "x": 752.5000000000001, + "y": 2586 }, { - "x": 625, - "y": 2626 + "x": 752.5000000000001, + "y": 2826 }, { - "x": 366.33333333333326, - "y": 2626 + "x": 452, + "y": 2826 }, { - "x": 366.33333333333326, - "y": 3172 + "x": 452, + "y": 3272 }, { - "x": 345.33333333333326, - "y": 3172 + "x": 451.3690476190475, + "y": 3272 }, { - "x": 345.33333333333326, - "y": 3212 + "x": 451.3690476190475, + "y": 3362 } ], "animated": false, @@ -6346,20 +6466,20 @@ "labelPercentage": 0, "route": [ { - "x": 198.33333333333326, - "y": 2486 + "x": 213.5, + "y": 2586 }, { - "x": 198.33333333333326, - "y": 2526 + "x": 213.5, + "y": 2626 }, { - "x": 212, - "y": 2526 + "x": 257.16666666666674, + "y": 2626 }, { - "x": 212, - "y": 2916 + "x": 257.16666666666674, + "y": 3116 } ], "animated": false, @@ -6394,20 +6514,20 @@ "labelPercentage": 0, "route": [ { - "x": 185.33333333333326, - "y": 2982 + "x": 230.5, + "y": 3182 }, { - "x": 185.33333333333326, - "y": 3022 + "x": 230.5, + "y": 3222 }, { - "x": 164.33333333333326, - "y": 3022 + "x": 177.5, + "y": 3222 }, { - "x": 164.33333333333326, - "y": 3212 + "x": 177.5, + "y": 3362 } ], "animated": false, @@ -6442,20 +6562,20 @@ "labelPercentage": 0, "route": [ { - "x": 154.33333333333326, - "y": 3278 + "x": 167.5, + "y": 3428 }, { - "x": 154.33333333333326, - "y": 3318 + "x": 167.5, + "y": 3518 }, { - "x": 144.33333333333326, - "y": 3318 + "x": 132, + "y": 3518 }, { - "x": 144.33333333333326, - "y": 3458 + "x": 132, + "y": 3708 } ], "animated": false, @@ -6490,12 +6610,12 @@ "labelPercentage": 0, "route": [ { - "x": 544.9999999999999, - "y": 1940 + "x": 618.5, + "y": 2040 }, { - "x": 544.9999999999999, - "y": 2420 + "x": 618.5, + "y": 2520 } ], "animated": false, @@ -6530,20 +6650,20 @@ "labelPercentage": 0, "route": [ { - "x": 544.9999999999999, - "y": 2486 + "x": 618.5, + "y": 2586 }, { - "x": 544.9999999999999, - "y": 2726 + "x": 618.5, + "y": 2626 }, { - "x": 553.3333333333333, - "y": 2726 + "x": 664.3690476190477, + "y": 2626 }, { - "x": 553.3333333333333, - "y": 2916 + "x": 664.3690476190477, + "y": 3116 } ], "animated": false, @@ -6578,20 +6698,20 @@ "labelPercentage": 0, "route": [ { - "x": 581.3333333333333, - "y": 2982 + "x": 692.3690476190477, + "y": 3182 }, { - "x": 581.3333333333333, - "y": 3022 + "x": 692.3690476190477, + "y": 3222 }, { - "x": 557.3333333333333, - "y": 3022 + "x": 716.3690476190476, + "y": 3222 }, { - "x": 557.3333333333333, - "y": 3212 + "x": 716.3690476190476, + "y": 3362 } ], "animated": false, @@ -6626,20 +6746,20 @@ "labelPercentage": 0, "route": [ { - "x": 1265.7142857142856, - "y": 1594 + "x": 1568.9166666666667, + "y": 1694 }, { - "x": 1265.7142857142856, - "y": 1784 + "x": 1568.9166666666667, + "y": 1884 }, { - "x": 1272.3809523809523, - "y": 1784 + "x": 1572.25, + "y": 1884 }, { - "x": 1272.3809523809523, - "y": 1874 + "x": 1572.25, + "y": 1974 } ], "animated": false, @@ -6674,28 +6794,28 @@ "labelPercentage": 0, "route": [ { - "x": 771.6666666666666, - "y": 1594 + "x": 929.1666666666667, + "y": 1694 }, { - "x": 771.6666666666666, - "y": 1634 + "x": 929.1666666666667, + "y": 1734 }, { - "x": 344.33333333333326, - "y": 1634 + "x": 368.1666666666665, + "y": 1734 }, { - "x": 344.33333333333326, - "y": 2576 + "x": 368.1666666666665, + "y": 2676 }, { - "x": 311.9999999999999, - "y": 2576 + "x": 357.1666666666665, + "y": 2676 }, { - "x": 311.9999999999999, - "y": 2916 + "x": 357.1666666666665, + "y": 3116 } ], "animated": false, @@ -6730,20 +6850,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.33333333333326, - "y": 2982 + "x": 270.5, + "y": 3182 }, { - "x": 225.33333333333326, - "y": 3368 + "x": 270.5, + "y": 3518 }, { - "x": 434.66666666666663, - "y": 3368 + "x": 555.3690476190476, + "y": 3518 }, { - "x": 434.66666666666663, - "y": 3458 + "x": 555.3690476190476, + "y": 3708 } ], "animated": false, @@ -6778,20 +6898,20 @@ "labelPercentage": 0, "route": [ { - "x": 658.3333333333333, - "y": 2486 + "x": 785.8333333333334, + "y": 2586 }, { - "x": 658.3333333333333, - "y": 2676 + "x": 785.8333333333334, + "y": 2876 }, { - "x": 377.33333333333326, - "y": 2676 + "x": 483.3690476190475, + "y": 2876 }, { - "x": 377.33333333333326, - "y": 3212 + "x": 483.3690476190475, + "y": 3362 } ], "animated": false, @@ -6826,12 +6946,20 @@ "labelPercentage": 0, "route": [ { - "x": 1458.8809523809523, - "y": 1940 + "x": 1782.6666666666665, + "y": 2040 }, { - "x": 1458.8809523809523, - "y": 3212 + "x": 1782.6666666666665, + "y": 2080 + }, + { + "x": 1777.8333333333333, + "y": 2080 + }, + { + "x": 1777.8333333333333, + "y": 3362 } ], "animated": false, @@ -6866,20 +6994,28 @@ "labelPercentage": 0, "route": [ { - "x": 265.33333333333326, - "y": 2982 + "x": 310.5, + "y": 3182 }, { - "x": 265.33333333333326, - "y": 3318 + "x": 310.5, + "y": 3222 }, { - "x": 467.9999999999999, - "y": 3318 + "x": 307.16666666666674, + "y": 3222 }, { - "x": 467.9999999999999, - "y": 3458 + "x": 307.16666666666674, + "y": 3468 + }, + { + "x": 588.7023809523808, + "y": 3468 + }, + { + "x": 588.7023809523808, + "y": 3708 } ], "animated": false, @@ -6914,28 +7050,28 @@ "labelPercentage": 0, "route": [ { - "x": 1272.3809523809523, - "y": 1940 + "x": 1572.25, + "y": 2040 }, { - "x": 1272.3809523809523, - "y": 2380 + "x": 1572.25, + "y": 2430 }, { - "x": 1023.7142857142857, - "y": 2380 + "x": 1481.4166666666667, + "y": 2430 }, { - "x": 1023.7142857142857, - "y": 3318 + "x": 1481.4166666666667, + "y": 3568 }, { - "x": 1294.595238095238, - "y": 3318 + "x": 1549.4285714285716, + "y": 3568 }, { - "x": 1294.595238095238, - "y": 3458 + "x": 1549.4285714285716, + "y": 3708 } ], "animated": false, @@ -6970,20 +7106,12 @@ "labelPercentage": 0, "route": [ { - "x": 637.3333333333333, - "y": 2982 + "x": 748.3690476190477, + "y": 3182 }, { - "x": 637.3333333333333, - "y": 3072 - }, - { - "x": 589.3333333333333, - "y": 3072 - }, - { - "x": 589.3333333333333, - "y": 3212 + "x": 748.3690476190476, + "y": 3362 } ], "animated": false, @@ -7018,20 +7146,20 @@ "labelPercentage": 0, "route": [ { - "x": 1368.8809523809523, - "y": 2982 + "x": 1602.4166666666667, + "y": 3182 }, { - "x": 1368.8809523809523, - "y": 3318 + "x": 1602.4166666666667, + "y": 3468 }, { - "x": 1363.1666666666665, - "y": 3318 + "x": 1618, + "y": 3468 }, { - "x": 1363.1666666666665, - "y": 3458 + "x": 1618, + "y": 3708 } ], "animated": false, @@ -7066,20 +7194,20 @@ "labelPercentage": 0, "route": [ { - "x": 581.3333333333333, - "y": 3278 + "x": 740.3690476190476, + "y": 3428 }, { - "x": 581.3333333333333, - "y": 3318 + "x": 740.3690476190476, + "y": 3568 }, { - "x": 567.9999999999999, - "y": 3318 + "x": 688.7023809523808, + "y": 3568 }, { - "x": 567.9999999999999, - "y": 3458 + "x": 688.7023809523808, + "y": 3708 } ], "animated": false, diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 3e1c2b49d..936c4c0be 100644 --- a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - + .d2-4079696995 .fill-N1{fill:#0A0F25;} + .d2-4079696995 .fill-N2{fill:#676C7E;} + .d2-4079696995 .fill-N3{fill:#9499AB;} + .d2-4079696995 .fill-N4{fill:#CFD2DD;} + .d2-4079696995 .fill-N5{fill:#DEE1EB;} + .d2-4079696995 .fill-N6{fill:#EEF1F8;} + .d2-4079696995 .fill-N7{fill:#FFFFFF;} + .d2-4079696995 .fill-B1{fill:#0D32B2;} + .d2-4079696995 .fill-B2{fill:#0D32B2;} + .d2-4079696995 .fill-B3{fill:#E3E9FD;} + .d2-4079696995 .fill-B4{fill:#E3E9FD;} + .d2-4079696995 .fill-B5{fill:#EDF0FD;} + .d2-4079696995 .fill-B6{fill:#F7F8FE;} + .d2-4079696995 .fill-AA2{fill:#4A6FF3;} + .d2-4079696995 .fill-AA4{fill:#EDF0FD;} + .d2-4079696995 .fill-AA5{fill:#F7F8FE;} + .d2-4079696995 .fill-AB4{fill:#EDF0FD;} + .d2-4079696995 .fill-AB5{fill:#F7F8FE;} + .d2-4079696995 .stroke-N1{stroke:#0A0F25;} + .d2-4079696995 .stroke-N2{stroke:#676C7E;} + .d2-4079696995 .stroke-N3{stroke:#9499AB;} + .d2-4079696995 .stroke-N4{stroke:#CFD2DD;} + .d2-4079696995 .stroke-N5{stroke:#DEE1EB;} + .d2-4079696995 .stroke-N6{stroke:#EEF1F8;} + .d2-4079696995 .stroke-N7{stroke:#FFFFFF;} + .d2-4079696995 .stroke-B1{stroke:#0D32B2;} + .d2-4079696995 .stroke-B2{stroke:#0D32B2;} + .d2-4079696995 .stroke-B3{stroke:#E3E9FD;} + .d2-4079696995 .stroke-B4{stroke:#E3E9FD;} + .d2-4079696995 .stroke-B5{stroke:#EDF0FD;} + .d2-4079696995 .stroke-B6{stroke:#F7F8FE;} + .d2-4079696995 .stroke-AA2{stroke:#4A6FF3;} + .d2-4079696995 .stroke-AA4{stroke:#EDF0FD;} + .d2-4079696995 .stroke-AA5{stroke:#F7F8FE;} + .d2-4079696995 .stroke-AB4{stroke:#EDF0FD;} + .d2-4079696995 .stroke-AB5{stroke:#F7F8FE;} + .d2-4079696995 .background-color-N1{background-color:#0A0F25;} + .d2-4079696995 .background-color-N2{background-color:#676C7E;} + .d2-4079696995 .background-color-N3{background-color:#9499AB;} + .d2-4079696995 .background-color-N4{background-color:#CFD2DD;} + .d2-4079696995 .background-color-N5{background-color:#DEE1EB;} + .d2-4079696995 .background-color-N6{background-color:#EEF1F8;} + .d2-4079696995 .background-color-N7{background-color:#FFFFFF;} + .d2-4079696995 .background-color-B1{background-color:#0D32B2;} + .d2-4079696995 .background-color-B2{background-color:#0D32B2;} + .d2-4079696995 .background-color-B3{background-color:#E3E9FD;} + .d2-4079696995 .background-color-B4{background-color:#E3E9FD;} + .d2-4079696995 .background-color-B5{background-color:#EDF0FD;} + .d2-4079696995 .background-color-B6{background-color:#F7F8FE;} + .d2-4079696995 .background-color-AA2{background-color:#4A6FF3;} + .d2-4079696995 .background-color-AA4{background-color:#EDF0FD;} + .d2-4079696995 .background-color-AA5{background-color:#F7F8FE;} + .d2-4079696995 .background-color-AB4{background-color:#EDF0FD;} + .d2-4079696995 .background-color-AB5{background-color:#F7F8FE;} + .d2-4079696995 .color-N1{color:#0A0F25;} + .d2-4079696995 .color-N2{color:#676C7E;} + .d2-4079696995 .color-N3{color:#9499AB;} + .d2-4079696995 .color-N4{color:#CFD2DD;} + .d2-4079696995 .color-N5{color:#DEE1EB;} + .d2-4079696995 .color-N6{color:#EEF1F8;} + .d2-4079696995 .color-N7{color:#FFFFFF;} + .d2-4079696995 .color-B1{color:#0D32B2;} + .d2-4079696995 .color-B2{color:#0D32B2;} + .d2-4079696995 .color-B3{color:#E3E9FD;} + .d2-4079696995 .color-B4{color:#E3E9FD;} + .d2-4079696995 .color-B5{color:#EDF0FD;} + .d2-4079696995 .color-B6{color:#F7F8FE;} + .d2-4079696995 .color-AA2{color:#4A6FF3;} + .d2-4079696995 .color-AA4{color:#EDF0FD;} + .d2-4079696995 .color-AA5{color:#F7F8FE;} + .d2-4079696995 .color-AB4{color:#EDF0FD;} + .d2-4079696995 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json index 35c633a6e..c873f8fed 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json @@ -48,7 +48,7 @@ "id": "b", "type": "cloud", "pos": { - "x": 70, + "x": 39, "y": 213 }, "width": 180, @@ -89,7 +89,7 @@ "id": "b.c", "type": "rectangle", "pos": { - "x": 120, + "x": 89, "y": 263 }, "width": 80, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 133, + "x": 102, "y": 454 }, "width": 54, @@ -327,11 +327,11 @@ "y": 168 }, { - "x": 146.83333333333331, + "x": 115.8333333333333, "y": 168 }, { - "x": 146.83333333333331, + "x": 115.8333333333333, "y": 263 } ], @@ -367,11 +367,11 @@ "labelPercentage": 0, "route": [ { - "x": 160.16666666666666, + "x": 129.16666666666663, "y": 329 }, { - "x": 160.16666666666669, + "x": 129.16666666666663, "y": 454 } ], @@ -415,11 +415,11 @@ "y": 118 }, { - "x": 173.5, + "x": 142.49999999999997, "y": 118 }, { - "x": 173.5, + "x": 142.49999999999997, "y": 263 } ], @@ -459,7 +459,15 @@ "y": 78 }, { - "x": 184, + "x": 183.5, + "y": 118 + }, + { + "x": 152.49999999999997, + "y": 118 + }, + { + "x": 153, "y": 214 } ], @@ -500,14 +508,14 @@ }, { "x": 256, - "y": 118 + "y": 168 }, { - "x": 193.5, - "y": 118 + "x": 162.49999999999997, + "y": 168 }, { - "x": 194, + "x": 163, "y": 219 } ], diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg index bfef834c9..f026c19af 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc + .d2-3828568108 .fill-N1{fill:#0A0F25;} + .d2-3828568108 .fill-N2{fill:#676C7E;} + .d2-3828568108 .fill-N3{fill:#9499AB;} + .d2-3828568108 .fill-N4{fill:#CFD2DD;} + .d2-3828568108 .fill-N5{fill:#DEE1EB;} + .d2-3828568108 .fill-N6{fill:#EEF1F8;} + .d2-3828568108 .fill-N7{fill:#FFFFFF;} + .d2-3828568108 .fill-B1{fill:#0D32B2;} + .d2-3828568108 .fill-B2{fill:#0D32B2;} + .d2-3828568108 .fill-B3{fill:#E3E9FD;} + .d2-3828568108 .fill-B4{fill:#E3E9FD;} + .d2-3828568108 .fill-B5{fill:#EDF0FD;} + .d2-3828568108 .fill-B6{fill:#F7F8FE;} + .d2-3828568108 .fill-AA2{fill:#4A6FF3;} + .d2-3828568108 .fill-AA4{fill:#EDF0FD;} + .d2-3828568108 .fill-AA5{fill:#F7F8FE;} + .d2-3828568108 .fill-AB4{fill:#EDF0FD;} + .d2-3828568108 .fill-AB5{fill:#F7F8FE;} + .d2-3828568108 .stroke-N1{stroke:#0A0F25;} + .d2-3828568108 .stroke-N2{stroke:#676C7E;} + .d2-3828568108 .stroke-N3{stroke:#9499AB;} + .d2-3828568108 .stroke-N4{stroke:#CFD2DD;} + .d2-3828568108 .stroke-N5{stroke:#DEE1EB;} + .d2-3828568108 .stroke-N6{stroke:#EEF1F8;} + .d2-3828568108 .stroke-N7{stroke:#FFFFFF;} + .d2-3828568108 .stroke-B1{stroke:#0D32B2;} + .d2-3828568108 .stroke-B2{stroke:#0D32B2;} + .d2-3828568108 .stroke-B3{stroke:#E3E9FD;} + .d2-3828568108 .stroke-B4{stroke:#E3E9FD;} + .d2-3828568108 .stroke-B5{stroke:#EDF0FD;} + .d2-3828568108 .stroke-B6{stroke:#F7F8FE;} + .d2-3828568108 .stroke-AA2{stroke:#4A6FF3;} + .d2-3828568108 .stroke-AA4{stroke:#EDF0FD;} + .d2-3828568108 .stroke-AA5{stroke:#F7F8FE;} + .d2-3828568108 .stroke-AB4{stroke:#EDF0FD;} + .d2-3828568108 .stroke-AB5{stroke:#F7F8FE;} + .d2-3828568108 .background-color-N1{background-color:#0A0F25;} + .d2-3828568108 .background-color-N2{background-color:#676C7E;} + .d2-3828568108 .background-color-N3{background-color:#9499AB;} + .d2-3828568108 .background-color-N4{background-color:#CFD2DD;} + .d2-3828568108 .background-color-N5{background-color:#DEE1EB;} + .d2-3828568108 .background-color-N6{background-color:#EEF1F8;} + .d2-3828568108 .background-color-N7{background-color:#FFFFFF;} + .d2-3828568108 .background-color-B1{background-color:#0D32B2;} + .d2-3828568108 .background-color-B2{background-color:#0D32B2;} + .d2-3828568108 .background-color-B3{background-color:#E3E9FD;} + .d2-3828568108 .background-color-B4{background-color:#E3E9FD;} + .d2-3828568108 .background-color-B5{background-color:#EDF0FD;} + .d2-3828568108 .background-color-B6{background-color:#F7F8FE;} + .d2-3828568108 .background-color-AA2{background-color:#4A6FF3;} + .d2-3828568108 .background-color-AA4{background-color:#EDF0FD;} + .d2-3828568108 .background-color-AA5{background-color:#F7F8FE;} + .d2-3828568108 .background-color-AB4{background-color:#EDF0FD;} + .d2-3828568108 .background-color-AB5{background-color:#F7F8FE;} + .d2-3828568108 .color-N1{color:#0A0F25;} + .d2-3828568108 .color-N2{color:#676C7E;} + .d2-3828568108 .color-N3{color:#9499AB;} + .d2-3828568108 .color-N4{color:#CFD2DD;} + .d2-3828568108 .color-N5{color:#DEE1EB;} + .d2-3828568108 .color-N6{color:#EEF1F8;} + .d2-3828568108 .color-N7{color:#FFFFFF;} + .d2-3828568108 .color-B1{color:#0D32B2;} + .d2-3828568108 .color-B2{color:#0D32B2;} + .d2-3828568108 .color-B3{color:#E3E9FD;} + .d2-3828568108 .color-B4{color:#E3E9FD;} + .d2-3828568108 .color-B5{color:#EDF0FD;} + .d2-3828568108 .color-B6{color:#F7F8FE;} + .d2-3828568108 .color-AA2{color:#4A6FF3;} + .d2-3828568108 .color-AA4{color:#EDF0FD;} + .d2-3828568108 .color-AA5{color:#F7F8FE;} + .d2-3828568108 .color-AB4{color:#EDF0FD;} + .d2-3828568108 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aa container labeldefgc \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json index c84b558fa..36f875c0d 100644 --- a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 93, + "x": 267, "y": 12 }, "width": 428, @@ -154,9 +154,17 @@ "labelPercentage": 0, "route": [ { - "x": 236, + "x": 409.66666666666674, "y": 110 }, + { + "x": 409.66666666666674, + "y": 150 + }, + { + "x": 236, + "y": 150 + }, { "x": 236, "y": 190 @@ -194,11 +202,11 @@ "labelPercentage": 0, "route": [ { - "x": 378.66666666666663, + "x": 552.3333333333334, "y": 110 }, { - "x": 378.66666666666663, + "x": 552.3333333333334, "y": 150 }, { diff --git a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg index bafa3aaee..de1fc6ed1 100644 --- a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ζœ‰δΈ€δΈͺε«εšε€ε€©ηš„ε­£θŠ‚γ€‚ γ‚γ‚‹ε­£η―€γ€ε€γ¨γ„γ†εε‰γŒγ€γ„γ¦γ„γΎγ™γ€‚ν•œ κ³„μ ˆ, μ—¬λ¦„μ΄λž€ 이름이 μžˆμŠ΅λ‹ˆλ‹€.ε€ε€©ηš„ζ—Άε€™οΌŒε€©ζ°”ιžεΈΈηƒ­οΌŒδΊΊδ»¬ζ€»ζ˜―ζ΅η€ζ±—γ€‚

倏にγͺγ‚‹γ¨γ€γ¨γ¦γ‚‚ζš‘γγ¦γ€δΊΊγ€…γ―ζ±—γ‚’ζ΅γ—γ¦γ„γΎγ™γ€‚

+ζœ‰δΈ€δΈͺε«εšε€ε€©ηš„ε­£θŠ‚γ€‚ γ‚γ‚‹ε­£η―€γ€ε€γ¨γ„γ†εε‰γŒγ€γ„γ¦γ„γΎγ™γ€‚ν•œ κ³„μ ˆ, μ—¬λ¦„μ΄λž€ 이름이 μžˆμŠ΅λ‹ˆλ‹€.ε€ε€©ηš„ζ—Άε€™οΌŒε€©ζ°”ιžεΈΈηƒ­οΌŒδΊΊδ»¬ζ€»ζ˜―ζ΅η€ζ±—γ€‚

倏にγͺγ‚‹γ¨γ€γ¨γ¦γ‚‚ζš‘γγ¦γ€δΊΊγ€…γ―ζ±—γ‚’ζ΅γ—γ¦γ„γΎγ™γ€‚

μ—¬λ¦„μ—λŠ” 맀우 λ”μ›Œμ„œ μ‚¬λžŒλ“€μ€ 땀을 ν˜λ¦½λ‹ˆλ‹€.

-
 +
 \ No newline at end of file