Default to Utf8 instead of direct mapping in Font

[libs/gl.git] / source / font.h

diff --git a/source/font.h b/source/font.h
index 3178a4c2717ed2f64d6d4e2c72bb413b84056a60..68c035a64d0c4b2d34c6b207b67641d8dadb6e4f 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include <map>
 #include <string>
 #include <msp/datafile/collection.h>
-#include <msp/strings/codec.h>
+#include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -49,10 +49,8 @@ public:
        float get_default_size() const { return default_size; }
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }
-       float get_string_width(const std::string &) const;
        float get_string_width(const std::string &, Codecs::Decoder &) const;
        void  draw_glyph(unsigned);
-       void  draw_string(const std::string &) const;
        void  draw_string(const std::string &, Codecs::Decoder &) const;
        void  draw_multiline(const std::string &) const;
 
@@ -63,12 +61,19 @@ public:
                return get_string_width(str, dec);
        }
 
+       float get_string_width(const std::string &str) const
+       { return get_string_width<Codecs::Utf8>(str); }
+
        template<class C>
        void draw_string(const std::string &str) const
        {
                typename C::Decoder dec;
                draw_string(str, dec);
        }
+
+       void draw_string(const std::string &str) const
+       { draw_string<Codecs::Utf8>(str); }
+
 private:
        struct Glyph
        {