X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Flstrings.cpp;h=6d5f86672fda133b10f060ecd346e18bee01b4e4;hb=7800c057884f6a950bb21bce351968f50679f18c;hp=0036d16274941a3448198e8f68ec19492b1fe31c;hpb=9b0e5215d935221c49ce97540bb0161290e72984;p=lyx.git

diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp
index 0036d16274..6d5f86672f 100644
--- a/src/support/lstrings.cpp
+++ b/src/support/lstrings.cpp
@@ -16,13 +16,13 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/lyxlib.h"
 #include "support/qstring_helpers.h"
 
 #include "support/lassert.h"
 
 #include <QString>
 
-#include <cmath>
 #include <cstdio>
 #include <cstring>
 #include <algorithm>
@@ -1074,18 +1074,20 @@ String const doSplit(String const & a, String & piece, Char delim)
 	size_t i = a.find(delim);
 	if (i == a.length() - 1) {
 		piece = a.substr(0, i);
-	} else if (i != String::npos) {
-		piece = a.substr(0, i);
-		tmp = a.substr(i + 1);
 	} else if (i == 0) {
 		piece.erase();
 		tmp = a.substr(i + 1);
+	} else if (i != String::npos) {
+		piece = a.substr(0, i);
+		tmp = a.substr(i + 1);
 	} else {
 		piece = a;
 	}
 	return tmp;
 }
 
+
+// FIXME: why is this specialization needed?
 template<typename Char> inline
 docstring const doSplit(docstring const & a, docstring & piece, Char delim)
 {
@@ -1093,12 +1095,12 @@ docstring const doSplit(docstring const & a, docstring & piece, Char delim)
 	size_t i = a.find(delim);
 	if (i == a.length() - 1) {
 		piece = a.substr(0, i);
-	} else if (i != docstring::npos) {
-		piece = a.substr(0, i);
-		tmp = a.substr(i + 1);
 	} else if (i == 0) {
 		piece.erase();
 		tmp = a.substr(i + 1);
+	} else if (i != docstring::npos) {
+		piece = a.substr(0, i);
+		tmp = a.substr(i + 1);
 	} else {
 		piece = a;
 	}
@@ -1199,6 +1201,17 @@ docstring const escape(docstring const & lab)
 }
 
 
+bool truncateWithEllipsis(docstring & str, size_t const len)
+{
+	if (str.size() <= len)
+		return false;
+	str.resize(len);
+	if (len > 0)
+		str[len - 1] = 0x2026;// HORIZONTAL ELLIPSIS
+	return true;
+}
+
+
 namespace {
 
 // this doesn't check whether str is empty, so do that first.
@@ -1222,7 +1235,7 @@ vector<docstring> wrapToVec(docstring const & str, int ind,
 		size_t const i = s.find_last_of(' ', width - 1);
 		if (i == docstring::npos || i <= size_t(ind)) {
 			// no space found
-			s = s.substr(0, width - 3) + "...";
+			truncateWithEllipsis(s, width);
 			break;
 		}
 		retval.push_back(s.substr(0, i));
@@ -1251,7 +1264,6 @@ 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();
 
@@ -1270,15 +1282,15 @@ docstring wrapParas(docstring const & str, int const indent,
 			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 (lsize > width - 1) {
+				size_t const i = last.find_last_of(' ', width - 1);
 				if (i == docstring::npos || i <= size_t(indent))
 					// no space found
-					last = last.substr(0, lsize - 3) + dots;
+					truncateWithEllipsis(last, lsize);
 				else
-					last = last.substr(0, i) + dots;
+					truncateWithEllipsis(last, i);
 			} else
-				last += dots;
+				last.push_back(0x2026);//HORIZONTAL ELLIPSIS
 			tmp.pop_back();
 			tmp.push_back(last);
 		}
@@ -1388,18 +1400,6 @@ int findToken(char const * const str[], string const & search_token)
 }
 
 
-#ifdef _MSC_VER
-// Replacement for C99 function lround()
-double round(double x)
-{
-	if (x < 0)
-		return ceil(x - 0.5);
-	else
-		return floor(x + 0.5);
-}
-#endif
-
-
 std::string formatFPNumber(double x)
 {
 	// Need manual tweaking, QString::number(x, 'f', 16) does not work either
@@ -1407,8 +1407,8 @@ std::string formatFPNumber(double x)
 	os << std::fixed;
 	// Prevent outputs of 23.4200000000000017 but output small numbers
 	// with at least 6 significant digits.
-	double const logarithm = log10(abs(x));
-	os << std::setprecision(max(6 - static_cast<int>(round(logarithm)), 0)) << x;
+	double const logarithm = log10(fabs(x));
+	os << std::setprecision(max(6 - iround(logarithm), 0)) << x;
 	string result = os.str();
 	if (result.find('.') != string::npos) {
 		result = rtrim(result, "0");
@@ -1437,6 +1437,17 @@ docstring bformat(docstring const & fmt, long arg1)
 }
 
 
+#ifdef LYX_USE_LONG_LONG
+template<>
+docstring bformat(docstring const & fmt, long long arg1)
+{
+	LATTEST(contains(fmt, from_ascii("%1$d")));
+	docstring const str = subst(fmt, from_ascii("%1$d"), convert<docstring>(arg1));
+	return subst(str, from_ascii("%%"), from_ascii("%"));
+}
+#endif
+
+
 template<>
 docstring bformat(docstring const & fmt, unsigned int arg1)
 {