Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Fully committed to new Text class.

- moved impl into .hpp
- replaced last few uses of LineWrapper with Text
- removed LineWrapper
Commit
b3acf45d7052efc97409db4ba2f930833cd15596
Author
Phil Nash ·
Parents
97d99852a85f

Files · Download .tar.gz

Changes

 include/catch_runner.hpp                           |    2 -
 include/internal/catch_impl.hpp                    |    2 +-
 include/internal/catch_line_wrap.h                 |   58 -
 include/internal/catch_line_wrap.hpp               |  117 --
 include/internal/catch_list.hpp                    |   16 +-
 include/internal/catch_test_case_info.h            |    1 +
 include/internal/catch_text.h                      |   76 +-
 include/internal/catch_text.hpp                    |   92 ++
 include/reporters/catch_reporter_console.hpp       |   11 +-
 projects/SelfTest/Baselines/approvedResults.txt    | 1313 +++++++++++---------
 projects/SelfTest/TestMain.cpp                     |    1 -
 .../CatchSelfTest.xcodeproj/project.pbxproj        |   14 +-
 .../{catch_line_wrap.cpp => catch_text.cpp}        |    2 +-
 13 files changed, 849 insertions(+), 856 deletions(-)

diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index 81f0ad5f..7f24d5b5 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -13,7 +13,6 @@
 #include "internal/catch_runner_impl.hpp"
 #include "internal/catch_test_spec.h"
 #include "internal/catch_version.h"
-#include "internal/catch_line_wrap.h"
 #include "internal/catch_text.h"
 
 #include <fstream>
@@ -162,7 +161,6 @@ namespace Catch {
                 displayedSpecificOption = true;
                 std::cout   << "\n" << opt.optionNames() << " " << opt.argsSynopsis() << "\n\n"
                             << opt.optionSummary() << "\n\n"
-//                            << LineWrapper().setIndent( 2 ).wrap( opt.optionDescription() ) << "\n" << std::endl;
                             << Text( opt.optionDescription(), TextAttributes().setIndent( 2 ) ) << "\n" << std::endl;
             }
         }
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index f3f214b2..ff95675b 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -27,7 +27,7 @@
 #include "catch_test_case_info.hpp"
 #include "catch_tags.hpp"
 #include "catch_version.hpp"
-#include "catch_line_wrap.hpp"
+#include "catch_text.hpp"
 #include "catch_message.hpp"
 #include "catch_legacy_reporter_adapter.hpp"
 
