diff options
| author | Auke Kok <sofar+github@foo-projects.org> | 2017-02-14 01:08:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 01:08:17 -0800 |
| commit | eb49009d023e6e3b5d59a97b8fb5fed5eee83296 (patch) | |
| tree | e36fa040aee7bcaf033548b3fef0afc9ad5ba01c /src | |
| parent | f17c9c45dc30a388675d46418d278a4a029206e2 (diff) | |
| download | minetest-eb49009d023e6e3b5d59a97b8fb5fed5eee83296.tar.gz minetest-eb49009d023e6e3b5d59a97b8fb5fed5eee83296.tar.bz2 minetest-eb49009d023e6e3b5d59a97b8fb5fed5eee83296.zip | |
FreeType: address font license issues (#5230)
It appears we were shipping font files without license text, and I
had my doubts about the bitmap fonts being usable directly.
This replaces existing TTF fonts with Apache-2.0 licensed fonts from
chome core (Cousine, Arimo, Tinos). Include the full license file
for all three fonts.
The Lucida Sans font bitmap is removed entirely for non-freetype
builds. There is therefore only mono fonts for non-freetype builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index bdf1f92ca..4e4c2f92c 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -214,11 +214,11 @@ void set_default_settings(Settings *settings) #if USE_FREETYPE settings->setDefault("freetype", "true"); - settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf")); + settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf")); settings->setDefault("font_shadow", "1"); settings->setDefault("font_shadow_alpha", "127"); - settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf")); - settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf")); + settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "Cousine-Regular.ttf")); + settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "Tinos-Regular.ttf")); settings->setDefault("fallback_font_shadow", "1"); settings->setDefault("fallback_font_shadow_alpha", "128"); @@ -228,7 +228,7 @@ void set_default_settings(Settings *settings) settings->setDefault("fallback_font_size", font_size_str); #else settings->setDefault("freetype", "false"); - settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "lucida_sans")); + settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans")); settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans")); std::string font_size_str = std::to_string(DEFAULT_FONT_SIZE); |