split LyXText::rowlist_ into individual Paragraph::rows_ chunks

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 979381cd8fd95ce832f08118926a5f1814f1d7ad..49d04e3a83bafc200ad7e5558f8317158a87ebb9 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -17,6 +17,7 @@
 #include "Lsstream.h"
 #include "debug.h"
 #include "BoostFormat.h"
+#include "lyxlib.h"
 
 #include <boost/regex.hpp>
 #include <boost/tokenizer.hpp>
@@ -38,6 +39,8 @@ using std::tolower;
 using std::toupper;
 #endif
 
+namespace lyx {
+namespace support {
 
 int compare_no_case(string const & s, string const & s2)
 {
@@ -156,7 +159,7 @@ int strToInt(string const & str)
                // 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;
        }
@@ -169,7 +172,7 @@ unsigned int strToUnsignedInt(string const & str)
                // 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;
        }
@@ -280,30 +283,6 @@ string const ascii_lowercase(string const & a)
 }
 
 
-bool prefixIs(string const & a, char const * pre)
-{
-       lyx::Assert(pre);
-
-       size_t const l = strlen(pre);
-       string::size_type const alen = a.length();
-
-       if (l > alen || a.empty())
-               return false;
-       else {
-#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
-               // Delete this code when the compilers get a bit better.
-               return ::strncmp(a.c_str(), pre, l) == 0;
-#else
-               // This is the code that we really want to use
-               // but until gcc ships with a basic_string that
-               // implements std::string correctly we have to
-               // use the code above.
-               return a.compare(0, l, pre, l) == 0;
-#endif
-       }
-}
-
-
 bool prefixIs(string const & a, string const & pre)
 {
        string::size_type const prelen = pre.length();
@@ -328,31 +307,6 @@ bool suffixIs(string const & a, char c)
 }
 
 
-bool suffixIs(string const & a, char const * suf)
-{
-       lyx::Assert(suf);
-
-       size_t const suflen = strlen(suf);
-       string::size_type const alen = a.length();
-
-       if (suflen > alen)
-               return false;
-       else {
-#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
-               // Delete this code when the compilers get a bit better.
-               string tmp(a, alen - suflen);
-               return ::strncmp(tmp.c_str(), suf, suflen) == 0;
-#else
-               // This is the code that we really want to use
-               // but until gcc ships with a basic_string that
-               // implements std::string correctly we have to
-               // use the code above.
-               return a.compare(alen - suflen, suflen, suf) == 0;
-#endif
-       }
-}
-
-
 bool suffixIs(string const & a, string const & suf)
 {
        string::size_type const suflen = suf.length();
@@ -462,23 +416,6 @@ string const subst(string const & a, char oldchar, char newchar)
 }
 
 
-string const subst(string const & a,
-                  char const * oldstr, string const & newstr)
-{
-       lyx::Assert(oldstr);
-
-       string lstr(a);
-       string::size_type i = 0;
-       string::size_type olen = strlen(oldstr);
-       while ((i = lstr.find(oldstr, i)) != string::npos) {
-               lstr.replace(i, olen, newstr);
-               i += newstr.length(); // We need to be sure that we dont
-               // use the same i over and over again.
-       }
-       return lstr;
-}
-
-
 string const subst(string const & a,
                   string const & oldstr, string const & newstr)
 {
@@ -496,7 +433,7 @@ string const subst(string const & a,
 
 string const trim(string const & a, char const * p)
 {
-       lyx::Assert(p);
+       Assert(p);
 
        if (a.empty() || !*p)
                return a;
@@ -514,7 +451,7 @@ string const trim(string const & a, char const * p)
 
 string const rtrim(string const & a, char const * p)
 {
-       lyx::Assert(p);
+       Assert(p);
 
        if (a.empty() || !*p)
                return a;
@@ -531,7 +468,7 @@ string const rtrim(string const & a, char const * p)
 
 string const ltrim(string const & a, char const * p)
 {
-       lyx::Assert(p);
+       Assert(p);
 
        if (a.empty() || !*p)
                return a;
@@ -665,9 +602,10 @@ string const getStringFromVector(vector<string> const & vec,
        for (vector<string>::const_iterator it = vec.begin();
             it != vec.end(); ++it) {
                string item = trim(*it);
-               if (item.empty()) continue;
-
-               if (i++ > 0) str += delim;
+               if (item.empty())
+                       continue;
+               if (i++ > 0)
+                       str += delim;
                str += item;
        }
        return str;
@@ -676,51 +614,83 @@ string const getStringFromVector(vector<string> const & vec,
 
 #if USE_BOOST_FORMAT
 
-string bformat(char const * fmt, string const & arg1)
+string bformat(string const & fmt, string const & arg1)
+{
+       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)).str());
+       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+               % STRCONV(arg2)).str());
 }
 
 
-string bformat(char const * fmt, string const & arg1, string const & arg2)
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+       string const & arg3)
 {
-       return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)).str());
+       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+               % STRCONV(arg2) % STRCONV(arg3)).str());
 }
 
-string bformat(char const * fmt, string const & arg1, string const & arg2,
+
+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());
 }
 
-#else 
 
-string bformat(char const * fmt, string const & arg1)
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+       string const & arg3, string const & arg4, string const & arg5)
 {
-       lyx::Assert(contains(fmt, "%1$s"));
+       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)
+{
+       Assert(contains(fmt, "%1$s"));
        string const str = subst(fmt, "%1$s", arg1);
        return subst(str, "%%", "%");
 }
 
 
-string bformat(char const * fmt, string const & arg1, string const & arg2)
+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(char const * fmt, string const & arg1, string const & arg2,
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+       string const & arg3)
+{
+       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);
+       return subst(str, "%%", "%");
+}
+
+
+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);
@@ -728,4 +698,24 @@ string bformat(char const * fmt, string const & arg1, string const & arg2,
        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