diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 4e018b11f..a3d943200 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -30,7 +30,10 @@ var setupJS string //go:embed dagre.js var dagreJS string -const MIN_SEGMENT_LEN = 10 +const ( + MIN_SEGMENT_LEN = 10 + MIN_RANK_SEP = 60 +) type ConfigurableOpts struct { NodeSep int `json:"nodesep"` @@ -39,7 +42,7 @@ type ConfigurableOpts struct { var DefaultOpts = ConfigurableOpts{ NodeSep: 60, - EdgeSep: 40, + EdgeSep: 20, } type DagreNode struct { diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 909a7eab1..886d3424a 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -87,9 +87,9 @@ type ConfigurableOpts struct { var DefaultOpts = ConfigurableOpts{ Algorithm: "layered", - NodeSpacing: 100.0, - Padding: "[top=75,left=75,bottom=75,right=75]", - EdgeNodeSpacing: 50.0, + NodeSpacing: 70.0, + Padding: "[top=50,left=50,bottom=50,right=50]", + EdgeNodeSpacing: 40.0, SelfLoopSpacing: 50.0, } @@ -132,7 +132,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err elkGraph := &ELKGraph{ ID: "root", LayoutOptions: &elkOpts{ - Thoroughness: 20, + Thoroughness: 8, EdgeEdgeBetweenLayersSpacing: 50, HierarchyHandling: "INCLUDE_CHILDREN", ConsiderModelOrder: "NODES_AND_EDGES", @@ -188,7 +188,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err if len(obj.ChildrenArray) > 0 { n.LayoutOptions = &elkOpts{ ForceNodeModelOrder: true, - Thoroughness: 20, + Thoroughness: 8, EdgeEdgeBetweenLayersSpacing: 50, HierarchyHandling: "INCLUDE_CHILDREN", ConsiderModelOrder: "NODES_AND_EDGES", diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index b2cbc5481..c1dd1de2a 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -246,8 +246,8 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { if inGroup { minX = math.Min(minX, n.TopLeft.X-HORIZONTAL_PAD) minY = math.Min(minY, n.TopLeft.Y-MIN_MESSAGE_DISTANCE/2.) - maxY = math.Max(maxY, n.TopLeft.Y+n.Height+HORIZONTAL_PAD) - maxX = math.Max(maxX, n.TopLeft.X+n.Width+MIN_MESSAGE_DISTANCE/2.) + maxX = math.Max(maxX, n.TopLeft.X+n.Width+HORIZONTAL_PAD) + maxY = math.Max(maxY, n.TopLeft.Y+n.Height+MIN_MESSAGE_DISTANCE/2.) } } diff --git a/d2renderers/d2sketch/sketch_test.go b/d2renderers/d2sketch/sketch_test.go index ba733435a..8e5a6c2b1 100644 --- a/d2renderers/d2sketch/sketch_test.go +++ b/d2renderers/d2sketch/sketch_test.go @@ -14,7 +14,6 @@ import ( tassert "github.com/stretchr/testify/assert" "oss.terrastruct.com/util-go/assert" - "oss.terrastruct.com/util-go/diff" "oss.terrastruct.com/util-go/go2" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" @@ -49,6 +48,132 @@ func TestSketch(t *testing.T) { script: `a -> b: hello `, }, + { + name: "crows feet", + script: `a1 <-> b1: { + style.stroke-width: 1 + source-arrowhead: { + shape: cf-many + } + target-arrowhead: { + shape: cf-many + } +} +a2 <-> b2: { + style.stroke-width: 3 + source-arrowhead: { + shape: cf-many + } + target-arrowhead: { + shape: cf-many + } +} +a3 <-> b3: { + style.stroke-width: 6 + source-arrowhead: { + shape: cf-many + } + target-arrowhead: { + shape: cf-many + } +} + +c1 <-> d1: { + style.stroke-width: 1 + source-arrowhead: { + shape: cf-many-required + } + target-arrowhead: { + shape: cf-many-required + } +} +c2 <-> d2: { + style.stroke-width: 3 + source-arrowhead: { + shape: cf-many-required + } + target-arrowhead: { + shape: cf-many-required + } +} +c3 <-> d3: { + style.stroke-width: 6 + source-arrowhead: { + shape: cf-many-required + } + target-arrowhead: { + shape: cf-many-required + } +} + +e1 <-> f1: { + style.stroke-width: 1 + source-arrowhead: { + shape: cf-one + } + target-arrowhead: { + shape: cf-one + } +} +e2 <-> f2: { + style.stroke-width: 3 + source-arrowhead: { + shape: cf-one + } + target-arrowhead: { + shape: cf-one + } +} +e3 <-> f3: { + style.stroke-width: 6 + source-arrowhead: { + shape: cf-one + } + target-arrowhead: { + shape: cf-one + } +} + +g1 <-> h1: { + style.stroke-width: 1 + source-arrowhead: { + shape: cf-one-required + } + target-arrowhead: { + shape: cf-one-required + } +} +g2 <-> h2: { + style.stroke-width: 3 + source-arrowhead: { + shape: cf-one-required + } + target-arrowhead: { + shape: cf-one-required + } +} +g3 <-> h3: { + style.stroke-width: 6 + source-arrowhead: { + shape: cf-one-required + } + target-arrowhead: { + shape: cf-one-required + } +} + +c <-> d <-> f: { + style.stroke-width: 1 + style.stroke: "orange" + source-arrowhead: { + shape: cf-many-required + } + target-arrowhead: { + shape: cf-one + } +} + `, + }, { name: "twitter", script: `timeline mixer: "" { @@ -408,7 +533,4 @@ func run(t *testing.T, tc testCase) { var xmlParsed interface{} err = xml.Unmarshal(svgBytes, &xmlParsed) assert.Success(t, err) - - err = diff.Testdata(filepath.Join(dataPath, "sketch"), ".svg", svgBytes) - assert.Success(t, err) } diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg index 921626327..c82b83336 100644 --- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg @@ -3,7 +3,7 @@ id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="486" height="800" viewBox="-102 -100 486 800"> + + + + +a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg index 93238ed1d..9a721f76a 100644 --- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg @@ -3,7 +3,7 @@ id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="2889" height="2473" viewBox="-102 -102 2889 2473">

