LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Fonts: replace Shippori Mincho with BIZ UDMincho (no Adobe-derived glyphs)
Brandon Thomas58626b982d75
diff --git a/NOTICE b/NOTICEindex 40c5f78cb..a95eb76a8 100644--- a/NOTICE+++ b/NOTICE@@ -15,6 +15,6 @@ list (author, source, license) is in assets/ATTRIBUTION.md.Inter (assets/fonts/Inter-*.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-Inter.txt.Showcase photographs by Ansel Adams, Dorothea Lange and NASA (docs/images/) — public domain. See assets/ATTRIBUTION.md.-Shippori Mincho: Copyright 2021 The Shippori Mincho Project Authors-(https://github.com/fontdasu/ShipporiMincho). SIL Open Font License 1.1;-see assets/fonts/OFL-ShipporiMincho.txt.+BIZ UDMincho: Copyright 2022 The BIZ UDMincho Project Authors+(https://github.com/googlefonts/morisawa-biz-ud-mincho). SIL Open Font License 1.1;+see assets/fonts/OFL-BIZUDMincho.txt.diff --git a/ROADMAP.md b/ROADMAP.mdindex fd45d71f8..54c86e812 100644--- a/ROADMAP.md+++ b/ROADMAP.md@@ -193,7 +193,7 @@ own chart-based calibration (M11.4). Adobe matrices are never used.## Japanese interface and text watermarksEnglish/Japanese interface language is persisted in UI state. Core menus have Japanese-translations; untranslated panels and dialogs retain English. Shippori Mincho is bundled+translations; untranslated panels and dialogs retain English. BIZ UDMincho is bundledunder OFL for Japanese glyph coverage without system fonts. Text watermarks now accept`vertical: true` in export JSON/presets and expose an orientation selector. Japanesecharacters stay upright in top-to-bottom columns, with newlines starting columns to thediff --git a/assets/ATTRIBUTION.md b/assets/ATTRIBUTION.mdindex 69165db3e..bc72d5e6b 100644--- a/assets/ATTRIBUTION.md+++ b/assets/ATTRIBUTION.md@@ -9,8 +9,8 @@ covers a whole directory), or if a licence file referenced in the Licence column| Path | Asset | Creator | Source | Licence | Added | Modifications ||---|---|---|---|---|---|---|| `assets/fonts/Inter-*.ttf` (Regular, Medium, SemiBold) | Inter | Rasmus Andersson | https://github.com/rsms/inter | SIL Open Font License 1.1 (`assets/fonts/OFL-Inter.txt`) | 2026-09-30 | none |-| `assets/fonts/ShipporiMincho-Regular.ttf` | Shippori Mincho Regular | The Shippori Mincho Project Authors (FONTDASU) | https://github.com/google/fonts/tree/9710da1eacb3be272583c3224dcb70f9da6eadbb/ofl/shipporimincho | OFL-1.1 (`assets/fonts/OFL-ShipporiMincho.txt`) | 2026-10-05 | Unmodified; SHA-256 769b5269f0f9bc6534b352c0e6bd856a566e03ff788f107191c2d835863570b2 |-| `assets/fonts/OFL-ShipporiMincho.txt` | Shippori Mincho licence | The Shippori Mincho Project Authors (FONTDASU) | https://github.com/google/fonts/blob/9710da1eacb3be272583c3224dcb70f9da6eadbb/ofl/shipporimincho/OFL.txt | OFL-1.1 | 2026-10-05 | Unmodified |+| `assets/fonts/BIZUDMincho-Regular.ttf` | BIZ UDMincho Regular | The BIZ UDMincho Project Authors (Morisawa Inc., design TypeBank Co., Ltd.) | https://github.com/google/fonts/tree/63833b7d10bb1f86a8f0b91cba2d3ae1f68d1aa3/ofl/bizudmincho | OFL-1.1 (`assets/fonts/OFL-BIZUDMincho.txt`) | 2026-10-05 | none |+| `assets/fonts/OFL-BIZUDMincho.txt` | BIZ UDMincho licence | The BIZ UDMincho Project Authors | https://github.com/google/fonts/blob/63833b7d10bb1f86a8f0b91cba2d3ae1f68d1aa3/ofl/bizudmincho/OFL.txt | OFL-1.1 | 2026-10-05 | none || `assets/app-icon/` (`lightcraft.svg` and the PNG/ICNS/ICO/SVG files derived from it) | LightCraft app icon (lynx) | LightCraft project owner (drawn in ArtCraft) | original work (vectorised from the owner's drawing; see `assets/app-icon/README.md`) | MIT OR Apache-2.0 (`assets/app-icon/LICENSE.txt`) | 2026-10-02 | vectorised to SVG; rendered to PNG/ICNS/ICO by `packaging/icons.sh` || `crates/scenes/` (generated images) | Procedural demo photographs | LightCraft contributors | original work (generated at runtime, no source imagery) | MIT OR Apache-2.0 | 2026-09-30 | n/a || `crates/ui-egui/src/icons.rs` | UI icons drawn as vector paths in code | LightCraft contributors | original work | MIT OR Apache-2.0 | 2026-09-30 | n/a |diff --git a/assets/fonts/BIZUDMincho-Regular.ttf b/assets/fonts/BIZUDMincho-Regular.ttfnew file mode 100644index 000000000..b5a3f4cc6Binary files /dev/null and b/assets/fonts/BIZUDMincho-Regular.ttf differdiff --git a/assets/fonts/OFL-ShipporiMincho.txt b/assets/fonts/OFL-BIZUDMincho.txtsimilarity index 97%rename from assets/fonts/OFL-ShipporiMincho.txtrename to assets/fonts/OFL-BIZUDMincho.txtindex a3f24cb5d..1664f9f62 100644--- a/assets/fonts/OFL-ShipporiMincho.txt+++ b/assets/fonts/OFL-BIZUDMincho.txt@@ -1,8 +1,8 @@-Copyright 2021 The Shippori Mincho Project Authors (https://github.com/fontdasu/ShipporiMincho)+Copyright 2022 The BIZ UDMincho Project Authors (https://github.com/googlefonts/morisawa-biz-ud-mincho)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+https://scripts.sil.org/OFL-----------------------------------------------------------diff --git a/assets/fonts/ShipporiMincho-Regular.ttf b/assets/fonts/ShipporiMincho-Regular.ttfdeleted file mode 100644index cfc25ceb7..000000000Binary files a/assets/fonts/ShipporiMincho-Regular.ttf and /dev/null differdiff --git a/crates/engine/src/export.rs b/crates/engine/src/export.rsindex 800cbd7ea..6ad24fcac 100644--- a/crates/engine/src/export.rs+++ b/crates/engine/src/export.rs@@ -244,9 +244,9 @@ impl Default for Watermark {/// Inter SemiBold (OFL, see assets/ATTRIBUTION.md).static WATERMARK_FONT: &[u8] = include_bytes!("../../../assets/fonts/Inter-SemiBold.ttf");-/// Shippori Mincho (OFL), Japanese fallback on both native and web.+/// BIZ UDMincho (OFL), Japanese fallback on both native and web./// Bundled OFL Japanese font bytes, shared by watermarks and UI glyph fallback.-pub static WATERMARK_JAPANESE_FONT: &[u8] = include_bytes!("../../../assets/fonts/ShipporiMincho-Regular.ttf");+pub static WATERMARK_JAPANESE_FONT: &[u8] = include_bytes!("../../../assets/fonts/BIZUDMincho-Regular.ttf");/// Draw `wm` onto `img` (straight alpha blending of the encoded values).pub fn draw_watermark(img: &mut Rgba8, wm: &Watermark) {diff --git a/docs/parity.md b/docs/parity.mdindex c4ea1a165..2f24d5995 100644--- a/docs/parity.md+++ b/docs/parity.md@@ -798,6 +798,6 @@ From `08-lightroom-classic-extras.md` (Classic-only features) and part 2 of `06-`app.export` watermark objects accept `vertical` (boolean, defaults to false). The exportdialog offers Horizontal/Vertical and multiline text. Japanese glyphs fall back to bundled-Shippori Mincho. Vertical lettering uses upright em cells and right-to-left newline columns;+BIZ UDMincho. Vertical lettering uses upright em cells and right-to-left newline columns;Latin stays upright. Advanced Japanese composition remains open. Regression coverage:`export::tests::japanese_watermarks_support_vertical_columns_and_legacy_defaults`.