Fix TAP coloring on non-terminal outputs

Author: toroidal-code

include/formatters/tap.hpp

@@ -76,10 +76,20 @@ inline void TAP::flush() {
   std::string str = buffer.str();
   std::ostringstream oss;
   if (str[0] == '\n') {
-    oss << str.substr(0, 1) << GREEN << "1.." << test_counter - 1 << RESET << std::endl << str.substr(1);
-  } else {
-    oss << GREEN << "1.." << test_counter - 1 << RESET << std::endl << str;
+    oss << str[0];
   }
+
+  if (color_output) {
+    oss << GREEN;
+  }
+  oss << "1.." << test_counter - 1;
+  if (color_output) {
+    oss << RESET;
+  }
+  oss << std::endl;
+
+  oss << ((str[0] == '\n') ? str.substr(1) : str);
+
   std::cout << oss.str() << std::flush;
   first = false;
   test_counter = 1;
@@ -89,4 +99,3 @@ inline void TAP::flush() {
 static TAP tap;
 
 }  // namespace CppSpec::Formatters
-

include/matchers/matcher_base.hpp

@@ -141,7 +141,7 @@ std::string MatcherBase<A, E>::failure_message_when_negated() {
 template <typename A, typename E>
 std::string MatcherBase<A, E>::description() {
   std::stringstream ss;
-  std::string pretty_expected = this->to_sentence(expected_);
+  //std::string pretty_expected = this->to_sentence(expected_);
   //  ss << "match " <<
   //  this->name_to_sentence(Util::demangle(typeid(*this).name()))
   //     << "(" << pretty_expected.substr(1, pretty_expected.length()) << ")";