diff --git a/addons/godot_xterm/themes/fonts/hack/LICENSE.md b/addons/godot_xterm/themes/fonts/hack/LICENSE.md deleted file mode 100644 index 08927e5..0000000 --- a/addons/godot_xterm/themes/fonts/hack/LICENSE.md +++ /dev/null @@ -1,45 +0,0 @@ -The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License - -The work in the DejaVu project was committed to the public domain. - -Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera" - -### MIT License - -Copyright (c) 2018 Source Foundry Authors - -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. - -### BITSTREAM VERA LICENSE - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. - -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 BITSTREAM OR THE GNOME FOUNDATION 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. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. diff --git a/addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf b/addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf deleted file mode 100644 index 92a90cb..0000000 Binary files a/addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf and /dev/null differ diff --git a/addons/godot_xterm/themes/fonts/jet_brains_mono/AUTHORS.txt b/addons/godot_xterm/themes/fonts/jet_brains_mono/AUTHORS.txt new file mode 100644 index 0000000..8814941 --- /dev/null +++ b/addons/godot_xterm/themes/fonts/jet_brains_mono/AUTHORS.txt @@ -0,0 +1,10 @@ +# This is the official list of project authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS.txt file. +# See the latter for an explanation. +# +# Names should be added to this file as: +# Name or Organization + +JetBrains <> +Philipp Nurullin +Konstantin Bulenkov diff --git a/addons/godot_xterm/themes/fonts/jet_brains_mono/OFL.txt b/addons/godot_xterm/themes/fonts/jet_brains_mono/OFL.txt new file mode 100644 index 0000000..8bee414 --- /dev/null +++ b/addons/godot_xterm/themes/fonts/jet_brains_mono/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +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://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/addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf b/addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf new file mode 100644 index 0000000..70d2ec9 Binary files /dev/null and b/addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf differ diff --git a/themes/fonts/hack/hack_italic-3.003.ttf.import b/addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf.import similarity index 54% rename from themes/fonts/hack/hack_italic-3.003.ttf.import rename to addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf.import index 88d1e67..618d0fc 100644 --- a/themes/fonts/hack/hack_italic-3.003.ttf.import +++ b/addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf.import @@ -2,13 +2,13 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://egrqmtm5myd6" -path="res://.godot/imported/hack_italic-3.003.ttf-d62bf696f9d2b4c58d4a0ef950f711d0.fontdata" +uid="uid://c51gnbjamppg" +path="res://.godot/imported/jet_brains_mono_nl-regular-2.304.ttf-96fa438503371775be3cc744a4450fc2.fontdata" [deps] -source_file="res://themes/fonts/hack/hack_italic-3.003.ttf" -dest_files=["res://.godot/imported/hack_italic-3.003.ttf-d62bf696f9d2b4c58d4a0ef950f711d0.fontdata"] +source_file="res://addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf" +dest_files=["res://.godot/imported/jet_brains_mono_nl-regular-2.304.ttf-96fa438503371775be3cc744a4450fc2.fontdata"] [params] diff --git a/addons/godot_xterm/themes/fonts/regular.tres b/addons/godot_xterm/themes/fonts/regular.tres index d167d8a..f5c523e 100644 --- a/addons/godot_xterm/themes/fonts/regular.tres +++ b/addons/godot_xterm/themes/fonts/regular.tres @@ -1,12 +1,6 @@ -[gd_resource type="FontFile" load_steps=2 format=3 uid="uid://dhmyegcx24dpo"] - -[ext_resource type="FontFile" uid="uid://edo5q2qxos3u" path="res://addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf" id="4"] +[gd_resource type="FontFile" format=3 uid="uid://dhmyegcx24dpo"] [resource] -fallbacks = [ExtResource("4")] -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8c2fa21..cf488a7 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Custom export templates are no longer required when exporting to HTML5 from Godot v3.5.x. +- The default bundled monospace font is now [JetBrains Mono](https://www.jetbrains.com/lp/mono/) rather than [Hack](https://sourcefoundry.org/hack/). + This reflects the change to the editor's default monospace font that was made in Godot 4. ### Removed diff --git a/docs/introduction.md b/docs/introduction.md index f0140e2..c5c3dc9 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -100,7 +100,9 @@ On platforms where the PTY node is not supported or if the library has been comp ### Fonts -- The Hack regular font is bundled with GodotXterm as the default Terminal font. This is also the default monospace font of the Godot editor. See the {{ '[full license]({}/addons/godot_xterm/themes/fonts/hack/LICENSE.md)'.format(repo) }}. +- The [JetBrains Mono](https://www.jetbrains.com/lp/mono/) NL (no ligatures) Regular font is bundled with GodotXterm as the default Terminal font. + This is same as the default monospace font used by the Godot editor. + It is released under the terms of the {{ '[SIL Open Font License]({}/addons/godot_xterm/themes/fonts/jet_brains_mono/OFL.txt)'.format(repo) }}. ### Nonbundled Resources @@ -108,7 +110,7 @@ The following resources are not bundled with GodotXterm (i.e. are not included i #### Fonts -- The **bold**, _italic_, and **_bold italic_** styles of the Hack font, covered by the same Hack font license as above. +- The **bold**, _italic_, and **_bold italic_** styles of the JetBrains Mono NL font, covered by the same font license as above. - Nerd Fonts. Combines symbols from a multitude of other fonts. See {{ '[license information]({}/themes/fonts/nerd_fonts/README.md)'.format(repo) }}. - Noto Color Emoji. Released under the {{ '[SIL Open Font License]({}/themes/fonts/noto_color_emoji/LICENSE_OFL.txt)'.format(repo) }}. - Unifont. Dual-licensed (since version 13.0.04) under the GNU GPL 2+ with the GNU font embedding exception and the SIL Open Font License (OFL) version 1.1. This project uses it under the terms of the {{ '[SIL Open Font License]({}/themes/fonts/unifont/LICENSE_OFL-1.1.txt)' }}. diff --git a/themes/default.tres b/themes/default.tres index 88d4758..af554b4 100644 --- a/themes/default.tres +++ b/themes/default.tres @@ -3,7 +3,7 @@ [ext_resource type="FontFile" path="res://themes/fonts/bold_italic.tres" id="2"] [ext_resource type="FontFile" path="res://themes/fonts/italic.tres" id="3"] [ext_resource type="FontFile" path="res://themes/fonts/bold.tres" id="4"] -[ext_resource type="FontFile" path="res://themes/fonts/regular.tres" id="5"] +[ext_resource type="FontFile" uid="uid://65pw442xps67" path="res://themes/fonts/regular.tres" id="5"] [resource] Terminal/colors/ansi_0_color = Color(0, 0, 0, 1) diff --git a/themes/fonts/bold.tres b/themes/fonts/bold.tres index 0a70fae..371d274 100644 --- a/themes/fonts/bold.tres +++ b/themes/fonts/bold.tres @@ -1,6 +1,6 @@ [gd_resource type="FontFile" load_steps=6 format=2] -[ext_resource path="res://themes/fonts/hack/hack_bold-3.003.ttf" type="FontFile" id=1] +[ext_resource path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf" type="FontFile" id=1] [ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=2] [ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3] [ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=4] diff --git a/themes/fonts/bold_italic.tres b/themes/fonts/bold_italic.tres index 0d9bbba..ac8ad88 100644 --- a/themes/fonts/bold_italic.tres +++ b/themes/fonts/bold_italic.tres @@ -1,7 +1,7 @@ [gd_resource type="FontFile" load_steps=6 format=2] [ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=1] -[ext_resource path="res://themes/fonts/hack/hack_bold_italic-3.003.ttf" type="FontFile" id=2] +[ext_resource path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf" type="FontFile" id=2] [ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3] [ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=4] [ext_resource path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=5] diff --git a/themes/fonts/hack/LICENSE.md b/themes/fonts/hack/LICENSE.md deleted file mode 100644 index 08927e5..0000000 --- a/themes/fonts/hack/LICENSE.md +++ /dev/null @@ -1,45 +0,0 @@ -The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License - -The work in the DejaVu project was committed to the public domain. - -Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera" - -### MIT License - -Copyright (c) 2018 Source Foundry Authors - -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. - -### BITSTREAM VERA LICENSE - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. - -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 BITSTREAM OR THE GNOME FOUNDATION 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. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. diff --git a/themes/fonts/hack/hack_bold-3.003.ttf b/themes/fonts/hack/hack_bold-3.003.ttf deleted file mode 100644 index 7ff4975..0000000 Binary files a/themes/fonts/hack/hack_bold-3.003.ttf and /dev/null differ diff --git a/themes/fonts/hack/hack_bold_italic-3.003.ttf b/themes/fonts/hack/hack_bold_italic-3.003.ttf deleted file mode 100644 index 3b137d9..0000000 Binary files a/themes/fonts/hack/hack_bold_italic-3.003.ttf and /dev/null differ diff --git a/themes/fonts/hack/hack_italic-3.003.ttf b/themes/fonts/hack/hack_italic-3.003.ttf deleted file mode 100644 index d26198a..0000000 Binary files a/themes/fonts/hack/hack_italic-3.003.ttf and /dev/null differ diff --git a/themes/fonts/italic.tres b/themes/fonts/italic.tres index 4843055..26a95f5 100644 --- a/themes/fonts/italic.tres +++ b/themes/fonts/italic.tres @@ -3,7 +3,7 @@ [ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=1] [ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=2] [ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=3] -[ext_resource path="res://themes/fonts/hack/hack_italic-3.003.ttf" type="FontFile" id=4] +[ext_resource path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf" type="FontFile" id=4] [ext_resource path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=5] [resource] diff --git a/themes/fonts/jet_brains_mono/AUTHORS.txt b/themes/fonts/jet_brains_mono/AUTHORS.txt new file mode 100644 index 0000000..8814941 --- /dev/null +++ b/themes/fonts/jet_brains_mono/AUTHORS.txt @@ -0,0 +1,10 @@ +# This is the official list of project authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS.txt file. +# See the latter for an explanation. +# +# Names should be added to this file as: +# Name or Organization + +JetBrains <> +Philipp Nurullin +Konstantin Bulenkov diff --git a/themes/fonts/jet_brains_mono/OFL.txt b/themes/fonts/jet_brains_mono/OFL.txt new file mode 100644 index 0000000..8bee414 --- /dev/null +++ b/themes/fonts/jet_brains_mono/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +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://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/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf new file mode 100644 index 0000000..f78f84f Binary files /dev/null and b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf differ diff --git a/themes/fonts/hack/hack_bold-3.003.ttf.import b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf.import similarity index 56% rename from themes/fonts/hack/hack_bold-3.003.ttf.import rename to themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf.import index 6a9604e..e0efe8f 100644 --- a/themes/fonts/hack/hack_bold-3.003.ttf.import +++ b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf.import @@ -2,13 +2,13 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://d12vt3jjjh13x" -path="res://.godot/imported/hack_bold-3.003.ttf-f6cda0eb31ecda1d960d719c91d3d8ab.fontdata" +uid="uid://uxbe3orgyw06" +path="res://.godot/imported/jet_brains_mono_nl-bold-2.304.ttf-c07502c5ad16184c3d9b936340712353.fontdata" [deps] -source_file="res://themes/fonts/hack/hack_bold-3.003.ttf" -dest_files=["res://.godot/imported/hack_bold-3.003.ttf-f6cda0eb31ecda1d960d719c91d3d8ab.fontdata"] +source_file="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf" +dest_files=["res://.godot/imported/jet_brains_mono_nl-bold-2.304.ttf-c07502c5ad16184c3d9b936340712353.fontdata"] [params] diff --git a/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf new file mode 100644 index 0000000..9fb8c83 Binary files /dev/null and b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf differ diff --git a/addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf.import b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf.import similarity index 55% rename from addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf.import rename to themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf.import index aa96867..efb5d80 100644 --- a/addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf.import +++ b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf.import @@ -2,13 +2,13 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://edo5q2qxos3u" -path="res://.godot/imported/hack_regular-3.003.ttf-eed242c98102dbda632bf4293360b927.fontdata" +uid="uid://d13vs8hwu22p" +path="res://.godot/imported/jet_brains_mono_nl-bold_italic-2.304.ttf-de03e2374fbc1657ec9496c33bc35f22.fontdata" [deps] -source_file="res://addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf" -dest_files=["res://.godot/imported/hack_regular-3.003.ttf-eed242c98102dbda632bf4293360b927.fontdata"] +source_file="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf" +dest_files=["res://.godot/imported/jet_brains_mono_nl-bold_italic-2.304.ttf-de03e2374fbc1657ec9496c33bc35f22.fontdata"] [params] diff --git a/themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf new file mode 100644 index 0000000..4e9c380 Binary files /dev/null and b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf differ diff --git a/themes/fonts/hack/hack_bold_italic-3.003.ttf.import b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf.import similarity index 56% rename from themes/fonts/hack/hack_bold_italic-3.003.ttf.import rename to themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf.import index 0e09da0..d89fe53 100644 --- a/themes/fonts/hack/hack_bold_italic-3.003.ttf.import +++ b/themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf.import @@ -2,13 +2,13 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://dkqb42uqcditb" -path="res://.godot/imported/hack_bold_italic-3.003.ttf-da55ee3a7829f071e18f2be8d225639a.fontdata" +uid="uid://4n72113e12uq" +path="res://.godot/imported/jet_brains_mono_nl-italic-2.304.ttf-26bc0aa726ea3244652aa3c47778a91e.fontdata" [deps] -source_file="res://themes/fonts/hack/hack_bold_italic-3.003.ttf" -dest_files=["res://.godot/imported/hack_bold_italic-3.003.ttf-da55ee3a7829f071e18f2be8d225639a.fontdata"] +source_file="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf" +dest_files=["res://.godot/imported/jet_brains_mono_nl-italic-2.304.ttf-26bc0aa726ea3244652aa3c47778a91e.fontdata"] [params] diff --git a/themes/fonts/regular.tres b/themes/fonts/regular.tres index 273ba9c..af8cc72 100644 --- a/themes/fonts/regular.tres +++ b/themes/fonts/regular.tres @@ -1,15 +1,34 @@ -[gd_resource type="FontFile" load_steps=6 format=2] +[gd_resource type="FontFile" load_steps=6 format=3 uid="uid://65pw442xps67"] -[ext_resource path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=1] -[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=2] -[ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3] -[ext_resource path="res://addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf" type="FontFile" id=4] -[ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=5] +[ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="1"] +[ext_resource type="FontFile" uid="uid://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="2"] +[ext_resource type="FontFile" uid="uid://bh6ce4yiqcvwi" path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" id="3"] +[ext_resource type="FontFile" uid="uid://c51gnbjamppg" path="res://addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf" id="4"] +[ext_resource type="FontFile" uid="uid://se3tefc5lv6m" path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" id="5"] [resource] -size = 14 -font_data = ExtResource( 4 ) -fallback/0 = ExtResource( 5 ) -fallback/1 = ExtResource( 3 ) -fallback/2 = ExtResource( 2 ) -fallback/3 = ExtResource( 1 ) +fallbacks = Array[Font]([ExtResource("4"), ExtResource("5"), ExtResource("3"), ExtResource("2"), ExtResource("1")]) +cache/0/11/0/ascent = 0.0 +cache/0/11/0/descent = 0.0 +cache/0/11/0/underline_position = 0.0 +cache/0/11/0/underline_thickness = 0.0 +cache/0/11/0/scale = 1.0 +cache/0/11/0/kerning_overrides/11/0 = Vector2(0, 0) +cache/0/11/0/kerning_overrides/14/0 = Vector2(0, 0) +cache/0/11/0/kerning_overrides/16/0 = Vector2(0, 0) +cache/0/14/0/ascent = 0.0 +cache/0/14/0/descent = 0.0 +cache/0/14/0/underline_position = 0.0 +cache/0/14/0/underline_thickness = 0.0 +cache/0/14/0/scale = 1.0 +cache/0/14/0/kerning_overrides/11/0 = Vector2(0, 0) +cache/0/14/0/kerning_overrides/14/0 = Vector2(0, 0) +cache/0/14/0/kerning_overrides/16/0 = Vector2(0, 0) +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/11/0 = Vector2(0, 0) +cache/0/16/0/kerning_overrides/14/0 = Vector2(0, 0) +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) diff --git a/themes/retro_green.tres b/themes/retro_green.tres index 554c8fc..34f7d2f 100644 --- a/themes/retro_green.tres +++ b/themes/retro_green.tres @@ -1,7 +1,7 @@ [gd_resource type="Theme" load_steps=4 format=3 uid="uid://blh56m1gdieyu"] [ext_resource type="Script" path="res://addons/godot_xterm/resources/xrdb_theme.gd" id="1"] -[ext_resource type="FontFile" uid="uid://edo5q2qxos3u" path="res://addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf" id="2"] +[ext_resource type="FontFile" uid="uid://c51gnbjamppg" path="res://addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf" id="2"] [sub_resource type="FontFile" id="FontFile_tdf0u"] fallbacks = [ExtResource("2")]