the freespacing patch from Kayvan, draw the math empty delim with onoffdash, asure...

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index b5428c06f222273b83bd298cea6f6366391c7e53..6ac6cbb2931d134151e8990b6487e66c445c3f7c 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -1,8 +1,12 @@
 #include <config.h>
 
 #include <algorithm>
+
+#ifdef __GLIBCPP__
+#include <ctype.h>
+#else
 #include <cctype>
-#include <cstdio>
+#endif
 #include <cstdlib>
 
 #include "LString.h"
@@ -10,6 +14,56 @@
 #include "LRegex.h"
 
 using std::count;
+using std::transform;
+using std::tolower;
+using std::toupper;
+
+       
+int compare_no_case(string const & s, string const & s2)
+{
+       // ANSI C
+       string::const_iterator p = s.begin();
+       string::const_iterator p2 = s2.begin();
+
+       while (p != s.end() && p2 != s2.end()) {
+               int const lc1 = tolower(*p);
+               int const lc2 = tolower(*p2);
+               if (lc1 != lc2)
+                       return (lc1 < lc2) ? -1 : 1;
+               ++p;
+               ++p2;
+       }
+       
+       if (s.size() == s2.size())
+               return 0;
+       if (s.size() < s2.size())
+               return -1;
+       return 1;
+}
+
+
+int compare_no_case(string const & s, string const & s2, unsigned int len)
+{
+//#warning verify this func please
+       string::const_iterator p = s.begin();
+       string::const_iterator p2 = s2.begin();
+       unsigned int i = 0;
+       while (i < len && p != s.end() && p2 != s2.end()) {
+               int const lc1 = tolower(*p);
+               int const lc2 = tolower(*p2);
+               if (lc1 != lc2)
+                       return (lc1 < lc2) ? -1 : 1;
+               ++i;
+               ++p;
+               ++p2;
+       }
+       if (s.size() == s2.size())
+               return 0;
+       if (s.size() < s2.size())
+               return -1;
+       return 1;
+}
+
 
 bool isStrInt(string const & str)
 {
@@ -44,67 +98,33 @@ int  strToInt(string const & str)
 
 string lowercase(string const & a)
 {
-       string tmp;
-       string::const_iterator cit = a.begin();
-       for(; cit != a.end(); ++cit) {
-               tmp += static_cast<char>(tolower(*cit));
+       string tmp(a);
+//#ifdef __GLIBCPP__
+       string::iterator result = tmp.begin();
+       for (string::iterator first = tmp.begin();
+            first != tmp.end(); ++first, ++result) {
+               *result = tolower(*first);
        }
+//#else
+//     transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
+//#endif
        return tmp;
 }
 
 
-string tostr(long i)
-{
-       char str[30];
-       sprintf(str, "%ld", i);
-       return string(str);
-}
-
-string tostr(unsigned long i)
-{
-       char str[30];
-       sprintf(str, "%lu", i);
-       return string(str);
-}
-
-string tostr(void * v)
+string uppercase(string const & a)
 {
-       return tostr(long(v));
-}
-
-
-string tostr(int i)
-{
-       return tostr(long(i));
-}
-
-string tostr(unsigned int ui)
-{
-       return tostr(long(ui));
-}
-
-string tostr(char c)
-{
-       return string(1, c);
-}
-
-string tostr(bool b)
-{
-       return b ? "true" : "false";
-}
-
-#if 0
-string tostr(float f)
-{
-       return tostr(double(f));
-}
-#endif
-
-string tostr(double d)
-{
-       char tmp[40];
-       sprintf(tmp, "%f", d);
-       return string(tmp);
+       string tmp(a);
+//#ifdef __GLIBCPP__
+       string::iterator result = tmp.begin();
+       for (string::iterator first = tmp.begin();
+            first != tmp.end(); ++first, ++result) {
+               *result = toupper(*first);
+       }
+//#else
+//     transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
+//#endif
+       return tmp;
 }
 
 
@@ -166,9 +186,15 @@ bool contains(char const * a, char const * b)
 }
 
 
-int countChar(string const & a, char const c)
+unsigned int countChar(string const & a, char const c)
 {
+#ifdef HAVE_STD_COUNT
        return count(a.begin(), a.end(), c);
+#else
+       unsigned int n = 0;
+       count(a.begin(), a.end(), c, n);
+       return n;
+#endif
 }
 
 
@@ -241,7 +267,7 @@ string subst(string const & a, char oldchar, char newchar)
 
 
 string subst(string const & a,
-             char const * oldstr, string const & newstr)
+            char const * oldstr, string const & newstr)
 {
        string lstr(a);
        string::size_type i = 0;