fix font paths

assets/fonts/.gitignore

@@ -0,0 +1 @@
+*.ttf

assets/fonts/Noto_Sans/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
-
-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.

assets/fonts/Noto_Sans/README.txt

@@ -1,136 +0,0 @@
-Noto Sans Variable Font
-=======================
-
-This download contains Noto Sans as both variable fonts and static fonts.
-
-Noto Sans is a variable font with these axes:
-  wdth
-  wght
-
-This means all the styles are contained in these files:
-  Noto_Sans/NotoSans-VariableFont_wdth,wght.ttf
-  Noto_Sans/NotoSans-Italic-VariableFont_wdth,wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Noto Sans:
-  Noto_Sans/static/NotoSans_ExtraCondensed-Thin.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLight.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-Light.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-Regular.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-Medium.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-SemiBold.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-Bold.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBold.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-Black.ttf
-  Noto_Sans/static/NotoSans_Condensed-Thin.ttf
-  Noto_Sans/static/NotoSans_Condensed-ExtraLight.ttf
-  Noto_Sans/static/NotoSans_Condensed-Light.ttf
-  Noto_Sans/static/NotoSans_Condensed-Regular.ttf
-  Noto_Sans/static/NotoSans_Condensed-Medium.ttf
-  Noto_Sans/static/NotoSans_Condensed-SemiBold.ttf
-  Noto_Sans/static/NotoSans_Condensed-Bold.ttf
-  Noto_Sans/static/NotoSans_Condensed-ExtraBold.ttf
-  Noto_Sans/static/NotoSans_Condensed-Black.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Thin.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-ExtraLight.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Light.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Regular.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Medium.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-SemiBold.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Bold.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-ExtraBold.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Black.ttf
-  Noto_Sans/static/NotoSans-Thin.ttf
-  Noto_Sans/static/NotoSans-ExtraLight.ttf
-  Noto_Sans/static/NotoSans-Light.ttf
-  Noto_Sans/static/NotoSans-Regular.ttf
-  Noto_Sans/static/NotoSans-Medium.ttf
-  Noto_Sans/static/NotoSans-SemiBold.ttf
-  Noto_Sans/static/NotoSans-Bold.ttf
-  Noto_Sans/static/NotoSans-ExtraBold.ttf
-  Noto_Sans/static/NotoSans-Black.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-ThinItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLightItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-LightItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-Italic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-MediumItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-SemiBoldItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-BoldItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBoldItalic.ttf
-  Noto_Sans/static/NotoSans_ExtraCondensed-BlackItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-ThinItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-ExtraLightItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-LightItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-Italic.ttf
-  Noto_Sans/static/NotoSans_Condensed-MediumItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-SemiBoldItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-BoldItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-ExtraBoldItalic.ttf
-  Noto_Sans/static/NotoSans_Condensed-BlackItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-ThinItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-ExtraLightItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-LightItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-Italic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-MediumItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-SemiBoldItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-BoldItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-ExtraBoldItalic.ttf
-  Noto_Sans/static/NotoSans_SemiCondensed-BlackItalic.ttf
-  Noto_Sans/static/NotoSans-ThinItalic.ttf
-  Noto_Sans/static/NotoSans-ExtraLightItalic.ttf
-  Noto_Sans/static/NotoSans-LightItalic.ttf
-  Noto_Sans/static/NotoSans-Italic.ttf
-  Noto_Sans/static/NotoSans-MediumItalic.ttf
-  Noto_Sans/static/NotoSans-SemiBoldItalic.ttf
-  Noto_Sans/static/NotoSans-BoldItalic.ttf
-  Noto_Sans/static/NotoSans-ExtraBoldItalic.ttf
-  Noto_Sans/static/NotoSans-BlackItalic.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
-  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
-  https://variablefonts.typenetwork.com
-  https://medium.com/variable-fonts
-
-In desktop apps
-
-  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
-  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
-  https://developers.google.com/fonts/docs/getting_started
-  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
-  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
-  MacOS: https://support.apple.com/en-us/HT201749
-  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
-  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
-  https://developers.google.com/fonts/docs/android
-  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-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.

assets/fonts/Roboto/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic)
-
-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.

assets/fonts/Roboto/README.txt

