Added colorised console output for Windows

Also tweaks the output again

include/internal/catch_console_colour.hpp

@@ -0,0 +1,50 @@
+/*
+ *  catch_console_colour.hpp
+ *  Catch
+ *
+ *  Created by Phil on 25/2/2012.
+ *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+#ifndef TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+
+#include "catch_common.h"
+
+namespace Catch
+{
+    struct ConsoleColourImpl;
+    
+    class TextColour : NonCopyable
+    {
+    public:
+        
+        enum Colours
+        {
+            None,
+            
+            FileName,
+            ResultError,
+            ResultSuccess,
+            
+            Error,
+            Success,
+            
+            OriginalExpression,
+            ReconstructedExpression
+        };
+        
+        TextColour( Colours colour = None );
+        void set( Colours colour );
+        ~TextColour();
+        
+    private:
+        ConsoleColourImpl* m_impl;
+    };
+    
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED

include/internal/catch_console_colour_impl.hpp

@@ -0,0 +1,102 @@
+/*
+ *  catch_console_colour_impl.hpp
+ *  Catch
+ *
+ *  Created by Phil on 25/2/2012.
+ *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+#ifndef TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
+
+#include "catch_console_colour.hpp"
+
+#ifdef CATCH_PLATFORM_WINDOWS
+
+#include "windows.h"
+
+namespace Catch
+{
+    namespace
+    {
+        WORD mapConsoleColour( TextColour::Colours colour )
+        {
+            switch( colour )
+            {
+                case TextColour::FileName:      
+                    return FOREGROUND_INTENSITY;                    // greyed out
+                case TextColour::ResultError:   
+                    return FOREGROUND_RED | FOREGROUND_INTENSITY;   // bright red
+                case TextColour::ResultSuccess: 
+                    return FOREGROUND_GREEN | FOREGROUND_INTENSITY; // bright green
+                case TextColour::Error:         
+                    return FOREGROUND_RED;                          // dark red
+                case TextColour::Success:       
+                    return FOREGROUND_GREEN;                        // dark green      
+                case TextColour::OriginalExpression:      
+                    return FOREGROUND_BLUE | FOREGROUND_GREEN;      // turquoise
+                case TextColour::ReconstructedExpression:    
+                    return FOREGROUND_RED | FOREGROUND_GREEN;       // greeny-yellow
+                default: return 0;
+            }
+        }
+    }
+    
+    struct ConsoleColourImpl
+    {
+        ConsoleColourImpl()
+        :   hStdout( GetStdHandle(STD_OUTPUT_HANDLE) ),
+        wOldColorAttrs( 0 )
+        {
+            GetConsoleScreenBufferInfo( hStdout, &csbiInfo );
+            wOldColorAttrs = csbiInfo.wAttributes;
+        }
+        ~ConsoleColourImpl()
+        {
+            SetConsoleTextAttribute( hStdout, wOldColorAttrs );
+        }
+        void set( TextColour::Colours colour )
+        {
+            WORD consoleColour = mapConsoleColour( colour );
+            if( consoleColour > 0 )
+                SetConsoleTextAttribute( hStdout, consoleColour );
+        }
+        
+        HANDLE hStdout;
+        CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+        WORD wOldColorAttrs;
+    };
+    
+    TextColour::TextColour( Colours colour )
+    : m_impl( new ConsoleColourImpl() )
+    {
+        if( colour )
+            m_impl->set( colour );
+    }
+    TextColour::~TextColour()
+    {
+        delete m_impl;
+    }
+    void TextColour::set( Colours colour )
+    {
+        m_impl->set( colour );
+    }
+    
+} // end namespace Catch
+
+#else
+
+namespace Catch
+{
+    TextColour::TextColour( Colours ){}
+    TextColour::~TextColour(){}
+    void TextColour::set( Colours ){}
+    
+} // end namespace Catch
+
+#endif
+
+#endif // TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED

include/internal/catch_hub_impl.hpp

@@ -15,6 +15,7 @@
 #include "catch_exception_translator_registry.hpp"
 #include "catch_runner_impl.hpp"
 #include "catch_generators_impl.hpp"
+#include "catch_console_colour_impl.hpp"
 #include "catch_stream.hpp"
 
 namespace Catch