Oldest message

-

Offset

-

Last message

-

Next message will be
+

Oldest message

+

Offset

+

Last message

+

Next message will be
inserted here

-
M0M1M2M3M4M5M6 - +
M0M1M2M3M4M5M6 +

Oldest message

-

Offset

-

Last message

-

Next message will be
+

Oldest message

+

Offset

+

Last message

+

Next message will be
inserted here

-
M0M1M2M3M4M5M6 - +
M0M1M2M3M4M5M6 +

hey

+

hey

  • they
      @@ -804,8 +804,8 @@ width="299" height="651" viewBox="-90 -90 299 651">x

      linux: because a PC is a terrible thing to waste

      -
      a You don't have to know how the computer works,just how to work the computer. - - +
a You don't have to know how the computer works,just how to work the computer. + + aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + abcd - - - \ No newline at end of file diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json deleted file mode 100644 index 987db0ad6..000000000 --- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json +++ /dev/null @@ -1,297 +0,0 @@ -{ - "name": "", - "fontFamily": "SourceSansPro", - "shapes": [ - { - "id": "a", - "type": "rectangle", - "pos": { - "x": 12, - "y": 12 - }, - "width": 514, - "height": 621, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#E3E9FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "a", - "fontSize": 28, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 1 - }, - { - "id": "a.b", - "type": "rectangle", - "pos": { - "x": 87, - "y": 87 - }, - "width": 364, - "height": 471, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#EDF0FD", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "b", - "fontSize": 24, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 12, - "labelHeight": 31, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 2 - }, - { - "id": "a.b.c", - "type": "rectangle", - "pos": { - "x": 172, - "y": 162 - }, - "width": 204, - "height": 216, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#F7F8FE", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "c", - "fontSize": 20, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": false, - "underline": false, - "labelWidth": 9, - "labelHeight": 26, - "labelPosition": "INSIDE_TOP_CENTER", - "zIndex": 0, - "level": 3 - }, - { - "id": "a.b.c.d", - "type": "rectangle", - "pos": { - "x": 247, - "y": 237 - }, - "width": 54, - "height": 66, - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "borderRadius": 0, - "fill": "#FFFFFF", - "stroke": "#0D32B2", - "shadow": false, - "3d": false, - "multiple": false, - "double-border": false, - "tooltip": "", - "link": "", - "icon": null, - "iconPosition": "", - "blend": false, - "fields": null, - "methods": null, - "columns": null, - "label": "d", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#0A0F25", - "italic": false, - "bold": true, - "underline": false, - "labelWidth": 9, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 0, - "level": 4 - } - ], - "connections": [ - { - "id": "(a.b -> a)[0]", - "src": "a.b", - "srcArrow": "none", - "srcLabel": "", - "dst": "a", - "dstArrow": "triangle", - "dstLabel": "", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 162, - "y": 558 - }, - { - "x": 162, - "y": 633 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "a.(b -> b.c)[0]", - "src": "a.b", - "srcArrow": "none", - "srcLabel": "", - "dst": "a.b.c", - "dstArrow": "triangle", - "dstLabel": "", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 247, - "y": 87 - }, - { - "x": 247, - "y": 162 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "a.(b.c.d -> b)[0]", - "src": "a.b.c.d", - "srcArrow": "none", - "srcLabel": "", - "dst": "a.b", - "dstArrow": "triangle", - "dstLabel": "", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "#0D32B2", - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "#676C7E", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "route": [ - { - "x": 274, - "y": 303 - }, - { - "x": 274, - "y": 433 - }, - { - "x": 162, - "y": 433 - }, - { - "x": 162, - "y": 87 - } - ], - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - } - ] -} diff --git a/e2etests/testdata/stable/child_parent_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/child_parent_edges/elk/sketch.exp.svg deleted file mode 100644 index 0a488aa47..000000000 --- a/e2etests/testdata/stable/child_parent_edges/elk/sketch.exp.svg +++ /dev/null @@ -1,59 +0,0 @@ - -abcd - - - \ No newline at end of file diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json index 4c3637f3d..91c33c16f 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json +++ b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json @@ -48,7 +48,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 299 + "y": 239 }, "width": 53, "height": 66, @@ -130,7 +130,7 @@ "type": "rectangle", "pos": { "x": 85, - "y": 299 + "y": 239 }, "width": 54, "height": 66, @@ -199,7 +199,7 @@ }, { "x": 38.5, - "y": 299 + "y": 239 } ], "animated": false, @@ -238,7 +238,7 @@ }, { "x": 112, - "y": 299 + "y": 239 } ], "animated": false, diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg index cf39da44b..60421b966 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg @@ -3,7 +3,7 @@ id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="339" height="557" viewBox="-90 -90 339 557">xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

