diff --git a/dragonpilot/LICENSE.md b/dragonpilot/LICENSE.md new file mode 100644 index 000000000..76e9bfcbb --- /dev/null +++ b/dragonpilot/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2019-, Rick Lan, dragonpilot community, and a number of other of contributors. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/dragonpilot/chinese-fonts/LICENSE_OFL.txt b/dragonpilot/chinese-fonts/LICENSE_OFL.txt new file mode 100644 index 000000000..d952d62c0 --- /dev/null +++ b/dragonpilot/chinese-fonts/LICENSE_OFL.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/selfdrive/assets/fonts/NotoSansCJKtc-Bold.otf b/dragonpilot/chinese-fonts/NotoSansCJKtc-Bold.otf similarity index 100% rename from selfdrive/assets/fonts/NotoSansCJKtc-Bold.otf rename to dragonpilot/chinese-fonts/NotoSansCJKtc-Bold.otf diff --git a/selfdrive/assets/fonts/NotoSansCJKtc-Medium.otf b/dragonpilot/chinese-fonts/NotoSansCJKtc-Medium.otf similarity index 100% rename from selfdrive/assets/fonts/NotoSansCJKtc-Medium.otf rename to dragonpilot/chinese-fonts/NotoSansCJKtc-Medium.otf diff --git a/selfdrive/assets/fonts/NotoSansCJKtc-Regular.otf b/dragonpilot/chinese-fonts/NotoSansCJKtc-Regular.otf similarity index 100% rename from selfdrive/assets/fonts/NotoSansCJKtc-Regular.otf rename to dragonpilot/chinese-fonts/NotoSansCJKtc-Regular.otf diff --git a/dragonpilot/chinese-fonts/fonts.xml b/dragonpilot/chinese-fonts/fonts.xml index 71c056832..de40a7624 100644 --- a/dragonpilot/chinese-fonts/fonts.xml +++ b/dragonpilot/chinese-fonts/fonts.xml @@ -334,12 +334,6 @@ NotoSansSymbols-Regular-Subsetted.ttf - - NotoSansSC-Regular.otf - - - NotoSansTC-Regular.otf - NotoSansJP-Regular.otf @@ -352,8 +346,15 @@ NotoColorEmoji.ttf - - Miui-Regular.ttf + + NotoSansCJKtc-Regular.otf + NotoSansCJKtc-Medium.otf + NotoSansCJKtc-Bold.otf + + + NotoSansCJKtc-Regular.otf + NotoSansCJKtc-Medium.otf + NotoSansCJKtc-Bold.otf MTLmr3m.ttf diff --git a/dragonpilot/chinese-fonts/installer.sh b/dragonpilot/chinese-fonts/installer.sh index f38725640..3589f7d88 100755 --- a/dragonpilot/chinese-fonts/installer.sh +++ b/dragonpilot/chinese-fonts/installer.sh @@ -1,48 +1,67 @@ #!/usr/bin/bash -# Anndroid system locale, zh-TW = Traditional Chinese, zh-CN = Simplified Chinese +############################################################################### +# The MIT License +# +# Copyright (c) 2019-, Rick Lan, dragonpilot community, and a number of other of contributors. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# +# Noto is a trademark of Google Inc. Noto fonts are open source. +# All Noto fonts are published under the SIL Open Font License, +# Version 1.1. Language data and some sample texts are from the Unicode CLDR project. +# +############################################################################### + + +# Android system locale, zh-TW = Traditional Chinese, zh-CN = Simplified Chinese lang=zh-TW -update_font_reg=0 -update_font_bold=0 +update_font=0 remove_old_font=0 # check regular font -if [ ! -f "/system/fonts/Miui-Regular.ttf" ]; then - update_font_reg=1 +if [ ! -f "/system/fonts/NotoSansCJKtc-Regular.otf" ]; then + update_font=1 fi -# check bold font -if [ ! -f "/system/fonts/Miui-Bold.ttf" ]; then - update_font_bold=1 -fi - -# check droidsans font -if ls /system/fonts/DroidSansFallback*.ttf 1> /dev/null 2>&1; then +# check miui font +if ls /system/fonts/Miui*.ttf 1> /dev/null 2>&1; then remove_old_font=1 fi -if [ $update_font_reg -eq "1" ] || [ $update_font_bold -eq "1" ] || [ $remove_old_font -eq "1" ]; then - # sleep 3 secs in case, make sure the /system is remountable +if [ $update_font -eq "1" ] || [ $remove_old_font -eq "1" ]; then + # sleep 3 secs in case, make sure the /system is re-mountable sleep 3 mount -o remount,rw /system - if [ $update_font_reg -eq "1" ] || [ $update_font_bold -eq "1" ]; then - # download regular font - if [ $update_font_reg -eq "1" ]; then - yes | cp -rf /data/openpilot/dragonpilot/chinese-fonts/Miui-Regular.ttf /system/fonts/Miui-Regular.ttf - fi - # download bold font - if [ $update_font_bold -eq "1" ]; then - yes | cp -rf /data/openpilot/dragonpilot/chinese-fonts/Miui-Bold.ttf /system/fonts/Miui-Bold.ttf - fi - # dont new font mapping - yes | cp -rf /data/openpilot/dragonpilot/chinese-fonts/fonts.xml /system/etc/fonts.xml + if [ $update_font -eq "1" ]; then + # install font + cp -rf /data/openpilot/dragonpilot/chinese-fonts/NotoSansCJKtc-* /system/fonts/ + # install font mapping + cp -rf /data/openpilot/dragonpilot/chinese-fonts/fonts.xml /system/etc/fonts.xml + # change permissions chmod 644 /system/etc/fonts.xml - chmod 644 /system/fonts/Miui-* + chmod 644 /system/fonts/NotoSansCJKtc-* fi - # remove driodsans font + # remove miui font if [ $remove_old_font -eq "1" ]; then - rm -fr /system/fonts/DroidSansFallback*.ttf + rm -fr /system/fonts/Miui*.ttf fi mount -o remount,r /system # change system locale diff --git a/selfdrive/dragonpilot/LICENSE.md b/selfdrive/dragonpilot/LICENSE.md new file mode 100644 index 000000000..76e9bfcbb --- /dev/null +++ b/selfdrive/dragonpilot/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2019-, Rick Lan, dragonpilot community, and a number of other of contributors. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/selfdrive/ui/ui.c b/selfdrive/ui/ui.c index 3af421133..09c51e999 100644 --- a/selfdrive/ui/ui.c +++ b/selfdrive/ui/ui.c @@ -569,11 +569,11 @@ static void ui_init(UIState *s) { s->font_courbd = nvgCreateFont(s->vg, "courbd", "../assets/fonts/courbd.ttf"); assert(s->font_courbd >= 0); - s->font_sans_regular = nvgCreateFont(s->vg, "sans-regular", "../assets/fonts/NotoSansCJKtc-Regular.otf"); + s->font_sans_regular = nvgCreateFont(s->vg, "sans-regular", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Regular.otf"); assert(s->font_sans_regular >= 0); - s->font_sans_semibold = nvgCreateFont(s->vg, "sans-semibold", "../assets/fonts/NotoSansCJKtc-Medium.otf"); + s->font_sans_semibold = nvgCreateFont(s->vg, "sans-semibold", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Medium.otf"); assert(s->font_sans_semibold >= 0); - s->font_sans_bold = nvgCreateFont(s->vg, "sans-bold", "../assets/fonts/NotoSansCJKtc-Bold.otf"); + s->font_sans_bold = nvgCreateFont(s->vg, "sans-bold", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Bold.otf"); assert(s->font_sans_bold >= 0); assert(s->img_wheel >= 0);