@@ -1,118 +0,0 @@
-Roboto Variable Font
-====================
-
-This download contains Roboto as both variable fonts and static fonts.
-
-Roboto is a variable font with these axes:
-  wdth
-  wght
-
-This means all the styles are contained in these files:
-  Roboto/Roboto-VariableFont_wdth,wght.ttf
-  Roboto/Roboto-Italic-VariableFont_wdth,wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Roboto:
-  Roboto/static/Roboto_Condensed-Thin.ttf
-  Roboto/static/Roboto_Condensed-ExtraLight.ttf
-  Roboto/static/Roboto_Condensed-Light.ttf
-  Roboto/static/Roboto_Condensed-Regular.ttf
-  Roboto/static/Roboto_Condensed-Medium.ttf
-  Roboto/static/Roboto_Condensed-SemiBold.ttf
-  Roboto/static/Roboto_Condensed-Bold.ttf
-  Roboto/static/Roboto_Condensed-ExtraBold.ttf
-  Roboto/static/Roboto_Condensed-Black.ttf
-  Roboto/static/Roboto_SemiCondensed-Thin.ttf
-  Roboto/static/Roboto_SemiCondensed-ExtraLight.ttf
-  Roboto/static/Roboto_SemiCondensed-Light.ttf
-  Roboto/static/Roboto_SemiCondensed-Regular.ttf
-  Roboto/static/Roboto_SemiCondensed-Medium.ttf
-  Roboto/static/Roboto_SemiCondensed-SemiBold.ttf
-  Roboto/static/Roboto_SemiCondensed-Bold.ttf
-  Roboto/static/Roboto_SemiCondensed-ExtraBold.ttf
-  Roboto/static/Roboto_SemiCondensed-Black.ttf
-  Roboto/static/Roboto-Thin.ttf
-  Roboto/static/Roboto-ExtraLight.ttf
-  Roboto/static/Roboto-Light.ttf
-  Roboto/static/Roboto-Regular.ttf
-  Roboto/static/Roboto-Medium.ttf
-  Roboto/static/Roboto-SemiBold.ttf
-  Roboto/static/Roboto-Bold.ttf
-  Roboto/static/Roboto-ExtraBold.ttf
-  Roboto/static/Roboto-Black.ttf
-  Roboto/static/Roboto_Condensed-ThinItalic.ttf
-  Roboto/static/Roboto_Condensed-ExtraLightItalic.ttf
-  Roboto/static/Roboto_Condensed-LightItalic.ttf
-  Roboto/static/Roboto_Condensed-Italic.ttf
-  Roboto/static/Roboto_Condensed-MediumItalic.ttf
-  Roboto/static/Roboto_Condensed-SemiBoldItalic.ttf
-  Roboto/static/Roboto_Condensed-BoldItalic.ttf
-  Roboto/static/Roboto_Condensed-ExtraBoldItalic.ttf
-  Roboto/static/Roboto_Condensed-BlackItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-ThinItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-ExtraLightItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-LightItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-Italic.ttf
-  Roboto/static/Roboto_SemiCondensed-MediumItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-SemiBoldItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-BoldItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-ExtraBoldItalic.ttf
-  Roboto/static/Roboto_SemiCondensed-BlackItalic.ttf
-  Roboto/static/Roboto-ThinItalic.ttf
-  Roboto/static/Roboto-ExtraLightItalic.ttf
-  Roboto/static/Roboto-LightItalic.ttf
-  Roboto/static/Roboto-Italic.ttf
-  Roboto/static/Roboto-MediumItalic.ttf
-  Roboto/static/Roboto-SemiBoldItalic.ttf
-  Roboto/static/Roboto-BoldItalic.ttf
-  Roboto/static/Roboto-ExtraBoldItalic.ttf
-  Roboto/static/Roboto-BlackItalic.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
-  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
-  https://variablefonts.typenetwork.com
-  https://medium.com/variable-fonts
-
-In desktop apps
-
-  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
-  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
-  https://developers.google.com/fonts/docs/getting_started
-  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
-  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
-  MacOS: https://support.apple.com/en-us/HT201749
-  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
-  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
-  https://developers.google.com/fonts/docs/android
-  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-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.

assets/fonts/fetch.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+FORCE=0
+if [[ "${1:-}" == "--force" ]]; then
+  FORCE=1
+fi
+
+BASE_URL="https://github.com/google/fonts/raw/refs/heads/main/"
+
+declare -A FONTS=(
+  ["Roboto.ttf"]="ofl/roboto/Roboto%5Bwdth,wght%5D.ttf"
+  ["NotoSans.ttf"]="ofl/notosans/NotoSans%5Bwdth,wght%5D.ttf"
+  ["NotoSansSC.ttf"]="ofl/notosanssc/NotoSansSC%5Bwdth,wght%5D.ttf"
+)
+
+for filename in "${!FONTS[@]}"; do
+  font_path="${FONTS[$filename]}"
+  url="${BASE_URL}${font_path}"
+
+  if [[ -f "$filename" && $FORCE -eq 0 ]]; then
+      echo "Skipping $filename (already exists)"
+  fi
+
+  echo "Fetching $filename from $url"
+  curl -L "$url" -o "$filename"
+done

crates/renderer/src/text.rs

@@ -16,10 +16,8 @@ use crate::{
     util::{self, F32, Rect2D},
 };
 
-const ROBOTO_BYTES: &[u8] =
-    include_bytes!("../../../assets/fonts/Roboto/Roboto-VariableFont_wdth,wght.ttf");
-const NOTO_SANS_HAN_BYTES: &[u8] =
-    include_bytes!("../../../assets/fonts/Noto_Sans_SC/NotoSansSC-VariableFont_wght.ttf");
+const ROBOTO_BYTES: &[u8] = include_bytes!("../../../assets/fonts/Roboto.ttf");
+const NOTO_SANS_HAN_BYTES: &[u8] = include_bytes!("../../../assets/fonts/NotoSansSC.ttf");
 
 def_monotonic_id!(pub FontId);