Merge pull request #143 from jpd236/across-down-canonicalization

Improve handling of different capitalizations of "Across" and "Down".

puz/Clue.hpp

@@ -147,8 +147,18 @@ class PUZ_API Clues : public std::vector<std::pair<string_t, ClueList> >
 
     ClueList & SetClueList(const string_t & direction, const ClueList & cluelist)
     {
-        operator[](direction) = cluelist;
-        ClueList & ret = operator[](direction);
+        // Normalize different capitalizations of "Across" and "Down", since these have special meaning.
+        // We still retain the original direction in the title field.
+        string_t canonical_direction;
+        if (CaseInsensitiveEquals(direction, puzT("Across")))
+            canonical_direction = puzT("Across");
+        else if (CaseInsensitiveEquals(direction, puzT("Down")))
+            canonical_direction = puzT("Down");
+        else
+            canonical_direction = direction;
+
+        operator[](canonical_direction) = cluelist;
+        ClueList & ret = operator[](canonical_direction);
         if (ret.GetTitle().empty())
             ret.SetTitle(direction);
         return ret;

puz/puzstring.cpp

@@ -347,6 +347,21 @@ bool EndsWith(const string_t & str, const string_t & cmp)
            str.compare(str.size() - cmp.size(), cmp.size(), cmp) == 0;
 }
 
+bool CaseInsensitiveEquals(const string_t& a, const string_t& b)
+{
+    unsigned int sz = a.size();
+    if (b.size() != sz)
+        return false;
+    for (unsigned int i = 0; i < sz; ++i)
+#if PUZ_UNICODE
+        if (towlower(a[i]) != towlower(b[i]))
+#else
+        if (tolower(a[i]) != tolower(b[i]))
+#endif
+            return false;
+    return true;
+}
+
 //----------------------------------------------------------------------------
 // Convert between formatted / unformatted
 //----------------------------------------------------------------------------

puz/puzstring.hpp

@@ -87,6 +87,8 @@ int ToInt(const string_t & str);
 bool StartsWith(const string_t & str, const string_t & cmp);
 bool EndsWith(const string_t & str, const string_t & cmp);
 
+bool CaseInsensitiveEquals(const string_t& a, const string_t& b);
+
 // XML stuff
 enum {
     UNESCAPE_BR = 1,