+xyThe top of the mountain

Cats, no less liquid than their shadows, offer no angles to the wind.

If we can't fix it, it ain't broke.

Dieters live life in the fasting lane.

-
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right - +
JoeDonaldi am top lefti am top righti am bottom lefti am bottom right + poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 +poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

+
 poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 - +poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

+
 +

Markdown: Syntax

+

Markdown: Syntax

  • Overview
      @@ -1053,8 +1053,8 @@ title for the link, surrounded in quotes. For example:

      Code

      Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

      -
ab - +
ab +

Note: This document is itself written using Markdown; you +

Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

Overview

-
ab - +
ab + mixed togethersugarsolution we get - - +mixed togethersugarsolution we get + +
    +
    • Overview
      • Philosophy
        • @@ -808,8 +808,8 @@ width="583" height="636" viewBox="-90 -90 583 636">
          +
          • Overview ok this is all measured
            • Philosophy
              • @@ -804,8 +804,8 @@ width="449" height="612" viewBox="-90 -90 449 612">
                +
                • Overview
                  • Philosophy
                    • @@ -829,8 +829,8 @@ width="551" height="1048" viewBox="-90 -90 551 1048">

                    List items may consist of multiple paragraphs. Each subsequent +

                    List items may consist of multiple paragraphs. Each subsequent paragraph in a list item must be indented by either 4 spaces or one tab:

                      @@ -827,8 +827,8 @@ sit amet, consectetuer adipiscing elit.

                      Another item in the same list.

                  -
                ab - +
              ab +

              Markdown: Syntax

              -
              ab - +

              Markdown: Syntax

              +
              ab +

              Every frustum longs to be a cone

              +

              Every frustum longs to be a cone

              • A continuing flow of paper is sufficient to continue the flow of paper
              • Please remain calm, it's no use both of us being hysterical at the same time
              • Visits always give pleasure: if not on arrival, then on the departure

              Festivity Level 1: Your guests are chatting amiably with each other.

              -
              xy - +
              xy + container

              they did it in style

              -

              a header

              +container

              they did it in style

              +

              a header

              a line of text and an

              {
 	indented: "block",
@@ -805,8 +805,8 @@ width="516" height="684" viewBox="-102 -100 516 684">container
              they did it in style
              
-
              a header
              
+container
              they did it in style
              
+
              a header
              
 
              a line of text and an
              
 
              {
 	indented: "block",
@@ -805,8 +805,8 @@ width="566" height="736" viewBox="-90 -90 566 736">markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
+markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
              
-
              
-
+
              
+
 
 markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
+markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
              
-
              
-
+
              
+
 
 markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
+markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
              
-
              
-
+
              
+
 
 markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
+markdown
              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
              
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
              
-
              
-
+
              
+
 
 
              {
+
              {
 	fenced: "block",
 	of: "json",
 }
 
              
-
              ab  
-
+
              ab  
+
 
 
              a line of text and an
              
+
              a line of text and an
              
 
              {
 	indented: "block",
 	of: "json",
 }
 
              
-
              ab  
-
+
              ab  
+
 
 
              code
              
-
              ab  
-
+
              code
              
+
              ab  
+
 
 
              A paragraph is simply one or more consecutive lines of text, separated
+
              A paragraph is simply one or more consecutive lines of text, separated
 by one or more blank lines. (A blank line is any line that looks like a
 blank line -- a line containing nothing but spaces or tabs is considered
 blank.) Normal paragraphs should not be indented with spaces or tabs.
              
-
              ab  
-
+
              ab  
+
 
 
              Here is an example of AppleScript:
              
+
              Here is an example of AppleScript:
              
 
              tell application "Foo"
     beep
 end tell
 
              
 
              A code block continues until it reaches a line that is not indented
 (or the end of the article).
              
-
              ab  
-
+
              ab  
+
 
 bearmama bearpapa bear  
-
+bearmama bearpapa bear  
+
 
 ninety ninesixty fourthirty twosixteeneight
-
-
-
\ No newline at end of file
diff --git a/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json
deleted file mode 100644
index dcdae1536..000000000
--- a/e2etests/testdata/todo/font_sizes_containers_large/elk/board.exp.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "name": "",
-  "fontFamily": "SourceSansPro",
-  "shapes": [
-    {
-      "id": "ninety nine",
-      "type": "rectangle",
-      "pos": {
-        "x": 12,
-        "y": 12
-      },
-      "width": 664,
-      "height": 656,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#E3E9FD",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "ninety nine",
-      "fontSize": 99,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 452,
-      "labelHeight": 125,
-      "labelPosition": "INSIDE_TOP_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "ninety nine.sixty four",
-      "type": "rectangle",
-      "pos": {
-        "x": 87,
-        "y": 87
-      },
-      "width": 514,
-      "height": 506,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#EDF0FD",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "sixty four",
-      "fontSize": 64,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 246,
-      "labelHeight": 81,
-      "labelPosition": "INSIDE_TOP_CENTER",
-      "zIndex": 0,
-      "level": 2
-    },
-    {
-      "id": "ninety nine.sixty four.thirty two",
-      "type": "rectangle",
-      "pos": {
-        "x": 162,
-        "y": 162
-      },
-      "width": 364,
-      "height": 356,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "thirty two",
-      "fontSize": 32,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 130,
-      "labelHeight": 41,
-      "labelPosition": "INSIDE_TOP_CENTER",
-      "zIndex": 0,
-      "level": 3
-    },
-    {
-      "id": "ninety nine.sixty four.thirty two.sixteen",
-      "type": "rectangle",
-      "pos": {
-        "x": 237,
-        "y": 237
-      },
-      "width": 214,
-      "height": 206,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#FFFFFF",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "sixteen",
-      "fontSize": 16,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 48,
-      "labelHeight": 21,
-      "labelPosition": "INSIDE_TOP_CENTER",
-      "zIndex": 0,
-      "level": 4
-    },
-    {
-      "id": "ninety nine.sixty four.thirty two.sixteen.eight",
-      "type": "rectangle",
-      "pos": {
-        "x": 312,
-        "y": 312
-      },
-      "width": 64,
-      "height": 56,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#FFFFFF",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "eight",
-      "fontSize": 8,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 19,
-      "labelHeight": 11,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 5
-    }
-  ],
-  "connections": []
-}
diff --git a/e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg
deleted file mode 100644
index 1fe80d81c..000000000
--- a/e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-
-ninety ninesixty fourthirty twosixteeneight
-
-
-
\ No newline at end of file
diff --git a/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json b/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json
deleted file mode 100644
index 2fb12da96..000000000
--- a/e2etests/testdata/todo/font_sizes_large/dagre/board.exp.json
+++ /dev/null
@@ -1,405 +0,0 @@
-{
-  "name": "",
-  "fontFamily": "SourceSansPro",
-  "shapes": [
-    {
-      "id": "eight",
-      "type": "rectangle",
-      "pos": {
-        "x": 233,
-        "y": 0
-      },
-      "width": 64,
-      "height": 56,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "eight",
-      "fontSize": 8,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 19,
-      "labelHeight": 11,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "sixteen",
-      "type": "rectangle",
-      "pos": {
-        "x": 216,
-        "y": 214
-      },
-      "width": 97,
-      "height": 66,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "sixteen",
-      "fontSize": 16,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 52,
-      "labelHeight": 21,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "thirty two",
-      "type": "rectangle",
-      "pos": {
-        "x": 171,
-        "y": 453
-      },
-      "width": 187,
-      "height": 86,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "thirty two",
-      "fontSize": 32,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 142,
-      "labelHeight": 41,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "sixty four",
-      "type": "rectangle",
-      "pos": {
-        "x": 108,
-        "y": 742
-      },
-      "width": 314,
-      "height": 126,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "sixty four",
-      "fontSize": 64,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 269,
-      "labelHeight": 81,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "ninety nine",
-      "type": "rectangle",
-      "pos": {
-        "x": 0,
-        "y": 1112
-      },
-      "width": 529,
-      "height": 170,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "ninety nine",
-      "fontSize": 99,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 484,
-      "labelHeight": 125,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    }
-  ],
-  "connections": [
-    {
-      "id": "(eight -> sixteen)[0]",
-      "src": "eight",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "sixteen",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "twelve",
-      "fontSize": 12,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 33,
-      "labelHeight": 16,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 264.5,
-          "y": 56
-        },
-        {
-          "x": 264.5,
-          "y": 119.2
-        },
-        {
-          "x": 264.5,
-          "y": 150.8
-        },
-        {
-          "x": 264.5,
-          "y": 214
-        }
-      ],
-      "isCurve": true,
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    },
-    {
-      "id": "(sixteen -> thirty two)[0]",
-      "src": "sixteen",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "thirty two",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "twenty four",
-      "fontSize": 24,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 114,
-      "labelHeight": 31,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 264.5,
-          "y": 280
-        },
-        {
-          "x": 264.5,
-          "y": 349.2
-        },
-        {
-          "x": 264.5,
-          "y": 383.9
-        },
-        {
-          "x": 264.5,
-          "y": 453.5
-        }
-      ],
-      "isCurve": true,
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    },
-    {
-      "id": "(thirty two -> sixty four)[0]",
-      "src": "thirty two",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "sixty four",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "forty eight",
-      "fontSize": 48,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 202,
-      "labelHeight": 61,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 264.5,
-          "y": 539
-        },
-        {
-          "x": 264.5,
-          "y": 620.2
-        },
-        {
-          "x": 264.5,
-          "y": 660.9
-        },
-        {
-          "x": 264.5,
-          "y": 742.5
-        }
-      ],
-      "isCurve": true,
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    },
-    {
-      "id": "(sixty four -> ninety nine)[0]",
-      "src": "sixty four",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "ninety nine",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "eighty one",
-      "fontSize": 81,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 341,
-      "labelHeight": 102,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 264.5,
-          "y": 868
-        },
-        {
-          "x": 264.5,
-          "y": 965.6
-        },
-        {
-          "x": 264.5,
-          "y": 1014.4
-        },
-        {
-          "x": 264.5,
-          "y": 1112
-        }
-      ],
-      "isCurve": true,
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    }
-  ]
-}
diff --git a/e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg
deleted file mode 100644
index 6d10c903d..000000000
--- a/e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-
-eightsixteenthirty twosixty fourninety nine  twelvetwenty fourforty eighteighty one
-
-
-
-
-
-
\ No newline at end of file
diff --git a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json b/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json
deleted file mode 100644
index 463f68094..000000000
--- a/e2etests/testdata/todo/font_sizes_large/elk/board.exp.json
+++ /dev/null
@@ -1,369 +0,0 @@
-{
-  "name": "",
-  "fontFamily": "SourceSansPro",
-  "shapes": [
-    {
-      "id": "eight",
-      "type": "rectangle",
-      "pos": {
-        "x": 244,
-        "y": 12
-      },
-      "width": 64,
-      "height": 56,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "eight",
-      "fontSize": 8,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 19,
-      "labelHeight": 11,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "sixteen",
-      "type": "rectangle",
-      "pos": {
-        "x": 228,
-        "y": 284
-      },
-      "width": 97,
-      "height": 66,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "sixteen",
-      "fontSize": 16,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 52,
-      "labelHeight": 21,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "thirty two",
-      "type": "rectangle",
-      "pos": {
-        "x": 183,
-        "y": 581
-      },
-      "width": 187,
-      "height": 86,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "thirty two",
-      "fontSize": 32,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 142,
-      "labelHeight": 41,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "sixty four",
-      "type": "rectangle",
-      "pos": {
-        "x": 119,
-        "y": 928
-      },
-      "width": 314,
-      "height": 126,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "sixty four",
-      "fontSize": 64,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 269,
-      "labelHeight": 81,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "ninety nine",
-      "type": "rectangle",
-      "pos": {
-        "x": 12,
-        "y": 1356
-      },
-      "width": 529,
-      "height": 170,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "ninety nine",
-      "fontSize": 99,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 484,
-      "labelHeight": 125,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    }
-  ],
-  "connections": [
-    {
-      "id": "(eight -> sixteen)[0]",
-      "src": "eight",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "sixteen",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "twelve",
-      "fontSize": 12,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 33,
-      "labelHeight": 16,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 276.5,
-          "y": 68
-        },
-        {
-          "x": 276.5,
-          "y": 284
-        }
-      ],
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    },
-    {
-      "id": "(sixteen -> thirty two)[0]",
-      "src": "sixteen",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "thirty two",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "twenty four",
-      "fontSize": 24,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 114,
-      "labelHeight": 31,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 276.5,
-          "y": 350
-        },
-        {
-          "x": 276.5,
-          "y": 581
-        }
-      ],
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    },
-    {
-      "id": "(thirty two -> sixty four)[0]",
-      "src": "thirty two",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "sixty four",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "forty eight",
-      "fontSize": 48,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 202,
-      "labelHeight": 61,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 276.5,
-          "y": 667
-        },
-        {
-          "x": 276.5,
-          "y": 928
-        }
-      ],
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    },
-    {
-      "id": "(sixty four -> ninety nine)[0]",
-      "src": "sixty four",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "ninety nine",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "eighty one",
-      "fontSize": 81,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 341,
-      "labelHeight": 102,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 276.5,
-          "y": 1054
-        },
-        {
-          "x": 276.5,
-          "y": 1356
-        }
-      ],
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    }
-  ]
-}
diff --git a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg b/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg
deleted file mode 100644
index 28c54832a..000000000
--- a/e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-
-eightsixteenthirty twosixty fourninety nine  twelvetwenty fourforty eighteighty one
-
-
-
-
-
-
\ No newline at end of file
diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
index 391bd4924..1b41b8a12 100644
--- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
+++ b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 41
       },
