diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json
index 161541e69..6096ee9c0 100644
--- a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json
+++ b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json
@@ -10,7 +10,7 @@
         "y": 0
       },
       "width": 239,
-      "height": 86,
+      "height": 150,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -37,7 +37,7 @@
       "bold": true,
       "underline": false,
       "labelWidth": 239,
-      "labelHeight": 86,
+      "labelHeight": 150,
       "zIndex": 0,
       "level": 1
     },
@@ -46,10 +46,10 @@
       "type": "code",
       "pos": {
         "x": 299,
-        "y": 0
+        "y": 16
       },
       "width": 160,
-      "height": 86,
+      "height": 118,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -76,7 +76,7 @@
       "bold": true,
       "underline": false,
       "labelWidth": 160,
-      "labelHeight": 86,
+      "labelHeight": 118,
       "zIndex": 0,
       "level": 1
     },
@@ -85,10 +85,10 @@
       "type": "code",
       "pos": {
         "x": 519,
-        "y": 0
+        "y": 16
       },
       "width": 160,
-      "height": 86,
+      "height": 118,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -115,7 +115,7 @@
       "bold": true,
       "underline": false,
       "labelWidth": 160,
-      "labelHeight": 86,
+      "labelHeight": 118,
       "zIndex": 0,
       "level": 1
     }
diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg
index 18b87b5d0..b35570020 100644
--- a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/code_leading_trailing_newlines/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="883" height="290" viewBox="-102 -102 883 290"><style type="text/css">
+width="883" height="354" viewBox="-102 -102 883 354"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,25 +39,25 @@ width="883" height="290" viewBox="-102 -102 883 290"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="hello world"><g class="shape" ></g><g transform="translate(0.000000 0.000000)" style="opacity:1.000000"><rect class="shape" width="239" height="86" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
+]]></script><g id="hello world"><g class="shape" ></g><g transform="translate(0.000000 0.000000)" style="opacity:1.000000"><rect class="shape" width="239" height="150" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;leading,&#160;2&#160;trailing</tspan>
 </text><text class="text-mono" x="0" y="4.000000em" xml:space="preserve"><tspan fill="#000000" font-weight="bold">def</tspan>&#160;<tspan fill="#990000" font-weight="bold">hello</tspan>():
 </text><text class="text-mono" x="0" y="5.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="6.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan>
 </text><text class="text-mono" x="0" y="7.000000em" xml:space="preserve">
-</text></g></g></g><g id="no trailing"><g class="shape" ></g><g transform="translate(299.000000 0.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="86" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
+</text></g></g></g><g id="no trailing"><g class="shape" ></g><g transform="translate(299.000000 16.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="118" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;leading</tspan>
 </text><text class="text-mono" x="0" y="4.000000em" xml:space="preserve"><tspan fill="#000000" font-weight="bold">def</tspan>&#160;<tspan fill="#990000" font-weight="bold">hello</tspan>():
 </text><text class="text-mono" x="0" y="5.000000em" xml:space="preserve">
-</text><text class="text-mono" x="0" y="6.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan></text></g></g></g><g id="no leading"><g class="shape" ></g><g transform="translate(519.000000 0.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="86" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;trailing</tspan>
+</text><text class="text-mono" x="0" y="6.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan></text></g></g></g><g id="no leading"><g class="shape" ></g><g transform="translate(519.000000 16.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="118" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;trailing</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve"><tspan fill="#000000" font-weight="bold">def</tspan>&#160;<tspan fill="#990000" font-weight="bold">hello</tspan>():
 </text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="4.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan>
 </text><text class="text-mono" x="0" y="5.000000em" xml:space="preserve">
-</text></g></g></g><mask id="555946603" maskUnits="userSpaceOnUse" x="-100" y="-100" width="883" height="290">
-<rect x="-100" y="-100" width="883" height="290" fill="white"></rect>
+</text></g></g></g><mask id="1103071855" maskUnits="userSpaceOnUse" x="-100" y="-100" width="883" height="354">
+<rect x="-100" y="-100" width="883" height="354" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text-mono {
diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json
index 3e0bd62e5..da4f01ab5 100644
--- a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json
+++ b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json
@@ -10,7 +10,7 @@
         "y": 12
       },
       "width": 239,
-      "height": 86,
+      "height": 150,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -37,7 +37,7 @@
       "bold": true,
       "underline": false,
       "labelWidth": 239,
-      "labelHeight": 86,
+      "labelHeight": 150,
       "zIndex": 0,
       "level": 1
     },
@@ -46,10 +46,10 @@
       "type": "code",
       "pos": {
         "x": 271,
-        "y": 12
+        "y": 28
       },
       "width": 160,
-      "height": 86,
+      "height": 118,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -76,7 +76,7 @@
       "bold": true,
       "underline": false,
       "labelWidth": 160,
-      "labelHeight": 86,
+      "labelHeight": 118,
       "zIndex": 0,
       "level": 1
     },
