diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 13edd896ef0..b50e63ec21f 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -150,9 +150,9 @@ Comment: Noto Sans font Copyright: 2012, Google Inc. License: OFL-1.1 -Files: ./thirdparty/fonts/source_code_pro.otf -Comment: Source Code Pro font -Copyright: 2010, 2012, Adobe Systems Incorporated +Files: ./thirdparty/fonts/mononoki_Regular.ttf +Comment: Mononoki font +Copyright: 2013, Matthias Tellen License: OFL-1.1 Files: ./thirdparty/freetype/ diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 3ab3f059062..d806b825ba5 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -73,13 +73,13 @@ static Ref make_font(int p_height, int p_ascent, int p_valign, int p m_name->add_fallback(FontFallback); // the custom spacings might only work with Noto Sans -#define MAKE_DEFAULT_FONT(m_name, m_size) \ - Ref m_name; \ - m_name.instance(); \ - m_name->set_size(m_size); \ - m_name->set_font_data(DefaultFont); \ - m_name->set_spacing(DynamicFont::SPACING_TOP, -1); \ - m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -1); \ +#define MAKE_DEFAULT_FONT(m_name, m_size) \ + Ref m_name; \ + m_name.instance(); \ + m_name->set_size(m_size); \ + m_name->set_font_data(DefaultFont); \ + m_name->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); \ + m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); \ MAKE_FALLBACKS(m_name); void editor_register_fonts(Ref p_theme) { @@ -119,7 +119,7 @@ void editor_register_fonts(Ref p_theme) { Ref dfmono; dfmono.instance(); - dfmono->set_font_ptr(_font_source_code_pro, _font_source_code_pro_size); + dfmono->set_font_ptr(_font_mononoki_Regular, _font_mononoki_Regular_size); //dfd->set_force_autohinter(true); //just looks better..i think? MAKE_DEFAULT_FONT(df, int(EditorSettings::get_singleton()->get("interface/font_size")) * EDSCALE); @@ -147,7 +147,9 @@ void editor_register_fonts(Ref p_theme) { Ref df_doc_code; df_doc_code.instance(); - df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 14)) * EDSCALE); + df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 18)) * EDSCALE); + df_doc_code->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); + df_doc_code->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); df_doc_code->set_font_data(dfmono); MAKE_FALLBACKS(df_doc_code); diff --git a/thirdparty/README.md b/thirdparty/README.md index 212b0195a35..bae509ee1fb 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -59,10 +59,10 @@ Files extracted from upstream source: Use UI font if exists, because it has tight vertial metrix and good for UI. -### Adobe Source Code Pro Regular +### Mononoki Regular -- Upstream: https://github.com/adobe-fonts/source-code-pro -- Version: 2.030 +- Upstream: https://github.com/madmalik/mononoki +- Version: 1.2 - License: OFL-1.1 ### DroidSans*.ttf diff --git a/thirdparty/fonts/LICENSE.SourceCodePro.txt b/thirdparty/fonts/LICENSE_Mononoki similarity index 94% rename from thirdparty/fonts/LICENSE.SourceCodePro.txt rename to thirdparty/fonts/LICENSE_Mononoki index f430ee5dbe5..6ef130c5ef0 100644 --- a/thirdparty/fonts/LICENSE.SourceCodePro.txt +++ b/thirdparty/fonts/LICENSE_Mononoki @@ -1,8 +1,9 @@ -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. +Copyright (c) 2013, Matthias Tellen matthias.tellen@googlemail.com, +with Reserved Font Name monoOne. This Font Software is licensed under the SIL Open Font License, Version 1.1. - -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL ----------------------------------------------------------- @@ -91,4 +92,3 @@ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - diff --git a/thirdparty/fonts/mononoki_Regular.ttf b/thirdparty/fonts/mononoki_Regular.ttf new file mode 100644 index 00000000000..9510ac85d15 Binary files /dev/null and b/thirdparty/fonts/mononoki_Regular.ttf differ diff --git a/thirdparty/fonts/source_code_pro.otf b/thirdparty/fonts/source_code_pro.otf deleted file mode 100644 index 1bae0027fff..00000000000 Binary files a/thirdparty/fonts/source_code_pro.otf and /dev/null differ