-      "width": 1112,
+      "width": 932,
       "height": 415,
       "opacity": 1,
       "strokeDash": 0,
@@ -47,10 +47,10 @@
       "id": "containers.circle container",
       "type": "oval",
       "pos": {
-        "x": 40,
+        "x": 20,
         "y": 106
       },
-      "width": 228,
+      "width": 208,
       "height": 320,
       "opacity": 1,
       "strokeDash": 0,
@@ -88,7 +88,7 @@
       "id": "containers.circle container.diamond",
       "type": "diamond",
       "pos": {
-        "x": 90,
+        "x": 60,
         "y": 234
       },
       "width": 128,
@@ -129,10 +129,10 @@
       "id": "containers.diamond container",
       "type": "diamond",
       "pos": {
-        "x": 308,
+        "x": 248,
         "y": 106
       },
-      "width": 228,
+      "width": 208,
       "height": 320,
       "opacity": 1,
       "strokeDash": 0,
@@ -170,7 +170,7 @@
       "id": "containers.diamond container.circle",
       "type": "oval",
       "pos": {
-        "x": 358,
+        "x": 288,
         "y": 202
       },
       "width": 128,
@@ -211,10 +211,10 @@
       "id": "containers.oval container",
       "type": "oval",
       "pos": {
-        "x": 576,
+        "x": 476,
         "y": 106
       },
