From a38b1ec19b12b167c5002680490ba42e45b2abaf Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Tue, 16 Dec 2025 23:22:59 +0000
Subject: [PATCH] ptx: fix incorrect column width calculation and padding logic

---
 src/uu/ptx/src/ptx.rs     | 10 ++++++++--
 tests/by-util/test_ptx.rs | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs
index d3b9d103ce1..28d19cdbdfd 100644
--- a/src/uu/ptx/src/ptx.rs
+++ b/src/uu/ptx/src/ptx.rs
@@ -614,11 +614,17 @@ fn format_dumb_line(
     };
 
     // Calculate the width for the left half (before the keyword)
-    let half_width = config.line_width / 2;
+    let half_width = cmp::max(config.line_width / 2, config.gap_size);
+
+    let left_part_len = if left_part.contains(&config.trunc_str) {
+        left_part.len() - config.trunc_str.len()
+    } else {
+        left_part.len()
+    };
 
     // Right-justify the left part within the left half
     let padding = if left_part.len() < half_width {
-        half_width - left_part.len()
+        half_width - left_part_len
     } else {
         0
     };
diff --git a/tests/by-util/test_ptx.rs b/tests/by-util/test_ptx.rs
index 464dcf6aead..c9ecb5c22e2 100644
--- a/tests/by-util/test_ptx.rs
+++ b/tests/by-util/test_ptx.rs
@@ -264,3 +264,40 @@ fn test_gnu_mode_dumb_format() {
         "                                       a b\n                                   a   b\n",
     );
 }
+
+#[test]
+fn test_gnu_compatibility_narrow_width() {
+    new_ucmd!()
+        .args(&["-w", "2"])
+        .pipe_in("qux")
+        .succeeds()
+        .stdout_only("      qux\n");
+}
+
+#[test]
+fn test_gnu_compatibility_truncation_width() {
+    new_ucmd!()
+        .args(&["-w", "10"])
+        .pipe_in("foo bar")
+        .succeeds()
+        .stdout_only("     /   bar\n        foo/\n");
+}
+
+#[test]
+fn test_unicode_padding_alignment() {
+    let input = "a\né";
+    new_ucmd!()
+        .args(&["-w", "10"])
+        .pipe_in(input)
+        .succeeds()
+        .stdout_only("        a\n        é\n");
+}
+
+#[test]
+fn test_unicode_truncation_alignment() {
+    new_ucmd!()
+        .args(&["-w", "10"])
+        .pipe_in("föö bar")
+        .succeeds()
+        .stdout_only("     /   bar\n        föö/\n");
+}