Merge branch 'master' into jgrpp

# Conflicts:
#	src/string.cpp

src/fontcache.cpp

@@ -75,6 +75,7 @@ public:
 	virtual GlyphID MapCharToGlyph(WChar key) { assert(IsPrintable(key)); return SPRITE_GLYPH | key; }
 	virtual const void *GetFontTable(uint32 tag, size_t &length) { length = 0; return NULL; }
 	virtual const char *GetFontName() { return "sprite"; }
+	virtual bool IsBuiltInFont() { return true; }
 };
 
 /**
@@ -254,6 +255,7 @@ public:
 	virtual GlyphID MapCharToGlyph(WChar key);
 	virtual const void *GetFontTable(uint32 tag, size_t &length);
 	virtual const char *GetFontName() { return face->family_name; }
+	virtual bool IsBuiltInFont() { return false; }
 };
 
 FT_Library _library = NULL;