-      "width": 228,
+      "width": 208,
       "height": 320,
       "opacity": 1,
       "strokeDash": 0,
@@ -252,7 +252,7 @@
       "id": "containers.oval container.hexagon",
       "type": "hexagon",
       "pos": {
-        "x": 626,
+        "x": 516,
         "y": 234
       },
       "width": 128,
@@ -293,10 +293,10 @@
       "id": "containers.hexagon container",
       "type": "hexagon",
       "pos": {
-        "x": 844,
+        "x": 704,
         "y": 106
       },
-      "width": 228,
+      "width": 208,
       "height": 320,
       "opacity": 1,
       "strokeDash": 0,
@@ -334,7 +334,7 @@
       "id": "containers.hexagon container.oval",
       "type": "oval",
       "pos": {
-        "x": 894,
+        "x": 744,
         "y": 234
       },
       "width": 128,
@@ -375,7 +375,7 @@
       "id": "cloud",
       "type": "cloud",
       "pos": {
-        "x": 1162,
+        "x": 972,
         "y": 100
       },
       "width": 512,
@@ -416,7 +416,7 @@
       "id": "tall cylinder",
       "type": "cylinder",
       "pos": {
-        "x": 1290,
+        "x": 1100,
         "y": 1456
       },
       "width": 256,
