From: Uchi <> Date: Sat, 25 May 2024 05:37:14 +0000 (+0200) Subject: Move notoemoji to its own font folder X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7bed0cf60c010a33de490812723677232ac961f8;p=xonotic%2Fxonotic.git Move notoemoji to its own font folder --- diff --git a/data/font-notoemoji.pk3dir/fonts/OFL.txt b/data/font-notoemoji.pk3dir/fonts/OFL.txt new file mode 100644 index 00000000..8f8e6f58 --- /dev/null +++ b/data/font-notoemoji.pk3dir/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2013 Google LLC + +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: +https://openfontlicense.org + + +----------------------------------------------------------- +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/data/font-notoemoji.pk3dir/fonts/README.txt b/data/font-notoemoji.pk3dir/fonts/README.txt new file mode 100644 index 00000000..0a853126 --- /dev/null +++ b/data/font-notoemoji.pk3dir/fonts/README.txt @@ -0,0 +1,18 @@ +Noto Emoji Variable Font +======================== + +This font provided by Google Fonts is used as a fallback font to display all kinds of emoticons. +The fonts have been transformed using FontForge to fit the dimensions of Xonotic using the following options: +1. Origin: Glyph origin, Scale Uniformly: 80% +2. Origin: Glyph origin, Move: 112 + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/data/font-notoemoji.pk3dir/fonts/notoemoji-bold.ttf b/data/font-notoemoji.pk3dir/fonts/notoemoji-bold.ttf new file mode 100644 index 00000000..66a53f75 Binary files /dev/null and b/data/font-notoemoji.pk3dir/fonts/notoemoji-bold.ttf differ diff --git a/data/font-notoemoji.pk3dir/fonts/notoemoji-regular.ttf b/data/font-notoemoji.pk3dir/fonts/notoemoji-regular.ttf new file mode 100644 index 00000000..b3dc5ecd Binary files /dev/null and b/data/font-notoemoji.pk3dir/fonts/notoemoji-regular.ttf differ diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/OFL.txt b/data/font-xolonium.pk3dir/fonts/notoemoji/OFL.txt deleted file mode 100644 index 8f8e6f58..00000000 --- a/data/font-xolonium.pk3dir/fonts/notoemoji/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2013 Google LLC - -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: -https://openfontlicense.org - - ------------------------------------------------------------ -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/data/font-xolonium.pk3dir/fonts/notoemoji/README.txt b/data/font-xolonium.pk3dir/fonts/notoemoji/README.txt deleted file mode 100644 index 9da3d24e..00000000 --- a/data/font-xolonium.pk3dir/fonts/notoemoji/README.txt +++ /dev/null @@ -1,18 +0,0 @@ -Noto Emoji Variable Font -======================== - -This font provided by Google Fonts is used as a fallback font for Xolonium to display all kinds of emoticons. -The fonts have been transformed using FontForge to fit the dimensions of Xonotic using the following options: -1. Origin: Glyph origin, Scale Uniformly: 80% -2. Origin: Glyph origin, Move: 112 - -License -------- -Please read the full license text (OFL.txt) to understand the permissions, -restrictions and requirements for usage, redistribution, and modification. - -You can use them in your products & projects – print or digital, -commercial or otherwise. - -This isn't legal advice, please consider consulting a lawyer and see the full -license for all details. diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-bold.ttf b/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-bold.ttf deleted file mode 100644 index 66a53f75..00000000 Binary files a/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-bold.ttf and /dev/null differ diff --git a/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-regular.ttf b/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-regular.ttf deleted file mode 100644 index b3dc5ecd..00000000 Binary files a/data/font-xolonium.pk3dir/fonts/notoemoji/notoemoji-regular.ttf and /dev/null differ diff --git a/derivation.nix b/derivation.nix index 35051b97..1d082882 100644 --- a/derivation.nix +++ b/derivation.nix @@ -26,6 +26,9 @@ let srcs."data/font-xolonium" = localFiles ./data/font-xolonium.pk3dir; vers."data/font-xolonium" = "xonotic-${VERSION}"; + + srcs."data/font-notoemoji" = localFiles ./data/font-notoemoji.pk3dir; + vers."data/font-notoemoji" = "xonotic-${VERSION}"; # https://gitlab.com/xonotic/d0_blind_id @@ -179,6 +182,18 @@ let cp -r $src $out ''; }; + + font-notoemoji = mkDerivation rec { + name = "font-notoemoji-${version}"; + version = vers."data/font-notoemoji"; + + src = srcs."data/font-notoemoji"; + + phases = [ "installPhase" ]; + installPhase = '' + cp -r $src $out + ''; + }; d0_blind_id = mkDerivation rec { name = "d0_blind_id-${version}"; diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index 54f7c8c5..69c7bf70 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -601,6 +601,7 @@ case "$cmd" in release_common verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir raw '' verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw '' + verbose "$SELF" release-buildpk3s data/font-notoemoji.pk3dir raw '' verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normaldds '' normal '-high' verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normaldds '' mapping '-mapping' normal '-high' verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' @@ -648,7 +649,8 @@ case "$cmd" in Xonotic/server \ Xonotic/key_0.d0pk \ Xonotic/data/font-unifont-$pk3stamp.pk3 \ - Xonotic/data/font-xolonium-$pk3stamp.pk3 + Xonotic/data/font-xolonium-$pk3stamp.pk3 \ + Xonotic/data/font-notoemoji-$pk3stamp.pk3 verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip verbose mkzipr Xonotic-$stamp-source.zip \ Xonotic/source/d0_blind_id/ \ diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff index ad2ffa61..070cbec2 100755 --- a/misc/tools/xzipdiff +++ b/misc/tools/xzipdiff @@ -20,6 +20,7 @@ excludes=" Xonotic/data/font-nimbussansl-*.pk3 Xonotic/data/font-unifont-*.pk3 Xonotic/data/font-xolonium-*.pk3 + Xonotic/data/font-notoemoji-*.pk3 " makepatchname() diff --git a/release.cmake b/release.cmake index e1c41973..79c3c584 100644 --- a/release.cmake +++ b/release.cmake @@ -209,6 +209,7 @@ deftransform(mapping buildpk3s(font-unifont.pk3dir "raw\;") buildpk3s(font-xolonium.pk3dir "raw\;") +buildpk3s(font-notoemoji.pk3dir "raw\;") buildpk3s(xonotic-data.pk3dir "low\;-low" "normaldds\;" "normal\;-high") buildpk3s(xonotic-maps.pk3dir "low\;-low" "normaldds\;" "normal\;-high" "mapping\;-mapping") buildpk3s(xonotic-music.pk3dir "raw\;" "low\;-low")