LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
fonts: Georgian UI text from craft-fonts' Noto Sans Georgian on the web
Davit Matchakhelidze07b2f55022f9
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.ymlindex 5fc2092a9..d85332b23 100644--- a/.github/workflows/freebsd.yml+++ b/.github/workflows/freebsd.yml@@ -33,4 +33,4 @@ jobs:uses: storytold/craft-common-actions/.github/workflows/freebsd.yml@mainwith:require-craft-fonts: true- craft-fonts-ref: 3d9ab3a132ed0eff457e424226a435a901da30d3+ craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bcdiff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex e24229356..7bc123bea 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -26,7 +26,7 @@ jobs:with:app-name: lightcraftapp-title: LightCraft- craft-fonts-ref: 3d9ab3a132ed0eff457e424226a435a901da30d3+ craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bcversion: ${{ inputs.version }}secrets:APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}diff --git a/crates/engine/build.rs b/crates/engine/build.rsindex 056c7adc8..7f5aa7777 100644--- a/crates/engine/build.rs+++ b/crates/engine/build.rs@@ -3,7 +3,7 @@//! Recipe from craft-fonts' docs/integration.md; craft-fonts is never a Cargo dependency, and this//! script only reads a local directory (no network).//!-//! wasm32 embeds BIZ UDPGothic Regular (~4.5 MB) and Noto Sans Thai (~214 KiB), to keep the+//! wasm32 embeds BIZ UDPGothic Regular (~4.5 MB) and Noto Sans Thai (~214 KiB) and Noto Sans Georgian, to keep the//! `.wasm` within the web size budget (Cloudflare serves at most 25 MiB per file); the export//! watermark falls back to it there. Native builds embed every font.use std::fmt::Write as _;@@ -78,7 +78,7 @@ fn craft_fonts(dir: &Path, required: bool) -> Result<String, String> {has_japanese_ui |= (*family, *style) == ("BIZ UDPGothic", "Regular");has_chinese_ui |= (*family, *style) == ("Noto Sans CJK SC", "Regular") && scripts.split(',').any(|script| script.trim() == "Hans");has_thai_ui |= (*family, *style) == ("Noto Sans Thai", "Regular") && scripts.split(',').any(|script| script.trim() == "Thai");- if wasm && !matches!((*family, *style), ("BIZ UDPGothic" | "Noto Sans Thai", "Regular")) {+ if wasm && !matches!((*family, *style), ("BIZ UDPGothic" | "Noto Sans Thai" | "Noto Sans Georgian", "Regular")) {continue;}let path = dir.join(file).canonicalize().map_err(|e| format!("{file}: {e}"))?;diff --git a/crates/engine/src/fonts.rs b/crates/engine/src/fonts.rsindex a246c4dca..db9e658d0 100644--- a/crates/engine/src/fonts.rs+++ b/crates/engine/src/fonts.rs@@ -105,7 +105,7 @@ mod tests {assert!(japanese(CRAFT_FONTS).next().is_some(), "craft-fonts carries Japanese faces");// Every script face that ships is a UI fallback, and has the glyphs of its script (#736).use ab_glyph::Font;- for (script, text) in [("Thai", "ภาพถ่ายสวัสดี๑๒๓"), ("Arab", "صورة")] {+ for (script, text) in [("Thai", "ภาพถ่ายสวัสดี๑๒๓"), ("Arab", "صورة"), ("Geor", "ფოტო")] {let Some(face) = ui_fallback(CRAFT_FONTS, "Latn", "Regular").into_iter().find(|f| f.covers(script)) else { continue };let font = ab_glyph::FontRef::try_from_slice(face.bytes).expect("parses");assert!(text.chars().all(|c| font.glyph_id(c).0 != 0), "{} draws {script}", face.family);