@@ -85,10 +85,10 @@
       "type": "code",
       "pos": {
         "x": 451,
-        "y": 12
+        "y": 28
       },
       "width": 160,
-      "height": 86,
+      "height": 118,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -115,7 +115,7 @@
       "bold": true,
       "underline": false,
       "labelWidth": 160,
-      "labelHeight": 86,
+      "labelHeight": 118,
       "zIndex": 0,
       "level": 1
     }
diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg
index b3352ede2..5f47f871b 100644
--- a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/code_leading_trailing_newlines/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="803" height="290" viewBox="-90 -90 803 290"><style type="text/css">
+width="803" height="354" viewBox="-90 -90 803 354"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,25 +39,25 @@ width="803" height="290" viewBox="-90 -90 803 290"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="hello world"><g class="shape" ></g><g transform="translate(12.000000 12.000000)" style="opacity:1.000000"><rect class="shape" width="239" height="86" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
+]]></script><g id="hello world"><g class="shape" ></g><g transform="translate(12.000000 12.000000)" style="opacity:1.000000"><rect class="shape" width="239" height="150" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;leading,&#160;2&#160;trailing</tspan>
 </text><text class="text-mono" x="0" y="4.000000em" xml:space="preserve"><tspan fill="#000000" font-weight="bold">def</tspan>&#160;<tspan fill="#990000" font-weight="bold">hello</tspan>():
 </text><text class="text-mono" x="0" y="5.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="6.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan>
 </text><text class="text-mono" x="0" y="7.000000em" xml:space="preserve">
-</text></g></g></g><g id="no trailing"><g class="shape" ></g><g transform="translate(271.000000 12.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="86" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
+</text></g></g></g><g id="no trailing"><g class="shape" ></g><g transform="translate(271.000000 28.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="118" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;leading</tspan>
 </text><text class="text-mono" x="0" y="4.000000em" xml:space="preserve"><tspan fill="#000000" font-weight="bold">def</tspan>&#160;<tspan fill="#990000" font-weight="bold">hello</tspan>():
 </text><text class="text-mono" x="0" y="5.000000em" xml:space="preserve">
-</text><text class="text-mono" x="0" y="6.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan></text></g></g></g><g id="no leading"><g class="shape" ></g><g transform="translate(451.000000 12.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="86" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;trailing</tspan>
+</text><text class="text-mono" x="0" y="6.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan></text></g></g></g><g id="no leading"><g class="shape" ></g><g transform="translate(451.000000 28.000000)" style="opacity:1.000000"><rect class="shape" width="160" height="118" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve"><tspan fill="#999988" font-style="italic">#&#160;2&#160;trailing</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve"><tspan fill="#000000" font-weight="bold">def</tspan>&#160;<tspan fill="#990000" font-weight="bold">hello</tspan>():
 </text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">
 </text><text class="text-mono" x="0" y="4.000000em" xml:space="preserve">&#160;&#160;<tspan fill="#0086b3">print</tspan>&#160;<tspan fill="#dd1144"></tspan><tspan fill="#dd1144">&quot;</tspan><tspan fill="#dd1144">world</tspan><tspan fill="#dd1144">&quot;</tspan>
 </text><text class="text-mono" x="0" y="5.000000em" xml:space="preserve">
-</text></g></g></g><mask id="3216095572" maskUnits="userSpaceOnUse" x="-100" y="-100" width="803" height="290">
-<rect x="-100" y="-100" width="803" height="290" fill="white"></rect>
+</text></g></g></g><mask id="571076990" maskUnits="userSpaceOnUse" x="-100" y="-100" width="803" height="354">
+<rect x="-100" y="-100" width="803" height="354" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text-mono {