#include "Lsstream.h"
#include "debug.h"
#include "BoostFormat.h"
+#include "lyxlib.h"
#include <boost/regex.hpp>
#include <boost/tokenizer.hpp>
using std::toupper;
#endif
+namespace lyx {
+namespace support {
int compare_no_case(string const & s, string const & s2)
{
// Remove leading and trailing white space chars.
string const tmpstr = trim(str);
// Do the conversion proper.
- return lyx::atoi(tmpstr);
+ return atoi(tmpstr);
} else {
return 0;
}
// Remove leading and trailing white space chars.
string const tmpstr = trim(str);
// Do the conversion proper.
- return lyx::atoi(tmpstr);
+ return atoi(tmpstr);
} else {
return 0;
}
string const trim(string const & a, char const * p)
{
- lyx::Assert(p);
+ Assert(p);
if (a.empty() || !*p)
return a;
string const rtrim(string const & a, char const * p)
{
- lyx::Assert(p);
+ Assert(p);
if (a.empty() || !*p)
return a;
string const ltrim(string const & a, char const * p)
{
- lyx::Assert(p);
+ Assert(p);
if (a.empty() || !*p)
return a;
string bformat(string const & fmt, string const & arg1)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)).str());
}
string bformat(string const & fmt, string const & arg1, string const & arg2)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2)).str());
}
string bformat(string const & fmt, string const & arg1, string const & arg2,
string const & arg3)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
- % STRCONV(arg3)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2) % STRCONV(arg3)).str());
}
string bformat(string const & fmt, string const & arg1, string const & arg2,
string const & arg3, string const & arg4)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
- % STRCONV(arg3) % STRCONV(arg4)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)).str());
+}
+
+
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+ string const & arg3, string const & arg4, string const & arg5)
+{
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)
+ % STRCONV(arg5)).str());
}
#else
string bformat(string const & fmt, string const & arg1)
{
- lyx::Assert(contains(fmt, "%1$s"));
+ Assert(contains(fmt, "%1$s"));
string const str = subst(fmt, "%1$s", arg1);
return subst(str, "%%", "%");
}
string bformat(string const & fmt, string const & arg1, string const & arg2)
{
- lyx::Assert(contains(fmt, "%1$s"));
- lyx::Assert(contains(fmt, "%2$s"));
+ Assert(contains(fmt, "%1$s"));
+ Assert(contains(fmt, "%2$s"));
string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2);
return subst(str, "%%", "%");
string bformat(string const & fmt, string const & arg1, string const & arg2,
string const & arg3)
{
- lyx::Assert(contains(fmt, "%1$s"));
- lyx::Assert(contains(fmt, "%2$s"));
- lyx::Assert(contains(fmt, "%3$s"));
+ Assert(contains(fmt, "%1$s"));
+ Assert(contains(fmt, "%2$s"));
+ Assert(contains(fmt, "%3$s"));
string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2);
str = subst(str, "%3$s", arg3);
string bformat(string const & fmt, string const & arg1, string const & arg2,
string const & arg3, string const & arg4)
{
- lyx::Assert(contains(fmt, "%1$s"));
- lyx::Assert(contains(fmt, "%2$s"));
- lyx::Assert(contains(fmt, "%3$s"));
- lyx::Assert(contains(fmt, "%4$s"));
+ Assert(contains(fmt, "%1$s"));
+ Assert(contains(fmt, "%2$s"));
+ Assert(contains(fmt, "%3$s"));
+ Assert(contains(fmt, "%4$s"));
+ string str = subst(fmt, "%1$s", arg1);
+ str = subst(str, "%2$s", arg2);
+ str = subst(str, "%3$s", arg3);
+ str = subst(str, "%4$s", arg4);
+ return subst(str, "%%", "%");
+}
+
+
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+ string const & arg3, string const & arg4, string const & arg5)
+{
+ Assert(contains(fmt, "%1$s"));
+ Assert(contains(fmt, "%2$s"));
+ Assert(contains(fmt, "%3$s"));
+ Assert(contains(fmt, "%4$s"));
+ Assert(contains(fmt, "%5$s"));
string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2);
str = subst(str, "%3$s", arg3);
str = subst(str, "%4$s", arg4);
+ str = subst(str, "%5$s", arg5);
return subst(str, "%%", "%");
}
#endif
+
+} // namespace support
+} // namespace lyx