diff --git a/internal/fonts/FiraCode-Bold.ttf b/internal/fonts/FiraCode-Bold.ttf deleted file mode 100644 index c0aa0f5..0000000 Binary files a/internal/fonts/FiraCode-Bold.ttf and /dev/null differ diff --git a/internal/fonts/FiraCode-Bold.ttf.xz b/internal/fonts/FiraCode-Bold.ttf.xz new file mode 100644 index 0000000..edea441 Binary files /dev/null and b/internal/fonts/FiraCode-Bold.ttf.xz differ diff --git a/internal/fonts/FiraCode-OFL.txt b/internal/fonts/FiraCode-OFL.txt deleted file mode 100644 index 19f4298..0000000 --- a/internal/fonts/FiraCode-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2014-2020 The Fira Code Project Authors (https://github.com/tonsky/FiraCode) - -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/internal/fonts/FiraCode-OFL.txt.xz b/internal/fonts/FiraCode-OFL.txt.xz new file mode 100644 index 0000000..dde5dfd Binary files /dev/null and b/internal/fonts/FiraCode-OFL.txt.xz differ diff --git a/internal/fonts/FiraCode-Regular.ttf b/internal/fonts/FiraCode-Regular.ttf deleted file mode 100644 index 82baafc..0000000 Binary files a/internal/fonts/FiraCode-Regular.ttf and /dev/null differ diff --git a/internal/fonts/FiraCode-Regular.ttf.xz b/internal/fonts/FiraCode-Regular.ttf.xz new file mode 100644 index 0000000..661a4a1 Binary files /dev/null and b/internal/fonts/FiraCode-Regular.ttf.xz differ diff --git a/internal/fonts/Inconsolata-Bold.ttf b/internal/fonts/Inconsolata-Bold.ttf deleted file mode 100644 index 57aa66c..0000000 Binary files a/internal/fonts/Inconsolata-Bold.ttf and /dev/null differ diff --git a/internal/fonts/Inconsolata-Bold.ttf.xz b/internal/fonts/Inconsolata-Bold.ttf.xz new file mode 100644 index 0000000..8875cb4 Binary files /dev/null and b/internal/fonts/Inconsolata-Bold.ttf.xz differ diff --git a/internal/fonts/Inconsolata-OFL.txt b/internal/fonts/Inconsolata-OFL.txt deleted file mode 100644 index 0b83a9a..0000000 --- a/internal/fonts/Inconsolata-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2006 The Inconsolata Project Authors - -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/internal/fonts/Inconsolata-OFL.txt.xz b/internal/fonts/Inconsolata-OFL.txt.xz new file mode 100644 index 0000000..cb8c915 Binary files /dev/null and b/internal/fonts/Inconsolata-OFL.txt.xz differ diff --git a/internal/fonts/Inconsolata-Regular.ttf b/internal/fonts/Inconsolata-Regular.ttf deleted file mode 100644 index 0d879bf..0000000 Binary files a/internal/fonts/Inconsolata-Regular.ttf and /dev/null differ diff --git a/internal/fonts/Inconsolata-Regular.ttf.xz b/internal/fonts/Inconsolata-Regular.ttf.xz new file mode 100644 index 0000000..e5e97ce Binary files /dev/null and b/internal/fonts/Inconsolata-Regular.ttf.xz differ diff --git a/internal/fonts/NotoSans-Bold.ttf b/internal/fonts/NotoSans-Bold.ttf deleted file mode 100644 index 3e68bc2..0000000 Binary files a/internal/fonts/NotoSans-Bold.ttf and /dev/null differ diff --git a/internal/fonts/NotoSans-Bold.ttf.xz b/internal/fonts/NotoSans-Bold.ttf.xz new file mode 100644 index 0000000..70c980a Binary files /dev/null and b/internal/fonts/NotoSans-Bold.ttf.xz differ diff --git a/internal/fonts/NotoSans-OFL.txt b/internal/fonts/NotoSans-OFL.txt deleted file mode 100644 index 90b7332..0000000 --- a/internal/fonts/NotoSans-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2015-2021 Google LLC. 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/internal/fonts/NotoSans-OFL.txt.xz b/internal/fonts/NotoSans-OFL.txt.xz new file mode 100644 index 0000000..72f581c Binary files /dev/null and b/internal/fonts/NotoSans-OFL.txt.xz differ diff --git a/internal/fonts/NotoSans-Regular.ttf b/internal/fonts/NotoSans-Regular.ttf deleted file mode 100644 index 973bc2e..0000000 Binary files a/internal/fonts/NotoSans-Regular.ttf and /dev/null differ diff --git a/internal/fonts/NotoSans-Regular.ttf.xz b/internal/fonts/NotoSans-Regular.ttf.xz new file mode 100644 index 0000000..62ae221 Binary files /dev/null and b/internal/fonts/NotoSans-Regular.ttf.xz differ diff --git a/internal/fonts/NotoSansCJK-Bold.ttf b/internal/fonts/NotoSansCJK-Bold.ttf deleted file mode 100644 index 2b8a788..0000000 Binary files a/internal/fonts/NotoSansCJK-Bold.ttf and /dev/null differ diff --git a/internal/fonts/NotoSansCJK-Bold.ttf.xz b/internal/fonts/NotoSansCJK-Bold.ttf.xz new file mode 100644 index 0000000..1270501 Binary files /dev/null and b/internal/fonts/NotoSansCJK-Bold.ttf.xz differ diff --git a/internal/fonts/NotoSansCJK-OFL.txt b/internal/fonts/NotoSansCJK-OFL.txt deleted file mode 100644 index 617bbeb..0000000 --- a/internal/fonts/NotoSansCJK-OFL.txt +++ /dev/null @@ -1,92 +0,0 @@ -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/internal/fonts/NotoSansCJK-OFL.txt.xz b/internal/fonts/NotoSansCJK-OFL.txt.xz new file mode 100644 index 0000000..e23b91e Binary files /dev/null and b/internal/fonts/NotoSansCJK-OFL.txt.xz differ diff --git a/internal/fonts/NotoSansCJK-Regular.ttf b/internal/fonts/NotoSansCJK-Regular.ttf deleted file mode 100644 index 9b8528d..0000000 Binary files a/internal/fonts/NotoSansCJK-Regular.ttf and /dev/null differ diff --git a/internal/fonts/NotoSansCJK-Regular.ttf.xz b/internal/fonts/NotoSansCJK-Regular.ttf.xz new file mode 100644 index 0000000..433a810 Binary files /dev/null and b/internal/fonts/NotoSansCJK-Regular.ttf.xz differ diff --git a/internal/fonts/Sevillana-OFL.txt b/internal/fonts/Sevillana-OFL.txt deleted file mode 100644 index 4b7a731..0000000 --- a/internal/fonts/Sevillana-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2011, Brownfox (gayaneh.b@gmail.com), -with Reserved Font Names "Sevillana" - -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/internal/fonts/Sevillana-OFL.txt.xz b/internal/fonts/Sevillana-OFL.txt.xz new file mode 100644 index 0000000..ec7ccfd Binary files /dev/null and b/internal/fonts/Sevillana-OFL.txt.xz differ diff --git a/internal/fonts/Sevillana-Regular.ttf b/internal/fonts/Sevillana-Regular.ttf deleted file mode 100644 index c95d5ce..0000000 Binary files a/internal/fonts/Sevillana-Regular.ttf and /dev/null differ diff --git a/internal/fonts/Sevillana-Regular.ttf.xz b/internal/fonts/Sevillana-Regular.ttf.xz new file mode 100644 index 0000000..8dd70ca Binary files /dev/null and b/internal/fonts/Sevillana-Regular.ttf.xz differ diff --git a/theme.go b/theme.go index 4685415..1231afa 100644 --- a/theme.go +++ b/theme.go @@ -4,9 +4,11 @@ import ( "crocgui/internal/croctheme" "fmt" "image/color" + "io" "fyne.io/fyne/v2" "fyne.io/fyne/v2/theme" + "github.com/ulikunitz/xz" ) type crocTheme struct { @@ -31,13 +33,15 @@ func (c crocTheme) Icon(name fyne.ThemeIconName) fyne.Resource { } func (c crocTheme) Font(style fyne.TextStyle) fyne.Resource { + ftype := "Regular" if style.Bold { - if ttf, lerr := fsFonts.ReadFile(fmt.Sprintf("internal/fonts/%s-Bold.ttf", c.fontName)); lerr == nil { - return fyne.NewStaticResource(fmt.Sprintf("%s-Bold.ttf", c.fontName), ttf) - } + ftype = "Bold" } - if ttf, lerr := fsFonts.ReadFile(fmt.Sprintf("internal/fonts/%s-Regular.ttf", c.fontName)); lerr == nil { - return fyne.NewStaticResource(fmt.Sprintf("%s-Regular.ttf", c.fontName), ttf) + + if ttfxz, lerr := fsFonts.Open(fmt.Sprintf("internal/fonts/%s-%s.ttf.xz", c.fontName, ftype)); lerr == nil { + xr, _ := xz.NewReader(ttfxz) + ttf, _ := io.ReadAll(xr) + return fyne.NewStaticResource(fmt.Sprintf("%s-%s.ttf", c.fontName, ftype), ttf) } return theme.DefaultTheme().Font(style)