#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>
int compare_locale(docstring const & s, docstring const & s2)
{
- // FIXME We have a report that this does not work on windows (bug 9030)
- try
- {
- string const l = to_local8bit(s);
- string const r = to_local8bit(s2);
- return strcoll(l.c_str(), r.c_str());
- }
- catch (bad_cast & e)
- {
- // fall back to builtin sorting
- LYXERR0("Could not compare using the current locale: "
- << e.what() << ", using fallback.");
- if (s < s2)
- return -1;
- if (s > s2)
- return 1;
- return 0;
- }
+ return QString::localeAwareCompare(toqstr(s), toqstr(s2));
}
}
+bool containsOnly(docstring const & s, string const & cset)
+{
+ return s.find_first_not_of(from_ascii(cset)) == string::npos;
+}
+
+
// ale970405+lasgoutt-970425
// rewritten to use new string (Lgb)
string const token(string const & a, char delim, int n)
}
+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.
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));
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();
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);
}
}
-#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
// Prevent outputs of 23.4200000000000017 but output small numbers
// with at least 6 significant digits.
double const logarithm = log10(fabs(x));
- os << std::setprecision(max(6 - static_cast<int>(round(logarithm)), 0)) << x;
+ os << std::setprecision(max(6 - iround(logarithm), 0)) << x;
string result = os.str();
if (result.find('.') != string::npos) {
result = rtrim(result, "0");
}
+#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)
{