diff --git a/assets/fonts/Geist-VF.ttf b/assets/fonts/Geist-VF.ttf deleted file mode 100644 index 6ae64b3b..00000000 Binary files a/assets/fonts/Geist-VF.ttf and /dev/null differ diff --git a/assets/fonts/Geist[wght].woff2 b/assets/fonts/Geist[wght].woff2 new file mode 100644 index 00000000..6fd61c44 Binary files /dev/null and b/assets/fonts/Geist[wght].woff2 differ diff --git a/assets/fonts/Onest-VF.ttf b/assets/fonts/Onest-VF.ttf deleted file mode 100644 index 6c77d201..00000000 Binary files a/assets/fonts/Onest-VF.ttf and /dev/null differ diff --git a/assets/fonts/Onest[wght].woff2 b/assets/fonts/Onest[wght].woff2 new file mode 100644 index 00000000..b51a0700 Binary files /dev/null and b/assets/fonts/Onest[wght].woff2 differ diff --git a/assets/fonts/ShangguSansHWSC-VF.ttf b/assets/fonts/ShangguSansSC-VF.ttf similarity index 99% rename from assets/fonts/ShangguSansHWSC-VF.ttf rename to assets/fonts/ShangguSansSC-VF.ttf index bcc56a50..c1a33ed3 100644 Binary files a/assets/fonts/ShangguSansHWSC-VF.ttf and b/assets/fonts/ShangguSansSC-VF.ttf differ diff --git a/assets/fonts/ZhudouSans-LICENSE.txt b/assets/fonts/ZhudouSans-LICENSE.txt new file mode 100644 index 00000000..5014a27d --- /dev/null +++ b/assets/fonts/ZhudouSans-LICENSE.txt @@ -0,0 +1,95 @@ +Copyright © 2022 Buernia (https://github.com/Buernia), with Reserved Font Name 'Zhudou' and '煮豆'. +Portions Copyright © 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. +Portions Copyright © 2015 Google Inc. + +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/assets/fonts/ZhudouSansVF-subset.woff2 b/assets/fonts/ZhudouSansVF-subset.woff2 new file mode 100644 index 00000000..d7e37194 Binary files /dev/null and b/assets/fonts/ZhudouSansVF-subset.woff2 differ diff --git a/assets/fonts/ZhudouSansVF.ttf b/assets/fonts/ZhudouSansVF.ttf deleted file mode 100644 index fffa3b1f..00000000 Binary files a/assets/fonts/ZhudouSansVF.ttf and /dev/null differ diff --git a/src/contentScripts/views/necessarySettingsWatchers.ts b/src/contentScripts/views/necessarySettingsWatchers.ts index da87f2aa..380f4b71 100644 --- a/src/contentScripts/views/necessarySettingsWatchers.ts +++ b/src/contentScripts/views/necessarySettingsWatchers.ts @@ -57,9 +57,8 @@ export function setupNecessarySettingsWatchers() { // Set the default font family if (!settings.value.fontFamily && settings.value.customizeFont !== 'custom') { - settings.value.fontFamily = `bilifont, Comme-Number, Onest, ShangguSans, -apple-system, BlinkMacSystemFont, InterVariable, Inter, "Segoe UI", - Cantarell, "Noto Sans", "Roboto Flex", Roboto, sans-serif, ui-sans-serif, system-ui, "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", - "Segoe UI Emoji", "Segoe UI Symbol", emoji` + /* Do not wrap following line */ + settings.value.fontFamily = `bilifont, CJKEmDash, Numbers, Onest, ShangguSansSCVF, -apple-system, BlinkMacSystemFont, InterVariable, Inter, "Segoe UI", Cantarell, "Noto Sans", "Roboto Flex", Roboto, sans-serif, ui-sans-serif, system-ui, "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", emoji` } // Remove the custom fonts first diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss index a0bb9d24..15b205a3 100644 --- a/src/styles/fonts.scss +++ b/src/styles/fonts.scss @@ -2,8 +2,8 @@ :root, :host { - --bew-fonts-basic: bilifont, Geist-Number, Onest, ShangguSans, -apple-system, BlinkMacSystemFont, InterVariable, Inter, - "Segoe UI", Cantarell, "Noto Sans", "Roboto Flex", Roboto; + --bew-fonts-basic: bilifont, CJKEmDash, Numbers, Onest, ShangguSansSCVF, -apple-system, BlinkMacSystemFont, + InterVariable, Inter, "Segoe UI", Cantarell, "Noto Sans", "Roboto Flex", Roboto; --bew-fonts-fallback: sans-serif, ui-sans-serif, system-ui, "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", emoji; diff --git a/src/styles/injectBuildInFonts.ts b/src/styles/injectBuildInFonts.ts index cefbf88b..c5e9633f 100644 --- a/src/styles/injectBuildInFonts.ts +++ b/src/styles/injectBuildInFonts.ts @@ -4,18 +4,24 @@ import { injectCSS } from '~/utils/main' injectCSS(` @font-face { - font-family: "Geist-Number"; - unicode-range: U+0030-0039, U+FF10-FF19; - src: url(${browser.runtime.getURL('/assets/fonts/Geist-VF.ttf')}) format("truetype-variations"); + font-family: "Numbers"; + unicode-range: U+0030-0039; + src: url(${browser.runtime.getURL('/assets/fonts/Geist[wght].woff2')}) format("woff2-variations"); } @font-face { font-family: "Onest"; - src: url(${browser.runtime.getURL('/assets/fonts/Onest-VF.ttf')}) format("truetype-variations"); + src: url(${browser.runtime.getURL('/assets/fonts/Onest[wght].woff2')}) format("woff2-variations"); } @font-face { - font-family: "ShangguSans"; - src: url(${browser.runtime.getURL('/assets/fonts/ShangguSansHWSC-VF.ttf')}) format("truetype-variations"); + font-family: "ShangguSansSCVF"; + src: url(${browser.runtime.getURL('/assets/fonts/ShangguSansSC-VF.ttf')}) format("truetype-variations"); + } + + @font-face { + font-family: "CJKEmDash"; + unicode-range: U+2014, U+2E3A-2E3B; + src: url(${browser.runtime.getURL('/assets/fonts/ZhudouSansVF-subset.woff2')}) format("woff2-variations"); } `)