diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index f2e72657e..1f17b9621 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -457,6 +457,9 @@ func deleteBends(g *d2graph.Graph) { if len(e.Route) < 4 { continue } + if e.Src == e.Dst { + continue + } var endpoint *d2graph.Object var start *geo.Point var corner *geo.Point @@ -500,6 +503,9 @@ func deleteBends(g *d2graph.Graph) { newStart = geo.NewPoint(end.X, start.Y) } + endpointShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(endpoint.Attributes.Shape.Value)], endpoint.Box) + newStart = shape.TraceToShapeBorder(endpointShape, newStart, end) + // Check that the new segment doesn't collide with anything new oldSegment := geo.NewSegment(start, corner) @@ -512,10 +518,17 @@ func deleteBends(g *d2graph.Graph) { continue } - oldIntersects = countEdgeIntersects(g, g.Edges[ei], *oldSegment) - newIntersects = countEdgeIntersects(g, g.Edges[ei], *newSegment) + oldCrossingsCount, oldOverlapsCount, oldCloseOverlapsCount := countEdgeIntersects(g, g.Edges[ei], *oldSegment) + newCrossingsCount, newOverlapsCount, newCloseOverlapsCount := countEdgeIntersects(g, g.Edges[ei], *newSegment) - if newIntersects > oldIntersects { + if newCrossingsCount > oldCrossingsCount { + continue + } + if newOverlapsCount > oldOverlapsCount { + continue + } + + if newCloseOverlapsCount > oldCloseOverlapsCount { continue } @@ -546,9 +559,11 @@ func countObjectIntersects(g *d2graph.Graph, s geo.Segment) int { } // countEdgeIntersects counts both crossings AND getting too close to a parallel segment -func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) int { +func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (int, int, int) { isHorizontal := s.Start.Y == s.End.Y - count := 0 + crossingsCount := 0 + overlapsCount := 0 + closeOverlapsCount := 0 for _, e := range g.Edges { if e == sEdge { continue @@ -558,16 +573,30 @@ func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) i otherS := geo.NewSegment(e.Route[i], e.Route[i+1]) otherIsHorizontal := otherS.Start.Y == otherS.End.Y if isHorizontal == otherIsHorizontal { - if s.Overlaps(*otherS, isHorizontal, float64(edge_node_spacing)) { - count++ + if s.Overlaps(*otherS, !isHorizontal, 0.) { + if isHorizontal { + if math.Abs(s.Start.Y-otherS.Start.Y) < float64(edge_node_spacing)/2. { + overlapsCount++ + if math.Abs(s.Start.Y-otherS.Start.Y) < float64(edge_node_spacing)/4. { + closeOverlapsCount++ + } + } + } else { + if math.Abs(s.Start.X-otherS.Start.X) < float64(edge_node_spacing)/2. { + overlapsCount++ + if math.Abs(s.Start.X-otherS.Start.X) < float64(edge_node_spacing)/4. { + closeOverlapsCount++ + } + } + } } } else { if s.Intersects(*otherS) { - count++ + crossingsCount++ } } } } - return count + return crossingsCount, overlapsCount, closeOverlapsCount } diff --git a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg index c110ca200..cb4cc2f3a 100644 --- a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3196562940 .fill-N1{fill:#0A0F25;} + .d2-3196562940 .fill-N2{fill:#676C7E;} + .d2-3196562940 .fill-N3{fill:#9499AB;} + .d2-3196562940 .fill-N4{fill:#CFD2DD;} + .d2-3196562940 .fill-N5{fill:#DEE1EB;} + .d2-3196562940 .fill-N6{fill:#EEF1F8;} + .d2-3196562940 .fill-N7{fill:#FFFFFF;} + .d2-3196562940 .fill-B1{fill:#0D32B2;} + .d2-3196562940 .fill-B2{fill:#0D32B2;} + .d2-3196562940 .fill-B3{fill:#E3E9FD;} + .d2-3196562940 .fill-B4{fill:#E3E9FD;} + .d2-3196562940 .fill-B5{fill:#EDF0FD;} + .d2-3196562940 .fill-B6{fill:#F7F8FE;} + .d2-3196562940 .fill-AA2{fill:#4A6FF3;} + .d2-3196562940 .fill-AA4{fill:#EDF0FD;} + .d2-3196562940 .fill-AA5{fill:#F7F8FE;} + .d2-3196562940 .fill-AB4{fill:#EDF0FD;} + .d2-3196562940 .fill-AB5{fill:#F7F8FE;} + .d2-3196562940 .stroke-N1{stroke:#0A0F25;} + .d2-3196562940 .stroke-N2{stroke:#676C7E;} + .d2-3196562940 .stroke-N3{stroke:#9499AB;} + .d2-3196562940 .stroke-N4{stroke:#CFD2DD;} + .d2-3196562940 .stroke-N5{stroke:#DEE1EB;} + .d2-3196562940 .stroke-N6{stroke:#EEF1F8;} + .d2-3196562940 .stroke-N7{stroke:#FFFFFF;} + .d2-3196562940 .stroke-B1{stroke:#0D32B2;} + .d2-3196562940 .stroke-B2{stroke:#0D32B2;} + .d2-3196562940 .stroke-B3{stroke:#E3E9FD;} + .d2-3196562940 .stroke-B4{stroke:#E3E9FD;} + .d2-3196562940 .stroke-B5{stroke:#EDF0FD;} + .d2-3196562940 .stroke-B6{stroke:#F7F8FE;} + .d2-3196562940 .stroke-AA2{stroke:#4A6FF3;} + .d2-3196562940 .stroke-AA4{stroke:#EDF0FD;} + .d2-3196562940 .stroke-AA5{stroke:#F7F8FE;} + .d2-3196562940 .stroke-AB4{stroke:#EDF0FD;} + .d2-3196562940 .stroke-AB5{stroke:#F7F8FE;} + .d2-3196562940 .background-color-N1{background-color:#0A0F25;} + .d2-3196562940 .background-color-N2{background-color:#676C7E;} + .d2-3196562940 .background-color-N3{background-color:#9499AB;} + .d2-3196562940 .background-color-N4{background-color:#CFD2DD;} + .d2-3196562940 .background-color-N5{background-color:#DEE1EB;} + .d2-3196562940 .background-color-N6{background-color:#EEF1F8;} + .d2-3196562940 .background-color-N7{background-color:#FFFFFF;} + .d2-3196562940 .background-color-B1{background-color:#0D32B2;} + .d2-3196562940 .background-color-B2{background-color:#0D32B2;} + .d2-3196562940 .background-color-B3{background-color:#E3E9FD;} + .d2-3196562940 .background-color-B4{background-color:#E3E9FD;} + .d2-3196562940 .background-color-B5{background-color:#EDF0FD;} + .d2-3196562940 .background-color-B6{background-color:#F7F8FE;} + .d2-3196562940 .background-color-AA2{background-color:#4A6FF3;} + .d2-3196562940 .background-color-AA4{background-color:#EDF0FD;} + .d2-3196562940 .background-color-AA5{background-color:#F7F8FE;} + .d2-3196562940 .background-color-AB4{background-color:#EDF0FD;} + .d2-3196562940 .background-color-AB5{background-color:#F7F8FE;} + .d2-3196562940 .color-N1{color:#0A0F25;} + .d2-3196562940 .color-N2{color:#676C7E;} + .d2-3196562940 .color-N3{color:#9499AB;} + .d2-3196562940 .color-N4{color:#CFD2DD;} + .d2-3196562940 .color-N5{color:#DEE1EB;} + .d2-3196562940 .color-N6{color:#EEF1F8;} + .d2-3196562940 .color-N7{color:#FFFFFF;} + .d2-3196562940 .color-B1{color:#0D32B2;} + .d2-3196562940 .color-B2{color:#0D32B2;} + .d2-3196562940 .color-B3{color:#E3E9FD;} + .d2-3196562940 .color-B4{color:#E3E9FD;} + .d2-3196562940 .color-B5{color:#EDF0FD;} + .d2-3196562940 .color-B6{color:#F7F8FE;} + .d2-3196562940 .color-AA2{color:#4A6FF3;} + .d2-3196562940 .color-AA4{color:#EDF0FD;} + .d2-3196562940 .color-AA5{color:#F7F8FE;} + .d2-3196562940 .color-AB4{color:#EDF0FD;} + .d2-3196562940 .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 b6adf0671..8ce7baba1 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 ad7c9469f..6e11d6389 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -1343,14 +1343,6 @@ }, { "x": 596.5, - "y": 1356 - }, - { - "x": 585.75, - "y": 1356 - }, - { - "x": 585.75, "y": 1506 } ], diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index 1156b4555..86abd4bf4 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-1892565133 .fill-N1{fill:#0A0F25;} + .d2-1892565133 .fill-N2{fill:#676C7E;} + .d2-1892565133 .fill-N3{fill:#9499AB;} + .d2-1892565133 .fill-N4{fill:#CFD2DD;} + .d2-1892565133 .fill-N5{fill:#DEE1EB;} + .d2-1892565133 .fill-N6{fill:#EEF1F8;} + .d2-1892565133 .fill-N7{fill:#FFFFFF;} + .d2-1892565133 .fill-B1{fill:#0D32B2;} + .d2-1892565133 .fill-B2{fill:#0D32B2;} + .d2-1892565133 .fill-B3{fill:#E3E9FD;} + .d2-1892565133 .fill-B4{fill:#E3E9FD;} + .d2-1892565133 .fill-B5{fill:#EDF0FD;} + .d2-1892565133 .fill-B6{fill:#F7F8FE;} + .d2-1892565133 .fill-AA2{fill:#4A6FF3;} + .d2-1892565133 .fill-AA4{fill:#EDF0FD;} + .d2-1892565133 .fill-AA5{fill:#F7F8FE;} + .d2-1892565133 .fill-AB4{fill:#EDF0FD;} + .d2-1892565133 .fill-AB5{fill:#F7F8FE;} + .d2-1892565133 .stroke-N1{stroke:#0A0F25;} + .d2-1892565133 .stroke-N2{stroke:#676C7E;} + .d2-1892565133 .stroke-N3{stroke:#9499AB;} + .d2-1892565133 .stroke-N4{stroke:#CFD2DD;} + .d2-1892565133 .stroke-N5{stroke:#DEE1EB;} + .d2-1892565133 .stroke-N6{stroke:#EEF1F8;} + .d2-1892565133 .stroke-N7{stroke:#FFFFFF;} + .d2-1892565133 .stroke-B1{stroke:#0D32B2;} + .d2-1892565133 .stroke-B2{stroke:#0D32B2;} + .d2-1892565133 .stroke-B3{stroke:#E3E9FD;} + .d2-1892565133 .stroke-B4{stroke:#E3E9FD;} + .d2-1892565133 .stroke-B5{stroke:#EDF0FD;} + .d2-1892565133 .stroke-B6{stroke:#F7F8FE;} + .d2-1892565133 .stroke-AA2{stroke:#4A6FF3;} + .d2-1892565133 .stroke-AA4{stroke:#EDF0FD;} + .d2-1892565133 .stroke-AA5{stroke:#F7F8FE;} + .d2-1892565133 .stroke-AB4{stroke:#EDF0FD;} + .d2-1892565133 .stroke-AB5{stroke:#F7F8FE;} + .d2-1892565133 .background-color-N1{background-color:#0A0F25;} + .d2-1892565133 .background-color-N2{background-color:#676C7E;} + .d2-1892565133 .background-color-N3{background-color:#9499AB;} + .d2-1892565133 .background-color-N4{background-color:#CFD2DD;} + .d2-1892565133 .background-color-N5{background-color:#DEE1EB;} + .d2-1892565133 .background-color-N6{background-color:#EEF1F8;} + .d2-1892565133 .background-color-N7{background-color:#FFFFFF;} + .d2-1892565133 .background-color-B1{background-color:#0D32B2;} + .d2-1892565133 .background-color-B2{background-color:#0D32B2;} + .d2-1892565133 .background-color-B3{background-color:#E3E9FD;} + .d2-1892565133 .background-color-B4{background-color:#E3E9FD;} + .d2-1892565133 .background-color-B5{background-color:#EDF0FD;} + .d2-1892565133 .background-color-B6{background-color:#F7F8FE;} + .d2-1892565133 .background-color-AA2{background-color:#4A6FF3;} + .d2-1892565133 .background-color-AA4{background-color:#EDF0FD;} + .d2-1892565133 .background-color-AA5{background-color:#F7F8FE;} + .d2-1892565133 .background-color-AB4{background-color:#EDF0FD;} + .d2-1892565133 .background-color-AB5{background-color:#F7F8FE;} + .d2-1892565133 .color-N1{color:#0A0F25;} + .d2-1892565133 .color-N2{color:#676C7E;} + .d2-1892565133 .color-N3{color:#9499AB;} + .d2-1892565133 .color-N4{color:#CFD2DD;} + .d2-1892565133 .color-N5{color:#DEE1EB;} + .d2-1892565133 .color-N6{color:#EEF1F8;} + .d2-1892565133 .color-N7{color:#FFFFFF;} + .d2-1892565133 .color-B1{color:#0D32B2;} + .d2-1892565133 .color-B2{color:#0D32B2;} + .d2-1892565133 .color-B3{color:#E3E9FD;} + .d2-1892565133 .color-B4{color:#E3E9FD;} + .d2-1892565133 .color-B5{color:#EDF0FD;} + .d2-1892565133 .color-B6{color:#F7F8FE;} + .d2-1892565133 .color-AA2{color:#4A6FF3;} + .d2-1892565133 .color-AA4{color:#EDF0FD;} + .d2-1892565133 .color-AA5{color:#F7F8FE;} + .d2-1892565133 .color-AB4{color:#EDF0FD;} + .d2-1892565133 .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/dagre_broken_arrowhead/elk/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json index f2fb1096c..3474dbc82 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json @@ -283,14 +283,6 @@ }, { "x": 88.5, - "y": 307 - }, - { - "x": 115, - "y": 307 - }, - { - "x": 115, "y": 347 } ], diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg index 5ceca9846..26eb5ec60 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 + .d2-3255763011 .fill-N1{fill:#0A0F25;} + .d2-3255763011 .fill-N2{fill:#676C7E;} + .d2-3255763011 .fill-N3{fill:#9499AB;} + .d2-3255763011 .fill-N4{fill:#CFD2DD;} + .d2-3255763011 .fill-N5{fill:#DEE1EB;} + .d2-3255763011 .fill-N6{fill:#EEF1F8;} + .d2-3255763011 .fill-N7{fill:#FFFFFF;} + .d2-3255763011 .fill-B1{fill:#0D32B2;} + .d2-3255763011 .fill-B2{fill:#0D32B2;} + .d2-3255763011 .fill-B3{fill:#E3E9FD;} + .d2-3255763011 .fill-B4{fill:#E3E9FD;} + .d2-3255763011 .fill-B5{fill:#EDF0FD;} + .d2-3255763011 .fill-B6{fill:#F7F8FE;} + .d2-3255763011 .fill-AA2{fill:#4A6FF3;} + .d2-3255763011 .fill-AA4{fill:#EDF0FD;} + .d2-3255763011 .fill-AA5{fill:#F7F8FE;} + .d2-3255763011 .fill-AB4{fill:#EDF0FD;} + .d2-3255763011 .fill-AB5{fill:#F7F8FE;} + .d2-3255763011 .stroke-N1{stroke:#0A0F25;} + .d2-3255763011 .stroke-N2{stroke:#676C7E;} + .d2-3255763011 .stroke-N3{stroke:#9499AB;} + .d2-3255763011 .stroke-N4{stroke:#CFD2DD;} + .d2-3255763011 .stroke-N5{stroke:#DEE1EB;} + .d2-3255763011 .stroke-N6{stroke:#EEF1F8;} + .d2-3255763011 .stroke-N7{stroke:#FFFFFF;} + .d2-3255763011 .stroke-B1{stroke:#0D32B2;} + .d2-3255763011 .stroke-B2{stroke:#0D32B2;} + .d2-3255763011 .stroke-B3{stroke:#E3E9FD;} + .d2-3255763011 .stroke-B4{stroke:#E3E9FD;} + .d2-3255763011 .stroke-B5{stroke:#EDF0FD;} + .d2-3255763011 .stroke-B6{stroke:#F7F8FE;} + .d2-3255763011 .stroke-AA2{stroke:#4A6FF3;} + .d2-3255763011 .stroke-AA4{stroke:#EDF0FD;} + .d2-3255763011 .stroke-AA5{stroke:#F7F8FE;} + .d2-3255763011 .stroke-AB4{stroke:#EDF0FD;} + .d2-3255763011 .stroke-AB5{stroke:#F7F8FE;} + .d2-3255763011 .background-color-N1{background-color:#0A0F25;} + .d2-3255763011 .background-color-N2{background-color:#676C7E;} + .d2-3255763011 .background-color-N3{background-color:#9499AB;} + .d2-3255763011 .background-color-N4{background-color:#CFD2DD;} + .d2-3255763011 .background-color-N5{background-color:#DEE1EB;} + .d2-3255763011 .background-color-N6{background-color:#EEF1F8;} + .d2-3255763011 .background-color-N7{background-color:#FFFFFF;} + .d2-3255763011 .background-color-B1{background-color:#0D32B2;} + .d2-3255763011 .background-color-B2{background-color:#0D32B2;} + .d2-3255763011 .background-color-B3{background-color:#E3E9FD;} + .d2-3255763011 .background-color-B4{background-color:#E3E9FD;} + .d2-3255763011 .background-color-B5{background-color:#EDF0FD;} + .d2-3255763011 .background-color-B6{background-color:#F7F8FE;} + .d2-3255763011 .background-color-AA2{background-color:#4A6FF3;} + .d2-3255763011 .background-color-AA4{background-color:#EDF0FD;} + .d2-3255763011 .background-color-AA5{background-color:#F7F8FE;} + .d2-3255763011 .background-color-AB4{background-color:#EDF0FD;} + .d2-3255763011 .background-color-AB5{background-color:#F7F8FE;} + .d2-3255763011 .color-N1{color:#0A0F25;} + .d2-3255763011 .color-N2{color:#676C7E;} + .d2-3255763011 .color-N3{color:#9499AB;} + .d2-3255763011 .color-N4{color:#CFD2DD;} + .d2-3255763011 .color-N5{color:#DEE1EB;} + .d2-3255763011 .color-N6{color:#EEF1F8;} + .d2-3255763011 .color-N7{color:#FFFFFF;} + .d2-3255763011 .color-B1{color:#0D32B2;} + .d2-3255763011 .color-B2{color:#0D32B2;} + .d2-3255763011 .color-B3{color:#E3E9FD;} + .d2-3255763011 .color-B4{color:#E3E9FD;} + .d2-3255763011 .color-B5{color:#EDF0FD;} + .d2-3255763011 .color-B6{color:#F7F8FE;} + .d2-3255763011 .color-AA2{color:#4A6FF3;} + .d2-3255763011 .color-AA4{color:#EDF0FD;} + .d2-3255763011 .color-AA5{color:#F7F8FE;} + .d2-3255763011 .color-AB4{color:#EDF0FD;} + .d2-3255763011 .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}]]>abc12d line 1line 2line 3line 4 - + \ 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 b211ecf77..9281fea96 100644 --- a/e2etests/testdata/regression/elk_order/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json @@ -598,17 +598,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 501.75, - "y": 60 - }, - { - "x": 501.75, - "y": 100 - }, { "x": 520.5, - "y": 100 + "y": 60 }, { "x": 520.5, @@ -646,17 +638,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 636.75, - "y": 60 - }, - { - "x": 636.75, - "y": 100 - }, { "x": 605.5, - "y": 100 + "y": 60 }, { "x": 605.5, diff --git a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg index 550aba88d..ad3b14931 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 @@ - \ 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 e93e1c37d..d6fc07f05 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json @@ -441,17 +441,9 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ - { - "x": 211, - "y": 178 - }, - { - "x": 211, - "y": 218 - }, { "x": 274, - "y": 218 + "y": 178 }, { "x": 274, @@ -497,17 +489,9 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ - { - "x": 410, - "y": 178 - }, - { - "x": 410, - "y": 319 - }, { "x": 482.3, - "y": 319 + "y": 178 }, { "x": 482.3, @@ -545,17 +529,9 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ - { - "x": 609, - "y": 178 - }, - { - "x": 609, - "y": 319 - }, { "x": 536.7, - "y": 319 + "y": 178 }, { "x": 536.7, @@ -593,17 +569,9 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, "route": [ - { - "x": 808, - "y": 178 - }, - { - "x": 808, - "y": 218 - }, { "x": 735.7, - "y": 218 + "y": 178 }, { "x": 735.7, 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 001be9e92..84ba737f0 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-1708311155 .fill-N1{fill:#0A0F25;} + .d2-1708311155 .fill-N2{fill:#676C7E;} + .d2-1708311155 .fill-N3{fill:#9499AB;} + .d2-1708311155 .fill-N4{fill:#CFD2DD;} + .d2-1708311155 .fill-N5{fill:#DEE1EB;} + .d2-1708311155 .fill-N6{fill:#EEF1F8;} + .d2-1708311155 .fill-N7{fill:#FFFFFF;} + .d2-1708311155 .fill-B1{fill:#0D32B2;} + .d2-1708311155 .fill-B2{fill:#0D32B2;} + .d2-1708311155 .fill-B3{fill:#E3E9FD;} + .d2-1708311155 .fill-B4{fill:#E3E9FD;} + .d2-1708311155 .fill-B5{fill:#EDF0FD;} + .d2-1708311155 .fill-B6{fill:#F7F8FE;} + .d2-1708311155 .fill-AA2{fill:#4A6FF3;} + .d2-1708311155 .fill-AA4{fill:#EDF0FD;} + .d2-1708311155 .fill-AA5{fill:#F7F8FE;} + .d2-1708311155 .fill-AB4{fill:#EDF0FD;} + .d2-1708311155 .fill-AB5{fill:#F7F8FE;} + .d2-1708311155 .stroke-N1{stroke:#0A0F25;} + .d2-1708311155 .stroke-N2{stroke:#676C7E;} + .d2-1708311155 .stroke-N3{stroke:#9499AB;} + .d2-1708311155 .stroke-N4{stroke:#CFD2DD;} + .d2-1708311155 .stroke-N5{stroke:#DEE1EB;} + .d2-1708311155 .stroke-N6{stroke:#EEF1F8;} + .d2-1708311155 .stroke-N7{stroke:#FFFFFF;} + .d2-1708311155 .stroke-B1{stroke:#0D32B2;} + .d2-1708311155 .stroke-B2{stroke:#0D32B2;} + .d2-1708311155 .stroke-B3{stroke:#E3E9FD;} + .d2-1708311155 .stroke-B4{stroke:#E3E9FD;} + .d2-1708311155 .stroke-B5{stroke:#EDF0FD;} + .d2-1708311155 .stroke-B6{stroke:#F7F8FE;} + .d2-1708311155 .stroke-AA2{stroke:#4A6FF3;} + .d2-1708311155 .stroke-AA4{stroke:#EDF0FD;} + .d2-1708311155 .stroke-AA5{stroke:#F7F8FE;} + .d2-1708311155 .stroke-AB4{stroke:#EDF0FD;} + .d2-1708311155 .stroke-AB5{stroke:#F7F8FE;} + .d2-1708311155 .background-color-N1{background-color:#0A0F25;} + .d2-1708311155 .background-color-N2{background-color:#676C7E;} + .d2-1708311155 .background-color-N3{background-color:#9499AB;} + .d2-1708311155 .background-color-N4{background-color:#CFD2DD;} + .d2-1708311155 .background-color-N5{background-color:#DEE1EB;} + .d2-1708311155 .background-color-N6{background-color:#EEF1F8;} + .d2-1708311155 .background-color-N7{background-color:#FFFFFF;} + .d2-1708311155 .background-color-B1{background-color:#0D32B2;} + .d2-1708311155 .background-color-B2{background-color:#0D32B2;} + .d2-1708311155 .background-color-B3{background-color:#E3E9FD;} + .d2-1708311155 .background-color-B4{background-color:#E3E9FD;} + .d2-1708311155 .background-color-B5{background-color:#EDF0FD;} + .d2-1708311155 .background-color-B6{background-color:#F7F8FE;} + .d2-1708311155 .background-color-AA2{background-color:#4A6FF3;} + .d2-1708311155 .background-color-AA4{background-color:#EDF0FD;} + .d2-1708311155 .background-color-AA5{background-color:#F7F8FE;} + .d2-1708311155 .background-color-AB4{background-color:#EDF0FD;} + .d2-1708311155 .background-color-AB5{background-color:#F7F8FE;} + .d2-1708311155 .color-N1{color:#0A0F25;} + .d2-1708311155 .color-N2{color:#676C7E;} + .d2-1708311155 .color-N3{color:#9499AB;} + .d2-1708311155 .color-N4{color:#CFD2DD;} + .d2-1708311155 .color-N5{color:#DEE1EB;} + .d2-1708311155 .color-N6{color:#EEF1F8;} + .d2-1708311155 .color-N7{color:#FFFFFF;} + .d2-1708311155 .color-B1{color:#0D32B2;} + .d2-1708311155 .color-B2{color:#0D32B2;} + .d2-1708311155 .color-B3{color:#E3E9FD;} + .d2-1708311155 .color-B4{color:#E3E9FD;} + .d2-1708311155 .color-B5{color:#EDF0FD;} + .d2-1708311155 .color-B6{color:#F7F8FE;} + .d2-1708311155 .color-AA2{color:#4A6FF3;} + .d2-1708311155 .color-AA4{color:#EDF0FD;} + .d2-1708311155 .color-AA5{color:#F7F8FE;} + .d2-1708311155 .color-AB4{color:#EDF0FD;} + .d2-1708311155 .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 45bb8da56..7cf00d5b6 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 @@ -1292,17 +1292,9 @@ "x": 333, "y": 262 }, - { - "x": 468, - "y": 262 - }, - { - "x": 468, - "y": 281 - }, { "x": 563, - "y": 281 + "y": 262 } ], "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 45e9b2867..4acba330a 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-3362555595 .fill-N1{fill:#0A0F25;} + .d2-3362555595 .fill-N2{fill:#676C7E;} + .d2-3362555595 .fill-N3{fill:#9499AB;} + .d2-3362555595 .fill-N4{fill:#CFD2DD;} + .d2-3362555595 .fill-N5{fill:#DEE1EB;} + .d2-3362555595 .fill-N6{fill:#EEF1F8;} + .d2-3362555595 .fill-N7{fill:#FFFFFF;} + .d2-3362555595 .fill-B1{fill:#0D32B2;} + .d2-3362555595 .fill-B2{fill:#0D32B2;} + .d2-3362555595 .fill-B3{fill:#E3E9FD;} + .d2-3362555595 .fill-B4{fill:#E3E9FD;} + .d2-3362555595 .fill-B5{fill:#EDF0FD;} + .d2-3362555595 .fill-B6{fill:#F7F8FE;} + .d2-3362555595 .fill-AA2{fill:#4A6FF3;} + .d2-3362555595 .fill-AA4{fill:#EDF0FD;} + .d2-3362555595 .fill-AA5{fill:#F7F8FE;} + .d2-3362555595 .fill-AB4{fill:#EDF0FD;} + .d2-3362555595 .fill-AB5{fill:#F7F8FE;} + .d2-3362555595 .stroke-N1{stroke:#0A0F25;} + .d2-3362555595 .stroke-N2{stroke:#676C7E;} + .d2-3362555595 .stroke-N3{stroke:#9499AB;} + .d2-3362555595 .stroke-N4{stroke:#CFD2DD;} + .d2-3362555595 .stroke-N5{stroke:#DEE1EB;} + .d2-3362555595 .stroke-N6{stroke:#EEF1F8;} + .d2-3362555595 .stroke-N7{stroke:#FFFFFF;} + .d2-3362555595 .stroke-B1{stroke:#0D32B2;} + .d2-3362555595 .stroke-B2{stroke:#0D32B2;} + .d2-3362555595 .stroke-B3{stroke:#E3E9FD;} + .d2-3362555595 .stroke-B4{stroke:#E3E9FD;} + .d2-3362555595 .stroke-B5{stroke:#EDF0FD;} + .d2-3362555595 .stroke-B6{stroke:#F7F8FE;} + .d2-3362555595 .stroke-AA2{stroke:#4A6FF3;} + .d2-3362555595 .stroke-AA4{stroke:#EDF0FD;} + .d2-3362555595 .stroke-AA5{stroke:#F7F8FE;} + .d2-3362555595 .stroke-AB4{stroke:#EDF0FD;} + .d2-3362555595 .stroke-AB5{stroke:#F7F8FE;} + .d2-3362555595 .background-color-N1{background-color:#0A0F25;} + .d2-3362555595 .background-color-N2{background-color:#676C7E;} + .d2-3362555595 .background-color-N3{background-color:#9499AB;} + .d2-3362555595 .background-color-N4{background-color:#CFD2DD;} + .d2-3362555595 .background-color-N5{background-color:#DEE1EB;} + .d2-3362555595 .background-color-N6{background-color:#EEF1F8;} + .d2-3362555595 .background-color-N7{background-color:#FFFFFF;} + .d2-3362555595 .background-color-B1{background-color:#0D32B2;} + .d2-3362555595 .background-color-B2{background-color:#0D32B2;} + .d2-3362555595 .background-color-B3{background-color:#E3E9FD;} + .d2-3362555595 .background-color-B4{background-color:#E3E9FD;} + .d2-3362555595 .background-color-B5{background-color:#EDF0FD;} + .d2-3362555595 .background-color-B6{background-color:#F7F8FE;} + .d2-3362555595 .background-color-AA2{background-color:#4A6FF3;} + .d2-3362555595 .background-color-AA4{background-color:#EDF0FD;} + .d2-3362555595 .background-color-AA5{background-color:#F7F8FE;} + .d2-3362555595 .background-color-AB4{background-color:#EDF0FD;} + .d2-3362555595 .background-color-AB5{background-color:#F7F8FE;} + .d2-3362555595 .color-N1{color:#0A0F25;} + .d2-3362555595 .color-N2{color:#676C7E;} + .d2-3362555595 .color-N3{color:#9499AB;} + .d2-3362555595 .color-N4{color:#CFD2DD;} + .d2-3362555595 .color-N5{color:#DEE1EB;} + .d2-3362555595 .color-N6{color:#EEF1F8;} + .d2-3362555595 .color-N7{color:#FFFFFF;} + .d2-3362555595 .color-B1{color:#0D32B2;} + .d2-3362555595 .color-B2{color:#0D32B2;} + .d2-3362555595 .color-B3{color:#E3E9FD;} + .d2-3362555595 .color-B4{color:#E3E9FD;} + .d2-3362555595 .color-B5{color:#EDF0FD;} + .d2-3362555595 .color-B6{color:#F7F8FE;} + .d2-3362555595 .color-AA2{color:#4A6FF3;} + .d2-3362555595 .color-AA4{color:#EDF0FD;} + .d2-3362555595 .color-AA5{color:#F7F8FE;} + .d2-3362555595 .color-AB4{color:#EDF0FD;} + .d2-3362555595 .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 d7467cf90..77c176dbb 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -671,17 +671,9 @@ "x": 278, "y": 288.1875 }, - { - "x": 612, - "y": 288.1875 - }, - { - "x": 612, - "y": 299.625 - }, { "x": 652, - "y": 299.625 + "y": 288.1875 } ], "animated": false, @@ -719,17 +711,9 @@ "x": 840, "y": 127.5 }, - { - "x": 880, - "y": 127.5 - }, - { - "x": 880, - "y": 102 - }, { "x": 970, - "y": 102 + "y": 127.5 } ], "animated": false, @@ -917,14 +901,6 @@ "route": [ { "x": 1290, - "y": 169.66666666666669 - }, - { - "x": 1330, - "y": 169.66666666666669 - }, - { - "x": 1330, "y": 164.66666666666669 }, { diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index 8736efd7b..441f0c445 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -
  • Staging
  • Dispatch to Site
    • -InstallationSupport +InstallationSupport \ 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 f7821a742..35e414a9b 100644 --- a/e2etests/testdata/stable/animated/elk/board.exp.json +++ b/e2etests/testdata/stable/animated/elk/board.exp.json @@ -564,17 +564,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 83.83333333333337, - "y": 78 - }, - { - "x": 83.83333333333337, - "y": 118 - }, { "x": 56.5, - "y": 118 + "y": 78 }, { "x": 56.5, @@ -612,17 +604,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 146.16666666666663, - "y": 78 - }, - { - "x": 146.16666666666663, - "y": 118 - }, { "x": 186, - "y": 118 + "y": 78 }, { "x": 186, diff --git a/e2etests/testdata/stable/animated/elk/sketch.exp.svg b/e2etests/testdata/stable/animated/elk/sketch.exp.svg index d3ce0e5b2..e4d731701 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-1162274579 .fill-N1{fill:#0A0F25;} + .d2-1162274579 .fill-N2{fill:#676C7E;} + .d2-1162274579 .fill-N3{fill:#9499AB;} + .d2-1162274579 .fill-N4{fill:#CFD2DD;} + .d2-1162274579 .fill-N5{fill:#DEE1EB;} + .d2-1162274579 .fill-N6{fill:#EEF1F8;} + .d2-1162274579 .fill-N7{fill:#FFFFFF;} + .d2-1162274579 .fill-B1{fill:#0D32B2;} + .d2-1162274579 .fill-B2{fill:#0D32B2;} + .d2-1162274579 .fill-B3{fill:#E3E9FD;} + .d2-1162274579 .fill-B4{fill:#E3E9FD;} + .d2-1162274579 .fill-B5{fill:#EDF0FD;} + .d2-1162274579 .fill-B6{fill:#F7F8FE;} + .d2-1162274579 .fill-AA2{fill:#4A6FF3;} + .d2-1162274579 .fill-AA4{fill:#EDF0FD;} + .d2-1162274579 .fill-AA5{fill:#F7F8FE;} + .d2-1162274579 .fill-AB4{fill:#EDF0FD;} + .d2-1162274579 .fill-AB5{fill:#F7F8FE;} + .d2-1162274579 .stroke-N1{stroke:#0A0F25;} + .d2-1162274579 .stroke-N2{stroke:#676C7E;} + .d2-1162274579 .stroke-N3{stroke:#9499AB;} + .d2-1162274579 .stroke-N4{stroke:#CFD2DD;} + .d2-1162274579 .stroke-N5{stroke:#DEE1EB;} + .d2-1162274579 .stroke-N6{stroke:#EEF1F8;} + .d2-1162274579 .stroke-N7{stroke:#FFFFFF;} + .d2-1162274579 .stroke-B1{stroke:#0D32B2;} + .d2-1162274579 .stroke-B2{stroke:#0D32B2;} + .d2-1162274579 .stroke-B3{stroke:#E3E9FD;} + .d2-1162274579 .stroke-B4{stroke:#E3E9FD;} + .d2-1162274579 .stroke-B5{stroke:#EDF0FD;} + .d2-1162274579 .stroke-B6{stroke:#F7F8FE;} + .d2-1162274579 .stroke-AA2{stroke:#4A6FF3;} + .d2-1162274579 .stroke-AA4{stroke:#EDF0FD;} + .d2-1162274579 .stroke-AA5{stroke:#F7F8FE;} + .d2-1162274579 .stroke-AB4{stroke:#EDF0FD;} + .d2-1162274579 .stroke-AB5{stroke:#F7F8FE;} + .d2-1162274579 .background-color-N1{background-color:#0A0F25;} + .d2-1162274579 .background-color-N2{background-color:#676C7E;} + .d2-1162274579 .background-color-N3{background-color:#9499AB;} + .d2-1162274579 .background-color-N4{background-color:#CFD2DD;} + .d2-1162274579 .background-color-N5{background-color:#DEE1EB;} + .d2-1162274579 .background-color-N6{background-color:#EEF1F8;} + .d2-1162274579 .background-color-N7{background-color:#FFFFFF;} + .d2-1162274579 .background-color-B1{background-color:#0D32B2;} + .d2-1162274579 .background-color-B2{background-color:#0D32B2;} + .d2-1162274579 .background-color-B3{background-color:#E3E9FD;} + .d2-1162274579 .background-color-B4{background-color:#E3E9FD;} + .d2-1162274579 .background-color-B5{background-color:#EDF0FD;} + .d2-1162274579 .background-color-B6{background-color:#F7F8FE;} + .d2-1162274579 .background-color-AA2{background-color:#4A6FF3;} + .d2-1162274579 .background-color-AA4{background-color:#EDF0FD;} + .d2-1162274579 .background-color-AA5{background-color:#F7F8FE;} + .d2-1162274579 .background-color-AB4{background-color:#EDF0FD;} + .d2-1162274579 .background-color-AB5{background-color:#F7F8FE;} + .d2-1162274579 .color-N1{color:#0A0F25;} + .d2-1162274579 .color-N2{color:#676C7E;} + .d2-1162274579 .color-N3{color:#9499AB;} + .d2-1162274579 .color-N4{color:#CFD2DD;} + .d2-1162274579 .color-N5{color:#DEE1EB;} + .d2-1162274579 .color-N6{color:#EEF1F8;} + .d2-1162274579 .color-N7{color:#FFFFFF;} + .d2-1162274579 .color-B1{color:#0D32B2;} + .d2-1162274579 .color-B2{color:#0D32B2;} + .d2-1162274579 .color-B3{color:#E3E9FD;} + .d2-1162274579 .color-B4{color:#E3E9FD;} + .d2-1162274579 .color-B5{color:#EDF0FD;} + .d2-1162274579 .color-B6{color:#F7F8FE;} + .d2-1162274579 .color-AA2{color:#4A6FF3;} + .d2-1162274579 .color-AA4{color:#EDF0FD;} + .d2-1162274579 .color-AA5{color:#F7F8FE;} + .d2-1162274579 .color-AB4{color:#EDF0FD;} + .d2-1162274579 .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 3f02ac582..ff22558a1 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -395,16 +395,8 @@ "labelPercentage": 0, "route": [ { - "x": 103, - "y": 258 - }, - { - "x": 103, - "y": 298 - }, - { - "x": 134.66666666666669, - "y": 298 + "x": 135, + "y": 247 }, { "x": 135, diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index f51594f93..f72baa241 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-1482414948 .fill-N1{fill:#0A0F25;} + .d2-1482414948 .fill-N2{fill:#676C7E;} + .d2-1482414948 .fill-N3{fill:#9499AB;} + .d2-1482414948 .fill-N4{fill:#CFD2DD;} + .d2-1482414948 .fill-N5{fill:#DEE1EB;} + .d2-1482414948 .fill-N6{fill:#EEF1F8;} + .d2-1482414948 .fill-N7{fill:#FFFFFF;} + .d2-1482414948 .fill-B1{fill:#0D32B2;} + .d2-1482414948 .fill-B2{fill:#0D32B2;} + .d2-1482414948 .fill-B3{fill:#E3E9FD;} + .d2-1482414948 .fill-B4{fill:#E3E9FD;} + .d2-1482414948 .fill-B5{fill:#EDF0FD;} + .d2-1482414948 .fill-B6{fill:#F7F8FE;} + .d2-1482414948 .fill-AA2{fill:#4A6FF3;} + .d2-1482414948 .fill-AA4{fill:#EDF0FD;} + .d2-1482414948 .fill-AA5{fill:#F7F8FE;} + .d2-1482414948 .fill-AB4{fill:#EDF0FD;} + .d2-1482414948 .fill-AB5{fill:#F7F8FE;} + .d2-1482414948 .stroke-N1{stroke:#0A0F25;} + .d2-1482414948 .stroke-N2{stroke:#676C7E;} + .d2-1482414948 .stroke-N3{stroke:#9499AB;} + .d2-1482414948 .stroke-N4{stroke:#CFD2DD;} + .d2-1482414948 .stroke-N5{stroke:#DEE1EB;} + .d2-1482414948 .stroke-N6{stroke:#EEF1F8;} + .d2-1482414948 .stroke-N7{stroke:#FFFFFF;} + .d2-1482414948 .stroke-B1{stroke:#0D32B2;} + .d2-1482414948 .stroke-B2{stroke:#0D32B2;} + .d2-1482414948 .stroke-B3{stroke:#E3E9FD;} + .d2-1482414948 .stroke-B4{stroke:#E3E9FD;} + .d2-1482414948 .stroke-B5{stroke:#EDF0FD;} + .d2-1482414948 .stroke-B6{stroke:#F7F8FE;} + .d2-1482414948 .stroke-AA2{stroke:#4A6FF3;} + .d2-1482414948 .stroke-AA4{stroke:#EDF0FD;} + .d2-1482414948 .stroke-AA5{stroke:#F7F8FE;} + .d2-1482414948 .stroke-AB4{stroke:#EDF0FD;} + .d2-1482414948 .stroke-AB5{stroke:#F7F8FE;} + .d2-1482414948 .background-color-N1{background-color:#0A0F25;} + .d2-1482414948 .background-color-N2{background-color:#676C7E;} + .d2-1482414948 .background-color-N3{background-color:#9499AB;} + .d2-1482414948 .background-color-N4{background-color:#CFD2DD;} + .d2-1482414948 .background-color-N5{background-color:#DEE1EB;} + .d2-1482414948 .background-color-N6{background-color:#EEF1F8;} + .d2-1482414948 .background-color-N7{background-color:#FFFFFF;} + .d2-1482414948 .background-color-B1{background-color:#0D32B2;} + .d2-1482414948 .background-color-B2{background-color:#0D32B2;} + .d2-1482414948 .background-color-B3{background-color:#E3E9FD;} + .d2-1482414948 .background-color-B4{background-color:#E3E9FD;} + .d2-1482414948 .background-color-B5{background-color:#EDF0FD;} + .d2-1482414948 .background-color-B6{background-color:#F7F8FE;} + .d2-1482414948 .background-color-AA2{background-color:#4A6FF3;} + .d2-1482414948 .background-color-AA4{background-color:#EDF0FD;} + .d2-1482414948 .background-color-AA5{background-color:#F7F8FE;} + .d2-1482414948 .background-color-AB4{background-color:#EDF0FD;} + .d2-1482414948 .background-color-AB5{background-color:#F7F8FE;} + .d2-1482414948 .color-N1{color:#0A0F25;} + .d2-1482414948 .color-N2{color:#676C7E;} + .d2-1482414948 .color-N3{color:#9499AB;} + .d2-1482414948 .color-N4{color:#CFD2DD;} + .d2-1482414948 .color-N5{color:#DEE1EB;} + .d2-1482414948 .color-N6{color:#EEF1F8;} + .d2-1482414948 .color-N7{color:#FFFFFF;} + .d2-1482414948 .color-B1{color:#0D32B2;} + .d2-1482414948 .color-B2{color:#0D32B2;} + .d2-1482414948 .color-B3{color:#E3E9FD;} + .d2-1482414948 .color-B4{color:#E3E9FD;} + .d2-1482414948 .color-B5{color:#EDF0FD;} + .d2-1482414948 .color-B6{color:#F7F8FE;} + .d2-1482414948 .color-AA2{color:#4A6FF3;} + .d2-1482414948 .color-AA4{color:#EDF0FD;} + .d2-1482414948 .color-AA5{color:#F7F8FE;} + .d2-1482414948 .color-AB4{color:#EDF0FD;} + .d2-1482414948 .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/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index 8dce06233..77fcdb0c7 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -793,14 +793,6 @@ }, { "x": 443.75, - "y": 567 - }, - { - "x": 413.5, - "y": 567 - }, - { - "x": 413.5, "y": 612 } ], @@ -937,14 +929,6 @@ }, { "x": 351.75, - "y": 270 - }, - { - "x": 295.25, - "y": 270 - }, - { - "x": 295.25, "y": 612 } ], diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index c3ff5dc94..7c479b482 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 - + - + diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index 0354534e1..79574c40a 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -154,17 +154,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 43.16666666666667, - "y": 78 - }, - { - "x": 43.16666666666667, - "y": 168 - }, { "x": 38.66666666666667, - "y": 168 + "y": 78 }, { "x": 38.66666666666667, @@ -202,17 +194,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 38.66666666666667, - "y": 274 - }, - { - "x": 38.66666666666667, - "y": 364 - }, { "x": 43.16666666666667, - "y": 364 + "y": 274 }, { "x": 43.16666666666667, @@ -250,17 +234,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 60.833333333333336, - "y": 404 - }, - { - "x": 60.833333333333336, - "y": 314 - }, { "x": 65.33333333333334, - "y": 314 + "y": 404 }, { "x": 65.33333333333334, @@ -298,17 +274,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 65.33333333333334, - "y": 208 - }, - { - "x": 65.33333333333334, - "y": 118 - }, { "x": 60.833333333333336, - "y": 118 + "y": 208 }, { "x": 60.833333333333336, diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index 70c51eb60..8c37ec8a3 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-4119277978 .fill-N1{fill:#0A0F25;} + .d2-4119277978 .fill-N2{fill:#676C7E;} + .d2-4119277978 .fill-N3{fill:#9499AB;} + .d2-4119277978 .fill-N4{fill:#CFD2DD;} + .d2-4119277978 .fill-N5{fill:#DEE1EB;} + .d2-4119277978 .fill-N6{fill:#EEF1F8;} + .d2-4119277978 .fill-N7{fill:#FFFFFF;} + .d2-4119277978 .fill-B1{fill:#0D32B2;} + .d2-4119277978 .fill-B2{fill:#0D32B2;} + .d2-4119277978 .fill-B3{fill:#E3E9FD;} + .d2-4119277978 .fill-B4{fill:#E3E9FD;} + .d2-4119277978 .fill-B5{fill:#EDF0FD;} + .d2-4119277978 .fill-B6{fill:#F7F8FE;} + .d2-4119277978 .fill-AA2{fill:#4A6FF3;} + .d2-4119277978 .fill-AA4{fill:#EDF0FD;} + .d2-4119277978 .fill-AA5{fill:#F7F8FE;} + .d2-4119277978 .fill-AB4{fill:#EDF0FD;} + .d2-4119277978 .fill-AB5{fill:#F7F8FE;} + .d2-4119277978 .stroke-N1{stroke:#0A0F25;} + .d2-4119277978 .stroke-N2{stroke:#676C7E;} + .d2-4119277978 .stroke-N3{stroke:#9499AB;} + .d2-4119277978 .stroke-N4{stroke:#CFD2DD;} + .d2-4119277978 .stroke-N5{stroke:#DEE1EB;} + .d2-4119277978 .stroke-N6{stroke:#EEF1F8;} + .d2-4119277978 .stroke-N7{stroke:#FFFFFF;} + .d2-4119277978 .stroke-B1{stroke:#0D32B2;} + .d2-4119277978 .stroke-B2{stroke:#0D32B2;} + .d2-4119277978 .stroke-B3{stroke:#E3E9FD;} + .d2-4119277978 .stroke-B4{stroke:#E3E9FD;} + .d2-4119277978 .stroke-B5{stroke:#EDF0FD;} + .d2-4119277978 .stroke-B6{stroke:#F7F8FE;} + .d2-4119277978 .stroke-AA2{stroke:#4A6FF3;} + .d2-4119277978 .stroke-AA4{stroke:#EDF0FD;} + .d2-4119277978 .stroke-AA5{stroke:#F7F8FE;} + .d2-4119277978 .stroke-AB4{stroke:#EDF0FD;} + .d2-4119277978 .stroke-AB5{stroke:#F7F8FE;} + .d2-4119277978 .background-color-N1{background-color:#0A0F25;} + .d2-4119277978 .background-color-N2{background-color:#676C7E;} + .d2-4119277978 .background-color-N3{background-color:#9499AB;} + .d2-4119277978 .background-color-N4{background-color:#CFD2DD;} + .d2-4119277978 .background-color-N5{background-color:#DEE1EB;} + .d2-4119277978 .background-color-N6{background-color:#EEF1F8;} + .d2-4119277978 .background-color-N7{background-color:#FFFFFF;} + .d2-4119277978 .background-color-B1{background-color:#0D32B2;} + .d2-4119277978 .background-color-B2{background-color:#0D32B2;} + .d2-4119277978 .background-color-B3{background-color:#E3E9FD;} + .d2-4119277978 .background-color-B4{background-color:#E3E9FD;} + .d2-4119277978 .background-color-B5{background-color:#EDF0FD;} + .d2-4119277978 .background-color-B6{background-color:#F7F8FE;} + .d2-4119277978 .background-color-AA2{background-color:#4A6FF3;} + .d2-4119277978 .background-color-AA4{background-color:#EDF0FD;} + .d2-4119277978 .background-color-AA5{background-color:#F7F8FE;} + .d2-4119277978 .background-color-AB4{background-color:#EDF0FD;} + .d2-4119277978 .background-color-AB5{background-color:#F7F8FE;} + .d2-4119277978 .color-N1{color:#0A0F25;} + .d2-4119277978 .color-N2{color:#676C7E;} + .d2-4119277978 .color-N3{color:#9499AB;} + .d2-4119277978 .color-N4{color:#CFD2DD;} + .d2-4119277978 .color-N5{color:#DEE1EB;} + .d2-4119277978 .color-N6{color:#EEF1F8;} + .d2-4119277978 .color-N7{color:#FFFFFF;} + .d2-4119277978 .color-B1{color:#0D32B2;} + .d2-4119277978 .color-B2{color:#0D32B2;} + .d2-4119277978 .color-B3{color:#E3E9FD;} + .d2-4119277978 .color-B4{color:#E3E9FD;} + .d2-4119277978 .color-B5{color:#EDF0FD;} + .d2-4119277978 .color-B6{color:#F7F8FE;} + .d2-4119277978 .color-AA2{color:#4A6FF3;} + .d2-4119277978 .color-AA4{color:#EDF0FD;} + .d2-4119277978 .color-AA5{color:#F7F8FE;} + .d2-4119277978 .color-AB4{color:#EDF0FD;} + .d2-4119277978 .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/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 734441d20..237eed648 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -599,17 +599,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 157.25, - "y": 379 - }, - { - "x": 157.25, - "y": 424 - }, { "x": 148.5, - "y": 424 + "y": 379 }, { "x": 148.5, diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index c1be090d9..471b96643 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-196107944 .fill-N1{fill:#0A0F25;} + .d2-196107944 .fill-N2{fill:#676C7E;} + .d2-196107944 .fill-N3{fill:#9499AB;} + .d2-196107944 .fill-N4{fill:#CFD2DD;} + .d2-196107944 .fill-N5{fill:#DEE1EB;} + .d2-196107944 .fill-N6{fill:#EEF1F8;} + .d2-196107944 .fill-N7{fill:#FFFFFF;} + .d2-196107944 .fill-B1{fill:#0D32B2;} + .d2-196107944 .fill-B2{fill:#0D32B2;} + .d2-196107944 .fill-B3{fill:#E3E9FD;} + .d2-196107944 .fill-B4{fill:#E3E9FD;} + .d2-196107944 .fill-B5{fill:#EDF0FD;} + .d2-196107944 .fill-B6{fill:#F7F8FE;} + .d2-196107944 .fill-AA2{fill:#4A6FF3;} + .d2-196107944 .fill-AA4{fill:#EDF0FD;} + .d2-196107944 .fill-AA5{fill:#F7F8FE;} + .d2-196107944 .fill-AB4{fill:#EDF0FD;} + .d2-196107944 .fill-AB5{fill:#F7F8FE;} + .d2-196107944 .stroke-N1{stroke:#0A0F25;} + .d2-196107944 .stroke-N2{stroke:#676C7E;} + .d2-196107944 .stroke-N3{stroke:#9499AB;} + .d2-196107944 .stroke-N4{stroke:#CFD2DD;} + .d2-196107944 .stroke-N5{stroke:#DEE1EB;} + .d2-196107944 .stroke-N6{stroke:#EEF1F8;} + .d2-196107944 .stroke-N7{stroke:#FFFFFF;} + .d2-196107944 .stroke-B1{stroke:#0D32B2;} + .d2-196107944 .stroke-B2{stroke:#0D32B2;} + .d2-196107944 .stroke-B3{stroke:#E3E9FD;} + .d2-196107944 .stroke-B4{stroke:#E3E9FD;} + .d2-196107944 .stroke-B5{stroke:#EDF0FD;} + .d2-196107944 .stroke-B6{stroke:#F7F8FE;} + .d2-196107944 .stroke-AA2{stroke:#4A6FF3;} + .d2-196107944 .stroke-AA4{stroke:#EDF0FD;} + .d2-196107944 .stroke-AA5{stroke:#F7F8FE;} + .d2-196107944 .stroke-AB4{stroke:#EDF0FD;} + .d2-196107944 .stroke-AB5{stroke:#F7F8FE;} + .d2-196107944 .background-color-N1{background-color:#0A0F25;} + .d2-196107944 .background-color-N2{background-color:#676C7E;} + .d2-196107944 .background-color-N3{background-color:#9499AB;} + .d2-196107944 .background-color-N4{background-color:#CFD2DD;} + .d2-196107944 .background-color-N5{background-color:#DEE1EB;} + .d2-196107944 .background-color-N6{background-color:#EEF1F8;} + .d2-196107944 .background-color-N7{background-color:#FFFFFF;} + .d2-196107944 .background-color-B1{background-color:#0D32B2;} + .d2-196107944 .background-color-B2{background-color:#0D32B2;} + .d2-196107944 .background-color-B3{background-color:#E3E9FD;} + .d2-196107944 .background-color-B4{background-color:#E3E9FD;} + .d2-196107944 .background-color-B5{background-color:#EDF0FD;} + .d2-196107944 .background-color-B6{background-color:#F7F8FE;} + .d2-196107944 .background-color-AA2{background-color:#4A6FF3;} + .d2-196107944 .background-color-AA4{background-color:#EDF0FD;} + .d2-196107944 .background-color-AA5{background-color:#F7F8FE;} + .d2-196107944 .background-color-AB4{background-color:#EDF0FD;} + .d2-196107944 .background-color-AB5{background-color:#F7F8FE;} + .d2-196107944 .color-N1{color:#0A0F25;} + .d2-196107944 .color-N2{color:#676C7E;} + .d2-196107944 .color-N3{color:#9499AB;} + .d2-196107944 .color-N4{color:#CFD2DD;} + .d2-196107944 .color-N5{color:#DEE1EB;} + .d2-196107944 .color-N6{color:#EEF1F8;} + .d2-196107944 .color-N7{color:#FFFFFF;} + .d2-196107944 .color-B1{color:#0D32B2;} + .d2-196107944 .color-B2{color:#0D32B2;} + .d2-196107944 .color-B3{color:#E3E9FD;} + .d2-196107944 .color-B4{color:#E3E9FD;} + .d2-196107944 .color-B5{color:#EDF0FD;} + .d2-196107944 .color-B6{color:#F7F8FE;} + .d2-196107944 .color-AA2{color:#4A6FF3;} + .d2-196107944 .color-AA4{color:#EDF0FD;} + .d2-196107944 .color-AA5{color:#F7F8FE;} + .d2-196107944 .color-AB4{color:#EDF0FD;} + .d2-196107944 .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 7999c5f00..9f0e7d4b5 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -728,17 +728,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 181.5, - "y": 224 - }, - { - "x": 181.5, - "y": 264 - }, { "x": 180, - "y": 264 + "y": 224 }, { "x": 180, @@ -776,17 +768,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 108.5, - "y": 224 - }, - { - "x": 108.5, - "y": 264 - }, { "x": 110, - "y": 264 + "y": 224 }, { "x": 110, @@ -825,27 +809,11 @@ "labelPercentage": 0, "route": [ { - "x": 422.75, + "x": 421, "y": 566 }, - { - "x": 422.75, - "y": 606 - }, { "x": 421, - "y": 606 - }, - { - "x": 421, - "y": 802 - }, - { - "x": 444.3333333333333, - "y": 802 - }, - { - "x": 444.3333333333333, "y": 942 } ], @@ -928,17 +896,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 160, - "y": 370 - }, - { - "x": 160, - "y": 410 - }, { "x": 146, - "y": 410 + "y": 370 }, { "x": 146, @@ -984,17 +944,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 200, - "y": 370 - }, - { - "x": 200, - "y": 410 - }, { "x": 214, - "y": 410 + "y": 370 }, { "x": 214, @@ -1800,17 +1752,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 603.25, - "y": 566 - }, - { - "x": 603.25, - "y": 606 - }, { "x": 601.5, - "y": 606 + "y": 566 }, { "x": 601.5, diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index 36412a1a3..68477b930 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-814832939 .fill-N1{fill:#0A0F25;} + .d2-814832939 .fill-N2{fill:#676C7E;} + .d2-814832939 .fill-N3{fill:#9499AB;} + .d2-814832939 .fill-N4{fill:#CFD2DD;} + .d2-814832939 .fill-N5{fill:#DEE1EB;} + .d2-814832939 .fill-N6{fill:#EEF1F8;} + .d2-814832939 .fill-N7{fill:#FFFFFF;} + .d2-814832939 .fill-B1{fill:#0D32B2;} + .d2-814832939 .fill-B2{fill:#0D32B2;} + .d2-814832939 .fill-B3{fill:#E3E9FD;} + .d2-814832939 .fill-B4{fill:#E3E9FD;} + .d2-814832939 .fill-B5{fill:#EDF0FD;} + .d2-814832939 .fill-B6{fill:#F7F8FE;} + .d2-814832939 .fill-AA2{fill:#4A6FF3;} + .d2-814832939 .fill-AA4{fill:#EDF0FD;} + .d2-814832939 .fill-AA5{fill:#F7F8FE;} + .d2-814832939 .fill-AB4{fill:#EDF0FD;} + .d2-814832939 .fill-AB5{fill:#F7F8FE;} + .d2-814832939 .stroke-N1{stroke:#0A0F25;} + .d2-814832939 .stroke-N2{stroke:#676C7E;} + .d2-814832939 .stroke-N3{stroke:#9499AB;} + .d2-814832939 .stroke-N4{stroke:#CFD2DD;} + .d2-814832939 .stroke-N5{stroke:#DEE1EB;} + .d2-814832939 .stroke-N6{stroke:#EEF1F8;} + .d2-814832939 .stroke-N7{stroke:#FFFFFF;} + .d2-814832939 .stroke-B1{stroke:#0D32B2;} + .d2-814832939 .stroke-B2{stroke:#0D32B2;} + .d2-814832939 .stroke-B3{stroke:#E3E9FD;} + .d2-814832939 .stroke-B4{stroke:#E3E9FD;} + .d2-814832939 .stroke-B5{stroke:#EDF0FD;} + .d2-814832939 .stroke-B6{stroke:#F7F8FE;} + .d2-814832939 .stroke-AA2{stroke:#4A6FF3;} + .d2-814832939 .stroke-AA4{stroke:#EDF0FD;} + .d2-814832939 .stroke-AA5{stroke:#F7F8FE;} + .d2-814832939 .stroke-AB4{stroke:#EDF0FD;} + .d2-814832939 .stroke-AB5{stroke:#F7F8FE;} + .d2-814832939 .background-color-N1{background-color:#0A0F25;} + .d2-814832939 .background-color-N2{background-color:#676C7E;} + .d2-814832939 .background-color-N3{background-color:#9499AB;} + .d2-814832939 .background-color-N4{background-color:#CFD2DD;} + .d2-814832939 .background-color-N5{background-color:#DEE1EB;} + .d2-814832939 .background-color-N6{background-color:#EEF1F8;} + .d2-814832939 .background-color-N7{background-color:#FFFFFF;} + .d2-814832939 .background-color-B1{background-color:#0D32B2;} + .d2-814832939 .background-color-B2{background-color:#0D32B2;} + .d2-814832939 .background-color-B3{background-color:#E3E9FD;} + .d2-814832939 .background-color-B4{background-color:#E3E9FD;} + .d2-814832939 .background-color-B5{background-color:#EDF0FD;} + .d2-814832939 .background-color-B6{background-color:#F7F8FE;} + .d2-814832939 .background-color-AA2{background-color:#4A6FF3;} + .d2-814832939 .background-color-AA4{background-color:#EDF0FD;} + .d2-814832939 .background-color-AA5{background-color:#F7F8FE;} + .d2-814832939 .background-color-AB4{background-color:#EDF0FD;} + .d2-814832939 .background-color-AB5{background-color:#F7F8FE;} + .d2-814832939 .color-N1{color:#0A0F25;} + .d2-814832939 .color-N2{color:#676C7E;} + .d2-814832939 .color-N3{color:#9499AB;} + .d2-814832939 .color-N4{color:#CFD2DD;} + .d2-814832939 .color-N5{color:#DEE1EB;} + .d2-814832939 .color-N6{color:#EEF1F8;} + .d2-814832939 .color-N7{color:#FFFFFF;} + .d2-814832939 .color-B1{color:#0D32B2;} + .d2-814832939 .color-B2{color:#0D32B2;} + .d2-814832939 .color-B3{color:#E3E9FD;} + .d2-814832939 .color-B4{color:#E3E9FD;} + .d2-814832939 .color-B5{color:#EDF0FD;} + .d2-814832939 .color-B6{color:#F7F8FE;} + .d2-814832939 .color-AA2{color:#4A6FF3;} + .d2-814832939 .color-AA4{color:#EDF0FD;} + .d2-814832939 .color-AA5{color:#F7F8FE;} + .d2-814832939 .color-AB4{color:#EDF0FD;} + .d2-814832939 .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/elk_shim/elk/board.exp.json b/e2etests/testdata/stable/elk_shim/elk/board.exp.json index 48c17c04d..67e7418a6 100644 --- a/e2etests/testdata/stable/elk_shim/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/elk/board.exp.json @@ -691,17 +691,9 @@ "labelPercentage": 0, "route": [ { - "x": 373, + "x": 399, "y": 99 }, - { - "x": 372.6666666666667, - "y": 165 - }, - { - "x": 398.6666666666667, - "y": 165 - }, { "x": 399, "y": 416 diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index b519dbbbf..896dba4eb 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell toweronline portaldata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-3026414495 .fill-N1{fill:#0A0F25;} + .d2-3026414495 .fill-N2{fill:#676C7E;} + .d2-3026414495 .fill-N3{fill:#9499AB;} + .d2-3026414495 .fill-N4{fill:#CFD2DD;} + .d2-3026414495 .fill-N5{fill:#DEE1EB;} + .d2-3026414495 .fill-N6{fill:#EEF1F8;} + .d2-3026414495 .fill-N7{fill:#FFFFFF;} + .d2-3026414495 .fill-B1{fill:#0D32B2;} + .d2-3026414495 .fill-B2{fill:#0D32B2;} + .d2-3026414495 .fill-B3{fill:#E3E9FD;} + .d2-3026414495 .fill-B4{fill:#E3E9FD;} + .d2-3026414495 .fill-B5{fill:#EDF0FD;} + .d2-3026414495 .fill-B6{fill:#F7F8FE;} + .d2-3026414495 .fill-AA2{fill:#4A6FF3;} + .d2-3026414495 .fill-AA4{fill:#EDF0FD;} + .d2-3026414495 .fill-AA5{fill:#F7F8FE;} + .d2-3026414495 .fill-AB4{fill:#EDF0FD;} + .d2-3026414495 .fill-AB5{fill:#F7F8FE;} + .d2-3026414495 .stroke-N1{stroke:#0A0F25;} + .d2-3026414495 .stroke-N2{stroke:#676C7E;} + .d2-3026414495 .stroke-N3{stroke:#9499AB;} + .d2-3026414495 .stroke-N4{stroke:#CFD2DD;} + .d2-3026414495 .stroke-N5{stroke:#DEE1EB;} + .d2-3026414495 .stroke-N6{stroke:#EEF1F8;} + .d2-3026414495 .stroke-N7{stroke:#FFFFFF;} + .d2-3026414495 .stroke-B1{stroke:#0D32B2;} + .d2-3026414495 .stroke-B2{stroke:#0D32B2;} + .d2-3026414495 .stroke-B3{stroke:#E3E9FD;} + .d2-3026414495 .stroke-B4{stroke:#E3E9FD;} + .d2-3026414495 .stroke-B5{stroke:#EDF0FD;} + .d2-3026414495 .stroke-B6{stroke:#F7F8FE;} + .d2-3026414495 .stroke-AA2{stroke:#4A6FF3;} + .d2-3026414495 .stroke-AA4{stroke:#EDF0FD;} + .d2-3026414495 .stroke-AA5{stroke:#F7F8FE;} + .d2-3026414495 .stroke-AB4{stroke:#EDF0FD;} + .d2-3026414495 .stroke-AB5{stroke:#F7F8FE;} + .d2-3026414495 .background-color-N1{background-color:#0A0F25;} + .d2-3026414495 .background-color-N2{background-color:#676C7E;} + .d2-3026414495 .background-color-N3{background-color:#9499AB;} + .d2-3026414495 .background-color-N4{background-color:#CFD2DD;} + .d2-3026414495 .background-color-N5{background-color:#DEE1EB;} + .d2-3026414495 .background-color-N6{background-color:#EEF1F8;} + .d2-3026414495 .background-color-N7{background-color:#FFFFFF;} + .d2-3026414495 .background-color-B1{background-color:#0D32B2;} + .d2-3026414495 .background-color-B2{background-color:#0D32B2;} + .d2-3026414495 .background-color-B3{background-color:#E3E9FD;} + .d2-3026414495 .background-color-B4{background-color:#E3E9FD;} + .d2-3026414495 .background-color-B5{background-color:#EDF0FD;} + .d2-3026414495 .background-color-B6{background-color:#F7F8FE;} + .d2-3026414495 .background-color-AA2{background-color:#4A6FF3;} + .d2-3026414495 .background-color-AA4{background-color:#EDF0FD;} + .d2-3026414495 .background-color-AA5{background-color:#F7F8FE;} + .d2-3026414495 .background-color-AB4{background-color:#EDF0FD;} + .d2-3026414495 .background-color-AB5{background-color:#F7F8FE;} + .d2-3026414495 .color-N1{color:#0A0F25;} + .d2-3026414495 .color-N2{color:#676C7E;} + .d2-3026414495 .color-N3{color:#9499AB;} + .d2-3026414495 .color-N4{color:#CFD2DD;} + .d2-3026414495 .color-N5{color:#DEE1EB;} + .d2-3026414495 .color-N6{color:#EEF1F8;} + .d2-3026414495 .color-N7{color:#FFFFFF;} + .d2-3026414495 .color-B1{color:#0D32B2;} + .d2-3026414495 .color-B2{color:#0D32B2;} + .d2-3026414495 .color-B3{color:#E3E9FD;} + .d2-3026414495 .color-B4{color:#E3E9FD;} + .d2-3026414495 .color-B5{color:#EDF0FD;} + .d2-3026414495 .color-B6{color:#F7F8FE;} + .d2-3026414495 .color-AA2{color:#4A6FF3;} + .d2-3026414495 .color-AA4{color:#EDF0FD;} + .d2-3026414495 .color-AA5{color:#F7F8FE;} + .d2-3026414495 .color-AB4{color:#EDF0FD;} + .d2-3026414495 .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}]]>networkuserapi serverlogscell toweronline portaldata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - + \ 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 0889b4bf4..192e9ea06 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -1331,15 +1331,7 @@ "y": 111 }, { - "x": 263.08333333333337, - "y": 153 - }, - { - "x": 297.16666666666663, - "y": 153 - }, - { - "x": 297, + "x": 263, "y": 193 } ], @@ -1771,16 +1763,8 @@ "y": 2322 }, { - "x": 351.66666666666663, - "y": 2423 - }, - { - "x": 341.66666666666663, - "y": 2423 - }, - { - "x": 342, - "y": 2518 + "x": 352, + "y": 2519 } ], "animated": false, @@ -2099,15 +2083,7 @@ "y": 1567.6666666666667 }, { - "x": 221.66666666666669, - "y": 1646 - }, - { - "x": 202.66666666666669, - "y": 1646 - }, - { - "x": 203, + "x": 222, "y": 1686 } ], @@ -2286,17 +2262,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 434.16666666666663, - "y": 2735 - }, - { - "x": 434.16666666666663, - "y": 2830 - }, { "x": 451.8333333333333, - "y": 2830 + "y": 2735 }, { "x": 452, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index cff36b15f..ebb9a2f5c 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-2423305564 .fill-N1{fill:#0A0F25;} + .d2-2423305564 .fill-N2{fill:#676C7E;} + .d2-2423305564 .fill-N3{fill:#9499AB;} + .d2-2423305564 .fill-N4{fill:#CFD2DD;} + .d2-2423305564 .fill-N5{fill:#DEE1EB;} + .d2-2423305564 .fill-N6{fill:#EEF1F8;} + .d2-2423305564 .fill-N7{fill:#FFFFFF;} + .d2-2423305564 .fill-B1{fill:#0D32B2;} + .d2-2423305564 .fill-B2{fill:#0D32B2;} + .d2-2423305564 .fill-B3{fill:#E3E9FD;} + .d2-2423305564 .fill-B4{fill:#E3E9FD;} + .d2-2423305564 .fill-B5{fill:#EDF0FD;} + .d2-2423305564 .fill-B6{fill:#F7F8FE;} + .d2-2423305564 .fill-AA2{fill:#4A6FF3;} + .d2-2423305564 .fill-AA4{fill:#EDF0FD;} + .d2-2423305564 .fill-AA5{fill:#F7F8FE;} + .d2-2423305564 .fill-AB4{fill:#EDF0FD;} + .d2-2423305564 .fill-AB5{fill:#F7F8FE;} + .d2-2423305564 .stroke-N1{stroke:#0A0F25;} + .d2-2423305564 .stroke-N2{stroke:#676C7E;} + .d2-2423305564 .stroke-N3{stroke:#9499AB;} + .d2-2423305564 .stroke-N4{stroke:#CFD2DD;} + .d2-2423305564 .stroke-N5{stroke:#DEE1EB;} + .d2-2423305564 .stroke-N6{stroke:#EEF1F8;} + .d2-2423305564 .stroke-N7{stroke:#FFFFFF;} + .d2-2423305564 .stroke-B1{stroke:#0D32B2;} + .d2-2423305564 .stroke-B2{stroke:#0D32B2;} + .d2-2423305564 .stroke-B3{stroke:#E3E9FD;} + .d2-2423305564 .stroke-B4{stroke:#E3E9FD;} + .d2-2423305564 .stroke-B5{stroke:#EDF0FD;} + .d2-2423305564 .stroke-B6{stroke:#F7F8FE;} + .d2-2423305564 .stroke-AA2{stroke:#4A6FF3;} + .d2-2423305564 .stroke-AA4{stroke:#EDF0FD;} + .d2-2423305564 .stroke-AA5{stroke:#F7F8FE;} + .d2-2423305564 .stroke-AB4{stroke:#EDF0FD;} + .d2-2423305564 .stroke-AB5{stroke:#F7F8FE;} + .d2-2423305564 .background-color-N1{background-color:#0A0F25;} + .d2-2423305564 .background-color-N2{background-color:#676C7E;} + .d2-2423305564 .background-color-N3{background-color:#9499AB;} + .d2-2423305564 .background-color-N4{background-color:#CFD2DD;} + .d2-2423305564 .background-color-N5{background-color:#DEE1EB;} + .d2-2423305564 .background-color-N6{background-color:#EEF1F8;} + .d2-2423305564 .background-color-N7{background-color:#FFFFFF;} + .d2-2423305564 .background-color-B1{background-color:#0D32B2;} + .d2-2423305564 .background-color-B2{background-color:#0D32B2;} + .d2-2423305564 .background-color-B3{background-color:#E3E9FD;} + .d2-2423305564 .background-color-B4{background-color:#E3E9FD;} + .d2-2423305564 .background-color-B5{background-color:#EDF0FD;} + .d2-2423305564 .background-color-B6{background-color:#F7F8FE;} + .d2-2423305564 .background-color-AA2{background-color:#4A6FF3;} + .d2-2423305564 .background-color-AA4{background-color:#EDF0FD;} + .d2-2423305564 .background-color-AA5{background-color:#F7F8FE;} + .d2-2423305564 .background-color-AB4{background-color:#EDF0FD;} + .d2-2423305564 .background-color-AB5{background-color:#F7F8FE;} + .d2-2423305564 .color-N1{color:#0A0F25;} + .d2-2423305564 .color-N2{color:#676C7E;} + .d2-2423305564 .color-N3{color:#9499AB;} + .d2-2423305564 .color-N4{color:#CFD2DD;} + .d2-2423305564 .color-N5{color:#DEE1EB;} + .d2-2423305564 .color-N6{color:#EEF1F8;} + .d2-2423305564 .color-N7{color:#FFFFFF;} + .d2-2423305564 .color-B1{color:#0D32B2;} + .d2-2423305564 .color-B2{color:#0D32B2;} + .d2-2423305564 .color-B3{color:#E3E9FD;} + .d2-2423305564 .color-B4{color:#E3E9FD;} + .d2-2423305564 .color-B5{color:#EDF0FD;} + .d2-2423305564 .color-B6{color:#F7F8FE;} + .d2-2423305564 .color-AA2{color:#4A6FF3;} + .d2-2423305564 .color-AA4{color:#EDF0FD;} + .d2-2423305564 .color-AA5{color:#F7F8FE;} + .d2-2423305564 .color-AB4{color:#EDF0FD;} + .d2-2423305564 .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 b4ffe6b6b..2374c0d59 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -1768,17 +1768,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 586.4166666666665, - "y": 1443.625 - }, - { - "x": 586.4166666666665, - "y": 1578 - }, { "x": 589.9166666666666, - "y": 1578 + "y": 1443.625 }, { "x": 589.9166666666666, @@ -2078,14 +2070,6 @@ }, { "x": 528, - "y": 966 - }, - { - "x": 503.08333333333326, - "y": 966 - }, - { - "x": 503.08333333333326, "y": 1377.625 } ], @@ -2120,17 +2104,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 225, - "y": 617 - }, - { - "x": 225, - "y": 966 - }, { "x": 197.5, - "y": 966 + "y": 617 }, { "x": 197.4999999999999, diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 129050c4a..f53e9360b 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-1000489389 .fill-N1{fill:#0A0F25;} + .d2-1000489389 .fill-N2{fill:#676C7E;} + .d2-1000489389 .fill-N3{fill:#9499AB;} + .d2-1000489389 .fill-N4{fill:#CFD2DD;} + .d2-1000489389 .fill-N5{fill:#DEE1EB;} + .d2-1000489389 .fill-N6{fill:#EEF1F8;} + .d2-1000489389 .fill-N7{fill:#FFFFFF;} + .d2-1000489389 .fill-B1{fill:#0D32B2;} + .d2-1000489389 .fill-B2{fill:#0D32B2;} + .d2-1000489389 .fill-B3{fill:#E3E9FD;} + .d2-1000489389 .fill-B4{fill:#E3E9FD;} + .d2-1000489389 .fill-B5{fill:#EDF0FD;} + .d2-1000489389 .fill-B6{fill:#F7F8FE;} + .d2-1000489389 .fill-AA2{fill:#4A6FF3;} + .d2-1000489389 .fill-AA4{fill:#EDF0FD;} + .d2-1000489389 .fill-AA5{fill:#F7F8FE;} + .d2-1000489389 .fill-AB4{fill:#EDF0FD;} + .d2-1000489389 .fill-AB5{fill:#F7F8FE;} + .d2-1000489389 .stroke-N1{stroke:#0A0F25;} + .d2-1000489389 .stroke-N2{stroke:#676C7E;} + .d2-1000489389 .stroke-N3{stroke:#9499AB;} + .d2-1000489389 .stroke-N4{stroke:#CFD2DD;} + .d2-1000489389 .stroke-N5{stroke:#DEE1EB;} + .d2-1000489389 .stroke-N6{stroke:#EEF1F8;} + .d2-1000489389 .stroke-N7{stroke:#FFFFFF;} + .d2-1000489389 .stroke-B1{stroke:#0D32B2;} + .d2-1000489389 .stroke-B2{stroke:#0D32B2;} + .d2-1000489389 .stroke-B3{stroke:#E3E9FD;} + .d2-1000489389 .stroke-B4{stroke:#E3E9FD;} + .d2-1000489389 .stroke-B5{stroke:#EDF0FD;} + .d2-1000489389 .stroke-B6{stroke:#F7F8FE;} + .d2-1000489389 .stroke-AA2{stroke:#4A6FF3;} + .d2-1000489389 .stroke-AA4{stroke:#EDF0FD;} + .d2-1000489389 .stroke-AA5{stroke:#F7F8FE;} + .d2-1000489389 .stroke-AB4{stroke:#EDF0FD;} + .d2-1000489389 .stroke-AB5{stroke:#F7F8FE;} + .d2-1000489389 .background-color-N1{background-color:#0A0F25;} + .d2-1000489389 .background-color-N2{background-color:#676C7E;} + .d2-1000489389 .background-color-N3{background-color:#9499AB;} + .d2-1000489389 .background-color-N4{background-color:#CFD2DD;} + .d2-1000489389 .background-color-N5{background-color:#DEE1EB;} + .d2-1000489389 .background-color-N6{background-color:#EEF1F8;} + .d2-1000489389 .background-color-N7{background-color:#FFFFFF;} + .d2-1000489389 .background-color-B1{background-color:#0D32B2;} + .d2-1000489389 .background-color-B2{background-color:#0D32B2;} + .d2-1000489389 .background-color-B3{background-color:#E3E9FD;} + .d2-1000489389 .background-color-B4{background-color:#E3E9FD;} + .d2-1000489389 .background-color-B5{background-color:#EDF0FD;} + .d2-1000489389 .background-color-B6{background-color:#F7F8FE;} + .d2-1000489389 .background-color-AA2{background-color:#4A6FF3;} + .d2-1000489389 .background-color-AA4{background-color:#EDF0FD;} + .d2-1000489389 .background-color-AA5{background-color:#F7F8FE;} + .d2-1000489389 .background-color-AB4{background-color:#EDF0FD;} + .d2-1000489389 .background-color-AB5{background-color:#F7F8FE;} + .d2-1000489389 .color-N1{color:#0A0F25;} + .d2-1000489389 .color-N2{color:#676C7E;} + .d2-1000489389 .color-N3{color:#9499AB;} + .d2-1000489389 .color-N4{color:#CFD2DD;} + .d2-1000489389 .color-N5{color:#DEE1EB;} + .d2-1000489389 .color-N6{color:#EEF1F8;} + .d2-1000489389 .color-N7{color:#FFFFFF;} + .d2-1000489389 .color-B1{color:#0D32B2;} + .d2-1000489389 .color-B2{color:#0D32B2;} + .d2-1000489389 .color-B3{color:#E3E9FD;} + .d2-1000489389 .color-B4{color:#E3E9FD;} + .d2-1000489389 .color-B5{color:#EDF0FD;} + .d2-1000489389 .color-B6{color:#F7F8FE;} + .d2-1000489389 .color-AA2{color:#4A6FF3;} + .d2-1000489389 .color-AA4{color:#EDF0FD;} + .d2-1000489389 .color-AA5{color:#F7F8FE;} + .d2-1000489389 .color-AB4{color:#EDF0FD;} + .d2-1000489389 .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 b54e1f4aa..bcc4c40d3 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -280,14 +280,6 @@ }, { "x": 294.9166666666667, - "y": 103 - }, - { - "x": 203, - "y": 103 - }, - { - "x": 203, "y": 143 } ], diff --git a/e2etests/testdata/stable/latex/elk/sketch.exp.svg b/e2etests/testdata/stable/latex/elk/sketch.exp.svg index 6c12727d1..ea9f1c914 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 39ab35100..de34f6528 100644 --- a/e2etests/testdata/stable/mono-font/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-font/elk/board.exp.json @@ -114,27 +114,11 @@ "labelPercentage": 0, "route": [ { - "x": 52, + "x": 44, "y": 78 }, - { - "x": 52.25, - "y": 118 - }, { "x": 44.5, - "y": 118 - }, - { - "x": 44.5, - "y": 219 - }, - { - "x": 54.75, - "y": 219 - }, - { - "x": 54.75, "y": 259 } ], @@ -210,27 +194,11 @@ "labelPercentage": 0, "route": [ { - "x": 133, + "x": 140, "y": 78 }, - { - "x": 132.75, - "y": 118 - }, { "x": 140.5, - "y": 118 - }, - { - "x": 140.5, - "y": 219 - }, - { - "x": 130.25, - "y": 219 - }, - { - "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 591742c9c..0e726f1c6 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-1206402152 .fill-N1{fill:#0A0F25;} + .d2-1206402152 .fill-N2{fill:#676C7E;} + .d2-1206402152 .fill-N3{fill:#9499AB;} + .d2-1206402152 .fill-N4{fill:#CFD2DD;} + .d2-1206402152 .fill-N5{fill:#DEE1EB;} + .d2-1206402152 .fill-N6{fill:#EEF1F8;} + .d2-1206402152 .fill-N7{fill:#FFFFFF;} + .d2-1206402152 .fill-B1{fill:#0D32B2;} + .d2-1206402152 .fill-B2{fill:#0D32B2;} + .d2-1206402152 .fill-B3{fill:#E3E9FD;} + .d2-1206402152 .fill-B4{fill:#E3E9FD;} + .d2-1206402152 .fill-B5{fill:#EDF0FD;} + .d2-1206402152 .fill-B6{fill:#F7F8FE;} + .d2-1206402152 .fill-AA2{fill:#4A6FF3;} + .d2-1206402152 .fill-AA4{fill:#EDF0FD;} + .d2-1206402152 .fill-AA5{fill:#F7F8FE;} + .d2-1206402152 .fill-AB4{fill:#EDF0FD;} + .d2-1206402152 .fill-AB5{fill:#F7F8FE;} + .d2-1206402152 .stroke-N1{stroke:#0A0F25;} + .d2-1206402152 .stroke-N2{stroke:#676C7E;} + .d2-1206402152 .stroke-N3{stroke:#9499AB;} + .d2-1206402152 .stroke-N4{stroke:#CFD2DD;} + .d2-1206402152 .stroke-N5{stroke:#DEE1EB;} + .d2-1206402152 .stroke-N6{stroke:#EEF1F8;} + .d2-1206402152 .stroke-N7{stroke:#FFFFFF;} + .d2-1206402152 .stroke-B1{stroke:#0D32B2;} + .d2-1206402152 .stroke-B2{stroke:#0D32B2;} + .d2-1206402152 .stroke-B3{stroke:#E3E9FD;} + .d2-1206402152 .stroke-B4{stroke:#E3E9FD;} + .d2-1206402152 .stroke-B5{stroke:#EDF0FD;} + .d2-1206402152 .stroke-B6{stroke:#F7F8FE;} + .d2-1206402152 .stroke-AA2{stroke:#4A6FF3;} + .d2-1206402152 .stroke-AA4{stroke:#EDF0FD;} + .d2-1206402152 .stroke-AA5{stroke:#F7F8FE;} + .d2-1206402152 .stroke-AB4{stroke:#EDF0FD;} + .d2-1206402152 .stroke-AB5{stroke:#F7F8FE;} + .d2-1206402152 .background-color-N1{background-color:#0A0F25;} + .d2-1206402152 .background-color-N2{background-color:#676C7E;} + .d2-1206402152 .background-color-N3{background-color:#9499AB;} + .d2-1206402152 .background-color-N4{background-color:#CFD2DD;} + .d2-1206402152 .background-color-N5{background-color:#DEE1EB;} + .d2-1206402152 .background-color-N6{background-color:#EEF1F8;} + .d2-1206402152 .background-color-N7{background-color:#FFFFFF;} + .d2-1206402152 .background-color-B1{background-color:#0D32B2;} + .d2-1206402152 .background-color-B2{background-color:#0D32B2;} + .d2-1206402152 .background-color-B3{background-color:#E3E9FD;} + .d2-1206402152 .background-color-B4{background-color:#E3E9FD;} + .d2-1206402152 .background-color-B5{background-color:#EDF0FD;} + .d2-1206402152 .background-color-B6{background-color:#F7F8FE;} + .d2-1206402152 .background-color-AA2{background-color:#4A6FF3;} + .d2-1206402152 .background-color-AA4{background-color:#EDF0FD;} + .d2-1206402152 .background-color-AA5{background-color:#F7F8FE;} + .d2-1206402152 .background-color-AB4{background-color:#EDF0FD;} + .d2-1206402152 .background-color-AB5{background-color:#F7F8FE;} + .d2-1206402152 .color-N1{color:#0A0F25;} + .d2-1206402152 .color-N2{color:#676C7E;} + .d2-1206402152 .color-N3{color:#9499AB;} + .d2-1206402152 .color-N4{color:#CFD2DD;} + .d2-1206402152 .color-N5{color:#DEE1EB;} + .d2-1206402152 .color-N6{color:#EEF1F8;} + .d2-1206402152 .color-N7{color:#FFFFFF;} + .d2-1206402152 .color-B1{color:#0D32B2;} + .d2-1206402152 .color-B2{color:#0D32B2;} + .d2-1206402152 .color-B3{color:#E3E9FD;} + .d2-1206402152 .color-B4{color:#E3E9FD;} + .d2-1206402152 .color-B5{color:#EDF0FD;} + .d2-1206402152 .color-B6{color:#F7F8FE;} + .d2-1206402152 .color-AA2{color:#4A6FF3;} + .d2-1206402152 .color-AA4{color:#EDF0FD;} + .d2-1206402152 .color-AA5{color:#F7F8FE;} + .d2-1206402152 .color-AB4{color:#EDF0FD;} + .d2-1206402152 .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 dd3d5dded..c74035438 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -1308,14 +1308,6 @@ }, { "x": 106.5, - "y": 400 - }, - { - "x": 89.25, - "y": 400 - }, - { - "x": 89.25, "y": 590 } ], @@ -1924,14 +1916,6 @@ }, { "x": 744.5, - "y": 400 - }, - { - "x": 767, - "y": 400 - }, - { - "x": 767, "y": 590 } ], diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index b42e542ed..f72fbbf94 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-662622818 .fill-N1{fill:#0A0F25;} + .d2-662622818 .fill-N2{fill:#676C7E;} + .d2-662622818 .fill-N3{fill:#9499AB;} + .d2-662622818 .fill-N4{fill:#CFD2DD;} + .d2-662622818 .fill-N5{fill:#DEE1EB;} + .d2-662622818 .fill-N6{fill:#EEF1F8;} + .d2-662622818 .fill-N7{fill:#FFFFFF;} + .d2-662622818 .fill-B1{fill:#0D32B2;} + .d2-662622818 .fill-B2{fill:#0D32B2;} + .d2-662622818 .fill-B3{fill:#E3E9FD;} + .d2-662622818 .fill-B4{fill:#E3E9FD;} + .d2-662622818 .fill-B5{fill:#EDF0FD;} + .d2-662622818 .fill-B6{fill:#F7F8FE;} + .d2-662622818 .fill-AA2{fill:#4A6FF3;} + .d2-662622818 .fill-AA4{fill:#EDF0FD;} + .d2-662622818 .fill-AA5{fill:#F7F8FE;} + .d2-662622818 .fill-AB4{fill:#EDF0FD;} + .d2-662622818 .fill-AB5{fill:#F7F8FE;} + .d2-662622818 .stroke-N1{stroke:#0A0F25;} + .d2-662622818 .stroke-N2{stroke:#676C7E;} + .d2-662622818 .stroke-N3{stroke:#9499AB;} + .d2-662622818 .stroke-N4{stroke:#CFD2DD;} + .d2-662622818 .stroke-N5{stroke:#DEE1EB;} + .d2-662622818 .stroke-N6{stroke:#EEF1F8;} + .d2-662622818 .stroke-N7{stroke:#FFFFFF;} + .d2-662622818 .stroke-B1{stroke:#0D32B2;} + .d2-662622818 .stroke-B2{stroke:#0D32B2;} + .d2-662622818 .stroke-B3{stroke:#E3E9FD;} + .d2-662622818 .stroke-B4{stroke:#E3E9FD;} + .d2-662622818 .stroke-B5{stroke:#EDF0FD;} + .d2-662622818 .stroke-B6{stroke:#F7F8FE;} + .d2-662622818 .stroke-AA2{stroke:#4A6FF3;} + .d2-662622818 .stroke-AA4{stroke:#EDF0FD;} + .d2-662622818 .stroke-AA5{stroke:#F7F8FE;} + .d2-662622818 .stroke-AB4{stroke:#EDF0FD;} + .d2-662622818 .stroke-AB5{stroke:#F7F8FE;} + .d2-662622818 .background-color-N1{background-color:#0A0F25;} + .d2-662622818 .background-color-N2{background-color:#676C7E;} + .d2-662622818 .background-color-N3{background-color:#9499AB;} + .d2-662622818 .background-color-N4{background-color:#CFD2DD;} + .d2-662622818 .background-color-N5{background-color:#DEE1EB;} + .d2-662622818 .background-color-N6{background-color:#EEF1F8;} + .d2-662622818 .background-color-N7{background-color:#FFFFFF;} + .d2-662622818 .background-color-B1{background-color:#0D32B2;} + .d2-662622818 .background-color-B2{background-color:#0D32B2;} + .d2-662622818 .background-color-B3{background-color:#E3E9FD;} + .d2-662622818 .background-color-B4{background-color:#E3E9FD;} + .d2-662622818 .background-color-B5{background-color:#EDF0FD;} + .d2-662622818 .background-color-B6{background-color:#F7F8FE;} + .d2-662622818 .background-color-AA2{background-color:#4A6FF3;} + .d2-662622818 .background-color-AA4{background-color:#EDF0FD;} + .d2-662622818 .background-color-AA5{background-color:#F7F8FE;} + .d2-662622818 .background-color-AB4{background-color:#EDF0FD;} + .d2-662622818 .background-color-AB5{background-color:#F7F8FE;} + .d2-662622818 .color-N1{color:#0A0F25;} + .d2-662622818 .color-N2{color:#676C7E;} + .d2-662622818 .color-N3{color:#9499AB;} + .d2-662622818 .color-N4{color:#CFD2DD;} + .d2-662622818 .color-N5{color:#DEE1EB;} + .d2-662622818 .color-N6{color:#EEF1F8;} + .d2-662622818 .color-N7{color:#FFFFFF;} + .d2-662622818 .color-B1{color:#0D32B2;} + .d2-662622818 .color-B2{color:#0D32B2;} + .d2-662622818 .color-B3{color:#E3E9FD;} + .d2-662622818 .color-B4{color:#E3E9FD;} + .d2-662622818 .color-B5{color:#EDF0FD;} + .d2-662622818 .color-B6{color:#F7F8FE;} + .d2-662622818 .color-AA2{color:#4A6FF3;} + .d2-662622818 .color-AA4{color:#EDF0FD;} + .d2-662622818 .color-AA5{color:#F7F8FE;} + .d2-662622818 .color-AB4{color:#EDF0FD;} + .d2-662622818 .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 7d091e448..76ac9c48f 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -1628,17 +1628,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 55.33333333333337, - "y": 752 - }, - { - "x": 55.33333333333337, - "y": 792 - }, { "x": 38.66666666666663, - "y": 792 + "y": 752 }, { "x": 38.66666666666663, @@ -1676,17 +1668,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 88.66666666666663, - "y": 752 - }, - { - "x": 88.66666666666663, - "y": 842 - }, { "x": 65.33333333333337, - "y": 842 + "y": 752 }, { "x": 65.33333333333337, @@ -1738,14 +1722,6 @@ }, { "x": 132, - "y": 1134 - }, - { - "x": 135.33333333333326, - "y": 1134 - }, - { - "x": 135.33333333333326, "y": 1174 } ], @@ -1828,17 +1804,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 236.33333333333326, - "y": 948 - }, - { - "x": 236.33333333333326, - "y": 988 - }, { "x": 233, - "y": 988 + "y": 948 }, { "x": 233, @@ -1924,17 +1892,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 155.33333333333326, - "y": 752 - }, - { - "x": 155.33333333333326, - "y": 792 - }, { "x": 150.83333333333326, - "y": 792 + "y": 752 }, { "x": 150.83333333333326, @@ -2122,14 +2082,6 @@ }, { "x": 366.6666666666667, - "y": 400 - }, - { - "x": 341.8333333333333, - "y": 400 - }, - { - "x": 341.8333333333333, "y": 540 } ], @@ -2170,14 +2122,6 @@ }, { "x": 368.49999999999994, - "y": 646 - }, - { - "x": 397.33333333333326, - "y": 646 - }, - { - "x": 397.33333333333326, "y": 686 } ], diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index 1bcdeff99..19189504c 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-1920563192 .fill-N1{fill:#0A0F25;} + .d2-1920563192 .fill-N2{fill:#676C7E;} + .d2-1920563192 .fill-N3{fill:#9499AB;} + .d2-1920563192 .fill-N4{fill:#CFD2DD;} + .d2-1920563192 .fill-N5{fill:#DEE1EB;} + .d2-1920563192 .fill-N6{fill:#EEF1F8;} + .d2-1920563192 .fill-N7{fill:#FFFFFF;} + .d2-1920563192 .fill-B1{fill:#0D32B2;} + .d2-1920563192 .fill-B2{fill:#0D32B2;} + .d2-1920563192 .fill-B3{fill:#E3E9FD;} + .d2-1920563192 .fill-B4{fill:#E3E9FD;} + .d2-1920563192 .fill-B5{fill:#EDF0FD;} + .d2-1920563192 .fill-B6{fill:#F7F8FE;} + .d2-1920563192 .fill-AA2{fill:#4A6FF3;} + .d2-1920563192 .fill-AA4{fill:#EDF0FD;} + .d2-1920563192 .fill-AA5{fill:#F7F8FE;} + .d2-1920563192 .fill-AB4{fill:#EDF0FD;} + .d2-1920563192 .fill-AB5{fill:#F7F8FE;} + .d2-1920563192 .stroke-N1{stroke:#0A0F25;} + .d2-1920563192 .stroke-N2{stroke:#676C7E;} + .d2-1920563192 .stroke-N3{stroke:#9499AB;} + .d2-1920563192 .stroke-N4{stroke:#CFD2DD;} + .d2-1920563192 .stroke-N5{stroke:#DEE1EB;} + .d2-1920563192 .stroke-N6{stroke:#EEF1F8;} + .d2-1920563192 .stroke-N7{stroke:#FFFFFF;} + .d2-1920563192 .stroke-B1{stroke:#0D32B2;} + .d2-1920563192 .stroke-B2{stroke:#0D32B2;} + .d2-1920563192 .stroke-B3{stroke:#E3E9FD;} + .d2-1920563192 .stroke-B4{stroke:#E3E9FD;} + .d2-1920563192 .stroke-B5{stroke:#EDF0FD;} + .d2-1920563192 .stroke-B6{stroke:#F7F8FE;} + .d2-1920563192 .stroke-AA2{stroke:#4A6FF3;} + .d2-1920563192 .stroke-AA4{stroke:#EDF0FD;} + .d2-1920563192 .stroke-AA5{stroke:#F7F8FE;} + .d2-1920563192 .stroke-AB4{stroke:#EDF0FD;} + .d2-1920563192 .stroke-AB5{stroke:#F7F8FE;} + .d2-1920563192 .background-color-N1{background-color:#0A0F25;} + .d2-1920563192 .background-color-N2{background-color:#676C7E;} + .d2-1920563192 .background-color-N3{background-color:#9499AB;} + .d2-1920563192 .background-color-N4{background-color:#CFD2DD;} + .d2-1920563192 .background-color-N5{background-color:#DEE1EB;} + .d2-1920563192 .background-color-N6{background-color:#EEF1F8;} + .d2-1920563192 .background-color-N7{background-color:#FFFFFF;} + .d2-1920563192 .background-color-B1{background-color:#0D32B2;} + .d2-1920563192 .background-color-B2{background-color:#0D32B2;} + .d2-1920563192 .background-color-B3{background-color:#E3E9FD;} + .d2-1920563192 .background-color-B4{background-color:#E3E9FD;} + .d2-1920563192 .background-color-B5{background-color:#EDF0FD;} + .d2-1920563192 .background-color-B6{background-color:#F7F8FE;} + .d2-1920563192 .background-color-AA2{background-color:#4A6FF3;} + .d2-1920563192 .background-color-AA4{background-color:#EDF0FD;} + .d2-1920563192 .background-color-AA5{background-color:#F7F8FE;} + .d2-1920563192 .background-color-AB4{background-color:#EDF0FD;} + .d2-1920563192 .background-color-AB5{background-color:#F7F8FE;} + .d2-1920563192 .color-N1{color:#0A0F25;} + .d2-1920563192 .color-N2{color:#676C7E;} + .d2-1920563192 .color-N3{color:#9499AB;} + .d2-1920563192 .color-N4{color:#CFD2DD;} + .d2-1920563192 .color-N5{color:#DEE1EB;} + .d2-1920563192 .color-N6{color:#EEF1F8;} + .d2-1920563192 .color-N7{color:#FFFFFF;} + .d2-1920563192 .color-B1{color:#0D32B2;} + .d2-1920563192 .color-B2{color:#0D32B2;} + .d2-1920563192 .color-B3{color:#E3E9FD;} + .d2-1920563192 .color-B4{color:#E3E9FD;} + .d2-1920563192 .color-B5{color:#EDF0FD;} + .d2-1920563192 .color-B6{color:#F7F8FE;} + .d2-1920563192 .color-AA2{color:#4A6FF3;} + .d2-1920563192 .color-AA4{color:#EDF0FD;} + .d2-1920563192 .color-AA5{color:#F7F8FE;} + .d2-1920563192 .color-AB4{color:#EDF0FD;} + .d2-1920563192 .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 aac27377d..18497eca4 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -359,17 +359,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 88.5, - "y": 128 - }, - { - "x": 88.5, - "y": 223 - }, { "x": 78.25, - "y": 223 + "y": 128 }, { "x": 78.25, @@ -415,17 +407,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 148.75, - "y": 651 - }, - { - "x": 148.75, - "y": 691 - }, { "x": 142.5, - "y": 691 + "y": 651 }, { "x": 142.5, @@ -551,17 +535,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 171.5, - "y": 178 - }, - { - "x": 171.5, - "y": 223 - }, { "x": 220.75, - "y": 223 + "y": 178 }, { "x": 220.75, @@ -645,14 +621,6 @@ }, { "x": 161.5, - "y": 273 - }, - { - "x": 148.75, - "y": 273 - }, - { - "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 5f3cbdc10..d90708b1e 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-1309689446 .fill-N1{fill:#0A0F25;} + .d2-1309689446 .fill-N2{fill:#676C7E;} + .d2-1309689446 .fill-N3{fill:#9499AB;} + .d2-1309689446 .fill-N4{fill:#CFD2DD;} + .d2-1309689446 .fill-N5{fill:#DEE1EB;} + .d2-1309689446 .fill-N6{fill:#EEF1F8;} + .d2-1309689446 .fill-N7{fill:#FFFFFF;} + .d2-1309689446 .fill-B1{fill:#0D32B2;} + .d2-1309689446 .fill-B2{fill:#0D32B2;} + .d2-1309689446 .fill-B3{fill:#E3E9FD;} + .d2-1309689446 .fill-B4{fill:#E3E9FD;} + .d2-1309689446 .fill-B5{fill:#EDF0FD;} + .d2-1309689446 .fill-B6{fill:#F7F8FE;} + .d2-1309689446 .fill-AA2{fill:#4A6FF3;} + .d2-1309689446 .fill-AA4{fill:#EDF0FD;} + .d2-1309689446 .fill-AA5{fill:#F7F8FE;} + .d2-1309689446 .fill-AB4{fill:#EDF0FD;} + .d2-1309689446 .fill-AB5{fill:#F7F8FE;} + .d2-1309689446 .stroke-N1{stroke:#0A0F25;} + .d2-1309689446 .stroke-N2{stroke:#676C7E;} + .d2-1309689446 .stroke-N3{stroke:#9499AB;} + .d2-1309689446 .stroke-N4{stroke:#CFD2DD;} + .d2-1309689446 .stroke-N5{stroke:#DEE1EB;} + .d2-1309689446 .stroke-N6{stroke:#EEF1F8;} + .d2-1309689446 .stroke-N7{stroke:#FFFFFF;} + .d2-1309689446 .stroke-B1{stroke:#0D32B2;} + .d2-1309689446 .stroke-B2{stroke:#0D32B2;} + .d2-1309689446 .stroke-B3{stroke:#E3E9FD;} + .d2-1309689446 .stroke-B4{stroke:#E3E9FD;} + .d2-1309689446 .stroke-B5{stroke:#EDF0FD;} + .d2-1309689446 .stroke-B6{stroke:#F7F8FE;} + .d2-1309689446 .stroke-AA2{stroke:#4A6FF3;} + .d2-1309689446 .stroke-AA4{stroke:#EDF0FD;} + .d2-1309689446 .stroke-AA5{stroke:#F7F8FE;} + .d2-1309689446 .stroke-AB4{stroke:#EDF0FD;} + .d2-1309689446 .stroke-AB5{stroke:#F7F8FE;} + .d2-1309689446 .background-color-N1{background-color:#0A0F25;} + .d2-1309689446 .background-color-N2{background-color:#676C7E;} + .d2-1309689446 .background-color-N3{background-color:#9499AB;} + .d2-1309689446 .background-color-N4{background-color:#CFD2DD;} + .d2-1309689446 .background-color-N5{background-color:#DEE1EB;} + .d2-1309689446 .background-color-N6{background-color:#EEF1F8;} + .d2-1309689446 .background-color-N7{background-color:#FFFFFF;} + .d2-1309689446 .background-color-B1{background-color:#0D32B2;} + .d2-1309689446 .background-color-B2{background-color:#0D32B2;} + .d2-1309689446 .background-color-B3{background-color:#E3E9FD;} + .d2-1309689446 .background-color-B4{background-color:#E3E9FD;} + .d2-1309689446 .background-color-B5{background-color:#EDF0FD;} + .d2-1309689446 .background-color-B6{background-color:#F7F8FE;} + .d2-1309689446 .background-color-AA2{background-color:#4A6FF3;} + .d2-1309689446 .background-color-AA4{background-color:#EDF0FD;} + .d2-1309689446 .background-color-AA5{background-color:#F7F8FE;} + .d2-1309689446 .background-color-AB4{background-color:#EDF0FD;} + .d2-1309689446 .background-color-AB5{background-color:#F7F8FE;} + .d2-1309689446 .color-N1{color:#0A0F25;} + .d2-1309689446 .color-N2{color:#676C7E;} + .d2-1309689446 .color-N3{color:#9499AB;} + .d2-1309689446 .color-N4{color:#CFD2DD;} + .d2-1309689446 .color-N5{color:#DEE1EB;} + .d2-1309689446 .color-N6{color:#EEF1F8;} + .d2-1309689446 .color-N7{color:#FFFFFF;} + .d2-1309689446 .color-B1{color:#0D32B2;} + .d2-1309689446 .color-B2{color:#0D32B2;} + .d2-1309689446 .color-B3{color:#E3E9FD;} + .d2-1309689446 .color-B4{color:#E3E9FD;} + .d2-1309689446 .color-B5{color:#EDF0FD;} + .d2-1309689446 .color-B6{color:#F7F8FE;} + .d2-1309689446 .color-AA2{color:#4A6FF3;} + .d2-1309689446 .color-AA4{color:#EDF0FD;} + .d2-1309689446 .color-AA5{color:#F7F8FE;} + .d2-1309689446 .color-AB4{color:#EDF0FD;} + .d2-1309689446 .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/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 831efef63..4f32b4090 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -3784,17 +3784,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1513, - "y": 1396 - }, - { - "x": 1513, - "y": 1491 - }, { "x": 1791.5, - "y": 1491 + "y": 1396 }, { "x": 1791.5, @@ -3846,14 +3838,6 @@ }, { "x": 2080, - "y": 1491 - }, - { - "x": 1801.5, - "y": 1491 - }, - { - "x": 1802, "y": 1536 } ], diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index d8f357d75..980a565e7 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-469845550 .fill-N1{fill:#0A0F25;} + .d2-469845550 .fill-N2{fill:#676C7E;} + .d2-469845550 .fill-N3{fill:#9499AB;} + .d2-469845550 .fill-N4{fill:#CFD2DD;} + .d2-469845550 .fill-N5{fill:#DEE1EB;} + .d2-469845550 .fill-N6{fill:#EEF1F8;} + .d2-469845550 .fill-N7{fill:#FFFFFF;} + .d2-469845550 .fill-B1{fill:#0D32B2;} + .d2-469845550 .fill-B2{fill:#0D32B2;} + .d2-469845550 .fill-B3{fill:#E3E9FD;} + .d2-469845550 .fill-B4{fill:#E3E9FD;} + .d2-469845550 .fill-B5{fill:#EDF0FD;} + .d2-469845550 .fill-B6{fill:#F7F8FE;} + .d2-469845550 .fill-AA2{fill:#4A6FF3;} + .d2-469845550 .fill-AA4{fill:#EDF0FD;} + .d2-469845550 .fill-AA5{fill:#F7F8FE;} + .d2-469845550 .fill-AB4{fill:#EDF0FD;} + .d2-469845550 .fill-AB5{fill:#F7F8FE;} + .d2-469845550 .stroke-N1{stroke:#0A0F25;} + .d2-469845550 .stroke-N2{stroke:#676C7E;} + .d2-469845550 .stroke-N3{stroke:#9499AB;} + .d2-469845550 .stroke-N4{stroke:#CFD2DD;} + .d2-469845550 .stroke-N5{stroke:#DEE1EB;} + .d2-469845550 .stroke-N6{stroke:#EEF1F8;} + .d2-469845550 .stroke-N7{stroke:#FFFFFF;} + .d2-469845550 .stroke-B1{stroke:#0D32B2;} + .d2-469845550 .stroke-B2{stroke:#0D32B2;} + .d2-469845550 .stroke-B3{stroke:#E3E9FD;} + .d2-469845550 .stroke-B4{stroke:#E3E9FD;} + .d2-469845550 .stroke-B5{stroke:#EDF0FD;} + .d2-469845550 .stroke-B6{stroke:#F7F8FE;} + .d2-469845550 .stroke-AA2{stroke:#4A6FF3;} + .d2-469845550 .stroke-AA4{stroke:#EDF0FD;} + .d2-469845550 .stroke-AA5{stroke:#F7F8FE;} + .d2-469845550 .stroke-AB4{stroke:#EDF0FD;} + .d2-469845550 .stroke-AB5{stroke:#F7F8FE;} + .d2-469845550 .background-color-N1{background-color:#0A0F25;} + .d2-469845550 .background-color-N2{background-color:#676C7E;} + .d2-469845550 .background-color-N3{background-color:#9499AB;} + .d2-469845550 .background-color-N4{background-color:#CFD2DD;} + .d2-469845550 .background-color-N5{background-color:#DEE1EB;} + .d2-469845550 .background-color-N6{background-color:#EEF1F8;} + .d2-469845550 .background-color-N7{background-color:#FFFFFF;} + .d2-469845550 .background-color-B1{background-color:#0D32B2;} + .d2-469845550 .background-color-B2{background-color:#0D32B2;} + .d2-469845550 .background-color-B3{background-color:#E3E9FD;} + .d2-469845550 .background-color-B4{background-color:#E3E9FD;} + .d2-469845550 .background-color-B5{background-color:#EDF0FD;} + .d2-469845550 .background-color-B6{background-color:#F7F8FE;} + .d2-469845550 .background-color-AA2{background-color:#4A6FF3;} + .d2-469845550 .background-color-AA4{background-color:#EDF0FD;} + .d2-469845550 .background-color-AA5{background-color:#F7F8FE;} + .d2-469845550 .background-color-AB4{background-color:#EDF0FD;} + .d2-469845550 .background-color-AB5{background-color:#F7F8FE;} + .d2-469845550 .color-N1{color:#0A0F25;} + .d2-469845550 .color-N2{color:#676C7E;} + .d2-469845550 .color-N3{color:#9499AB;} + .d2-469845550 .color-N4{color:#CFD2DD;} + .d2-469845550 .color-N5{color:#DEE1EB;} + .d2-469845550 .color-N6{color:#EEF1F8;} + .d2-469845550 .color-N7{color:#FFFFFF;} + .d2-469845550 .color-B1{color:#0D32B2;} + .d2-469845550 .color-B2{color:#0D32B2;} + .d2-469845550 .color-B3{color:#E3E9FD;} + .d2-469845550 .color-B4{color:#E3E9FD;} + .d2-469845550 .color-B5{color:#EDF0FD;} + .d2-469845550 .color-B6{color:#F7F8FE;} + .d2-469845550 .color-AA2{color:#4A6FF3;} + .d2-469845550 .color-AA4{color:#EDF0FD;} + .d2-469845550 .color-AA5{color:#F7F8FE;} + .d2-469845550 .color-AB4{color:#EDF0FD;} + .d2-469845550 .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) 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 9a7aeb0b5..18c1ade81 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -1294,14 +1294,6 @@ }, { "x": 245.75, - "y": 494 - }, - { - "x": 261.5, - "y": 494 - }, - { - "x": 261.5, "y": 589 } ], 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 728ebfa59..111f38968 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-3261660690 .fill-N1{fill:#0A0F25;} + .d2-3261660690 .fill-N2{fill:#676C7E;} + .d2-3261660690 .fill-N3{fill:#9499AB;} + .d2-3261660690 .fill-N4{fill:#CFD2DD;} + .d2-3261660690 .fill-N5{fill:#DEE1EB;} + .d2-3261660690 .fill-N6{fill:#EEF1F8;} + .d2-3261660690 .fill-N7{fill:#FFFFFF;} + .d2-3261660690 .fill-B1{fill:#0D32B2;} + .d2-3261660690 .fill-B2{fill:#0D32B2;} + .d2-3261660690 .fill-B3{fill:#E3E9FD;} + .d2-3261660690 .fill-B4{fill:#E3E9FD;} + .d2-3261660690 .fill-B5{fill:#EDF0FD;} + .d2-3261660690 .fill-B6{fill:#F7F8FE;} + .d2-3261660690 .fill-AA2{fill:#4A6FF3;} + .d2-3261660690 .fill-AA4{fill:#EDF0FD;} + .d2-3261660690 .fill-AA5{fill:#F7F8FE;} + .d2-3261660690 .fill-AB4{fill:#EDF0FD;} + .d2-3261660690 .fill-AB5{fill:#F7F8FE;} + .d2-3261660690 .stroke-N1{stroke:#0A0F25;} + .d2-3261660690 .stroke-N2{stroke:#676C7E;} + .d2-3261660690 .stroke-N3{stroke:#9499AB;} + .d2-3261660690 .stroke-N4{stroke:#CFD2DD;} + .d2-3261660690 .stroke-N5{stroke:#DEE1EB;} + .d2-3261660690 .stroke-N6{stroke:#EEF1F8;} + .d2-3261660690 .stroke-N7{stroke:#FFFFFF;} + .d2-3261660690 .stroke-B1{stroke:#0D32B2;} + .d2-3261660690 .stroke-B2{stroke:#0D32B2;} + .d2-3261660690 .stroke-B3{stroke:#E3E9FD;} + .d2-3261660690 .stroke-B4{stroke:#E3E9FD;} + .d2-3261660690 .stroke-B5{stroke:#EDF0FD;} + .d2-3261660690 .stroke-B6{stroke:#F7F8FE;} + .d2-3261660690 .stroke-AA2{stroke:#4A6FF3;} + .d2-3261660690 .stroke-AA4{stroke:#EDF0FD;} + .d2-3261660690 .stroke-AA5{stroke:#F7F8FE;} + .d2-3261660690 .stroke-AB4{stroke:#EDF0FD;} + .d2-3261660690 .stroke-AB5{stroke:#F7F8FE;} + .d2-3261660690 .background-color-N1{background-color:#0A0F25;} + .d2-3261660690 .background-color-N2{background-color:#676C7E;} + .d2-3261660690 .background-color-N3{background-color:#9499AB;} + .d2-3261660690 .background-color-N4{background-color:#CFD2DD;} + .d2-3261660690 .background-color-N5{background-color:#DEE1EB;} + .d2-3261660690 .background-color-N6{background-color:#EEF1F8;} + .d2-3261660690 .background-color-N7{background-color:#FFFFFF;} + .d2-3261660690 .background-color-B1{background-color:#0D32B2;} + .d2-3261660690 .background-color-B2{background-color:#0D32B2;} + .d2-3261660690 .background-color-B3{background-color:#E3E9FD;} + .d2-3261660690 .background-color-B4{background-color:#E3E9FD;} + .d2-3261660690 .background-color-B5{background-color:#EDF0FD;} + .d2-3261660690 .background-color-B6{background-color:#F7F8FE;} + .d2-3261660690 .background-color-AA2{background-color:#4A6FF3;} + .d2-3261660690 .background-color-AA4{background-color:#EDF0FD;} + .d2-3261660690 .background-color-AA5{background-color:#F7F8FE;} + .d2-3261660690 .background-color-AB4{background-color:#EDF0FD;} + .d2-3261660690 .background-color-AB5{background-color:#F7F8FE;} + .d2-3261660690 .color-N1{color:#0A0F25;} + .d2-3261660690 .color-N2{color:#676C7E;} + .d2-3261660690 .color-N3{color:#9499AB;} + .d2-3261660690 .color-N4{color:#CFD2DD;} + .d2-3261660690 .color-N5{color:#DEE1EB;} + .d2-3261660690 .color-N6{color:#EEF1F8;} + .d2-3261660690 .color-N7{color:#FFFFFF;} + .d2-3261660690 .color-B1{color:#0D32B2;} + .d2-3261660690 .color-B2{color:#0D32B2;} + .d2-3261660690 .color-B3{color:#E3E9FD;} + .d2-3261660690 .color-B4{color:#E3E9FD;} + .d2-3261660690 .color-B5{color:#EDF0FD;} + .d2-3261660690 .color-B6{color:#F7F8FE;} + .d2-3261660690 .color-AA2{color:#4A6FF3;} + .d2-3261660690 .color-AA4{color:#EDF0FD;} + .d2-3261660690 .color-AA5{color:#F7F8FE;} + .d2-3261660690 .color-AB4{color:#EDF0FD;} + .d2-3261660690 .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/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index a5aaa99c4..ebda440e3 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -2297,17 +2297,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1743.3333333333333, - "y": 1298 - }, - { - "x": 1743.3333333333333, - "y": 1338 - }, { "x": 1736.6666666666665, - "y": 1338 + "y": 1298 }, { "x": 1736.6666666666665, @@ -2583,14 +2575,6 @@ }, { "x": 774.8333333333334, - "y": 2080 - }, - { - "x": 752.5000000000001, - "y": 2080 - }, - { - "x": 752.5000000000001, "y": 2520 } ], @@ -2721,17 +2705,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1770, - "y": 1298 - }, - { - "x": 1770, - "y": 1338 - }, { "x": 1776.6666666666665, - "y": 1338 + "y": 1298 }, { "x": 1776.6666666666665, @@ -2769,17 +2745,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1720.6666666666665, - "y": 1694 - }, - { - "x": 1720.6666666666665, - "y": 1734 - }, { "x": 1722.6666666666665, - "y": 1734 + "y": 1694 }, { "x": 1722.6666666666665, @@ -3050,27 +3018,11 @@ "labelPercentage": 0, "route": [ { - "x": 1562.4166666666667, + "x": 1559.1666666666667, "y": 3182 }, - { - "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 } ], @@ -3186,27 +3138,11 @@ "labelPercentage": 0, "route": [ { - "x": 117.5, + "x": 116.5, "y": 2586 }, - { - "x": 117.5, - "y": 2626 - }, { "x": 116.5, - "y": 2626 - }, - { - "x": 116.5, - "y": 3222 - }, - { - "x": 117.5, - "y": 3222 - }, - { - "x": 117.5, "y": 3362 } ], @@ -4055,14 +3991,6 @@ }, { "x": 1301.1666666666667, - "y": 2280 - }, - { - "x": 1313.4166666666667, - "y": 2280 - }, - { - "x": 1313.4166666666667, "y": 2520 } ], @@ -4103,14 +4031,6 @@ }, { "x": 1104.3690476190477, - "y": 254 - }, - { - "x": 1057.702380952381, - "y": 254 - }, - { - "x": 1057.702380952381, "y": 294 } ], @@ -4255,14 +4175,6 @@ }, { "x": 1479, - "y": 550 - }, - { - "x": 1465.3333333333333, - "y": 550 - }, - { - "x": 1465.3333333333333, "y": 836 } ], @@ -4599,14 +4511,6 @@ }, { "x": 797, - "y": 2130 - }, - { - "x": 785.8333333333334, - "y": 2130 - }, - { - "x": 785.8333333333334, "y": 2520 } ], @@ -4889,17 +4793,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 471.83333333333326, - "y": 656 - }, - { - "x": 471.83333333333326, - "y": 696 - }, { "x": 485.1666666666665, - "y": 696 + "y": 656 }, { "x": 485.1666666666665, @@ -4938,27 +4834,11 @@ "labelPercentage": 0, "route": [ { - "x": 437.1666666666665, + "x": 430.5, "y": 902 }, - { - "x": 437.1666666666665, - "y": 942 - }, { "x": 430.5, - "y": 942 - }, - { - "x": 430.5, - "y": 3222 - }, - { - "x": 419.3690476190475, - "y": 3222 - }, - { - "x": 419.3690476190475, "y": 3362 } ], @@ -5281,17 +5161,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 149.5, - "y": 2586 - }, - { - "x": 149.5, - "y": 3222 - }, { "x": 147.5, - "y": 3222 + "y": 2586 }, { "x": 147.5, @@ -5329,17 +5201,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 127.5, - "y": 3428 - }, - { - "x": 127.5, - "y": 3468 - }, { "x": 102, - "y": 3468 + "y": 3428 }, { "x": 102, @@ -5543,14 +5407,6 @@ }, { "x": 1585.5833333333333, - "y": 1388 - }, - { - "x": 1558.9166666666667, - "y": 1388 - }, - { - "x": 1558.9166666666667, "y": 1628 } ], @@ -5585,17 +5441,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1508.9166666666667, - "y": 1694 - }, - { - "x": 1508.9166666666667, - "y": 1884 - }, { "x": 1505.5833333333333, - "y": 1884 + "y": 1694 }, { "x": 1505.5833333333333, @@ -5879,14 +5727,6 @@ }, { "x": 1492.25, - "y": 1388 - }, - { - "x": 1518.9166666666667, - "y": 1388 - }, - { - "x": 1518.9166666666667, "y": 1628 } ], @@ -6121,17 +5961,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1784.6666666666665, - "y": 1694 - }, - { - "x": 1784.6666666666665, - "y": 1734 - }, { "x": 1782.6666666666665, - "y": 1734 + "y": 1694 }, { "x": 1782.6666666666665, @@ -6423,14 +6255,6 @@ }, { "x": 452, - "y": 3272 - }, - { - "x": 451.3690476190475, - "y": 3272 - }, - { - "x": 451.3690476190475, "y": 3362 } ], @@ -6561,17 +6385,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 167.5, - "y": 3428 - }, - { - "x": 167.5, - "y": 3518 - }, { "x": 132, - "y": 3518 + "y": 3428 }, { "x": 132, @@ -6697,17 +6513,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 692.3690476190477, - "y": 3182 - }, - { - "x": 692.3690476190477, - "y": 3222 - }, { "x": 716.3690476190476, - "y": 3222 + "y": 3182 }, { "x": 716.3690476190476, @@ -6745,17 +6553,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1568.9166666666667, - "y": 1694 - }, - { - "x": 1568.9166666666667, - "y": 1884 - }, { "x": 1572.25, - "y": 1884 + "y": 1694 }, { "x": 1572.25, @@ -6807,14 +6607,6 @@ }, { "x": 368.1666666666665, - "y": 2676 - }, - { - "x": 357.1666666666665, - "y": 2676 - }, - { - "x": 357.1666666666665, "y": 3116 } ], @@ -6945,17 +6737,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1782.6666666666665, - "y": 2040 - }, - { - "x": 1782.6666666666665, - "y": 2080 - }, { "x": 1777.8333333333333, - "y": 2080 + "y": 2040 }, { "x": 1777.8333333333333, @@ -6993,17 +6777,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 310.5, - "y": 3182 - }, - { - "x": 310.5, - "y": 3222 - }, { "x": 307.16666666666674, - "y": 3222 + "y": 3182 }, { "x": 307.16666666666674, @@ -7145,17 +6921,9 @@ "labelPosition": "", "labelPercentage": 0, "route": [ - { - "x": 1602.4166666666667, - "y": 3182 - }, - { - "x": 1602.4166666666667, - "y": 3468 - }, { "x": 1618, - "y": 3468 + "y": 3182 }, { "x": 1618, diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 936c4c0be..1d7391c15 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-974888937 .fill-N1{fill:#0A0F25;} + .d2-974888937 .fill-N2{fill:#676C7E;} + .d2-974888937 .fill-N3{fill:#9499AB;} + .d2-974888937 .fill-N4{fill:#CFD2DD;} + .d2-974888937 .fill-N5{fill:#DEE1EB;} + .d2-974888937 .fill-N6{fill:#EEF1F8;} + .d2-974888937 .fill-N7{fill:#FFFFFF;} + .d2-974888937 .fill-B1{fill:#0D32B2;} + .d2-974888937 .fill-B2{fill:#0D32B2;} + .d2-974888937 .fill-B3{fill:#E3E9FD;} + .d2-974888937 .fill-B4{fill:#E3E9FD;} + .d2-974888937 .fill-B5{fill:#EDF0FD;} + .d2-974888937 .fill-B6{fill:#F7F8FE;} + .d2-974888937 .fill-AA2{fill:#4A6FF3;} + .d2-974888937 .fill-AA4{fill:#EDF0FD;} + .d2-974888937 .fill-AA5{fill:#F7F8FE;} + .d2-974888937 .fill-AB4{fill:#EDF0FD;} + .d2-974888937 .fill-AB5{fill:#F7F8FE;} + .d2-974888937 .stroke-N1{stroke:#0A0F25;} + .d2-974888937 .stroke-N2{stroke:#676C7E;} + .d2-974888937 .stroke-N3{stroke:#9499AB;} + .d2-974888937 .stroke-N4{stroke:#CFD2DD;} + .d2-974888937 .stroke-N5{stroke:#DEE1EB;} + .d2-974888937 .stroke-N6{stroke:#EEF1F8;} + .d2-974888937 .stroke-N7{stroke:#FFFFFF;} + .d2-974888937 .stroke-B1{stroke:#0D32B2;} + .d2-974888937 .stroke-B2{stroke:#0D32B2;} + .d2-974888937 .stroke-B3{stroke:#E3E9FD;} + .d2-974888937 .stroke-B4{stroke:#E3E9FD;} + .d2-974888937 .stroke-B5{stroke:#EDF0FD;} + .d2-974888937 .stroke-B6{stroke:#F7F8FE;} + .d2-974888937 .stroke-AA2{stroke:#4A6FF3;} + .d2-974888937 .stroke-AA4{stroke:#EDF0FD;} + .d2-974888937 .stroke-AA5{stroke:#F7F8FE;} + .d2-974888937 .stroke-AB4{stroke:#EDF0FD;} + .d2-974888937 .stroke-AB5{stroke:#F7F8FE;} + .d2-974888937 .background-color-N1{background-color:#0A0F25;} + .d2-974888937 .background-color-N2{background-color:#676C7E;} + .d2-974888937 .background-color-N3{background-color:#9499AB;} + .d2-974888937 .background-color-N4{background-color:#CFD2DD;} + .d2-974888937 .background-color-N5{background-color:#DEE1EB;} + .d2-974888937 .background-color-N6{background-color:#EEF1F8;} + .d2-974888937 .background-color-N7{background-color:#FFFFFF;} + .d2-974888937 .background-color-B1{background-color:#0D32B2;} + .d2-974888937 .background-color-B2{background-color:#0D32B2;} + .d2-974888937 .background-color-B3{background-color:#E3E9FD;} + .d2-974888937 .background-color-B4{background-color:#E3E9FD;} + .d2-974888937 .background-color-B5{background-color:#EDF0FD;} + .d2-974888937 .background-color-B6{background-color:#F7F8FE;} + .d2-974888937 .background-color-AA2{background-color:#4A6FF3;} + .d2-974888937 .background-color-AA4{background-color:#EDF0FD;} + .d2-974888937 .background-color-AA5{background-color:#F7F8FE;} + .d2-974888937 .background-color-AB4{background-color:#EDF0FD;} + .d2-974888937 .background-color-AB5{background-color:#F7F8FE;} + .d2-974888937 .color-N1{color:#0A0F25;} + .d2-974888937 .color-N2{color:#676C7E;} + .d2-974888937 .color-N3{color:#9499AB;} + .d2-974888937 .color-N4{color:#CFD2DD;} + .d2-974888937 .color-N5{color:#DEE1EB;} + .d2-974888937 .color-N6{color:#EEF1F8;} + .d2-974888937 .color-N7{color:#FFFFFF;} + .d2-974888937 .color-B1{color:#0D32B2;} + .d2-974888937 .color-B2{color:#0D32B2;} + .d2-974888937 .color-B3{color:#E3E9FD;} + .d2-974888937 .color-B4{color:#E3E9FD;} + .d2-974888937 .color-B5{color:#EDF0FD;} + .d2-974888937 .color-B6{color:#F7F8FE;} + .d2-974888937 .color-AA2{color:#4A6FF3;} + .d2-974888937 .color-AA4{color:#EDF0FD;} + .d2-974888937 .color-AA5{color:#F7F8FE;} + .d2-974888937 .color-AB4{color:#EDF0FD;} + .d2-974888937 .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/unicode/mixed-language/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json index 36f875c0d..f09546918 100644 --- a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json @@ -159,14 +159,6 @@ }, { "x": 409.66666666666674, - "y": 150 - }, - { - "x": 236, - "y": 150 - }, - { - "x": 236, "y": 190 } ], @@ -207,14 +199,6 @@ }, { "x": 552.3333333333334, - "y": 150 - }, - { - "x": 726, - "y": 150 - }, - { - "x": 726, "y": 190 } ], diff --git a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg index de1fc6ed1..737ffac96 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