diff --git a/include/internal/catch_line_wrap.h b/include/internal/catch_line_wrap.h
deleted file mode 100644
index cfd31df8..00000000
--- a/include/internal/catch_line_wrap.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Created by Phil on 11/1/2013.
- *  Copyright 2013 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_LINE_WRAP_H_INCLUDED
-#define TWOBLUECUBES_CATCH_LINE_WRAP_H_INCLUDED
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-    
-    class LineWrapper {
-    public:
-        LineWrapper();
-
-        LineWrapper& setIndent( std::size_t _indent );
-        LineWrapper& setInitialIndent( std::size_t _initalIndent );
-        LineWrapper& setRight( std::size_t _right );
-        LineWrapper& setTabChar( char _tabChar );
-
-        LineWrapper& wrap( std::string const& _str );
-
-        std::string toString() const;
-
-        typedef std::vector<std::string>::const_iterator const_iterator;
-
-        const_iterator begin() const { return lines.begin(); }
-        const_iterator end() const { return lines.end(); }
-        std::string const& last() const { return lines.back(); }
-        std::size_t size() const { return lines.size(); }
-        std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
-
-        friend std::ostream& operator << ( std::ostream& _stream, LineWrapper const& _lineWrapper );
-        
-    private:
-        void wrapInternal( std::string const& _str );
-        void addLine( const std::string& _line );
-        bool isWrapPoint( char c );
-        std::size_t getCurrentIndent() const;
-
-        std::size_t right;
-        std::size_t nextTab;
-        std::size_t tab;
-        std::size_t indent;
-        std::size_t initialIndent;
-        std::string wrappableChars;
-        char tabChar;
-        int recursionCount;
-        std::vector<std::string> lines;
-    };
-    
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_LINE_WRAP_H_INCLUDED
diff --git a/include/internal/catch_line_wrap.hpp b/include/internal/catch_line_wrap.hpp
deleted file mode 100644
index aa278f5d..00000000
--- a/include/internal/catch_line_wrap.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Created by Phil on 11/1/2013.
- *  Copyright 2013 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_LINE_WRAP_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_LINE_WRAP_HPP_INCLUDED
-
-#include "catch_line_wrap.h"
-
-namespace Catch {
-    
-    LineWrapper::LineWrapper()
-    :   right( CATCH_CONFIG_CONSOLE_WIDTH-1 ),
-        nextTab( 0 ),
-        tab( 0 ),
-        indent( 0 ),
-        initialIndent( (std::size_t)-1 ), // use indent by default
-        wrappableChars( " [({.,/|\\" ),
-        tabChar( '\t' ),
-        recursionCount( 0 )
-    {}
-    
-    LineWrapper& LineWrapper::setIndent( std::size_t _indent ) {
-        indent = _indent;
-        return *this;
-    }
-    LineWrapper& LineWrapper::setInitialIndent( std::size_t _initialIndent ) {
-        initialIndent = _initialIndent;
-        return *this;
-    }
-    LineWrapper& LineWrapper::setRight( std::size_t _right ) {
-        right = _right;
-        return *this;
-    }
-    LineWrapper& LineWrapper::wrap( std::string const& _str ) {
-        nextTab = tab = 0;
-        wrapInternal( _str );
-        return *this;
-    }
-    LineWrapper& LineWrapper::setTabChar( char _tabChar ) {
-        tabChar = _tabChar;
-        return *this;
-    }
-    bool LineWrapper::isWrapPoint( char c ) {
-        return wrappableChars.find( c ) != std::string::npos;
-    }
-    void LineWrapper::wrapInternal( std::string const& _str ) {
-        assert( ++recursionCount < 1000 );
-
-        std::size_t width = right - getCurrentIndent();
-        std::size_t wrapPoint = width-tab;
-        for( std::size_t pos = 0; pos < _str.size(); ++pos ) {
-            if( _str[pos] == '\n' )
-            {
-                addLine( _str.substr( 0, pos ) );
-                nextTab = tab = 0;
-                return wrapInternal( _str.substr( pos+1 ) );
-            }                
-            if( pos == width-tab ) {
-                if( _str[wrapPoint] == ' ' ) {
-                    addLine( _str.substr( 0, wrapPoint ) );
-                    while( _str[++wrapPoint] == ' ' );
-                }
-                else if( isWrapPoint( _str[wrapPoint] ) ) {
-                    addLine( _str.substr( 0, wrapPoint ) );
-                }
-                else {
-                    addLine( _str.substr( 0, --wrapPoint ) + '-' );
-                }
-                return wrapInternal( _str.substr( wrapPoint ) );
-            }
-            if( _str[pos] == tabChar ) {
-                nextTab = pos;
-                std::string withoutTab = _str.substr( 0, nextTab ) + _str.substr( nextTab+1 );
-                return wrapInternal( withoutTab );
-            }
-            else if( pos > 0 && isWrapPoint( _str[pos] ) ) {
-                wrapPoint = pos;
-            }
-        }
-        addLine( _str );
-    }
-
-    std::ostream& operator << ( std::ostream& _stream, LineWrapper const& _lineWrapper ) {
-        for( LineWrapper::const_iterator it = _lineWrapper.begin(), itEnd = _lineWrapper.end();
-            it != itEnd; ++it ) {
-            if( it != _lineWrapper.begin() )
-                _stream << "\n";
-            _stream << *it;
-        }
-        return _stream;
-    }
-    std::string LineWrapper::toString() const {
-        std::ostringstream oss;
-        oss << *this;
-        return oss.str();
-    }
-    
-    void LineWrapper::addLine( const std::string& _line ) {
-        lines.push_back( std::string( tab + getCurrentIndent(), ' ' ) + _line );
-        if( nextTab > 0 )
-            tab = nextTab;
-    }
-    
-    std::size_t LineWrapper::getCurrentIndent() const
-    {
-        return (initialIndent != (std::size_t)-1 && lines.empty() )
-            ? initialIndent
-            : indent;
-    }
-    
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_LINE_WRAP_HPP_INCLUDED
diff --git a/include/internal/catch_list.hpp b/include/internal/catch_list.hpp
index c0a44081..b1504f4d 100644
--- a/include/internal/catch_list.hpp
+++ b/include/internal/catch_list.hpp
@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED
 
 #include "catch_commandline.hpp"
-#include "catch_line_wrap.h"
+#include "catch_text.h"
 #include "catch_console_colour.hpp"
 
 #include <limits>
@@ -57,11 +57,11 @@ namespace Catch {
             if( matchesFilters( config.filters, *it ) ) {
                 matchedTests++;
                 // !TBD: consider listAs()
-                LineWrapper nameWrapper;
-                nameWrapper.setRight( maxNameLen ).setIndent( 2 ).wrap( it->getTestCaseInfo().name );
+                Text nameWrapper(   it->getTestCaseInfo().name,
+                                    TextAttributes().setWidth( maxNameLen ).setIndent(2) );
 
-                LineWrapper tagsWrapper;
-                tagsWrapper.setRight( maxTagLen ).wrap( it->getTestCaseInfo().tagsAsString );
+                Text tagsWrapper(   it->getTestCaseInfo().tagsAsString,
+                                    TextAttributes().setWidth( maxTagLen ) );
                 
                 for( std::size_t i = 0; i < std::max( nameWrapper.size(), tagsWrapper.size() ); ++i ) {
                     Colour::Code colour = Colour::None;
@@ -135,9 +135,9 @@ namespace Catch {
         for( std::map<std::string, int>::const_iterator countIt = tagCounts.begin(), countItEnd = tagCounts.end();
                 countIt != countItEnd;
                 ++countIt ) {            
-            LineWrapper wrapper;
-            wrapper.setIndent(2).setRight( maxTagLen ).wrap( "[" + countIt->first + "]" );
-            
+            Text wrapper( "[" + countIt->first + "]", TextAttributes()
+                                                        .setIndent(2)
+                                                        .setWidth( maxTagLen ) );
             std::cout << wrapper;
             std::size_t dots = 2;
             if( maxTagLen > wrapper.last().size() )
diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h
index fde9748a..ba804b19 100644
--- a/include/internal/catch_test_case_info.h
+++ b/include/internal/catch_test_case_info.h
@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
 #include "catch_common.h"
+#include "catch_ptr.hpp"
 
 #include <string>
 #include <set>
diff --git a/include/internal/catch_text.h b/include/internal/catch_text.h
index 97288a72..8584da31 100644
--- a/include/internal/catch_text.h
+++ b/include/internal/catch_text.h
@@ -8,6 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
 
+#include "catch_config.hpp"
+
 #include <string>
 #include <vector>
 
@@ -34,62 +36,8 @@ namespace Catch {
 
     class Text {
     public:
-        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
-        : attr( _attr )
-        {
-            std::string wrappableChars = " [({.,/|\\-";
-            std::size_t indent = _attr.initialIndent != std::string::npos
-                ? _attr.initialIndent
-                : _attr.indent;
-            std::string remainder = _str;
-
-            while( !remainder.empty() ) {
-                assert( lines.size() < 1000 );
-                std::size_t tabPos = std::string::npos;
-                std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
-                std::size_t pos = remainder.find_first_of( '\n' );
-                if( pos <= width ) {
-                    width = pos;
-                }
-                pos = remainder.find_last_of( _attr.tabChar, width );
-                if( pos != std::string::npos ) {
-                    tabPos = pos;
-                    if( remainder[width] == '\n' )
-                        width--;
-                    remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
-                }
-                
-                if( width == remainder.size() ) {
-                    spliceLine( indent, remainder, width );
-                }
-                else if( remainder[width] == '\n' ) {
-                    spliceLine( indent, remainder, width );
-                    if( width <= 1 || remainder.size() != 1 )
-                        remainder = remainder.substr( 1 );
-                    indent = _attr.indent;
-                }
-                else {
-                    pos = remainder.find_last_of( wrappableChars, width );
-                    if( pos != std::string::npos ) {
-                        spliceLine( indent, remainder, pos );
-                        if( remainder[0] == ' ' )
-                            remainder = remainder.substr( 1 );
-                    }
-                    else {
-                        spliceLine( indent, remainder, width-1 );
-                        lines.back() += "-";
-                    }
-                    if( lines.size() == 1 )
-                        indent = _attr.indent;
-                    if( tabPos != std::string::npos )
-                        indent += tabPos;
-                }
-            }
-        }
-        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
-            lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
-            _remainder = _remainder.substr( _pos );
-        }
+        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() );
+        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos );
         
         typedef std::vector<std::string>::const_iterator const_iterator;
 
@@ -98,21 +46,9 @@ namespace Catch {
         std::string const& last() const { return lines.back(); }
         std::size_t size() const { return lines.size(); }
         std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
+        std::string toString() const;
 
-        friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
-            for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
-                it != itEnd; ++it ) {
-                if( it != _text.begin() )
-                    _stream << "\n";
-                _stream << *it;
-            }
-            return _stream;
-        }
-        std::string toString() const {
-            std::ostringstream oss;
-            oss << *this;
-            return oss.str();
-        }
+        friend std::ostream& operator << ( std::ostream& _stream, Text const& _text );
         
     private:
         std::string str;
diff --git a/include/internal/catch_text.hpp b/include/internal/catch_text.hpp
new file mode 100644
index 00000000..bc502e8d
--- /dev/null
+++ b/include/internal/catch_text.hpp
@@ -0,0 +1,92 @@
+/*
+ *  Created by Phil on 20/4/2013.
+ *  Copyright 2013 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_TEXT_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEXT_HPP_INCLUDED
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+    
+    Text::Text( std::string const& _str, TextAttributes const& _attr )
+    : attr( _attr )
+    {
+        std::string wrappableChars = " [({.,/|\\-";
+        std::size_t indent = _attr.initialIndent != std::string::npos
+            ? _attr.initialIndent
+            : _attr.indent;
+        std::string remainder = _str;
+
+        while( !remainder.empty() ) {
+            assert( lines.size() < 1000 );
+            std::size_t tabPos = std::string::npos;
+            std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
+            std::size_t pos = remainder.find_first_of( '\n' );
+            if( pos <= width ) {
+                width = pos;
+            }
+            pos = remainder.find_last_of( _attr.tabChar, width );
+            if( pos != std::string::npos ) {
+                tabPos = pos;
+                if( remainder[width] == '\n' )
+                    width--;
+                remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
+            }
+            
+            if( width == remainder.size() ) {
+                spliceLine( indent, remainder, width );
+            }
+            else if( remainder[width] == '\n' ) {
+                spliceLine( indent, remainder, width );
+                if( width <= 1 || remainder.size() != 1 )
+                    remainder = remainder.substr( 1 );
+                indent = _attr.indent;
+            }
+            else {
+                pos = remainder.find_last_of( wrappableChars, width );
+                if( pos != std::string::npos && pos > 0 ) {
+                    spliceLine( indent, remainder, pos );
+                    if( remainder[0] == ' ' )
+                        remainder = remainder.substr( 1 );
+                }
+                else {
+                    spliceLine( indent, remainder, width-1 );
+                    lines.back() += "-";
+                }
+                if( lines.size() == 1 )
+                    indent = _attr.indent;
+                if( tabPos != std::string::npos )
+                    indent += tabPos;
+            }
+        }
+    }
+
+    void Text::spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
+        lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
+        _remainder = _remainder.substr( _pos );
+    }
+
+    std::string Text::toString() const {
+        std::ostringstream oss;
+        oss << *this;
+        return oss.str();
+    }
+
+    std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
+        for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
+            it != itEnd; ++it ) {
+            if( it != _text.begin() )
+                _stream << "\n";
+            _stream << *it;
+        }
+        return _stream;
+    }
+    
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_TEXT_HPP_INCLUDED
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index 8326cc2f..99ba0bc3 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -203,7 +203,7 @@ namespace Catch {
                 if( result.hasExpandedExpression() ) {
                     stream << "with expansion:\n";
                     Colour colourGuard( Colour::ReconstructedExpression );
-                    stream << LineWrapper().setIndent(2).wrap( result.getExpandedExpression() ) << "\n";
+                    stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << "\n";
                 }
             }
             void printMessage() const {
@@ -212,7 +212,7 @@ namespace Catch {
                 for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
                         it != itEnd;
                         ++it ) {                    
-                    stream << LineWrapper().setIndent(2).wrap( it->message ) << "\n";
+                    stream << Text( it->message, TextAttributes().setIndent(2) ) << "\n";
                 }
             }
             void printSourceInfo() const {
@@ -313,10 +313,9 @@ namespace Catch {
                 i+=2;
             else
                 i = 0;
-            stream << LineWrapper()
-                        .setIndent( indent+i)
-                        .setInitialIndent( indent )
-                        .wrap( _string ) << "\n";
+            stream << Text( _string, TextAttributes()
+                                        .setIndent( indent+i)
+                                        .setInitialIndent( indent ) ) << "\n";
         }
         
         void printTotals( const Totals& totals ) {
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 167f1080..bfb9e47b 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -4,9 +4,9 @@ CatchSelfTest is a CATCH v0.9 b33 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:16
-
 ./succeeding/Approx/simple
+-------------------------------------------------------------------------------
+ApproxTests.cpp:16
 ...............................................................................
 
 ApproxTests.cpp:20:
@@ -46,9 +46,9 @@ with expansion:
   Approx( 1.23 ) != 1.24
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:34
-
 ./succeeding/Approx/epsilon
+-------------------------------------------------------------------------------
+ApproxTests.cpp:34
 ...............................................................................
 
 ApproxTests.cpp:38:
@@ -64,9 +64,9 @@ with expansion:
   1.23 == Approx( 1.231 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:47
-
 ./succeeding/Approx/float
+-------------------------------------------------------------------------------
+ApproxTests.cpp:47
 ...............................................................................
 
 ApproxTests.cpp:49:
@@ -82,9 +82,9 @@ with expansion:
   0 == Approx( 0 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:58
-
 ./succeeding/Approx/int
+-------------------------------------------------------------------------------
+ApproxTests.cpp:58
 ...............................................................................
 
 ApproxTests.cpp:60:
@@ -96,9 +96,9 @@ PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:69
-
 ./succeeding/Approx/mixed
+-------------------------------------------------------------------------------
+ApproxTests.cpp:69
 ...............................................................................
 
 ApproxTests.cpp:75:
@@ -132,9 +132,9 @@ with expansion:
   1.234 == Approx( 1.234 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:87
-
 ./succeeding/Approx/custom
+-------------------------------------------------------------------------------
+ApproxTests.cpp:87
 ...............................................................................
 
 ApproxTests.cpp:93:
@@ -186,9 +186,9 @@ with expansion:
   Approx( 1.23 ) != 1.25
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:108
-
 Approximate PI
+-------------------------------------------------------------------------------
+ApproxTests.cpp:108
 ...............................................................................
 
 ApproxTests.cpp:110:
@@ -204,9 +204,9 @@ with expansion:
   3.142857142857143 != Approx( 3.141 )
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:34
-
 ./succeeding/TestClass/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:34
 ...............................................................................
 
 ClassTests.cpp:24:
@@ -216,9 +216,9 @@ with expansion:
   "hello" == "hello"
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:35
-
 ./failing/TestClass/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:35
 ...............................................................................
 
 ClassTests.cpp:28: FAILED:
@@ -227,9 +227,9 @@ with expansion:
   "hello" == "world"
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:45
-
 ./succeeding/Fixture/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:45
 ...............................................................................
 
 ClassTests.cpp:47:
@@ -239,9 +239,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:53
-
 ./failing/Fixture/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:53
 ...............................................................................
 
 ClassTests.cpp:55: FAILED:
@@ -250,9 +250,9 @@ with expansion:
   1 == 2
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:47
-
 ./succeeding/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:47
 ...............................................................................
 
 ConditionTests.cpp:55:
@@ -298,9 +298,9 @@ with expansion:
   1.3 == Approx( 1.3 )
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:67
-
 ./failing/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:67
 ...............................................................................
 
 ConditionTests.cpp:71: FAILED:
@@ -369,9 +369,9 @@ with expansion:
   1.3 == Approx( 1.301 )
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:89
-
 ./succeeding/conditions/inequality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:89
 ...............................................................................
 
 ConditionTests.cpp:93:
@@ -441,9 +441,9 @@ with expansion:
   5 != 6
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:107
-
 ./failing/conditions/inequality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:107
 ...............................................................................
 
 ConditionTests.cpp:111: FAILED:
@@ -472,9 +472,9 @@ with expansion:
   5 != 5
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:120
-
 ./succeeding/conditions/ordered
+-------------------------------------------------------------------------------
+ConditionTests.cpp:120
 ...............................................................................
 
 ConditionTests.cpp:124:
@@ -580,9 +580,9 @@ with expansion:
   "hello" > "a"
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:148
-
 ./failing/conditions/ordered
+-------------------------------------------------------------------------------
+ConditionTests.cpp:148
 ...............................................................................
 
 ConditionTests.cpp:152: FAILED:
@@ -681,9 +681,9 @@ with expansion:
   "hello" <= "a"
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:179
-
 ./succeeding/conditions/int literals
+-------------------------------------------------------------------------------
+ConditionTests.cpp:179
 ...............................................................................
 
 ConditionTests.cpp:188:
@@ -765,9 +765,9 @@ with expansion:
   0x<hex digits> > 4
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:218
-
 ./succeeding/conditions//long_to_unsigned_x
+-------------------------------------------------------------------------------
+ConditionTests.cpp:218
 ...............................................................................
 
 ConditionTests.cpp:226:
@@ -795,9 +795,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:233
-
 ./succeeding/conditions/const ints to int literal
+-------------------------------------------------------------------------------
+ConditionTests.cpp:233
 ...............................................................................
 
 ConditionTests.cpp:240:
@@ -825,9 +825,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:247
-
 ./succeeding/conditions/negative ints
+-------------------------------------------------------------------------------
+ConditionTests.cpp:247
 ...............................................................................
 
 ConditionTests.cpp:249:
@@ -867,9 +867,9 @@ with expansion:
   -2147483648 > 2
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:270
-
 ./succeeding/conditions/computed ints
+-------------------------------------------------------------------------------
+ConditionTests.cpp:270
 ...............................................................................
 
 ConditionTests.cpp:272:
@@ -879,9 +879,9 @@ with expansion:
   54 == 54
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:283
-
 ./succeeding/conditions/ptr
+-------------------------------------------------------------------------------
+ConditionTests.cpp:283
 ...............................................................................
 
 ConditionTests.cpp:288:
@@ -933,9 +933,9 @@ with expansion:
   0 != 0x<hex digits>
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:316
-
 ./succeeding/conditions/not
+-------------------------------------------------------------------------------
+ConditionTests.cpp:316
 ...............................................................................
 
 ConditionTests.cpp:320:
@@ -981,9 +981,9 @@ with expansion:
   !(1 == 2)
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:333
-
 ./failing/conditions/not
+-------------------------------------------------------------------------------
+ConditionTests.cpp:333
 ...............................................................................
 
 ConditionTests.cpp:337: FAILED:
@@ -1021,9 +1021,9 @@ with expansion:
   !(1 == 1)
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:33
-
 ./succeeding/exceptions/explicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:33
 ...............................................................................
 
 ExceptionTests.cpp:35:
@@ -1039,9 +1039,9 @@ PASSED:
   REQUIRE_THROWS( thisThrows() )
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:41
-
 ./failing/exceptions/explicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:41
 ...............................................................................
 
 ExceptionTests.cpp:43: FAILED:
@@ -1059,9 +1059,9 @@ due to unexpected exception with message:
   expected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:48
-
 ./failing/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:48
 ...............................................................................
 
 ExceptionTests.cpp:48: FAILED:
@@ -1069,9 +1069,9 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:54
-
 ./failing/exceptions/implicit/2
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:54
 ...............................................................................
 
 ExceptionTests.cpp:56:
@@ -1084,10 +1084,10 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:62
-
 ./failing/exceptions/implicit/3
   section name
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:62
 ...............................................................................
 
 ExceptionTests.cpp:62: FAILED:
@@ -1095,18 +1095,18 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:69
-
 ./succeeding/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:69
 ...............................................................................
 
 
 No assertions in test case, './succeeding/exceptions/implicit'
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:106
-
 ./failing/exceptions/custom
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:106
 ...............................................................................
 
 ExceptionTests.cpp:106: FAILED:
@@ -1114,9 +1114,9 @@ due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:114
-
 ./failing/exceptions/custom/nothrow
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:114
 ...............................................................................
 
 ExceptionTests.cpp:116: FAILED:
@@ -1125,9 +1125,9 @@ due to unexpected exception with message:
   unexpected custom exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:119
-
 ./failing/exceptions/custom/throw
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:119
 ...............................................................................
 
 ExceptionTests.cpp:121: FAILED:
@@ -1136,9 +1136,9 @@ due to unexpected exception with message:
   custom exception - not std
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:125
-
 ./failing/exceptions/custom/double
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:125
 ...............................................................................
 
 ExceptionTests.cpp:125: FAILED:
@@ -1146,9 +1146,9 @@ due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:134
-
 ./succeeding/exceptions/notimplemented
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:134
 ...............................................................................
 
 ExceptionTests.cpp:136:
@@ -1156,9 +1156,9 @@ PASSED:
   REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
 
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:19
-
 ./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:19
 ...............................................................................
 
 GeneratorTests.cpp:26:
@@ -2026,9 +2026,9 @@ with expansion:
   214 == 214
 
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:32
-
 ./succeeding/generators/2
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:32
 ...............................................................................
 
 GeneratorTests.cpp:40:
@@ -2044,9 +2044,9 @@ with expansion:
   2 == 2
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:11
-
 ./succeeding/message
+-------------------------------------------------------------------------------
+MessageTests.cpp:11
 ...............................................................................
 
 MessageTests.cpp:14:
@@ -2058,9 +2058,9 @@ warning:
 No assertions in test case, './succeeding/message'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:16
-
 ./succeeding/succeed
+-------------------------------------------------------------------------------
+MessageTests.cpp:16
 ...............................................................................
 
 MessageTests.cpp:18:
@@ -2069,9 +2069,9 @@ with message:
   this is a success
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:21
-
 ./failing/message/info/1
+-------------------------------------------------------------------------------
+MessageTests.cpp:21
 ...............................................................................
 
 MessageTests.cpp:26: FAILED:
@@ -2083,9 +2083,9 @@ with messages:
   so should this
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:29
-
 ./mixed/message/info/2
+-------------------------------------------------------------------------------
+MessageTests.cpp:29
 ...............................................................................
 
 MessageTests.cpp:33:
@@ -2119,9 +2119,9 @@ with message:
   but not this
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:48
-
 ./failing/message/fail
+-------------------------------------------------------------------------------
+MessageTests.cpp:48
 ...............................................................................
 
 MessageTests.cpp:51: FAILED:
@@ -2129,10 +2129,10 @@ explicitly with message:
   This is a failure
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:56
-
 ./failing/message/sections
   one
+-------------------------------------------------------------------------------
+MessageTests.cpp:56
 ...............................................................................
 
 MessageTests.cpp:58: FAILED:
@@ -2140,10 +2140,10 @@ explicitly with message:
   Message from section one
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:61
-
 ./failing/message/sections
   two
+-------------------------------------------------------------------------------
+MessageTests.cpp:61
 ...............................................................................
 
 MessageTests.cpp:63: FAILED:
@@ -2152,10 +2152,10 @@ explicitly with message:
 
 Message from section one
 -------------------------------------------------------------------------------
-MessageTests.cpp:69
-
 ./succeeding/message/sections/stdout
   one
+-------------------------------------------------------------------------------
+MessageTests.cpp:69
 ...............................................................................
 
 
@@ -2163,19 +2163,19 @@ No assertions in section, 'one'
 
 Message from section two
 -------------------------------------------------------------------------------
-MessageTests.cpp:74
-
 ./succeeding/message/sections/stdout
   two
+-------------------------------------------------------------------------------
+MessageTests.cpp:74
 ...............................................................................
 
 
 No assertions in section, 'two'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:80
-
 ./mixed/message/scoped
+-------------------------------------------------------------------------------
+MessageTests.cpp:80
 ...............................................................................
 
 MessageTests.cpp:86:
@@ -2277,9 +2277,9 @@ with messages:
   i := 10
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:90
-
 ./succeeding/nofail
+-------------------------------------------------------------------------------
+MessageTests.cpp:90
 ...............................................................................
 
 MessageTests.cpp:92:
@@ -2290,18 +2290,18 @@ FAILED - but was ok:
 No assertions in test case, './succeeding/nofail'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:95
-
 just info
+-------------------------------------------------------------------------------
+MessageTests.cpp:95
 ...............................................................................
 
 
 No assertions in test case, 'just info'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:99
-
 just failure
+-------------------------------------------------------------------------------
+MessageTests.cpp:99
 ...............................................................................
 
 MessageTests.cpp:101: FAILED:
@@ -2309,10 +2309,10 @@ explicitly with message:
   Previous info should not be seen
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:19
-
 ./succeeding/Misc/Sections
   s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:19
 ...............................................................................
 
 MiscTests.cpp:21:
@@ -2328,10 +2328,10 @@ with expansion:
   2 != 1
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:25
-
 ./succeeding/Misc/Sections
   s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:25
 ...............................................................................
 
 MiscTests.cpp:27:
@@ -2341,10 +2341,10 @@ with expansion:
   1 != 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:36
-
 ./succeeding/Misc/Sections/nested
   s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:36
 ...............................................................................
 
 MiscTests.cpp:38:
@@ -2360,11 +2360,11 @@ with expansion:
   2 != 1
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:41
-
 ./succeeding/Misc/Sections/nested
   s1
   s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:41
 ...............................................................................
 
 MiscTests.cpp:43:
@@ -2374,11 +2374,11 @@ with expansion:
   1 != 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:55
-
 ./mixed/Misc/Sections/nested2
   s1
   s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:55
 ...............................................................................
 
 MiscTests.cpp:57: FAILED:
@@ -2387,11 +2387,11 @@ with expansion:
   1 == 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:60
-
 ./mixed/Misc/Sections/nested2
   s1
   s3
+-------------------------------------------------------------------------------
+MiscTests.cpp:60
 ...............................................................................
 
 MiscTests.cpp:62:
@@ -2401,11 +2401,11 @@ with expansion:
   1 != 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:64
-
 ./mixed/Misc/Sections/nested2
   s1
   s4
+-------------------------------------------------------------------------------
+MiscTests.cpp:64
 ...............................................................................
 
 MiscTests.cpp:66:
@@ -2415,42 +2415,42 @@ with expansion:
   1 < 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:75
-
 ./Sections/nested/a/b
   c
   d (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:75
 ...............................................................................
 
 
 No assertions in section, 'd (leaf)'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:79
-
 ./Sections/nested/a/b
   c
   e (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:79
 ...............................................................................
 
 
 No assertions in section, 'e (leaf)'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:84
-
 ./Sections/nested/a/b
   f (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:84
 ...............................................................................
 
 
 No assertions in section, 'f (leaf)'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:97
-
 ./mixed/Misc/Sections/loops
   s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:97
 ...............................................................................
 
 MiscTests.cpp:99: FAILED:
@@ -2459,9 +2459,9 @@ with expansion:
   0 > 1
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:104
-
 ./mixed/Misc/loops
+-------------------------------------------------------------------------------
+MiscTests.cpp:104
 ...............................................................................
 
 MiscTests.cpp:111: FAILED:
@@ -2525,18 +2525,18 @@ with message:
 Some information
 An error
 -------------------------------------------------------------------------------
-MiscTests.cpp:115
-
 ./succeeding/Misc/stdout,stderr
+-------------------------------------------------------------------------------
+MiscTests.cpp:115
 ...............................................................................
 
 
 No assertions in test case, './succeeding/Misc/stdout,stderr'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:127
-
 ./succeeding/Misc/null strings
+-------------------------------------------------------------------------------
+MiscTests.cpp:127
 ...............................................................................
 
 MiscTests.cpp:129:
@@ -2552,9 +2552,9 @@ with expansion:
   {null string} == {null string}
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:133
-
 ./failing/info
+-------------------------------------------------------------------------------
+MiscTests.cpp:133
 ...............................................................................
 
 MiscTests.cpp:138: FAILED:
@@ -2564,9 +2564,9 @@ with messages:
   i := 7
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:149
-
 ./succeeding/checkedif
+-------------------------------------------------------------------------------
+MiscTests.cpp:149
 ...............................................................................
 
 MiscTests.cpp:143:
@@ -2582,9 +2582,9 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:154
-
 ./failing/checkedif
+-------------------------------------------------------------------------------
+MiscTests.cpp:154
 ...............................................................................
 
 MiscTests.cpp:143: FAILED:
@@ -2598,9 +2598,9 @@ with expansion:
   false
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:167
-
 ./succeeding/checkedelse
+-------------------------------------------------------------------------------
+MiscTests.cpp:167
 ...............................................................................
 
 MiscTests.cpp:161:
@@ -2616,9 +2616,9 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:172
-
 ./failing/checkedelse
+-------------------------------------------------------------------------------
+MiscTests.cpp:172
 ...............................................................................
 
 MiscTests.cpp:161: FAILED:
@@ -2632,29 +2632,29 @@ with expansion:
   false
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:179
-
 ./misc/xmlentitycheck
   embedded xml
+-------------------------------------------------------------------------------
+MiscTests.cpp:179
 ...............................................................................
 
 
 No assertions in section, 'embedded xml'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:183
-
 ./misc/xmlentitycheck
   encoded chars
+-------------------------------------------------------------------------------
+MiscTests.cpp:183
 ...............................................................................
 
 
 No assertions in section, 'encoded chars'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:189
-
 ./manual/onechar
+-------------------------------------------------------------------------------
+MiscTests.cpp:189
 ...............................................................................
 
 MiscTests.cpp:192: FAILED:
@@ -2663,9 +2663,9 @@ with message:
   3
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:195
-
 ./succeeding/atomic if
+-------------------------------------------------------------------------------
+MiscTests.cpp:195
 ...............................................................................
 
 MiscTests.cpp:202:
@@ -2675,9 +2675,9 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:210
-
 ./succeeding/matchers
+-------------------------------------------------------------------------------
+MiscTests.cpp:210
 ...............................................................................
 
 MiscTests.cpp:212:
@@ -2705,9 +2705,9 @@ with expansion:
   "this string contains 'abc' as a substring" ends with: "substring"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:219
-
 ./failing/matchers/Contains
+-------------------------------------------------------------------------------
+MiscTests.cpp:219
 ...............................................................................
 
 MiscTests.cpp:221: FAILED:
@@ -2716,9 +2716,9 @@ with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:224
-
 ./failing/matchers/StartsWith
+-------------------------------------------------------------------------------
+MiscTests.cpp:224
 ...............................................................................
 
 MiscTests.cpp:226: FAILED:
@@ -2727,9 +2727,9 @@ with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:229
-
 ./failing/matchers/EndsWith
+-------------------------------------------------------------------------------
+MiscTests.cpp:229
 ...............................................................................
 
 MiscTests.cpp:231: FAILED:
@@ -2738,9 +2738,9 @@ with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:234
-
 ./failing/matchers/Equals
+-------------------------------------------------------------------------------
+MiscTests.cpp:234
 ...............................................................................
 
 MiscTests.cpp:236: FAILED:
@@ -2749,9 +2749,9 @@ with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:242
-
 ./succeeding/matchers/AllOf
+-------------------------------------------------------------------------------
+MiscTests.cpp:242
 ...............................................................................
 
 MiscTests.cpp:244:
@@ -2762,17 +2762,17 @@ with expansion:
   contains: "abc" )
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:246
-
 ./succeeding/matchers/AnyOf
+-------------------------------------------------------------------------------
+MiscTests.cpp:246
 ...............................................................................
 
 MiscTests.cpp:248:
 PASSED:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
 with expansion:
-  "this string contains 'abc' as a substring" ( contains: "string" or
-  contains: "not there" )
+  "this string contains 'abc' as a substring" ( contains: "string" or contains:
+  "not there" )
 
 MiscTests.cpp:249:
 PASSED:
@@ -2782,9 +2782,9 @@ with expansion:
   contains: "string" )
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:252
-
 ./succeeding/matchers/Equals
+-------------------------------------------------------------------------------
+MiscTests.cpp:252
 ...............................................................................
 
 MiscTests.cpp:254:
@@ -2795,9 +2795,9 @@ with expansion:
   'abc' as a substring"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:263
-
 example/factorial
+-------------------------------------------------------------------------------
+MiscTests.cpp:263
 ...............................................................................
 
 MiscTests.cpp:265:
@@ -2831,18 +2831,18 @@ with expansion:
   0x<hex digits> == 3628800
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:272
-
 empty
+-------------------------------------------------------------------------------
+MiscTests.cpp:272
 ...............................................................................
 
 
 No assertions in test case, 'empty'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:276
-
 Nice descriptive name
+-------------------------------------------------------------------------------
+MiscTests.cpp:276
 ...............................................................................
 
 MiscTests.cpp:278:
@@ -2853,27 +2853,27 @@ warning:
 No assertions in test case, 'Nice descriptive name'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:280
-
 first tag
+-------------------------------------------------------------------------------
+MiscTests.cpp:280
 ...............................................................................
 
 
 No assertions in test case, 'first tag'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:283
-
 second tag
+-------------------------------------------------------------------------------
+MiscTests.cpp:283
 ...............................................................................
 
 
 No assertions in test case, 'second tag'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:296
-
 vectors can be sized and resized
+-------------------------------------------------------------------------------
+MiscTests.cpp:296
 ...............................................................................
 
 MiscTests.cpp:300:
@@ -2889,10 +2889,10 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:303
-
 vectors can be sized and resized
   resizing bigger changes size and capacity
+-------------------------------------------------------------------------------
+MiscTests.cpp:303
 ...............................................................................
 
 MiscTests.cpp:306:
@@ -2908,9 +2908,9 @@ with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:296
-
 vectors can be sized and resized
+-------------------------------------------------------------------------------
+MiscTests.cpp:296
 ...............................................................................
 
 MiscTests.cpp:300:
@@ -2926,10 +2926,10 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:309
-
 vectors can be sized and resized
   resizing smaller changes size but not capacity
+-------------------------------------------------------------------------------
+MiscTests.cpp:309
 ...............................................................................
 
 MiscTests.cpp:312:
@@ -2945,11 +2945,11 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:315
-
 vectors can be sized and resized
   resizing smaller changes size but not capacity
   We can use the 'swap trick' to reset the capacity
+-------------------------------------------------------------------------------
+MiscTests.cpp:315
 ...............................................................................
 
 MiscTests.cpp:319:
@@ -2959,9 +2959,9 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:296
-
 vectors can be sized and resized
+-------------------------------------------------------------------------------
+MiscTests.cpp:296
 ...............................................................................
 
 MiscTests.cpp:300:
@@ -2977,10 +2977,10 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:309
-
 vectors can be sized and resized
   resizing smaller changes size but not capacity
+-------------------------------------------------------------------------------
+MiscTests.cpp:309
 ...............................................................................
 
 MiscTests.cpp:312:
@@ -2996,9 +2996,9 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:296
-
 vectors can be sized and resized
+-------------------------------------------------------------------------------
+MiscTests.cpp:296
 ...............................................................................
 
 MiscTests.cpp:300:
@@ -3014,10 +3014,10 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:322
-
 vectors can be sized and resized
   reserving bigger changes capacity but not size
+-------------------------------------------------------------------------------
+MiscTests.cpp:322
 ...............................................................................
 
 MiscTests.cpp:325:
@@ -3033,9 +3033,9 @@ with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:296
-
 vectors can be sized and resized
+-------------------------------------------------------------------------------
+MiscTests.cpp:296
 ...............................................................................
 
 MiscTests.cpp:300:
@@ -3051,10 +3051,10 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:328
-
 vectors can be sized and resized
   reserving smaller does not change size or capacity
+-------------------------------------------------------------------------------
+MiscTests.cpp:328
 ...............................................................................
 
 MiscTests.cpp:331:
@@ -3070,11 +3070,11 @@ with expansion:
   5 >= 5
 
 -------------------------------------------------------------------------------
-TestMain.cpp:23
-
 selftest/main
   selftest/expected result
   selftest/expected result/failing tests
+-------------------------------------------------------------------------------
+TestMain.cpp:23
 ...............................................................................
 
 catch_self_test.hpp:120:
@@ -3208,11 +3208,11 @@ with message:
   Tests failed, as expected
 
 -------------------------------------------------------------------------------
-TestMain.cpp:28
-
 selftest/main
   selftest/expected result
   selftest/expected result/succeeding tests
+-------------------------------------------------------------------------------
+TestMain.cpp:28
 ...............................................................................
 
 catch_self_test.hpp:109:
@@ -3454,11 +3454,11 @@ Message from section two
 Some information
 An error
 -------------------------------------------------------------------------------
-TestMain.cpp:39
-
 selftest/main
   selftest/test counts
   selftest/test counts/succeeding tests
+-------------------------------------------------------------------------------
+TestMain.cpp:39
 ...............................................................................
 
 TestMain.cpp:41:
@@ -3474,11 +3474,11 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-TestMain.cpp:46
-
 selftest/main
   selftest/test counts
   selftest/test counts/failing tests
+-------------------------------------------------------------------------------
+TestMain.cpp:46
 ...............................................................................
 
 TestMain.cpp:48:
@@ -3494,9 +3494,9 @@ with expansion:
   73 == 73
 
 -------------------------------------------------------------------------------
-TestMain.cpp:54
-
 meta/Misc/Sections
+-------------------------------------------------------------------------------
+TestMain.cpp:54
 ...............................................................................
 
 TestMain.cpp:58:
@@ -3512,10 +3512,10 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-TestMain.cpp:96
-
 selftest/parser/2
   default
+-------------------------------------------------------------------------------
+TestMain.cpp:96
 ...............................................................................
 
 TestMain.cpp:98:
@@ -3547,11 +3547,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:107
-
 selftest/parser/2
   test lists
   -t/1
+-------------------------------------------------------------------------------
+TestMain.cpp:107
 ...............................................................................
 
 TestMain.cpp:109:
@@ -3577,11 +3577,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:115
-
 selftest/parser/2
   test lists
   -t/exclude:1
+-------------------------------------------------------------------------------
+TestMain.cpp:115
 ...............................................................................
 
 TestMain.cpp:117:
@@ -3607,11 +3607,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:124
-
 selftest/parser/2
   test lists
   --test/1
+-------------------------------------------------------------------------------
+TestMain.cpp:124
 ...............................................................................
 
 TestMain.cpp:126:
@@ -3637,11 +3637,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:133
-
 selftest/parser/2
   test lists
   --test/exclude:1
+-------------------------------------------------------------------------------
+TestMain.cpp:133
 ...............................................................................
 
 TestMain.cpp:135:
@@ -3667,11 +3667,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:142
-
 selftest/parser/2
   test lists
   --test/exclude:2
+-------------------------------------------------------------------------------
+TestMain.cpp:142
 ...............................................................................
 
 TestMain.cpp:144:
@@ -3697,11 +3697,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:151
-
 selftest/parser/2
   test lists
   -t/2
+-------------------------------------------------------------------------------
+TestMain.cpp:151
 ...............................................................................
 
 TestMain.cpp:153:
@@ -3733,11 +3733,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:161
-
 selftest/parser/2
   test lists
   -t/0
+-------------------------------------------------------------------------------
+TestMain.cpp:161
 ...............................................................................
 
 TestMain.cpp:163:
@@ -3748,11 +3748,11 @@ with expansion:
   least 1"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:168
-
 selftest/parser/2
   reporter
   -r/console
+-------------------------------------------------------------------------------
+TestMain.cpp:168
 ...............................................................................
 
 TestMain.cpp:170:
@@ -3766,11 +3766,11 @@ with expansion:
   "console" == "console"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:174
-
 selftest/parser/2
   reporter
   -r/xml
+-------------------------------------------------------------------------------
+TestMain.cpp:174
 ...............................................................................
 
 TestMain.cpp:176:
@@ -3784,11 +3784,11 @@ with expansion:
   "xml" == "xml"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:180
-
 selftest/parser/2
   reporter
   --reporter/junit
+-------------------------------------------------------------------------------
+TestMain.cpp:180
 ...............................................................................
 
 TestMain.cpp:182:
@@ -3802,26 +3802,26 @@ with expansion:
   "junit" == "junit"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:186
-
 selftest/parser/2
   reporter
   -r/error
+-------------------------------------------------------------------------------
+TestMain.cpp:186
 ...............................................................................
 
 TestMain.cpp:188:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) )
 with expansion:
-  "Error while parsing arguments. Expected 1 argument. Arguments were: one
-  two" contains: "1 argument"
+  "Error while parsing arguments. Expected 1 argument. Arguments were: one two"
+  contains: "1 argument"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:193
-
 selftest/parser/2
   debugger
   -b
+-------------------------------------------------------------------------------
+TestMain.cpp:193
 ...............................................................................
 
 TestMain.cpp:195:
@@ -3835,11 +3835,11 @@ with expansion:
   true == true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:199
-
 selftest/parser/2
   debugger
   --break
+-------------------------------------------------------------------------------
+TestMain.cpp:199
 ...............................................................................
 
 TestMain.cpp:201:
@@ -3853,11 +3853,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:205
-
 selftest/parser/2
   debugger
   -b
+-------------------------------------------------------------------------------
+TestMain.cpp:205
 ...............................................................................
 
 TestMain.cpp:207:
@@ -3868,11 +3868,11 @@ with expansion:
   unexpected" contains: "0 arguments"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:212
-
 selftest/parser/2
   abort
   -a
+-------------------------------------------------------------------------------
+TestMain.cpp:212
 ...............................................................................
 
 TestMain.cpp:214:
@@ -3886,11 +3886,11 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-TestMain.cpp:218
-
 selftest/parser/2
   abort
   -a/2
+-------------------------------------------------------------------------------
+TestMain.cpp:218
 ...............................................................................
 
 TestMain.cpp:220:
@@ -3904,41 +3904,41 @@ with expansion:
   2 == 2
 
 -------------------------------------------------------------------------------
-TestMain.cpp:224
-
 selftest/parser/2
   abort
   -a/error/0
+-------------------------------------------------------------------------------
+TestMain.cpp:224
 ...............................................................................
 
 TestMain.cpp:226:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
 with expansion:
-  "Error while parsing arguments. threshold must be a number greater than zero
-  . Arguments were: 0" contains: "greater than zero"
+  "Error while parsing arguments. threshold must be a number greater than zero.
+  Arguments were: 0" contains: "greater than zero"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:228
-
 selftest/parser/2
   abort
   -a/error/non numeric
+-------------------------------------------------------------------------------
+TestMain.cpp:228
 ...............................................................................
 
 TestMain.cpp:230:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
 with expansion:
-  "Error while parsing arguments. threshold must be a number greater than zero
-  . Arguments were: oops" contains: "greater than zero"
+  "Error while parsing arguments. threshold must be a number greater than zero.
+  Arguments were: oops" contains: "greater than zero"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:232
-
 selftest/parser/2
   abort
   -a/error/two args
+-------------------------------------------------------------------------------
+TestMain.cpp:232
 ...............................................................................
 
 TestMain.cpp:234:
@@ -3949,11 +3949,11 @@ with expansion:
   were: 1 2" contains: "0 and 1 argument"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:239
-
 selftest/parser/2
   nothrow
   -nt
+-------------------------------------------------------------------------------
+TestMain.cpp:239
 ...............................................................................
 
 TestMain.cpp:241:
@@ -3967,11 +3967,11 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:245
-
 selftest/parser/2
   nothrow
   --nothrow
+-------------------------------------------------------------------------------
+TestMain.cpp:245
 ...............................................................................
 
 TestMain.cpp:247:
@@ -3985,11 +3985,11 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:254
-
 selftest/parser/2
   streams
   -o filename
+-------------------------------------------------------------------------------
+TestMain.cpp:254
 ...............................................................................
 
 TestMain.cpp:256:
@@ -4009,11 +4009,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:261
-
 selftest/parser/2
   streams
   -o %stdout
+-------------------------------------------------------------------------------
+TestMain.cpp:261
 ...............................................................................
 
 TestMain.cpp:263:
@@ -4033,11 +4033,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:268
-
 selftest/parser/2
   streams
   --out
+-------------------------------------------------------------------------------
+TestMain.cpp:268
 ...............................................................................
 
 TestMain.cpp:270:
@@ -4051,11 +4051,11 @@ with expansion:
   "filename.ext" == "filename.ext"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:277
-
 selftest/parser/2
   combinations
   -a -b
+-------------------------------------------------------------------------------
+TestMain.cpp:277
 ...............................................................................
 
 TestMain.cpp:279:
@@ -4081,9 +4081,9 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:288
-
 selftest/test filter
+-------------------------------------------------------------------------------
+TestMain.cpp:288
 ...............................................................................
 
 TestMain.cpp:292:
@@ -4123,9 +4123,9 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:305
-
 selftest/test filters
+-------------------------------------------------------------------------------
+TestMain.cpp:305
 ...............................................................................
 
 TestMain.cpp:313:
@@ -4153,9 +4153,9 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:320
-
 selftest/filter/prefix wildcard
+-------------------------------------------------------------------------------
+TestMain.cpp:320
 ...............................................................................
 
 TestMain.cpp:323:
@@ -4171,9 +4171,9 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:326
-
 selftest/filter/wildcard at both ends
+-------------------------------------------------------------------------------
+TestMain.cpp:326
 ...............................................................................
 
 TestMain.cpp:329:
@@ -4201,9 +4201,9 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:341
-
 selftest/option parsers
+-------------------------------------------------------------------------------
+TestMain.cpp:341
 ...............................................................................
 
 TestMain.cpp:352:
@@ -4229,10 +4229,10 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:367
-
 selftest/tags
   one tag
+-------------------------------------------------------------------------------
+TestMain.cpp:367
 ...............................................................................
 
 TestMain.cpp:370:
@@ -4284,10 +4284,10 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:381
-
 selftest/tags
   two tags
+-------------------------------------------------------------------------------
+TestMain.cpp:381
 ...............................................................................
 
 TestMain.cpp:384:
@@ -4357,10 +4357,10 @@ with expansion:
   true == true
 
 -------------------------------------------------------------------------------
-TestMain.cpp:398
-
 selftest/tags
   one tag with characters either side
+-------------------------------------------------------------------------------
+TestMain.cpp:398
 ...............................................................................
 
 TestMain.cpp:401:
@@ -4388,10 +4388,10 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-TestMain.cpp:407
-
 selftest/tags
   start of a tag, but not closed
+-------------------------------------------------------------------------------
+TestMain.cpp:407
 ...............................................................................
 
 TestMain.cpp:411:
@@ -4413,10 +4413,10 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-TestMain.cpp:416
-
 selftest/tags
   hidden
+-------------------------------------------------------------------------------
+TestMain.cpp:416
 ...............................................................................
 
 TestMain.cpp:419:
@@ -4444,40 +4444,40 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TestMain.cpp:434
-
 Long strings can be wrapped
   plain string
   No wrapping
+-------------------------------------------------------------------------------
+TestMain.cpp:435
 ...............................................................................
 
-TestMain.cpp:435:
+TestMain.cpp:436:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString )
+  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
   "one two three four"
   ==
   "one two three four"
 
-TestMain.cpp:436:
+TestMain.cpp:437:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString )
+  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
   "one two three four"
   ==
   "one two three four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:438
-
 Long strings can be wrapped
   plain string
   Wrapped once
+-------------------------------------------------------------------------------
+TestMain.cpp:439
 ...............................................................................
 
-TestMain.cpp:439:
+TestMain.cpp:440:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 17 ).wrap( testString ).toString() == "one two three\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" )
 with expansion:
   "one two three
   four"
@@ -4485,9 +4485,9 @@ with expansion:
   "one two three
   four"
 
-TestMain.cpp:440:
+TestMain.cpp:441:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 16 ).wrap( testString ).toString() == "one two three\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" )
 with expansion:
   "one two three
   four"
@@ -4495,9 +4495,9 @@ with expansion:
   "one two three
   four"
 
-TestMain.cpp:441:
+TestMain.cpp:442:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 15 ).wrap( testString ).toString() == "one two three\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" )
 with expansion:
   "one two three
   four"
@@ -4505,9 +4505,9 @@ with expansion:
   "one two three
   four"
 
-TestMain.cpp:442:
+TestMain.cpp:443:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 14 ).wrap( testString ).toString() == "one two three\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" )
 with expansion:
   "one two three
   four"
@@ -4515,9 +4515,9 @@ with expansion:
   "one two three
   four"
 
-TestMain.cpp:443:
+TestMain.cpp:444:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 13 ).wrap( testString ).toString() == "one two\nthree four" )
+  CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" )
 with expansion:
   "one two
   three four"
@@ -4526,16 +4526,16 @@ with expansion:
   three four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:445
-
 Long strings can be wrapped
   plain string
   Wrapped twice
+-------------------------------------------------------------------------------
+TestMain.cpp:446
 ...............................................................................
 
-TestMain.cpp:446:
+TestMain.cpp:447:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
   "one two
   three
@@ -4545,9 +4545,9 @@ with expansion:
   three
   four"
 
-TestMain.cpp:447:
+TestMain.cpp:448:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
   "one two
   three
@@ -4557,17 +4557,29 @@ with expansion:
   three
   four"
 
--------------------------------------------------------------------------------
-TestMain.cpp:449
+TestMain.cpp:449:
+PASSED:
+  CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
+with expansion:
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
 
+-------------------------------------------------------------------------------
 Long strings can be wrapped
   plain string
   Wrapped three times
+-------------------------------------------------------------------------------
+TestMain.cpp:451
 ...............................................................................
 
-TestMain.cpp:450:
+TestMain.cpp:452:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
   "one
   two
@@ -4579,9 +4591,9 @@ with expansion:
   three
   four"
 
-TestMain.cpp:451:
+TestMain.cpp:453:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
   "one
   two
@@ -4594,16 +4606,16 @@ with expansion:
   four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:453
-
 Long strings can be wrapped
   plain string
   Short wrap
+-------------------------------------------------------------------------------
+TestMain.cpp:455
 ...............................................................................
 
-TestMain.cpp:454:
+TestMain.cpp:456:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" )
+  CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" )
 with expansion:
   "abc-
   def"
@@ -4611,9 +4623,9 @@ with expansion:
   "abc-
   def"
 
-TestMain.cpp:455:
+TestMain.cpp:457:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" )
+  CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" )
 with expansion:
   "abc-
   defg"
@@ -4621,9 +4633,9 @@ with expansion:
   "abc-
   defg"
 
-TestMain.cpp:456:
+TestMain.cpp:458:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" )
+  CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" )
 with expansion:
   "abc-
   def-
@@ -4633,9 +4645,9 @@ with expansion:
   def-
   gh"
 
-TestMain.cpp:458:
+TestMain.cpp:460:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" )
 with expansion:
   "one
   two
@@ -4649,9 +4661,9 @@ with expansion:
   ee
   four"
 
-TestMain.cpp:459:
+TestMain.cpp:461:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" )
+  CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" )
 with expansion:
   "one
   two
@@ -4668,54 +4680,54 @@ with expansion:
   ur"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:461
-
 Long strings can be wrapped
   plain string
   As container
+-------------------------------------------------------------------------------
+TestMain.cpp:463
 ...............................................................................
 
-TestMain.cpp:464:
+TestMain.cpp:465:
 PASSED:
-  CHECK( wrapper.size() == 4 )
+  REQUIRE( text.size() == 4 )
 with expansion:
   4 == 4
 
-TestMain.cpp:465:
+TestMain.cpp:466:
 PASSED:
-  CHECK( wrapper[0] == "one" )
+  CHECK( text[0] == "one" )
 with expansion:
   "one" == "one"
 
-TestMain.cpp:466:
+TestMain.cpp:467:
 PASSED:
-  CHECK( wrapper[1] == "two" )
+  CHECK( text[1] == "two" )
 with expansion:
   "two" == "two"
 
-TestMain.cpp:467:
+TestMain.cpp:468:
 PASSED:
-  CHECK( wrapper[2] == "three" )
+  CHECK( text[2] == "three" )
 with expansion:
   "three" == "three"
 
-TestMain.cpp:468:
+TestMain.cpp:469:
 PASSED:
-  CHECK( wrapper[3] == "four" )
+  CHECK( text[3] == "four" )
 with expansion:
   "four" == "four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:470
-
 Long strings can be wrapped
   plain string
   Indent first line differently
+-------------------------------------------------------------------------------
+TestMain.cpp:471
 ...............................................................................
 
-TestMain.cpp:475:
+TestMain.cpp:476:
 PASSED:
-  CHECK( Catch::LineWrapper() .setRight( 10 ) .setIndent( 4 ) .setInitialIndent( 1 ) .wrap( testString ).toString() == " one two\n    three\n    four" )
+  CHECK( text.toString() == " one two\n    three\n    four" )
 with expansion:
   " one two
       three
@@ -4726,16 +4738,16 @@ with expansion:
       four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:485
-
 Long strings can be wrapped
   With newlines
   No wrapping
+-------------------------------------------------------------------------------
+TestMain.cpp:486
 ...............................................................................
 
-TestMain.cpp:486:
+TestMain.cpp:487:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString )
+  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
   "one two
   three four"
@@ -4743,9 +4755,9 @@ with expansion:
   "one two
   three four"
 
-TestMain.cpp:487:
+TestMain.cpp:488:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString )
+  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
   "one two
   three four"
@@ -4753,9 +4765,9 @@ with expansion:
   "one two
   three four"
 
-TestMain.cpp:488:
+TestMain.cpp:489:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 10 ).wrap( testString ).toString() == testString )
+  CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString )
 with expansion:
   "one two
   three four"
@@ -4764,16 +4776,16 @@ with expansion:
   three four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:490
-
 Long strings can be wrapped
   With newlines
   Trailing newline
+-------------------------------------------------------------------------------
+TestMain.cpp:491
 ...............................................................................
 
-TestMain.cpp:491:
+TestMain.cpp:492:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" )
+  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" )
 with expansion:
   "abcdef
   "
@@ -4781,15 +4793,15 @@ with expansion:
   "abcdef
   "
 
-TestMain.cpp:492:
+TestMain.cpp:493:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 6 ).wrap( "abcdef" ).toString() == "abcdef" )
+  CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" )
 with expansion:
   "abcdef" == "abcdef"
 
-TestMain.cpp:493:
+TestMain.cpp:494:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" )
+  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" )
 with expansion:
   "abcdef
   "
@@ -4798,16 +4810,16 @@ with expansion:
   "
 
 -------------------------------------------------------------------------------
-TestMain.cpp:495
-
 Long strings can be wrapped
   With newlines
   Wrapped once
+-------------------------------------------------------------------------------
+TestMain.cpp:496
 ...............................................................................
 
-TestMain.cpp:496:
+TestMain.cpp:497:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
   "one two
   three
@@ -4817,9 +4829,9 @@ with expansion:
   three
   four"
 
-TestMain.cpp:497:
+TestMain.cpp:498:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
   "one two
   three
@@ -4829,9 +4841,9 @@ with expansion:
   three
   four"
 
-TestMain.cpp:498:
+TestMain.cpp:499:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
   "one two
   three
@@ -4842,16 +4854,16 @@ with expansion:
   four"
 
 -------------------------------------------------------------------------------
-TestMain.cpp:500
-
 Long strings can be wrapped
   With newlines
   Wrapped twice
+-------------------------------------------------------------------------------
+TestMain.cpp:501
 ...............................................................................
 
-TestMain.cpp:501:
+TestMain.cpp:502:
 PASSED:
-  CHECK( Catch::LineWrapper().setRight( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" )
+  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
   "one
   two
@@ -4863,21 +4875,64 @@ with expansion:
   three
   four"
 
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  With tabs
+-------------------------------------------------------------------------------
+TestMain.cpp:506
+...............................................................................
+
+TestMain.cpp:512:
+PASSED:
+  CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" )
+with expansion:
+  "one two three
+          four
+          five
+          six"
+  ==
+  "one two three
+          four
+          five
+          six"
+
 hello
 hello
 -------------------------------------------------------------------------------
-TestMain.cpp:604
-
 Strings can be rendered with colour
+-------------------------------------------------------------------------------
+TestMain.cpp:591
 ...............................................................................
 
 
 No assertions in test case, 'Strings can be rendered with colour'
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:32
+Text can be formatted using the Text class
+-------------------------------------------------------------------------------
+TestMain.cpp:610
+...............................................................................
+
+TestMain.cpp:612:
+PASSED:
+  CHECK( Text( "hi there" ).toString() == "hi there" )
+with expansion:
+  "hi there" == "hi there"
 
+TestMain.cpp:617:
+PASSED:
+  CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" )
+with expansion:
+  "hi
+  there"
+  ==
+  "hi
+  there"
+
+-------------------------------------------------------------------------------
 ./succeeding/Tricky/std::pair
+-------------------------------------------------------------------------------
+TrickyTests.cpp:32
 ...............................................................................
 
 TrickyTests.cpp:37:
@@ -4887,9 +4942,9 @@ with expansion:
   std::pair( 1, 2 ) == std::pair( 1, 2 )
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:46
-
 ./inprogress/failing/Tricky/trailing expression
+-------------------------------------------------------------------------------
+TrickyTests.cpp:46
 ...............................................................................
 
 TrickyTests.cpp:55:
@@ -4901,9 +4956,9 @@ warning:
 No assertions in test case, './inprogress/failing/Tricky/trailing expression'
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:62
-
 ./inprogress/failing/Tricky/compound lhs
+-------------------------------------------------------------------------------
+TrickyTests.cpp:62
 ...............................................................................
 
 TrickyTests.cpp:71:
@@ -4915,9 +4970,9 @@ warning:
 No assertions in test case, './inprogress/failing/Tricky/compound lhs'
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:88
-
 ./failing/Tricky/non streamable type
+-------------------------------------------------------------------------------
+TrickyTests.cpp:88
 ...............................................................................
 
 TrickyTests.cpp:95: FAILED:
@@ -4931,9 +4986,9 @@ with expansion:
   {?} == {?}
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:104
-
 ./failing/string literals
+-------------------------------------------------------------------------------
+TrickyTests.cpp:104
 ...............................................................................
 
 TrickyTests.cpp:106: FAILED:
@@ -4942,9 +4997,9 @@ with expansion:
   "first" == "second"
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:115
-
 ./succeeding/side-effects
+-------------------------------------------------------------------------------
+TrickyTests.cpp:115
 ...............................................................................
 
 TrickyTests.cpp:119:
@@ -4960,9 +5015,9 @@ with expansion:
   8 == 8
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:183
-
 ./succeeding/koenig
+-------------------------------------------------------------------------------
+TrickyTests.cpp:183
 ...............................................................................
 
 TrickyTests.cpp:186:
@@ -4972,9 +5027,9 @@ with expansion:
   0x<hex digits> == {?}
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:209
-
 ./succeeding/non-const==
+-------------------------------------------------------------------------------
+TrickyTests.cpp:209
 ...............................................................................
 
 TrickyTests.cpp:212:
@@ -4984,9 +5039,9 @@ with expansion:
   {?} == 1
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:222
-
 ./succeeding/enum/bits
+-------------------------------------------------------------------------------
+TrickyTests.cpp:222
 ...............................................................................
 
 TrickyTests.cpp:224:
@@ -4996,9 +5051,9 @@ with expansion:
   0x<hex digits> == 3221225472
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:236
-
 ./succeeding/boolean member
+-------------------------------------------------------------------------------
+TrickyTests.cpp:236
 ...............................................................................
 
 TrickyTests.cpp:239:
@@ -5008,10 +5063,10 @@ with expansion:
   0x<hex digits> != 0
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:257
-
 ./succeeding/unimplemented static bool
   compare to true
+-------------------------------------------------------------------------------
+TrickyTests.cpp:257
 ...............................................................................
 
 TrickyTests.cpp:259:
@@ -5027,10 +5082,10 @@ with expansion:
   true == true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:262
-
 ./succeeding/unimplemented static bool
   compare to false
+-------------------------------------------------------------------------------
+TrickyTests.cpp:262
 ...............................................................................
 
 TrickyTests.cpp:264:
@@ -5046,10 +5101,10 @@ with expansion:
   false == false
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:268
-
 ./succeeding/unimplemented static bool
   negation
+-------------------------------------------------------------------------------
+TrickyTests.cpp:268
 ...............................................................................
 
 TrickyTests.cpp:270:
@@ -5059,10 +5114,10 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:273
-
 ./succeeding/unimplemented static bool
   double negation
+-------------------------------------------------------------------------------
+TrickyTests.cpp:273
 ...............................................................................
 
 TrickyTests.cpp:275:
@@ -5072,10 +5127,10 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:278
-
 ./succeeding/unimplemented static bool
   direct
+-------------------------------------------------------------------------------
+TrickyTests.cpp:278
 ...............................................................................
 
 TrickyTests.cpp:280:
@@ -5091,9 +5146,9 @@ with expansion:
   !false
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:308
-
 ./succeeding/SafeBool
+-------------------------------------------------------------------------------
+TrickyTests.cpp:308
 ...............................................................................
 
 TrickyTests.cpp:313:
@@ -5115,9 +5170,9 @@ with expansion:
   !false
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:318
-
 Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:318
 ...............................................................................
 
 TrickyTests.cpp:323:
@@ -5127,10 +5182,10 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:325
-
 Assertions then sections
   A section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:325
 ...............................................................................
 
 TrickyTests.cpp:327:
@@ -5140,11 +5195,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:329
-
 Assertions then sections
   A section
   Another section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:329
 ...............................................................................
 
 TrickyTests.cpp:331:
@@ -5154,9 +5209,9 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:318
-
 Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:318
 ...............................................................................
 
 TrickyTests.cpp:323:
@@ -5166,10 +5221,10 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:325
-
 Assertions then sections
   A section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:325
 ...............................................................................
 
 TrickyTests.cpp:327:
@@ -5179,11 +5234,11 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-TrickyTests.cpp:333
-
 Assertions then sections
   A section
   Another other section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:333
 ...............................................................................
 
 TrickyTests.cpp:335:
@@ -5193,9 +5248,9 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:12
-
 Anonymous test case 1
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:12
 ...............................................................................
 
 VariadicMacrosTests.cpp:14:
@@ -5204,9 +5259,9 @@ with message:
   anonymous test case
 
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:17
-
 Test case with one argument
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:17
 ...............................................................................
 
 VariadicMacrosTests.cpp:19:
@@ -5215,10 +5270,10 @@ with message:
   no assertions
 
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:24
-
 Variadic macros
   Section with one argument
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:24
 ...............................................................................
 
 VariadicMacrosTests.cpp:26:
@@ -5227,12 +5282,12 @@ with message:
   no assertions
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:19
-
 Scenario: Do that thing with the thing
      Given: This stuff exists
       When: I do this
       Then: it should do this
+-------------------------------------------------------------------------------
+BDDTests.cpp:19
 ...............................................................................
 
 BDDTests.cpp:21:
@@ -5242,13 +5297,13 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:22
-
 Scenario: Do that thing with the thing
      Given: This stuff exists
       When: I do this
       Then: it should do this
        And: do that
+-------------------------------------------------------------------------------
+BDDTests.cpp:22
 ...............................................................................
 
 BDDTests.cpp:23:
@@ -5258,10 +5313,10 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:30
 ...............................................................................
 
 BDDTests.cpp:32:
@@ -5271,12 +5326,12 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:36
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
       When: it is made larger
       Then: the size and capacity go up
+-------------------------------------------------------------------------------
+BDDTests.cpp:36
 ...............................................................................
 
 BDDTests.cpp:37:
@@ -5292,14 +5347,14 @@ with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:42
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
       When: it is made larger
       Then: the size and capacity go up
   And when: it is made smaller again
       Then: the size goes down but the capacity stays the same
+-------------------------------------------------------------------------------
+BDDTests.cpp:42
 ...............................................................................
 
 BDDTests.cpp:43:
@@ -5315,10 +5370,10 @@ with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:30
 ...............................................................................
 
 BDDTests.cpp:32:
@@ -5328,12 +5383,12 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:36
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
       When: it is made larger
       Then: the size and capacity go up
+-------------------------------------------------------------------------------
+BDDTests.cpp:36
 ...............................................................................
 
 BDDTests.cpp:37:
@@ -5349,10 +5404,10 @@ with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:30
 ...............................................................................
 
 BDDTests.cpp:32:
@@ -5362,12 +5417,12 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:36
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
       When: it is made larger
       Then: the size and capacity go up
+-------------------------------------------------------------------------------
+BDDTests.cpp:36
 ...............................................................................
 
 BDDTests.cpp:37:
@@ -5383,10 +5438,10 @@ with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:30
 ...............................................................................
 
 BDDTests.cpp:32:
@@ -5396,10 +5451,10 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:30
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:30
 ...............................................................................
 
 BDDTests.cpp:32:
@@ -5409,12 +5464,12 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:52
-
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
       When: we reserve more space
       Then: The capacity is increased but the size remains the same
+-------------------------------------------------------------------------------
+BDDTests.cpp:52
 ...............................................................................
 
 BDDTests.cpp:53:
@@ -5430,16 +5485,16 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-BDDTests.cpp:66
-
-Scenario: This is a really long scenario name to see how the list command
-          deals with wrapping
+Scenario: This is a really long scenario name to see how the list command deals
+          with wrapping
      Given: A section name that is so long that it cannot fit in a single
             console width
       When: The test headers are printed as part of the normal running of the
             scenario
       Then: The, deliberately very long and overly verbose (you see what I did
             there?) section names must wrap, along with an indent
+-------------------------------------------------------------------------------
+BDDTests.cpp:66
 ...............................................................................
 
 BDDTests.cpp:67:
@@ -5448,7 +5503,7 @@ with message:
   boo!
 
 ===============================================================================
-109 test cases - 48 failed (699 assertions - 105 failed)
+110 test cases - 48 failed (703 assertions - 105 failed)
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -5456,9 +5511,9 @@ CatchSelfTest is a CATCH v0.9 b33 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:16
-
 ./succeeding/Approx/simple
+-------------------------------------------------------------------------------
+ApproxTests.cpp:16
 ...............................................................................
 
 ApproxTests.cpp:20:
@@ -5498,9 +5553,9 @@ with expansion:
   Approx( 1.23 ) != 1.24
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:34
-
 ./succeeding/Approx/epsilon
+-------------------------------------------------------------------------------
+ApproxTests.cpp:34
 ...............................................................................
 
 ApproxTests.cpp:38:
@@ -5516,9 +5571,9 @@ with expansion:
   1.23 == Approx( 1.231 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:47
-
 ./succeeding/Approx/float
+-------------------------------------------------------------------------------
+ApproxTests.cpp:47
 ...............................................................................
 
 ApproxTests.cpp:49:
@@ -5534,9 +5589,9 @@ with expansion:
   0 == Approx( 0 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:58
-
 ./succeeding/Approx/int
+-------------------------------------------------------------------------------
+ApproxTests.cpp:58
 ...............................................................................
 
 ApproxTests.cpp:60:
@@ -5548,9 +5603,9 @@ PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:69
-
 ./succeeding/Approx/mixed
+-------------------------------------------------------------------------------
+ApproxTests.cpp:69
 ...............................................................................
 
 ApproxTests.cpp:75:
@@ -5584,9 +5639,9 @@ with expansion:
   1.234 == Approx( 1.234 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:87
-
 ./succeeding/Approx/custom
+-------------------------------------------------------------------------------
+ApproxTests.cpp:87
 ...............................................................................
 
 ApproxTests.cpp:93:
@@ -5638,9 +5693,9 @@ with expansion:
   Approx( 1.23 ) != 1.25
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:108
-
 Approximate PI
+-------------------------------------------------------------------------------
+ApproxTests.cpp:108
 ...............................................................................
 
 ApproxTests.cpp:110:
@@ -5656,9 +5711,9 @@ with expansion:
   3.142857142857143 != Approx( 3.141 )
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:34
-
 ./succeeding/TestClass/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:34
 ...............................................................................
 
 ClassTests.cpp:24:
@@ -5668,9 +5723,9 @@ with expansion:
   "hello" == "hello"
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:35
-
 ./failing/TestClass/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:35
 ...............................................................................
 
 ClassTests.cpp:28: FAILED:
@@ -5679,9 +5734,9 @@ with expansion:
   "hello" == "world"
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:45
-
 ./succeeding/Fixture/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:45
 ...............................................................................
 
 ClassTests.cpp:47:
@@ -5691,9 +5746,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:53
-
 ./failing/Fixture/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:53
 ...............................................................................
 
 ClassTests.cpp:55: FAILED:
@@ -5702,9 +5757,9 @@ with expansion:
   1 == 2
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:47
-
 ./succeeding/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:47
 ...............................................................................
 
 ConditionTests.cpp:55:
@@ -5750,9 +5805,9 @@ with expansion:
   1.3 == Approx( 1.3 )
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:67
-
 ./failing/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:67
 ...............................................................................
 
 ConditionTests.cpp:71: FAILED:
@@ -5769,7 +5824,7 @@ with expansion:
 13 test cases - 3 failed (40 assertions - 4 failed)
 
 <testsuites>
-  <testsuite name="~dummy" errors="9" failures="78" tests="699" hostname="tbd" time="tbd" timestamp="tbd">
+  <testsuite name="~dummy" errors="9" failures="78" tests="703" hostname="tbd" time="tbd" timestamp="tbd">
     <testcase classname="global" name="./succeeding/Approx/simple" time="tbd"/>
     <testcase classname="global" name="./succeeding/Approx/epsilon" time="tbd"/>
     <testcase classname="global" name="./succeeding/Approx/float" time="tbd"/>
@@ -6230,6 +6285,7 @@ hello
 hello
       </system-out>
     </testcase>
+    <testcase classname="global" name="Text can be formatted using the Text class" time="tbd"/>
     <testcase classname="global" name="./succeeding/Tricky/std::pair" time="tbd"/>
     <testcase classname="global" name="./inprogress/failing/Tricky/trailing expression" time="tbd">
       <warning type="WARN">
@@ -11117,9 +11173,9 @@ TestMain.cpp" line="423">
     <TestCase name="Long strings can be wrapped">
       <Section name="plain string">
         <Section name="No wrapping">
-TestMain.cpp" line="435">
+TestMain.cpp" line="436">
             <Original>
-              Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString
+              Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
             <Expanded>
               &quot;one two three four&quot;
@@ -11127,9 +11183,9 @@ TestMain.cpp" line="435">
 &quot;one two three four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="436">
+TestMain.cpp" line="437">
             <Original>
-              Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString
+              Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
             <Expanded>
               &quot;one two three four&quot;
@@ -11143,9 +11199,9 @@ TestMain.cpp" line="436">
       </Section>
       <Section name="plain string">
         <Section name="Wrapped once">
-TestMain.cpp" line="439">
+TestMain.cpp" line="440">
             <Original>
-              Catch::LineWrapper().setRight( 17 ).wrap( testString ).toString() == &quot;one two three\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 17 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two three
@@ -11155,9 +11211,9 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="440">
+TestMain.cpp" line="441">
             <Original>
-              Catch::LineWrapper().setRight( 16 ).wrap( testString ).toString() == &quot;one two three\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 16 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two three
@@ -11167,9 +11223,9 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="441">
+TestMain.cpp" line="442">
             <Original>
-              Catch::LineWrapper().setRight( 15 ).wrap( testString ).toString() == &quot;one two three\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 14 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two three
@@ -11179,9 +11235,9 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="442">
+TestMain.cpp" line="443">
             <Original>
-              Catch::LineWrapper().setRight( 14 ).wrap( testString ).toString() == &quot;one two three\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 13 ) ).toString() == &quot;one two three\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two three
@@ -11191,9 +11247,9 @@ four&quot;
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="443">
+TestMain.cpp" line="444">
             <Original>
-              Catch::LineWrapper().setRight( 13 ).wrap( testString ).toString() == &quot;one two\nthree four&quot;
+              Text( testString, TextAttributes().setWidth( 12 ) ).toString() == &quot;one two\nthree four&quot;
             </Original>
             <Expanded>
               &quot;one two
@@ -11209,9 +11265,9 @@ three four&quot;
       </Section>
       <Section name="plain string">
         <Section name="Wrapped twice">
-TestMain.cpp" line="446">
+TestMain.cpp" line="447">
             <Original>
-              Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == &quot;one two\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two
@@ -11223,9 +11279,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="447">
+TestMain.cpp" line="448">
             <Original>
-              Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == &quot;one two\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two
@@ -11237,15 +11293,29 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+TestMain.cpp" line="449">
+            <Original>
+              Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="3" failures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="3" failures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="Wrapped three times">
-TestMain.cpp" line="450">
+TestMain.cpp" line="452">
             <Original>
-              Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == &quot;one\ntwo\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one
@@ -11259,9 +11329,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="451">
+TestMain.cpp" line="453">
             <Original>
-              Catch::LineWrapper().setRight( 5 ).wrap( testString ).toString() == &quot;one\ntwo\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 5 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one
@@ -11281,9 +11351,9 @@ four&quot;
       </Section>
       <Section name="plain string">
         <Section name="Short wrap">
-TestMain.cpp" line="454">
+TestMain.cpp" line="456">
             <Original>
-              Catch::LineWrapper().setRight( 4 ).wrap( &quot;abcdef&quot; ).toString() == &quot;abc-\ndef&quot;
+              Text( &quot;abcdef&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef&quot;
             </Original>
             <Expanded>
               &quot;abc-
@@ -11293,9 +11363,9 @@ def&quot;
 def&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="455">
+TestMain.cpp" line="457">
             <Original>
-              Catch::LineWrapper().setRight( 4 ).wrap( &quot;abcdefg&quot; ).toString() == &quot;abc-\ndefg&quot;
+              Text( &quot;abcdefg&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndefg&quot;
             </Original>
             <Expanded>
               &quot;abc-
@@ -11305,9 +11375,9 @@ defg&quot;
 defg&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="456">
+TestMain.cpp" line="458">
             <Original>
-              Catch::LineWrapper().setRight( 4 ).wrap(&quot;abcdefgh&quot; ).toString() == &quot;abc-\ndef-\ngh&quot;
+              Text( &quot;abcdefgh&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef-\ngh&quot;
             </Original>
             <Expanded>
               &quot;abc-
@@ -11319,9 +11389,9 @@ def-
 gh&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="458">
+TestMain.cpp" line="460">
             <Original>
-              Catch::LineWrapper().setRight( 4 ).wrap( testString ).toString() == &quot;one\ntwo\nthr-\nee\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 4 ) ).toString() == &quot;one\ntwo\nthr-\nee\nfour&quot;
             </Original>
             <Expanded>
               &quot;one
@@ -11337,9 +11407,9 @@ ee
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="459">
+TestMain.cpp" line="461">
             <Original>
-              Catch::LineWrapper().setRight( 3 ).wrap( testString ).toString() == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
+              Text( testString, TextAttributes().setWidth( 3 ) ).toString() == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
             </Original>
             <Expanded>
               &quot;one
@@ -11363,41 +11433,41 @@ ur&quot;
       </Section>
       <Section name="plain string">
         <Section name="As container">
-TestMain.cpp" line="464">
+TestMain.cpp" line="465">
             <Original>
-              wrapper.size() == 4
+              text.size() == 4
             </Original>
             <Expanded>
               4 == 4
             </Expanded>
           </Expression>
-TestMain.cpp" line="465">
+TestMain.cpp" line="466">
             <Original>
-              wrapper[0] == &quot;one&quot;
+              text[0] == &quot;one&quot;
             </Original>
             <Expanded>
               &quot;one&quot; == &quot;one&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="466">
+TestMain.cpp" line="467">
             <Original>
-              wrapper[1] == &quot;two&quot;
+              text[1] == &quot;two&quot;
             </Original>
             <Expanded>
               &quot;two&quot; == &quot;two&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="467">
+TestMain.cpp" line="468">
             <Original>
-              wrapper[2] == &quot;three&quot;
+              text[2] == &quot;three&quot;
             </Original>
             <Expanded>
               &quot;three&quot; == &quot;three&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="468">
+TestMain.cpp" line="469">
             <Original>
-              wrapper[3] == &quot;four&quot;
+              text[3] == &quot;four&quot;
             </Original>
             <Expanded>
               &quot;four&quot; == &quot;four&quot;
@@ -11409,9 +11479,9 @@ TestMain.cpp" line="468">
       </Section>
       <Section name="plain string">
         <Section name="Indent first line differently">
-TestMain.cpp" line="475">
+TestMain.cpp" line="476">
             <Original>
-              Catch::LineWrapper() .setRight( 10 ) .setIndent( 4 ) .setInitialIndent( 1 ) .wrap( testString ).toString() == &quot; one two\n    three\n    four&quot;
+              text.toString() == &quot; one two\n    three\n    four&quot;
             </Original>
             <Expanded>
               &quot; one two
@@ -11432,9 +11502,9 @@ TestMain.cpp" line="475">
       </Section>
       <Section name="With newlines">
         <Section name="No wrapping">
-TestMain.cpp" line="486">
+TestMain.cpp" line="487">
             <Original>
-              Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString
+              Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
             </Original>
             <Expanded>
               &quot;one two
@@ -11444,9 +11514,9 @@ three four&quot;
 three four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="487">
+TestMain.cpp" line="488">
             <Original>
-              Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString
+              Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
             </Original>
             <Expanded>
               &quot;one two
@@ -11456,9 +11526,9 @@ three four&quot;
 three four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="488">
+TestMain.cpp" line="489">
             <Original>
-              Catch::LineWrapper().setRight( 10 ).wrap( testString ).toString() == testString
+              Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString
             </Original>
             <Expanded>
               &quot;one two
@@ -11474,9 +11544,9 @@ three four&quot;
       </Section>
       <Section name="With newlines">
         <Section name="Trailing newline">
-TestMain.cpp" line="491">
+TestMain.cpp" line="492">
             <Original>
-              Catch::LineWrapper().setRight( 10 ).wrap( &quot;abcdef\n&quot; ).toString() == &quot;abcdef\n&quot;
+              Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 10 ) ).toString() == &quot;abcdef\n&quot;
             </Original>
             <Expanded>
               &quot;abcdef
@@ -11486,17 +11556,17 @@ TestMain.cpp" line="491">
 &quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="492">
+TestMain.cpp" line="493">
             <Original>
-              Catch::LineWrapper().setRight( 6 ).wrap( &quot;abcdef&quot; ).toString() == &quot;abcdef&quot;
+              Text( &quot;abcdef&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef&quot;
             </Original>
             <Expanded>
               &quot;abcdef&quot; == &quot;abcdef&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="493">
+TestMain.cpp" line="494">
             <Original>
-              Catch::LineWrapper().setRight( 6 ).wrap( &quot;abcdef\n&quot; ).toString() == &quot;abcdef\n&quot;
+              Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef\n&quot;
             </Original>
             <Expanded>
               &quot;abcdef
@@ -11512,9 +11582,9 @@ TestMain.cpp" line="493">
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped once">
-TestMain.cpp" line="496">
+TestMain.cpp" line="497">
             <Original>
-              Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == &quot;one two\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two
@@ -11526,9 +11596,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="497">
+TestMain.cpp" line="498">
             <Original>
-              Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == &quot;one two\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two
@@ -11540,9 +11610,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="498">
+TestMain.cpp" line="499">
             <Original>
-              Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == &quot;one two\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one two
@@ -11560,9 +11630,9 @@ four&quot;
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped twice">
-TestMain.cpp" line="501">
+TestMain.cpp" line="502">
             <Original>
-              Catch::LineWrapper().setRight( 6 ).wrap( testString ).toString() == &quot;one\ntwo\nthree\nfour&quot;
+              Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
             </Original>
             <Expanded>
               &quot;one
@@ -11580,11 +11650,56 @@ four&quot;
         </Section>
         <OverallResults successes="1" failures="0"/>
       </Section>
+      <Section name="With newlines">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="With tabs">
+TestMain.cpp" line="512">
+          <Original>
+            Text( testString, TextAttributes().setWidth( 15 ) ).toString() == &quot;one two three\n        four\n        five\n        six&quot;
+          </Original>
+          <Expanded>
+            &quot;one two three
+        four
+        five
+        six&quot;
+==
+&quot;one two three
+        four
+        five
+        six&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Strings can be rendered with colour">
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="Text can be formatted using the Text class">
+TestMain.cpp" line="612">
+        <Original>
+          Text( &quot;hi there&quot; ).toString() == &quot;hi there&quot;
+        </Original>
+        <Expanded>
+          &quot;hi there&quot; == &quot;hi there&quot;
+        </Expanded>
+      </Expression>
+TestMain.cpp" line="617">
+        <Original>
+          Text( &quot;hi there&quot;, narrow ).toString() == &quot;hi\nthere&quot;
+        </Original>
+        <Expanded>
+          &quot;hi
+there&quot;
+==
+&quot;hi
+there&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="./succeeding/Tricky/std::pair">
 TrickyTests.cpp" line="37">
         <Original>
@@ -12102,9 +12217,9 @@ BDDTests.cpp" line="54">
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="594" failures="105"/>
+    <OverallResults successes="598" failures="105"/>
   </Group>
-  <OverallResults successes="594" failures="105"/>
+  <OverallResults successes="598" failures="105"/>
 </Catch>
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']
@@ -13426,11 +13541,11 @@ TestMain.cpp:423: oneTag.matchesTags( "~[hide]" ) == false succeeded for: false
 [Running: Long strings can be wrapped]
 [Started section: 'plain string']
 [Started section: 'No wrapping']
-TestMain.cpp:435: Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString succeeded for:
+TestMain.cpp:436: Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString succeeded for:
 	"one two three four"
 ==
 "one two three four"
-TestMain.cpp:436: Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString succeeded for:
+TestMain.cpp:437: Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString succeeded for:
 	"one two three four"
 ==
 "one two three four"
@@ -13440,31 +13555,31 @@ TestMain.cpp:436: Catch::LineWrapper().setRight( 18 ).wrap( testString ).toStrin
 
 [Started section: 'plain string']
 [Started section: 'Wrapped once']
-TestMain.cpp:439: Catch::LineWrapper().setRight( 17 ).wrap( testString ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp:440: Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:440: Catch::LineWrapper().setRight( 16 ).wrap( testString ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp:441: Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:441: Catch::LineWrapper().setRight( 15 ).wrap( testString ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp:442: Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:442: Catch::LineWrapper().setRight( 14 ).wrap( testString ).toString() == "one two three\nfour" succeeded for:
+TestMain.cpp:443: Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" succeeded for:
 	"one two three
 four"
 ==
 "one two three
 four"
-TestMain.cpp:443: Catch::LineWrapper().setRight( 13 ).wrap( testString ).toString() == "one two\nthree four" succeeded for:
+TestMain.cpp:444: Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" succeeded for:
 	"one two
 three four"
 ==
@@ -13476,7 +13591,15 @@ three four"
 
 [Started section: 'plain string']
 [Started section: 'Wrapped twice']
-TestMain.cpp:446: Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp:447: Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" succeeded for:
+	"one two
+three
+four"
+==
+"one two
+three
+four"
+TestMain.cpp:448: Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -13484,7 +13607,7 @@ four"
 "one two
 three
 four"
-TestMain.cpp:447: Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp:449: Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -13492,13 +13615,13 @@ four"
 "one two
 three
 four"
-[End of section: 'Wrapped twice' All 2 assertions passed]
+[End of section: 'Wrapped twice' All 3 assertions passed]
 
-[End of section: 'plain string' All 2 assertions passed]
+[End of section: 'plain string' All 3 assertions passed]
 
 [Started section: 'plain string']
 [Started section: 'Wrapped three times']
-TestMain.cpp:450: Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for:
+TestMain.cpp:452: Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
 	"one
 two
 three
@@ -13508,7 +13631,7 @@ four"
 two
 three
 four"
-TestMain.cpp:451: Catch::LineWrapper().setRight( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for:
+TestMain.cpp:453: Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
 	"one
 two
 three
@@ -13524,24 +13647,24 @@ four"
 
 [Started section: 'plain string']
 [Started section: 'Short wrap']
-TestMain.cpp:454: Catch::LineWrapper().setRight( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" succeeded for: "abc-
+TestMain.cpp:456: Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" succeeded for: "abc-
 def"
 ==
 "abc-
 def"
-TestMain.cpp:455: Catch::LineWrapper().setRight( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" succeeded for: "abc-
+TestMain.cpp:457: Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" succeeded for: "abc-
 defg"
 ==
 "abc-
 defg"
-TestMain.cpp:456: Catch::LineWrapper().setRight( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" succeeded for: "abc-
+TestMain.cpp:458: Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" succeeded for: "abc-
 def-
 gh"
 ==
 "abc-
 def-
 gh"
-TestMain.cpp:458: Catch::LineWrapper().setRight( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" succeeded for:
+TestMain.cpp:460: Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" succeeded for:
 	"one
 two
 thr-
@@ -13553,7 +13676,7 @@ two
 thr-
 ee
 four"
-TestMain.cpp:459: Catch::LineWrapper().setRight( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" succeeded for:
+TestMain.cpp:461: Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" succeeded for:
 	"one
 two
 th-
@@ -13573,18 +13696,18 @@ ur"
 
 [Started section: 'plain string']
 [Started section: 'As container']
-TestMain.cpp:464: wrapper.size() == 4 succeeded for: 4 == 4
-TestMain.cpp:465: wrapper[0] == "one" succeeded for: "one" == "one"
-TestMain.cpp:466: wrapper[1] == "two" succeeded for: "two" == "two"
-TestMain.cpp:467: wrapper[2] == "three" succeeded for: "three" == "three"
-TestMain.cpp:468: wrapper[3] == "four" succeeded for: "four" == "four"
+TestMain.cpp:465: text.size() == 4 succeeded for: 4 == 4
+TestMain.cpp:466: text[0] == "one" succeeded for: "one" == "one"
+TestMain.cpp:467: text[1] == "two" succeeded for: "two" == "two"
+TestMain.cpp:468: text[2] == "three" succeeded for: "three" == "three"
+TestMain.cpp:469: text[3] == "four" succeeded for: "four" == "four"
 [End of section: 'As container' All 5 assertions passed]
 
 [End of section: 'plain string' All 5 assertions passed]
 
 [Started section: 'plain string']
 [Started section: 'Indent first line differently']
-TestMain.cpp:475: Catch::LineWrapper() .setRight( 10 ) .setIndent( 4 ) .setInitialIndent( 1 ) .wrap( testString ).toString() == " one two\n    three\n    four" succeeded for:
+TestMain.cpp:476: text.toString() == " one two\n    three\n    four" succeeded for:
 	" one two
     three
     four"
@@ -13598,19 +13721,19 @@ TestMain.cpp:475: Catch::LineWrapper() .setRight( 10 ) .setIndent( 4 ) .setIniti
 
 [Started section: 'With newlines']
 [Started section: 'No wrapping']
-TestMain.cpp:486: Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString succeeded for:
+TestMain.cpp:487: Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString succeeded for:
 	"one two
 three four"
 ==
 "one two
 three four"
-TestMain.cpp:487: Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString succeeded for:
+TestMain.cpp:488: Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString succeeded for:
 	"one two
 three four"
 ==
 "one two
 three four"
-TestMain.cpp:488: Catch::LineWrapper().setRight( 10 ).wrap( testString ).toString() == testString succeeded for:
+TestMain.cpp:489: Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString succeeded for:
 	"one two
 three four"
 ==
@@ -13622,13 +13745,13 @@ three four"
 
 [Started section: 'With newlines']
 [Started section: 'Trailing newline']
-TestMain.cpp:491: Catch::LineWrapper().setRight( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" succeeded for: "abcdef
+TestMain.cpp:492: Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" succeeded for: "abcdef
 "
 ==
 "abcdef
 "
-TestMain.cpp:492: Catch::LineWrapper().setRight( 6 ).wrap( "abcdef" ).toString() == "abcdef" succeeded for: "abcdef" == "abcdef"
-TestMain.cpp:493: Catch::LineWrapper().setRight( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" succeeded for: "abcdef
+TestMain.cpp:493: Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" succeeded for: "abcdef" == "abcdef"
+TestMain.cpp:494: Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" succeeded for: "abcdef
 "
 ==
 "abcdef
@@ -13639,7 +13762,7 @@ TestMain.cpp:493: Catch::LineWrapper().setRight( 6 ).wrap( "abcdef\n" ).toString
 
 [Started section: 'With newlines']
 [Started section: 'Wrapped once']
-TestMain.cpp:496: Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp:497: Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -13647,7 +13770,7 @@ four"
 "one two
 three
 four"
-TestMain.cpp:497: Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp:498: Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -13655,7 +13778,7 @@ four"
 "one two
 three
 four"
-TestMain.cpp:498: Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for:
+TestMain.cpp:499: Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" succeeded for:
 	"one two
 three
 four"
@@ -13669,7 +13792,7 @@ four"
 
 [Started section: 'With newlines']
 [Started section: 'Wrapped twice']
-TestMain.cpp:501: Catch::LineWrapper().setRight( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for:
+TestMain.cpp:502: Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" succeeded for:
 	"one
 two
 three
@@ -13683,7 +13806,20 @@ four"
 
 [End of section: 'With newlines' 1 assertion passed]
 
-[Finished: 'Long strings can be wrapped' All tests passed (32 assertions in 1 test case)]
+[Started section: 'With tabs']
+TestMain.cpp:512: Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" succeeded for:
+"one two three
+        four
+        five
+        six"
+==
+"one two three
+        four
+        five
+        six"
+[End of section: 'With tabs' 1 assertion passed]
+
+[Finished: 'Long strings can be wrapped' All tests passed (34 assertions in 1 test case)]
 hello
 hello
 
@@ -13693,6 +13829,15 @@ No assertions in test case, 'Strings can be rendered with colour'
 
 [Finished: 'Strings can be rendered with colour' 1 test case failed (1 assertion failed)]
 
+[Running: Text can be formatted using the Text class]
+TestMain.cpp:612: Text( "hi there" ).toString() == "hi there" succeeded for: "hi there" == "hi there"
+TestMain.cpp:617: Text( "hi there", narrow ).toString() == "hi\nthere" succeeded for: "hi
+there"
+==
+"hi
+there"
+[Finished: 'Text can be formatted using the Text class' All tests passed (2 assertions in 1 test case)]
+
 [Running: ./succeeding/Tricky/std::pair]
 TrickyTests.cpp:37: (std::pair<int, int>( 1, 2 )) == aNicePair succeeded for: std::pair( 1, 2 ) == std::pair( 1, 2 )
 [Finished: './succeeding/Tricky/std::pair' All tests passed (1 assertion in 1 test case)]
@@ -13905,10 +14050,10 @@ BDDTests.cpp:67:  succeeded
 [End of section: '   Given: A section name that is so long that it cannot fit in a single console width' 1 assertion passed]
 
 [Finished: 'Scenario: This is a really long scenario name to see how the list command deals with wrapping' All tests passed (1 assertion in 1 test case)]
-[End of group: '~dummy'. 48 of 109 test cases failed (105 of 699 assertions failed)]
+[End of group: '~dummy'. 48 of 110 test cases failed (105 of 703 assertions failed)]
 
 
-[Testing completed. 48 of 109 test cases failed (105 of 699 assertions failed)]
+[Testing completed. 48 of 110 test cases failed (105 of 703 assertions failed)]
 
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index 19e8f68b..e6e4faf9 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -10,7 +10,6 @@
 #endif
 
 #include "catch_self_test.hpp"
-#include "internal/catch_line_wrap.h"
 #include "internal/catch_text.h"
 
 TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" ) {
diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
index 347234fb..37f2f351 100644
--- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
+++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
@@ -10,7 +10,7 @@
 		266B06B816F3A60A004ED264 /* VariadicMacrosTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */; };
 		266ECD74170F3C620030D735 /* BDDTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266ECD73170F3C620030D735 /* BDDTests.cpp */; };
 		26847E5F16BBADB40043B9C1 /* catch_message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26847E5D16BBADB40043B9C1 /* catch_message.cpp */; };
-		2694A1FD16A0000E004816E3 /* catch_line_wrap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2694A1FB16A0000E004816E3 /* catch_line_wrap.cpp */; };
+		2694A1FD16A0000E004816E3 /* catch_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2694A1FB16A0000E004816E3 /* catch_text.cpp */; };
 		4A45DA2416161EF9004F8D6B /* catch_console_colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A45DA2316161EF9004F8D6B /* catch_console_colour.cpp */; };
 		4A45DA2716161F1F004F8D6B /* catch_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A45DA2616161F1F004F8D6B /* catch_ptr.cpp */; };
 		4A45DA2916161F3D004F8D6B /* catch_streambuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A45DA2816161F3D004F8D6B /* catch_streambuf.cpp */; };
