From 83b81f6c8a88874d1e732525f43407f0576574c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= Date: Sat, 6 Dec 2014 21:26:52 +0100 Subject: [PATCH 1/2] Format paragraphs properly - count the space between words. --- src/utilstrencodings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp index d0062d454..419a63c43 100644 --- a/src/utilstrencodings.cpp +++ b/src/utilstrencodings.cpp @@ -459,7 +459,7 @@ std::string FormatParagraph(const std::string in, size_t width, size_t indent) } // Append word out << in.substr(ptr, endword - ptr); - col += endword - ptr; + col += endword - ptr + 1; ptr = endword; } return out.str(); From a26bf478ea54d28ceccdb7ad91c6d8d92f5680be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= Date: Sat, 6 Dec 2014 22:49:07 +0100 Subject: [PATCH 2/2] Add a new test for FormatParagraph (string longer than the default width). --- src/test/util_tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 10f77e3a5..feea14035 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -340,6 +340,7 @@ BOOST_AUTO_TEST_CASE(test_FormatParagraph) BOOST_CHECK_EQUAL(FormatParagraph("test test", 4, 0), "test\ntest"); BOOST_CHECK_EQUAL(FormatParagraph("testerde test ", 4, 0), "testerde\ntest"); BOOST_CHECK_EQUAL(FormatParagraph("test test", 4, 4), "test\n test"); + BOOST_CHECK_EQUAL(FormatParagraph("This is a very long test string. This is a second sentence in the very long test string."), "This is a very long test string. This is a second sentence in the very long\ntest string."); } BOOST_AUTO_TEST_CASE(test_FormatSubVersion)