From 9f54c4302c4343d09920e70ac3f06d4cd15af986 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 14 Aug 2025 20:21:55 -0600
Subject: [PATCH 01/12] save

---
 d2js/d2wasm/functions.go           | 45 +++++++++++++++++
 d2js/d2wasm/types.go               |  2 +
 d2js/js/examples/customizable.html | 80 ++++++++++++++++++++++++++++--
 d2js/js/index.d.ts                 |  4 ++
 d2js/js/test/unit/basic.test.js    | 62 +++++++++++++++++++++++
 5 files changed, 189 insertions(+), 4 deletions(-)

diff --git a/d2js/d2wasm/functions.go b/d2js/d2wasm/functions.go
index 2d0599ba6b..61f2e1eb76 100644
--- a/d2js/d2wasm/functions.go
+++ b/d2js/d2wasm/functions.go
@@ -20,6 +20,8 @@ import (
 	"oss.terrastruct.com/d2/d2oracle"
 	"oss.terrastruct.com/d2/d2parser"
 	"oss.terrastruct.com/d2/d2renderers/d2animate"
+	"oss.terrastruct.com/d2/d2renderers/d2ascii"
+	"oss.terrastruct.com/d2/d2renderers/d2ascii/charset"
 	"oss.terrastruct.com/d2/d2renderers/d2fonts"
 	"oss.terrastruct.com/d2/d2renderers/d2svg"
 	"oss.terrastruct.com/d2/d2renderers/d2svg/appendix"
@@ -29,6 +31,7 @@ import (
 	"oss.terrastruct.com/d2/lib/textmeasure"
 	"oss.terrastruct.com/d2/lib/urlenc"
 	"oss.terrastruct.com/d2/lib/version"
+	"oss.terrastruct.com/util-go/go2"
 )
 
 const DEFAULT_INPUT_PATH = "index"
@@ -242,6 +245,12 @@ func Compile(args []js.Value) (interface{}, error) {
 		compileOpts.Layout = input.Opts.Layout
 	}
 
+	if input.Opts != nil && input.Opts.ASCII != nil && *input.Opts.ASCII {
+		if compileOpts.Layout == nil || *compileOpts.Layout == "dagre" {
+			compileOpts.Layout = go2.Pointer("elk")
+		}
+	}
+
 	renderOpts := &d2svg.RenderOpts{}
 	if input.Opts != nil && input.Opts.Sketch != nil {
 		renderOpts.Sketch = input.Opts.Sketch
@@ -293,6 +302,8 @@ func Compile(args []js.Value) (interface{}, error) {
 			AnimateInterval:    input.Opts.AnimateInterval,
 			Salt:               input.Opts.Salt,
 			NoXMLTag:           input.Opts.NoXMLTag,
+			ASCII:              input.Opts.ASCII,
+			ASCIIMode:          input.Opts.ASCIIMode,
 		},
 	}, nil
 }
@@ -397,6 +408,40 @@ func Render(args []js.Value) (interface{}, error) {
 		renderOpts.NoXMLTag = input.Opts.NoXMLTag
 	}
 
+	if input.Opts != nil && input.Opts.ASCII != nil && *input.Opts.ASCII {
+		if !noChildren && animateInterval > 0 {
+			return nil, &WASMError{Message: "ASCII rendering does not support multi-board animation", Code: 400}
+		}
+		if !noChildren {
+			return nil, &WASMError{Message: "ASCII rendering does not support multi-board targets", Code: 400}
+		}
+
+		artist := d2ascii.NewASCIIartist()
+		asciiOpts := &d2ascii.RenderOpts{}
+		if input.Opts.Scale != nil {
+			asciiOpts.Scale = input.Opts.Scale
+		}
+		// Set charset based on ASCII mode (default to "extended"/Unicode)
+		var charsetType charset.Type
+		asciiMode := "extended" // Default
+		if input.Opts.ASCIIMode != nil {
+			asciiMode = *input.Opts.ASCIIMode
+		}
+		switch asciiMode {
+		case "standard":
+			charsetType = charset.ASCII
+		default: // "extended" or any other value defaults to Unicode
+			charsetType = charset.Unicode
+		}
+		asciiOpts.Charset = charsetType
+
+		out, err := artist.Render(diagram, asciiOpts)
+		if err != nil {
+			return nil, &WASMError{Message: fmt.Sprintf("ASCII render failed: %s", err.Error()), Code: 500}
+		}
+		return out, nil
+	}
+
 	forceAppendix := input.Opts != nil && input.Opts.ForceAppendix != nil && *input.Opts.ForceAppendix
 
 	var boards [][]byte
diff --git a/d2js/d2wasm/types.go b/d2js/d2wasm/types.go
index b10e97c1fe..435efb3867 100644
--- a/d2js/d2wasm/types.go
+++ b/d2js/d2wasm/types.go
@@ -52,6 +52,8 @@ type RenderOptions struct {
 	AnimateInterval    *int64                   `json:"animateInterval"`
 	Salt               *string                  `json:"salt"`
 	NoXMLTag           *bool                    `json:"noXMLTag"`
+	ASCII              *bool                    `json:"ascii"`
+	ASCIIMode          *string                  `json:"asciiMode"`
 }
 
 type CompileOptions struct {
diff --git a/d2js/js/examples/customizable.html b/d2js/js/examples/customizable.html
index afa6e60a37..3498181823 100644
--- a/d2js/js/examples/customizable.html
+++ b/d2js/js/examples/customizable.html
@@ -90,12 +90,30 @@
         min-width: 100%;
         max-height: 90vh;
       }
+
+      #output pre {
+        font-family: monospace;
+        white-space: pre;
+        overflow-x: auto;
+        background: #f5f5f5;
+        padding: 16px;
+        border-radius: 4px;
+      }
     </style>
   </head>
 
   <body>
     <div class="controls">
-      <textarea id="input">x -> y</textarea>
+      <textarea id="input">
+server: {shape: rectangle}
+database: {shape: cylinder}
+user: {shape: person}
+
+user -> server: "HTTP request"
+server -> database: "SQL query"
+database -> server: "result"
+server -> user: "response"</textarea
+      >
       <div class="options-group">
         <div class="option">
           <div class="option-toggle">
@@ -137,6 +155,30 @@
             </div>
           </div>
         </div>
+        <div class="option">
+          <div class="option-toggle">
+            <label class="checkbox-label">
+              <input type="checkbox" id="ascii-toggle" class="option-toggle-box" />
+              <span>ASCII Mode</span>
+            </label>
+          </div>
+          <div class="option-select">
+            <div class="radio-group">
+              <label class="radio-label">
+                <input type="radio" name="ascii-select" value="true" checked />
+                Enabled
+              </label>
+              <label class="radio-label">
+                <input type="radio" name="ascii-select" value="false" />
+                Disabled
+              </label>
+            </div>
+            <select id="ascii-mode-select">
+              <option selected value="extended">Extended (Unicode)</option>
+              <option value="standard">Standard (ASCII)</option>
+            </select>
+          </div>
+        </div>
         <div class="option">
           <div class="option-toggle">
             <label class="checkbox-label">
@@ -384,6 +426,13 @@
         const layout = document.getElementById("layout-toggle").checked
           ? document.querySelector('input[name="layout-select"]:checked').value
           : null;
+        const ascii = document.getElementById("ascii-toggle").checked
+          ? document.querySelector('input[name="ascii-select"]:checked').value == "true"
+          : null;
+        const asciiModeSelector = document.getElementById("ascii-mode-select");
+        const asciiMode = ascii
+          ? asciiModeSelector.options[asciiModeSelector.selectedIndex].value
+          : null;
         const sketch = document.getElementById("sketch-toggle").checked
           ? document.querySelector('input[name="sketch-select"]:checked').value == "true"
           : null;
@@ -430,7 +479,7 @@
         try {
           const result = await d2.compile(input, {
             layout,
-            sketch,
+            sketch: ascii ? false : sketch, // Disable sketch when ASCII is enabled
             themeId,
             darkThemeId,
             scale,
@@ -446,13 +495,36 @@
             fontBold,
             noXmlTag: true,
           });
-          const svg = await d2.render(result.diagram, result.renderOptions);
-          document.getElementById("output").innerHTML = svg;
+          const output = await d2.render(result.diagram, {
+            ...result.renderOptions,
+            ascii: ascii,
+            asciiMode: asciiMode,
+          });
+
+          if (ascii) {
+            document.getElementById("output").innerHTML = `<pre>${output}</pre>`;
+          } else {
+            document.getElementById("output").innerHTML = output;
+          }
         } catch (err) {
           console.error(err);
           document.getElementById("output").textContent = err.message;
         }
       };
+
+      // Make ASCII and Sketch modes mutually exclusive
+      document.getElementById("ascii-toggle").addEventListener("change", function () {
+        if (this.checked) {
+          document.getElementById("sketch-toggle").checked = false;
+        }
+      });
+
+      document.getElementById("sketch-toggle").addEventListener("change", function () {
+        if (this.checked) {
+          document.getElementById("ascii-toggle").checked = false;
+        }
+      });
+
       compile();
     </script>
   </body>
diff --git a/d2js/js/index.d.ts b/d2js/js/index.d.ts
index 0b455af6e1..4d298b82c2 100644
--- a/d2js/js/index.d.ts
+++ b/d2js/js/index.d.ts
@@ -28,6 +28,10 @@ export interface RenderOptions {
   salt?: string;
   /** Omit XML tag (<?xml ...?>) from output SVG files. Useful when generating SVGs for direct HTML embedding. */
   noXMLTag?: boolean;
+  /** Render as ASCII instead of SVG [default: false] */
+  ascii?: boolean;
+  /** ASCII rendering mode for text outputs. Options: 'standard' (basic ASCII chars) or 'extended' (Unicode chars) [default: 'extended'] */
+  asciiMode?: "standard" | "extended";
 }
 
 export interface CompileOptions extends RenderOptions {
diff --git a/d2js/js/test/unit/basic.test.js b/d2js/js/test/unit/basic.test.js
index aaeef0943f..9cd77a6364 100644
--- a/d2js/js/test/unit/basic.test.js
+++ b/d2js/js/test/unit/basic.test.js
@@ -429,4 +429,66 @@ describe("D2 Unit Tests", () => {
     expect(jsVersion.length).toBeGreaterThan(0);
     await d2.worker.terminate();
   }, 20000);
+
+  test("ASCII render works", async () => {
+    const d2 = new D2();
+    const result = await d2.compile("x -> y");
+    const ascii = await d2.render(result.diagram, { ascii: true });
+    expect(ascii).toBeDefined();
+    expect(typeof ascii).toBe("string");
+    expect(ascii).toContain("x");
+    expect(ascii).toContain("y");
+    // ASCII art uses box drawing characters for connections
+    expect(ascii).toContain("┌") ||
+      expect(ascii).toContain("└") ||
+      expect(ascii).toContain("│");
+    await d2.worker.terminate();
+  }, 20000);
+
+  test("ASCII render with multiple shapes works", async () => {
+    const d2 = new D2();
+    const result = await d2.compile(`
+      a: {shape: rectangle}
+      b: {shape: circle} 
+      c: {shape: diamond}
+      a -> b
+      b -> c
+    `);
+    const ascii = await d2.render(result.diagram, { ascii: true });
+    expect(ascii).toBeDefined();
+    expect(typeof ascii).toBe("string");
+    expect(ascii).toContain("a");
+    expect(ascii).toContain("b");
+    expect(ascii).toContain("c");
+    await d2.worker.terminate();
+  }, 20000);
+
+  test("ASCII mode options work correctly", async () => {
+    const d2 = new D2();
+    const result = await d2.compile("x -> y");
+    
+    // Test extended mode (default)
+    const asciiExtended = await d2.render(result.diagram, { 
+      ascii: true, 
+      asciiMode: "extended" 
+    });
+    expect(asciiExtended).toBeDefined();
+    expect(typeof asciiExtended).toBe("string");
+    expect(asciiExtended).toMatch(/[┌┐└┘│─]/); // Should contain Unicode box chars
+    
+    // Test standard mode
+    const asciiStandard = await d2.render(result.diagram, { 
+      ascii: true, 
+      asciiMode: "standard" 
+    });
+    expect(asciiStandard).toBeDefined();
+    expect(typeof asciiStandard).toBe("string");
+    expect(asciiStandard).not.toMatch(/[┌┐└┘│─]/); // Should not contain Unicode box chars
+    expect(asciiStandard).toMatch(/[+\-|]/); // Should contain basic ASCII chars
+    
+    // Modes should produce different outputs
+    expect(asciiExtended).not.toBe(asciiStandard);
+    
+    await d2.worker.terminate();
+  }, 20000);
 });

From f7b1a4ffd68560b95af10bd599150e5b674b8cbb Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 14 Aug 2025 20:23:48 -0600
Subject: [PATCH 02/12] test

---
 d2js/js/examples/customizable.html |  2 ++
 d2js/js/test/unit/basic.test.js    | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/d2js/js/examples/customizable.html b/d2js/js/examples/customizable.html
index 3498181823..e14cfb3195 100644
--- a/d2js/js/examples/customizable.html
+++ b/d2js/js/examples/customizable.html
@@ -494,6 +494,8 @@
             fontSemibold,
             fontBold,
             noXmlTag: true,
