diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b17977a..0b28fef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,6 @@ set(RESOURCES BITMAP/Credit18.bmp CURSOR/CURSOR_IKA.bmp CURSOR/CURSOR_NORMAL.bmp - FONT/LiberationMono.ttf ICON/ICON_MINI.bmp ORG/Access.org ORG/Anzen.org @@ -233,11 +232,11 @@ set(RESOURCES # Handle options if(JAPANESE) set(DATA_DIRECTORY "${ASSETS_DIRECTORY}/data_jp") - list(APPEND RESOURCES "BITMAP/pixel_jp.bmp") + list(APPEND RESOURCES "BITMAP/pixel_jp.bmp" "FONT/NotoSansMonoCJKjp.otf") target_compile_definitions(CSE2 PRIVATE JAPANESE) else() set(DATA_DIRECTORY "${ASSETS_DIRECTORY}/data_en") - list(APPEND RESOURCES "BITMAP/pixel.bmp") + list(APPEND RESOURCES "BITMAP/pixel.bmp" "FONT/LiberationMono.ttf") endif() if(FIX_BUGS) diff --git a/Makefile b/Makefile index 95654b0c..47f51441 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,6 @@ RESOURCES = \ BITMAP/Credit18.bmp \ CURSOR/CURSOR_IKA.bmp \ CURSOR/CURSOR_NORMAL.bmp \ - FONT/LiberationMono.ttf \ ICON/ICON_MINI.bmp \ ORG/Access.org \ ORG/Anzen.org \ @@ -195,8 +194,10 @@ RESOURCES = \ ifeq ($(JAPANESE), 1) RESOURCES += BITMAP/pixel_jp.bmp + RESOURCES += FONT/NotoSansMonoCJKjp.otf else RESOURCES += BITMAP/pixel.bmp + RESOURCES += FONT/LiberationMono.ttf endif ifeq ($(RENDERER), OpenGL3) diff --git a/assets/resources/FONT/LICENSE b/assets/resources/FONT/LICENSE-LiberationMono.txt similarity index 100% rename from assets/resources/FONT/LICENSE rename to assets/resources/FONT/LICENSE-LiberationMono.txt diff --git a/assets/resources/FONT/LICENSE-NotoSansMonoCJKjp.txt b/assets/resources/FONT/LICENSE-NotoSansMonoCJKjp.txt new file mode 100644 index 00000000..d952d62c --- /dev/null +++ b/assets/resources/FONT/LICENSE-NotoSansMonoCJKjp.txt @@ -0,0 +1,92 @@ +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/assets/resources/FONT/NotoSansMonoCJKjp.otf b/assets/resources/FONT/NotoSansMonoCJKjp.otf new file mode 100644 index 00000000..8732e8c0 Binary files /dev/null and b/assets/resources/FONT/NotoSansMonoCJKjp.otf differ diff --git a/src/Resource.cpp b/src/Resource.cpp index 3ff40095..58d1e4be 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -27,7 +27,11 @@ #endif #include "Resource/CURSOR/CURSOR_IKA.bmp.h" #include "Resource/CURSOR/CURSOR_NORMAL.bmp.h" +#ifdef JAPANESE +#include "Resource/FONT/NotoSansMonoCJKjp.otf.h" +#else #include "Resource/FONT/LiberationMono.ttf.h" +#endif #include "Resource/ICON/ICON_MINI.bmp.h" #include "Resource/ORG/Access.org.h" #include "Resource/ORG/Anzen.org.h" @@ -104,7 +108,11 @@ static const struct #endif {"CURSOR", "CURSOR_IKA", rCURSOR_IKA, sizeof(rCURSOR_IKA)}, {"CURSOR", "CURSOR_NORMAL", rCURSOR_NORMAL, sizeof(rCURSOR_NORMAL)}, +#ifdef JAPANESE + {"FONT", "FONT", rNotoSansMonoCJKjp, sizeof(rNotoSansMonoCJKjp)}, +#else {"FONT", "FONT", rLiberationMono, sizeof(rLiberationMono)}, +#endif {"ICON", "ICON_MINI", rICON_MINI, sizeof(rICON_MINI)}, {"ORG", "ACCESS", rAccess, sizeof(rAccess)}, {"ORG", "ANZEN", rAnzen, sizeof(rAnzen)},