@@ -457,7 +457,7 @@
       "id": "class",
       "type": "class",
       "pos": {
-        "x": 1018,
+        "x": 828,
         "y": 756
       },
       "width": 800,
@@ -532,7 +532,7 @@
       "id": "users",
       "type": "sql_table",
       "pos": {
-        "x": 1018,
+        "x": 828,
         "y": 2068
       },
       "width": 800,
@@ -716,7 +716,7 @@
       "id": "container",
       "type": "rectangle",
       "pos": {
-        "x": 2021,
+        "x": 1831,
         "y": 195
       },
       "width": 114,
@@ -757,7 +757,7 @@
       "id": "text",
       "type": "text",
       "pos": {
-        "x": 1878,
+        "x": 1688,
         "y": 556
       },
       "width": 400,
@@ -797,7 +797,7 @@
       "id": "code",
       "type": "code",
       "pos": {
-        "x": 1878,
+        "x": 1688,
         "y": 1562
       },
       "width": 400,
@@ -837,7 +837,7 @@
       "id": "small code",
       "type": "code",
       "pos": {
-        "x": 1983,
+        "x": 1793,
         "y": 2236
       },
       "width": 191,
@@ -901,31 +901,31 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 1418,
+          "x": 1228,
           "y": 355
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 395.8
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 416
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 431
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 446
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 556
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 756
         }
       ],
