diff --git a/resources/fonts/NanumGothic-Bold.ttf b/resources/fonts/NanumGothic-Bold.ttf new file mode 100644 index 0000000000..a9a40dc1a1 Binary files /dev/null and b/resources/fonts/NanumGothic-Bold.ttf differ diff --git a/resources/fonts/NanumGothic-Regular.ttf b/resources/fonts/NanumGothic-Regular.ttf new file mode 100644 index 0000000000..6e4dd8748c Binary files /dev/null and b/resources/fonts/NanumGothic-Regular.ttf differ diff --git a/resources/fonts/NotoSansKR-Bold.otf b/resources/fonts/NotoSansKR-Bold.otf deleted file mode 100644 index be388bf5f9..0000000000 Binary files a/resources/fonts/NotoSansKR-Bold.otf and /dev/null differ diff --git a/resources/fonts/NotoSansKR-Regular.otf b/resources/fonts/NotoSansKR-Regular.otf deleted file mode 100644 index 7c5c2fae3f..0000000000 Binary files a/resources/fonts/NotoSansKR-Regular.otf and /dev/null differ diff --git a/resources/fonts/OFL.txt b/resources/fonts/OFL.txt index c9857270cc..62104f731e 100644 --- a/resources/fonts/OFL.txt +++ b/resources/fonts/OFL.txt @@ -1,4 +1,8 @@ -Copyright 2012 Google Inc. All Rights Reserved. +Copyright (c) 2010, NHN Corporation (http://www.nhncorp.com), +with Reserved Font Name Nanum, Naver Nanum, NanumGothic, Naver +NanumGothic, NanumMyeongjo, Naver NanumMyeongjo, NanumBrush, Naver +NanumBrush, NanumPen, Naver NanumPen. + 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: diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index a05a2739c6..05ef3a4c95 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -2095,8 +2095,8 @@ void ImGuiWrapper::init_font(bool compress) auto font_name_regular = "HarmonyOS_Sans_SC_Regular.ttf"; auto font_name_bold = "HarmonyOS_Sans_SC_Bold.ttf"; if(m_glyph_ranges == ImGui::GetIO().Fonts->GetGlyphRangesKorean()) { - font_name_regular = "NotoSansKR-Regular.otf"; - font_name_bold = "NotoSansKR-Bold.otf"; + font_name_regular = "NanumGothic-Regular.ttf"; + font_name_bold = "NanumGothic-Bold.ttf"; } default_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + font_name_regular).c_str(), m_font_size, &cfg, ranges.Data); if (default_font == nullptr) { diff --git a/src/slic3r/GUI/Widgets/Label.cpp b/src/slic3r/GUI/Widgets/Label.cpp index 017f0fcecf..b57a62e477 100644 --- a/src/slic3r/GUI/Widgets/Label.cpp +++ b/src/slic3r/GUI/Widgets/Label.cpp @@ -16,7 +16,7 @@ wxFont Label::sysFont(int size, bool bold) // Check if the current locale is Korean if (wxLocale::GetSystemLanguage() == wxLANGUAGE_KOREAN) { - face = "Noto Sans KR"; + face = "NanumGothic"; } wxFont font{size, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, bold ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL, false, face}; @@ -65,15 +65,15 @@ void Label::initSysFont() result = wxFont::AddPrivateFont(font_path); // BOOST_LOG_TRIVIAL(info) << boost::format("add font of HarmonyOS_Sans_SC_Regular returns %1%")%result; printf("add font of HarmonyOS_Sans_SC_Regular returns %d\n", result); - // Adding Noto Sans KR Regular and Bold - font_path = wxString::FromUTF8(resource_path + "/fonts/NotoSansKR-Regular.otf"); + // Adding NanumGothic Regular and Bold + font_path = wxString::FromUTF8(resource_path + "/fonts/NanumGothic-Regular.ttf"); result = wxFont::AddPrivateFont(font_path); - // BOOST_LOG_TRIVIAL(info) << boost::format("add font of NotoSansKR-Regular returns %1%")%result; - printf("add font of NotoSansKR-Regular returns %d\n", result); - font_path = wxString::FromUTF8(resource_path + "/fonts/NotoSansKR-Bold.otf"); + // BOOST_LOG_TRIVIAL(info) << boost::format("add font of NanumGothic-Regular returns %1%")%result; + printf("add font of NanumGothic-Regular returns %d\n", result); + font_path = wxString::FromUTF8(resource_path + "/fonts/NanumGothic-Bold.ttf"); result = wxFont::AddPrivateFont(font_path); - // BOOST_LOG_TRIVIAL(info) << boost::format("add font of NotoSansKR-Bold returns %1%")%result; - printf("add font of NotoSansKR-Bold returns %d\n", result); + // BOOST_LOG_TRIVIAL(info) << boost::format("add font of NanumGothic-Bold returns %1%")%result; + printf("add font of NanumGothic-Bold returns %d\n", result); #endif Head_48 = Label::sysFont(48, true); Head_32 = Label::sysFont(32, true);