various changes

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 74fc4fee8cb72d5a5934d3c64b31a90c67a849c5..d4047936bd226729d2cb1ecc9809af9c074104e6 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -26,15 +26,16 @@
 
 using std::count;
 using std::transform;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::tolower;
 using std::toupper;
+using std::strlen;
 #endif
 
 
 int compare_no_case(string const & s, string const & s2)
 {
-       // ANSI C
        string::const_iterator p = s.begin();
        string::const_iterator p2 = s2.begin();
 
@@ -46,7 +47,7 @@ int compare_no_case(string const & s, string const & s2)
                ++p;
                ++p2;
        }
-       
+
        if (s.size() == s2.size())
                return 0;
        if (s.size() < s2.size())
@@ -69,7 +70,8 @@ int compare_no_case(string const & s, string const & s2, unsigned int len)
                ++p;
                ++p2;
        }
-       if (s.size() == s2.size())
+
+       if (s.size() >= len && s2.size() >= len)
                return 0;
        if (s.size() < s2.size())
                return -1;
@@ -193,45 +195,43 @@ char uppercase(char c)
 }
 
 
+namespace {
+
+// since we cannot use std::tolower and std::toupper directly in the
+// calls to std::transform yet, we use these helper clases. (Lgb)
+
+struct local_lowercase {
+       char operator()(char c) const {
+               return tolower(c);
+       }
+};
+       
+struct local_uppercase {
+       char operator()(char c) const {
+               return toupper(c);
+       }
+};
+
+} // end of anon namespace
+
 string const lowercase(string const & a)
 {
        string tmp(a);
-#if 1
-       string::iterator result = tmp.begin();
-       string::iterator end = tmp.end();
-       for (string::iterator first = tmp.begin();
-            first != end; ++first, ++result) {
-               *result = lowercase(*first);
-       }
-#else
-       // We want to use this one. (Lgb)
-       transform(tmp.begin(), tmp.end(), tmp.begin(), lowercase);
-#endif
+       transform(tmp.begin(), tmp.end(), tmp.begin(), local_lowercase());
        return tmp;
 }
 
-
 string const uppercase(string const & a)
 {
        string tmp(a);
-#if 1
-       string::iterator result = tmp.begin();
-       string::iterator end = tmp.end();
-       for (string::iterator first = tmp.begin();
-            first != end; ++first, ++result) {
-               *result = uppercase(*first);
-       }
-#else
-       // We want to use this one. (Lgb)
-       transform(tmp.begin(), tmp.end(), tmp.begin(), uppercase);
-#endif
+       transform(tmp.begin(), tmp.end(), tmp.begin(), local_uppercase());
        return tmp;
 }
 
 
 bool prefixIs(string const & a, char const * pre)
 {
-       Assert(pre);
+       lyx::Assert(pre);
        
        size_t const l = strlen(pre);
        string::size_type const alen = a.length();
@@ -258,7 +258,7 @@ bool prefixIs(string const & a, string const & pre)
        string::size_type const prelen = pre.length();
        string::size_type const alen = a.length();
        
-       if (prelen < alen || a.empty())
+       if (prelen > alen || a.empty())
                return false;
        else {
 #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
@@ -279,7 +279,7 @@ bool suffixIs(string const & a, char c)
 
 bool suffixIs(string const & a, char const * suf)
 {
-       Assert(suf);
+       lyx::Assert(suf);
        
        size_t const suflen = strlen(suf);
        string::size_type const alen = a.length();
@@ -322,7 +322,7 @@ bool suffixIs(string const & a, string const & suf)
 
 bool contains(char const * a, string const & b)
 {
-       Assert(a);
+       lyx::Assert(a);
        string const at(a);
        return contains(at, b);
 }
@@ -330,7 +330,7 @@ bool contains(char const * a, string const & b)
 
 bool contains(string const & a, char const * b)
 {
-       Assert(b);
+       lyx::Assert(b);
        string const bt(b);
        return contains(a, bt);
 }
@@ -344,9 +344,17 @@ bool contains(string const & a, string const & b)
 }
 
 
+bool contains(string const & a, char b)
+{
+       if (a.empty())
+               return false;
+       return a.find(b) != string::npos;
+}
+
+
 bool contains(char const * a, char const * b)
 {
-       Assert(a && b);
+       lyx::Assert(a && b);
        string const at(a);
        string const bt(b);
        return contains(at, bt);
@@ -355,7 +363,7 @@ bool contains(char const * a, char const * b)
 
 bool containsOnly(string const & s, char const * cset)
 {
-       Assert(cset);
+       lyx::Assert(cset);
        
        return s.find_first_not_of(cset) == string::npos;
 }
@@ -369,7 +377,7 @@ bool containsOnly(string const & s, string const & cset)
 
 bool containsOnly(char const * s, char const * cset)
 {
-       Assert(s && cset);
+       lyx::Assert(s && cset);
        
        return string(s).find_first_not_of(cset) == string::npos;
 }
@@ -377,7 +385,7 @@ bool containsOnly(char const * s, char const * cset)
 
 bool containsOnly(char const * s, string const & cset)
 {
-       Assert(s);
+       lyx::Assert(s);
        
        return string(s).find_first_not_of(cset) == string::npos;
 }
@@ -465,9 +473,9 @@ string const subst(string const & a, char oldchar, char newchar)
 
 
 string const subst(string const & a,
-            char const * oldstr, string const & newstr)
+                  char const * oldstr, string const & newstr)
 {
-       Assert(oldstr);
+       lyx::Assert(oldstr);
        
        string lstr(a);
        string::size_type i = 0;
@@ -504,6 +512,13 @@ string const strip(string const & a, char c)
        if (i == a.length() - 1) return tmp; // no c's at end of a
        if (i != string::npos) 
                tmp.erase(i + 1, string::npos);
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+       /// Needed for broken string::find_last_not_of
+       else if (tmp[0] != c) {
+               if (a.length() == 1) return tmp;
+               tmp.erase(1, string::npos);
+       }
+#endif
        else
                tmp.erase(); // only c in the whole string
        return tmp;
@@ -512,7 +527,7 @@ string const strip(string const & a, char c)
 
 string const frontStrip(string const & a, char const * p)
 {
-       Assert(p);
+       lyx::Assert(p);
        
        if (a.empty() || !*p) return a;
        string tmp(a);