diff --git a/resources/fonts/HarmonyOS_Sans_SC_Black.ttf b/resources/fonts/HarmonyOS_Sans_SC_Black.ttf deleted file mode 100644 index 553db8e3a1..0000000000 Binary files a/resources/fonts/HarmonyOS_Sans_SC_Black.ttf and /dev/null differ diff --git a/resources/fonts/HarmonyOS_Sans_SC_Light.ttf b/resources/fonts/HarmonyOS_Sans_SC_Light.ttf deleted file mode 100644 index 30af673b73..0000000000 Binary files a/resources/fonts/HarmonyOS_Sans_SC_Light.ttf and /dev/null differ diff --git a/resources/fonts/HarmonyOS_Sans_SC_Medium.ttf b/resources/fonts/HarmonyOS_Sans_SC_Medium.ttf deleted file mode 100644 index 755348d2dd..0000000000 Binary files a/resources/fonts/HarmonyOS_Sans_SC_Medium.ttf and /dev/null differ diff --git a/resources/fonts/HarmonyOS_Sans_SC_Thin.ttf b/resources/fonts/HarmonyOS_Sans_SC_Thin.ttf deleted file mode 100644 index d33db2b5b7..0000000000 Binary files a/resources/fonts/HarmonyOS_Sans_SC_Thin.ttf and /dev/null differ diff --git a/resources/fonts/NotoSansKR-Bold.otf b/resources/fonts/NotoSansKR-Bold.otf new file mode 100644 index 0000000000..be388bf5f9 Binary files /dev/null and b/resources/fonts/NotoSansKR-Bold.otf differ diff --git a/resources/fonts/NotoSansKR-Regular.otf b/resources/fonts/NotoSansKR-Regular.otf new file mode 100644 index 0000000000..7c5c2fae3f Binary files /dev/null and b/resources/fonts/NotoSansKR-Regular.otf differ diff --git a/resources/fonts/OFL.txt b/resources/fonts/OFL.txt new file mode 100644 index 0000000000..c9857270cc --- /dev/null +++ b/resources/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2012 Google Inc. All Rights Reserved. + +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 + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +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/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 75450237f3..5a3ed14802 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -2079,7 +2079,15 @@ void ImGuiWrapper::init_font(bool compress) cfg.OversampleH = cfg.OversampleV = 1; //FIXME replace with io.Fonts->AddFontFromMemoryTTF(buf_decompressed_data, (int)buf_decompressed_size, m_font_size, nullptr, ranges.Data); //https://github.com/ocornut/imgui/issues/220 - default_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "HarmonyOS_Sans_SC_Regular.ttf").c_str(), m_font_size, &cfg, m_font_cjk ? ImGui::GetIO().Fonts->GetGlyphRangesChineseFull() : ranges.Data); + + // Orca: temp fix for Korean font + 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"; + } + default_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + font_name_regular).c_str(), m_font_size, &cfg, ranges.Data); if (default_font == nullptr) { default_font = io.Fonts->AddFontDefault(); if (default_font == nullptr) { @@ -2087,7 +2095,7 @@ void ImGuiWrapper::init_font(bool compress) } } - bold_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + "HarmonyOS_Sans_SC_Bold.ttf").c_str(), m_font_size, &cfg, ranges.Data); + bold_font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/" + font_name_bold).c_str(), m_font_size, &cfg, ranges.Data); if (bold_font == nullptr) { bold_font = io.Fonts->AddFontDefault(); if (bold_font == nullptr) { throw Slic3r::RuntimeError("ImGui: Could not load deafult font"); } diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index ba789938c3..89bd79b6dc 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -1577,7 +1577,7 @@ void PartPlate::generate_plate_name_texture() auto* font = &Label::Head_32; wxColour foreground(0xf2, 0x75, 0x4e, 0xff); - if (!m_name_texture.generate_from_text_string(text.ToStdString(), *font, *wxBLACK, foreground)) + if (!m_name_texture.generate_from_text_string(text.ToUTF8().data(), *font, *wxBLACK, foreground)) BOOST_LOG_TRIVIAL(error) << "PartPlate::generate_plate_name_texture(): generate_from_text_string() failed"; auto bed_ext = get_extents(m_shape); auto factor = bed_ext.size()(1) / 200.0;