From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 20 Apr 2023 01:16:08 +0000 (+0200)
Subject: When --all and --num print both
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=4da2eba7c0d2a0616edc1780c09ef6f38f059a92;p=nb.git

When --all and --num print both
---

diff --git a/bin/color.pl b/bin/color.pl
index d8b3b226..aee49b3d 100755
--- a/bin/color.pl
+++ b/bin/color.pl
@@ -94,6 +94,7 @@ my $input = join('',@ARGV) || 'My Text';
 
 if ($Opt{all}) {
 
+  $PRINT_CODE = $PRINT_CODE ? 2 : 0;
   my $length = length($input)+3;
 
   print "\nEffect:\n";
@@ -157,32 +158,40 @@ sub in_color {
 #------------------------------------------------------------------------------
 my ($txt,$hparam) = @_;
 
+	my $new = "";
 	$hparam->{bg} ||= 'default';
 	$hparam->{fg} ||= 'default';
 	$hparam->{effect} ||= 'normal';
+	#die $hparam->{num};
 
-  if ($hparam->{num}) {
+  if (!$hparam->{num} or $hparam->{num} == 2) {
 
-    return 
-      '\e['
+    $new .= 
+      "\e["
       . $BG{$hparam->{bg}}
-      . ";",$FG{$hparam->{fg}}
-      . ";",$EFFECT{$hparam->{effect}}
-      . "m",$txt
-      . '\e[0m'
+      . ";".$FG{$hparam->{fg}}
+      . ";".$EFFECT{$hparam->{effect}}
+      . "m".$txt
+      . "\e[0m"
     ;
+  	$new .= " | " if $hparam->{num} == 2;
 
-  } else {
+  }
 
-    return 
-      "\e["
+  if ($hparam->{num}) {
+
+    $new .= 
+      '\e['
       . $BG{$hparam->{bg}}
-      . ";",$FG{$hparam->{fg}}
-      . ";",$EFFECT{$hparam->{effect}}
-      . "m",$txt
-      . "\e[0m"
+      . ";".$FG{$hparam->{fg}}
+      . ";".$EFFECT{$hparam->{effect}}
+      . "m".$txt
+      . '\e[0m'
     ;
+
   }
+
+	return $new;
 }
 
 sub version {