@@ -56,6 +56,7 @@
 
 /* Begin PBXFileReference section */
 		266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariadicMacrosTests.cpp; path = ../../../SelfTest/VariadicMacrosTests.cpp; sourceTree = "<group>"; };
+		266E9AD117230ACF0061DAB2 /* catch_text.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_text.hpp; sourceTree = "<group>"; };
 		266ECD73170F3C620030D735 /* BDDTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BDDTests.cpp; path = ../../../SelfTest/BDDTests.cpp; sourceTree = "<group>"; };
 		266ECD8C1713614B0030D735 /* catch_legacy_reporter_adapter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_legacy_reporter_adapter.hpp; sourceTree = "<group>"; };
 		266ECD8D1713614B0030D735 /* catch_legacy_reporter_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_legacy_reporter_adapter.h; sourceTree = "<group>"; };
@@ -64,9 +65,7 @@
 		26847E5B16BBAB790043B9C1 /* catch_message.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_message.h; sourceTree = "<group>"; };
 		26847E5C16BBACB60043B9C1 /* catch_message.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_message.hpp; sourceTree = "<group>"; };
 		26847E5D16BBADB40043B9C1 /* catch_message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = catch_message.cpp; path = ../../../SelfTest/SurrogateCpps/catch_message.cpp; sourceTree = "<group>"; };
-		2694A1F8169FFF9B004816E3 /* catch_line_wrap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_line_wrap.h; sourceTree = "<group>"; };
-		2694A1FA169FFFEC004816E3 /* catch_line_wrap.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_line_wrap.hpp; sourceTree = "<group>"; };
-		2694A1FB16A0000E004816E3 /* catch_line_wrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catch_line_wrap.cpp; sourceTree = "<group>"; };
+		2694A1FB16A0000E004816E3 /* catch_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catch_text.cpp; sourceTree = "<group>"; };
 		26DACF2F17206D3400A21326 /* catch_text.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_text.h; sourceTree = "<group>"; };
 		4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_info.hpp; sourceTree = "<group>"; };
 		4A084F1D15DAD15F0027E631 /* catch_test_spec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_test_spec.h; sourceTree = "<group>"; };
@@ -286,7 +285,7 @@
 				4AB3D99F1616219100C9A0F8 /* catch_interfaces_config.cpp */,
 				4AB3D9A1161621B500C9A0F8 /* catch_interfaces_generators.cpp */,
 				4ACE21CA166CA1B300FB5509 /* catch_option.cpp */,