@@ -961,19 +961,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 1418,
+          "x": 1228,
           "y": 1156
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 1356
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 1416
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 1456
         }
       ],
@@ -1009,19 +1009,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 1418,
+          "x": 1228,
           "y": 1968
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 2008
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 2028
         },
         {
-          "x": 1418,
+          "x": 1228,
           "y": 2068
         }
       ],
@@ -1057,31 +1057,31 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 2078,
+          "x": 1888,
           "y": 261
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 377
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 416
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 431
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 446
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 516
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 556
         }
       ],
@@ -1117,19 +1117,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 2078,
+          "x": 1888,
           "y": 1356
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 1396
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 1437.2
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 1562
         }
       ],
@@ -1165,19 +1165,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 2078,
+          "x": 1888,
           "y": 1862
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 1986.8
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 2061.5
         },
         {
-          "x": 2078,
+          "x": 1888,
           "y": 2235.5
         }
       ],
diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
index c807e2b94..1f48d4177 100644
--- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
+++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="2482" height="2670" viewBox="-102 -100 2482 2670">containerscloudtall cylinderclass-
-num
-int-
-timeout
-int-
-pid
-+
-getStatus()
-Enum+
-getJobs()
-Job[]+
-setTimeout(seconds int)
-voidusersid
-int
-name
-string
-email
-string
-password
-string
-last_login
-datetime
-container
              markdown text expanded to 800x400
              
-
              a := 5
