Merge pull request #2505 from ericoporto/agspak-with-ignore

Tools: agspak with ignore file support

Common/util/string.cpp

@@ -19,6 +19,7 @@
 #include "util/stream.h"
 #include "util/string.h"
 #include "util/string_compat.h"
+#include "utf8.h"
 
 namespace AGS
 {
@@ -368,6 +369,20 @@ String String::Upper() const
     return str;
 }
 
+String String::LowerUTF8() const
+{
+    String str = *this;
+    str.MakeLowerUTF8();
+    return str;
+}
+
+String String::UpperUTF8() const
+{
+    String str = *this;
+    str.MakeUpperUTF8();
+    return str;
+}
+
 String String::Left(size_t count) const
 {
     count = std::min(count, _len);
@@ -715,6 +730,24 @@ void String::MakeUpper()
     }
 }
 
+void String::MakeLowerUTF8()
+{
+    if (_len != 0)
+    {
+        BecomeUnique();
+        Utf8::CStrToLower(_cstr);
+    }
+}
+
+void String::MakeUpperUTF8()
+{
+    if (_len != 0)
+    {
+        BecomeUnique();
+        Utf8::CStrToUpper(_cstr);
+    }
+}
+
 void String::MergeSequences(char c)
 {
     if (_len <= 1)

Common/util/string.h

@@ -229,6 +229,11 @@ class String
     // Creates an uppercased copy of the string
     String  Upper() const;
 
+    // Creates a lowercased copy of the utf-8 string
+    String  LowerUTF8() const;
+    // Creates an uppercased copy of the utf-8 string
+    String  UpperUTF8() const;
+
     // Extract N leftmost characters as a new string
     String  Left(size_t count) const;
     // Extract up to N characters starting from given index
@@ -304,6 +309,10 @@ class String
     void    MakeLower();
     // Convert string to uppercase equivalent
     void    MakeUpper();
+    // Convert utf-8 string to lowercase equivalent
+    void    MakeLowerUTF8();
+    // Convert utf-8 string to uppercase equivalent
+    void    MakeUpperUTF8();
     // Merges sequences of same characters into one
     void    MergeSequences(char c = 0);
     // Prepend* methods add content before the string's head, increasing its length
@@ -435,6 +444,7 @@ class String
         char      *_buf;     // reference-counted data (raw ptr)
         BufHeader *_bufHead; // the header of a reference-counted data
     };
+
 };
 
 } // namespace Common