-				2694A1FB16A0000E004816E3 /* catch_line_wrap.cpp */,
+				2694A1FB16A0000E004816E3 /* catch_text.cpp */,
 				26847E5D16BBADB40043B9C1 /* catch_message.cpp */,
 			);
 			name = SurrogateCpps;
@@ -295,6 +294,7 @@
 		4AC91CB4155B9EBF00DC5117 /* impl */ = {
 			isa = PBXGroup;
 			children = (
+				266E9AD117230ACF0061DAB2 /* catch_text.hpp */,
 				4A4B0F9C15CEFA8300AE2392 /* catch_impl.hpp */,
 				4A4B0F9715CE6CFB00AE2392 /* catch_registry_hub.hpp */,
 				4A6D0C50149B3E3D00DB3EAA /* catch_generators_impl.hpp */,
@@ -306,7 +306,6 @@
 				4A90B59D15D24FE900EF71BC /* catch_assertionresult.hpp */,
 				4A90B59E15D2521E00EF71BC /* catch_expressionresult_builder.hpp */,
 				4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */,
-				2694A1FA169FFFEC004816E3 /* catch_line_wrap.hpp */,
 				26847E5C16BBACB60043B9C1 /* catch_message.hpp */,
 			);
 			name = impl;
@@ -397,7 +396,6 @@
 				4AB77CB51551AEA200857BF0 /* catch_ptr.hpp */,
 				4AEE0326161431070071E950 /* catch_streambuf.h */,
 				4ACE21C8166CA19700FB5509 /* catch_option.hpp */,
-				2694A1F8169FFF9B004816E3 /* catch_line_wrap.h */,
 				26759472171C72A400A84BD1 /* catch_sfinae.hpp */,
 				26759473171C74C200A84BD1 /* catch_compiler_capabilities.h */,
 				26DACF2F17206D3400A21326 /* catch_text.h */,
@@ -491,7 +489,7 @@
 				4AB3D9A01616219100C9A0F8 /* catch_interfaces_config.cpp in Sources */,
 				4AB3D9A2161621B500C9A0F8 /* catch_interfaces_generators.cpp in Sources */,
 				4ACE21CC166CA1B300FB5509 /* catch_option.cpp in Sources */,
-				2694A1FD16A0000E004816E3 /* catch_line_wrap.cpp in Sources */,
+				2694A1FD16A0000E004816E3 /* catch_text.cpp in Sources */,
 				26847E5F16BBADB40043B9C1 /* catch_message.cpp in Sources */,
 				266B06B816F3A60A004ED264 /* VariadicMacrosTests.cpp in Sources */,
 				266ECD74170F3C620030D735 /* BDDTests.cpp in Sources */,
diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest/catch_line_wrap.cpp b/projects/XCode4/CatchSelfTest/CatchSelfTest/catch_text.cpp
similarity index 76%
rename from projects/XCode4/CatchSelfTest/CatchSelfTest/catch_line_wrap.cpp
rename to projects/XCode4/CatchSelfTest/CatchSelfTest/catch_text.cpp
index d0445cc2..502a0d05 100644
--- a/projects/XCode4/CatchSelfTest/CatchSelfTest/catch_line_wrap.cpp
+++ b/projects/XCode4/CatchSelfTest/CatchSelfTest/catch_text.cpp
@@ -1,2 +1,2 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "catch_line_wrap.h"
+#include "catch_text.h"