diff --git a/src/Color.cpp b/src/Color.cpp index b4762813f..0f6a2935a 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -465,18 +465,18 @@ std::string Color::colorize (const std::string& input) result << "4"; } - if (value & _COLOR_HASBG) - { - if (count++) result << ";"; - result << ((value & _COLOR_BRIGHT ? 99 : 39) + ((value & _COLOR_BG) >> 8)); - } - if (value & _COLOR_HASFG) { if (count++) result << ";"; result << (29 + (value & _COLOR_FG)); } + if (value & _COLOR_HASBG) + { + if (count++) result << ";"; + result << ((value & _COLOR_BRIGHT ? 99 : 39) + ((value & _COLOR_BG) >> 8)); + } + result << "m" << input << "\033[0m"; return result.str (); } diff --git a/src/tests/cal.t b/src/tests/cal.t index 93c2e5bac..1d0f0b176 100755 --- a/src/tests/cal.t +++ b/src/tests/cal.t @@ -63,9 +63,9 @@ qx{../task rc:cal.rc add zero}; unlike ($output, qr/\[41m\d+/, 'No overdue tasks are present'); unlike ($output, qr/\[43m\d+/, 'No due tasks are present'); $output = qx{../task rc:cal.rc rc.weekstart:Sunday cal}; -like ($output, qr/Su Mo Tu/, 'Week starts on Sunday'); +like ($output, qr/Su Mo Tu/, 'Week starts on Sunday'); $output = qx{../task rc:cal.rc rc.weekstart:Monday cal}; -like ($output, qr/Fr Sa Su/, 'Week starts on Monday'); +like ($output, qr/Fr Sa Su/, 'Week starts on Monday'); $output = qx{../task rc:cal.rc cal y}; like ($output, qr/$month.* $year/, 'Current month and year are displayed'); like ($output, qr/$prevmonth.* $nextyear/, 'Month and year one year ahead are displayed');