From 99843cb9ae55fa7d0474791b81fa3bcc55efe45c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 3 Aug 2024 10:53:32 -0600 Subject: [PATCH] d2sequence: remove global ystep --- ci/release/changelogs/next.md | 1 + d2layouts/d2sequence/sequence_diagram.go | 2 - .../testdata/TestCLI_E2E/empty-base.exp.svg | 176 ++++++++--------- .../dagre/board.exp.json | 44 ++--- .../dagre/sketch.exp.svg | 180 +++++++++--------- .../elk/board.exp.json | 44 ++--- .../elk/sketch.exp.svg | 180 +++++++++--------- .../dagre/board.exp.json | 32 ++-- .../dagre/sketch.exp.svg | 168 ++++++++-------- .../elk/board.exp.json | 32 ++-- .../elk/sketch.exp.svg | 168 ++++++++-------- 11 files changed, 513 insertions(+), 514 deletions(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index a2ce6787c..7dd5fcc66 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -3,5 +3,6 @@ #### Improvements 🧹 - Sequence diagram edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038) +- Sequence diagram self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040) #### Bugfixes ⛑️ diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 70376f37c..3659a63b8 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -162,8 +162,6 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) (*s for _, message := range sd.messages { sd.verticalIndices[message.AbsID()] = getEdgeEarliestLineNum(message) - // TODO this should not be global yStep, only affect the neighbors - sd.yStep = math.Max(sd.yStep, float64(message.LabelDimensions.Height)) // ensures that long labels, spanning over multiple actors, don't make for large gaps between actors // by distributing the label length across the actors rank difference diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg index aabefe23d..5aee84d37 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg @@ -1,9 +1,9 @@ -ab +}]]>ab -abdc - +abdc + - - -abdce - + + +abdce + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json index d37e00010..44b34355b 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 424, - "height": 1407, + "height": 1123, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -172,10 +172,10 @@ "type": "rectangle", "pos": { "x": 10, - "y": 232 + "y": 161 }, "width": 254, - "height": 919, + "height": 777, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -214,7 +214,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 983 + "y": 770 }, "width": 230, "height": 156, @@ -256,7 +256,7 @@ "type": "rectangle", "pos": { "x": 172, - "y": 1160 + "y": 947 }, "width": 230, "height": 156, @@ -321,11 +321,11 @@ "route": [ { "x": 62, - "y": 326 + "y": 255 }, { "x": 212, - "y": 326 + "y": 255 } ], "animated": false, @@ -359,11 +359,11 @@ "route": [ { "x": 62, - "y": 472 + "y": 401 }, { "x": 212, - "y": 472 + "y": 401 } ], "animated": false, @@ -397,11 +397,11 @@ "route": [ { "x": 62, - "y": 618 + "y": 547 }, { "x": 212, - "y": 618 + "y": 547 } ], "animated": false, @@ -435,11 +435,11 @@ "route": [ { "x": 62, - "y": 759 + "y": 617 }, { "x": 212, - "y": 759 + "y": 617 } ], "animated": false, @@ -473,11 +473,11 @@ "route": [ { "x": 62, - "y": 900 + "y": 687 }, { "x": 212, - "y": 900 + "y": 687 } ], "animated": false, @@ -511,11 +511,11 @@ "route": [ { "x": 62, - "y": 1077 + "y": 864 }, { "x": 212, - "y": 1077 + "y": 864 } ], "animated": false, @@ -549,11 +549,11 @@ "route": [ { "x": 362, - "y": 1254 + "y": 1041 }, { "x": 212, - "y": 1254 + "y": 1041 } ], "animated": false, @@ -591,7 +591,7 @@ }, { "x": 62, - "y": 1395 + "y": 1111 } ], "animated": false, @@ -629,7 +629,7 @@ }, { "x": 212, - "y": 1395 + "y": 1111 } ], "animated": false, @@ -667,7 +667,7 @@ }, { "x": 362, - "y": 1395 + "y": 1111 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg index 1036fcd0e..964505240 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix - + .d2-3126287312 .fill-N1{fill:#0A0F25;} + .d2-3126287312 .fill-N2{fill:#676C7E;} + .d2-3126287312 .fill-N3{fill:#9499AB;} + .d2-3126287312 .fill-N4{fill:#CFD2DD;} + .d2-3126287312 .fill-N5{fill:#DEE1EB;} + .d2-3126287312 .fill-N6{fill:#EEF1F8;} + .d2-3126287312 .fill-N7{fill:#FFFFFF;} + .d2-3126287312 .fill-B1{fill:#0D32B2;} + .d2-3126287312 .fill-B2{fill:#0D32B2;} + .d2-3126287312 .fill-B3{fill:#E3E9FD;} + .d2-3126287312 .fill-B4{fill:#E3E9FD;} + .d2-3126287312 .fill-B5{fill:#EDF0FD;} + .d2-3126287312 .fill-B6{fill:#F7F8FE;} + .d2-3126287312 .fill-AA2{fill:#4A6FF3;} + .d2-3126287312 .fill-AA4{fill:#EDF0FD;} + .d2-3126287312 .fill-AA5{fill:#F7F8FE;} + .d2-3126287312 .fill-AB4{fill:#EDF0FD;} + .d2-3126287312 .fill-AB5{fill:#F7F8FE;} + .d2-3126287312 .stroke-N1{stroke:#0A0F25;} + .d2-3126287312 .stroke-N2{stroke:#676C7E;} + .d2-3126287312 .stroke-N3{stroke:#9499AB;} + .d2-3126287312 .stroke-N4{stroke:#CFD2DD;} + .d2-3126287312 .stroke-N5{stroke:#DEE1EB;} + .d2-3126287312 .stroke-N6{stroke:#EEF1F8;} + .d2-3126287312 .stroke-N7{stroke:#FFFFFF;} + .d2-3126287312 .stroke-B1{stroke:#0D32B2;} + .d2-3126287312 .stroke-B2{stroke:#0D32B2;} + .d2-3126287312 .stroke-B3{stroke:#E3E9FD;} + .d2-3126287312 .stroke-B4{stroke:#E3E9FD;} + .d2-3126287312 .stroke-B5{stroke:#EDF0FD;} + .d2-3126287312 .stroke-B6{stroke:#F7F8FE;} + .d2-3126287312 .stroke-AA2{stroke:#4A6FF3;} + .d2-3126287312 .stroke-AA4{stroke:#EDF0FD;} + .d2-3126287312 .stroke-AA5{stroke:#F7F8FE;} + .d2-3126287312 .stroke-AB4{stroke:#EDF0FD;} + .d2-3126287312 .stroke-AB5{stroke:#F7F8FE;} + .d2-3126287312 .background-color-N1{background-color:#0A0F25;} + .d2-3126287312 .background-color-N2{background-color:#676C7E;} + .d2-3126287312 .background-color-N3{background-color:#9499AB;} + .d2-3126287312 .background-color-N4{background-color:#CFD2DD;} + .d2-3126287312 .background-color-N5{background-color:#DEE1EB;} + .d2-3126287312 .background-color-N6{background-color:#EEF1F8;} + .d2-3126287312 .background-color-N7{background-color:#FFFFFF;} + .d2-3126287312 .background-color-B1{background-color:#0D32B2;} + .d2-3126287312 .background-color-B2{background-color:#0D32B2;} + .d2-3126287312 .background-color-B3{background-color:#E3E9FD;} + .d2-3126287312 .background-color-B4{background-color:#E3E9FD;} + .d2-3126287312 .background-color-B5{background-color:#EDF0FD;} + .d2-3126287312 .background-color-B6{background-color:#F7F8FE;} + .d2-3126287312 .background-color-AA2{background-color:#4A6FF3;} + .d2-3126287312 .background-color-AA4{background-color:#EDF0FD;} + .d2-3126287312 .background-color-AA5{background-color:#F7F8FE;} + .d2-3126287312 .background-color-AB4{background-color:#EDF0FD;} + .d2-3126287312 .background-color-AB5{background-color:#F7F8FE;} + .d2-3126287312 .color-N1{color:#0A0F25;} + .d2-3126287312 .color-N2{color:#676C7E;} + .d2-3126287312 .color-N3{color:#9499AB;} + .d2-3126287312 .color-N4{color:#CFD2DD;} + .d2-3126287312 .color-N5{color:#DEE1EB;} + .d2-3126287312 .color-N6{color:#EEF1F8;} + .d2-3126287312 .color-N7{color:#FFFFFF;} + .d2-3126287312 .color-B1{color:#0D32B2;} + .d2-3126287312 .color-B2{color:#0D32B2;} + .d2-3126287312 .color-B3{color:#E3E9FD;} + .d2-3126287312 .color-B4{color:#E3E9FD;} + .d2-3126287312 .color-B5{color:#EDF0FD;} + .d2-3126287312 .color-B6{color:#F7F8FE;} + .d2-3126287312 .color-AA2{color:#4A6FF3;} + .d2-3126287312 .color-AA4{color:#EDF0FD;} + .d2-3126287312 .color-AA5{color:#F7F8FE;} + .d2-3126287312 .color-AB4{color:#EDF0FD;} + .d2-3126287312 .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}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json index 4f5d3c43f..3c05fd4bf 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 424, - "height": 1407, + "height": 1123, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -172,10 +172,10 @@ "type": "rectangle", "pos": { "x": 22, - "y": 244 + "y": 173 }, "width": 254, - "height": 919, + "height": 777, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -214,7 +214,7 @@ "type": "rectangle", "pos": { "x": 34, - "y": 995 + "y": 782 }, "width": 230, "height": 156, @@ -256,7 +256,7 @@ "type": "rectangle", "pos": { "x": 184, - "y": 1172 + "y": 959 }, "width": 230, "height": 156, @@ -321,11 +321,11 @@ "route": [ { "x": 74, - "y": 338 + "y": 267 }, { "x": 224, - "y": 338 + "y": 267 } ], "animated": false, @@ -359,11 +359,11 @@ "route": [ { "x": 74, - "y": 484 + "y": 413 }, { "x": 224, - "y": 484 + "y": 413 } ], "animated": false, @@ -397,11 +397,11 @@ "route": [ { "x": 74, - "y": 630 + "y": 559 }, { "x": 224, - "y": 630 + "y": 559 } ], "animated": false, @@ -435,11 +435,11 @@ "route": [ { "x": 74, - "y": 771 + "y": 629 }, { "x": 224, - "y": 771 + "y": 629 } ], "animated": false, @@ -473,11 +473,11 @@ "route": [ { "x": 74, - "y": 912 + "y": 699 }, { "x": 224, - "y": 912 + "y": 699 } ], "animated": false, @@ -511,11 +511,11 @@ "route": [ { "x": 74, - "y": 1089 + "y": 876 }, { "x": 224, - "y": 1089 + "y": 876 } ], "animated": false, @@ -549,11 +549,11 @@ "route": [ { "x": 374, - "y": 1266 + "y": 1053 }, { "x": 224, - "y": 1266 + "y": 1053 } ], "animated": false, @@ -591,7 +591,7 @@ }, { "x": 74, - "y": 1407 + "y": 1123 } ], "animated": false, @@ -629,7 +629,7 @@ }, { "x": 224, - "y": 1407 + "y": 1123 } ], "animated": false, @@ -667,7 +667,7 @@ }, { "x": 374, - "y": 1407 + "y": 1123 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg index e2f94e5b6..01f07da27 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix - + .d2-1459407460 .fill-N1{fill:#0A0F25;} + .d2-1459407460 .fill-N2{fill:#676C7E;} + .d2-1459407460 .fill-N3{fill:#9499AB;} + .d2-1459407460 .fill-N4{fill:#CFD2DD;} + .d2-1459407460 .fill-N5{fill:#DEE1EB;} + .d2-1459407460 .fill-N6{fill:#EEF1F8;} + .d2-1459407460 .fill-N7{fill:#FFFFFF;} + .d2-1459407460 .fill-B1{fill:#0D32B2;} + .d2-1459407460 .fill-B2{fill:#0D32B2;} + .d2-1459407460 .fill-B3{fill:#E3E9FD;} + .d2-1459407460 .fill-B4{fill:#E3E9FD;} + .d2-1459407460 .fill-B5{fill:#EDF0FD;} + .d2-1459407460 .fill-B6{fill:#F7F8FE;} + .d2-1459407460 .fill-AA2{fill:#4A6FF3;} + .d2-1459407460 .fill-AA4{fill:#EDF0FD;} + .d2-1459407460 .fill-AA5{fill:#F7F8FE;} + .d2-1459407460 .fill-AB4{fill:#EDF0FD;} + .d2-1459407460 .fill-AB5{fill:#F7F8FE;} + .d2-1459407460 .stroke-N1{stroke:#0A0F25;} + .d2-1459407460 .stroke-N2{stroke:#676C7E;} + .d2-1459407460 .stroke-N3{stroke:#9499AB;} + .d2-1459407460 .stroke-N4{stroke:#CFD2DD;} + .d2-1459407460 .stroke-N5{stroke:#DEE1EB;} + .d2-1459407460 .stroke-N6{stroke:#EEF1F8;} + .d2-1459407460 .stroke-N7{stroke:#FFFFFF;} + .d2-1459407460 .stroke-B1{stroke:#0D32B2;} + .d2-1459407460 .stroke-B2{stroke:#0D32B2;} + .d2-1459407460 .stroke-B3{stroke:#E3E9FD;} + .d2-1459407460 .stroke-B4{stroke:#E3E9FD;} + .d2-1459407460 .stroke-B5{stroke:#EDF0FD;} + .d2-1459407460 .stroke-B6{stroke:#F7F8FE;} + .d2-1459407460 .stroke-AA2{stroke:#4A6FF3;} + .d2-1459407460 .stroke-AA4{stroke:#EDF0FD;} + .d2-1459407460 .stroke-AA5{stroke:#F7F8FE;} + .d2-1459407460 .stroke-AB4{stroke:#EDF0FD;} + .d2-1459407460 .stroke-AB5{stroke:#F7F8FE;} + .d2-1459407460 .background-color-N1{background-color:#0A0F25;} + .d2-1459407460 .background-color-N2{background-color:#676C7E;} + .d2-1459407460 .background-color-N3{background-color:#9499AB;} + .d2-1459407460 .background-color-N4{background-color:#CFD2DD;} + .d2-1459407460 .background-color-N5{background-color:#DEE1EB;} + .d2-1459407460 .background-color-N6{background-color:#EEF1F8;} + .d2-1459407460 .background-color-N7{background-color:#FFFFFF;} + .d2-1459407460 .background-color-B1{background-color:#0D32B2;} + .d2-1459407460 .background-color-B2{background-color:#0D32B2;} + .d2-1459407460 .background-color-B3{background-color:#E3E9FD;} + .d2-1459407460 .background-color-B4{background-color:#E3E9FD;} + .d2-1459407460 .background-color-B5{background-color:#EDF0FD;} + .d2-1459407460 .background-color-B6{background-color:#F7F8FE;} + .d2-1459407460 .background-color-AA2{background-color:#4A6FF3;} + .d2-1459407460 .background-color-AA4{background-color:#EDF0FD;} + .d2-1459407460 .background-color-AA5{background-color:#F7F8FE;} + .d2-1459407460 .background-color-AB4{background-color:#EDF0FD;} + .d2-1459407460 .background-color-AB5{background-color:#F7F8FE;} + .d2-1459407460 .color-N1{color:#0A0F25;} + .d2-1459407460 .color-N2{color:#676C7E;} + .d2-1459407460 .color-N3{color:#9499AB;} + .d2-1459407460 .color-N4{color:#CFD2DD;} + .d2-1459407460 .color-N5{color:#DEE1EB;} + .d2-1459407460 .color-N6{color:#EEF1F8;} + .d2-1459407460 .color-N7{color:#FFFFFF;} + .d2-1459407460 .color-B1{color:#0D32B2;} + .d2-1459407460 .color-B2{color:#0D32B2;} + .d2-1459407460 .color-B3{color:#E3E9FD;} + .d2-1459407460 .color-B4{color:#E3E9FD;} + .d2-1459407460 .color-B5{color:#EDF0FD;} + .d2-1459407460 .color-B6{color:#F7F8FE;} + .d2-1459407460 .color-AA2{color:#4A6FF3;} + .d2-1459407460 .color-AA4{color:#EDF0FD;} + .d2-1459407460 .color-AA5{color:#F7F8FE;} + .d2-1459407460 .color-AB4{color:#EDF0FD;} + .d2-1459407460 .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}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json index 757009426..4929dc207 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json @@ -113,19 +113,19 @@ "route": [ { "x": 62, - "y": 211 + "y": 188 }, { "x": 142, - "y": 211 + "y": 188 }, { "x": 142, - "y": 290.5 + "y": 267.5 }, { "x": 62, - "y": 290.5 + "y": 267.5 } ], "animated": false, @@ -159,19 +159,19 @@ "route": [ { "x": 62, - "y": 309 + "y": 286 }, { "x": 142, - "y": 309 + "y": 286 }, { "x": 142, - "y": 364.5 + "y": 341.5 }, { "x": 62, - "y": 364.5 + "y": 341.5 } ], "animated": false, @@ -205,11 +205,11 @@ "route": [ { "x": 62, - "y": 402 + "y": 368 }, { "x": 212, - "y": 402 + "y": 368 } ], "animated": false, @@ -243,19 +243,19 @@ "route": [ { "x": 212, - "y": 495 + "y": 438 }, { "x": 292, - "y": 495 + "y": 438 }, { "x": 292, - "y": 574.5 + "y": 517.5 }, { "x": 212, - "y": 574.5 + "y": 517.5 } ], "animated": false, @@ -293,7 +293,7 @@ }, { "x": 62, - "y": 667.5 + "y": 587.5 } ], "animated": false, @@ -331,7 +331,7 @@ }, { "x": 212, - "y": 667.5 + "y": 587.5 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg index 4adb72495..34918e21a 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows - + .d2-2951479422 .fill-N1{fill:#0A0F25;} + .d2-2951479422 .fill-N2{fill:#676C7E;} + .d2-2951479422 .fill-N3{fill:#9499AB;} + .d2-2951479422 .fill-N4{fill:#CFD2DD;} + .d2-2951479422 .fill-N5{fill:#DEE1EB;} + .d2-2951479422 .fill-N6{fill:#EEF1F8;} + .d2-2951479422 .fill-N7{fill:#FFFFFF;} + .d2-2951479422 .fill-B1{fill:#0D32B2;} + .d2-2951479422 .fill-B2{fill:#0D32B2;} + .d2-2951479422 .fill-B3{fill:#E3E9FD;} + .d2-2951479422 .fill-B4{fill:#E3E9FD;} + .d2-2951479422 .fill-B5{fill:#EDF0FD;} + .d2-2951479422 .fill-B6{fill:#F7F8FE;} + .d2-2951479422 .fill-AA2{fill:#4A6FF3;} + .d2-2951479422 .fill-AA4{fill:#EDF0FD;} + .d2-2951479422 .fill-AA5{fill:#F7F8FE;} + .d2-2951479422 .fill-AB4{fill:#EDF0FD;} + .d2-2951479422 .fill-AB5{fill:#F7F8FE;} + .d2-2951479422 .stroke-N1{stroke:#0A0F25;} + .d2-2951479422 .stroke-N2{stroke:#676C7E;} + .d2-2951479422 .stroke-N3{stroke:#9499AB;} + .d2-2951479422 .stroke-N4{stroke:#CFD2DD;} + .d2-2951479422 .stroke-N5{stroke:#DEE1EB;} + .d2-2951479422 .stroke-N6{stroke:#EEF1F8;} + .d2-2951479422 .stroke-N7{stroke:#FFFFFF;} + .d2-2951479422 .stroke-B1{stroke:#0D32B2;} + .d2-2951479422 .stroke-B2{stroke:#0D32B2;} + .d2-2951479422 .stroke-B3{stroke:#E3E9FD;} + .d2-2951479422 .stroke-B4{stroke:#E3E9FD;} + .d2-2951479422 .stroke-B5{stroke:#EDF0FD;} + .d2-2951479422 .stroke-B6{stroke:#F7F8FE;} + .d2-2951479422 .stroke-AA2{stroke:#4A6FF3;} + .d2-2951479422 .stroke-AA4{stroke:#EDF0FD;} + .d2-2951479422 .stroke-AA5{stroke:#F7F8FE;} + .d2-2951479422 .stroke-AB4{stroke:#EDF0FD;} + .d2-2951479422 .stroke-AB5{stroke:#F7F8FE;} + .d2-2951479422 .background-color-N1{background-color:#0A0F25;} + .d2-2951479422 .background-color-N2{background-color:#676C7E;} + .d2-2951479422 .background-color-N3{background-color:#9499AB;} + .d2-2951479422 .background-color-N4{background-color:#CFD2DD;} + .d2-2951479422 .background-color-N5{background-color:#DEE1EB;} + .d2-2951479422 .background-color-N6{background-color:#EEF1F8;} + .d2-2951479422 .background-color-N7{background-color:#FFFFFF;} + .d2-2951479422 .background-color-B1{background-color:#0D32B2;} + .d2-2951479422 .background-color-B2{background-color:#0D32B2;} + .d2-2951479422 .background-color-B3{background-color:#E3E9FD;} + .d2-2951479422 .background-color-B4{background-color:#E3E9FD;} + .d2-2951479422 .background-color-B5{background-color:#EDF0FD;} + .d2-2951479422 .background-color-B6{background-color:#F7F8FE;} + .d2-2951479422 .background-color-AA2{background-color:#4A6FF3;} + .d2-2951479422 .background-color-AA4{background-color:#EDF0FD;} + .d2-2951479422 .background-color-AA5{background-color:#F7F8FE;} + .d2-2951479422 .background-color-AB4{background-color:#EDF0FD;} + .d2-2951479422 .background-color-AB5{background-color:#F7F8FE;} + .d2-2951479422 .color-N1{color:#0A0F25;} + .d2-2951479422 .color-N2{color:#676C7E;} + .d2-2951479422 .color-N3{color:#9499AB;} + .d2-2951479422 .color-N4{color:#CFD2DD;} + .d2-2951479422 .color-N5{color:#DEE1EB;} + .d2-2951479422 .color-N6{color:#EEF1F8;} + .d2-2951479422 .color-N7{color:#FFFFFF;} + .d2-2951479422 .color-B1{color:#0D32B2;} + .d2-2951479422 .color-B2{color:#0D32B2;} + .d2-2951479422 .color-B3{color:#E3E9FD;} + .d2-2951479422 .color-B4{color:#E3E9FD;} + .d2-2951479422 .color-B5{color:#EDF0FD;} + .d2-2951479422 .color-B6{color:#F7F8FE;} + .d2-2951479422 .color-AA2{color:#4A6FF3;} + .d2-2951479422 .color-AA4{color:#EDF0FD;} + .d2-2951479422 .color-AA5{color:#F7F8FE;} + .d2-2951479422 .color-AB4{color:#EDF0FD;} + .d2-2951479422 .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}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json index 757009426..4929dc207 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json @@ -113,19 +113,19 @@ "route": [ { "x": 62, - "y": 211 + "y": 188 }, { "x": 142, - "y": 211 + "y": 188 }, { "x": 142, - "y": 290.5 + "y": 267.5 }, { "x": 62, - "y": 290.5 + "y": 267.5 } ], "animated": false, @@ -159,19 +159,19 @@ "route": [ { "x": 62, - "y": 309 + "y": 286 }, { "x": 142, - "y": 309 + "y": 286 }, { "x": 142, - "y": 364.5 + "y": 341.5 }, { "x": 62, - "y": 364.5 + "y": 341.5 } ], "animated": false, @@ -205,11 +205,11 @@ "route": [ { "x": 62, - "y": 402 + "y": 368 }, { "x": 212, - "y": 402 + "y": 368 } ], "animated": false, @@ -243,19 +243,19 @@ "route": [ { "x": 212, - "y": 495 + "y": 438 }, { "x": 292, - "y": 495 + "y": 438 }, { "x": 292, - "y": 574.5 + "y": 517.5 }, { "x": 212, - "y": 574.5 + "y": 517.5 } ], "animated": false, @@ -293,7 +293,7 @@ }, { "x": 62, - "y": 667.5 + "y": 587.5 } ], "animated": false, @@ -331,7 +331,7 @@ }, { "x": 212, - "y": 667.5 + "y": 587.5 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg index 4adb72495..34918e21a 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows - + .d2-2951479422 .fill-N1{fill:#0A0F25;} + .d2-2951479422 .fill-N2{fill:#676C7E;} + .d2-2951479422 .fill-N3{fill:#9499AB;} + .d2-2951479422 .fill-N4{fill:#CFD2DD;} + .d2-2951479422 .fill-N5{fill:#DEE1EB;} + .d2-2951479422 .fill-N6{fill:#EEF1F8;} + .d2-2951479422 .fill-N7{fill:#FFFFFF;} + .d2-2951479422 .fill-B1{fill:#0D32B2;} + .d2-2951479422 .fill-B2{fill:#0D32B2;} + .d2-2951479422 .fill-B3{fill:#E3E9FD;} + .d2-2951479422 .fill-B4{fill:#E3E9FD;} + .d2-2951479422 .fill-B5{fill:#EDF0FD;} + .d2-2951479422 .fill-B6{fill:#F7F8FE;} + .d2-2951479422 .fill-AA2{fill:#4A6FF3;} + .d2-2951479422 .fill-AA4{fill:#EDF0FD;} + .d2-2951479422 .fill-AA5{fill:#F7F8FE;} + .d2-2951479422 .fill-AB4{fill:#EDF0FD;} + .d2-2951479422 .fill-AB5{fill:#F7F8FE;} + .d2-2951479422 .stroke-N1{stroke:#0A0F25;} + .d2-2951479422 .stroke-N2{stroke:#676C7E;} + .d2-2951479422 .stroke-N3{stroke:#9499AB;} + .d2-2951479422 .stroke-N4{stroke:#CFD2DD;} + .d2-2951479422 .stroke-N5{stroke:#DEE1EB;} + .d2-2951479422 .stroke-N6{stroke:#EEF1F8;} + .d2-2951479422 .stroke-N7{stroke:#FFFFFF;} + .d2-2951479422 .stroke-B1{stroke:#0D32B2;} + .d2-2951479422 .stroke-B2{stroke:#0D32B2;} + .d2-2951479422 .stroke-B3{stroke:#E3E9FD;} + .d2-2951479422 .stroke-B4{stroke:#E3E9FD;} + .d2-2951479422 .stroke-B5{stroke:#EDF0FD;} + .d2-2951479422 .stroke-B6{stroke:#F7F8FE;} + .d2-2951479422 .stroke-AA2{stroke:#4A6FF3;} + .d2-2951479422 .stroke-AA4{stroke:#EDF0FD;} + .d2-2951479422 .stroke-AA5{stroke:#F7F8FE;} + .d2-2951479422 .stroke-AB4{stroke:#EDF0FD;} + .d2-2951479422 .stroke-AB5{stroke:#F7F8FE;} + .d2-2951479422 .background-color-N1{background-color:#0A0F25;} + .d2-2951479422 .background-color-N2{background-color:#676C7E;} + .d2-2951479422 .background-color-N3{background-color:#9499AB;} + .d2-2951479422 .background-color-N4{background-color:#CFD2DD;} + .d2-2951479422 .background-color-N5{background-color:#DEE1EB;} + .d2-2951479422 .background-color-N6{background-color:#EEF1F8;} + .d2-2951479422 .background-color-N7{background-color:#FFFFFF;} + .d2-2951479422 .background-color-B1{background-color:#0D32B2;} + .d2-2951479422 .background-color-B2{background-color:#0D32B2;} + .d2-2951479422 .background-color-B3{background-color:#E3E9FD;} + .d2-2951479422 .background-color-B4{background-color:#E3E9FD;} + .d2-2951479422 .background-color-B5{background-color:#EDF0FD;} + .d2-2951479422 .background-color-B6{background-color:#F7F8FE;} + .d2-2951479422 .background-color-AA2{background-color:#4A6FF3;} + .d2-2951479422 .background-color-AA4{background-color:#EDF0FD;} + .d2-2951479422 .background-color-AA5{background-color:#F7F8FE;} + .d2-2951479422 .background-color-AB4{background-color:#EDF0FD;} + .d2-2951479422 .background-color-AB5{background-color:#F7F8FE;} + .d2-2951479422 .color-N1{color:#0A0F25;} + .d2-2951479422 .color-N2{color:#676C7E;} + .d2-2951479422 .color-N3{color:#9499AB;} + .d2-2951479422 .color-N4{color:#CFD2DD;} + .d2-2951479422 .color-N5{color:#DEE1EB;} + .d2-2951479422 .color-N6{color:#EEF1F8;} + .d2-2951479422 .color-N7{color:#FFFFFF;} + .d2-2951479422 .color-B1{color:#0D32B2;} + .d2-2951479422 .color-B2{color:#0D32B2;} + .d2-2951479422 .color-B3{color:#E3E9FD;} + .d2-2951479422 .color-B4{color:#E3E9FD;} + .d2-2951479422 .color-B5{color:#EDF0FD;} + .d2-2951479422 .color-B6{color:#F7F8FE;} + .d2-2951479422 .color-AA2{color:#4A6FF3;} + .d2-2951479422 .color-AA4{color:#EDF0FD;} + .d2-2951479422 .color-AA5{color:#F7F8FE;} + .d2-2951479422 .color-AB4{color:#EDF0FD;} + .d2-2951479422 .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}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows + - - - - + + + + \ No newline at end of file