diff --git a/fonts/resources/iosevka/iosevka-bold-italic.ttf b/fonts/resources/iosevka/iosevka-bold-italic.ttf deleted file mode 100755 index 73f97e1..0000000 Binary files a/fonts/resources/iosevka/iosevka-bold-italic.ttf and /dev/null differ diff --git a/fonts/resources/iosevka/iosevka-bold.ttf b/fonts/resources/iosevka/iosevka-bold.ttf deleted file mode 100755 index 804e43b..0000000 Binary files a/fonts/resources/iosevka/iosevka-bold.ttf and /dev/null differ diff --git a/fonts/resources/iosevka/iosevka-bold.woff b/fonts/resources/iosevka/iosevka-bold.woff new file mode 100644 index 0000000..cd5bda7 Binary files /dev/null and b/fonts/resources/iosevka/iosevka-bold.woff differ diff --git a/fonts/resources/iosevka/iosevka-bolditalic.woff b/fonts/resources/iosevka/iosevka-bolditalic.woff new file mode 100644 index 0000000..893c38a Binary files /dev/null and b/fonts/resources/iosevka/iosevka-bolditalic.woff differ diff --git a/fonts/resources/iosevka/iosevka-italic.ttf b/fonts/resources/iosevka/iosevka-italic.ttf deleted file mode 100755 index d07d25c..0000000 Binary files a/fonts/resources/iosevka/iosevka-italic.ttf and /dev/null differ diff --git a/fonts/resources/iosevka/iosevka-italic.woff b/fonts/resources/iosevka/iosevka-italic.woff new file mode 100644 index 0000000..d9f64f9 Binary files /dev/null and b/fonts/resources/iosevka/iosevka-italic.woff differ diff --git a/fonts/resources/iosevka/iosevka.ttf b/fonts/resources/iosevka/iosevka.ttf deleted file mode 100755 index dcfe632..0000000 Binary files a/fonts/resources/iosevka/iosevka.ttf and /dev/null differ diff --git a/fonts/resources/iosevka/iosevka.woff b/fonts/resources/iosevka/iosevka.woff new file mode 100644 index 0000000..17e46c6 Binary files /dev/null and b/fonts/resources/iosevka/iosevka.woff differ diff --git a/fonts/resources/iosevka/license.txt b/fonts/resources/iosevka/license.md similarity index 73% rename from fonts/resources/iosevka/license.txt rename to fonts/resources/iosevka/license.md index 285b163..831ac60 100755 --- a/fonts/resources/iosevka/license.txt +++ b/fonts/resources/iosevka/license.md @@ -1,22 +1,33 @@ The font is licensed under SIL OFL Version 1.1. + The support code is licensed under Berkeley Software Distribution license. -==================================================================== -Copyright (c) 2015-2016 Belleve Invis +--- +--- -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: +Copyright (c) 2015-2020 Belleve Invis (belleve@typeof.net). -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +* Neither the name of Belleve Invis nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -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. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BELLEVE INVIS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -==================================================================== -Copyright 2015-2016, Belleve Invis (belleve@typeof.net) +----------------------- + +--- + +Copyright 2015-2020, Belleve Invis (belleve@typeof.net). 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 v1.1 ==================================================== @@ -98,6 +109,7 @@ Software, subject to the following conditions: using the Font Software. + Termination ----------- @@ -115,4 +127,4 @@ not met. 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. \ No newline at end of file + OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/stylesheets/fonts.less b/fonts/stylesheets/fonts.less index 12ff6ea..de1e2a0 100755 --- a/fonts/stylesheets/fonts.less +++ b/fonts/stylesheets/fonts.less @@ -165,10 +165,10 @@ .font ( 'ia-writer-mono', bold, normal, 'ia-writer-mono/ia-writer-mono-bold.woff' ); .font ( 'ia-writer-mono', bold, italic, 'ia-writer-mono/ia-writer-mono-bold-italic.woff' ); -.font ( 'iosevka', normal, normal, 'iosevka/iosevka.ttf' ); -.font ( 'iosevka', normal, italic, 'iosevka/iosevka-italic.ttf' ); -.font ( 'iosevka', bold, normal, 'iosevka/iosevka-bold.ttf' ); -.font ( 'iosevka', bold, italic, 'iosevka/iosevka-bold-italic.ttf' ); +.font ( 'iosevka', normal, normal, 'iosevka/iosevka.woff' ); +.font ( 'iosevka', normal, italic, 'iosevka/iosevka-italic.woff' ); +.font ( 'iosevka', bold, normal, 'iosevka/iosevka-bold.woff' ); +.font ( 'iosevka', bold, italic, 'iosevka/iosevka-bold-italic.woff' ); .font ( 'inconsolata', normal, normal, 'inconsolata/inconsolata.otf' ); diff --git a/fonts/stylesheets/stylesheet.css b/fonts/stylesheets/stylesheet.css index b4e1e8d..24331e9 100755 --- a/fonts/stylesheets/stylesheet.css +++ b/fonts/stylesheets/stylesheet.css @@ -698,25 +698,25 @@ font-family: 'iosevka'; font-weight: normal; font-style: normal; - src: url('../resources/iosevka/iosevka.ttf'); + src: url('../resources/iosevka/iosevka.woff'); } @font-face { font-family: 'iosevka'; font-weight: normal; font-style: italic; - src: url('../resources/iosevka/iosevka-italic.ttf'); + src: url('../resources/iosevka/iosevka-italic.woff'); } @font-face { font-family: 'iosevka'; font-weight: bold; font-style: normal; - src: url('../resources/iosevka/iosevka-bold.ttf'); + src: url('../resources/iosevka/iosevka-bold.woff'); } @font-face { font-family: 'iosevka'; font-weight: bold; font-style: italic; - src: url('../resources/iosevka/iosevka-bold-italic.ttf'); + src: url('../resources/iosevka/iosevka-bold-italic.woff'); } @font-face { font-family: 'inconsolata';