From 86f7cb41764cadc1a0be4745558523410deca7e6 Mon Sep 17 00:00:00 2001 From: twanvl Date: Fri, 6 Jul 2007 15:29:48 +0000 Subject: [PATCH] Uses smart_less for position() script function git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@506 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/util/order_cache.hpp | 2 +- src/util/string.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/order_cache.hpp b/src/util/order_cache.hpp index d971437e..1c9659f4 100644 --- a/src/util/order_cache.hpp +++ b/src/util/order_cache.hpp @@ -47,7 +47,7 @@ struct OrderCache::CompareValues { CompareValues(const vector& values) : values(values) {} inline bool operator () (const KV& a, const KV& b) { - return values[a.second] < values[b.second]; + return smart_less(values[a.second], values[b.second]); } }; diff --git a/src/util/string.cpp b/src/util/string.cpp index bfac4869..310e02f0 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -221,6 +221,7 @@ bool smart_less(const String& as, const String& bs) { return lt; } else { // compare characters + // TODO: decompose characters, in particular AE and accents Char la = toLower(a), lb = toLower(b); if (la < lb) return true; if (la > lb) return false;