diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go
index 1f17b9621..f0293e693 100644
--- a/d2layouts/d2elklayout/layout.go
+++ b/d2layouts/d2elklayout/layout.go
@@ -452,6 +452,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
// see https://github.com/terrastruct/d2/issues/1030
func deleteBends(g *d2graph.Graph) {
// Get rid of S-shapes at the source and the target
+ // TODO there might be value in repeating this. removal of an S shape introducing another S shape that can still be removed
for _, isSource := range []bool{true, false} {
for ei, e := range g.Edges {
if len(e.Route) < 4 {
@@ -546,6 +547,97 @@ func deleteBends(g *d2graph.Graph) {
}
}
}
+ // Get rid of ladders
+ // ELK likes to do these for some reason
+ // . ┌─
+ // . ┌─┘
+ // . │
+ // We want to transform these into L-shapes
+ for ei, e := range g.Edges {
+ if len(e.Route) < 6 {
+ continue
+ }
+ if e.Src == e.Dst {
+ continue
+ }
+
+ for i := 1; i < len(e.Route)-3; i++ {
+ before := e.Route[i-1]
+ start := e.Route[i]
+ corner := e.Route[i+1]
+ end := e.Route[i+2]
+ after := e.Route[i+3]
+
+ // S-shape on sources only concerned one segment, since the other was just along the bound of endpoint
+ // These concern two segments
+
+ var newCorner *geo.Point
+ if start.X == corner.X {
+ newCorner = geo.NewPoint(end.X, start.Y)
+ // not ladder
+ if (end.Y > start.Y) != (before.Y > start.Y) {
+ continue
+ }
+ if (end.Y > start.Y) != (end.Y > start.Y) {
+ continue
+ }
+ } else {
+ newCorner = geo.NewPoint(start.X, end.Y)
+ if (end.X > start.X) != (before.X > start.X) {
+ continue
+ }
+ if (end.X > start.X) != (after.X > start.X) {
+ continue
+ }
+ }
+
+ oldS1 := geo.NewSegment(start, corner)
+ oldS2 := geo.NewSegment(corner, end)
+
+ newS1 := geo.NewSegment(start, newCorner)
+ newS2 := geo.NewSegment(newCorner, end)
+
+ // Check that the new segments doesn't collide with anything new
+ oldIntersects := countObjectIntersects(g, *oldS1) + countObjectIntersects(g, *oldS2)
+ newIntersects := countObjectIntersects(g, *newS1) + countObjectIntersects(g, *newS2)
+
+ if newIntersects > oldIntersects {
+ continue
+ }
+
+ oldCrossingsCount1, oldOverlapsCount1, oldCloseOverlapsCount1 := countEdgeIntersects(g, g.Edges[ei], *oldS1)
+ oldCrossingsCount2, oldOverlapsCount2, oldCloseOverlapsCount2 := countEdgeIntersects(g, g.Edges[ei], *oldS2)
+ oldCrossingsCount := oldCrossingsCount1 + oldCrossingsCount2
+ oldOverlapsCount := oldOverlapsCount1 + oldOverlapsCount2
+ oldCloseOverlapsCount := oldCloseOverlapsCount1 + oldCloseOverlapsCount2
+
+ newCrossingsCount1, newOverlapsCount1, newCloseOverlapsCount1 := countEdgeIntersects(g, g.Edges[ei], *newS1)
+ newCrossingsCount2, newOverlapsCount2, newCloseOverlapsCount2 := countEdgeIntersects(g, g.Edges[ei], *newS1)
+ newCrossingsCount := newCrossingsCount1 + newCrossingsCount2
+ newOverlapsCount := newOverlapsCount1 + newOverlapsCount2
+ newCloseOverlapsCount := newCloseOverlapsCount1 + newCloseOverlapsCount2
+
+ if newCrossingsCount > oldCrossingsCount {
+ continue
+ }
+ if newOverlapsCount > oldOverlapsCount {
+ continue
+ }
+
+ if newCloseOverlapsCount > oldCloseOverlapsCount {
+ continue
+ }
+
+ // commit
+ g.Edges[ei].Route = append(append(
+ e.Route[:i],
+ newCorner,
+ ),
+ e.Route[i+3:]...,
+ )
+ break
+ }
+ }
}
func countObjectIntersects(g *d2graph.Graph, s geo.Segment) int {
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 8ce7baba1..2a82b3352 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/straight_hierarchy_container_direction_right/elk/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json
index 7cf00d5b6..6a7d604a8 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
@@ -1180,17 +1180,9 @@
"x": 243,
"y": 300
},
- {
- "x": 283,
- "y": 300
- },
- {
- "x": 283,
- "y": 252
- },
{
"x": 468,
- "y": 252
+ "y": 300
},
{
"x": 468,
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 4acba330a..dfd240c40 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 @@
-
\ 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 77fcdb0c7..fa5d66588 100644
--- a/e2etests/testdata/stable/chaos2/elk/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json
@@ -969,14 +969,6 @@
},
{
"x": 507.25,
- "y": 466
- },
- {
- "x": 494.25,
- "y": 466
- },
- {
- "x": 494.25,
"y": 567
},
{
diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg
index 7c479b482..8ae645ac4 100644
--- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg
@@ -1,23 +1,23 @@
-