reserve minimal length for -H formatting

Without a more expensive calculation, assume regular results of 3 digits and
a unit, without sign and exponent for which the reserved amount would still
be insufficient.

diff --git a/barcat b/barcat
index fb5c1ab42dbf4172ac734d6719142518a9b82de4..426053ecce2f864fe5bc8144e538761677657431 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -116,7 +116,7 @@ $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
 $opt{units}   = [split //, ' kMGTPEZYyzafpn'.($opt{ascii} ? 'u' : 'μ').'m']
        if $opt{'human-readable'};
 $opt{anchor} //= qr/\A/;
-$opt{'value-length'} = 6 if $opt{units};
+$opt{'value-length'} = 4 if $opt{units};
 $opt{'value-length'} = 1 if $opt{unmodified};
 $opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT';
 $opt{markers} //= '=avg >31.73v <68.27v +50v |0';

diff --git a/t/t1401-magnitude_-H.out b/t/t1401-magnitude_-H.out
index bbe87ab72aaffb16741d7a78443f6ac44c94ac44..badb446b2c830ba4a0c1a210fc91987254cd5801 100644 (file)
--- a/t/t1401-magnitude_-H.out
+++ b/t/t1401-magnitude_-H.out
@@ -17,4 +17,4 @@
 1.7M 
  18M 
 190M =--
-2.0G =--------------------------------
+2.0G =----------------------------------

diff --git a/t/t1403-precision_-H.out b/t/t1403-precision_-H.out
index da5f9aeca1115774febd77c8f50c5fa588775134..97fd1ef99a1f0be3070395ac6010dd7bea728368 100644 (file)
--- a/t/t1403-precision_-H.out
+++ b/t/t1403-precision_-H.out
@@ -4,7 +4,7 @@
 2.0k 
 2.0k 
 2.1k 
-200k -=-------------------------------
+200k --=--------------------------------
   0  
 160z 
 -150z 

diff --git a/t/t1404-minitude_-H.out b/t/t1404-minitude_-H.out
index 0c6388b7dbb1739b2013f05b86892406b3b16509..78221cc15301a82ed35a56413d352ea20332f0f0 100644 (file)
--- a/t/t1404-minitude_-H.out
+++ b/t/t1404-minitude_-H.out
@@ -1,26 +1,26 @@
- -10p   ----------------------------=+|
--200p   ----------------------------=+|
--3.0n   ----------------------------=+|
- -40n   ----------------------------=+|
--500n   ----------------------------=+|
--6.0μ   ----------------------------=+|
- -70μ   ----------------------------=+|
--800μ   ----------------------------=+|
--9.0m   ----------------------------=+|
--100m   ----------------------------=+|
--1.1    ----------------------------=+|
- -12    ----------------------------=+|
--130    ----------------------------=+|
--1.4k   ----------------------------=+|
- -15k   ----------------------------=+|
--160k   ----------------------------=+|
--1.7M   ----------------------------=+|
- -18M   ----------------------------=+|
--190M   ----------------------------
+ -10p   ------------------------------=+|
+-200p   ------------------------------=+|
+-3.0n   ------------------------------=+|
+ -40n   ------------------------------=+|
+-500n   ------------------------------=+|
+-6.0μ   ------------------------------=+|
+ -70μ   ------------------------------=+|
+-800μ   ------------------------------=+|
+-9.0m   ------------------------------=+|
+-100m   ------------------------------=+|
+-1.1    ------------------------------=+|
+ -12    ------------------------------=+|
+-130    ------------------------------=+|
+-1.4k   ------------------------------=+|
+ -15k   ------------------------------=+|
+-160k   ------------------------------=+|
+-1.7M   ------------------------------=+|
+ -18M   ------------------------------=+|
+-190M   ------------------------------
 -2.0G   
 
--999k - ----------------------------=+|
--1.0M + ----------------------------=+|
--1.0M   ----------------------------=+|
--1.0M - ----------------------------=+|
--1.1M + ----------------------------=+|
+-999k - ------------------------------=+|
+-1.0M + ------------------------------=+|
+-1.0M   ------------------------------=+|
+-1.0M - ------------------------------=+|
+-1.1M + ------------------------------=+|

diff --git a/t/t1422-all_the_time_--sexagesimal_-H_-sC.out b/t/t1422-all_the_time_--sexagesimal_-H_-sC.out
index 9ba7ac238435a2c286062ed2743bb252e57a28b5..cc1d16b6fccb91a021952a31bc4e724232e2d211 100644 (file)
--- a/t/t1422-all_the_time_--sexagesimal_-H_-sC.out
+++ b/t/t1422-all_the_time_--sexagesimal_-H_-sC.out
@@ -1,6 +1,6 @@
 \e[90m0:00:00\e[0m      -
-\e[90m24:00:00\e[0m      ---\e[36m=\e[0m--
-\e[32m111:11:11\e[0m long ---\e[36m=\e[0m------------------------
+\e[90m24:00:00\e[0m      ---\e[36m=\e[0m---
+\e[32m111:11:11\e[0m long ---\e[36m=\e[0m--------------------------
 
 \e[90m-0:00:00\e[0m      -
 \e[90m-0:00:01\e[0m      -

diff --git a/t/t2201-ascii_-aHl7.out b/t/t2201-ascii_-aHl7.out
index 31e871d61a6b904d6ec03a2c4932b1317012efe2..61106938e54b42503358656dee651bee7d335ba3 100644 (file)
--- a/t/t2201-ascii_-aHl7.out
+++ b/t/t2201-ascii_-aHl7.out
@@ -1,5 +1,5 @@
-123u micro ------------<-=-+--------|
-100m long> ------------<-=-+--------|-
-  -1        ------------<-=-+
+123u micro -------------<--=+---------|
+100m long> -------------<--=+---------|-
+  -1        -------------<--=+-
   -2        ---------
   -3