+containerscloudtall cylinderclass-
+num
+int-
+timeout
+int-
+pid
++
+getStatus()
+Enum+
+getJobs()
+Job[]+
+setTimeout(seconds int)
+voidusersid
+int
+name
+string
+email
+string
+password
+string
+last_login
+datetime
+container
              markdown text expanded to 800x400
              
+
              a := 5
 b := a + 7
-fmt.Printf("%d", b)a := 5
+fmt.Printf("%d", b)a := 5
 b := a + 7
-fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval  
-
+              fmt.Printf("%d", b)              circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval  
+
 
 containerscloudtall cylinderclass-
-num
-int-
-timeout
-int-
-pid
-+
-getStatus()
-Enum+
-getJobs()
-Job[]+
-setTimeout(seconds int)
-voidusersid
-int
-name
-string
-email
-string
-password
-string
-last_login
-datetime
-container
              markdown text expanded to 800x400
              
-
              a := 5
+containerscloudtall cylinderclass-
+num
+int-
+timeout
+int-
+pid
++
+getStatus()
+Enum+
+getJobs()
+Job[]+
+setTimeout(seconds int)
+voidusersid
+int
+name
+string
+email
+string
+password
+string
+last_login
+datetime
+container
              markdown text expanded to 800x400
              
+
              a := 5
 b := a + 7
-fmt.Printf("%d", b)a := 5
+fmt.Printf("%d", b)a := 5
 b := a + 7
-fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval  
-
+              fmt.Printf("%d", b)              circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval  
+
 
 ab  Thereoncewasaverytalledgelabel
-
-
-
\ No newline at end of file
diff --git a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json b/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json
deleted file mode 100644
index 6f0851cca..000000000
--- a/e2etests/testdata/todo/tall_edge_label/elk/board.exp.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "name": "",
-  "fontFamily": "SourceSansPro",
-  "shapes": [
-    {
-      "id": "a",
-      "type": "rectangle",
-      "pos": {
-        "x": 12,
-        "y": 12
-      },
-      "width": 53,
-      "height": 66,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "a",
-      "fontSize": 16,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 8,
-      "labelHeight": 21,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    },
-    {
-      "id": "b",
-      "type": "rectangle",
-      "pos": {
-        "x": 12,
-        "y": 411
-      },
-      "width": 53,
-      "height": 66,
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "borderRadius": 0,
-      "fill": "#F7F8FE",
-      "stroke": "#0D32B2",
-      "shadow": false,
-      "3d": false,
-      "multiple": false,
-      "double-border": false,
-      "tooltip": "",
-      "link": "",
-      "icon": null,
-      "iconPosition": "",
-      "blend": false,
-      "fields": null,
-      "methods": null,
-      "columns": null,
-      "label": "b",
-      "fontSize": 16,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#0A0F25",
-      "italic": false,
-      "bold": true,
-      "underline": false,
-      "labelWidth": 8,
-      "labelHeight": 21,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "zIndex": 0,
-      "level": 1
-    }
-  ],
-  "connections": [
-    {
-      "id": "(a -> b)[0]",
-      "src": "a",
-      "srcArrow": "none",
-      "srcLabel": "",
-      "dst": "b",
-      "dstArrow": "triangle",
-      "dstLabel": "",
-      "opacity": 1,
-      "strokeDash": 0,
-      "strokeWidth": 2,
-      "stroke": "#0D32B2",
-      "label": "There\nonce\nwas\na\nvery\ntall\nedge\nlabel",
-      "fontSize": 16,
-      "fontFamily": "DEFAULT",
-      "language": "",
-      "color": "#676C7E",
-      "italic": true,
-      "bold": false,
-      "underline": false,
-      "labelWidth": 38,
-      "labelHeight": 133,
-      "labelPosition": "INSIDE_MIDDLE_CENTER",
-      "labelPercentage": 0,
-      "route": [
-        {
-          "x": 38.5,
-          "y": 78
-        },
-        {
-          "x": 38.5,
-          "y": 411
-        }
-      ],
-      "animated": false,
-      "tooltip": "",
-      "icon": null,
-      "zIndex": 0
-    }
-  ]
-}
diff --git a/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg b/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg
deleted file mode 100644
index ce817e41e..000000000
--- a/e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-
-ab  Thereoncewasaverytalledgelabel
-
-
-
\ No newline at end of file