+            ascii: ascii,
+            asciiMode: asciiMode,
           });
           const output = await d2.render(result.diagram, {
             ...result.renderOptions,
diff --git a/d2js/js/test/unit/basic.test.js b/d2js/js/test/unit/basic.test.js
index 9cd77a6364..7b333ca9ad 100644
--- a/d2js/js/test/unit/basic.test.js
+++ b/d2js/js/test/unit/basic.test.js
@@ -466,29 +466,29 @@ describe("D2 Unit Tests", () => {
   test("ASCII mode options work correctly", async () => {
     const d2 = new D2();
     const result = await d2.compile("x -> y");
-    
+
     // Test extended mode (default)
-    const asciiExtended = await d2.render(result.diagram, { 
-      ascii: true, 
-      asciiMode: "extended" 
+    const asciiExtended = await d2.render(result.diagram, {
+      ascii: true,
+      asciiMode: "extended",
     });
     expect(asciiExtended).toBeDefined();
     expect(typeof asciiExtended).toBe("string");
     expect(asciiExtended).toMatch(/[┌┐└┘│─]/); // Should contain Unicode box chars
-    
+
     // Test standard mode
-    const asciiStandard = await d2.render(result.diagram, { 
-      ascii: true, 
-      asciiMode: "standard" 
+    const asciiStandard = await d2.render(result.diagram, {
+      ascii: true,
+      asciiMode: "standard",
     });
     expect(asciiStandard).toBeDefined();
     expect(typeof asciiStandard).toBe("string");
     expect(asciiStandard).not.toMatch(/[┌┐└┘│─]/); // Should not contain Unicode box chars
     expect(asciiStandard).toMatch(/[+\-|]/); // Should contain basic ASCII chars
-    
+
     // Modes should produce different outputs
     expect(asciiExtended).not.toBe(asciiStandard);
-    
+
     await d2.worker.terminate();
   }, 20000);
 });

From b3aba38c7e9a780c707b2c1f0b0b0cba170ebe91 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Fri, 15 Aug 2025 06:51:44 -0600
Subject: [PATCH 03/12] save test

---
 e2etests/asciitxtar.txt                       |  3 +
 .../asciitxtar/basic-simple/extended.exp.txt  |  8 ++
 .../asciitxtar/basic-simple/sketch.exp.svg    | 95 +++++++++++++++++++
 .../asciitxtar/basic-simple/standard.exp.txt  |  8 ++
 4 files changed, 114 insertions(+)
 create mode 100644 e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
 create mode 100644 e2etests/testdata/asciitxtar/basic-simple/sketch.exp.svg
 create mode 100644 e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt

diff --git a/e2etests/asciitxtar.txt b/e2etests/asciitxtar.txt
index 1bdcbde809..f96be0a4f5 100644
--- a/e2etests/asciitxtar.txt
+++ b/e2etests/asciitxtar.txt
@@ -1,3 +1,6 @@
+-- basic-simple --
+x -> y
+
 -- network-vertical --
 network: {
   cell tower: {
diff --git a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
new file mode 100644
index 0000000000..d27ed61d33
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
@@ -0,0 +1,8 @@
+ ┌───┐ 
+ │ x │ 
+ └───┘ 
+    │  
+    ▼  
+ ┌────┐
+ │ y  │
+ └────┘
diff --git a/e2etests/testdata/asciitxtar/basic-simple/sketch.exp.svg b/e2etests/testdata/asciitxtar/basic-simple/sketch.exp.svg
new file mode 100644
index 0000000000..135c8c2672
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/basic-simple/sketch.exp.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" data-d2-version="v0.7.0-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 56 204"><svg class="d2-4045365429 d2-svg" width="56" height="204" viewBox="11 11 56 204"><rect x="11.000000" y="11.000000" width="56.000000" height="204.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+.d2-4045365429 .text-bold {
+	font-family: "d2-4045365429-font-bold";
+}
+@font-face {
+	font-family: d2-4045365429-font-bold;
+	src: url("data:application/font-woff;base64,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");
+}]]></style><style type="text/css"><![CDATA[.shape {
+  shape-rendering: geometricPrecision;
+  stroke-linejoin: round;
+}
+.connection {
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+.blend {
+  mix-blend-mode: multiply;
+  opacity: 0.5;
+}
+
+		.d2-4045365429 .fill-N1{fill:#0A0F25;}
+		.d2-4045365429 .fill-N2{fill:#676C7E;}
+		.d2-4045365429 .fill-N3{fill:#9499AB;}
+		.d2-4045365429 .fill-N4{fill:#CFD2DD;}
+		.d2-4045365429 .fill-N5{fill:#DEE1EB;}
+		.d2-4045365429 .fill-N6{fill:#EEF1F8;}
+		.d2-4045365429 .fill-N7{fill:#FFFFFF;}
+		.d2-4045365429 .fill-B1{fill:#0D32B2;}
+		.d2-4045365429 .fill-B2{fill:#0D32B2;}
+		.d2-4045365429 .fill-B3{fill:#E3E9FD;}
+		.d2-4045365429 .fill-B4{fill:#E3E9FD;}
+		.d2-4045365429 .fill-B5{fill:#EDF0FD;}
+		.d2-4045365429 .fill-B6{fill:#F7F8FE;}
+		.d2-4045365429 .fill-AA2{fill:#4A6FF3;}
+		.d2-4045365429 .fill-AA4{fill:#EDF0FD;}
+		.d2-4045365429 .fill-AA5{fill:#F7F8FE;}
+		.d2-4045365429 .fill-AB4{fill:#EDF0FD;}
+		.d2-4045365429 .fill-AB5{fill:#F7F8FE;}
+		.d2-4045365429 .stroke-N1{stroke:#0A0F25;}
+		.d2-4045365429 .stroke-N2{stroke:#676C7E;}
+		.d2-4045365429 .stroke-N3{stroke:#9499AB;}
+		.d2-4045365429 .stroke-N4{stroke:#CFD2DD;}
+		.d2-4045365429 .stroke-N5{stroke:#DEE1EB;}
+		.d2-4045365429 .stroke-N6{stroke:#EEF1F8;}
+		.d2-4045365429 .stroke-N7{stroke:#FFFFFF;}
+		.d2-4045365429 .stroke-B1{stroke:#0D32B2;}
+		.d2-4045365429 .stroke-B2{stroke:#0D32B2;}
+		.d2-4045365429 .stroke-B3{stroke:#E3E9FD;}
+		.d2-4045365429 .stroke-B4{stroke:#E3E9FD;}
+		.d2-4045365429 .stroke-B5{stroke:#EDF0FD;}
+		.d2-4045365429 .stroke-B6{stroke:#F7F8FE;}
+		.d2-4045365429 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-4045365429 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-4045365429 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-4045365429 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-4045365429 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-4045365429 .background-color-N1{background-color:#0A0F25;}
+		.d2-4045365429 .background-color-N2{background-color:#676C7E;}
+		.d2-4045365429 .background-color-N3{background-color:#9499AB;}
+		.d2-4045365429 .background-color-N4{background-color:#CFD2DD;}
+		.d2-4045365429 .background-color-N5{background-color:#DEE1EB;}
+		.d2-4045365429 .background-color-N6{background-color:#EEF1F8;}
+		.d2-4045365429 .background-color-N7{background-color:#FFFFFF;}
+		.d2-4045365429 .background-color-B1{background-color:#0D32B2;}
+		.d2-4045365429 .background-color-B2{background-color:#0D32B2;}
+		.d2-4045365429 .background-color-B3{background-color:#E3E9FD;}
+		.d2-4045365429 .background-color-B4{background-color:#E3E9FD;}
+		.d2-4045365429 .background-color-B5{background-color:#EDF0FD;}
+		.d2-4045365429 .background-color-B6{background-color:#F7F8FE;}
+		.d2-4045365429 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-4045365429 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-4045365429 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-4045365429 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-4045365429 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-4045365429 .color-N1{color:#0A0F25;}
+		.d2-4045365429 .color-N2{color:#676C7E;}
+		.d2-4045365429 .color-N3{color:#9499AB;}
+		.d2-4045365429 .color-N4{color:#CFD2DD;}
+		.d2-4045365429 .color-N5{color:#DEE1EB;}
+		.d2-4045365429 .color-N6{color:#EEF1F8;}
+		.d2-4045365429 .color-N7{color:#FFFFFF;}
+		.d2-4045365429 .color-B1{color:#0D32B2;}
+		.d2-4045365429 .color-B2{color:#0D32B2;}
+		.d2-4045365429 .color-B3{color:#E3E9FD;}
+		.d2-4045365429 .color-B4{color:#E3E9FD;}
+		.d2-4045365429 .color-B5{color:#EDF0FD;}
+		.d2-4045365429 .color-B6{color:#F7F8FE;}
+		.d2-4045365429 .color-AA2{color:#4A6FF3;}
+		.d2-4045365429 .color-AA4{color:#EDF0FD;}
+		.d2-4045365429 .color-AA5{color:#F7F8FE;}
+		.d2-4045365429 .color-AB4{color:#EDF0FD;}
+		.d2-4045365429 .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-d2-4045365429);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4045365429);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4045365429);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4045365429);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4045365429);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4045365429);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4045365429);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4045365429);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g class="eA=="><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g class="eQ=="><g class="shape" ><rect x="12.000000" y="148.000000" width="54.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="39.000000" y="186.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g class="KHggLSZndDsgeSlbMF0="><marker id="mk-d2-4045365429-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 39.000000 80.000000 L 39.000000 144.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-4045365429-3488378134)" mask="url(#d2-4045365429)" /></g><mask id="d2-4045365429" maskUnits="userSpaceOnUse" x="11" y="11" width="56" height="204">
+<rect x="11" y="11" width="56" height="204" fill="white"></rect>
+
+</mask></svg></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
new file mode 100644
index 0000000000..19d95ce16a
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
@@ -0,0 +1,8 @@
+ +---+ 
+ | x | 
+ +---+ 
+    |  
+    v  
+ +----+
+ | y  |
+ +----+

From d5a4d0404df0b7db0a81f63fd56cb52a960abba2 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sat, 16 Aug 2025 15:58:21 -0600
Subject: [PATCH 04/12] logs

---
 d2renderers/d2ascii/asciiroute/asciiroute.go  | 25 ++++++
 d2renderers/d2ascii/asciiroute/drawing.go     | 49 ++++++++++-
 d2renderers/d2ascii/asciiroute/routing.go     | 83 ++++++++++++++++++-
 .../d2ascii/asciishapes/asciishapes.go        | 33 +++++++-
 d2renderers/d2ascii/asciishapes/rectangle.go  | 15 ++++
 d2renderers/d2ascii/d2ascii.go                | 40 ++++++++-
 .../asciitxtar/basic-simple/extended.exp.txt  | 16 ++--
 .../asciitxtar/basic-simple/standard.exp.txt  | 16 ++--
 package-lock.json                             |  6 ++
 9 files changed, 260 insertions(+), 23 deletions(-)
 create mode 100644 package-lock.json

diff --git a/d2renderers/d2ascii/asciiroute/asciiroute.go b/d2renderers/d2ascii/asciiroute/asciiroute.go
index c2b42e5303..9a1faab205 100644
--- a/d2renderers/d2ascii/asciiroute/asciiroute.go
+++ b/d2renderers/d2ascii/asciiroute/asciiroute.go
@@ -1,6 +1,7 @@
 package asciiroute
 
 import (
+	"fmt"
 	"math"
 	"strings"
 
@@ -50,22 +51,46 @@ func DrawRoute(rd RouteDrawer, conn d2target.Connection) {
 	routes := conn.Route
 	label := conn.Label
 
+	fmt.Printf("[D2ASCII] Starting edge route for connection %s -> %s\n", conn.Src, conn.Dst)
+	fmt.Printf("[D2ASCII] Initial route points (%d points):\n", len(routes))
+	for i, pt := range routes {
+		fmt.Printf("[D2ASCII]   Point %d: (%.2f, %.2f)\n", i, pt.X, pt.Y)
+	}
+
 	frmShapeBoundary, toShapeBoundary := getConnectionBoundaries(rd, conn.Src, conn.Dst)
+	fmt.Printf("[D2ASCII] Source boundary: TL(%d,%d) BR(%d,%d)\n", 
+		frmShapeBoundary.TL.X, frmShapeBoundary.TL.Y, 
+		frmShapeBoundary.BR.X, frmShapeBoundary.BR.Y)
+	fmt.Printf("[D2ASCII] Dest boundary: TL(%d,%d) BR(%d,%d)\n", 
+		toShapeBoundary.TL.X, toShapeBoundary.TL.Y, 
+		toShapeBoundary.BR.X, toShapeBoundary.BR.Y)
 
 	routes = processRoute(rd, routes, frmShapeBoundary, toShapeBoundary)
 
 	turnDir := calculateTurnDirections(routes)
+	fmt.Printf("[D2ASCII] Turn directions calculated: %d turns\n", len(turnDir))
+	for key, dir := range turnDir {
+		fmt.Printf("[D2ASCII]   Turn at %s: direction %s\n", key, dir)
+	}
 
 	var labelPos *RouteLabelPosition
 	if strings.TrimSpace(label) != "" {
 		labelPos = calculateBestLabelPosition(rd, routes, label)
+		if labelPos != nil {
+			fmt.Printf("[D2ASCII] Label position calculated: segment %d, pos (%d, %d), maxDiff %.2f\n", 
+				labelPos.I, labelPos.X, labelPos.Y, labelPos.MaxDiff)
+		}
 	}
 
 	corners, arrows := getCharacterMaps(rd)
 
+	fmt.Printf("[D2ASCII] Drawing %d segments\n", len(routes)-1)
 	for i := 1; i < len(routes); i++ {
+		fmt.Printf("[D2ASCII] Drawing segment %d: (%.2f,%.2f) -> (%.2f,%.2f)\n", 
+			i-1, routes[i-1].X, routes[i-1].Y, routes[i].X, routes[i].Y)
 		drawSegmentBetweenPoints(rd, routes[i-1], routes[i], i, conn, corners, arrows, turnDir, frmShapeBoundary, toShapeBoundary, labelPos, label)
 	}
+	fmt.Printf("[D2ASCII] Edge route completed for %s -> %s\n", conn.Src, conn.Dst)
 }
 
 func getCharacterMaps(rd RouteDrawer) (corners, arrows map[string]string) {
diff --git a/d2renderers/d2ascii/asciiroute/drawing.go b/d2renderers/d2ascii/asciiroute/drawing.go
index c9d11fffaa..fae925603d 100644
--- a/d2renderers/d2ascii/asciiroute/drawing.go
+++ b/d2renderers/d2ascii/asciiroute/drawing.go
@@ -14,15 +14,21 @@ func drawSegmentBetweenPoints(rd RouteDrawer, start, end *geo.Point, segmentInde
 	ax, ay := start.X, start.Y
 	cx, cy := end.X, end.Y
 
+	fmt.Printf("[D2ASCII]   Drawing segment %d: (%.2f,%.2f) -> (%.2f,%.2f)\n", 
+		segmentIndex-1, ax, ay, cx, cy)
+
 	sx := cx - ax
 	sy := cy - ay
 	step := math.Max(math.Abs(sx), math.Abs(sy))
 	if step == 0 {
+		fmt.Printf("[D2ASCII]   Zero-length segment, skipping\n")
 		return
 	}
 	sx /= step
 	sy /= step
 
+	fmt.Printf("[D2ASCII]   Step vector: (%.2f, %.2f), total steps: %.0f\n", sx, sy, step)
+
 	fx, fy := ax, ay
 	attempt := 0
 	x := int(math.Round(ax))
@@ -31,13 +37,25 @@ func drawSegmentBetweenPoints(rd RouteDrawer, start, end *geo.Point, segmentInde
 	for {
 		attempt++
 		if x == int(math.Round(cx)) && y == int(math.Round(cy)) || attempt == MaxRouteAttempts {
+			if attempt == MaxRouteAttempts {
+				fmt.Printf("[D2ASCII]   Max route attempts (%d) reached\n", MaxRouteAttempts)
+			} else {
+				fmt.Printf("[D2ASCII]   Reached segment endpoint at (%d, %d)\n", x, y)
+			}
 			break
 		}
 		x = int(math.Round(fx))
 		y = int(math.Round(fy))
 
 		// Skip if out of bounds or contains alphanumeric character
-		if !isInBounds(rd, x, y) || containsAlphaNumeric(rd, x, y) {
+		if !isInBounds(rd, x, y) {
+			fmt.Printf("[D2ASCII]   Position (%d, %d) out of bounds, skipping\n", x, y)
+			fx += sx
+			fy += sy
+			continue
+		}
+		if containsAlphaNumeric(rd, x, y) {
+			fmt.Printf("[D2ASCII]   Position (%d, %d) contains alphanumeric, skipping\n", x, y)
 			fx += sx
 			fy += sy
 			continue
@@ -63,17 +81,21 @@ func drawRoutePoint(rd RouteDrawer, x, y int, sx, sy float64, segmentIndex, rout
 
 	canvas := rd.GetCanvas()
 	key := fmt.Sprintf("%d_%d", x, y)
+	existingChar := canvas.Get(x, y)
 
 	// Check for corners first
 	if char, ok := corners[turnDir[key]]; ok {
+		fmt.Printf("[D2ASCII]     Drawing corner at (%d, %d): '%s' (direction: %s)\n", x, y, char, turnDir[key])
 		canvas.Set(x, y, char)
 		return
 	}
 
 	// Check for destination arrow
 	if segmentIndex == routeLen-1 && x == int(math.Round(cx)) && y == int(math.Round(cy)) && conn.DstArrow != d2target.NoArrowhead {
+		fmt.Printf("[D2ASCII]     Drawing destination arrow at (%d, %d)\n", x, y)
 		drawArrowhead(rd, x, y, sx, sy, arrows)
 		if conn.DstLabel != nil {
+			fmt.Printf("[D2ASCII]     Drawing destination label: %s\n", conn.DstLabel.Label)
 			drawDestinationLabel(rd, conn.DstLabel.Label, cx, cy, sx, sy)
 		}
 		return
@@ -81,15 +103,19 @@ func drawRoutePoint(rd RouteDrawer, x, y int, sx, sy float64, segmentIndex, rout
 
 	// Check for source arrow
 	if segmentIndex == 1 && x == int(math.Round(ax)) && y == int(math.Round(ay)) && conn.SrcArrow != d2target.NoArrowhead {
+		fmt.Printf("[D2ASCII]     Drawing source arrow at (%d, %d)\n", x, y)
 		arrowKey := fmt.Sprintf("%d%d", geo.Sign(sx)*-1, geo.Sign(sy)*-1)
 		canvas.Set(x, y, arrows[arrowKey])
 		if conn.SrcLabel != nil {
+			fmt.Printf("[D2ASCII]     Drawing source label: %s\n", conn.SrcLabel.Label)
 			drawSourceLabel(rd, conn.SrcLabel.Label, ax, cy, cx, sx, sy)
 		}
 		return
 	}
 
 	// Default: draw route segment
+	fmt.Printf("[D2ASCII]     Drawing route segment at (%d, %d), existing: '%s'\n", 
+		x, y, existingChar)
 	drawRouteSegment(rd, x, y, sx, sy, frmBoundary, toBoundary)
 }
 
@@ -99,13 +125,24 @@ func drawRouteSegment(rd RouteDrawer, x, y int, sx, sy float64, frmBoundary, toB
 	}
 
 	canvas := rd.GetCanvas()
-	overWrite := canvas.Get(x, y) != " "
+	existingChar := canvas.Get(x, y)
+	overWrite := existingChar != " "
 
 	if sx == 0 { // Vertical line
+		fmt.Printf("[D2ASCII]       Drawing vertical segment at (%d, %d), overwrite=%t, existing='%s'\n", 
+			x, y, overWrite, existingChar)
 		drawVerticalSegment(rd, x, y, sy, overWrite, frmBoundary, toBoundary)
 	} else { // Horizontal line
+		fmt.Printf("[D2ASCII]       Drawing horizontal segment at (%d, %d), overwrite=%t, existing='%s'\n", 
+			x, y, overWrite, existingChar)
 		drawHorizontalSegment(rd, x, y, sx, overWrite, frmBoundary, toBoundary)
 	}
+
+	newChar := canvas.Get(x, y)
+	if newChar != existingChar {
+		fmt.Printf("[D2ASCII]       Character placed: '%s' -> '%s' at (%d, %d)\n", 
+			existingChar, newChar, x, y)
+	}
 }
 
 func drawVerticalSegment(rd RouteDrawer, x, y int, sy float64, overWrite bool, frmBoundary, toBoundary Boundary) {
@@ -114,13 +151,16 @@ func drawVerticalSegment(rd RouteDrawer, x, y int, sy float64, overWrite bool, f
 
 	if overWrite && shouldDrawTJunction(rd, x, y, frmBoundary, toBoundary, true) {
 		if sy > 0 {
+			fmt.Printf("[D2ASCII]         Drawing T-junction down at (%d, %d)\n", x, y)
 			canvas.Set(x, y, chars.TDown())
 		} else {
+			fmt.Printf("[D2ASCII]         Drawing T-junction up at (%d, %d)\n", x, y)
 			canvas.Set(x, y, chars.TUp())
 		}
 	} else if overWrite && shouldSkipOverwrite(rd, x, y, frmBoundary, toBoundary) {
-		// skip
+		fmt.Printf("[D2ASCII]         Skipping overwrite at (%d, %d)\n", x, y)
 	} else {
+		fmt.Printf("[D2ASCII]         Drawing vertical line at (%d, %d)\n", x, y)
 		canvas.Set(x, y, chars.Vertical())
 	}
 }
@@ -131,11 +171,14 @@ func drawHorizontalSegment(rd RouteDrawer, x, y int, sx float64, overWrite bool,
 
 	if overWrite && shouldDrawTJunction(rd, x, y, frmBoundary, toBoundary, false) {
 		if sx > 0 {
+			fmt.Printf("[D2ASCII]         Drawing T-junction right at (%d, %d)\n", x, y)
 			canvas.Set(x, y, chars.TRight())
 		} else {
+			fmt.Printf("[D2ASCII]         Drawing T-junction left at (%d, %d)\n", x, y)
 			canvas.Set(x, y, chars.TLeft())
 		}
 	} else {
+		fmt.Printf("[D2ASCII]         Drawing horizontal line at (%d, %d)\n", x, y)
 		canvas.Set(x, y, chars.Horizontal())
 	}
 }
diff --git a/d2renderers/d2ascii/asciiroute/routing.go b/d2renderers/d2ascii/asciiroute/routing.go
index 563f18ff95..af531ec139 100644
--- a/d2renderers/d2ascii/asciiroute/routing.go
+++ b/d2renderers/d2ascii/asciiroute/routing.go
@@ -8,22 +8,54 @@ import (
 )
 
 func processRoute(rd RouteDrawer, routes []*geo.Point, fromBoundary, toBoundary Boundary) []*geo.Point {
+	fmt.Printf("[D2ASCII] Processing route with %d points\n", len(routes))
+	
 	// Create a deep copy of routes to avoid modifying the original
 	routesCopy := make([]*geo.Point, len(routes))
 	for i, pt := range routes {
 		routesCopy[i] = &geo.Point{X: pt.X, Y: pt.Y}
 	}
 
+	fmt.Printf("[D2ASCII] Step 1: Merging collinear route segments\n")
+	beforeMerge := len(routesCopy)
 	routesCopy = mergeRoutes(routesCopy)
+	fmt.Printf("[D2ASCII]   Merged from %d to %d points\n", beforeMerge, len(routesCopy))
+	for i, pt := range routesCopy {
+		fmt.Printf("[D2ASCII]   After merge point %d: (%.2f, %.2f)\n", i, pt.X, pt.Y)
+	}
+
+	fmt.Printf("[D2ASCII] Step 2: Calibrating coordinates to ASCII grid\n")
 	calibrateRoutes(rd, routesCopy)
+	for i, pt := range routesCopy {
+		fmt.Printf("[D2ASCII]   Calibrated point %d: (%.2f, %.2f)\n", i, pt.X, pt.Y)
+	}
 
 	// Force all route segments to be horizontal or vertical (after calibration)
+	fmt.Printf("[D2ASCII] Step 3: Forcing horizontal/vertical segments\n")
+	beforeForce := len(routesCopy)
 	routesCopy = forceHorizontalVerticalRoute(routesCopy)
+	fmt.Printf("[D2ASCII]   Adjusted from %d to %d points\n", beforeForce, len(routesCopy))
+	for i, pt := range routesCopy {
+		fmt.Printf("[D2ASCII]   After H/V force point %d: (%.2f, %.2f)\n", i, pt.X, pt.Y)
+	}
 
 	// Adjust route endpoints to avoid overlapping with existing characters
 	if len(routesCopy) >= 2 {
+		fmt.Printf("[D2ASCII] Step 4: Adjusting start point to avoid overlaps\n")
+		startBefore := fmt.Sprintf("(%.2f, %.2f)", routesCopy[0].X, routesCopy[0].Y)
 		adjustRouteStartPoint(rd, routesCopy, fromBoundary)
+		fmt.Printf("[D2ASCII]   Start point: %s -> (%.2f, %.2f)\n", startBefore, routesCopy[0].X, routesCopy[0].Y)
+		
+		fmt.Printf("[D2ASCII] Step 5: Adjusting end point to avoid overlaps\n")
+		endIdx := len(routesCopy) - 1
+		endBefore := fmt.Sprintf("(%.2f, %.2f)", routesCopy[endIdx].X, routesCopy[endIdx].Y)
 		adjustRouteEndPoint(rd, routesCopy, toBoundary)
+		fmt.Printf("[D2ASCII]   End point: %s -> (%.2f, %.2f)\n", endBefore, routesCopy[endIdx].X, routesCopy[endIdx].Y)
+	}
+
+	fmt.Printf("[D2ASCII] Final processed route (%d points):\n", len(routesCopy))
+	for i, pt := range routesCopy {
+		fmt.Printf("[D2ASCII]   Final point %d: (%.2f, %.2f)\n", i, pt.X, pt.Y)
 	}
 
 	return routesCopy
@@ -44,12 +76,15 @@ func forceHorizontalVerticalRoute(routes []*geo.Point) []*geo.Point {
 		deltaY := math.Abs(curr.Y - prev.Y)
 
 		if deltaX > 0.5 && deltaY > 0.5 {
+			fmt.Printf("[D2ASCII]   Found diagonal segment %d: (%.2f,%.2f) -> (%.2f,%.2f), deltaX=%.2f, deltaY=%.2f\n",
+				i-1, prev.X, prev.Y, curr.X, curr.Y, deltaX, deltaY)
 			hasDiagonals = true
 			break
 		}
 	}
 
 	if !hasDiagonals {
+		fmt.Printf("[D2ASCII]   No diagonal segments found, keeping route as-is\n")
 		return routes
 	}
 
@@ -66,6 +101,10 @@ func forceHorizontalVerticalRoute(routes []*geo.Point) []*geo.Point {
 		if deltaX > 0.5 && deltaY > 0.5 {
 			// Break diagonal into horizontal then vertical
 			intermediate := &geo.Point{X: curr.X, Y: prev.Y}
+			fmt.Printf("[D2ASCII]   Breaking diagonal: (%.2f,%.2f) -> (%.2f,%.2f) into H: (%.2f,%.2f) -> (%.2f,%.2f) and V: (%.2f,%.2f) -> (%.2f,%.2f)\n",
+				prev.X, prev.Y, curr.X, curr.Y,
+				prev.X, prev.Y, intermediate.X, intermediate.Y,
+				intermediate.X, intermediate.Y, curr.X, curr.Y)
 			newRoutes = append(newRoutes, intermediate)
 		}
 
@@ -93,7 +132,10 @@ func getConnectionBoundaries(rd RouteDrawer, srcID, dstID string) (frmShapeBound
 
 func calibrateRoutes(rd RouteDrawer, routes []*geo.Point) {
 	for i := range routes {
+		origX, origY := routes[i].X, routes[i].Y
 		routes[i].X, routes[i].Y = rd.CalibrateXY(routes[i].X, routes[i].Y)
+		fmt.Printf("[D2ASCII]   Calibrate point %d: (%.2f, %.2f) -> (%.2f, %.2f)\n", 
+			i, origX, origY, routes[i].X, routes[i].Y)
 	}
 }
 
@@ -150,9 +192,13 @@ func adjustRouteStartPoint(rd RouteDrawer, routes []*geo.Point, fromBoundary Bou
 	secondX := routes[1].X
 	secondY := routes[1].Y
 
+	fmt.Printf("[D2ASCII]   Adjusting start point: (%.2f, %.2f) -> (%.2f, %.2f)\n", 
+		firstX, firstY, secondX, secondY)
+
 	// Check if end point is inside the to boundary
 	// Move along the vector of the last segment until outside the boundary if so
 	if fromBoundary.Contains(int(math.Round(firstX)), int(math.Round(firstY))) {
+		fmt.Printf("[D2ASCII]   Start point inside source boundary, moving along vector\n")
 		vectorX := secondX - firstX
 		vectorY := secondY - firstY
 
@@ -160,33 +206,44 @@ func adjustRouteStartPoint(rd RouteDrawer, routes []*geo.Point, fromBoundary Bou
 		if length > 0 {
 			vectorX /= length
 			vectorY /= length
+			fmt.Printf("[D2ASCII]   Movement vector: (%.2f, %.2f)\n", vectorX, vectorY)
 
+			steps := 0
 			for fromBoundary.Contains(int(math.Round(routes[0].X)), int(math.Round(routes[0].Y))) {
 				routes[0].X += vectorX
 				routes[0].Y += vectorY
+				steps++
 			}
+			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n", 
+				steps, routes[0].X, routes[0].Y)
 		}
 		return
 	}
 
 	// Determine line direction and keep shifting until empty space
 	if math.Abs(firstY-secondY) < 0.1 { // Horizontal line
+		fmt.Printf("[D2ASCII]   Horizontal line detected\n")
 		deltaX := 0.0
 		if secondX > firstX {
 			deltaX = 1.0 // Shift start point towards second point (right)
+			fmt.Printf("[D2ASCII]   Shifting start point right\n")
 		} else if secondX < firstX {
 			deltaX = -1.0 // Shift start point towards second point (left)
+			fmt.Printf("[D2ASCII]   Shifting start point left\n")
 		}
 
 		if deltaX != 0 {
 			shiftPointUntilEmpty(rd, &routes[0].X, &routes[0].Y, deltaX, 0)
 		}
 	} else if math.Abs(firstX-secondX) < 0.1 { // Vertical line
+		fmt.Printf("[D2ASCII]   Vertical line detected\n")
 		deltaY := 0.0
 		if secondY > firstY {
 			deltaY = 1.0 // Shift start point towards second point (down)
+			fmt.Printf("[D2ASCII]   Shifting start point down\n")
 		} else if secondY < firstY {
 			deltaY = -1.0 // Shift start point towards second point (up)
+			fmt.Printf("[D2ASCII]   Shifting start point up\n")
 		}
 
 		if deltaY != 0 {
@@ -208,9 +265,13 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 	secondLastX := routes[secondLastIdx].X
 	secondLastY := routes[secondLastIdx].Y
 
+	fmt.Printf("[D2ASCII]   Adjusting end point: (%.2f, %.2f) <- (%.2f, %.2f)\n", 
+		lastX, lastY, secondLastX, secondLastY)
+
 	// Check if end point is inside the to boundary
 	// Move along the vector of the last segment until outside the boundary if so
 	if toBoundary.Contains(int(math.Round(lastX)), int(math.Round(lastY))) {
+		fmt.Printf("[D2ASCII]   End point inside dest boundary, moving along vector\n")
 		vectorX := lastX - secondLastX
 		vectorY := lastY - secondLastY
 
@@ -218,33 +279,44 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 		if length > 0 {
 			vectorX /= length
 			vectorY /= length
+			fmt.Printf("[D2ASCII]   Movement vector: (%.2f, %.2f)\n", vectorX, vectorY)
 
+			steps := 0
 			for toBoundary.Contains(int(math.Round(routes[lastIdx].X)), int(math.Round(routes[lastIdx].Y))) {
 				routes[lastIdx].X -= vectorX
 				routes[lastIdx].Y -= vectorY
+				steps++
 			}
+			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n", 
+				steps, routes[lastIdx].X, routes[lastIdx].Y)
 		}
 		return
 	}
 
 	// Determine line direction and keep shifting until empty space
 	if math.Abs(lastY-secondLastY) < 0.1 { // Horizontal line
+		fmt.Printf("[D2ASCII]   Horizontal line detected\n")
 		deltaX := 0.0
 		if secondLastX > lastX {
 			deltaX = 1.0 // Shift end point towards second-to-last point (right)
+			fmt.Printf("[D2ASCII]   Shifting end point right\n")
 		} else if secondLastX < lastX {
 			deltaX = -1.0 // Shift end point towards second-to-last point (left)
+			fmt.Printf("[D2ASCII]   Shifting end point left\n")
 		}
 
 		if deltaX != 0 {
 			shiftPointUntilEmpty(rd, &routes[lastIdx].X, &routes[lastIdx].Y, deltaX, 0)
 		}
 	} else if math.Abs(lastX-secondLastX) < 0.1 { // Vertical line
+		fmt.Printf("[D2ASCII]   Vertical line detected\n")
 		deltaY := 0.0
 		if secondLastY > lastY {
 			deltaY = 1.0 // Shift end point towards second-to-last point (down)
+			fmt.Printf("[D2ASCII]   Shifting end point down\n")
 		} else if secondLastY < lastY {
 			deltaY = -1.0 // Shift end point towards second-to-last point (up)
+			fmt.Printf("[D2ASCII]   Shifting end point up\n")
 		}
 
 		if deltaY != 0 {
@@ -255,16 +327,25 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 
 func shiftPointUntilEmpty(rd RouteDrawer, x, y *float64, deltaX, deltaY float64) {
 	canvas := rd.GetCanvas()
+	startX, startY := *x, *y
+	steps := 0
 	for {
 		xi := int(math.Round(*x))
 		yi := int(math.Round(*y))
 		if canvas.IsInBounds(xi, yi) {
-			if canvas.Get(xi, yi) == " " {
+			char := canvas.Get(xi, yi)
+			if char == " " {
+				fmt.Printf("[D2ASCII]     Found empty space after %d steps: (%.2f, %.2f) -> (%.2f, %.2f)\n", 
+					steps, startX, startY, *x, *y)
 				break // Found empty space
 			}
+			fmt.Printf("[D2ASCII]     Position (%d, %d) occupied by '%s', shifting by (%.2f, %.2f)\n", 
+				xi, yi, string(char), deltaX, deltaY)
 			*x += deltaX
 			*y += deltaY
+			steps++
 		} else {
+			fmt.Printf("[D2ASCII]     Position (%d, %d) out of bounds, stopping\n", xi, yi)
 			break // Out of bounds
 		}
 	}
diff --git a/d2renderers/d2ascii/asciishapes/asciishapes.go b/d2renderers/d2ascii/asciishapes/asciishapes.go
index f2d21e6075..74298c667c 100644
--- a/d2renderers/d2ascii/asciishapes/asciishapes.go
+++ b/d2renderers/d2ascii/asciishapes/asciishapes.go
@@ -1,6 +1,7 @@
 package asciishapes
 
 import (
+	"fmt"
 	"math"
 	"strings"
 
@@ -32,24 +33,35 @@ func (ctx *Context) Calibrate(x, y, w, h float64) (int, int, int, int) {
 	wC := int(math.Round((w / ctx.FW) * ctx.Scale))
 	hC := int(math.Round((h / ctx.FH) * ctx.Scale))
 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Calibrate: (%.0f,%.0f) %.0fx%.0f -> (%d,%d) %dx%d [FW=%.2f, FH=%.2f, Scale=%.2f]\033[0m\n", 
+		x, y, w, h, xC, yC, wC, hC, ctx.FW, ctx.FH, ctx.Scale)
+
 	return xC, yC, wC, hC
 }
 
 func LabelY(y1, y2, h int, label, labelPosition string) int {
 	ly := -1
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Label Y calculation: bounds=%d-%d, height=%d, position='%s'\033[0m\n", 
+		y1, y2, h, labelPosition)
+	
 	if strings.Contains(labelPosition, "OUTSIDE") {
 		if strings.Contains(labelPosition, "BOTTOM") {
 			ly = y2 + 1
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]       Outside bottom: y=%d\033[0m\n", ly)
 		} else if strings.Contains(labelPosition, "TOP") {
 			ly = y1 - 1
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]       Outside top: y=%d\033[0m\n", ly)
 		}
 	} else {
 		if strings.Contains(labelPosition, "TOP") {
 			ly = y1 + 1
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]       Inside top: y=%d\033[0m\n", ly)
 		} else if strings.Contains(labelPosition, "MIDDLE") {
 			ly = y1 + h/2
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]       Inside middle: y=%d\033[0m\n", ly)
 		} else if strings.Contains(labelPosition, "BOTTOM") {
 			ly = y2 - 1
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]       Inside bottom: y=%d\033[0m\n", ly)
 		}
 	}
 	return ly
@@ -57,26 +69,43 @@ func LabelY(y1, y2, h int, label, labelPosition string) int {
 
 func DrawShapeLabel(ctx *Context, x1, y1, x2, y2, width, height int, label, labelPosition string) {
 	if label == "" {
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]     No label to draw\033[0m\n")
 		return
 	}
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Drawing label '%s' in bounds (%d,%d)-(%d,%d) [%dx%d]\033[0m\n", 
+		label, x1, y1, x2, y2, width, height)
+	
 	ly := LabelY(y1, y2, height, label, labelPosition)
 	lx := x1 + (width-len(label))/2
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Label position calculated: (%d, %d)\033[0m\n", lx, ly)
 	ctx.Canvas.DrawLabel(lx, ly, label)
 }
 
 func adjustWidthForLabel(ctx *Context, x, y, w, h float64, width int, label string) int {
 	if label == "" {
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]     No label, keeping width: %d\033[0m\n", width)
 		return width
 	}
 
+	originalWidth := width
 	availableSpace := width - len(label)
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Width adjustment for label '%s' (%d chars): width=%d, available=%d\033[0m\n", 
+		label, len(label), width, availableSpace)
+	
 	if availableSpace < MinLabelPadding {
-		return len(label) + MinLabelPadding
+		width = len(label) + MinLabelPadding
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]     Insufficient space, expanding: %d -> %d (min padding=%d)\033[0m\n", 
+			originalWidth, width, MinLabelPadding)
+		return width
 	}
 
 	if availableSpace%2 == 1 {
-		return width - 1
+		width = width - 1
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]     Odd spacing, adjusting for centering: %d -> %d\033[0m\n", 
+			originalWidth, width)
+		return width
 	}
 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Width unchanged: %d\033[0m\n", width)
 	return width
 }
diff --git a/d2renderers/d2ascii/asciishapes/rectangle.go b/d2renderers/d2ascii/asciishapes/rectangle.go
index b887222d27..87a7cf2cb3 100644
--- a/d2renderers/d2ascii/asciishapes/rectangle.go
+++ b/d2renderers/d2ascii/asciishapes/rectangle.go
@@ -6,17 +6,27 @@ import (
 )
 
 func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol string) {
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   DrawRect: (%.0f,%.0f) %.0fx%.0f, label='%s', symbol='%s'\033[0m\n", 
+		x, y, w, h, label, symbol)
+	
 	x1, y1, wC, hC := ctx.Calibrate(x, y, w, h)
+	originalHC := hC
 	if label != "" && hC%2 == 0 {
 		if hC > 2 {
 			hC--
 			y1++
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]     Height adjustment for label centering: %d -> %d, y1: %d -> %d\033[0m\n", 
+				originalHC, hC, y1-1, y1)
 		} else {
 			hC++
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]     Height expanded for small shape: %d -> %d\033[0m\n", 
+				originalHC, hC)
 		}
 	}
 	wC = adjustWidthForLabel(ctx, x, y, w, h, wC, label)
 	x2, y2 := x1+wC, y1+hC
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Final bounds: (%d,%d) to (%d,%d) [%dx%d]\033[0m\n", 
+		x1, y1, x2, y2, wC, hC)
 	corners := map[string]string{
 		fmt.Sprintf("%d_%d", x1, y1):     ctx.Chars.TopLeftCorner(),
 		fmt.Sprintf("%d_%d", x2-1, y1):   ctx.Chars.TopRightCorner(),
@@ -24,6 +34,7 @@ func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol str
 		fmt.Sprintf("%d_%d", x2-1, y2-1): ctx.Chars.BottomRightCorner(),
 	}
 
+	charsDrawn := 0
 	for xi := x1; xi < x2; xi++ {
 		for yi := y1; yi < y2; yi++ {
 			key := fmt.Sprintf("%d_%d", xi, yi)
@@ -35,9 +46,13 @@ func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol str
 				ctx.Canvas.Set(xi, yi, ctx.Chars.Vertical())
 			} else if yi == y1 || yi == y2-1 {
 				ctx.Canvas.Set(xi, yi, ctx.Chars.Horizontal())
+			} else {
+				continue
 			}
+			charsDrawn++
 		}
 	}
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Drew %d border characters\033[0m\n", charsDrawn)
 
 	DrawShapeLabel(ctx, x1, y1, x2, y2, wC, hC, label, labelPosition)
 }
diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index 8ed8403e7f..7ef68372f9 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -1,6 +1,7 @@
 package d2ascii
 
 import (
+	"fmt"
 	"math"
 
 	"oss.terrastruct.com/d2/d2renderers/d2ascii/asciicanvas"
@@ -46,22 +47,32 @@ func NewBoundary(tl, br Point) *Boundary {
 }
 
 func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
+	fmt.Printf("\033[36m[D2ASCII-SHAPE] GetBoundary for shape %s (%s)\033[0m\n", s.ID, s.Type)
+	
 	// For multiple shapes, expand boundary to match the expanded rendering
 	posX := float64(s.Pos.X)
 	posY := float64(s.Pos.Y)
 	width := float64(s.Width)
 	height := float64(s.Height)
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Original dimensions: (%.0f,%.0f) %.0fx%.0f\033[0m\n", 
+		posX, posY, width, height)
 
 	if s.Multiple {
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple shape, expanding boundary by %.0f\033[0m\n", d2target.MULTIPLE_OFFSET)
 		posX -= d2target.MULTIPLE_OFFSET   // Move left to include shadow area
 		width += d2target.MULTIPLE_OFFSET  // Include shadow width
 		height += d2target.MULTIPLE_OFFSET // Include shadow height
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Expanded dimensions: (%.0f,%.0f) %.0fx%.0f\033[0m\n", 
+			posX, posY, width, height)
 	}
 
 	x1 := int(math.Round((posX / a.FW) * a.SCALE))
 	y1 := int(math.Round((posY / a.FH) * a.SCALE))
 	x2 := int(math.Round(((posX + width - 1) / a.FW) * a.SCALE))
 	y2 := int(math.Round(((posY + height - 1) / a.FH) * a.SCALE))
+	
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Boundary calibrated: (%.0f,%.0f)-(%.0f,%.0f) -> (%d,%d)-(%d,%d)\033[0m\n", 
+		posX, posY, posX+width-1, posY+height-1, x1, y1, x2, y2)
 
 	return Point{X: x1, Y: y1}, Point{X: x2, Y: y2}
 }
@@ -219,14 +230,24 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 		}
 	}
 	padding := maxLabelLen + asciishapes.MinLabelPadding
+	fmt.Printf("\033[36m[D2ASCII-SHAPE] Canvas padding calculated: maxLabelLen=%d, padding=%d\033[0m\n", maxLabelLen, padding)
+	fmt.Printf("\033[36m[D2ASCII-SHAPE] Creating canvas: %dx%d (base: %dx%d + padding)\033[0m\n", w+padding+1, h+padding+1, w, h)
 
 	a.canvas = asciicanvas.New(w+padding+1, h+padding+1)
 
-	for _, shape := range diagram.Shapes {
+	fmt.Printf("\033[36m[D2ASCII-SHAPE] Processing %d shapes with offset (%d, %d)\033[0m\n", len(diagram.Shapes), xOffset, yOffset)
+	for i, shape := range diagram.Shapes {
+		fmt.Printf("\033[36m[D2ASCII-SHAPE] Shape %d (%s): %s at (%.0f,%.0f) size %.0fx%.0f\033[0m\n", 
+			i, shape.ID, shape.Type, float64(shape.Pos.X), float64(shape.Pos.Y), float64(shape.Width), float64(shape.Height))
+		
+		originalX, originalY := shape.Pos.X, shape.Pos.Y
 		shape.Pos.X += xOffset
 		shape.Pos.Y += yOffset
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Position adjusted: (%.0f,%.0f) -> (%d,%d)\033[0m\n", 
+			float64(originalX), float64(originalY), shape.Pos.X, shape.Pos.Y)
 
 		preserveWidth := hasConnectionsAtRightEdge(shape, diagram.Connections, a.FW)
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Right edge connections detected: %t\033[0m\n", preserveWidth)
 
 		ctx := &asciishapes.Context{
 			Canvas: a.canvas,
@@ -236,11 +257,16 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 			Scale:  a.SCALE,
 		}
 
+		originalWidth := shape.Width
 		if preserveWidth && shape.Label != "" {
 			wC := int(math.Round((float64(shape.Width) / a.FW) * a.SCALE))
 			availableSpace := wC - len(shape.Label)
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Width preservation check: calibrated=%d, label=%d chars, available=%d\033[0m\n", 
+				wC, len(shape.Label), availableSpace)
 			if availableSpace >= asciishapes.MinLabelPadding && availableSpace%2 == 1 {
 				shape.Width += int(a.FW / a.SCALE)
+				fmt.Printf("\033[36m[D2ASCII-SHAPE]   Width adjusted for even spacing: %d -> %d\033[0m\n", 
+					originalWidth, shape.Width)
 			}
 		}
 
@@ -251,6 +277,7 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 		drawHeight := float64(shape.Height)
 
 		if shape.Multiple {
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple shape adjustments: offset=%.0f\033[0m\n", d2target.MULTIPLE_OFFSET)
 			// Move position to top-left of total occupied area (shadow extends left and down)
 			drawX -= d2target.MULTIPLE_OFFSET // Move left to include shadow area
 			// Y stays the same since shadow goes down, not up
@@ -258,12 +285,21 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 			// Expand size to fill entire multiple effect area
 			drawWidth += d2target.MULTIPLE_OFFSET  // Include shadow width
 			drawHeight += d2target.MULTIPLE_OFFSET // Include shadow height
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple dimensions: (%.0f,%.0f) %.0fx%.0f -> (%.0f,%.0f) %.0fx%.0f\033[0m\n", 
+				float64(shape.Pos.X), float64(shape.Pos.Y), float64(shape.Width), float64(shape.Height),
+				drawX, drawY, drawWidth, drawHeight)
 		}
 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Final draw parameters: (%.0f,%.0f) %.0fx%.0f, label='%s'\033[0m\n", 
+			drawX, drawY, drawWidth, drawHeight, shape.Label)
+
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Drawing shape type: %s\033[0m\n", shape.Type)
 		switch shape.Type {
 		case d2target.ShapeRectangle:
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   -> DrawRect\033[0m\n")
 			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, "")
 		case d2target.ShapeSquare:
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   -> DrawRect (square)\033[0m\n")
 			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, "")
 		case d2target.ShapePage:
 			asciishapes.DrawPage(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition)
@@ -324,6 +360,8 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 func (a *ASCIIartist) calibrateXY(x, y float64) (float64, float64) {
 	xC := float64(math.Round((x / a.FW) * a.SCALE))
 	yC := float64(math.Round((y / a.FH) * a.SCALE))
+	fmt.Printf("[D2ASCII]     CalibrateXY: (%.2f, %.2f) -> (%.2f, %.2f) [FW=%.2f, FH=%.2f, SCALE=%.2f]\n", 
+		x, y, xC, yC, a.FW, a.FH, a.SCALE)
 	return xC, yC
 }
 
diff --git a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
index d27ed61d33..b8285e70a1 100644
--- a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
@@ -1,8 +1,8 @@
- ┌───┐ 
- │ x │ 
- └───┘ 
-    │  
-    ▼  
- ┌────┐
- │ y  │
- └────┘
+ ┌───┐
+ │ x │
+ └───┘
+    │ 
+    ▼ 
+ ┌───┐
+ │ y │
+ └───┘
diff --git a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
index 19d95ce16a..a9edbab7f6 100644
--- a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
@@ -1,8 +1,8 @@
- +---+ 
- | x | 
- +---+ 
-    |  
-    v  
- +----+
- | y  |
- +----+
+ +---+
+ | x |
+ +---+
+    | 
+    v 
+ +---+
+ | y |
+ +---+
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..79d330f57e
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "d2",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

From 729cb7d5330d5e13f02f7933fca131f473b7275a Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sat, 16 Aug 2025 16:07:58 -0600
Subject: [PATCH 05/12] use real bound

---
 .../d2ascii/asciishapes/asciishapes.go        |  2 +-
 d2renderers/d2ascii/asciishapes/cylinder.go   |  2 +-
 d2renderers/d2ascii/asciishapes/page.go       |  2 +-
 d2renderers/d2ascii/asciishapes/rectangle.go  |  4 +--
 d2renderers/d2ascii/d2ascii.go                | 32 +++++++++++++++----
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/d2renderers/d2ascii/asciishapes/asciishapes.go b/d2renderers/d2ascii/asciishapes/asciishapes.go
index 74298c667c..f9683a62b0 100644
--- a/d2renderers/d2ascii/asciishapes/asciishapes.go
+++ b/d2renderers/d2ascii/asciishapes/asciishapes.go
@@ -81,7 +81,7 @@ func DrawShapeLabel(ctx *Context, x1, y1, x2, y2, width, height int, label, labe
 	ctx.Canvas.DrawLabel(lx, ly, label)
 }
 
-func adjustWidthForLabel(ctx *Context, x, y, w, h float64, width int, label string) int {
+func AdjustWidthForLabel(ctx *Context, x, y, w, h float64, width int, label string) int {
 	if label == "" {
 		fmt.Printf("\033[36m[D2ASCII-SHAPE]     No label, keeping width: %d\033[0m\n", width)
 		return width
diff --git a/d2renderers/d2ascii/asciishapes/cylinder.go b/d2renderers/d2ascii/asciishapes/cylinder.go
index 62b9061301..12ae80f516 100644
--- a/d2renderers/d2ascii/asciishapes/cylinder.go
+++ b/d2renderers/d2ascii/asciishapes/cylinder.go
@@ -2,7 +2,7 @@ package asciishapes
 
 func DrawCylinder(ctx *Context, x, y, w, h float64, label, labelPosition string) {
 	xi, yi, wi, hi := ctx.Calibrate(x, y, w, h)
-	wi = adjustWidthForLabel(ctx, x, y, w, h, wi, label)
+	wi = AdjustWidthForLabel(ctx, x, y, w, h, wi, label)
 	x1, y1 := xi, yi
 	x2, y2 := xi+wi-1, yi+hi-1
 
diff --git a/d2renderers/d2ascii/asciishapes/page.go b/d2renderers/d2ascii/asciishapes/page.go
index 0bd4f889b0..827d34168c 100644
--- a/d2renderers/d2ascii/asciishapes/page.go
+++ b/d2renderers/d2ascii/asciishapes/page.go
@@ -15,7 +15,7 @@ func DrawPage(ctx *Context, x, y, w, h float64, label, labelPosition string) {
 			hC++
 		}
 	}
-	wC = adjustWidthForLabel(ctx, x, y, w, h, wC, label)
+	wC = AdjustWidthForLabel(ctx, x, y, w, h, wC, label)
 	x2, y2 := x1+wC, y1+hC
 	corners := map[string]string{
 		fmt.Sprintf("%d_%d", x1, y1):     ctx.Chars.TopLeftCorner(),
diff --git a/d2renderers/d2ascii/asciishapes/rectangle.go b/d2renderers/d2ascii/asciishapes/rectangle.go
index 87a7cf2cb3..3010e86215 100644
--- a/d2renderers/d2ascii/asciishapes/rectangle.go
+++ b/d2renderers/d2ascii/asciishapes/rectangle.go
@@ -23,9 +23,9 @@ func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol str
 				originalHC, hC)
 		}
 	}
-	wC = adjustWidthForLabel(ctx, x, y, w, h, wC, label)
+	wC = AdjustWidthForLabel(ctx, x, y, w, h, wC, label)
 	x2, y2 := x1+wC, y1+hC
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Final bounds: (%d,%d) to (%d,%d) [%dx%d]\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Final draw bounds: (%d,%d) to (%d,%d) [%dx%d] (actual shape area)\033[0m\n", 
 		x1, y1, x2, y2, wC, hC)
 	corners := map[string]string{
 		fmt.Sprintf("%d_%d", x1, y1):     ctx.Chars.TopLeftCorner(),
diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index 7ef68372f9..11ec26455c 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -66,13 +66,33 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 			posX, posY, width, height)
 	}
 
-	x1 := int(math.Round((posX / a.FW) * a.SCALE))
-	y1 := int(math.Round((posY / a.FH) * a.SCALE))
-	x2 := int(math.Round(((posX + width - 1) / a.FW) * a.SCALE))
-	y2 := int(math.Round(((posY + height - 1) / a.FH) * a.SCALE))
+	// Use the same calibration logic as the drawing functions
+	ctx := &asciishapes.Context{
+		Canvas: a.canvas,
+		Chars:  a.chars,
+		FW:     a.FW,
+		FH:     a.FH,
+		Scale:  a.SCALE,
+	}
+	x1, y1, wC, hC := ctx.Calibrate(posX, posY, width, height)
+	
+	// Apply the same height adjustments as DrawRect for labels
+	if s.Label != "" && hC%2 == 0 {
+		if hC > 2 {
+			hC--
+			y1++
+		} else {
+			hC++
+		}
+	}
+	
+	// Apply the same width adjustments as DrawRect for labels
+	wC = asciishapes.AdjustWidthForLabel(ctx, posX, posY, width, height, wC, s.Label)
+	
+	x2, y2 := x1+wC, y1+hC
 	
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Boundary calibrated: (%.0f,%.0f)-(%.0f,%.0f) -> (%d,%d)-(%d,%d)\033[0m\n", 
-		posX, posY, posX+width-1, posY+height-1, x1, y1, x2, y2)
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Boundary matches actual draw bounds: (%d,%d)-(%d,%d) [%dx%d]\033[0m\n", 
+		x1, y1, x2, y2, wC, hC)
 
 	return Point{X: x1, Y: y1}, Point{X: x2, Y: y2}
 }

From 3f3f13ff7b9daa67cf9f64ed2b5b765b11970a99 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sat, 16 Aug 2025 16:52:22 -0600
Subject: [PATCH 06/12] draw correctly

---
 .../d2ascii/asciishapes/asciishapes.go        |  18 +-
 d2renderers/d2ascii/asciishapes/rectangle.go  |  29 ++--
 .../asciitxtar/all-shapes/extended.exp.txt    |  30 ++--
 .../asciitxtar/all-shapes/standard.exp.txt    |  30 ++--
 .../asciitxtar/basic-simple/extended.exp.txt  |  18 +-
 .../asciitxtar/basic-simple/standard.exp.txt  |  18 +-
 .../asciitxtar/curved-line/extended.exp.txt   | 161 +++++++++---------
 .../asciitxtar/curved-line/standard.exp.txt   | 161 +++++++++---------
 .../network-horizontal/extended.exp.txt       |  55 +++---
 .../network-horizontal/standard.exp.txt       |  55 +++---
 .../network-vertical/extended.exp.txt         |  93 +++++-----
 .../network-vertical/standard.exp.txt         |  93 +++++-----
 .../overextended-lines/extended.exp.txt       |  82 ++++-----
 .../overextended-lines/standard.exp.txt       |  82 ++++-----
 .../simple-sequence/extended.exp.txt          |  21 +--
 .../simple-sequence/standard.exp.txt          |  21 +--
 .../terminal-horizontal/extended.exp.txt      |   7 +-
 .../terminal-horizontal/standard.exp.txt      |   7 +-
 18 files changed, 507 insertions(+), 474 deletions(-)

diff --git a/d2renderers/d2ascii/asciishapes/asciishapes.go b/d2renderers/d2ascii/asciishapes/asciishapes.go
index f9683a62b0..e782a0bc26 100644
--- a/d2renderers/d2ascii/asciishapes/asciishapes.go
+++ b/d2renderers/d2ascii/asciishapes/asciishapes.go
@@ -33,7 +33,7 @@ func (ctx *Context) Calibrate(x, y, w, h float64) (int, int, int, int) {
 	wC := int(math.Round((w / ctx.FW) * ctx.Scale))
 	hC := int(math.Round((h / ctx.FH) * ctx.Scale))
 
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Calibrate: (%.0f,%.0f) %.0fx%.0f -> (%d,%d) %dx%d [FW=%.2f, FH=%.2f, Scale=%.2f]\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Calibrate: (%.0f,%.0f) %.0fx%.0f -> (%d,%d) %dx%d [FW=%.2f, FH=%.2f, Scale=%.2f]\033[0m\n",
 		x, y, w, h, xC, yC, wC, hC, ctx.FW, ctx.FH, ctx.Scale)
 
 	return xC, yC, wC, hC
@@ -41,9 +41,9 @@ func (ctx *Context) Calibrate(x, y, w, h float64) (int, int, int, int) {
 
 func LabelY(y1, y2, h int, label, labelPosition string) int {
 	ly := -1
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Label Y calculation: bounds=%d-%d, height=%d, position='%s'\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Label Y calculation: bounds=%d-%d, height=%d, position='%s'\033[0m\n",
 		y1, y2, h, labelPosition)
-	
+
 	if strings.Contains(labelPosition, "OUTSIDE") {
 		if strings.Contains(labelPosition, "BOTTOM") {
 			ly = y2 + 1
@@ -72,9 +72,9 @@ func DrawShapeLabel(ctx *Context, x1, y1, x2, y2, width, height int, label, labe
 		fmt.Printf("\033[36m[D2ASCII-SHAPE]     No label to draw\033[0m\n")
 		return
 	}
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Drawing label '%s' in bounds (%d,%d)-(%d,%d) [%dx%d]\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Drawing label '%s' in bounds (%d,%d)-(%d,%d) [%dx%d]\033[0m\n",
 		label, x1, y1, x2, y2, width, height)
-	
+
 	ly := LabelY(y1, y2, height, label, labelPosition)
 	lx := x1 + (width-len(label))/2
 	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Label position calculated: (%d, %d)\033[0m\n", lx, ly)
@@ -89,19 +89,19 @@ func AdjustWidthForLabel(ctx *Context, x, y, w, h float64, width int, label stri
 
 	originalWidth := width
 	availableSpace := width - len(label)
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Width adjustment for label '%s' (%d chars): width=%d, available=%d\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Width adjustment for label '%s' (%d chars): width=%d, available=%d\033[0m\n",
 		label, len(label), width, availableSpace)
-	
+
 	if availableSpace < MinLabelPadding {
 		width = len(label) + MinLabelPadding
-		fmt.Printf("\033[36m[D2ASCII-SHAPE]     Insufficient space, expanding: %d -> %d (min padding=%d)\033[0m\n", 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]     Insufficient space, expanding: %d -> %d (min padding=%d)\033[0m\n",
 			originalWidth, width, MinLabelPadding)
 		return width
 	}
 
 	if availableSpace%2 == 1 {
 		width = width - 1
-		fmt.Printf("\033[36m[D2ASCII-SHAPE]     Odd spacing, adjusting for centering: %d -> %d\033[0m\n", 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]     Odd spacing, adjusting for centering: %d -> %d\033[0m\n",
 			originalWidth, width)
 		return width
 	}
diff --git a/d2renderers/d2ascii/asciishapes/rectangle.go b/d2renderers/d2ascii/asciishapes/rectangle.go
index 3010e86215..58a5a601fc 100644
--- a/d2renderers/d2ascii/asciishapes/rectangle.go
+++ b/d2renderers/d2ascii/asciishapes/rectangle.go
@@ -3,48 +3,51 @@ package asciishapes
 import (
 	"fmt"
 	"strings"
+
+	"github.com/davecgh/go-spew/spew"
 )
 
 func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol string) {
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]   DrawRect: (%.0f,%.0f) %.0fx%.0f, label='%s', symbol='%s'\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   DrawRect: (%.0f,%.0f) %.0fx%.0f, label='%s', symbol='%s'\033[0m\n",
 		x, y, w, h, label, symbol)
-	
+
 	x1, y1, wC, hC := ctx.Calibrate(x, y, w, h)
 	originalHC := hC
 	if label != "" && hC%2 == 0 {
 		if hC > 2 {
 			hC--
 			y1++
-			fmt.Printf("\033[36m[D2ASCII-SHAPE]     Height adjustment for label centering: %d -> %d, y1: %d -> %d\033[0m\n", 
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]     Height adjustment for label centering: %d -> %d, y1: %d -> %d\033[0m\n",
 				originalHC, hC, y1-1, y1)
 		} else {
 			hC++
-			fmt.Printf("\033[36m[D2ASCII-SHAPE]     Height expanded for small shape: %d -> %d\033[0m\n", 
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]     Height expanded for small shape: %d -> %d\033[0m\n",
 				originalHC, hC)
 		}
 	}
 	wC = AdjustWidthForLabel(ctx, x, y, w, h, wC, label)
 	x2, y2 := x1+wC, y1+hC
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Final draw bounds: (%d,%d) to (%d,%d) [%dx%d] (actual shape area)\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]     Final draw bounds: (%d,%d) to (%d,%d) [%dx%d] (actual shape area)\033[0m\n",
 		x1, y1, x2, y2, wC, hC)
 	corners := map[string]string{
-		fmt.Sprintf("%d_%d", x1, y1):     ctx.Chars.TopLeftCorner(),
-		fmt.Sprintf("%d_%d", x2-1, y1):   ctx.Chars.TopRightCorner(),
-		fmt.Sprintf("%d_%d", x1, y2-1):   ctx.Chars.BottomLeftCorner(),
-		fmt.Sprintf("%d_%d", x2-1, y2-1): ctx.Chars.BottomRightCorner(),
+		fmt.Sprintf("%d_%d", x1, y1): ctx.Chars.TopLeftCorner(),
+		fmt.Sprintf("%d_%d", x2, y1): ctx.Chars.TopRightCorner(),
+		fmt.Sprintf("%d_%d", x1, y2): ctx.Chars.BottomLeftCorner(),
+		fmt.Sprintf("%d_%d", x2, y2): ctx.Chars.BottomRightCorner(),
 	}
 
 	charsDrawn := 0
-	for xi := x1; xi < x2; xi++ {
-		for yi := y1; yi < y2; yi++ {
+	for xi := x1; xi <= x2; xi++ {
+		for yi := y1; yi <= y2; yi++ {
 			key := fmt.Sprintf("%d_%d", xi, yi)
+			spew.Dump(key)
 			if val, ok := corners[key]; ok {
 				ctx.Canvas.Set(xi, yi, val)
 			} else if strings.TrimSpace(symbol) != "" && yi == y1 && xi == x1+1 {
 				ctx.Canvas.Set(xi, yi, symbol)
-			} else if xi == x1 || xi == x2-1 {
+			} else if xi == x1 || xi == x2 {
 				ctx.Canvas.Set(xi, yi, ctx.Chars.Vertical())
-			} else if yi == y1 || yi == y2-1 {
+			} else if yi == y1 || yi == y2 {
 				ctx.Canvas.Set(xi, yi, ctx.Chars.Horizontal())
 			} else {
 				continue
diff --git a/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt b/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt
index 0811fba22a..c157da0659 100644
--- a/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt
@@ -1,21 +1,23 @@
                                                       ┌────────┐         ***                     
                   ╱‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾╱   ╱‾‾‾‾‾‾‾‾‾╱╲    │callout │     ****   ****     ╱‾‾‾‾‾‾‾‾‾╲ 
- ┌─────────┐     ╱               ╱   │         │  │   └────────┘  ***  diamond  *** ╱           ╲
- │rectangle│    ╱ parallelogram ╱    │   queue │  │        │ ╱      ****     ****   ╲  hexagon  ╱
- └─────────┘   ╱_______________╱      ╲________ ╲╱         │╱           *****        ╲_________╱ 
+ ┌──────────┐    ╱               ╱   │         │  │   └────────┘  ***  diamond  *** ╱           ╲
+ │rectangle │   ╱ parallelogram ╱    │   queue │  │        │ ╱      ****     ****   ╲  hexagon  ╱
+ │          │  ╱_______________╱      ╲________ ╲╱         │╱           *****        ╲_________╱ 
+ └──────────┘            │                  │              │              │                │     
        │                 │                  │              │              │                │     
        ▼                 ▼                  ▼              ▼              │                ▼     
-  ┌────────┐       ┌──────────┐        ┌────┐        ╱‾‾‾‾‾‾‾‾‾‾‾╱        ▼          ┌☁────────┐ 
-  │        │       │ document │        │    └────┐  ╱           ╱    ┌⬭───────┐      │         │ 
-  │ square │       │     .-`-.│        │ package │ │ stored_data     │  oval  │      │  cloud  │ 
-  │        │        `-.-`              └─────────┘  ╲           ╲    └────────┘      │         │ 
-  └────────┘             │                  │        ╲___________╲        │          └─────────┘ 
+  ┌─────────┐      ┌──────────┐        ┌────┐        ╱‾‾‾‾‾‾‾‾‾‾‾╱        ▼          ┌☁─────────┐
+  │         │      │ document │        │    └────┐  ╱           ╱    ┌⬭────────┐     │          │
+  │ square  │      │     .-`-.│        │ package │ │ stored_data     │  oval   │     │  cloud   │
+  │         │       `-.-`              └─────────┘  ╲           ╲    │         │     │          │
+  │         │            │                  │        ╲___________╲   └─────────┘     │          │
+  └─────────┘            │                  │              │              │          └──────────┘
        │                 │                  │              │              │                      
        ▼                 ▼                  ▼              ▼              │                      
    ┌─────┐          .-‾‾‾‾-.          ╲‾‾‾‾‾‾‾ ╲         ╱‾‾╲             ▼                      
-   │     ╲┐        │╲-____-╱│          ╲        ╲        ╲__╱        ┌⬭───────┐                  
-   │ page │        │        │           ╲        ╲      ╱‾‾‾‾╲       │        │                  
-   │      │        │        │           ╱ step   ╱      ‾‾‾‾‾‾       │ circle │                  
-   └──────┘        │cylinder│          ╱        ╱       person       │        │                  
-                   │        │         ╱_______ ╱                     └────────┘                  
-                    ╲-____-╱                                                                     
+   │     ╲┐        │╲-____-╱│          ╲        ╲        ╲__╱        ┌⬭────────┐                 
+   │ page │        │        │           ╲        ╲      ╱‾‾‾‾╲       │         │                 
+   │      │        │        │           ╱ step   ╱      ‾‾‾‾‾‾       │ circle  │                 
+   └──────┘        │cylinder│          ╱        ╱       person       │         │                 
+                   │        │         ╱_______ ╱                     │         │                 
+                    ╲-____-╱                                         └─────────┘                 
diff --git a/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt b/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt
index 7c9279d81d..ea16639f74 100644
--- a/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt
@@ -1,21 +1,23 @@
                                                       +--------+         ***                     
                   /---------------/   /---------/\    |callout |     ****   ****     /---------\ 
- +---------+     /               /   |         |  |   +--------+  ***  diamond  *** /           \
- |rectangle|    / parallelogram /    |   queue |  |        | /      ****     ****   \  hexagon  /
- +---------+   /_______________/      \________ \/         |/           *****        \_________/ 
+ +----------+    /               /   |         |  |   +--------+  ***  diamond  *** /           \
+ |rectangle |   / parallelogram /    |   queue |  |        | /      ****     ****   \  hexagon  /
+ |          |  /_______________/      \________ \/         |/           *****        \_________/ 
+ +----------+            |                  |              |              |                |     
        |                 |                  |              |              |                |     
        v                 v                  v              v              |                v     
-  +--------+       +----------+        +----+        /-----------/        v          +@--------+ 
-  |        |       | document |        |    +----+  /           /    +O-------+      |         | 
-  | square |       |     .-`-.|        | package | | stored_data     |  oval  |      |  cloud  | 
-  |        |        `-.-`              +---------+  \           \    +--------+      |         | 
-  +--------+             |                  |        \___________\        |          +---------+ 
+  +---------+      +----------+        +----+        /-----------/        v          +@---------+
+  |         |      | document |        |    +----+  /           /    +O--------+     |          |
+  | square  |      |     .-`-.|        | package | | stored_data     |  oval   |     |  cloud   |
+  |         |       `-.-`              +---------+  \           \    |         |     |          |
+  |         |            |                  |        \___________\   +---------+     |          |
+  +---------+            |                  |              |              |          +----------+
        |                 |                  |              |              |                      
        v                 v                  v              v              |                      
    +-----+          .------.          \------- \         /--\             v                      
-   |     \+        |\-____-/|          \        \        \__/        +O-------+                  
-   | page |        |        |           \        \      /----\       |        |                  
-   |      |        |        |           / step   /      ------       | circle |                  
-   +------+        |cylinder|          /        /       person       |        |                  
-                   |        |         /_______ /                     +--------+                  
-                    \-____-/                                                                     
+   |     \+        |\-____-/|          \        \        \__/        +O--------+                 
+   | page |        |        |           \        \      /----\       |         |                 
+   |      |        |        |           / step   /      ------       | circle  |                 
+   +------+        |cylinder|          /        /       person       |         |                 
+                   |        |         /_______ /                     |         |                 
+                    \-____-/                                         +---------+                 
diff --git a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
index b8285e70a1..690f1283a9 100644
--- a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
@@ -1,8 +1,10 @@
- ┌───┐
- │ x │
- └───┘
-    │ 
-    ▼ 
- ┌───┐
- │ y │
- └───┘
+ ┌────┐
+ │ x  │
+ │    │
+ └──┬─┘
+    │  
+    ▼  
+ ┌────┐
+ │ y  │
+ │    │
+ └────┘
diff --git a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
index a9edbab7f6..864e742e56 100644
--- a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
@@ -1,8 +1,10 @@
- +---+
- | x |
- +---+
-    | 
-    v 
- +---+
- | y |
- +---+
+ +----+
+ | x  |
+ |    |
+ +--+-+
+    |  
+    v  
+ +----+
+ | y  |
+ |    |
+ +----+
diff --git a/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt b/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt
index 69cea190ce..37d45a2366 100644
--- a/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt
@@ -1,79 +1,82 @@
-                             ┌─────────────────────────────────────────────────────┐
-                             │                          k                          │
-                             │                                                     │
-                             │    ┌──────────────────────┐                         │
-                             │    │      cell tower      │                         │
-                             │    │                      │                         │
-                             │    │     ╱‾‾‾‾‾‾‾‾‾‾╱     │                         │
-                             │    │    ╱          ╱      │                         │
-                             │    │   │ satellites       │                         │
-                             │    │    ╲          ╲      │                         │
-                             │    │     ╲__________│     │   ┌───────────────┐     │
-                             │    │       │   │    │     │   │ online portal │     │
-                             │    │       │   │    │     │   │      ╱‾‾╲     │     │
-                             │    │       │   │    │     │   │     ╱    ╲    │     │
-                             │    │       │   │    │     │   │     ╲ ui ╱    │     │
-                             │    │     sendsend send    │   │      ╲__╱     │     │
-                             │    │       │   │    │     │   │               │     │
-                             │    │       │   │    │     │   └───────────────┘     │
-                             │    │       │   │    │     │                         │
-                             │    │       ▼   ▼    ▼     │                         │
-                             │    │     ┌───────────┐    │                         │
-                             │    │     │transmitter│    │                         │
-                             │    │     └───────────┘    │                         │
-                             │    │           │          │                         │
-                             │    └───────────│──────────┘                         │
-                             │                │                                    │
-                             │           phone logs                                │
-                             │                │                                    │
-                             │      ┌─────────│────────┐                           │
-                             │      │  data processor  │                           │
-                             │      │         │        │                           │
-                             │      │         ▼        │                           │
-                             │      │    .-‾‾‾‾‾-.     │                           │
-                             │      │   │╲-_____-╱│    │                           │
-                             │      │   │         │    │                           │
-                             │      │   │ storage │    │                           │
-                             │      │   │         │    │                           │
-                  ╱‾‾‾╲      │      │    ╲-_____-╱     │                           │
-                  ╲___╱      │      │                  │                           │
-               ╱‾‾‾‾‾‾‾‾‾╲   │      └──────────────────┘                           │
-              ╱           ╲  │                                                     │
-              ‾‾‾‾‾‾‾‾‾‾‾‾‾─┐│                                                     │
-                 │user      │└─────────────────────────────────────────────────────┘
-                 │          │                                                       
-                 │       access                                                     
-                 │          │                                                       
-            ┌────┘          │  ┌──────────────────────────────────┐                 
-            │               │  │                                  │                 
- ┌──────────│───────────────│──│───────────────────────────┐      │                 
- │      make call          network                         │      │                 
- │          │               │  │                           │      │                 
- │          ▼       ┌───────│──│────┐                      │      │                 
- │    ┌──────────┐  │ online│portal │                      │      │                 
- │    │cell tower│  │       │  │    │                      │      │                 
- │    └──────────┘  │       ▼  ▼    │                      │      │                 
- │                  │    ┌──────┐   │                      │      │                 
- │                  │    │  ui  │   │                      │      │                 
- │                  │    └──────┘   │                      │      │                 
- │                  │               │    ┌──────────────┐  │   display              
- │                  └───────────────┘    │data processor│  │      │                 
- │                                       └──────────────┘  │      │                 
- │                                                     │   │      │                 
- └─────────────────────────────────────────────────────│───┘      │                 
-                                                       │          │                 
-                                                       │   ┌──────┘                 
-                                                       │   │                        
-                                                       ▼   │                        
-                                                   ┌──────────┐                     
-                                                   │api server│                     
-                                                   └──────────┘                     
-                                                         │                          
-                                                      persist                       
-                                                         │                          
-                                                         ▼                          
-                                                    ┌─────┐                         
-                                                    │     ╲┐                        
-                                                    │ logs │                        
-                                                    │      │                        
-                                                    └──────┘                        
+                             ┌──────────────────────────────────────────────────────┐
+                             │                          k                           │
+                             │                                                      │
+                             │    ┌───────────────────────┐                         │
+                             │    │      cell tower       │                         │
+                             │    │                       │                         │
+                             │    │     ╱‾‾‾‾‾‾‾‾‾‾╱      │                         │
+                             │    │    ╱          ╱       │                         │
+                             │    │   │ satellites        │                         │
+                             │    │    ╲          ╲       │                         │
+                             │    │     ╲__________│      │  ┌────────────────┐     │
+                             │    │       │   │    │      │  │ online portal  │     │
+                             │    │       │   │    │      │  │      ╱‾‾╲      │     │
+                             │    │       │   │    │      │  │     ╱    ╲     │     │
+                             │    │       │   │    │      │  │     ╲ ui ╱     │     │
+                             │    │     sendsend send     │  │      ╲__╱      │     │
+                             │    │       │   │    │      │  │                │     │
+                             │    │       │   │    │      │  └────────────────┘     │
+                             │    │       ▼   ▼    ▼      │                         │
+                             │    │     ┌────────────┐    │                         │
+                             │    │     │transmitter │    │                         │
+                             │    │     │            │    │                         │
+                             │    │     └─────┬──────┘    │                         │
+                             │    │           │           │                         │
+                             │    └───────────│───────────┘                         │
+                             │                │                                     │
+                             │           phone logs                                 │
+                             │                │                                     │
+                             │      ┌─────────│─────────┐                           │
+                             │      │  data processor   │                           │
+                             │      │         │         │                           │
+                             │      │         ▼         │                           │
+                             │      │    .-‾‾‾‾‾-.      │                           │
+                             │      │   │╲-_____-╱│     │                           │
+                             │      │   │         │     │                           │
+                             │      │   │ storage │     │                           │
+                             │      │   │         │     │                           │
+                  ╱‾‾‾╲      │      │    ╲-_____-╱      │                           │
+                  ╲___╱      │      │                   │                           │
+               ╱‾‾‾‾‾‾‾‾‾╲   │      │                   │                           │
+              ╱           ╲  │      └───────────────────┘                           │
+              ‾‾‾‾‾‾‾‾‾‾‾‾──┐│                                                      │
+                 │user      ││                                                      │
+                 │          │└──────────────────────────────────────────────────────┘
+                 │          │                                                        
+                 │       access                                                      
+                 │          │                                                        
+            ┌────┘          │  ┌──────────────────────────────────┐                  
+            │               │  │                                  │                  
+ ┌──────────│───────────────│──│────────────────────────────┐     │                  
+ │      make call          network                          │     │                  
+ │          │               │  │                            │     │                  
+ │          ▼       ┌───────│──│─────┐                      │     │                  
+ │    ┌───────────┐ │ online│portal  │                      │     │                  
+ │    │cell tower │ │       │  │     │                      │     │                  
+ │    │           │ │       ▼  ▼     │                      │     │                  
+ │    └───────────┘ │    ┌───────┐   │                      │     │                  
+ │                  │    │  ui   │   │                      │     │                  
+ │                  │    │       │   │                      │     │                  
+ │                  │    └───────┘   │   ┌───────────────┐  │  display               
+ │                  │                │   │data processor │  │     │                  
+ │                  └────────────────┘   │               │  │     │                  
+ │                                       └───────────────┘  │     │                  
+ │                                                     │    │     │                  
+ └─────────────────────────────────────────────────────│────┘     │                  
+                                                       │          │                  
+                                                       │   ┌──────┘                  
+                                                       │   │                         
+                                                       ▼   │                         
+                                                   ┌───────────┐                     
+                                                   │api server │                     
+                                                   │           │                     
+                                                   └───────────┘                     
+                                                         │                           
+                                                      persist                        
+                                                         │                           
+                                                         ▼                           
+                                                    ┌─────┐                          
+                                                    │     ╲┐                         
+                                                    │ logs │                         
+                                                    │      │                         
+                                                    └──────┘                         
diff --git a/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt b/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt
index 0e4b40b0a6..0ae3ea2ee2 100644
--- a/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt
@@ -1,79 +1,82 @@
-                             +-----------------------------------------------------+
-                             |                          k                          |
-                             |                                                     |
-                             |    +----------------------+                         |
-                             |    |      cell tower      |                         |
-                             |    |                      |                         |
-                             |    |     /----------/     |                         |
-                             |    |    /          /      |                         |
-                             |    |   | satellites       |                         |
-                             |    |    \          \      |                         |
-                             |    |     \__________|     |   +---------------+     |
-                             |    |       |   |    |     |   | online portal |     |
-                             |    |       |   |    |     |   |      /--\     |     |
-                             |    |       |   |    |     |   |     /    \    |     |
-                             |    |       |   |    |     |   |     \ ui /    |     |
-                             |    |     sendsend send    |   |      \__/     |     |
-                             |    |       |   |    |     |   |               |     |
-                             |    |       |   |    |     |   +---------------+     |
-                             |    |       |   |    |     |                         |
-                             |    |       v   v    v     |                         |
-                             |    |     +-----------+    |                         |
-                             |    |     |transmitter|    |                         |
-                             |    |     +-----------+    |                         |
-                             |    |           |          |                         |
-                             |    +-----------|----------+                         |
-                             |                |                                    |
-                             |           phone logs                                |
-                             |                |                                    |
-                             |      +---------|--------+                           |
-                             |      |  data processor  |                           |
-                             |      |         |        |                           |
-                             |      |         v        |                           |
-                             |      |    .-------.     |                           |
-                             |      |   |\-_____-/|    |                           |
-                             |      |   |         |    |                           |
-                             |      |   | storage |    |                           |
-                             |      |   |         |    |                           |
-                  /---\      |      |    \-_____-/     |                           |
-                  \___/      |      |                  |                           |
-               /---------\   |      +------------------+                           |
-              /           \  |                                                     |
-              --------------+|                                                     |
-                 |user      |+-----------------------------------------------------+
-                 |          |                                                       
-                 |       access                                                     
-                 |          |                                                       
-            +----+          |  +----------------------------------+                 
-            |               |  |                                  |                 
- +----------|---------------|--|---------------------------+      |                 
- |      make call          network                         |      |                 
- |          |               |  |                           |      |                 
- |          v       +-------|--|----+                      |      |                 
- |    +----------+  | online|portal |                      |      |                 
- |    |cell tower|  |       |  |    |                      |      |                 
- |    +----------+  |       v  v    |                      |      |                 
- |                  |    +------+   |                      |      |                 
- |                  |    |  ui  |   |                      |      |                 
- |                  |    +------+   |                      |      |                 
- |                  |               |    +--------------+  |   display              
- |                  +---------------+    |data processor|  |      |                 
- |                                       +--------------+  |      |                 
- |                                                     |   |      |                 
- +-----------------------------------------------------|---+      |                 
-                                                       |          |                 
-                                                       |   +------+                 
-                                                       |   |                        
-                                                       v   |                        
-                                                   +----------+                     
-                                                   |api server|                     
-                                                   +----------+                     
-                                                         |                          
-                                                      persist                       
-                                                         |                          
-                                                         v                          
-                                                    +-----+                         
-                                                    |     \+                        
-                                                    | logs |                        
-                                                    |      |                        
-                                                    +------+                        
+                             +------------------------------------------------------+
+                             |                          k                           |
+                             |                                                      |
+                             |    +-----------------------+                         |
+                             |    |      cell tower       |                         |
+                             |    |                       |                         |
+                             |    |     /----------/      |                         |
+                             |    |    /          /       |                         |
+                             |    |   | satellites        |                         |
+                             |    |    \          \       |                         |
+                             |    |     \__________|      |  +----------------+     |
+                             |    |       |   |    |      |  | online portal  |     |
+                             |    |       |   |    |      |  |      /--\      |     |
+                             |    |       |   |    |      |  |     /    \     |     |
+                             |    |       |   |    |      |  |     \ ui /     |     |
+                             |    |     sendsend send     |  |      \__/      |     |
+                             |    |       |   |    |      |  |                |     |
+                             |    |       |   |    |      |  +----------------+     |
+                             |    |       v   v    v      |                         |
+                             |    |     +------------+    |                         |
+                             |    |     |transmitter |    |                         |
+                             |    |     |            |    |                         |
+                             |    |     +-----+------+    |                         |
+                             |    |           |           |                         |
+                             |    +-----------|-----------+                         |
+                             |                |                                     |
+                             |           phone logs                                 |
+                             |                |                                     |
+                             |      +---------|---------+                           |
+                             |      |  data processor   |                           |
+                             |      |         |         |                           |
+                             |      |         v         |                           |
+                             |      |    .-------.      |                           |
+                             |      |   |\-_____-/|     |                           |
+                             |      |   |         |     |                           |
+                             |      |   | storage |     |                           |
+                             |      |   |         |     |                           |
+                  /---\      |      |    \-_____-/      |                           |
+                  \___/      |      |                   |                           |
+               /---------\   |      |                   |                           |
+              /           \  |      +-------------------+                           |
+              --------------+|                                                      |
+                 |user      ||                                                      |
+                 |          |+------------------------------------------------------+
+                 |          |                                                        
+                 |       access                                                      
+                 |          |                                                        
+            +----+          |  +----------------------------------+                  
+            |               |  |                                  |                  
+ +----------|---------------|--|----------------------------+     |                  
+ |      make call          network                          |     |                  
+ |          |               |  |                            |     |                  
+ |          v       +-------|--|-----+                      |     |                  
+ |    +-----------+ | online|portal  |                      |     |                  
+ |    |cell tower | |       |  |     |                      |     |                  
+ |    |           | |       v  v     |                      |     |                  
+ |    +-----------+ |    +-------+   |                      |     |                  
+ |                  |    |  ui   |   |                      |     |                  
+ |                  |    |       |   |                      |     |                  
+ |                  |    +-------+   |   +---------------+  |  display               
+ |                  |                |   |data processor |  |     |                  
+ |                  +----------------+   |               |  |     |                  
+ |                                       +---------------+  |     |                  
+ |                                                     |    |     |                  
+ +-----------------------------------------------------|----+     |                  
+                                                       |          |                  
+                                                       |   +------+                  
+                                                       |   |                         
+                                                       v   |                         
+                                                   +-----------+                     
+                                                   |api server |                     
+                                                   |           |                     
+                                                   +-----------+                     
+                                                         |                           
+                                                      persist                        
+                                                         |                           
+                                                         v                           
+                                                    +-----+                          
+                                                    |     \+                         
+                                                    | logs |                         
+                                                    |      |                         
+                                                    +------+                         
diff --git a/e2etests/testdata/asciitxtar/network-horizontal/extended.exp.txt b/e2etests/testdata/asciitxtar/network-horizontal/extended.exp.txt
index 40a5b0aa1f..54a435981d 100644
--- a/e2etests/testdata/asciitxtar/network-horizontal/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/network-horizontal/extended.exp.txt
@@ -1,27 +1,28 @@
-                                      ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────┐                                                      
-                                      │                                                 network                                                 │                                                      
-                                      │                                                                                                         │                                                      
-                                      │    ┌────────────────────────────────────────────────────┐                                               │                                                      
-                                      │    │                     cell tower                     │                        ┌──────────────────┐   │                                                      
-                                      │    │    ┌──────────┐                   ┌───────────┐    │                        │  data processor  │   │                                                      
-                   ┌───────make call──────▶│    │          │                   │           │    │                        │                  │   │                                                      
-                   │                  │    │    │          │───────send───────▶│           │    │                        │                  │─────────────────┐                                        
-                   │                  │    │    │satellites│                   │transmitter│    │                        │    ┌───────┐     │   │             │                                        
-                   │                  │    │    │          │───────send───────▶│           │ ───────────phone logs───────────▶│storage│     │   │             │                                        
-                   │                  │    │    │          │───────send───────▶│           │    │                        │    └───────┘     │   │             │                                        
- ┌────────────┐    │                  │    │    └──────────┘                   └───────────┘    │                        │                  │   │             │                                        
- │    user    │────┘                  │    │                                                    │                        └──────────────────┘   │             │                                        
- └────────────┘────┐                  │    └────────────────────────────────────────────────────┘                                               │             │                                        
-                   │                  │                                                                                                         │             │                                        
-                   │                  │     ┌───────────────┐                                                                                   │             │   ┌──────────┐                         
-                   │                  │     │ online portal │                                                                                   │             └──▶│api server│                   ┌────┐
-                   │                  │     │               │                                                                                   │             ┌───└──────────┘──────persist─────▶│logs│
-                   └───────────access────────────▶┌────┐    │                                                                                   │             │                                  └────┘
-                                      │     │     │ ui │    │                                                                                   │             │                                        
-                                 ┌───────────────▶└────┘    │                                                                                   │             │                                        
-                                 │    │     │               │                                                                                   │             │                                        
-                                 │    │     └───────────────┘                                                                                   │             │                                        
-                                 │    │                                                                                                         │             │                                        
-                                 │    └─────────────────────────────────────────────────────────────────────────────────────────────────────────┘             │                                        
-                                 │                                                                                                                            │                                        
-                                 └───────────────────────────────────────────────────────────display──────────────────────────────────────────────────────────┘                                        
+                                      ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────┐                                                      
+                                      │                                                 network                                                  │                                                      
+                                      │                                                                                                          │                                                      
+                                      │    ┌─────────────────────────────────────────────────────┐                                               │                                                      
+                                      │    │                     cell tower                      │                       ┌───────────────────┐   │                                                      
+                                      │    │    ┌───────────┐                  ┌────────────┐    │                       │  data processor   │   │                                                      
+                   ┌───────make call──────▶│    │           │                  │            │    │                       │                   │   │                                                      
+                   │                  │    │    │           │───────send──────▶│            │    │                       │                   │────────────────┐                                         
+                   │                  │    │    │satellites │                  │transmitter │    │                       │    ┌────────┐     │   │            │                                         
+                   │                  │    │    │           │───────send──────▶│            │───────────phone logs───────────▶│storage │     │   │            │                                         
+                   │                  │    │    │           │───────send──────▶│            │    │                       │    │        │     │   │            │                                         
+ ┌─────────────┐   │                  │    │    │           │                  │            │    │                       │    └────────┘     │   │            │                                         
+ │    user     │───┘                  │    │    └───────────┘                  └────────────┘    │                       │                   │   │            │                                         
+ │             │───┐                  │    │                                                     │                       └───────────────────┘   │            │                                         
+ └─────────────┘   │                  │    └─────────────────────────────────────────────────────┘                                               │            │                                         
+                   │                  │                                                                                                          │            │                                         
+                   │                  │     ┌────────────────┐                                                                                   │            │   ┌───────────┐                         
+                   │                  │     │ online portal  │                                                                                   │            └──▶│api server │                  ┌─────┐
+                   │                  │     │                │                                                                                   │            ┌───│           │──────persist────▶│logs │
+                   └───────────access────────────▶┌─────┐    │                                                                                   │            │   └───────────┘                  │     │
+                                      │     │     │ ui  │    │                                                                                   │            │                                  └─────┘
+                                 ┌───────────────▶│     │    │                                                                                   │            │                                         
+                                 │    │     │     └─────┘    │                                                                                   │            │                                         
+                                 │    │     │                │                                                                                   │            │                                         
+                                 │    │     └────────────────┘                                                                                   │            │                                         
+                                 │    │                                                                                                          │            │                                         
+                                 │    └──────────────────────────────────────────────────────────────────────────────────────────────────────────┘            │                                         
+                                 └───────────────────────────────────────────────────────────display──────────────────────────────────────────────────────────┘                                         
diff --git a/e2etests/testdata/asciitxtar/network-horizontal/standard.exp.txt b/e2etests/testdata/asciitxtar/network-horizontal/standard.exp.txt
index f5ac655649..22497e61f5 100644
--- a/e2etests/testdata/asciitxtar/network-horizontal/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/network-horizontal/standard.exp.txt
@@ -1,27 +1,28 @@
-                                      +---------------------------------------------------------------------------------------------------------+                                                      
-                                      |                                                 network                                                 |                                                      
-                                      |                                                                                                         |                                                      
-                                      |    +----------------------------------------------------+                                               |                                                      
-                                      |    |                     cell tower                     |                        +------------------+   |                                                      
-                                      |    |    +----------+                   +-----------+    |                        |  data processor  |   |                                                      
-                   +-------make call------>|    |          |                   |           |    |                        |                  |   |                                                      
-                   |                  |    |    |          |-------send------->|           |    |                        |                  |-----------------+                                        
-                   |                  |    |    |satellites|                   |transmitter|    |                        |    +-------+     |   |             |                                        
-                   |                  |    |    |          |-------send------->|           | -----------phone logs----------->|storage|     |   |             |                                        
-                   |                  |    |    |          |-------send------->|           |    |                        |    +-------+     |   |             |                                        
- +------------+    |                  |    |    +----------+                   +-----------+    |                        |                  |   |             |                                        
- |    user    |----+                  |    |                                                    |                        +------------------+   |             |                                        
- +------------+----+                  |    +----------------------------------------------------+                                               |             |                                        
-                   |                  |                                                                                                         |             |                                        
-                   |                  |     +---------------+                                                                                   |             |   +----------+                         
-                   |                  |     | online portal |                                                                                   |             +-->|api server|                   +----+
-                   |                  |     |               |                                                                                   |             +---+----------+------persist----->|logs|
-                   +-----------access------------>+----+    |                                                                                   |             |                                  +----+
-                                      |     |     | ui |    |                                                                                   |             |                                        
-                                 +--------------->+----+    |                                                                                   |             |                                        
-                                 |    |     |               |                                                                                   |             |                                        
-                                 |    |     +---------------+                                                                                   |             |                                        
-                                 |    |                                                                                                         |             |                                        
-                                 |    +---------------------------------------------------------------------------------------------------------+             |                                        
-                                 |                                                                                                                            |                                        
-                                 +-----------------------------------------------------------display----------------------------------------------------------+                                        
+                                      +----------------------------------------------------------------------------------------------------------+                                                      
+                                      |                                                 network                                                  |                                                      
+                                      |                                                                                                          |                                                      
+                                      |    +-----------------------------------------------------+                                               |                                                      
+                                      |    |                     cell tower                      |                       +-------------------+   |                                                      
+                                      |    |    +-----------+                  +------------+    |                       |  data processor   |   |                                                      
+                   +-------make call------>|    |           |                  |            |    |                       |                   |   |                                                      
+                   |                  |    |    |           |-------send------>|            |    |                       |                   |----------------+                                         
+                   |                  |    |    |satellites |                  |transmitter |    |                       |    +--------+     |   |            |                                         
+                   |                  |    |    |           |-------send------>|            |-----------phone logs----------->|storage |     |   |            |                                         
+                   |                  |    |    |           |-------send------>|            |    |                       |    |        |     |   |            |                                         
+ +-------------+   |                  |    |    |           |                  |            |    |                       |    +--------+     |   |            |                                         
+ |    user     |---+                  |    |    +-----------+                  +------------+    |                       |                   |   |            |                                         
+ |             |---+                  |    |                                                     |                       +-------------------+   |            |                                         
+ +-------------+   |                  |    +-----------------------------------------------------+                                               |            |                                         
+                   |                  |                                                                                                          |            |                                         
+                   |                  |     +----------------+                                                                                   |            |   +-----------+                         
+                   |                  |     | online portal  |                                                                                   |            +-->|api server |                  +-----+
+                   |                  |     |                |                                                                                   |            +---|           |------persist---->|logs |
+                   +-----------access------------>+-----+    |                                                                                   |            |   +-----------+                  |     |
+                                      |     |     | ui  |    |                                                                                   |            |                                  +-----+
+                                 +--------------->|     |    |                                                                                   |            |                                         
+                                 |    |     |     +-----+    |                                                                                   |            |                                         
+                                 |    |     |                |                                                                                   |            |                                         
+                                 |    |     +----------------+                                                                                   |            |                                         
+                                 |    |                                                                                                          |            |                                         
+                                 |    +----------------------------------------------------------------------------------------------------------+            |                                         
+                                 +-----------------------------------------------------------display----------------------------------------------------------+                                         
diff --git a/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt b/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt
index f24630f683..78151a74f6 100644
--- a/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt
@@ -1,58 +1,63 @@
-                   ┌──────────┐                                 
-                   │   user   │                                 
-                   └──────────┘                                 
+                   ┌───────────┐                                
+                   │   user    │                                
+                   │           │                                
+                   └───────────┘                                
                        │    │                                   
             ┌──────────┘    └──────────┐                        
             │                          │                        
         make call                      │                        
             │                          │  ┌─────────────────┐   
             │                       access│                 │   
- ┌──────────│──────────────────────────│──│──────────┐      │   
- │          │           network        │  │          │      │   
- │          ▼                          │  │          │      │   
- │    ┌────────────────────┐    ┌──────│──│─────┐    │      │   
- │    │     cell tower     │    │ online portal │    │      │   
- │    │                    │    │      │  │     │    │      │   
- │    │                    │    │      ▼  ▼     │    │      │   
- │    │     ┌──────────┐   │    │    ┌──────┐   │    │      │   
- │    │     │satellites│   │    │    │  ui  │   │    │      │   
- │    │     └──────────┘   │    │    └──────┘   │    │      │   
- │    │       │   │    │   │    │               │    │      │   
- │    │       │   │    │   │    └───────────────┘    │      │   
- │    │       │   │    │   │                         │      │   
- │    │     sendsend send  │                         │      │   
- │    │       │   │    │   │                         │      │   
- │    │       ▼   ▼    ▼   │                         │      │   
- │    │    ┌───────────┐   │                         │      │   
- │    │    │transmitter│   │                         │      │   
- │    │    └───────────┘   │                         │      │   
- │    │           │        │                         │      │   
- │    └───────────│────────┘                         │      │   
- │                │                                  │   display
- │                │                                  │      │   
- │           phone logs                              │      │   
- │                │                                  │      │   
- │      ┌─────────│────────┐                         │      │   
- │      │  data processor  │                         │      │   
- │      │         ▼        │                         │      │   
- │      │    ┌───────┐     │                         │      │   
- │      │    │storage│     │                         │      │   
- │      │    └───────┘     │                         │      │   
- │      │                  │                         │      │   
- │      └──────────────────┘                         │      │   
- │           │                                       │      │   
- └───────────│───────────────────────────────────────┘      │   
+ ┌──────────│──────────────────────────│──│───────────┐     │   
+ │          │           network        │  │           │     │   
+ │          ▼                          │  │           │     │   
+ │    ┌─────────────────────┐   ┌──────│──│──────┐    │     │   
+ │    │     cell tower      │   │ online portal  │    │     │   
+ │    │                     │   │      │  │      │    │     │   
+ │    │                     │   │      ▼  ▼      │    │     │   
+ │    │     ┌───────────┐   │   │    ┌───────┐   │    │     │   
+ │    │     │satellites │   │   │    │  ui   │   │    │     │   
+ │    │     │           │   │   │    │       │   │    │     │   
+ │    │     └───────────┘   │   │    └───────┘   │    │     │   
+ │    │       │   │    │    │   │                │    │     │   
+ │    │       │   │    │    │   └────────────────┘    │     │   
+ │    │       │   │    │    │                         │     │   
+ │    │     sendsend send   │                         │     │   
+ │    │       │   │    │    │                         │     │   
+ │    │       ▼   ▼    ▼    │                         │     │   
+ │    │    ┌────────────┐   │                         │     │   
+ │    │    │transmitter │   │                         │     │   
+ │    │    │            │   │                         │     │   
+ │    │    └──────┬─────┘   │                         │     │   
+ │    │           │         │                         │     │   
+ │    └───────────│─────────┘                         │  display
+ │                │                                   │     │   
+ │           phone logs                               │     │   
+ │                │                                   │     │   
+ │      ┌─────────│─────────┐                         │     │   
+ │      │  data processor   │                         │     │   
+ │      │         ▼         │                         │     │   
+ │      │    ┌────────┐     │                         │     │   
+ │      │    │storage │     │                         │     │   
+ │      │    │        │     │                         │     │   
+ │      │    └────────┘     │                         │     │   
+ │      │                   │                         │     │   
+ │      └───────────────────┘                         │     │   
+ │           │                                        │     │   
+ └───────────│────────────────────────────────────────┘     │   
              │                                              │   
              └────────────────────┐   ┌─────────────────────┘   
                                   │   │                         
                                   ▼   │                         
-                              ┌──────────┐                      
-                              │api server│                      
-                              └──────────┘                      
+                              ┌───────────┐                     
+                              │api server │                     
+                              │           │                     
+                              └───────────┘                     
                                     │                           
                                  persist                        
                                     │                           
                                     ▼                           
-                                 ┌────┐                         
-                                 │logs│                         
-                                 └────┘                         
+                                 ┌─────┐                        
+                                 │logs │                        
+                                 │     │                        
+                                 └─────┘                        
diff --git a/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt b/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt
index 3e0759431f..045105b76c 100644
--- a/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt
@@ -1,58 +1,63 @@
-                   +----------+                                 
-                   |   user   |                                 
-                   +----------+                                 
+                   +-----------+                                
+                   |   user    |                                
+                   |           |                                
+                   +-----------+                                
                        |    |                                   
             +----------+    +----------+                        
             |                          |                        
         make call                      |                        
             |                          |  +-----------------+   
             |                       access|                 |   
- +----------|--------------------------|--|----------+      |   
- |          |           network        |  |          |      |   
- |          v                          |  |          |      |   
- |    +--------------------+    +------|--|-----+    |      |   
- |    |     cell tower     |    | online portal |    |      |   
- |    |                    |    |      |  |     |    |      |   
- |    |                    |    |      v  v     |    |      |   
- |    |     +----------+   |    |    +------+   |    |      |   
- |    |     |satellites|   |    |    |  ui  |   |    |      |   
- |    |     +----------+   |    |    +------+   |    |      |   
- |    |       |   |    |   |    |               |    |      |   
- |    |       |   |    |   |    +---------------+    |      |   
- |    |       |   |    |   |                         |      |   
- |    |     sendsend send  |                         |      |   
- |    |       |   |    |   |                         |      |   
- |    |       v   v    v   |                         |      |   
- |    |    +-----------+   |                         |      |   
- |    |    |transmitter|   |                         |      |   
- |    |    +-----------+   |                         |      |   
- |    |           |        |                         |      |   
- |    +-----------|--------+                         |      |   
- |                |                                  |   display
- |                |                                  |      |   
- |           phone logs                              |      |   
- |                |                                  |      |   
- |      +---------|--------+                         |      |   
- |      |  data processor  |                         |      |   
- |      |         v        |                         |      |   
- |      |    +-------+     |                         |      |   
- |      |    |storage|     |                         |      |   
- |      |    +-------+     |                         |      |   
- |      |                  |                         |      |   
- |      +------------------+                         |      |   
- |           |                                       |      |   
- +-----------|---------------------------------------+      |   
+ +----------|--------------------------|--|-----------+     |   
+ |          |           network        |  |           |     |   
+ |          v                          |  |           |     |   
+ |    +---------------------+   +------|--|------+    |     |   
+ |    |     cell tower      |   | online portal  |    |     |   
+ |    |                     |   |      |  |      |    |     |   
+ |    |                     |   |      v  v      |    |     |   
+ |    |     +-----------+   |   |    +-------+   |    |     |   
+ |    |     |satellites |   |   |    |  ui   |   |    |     |   
+ |    |     |           |   |   |    |       |   |    |     |   
+ |    |     +-----------+   |   |    +-------+   |    |     |   
+ |    |       |   |    |    |   |                |    |     |   
+ |    |       |   |    |    |   +----------------+    |     |   
+ |    |       |   |    |    |                         |     |   
+ |    |     sendsend send   |                         |     |   
+ |    |       |   |    |    |                         |     |   
+ |    |       v   v    v    |                         |     |   
+ |    |    +------------+   |                         |     |   
+ |    |    |transmitter |   |                         |     |   
+ |    |    |            |   |                         |     |   
+ |    |    +------+-----+   |                         |     |   
+ |    |           |         |                         |     |   
+ |    +-----------|---------+                         |  display
+ |                |                                   |     |   
+ |           phone logs                               |     |   
+ |                |                                   |     |   
+ |      +---------|---------+                         |     |   
+ |      |  data processor   |                         |     |   
+ |      |         v         |                         |     |   
+ |      |    +--------+     |                         |     |   
+ |      |    |storage |     |                         |     |   
+ |      |    |        |     |                         |     |   
+ |      |    +--------+     |                         |     |   
+ |      |                   |                         |     |   
+ |      +-------------------+                         |     |   
+ |           |                                        |     |   
+ +-----------|----------------------------------------+     |   
              |                                              |   
              +--------------------+   +---------------------+   
                                   |   |                         
                                   v   |                         
-                              +----------+                      
-                              |api server|                      
-                              +----------+                      
+                              +-----------+                     
+                              |api server |                     
+                              |           |                     
+                              +-----------+                     
                                     |                           
                                  persist                        
                                     |                           
                                     v                           
-                                 +----+                         
-                                 |logs|                         
-                                 +----+                         
+                                 +-----+                        
+                                 |logs |                        
+                                 |     |                        
+                                 +-----+                        
diff --git a/e2etests/testdata/asciitxtar/overextended-lines/extended.exp.txt b/e2etests/testdata/asciitxtar/overextended-lines/extended.exp.txt
index 765b0325f8..4c9bff5330 100644
--- a/e2etests/testdata/asciitxtar/overextended-lines/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/overextended-lines/extended.exp.txt
@@ -1,41 +1,41 @@
- ┌───────────────────────────────────────────────────┐
- │                         k                         │
- │    ┌──────────────────────┐                       │
- │    │      cell tower      │                       │
- │    │                      │                       │
- │    │      ╱‾‾‾‾‾‾‾‾‾╱     │                       │
- │    │     ╱         ╱      │                       │
- │    │    │satellites       │                       │
- │    │     ╲         ╲      │                       │
- │    │      ╲_________╲     │  ┌───────────────┐    │
- │    │       │   │    │     │  │ online portal │    │
- │    │       │   │    │     │  │               │    │
- │    │       │   │    │     │  │      ╱‾‾╲     │    │
- │    │       │   │    │     │  │     ╱    ╲    │    │
- │    │       │   │    │     │  │     ╲ ui ╱    │    │
- │    │     sendsend send    │  │      ╲__╱     │    │
- │    │       │   │    │     │  │               │    │
- │    │       │   │    │     │  └───────────────┘    │
- │    │       │   │    │     │                       │
- │    │       ▼   ▼    ▼     │                       │
- │    │     ┌───────────┐    │                       │
- │    │     │transmitter│    │                       │
- │    │     └───────────┘    │                       │
- │    │           │          │                       │
- │    └───────────│──────────┘                       │
- │                │                                  │
- │           phone logs                              │
- │                │                                  │
- │     ┌──────────│───────┐                          │
- │     │  data processor  │                          │
- │     │          ▼       │                          │
- │     │    .-‾‾‾‾‾-.     │                          │
- │     │   │╲-_____-╱│    │                          │
- │     │   │         │    │                          │
- │     │   │ storage │    │                          │
- │     │   │         │    │                          │
- │     │    ╲-_____-╱     │                          │
- │     │                  │                          │
- │     └──────────────────┘                          │
- │                                                   │
- └───────────────────────────────────────────────────┘
+ ┌────────────────────────────────────────────────────┐
+ │                         k                          │
+ │    ┌───────────────────────┐                       │
+ │    │      cell tower       │                       │
+ │    │                       │                       │
+ │    │      ╱‾‾‾‾‾‾‾‾‾╱      │                       │
+ │    │     ╱         ╱       │                       │
+ │    │    │satellites        │                       │
+ │    │     ╲         ╲       │                       │
+ │    │      ╲_________╲      │ ┌────────────────┐    │
+ │    │       │   │    │      │ │ online portal  │    │
+ │    │       │   │    │      │ │                │    │
+ │    │       │   │    │      │ │      ╱‾‾╲      │    │
+ │    │       │   │    │      │ │     ╱    ╲     │    │
+ │    │       │   │    │      │ │     ╲ ui ╱     │    │
+ │    │     sendsend send     │ │      ╲__╱      │    │
+ │    │       │   │    │      │ │                │    │
+ │    │       │   │    │      │ └────────────────┘    │
+ │    │       ▼   ▼    ▼      │                       │
+ │    │     ┌────────────┐    │                       │
+ │    │     │transmitter │    │                       │
+ │    │     │            │    │                       │
+ │    │     └────────────┘    │                       │
+ │    │           │           │                       │
+ │    └───────────│───────────┘                       │
+ │                │                                   │
+ │           phone logs                               │
+ │                │                                   │
+ │     ┌──────────│────────┐                          │
+ │     │  data processor   │                          │
+ │     │          ▼        │                          │
+ │     │    .-‾‾‾‾‾-.      │                          │
+ │     │   │╲-_____-╱│     │                          │
+ │     │   │         │     │                          │
+ │     │   │ storage │     │                          │
+ │     │   │         │     │                          │
+ │     │    ╲-_____-╱      │                          │
+ │     │                   │                          │
+ │     └───────────────────┘                          │
+ │                                                    │
+ └────────────────────────────────────────────────────┘
diff --git a/e2etests/testdata/asciitxtar/overextended-lines/standard.exp.txt b/e2etests/testdata/asciitxtar/overextended-lines/standard.exp.txt
index 23139d9f84..b0d41e0baa 100644
--- a/e2etests/testdata/asciitxtar/overextended-lines/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/overextended-lines/standard.exp.txt
@@ -1,41 +1,41 @@
- +---------------------------------------------------+
- |                         k                         |
- |    +----------------------+                       |
- |    |      cell tower      |                       |
- |    |                      |                       |
- |    |      /---------/     |                       |
- |    |     /         /      |                       |
- |    |    |satellites       |                       |
- |    |     \         \      |                       |
- |    |      \_________\     |  +---------------+    |
- |    |       |   |    |     |  | online portal |    |
- |    |       |   |    |     |  |               |    |
- |    |       |   |    |     |  |      /--\     |    |
- |    |       |   |    |     |  |     /    \    |    |
- |    |       |   |    |     |  |     \ ui /    |    |
- |    |     sendsend send    |  |      \__/     |    |
- |    |       |   |    |     |  |               |    |
- |    |       |   |    |     |  +---------------+    |
- |    |       |   |    |     |                       |
- |    |       v   v    v     |                       |
- |    |     +-----------+    |                       |
- |    |     |transmitter|    |                       |
- |    |     +-----------+    |                       |
- |    |           |          |                       |
- |    +-----------|----------+                       |
- |                |                                  |
- |           phone logs                              |
- |                |                                  |
- |     +----------|-------+                          |
- |     |  data processor  |                          |
- |     |          v       |                          |
- |     |    .-------.     |                          |
- |     |   |\-_____-/|    |                          |
- |     |   |         |    |                          |
- |     |   | storage |    |                          |
- |     |   |         |    |                          |
- |     |    \-_____-/     |                          |
- |     |                  |                          |
- |     +------------------+                          |
- |                                                   |
- +---------------------------------------------------+
+ +----------------------------------------------------+
+ |                         k                          |
+ |    +-----------------------+                       |
+ |    |      cell tower       |                       |
+ |    |                       |                       |
+ |    |      /---------/      |                       |
+ |    |     /         /       |                       |
+ |    |    |satellites        |                       |
+ |    |     \         \       |                       |
+ |    |      \_________\      | +----------------+    |
+ |    |       |   |    |      | | online portal  |    |
+ |    |       |   |    |      | |                |    |
+ |    |       |   |    |      | |      /--\      |    |
+ |    |       |   |    |      | |     /    \     |    |
+ |    |       |   |    |      | |     \ ui /     |    |
+ |    |     sendsend send     | |      \__/      |    |
+ |    |       |   |    |      | |                |    |
+ |    |       |   |    |      | +----------------+    |
+ |    |       v   v    v      |                       |
+ |    |     +------------+    |                       |
+ |    |     |transmitter |    |                       |
+ |    |     |            |    |                       |
+ |    |     +------------+    |                       |
+ |    |           |           |                       |
+ |    +-----------|-----------+                       |
+ |                |                                   |
+ |           phone logs                               |
+ |                |                                   |
+ |     +----------|--------+                          |
+ |     |  data processor   |                          |
+ |     |          v        |                          |
+ |     |    .-------.      |                          |
+ |     |   |\-_____-/|     |                          |
+ |     |   |         |     |                          |
+ |     |   | storage |     |                          |
+ |     |   |         |     |                          |
+ |     |    \-_____-/      |                          |
+ |     |                   |                          |
+ |     +-------------------+                          |
+ |                                                    |
+ +----------------------------------------------------+
diff --git a/e2etests/testdata/asciitxtar/simple-sequence/extended.exp.txt b/e2etests/testdata/asciitxtar/simple-sequence/extended.exp.txt
index 42a0e2bcc3..6563b66d0f 100644
--- a/e2etests/testdata/asciitxtar/simple-sequence/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/simple-sequence/extended.exp.txt
@@ -1,10 +1,11 @@
- ┌───────┐       ┌───────┐      ┌────────┐
- │ alice │       │  bob  │      │  carl  │
- └───────┘       └───────┘      └────────┘
-      │               │              │    
-      │─────hello────▶│              │    
-      │               │              │    
-      │◀────jello─────│              │    
-      │               │              │    
-      │──────────────bye────────────▶│    
-      │               │              │    
+ ┌────────┐      ┌────────┐     ┌─────────┐
+ │ alice  │      │  bob   │     │  carl   │
+ │        │      │        │     │         │
+ └────────┘      └────────┘     └─────────┘
+      │               │              │     
+      │─────hello────▶│              │     
+      │               │              │     
+      │◀────jello─────│              │     
+      │               │              │     
+      │──────────────bye────────────▶│     
+      │               │              │     
diff --git a/e2etests/testdata/asciitxtar/simple-sequence/standard.exp.txt b/e2etests/testdata/asciitxtar/simple-sequence/standard.exp.txt
index 2936b2b3e1..f6c499b827 100644
--- a/e2etests/testdata/asciitxtar/simple-sequence/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/simple-sequence/standard.exp.txt
@@ -1,10 +1,11 @@
- +-------+       +-------+      +--------+
- | alice |       |  bob  |      |  carl  |
- +-------+       +-------+      +--------+
-      |               |              |    
-      |-----hello---->|              |    
-      |               |              |    
-      |<----jello-----|              |    
-      |               |              |    
-      |--------------bye------------>|    
-      |               |              |    
+ +--------+      +--------+     +---------+
+ | alice  |      |  bob   |     |  carl   |
+ |        |      |        |     |         |
+ +--------+      +--------+     +---------+
+      |               |              |     
+      |-----hello---->|              |     
+      |               |              |     
+      |<----jello-----|              |     
+      |               |              |     
+      |--------------bye------------>|     
+      |               |              |     
diff --git a/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt b/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt
index 4f4371ef59..b2736d09e4 100644
--- a/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt
@@ -1,3 +1,4 @@
- ┌─────┐                        ┌───┐
- │  A  │───────HELLO WORLD─────▶│ B │
- └─────┘                        └───┘
+ ┌──────┐                       ┌────┐
+ │  A  ───────HELLO WORLD──────▶│ B  │
+ │      │                       │    │
+ └──────┘                       └────┘
diff --git a/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt b/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt
index 3452c1957a..3801e9e344 100644
--- a/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt
@@ -1,3 +1,4 @@
- +-----+                        +---+
- |  A  |-------HELLO WORLD----->| B |
- +-----+                        +---+
+ +------+                       +----+
+ |  A  -------HELLO WORLD------>| B  |
+ |      |                       |    |
+ +------+                       +----+

From fd8249be3192c1956a4918e05901adffdc787079 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 17 Aug 2025 06:14:36 -0600
Subject: [PATCH 07/12] fix bounds

---
 d2renderers/d2ascii/asciiroute/asciiroute.go  |  2 +-
 d2renderers/d2ascii/asciishapes/page.go       | 28 +++++++++----------
 d2renderers/d2ascii/asciishapes/rectangle.go  |  3 --
 d2renderers/d2ascii/d2ascii.go                | 24 ++++++++++++++--
 .../asciitxtar/all-shapes/extended.exp.txt    |  4 +--
 .../asciitxtar/all-shapes/standard.exp.txt    |  4 +--
 .../asciitxtar/basic-simple/extended.exp.txt  |  2 +-
 .../asciitxtar/basic-simple/standard.exp.txt  |  2 +-
 .../asciitxtar/curved-line/extended.exp.txt   | 11 ++++----
 .../asciitxtar/curved-line/standard.exp.txt   |  9 +++---
 .../network-vertical/extended.exp.txt         |  2 +-
 .../network-vertical/standard.exp.txt         |  2 +-
 .../terminal-horizontal/extended.exp.txt      |  2 +-
 .../terminal-horizontal/standard.exp.txt      |  2 +-
 14 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/d2renderers/d2ascii/asciiroute/asciiroute.go b/d2renderers/d2ascii/asciiroute/asciiroute.go
index 9a1faab205..ab100310c2 100644
--- a/d2renderers/d2ascii/asciiroute/asciiroute.go
+++ b/d2renderers/d2ascii/asciiroute/asciiroute.go
@@ -26,7 +26,7 @@ type Boundary struct {
 }
 
 func (b *Boundary) Contains(x int, y int) bool {
-	return x > b.TL.X && x < b.BR.X && y > b.TL.Y && y < b.BR.Y
+	return x >= b.TL.X && x <= b.BR.X && y >= b.TL.Y && y <= b.BR.Y
 }
 
 func NewBoundary(tl, br Point) *Boundary {
diff --git a/d2renderers/d2ascii/asciishapes/page.go b/d2renderers/d2ascii/asciishapes/page.go
index 827d34168c..667ab076e6 100644
--- a/d2renderers/d2ascii/asciishapes/page.go
+++ b/d2renderers/d2ascii/asciishapes/page.go
@@ -16,31 +16,31 @@ func DrawPage(ctx *Context, x, y, w, h float64, label, labelPosition string) {
 		}
 	}
 	wC = AdjustWidthForLabel(ctx, x, y, w, h, wC, label)
-	x2, y2 := x1+wC, y1+hC
+	x2, y2 := x1+wC-1, y1+hC-1
 	corners := map[string]string{
-		fmt.Sprintf("%d_%d", x1, y1):     ctx.Chars.TopLeftCorner(),
-		fmt.Sprintf("%d_%d", x2-1, y1):   ctx.Chars.TopRightCorner(),
-		fmt.Sprintf("%d_%d", x1, y2-1):   ctx.Chars.BottomLeftCorner(),
-		fmt.Sprintf("%d_%d", x2-1, y2-1): ctx.Chars.BottomRightCorner(),
+		fmt.Sprintf("%d_%d", x1, y1): ctx.Chars.TopLeftCorner(),
+		fmt.Sprintf("%d_%d", x2, y1): ctx.Chars.TopRightCorner(),
+		fmt.Sprintf("%d_%d", x1, y2): ctx.Chars.BottomLeftCorner(),
+		fmt.Sprintf("%d_%d", x2, y2): ctx.Chars.BottomRightCorner(),
 	}
 
-	for xi := x1; xi < x2; xi++ {
-		for yi := y1; yi < y2; yi++ {
+	for xi := x1; xi <= x2; xi++ {
+		for yi := y1; yi <= y2; yi++ {
 			key := fmt.Sprintf("%d_%d", xi, yi)
 			if val, ok := corners[key]; ok {
 				ctx.Canvas.Set(xi, yi, val)
-			} else if xi == x1 || xi == x2-1 {
+			} else if xi == x1 || xi == x2 {
 				ctx.Canvas.Set(xi, yi, ctx.Chars.Vertical())
-			} else if yi == y1 || yi == y2-1 {
+			} else if yi == y1 || yi == y2 {
 				ctx.Canvas.Set(xi, yi, ctx.Chars.Horizontal())
 			}
 		}
 	}
-	// The fold
-	ctx.Canvas.Set(x2-1, y1, " ")
-	ctx.Canvas.Set(x2-2, y1, ctx.Chars.TopRightCorner())
-	ctx.Canvas.Set(x2-2, y1+1, ctx.Chars.Backslash())
-	ctx.Canvas.Set(x2-1, y1+1, ctx.Chars.TopRightCorner())
+	// The fold  
+	ctx.Canvas.Set(x2, y1, " ")
+	ctx.Canvas.Set(x2-1, y1, ctx.Chars.TopRightCorner())
+	ctx.Canvas.Set(x2-1, y1+1, ctx.Chars.Backslash())
+	ctx.Canvas.Set(x2, y1+1, ctx.Chars.TopRightCorner())
 
 	DrawShapeLabel(ctx, x1, y1, x2, y2, wC, hC, label, labelPosition)
 
diff --git a/d2renderers/d2ascii/asciishapes/rectangle.go b/d2renderers/d2ascii/asciishapes/rectangle.go
index 58a5a601fc..6e9564903c 100644
--- a/d2renderers/d2ascii/asciishapes/rectangle.go
+++ b/d2renderers/d2ascii/asciishapes/rectangle.go
@@ -3,8 +3,6 @@ package asciishapes
 import (
 	"fmt"
 	"strings"
-
-	"github.com/davecgh/go-spew/spew"
 )
 
 func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol string) {
@@ -40,7 +38,6 @@ func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol str
 	for xi := x1; xi <= x2; xi++ {
 		for yi := y1; yi <= y2; yi++ {
 			key := fmt.Sprintf("%d_%d", xi, yi)
-			spew.Dump(key)
 			if val, ok := corners[key]; ok {
 				ctx.Canvas.Set(xi, yi, val)
 			} else if strings.TrimSpace(symbol) != "" && yi == y1 && xi == x1+1 {
diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index 11ec26455c..bbfe5b144f 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -58,7 +58,7 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 		posX, posY, width, height)
 
 	if s.Multiple {
-		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple shape, expanding boundary by %.0f\033[0m\n", d2target.MULTIPLE_OFFSET)
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple shape, expanding boundary by %d\033[0m\n", d2target.MULTIPLE_OFFSET)
 		posX -= d2target.MULTIPLE_OFFSET   // Move left to include shadow area
 		width += d2target.MULTIPLE_OFFSET  // Include shadow width
 		height += d2target.MULTIPLE_OFFSET // Include shadow height
@@ -86,6 +86,26 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 		}
 	}
 	
+	// Apply the same width adjustments as the drawing code
+	preserveWidth := hasConnectionsAtRightEdge(s, a.diagram.Connections, a.FW)
+	if preserveWidth && s.Label != "" {
+		availableSpace := wC - len(s.Label)
+		if availableSpace >= asciishapes.MinLabelPadding && availableSpace%2 == 1 {
+			// Adjust the original width before recalibrating
+			width += a.FW / a.SCALE
+			x1, y1, wC, hC = ctx.Calibrate(posX, posY, width, height)
+			// Reapply height adjustments
+			if s.Label != "" && hC%2 == 0 {
+				if hC > 2 {
+					hC--
+					y1++
+				} else {
+					hC++
+				}
+			}
+		}
+	}
+	
 	// Apply the same width adjustments as DrawRect for labels
 	wC = asciishapes.AdjustWidthForLabel(ctx, posX, posY, width, height, wC, s.Label)
 	
@@ -297,7 +317,7 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 		drawHeight := float64(shape.Height)
 
 		if shape.Multiple {
-			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple shape adjustments: offset=%.0f\033[0m\n", d2target.MULTIPLE_OFFSET)
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple shape adjustments: offset=%d\033[0m\n", d2target.MULTIPLE_OFFSET)
 			// Move position to top-left of total occupied area (shadow extends left and down)
 			drawX -= d2target.MULTIPLE_OFFSET // Move left to include shadow area
 			// Y stays the same since shadow goes down, not up
diff --git a/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt b/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt
index c157da0659..9d9dffd1f4 100644
--- a/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/all-shapes/extended.exp.txt
@@ -3,14 +3,14 @@
  ┌──────────┐    ╱               ╱   │         │  │   └────────┘  ***  diamond  *** ╱           ╲
  │rectangle │   ╱ parallelogram ╱    │   queue │  │        │ ╱      ****     ****   ╲  hexagon  ╱
  │          │  ╱_______________╱      ╲________ ╲╱         │╱           *****        ╲_________╱ 
- └──────────┘            │                  │              │              │                │     
+ └──────────┘                                                                                    
        │                 │                  │              │              │                │     
        ▼                 ▼                  ▼              ▼              │                ▼     
   ┌─────────┐      ┌──────────┐        ┌────┐        ╱‾‾‾‾‾‾‾‾‾‾‾╱        ▼          ┌☁─────────┐
   │         │      │ document │        │    └────┐  ╱           ╱    ┌⬭────────┐     │          │
   │ square  │      │     .-`-.│        │ package │ │ stored_data     │  oval   │     │  cloud   │
   │         │       `-.-`              └─────────┘  ╲           ╲    │         │     │          │
-  │         │            │                  │        ╲___________╲   └─────────┘     │          │
+  │         │                                        ╲___________╲   └─────────┘     │          │
   └─────────┘            │                  │              │              │          └──────────┘
        │                 │                  │              │              │                      
        ▼                 ▼                  ▼              ▼              │                      
diff --git a/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt b/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt
index ea16639f74..1d218cf772 100644
--- a/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/all-shapes/standard.exp.txt
@@ -3,14 +3,14 @@
  +----------+    /               /   |         |  |   +--------+  ***  diamond  *** /           \
  |rectangle |   / parallelogram /    |   queue |  |        | /      ****     ****   \  hexagon  /
  |          |  /_______________/      \________ \/         |/           *****        \_________/ 
- +----------+            |                  |              |              |                |     
+ +----------+                                                                                    
        |                 |                  |              |              |                |     
        v                 v                  v              v              |                v     
   +---------+      +----------+        +----+        /-----------/        v          +@---------+
   |         |      | document |        |    +----+  /           /    +O--------+     |          |
   | square  |      |     .-`-.|        | package | | stored_data     |  oval   |     |  cloud   |
   |         |       `-.-`              +---------+  \           \    |         |     |          |
-  |         |            |                  |        \___________\   +---------+     |          |
+  |         |                                        \___________\   +---------+     |          |
   +---------+            |                  |              |              |          +----------+
        |                 |                  |              |              |                      
        v                 v                  v              v              |                      
diff --git a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
index 690f1283a9..8e73b6e463 100644
--- a/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/basic-simple/extended.exp.txt
@@ -1,7 +1,7 @@
  ┌────┐
  │ x  │
  │    │
- └──┬─┘
+ └────┘
     │  
     ▼  
  ┌────┐
diff --git a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
index 864e742e56..739c1e1354 100644
--- a/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/basic-simple/standard.exp.txt
@@ -1,7 +1,7 @@
  +----+
  | x  |
  |    |
- +--+-+
+ +----+
     |  
     v  
  +----+
diff --git a/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt b/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt
index 37d45a2366..7d73423125 100644
--- a/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/curved-line/extended.exp.txt
@@ -8,19 +8,20 @@
                              │    │    ╱          ╱       │                         │
                              │    │   │ satellites        │                         │
                              │    │    ╲          ╲       │                         │
-                             │    │     ╲__________│      │  ┌────────────────┐     │
+                             │    │     ╲__________╲      │  ┌────────────────┐     │
                              │    │       │   │    │      │  │ online portal  │     │
                              │    │       │   │    │      │  │      ╱‾‾╲      │     │
                              │    │       │   │    │      │  │     ╱    ╲     │     │
                              │    │       │   │    │      │  │     ╲ ui ╱     │     │
-                             │    │     sendsend send     │  │      ╲__╱      │     │
+                             │    │       │   │    │      │  │      ╲__╱      │     │
+                             │    │     sendsend send     │  │                │     │
                              │    │       │   │    │      │  │                │     │
                              │    │       │   │    │      │  └────────────────┘     │
                              │    │       ▼   ▼    ▼      │                         │
                              │    │     ┌────────────┐    │                         │
                              │    │     │transmitter │    │                         │
                              │    │     │            │    │                         │
-                             │    │     └─────┬──────┘    │                         │
+                             │    │     └────────────┘    │                         │
                              │    │           │           │                         │
                              │    └───────────│───────────┘                         │
                              │                │                                     │
@@ -39,8 +40,8 @@
                   ╲___╱      │      │                   │                           │
                ╱‾‾‾‾‾‾‾‾‾╲   │      │                   │                           │
               ╱           ╲  │      └───────────────────┘                           │
-              ‾‾‾‾‾‾‾‾‾‾‾‾──┐│                                                      │
-                 │user      ││                                                      │
+              ‾‾‾‾‾‾‾‾‾‾‾‾‾─┐│                                                      │
+                  user      ││                                                      │
                  │          │└──────────────────────────────────────────────────────┘
                  │          │                                                        
                  │       access                                                      
diff --git a/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt b/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt
index 0ae3ea2ee2..615ed605c7 100644
--- a/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/curved-line/standard.exp.txt
@@ -8,19 +8,20 @@
                              |    |    /          /       |                         |
                              |    |   | satellites        |                         |
                              |    |    \          \       |                         |
-                             |    |     \__________|      |  +----------------+     |
+                             |    |     \__________\      |  +----------------+     |
                              |    |       |   |    |      |  | online portal  |     |
                              |    |       |   |    |      |  |      /--\      |     |
                              |    |       |   |    |      |  |     /    \     |     |
                              |    |       |   |    |      |  |     \ ui /     |     |
-                             |    |     sendsend send     |  |      \__/      |     |
+                             |    |       |   |    |      |  |      \__/      |     |
+                             |    |     sendsend send     |  |                |     |
                              |    |       |   |    |      |  |                |     |
                              |    |       |   |    |      |  +----------------+     |
                              |    |       v   v    v      |                         |
                              |    |     +------------+    |                         |
                              |    |     |transmitter |    |                         |
                              |    |     |            |    |                         |
-                             |    |     +-----+------+    |                         |
+                             |    |     +------------+    |                         |
                              |    |           |           |                         |
                              |    +-----------|-----------+                         |
                              |                |                                     |
@@ -40,7 +41,7 @@
                /---------\   |      |                   |                           |
               /           \  |      +-------------------+                           |
               --------------+|                                                      |
-                 |user      ||                                                      |
+                  user      ||                                                      |
                  |          |+------------------------------------------------------+
                  |          |                                                        
                  |       access                                                      
diff --git a/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt b/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt
index 78151a74f6..1df1895096 100644
--- a/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/network-vertical/extended.exp.txt
@@ -28,7 +28,7 @@
  │    │    ┌────────────┐   │                         │     │   
  │    │    │transmitter │   │                         │     │   
  │    │    │            │   │                         │     │   
- │    │    └──────┬─────┘   │                         │     │   
+ │    │    └────────────┘   │                         │     │   
  │    │           │         │                         │     │   
  │    └───────────│─────────┘                         │  display
  │                │                                   │     │   
diff --git a/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt b/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt
index 045105b76c..7beb5f3e10 100644
--- a/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/network-vertical/standard.exp.txt
@@ -28,7 +28,7 @@
  |    |    +------------+   |                         |     |   
  |    |    |transmitter |   |                         |     |   
  |    |    |            |   |                         |     |   
- |    |    +------+-----+   |                         |     |   
+ |    |    +------------+   |                         |     |   
  |    |           |         |                         |     |   
  |    +-----------|---------+                         |  display
  |                |                                   |     |   
diff --git a/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt b/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt
index b2736d09e4..97b96fb011 100644
--- a/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/terminal-horizontal/extended.exp.txt
@@ -1,4 +1,4 @@
  ┌──────┐                       ┌────┐
- │  A  ───────HELLO WORLD──────▶│ B  │
+ │  A   │──────HELLO WORLD─────▶│ B  │
  │      │                       │    │
  └──────┘                       └────┘
diff --git a/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt b/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt
index 3801e9e344..455fa5dc87 100644
--- a/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/terminal-horizontal/standard.exp.txt
@@ -1,4 +1,4 @@
  +------+                       +----+
- |  A  -------HELLO WORLD------>| B  |
+ |  A   |------HELLO WORLD----->| B  |
  |      |                       |    |
  +------+                       +----+

From ff00f706ce56747848a9dd77b100853da0835086 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 17 Aug 2025 06:20:06 -0600
Subject: [PATCH 08/12] add more tests

---
 e2etests/asciitxtar.txt                       |  12 +++
 .../asciitxtar/three-down/extended.exp.txt    |  22 ++++
 .../asciitxtar/three-down/sketch.exp.svg      | 102 ++++++++++++++++++
 .../asciitxtar/three-down/standard.exp.txt    |  22 ++++
 .../asciitxtar/three-right/extended.exp.txt   |   8 ++
 .../asciitxtar/three-right/sketch.exp.svg     | 102 ++++++++++++++++++
 .../asciitxtar/three-right/standard.exp.txt   |   8 ++
 7 files changed, 276 insertions(+)
 create mode 100644 e2etests/testdata/asciitxtar/three-down/extended.exp.txt
 create mode 100644 e2etests/testdata/asciitxtar/three-down/sketch.exp.svg
 create mode 100644 e2etests/testdata/asciitxtar/three-down/standard.exp.txt
 create mode 100644 e2etests/testdata/asciitxtar/three-right/extended.exp.txt
 create mode 100644 e2etests/testdata/asciitxtar/three-right/sketch.exp.svg
 create mode 100644 e2etests/testdata/asciitxtar/three-right/standard.exp.txt

diff --git a/e2etests/asciitxtar.txt b/e2etests/asciitxtar.txt
index f96be0a4f5..9f65a67738 100644
--- a/e2etests/asciitxtar.txt
+++ b/e2etests/asciitxtar.txt
@@ -1,3 +1,15 @@
+-- three-right --
+direction: right
+x -> y -> z
+x -> z
+x -> y: okay
+
+-- three-down --
+direction: down
+x -> y -> z
+x -> z
+x -> y: okay
+
 -- basic-simple --
 x -> y
 
diff --git a/e2etests/testdata/asciitxtar/three-down/extended.exp.txt b/e2etests/testdata/asciitxtar/three-down/extended.exp.txt
new file mode 100644
index 0000000000..366886a798
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/three-down/extended.exp.txt
@@ -0,0 +1,22 @@
+   ┌──────────┐ 
+   │    x     │ 
+   │          │ 
+   └──────────┘ 
+      │ │   │   
+  ┌───┘ │   └──┐
+  │     │      │
+  │   okay     │
+  │     │      │
+  ▼     ▼      │
+ ┌──────┐      │
+ │  y   │      │
+ │      │      │
+ └──────┘      │
+        │      │
+        │  ┌───┘
+        │  │    
+        ▼  ▼    
+     ┌──────┐   
+     │  z   │   
+     │      │   
+     └──────┘   
diff --git a/e2etests/testdata/asciitxtar/three-down/sketch.exp.svg b/e2etests/testdata/asciitxtar/three-down/sketch.exp.svg
new file mode 100644
index 0000000000..7e8220f225
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/three-down/sketch.exp.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" data-d2-version="v0.7.0-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 135 461"><svg class="d2-844595713 d2-svg" width="135" height="461" viewBox="11 11 135 461"><rect x="11.000000" y="11.000000" width="135.000000" height="461.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+.d2-844595713 .text-bold {
+	font-family: "d2-844595713-font-bold";
+}
+@font-face {
+	font-family: d2-844595713-font-bold;
+	src: url("data:application/font-woff;base64,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");
+}
+.d2-844595713 .text-italic {
+	font-family: "d2-844595713-font-italic";
+}
+@font-face {
+	font-family: d2-844595713-font-italic;
+	src: url("data:application/font-woff;base64,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");
+}]]></style><style type="text/css"><![CDATA[.shape {
+  shape-rendering: geometricPrecision;
+  stroke-linejoin: round;
+}
+.connection {
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+.blend {
+  mix-blend-mode: multiply;
+  opacity: 0.5;
+}
+
+		.d2-844595713 .fill-N1{fill:#0A0F25;}
+		.d2-844595713 .fill-N2{fill:#676C7E;}
+		.d2-844595713 .fill-N3{fill:#9499AB;}
+		.d2-844595713 .fill-N4{fill:#CFD2DD;}
+		.d2-844595713 .fill-N5{fill:#DEE1EB;}
+		.d2-844595713 .fill-N6{fill:#EEF1F8;}
+		.d2-844595713 .fill-N7{fill:#FFFFFF;}
+		.d2-844595713 .fill-B1{fill:#0D32B2;}
+		.d2-844595713 .fill-B2{fill:#0D32B2;}
+		.d2-844595713 .fill-B3{fill:#E3E9FD;}
+		.d2-844595713 .fill-B4{fill:#E3E9FD;}
+		.d2-844595713 .fill-B5{fill:#EDF0FD;}
+		.d2-844595713 .fill-B6{fill:#F7F8FE;}
+		.d2-844595713 .fill-AA2{fill:#4A6FF3;}
+		.d2-844595713 .fill-AA4{fill:#EDF0FD;}
+		.d2-844595713 .fill-AA5{fill:#F7F8FE;}
+		.d2-844595713 .fill-AB4{fill:#EDF0FD;}
+		.d2-844595713 .fill-AB5{fill:#F7F8FE;}
+		.d2-844595713 .stroke-N1{stroke:#0A0F25;}
+		.d2-844595713 .stroke-N2{stroke:#676C7E;}
+		.d2-844595713 .stroke-N3{stroke:#9499AB;}
+		.d2-844595713 .stroke-N4{stroke:#CFD2DD;}
+		.d2-844595713 .stroke-N5{stroke:#DEE1EB;}
+		.d2-844595713 .stroke-N6{stroke:#EEF1F8;}
+		.d2-844595713 .stroke-N7{stroke:#FFFFFF;}
+		.d2-844595713 .stroke-B1{stroke:#0D32B2;}
+		.d2-844595713 .stroke-B2{stroke:#0D32B2;}
+		.d2-844595713 .stroke-B3{stroke:#E3E9FD;}
+		.d2-844595713 .stroke-B4{stroke:#E3E9FD;}
+		.d2-844595713 .stroke-B5{stroke:#EDF0FD;}
+		.d2-844595713 .stroke-B6{stroke:#F7F8FE;}
+		.d2-844595713 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-844595713 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-844595713 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-844595713 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-844595713 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-844595713 .background-color-N1{background-color:#0A0F25;}
+		.d2-844595713 .background-color-N2{background-color:#676C7E;}
+		.d2-844595713 .background-color-N3{background-color:#9499AB;}
+		.d2-844595713 .background-color-N4{background-color:#CFD2DD;}
+		.d2-844595713 .background-color-N5{background-color:#DEE1EB;}
+		.d2-844595713 .background-color-N6{background-color:#EEF1F8;}
+		.d2-844595713 .background-color-N7{background-color:#FFFFFF;}
+		.d2-844595713 .background-color-B1{background-color:#0D32B2;}
+		.d2-844595713 .background-color-B2{background-color:#0D32B2;}
+		.d2-844595713 .background-color-B3{background-color:#E3E9FD;}
+		.d2-844595713 .background-color-B4{background-color:#E3E9FD;}
+		.d2-844595713 .background-color-B5{background-color:#EDF0FD;}
+		.d2-844595713 .background-color-B6{background-color:#F7F8FE;}
+		.d2-844595713 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-844595713 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-844595713 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-844595713 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-844595713 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-844595713 .color-N1{color:#0A0F25;}
+		.d2-844595713 .color-N2{color:#676C7E;}
+		.d2-844595713 .color-N3{color:#9499AB;}
+		.d2-844595713 .color-N4{color:#CFD2DD;}
+		.d2-844595713 .color-N5{color:#DEE1EB;}
+		.d2-844595713 .color-N6{color:#EEF1F8;}
+		.d2-844595713 .color-N7{color:#FFFFFF;}
+		.d2-844595713 .color-B1{color:#0D32B2;}
+		.d2-844595713 .color-B2{color:#0D32B2;}
+		.d2-844595713 .color-B3{color:#E3E9FD;}
+		.d2-844595713 .color-B4{color:#E3E9FD;}
+		.d2-844595713 .color-B5{color:#EDF0FD;}
+		.d2-844595713 .color-B6{color:#F7F8FE;}
+		.d2-844595713 .color-AA2{color:#4A6FF3;}
+		.d2-844595713 .color-AA4{color:#EDF0FD;}
+		.d2-844595713 .color-AA5{color:#F7F8FE;}
+		.d2-844595713 .color-AB4{color:#EDF0FD;}
+		.d2-844595713 .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-d2-844595713);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-844595713);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-844595713);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-844595713);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-844595713);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-844595713);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-844595713);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-844595713);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g class="eA=="><g class="shape" ><rect x="25.000000" y="12.000000" width="120.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="85.000000" y="50.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g class="eQ=="><g class="shape" ><rect x="12.000000" y="259.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="52.000000" y="297.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g class="eg=="><g class="shape" ><rect x="51.000000" y="405.000000" width="80.000000" height="66.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="91.000000" y="443.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g class="KHggLSZndDsgeSlbMF0="><marker id="mk-d2-844595713-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 55.333000 80.000000 L 55.333000 108.000000 S 55.333000 118.000000 45.333000 118.000000 L 33.250000 118.000000 S 23.250000 118.000000 23.250000 128.000000 L 23.250000 255.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-844595713-3488378134)" mask="url(#d2-844595713)" /></g><g class="KHkgLSZndDsgeilbMF0="><path d="M 78.666000 327.000000 L 78.666000 401.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-844595713-3488378134)" mask="url(#d2-844595713)" /></g><g class="KHggLSZndDsgeilbMF0="><path d="M 115.333000 80.000000 L 115.333000 108.000000 S 115.333000 118.000000 125.333000 118.000000 L 132.832993 118.000000 S 142.832993 118.000000 142.832993 128.000000 L 142.832993 355.000000 S 142.832993 365.000000 132.832993 365.000000 L 115.333000 365.000000 S 105.333000 365.000000 105.333000 375.000000 L 105.333000 401.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-844595713-3488378134)" mask="url(#d2-844595713)" /></g><g class="KHggLSZndDsgeSlbMV0="><path d="M 80.750000 80.000000 L 80.750000 255.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-844595713-3488378134)" mask="url(#d2-844595713)" /><text x="80.500000" y="174.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">okay</text></g><mask id="d2-844595713" maskUnits="userSpaceOnUse" x="11" y="11" width="135" height="461">
+<rect x="11" y="11" width="135" height="461" fill="white"></rect>
+<rect x="62.000000" y="158.000000" width="37" height="21" fill="black"></rect>
+</mask></svg></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/asciitxtar/three-down/standard.exp.txt b/e2etests/testdata/asciitxtar/three-down/standard.exp.txt
new file mode 100644
index 0000000000..356db0d460
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/three-down/standard.exp.txt
@@ -0,0 +1,22 @@
+   +----------+ 
+   |    x     | 
+   |          | 
+   +----------+ 
+      | |   |   
+  +---+ |   +--+
+  |     |      |
+  |   okay     |
+  |     |      |
+  v     v      |
+ +------+      |
+ |  y   |      |
+ |      |      |
+ +------+      |
+        |      |
+        |  +---+
+        |  |    
+        v  v    
+     +------+   
+     |  z   |   
+     |      |   
+     +------+   
diff --git a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
new file mode 100644
index 0000000000..2b53fd3f68
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
@@ -0,0 +1,8 @@
+ ┌────┐    ┌────────────────────▶                  
+ │    │    │                    ┌────┐             
+ │    │────┘                    │ y  │             
+ │ x  │──────────okay──────────▶│    │  ────▶┌────┐
+ │    │                         └────┘       │ z  │
+ │    │────┐                             ┌──▶│    │
+ │    │    │                             │   └────┘
+ └────┘    └─────────────────────────────┘         
diff --git a/e2etests/testdata/asciitxtar/three-right/sketch.exp.svg b/e2etests/testdata/asciitxtar/three-right/sketch.exp.svg
new file mode 100644
index 0000000000..e83fdca495
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/three-right/sketch.exp.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" data-d2-version="v0.7.0-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 484 135"><svg class="d2-48127974 d2-svg" width="484" height="135" viewBox="11 11 484 135"><rect x="11.000000" y="11.000000" width="484.000000" height="135.000000" rx="0.000000" fill="#FFFFFF" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+.d2-48127974 .text-bold {
+	font-family: "d2-48127974-font-bold";
+}
+@font-face {
+	font-family: d2-48127974-font-bold;
+	src: url("data:application/font-woff;base64,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");
+}
+.d2-48127974 .text-italic {
+	font-family: "d2-48127974-font-italic";
+}
+@font-face {
+	font-family: d2-48127974-font-italic;
+	src: url("data:application/font-woff;base64,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");
+}]]></style><style type="text/css"><![CDATA[.shape {
+  shape-rendering: geometricPrecision;
+  stroke-linejoin: round;
+}
+.connection {
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+.blend {
+  mix-blend-mode: multiply;
+  opacity: 0.5;
+}
+
+		.d2-48127974 .fill-N1{fill:#0A0F25;}
+		.d2-48127974 .fill-N2{fill:#676C7E;}
+		.d2-48127974 .fill-N3{fill:#9499AB;}
+		.d2-48127974 .fill-N4{fill:#CFD2DD;}
+		.d2-48127974 .fill-N5{fill:#DEE1EB;}
+		.d2-48127974 .fill-N6{fill:#EEF1F8;}
+		.d2-48127974 .fill-N7{fill:#FFFFFF;}
+		.d2-48127974 .fill-B1{fill:#0D32B2;}
+		.d2-48127974 .fill-B2{fill:#0D32B2;}
+		.d2-48127974 .fill-B3{fill:#E3E9FD;}
+		.d2-48127974 .fill-B4{fill:#E3E9FD;}
+		.d2-48127974 .fill-B5{fill:#EDF0FD;}
+		.d2-48127974 .fill-B6{fill:#F7F8FE;}
+		.d2-48127974 .fill-AA2{fill:#4A6FF3;}
+		.d2-48127974 .fill-AA4{fill:#EDF0FD;}
+		.d2-48127974 .fill-AA5{fill:#F7F8FE;}
+		.d2-48127974 .fill-AB4{fill:#EDF0FD;}
+		.d2-48127974 .fill-AB5{fill:#F7F8FE;}
+		.d2-48127974 .stroke-N1{stroke:#0A0F25;}
+		.d2-48127974 .stroke-N2{stroke:#676C7E;}
+		.d2-48127974 .stroke-N3{stroke:#9499AB;}
+		.d2-48127974 .stroke-N4{stroke:#CFD2DD;}
+		.d2-48127974 .stroke-N5{stroke:#DEE1EB;}
+		.d2-48127974 .stroke-N6{stroke:#EEF1F8;}
+		.d2-48127974 .stroke-N7{stroke:#FFFFFF;}
+		.d2-48127974 .stroke-B1{stroke:#0D32B2;}
+		.d2-48127974 .stroke-B2{stroke:#0D32B2;}
+		.d2-48127974 .stroke-B3{stroke:#E3E9FD;}
+		.d2-48127974 .stroke-B4{stroke:#E3E9FD;}
+		.d2-48127974 .stroke-B5{stroke:#EDF0FD;}
+		.d2-48127974 .stroke-B6{stroke:#F7F8FE;}
+		.d2-48127974 .stroke-AA2{stroke:#4A6FF3;}
+		.d2-48127974 .stroke-AA4{stroke:#EDF0FD;}
+		.d2-48127974 .stroke-AA5{stroke:#F7F8FE;}
+		.d2-48127974 .stroke-AB4{stroke:#EDF0FD;}
+		.d2-48127974 .stroke-AB5{stroke:#F7F8FE;}
+		.d2-48127974 .background-color-N1{background-color:#0A0F25;}
+		.d2-48127974 .background-color-N2{background-color:#676C7E;}
+		.d2-48127974 .background-color-N3{background-color:#9499AB;}
+		.d2-48127974 .background-color-N4{background-color:#CFD2DD;}
+		.d2-48127974 .background-color-N5{background-color:#DEE1EB;}
+		.d2-48127974 .background-color-N6{background-color:#EEF1F8;}
+		.d2-48127974 .background-color-N7{background-color:#FFFFFF;}
+		.d2-48127974 .background-color-B1{background-color:#0D32B2;}
+		.d2-48127974 .background-color-B2{background-color:#0D32B2;}
+		.d2-48127974 .background-color-B3{background-color:#E3E9FD;}
+		.d2-48127974 .background-color-B4{background-color:#E3E9FD;}
+		.d2-48127974 .background-color-B5{background-color:#EDF0FD;}
+		.d2-48127974 .background-color-B6{background-color:#F7F8FE;}
+		.d2-48127974 .background-color-AA2{background-color:#4A6FF3;}
+		.d2-48127974 .background-color-AA4{background-color:#EDF0FD;}
+		.d2-48127974 .background-color-AA5{background-color:#F7F8FE;}
+		.d2-48127974 .background-color-AB4{background-color:#EDF0FD;}
+		.d2-48127974 .background-color-AB5{background-color:#F7F8FE;}
+		.d2-48127974 .color-N1{color:#0A0F25;}
+		.d2-48127974 .color-N2{color:#676C7E;}
+		.d2-48127974 .color-N3{color:#9499AB;}
+		.d2-48127974 .color-N4{color:#CFD2DD;}
+		.d2-48127974 .color-N5{color:#DEE1EB;}
+		.d2-48127974 .color-N6{color:#EEF1F8;}
+		.d2-48127974 .color-N7{color:#FFFFFF;}
+		.d2-48127974 .color-B1{color:#0D32B2;}
+		.d2-48127974 .color-B2{color:#0D32B2;}
+		.d2-48127974 .color-B3{color:#E3E9FD;}
+		.d2-48127974 .color-B4{color:#E3E9FD;}
+		.d2-48127974 .color-B5{color:#EDF0FD;}
+		.d2-48127974 .color-B6{color:#F7F8FE;}
+		.d2-48127974 .color-AA2{color:#4A6FF3;}
+		.d2-48127974 .color-AA4{color:#EDF0FD;}
+		.d2-48127974 .color-AA5{color:#F7F8FE;}
+		.d2-48127974 .color-AB4{color:#EDF0FD;}
+		.d2-48127974 .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-d2-48127974);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-48127974);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-48127974);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-48127974);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-48127974);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-48127974);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-48127974);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-48127974);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g class="eA=="><g class="shape" ><rect x="12.000000" y="25.000000" width="53.000000" height="120.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="90.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">x</text></g><g class="eQ=="><g class="shape" ><rect x="308.000000" y="12.000000" width="54.000000" height="80.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="335.000000" y="57.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">y</text></g><g class="eg=="><g class="shape" ><rect x="442.000000" y="51.000000" width="52.000000" height="80.000000" stroke="#0D32B2" fill="#F7F8FE" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="468.000000" y="96.500000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">z</text></g><g class="KHggLSZndDsgeSlbMF0="><marker id="mk-d2-48127974-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#0D32B2" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 67.000000 55.333000 L 95.000000 55.333000 S 105.000000 55.333000 105.000000 45.333000 L 105.000000 36.000000 S 105.000000 26.000000 115.000000 26.000000 L 304.000000 26.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-48127974-3488378134)" mask="url(#d2-48127974)" /></g><g class="KHkgLSZndDsgeilbMF0="><path d="M 364.000000 78.666000 L 438.000000 78.666000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-48127974-3488378134)" mask="url(#d2-48127974)" /></g><g class="KHggLSZndDsgeilbMF0="><path d="M 67.000000 115.333000 L 95.000000 115.333000 S 105.000000 115.333000 105.000000 125.333000 L 105.000000 127.332993 S 105.000000 137.332993 115.000000 137.332993 L 392.000000 137.332993 S 402.000000 137.332993 402.000000 127.332993 L 402.000000 115.333000 S 402.000000 105.333000 412.000000 105.333000 L 438.000000 105.333000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-48127974-3488378134)" mask="url(#d2-48127974)" /></g><g class="KHggLSZndDsgeSlbMV0="><path d="M 67.000000 78.000000 L 304.000000 78.000000" stroke="#0D32B2" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-48127974-3488378134)" mask="url(#d2-48127974)" /><text x="186.500000" y="84.000000" fill="#676C7E" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px">okay</text></g><mask id="d2-48127974" maskUnits="userSpaceOnUse" x="11" y="11" width="484" height="135">
+<rect x="11" y="11" width="484" height="135" fill="white"></rect>
+<rect x="168.000000" y="68.000000" width="37" height="21" fill="black"></rect>
+</mask></svg></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
new file mode 100644
index 0000000000..fc5a164a40
--- /dev/null
+++ b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
@@ -0,0 +1,8 @@
+ +----+    +-------------------->                  
+ |    |    |                    +----+             
+ |    |----+                    | y  |             
+ | x  |----------okay---------->|    |  ---->+----+
+ |    |                         +----+       | z  |
+ |    |----+                             +-->|    |
+ |    |    |                             |   +----+
+ +----+    +-----------------------------+         

From aef38f79dfe7a7543bcdaf42172eaacfe023bd8c Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 17 Aug 2025 06:26:04 -0600
Subject: [PATCH 09/12] fix bad truncation

---
 d2renderers/d2ascii/d2ascii.go                            | 2 +-
 e2etests/testdata/asciitxtar/three-right/extended.exp.txt | 2 +-
 e2etests/testdata/asciitxtar/three-right/standard.exp.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index bbfe5b144f..862014e316 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -92,7 +92,7 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 		availableSpace := wC - len(s.Label)
 		if availableSpace >= asciishapes.MinLabelPadding && availableSpace%2 == 1 {
 			// Adjust the original width before recalibrating
-			width += a.FW / a.SCALE
+			width += float64(int(a.FW / a.SCALE))
 			x1, y1, wC, hC = ctx.Calibrate(posX, posY, width, height)
 			// Reapply height adjustments
 			if s.Label != "" && hC%2 == 0 {
diff --git a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
index 2b53fd3f68..2f236d6036 100644
--- a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
@@ -1,7 +1,7 @@
  ┌────┐    ┌────────────────────▶                  
  │    │    │                    ┌────┐             
  │    │────┘                    │ y  │             
- │ x  │──────────okay──────────▶│    │  ────▶┌────┐
+ │ x  │──────────okay──────────▶│    │──────▶┌────┐
  │    │                         └────┘       │ z  │
  │    │────┐                             ┌──▶│    │
  │    │    │                             │   └────┘
diff --git a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
index fc5a164a40..6a989ef3bd 100644
--- a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
@@ -1,7 +1,7 @@
  +----+    +-------------------->                  
  |    |    |                    +----+             
  |    |----+                    | y  |             
- | x  |----------okay---------->|    |  ---->+----+
+ | x  |----------okay---------->|    |------>+----+
  |    |                         +----+       | z  |
  |    |----+                             +-->|    |
  |    |    |                             |   +----+

From 98cecec66f667c0f31a821e0c7c0b12a2c76479a Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 17 Aug 2025 06:50:04 -0600
Subject: [PATCH 10/12] save

---
 d2renderers/d2ascii/asciiroute/routing.go      | 16 +++++++++++-----
 d2renderers/d2ascii/d2ascii.go                 | 18 ------------------
 .../asciitxtar/three-right/extended.exp.txt    |  8 ++++----
 .../asciitxtar/three-right/standard.exp.txt    |  8 ++++----
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/d2renderers/d2ascii/asciiroute/routing.go b/d2renderers/d2ascii/asciiroute/routing.go
index af531ec139..d853ca7a8c 100644
--- a/d2renderers/d2ascii/asciiroute/routing.go
+++ b/d2renderers/d2ascii/asciiroute/routing.go
@@ -49,7 +49,7 @@ func processRoute(rd RouteDrawer, routes []*geo.Point, fromBoundary, toBoundary
 		fmt.Printf("[D2ASCII] Step 5: Adjusting end point to avoid overlaps\n")
 		endIdx := len(routesCopy) - 1
 		endBefore := fmt.Sprintf("(%.2f, %.2f)", routesCopy[endIdx].X, routesCopy[endIdx].Y)
-		adjustRouteEndPoint(rd, routesCopy, toBoundary)
+		routesCopy = adjustRouteEndPoint(rd, routesCopy, toBoundary)
 		fmt.Printf("[D2ASCII]   End point: %s -> (%.2f, %.2f)\n", endBefore, routesCopy[endIdx].X, routesCopy[endIdx].Y)
 	}
 
@@ -252,9 +252,9 @@ func adjustRouteStartPoint(rd RouteDrawer, routes []*geo.Point, fromBoundary Bou
 	}
 }
 
-func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundary) {
+func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundary) []*geo.Point {
 	if len(routes) < 2 {
-		return
+		return routes
 	}
 
 	lastIdx := len(routes) - 1
@@ -268,9 +268,12 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 	fmt.Printf("[D2ASCII]   Adjusting end point: (%.2f, %.2f) <- (%.2f, %.2f)\n", 
 		lastX, lastY, secondLastX, secondLastY)
 
+	lastXInt := int(math.Round(lastX))
+	lastYInt := int(math.Round(lastY))
+
 	// Check if end point is inside the to boundary
 	// Move along the vector of the last segment until outside the boundary if so
-	if toBoundary.Contains(int(math.Round(lastX)), int(math.Round(lastY))) {
+	if toBoundary.Contains(lastXInt, lastYInt) {
 		fmt.Printf("[D2ASCII]   End point inside dest boundary, moving along vector\n")
 		vectorX := lastX - secondLastX
 		vectorY := lastY - secondLastY
@@ -290,9 +293,10 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n", 
 				steps, routes[lastIdx].X, routes[lastIdx].Y)
 		}
-		return
+		return routes
 	}
 
+
 	// Determine line direction and keep shifting until empty space
 	if math.Abs(lastY-secondLastY) < 0.1 { // Horizontal line
 		fmt.Printf("[D2ASCII]   Horizontal line detected\n")
@@ -323,6 +327,8 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 			shiftPointUntilEmpty(rd, &routes[lastIdx].X, &routes[lastIdx].Y, 0, deltaY)
 		}
 	}
+	
+	return routes
 }
 
 func shiftPointUntilEmpty(rd RouteDrawer, x, y *float64, deltaX, deltaY float64) {
diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index 862014e316..38b75eccdc 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -76,15 +76,6 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 	}
 	x1, y1, wC, hC := ctx.Calibrate(posX, posY, width, height)
 	
-	// Apply the same height adjustments as DrawRect for labels
-	if s.Label != "" && hC%2 == 0 {
-		if hC > 2 {
-			hC--
-			y1++
-		} else {
-			hC++
-		}
-	}
 	
 	// Apply the same width adjustments as the drawing code
 	preserveWidth := hasConnectionsAtRightEdge(s, a.diagram.Connections, a.FW)
@@ -94,15 +85,6 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 			// Adjust the original width before recalibrating
 			width += float64(int(a.FW / a.SCALE))
 			x1, y1, wC, hC = ctx.Calibrate(posX, posY, width, height)
-			// Reapply height adjustments
-			if s.Label != "" && hC%2 == 0 {
-				if hC > 2 {
-					hC--
-					y1++
-				} else {
-					hC++
-				}
-			}
 		}
 	}
 	
diff --git a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
index 2f236d6036..4e3bae4ce6 100644
--- a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
@@ -1,7 +1,7 @@
- ┌────┐    ┌────────────────────▶                  
- │    │    │                    ┌────┐             
- │    │────┘                    │ y  │             
- │ x  │──────────okay──────────▶│    │──────▶┌────┐
+ ┌────┐    ┌───────────────────▶┌────┐             
+ │    │    │                    │    │             
+ │    │────┘                    │ y  │       ┌────┐
+ │ x  │──────────okay──────────▶│    │──────▶│    │
  │    │                         └────┘       │ z  │
  │    │────┐                             ┌──▶│    │
  │    │    │                             │   └────┘
diff --git a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
index 6a989ef3bd..f50ef3993f 100644
--- a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
@@ -1,7 +1,7 @@
- +----+    +-------------------->                  
- |    |    |                    +----+             
- |    |----+                    | y  |             
- | x  |----------okay---------->|    |------>+----+
+ +----+    +------------------->+----+             
+ |    |    |                    |    |             
+ |    |----+                    | y  |       +----+
+ | x  |----------okay---------->|    |------>|    |
  |    |                         +----+       | z  |
  |    |----+                             +-->|    |
  |    |    |                             |   +----+

From 0d9c62f357d24ae3ac4482c8a8f7749746a0ef10 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 17 Aug 2025 06:58:19 -0600
Subject: [PATCH 11/12] Save

---
 d2renderers/d2ascii/asciishapes/rectangle.go  |  5 +-
 d2renderers/d2ascii/d2ascii.go                | 55 ++++++++++++++++++-
 .../asciitxtar/three-right/extended.exp.txt   |  4 +-
 .../asciitxtar/three-right/standard.exp.txt   |  4 +-
 4 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/d2renderers/d2ascii/asciishapes/rectangle.go b/d2renderers/d2ascii/asciishapes/rectangle.go
index 6e9564903c..552466b86a 100644
--- a/d2renderers/d2ascii/asciishapes/rectangle.go
+++ b/d2renderers/d2ascii/asciishapes/rectangle.go
@@ -5,13 +5,14 @@ import (
 	"strings"
 )
 
-func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol string) {
+func DrawRect(ctx *Context, x, y, w, h float64, label, labelPosition, symbol string, preserveHeight ...bool) {
 	fmt.Printf("\033[36m[D2ASCII-SHAPE]   DrawRect: (%.0f,%.0f) %.0fx%.0f, label='%s', symbol='%s'\033[0m\n",
 		x, y, w, h, label, symbol)
 
 	x1, y1, wC, hC := ctx.Calibrate(x, y, w, h)
 	originalHC := hC
-	if label != "" && hC%2 == 0 {
+	shouldPreserveHeight := len(preserveHeight) > 0 && preserveHeight[0]
+	if label != "" && hC%2 == 0 && !shouldPreserveHeight {
 		if hC > 2 {
 			hC--
 			y1++
diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index 38b75eccdc..fb73592160 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -79,6 +79,7 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 	
 	// Apply the same width adjustments as the drawing code
 	preserveWidth := hasConnectionsAtRightEdge(s, a.diagram.Connections, a.FW)
+	preserveHeight := hasConnectionsAtTopEdge(s, a.diagram.Connections, a.FH)
 	if preserveWidth && s.Label != "" {
 		availableSpace := wC - len(s.Label)
 		if availableSpace >= asciishapes.MinLabelPadding && availableSpace%2 == 1 {
@@ -88,6 +89,16 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 		}
 	}
 	
+	// Apply the same height adjustments as DrawRect for labels
+	if s.Label != "" && hC%2 == 0 && !preserveHeight {
+		if hC > 2 {
+			hC--
+			y1++
+		} else {
+			hC++
+		}
+	}
+	
 	// Apply the same width adjustments as DrawRect for labels
 	wC = asciishapes.AdjustWidthForLabel(ctx, posX, posY, width, height, wC, s.Label)
 	
@@ -269,6 +280,7 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 			float64(originalX), float64(originalY), shape.Pos.X, shape.Pos.Y)
 
 		preserveWidth := hasConnectionsAtRightEdge(shape, diagram.Connections, a.FW)
+		preserveHeight := hasConnectionsAtTopEdge(shape, diagram.Connections, a.FH)
 		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Right edge connections detected: %t\033[0m\n", preserveWidth)
 
 		ctx := &asciishapes.Context{
@@ -319,10 +331,10 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 		switch shape.Type {
 		case d2target.ShapeRectangle:
 			fmt.Printf("\033[36m[D2ASCII-SHAPE]   -> DrawRect\033[0m\n")
-			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, "")
+			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, "", preserveHeight)
 		case d2target.ShapeSquare:
 			fmt.Printf("\033[36m[D2ASCII-SHAPE]   -> DrawRect (square)\033[0m\n")
-			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, "")
+			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, "", preserveHeight)
 		case d2target.ShapePage:
 			asciishapes.DrawPage(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition)
 		case d2target.ShapeHexagon:
@@ -359,7 +371,7 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 			default:
 				symbol = ""
 			}
-			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, symbol)
+			asciishapes.DrawRect(ctx, drawX, drawY, drawWidth, drawHeight, shape.Label, shape.LabelPosition, symbol, preserveHeight)
 		}
 	}
 	for _, conn := range diagram.Connections {
@@ -419,3 +431,40 @@ func hasConnectionsAtRightEdge(shape d2target.Shape, connections []d2target.Conn
 
 	return false
 }
+
+func hasConnectionsAtTopEdge(shape d2target.Shape, connections []d2target.Connection, fontHeight float64) bool {
+	shapeTop := float64(shape.Pos.Y)
+	shapeLeft := float64(shape.Pos.X)
+	shapeRight := float64(shape.Pos.X + shape.Width)
+
+	for _, conn := range connections {
+		if len(conn.Route) < 2 {
+			continue
+		}
+
+		// Check if route has horizontal segments connecting to top edge
+		for i := 0; i < len(conn.Route)-1; i++ {
+			p1 := conn.Route[i]
+			p2 := conn.Route[i+1]
+			
+			// Check if this is a horizontal segment
+			if math.Abs(p1.Y-p2.Y) < 0.1 {
+				segmentY := p1.Y
+				segmentLeft := math.Min(p1.X, p2.X)
+				segmentRight := math.Max(p1.X, p2.X)
+				
+				tolerance := fontHeight
+				
+				// Check if horizontal segment connects to shape's top edge
+				if math.Abs(segmentY-shapeTop) < tolerance &&
+					segmentRight >= shapeLeft && segmentLeft <= shapeRight {
+					fmt.Printf("\033[36m[D2ASCII-SHAPE]     Found horizontal top connection: segment Y=%.2f vs shape Y=%.2f\033[0m\n", 
+						segmentY, shapeTop)
+					return true
+				}
+			}
+		}
+	}
+
+	return false
+}
diff --git a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
index 4e3bae4ce6..969cde87d3 100644
--- a/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
+++ b/e2etests/testdata/asciitxtar/three-right/extended.exp.txt
@@ -1,7 +1,7 @@
  ┌────┐    ┌───────────────────▶┌────┐             
  │    │    │                    │    │             
- │    │────┘                    │ y  │       ┌────┐
- │ x  │──────────okay──────────▶│    │──────▶│    │
+ │    │────┘                    │ y  │             
+ │ x  │──────────okay──────────▶│    │──────▶┌────┐
  │    │                         └────┘       │ z  │
  │    │────┐                             ┌──▶│    │
  │    │    │                             │   └────┘
diff --git a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
index f50ef3993f..40108d5704 100644
--- a/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
+++ b/e2etests/testdata/asciitxtar/three-right/standard.exp.txt
@@ -1,7 +1,7 @@
  +----+    +------------------->+----+             
  |    |    |                    |    |             
- |    |----+                    | y  |       +----+
- | x  |----------okay---------->|    |------>|    |
+ |    |----+                    | y  |             
+ | x  |----------okay---------->|    |------>+----+
  |    |                         +----+       | z  |
  |    |----+                             +-->|    |
  |    |    |                             |   +----+

From d0ea5219f7237a4f9f40f763a14519ea482df1b5 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 17 Aug 2025 10:29:48 -0600
Subject: [PATCH 12/12] fmt

---
 d2renderers/d2ascii/asciiroute/asciiroute.go | 12 +++---
 d2renderers/d2ascii/asciiroute/drawing.go    | 10 ++---
 d2renderers/d2ascii/asciiroute/routing.go    | 21 +++++-----
 d2renderers/d2ascii/asciishapes/page.go      |  2 +-
 d2renderers/d2ascii/d2ascii.go               | 43 ++++++++++----------
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/d2renderers/d2ascii/asciiroute/asciiroute.go b/d2renderers/d2ascii/asciiroute/asciiroute.go
index ab100310c2..493951a4b4 100644
--- a/d2renderers/d2ascii/asciiroute/asciiroute.go
+++ b/d2renderers/d2ascii/asciiroute/asciiroute.go
@@ -58,11 +58,11 @@ func DrawRoute(rd RouteDrawer, conn d2target.Connection) {
 	}
 
 	frmShapeBoundary, toShapeBoundary := getConnectionBoundaries(rd, conn.Src, conn.Dst)
-	fmt.Printf("[D2ASCII] Source boundary: TL(%d,%d) BR(%d,%d)\n", 
-		frmShapeBoundary.TL.X, frmShapeBoundary.TL.Y, 
+	fmt.Printf("[D2ASCII] Source boundary: TL(%d,%d) BR(%d,%d)\n",
+		frmShapeBoundary.TL.X, frmShapeBoundary.TL.Y,
 		frmShapeBoundary.BR.X, frmShapeBoundary.BR.Y)
-	fmt.Printf("[D2ASCII] Dest boundary: TL(%d,%d) BR(%d,%d)\n", 
-		toShapeBoundary.TL.X, toShapeBoundary.TL.Y, 
+	fmt.Printf("[D2ASCII] Dest boundary: TL(%d,%d) BR(%d,%d)\n",
+		toShapeBoundary.TL.X, toShapeBoundary.TL.Y,
 		toShapeBoundary.BR.X, toShapeBoundary.BR.Y)
 
 	routes = processRoute(rd, routes, frmShapeBoundary, toShapeBoundary)
@@ -77,7 +77,7 @@ func DrawRoute(rd RouteDrawer, conn d2target.Connection) {
 	if strings.TrimSpace(label) != "" {
 		labelPos = calculateBestLabelPosition(rd, routes, label)
 		if labelPos != nil {
-			fmt.Printf("[D2ASCII] Label position calculated: segment %d, pos (%d, %d), maxDiff %.2f\n", 
+			fmt.Printf("[D2ASCII] Label position calculated: segment %d, pos (%d, %d), maxDiff %.2f\n",
 				labelPos.I, labelPos.X, labelPos.Y, labelPos.MaxDiff)
 		}
 	}
@@ -86,7 +86,7 @@ func DrawRoute(rd RouteDrawer, conn d2target.Connection) {
 
 	fmt.Printf("[D2ASCII] Drawing %d segments\n", len(routes)-1)
 	for i := 1; i < len(routes); i++ {
-		fmt.Printf("[D2ASCII] Drawing segment %d: (%.2f,%.2f) -> (%.2f,%.2f)\n", 
+		fmt.Printf("[D2ASCII] Drawing segment %d: (%.2f,%.2f) -> (%.2f,%.2f)\n",
 			i-1, routes[i-1].X, routes[i-1].Y, routes[i].X, routes[i].Y)
 		drawSegmentBetweenPoints(rd, routes[i-1], routes[i], i, conn, corners, arrows, turnDir, frmShapeBoundary, toShapeBoundary, labelPos, label)
 	}
diff --git a/d2renderers/d2ascii/asciiroute/drawing.go b/d2renderers/d2ascii/asciiroute/drawing.go
index fae925603d..2c5ce8c1cf 100644
--- a/d2renderers/d2ascii/asciiroute/drawing.go
+++ b/d2renderers/d2ascii/asciiroute/drawing.go
@@ -14,7 +14,7 @@ func drawSegmentBetweenPoints(rd RouteDrawer, start, end *geo.Point, segmentInde
 	ax, ay := start.X, start.Y
 	cx, cy := end.X, end.Y
 
-	fmt.Printf("[D2ASCII]   Drawing segment %d: (%.2f,%.2f) -> (%.2f,%.2f)\n", 
+	fmt.Printf("[D2ASCII]   Drawing segment %d: (%.2f,%.2f) -> (%.2f,%.2f)\n",
 		segmentIndex-1, ax, ay, cx, cy)
 
 	sx := cx - ax
@@ -114,7 +114,7 @@ func drawRoutePoint(rd RouteDrawer, x, y int, sx, sy float64, segmentIndex, rout
 	}
 
 	// Default: draw route segment
-	fmt.Printf("[D2ASCII]     Drawing route segment at (%d, %d), existing: '%s'\n", 
+	fmt.Printf("[D2ASCII]     Drawing route segment at (%d, %d), existing: '%s'\n",
 		x, y, existingChar)
 	drawRouteSegment(rd, x, y, sx, sy, frmBoundary, toBoundary)
 }
@@ -129,18 +129,18 @@ func drawRouteSegment(rd RouteDrawer, x, y int, sx, sy float64, frmBoundary, toB
 	overWrite := existingChar != " "
 
 	if sx == 0 { // Vertical line
-		fmt.Printf("[D2ASCII]       Drawing vertical segment at (%d, %d), overwrite=%t, existing='%s'\n", 
+		fmt.Printf("[D2ASCII]       Drawing vertical segment at (%d, %d), overwrite=%t, existing='%s'\n",
 			x, y, overWrite, existingChar)
 		drawVerticalSegment(rd, x, y, sy, overWrite, frmBoundary, toBoundary)
 	} else { // Horizontal line
-		fmt.Printf("[D2ASCII]       Drawing horizontal segment at (%d, %d), overwrite=%t, existing='%s'\n", 
+		fmt.Printf("[D2ASCII]       Drawing horizontal segment at (%d, %d), overwrite=%t, existing='%s'\n",
 			x, y, overWrite, existingChar)
 		drawHorizontalSegment(rd, x, y, sx, overWrite, frmBoundary, toBoundary)
 	}
 
 	newChar := canvas.Get(x, y)
 	if newChar != existingChar {
-		fmt.Printf("[D2ASCII]       Character placed: '%s' -> '%s' at (%d, %d)\n", 
+		fmt.Printf("[D2ASCII]       Character placed: '%s' -> '%s' at (%d, %d)\n",
 			existingChar, newChar, x, y)
 	}
 }
diff --git a/d2renderers/d2ascii/asciiroute/routing.go b/d2renderers/d2ascii/asciiroute/routing.go
index d853ca7a8c..a14c05dc62 100644
--- a/d2renderers/d2ascii/asciiroute/routing.go
+++ b/d2renderers/d2ascii/asciiroute/routing.go
@@ -9,7 +9,7 @@ import (
 
 func processRoute(rd RouteDrawer, routes []*geo.Point, fromBoundary, toBoundary Boundary) []*geo.Point {
 	fmt.Printf("[D2ASCII] Processing route with %d points\n", len(routes))
-	
+
 	// Create a deep copy of routes to avoid modifying the original
 	routesCopy := make([]*geo.Point, len(routes))
 	for i, pt := range routes {
@@ -45,7 +45,7 @@ func processRoute(rd RouteDrawer, routes []*geo.Point, fromBoundary, toBoundary
 		startBefore := fmt.Sprintf("(%.2f, %.2f)", routesCopy[0].X, routesCopy[0].Y)
 		adjustRouteStartPoint(rd, routesCopy, fromBoundary)
 		fmt.Printf("[D2ASCII]   Start point: %s -> (%.2f, %.2f)\n", startBefore, routesCopy[0].X, routesCopy[0].Y)
-		
+
 		fmt.Printf("[D2ASCII] Step 5: Adjusting end point to avoid overlaps\n")
 		endIdx := len(routesCopy) - 1
 		endBefore := fmt.Sprintf("(%.2f, %.2f)", routesCopy[endIdx].X, routesCopy[endIdx].Y)
@@ -134,7 +134,7 @@ func calibrateRoutes(rd RouteDrawer, routes []*geo.Point) {
 	for i := range routes {
 		origX, origY := routes[i].X, routes[i].Y
 		routes[i].X, routes[i].Y = rd.CalibrateXY(routes[i].X, routes[i].Y)
-		fmt.Printf("[D2ASCII]   Calibrate point %d: (%.2f, %.2f) -> (%.2f, %.2f)\n", 
+		fmt.Printf("[D2ASCII]   Calibrate point %d: (%.2f, %.2f) -> (%.2f, %.2f)\n",
 			i, origX, origY, routes[i].X, routes[i].Y)
 	}
 }
@@ -192,7 +192,7 @@ func adjustRouteStartPoint(rd RouteDrawer, routes []*geo.Point, fromBoundary Bou
 	secondX := routes[1].X
 	secondY := routes[1].Y
 
-	fmt.Printf("[D2ASCII]   Adjusting start point: (%.2f, %.2f) -> (%.2f, %.2f)\n", 
+	fmt.Printf("[D2ASCII]   Adjusting start point: (%.2f, %.2f) -> (%.2f, %.2f)\n",
 		firstX, firstY, secondX, secondY)
 
 	// Check if end point is inside the to boundary
@@ -214,7 +214,7 @@ func adjustRouteStartPoint(rd RouteDrawer, routes []*geo.Point, fromBoundary Bou
 				routes[0].Y += vectorY
 				steps++
 			}
-			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n", 
+			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n",
 				steps, routes[0].X, routes[0].Y)
 		}
 		return
@@ -265,7 +265,7 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 	secondLastX := routes[secondLastIdx].X
 	secondLastY := routes[secondLastIdx].Y
 
-	fmt.Printf("[D2ASCII]   Adjusting end point: (%.2f, %.2f) <- (%.2f, %.2f)\n", 
+	fmt.Printf("[D2ASCII]   Adjusting end point: (%.2f, %.2f) <- (%.2f, %.2f)\n",
 		lastX, lastY, secondLastX, secondLastY)
 
 	lastXInt := int(math.Round(lastX))
@@ -290,13 +290,12 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 				routes[lastIdx].Y -= vectorY
 				steps++
 			}
-			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n", 
+			fmt.Printf("[D2ASCII]   Moved %d steps to exit boundary: (%.2f, %.2f)\n",
 				steps, routes[lastIdx].X, routes[lastIdx].Y)
 		}
 		return routes
 	}
 
-
 	// Determine line direction and keep shifting until empty space
 	if math.Abs(lastY-secondLastY) < 0.1 { // Horizontal line
 		fmt.Printf("[D2ASCII]   Horizontal line detected\n")
@@ -327,7 +326,7 @@ func adjustRouteEndPoint(rd RouteDrawer, routes []*geo.Point, toBoundary Boundar
 			shiftPointUntilEmpty(rd, &routes[lastIdx].X, &routes[lastIdx].Y, 0, deltaY)
 		}
 	}
-	
+
 	return routes
 }
 
@@ -341,11 +340,11 @@ func shiftPointUntilEmpty(rd RouteDrawer, x, y *float64, deltaX, deltaY float64)
 		if canvas.IsInBounds(xi, yi) {
 			char := canvas.Get(xi, yi)
 			if char == " " {
-				fmt.Printf("[D2ASCII]     Found empty space after %d steps: (%.2f, %.2f) -> (%.2f, %.2f)\n", 
+				fmt.Printf("[D2ASCII]     Found empty space after %d steps: (%.2f, %.2f) -> (%.2f, %.2f)\n",
 					steps, startX, startY, *x, *y)
 				break // Found empty space
 			}
-			fmt.Printf("[D2ASCII]     Position (%d, %d) occupied by '%s', shifting by (%.2f, %.2f)\n", 
+			fmt.Printf("[D2ASCII]     Position (%d, %d) occupied by '%s', shifting by (%.2f, %.2f)\n",
 				xi, yi, string(char), deltaX, deltaY)
 			*x += deltaX
 			*y += deltaY
diff --git a/d2renderers/d2ascii/asciishapes/page.go b/d2renderers/d2ascii/asciishapes/page.go
index 667ab076e6..51f7ddf85a 100644
--- a/d2renderers/d2ascii/asciishapes/page.go
+++ b/d2renderers/d2ascii/asciishapes/page.go
@@ -36,7 +36,7 @@ func DrawPage(ctx *Context, x, y, w, h float64, label, labelPosition string) {
 			}
 		}
 	}
-	// The fold  
+	// The fold
 	ctx.Canvas.Set(x2, y1, " ")
 	ctx.Canvas.Set(x2-1, y1, ctx.Chars.TopRightCorner())
 	ctx.Canvas.Set(x2-1, y1+1, ctx.Chars.Backslash())
diff --git a/d2renderers/d2ascii/d2ascii.go b/d2renderers/d2ascii/d2ascii.go
index fb73592160..e1a6d575c7 100644
--- a/d2renderers/d2ascii/d2ascii.go
+++ b/d2renderers/d2ascii/d2ascii.go
@@ -48,13 +48,13 @@ func NewBoundary(tl, br Point) *Boundary {
 
 func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 	fmt.Printf("\033[36m[D2ASCII-SHAPE] GetBoundary for shape %s (%s)\033[0m\n", s.ID, s.Type)
-	
+
 	// For multiple shapes, expand boundary to match the expanded rendering
 	posX := float64(s.Pos.X)
 	posY := float64(s.Pos.Y)
 	width := float64(s.Width)
 	height := float64(s.Height)
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Original dimensions: (%.0f,%.0f) %.0fx%.0f\033[0m\n", 
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Original dimensions: (%.0f,%.0f) %.0fx%.0f\033[0m\n",
 		posX, posY, width, height)
 
 	if s.Multiple {
@@ -62,7 +62,7 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 		posX -= d2target.MULTIPLE_OFFSET   // Move left to include shadow area
 		width += d2target.MULTIPLE_OFFSET  // Include shadow width
 		height += d2target.MULTIPLE_OFFSET // Include shadow height
-		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Expanded dimensions: (%.0f,%.0f) %.0fx%.0f\033[0m\n", 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Expanded dimensions: (%.0f,%.0f) %.0fx%.0f\033[0m\n",
 			posX, posY, width, height)
 	}
 
@@ -75,8 +75,7 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 		Scale:  a.SCALE,
 	}
 	x1, y1, wC, hC := ctx.Calibrate(posX, posY, width, height)
-	
-	
+
 	// Apply the same width adjustments as the drawing code
 	preserveWidth := hasConnectionsAtRightEdge(s, a.diagram.Connections, a.FW)
 	preserveHeight := hasConnectionsAtTopEdge(s, a.diagram.Connections, a.FH)
@@ -88,7 +87,7 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 			x1, y1, wC, hC = ctx.Calibrate(posX, posY, width, height)
 		}
 	}
-	
+
 	// Apply the same height adjustments as DrawRect for labels
 	if s.Label != "" && hC%2 == 0 && !preserveHeight {
 		if hC > 2 {
@@ -98,13 +97,13 @@ func (a *ASCIIartist) GetBoundary(s d2target.Shape) (Point, Point) {
 			hC++
 		}
 	}
-	
+
 	// Apply the same width adjustments as DrawRect for labels
 	wC = asciishapes.AdjustWidthForLabel(ctx, posX, posY, width, height, wC, s.Label)
-	
+
 	x2, y2 := x1+wC, y1+hC
-	
-	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Boundary matches actual draw bounds: (%d,%d)-(%d,%d) [%dx%d]\033[0m\n", 
+
+	fmt.Printf("\033[36m[D2ASCII-SHAPE]   Boundary matches actual draw bounds: (%d,%d)-(%d,%d) [%dx%d]\033[0m\n",
 		x1, y1, x2, y2, wC, hC)
 
 	return Point{X: x1, Y: y1}, Point{X: x2, Y: y2}
@@ -270,13 +269,13 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 
 	fmt.Printf("\033[36m[D2ASCII-SHAPE] Processing %d shapes with offset (%d, %d)\033[0m\n", len(diagram.Shapes), xOffset, yOffset)
 	for i, shape := range diagram.Shapes {
-		fmt.Printf("\033[36m[D2ASCII-SHAPE] Shape %d (%s): %s at (%.0f,%.0f) size %.0fx%.0f\033[0m\n", 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE] Shape %d (%s): %s at (%.0f,%.0f) size %.0fx%.0f\033[0m\n",
 			i, shape.ID, shape.Type, float64(shape.Pos.X), float64(shape.Pos.Y), float64(shape.Width), float64(shape.Height))
-		
+
 		originalX, originalY := shape.Pos.X, shape.Pos.Y
 		shape.Pos.X += xOffset
 		shape.Pos.Y += yOffset
-		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Position adjusted: (%.0f,%.0f) -> (%d,%d)\033[0m\n", 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Position adjusted: (%.0f,%.0f) -> (%d,%d)\033[0m\n",
 			float64(originalX), float64(originalY), shape.Pos.X, shape.Pos.Y)
 
 		preserveWidth := hasConnectionsAtRightEdge(shape, diagram.Connections, a.FW)
@@ -295,11 +294,11 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 		if preserveWidth && shape.Label != "" {
 			wC := int(math.Round((float64(shape.Width) / a.FW) * a.SCALE))
 			availableSpace := wC - len(shape.Label)
-			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Width preservation check: calibrated=%d, label=%d chars, available=%d\033[0m\n", 
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Width preservation check: calibrated=%d, label=%d chars, available=%d\033[0m\n",
 				wC, len(shape.Label), availableSpace)
 			if availableSpace >= asciishapes.MinLabelPadding && availableSpace%2 == 1 {
 				shape.Width += int(a.FW / a.SCALE)
-				fmt.Printf("\033[36m[D2ASCII-SHAPE]   Width adjusted for even spacing: %d -> %d\033[0m\n", 
+				fmt.Printf("\033[36m[D2ASCII-SHAPE]   Width adjusted for even spacing: %d -> %d\033[0m\n",
 					originalWidth, shape.Width)
 			}
 		}
@@ -319,12 +318,12 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 			// Expand size to fill entire multiple effect area
 			drawWidth += d2target.MULTIPLE_OFFSET  // Include shadow width
 			drawHeight += d2target.MULTIPLE_OFFSET // Include shadow height
-			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple dimensions: (%.0f,%.0f) %.0fx%.0f -> (%.0f,%.0f) %.0fx%.0f\033[0m\n", 
+			fmt.Printf("\033[36m[D2ASCII-SHAPE]   Multiple dimensions: (%.0f,%.0f) %.0fx%.0f -> (%.0f,%.0f) %.0fx%.0f\033[0m\n",
 				float64(shape.Pos.X), float64(shape.Pos.Y), float64(shape.Width), float64(shape.Height),
 				drawX, drawY, drawWidth, drawHeight)
 		}
 
-		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Final draw parameters: (%.0f,%.0f) %.0fx%.0f, label='%s'\033[0m\n", 
+		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Final draw parameters: (%.0f,%.0f) %.0fx%.0f, label='%s'\033[0m\n",
 			drawX, drawY, drawWidth, drawHeight, shape.Label)
 
 		fmt.Printf("\033[36m[D2ASCII-SHAPE]   Drawing shape type: %s\033[0m\n", shape.Type)
@@ -394,7 +393,7 @@ func (a *ASCIIartist) Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byt
 func (a *ASCIIartist) calibrateXY(x, y float64) (float64, float64) {
 	xC := float64(math.Round((x / a.FW) * a.SCALE))
 	yC := float64(math.Round((y / a.FH) * a.SCALE))
-	fmt.Printf("[D2ASCII]     CalibrateXY: (%.2f, %.2f) -> (%.2f, %.2f) [FW=%.2f, FH=%.2f, SCALE=%.2f]\n", 
+	fmt.Printf("[D2ASCII]     CalibrateXY: (%.2f, %.2f) -> (%.2f, %.2f) [FW=%.2f, FH=%.2f, SCALE=%.2f]\n",
 		x, y, xC, yC, a.FW, a.FH, a.SCALE)
 	return xC, yC
 }
@@ -446,19 +445,19 @@ func hasConnectionsAtTopEdge(shape d2target.Shape, connections []d2target.Connec
 		for i := 0; i < len(conn.Route)-1; i++ {
 			p1 := conn.Route[i]
 			p2 := conn.Route[i+1]
-			
+
 			// Check if this is a horizontal segment
 			if math.Abs(p1.Y-p2.Y) < 0.1 {
 				segmentY := p1.Y
 				segmentLeft := math.Min(p1.X, p2.X)
 				segmentRight := math.Max(p1.X, p2.X)
-				
+
 				tolerance := fontHeight
-				
+
 				// Check if horizontal segment connects to shape's top edge
 				if math.Abs(segmentY-shapeTop) < tolerance &&
 					segmentRight >= shapeLeft && segmentLeft <= shapeRight {
-					fmt.Printf("\033[36m[D2ASCII-SHAPE]     Found horizontal top connection: segment Y=%.2f vs shape Y=%.2f\033[0m\n", 
+					fmt.Printf("\033[36m[D2ASCII-SHAPE]     Found horizontal top connection: segment Y=%.2f vs shape Y=%.2f\033[0m\n",
 						segmentY, shapeTop)
 					return true
 				}