listerrors.lyx : Update a link.

[lyx.git] / src / support / lstrings.cpp

diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp
index 4ba72d8081582ec55bb760ad344078eb3ea0ebe6..98249e4e1d0ffef07e1778a0e52d21d30297dd6e 100644 (file)
--- a/src/support/lstrings.cpp
+++ b/src/support/lstrings.cpp
@@ -332,7 +332,7 @@ bool hasDigitASCII(docstring const & str)
 }
 
 
-static bool isHexChar(char_type c)
+bool isHexChar(char_type c)
 {
        return c == '0' ||
                c == '1' ||
@@ -1153,6 +1153,7 @@ docstring wrap(docstring const & str, int const ind, size_t const width)
 docstring wrapParas(docstring const & str, int const indent,
                    size_t const width, size_t const maxlines)
 {
+       docstring const dots = from_ascii("...");
        if (str.empty())
                return docstring();
 
@@ -1167,9 +1168,21 @@ docstring wrapParas(docstring const & str, int const indent,
                if (nlines == 0)
                        continue;
                size_t const curlines = retval.size();
-               if (maxlines > 0 && curlines + nlines >= maxlines) {
-                       tmp.resize(maxlines - curlines - 1);
-                       tmp.push_back(from_ascii("..."));
+               if (maxlines > 0 && curlines + nlines > maxlines) {
+                       tmp.resize(maxlines - curlines);
+                       docstring last = tmp.back();
+                       size_t const lsize = last.size();
+                       if (lsize > width - 3) {
+                               size_t const i = last.find_last_of(' ', width - 3);
+                               if (i == docstring::npos || i <= size_t(indent))
+                                       // no space found
+                                       last = last.substr(0, lsize - 3) + dots;
+                               else
+                                       last = last.substr(0, i) + dots;
+                       } else
+                               last += dots;
+                       tmp.pop_back();
+                       tmp.push_back(last);
                }
                retval.insert(retval.end(), tmp.begin(), tmp.end());
                if (maxlines > 0 && retval.size() >= maxlines)