diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..2095acad7
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+name: CI
+
+# Quality gates for every push to main and every pull request (`cargo xtask ci`), through the
+# suite's shared gate workflow in craft-common-actions.
+on:
+ push:
+ branches: [main]
+ pull_request:
+ workflow_dispatch:
+
+permissions:
+ contents: read
+
+# A newer push to a PR branch cancels its older run; every push to main runs to the end.
+concurrency:
+ group: ci-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}
+ cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+ gate:
+ # Tracks @main so suite-wide CI fixes reach every app without a PR in each repository.
+ uses: storytold/craft-common-actions/.github/workflows/gate.yml@main
+ with:
+ packages: >-
+ pkg-config libxkbcommon-dev libwayland-dev libx11-dev libxcb1-dev libxcursor-dev
+ libxrandr-dev libxi-dev libfontconfig1-dev libfreetype-dev mesa-vulkan-drivers
+ libgl1-mesa-dev libasound2-dev
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index f8ac8a300..8967f9431 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -2,12 +2,10 @@
# (GitHub has no FreeBSD runners). GPU tests skip themselves when the VM has no adapter.
name: FreeBSD
-# The VM build is slow, so it runs nightly on main and on pushes to `release`, not on every push
-# or dependency change: a drifted dependency still shows up within a day, and always before a
-# release ships. PRs that change the FreeBSD packaging itself still run it.
+# The VM build is slow, so it runs nightly on main and on pushes to `release`, not on every pull
+# request: a drifted dependency still shows up within a day, and always before a release ships.
+# PRs that change the FreeBSD workflow or packaging itself still run it.
on:
- schedule:
- - cron: "47 2 * * *"
push:
branches: [release]
pull_request:
@@ -15,6 +13,8 @@ on:
- .github/workflows/freebsd.yml
- packaging/freebsd/**
- packaging/env.sh
+ schedule:
+ - cron: "47 2 * * *"
workflow_dispatch:
concurrency:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 808e1628d..3cfbdc8b0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,15 +10,14 @@ on:
type: string
default: ""
-permissions:
- contents: write
-
concurrency:
group: release-${{ github.ref }}
cancel-in-progress: false
jobs:
release:
+ permissions:
+ contents: write
# Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
uses: storytold/craft-common-actions/.github/workflows/release.yml@main
with:
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 000000000..e78fe1ea3
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,21 @@
+name: SonarCloud
+
+on:
+ push:
+ branches: [main]
+ pull_request:
+ types: [opened, synchronize, reopened]
+
+permissions:
+ contents: read
+
+concurrency:
+ group: sonarcloud-${{ github.ref }}
+ # A push to main is the run that publishes coverage; superseded runs there would never finish.
+ cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+ sonarcloud:
+ # Tracked at @main so org-wide CI improvements propagate without PR churn.
+ uses: storytold/craft-common-actions/.github/workflows/sonarcloud.yml@main
+ secrets: inherit
diff --git a/AGENTS.md b/AGENTS.md
index aad29c94a..24abee6a1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -105,6 +105,8 @@ reproduce an image (for example, point lists traced from someone else's icon).
See `CLAUDE.md`: pure Rust, dependency layering (`cargo xtask layers`), exact `Tick` time, everything is
a command, everything is agent-drivable, and the quality gates (`cargo xtask ci`) before every commit.
+- **Time goes through `chrono`** (workspace dependency). Never hand-roll UTC/calendar conversion (days-to-date algorithms, leap-year math); a crate owns only its output format string. The one exception is range extension: past the years chrono can represent, shift the date by whole 400-year Gregorian cycles (146,097 days, after which the calendar repeats), let chrono compute the month and day, and add the cycles back to the year (splitting seconds into hours, minutes and seconds is plain arithmetic).
+
Shared real-file test corpora (Photoshop-authored PSDs, etc.) live in
[`storytold/photocraft-corpus`](https://github.com/storytold/photocraft-corpus), explained in
[craftrules `standards/test-corpora.md`](https://github.com/storytold/craftrules/blob/main/standards/test-corpora.md).
diff --git a/CLAUDE.md b/CLAUDE.md
index a7c47fe3f..e52386942 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -16,6 +16,7 @@ EffectCraft is a clean-room, open-source, pure-Rust motion graphics and visual e
- **Pure Rust.** Media codecs come from FilmCraft crates (git deps behind `crates/media`, see `plan/adr/0001`).
- **Layering** (`cargo xtask layers`): nothing below L5 depends on egui/eframe/winit/rfd/cpal; L0–L4 build for wasm32.
- **Exact time:** `effectcraft_time::Tick` (254 016 000 000/s). Keyframe times are **layer time**.
+- **Time goes through `chrono`** (workspace dependency). Never hand-roll UTC/calendar conversion (days-to-date algorithms, leap-year math); a crate owns only its output format string. The one exception is range extension: past the years chrono can represent, shift the date by whole 400-year Gregorian cycles (146,097 days, after which the calendar repeats), let chrono compute the month and day, and add the cycles back to the year (splitting seconds into hours, minutes and seconds is plain arithmetic).
- **Property tree:** everything animatable is a `Property` in the layer's `PropGroup` tree, addressed by paths (`transform/position`, `effects/#1/blurriness`, `@uid`).
- **Everything is a command** (`crates/engine`): id, label, menu path, shortcut, params, enabled(), run(). UI, CLI, control channel and MCP dispatch by id.
- **Everything is agent-drivable:** every interactive widget registers an automation id; UI state is serde.
diff --git a/Cargo.lock b/Cargo.lock
index ee9c99cf2..9bed551d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -803,6 +803,15 @@ dependencies = [
"rand_core 0.10.1",
]
+[[package]]
+name = "chrono"
+version = "0.4.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "clipboard-win"
version = "5.4.1"
@@ -1163,7 +1172,7 @@ dependencies = [
[[package]]
name = "effectcraft"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"cpal",
"effectcraft-engine",
@@ -1188,7 +1197,7 @@ dependencies = [
[[package]]
name = "effectcraft-automation"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-engine",
"effectcraft-host",
@@ -1200,14 +1209,14 @@ dependencies = [
[[package]]
name = "effectcraft-av1enc"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"filmcraft-av1",
]
[[package]]
name = "effectcraft-cli"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"cpu-time",
"effectcraft-automation",
@@ -1223,7 +1232,7 @@ dependencies = [
[[package]]
name = "effectcraft-color"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"proptest",
"serde",
@@ -1231,8 +1240,9 @@ dependencies = [
[[package]]
name = "effectcraft-effects"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
+ "chrono",
"effectcraft-color",
"effectcraft-geom",
"effectcraft-keyframe",
@@ -1248,8 +1258,9 @@ dependencies = [
[[package]]
name = "effectcraft-engine"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
+ "chrono",
"craft-docpath",
"effectcraft-color",
"effectcraft-effects",
@@ -1282,7 +1293,7 @@ dependencies = [
[[package]]
name = "effectcraft-export"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-av1enc",
"effectcraft-color",
@@ -1312,7 +1323,7 @@ dependencies = [
[[package]]
name = "effectcraft-expr"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"boa_engine",
"effectcraft-color",
@@ -1329,7 +1340,7 @@ dependencies = [
[[package]]
name = "effectcraft-geom"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"proptest",
"serde",
@@ -1337,7 +1348,7 @@ dependencies = [
[[package]]
name = "effectcraft-gpu"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"bytemuck",
"effectcraft-color",
@@ -1359,14 +1370,14 @@ dependencies = [
[[package]]
name = "effectcraft-hevcenc"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"filmcraft-hevc",
]
[[package]]
name = "effectcraft-host"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-engine",
"effectcraft-export",
@@ -1391,7 +1402,7 @@ dependencies = [
[[package]]
name = "effectcraft-interchange"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-color",
"effectcraft-keyframe",
@@ -1410,7 +1421,7 @@ dependencies = [
[[package]]
name = "effectcraft-keyframe"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-color",
"effectcraft-geom",
@@ -1422,7 +1433,7 @@ dependencies = [
[[package]]
name = "effectcraft-lottie"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"craft-docpath",
"effectcraft-color",
@@ -1440,7 +1451,7 @@ dependencies = [
[[package]]
name = "effectcraft-media"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"craft-docpath",
"effectcraft-model",
@@ -1469,7 +1480,7 @@ dependencies = [
[[package]]
name = "effectcraft-model"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-geom",
"image",
@@ -1481,14 +1492,14 @@ dependencies = [
[[package]]
name = "effectcraft-opusenc"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"filmcraft-opus",
]
[[package]]
name = "effectcraft-path"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-geom",
"effectcraft-keyframe",
@@ -1500,7 +1511,7 @@ dependencies = [
[[package]]
name = "effectcraft-pdf"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"craft-pdf",
"effectcraft-raster",
@@ -1516,7 +1527,7 @@ dependencies = [
[[package]]
name = "effectcraft-plugin"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-effects",
"effectcraft-keyframe",
@@ -1528,7 +1539,7 @@ dependencies = [
[[package]]
name = "effectcraft-project"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-color",
"effectcraft-geom",
@@ -1541,14 +1552,14 @@ dependencies = [
[[package]]
name = "effectcraft-psd"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"miniz_oxide 0.8.9",
]
[[package]]
name = "effectcraft-raster"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-color",
"effectcraft-geom",
@@ -1557,7 +1568,7 @@ dependencies = [
[[package]]
name = "effectcraft-render"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-color",
"effectcraft-effects",
@@ -1579,7 +1590,7 @@ dependencies = [
[[package]]
name = "effectcraft-script"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"boa_engine",
"effectcraft-engine",
@@ -1596,7 +1607,7 @@ dependencies = [
[[package]]
name = "effectcraft-segment"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"miniz_oxide 0.8.9",
"ndarray",
@@ -1605,7 +1616,7 @@ dependencies = [
[[package]]
name = "effectcraft-svg"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-geom",
"effectcraft-path",
@@ -1617,7 +1628,7 @@ dependencies = [
[[package]]
name = "effectcraft-text"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-keyframe",
"harfrust",
@@ -1629,7 +1640,7 @@ dependencies = [
[[package]]
name = "effectcraft-time"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"proptest",
"serde",
@@ -1637,7 +1648,7 @@ dependencies = [
[[package]]
name = "effectcraft-track"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-raster",
"effectcraft-segment",
@@ -1649,8 +1660,9 @@ dependencies = [
[[package]]
name = "effectcraft-ui-egui"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
+ "chrono",
"craft-ui",
"effectcraft-color",
"effectcraft-engine",
@@ -1681,11 +1693,11 @@ dependencies = [
[[package]]
name = "effectcraft-vp9enc"
-version = "0.13.0"
+version = "0.16.0"
[[package]]
name = "effectcraft-web"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
"effectcraft-engine",
"effectcraft-export",
@@ -6625,9 +6637,11 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
[[package]]
name = "xtask"
-version = "0.13.0"
+version = "0.16.0"
dependencies = [
+ "chrono",
"serde_json",
+ "tempfile",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8c6f978ef..d71d29337 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
default-members = ["crates/*", "apps/*"]
[workspace.package]
-version = "0.13.0"
+version = "0.16.0"
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.95"
@@ -52,6 +52,8 @@ thiserror = "2"
serde = { version = "1", features = ["derive", "rc"] }
serde_json = { version = "1", features = ["float_roundtrip"] }
log = "0.4"
+# All date/time conversion goes through chrono (no hand-rolled calendar code beyond the 400-year range extension; AGENTS.md).
+chrono = { version = "0.4.45", default-features = false, features = ["std"] }
rayon = "1"
# std::time::Instant/SystemTime on native; the browser clock on wasm32 (std's panic there).
web-time = "1"
@@ -137,9 +139,12 @@ type_complexity = "allow"
[profile.dev.package."*"]
opt-level = 2
+debug = false
[profile.dev]
opt-level = 1
+# Panics and backtraces keep file and line; full debug info only made the many test binaries large.
+debug = "line-tables-only"
# Pixel hot loops: keep debug builds interactive.
[profile.dev.package.effectcraft-raster]
diff --git a/README.md b/README.md
index 9dc985ee1..5fa28f0bb 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,10 @@
+
+ 
+
+
EffectCraft
diff --git a/ROADMAP.md b/ROADMAP.md
index e3dc2792c..40f3c5a5f 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -97,7 +97,7 @@ UI strings translated out of ≈ 4,200 (detail: [localization-parity.md](docs/lo
| Korean | none | 0% |
| Vietnamese | none | 0% |
-Also shipped: Traditional Chinese (partial, 39%), Ukrainian (partial, 27%), Czech (partial, 27%) and Russian (menus only, 15%). No language has had
+Also shipped: Traditional Chinese (partial, 39%), Ukrainian (partial, 27%), Czech (partial, 27%), Georgian (partial, 38%; native-speaker reviewed) and Russian (menus only, 15%). No other language has had
native-speaker review.
## Upcoming
@@ -140,6 +140,7 @@ Come tell us what matters most to you on [Discord](https://discord.gg/artcraft).
follow the shared standard: `docs/parity.md` became `docs/target-app-parity.md`; new
`docs/roadmap.md`, `localization-parity.md`, `file-format-parity.md`, `hardware-parity.md`,
`ui-parity.md`, `effects-parity.md` and `scripting-parity.md`.
+- 2026-10-14: Georgian (`ka`): every menu row, every panel-catalog row the Chinese catalogs have plus 195 Georgian-only ones, and the effect names and categories; Match System for `ka` / `ka-GE` / `ka_GE.UTF-8` locales. Reviewed by a native speaker.
- 2026-10-10: Spanish (#460) and Brazilian Portuguese (#217) menu translations.
- 2026-10-10: Japanese now translates the interface below the menu bar too: `crates/ui-egui/src/i18n/ui.rs` has a Japanese table with the same 396 rows as the Chinese ones (panels, dialogs, buttons and tooltips; the shape test keeps the three catalogs listing the same source strings). Menus were already Japanese.
- 2026-10-09: Ukrainian now covers all 396 current panel-catalog strings, including dialogs, buttons and tooltips, alongside its menu translation. The catalog keeps the same source keys and placeholder counts as the Chinese catalogs; missing or engine-generated text still falls back to English.
diff --git a/apps/effectcraft-cli/tests/cli.rs b/apps/effectcraft-cli/tests/it/cli.rs
similarity index 100%
rename from apps/effectcraft-cli/tests/cli.rs
rename to apps/effectcraft-cli/tests/it/cli.rs
diff --git a/apps/effectcraft-cli/tests/it/main.rs b/apps/effectcraft-cli/tests/it/main.rs
new file mode 100644
index 000000000..17149f545
--- /dev/null
+++ b/apps/effectcraft-cli/tests/it/main.rs
@@ -0,0 +1,4 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod cli;
+mod qa_template;
diff --git a/apps/effectcraft-cli/tests/qa_template.rs b/apps/effectcraft-cli/tests/it/qa_template.rs
similarity index 100%
rename from apps/effectcraft-cli/tests/qa_template.rs
rename to apps/effectcraft-cli/tests/it/qa_template.rs
diff --git a/apps/effectcraft-web/Cargo.toml b/apps/effectcraft-web/Cargo.toml
index 6c30f9a56..28ea2f369 100644
--- a/apps/effectcraft-web/Cargo.toml
+++ b/apps/effectcraft-web/Cargo.toml
@@ -50,6 +50,7 @@ web-sys = { version = "0.3", features = [
"HtmlElement",
"HtmlInputElement",
"Location",
+ "Navigator",
"Url",
"UrlSearchParams",
"Window",
diff --git a/apps/effectcraft-web/js/host.js b/apps/effectcraft-web/js/host.js
index 5c438550e..12cb90bfa 100644
--- a/apps/effectcraft-web/js/host.js
+++ b/apps/effectcraft-web/js/host.js
@@ -494,8 +494,12 @@ export async function cacheRead(name) {
/// resolves with its size.
export async function cacheWrite(fullName, bytes) {
const [dir, name] = await entryDir(fullName);
- const canMove = typeof FileSystemHandle !== "undefined" && "move" in FileSystemHandle.prototype;
- const tmp = canMove ? `${name}.tmp.${Math.random().toString(36).slice(2)}` : name;
+ const canMove =
+ typeof FileSystemHandle !== "undefined" &&
+ "move" in FileSystemHandle.prototype &&
+ typeof crypto !== "undefined" &&
+ typeof crypto.randomUUID === "function";
+ const tmp = canMove ? `${name}.tmp.${crypto.randomUUID()}` : name;
const fh = await dir.getFileHandle(tmp, { create: true });
if (fh.createSyncAccessHandle) {
const h = await fh.createSyncAccessHandle();
diff --git a/apps/effectcraft-web/src/app.rs b/apps/effectcraft-web/src/app.rs
index 1a6952408..3f462bd2a 100644
--- a/apps/effectcraft-web/src/app.rs
+++ b/apps/effectcraft-web/src/app.rs
@@ -184,6 +184,11 @@ fn install_hooks(app: &mut EffectcraftApp) {
#[wasm_bindgen]
pub async fn start(canvas_id: String) -> Result<(), JsValue> {
eframe::WebLogger::init(log::LevelFilter::Info).ok();
+ // Match System follows `?lang=` in the address, then the browser's languages; a language
+ // chosen in Settings still wins.
+ let navigator = web_sys::window().map(|w| w.navigator());
+ let browser = navigator.iter().flat_map(|n| n.languages().iter().filter_map(|v| v.as_string()).collect::>());
+ effectcraft_ui_egui::i18n::set_system_locales(query_value("lang"), browser.collect());
let doc = web_sys::window().and_then(|w| w.document()).ok_or("no document")?;
let canvas: web_sys::HtmlCanvasElement = doc.get_element_by_id(&canvas_id).ok_or("no canvas")?.dyn_into()?;
let empty = query_flag("empty");
@@ -257,6 +262,7 @@ pub async fn start(canvas_id: String) -> Result<(), JsValue> {
if n > 0 {
app.frames.set_remote(Some(Arc::new(frames::WebFrames::start(n, !query_flag("nogpuworkers")))));
}
+ app.frames.set_virtual_media(files::STORE.media_epoch(), Arc::new(|path| files::STORE.file_identity(path)));
let (tx, rx) = std::sync::mpsc::channel();
api::set_sender(tx);
app = app.with_control(rx);
diff --git a/apps/effectcraft-web/src/frames.rs b/apps/effectcraft-web/src/frames.rs
index 523fd03c8..c7f350526 100644
--- a/apps/effectcraft-web/src/frames.rs
+++ b/apps/effectcraft-web/src/frames.rs
@@ -416,6 +416,7 @@ fn post_reply(r: &FrameReply, px: Option<&[u8]>) {
fn new_server() -> FrameServer {
let mut s = FrameServer::new(crate::worker::pool(), Some(Arc::new(effectcraft_expr::Expressions)));
s.set_layer_store(Some(Arc::new(effectcraft_engine::render::PrefetchStore::default())));
+ s.set_virtual_id(Some(Arc::new(|path| crate::files::STORE.file_identity(path))));
s
}
diff --git a/apps/effectcraft-web/src/store.rs b/apps/effectcraft-web/src/store.rs
index b3a858def..a44a2eac7 100644
--- a/apps/effectcraft-web/src/store.rs
+++ b/apps/effectcraft-web/src/store.rs
@@ -20,6 +20,7 @@
use std::collections::BTreeMap;
use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::{Arc, Mutex, OnceLock};
use effectcraft_engine::config::{ConfigStore, FileOps};
@@ -45,6 +46,8 @@ pub struct Entry {
/// Which write this is: new with every write of the key, so a file replaced by another of
/// the same size still reads as changed (workers are sent it again, #218).
pub version: u64,
+ /// FNV-1a of `data`, filled the first time a disk-cache key asks for it.
+ hash: Option,
}
/// A queued write for the browser storage: `data` = `None` deletes the key.
@@ -69,13 +72,13 @@ impl Mirror {
/// An entry read from the browser's storage at startup (nothing to flush).
pub fn load(&mut self, key: &str, data: Arc<[u8]>, modified: f64) {
let version = self.next_version();
- self.entries.insert(key.to_string(), Entry { data, modified, persist: true, version });
+ self.entries.insert(key.to_string(), Entry { data, modified, persist: true, version, hash: None });
}
pub fn put(&mut self, key: &str, data: Arc<[u8]>, modified: f64, persist: bool) {
let was_persisted = self.entries.get(key).is_some_and(|e| e.persist);
let version = self.next_version();
- self.entries.insert(key.to_string(), Entry { data, modified, persist, version });
+ self.entries.insert(key.to_string(), Entry { data, modified, persist, version, hash: None });
if persist || was_persisted {
self.touch(key);
}
@@ -149,14 +152,31 @@ pub fn key_path(key: &str) -> Option<&str> {
key.strip_prefix(FILES).filter(|p| p.starts_with('/'))
}
+/// FNV-1a 64. Computed when a disk-cache key first needs the file, not on every write.
+fn content_hash(data: &[u8]) -> u64 {
+ let mut h: u64 = 0xcbf2_9ce4_8422_2325;
+ for &b in data {
+ h ^= u64::from(b);
+ h = h.wrapping_mul(0x0000_0100_0000_01b3);
+ }
+ h
+}
+
/// The persistent store: a [`Mirror`] and a hook that wakes the flusher after changes.
-#[derive(Default)]
pub struct Store {
pub mirror: Mutex,
/// Called after every change that needs flushing (the web host schedules a flush).
pub on_change: OnceLock,
/// Clock in milliseconds since the Unix epoch (tests pin it).
pub clock: OnceLock f64>,
+ /// Bumped when a virtual file is written. Preview cache lookups key on it; they do not hash.
+ media_epoch: Arc,
+}
+
+impl Default for Store {
+ fn default() -> Self {
+ Self { mirror: Mutex::default(), on_change: OnceLock::new(), clock: OnceLock::new(), media_epoch: Arc::new(AtomicU64::new(0)) }
+ }
}
impl Store {
@@ -179,12 +199,40 @@ impl Store {
/// Store a file under `path` (persisted unless `persist` is false: render outputs).
pub fn put_file(&self, path: &str, data: Arc<[u8]>, persist: bool) {
let now = self.now();
- self.lock().put(&file_key(path), data, now, persist);
+ let key = file_key(path);
+ let replaced = self.lock().get(&key).is_none_or(|e| !Arc::ptr_eq(&e.data, &data));
+ self.lock().put(&key, data, now, persist);
+ if replaced {
+ self.media_epoch.fetch_add(1, Ordering::Relaxed);
+ }
if persist {
self.changed();
}
}
+ /// The generation preview cache lookups key on. It changes when [`Self::put_file`] writes
+ /// a different blob, and it is not a content hash.
+ pub fn media_epoch(&self) -> Arc {
+ self.media_epoch.clone()
+ }
+
+ /// Size and content hash of the file under `path`. The hash is stored on the entry so a
+ /// later key does not walk the bytes again.
+ pub fn file_identity(&self, path: &str) -> Option<(u64, u64)> {
+ let key = file_key(path);
+ let mut mirror = self.lock();
+ let entry = mirror.entries.get(&key)?;
+ if let Some(hash) = entry.hash {
+ return Some((entry.data.len() as u64, hash));
+ }
+ let hash = content_hash(&entry.data);
+ let len = entry.data.len() as u64;
+ if let Some(entry) = mirror.entries.get_mut(&key) {
+ entry.hash = Some(hash);
+ }
+ Some((len, hash))
+ }
+
pub fn file(&self, path: &str) -> Option> {
self.lock().get(&file_key(path)).map(|e| e.data.clone())
}
@@ -446,6 +494,11 @@ mod tests {
assert_ne!(a, b);
assert_eq!(&data[..], b"blue");
assert_eq!(s.file_versioned("/collision.png").map(|f| f.1), Some(b), "reading doesn't change it");
+ let epoch = s.media_epoch().load(Ordering::Relaxed);
+ let id = s.file_identity("/collision.png").expect("identity");
+ assert_eq!(id, (4, content_hash(b"blue")));
+ assert_eq!(s.file_identity("/collision.png"), Some(id), "the hash is kept on the entry");
+ assert!(epoch >= 2, "each new blob bumps the generation the preview keys on");
}
/// A write that failed is flushed again with the key's latest state (#215).
diff --git a/apps/effectcraft-web/web/sw.js b/apps/effectcraft-web/web/sw.js
index 8c7efc2e5..4acbeeeeb 100644
--- a/apps/effectcraft-web/web/sw.js
+++ b/apps/effectcraft-web/web/sw.js
@@ -32,13 +32,15 @@ self.addEventListener("fetch", (event) => {
if (req.method !== "GET" || url.origin !== self.location.origin) return;
event.respondWith(
(async () => {
- const cache = await caches.open(CACHE);
- // The page itself regardless of its query (?empty, ?demo…).
- const key = req.mode === "navigate" ? new URL("./", self.registration.scope).href : req;
- const hit = await cache.match(key, { ignoreSearch: req.mode === "navigate" });
- if (hit) return hit;
+ const cache = await caches.open(CACHE).catch(() => null);
+ if (cache) {
+ // The page itself regardless of its query (?empty, ?demo…).
+ const key = req.mode === "navigate" ? new URL("./", self.registration.scope).href : req;
+ const hit = await cache.match(key, { ignoreSearch: req.mode === "navigate" }).catch(() => null);
+ if (hit) return hit;
+ }
const res = await fetch(req);
- if (res.ok && res.type === "basic") cache.put(req, res.clone());
+ if (cache && res.ok && res.type === "basic") void cache.put(req, res.clone()).catch(() => {});
return res;
})(),
);
diff --git a/crates/av1enc/README.md b/crates/av1enc/README.md
index 6ced20ba1..c922c95eb 100644
--- a/crates/av1enc/README.md
+++ b/crates/av1enc/README.md
@@ -4,8 +4,8 @@ Clean-room, pure-Rust AV1 encoder for EffectCraft's MP4 / WebM export (layer L0,
no `unsafe`, builds for `wasm32-unknown-unknown`).
Output is decoded **bit-exactly** by libdav1d (`ffmpeg -c:v libdav1d`, checked in
-`tests/ffmpeg_oracle.rs` when ffmpeg is installed) and by FilmCraft's spec-derived
-`filmcraft-av1` decoder (`tests/roundtrip.rs`): every decoded frame equals the encoder's own
+`tests/it/ffmpeg_oracle.rs` when ffmpeg is installed) and by FilmCraft's spec-derived
+`filmcraft-av1` decoder (`tests/it/roundtrip.rs`): every decoded frame equals the encoder's own
reconstruction, so prediction never drifts.
## What is implemented
diff --git a/crates/av1enc/tests/bench.rs b/crates/av1enc/tests/it/bench.rs
similarity index 97%
rename from crates/av1enc/tests/bench.rs
rename to crates/av1enc/tests/it/bench.rs
index 6577f8f9f..b29817e1a 100644
--- a/crates/av1enc/tests/bench.rs
+++ b/crates/av1enc/tests/it/bench.rs
@@ -1,7 +1,7 @@
//! Speed / efficiency measurements on ffmpeg-generated test sources (ignored by default):
-//! `cargo test -p effectcraft-av1enc --test bench -- --ignored --nocapture`.
+//! `cargo test -p effectcraft-av1enc --test it bench:: -- --ignored --nocapture`.
-mod common;
+use crate::common;
use std::process::Command;
use std::time::Instant;
diff --git a/crates/av1enc/tests/common/mod.rs b/crates/av1enc/tests/it/common/mod.rs
similarity index 100%
rename from crates/av1enc/tests/common/mod.rs
rename to crates/av1enc/tests/it/common/mod.rs
diff --git a/crates/av1enc/tests/ffmpeg_oracle.rs b/crates/av1enc/tests/it/ffmpeg_oracle.rs
similarity index 99%
rename from crates/av1enc/tests/ffmpeg_oracle.rs
rename to crates/av1enc/tests/it/ffmpeg_oracle.rs
index 66f380ac2..b35cbf496 100644
--- a/crates/av1enc/tests/ffmpeg_oracle.rs
+++ b/crates/av1enc/tests/it/ffmpeg_oracle.rs
@@ -2,7 +2,7 @@
//! bit for bit. Skipped when `ffmpeg` (with libdav1d) is not installed. ffmpeg's native `av1`
//! decoder only drives hardware decoders, so it is not used.
-mod common;
+use crate::common;
use std::process::Command;
diff --git a/crates/av1enc/tests/it/main.rs b/crates/av1enc/tests/it/main.rs
new file mode 100644
index 000000000..c66bacde5
--- /dev/null
+++ b/crates/av1enc/tests/it/main.rs
@@ -0,0 +1,6 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod bench;
+mod common;
+mod ffmpeg_oracle;
+mod roundtrip;
diff --git a/crates/av1enc/tests/roundtrip.rs b/crates/av1enc/tests/it/roundtrip.rs
similarity index 99%
rename from crates/av1enc/tests/roundtrip.rs
rename to crates/av1enc/tests/it/roundtrip.rs
index 1e777e509..282880e08 100644
--- a/crates/av1enc/tests/roundtrip.rs
+++ b/crates/av1enc/tests/it/roundtrip.rs
@@ -1,7 +1,7 @@
//! Round trips through FilmCraft's spec-derived AV1 decoder: decoded frames must equal the
//! encoder's own reconstruction bit for bit.
-mod common;
+use crate::common;
use common::*;
use effectcraft_av1enc::{EncoderConfig, RateControl};
diff --git a/crates/color/src/lib.rs b/crates/color/src/lib.rs
index 1fae0ea90..5545f390d 100644
--- a/crates/color/src/lib.rs
+++ b/crates/color/src/lib.rs
@@ -141,7 +141,11 @@ pub fn rgb_to_hsv(r: f32, g: f32, b: f32) -> (f32, f32, f32) {
}
pub fn hsv_to_rgb(h: f32, s: f32, v: f32) -> (f32, f32, f32) {
- let h6 = h.rem_euclid(1.0) * 6.0;
+ let mut h6 = h.rem_euclid(1.0) * 6.0;
+ // In f32, a tiny negative hue wraps to exactly 1.0; treat it as 0.
+ if h6 >= 6.0 {
+ h6 = 0.0;
+ }
let i = h6.floor();
let f = h6 - i;
let p = v * (1.0 - s);
@@ -252,6 +256,12 @@ impl Label {
mod tests {
use super::*;
+ #[test]
+ fn hsv_to_rgb_tiny_negative_hue_is_red() {
+ let (r, g, b) = hsv_to_rgb(-1e-9, 1.0, 1.0);
+ assert!(r > 0.99 && g < 0.01 && b < 0.01, "{r} {g} {b}");
+ }
+
#[test]
fn srgb_roundtrip() {
for i in 0..=100 {
diff --git a/crates/effects/Cargo.toml b/crates/effects/Cargo.toml
index c37d09949..bb26d3127 100644
--- a/crates/effects/Cargo.toml
+++ b/crates/effects/Cargo.toml
@@ -21,4 +21,5 @@ rayon = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
log = { workspace = true }
+chrono = { workspace = true }
diff --git a/crates/effects/src/object_matte.rs b/crates/effects/src/object_matte.rs
index 32a196af2..d98ec73ad 100644
--- a/crates/effects/src/object_matte.rs
+++ b/crates/effects/src/object_matte.rs
@@ -284,9 +284,13 @@ pub fn frozen_alpha(params: &Params, layer_size: [f64; 2], fps: f64, f: i64, w:
return None;
}
let fr = fc.frames.get(&f)?;
- let a = rle::decode(&fr.a)?;
let [fw, fh] = fc.size;
- if fw == 0 || fh == 0 || a.len() != fw.checked_mul(fh)? {
+ let expected = fw.checked_mul(fh)?;
+ if fw == 0 || fh == 0 || expected > rle::MAX_PLANE_BYTES {
+ return None;
+ }
+ let a = rle::decode_bounded(&fr.a, expected)?;
+ if a.len() != expected {
return None;
}
let af: Vec = a.iter().map(|v| *v as f32 / 255.0).collect();
diff --git a/crates/effects/src/roto.rs b/crates/effects/src/roto.rs
index a6c80e742..4917cc231 100644
--- a/crates/effects/src/roto.rs
+++ b/crates/effects/src/roto.rs
@@ -560,10 +560,14 @@ fn matte_for(ctx: &EffectCtx, f: i64, img: &Arc, scale: f64) -> Option<(V
&& fc.key == frozen_key(ctx.params, ctx.layer_size, ctx.fps())
&& let Some(fr) = fc.frames.get(&f)
{
- let a = rle::decode(&fr.a)?;
- let bnd = rle::decode(&fr.b)?;
let [fw, fh] = fc.size;
- if a.len() == fw * fh && bnd.len() == fw * fh {
+ let expected = fw.checked_mul(fh)?;
+ if fw == 0 || fh == 0 || expected > rle::MAX_PLANE_BYTES {
+ return None;
+ }
+ let a = rle::decode_bounded(&fr.a, expected)?;
+ let bnd = rle::decode_bounded(&fr.b, expected)?;
+ if a.len() == expected && bnd.len() == expected {
let af: Vec = a.iter().map(|v| *v as f32 / 255.0).collect();
let (alpha, band) = if fw == w && fh == h {
(af, bnd)
diff --git a/crates/effects/src/textfx.rs b/crates/effects/src/textfx.rs
index 34282c272..cb172dfc5 100644
--- a/crates/effects/src/textfx.rs
+++ b/crates/effects/src/textfx.rs
@@ -288,20 +288,39 @@ fn look_from(ctx: &EffectCtx, b: &Buf, on_original_id: &str) -> TextLook {
const MONTHS: [&str; 12] = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
const DAYS: [&str; 7] = ["Saturday", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"];
-/// Proleptic Gregorian date from a day count since 2000-01-01 (a Saturday).
+/// `num_days_from_ce` of 2000-01-01: the day count since 2000-01-01 (Numbers' date epoch, a
+/// Saturday) rebased so that chrono's `num_days_from_ce` (0001-01-01 is day 1) can convert it.
+const CE_FROM_2000: i64 = 730_120;
+
+/// Days in one 400-year Gregorian cycle; the proleptic calendar repeats after it.
+const DAYS_PER_400_YEARS: i64 = 146_097;
+
+/// Proleptic Gregorian date (year, month, day, Saturday-indexed weekday) from a day count since
+/// 2000-01-01 (a Saturday), for any `i64` count.
+///
+/// chrono's `NaiveDate` stops near ±262143, but Numbers' `value` slider is a plain scalar with
+/// no range guard, so a keyframed count can run past that. The calendar repeats every 400 years,
+/// so chrono converts the day within one cycle and the whole cycles are added back as years (via
+/// i128 so `i64::MIN`/`MAX` can't overflow); the result matches the pre-chrono count for every
+/// year. The weekday comes from the same resolved date, so it can never disagree with it.
fn date_from_days(days: i64) -> (i64, u32, u32, usize) {
- // Days since 0000-03-01 based civil calendar conversion.
- let z = days + 730_425; // 2000-01-01 relative to 0000-03-01
- let era = z.div_euclid(146_097);
- let doe = z.rem_euclid(146_097);
- let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
- let y = yoe + era * 400;
- let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
- let mp = (5 * doy + 2) / 153;
- let d = (doy - (153 * mp + 2) / 5 + 1) as u32;
- let m = if mp < 10 { mp + 3 } else { mp - 9 } as u32;
- let y = if m <= 2 { y + 1 } else { y };
- (y, m, d, days.rem_euclid(7) as usize)
+ use chrono::Datelike;
+ let from_ce = i128::from(days) + i128::from(CE_FROM_2000);
+ let (cycles, rest) = (from_ce.div_euclid(i128::from(DAYS_PER_400_YEARS)), from_ce.rem_euclid(i128::from(DAYS_PER_400_YEARS)));
+ // `rest` is 0..146_097, so it is always a valid `num_days_from_ce` day inside chrono's range.
+ let date = i32::try_from(rest).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+ // Unreachable fallback: every `rest` in 0..146_097 converts. 2000-01-01 keeps the epoch's date.
+ let (y, m, d, wd) = match date {
+ Some(date) => {
+ let year = i128::from(date.year()) + cycles * 400;
+ let year = i64::try_from(year).unwrap_or(if year < 0 { i64::MIN } else { i64::MAX });
+ // DAYS is Saturday-indexed; chrono counts from Sunday.
+ let wd = (date.weekday().num_days_from_sunday() as usize + 1) % 7;
+ (year, date.month(), date.day(), wd)
+ }
+ None => (2000, 1, 1, 0),
+ };
+ (y, m, d, wd)
}
fn timecode(frames: i64, fps: f64) -> String {
@@ -1123,6 +1142,10 @@ mod tests {
assert_eq!(txt(&[("value", num(255.0)), ("type", Value::Enum(9))], 0.0), "FF");
assert_eq!(txt(&[("value", num(0.0)), ("type", Value::Enum(6))], 0.0), "01/01/00");
assert_eq!(txt(&[("value", num(60.0)), ("type", Value::Enum(8))], 0.0), "Wednesday, March 1, 2000");
+ // A keyframed date count past chrono's ±262143 range still renders its real date and a
+ // matching weekday (275790-09-13 is a Monday), not an epoch-derived stand-in.
+ assert_eq!(txt(&[("value", num(100_000_000.0)), ("type", Value::Enum(8))], 0.0), "Monday, September 13, 275790");
+ assert_eq!(txt(&[("value", num(-100_000_000.0)), ("type", Value::Enum(7))], 0.0), "Apr 20, -271791");
assert_eq!(txt(&[("value", num(1.0)), ("currentTimeDate", Value::Bool(true)), ("decimalPlaces", num(1.0))], 2.0), "3.0");
assert_ne!(
txt(&[("value", num(100.0)), ("randomValues", Value::Bool(true))], 0.0),
@@ -1130,6 +1153,28 @@ mod tests {
);
}
+ #[test]
+ fn date_from_days_past_chrono_range() {
+ // chrono's NaiveDate stops near ±262143, but Numbers' `value` has no range guard, so a
+ // keyframed day count can run past it. The 400-year cycle keeps the real date (and a
+ // matching weekday) for every count; values from the pre-chrono formula, both directions,
+ // both sides of the 2000-01-01 epoch.
+ for (days, date, day) in [
+ (0_i64, (2000, 1, 1), "Saturday"),
+ (60, (2000, 3, 1), "Wednesday"),
+ (95_015_644, (262143, 12, 31), "Tuesday"), // chrono's last representable date
+ (100_000_000, (275790, 9, 13), "Monday"), // past it: used to read as the epoch
+ (-96_476_616, (-262145, 12, 31), "Monday"),
+ (-100_000_000, (-271791, 4, 20), "Thursday"),
+ ] {
+ let (y, m, d, wd) = super::date_from_days(days);
+ assert_eq!((y, m, d), date, "days={days}");
+ assert_eq!(super::DAYS[wd], day, "days={days}");
+ }
+ // Extremes don't overflow (i128 intermediates).
+ let _ = (super::date_from_days(i64::MAX), super::date_from_days(i64::MIN));
+ }
+
#[test]
fn numbers_draws_glyph_at_position() {
let img = Image::new(80, 60);
diff --git a/crates/effects/tests/gen_golden.rs b/crates/effects/tests/it/gen_golden.rs
similarity index 100%
rename from crates/effects/tests/gen_golden.rs
rename to crates/effects/tests/it/gen_golden.rs
diff --git a/crates/effects/tests/it/main.rs b/crates/effects/tests/it/main.rs
new file mode 100644
index 000000000..7b12e25c6
--- /dev/null
+++ b/crates/effects/tests/it/main.rs
@@ -0,0 +1,6 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod gen_golden;
+mod particle_golden;
+mod sim_golden;
+mod timewarp_golden;
diff --git a/crates/effects/tests/particle_golden.rs b/crates/effects/tests/it/particle_golden.rs
similarity index 100%
rename from crates/effects/tests/particle_golden.rs
rename to crates/effects/tests/it/particle_golden.rs
diff --git a/crates/effects/tests/sim_golden.rs b/crates/effects/tests/it/sim_golden.rs
similarity index 100%
rename from crates/effects/tests/sim_golden.rs
rename to crates/effects/tests/it/sim_golden.rs
diff --git a/crates/effects/tests/timewarp_golden.rs b/crates/effects/tests/it/timewarp_golden.rs
similarity index 100%
rename from crates/effects/tests/timewarp_golden.rs
rename to crates/effects/tests/it/timewarp_golden.rs
diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml
index 0e26cca58..7104bc1cc 100644
--- a/crates/engine/Cargo.toml
+++ b/crates/engine/Cargo.toml
@@ -34,6 +34,7 @@ serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
log = { workspace = true }
+chrono = { workspace = true }
rayon = { workspace = true }
image = { workspace = true }
web-time = { workspace = true }
diff --git a/crates/engine/src/commands/align_data.rs b/crates/engine/src/commands/align_data.rs
index 097bddc22..38d9e7841 100644
--- a/crates/engine/src/commands/align_data.rs
+++ b/crates/engine/src/commands/align_data.rs
@@ -33,14 +33,16 @@ pub struct Stamp {
pub dated: bool,
}
-fn days_from_civil(y: i64, m: i64, d: i64) -> i64 {
- let y = if m <= 2 { y - 1 } else { y };
- let era = y.div_euclid(400);
- let yoe = y - era * 400;
- let mp = (m + 9) % 12;
- let doy = (153 * mp + 2) / 5 + d - 1;
- let doe = yoe * 365 + yoe / 4 - yoe / 100 + doy;
- era * 146_097 + doe - 719_468
+/// Days since 1970-01-01 of the proleptic-Gregorian date `(y, m, d)`. `d` is added linearly (as
+/// the previous hand-rolled `days_from_civil` did), so a day past the month's end rolls over;
+/// `None` when the year/month is out of chrono's range. `m` must be 1..=12.
+fn days_from_civil(y: i64, m: i64, d: i64) -> Option {
+ let year = i32::try_from(y).ok()?;
+ let month = u32::try_from(m).ok()?;
+ let first = chrono::NaiveDate::from_ymd_opt(year, month, 1)?;
+ // Days since the Unix epoch: `num_days_from_ce` counts from 0001-01-01; 719_162 days precede 1970-01-01.
+ use chrono::Datelike;
+ i64::from(first.num_days_from_ce()).checked_sub(719_163)?.checked_add(d.checked_sub(1)?)
}
/// `hh:mm:ss(.fff)` or timecode `hh:mm:ss:ff` / `hh:mm:ss;ff` → seconds.
@@ -71,7 +73,7 @@ pub fn parse_stamp(v: &Value, fps: f64) -> Option {
// ISO 8601: date [T| ] time [zone].
if s.len() >= 10 && s.as_bytes()[4] == b'-' && s.as_bytes()[7] == b'-' {
let (y, m, d) = (s[0..4].parse::().ok()?, s[5..7].parse::().ok()?, s[8..10].parse::().ok()?);
- let mut secs = days_from_civil(y, m, d) as f64 * 86_400.0;
+ let mut secs = days_from_civil(y, m, d)? as f64 * 86_400.0;
let rest = s[10..].trim_start_matches(['T', 't', ' ']);
if !rest.is_empty() {
// Zone: Z or ±hh:mm / ±hhmm.
diff --git a/crates/engine/src/commands/layer.rs b/crates/engine/src/commands/layer.rs
index b798493b1..13037c88a 100644
--- a/crates/engine/src/commands/layer.rs
+++ b/crates/engine/src/commands/layer.rs
@@ -4,8 +4,8 @@ use effectcraft_color::{BlendMode, Label};
use effectcraft_keyframe::{Justify, TextDoc, Value as KV};
use effectcraft_project::build::{self, Ids};
use effectcraft_project::{
- Comp, FrameBlend, GroupKind, ItemId, ItemKind, Layer, LayerId, LayerSource, MaskMode, MatteKind, Node, Project, PropGroup, Quality, Solid, TrackMatte,
- limits,
+ Comp, FootageKind, FrameBlend, GroupKind, ItemId, ItemKind, Layer, LayerId, LayerSource, MaskMode, MatteKind, Node, Project, PropGroup, Quality, Solid,
+ TrackMatte, limits,
};
use effectcraft_time::Tick;
use serde_json::{Value, json};
@@ -307,6 +307,103 @@ fn add_item(s: &mut Session, p: &Value) -> Result {
Ok(json!({"layer": id.0}))
}
+/// A layer whose source is an item (footage, precomposition or solid), as in After Effects'
+/// Replace Source. Text, shape, null, camera, light and 3D model layers have no AVItem source to
+/// replace.
+fn replaceable_layer(l: &Layer) -> bool {
+ matches!(l.source, LayerSource::Footage { .. } | LayerSource::Comp { .. } | LayerSource::Solid { .. })
+}
+
+/// The source a Project item gives a layer, or why it can't replace one.
+fn replacement_source(item: ItemId, it: &effectcraft_project::Item) -> Result {
+ const CMD: &str = "layer.replaceSource";
+ match &it.kind {
+ ItemKind::Comp(_) => Ok(LayerSource::Comp { item }),
+ ItemKind::Footage(f) if f.kind == FootageKind::Data => {
+ Err(bad(CMD, "data files can't be layer sources; read them in expressions with footage(\"name\").sourceData"))
+ }
+ ItemKind::Footage(f) if f.kind == FootageKind::Model => Err(bad(CMD, "3D model items can't replace a 2D layer source; add them as 3D layers")),
+ ItemKind::Footage(_) => Ok(LayerSource::Footage { item }),
+ ItemKind::Solid(_) => Ok(LayerSource::Solid { item }),
+ ItemKind::Folder => Err(bad(CMD, "folders can't be layer sources")),
+ }
+}
+
+/// Whether a source brings audio properties (precompositions always can; footage when it has an
+/// audio stream).
+fn source_has_audio(project: &Project, source: &LayerSource) -> bool {
+ match source {
+ LayerSource::Comp { .. } => true,
+ LayerSource::Footage { item } => project.item(*item).is_some_and(|i| matches!(&i.kind, ItemKind::Footage(f) if f.has_audio)),
+ _ => false,
+ }
+}
+
+fn has_replace_source(s: &Session) -> std::result::Result<(), String> {
+ has_comp(s)?;
+ let c = s.active_comp().ok_or("no composition")?;
+ if !s.state.selected_layers.iter().filter_map(|l| c.layer(*l)).any(replaceable_layer) {
+ return Err("select a footage, composition or solid layer".into());
+ }
+ if s.state.project_selection.is_empty() {
+ return Err("select a footage item, a composition or a solid in the Project panel".into());
+ }
+ Ok(())
+}
+
+/// Replace the source of the selected (or `layers`) AV layers with a Project item, as After
+/// Effects' Alt-drag and Ctrl+Alt+/ do. The layer keeps every property: name, timing, transforms,
+/// keyframes, expressions, effects, masks, switches, parenting and track matte. Only its source
+/// changes; precompositions bring their Essential Properties group through `sync_project`, and a
+/// source with audio adds an Audio group when the layer has none.
+fn replace_source(s: &mut Session, p: &Value) -> Result {
+ const CMD: &str = "layer.replaceSource";
+ let (cid, ids) = layers_p(s, p)?;
+ let ids = unlocked(s, cid, ids, CMD)?;
+ if ids.is_empty() {
+ return Err(bad(CMD, "select a layer first"));
+ }
+ let item = match p.get("item") {
+ Some(Value::Number(n)) => ItemId(n.as_u64().ok_or_else(|| bad(CMD, "item: a project item id"))?),
+ Some(Value::String(name)) => s.project.find_by_name(name).map(|i| i.id).ok_or_else(|| bad(CMD, format!("no item `{name}`")))?,
+ _ => *s.state.project_selection.first().ok_or_else(|| bad(CMD, "select a footage item, a composition or a solid in the Project panel"))?,
+ };
+ let it = s.project.item(item).ok_or_else(|| bad(CMD, format!("no item {}", item.0)))?;
+ let source = replacement_source(item, it)?;
+ let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+ for lid in &ids {
+ let l = comp.layer(*lid).ok_or_else(|| bad(CMD, "no such layer"))?;
+ if !replaceable_layer(l) {
+ return Err(bad(CMD, format!("“{}” has no source item to replace", l.name)));
+ }
+ }
+ if let LayerSource::Comp { item: new } = &source
+ && s.project.comp_contains(*new, cid)
+ {
+ return Err(bad(CMD, "a composition can't contain itself"));
+ }
+ let has_audio = source_has_audio(&s.project, &source);
+ let source_for_edit = source.clone();
+ s.edit("Replace Layer Source", None, |proj, _| {
+ for lid in &ids {
+ let needs_audio = has_audio && proj.comp(cid).and_then(|c| c.layer(*lid)).is_some_and(|l| l.props.sub("audio").is_none());
+ let audio = if needs_audio {
+ let mut next = Ids(&mut proj.next_id);
+ Some(build::audio(&mut next))
+ } else {
+ None
+ };
+ let l = layer_mut(proj, cid, *lid)?;
+ l.source = source_for_edit.clone();
+ if let Some(audio) = audio {
+ l.props.children.push(audio.into());
+ }
+ }
+ Ok(())
+ })?;
+ Ok(json!({"layers": ids.iter().map(|l| l.0).collect::>(), "item": item.0}))
+}
+
fn select(s: &mut Session, p: &Value) -> Result {
let cid = comp_id(s, p)?;
let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
@@ -417,8 +514,10 @@ fn set_switch_others(s: &mut Session, cid: ItemId, ids: &[LayerId], name: &str,
let applies = |l: &Layer| match name {
"audio" => l.props.sub("audio").is_some(),
"lock" | "locked" => true,
- // Nulls have a Video switch too (it hides their outline in the viewer).
- "video" | "eye" => (l.source.is_av() || matches!(l.source, LayerSource::Null)) && !mattes.contains(&l.id),
+ // Every layer has a Video switch (it hides a null's outline in the viewer and turns a
+ // camera or light off), as the Timeline's eye cell shows; track mattes keep theirs off
+ // by design.
+ "video" | "eye" => !mattes.contains(&l.id),
_ => l.source.is_av() && !mattes.contains(&l.id),
};
let mut alone = true;
@@ -1628,6 +1727,15 @@ pub fn specs() -> Vec {
has_comp,
add_item
),
+ cmd!(
+ "layer.replaceSource",
+ "Replace Layer Source",
+ [],
+ Some("Cmd+Alt+/"),
+ "{comp?, layers?, layer?, item?: id|name (default the Project panel selection), fixExpressions?: bool (accepted for After Effects compatibility)} → {layers, item}",
+ has_replace_source,
+ replace_source
+ ),
cmd!("layer.select", "Select Layers", [], None, "{layers: [id|name|#n], add?, toggle?}", has_comp, select),
cmd!("layer.selectNext", "Select Next Layer", [], Some("Cmd+ArrowDown"), "{add?}", has_comp, select_next),
cmd!("layer.selectPrevious", "Select Previous Layer", [], Some("Cmd+ArrowUp"), "{add?}", has_comp, select_prev),
diff --git a/crates/engine/src/commands/layer_menu.rs b/crates/engine/src/commands/layer_menu.rs
index 9cac80412..0a0449376 100644
--- a/crates/engine/src/commands/layer_menu.rs
+++ b/crates/engine/src/commands/layer_menu.rs
@@ -114,10 +114,10 @@ fn frame_blending(s: &mut Session, p: &Value) -> Result {
fn hide_other_video(s: &mut Session, p: &Value) -> Result {
let (cid, ids) = layers_p(s, p)?;
s.edit("Hide Other Video", None, |proj, _| {
- for l in proj.comp_mut(cid).ok_or(EngineError::NoComp)?.layers.iter_mut() {
- if !ids.contains(&l.id) && (l.source.is_av() || matches!(l.source, LayerSource::Null)) {
- l.switches.video = false;
- }
+ // Every layer has a Video switch (nulls, cameras and lights included, as the Timeline's
+ // eye cell shows): the selection stays shown.
+ for l in proj.comp_mut(cid).ok_or(EngineError::NoComp)?.layers.iter_mut().filter(|l| !ids.contains(&l.id)) {
+ l.switches.video = false;
}
Ok(())
})?;
@@ -754,17 +754,33 @@ fn reveal_in_finder(s: &mut Session, p: &Value) -> Result {
}
fn reveal_source(s: &mut Session, p: &Value) -> Result {
- let item = source_item(s, p, "layer.revealSource")?;
- s.state.project_selection = vec![item];
- frontend(s, "window.panel", &json!({"panel": "project"}))?;
- Ok(json!({"item": item.0}))
+ let (cid, ids) = layers_p(s, p)?;
+ let mut items: Vec = Vec::new();
+ {
+ let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+ for layer in ids.iter().filter_map(|id| comp.layer(*id)) {
+ if let Some(item) = layer.source.item()
+ && s.project.item(item).is_some()
+ && !items.contains(&item)
+ {
+ items.push(item);
+ }
+ }
+ }
+ if items.is_empty() {
+ return Err(bad("layer.revealSource", "the selected layers have no source item"));
+ }
+ s.state.project_selection = items.clone();
+ let raw: Vec = items.iter().map(|item| item.0).collect();
+ frontend(s, "project.reveal", &json!({"items": raw}))?;
+ Ok(json!({"item": items[0].0, "items": raw}))
}
fn reveal_comp(s: &mut Session, p: &Value) -> Result {
let cid = comp_id(s, p)?;
s.state.project_selection = vec![cid];
- frontend(s, "window.panel", &json!({"panel": "project"}))?;
- Ok(json!({"item": cid.0}))
+ frontend(s, "project.reveal", &json!({"items": [cid.0]}))?;
+ Ok(json!({"item": cid.0, "items": [cid.0]}))
}
impl Session {
@@ -909,7 +925,7 @@ pub fn specs() -> Vec {
cmd!("layer.trackMatte", "Track Matte", [], None, "{layers?, op: none|alpha|alphaInverted|luma|lumaInverted|above|below}", has_layers, track_matte_op),
cmd!("layer.openSource", "Open Layer Source", ["Layer"], None, "{layer?}", has_source_item, open_source),
cmd!("layer.revealInFinder", "Reveal in Finder", ["Layer"], None, "{layer?}", has_footage_layer, reveal_in_finder),
- cmd!("layer.revealSource", "Reveal Layer Source in Project", ["Layer", "Reveal"], None, "{layer?}", has_source_item, reveal_source),
+ cmd!("layer.revealSource", "Reveal Layer Source in Project", ["Layer", "Reveal"], None, "{layers?}", has_source_item, reveal_source),
cmd!("comp.revealInProject", "Reveal Composition in Project", ["Layer", "Reveal"], None, "{comp?}", has_comp, reveal_comp),
cmd!("layer.revealExpressionErrors", "Reveal Expression Errors", ["Layer", "Reveal"], None, "{comp?}", has_comp, reveal_expression_errors),
cmd!(
diff --git a/crates/engine/src/doc_path.rs b/crates/engine/src/doc_path.rs
index c7416a8ce..00d6c33f1 100644
--- a/crates/engine/src/doc_path.rs
+++ b/crates/engine/src/doc_path.rs
@@ -46,13 +46,22 @@ pub fn resolve(stored: &str, project: Option<&str>) -> Result {
+ NotFollowed::NoProjectFolder
+ }
+ why => NotFollowed::Refused(why),
+ })
+}
+
+/// Whether `p` is a Windows drive or share path, which a project cannot make absolute outside Windows.
+fn is_windows_rooted(p: &Path) -> bool {
+ let s = p.to_string_lossy();
+ let b = s.as_bytes();
+ (b.len() >= 2 && b[0].is_ascii_alphabetic() && b[1] == b':') || s.starts_with(r"\\") || s.starts_with("//")
}
/// The paths of `f` (its file and every frame of an image sequence) resolved against the document
diff --git a/crates/engine/src/doc_path/tests.rs b/crates/engine/src/doc_path/tests.rs
index b8dcbc190..d9d971247 100644
--- a/crates/engine/src/doc_path/tests.rs
+++ b/crates/engine/src/doc_path/tests.rs
@@ -34,9 +34,11 @@ impl Services for Recording {
}
}
-/// Probes every file as a still.
+/// Probes every file as a still. Only the Unix part of the test below imports files.
+#[cfg(unix)]
struct Stills;
+#[cfg(unix)]
impl crate::Importer for Stills {
fn probe(&self, path: &str) -> Result {
if !std::path::Path::new(path).is_file() {
@@ -147,7 +149,23 @@ fn stored_paths_resolve_against_the_project() {
let doc = doc.to_str().unwrap();
assert_eq!(super::resolve("clip.mov", Some(doc)), Ok(std::env::temp_dir().join("art").join("clip.mov")));
assert_eq!(super::resolve("clip.mov", None), Err(super::NotFollowed::NoProjectFolder));
+ assert_eq!(super::resolve("../logo.png", None), Err(super::NotFollowed::NoProjectFolder));
+ // A drive path is not a local file on Unix, with or without a project: it is not a missing project.
+ #[cfg(unix)]
+ for stored in [r"C:\x.mov", "C:x.mov"] {
+ assert_eq!(super::resolve(stored, None), Err(super::NotFollowed::Refused(super::Refused::Invalid)), "{stored}");
+ }
assert_eq!(super::resolve(r"\\192.0.2.1\share\x.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Network)));
+ assert_eq!(super::resolve("jar:clip.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Url)));
+ // Windows reads a colon in a name as an alternate data stream; elsewhere it is a plain character.
+ if cfg!(windows) {
+ assert_eq!(super::resolve("shots/take:1.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Invalid)));
+ } else {
+ assert_eq!(super::resolve("shots/take:1.mov", Some(doc)), Ok(std::env::temp_dir().join("art").join("shots").join("take:1.mov")));
+ }
+ // A Windows drive path names no file on other platforms.
+ #[cfg(unix)]
+ assert_eq!(super::resolve(r"C:\art\clip.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Invalid)));
#[cfg(windows)]
assert!(super::resolve(r"\\server\share\x.mov", Some(r"\\SERVER\share\job\intro.ecproj")).is_ok());
}
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index cdfc7468e..96b3bf67d 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -1290,6 +1290,8 @@ mod tests_proxy;
#[cfg(test)]
mod tests_quick_offset;
#[cfg(test)]
+mod tests_replace_source;
+#[cfg(test)]
mod tests_rig3d;
#[cfg(test)]
mod tests_sequence;
diff --git a/crates/engine/src/logging.rs b/crates/engine/src/logging.rs
index 2c89466ae..ec5785f7e 100644
--- a/crates/engine/src/logging.rs
+++ b/crates/engine/src/logging.rs
@@ -93,28 +93,34 @@ fn thread_name() -> String {
return "main".to_string();
}
-/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds) for `ms` milliseconds since 1970.
+/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds) for `ms` milliseconds since 1970. A clock set
+/// absurdly far ahead keeps its real year (preserved) instead of reading as the epoch.
fn timestamp(ms: u64) -> String {
- let secs = ms / 1000;
- let (days, rem) = (secs / 86_400, secs % 86_400);
- let (y, m, d) = civil_from_days(days);
- format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}.{:03}Z", rem / 3600, rem % 3600 / 60, rem % 60, ms % 1000)
+ let (secs, millis) = (ms / 1000, (ms % 1000) as u32);
+ let (y, t) = utc_parts(secs, millis * 1_000_000);
+ // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+ format!("{y:04}-{}", t.format("%m-%dT%H:%M:%S%.3fZ"))
}
-/// Days since 1970-01-01 to a proleptic Gregorian (year, month, day) (Howard Hinnant's
-/// `civil_from_days`, unsigned since the clock is clamped at the epoch). `days` is at most
-/// `u64::MAX / 86_400_000`, so none of the arithmetic below can overflow.
-fn civil_from_days(days: u64) -> (u64, u64, u64) {
- let z = days + 719_468;
- let era = z / 146_097;
- let doe = z % 146_097;
- let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
- let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
- let mp = (5 * doy + 2) / 153;
- let d = doy - (153 * mp + 2) / 5 + 1;
- let m = if mp < 10 { mp + 3 } else { mp - 9 };
- let y = yoe + era * 400 + u64::from(m <= 2);
- (y, m, d)
+/// Unix seconds (+ nanos) → (proleptic Gregorian year, the same wall-clock instant moved into
+/// chrono's range by whole 400-year cycles). The Gregorian calendar repeats every 400 years
+/// (146_097 days), so month, day and time of day come from chrono and only the year is carried,
+/// which keeps every input exact instead of collapsing out-of-range years to the epoch. `secs` is
+/// `u64` (the clock is clamped at the epoch before 1970), so `days` always fits an `i64`.
+fn utc_parts(secs: u64, nanos: u32) -> (i64, chrono::NaiveDateTime) {
+ use chrono::Datelike;
+ let (days, sod) = ((secs / 86_400) as i64, (secs % 86_400) as i64);
+ let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+ // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+ let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+ let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, nanos.min(999_999_999)));
+ match (date, time) {
+ (Some(d), Some(t)) => {
+ let y = i128::from(d.year()) + i128::from(cycles) * 400;
+ (i64::try_from(y).unwrap_or(i64::MAX), d.and_time(t))
+ }
+ _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+ }
}
/// One log line (without the newline): ` [] : `.
@@ -358,7 +364,12 @@ mod tests {
assert_eq!(timestamp(1_709_164_800_000), "2024-02-29T00:00:00.000Z");
assert_eq!(timestamp(951_782_400_000), "2000-02-29T00:00:00.000Z");
assert_eq!(timestamp(1_767_225_599_000), "2025-12-31T23:59:59.000Z");
- let _ = timestamp(u64::MAX);
+ // Years past 9999 keep the plain zero-padded year (no `+`).
+ assert_eq!(timestamp(253_402_300_800_000), "10000-01-01T00:00:00.000Z");
+ // A clock absurdly far ahead keeps its real year (years far outside chrono's own range are
+ // preserved) instead of collapsing to the epoch (reviewer rule from the sibling PRs).
+ assert_eq!(timestamp(10_000_000_000_000_000), "318857-05-20T17:46:40.000Z");
+ assert_eq!(timestamp(u64::MAX), "584556019-04-03T14:25:51.615Z");
}
/// Each launch keeps the previous runs' logs, so the log of a run that crashed survives.
diff --git a/crates/engine/src/media_browser.rs b/crates/engine/src/media_browser.rs
index d22875f17..c0e20be71 100644
--- a/crates/engine/src/media_browser.rs
+++ b/crates/engine/src/media_browser.rs
@@ -264,22 +264,33 @@ pub fn parent(dir: &str) -> Option {
std::path::Path::new(dir).parent().map(|p| p.to_string_lossy().to_string()).filter(|p| !p.is_empty())
}
-/// Format seconds since the epoch as an ISO 8601 UTC date-time.
+/// Format seconds since the epoch as an ISO 8601 UTC date-time. Years far outside chrono's own
+/// range are preserved (the old hand-rolled conversion kept them) rather than collapsing to the epoch.
pub fn iso_date(secs: u64) -> String {
- let days = (secs / 86_400) as i64;
- let rem = secs % 86_400;
- // Civil-from-days (Howard Hinnant's algorithm).
- let z = days + 719_468;
- let era = z.div_euclid(146_097);
- let doe = z - era * 146_097;
- let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
- let y = yoe + era * 400;
- let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
- let mp = (5 * doy + 2) / 153;
- let d = doy - (153 * mp + 2) / 5 + 1;
- let m = if mp < 10 { mp + 3 } else { mp - 9 };
- let y = if m <= 2 { y + 1 } else { y };
- format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}Z", rem / 3600, rem % 3600 / 60, rem % 60)
+ let (y, t) = utc_parts(secs);
+ // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+ format!("{y:04}-{}", t.format("%m-%dT%H:%M:%SZ"))
+}
+
+/// Unix seconds → (proleptic Gregorian year, the same wall-clock instant moved into chrono's range
+/// by whole 400-year cycles). The Gregorian calendar repeats every 400 years (146_097 days), so
+/// month, day and time of day come from chrono and only the year is carried, which keeps every
+/// input exact instead of collapsing out-of-range years to the epoch. `secs` is `u64`, so `days`
+/// always fits an `i64`.
+fn utc_parts(secs: u64) -> (i64, chrono::NaiveDateTime) {
+ use chrono::Datelike;
+ let (days, sod) = ((secs / 86_400) as i64, (secs % 86_400) as i64);
+ let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+ // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+ let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+ let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, 0));
+ match (date, time) {
+ (Some(d), Some(t)) => {
+ let y = i128::from(d.year()) + i128::from(cycles) * 400;
+ (i64::try_from(y).unwrap_or(i64::MAX), d.and_time(t))
+ }
+ _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+ }
}
/// File dates and size: (created, modified, size).
@@ -506,5 +517,10 @@ mod tests {
assert_eq!(iso_date(0), "1970-01-01T00:00:00Z");
assert_eq!(iso_date(1_700_000_000), "2023-11-14T22:13:20Z");
assert_eq!(iso_date(951_782_400), "2000-02-29T00:00:00Z");
+ // Years far outside chrono's own range are preserved (the old hand-rolled conversion kept
+ // them) rather than collapsing to the epoch.
+ assert_eq!(iso_date(253_402_300_800), "10000-01-01T00:00:00Z");
+ assert_eq!(iso_date(10_000_000_000_000), "318857-05-20T17:46:40Z");
+ assert_eq!(iso_date(u64::MAX), "584554051223-11-09T07:00:15Z");
}
}
diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs
index a2ce579ea..800cff191 100644
--- a/crates/engine/src/prefs.rs
+++ b/crates/engine/src/prefs.rs
@@ -36,6 +36,7 @@ pub const LANGUAGES: &[(&str, &str)] = &[
("Français", "fr"),
("Deutsch", "de"),
("Čeština", "cs"),
+ ("ქართული", "ka"),
];
/// Settings ▸ Startup & Repair ▸ Window Graphics: (label, `startup.windowGraphics` value).
@@ -110,7 +111,8 @@ page!(General {
/// Synchronize Time of All Related Items.
sync_time_related_items: bool = true,
expression_pick_whip_compact: bool = true,
- create_split_layers_above: bool = false,
+ /// Create Split Layers Above Original Layer (After Effects' default).
+ create_split_layers_above: bool = true,
use_system_color_picker: bool = false,
/// Number of projects in File ▸ Open Recent.
recent_items: u32 = 10,
diff --git a/crates/engine/src/remote.rs b/crates/engine/src/remote.rs
index 207367b07..7d592abe2 100644
--- a/crates/engine/src/remote.rs
+++ b/crates/engine/src/remote.rs
@@ -263,6 +263,8 @@ pub struct FrameServer {
/// The disk cache's layer buffers (see the module docs) and the project's salt.
layer_store: Option>,
salt: u64,
+ /// Size and content hash for footage paths with no native metadata (the browser file table).
+ virtual_id: Option Option<(u64, u64)> + Send + Sync>>,
}
/// A frame whose readbacks are in flight.
@@ -294,9 +296,16 @@ impl FrameServer {
pending: None,
layer_store: None,
salt: 0,
+ virtual_id: None,
}
}
+ /// Identity of virtual footage files, used when native metadata cannot describe the path.
+ /// Called from [`FrameServer::load`], not from the UI thread's cache lookup.
+ pub fn set_virtual_id(&mut self, id: Option Option<(u64, u64)> + Send + Sync>>) {
+ self.virtual_id = id;
+ }
+
/// The store behind the layer cache when a request asks for `layers` (the browser: the
/// disk cache's layer buffers, fetched before the request).
pub fn set_layer_store(&mut self, store: Option>) {
@@ -338,7 +347,7 @@ impl FrameServer {
fn load(&mut self, revision: u64) -> Result<(), String> {
let p = Project::from_json(&self.doc.to_string()).map_err(|e| e.to_string())?;
- self.salt = effectcraft_render::disk_cache::footage_salt(&p);
+ self.salt = effectcraft_render::disk_cache::footage_salt_with(&p, self.virtual_id.as_deref());
self.cache.set_store_salt(self.salt);
self.project = Some(Arc::new(p));
self.revision = Some(revision);
diff --git a/crates/engine/src/tests_limits.rs b/crates/engine/src/tests_limits.rs
index 68f2c04c0..524719bbf 100644
--- a/crates/engine/src/tests_limits.rs
+++ b/crates/engine/src/tests_limits.rs
@@ -102,3 +102,38 @@ fn commands_cap_sizes_at_30000_px() {
let f = s.project.items.values().find_map(|i| if let ItemKind::Footage(f) = &i.kind { Some(f.clone()) } else { None }).unwrap();
assert_eq!((f.width, f.height, f.frame_rate), (limits::MAX_SIZE, 8, FrameRate::FPS_29_97));
}
+
+#[test]
+fn a_project_with_a_precomp_cycle_opens_adds_and_renders_without_running_out_of_stack() {
+ // Comps A and B nest each other (a damaged file); C is unrelated. Checking whether A
+ // contains C walked the A ⇄ B cycle until the stack ran out (#1237).
+ let mut s = Session::default();
+ let mut ids = vec![];
+ for name in ["A", "B", "C"] {
+ s.execute("comp.new", json!({"name": name, "width": 32, "height": 32, "frameRate": 30, "duration": 1})).unwrap();
+ ids.push(s.active_comp_id().unwrap());
+ }
+ let (a, b, c) = (ids[0], ids[1], ids[2]);
+ {
+ let proj = std::sync::Arc::make_mut(&mut s.project);
+ for (outer, inner) in [(a, b), (b, a)] {
+ let comp = proj.comp(outer).unwrap().clone();
+ let l = effectcraft_project::build::layer(proj, &comp, "pre", effectcraft_project::LayerSource::Comp { item: inner }, (32, 32), None);
+ let ItemKind::Comp(cc) = &mut proj.item_mut(outer).unwrap().kind else { panic!("comp") };
+ std::sync::Arc::make_mut(cc).layers.push(l);
+ }
+ }
+ let path = tmp("cycle.ecproj");
+ std::fs::write(&path, s.project.to_file_json().unwrap()).unwrap();
+ let mut t = Session::default();
+ t.execute("file.open", json!({"path": path})).unwrap();
+ t.open_comp(c);
+ // Adding A into C asks whether A contains C: it doesn't, so the layer goes in.
+ let r = t.execute("layer.addItem", json!({"comp": c.0, "item": a.0})).unwrap();
+ assert!(r["layer"].as_u64().is_some(), "{r}");
+ // Adding C into A would nest C in itself through A: refused, as before.
+ assert!(t.execute("layer.addItem", json!({"comp": a.0, "item": c.0})).is_err());
+ // C renders: inside A the renderer skips B's copy of A instead of looping.
+ let img = t.render(c, Tick::ZERO, RenderOpts { scale: 1.0, ..Default::default() });
+ assert_eq!((img.width, img.height), (32, 32));
+}
diff --git a/crates/engine/src/tests_m145.rs b/crates/engine/src/tests_m145.rs
index fe0a16936..68b897617 100644
--- a/crates/engine/src/tests_m145.rs
+++ b/crates/engine/src/tests_m145.rs
@@ -42,14 +42,14 @@ fn split_layers_go_above_or_below_the_original() {
let mut s = session();
let a = solid(&mut s, "#ff0000");
s.execute("time.set", json!({"time": 1.0})).unwrap();
- let below = s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap()[0].as_u64().unwrap();
- let order: Vec = s.active_comp().unwrap().layers.iter().map(|l| l.id.0).collect();
- assert_eq!(order, vec![a, below], "off (default): the new part goes below");
- s.execute("edit.undo", json!({})).unwrap();
- s.execute("prefs.set", json!({"key": "general.createSplitLayersAbove", "value": true})).unwrap();
let above = s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap()[0].as_u64().unwrap();
let order: Vec = s.active_comp().unwrap().layers.iter().map(|l| l.id.0).collect();
- assert_eq!(order, vec![above, a]);
+ assert_eq!(order, vec![above, a], "on (default): the new part goes above");
+ s.execute("edit.undo", json!({})).unwrap();
+ s.execute("prefs.set", json!({"key": "general.createSplitLayersAbove", "value": false})).unwrap();
+ let below = s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap()[0].as_u64().unwrap();
+ let order: Vec = s.active_comp().unwrap().layers.iter().map(|l| l.id.0).collect();
+ assert_eq!(order, vec![a, below]);
}
#[test]
diff --git a/crates/engine/src/tests_menu_cmds.rs b/crates/engine/src/tests_menu_cmds.rs
index 6da07dd40..5131bf3f4 100644
--- a/crates/engine/src/tests_menu_cmds.rs
+++ b/crates/engine/src/tests_menu_cmds.rs
@@ -111,6 +111,29 @@ fn set_switch_others() {
assert!(s.execute("layer.setSwitch", json!({"layers": [c], "switch": "nope", "others": true})).is_err());
}
+/// The Video switch has a cell on every layer's row, cameras and lights included, so Alt-clicking
+/// it (and Hide Other Video) takes them along with the rest.
+#[test]
+fn video_others_takes_cameras_and_lights() {
+ let mut s = comp();
+ let a = solid(&mut s, "#ff0000");
+ let cam = s.execute("layer.newCamera", json!({})).unwrap()["layer"].as_u64().unwrap();
+ let light = s.execute("layer.newLight", json!({"kind": "Point"})).unwrap()["layer"].as_u64().unwrap();
+ let get = |s: &Session, f: fn(&effectcraft_project::Layer) -> bool| [a, cam, light].map(|l| f(&layer(s, l)));
+ // The camera and the light are hidden: Alt-click on the solid's eye brings them back, since
+ // they stand apart with it, and the next Alt-click hides them with every other layer.
+ s.execute("layer.setSwitch", json!({"layers": [cam, light], "switch": "video", "value": false})).unwrap();
+ s.execute("layer.setSwitch", json!({"layers": [a], "switch": "video", "others": true})).unwrap();
+ assert_eq!(get(&s, |l| l.switches.video), [true; 3]);
+ s.execute("layer.setSwitch", json!({"layers": [a], "switch": "video", "others": true})).unwrap();
+ assert_eq!(get(&s, |l| l.switches.video), [true, false, false]);
+ // Hide Other Video takes them too.
+ s.execute("layer.showAllVideo", json!({})).unwrap();
+ assert_eq!(get(&s, |l| l.switches.video), [true; 3]);
+ s.execute("layer.hideOtherVideo", json!({"layers": [a]})).unwrap();
+ assert_eq!(get(&s, |l| l.switches.video), [true, false, false]);
+}
+
/// A null's Video switch (the eye) works like any layer's, as in After Effects: it toggles,
/// Alt-click and Hide Other Video take nulls along, and its children still follow it while it is
/// hidden (parenting ignores the eye).
@@ -725,6 +748,37 @@ fn reveal_properties() {
assert!(frontend_events(&mut s).iter().all(|(c, _)| c == "timeline.revealProps"));
}
+#[test]
+fn reveal_layer_source_selects_each_layers_source_item() {
+ let mut s = comp();
+ let a = solid(&mut s, "#ff0000");
+ let b = solid(&mut s, "#00ff00");
+ let ia = layer(&s, a).source.item().unwrap();
+ let ib = layer(&s, b).source.item().unwrap();
+ assert_ne!(ia, ib);
+ s.execute("layer.select", json!({"layers": [a, b]})).unwrap();
+ let r = s.execute("layer.revealSource", json!({})).unwrap();
+ assert_eq!(r["item"], ia.0);
+ assert_eq!(r["items"], json!([ia.0, ib.0]));
+ assert_eq!(s.state.project_selection, vec![ia, ib]);
+ assert_eq!(frontend_events(&mut s), vec![("project.reveal".to_string(), json!({"items": [ia.0, ib.0]}))]);
+ // A null has no source. Alone it is refused; in a mixed selection only the sources are revealed.
+ let n = s.execute("layer.newNull", json!({})).unwrap()["layer"].as_u64().unwrap();
+ s.execute("layer.select", json!({"layers": [n]})).unwrap();
+ assert!(s.execute("layer.revealSource", json!({})).is_err());
+ s.execute("layer.select", json!({"layers": [n, a]})).unwrap();
+ let r = s.execute("layer.revealSource", json!({})).unwrap();
+ assert_eq!(r["items"], json!([ia.0]));
+ assert_eq!(s.state.project_selection, vec![ia]);
+ // Reveal Composition in Project opens the same panel and folders.
+ let cid = s.active_comp_id().unwrap();
+ s.drain_events();
+ let r = s.execute("comp.revealInProject", json!({"comp": cid.0})).unwrap();
+ assert_eq!(r["item"], cid.0);
+ assert_eq!(s.state.project_selection, vec![cid]);
+ assert_eq!(frontend_events(&mut s), vec![("project.reveal".to_string(), json!({"items": [cid.0]}))]);
+}
+
#[test]
fn sequence_layers() {
let mut s = comp();
diff --git a/crates/engine/src/tests_replace_source.rs b/crates/engine/src/tests_replace_source.rs
new file mode 100644
index 000000000..a5cb252ce
--- /dev/null
+++ b/crates/engine/src/tests_replace_source.rs
@@ -0,0 +1,158 @@
+//! Layer ▸ Replace Source (#991, and the `replaceSource` part of #813): Alt-drag and Ctrl+Alt+/
+//! replace an AV layer's source while every other layer property stays.
+
+use std::sync::Arc;
+
+use effectcraft_color::Label;
+use effectcraft_project::{Footage, FootageKind, ItemId, ItemKind, LayerSource, Solid};
+use serde_json::json;
+
+use crate::Session;
+
+fn comp() -> Session {
+ let mut s = Session::default();
+ s.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360, "frameRate": 30, "duration": 10})).unwrap();
+ s
+}
+
+fn layer(s: &Session, id: u64) -> effectcraft_project::Layer {
+ s.active_comp().unwrap().layer(effectcraft_project::LayerId(id)).unwrap().clone()
+}
+
+fn solid(s: &mut Session, name: &str) -> u64 {
+ s.execute("layer.newSolid", json!({"name": name, "color": "#ff0000", "width": 200, "height": 100})).unwrap()["layer"].as_u64().unwrap()
+}
+
+fn add_footage(s: &mut Session, name: &str, kind: FootageKind, width: u32, height: u32, has_audio: bool) -> ItemId {
+ let f = Footage { path: format!("/tmp/{name}"), kind, width, height, has_video: kind != FootageKind::Data, has_audio, ..Default::default() };
+ Arc::make_mut(&mut s.project).add_item(name, Label::None, None, ItemKind::Footage(f))
+}
+
+/// The replacement changes `source` and nothing else: name, label, comment, timing, stretch,
+/// switches, blending, parenting, track matte and the whole property tree (keys, expression,
+/// effect, mask) stay.
+#[test]
+fn replace_source_keeps_every_layer_property() {
+ let mut s = comp();
+ let a = solid(&mut s, "Hero");
+ let parent = solid(&mut s, "Parent");
+ let matte = solid(&mut s, "Matte");
+ s.execute("layer.timing", json!({"layers": [a], "in": 1.0, "out": 5.0})).unwrap();
+ s.execute("layer.timeStretch", json!({"layers": [a], "percent": 50})).unwrap();
+ s.execute("layer.setSwitch", json!({"layers": [a], "switch": "preserveTransparency", "value": true})).unwrap();
+ s.execute("layer.setSwitch", json!({"layers": [a], "switch": "motionBlur", "value": true})).unwrap();
+ s.execute("layer.setBlendMode", json!({"layers": [a], "mode": "Multiply"})).unwrap();
+ s.execute("layer.setParent", json!({"layers": [a], "parent": parent, "compensate": false})).unwrap();
+ s.execute("layer.setTrackMatte", json!({"layer": a, "matte": matte, "kind": "alpha"})).unwrap();
+ s.execute("layer.setComment", json!({"layers": [a], "comment": "keep me"})).unwrap();
+ s.execute("effect.apply", json!({"layer": a, "effect": "Gaussian Blur"})).unwrap();
+ s.execute("mask.new", json!({"layer": a, "vertices": [[10, 10], [90, 10], [90, 90]], "closed": true})).unwrap();
+ s.execute("prop.addKey", json!({"layer": a, "path": "transform/opacity", "time": 1.0, "value": 25.0})).unwrap();
+ s.execute("prop.addKey", json!({"layer": a, "path": "transform/opacity", "time": 2.0, "value": 75.0})).unwrap();
+ s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "time * 90"})).unwrap();
+ let before = layer(&s, a);
+ let item = add_footage(&mut s, "new.png", FootageKind::Still, 120, 80, false);
+ s.execute("layer.replaceSource", json!({"layers": [a], "item": item.0})).unwrap();
+ let after = layer(&s, a);
+ assert_eq!(after.source, LayerSource::Footage { item });
+ assert_eq!(after.name, before.name);
+ assert_eq!(after.label, before.label);
+ assert_eq!(after.comment, before.comment);
+ assert_eq!((after.start_time, after.in_point, after.out_point, after.stretch), (before.start_time, before.in_point, before.out_point, before.stretch));
+ assert_eq!((after.switches, after.blend_mode, after.preserve_transparency), (before.switches, before.blend_mode, before.preserve_transparency));
+ assert_eq!((after.parent, after.track_matte), (before.parent, before.track_matte));
+ assert_eq!(after.props, before.props);
+ assert_eq!(s.active_comp().unwrap().layers.len(), 3, "no layer is added or removed");
+ s.execute("edit.undo", json!({})).unwrap();
+ assert_eq!(layer(&s, a).source, before.source, "one undo step restores the source");
+}
+
+/// Composition, footage and solid sources are interchangeable; a precomposition adds its Audio
+/// group when the layer has none, and an existing Audio group is kept when the next source has no
+/// audio.
+#[test]
+fn replace_source_crosses_types_and_adds_audio() {
+ let mut s = comp();
+ let a = solid(&mut s, "Layer");
+ let inner = s.execute("comp.new", json!({"name": "Inner", "width": 200, "height": 100, "frameRate": 25, "duration": 3})).unwrap()["comp"].as_u64().unwrap();
+ let main = s.project.items.values().find(|i| i.name == "Main").unwrap().id;
+ s.execute("comp.open", json!({"comp": main})).unwrap();
+ let before = layer(&s, a);
+ s.execute("layer.replaceSource", json!({"layers": [a], "item": inner})).unwrap();
+ let after = layer(&s, a);
+ assert_eq!(after.source, LayerSource::Comp { item: ItemId(inner) });
+ assert_eq!(after.name, before.name);
+ assert!(after.props.sub("audio").is_some(), "a precomposition brings Audio");
+ let footage = add_footage(&mut s, "still.png", FootageKind::Still, 64, 32, false);
+ s.execute("layer.replaceSource", json!({"layers": [a], "item": footage.0})).unwrap();
+ let after = layer(&s, a);
+ assert_eq!(after.source, LayerSource::Footage { item: footage });
+ assert!(after.props.sub("audio").is_some(), "the Audio group is preserved for the next source");
+ let new_solid = Arc::make_mut(&mut s.project).add_item(
+ "New Solid",
+ Label::None,
+ None,
+ ItemKind::Solid(Solid { color: [0.0, 1.0, 0.0], width: 10, height: 10, pixel_aspect: 1.0 }),
+ );
+ s.execute("layer.replaceSource", json!({"layers": [a], "item": new_solid.0})).unwrap();
+ assert_eq!(layer(&s, a).source, LayerSource::Solid { item: new_solid });
+ assert_eq!(s.active_comp().unwrap().layers.len(), 1);
+ s.execute("edit.undo", json!({})).unwrap();
+ assert_eq!(layer(&s, a).source, LayerSource::Footage { item: footage });
+}
+
+/// Folders, data files, 3D models, non-source layers and composition cycles are refused before
+/// anything is edited.
+#[test]
+fn replace_source_refuses_invalid_sources_targets_and_cycles() {
+ let mut s = comp();
+ let a = solid(&mut s, "Layer");
+ let folder = Arc::make_mut(&mut s.project).add_item("Folder", Label::None, None, ItemKind::Folder);
+ let data = add_footage(&mut s, "data.txt", FootageKind::Data, 0, 0, false);
+ let model = add_footage(&mut s, "model.glb", FootageKind::Model, 10, 10, false);
+ for (item, needle) in [(folder, "folder"), (data, "data"), (model, "3D model")] {
+ let err = s.execute("layer.replaceSource", json!({"layers": [a], "item": item.0})).unwrap_err().to_string();
+ assert!(err.contains(needle), "{err}");
+ }
+ let footage = add_footage(&mut s, "still.png", FootageKind::Still, 10, 10, false);
+ let text = s.execute("layer.newText", json!({"text": "Hello"})).unwrap()["layer"].as_u64().unwrap();
+ let err = s.execute("layer.replaceSource", json!({"layers": [text], "item": footage.0})).unwrap_err().to_string();
+ assert!(err.contains("no source item"), "{err}");
+ let inner = s.execute("comp.new", json!({"name": "Inner", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
+ let main = s.project.items.values().find(|i| i.name == "Main").unwrap().id;
+ s.execute("comp.open", json!({"comp": main})).unwrap();
+ let inner_layer = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
+ let err = s.execute("layer.replaceSource", json!({"layers": [inner_layer], "item": main.0})).unwrap_err().to_string();
+ assert!(err.contains("contain"), "{err}");
+}
+
+/// Ctrl+Alt+/ takes the source from the Project panel selection and replaces every selected
+/// layer; locked layers are left alone (and an all-locked selection is an error).
+#[test]
+fn replace_source_uses_the_project_selection_and_skips_locked_layers() {
+ let mut s = comp();
+ let a = solid(&mut s, "A");
+ let b = solid(&mut s, "B");
+ let footage = add_footage(&mut s, "still.png", FootageKind::Still, 10, 10, false);
+ s.state.project_selection = vec![footage];
+ let r = s.execute("layer.replaceSource", json!({"layers": [a, b]})).unwrap();
+ assert_eq!(r["item"], json!(footage.0));
+ assert!(matches!(layer(&s, a).source, LayerSource::Footage { item } if item == footage));
+ assert!(matches!(layer(&s, b).source, LayerSource::Footage { item } if item == footage));
+ s.execute("edit.undo", json!({})).unwrap();
+ s.execute("layer.setSwitch", json!({"layers": [b], "switch": "lock", "value": true})).unwrap();
+ let old_b = layer(&s, b).source;
+ let r = s.execute("layer.replaceSource", json!({"layers": [a, b], "item": footage.0})).unwrap();
+ assert_eq!(r["layers"], json!([a]));
+ assert!(matches!(layer(&s, a).source, LayerSource::Footage { item } if item == footage));
+ assert_eq!(layer(&s, b).source, old_b);
+ let err = s.execute("layer.replaceSource", json!({"layers": [b], "item": footage.0})).unwrap_err().to_string();
+ assert!(err.contains("locked"), "{err}");
+}
+
+/// After Effects' Ctrl+Alt+/ default (Cmd+Alt+/ in EffectCraft's shortcut syntax).
+#[test]
+fn replace_source_is_bound_to_ctrl_alt_slash() {
+ let b = crate::shortcuts::bindables(&[]).into_iter().find(|b| b.command == "layer.replaceSource").expect("layer.replaceSource is bindable");
+ assert!(b.defaults.iter().any(|d| d == "Cmd+Alt+/"), "{:?}", b.defaults);
+}
diff --git a/crates/engine/src/tests_settings.rs b/crates/engine/src/tests_settings.rs
index a4f4d89eb..c35d4f3a4 100644
--- a/crates/engine/src/tests_settings.rs
+++ b/crates/engine/src/tests_settings.rs
@@ -1064,6 +1064,12 @@ fn interface_language_is_validated_persisted_and_backward_compatible() {
cs.load_settings();
assert_eq!(cs.prefs.general.language, "cs");
assert_eq!(Prefs::from_json(r#"{"general":{"language":"cs"}}"#).general.language, "cs");
+ // Georgian too.
+ assert!(crate::prefs::LANGUAGES.contains(&("ქართული", "ka")));
+ s.execute("prefs.set", json!({"key": "general.language", "value": "ka"})).unwrap();
+ let mut ka = Session { config: Some(store.clone()), ..Default::default() };
+ ka.load_settings();
+ assert_eq!(ka.prefs.general.language, "ka");
s.execute("prefs.set", json!({"key": "general.language", "value": "ja"})).unwrap();
let mut reloaded = Session { config: Some(store), ..Default::default() };
reloaded.load_settings();
diff --git a/crates/engine/src/tests_timeline_interchange.rs b/crates/engine/src/tests_timeline_interchange.rs
index b32e19c49..45be0f7a1 100644
--- a/crates/engine/src/tests_timeline_interchange.rs
+++ b/crates/engine/src/tests_timeline_interchange.rs
@@ -1,5 +1,5 @@
//! File ▸ Import / Export ▸ Adobe Premiere Pro Project… (timeline interchange) through the command
-//! registry, without media decoding (pixels: `crates/host/tests/timeline_interop.rs`).
+//! registry, without media decoding (pixels: `crates/host/tests/it/timeline_interop.rs`).
use serde_json::json;
diff --git a/crates/engine/tests/key_time_post_snap_bounds.rs b/crates/engine/tests/it/key_time_post_snap_bounds.rs
similarity index 100%
rename from crates/engine/tests/key_time_post_snap_bounds.rs
rename to crates/engine/tests/it/key_time_post_snap_bounds.rs
diff --git a/crates/engine/tests/key_time_reply_contract.rs b/crates/engine/tests/it/key_time_reply_contract.rs
similarity index 100%
rename from crates/engine/tests/key_time_reply_contract.rs
rename to crates/engine/tests/it/key_time_reply_contract.rs
diff --git a/crates/engine/tests/it/main.rs b/crates/engine/tests/it/main.rs
new file mode 100644
index 000000000..ac1484cfb
--- /dev/null
+++ b/crates/engine/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod key_time_post_snap_bounds;
+mod key_time_reply_contract;
+mod parenting_3d_position;
diff --git a/crates/engine/tests/parenting_3d_position.rs b/crates/engine/tests/it/parenting_3d_position.rs
similarity index 100%
rename from crates/engine/tests/parenting_3d_position.rs
rename to crates/engine/tests/it/parenting_3d_position.rs
diff --git a/crates/export/tests/audio_sample_positions.rs b/crates/export/tests/it/audio_sample_positions.rs
similarity index 100%
rename from crates/export/tests/audio_sample_positions.rs
rename to crates/export/tests/it/audio_sample_positions.rs
diff --git a/crates/export/tests/hevc_av1_roundtrip.rs b/crates/export/tests/it/hevc_av1_roundtrip.rs
similarity index 100%
rename from crates/export/tests/hevc_av1_roundtrip.rs
rename to crates/export/tests/it/hevc_av1_roundtrip.rs
diff --git a/crates/export/tests/it/main.rs b/crates/export/tests/it/main.rs
new file mode 100644
index 000000000..0f89a641d
--- /dev/null
+++ b/crates/export/tests/it/main.rs
@@ -0,0 +1,14 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod audio_sample_positions;
+mod hevc_av1_roundtrip;
+#[cfg(not(target_arch = "wasm32"))]
+mod mov_audio_sample_positions;
+mod ms_rounded_footage;
+#[cfg(not(target_arch = "wasm32"))]
+mod native_audio_sample_positions;
+mod opus_roundtrip;
+mod render_settings;
+mod roundtrip;
+mod uncompressed_mov;
+mod vp9_roundtrip;
diff --git a/crates/export/tests/mov_audio_sample_positions.rs b/crates/export/tests/it/mov_audio_sample_positions.rs
similarity index 99%
rename from crates/export/tests/mov_audio_sample_positions.rs
rename to crates/export/tests/it/mov_audio_sample_positions.rs
index c58d2b14d..a46a49271 100644
--- a/crates/export/tests/mov_audio_sample_positions.rs
+++ b/crates/export/tests/it/mov_audio_sample_positions.rs
@@ -1,5 +1,3 @@
-#![cfg(not(target_arch = "wasm32"))]
-
//! Tiny native WAV to ProRes PCM MOV sample-position proof.
use effectcraft_export::render_queue::{AudioFormat, OutputFormat, OutputModule, RenderSettings};
use effectcraft_export::{Job, JobOptions, Sink, export};
diff --git a/crates/export/tests/ms_rounded_footage.rs b/crates/export/tests/it/ms_rounded_footage.rs
similarity index 100%
rename from crates/export/tests/ms_rounded_footage.rs
rename to crates/export/tests/it/ms_rounded_footage.rs
diff --git a/crates/export/tests/native_audio_sample_positions.rs b/crates/export/tests/it/native_audio_sample_positions.rs
similarity index 99%
rename from crates/export/tests/native_audio_sample_positions.rs
rename to crates/export/tests/it/native_audio_sample_positions.rs
index 1b59e8c11..9222d0f23 100644
--- a/crates/export/tests/native_audio_sample_positions.rs
+++ b/crates/export/tests/it/native_audio_sample_positions.rs
@@ -1,5 +1,3 @@
-#![cfg(not(target_arch = "wasm32"))]
-
//! Native MediaPool decoding and native WAV export preserve selected sample positions.
use effectcraft_export::render_queue::{AudioFormat, OutputFormat, OutputModule, RenderSettings};
use effectcraft_export::{Job, JobOptions, Sink, export};
diff --git a/crates/export/tests/opus_roundtrip.rs b/crates/export/tests/it/opus_roundtrip.rs
similarity index 100%
rename from crates/export/tests/opus_roundtrip.rs
rename to crates/export/tests/it/opus_roundtrip.rs
diff --git a/crates/export/tests/render_settings.rs b/crates/export/tests/it/render_settings.rs
similarity index 100%
rename from crates/export/tests/render_settings.rs
rename to crates/export/tests/it/render_settings.rs
diff --git a/crates/export/tests/roundtrip.rs b/crates/export/tests/it/roundtrip.rs
similarity index 100%
rename from crates/export/tests/roundtrip.rs
rename to crates/export/tests/it/roundtrip.rs
diff --git a/crates/export/tests/uncompressed_mov.rs b/crates/export/tests/it/uncompressed_mov.rs
similarity index 100%
rename from crates/export/tests/uncompressed_mov.rs
rename to crates/export/tests/it/uncompressed_mov.rs
diff --git a/crates/export/tests/vp9_roundtrip.rs b/crates/export/tests/it/vp9_roundtrip.rs
similarity index 100%
rename from crates/export/tests/vp9_roundtrip.rs
rename to crates/export/tests/it/vp9_roundtrip.rs
diff --git a/crates/expr/src/prelude.js b/crates/expr/src/prelude.js
index 4da7bc63b..df6ed3ff4 100644
--- a/crates/expr/src/prelude.js
+++ b/crates/expr/src/prelude.js
@@ -461,7 +461,7 @@ Comp.prototype = {
var l = this.layer(i);
if (l.__info[10] === 'Camera' && l.active) return l;
}
- __err('Composition "' + this.name + '" has no active camera');
+ return __err('Composition "' + this.name + '" has no active camera');
},
layer: function (a, rel) {
if (a !== null && typeof a === 'object' && a.__isLayer) return this.layer(a.index + (rel || 0));
diff --git a/crates/expr/src/rewrite.rs b/crates/expr/src/rewrite.rs
index 55e9800aa..6b0ea539f 100644
--- a/crates/expr/src/rewrite.rs
+++ b/crates/expr/src/rewrite.rs
@@ -528,8 +528,9 @@ fn rewrite_seq(items: &[Item]) -> String {
let end = assignment_end(items, j + 1);
let rhs = rewrite_seq(&items[j + 1..end]);
let h = helper(&op.text[..1]).unwrap_or("__add");
+ let target = compound_assignment_target(items, i, j);
out.push_str(&p.ws);
- out.push_str(&format!("{} ={}{h}({}, ({rhs}))", p.body, op.ws, p.body));
+ out.push_str(&format!("{target} ={}{h}({target}, ({rhs}))", op.ws));
i = end;
continue;
}
@@ -543,6 +544,34 @@ fn rewrite_seq(items: &[Item]) -> String {
out
}
+fn raw_ref(item: &Item) -> String {
+ match item {
+ Item::Tok(t) => format!("{}{}", t.ws, t.text),
+ Item::Group { open, inner, close } => {
+ let mut out = format!("{}{}", open.ws, open.text);
+ if has_assign(inner) {
+ // shortcut: nested assignments stay verbatim (rewriting them would double per level), so arithmetic beside them is not array-aware
+ for item in inner {
+ out.push_str(&raw_ref(item));
+ }
+ } else {
+ out.push_str(&rewrite_seq(inner));
+ }
+ if let Some(close) = close {
+ out.push_str(&close.text);
+ }
+ out
+ }
+ }
+}
+
+fn has_assign(items: &[Item]) -> bool {
+ items.iter().any(|it| match it {
+ Item::Tok(t) => ASSIGN.contains(&t.text.as_str()),
+ Item::Group { inner, .. } => has_assign(inner),
+ })
+}
+
fn push_piece(out: &mut String, p: Piece) {
out.push_str(&p.ws);
out.push_str(&p.body);
@@ -554,6 +583,18 @@ fn push_piece(out: &mut String, p: Piece) {
/// nested brackets, so deeper expressions are rejected with an error instead. Constructs that
/// nest without brackets count as part of a level ([`too_nested`]).
pub const MAX_NESTING: usize = 32;
+/// Hard limit on bytes emitted by the array-math source rewrite.
+pub const MAX_REWRITTEN_BYTES: usize = 4 * 1024 * 1024;
+
+fn over_rewrite_limit(text: &str) -> bool {
+ text.len() > MAX_REWRITTEN_BYTES
+}
+
+fn compound_assignment_target(items: &[Item], start: usize, end: usize) -> String {
+ // Rewriting the whole left side duplicates nested computed assignment targets. Keep the
+ // original target syntax for both reads/writes; source length is bounded above.
+ items[start..end].iter().map(raw_ref).collect()
+}
/// Stack cost of one level of brackets (also of a template substitution, a regex group and a
/// prefix operator, which cost the parser about as much or are never chained in real code).
@@ -746,12 +787,18 @@ fn too_nested_from(toks: &[Tok], base: usize) -> bool {
/// An error when `src` nests deeper than [`MAX_NESTING`] levels (before or after the rewrite).
pub fn check_nesting(src: &str) -> Result<(), String> {
+ if over_rewrite_limit(src) {
+ return Err(too_large());
+ }
let (toks, tail) = tokenize(src);
if too_nested(&toks) {
return Err(too_deep());
}
let mut out = rewrite_seq(&build(toks));
out.push_str(&tail);
+ if over_rewrite_limit(&out) {
+ return Err(too_large());
+ }
if too_nested(&tokenize(&out).0) {
return Err(too_deep());
}
@@ -765,12 +812,18 @@ fn too_deep() -> String {
/// Rewrite an expression's source for array-aware arithmetic. Line breaks are preserved.
/// An expression nested deeper than [`MAX_NESTING`] becomes a `throw` of that error.
pub fn rewrite(src: &str) -> String {
+ if over_rewrite_limit(src) {
+ return throw_too_large();
+ }
let (toks, tail) = tokenize(src);
if too_nested(&toks) {
return throw_too_deep();
}
let mut out = rewrite_seq(&build(toks));
out.push_str(&tail);
+ if over_rewrite_limit(&out) {
+ return throw_too_large();
+ }
if too_nested(&tokenize(&out).0) {
return throw_too_deep();
}
@@ -781,6 +834,14 @@ fn throw_too_deep() -> String {
format!("throw new RangeError({:?})", too_deep().trim_start_matches("Error: "))
}
+fn too_large() -> String {
+ format!("Error: expression exceeds the {MAX_REWRITTEN_BYTES}-byte rewrite limit")
+}
+
+fn throw_too_large() -> String {
+ format!("throw new RangeError({:?})", too_large().trim_start_matches("Error: "))
+}
+
#[cfg(test)]
mod tests {
use super::{MAX_NESTING, check_nesting, rewrite};
@@ -821,6 +882,8 @@ mod tests {
#[test]
fn compound_assignment_and_functions() {
assert_eq!(n(&rewrite("x += [1, 0];")), n("x = __add(x, ( [1, 0]));"));
+ assert_eq!(n(&rewrite("obj[key] += 1")), n("obj[key] = __add(obj[key], (1))"));
+ assert_eq!(n(&rewrite("o[a + b] += 1")), n("o[__add(a, b)] = __add(o[__add(a, b)], (1))"));
assert_eq!(n(&rewrite("function f(a) { return a * 2 }")), n("function f(a) { return __mul(a, 2) }"));
assert_eq!(n(&rewrite("var g = (a) => a - 1")), n("var g = (a) => __sub(a, 1)"));
assert_eq!(n(&rewrite("typeof a + 'x'")), n("__add(typeof a, 'x')"));
@@ -828,6 +891,20 @@ mod tests {
assert_eq!(n(&rewrite("2 ** 3 * 2")), n("__mul(2 ** 3, 2)"));
}
+ #[test]
+ fn source_expansion_is_bounded_before_rewriting() {
+ let src = "x += 1;".repeat(super::MAX_REWRITTEN_BYTES / 6 + 1);
+ assert!(check_nesting(&src).unwrap_err().contains("rewrite limit"));
+ assert!(rewrite(&src).starts_with("throw new RangeError("));
+ }
+
+ #[test]
+ fn output_expansion_is_bounded() {
+ let src = format!("{} += 1", "a".repeat(super::MAX_REWRITTEN_BYTES / 2));
+ assert!(check_nesting(&src).unwrap_err().contains("rewrite limit"));
+ assert!(rewrite(&src).starts_with("throw new RangeError("));
+ }
+
#[test]
fn deep_nesting_is_an_error_not_a_stack_overflow() {
// Each level costs the JavaScript parser stack: ~60 nested brackets overflowed a 2 MiB
diff --git a/crates/expr/src/sample.rs b/crates/expr/src/sample.rs
index bff5a2149..28f830bb2 100644
--- a/crates/expr/src/sample.rs
+++ b/crates/expr/src/sample.rs
@@ -99,8 +99,8 @@ pub fn sample_image(ctx: EvalCtx, comp: ItemId, layer: &Layer, point: [f64; 2],
};
let mut acc = [0.0f64; 4];
let mut n = 0.0;
- for y in y0..=y1.min(y0 + 4096) {
- for x in x0..=x1.min(x0 + 4096) {
+ for y in y0..=y1.min(y0.saturating_add(4096)) {
+ for x in x0..=x1.min(x0.saturating_add(4096)) {
let p = b.img.get(x, y);
for k in 0..4 {
acc[k] += p[k] as f64;
diff --git a/crates/expr/src/tests.rs b/crates/expr/src/tests.rs
index 18b725084..7d2790255 100644
--- a/crates/expr/src/tests.rs
+++ b/crates/expr/src/tests.rs
@@ -1166,6 +1166,13 @@ fn sample_image_reads_rendered_pixels() {
assert_close!(f.num(&code("thisComp.layer(\"B\").sampleImage([-50, -50])"), 0.0), 0.0);
}
+/// A huge sample point saturates the pixel coordinates; it must not overflow the loop bounds.
+#[test]
+fn sample_image_huge_point_is_transparent() {
+ let f = fx();
+ assert_close!(f.num("var c = thisComp.layer(\"B\").sampleImage([1e300, 1e300]); c[3]", 0.0), 0.0);
+}
+
fn data_item(p: &mut Project, name: &str, text: &str) {
let f = effectcraft_project::Footage {
path: format!("/data/{name}"),
diff --git a/crates/gpu/src/tests.rs b/crates/gpu/src/tests.rs
index 24f8c9614..79ef77b57 100644
--- a/crates/gpu/src/tests.rs
+++ b/crates/gpu/src/tests.rs
@@ -79,6 +79,35 @@ pub(crate) fn on_gl() -> bool {
gpu().is_some_and(|g| g.ctx.name.ends_with("(Gl)"))
}
+/// The test device is Mesa's software rasteriser, llvmpipe: on OpenGL, or as lavapipe on Vulkan
+/// (the Linux CI gate).
+pub(crate) fn on_llvmpipe() -> bool {
+ gpu().is_some_and(|g| g.ctx.name.starts_with("llvmpipe"))
+}
+
+thread_local! {
+ static LLVMPIPE_FLIPS: std::cell::Cell = const { std::cell::Cell::new(false) };
+}
+
+/// Until the guard drops, comparisons on lavapipe get [`GL_BOUNDARY_FLIPS`] too. Only the tests
+/// that measured such flips there opt in (CC HexTile cell edges, CC Threshold RGB thresholds);
+/// every other comparison on the Linux gate stays exact.
+pub(crate) fn allow_llvmpipe_boundary_flips() -> impl Drop {
+ struct Reset;
+ impl Drop for Reset {
+ fn drop(&mut self) {
+ LLVMPIPE_FLIPS.with(|f| f.set(false));
+ }
+ }
+ LLVMPIPE_FLIPS.with(|f| f.set(true));
+ Reset
+}
+
+/// The boundary-flip allowance applies: OpenGL, or llvmpipe in a test that opted in.
+fn boundary_flips_allowed() -> bool {
+ on_gl() || (LLVMPIPE_FLIPS.with(std::cell::Cell::get) && on_llvmpipe())
+}
+
/// On GL, the fraction of pixels allowed past the tolerance: pixels on a decision boundary (a
/// hex cell's edge, a threshold, a corner pin's coverage edge, a median's rank tie) may land on
/// the other side, since GL drivers may divide through a reciprocal and GLSL's `fma` need not be
@@ -255,7 +284,7 @@ pub(crate) fn check(label: &str, d: Option, allow: f64) {
let frac = d.over as f64 / d.total as f64;
// Quantised depths: rounding-boundary flips (see the module docs).
let (allow, cap) = if d.quantized && allow == 0.0 { (0.003, 4.0 / 255.0 + 1e-6) } else { (allow, f32::INFINITY) };
- let (allow, cap) = if on_gl() { (allow.max(GL_BOUNDARY_FLIPS), f32::INFINITY) } else { (allow, cap) };
+ let (allow, cap) = if boundary_flips_allowed() { (allow.max(GL_BOUNDARY_FLIPS), f32::INFINITY) } else { (allow, cap) };
assert!(frac <= allow && d.max <= cap, "{label}: {} of {} pixels over tolerance (max {:.6}); worst {:?}", d.over, d.total, d.max, d.worst);
if d.over > 0 {
eprintln!("{label}: {} of {} pixels over tolerance (max {:.6})", d.over, d.total, d.max);
@@ -454,7 +483,7 @@ pub(crate) fn effect_direct(id: &str, vals: &[(&str, Value)], adjustment: bool)
let out = effectcraft_render::Accelerator::effects(g, &[effectcraft_render::FxStep { spec, ctx: ctx() }], &buf, None).expect("the GPU runs the effect");
assert_eq!((out.offset, out.scale), (cpu.offset, cpu.scale), "{id}: geometry");
let d = diff(&cpu.img, &out.img, 1e-3);
- let allow = if on_gl() { (d.total as f64 * GL_BOUNDARY_FLIPS) as usize } else { 0 };
+ let allow = if boundary_flips_allowed() { (d.total as f64 * GL_BOUNDARY_FLIPS) as usize } else { 0 };
assert!(
d.over <= allow,
"{id} {vals:?} adj {adjustment} scale {scale}: {} of {} pixels over 1e-3 (max {}); worst {:?}",
diff --git a/crates/gpu/src/tests_fx_pixel2.rs b/crates/gpu/src/tests_fx_pixel2.rs
index 899955b85..4a7886afe 100644
--- a/crates/gpu/src/tests_fx_pixel2.rs
+++ b/crates/gpu/src/tests_fx_pixel2.rs
@@ -12,7 +12,7 @@ use effectcraft_project::{BitDepth, MaskMode};
use effectcraft_render::RenderOpts;
use effectcraft_time::Tick;
-use crate::tests::{Scene, c, check, compare_at, diff, effect_case, gpu, n, opts, pattern, set};
+use crate::tests::{Scene, allow_llvmpipe_boundary_flips, c, check, compare_at, diff, effect_case, gpu, n, opts, pattern, set};
pub(crate) fn e(v: u32) -> Value {
Value::Enum(v)
@@ -193,6 +193,7 @@ fn composites_and_colour() {
#[test]
fn stylize() {
+ let _flips = allow_llvmpipe_boundary_flips();
for (done, flags) in
[(30.0, [true, true, true, false]), (55.0, [false, true, false, true]), (70.0, [true, false, false, false]), (10.0, [false, false, true, true])]
{
diff --git a/crates/gpu/src/tests_fx_stylize.rs b/crates/gpu/src/tests_fx_stylize.rs
index 44e156aec..20d76efa6 100644
--- a/crates/gpu/src/tests_fx_stylize.rs
+++ b/crates/gpu/src/tests_fx_stylize.rs
@@ -6,7 +6,7 @@ use effectcraft_project::BitDepth;
use effectcraft_render::RenderOpts;
use effectcraft_time::Tick;
-use crate::tests::{Scene, c, check, compare_at, effect_case, n, opts, set};
+use crate::tests::{Scene, allow_llvmpipe_boundary_flips, c, check, compare_at, effect_case, n, opts, set};
fn e(v: u32) -> Value {
Value::Enum(v)
@@ -22,6 +22,7 @@ fn pt(x: f64, y: f64) -> Value {
#[test]
fn posterize_thresholds_strobe_vignette() {
+ let _flips = allow_llvmpipe_boundary_flips();
effect_case("ec.stylize.posterize", &[("level", n(4.0))]);
effect_case("ec.stylize.posterize", &[("level", n(9.0))]);
effect_case("ec.stylize.threshold", &[("level", n(100.0))]);
diff --git a/crates/gpu/src/tests_fx_warp.rs b/crates/gpu/src/tests_fx_warp.rs
index 39bcba13c..1482c268b 100644
--- a/crates/gpu/src/tests_fx_warp.rs
+++ b/crates/gpu/src/tests_fx_warp.rs
@@ -2,6 +2,8 @@
//! Emboss, Cartoon) vs the CPU effects (the oracle): direct on a buffer at full and half
//! resolution, as adjustment, and composited at 8 and 32 bpc.
+use std::io::Write;
+
use effectcraft_effects::MaskShape;
use effectcraft_keyframe::{ShapePath, Value};
use effectcraft_project::build::{self, Ids};
@@ -9,7 +11,7 @@ use effectcraft_project::{BitDepth, MaskMode};
use effectcraft_render::RenderOpts;
use effectcraft_time::Tick;
-use crate::tests::{Scene, c, check, compare_at, diff, effect_case, gpu, n, opts, pattern};
+use crate::tests::{Scene, c, check, compare_at, diff, effect_case, gpu, n, on_llvmpipe, opts, pattern};
fn e(v: u32) -> Value {
Value::Enum(v)
@@ -182,6 +184,12 @@ fn smear_and_reshape() {
],
];
for vals in reshape {
+ if on_llvmpipe() && vals.iter().any(|(k, _)| *k == "boundaryMask") {
+ // Straight to stderr: libtest captures `eprintln!` of passing tests, and the skip
+ // should show in the log.
+ let _ = writeln!(std::io::stderr(), "tests_fx_warp::smear_and_reshape: skipping ec.distort.reshape {vals:?} on llvmpipe (crashes lavapipe, #2238)");
+ continue;
+ }
direct_with_masks("ec.distort.reshape", vals);
composite_with_masks("ec.distort.reshape", vals);
}
diff --git a/crates/host/tests/background_presets.rs b/crates/host/tests/it/background_presets.rs
similarity index 100%
rename from crates/host/tests/background_presets.rs
rename to crates/host/tests/it/background_presets.rs
diff --git a/crates/host/tests/determinism.rs b/crates/host/tests/it/determinism.rs
similarity index 100%
rename from crates/host/tests/determinism.rs
rename to crates/host/tests/it/determinism.rs
diff --git a/crates/host/tests/exr_layers.rs b/crates/host/tests/it/exr_layers.rs
similarity index 100%
rename from crates/host/tests/exr_layers.rs
rename to crates/host/tests/it/exr_layers.rs
diff --git a/crates/host/tests/footage_reload.rs b/crates/host/tests/it/footage_reload.rs
similarity index 100%
rename from crates/host/tests/footage_reload.rs
rename to crates/host/tests/it/footage_reload.rs
diff --git a/crates/host/tests/gif_animates.rs b/crates/host/tests/it/gif_animates.rs
similarity index 100%
rename from crates/host/tests/gif_animates.rs
rename to crates/host/tests/it/gif_animates.rs
diff --git a/crates/host/tests/it/main.rs b/crates/host/tests/it/main.rs
new file mode 100644
index 000000000..575ae946a
--- /dev/null
+++ b/crates/host/tests/it/main.rs
@@ -0,0 +1,13 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod background_presets;
+mod determinism;
+mod exr_layers;
+mod footage_reload;
+mod gif_animates;
+mod plugins;
+mod relink;
+mod tga_import;
+mod timeline_interop;
+mod vector_import;
+mod webm_metadata;
diff --git a/crates/host/tests/plugins.rs b/crates/host/tests/it/plugins.rs
similarity index 100%
rename from crates/host/tests/plugins.rs
rename to crates/host/tests/it/plugins.rs
diff --git a/crates/host/tests/relink.rs b/crates/host/tests/it/relink.rs
similarity index 100%
rename from crates/host/tests/relink.rs
rename to crates/host/tests/it/relink.rs
diff --git a/crates/host/tests/tga_import.rs b/crates/host/tests/it/tga_import.rs
similarity index 100%
rename from crates/host/tests/tga_import.rs
rename to crates/host/tests/it/tga_import.rs
diff --git a/crates/host/tests/timeline_interop.rs b/crates/host/tests/it/timeline_interop.rs
similarity index 100%
rename from crates/host/tests/timeline_interop.rs
rename to crates/host/tests/it/timeline_interop.rs
diff --git a/crates/host/tests/vector_import.rs b/crates/host/tests/it/vector_import.rs
similarity index 99%
rename from crates/host/tests/vector_import.rs
rename to crates/host/tests/it/vector_import.rs
index 49f8d950c..36d83dd1a 100644
--- a/crates/host/tests/vector_import.rs
+++ b/crates/host/tests/it/vector_import.rs
@@ -121,8 +121,8 @@ fn psd_16bit_cmyk_composition_imports() {
assert!(d < 2.0 / 255.0, "mean diff {d}");
}
-const SVG: &[u8] = include_bytes!("../../svg/tests/fixtures/basic-shapes.svg");
-const SVG2: &[u8] = include_bytes!("../../svg/tests/fixtures/paths-gradients.svg");
+const SVG: &[u8] = include_bytes!("../../../svg/tests/fixtures/basic-shapes.svg");
+const SVG2: &[u8] = include_bytes!("../../../svg/tests/fixtures/paths-gradients.svg");
#[test]
fn svg_footage_and_shapes_from_vector_layer() {
diff --git a/crates/host/tests/webm_metadata.rs b/crates/host/tests/it/webm_metadata.rs
similarity index 100%
rename from crates/host/tests/webm_metadata.rs
rename to crates/host/tests/it/webm_metadata.rs
diff --git a/crates/keyframe/src/value.rs b/crates/keyframe/src/value.rs
index 1dff4477f..6609aed68 100644
--- a/crates/keyframe/src/value.rs
+++ b/crates/keyframe/src/value.rs
@@ -82,7 +82,18 @@ impl ShapePath {
if i == 0 && f.segment == 0 && !self.closed {
return false;
}
- if i > 0 && f.segment == i - 1 {
+ if i == 0 && self.closed && segs > 0 {
+ // The old closing segment and segment 0 merge into the new closing one.
+ if f.segment == segs {
+ f.segment = segs - 1;
+ f.t *= 0.5;
+ } else if f.segment == 0 {
+ f.segment = segs - 1;
+ f.t = 0.5 + f.t * 0.5;
+ } else {
+ f.segment -= 1;
+ }
+ } else if i > 0 && f.segment == i - 1 {
f.t *= 0.5;
} else if f.segment == i && i > 0 {
f.segment = i - 1;
diff --git a/crates/keyframe/tests/feather_remove.rs b/crates/keyframe/tests/feather_remove.rs
new file mode 100644
index 000000000..06836bbf6
--- /dev/null
+++ b/crates/keyframe/tests/feather_remove.rs
@@ -0,0 +1,14 @@
+use effectcraft_keyframe::{FeatherPoint, ShapePath};
+
+#[test]
+fn removing_first_vertex_of_closed_path_merges_closing_segment() {
+ let mut p = ShapePath::rect([0.0, 0.0], 10.0, 10.0);
+ let fp = |segment| FeatherPoint { segment, t: 0.5, radius: 1.0, tension: 0.0 };
+ p.feather = vec![fp(3), fp(0)];
+ p.vertices.remove(0);
+ p.in_tangents.remove(0);
+ p.out_tangents.remove(0);
+ p.feather_after_remove(0);
+ let got: Vec<(usize, f64)> = p.feather.iter().map(|f| (f.segment, f.t)).collect();
+ assert_eq!(got, vec![(2, 0.25), (2, 0.75)]);
+}
diff --git a/crates/lottie/src/import.rs b/crates/lottie/src/import.rs
index 7730017d8..b2eeece49 100644
--- a/crates/lottie/src/import.rs
+++ b/crates/lottie/src/import.rs
@@ -96,9 +96,11 @@ fn external_image(stored: &str, base_dir: &str) -> Result {
let doc = std::path::Path::new(base_dir).join("lottie.json");
std::path::absolute(&doc).unwrap_or(doc)
});
- match craft_docpath::resolve(stored, doc.as_deref()) {
- Ok(path) if path.is_absolute() => Ok(path.to_string_lossy().into_owned()),
- Ok(_) => Err(format!("{stored} is relative and the Lottie file's folder is not known")),
+ match craft_docpath::resolve_absolute(stored, doc.as_deref()) {
+ Ok(path) => Ok(path.to_string_lossy().into_owned()),
+ Err(craft_docpath::Refused::Invalid) if doc.is_none() && craft_docpath::resolve(stored, None).is_ok() => {
+ Err(format!("{stored} is relative and the Lottie file's folder is not known"))
+ }
Err(why) => Err(format!("{stored}: {why}")),
}
}
diff --git a/crates/media/src/pool.rs b/crates/media/src/pool.rs
index 9a8ec5c28..ee1d80cd3 100644
--- a/crates/media/src/pool.rs
+++ b/crates/media/src/pool.rs
@@ -45,6 +45,9 @@ struct Key {
matte: [u32; 3],
/// A movie frame made at this size for a reduced-resolution render ((0, 0): as decoded).
size: (u32, u32),
+ /// A still at a reduced `size`: the footage's nominal size, which decides whether it is
+ /// resampled (see `Inner::still_at_size`); (0, 0) otherwise.
+ nominal: (u32, u32),
}
struct Entry {
@@ -559,7 +562,7 @@ impl Inner {
let loaded = self.read(path).map_err(|e| e.to_string()).and_then(|bytes| {
// Files the model names are read only when local or on the model's own network share.
let resolve = |uri: &str| -> Option> {
- let p = craft_docpath::resolve(uri, Some(std::path::Path::new(path))).ok().filter(|p| p.is_absolute())?;
+ let p = craft_docpath::resolve_absolute(uri, Some(std::path::Path::new(path))).ok()?;
self.read(&p.to_string_lossy()).ok().map(|b| b.to_vec())
};
effectcraft_model::load(path, &bytes, &resolve).map_err(|e| e.to_string())
@@ -678,7 +681,7 @@ impl Inner {
FloatCurve::Gamma24 => 2,
} << 2);
let matte = if footage.alpha == AlphaMode::Premultiplied { footage.premul_color.map(f32::to_bits) } else { [0; 3] };
- let key = |path: &str, frame| Key { path: path.into(), frame, interp, matte, size: (0, 0) };
+ let key = |path: &str, frame| Key { path: path.into(), frame, interp, matte, size: (0, 0), nominal: (0, 0) };
match footage.kind {
FootageKind::Sequence if !footage.sequence.is_empty() => {
let i = Self::frame_index(footage.frame_rate, t, footage.sequence_frames(), footage.loop_count);
@@ -708,16 +711,20 @@ impl Inner {
}
}
- /// The frame of `footage` at `t`; a movie's resampled to `size` when it can be made at that
- /// size directly (see [`FootageSource::frame_at_size`]).
+ /// The frame of `footage` at `t`, resampled to `size` (see [`FootageSource::frame_at_size`]):
+ /// a movie's made at that size directly, a still's resampled once and kept at that size.
fn frame_at(self: &Arc, footage: &Footage, t: Tick, playback: bool, size: Option<(u32, u32)>, float: FloatCurve) -> Result> {
if !footage.has_video {
return Err(MediaError::Unsupported(format!("{}: no video", footage.path)));
}
let mut loc = Self::locate(footage, t, float);
let movie = loc.media_t.is_some();
- if movie && let Some(size) = size {
+ // A still asked for at its own size is the unsized frame (one decode, one entry).
+ if let Some(size) = size.filter(|s| movie || *s != (footage.width, footage.height)) {
loc.key.size = size;
+ if !movie {
+ loc.key.nominal = (footage.width, footage.height);
+ }
}
let mut c = lock(&self.cache);
// sequential playback of a movie: read the next frame ahead
@@ -773,34 +780,62 @@ impl Inner {
#[cfg(target_arch = "wasm32")]
fn prefetch(self: &Arc, _footage: &Footage, _t: Tick, _size: Option<(u32, u32)>, _float: FloatCurve) {}
+ /// A still (image file or sequence frame) at `loc.key.size` when one is set: resampled as the
+ /// renderer would ([`FootageSource::frame_at_size`]), so the pool keeps the reduced frame and a
+ /// reduced-resolution render neither decodes nor resamples a large still again for every frame
+ /// (#1812: 21120-px plates at Quarter). Like the renderer's `footage_buf`, an image decoded
+ /// larger than the footage's nominal size (a smart object's pixels) is resampled too, and one
+ /// decoded smaller is not (the renderer scales the layer instead).
+ fn still_at_size(img: Image, loc: &Loc, footage: &Footage) -> Image {
+ let (w, h) = loc.key.size;
+ let smaller = img.width == 0 || footage.width as f64 / img.width as f64 > 1.0 + 1e-9;
+ if w == 0 || h == 0 || smaller || (w, h) == (img.width, img.height) {
+ return img;
+ }
+ effectcraft_raster::resample(&img, w, h)
+ }
+
fn decode(&self, loc: &Loc, footage: &Footage) -> Result {
+ match loc.media_t {
+ None => self.decode_still(loc, footage).map(|img| Self::still_at_size(img, loc, footage)),
+ Some(_) => self.decode_media(loc, footage),
+ }
+ }
+
+ fn decode_still(&self, loc: &Loc, footage: &Footage) -> Result {
+ let op = AlphaOp::of(footage, loc.float);
+ let path = &loc.key.path;
+ if &**path == PLACEHOLDER {
+ return Ok(colour_bars(footage.width, footage.height));
+ }
+ let bytes = self.read(path)?;
+ if let Some(img) = crate::dpx::decode(path, &bytes)? {
+ return Ok(dynamic_to_image(&img, op));
+ }
+ if let Some(img) = crate::layered::decode(path, &bytes, footage, op)? {
+ return Ok(img);
+ }
+ // (an OpenEXR compression the decoder lacks came out transparent or as a missing
+ // channel error)
+ if path.to_ascii_lowercase().ends_with(".exr")
+ && let Some(why) = crate::exr_channels::unsupported_compression(&bytes)
+ {
+ return Err(MediaError::Decode(format!("{path}: {why}")));
+ }
+ let loaded = crate::probe::load_oriented(&bytes, crate::still_format(path, &bytes));
+ let img = match loaded {
+ Ok(img) => img,
+ // A multi-layer OpenEXR file without an unnamed RGB layer: its colour layer.
+ Err(e) => crate::exr_channels::cached_layered_image(path, bytes).ok_or_else(|| MediaError::Decode(format!("{path}: {e}")))?,
+ };
+ Ok(dynamic_to_image(&img, op))
+ }
+
+ fn decode_media(&self, loc: &Loc, footage: &Footage) -> Result {
let op = AlphaOp::of(footage, loc.float);
let path = &loc.key.path;
match loc.media_t {
- None if &**path == PLACEHOLDER => Ok(colour_bars(footage.width, footage.height)),
- None => {
- let bytes = self.read(path)?;
- if let Some(img) = crate::dpx::decode(path, &bytes)? {
- return Ok(dynamic_to_image(&img, op));
- }
- if let Some(img) = crate::layered::decode(path, &bytes, footage, op)? {
- return Ok(img);
- }
- // (an OpenEXR compression the decoder lacks came out transparent or as a missing
- // channel error)
- if path.to_ascii_lowercase().ends_with(".exr")
- && let Some(why) = crate::exr_channels::unsupported_compression(&bytes)
- {
- return Err(MediaError::Decode(format!("{path}: {why}")));
- }
- let loaded = crate::probe::load_oriented(&bytes, crate::still_format(path, &bytes));
- let img = match loaded {
- Ok(img) => img,
- // A multi-layer OpenEXR file without an unnamed RGB layer: its colour layer.
- Err(e) => crate::exr_channels::cached_layered_image(path, bytes).ok_or_else(|| MediaError::Decode(format!("{path}: {e}")))?,
- };
- Ok(dynamic_to_image(&img, op))
- }
+ None => self.decode_still(loc, footage),
Some(mt) if gif_anim::is_animated(footage) => {
let anim = self.gif(path)?;
let frame = anim.frame_at(Tick(mt.0)).ok_or_else(|| MediaError::Decode(format!("{path}: no frames")))?;
@@ -1045,7 +1080,7 @@ mod tests {
fn lru_respects_budget_and_recycles() {
let mut c = Lru::default();
let img = || Arc::new(Image::new(16, 16)); // 4 KiB + overhead
- let k = |i| Key { path: "a".into(), frame: i, interp: 0, matte: [0; 3], size: (0, 0) };
+ let k = |i| Key { path: "a".into(), frame: i, interp: 0, matte: [0; 3], size: (0, 0), nominal: (0, 0) };
let budget = 3 * (4096 + 64);
for i in 0..10 {
c.insert(k(i), img(), budget);
diff --git a/crates/media/src/probe.rs b/crates/media/src/probe.rs
index 2793be251..6bba682b3 100644
--- a/crates/media/src/probe.rs
+++ b/crates/media/src/probe.rs
@@ -27,12 +27,21 @@ pub fn probe(path: impl AsRef) -> Result {
}
let bytes = std::fs::read(path).map_err(|e| MediaError::Io(format!("{}: {e}", path.display())))?;
if crate::MODEL_EXTENSIONS.contains(&ext_of(path).as_str()) {
- let dir = path.parent().map(Path::to_path_buf).unwrap_or_default();
- return probe_model(&path.to_string_lossy(), &bytes, &|uri| std::fs::read(dir.join(uri)).ok());
+ return probe_model(&path.to_string_lossy(), &bytes, &side_file_reader(path));
}
probe_bytes(&path.to_string_lossy(), bytes.into())
}
+/// Reads the files a model file names (buffers, textures, MTL files). Like the pool, it follows only
+/// local files and files on the model's own network share: a URI is a path stored in the model.
+fn side_file_reader(model: &Path) -> impl Fn(&str) -> Option> + use<> {
+ let model = std::path::absolute(model).unwrap_or_else(|_| model.to_path_buf());
+ move |uri| {
+ let p = craft_docpath::resolve_absolute(uri, Some(&model)).ok()?;
+ std::fs::read(p).ok()
+ }
+}
+
/// Probe a 3D model (glTF 2.0 / OBJ / STL / FBX): a [`FootageKind::Model`] item whose duration is its
/// longest animation. `resolve` reads sibling resources.
pub fn probe_model(path: &str, bytes: &[u8], resolve: &dyn Fn(&str) -> Option>) -> Result {
@@ -316,6 +325,20 @@ mod tests {
(0..n).map(|k| (at(k + 1) - at(k)) as u32).collect()
}
+ /// A model's side files are read from beside it; a URI to another computer is not followed.
+ #[test]
+ fn model_side_files_are_not_read_from_other_computers() {
+ let dir = std::env::temp_dir().join(format!("ec-probe-side-{}", std::process::id()));
+ std::fs::create_dir_all(&dir).unwrap();
+ std::fs::write(dir.join("buf.bin"), b"abc").unwrap();
+ let read = side_file_reader(&dir.join("model.gltf"));
+ assert_eq!(read("buf.bin"), Some(b"abc".to_vec()));
+ assert_eq!(read(r"\\192.0.2.1\share\buf.bin"), None);
+ assert_eq!(read("file://192.0.2.1/share/buf.bin"), None);
+ assert_eq!(read(r"C:\buf.bin"), None);
+ let _ = std::fs::remove_dir_all(&dir);
+ }
+
#[test]
fn millisecond_rounded_frame_times_average_to_their_rate() {
assert_eq!(rounded(FrameRate::FPS_30, 1000, 6), [33, 34, 33, 33, 34, 33]);
diff --git a/crates/media/tests/downmix.rs b/crates/media/tests/it/downmix.rs
similarity index 100%
rename from crates/media/tests/downmix.rs
rename to crates/media/tests/it/downmix.rs
diff --git a/crates/media/tests/exif_orientation.rs b/crates/media/tests/it/exif_orientation.rs
similarity index 100%
rename from crates/media/tests/exif_orientation.rs
rename to crates/media/tests/it/exif_orientation.rs
diff --git a/crates/media/tests/footage.rs b/crates/media/tests/it/footage.rs
similarity index 94%
rename from crates/media/tests/footage.rs
rename to crates/media/tests/it/footage.rs
index 13ca605e2..a2849dc1d 100644
--- a/crates/media/tests/footage.rs
+++ b/crates/media/tests/it/footage.rs
@@ -40,7 +40,11 @@ fn ffmpeg_fixture(name: &str, args: &[&str]) -> Option {
let tmp = out.with_file_name(format!("tmp-{}-{:?}.{ext}", std::process::id(), std::thread::current().id()).replace(['(', ')'], ""));
let st = Command::new("ffmpeg").args(["-hide_banner", "-loglevel", "error", "-y"]).args(args).arg(&tmp).status().expect("run ffmpeg");
assert!(st.success(), "ffmpeg failed for {name}");
- std::fs::rename(&tmp, &out).expect("rename");
+ if std::fs::rename(&tmp, &out).is_err() {
+ // Another test made it first; on Windows the rename fails while that test has it open.
+ let _ = std::fs::remove_file(&tmp);
+ assert!(out.exists(), "rename {} to {name} failed", tmp.display());
+ }
Some(out)
}
@@ -580,6 +584,46 @@ fn sequence_gaps_show_placeholders() {
let _ = std::fs::remove_dir_all(&dir);
}
+/// #1812: a still asked for at a reduced size comes back as the renderer would resample it, and
+/// is kept at that size: later frames at that size neither decode nor resample it again (a
+/// parallax project's 21120-px plates were decoded and resampled for every frame at Quarter).
+#[test]
+fn stills_at_reduced_sizes_are_resampled_once() {
+ let dir = std::env::temp_dir().join(format!("ec-still-size-{}", std::process::id()));
+ std::fs::create_dir_all(&dir).expect("temp dir");
+ let p = dir.join("plate.png");
+ let px = |x: u32, y: u32| {
+ image::Rgba([(x * 7 % 256) as u8, (y * 13 % 256) as u8, ((x ^ y) % 256) as u8, if (x + y).is_multiple_of(5) { 0 } else { 255 - (x % 128) as u8 }])
+ };
+ image::RgbaImage::from_fn(613, 97, px).save(&p).expect("png");
+ let f = probe(&p).expect("probe");
+ let pool = MediaPool::new();
+ let full = pool.frame(ItemId(1), &f, Tick::ZERO).expect("frame");
+ // At its own size it is the unsized frame: no second decode, no second full-size copy.
+ let misses = pool.stats().misses;
+ let native = pool.frame_at_size(ItemId(1), &f, Tick::ZERO, f.width, f.height).expect("frame");
+ assert!(Arc::ptr_eq(&full, &native), "the native size reuses the unsized frame");
+ assert_eq!(pool.stats().misses, misses);
+ for (w, h) in [(306, 48), (153, 24), (77, 12)] {
+ let sized = pool.frame_at_size(ItemId(1), &f, Tick::ZERO, w, h).expect("frame");
+ assert_eq!(*sized, effectcraft_raster::resample(&full, w, h), "{w}×{h}: the renderer's resample");
+ let misses = pool.stats().misses;
+ let again = pool.frame_at_size(ItemId(1), &f, Tick(3 * TICKS_PER_SECOND), w, h).expect("frame");
+ assert!(Arc::ptr_eq(&sized, &again), "{w}×{h}: kept at that size");
+ assert_eq!(pool.stats().misses, misses, "{w}×{h}: not decoded again");
+ }
+ // Pixels larger than the nominal size (a smart object's) are resampled as the renderer does;
+ // smaller ones are left as they are (the renderer scales the layer up instead).
+ // One pool, one file, one requested size: the two decisions don't share a cache entry.
+ let larger = Footage { width: 306, height: 48, ..f.clone() };
+ let smaller = Footage { width: 1226, height: 194, ..f.clone() };
+ let sized = pool.frame_at_size(ItemId(2), &larger, Tick::ZERO, 153, 24).expect("frame");
+ assert_eq!(*sized, effectcraft_raster::resample(&full, 153, 24));
+ let kept = pool.frame_at_size(ItemId(3), &smaller, Tick::ZERO, 153, 24).expect("frame");
+ assert_eq!(*kept, *full);
+ let _ = std::fs::remove_dir_all(&dir);
+}
+
#[test]
fn png_with_alpha() {
let Some(p) = alpha_png() else { return };
@@ -833,7 +877,7 @@ fn flac_audio_of_any_shape_reads_in_device_blocks() {
}
// ffmpeg's sine source has an amplitude of 1/8 (mono is duplicated). The fixture carries
// channels 0 and 1 at full level and the others at half, so a multichannel file sounds as
- // its stereo downmix (tests/downmix.rs checks that matrix channel by channel).
+ // its stereo downmix (tests/it/downmix.rs checks that matrix channel by channel).
let gains = effectcraft_media::downmix::stereo_gains(channels as usize, false);
let side = |s: usize| gains.iter().enumerate().map(|(c, g)| f64::from(g[s]) * if c < 2 { 1.0 } else { 0.5 }).sum::();
let want = 0.125 * ((side(0).powi(2) + side(1).powi(2)) / 2.0).sqrt() / 2f64.sqrt();
diff --git a/crates/media/tests/it/main.rs b/crates/media/tests/it/main.rs
new file mode 100644
index 000000000..5f7fb8037
--- /dev/null
+++ b/crates/media/tests/it/main.rs
@@ -0,0 +1,7 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod downmix;
+mod exif_orientation;
+mod footage;
+mod open_in_place;
+mod tga;
diff --git a/crates/media/tests/open_in_place.rs b/crates/media/tests/it/open_in_place.rs
similarity index 100%
rename from crates/media/tests/open_in_place.rs
rename to crates/media/tests/it/open_in_place.rs
diff --git a/crates/media/tests/tga.rs b/crates/media/tests/it/tga.rs
similarity index 100%
rename from crates/media/tests/tga.rs
rename to crates/media/tests/it/tga.rs
diff --git a/crates/opusenc/README.md b/crates/opusenc/README.md
index 999d8a7e9..1ebf6fedb 100644
--- a/crates/opusenc/README.md
+++ b/crates/opusenc/README.md
@@ -130,7 +130,7 @@ weights) and the decoder-side normative arithmetic the encoder must reproduce bi
allocation; SILK NLSF dequantisation and stabilisation, NLSF → LPC conversion, `log2lin`, the
fixed-point division/inverse helpers and the LPC analysis filter) are mirrored from FilmCraft's
first-party, spec-derived `filmcraft-opus` decoder (MIT OR Apache-2.0), which is also the
-round-trip oracle in `tests/` and `crates/export/tests/opus_roundtrip.rs` (ffmpeg is a second,
+round-trip oracle in `tests/` and `crates/export/tests/it/opus_roundtrip.rs` (ffmpeg is a second,
external oracle when installed). All encoder-side analysis and search (pitch, LPC, NLSF and
LTP search, noise feedback, rate control, stereo prediction, the decimator) is our own design.
No third-party encoder or decoder source (libopus or otherwise) was consulted.
diff --git a/crates/opusenc/tests/common/mod.rs b/crates/opusenc/tests/it/common/mod.rs
similarity index 100%
rename from crates/opusenc/tests/common/mod.rs
rename to crates/opusenc/tests/it/common/mod.rs
diff --git a/crates/opusenc/tests/ffmpeg.rs b/crates/opusenc/tests/it/ffmpeg.rs
similarity index 99%
rename from crates/opusenc/tests/ffmpeg.rs
rename to crates/opusenc/tests/it/ffmpeg.rs
index fcbb8c8a7..1294ed348 100644
--- a/crates/opusenc/tests/ffmpeg.rs
+++ b/crates/opusenc/tests/it/ffmpeg.rs
@@ -2,7 +2,7 @@
//! without errors with both ffmpeg's native `opus` decoder and `libopus`, honour the pre-skip
//! and end granule, and reproduce the input. Skipped when ffmpeg is not installed.
-mod common;
+use crate::common;
use std::process::Command;
diff --git a/crates/opusenc/tests/it/main.rs b/crates/opusenc/tests/it/main.rs
new file mode 100644
index 000000000..ba6a7895d
--- /dev/null
+++ b/crates/opusenc/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod common;
+mod ffmpeg;
+mod modes;
diff --git a/crates/opusenc/tests/modes.rs b/crates/opusenc/tests/it/modes.rs
similarity index 99%
rename from crates/opusenc/tests/modes.rs
rename to crates/opusenc/tests/it/modes.rs
index 843cf3d9f..c01f64e69 100644
--- a/crates/opusenc/tests/modes.rs
+++ b/crates/opusenc/tests/it/modes.rs
@@ -2,7 +2,7 @@
//! mode/bandwidth decodes, waveform quality on speech-like and music-like signals, bitrate
//! tracking, stereo, the application tables and delay alignment.
-mod common;
+use crate::common;
use common::*;
use effectcraft_opusenc::{Application, Bandwidth, Mode, OpusEncoder};
diff --git a/crates/path/src/lib.rs b/crates/path/src/lib.rs
index 249eb9fdd..5069cb83e 100644
--- a/crates/path/src/lib.rs
+++ b/crates/path/src/lib.rs
@@ -133,7 +133,9 @@ pub fn from_kurbo(path: &BezPath) -> Vec {
/// Rectangle path centred at `pos` with corner `roundness` (AE draws clockwise from the top-right).
pub fn rect(size: [f64; 2], pos: [f64; 2], roundness: f64) -> BezPath {
let r = kurbo::Rect::from_center_size(Point::new(pos[0], pos[1]), (size[0].abs(), size[1].abs()));
- let rad = roundness.clamp(0.0, size[0].abs().min(size[1].abs()) / 2.0);
+ let max_rad = size[0].abs().min(size[1].abs()) / 2.0;
+ // `f64::clamp` panics on a NaN bound (both size components NaN): fall back to no roundness.
+ let rad = if max_rad.is_nan() { 0.0 } else { roundness.clamp(0.0, max_rad) };
if rad > 0.0 { r.to_rounded_rect(rad).to_path(0.1) } else { r.to_path(0.1) }
}
@@ -354,6 +356,11 @@ pub fn transform(paths: &[BezPath], m: &Mat3) -> Vec {
mod tests {
use super::*;
+ #[test]
+ fn rect_with_nan_size_does_not_panic() {
+ let _ = rect([f64::NAN, f64::NAN], [0.0, 0.0], 5.0);
+ }
+
#[test]
fn roundtrip_vertex_model() {
let sp = ShapePath::ellipse([10.0, 20.0], 40.0, 30.0);
diff --git a/crates/pdf/src/image.rs b/crates/pdf/src/image.rs
index 4d55fef8e..7006979c2 100644
--- a/crates/pdf/src/image.rs
+++ b/crates/pdf/src/image.rs
@@ -16,6 +16,7 @@ pub(crate) struct Decoded {
/// The longest side of a decoded image (larger images are refused rather than exhausting
/// memory).
const MAX_SIDE: usize = 16384;
+const MAX_PIXELS: usize = 64 << 20;
fn get<'a>(file: &'a File, d: &'a Dict, long: &str, short: &str) -> Option<&'a Obj> {
file.get(d, long).or_else(|| file.get(d, short))
@@ -114,6 +115,11 @@ fn jpeg_decode(data: &[u8]) -> Result<(Vec, usize), String> {
use zune_jpeg::zune_core::options::DecoderOptions;
let mut probe = JpegDecoder::new(std::io::Cursor::new(data));
probe.decode_headers().map_err(|_| "image (JPEG)".to_string())?;
+ // Bound the header-declared size before decode() allocates the output.
+ let (hw, hh) = probe.dimensions().ok_or_else(|| "image (JPEG)".to_string())?;
+ if hw.checked_mul(hh).is_none_or(|p| p > MAX_PIXELS) {
+ return Err("image (JPEG)".to_string());
+ }
let n = probe.input_colorspace().map(|c| c.num_components()).unwrap_or(3);
let out = match n {
1 => ColorSpace::Luma,
@@ -134,8 +140,17 @@ fn jpeg_decode(data: &[u8]) -> Result<(Vec, usize), String> {
/// Unpack `w`×`h` samples of `n` components at `bpc` bits into 0..=max integers.
fn unpack(data: &[u8], w: usize, h: usize, n: usize, bpc: usize) -> Vec {
- let row_bytes = (w * n * bpc).div_ceil(8);
- let mut out = Vec::with_capacity(w * h * n);
+ let Some(samples) = w.checked_mul(h).and_then(|p| p.checked_mul(n)).filter(|count| *count <= MAX_PIXELS.saturating_mul(4)) else { return Vec::new() };
+ let Some(row_bits) = w.checked_mul(n).and_then(|v| v.checked_mul(bpc)) else { return Vec::new() };
+ let row_bytes = row_bits.div_ceil(8);
+ let Some(row_len) = row_bytes.checked_mul(h) else { return Vec::new() };
+ if row_len > data.len() {
+ return Vec::new();
+ }
+ let mut out = Vec::new();
+ if out.try_reserve_exact(samples).is_err() {
+ return Vec::new();
+ }
for y in 0..h {
let row = data.get(y * row_bytes..((y + 1) * row_bytes).min(data.len())).unwrap_or(&[]);
for i in 0..w * n {
@@ -157,10 +172,22 @@ fn unpack(data: &[u8], w: usize, h: usize, n: usize, bpc: usize) -> Vec {
/// Nearest-neighbour resample of a single-channel 8-bit mask to `w`×`h`.
fn resample(m: &[u8], mw: usize, mh: usize, w: usize, h: usize) -> Vec {
+ let Some(pixels) = w.checked_mul(h).filter(|p| *p <= MAX_PIXELS) else { return Vec::new() };
+ if mw.checked_mul(mh).is_none_or(|n| n > m.len()) {
+ return Vec::new();
+ }
if mw == w && mh == h {
- return m.to_vec();
+ let mut out = Vec::new();
+ if out.try_reserve_exact(pixels).is_err() {
+ return Vec::new();
+ }
+ out.extend_from_slice(&m[..pixels]);
+ return out;
+ }
+ let mut out = Vec::new();
+ if out.try_reserve_exact(pixels).is_err() {
+ return Vec::new();
}
- let mut out = Vec::with_capacity(w * h);
for y in 0..h {
let sy = (y * mh / h.max(1)).min(mh.saturating_sub(1));
for x in 0..w {
@@ -176,12 +203,16 @@ fn mask_image(file: &File, o: &Obj, soft: bool) -> Option<(Vec, usize, usize
let Obj::Stream(d, raw) = file.resolve(o) else { return None };
let w = file.get_num(d, "Width")? as usize;
let h = file.get_num(d, "Height")? as usize;
- if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE {
+ if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE || w.checked_mul(h).is_none_or(|p| p > MAX_PIXELS) {
return None;
}
let (data, jpeg_n) = samples(file, d, raw).ok()?;
+ let pixels = w.checked_mul(h)?;
if jpeg_n.is_some() {
- return Some((data.into_iter().step_by(jpeg_n.unwrap_or(1)).take(w * h).collect(), w, h));
+ let mut out = Vec::new();
+ out.try_reserve_exact(pixels).ok()?;
+ out.extend(data.into_iter().step_by(jpeg_n.unwrap_or(1)).take(pixels));
+ return Some((out, w, h));
}
let bpc = if soft { file.get_num(d, "BitsPerComponent").unwrap_or(8.0) as usize } else { 1 };
// Like `decode()`: only 1/2/4/8/16-bit depths are supported. Anything else (notably
@@ -192,19 +223,21 @@ fn mask_image(file: &File, o: &Obj, soft: bool) -> Option<(Vec, usize, usize
let max = ((1u32 << bpc) - 1).max(1) as f64;
let dec = file.get(d, "Decode").map(|x| file.nums(x)).filter(|v| v.len() >= 2);
let v = unpack(&data, w, h, 1, bpc);
- let out = v
- .into_iter()
- .map(|s| {
- let t = s as f64 / max;
- let t = match &dec {
- Some(dd) => dd[0] + t * (dd[1] - dd[0]),
- None => t,
- };
- // Explicit (stencil) masks: sample 1 masks out with the default Decode.
- let a = if soft { t } else { 1.0 - t };
- (a.clamp(0.0, 1.0) * 255.0).round() as u8
- })
- .collect();
+ if v.len() != pixels {
+ return None;
+ }
+ let mut out = Vec::new();
+ out.try_reserve_exact(pixels).ok()?;
+ out.extend(v.into_iter().map(|s| {
+ let t = s as f64 / max;
+ let t = match &dec {
+ Some(dd) => dd[0] + t * (dd[1] - dd[0]),
+ None => t,
+ };
+ // Explicit (stencil) masks: sample 1 masks out with the default Decode.
+ let a = if soft { t } else { 1.0 - t };
+ (a.clamp(0.0, 1.0) * 255.0).round() as u8
+ }));
Some((out, w, h))
}
@@ -212,15 +245,24 @@ fn mask_image(file: &File, o: &Obj, soft: bool) -> Option<(Vec, usize, usize
pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill: [f64; 3]) -> Result {
let w = file.get_num(d, "Width").unwrap_or(0.0) as usize;
let h = file.get_num(d, "Height").unwrap_or(0.0) as usize;
- if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE || w * h > 64 << 20 {
+ let Some(pixels) = w.checked_mul(h).filter(|p| *p <= MAX_PIXELS) else {
+ return Err("image (size)".into());
+ };
+ if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE {
return Err("image (size)".into());
}
let stencil = matches!(file.get(d, "ImageMask"), Some(Obj::Bool(true)));
let (data, jpeg_n) = samples(file, d, raw)?;
let decode_arr = file.get(d, "Decode").map(|x| file.nums(x)).unwrap_or_default();
- let mut rgba = vec![0u8; w * h * 4];
+ let rgba_len = pixels.checked_mul(4).ok_or_else(|| "image (size)".to_string())?;
+ let mut rgba = Vec::new();
+ rgba.try_reserve_exact(rgba_len).map_err(|_| "image (allocation)".to_string())?;
+ rgba.resize(rgba_len, 0);
if stencil {
let v = unpack(&data, w, h, 1, 1);
+ if v.len() != pixels {
+ return Err("image (sample allocation)".into());
+ }
let paint_on = if decode_arr.first().copied().unwrap_or(0.0) > 0.5 { 1 } else { 0 };
let c = fill.map(|x| (x.clamp(0.0, 1.0) * 255.0).round() as u8);
for (i, s) in v.into_iter().enumerate() {
@@ -243,8 +285,14 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
if !matches!(bpc, 1 | 2 | 4 | 8 | 16) {
return Err(format!("image ({bpc} bits per component)"));
}
+ let Some(sample_count) = pixels.checked_mul(n).filter(|n| *n <= MAX_PIXELS.saturating_mul(4)) else {
+ return Err("image (size)".into());
+ };
let max = ((1u32 << bpc) - 1) as f64;
let raw_samples = unpack(&data, w, h, n, bpc);
+ if raw_samples.len() != sample_count {
+ return Err("image (sample allocation)".into());
+ }
// Decode ranges per component.
let indexed = matches!(cs, Cs::Indexed { .. });
let range = |k: usize| -> (f64, f64) {
@@ -262,7 +310,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
Cs::Indexed { hival, .. } if n == 1 => Some((0..=*hival).map(|i| cs.to_rgb(&[i as f64])).collect()),
_ => None,
};
- for i in 0..w * h {
+ for i in 0..pixels {
if let Some(pal) = &palette {
let s = raw_samples[i] as f64 / max;
let (a, b) = ranges[0];
@@ -288,7 +336,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
Some(Obj::Array(a)) => {
let keys: Vec = a.iter().filter_map(|x| file.resolve(x).num()).collect();
if keys.len() >= 2 * n {
- for i in 0..w * h {
+ for i in 0..pixels {
if (0..n).all(|k| {
let v = raw_samples[i * n + k] as f64;
v >= keys[2 * k] && v <= keys[2 * k + 1]
@@ -300,7 +348,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
}
Some(m @ Obj::Stream(..)) => {
if let Some((m, mw, mh)) = mask_image(file, m, false) {
- for (i, a) in resample(&m, mw, mh, w, h).into_iter().enumerate() {
+ for (i, a) in resample(&m, mw, mh, w, h).into_iter().take(pixels).enumerate() {
rgba[i * 4 + 3] = a;
}
}
@@ -310,7 +358,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
if let Some(sm) = file.get(d, "SMask")
&& let Some((m, mw, mh)) = mask_image(file, sm, true)
{
- for (i, a) in resample(&m, mw, mh, w, h).into_iter().enumerate() {
+ for (i, a) in resample(&m, mw, mh, w, h).into_iter().take(pixels).enumerate() {
rgba[i * 4 + 3] = ((rgba[i * 4 + 3] as u32 * a as u32) / 255) as u8;
}
}
diff --git a/crates/project/src/lib.rs b/crates/project/src/lib.rs
index a4bffbe0c..ccc6be252 100644
--- a/crates/project/src/lib.rs
+++ b/crates/project/src/lib.rs
@@ -1478,11 +1478,32 @@ impl Project {
}
/// Whether comp `inner` is (transitively) nested inside comp `outer` (to prevent cycles).
pub fn comp_contains(&self, outer: ItemId, inner: ItemId) -> bool {
+ // A walk with a stack and a visited set rather than recursion (#1237): a damaged project
+ // may hold a precomp cycle that doesn't pass `inner` (recursion never ended), a long
+ // chain must not use up the call stack, and comps shared by many paths are visited once
+ // (recursion re-walked them for every path).
if outer == inner {
return true;
}
- let Some(c) = self.comp(outer) else { return false };
- c.layers.iter().any(|l| matches!(l.source, LayerSource::Comp { item } if self.comp_contains(item, inner)))
+ let mut seen = std::collections::HashSet::new();
+ let mut stack = vec![outer];
+ while let Some(id) = stack.pop() {
+ if !seen.insert(id) {
+ continue;
+ }
+ let Some(c) = self.comp(id) else { continue };
+ for l in &c.layers {
+ if let LayerSource::Comp { item } = l.source {
+ if item == inner {
+ return true;
+ }
+ if !seen.contains(&item) {
+ stack.push(item);
+ }
+ }
+ }
+ }
+ false
}
/// Make sure `next_id` exceeds every id in the project (after loading or merging).
pub fn fix_next_id(&mut self) {
diff --git a/crates/project/src/tests.rs b/crates/project/src/tests.rs
index 8cd52092f..bc69a2c24 100644
--- a/crates/project/src/tests.rs
+++ b/crates/project/src/tests.rs
@@ -212,3 +212,58 @@ fn item_users_count_layers_in_every_comp() {
assert!(p.item_users(unused).is_empty());
assert!(p.item_users(main).is_empty());
}
+
+/// A project of `n` empty comps; `links` adds a precomp layer of comp `b` inside comp `a`
+/// (indexes into the returned ids).
+fn comp_graph(n: usize, links: &[(usize, usize)]) -> (Project, Vec) {
+ let mut p = Project::default();
+ let ids: Vec = (0..n)
+ .map(|i| {
+ p.add_item(
+ &format!("C{i}"),
+ effectcraft_color::Label::None,
+ None,
+ ItemKind::Comp(Comp::new(8, 8, FrameRate::FPS_25, Tick::from_seconds_f64(1.0)).into()),
+ )
+ })
+ .collect();
+ for &(a, b) in links {
+ let outer = p.comp(ids[a]).unwrap().clone();
+ let l = build::layer(&mut p, &outer, "pre", LayerSource::Comp { item: ids[b] }, (8, 8), None);
+ let ItemKind::Comp(c) = &mut p.item_mut(ids[a]).unwrap().kind else { panic!("comp") };
+ std::sync::Arc::make_mut(c).layers.push(l);
+ }
+ (p, ids)
+}
+
+#[test]
+fn comp_contains_ends_on_cycles_long_chains_and_shared_precomps() {
+ // A ⇄ B cycle, C unrelated: the walk used to recurse until the stack ran out (#1237).
+ let (p, c) = comp_graph(3, &[(0, 1), (1, 0)]);
+ assert!(!p.comp_contains(c[0], c[2]));
+ assert!(p.comp_contains(c[0], c[1]) && p.comp_contains(c[1], c[0]));
+ // A comp nesting itself.
+ let (p, c) = comp_graph(2, &[(0, 0)]);
+ assert!(!p.comp_contains(c[0], c[1]));
+ assert!(p.comp_contains(c[0], c[0]));
+ // A target reached through a cycle.
+ let (p, c) = comp_graph(3, &[(0, 1), (1, 0), (1, 2)]);
+ assert!(p.comp_contains(c[0], c[2]));
+ assert!(!p.comp_contains(c[2], c[0]));
+ // 40 levels of diamonds: 2^40 paths, each comp visited once.
+ let mut links = vec![];
+ for i in 0..40 {
+ let (top, l, r, bottom) = (i * 3, i * 3 + 1, i * 3 + 2, i * 3 + 3);
+ links.extend([(top, l), (top, r), (l, bottom), (r, bottom)]);
+ }
+ let (p, c) = comp_graph(121, &links);
+ let t0 = std::time::Instant::now();
+ assert!(p.comp_contains(c[0], c[120]));
+ assert!(!p.comp_contains(c[120], c[0]));
+ assert!(t0.elapsed() < std::time::Duration::from_secs(1), "{:?}", t0.elapsed());
+ // A chain 20 000 comps deep (a deep recursion's stack frames).
+ let n = 20_000;
+ let (p, c) = comp_graph(n, &(0..n - 1).map(|i| (i, i + 1)).collect::>());
+ assert!(p.comp_contains(c[0], c[n - 1]));
+ assert!(!p.comp_contains(c[n - 1], c[0]));
+}
diff --git a/crates/render/src/cache.rs b/crates/render/src/cache.rs
index bae12d1e3..89e9fd1c9 100644
--- a/crates/render/src/cache.rs
+++ b/crates/render/src/cache.rs
@@ -22,7 +22,7 @@ use std::hash::{Hash, Hasher};
use std::sync::{Arc, Mutex};
use effectcraft_effects::Buf;
-use effectcraft_project::{ItemKind, Layer, LayerSource, Node, PropGroup};
+use effectcraft_project::{FootageKind, ItemKind, Layer, LayerSource, Node, PropGroup};
use crate::eval::EvalCtx;
@@ -168,15 +168,23 @@ impl LayerCache {
// Disk cache: a hit comes back into memory.
let (dc, dk) = self.disk_key(key)?;
let buf = dc.get_layer(dk)?;
- self.insert_mem(key, buf.clone());
- Some(buf)
+ Some(self.insert_mem(key, buf))
}
}
}
- pub fn insert(&self, key: u64, buf: Arc) {
+ /// Keep `buf` under `key`, and return the buffer the cache holds for it: the one kept first
+ /// when another render of the same layer got there before (#1812: preview workers starting
+ /// together each rendered every layer; sharing the first buffer, the GPU compositor uploads
+ /// and packs it once instead of once per worker, which ran it out of memory). Renders don't
+ /// wait for each other: on the frame workers' shared thread pool a wait can end up under
+ /// the very work it waits for.
+ pub fn insert(&self, key: u64, buf: Arc) -> Arc {
if self.gated() {
- return;
+ return buf;
+ }
+ if let Some(kept) = self.inner.lock().ok().and_then(|g| g.map.get(&key).map(|e| e.buf.clone())) {
+ return kept;
}
let started = self.inner.lock().ok().and_then(|mut g| g.missed_at.remove(&key));
if let Some((dc, dk)) = self.disk_key(key) {
@@ -185,20 +193,24 @@ impl LayerCache {
dc.put_layer(dk, &buf);
}
}
- self.insert_mem(key, buf);
+ self.insert_mem(key, buf)
}
- fn insert_mem(&self, key: u64, buf: Arc) {
+ /// See [`LayerCache::insert`]: the buffer kept under `key` (`buf`, unless one was kept first
+ /// or `buf` is too large to keep).
+ fn insert_mem(&self, key: u64, buf: Arc) -> Arc {
let bytes = buf.img.data.len() * std::mem::size_of::();
- let Ok(mut g) = self.inner.lock() else { return };
+ let Ok(mut g) = self.inner.lock() else { return buf };
if bytes > g.budget / 4 {
- return;
+ return buf;
}
g.clock += 1;
let now = g.clock;
- if let Some(old) = g.map.insert(key, Entry { buf, bytes, last_use: now }) {
- g.bytes -= old.bytes;
+ if let Some(e) = g.map.get_mut(&key) {
+ e.last_use = now;
+ return e.buf.clone();
}
+ g.map.insert(key, Entry { buf: buf.clone(), bytes, last_use: now });
g.bytes += bytes;
if g.bytes > g.budget {
// Evict least-recently used entries down to 3/4 of the budget.
@@ -214,6 +226,7 @@ impl LayerCache {
}
}
}
+ buf
}
/// The memory budget in bytes.
@@ -481,7 +494,7 @@ fn hash_values(h: &mut KeyHasher, ctx: &EvalCtx, layer: &Layer, g: &PropGroup) {
}
/// Cache key for the processed (source → masks → effects) buffer of `layer` at the context
-/// time, or `None` when the layer must not be cached (footage, precomps, cameras, adjustment
+/// time, or `None` when the layer must not be cached (movie footage, precomps, cameras, adjustment
/// layers…).
pub fn layer_key(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool) -> Option {
// Time effects see property values at other times. Keyframes are part of the hashed
@@ -514,6 +527,34 @@ fn reads_other_times(layer: &Layer) -> bool {
})
}
+/// A still image (no proxy): its layer is cached like a text or shape layer, so the GPU
+/// compositor uploads it once, not every frame (#1812: four 21120 px plates re-uploaded by every
+/// preview worker ran the GPU out of memory). Movies and sequences stay in the media pool only.
+fn still_footage(ctx: &EvalCtx, item: effectcraft_project::ItemId) -> bool {
+ ctx.project.item(item).is_some_and(|it| it.proxy.is_none() && matches!(&it.kind, ItemKind::Footage(f) if f.kind == FootageKind::Still))
+}
+
+/// Does the layer have an animated mask that motion blur may draw at other times (Layer ▸ Mask ▸
+/// Motion Blur On, or Same As Layer with the layer blurred)?
+fn mask_motion_blur(ctx: &EvalCtx, layer: &Layer, blur: bool) -> bool {
+ use effectcraft_project::{GroupKind, MaskMotionBlur};
+ fn animated(g: &PropGroup) -> bool {
+ g.children.iter().any(|c| match c {
+ Node::Prop(p) => !p.keys.is_empty() || p.has_expression(),
+ Node::Group(sub) => animated(sub),
+ })
+ }
+ ctx.comp.enable_motion_blur
+ && layer.masks().is_some_and(|m| {
+ m.groups().any(|g| match g.kind {
+ GroupKind::Mask { motion_blur, .. } => {
+ (motion_blur == MaskMotionBlur::On || (motion_blur == MaskMotionBlur::SameAsLayer && blur)) && animated(g)
+ }
+ _ => false,
+ })
+ })
+}
+
fn has_expression(g: &PropGroup) -> bool {
g.children.iter().any(|c| match c {
Node::Prop(p) => p.has_expression(),
@@ -552,14 +593,17 @@ fn key_any(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool, fo
hash_debug(&mut h, s);
}
LayerSource::Text | LayerSource::Shape => {}
- LayerSource::Footage { item } if footage => {
+ LayerSource::Footage { item } if footage || still_footage(ctx, *item) => {
let it = ctx.project.item(*item)?;
let ItemKind::Footage(f) = &it.kind else { return None };
hash_debug(&mut h, f);
// A proxy (and its Use Proxy switch) changes the pixels.
hash_debug(&mut h, &it.proxy);
item.hash(&mut h);
- ctx.source_time(layer).0.hash(&mut h);
+ // A still is the same at every time (unless a proxy, which may be a movie, stands in).
+ if f.kind != FootageKind::Still || it.proxy.is_some() {
+ ctx.source_time(layer).0.hash(&mut h);
+ }
// Frame blending mixes neighbouring source frames.
ctx.comp.enable_frame_blending.hash(&mut h);
}
@@ -625,6 +669,11 @@ fn key_any(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool, fo
effectcraft_effects::paint::cache_key(g, lt).0.hash(&mut h);
}
}
+ // Mask motion blur draws animated masks at the shutter's other times too: their values at
+ // this time don't tell two frames apart (a hold before a move).
+ if mask_motion_blur(ctx, layer, blur) {
+ layer.layer_time(ctx.time).0.hash(&mut h);
+ }
if time_dependent(layer, effects != Some(0)) {
layer.layer_time(ctx.time).0.hash(&mut h);
// Effects also see the layer's time mapping.
@@ -668,3 +717,23 @@ pub fn derive(key: u64, i: u64) -> u64 {
i.hash(&mut h);
h.finish()
}
+
+#[cfg(test)]
+mod shared_insert_tests {
+ use std::sync::Arc;
+
+ use super::LayerCache;
+ use effectcraft_effects::Buf;
+ use effectcraft_raster::Image;
+
+ /// Two renders of one layer kept under one key: both use the buffer kept first.
+ #[test]
+ fn the_buffer_kept_first_is_shared() {
+ let cache = LayerCache::default();
+ let buf = || Arc::new(Buf { img: Image::new(4, 4), offset: [0.0; 2], scale: 1.0 });
+ let (a, b) = (buf(), buf());
+ assert!(Arc::ptr_eq(&cache.insert(3, a.clone()), &a));
+ assert!(Arc::ptr_eq(&cache.insert(3, b), &a), "the later render gets the first buffer");
+ assert!(Arc::ptr_eq(&cache.get(3).unwrap(), &a));
+ }
+}
diff --git a/crates/render/src/disk_cache.rs b/crates/render/src/disk_cache.rs
index 4140b7923..f867a614a 100644
--- a/crates/render/src/disk_cache.rs
+++ b/crates/render/src/disk_cache.rs
@@ -779,8 +779,12 @@ fn hash_debug(h: &mut Hash128, v: &impl std::fmt::Debug) {
h.write(&[0xff]);
}
-/// A file's size and modification time (so edited footage gets new keys).
-fn file_stamp(h: &mut Hash128, path: &str) {
+/// Size and content hash of a path that has no native metadata (the browser file table).
+pub type VirtualFileId<'a> = &'a (dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync);
+
+/// A file's size and modification time (so edited footage gets new keys). When the path has no
+/// native metadata, `virtual_id` supplies a durable size and content hash instead.
+fn file_stamp(h: &mut Hash128, path: &str, virtual_id: Option>) {
if path.is_empty() {
return;
}
@@ -791,26 +795,36 @@ fn file_stamp(h: &mut Hash128, path: &str) {
{
h.write_u64(d.as_nanos() as u64);
}
+ return;
+ }
+ if let Some((len, hash)) = virtual_id.and_then(|id| id(path)) {
+ h.write_u64(len);
+ h.write_u64(hash);
}
}
-fn footage_stamp(h: &mut Hash128, f: &effectcraft_project::Footage) {
- file_stamp(h, &f.path);
+fn footage_stamp(h: &mut Hash128, f: &effectcraft_project::Footage, virtual_id: Option>) {
+ file_stamp(h, &f.path, virtual_id);
for p in &f.sequence {
- file_stamp(h, p);
+ file_stamp(h, p, virtual_id);
}
}
/// Salt for layer cache keys on disk: the renderer version and every footage file's identity
/// (layer keys name footage items, not file contents).
pub fn footage_salt(project: &effectcraft_project::Project) -> u64 {
+ footage_salt_with(project, None)
+}
+
+/// [`footage_salt`] with [`VirtualFileId`] for paths `std::fs::metadata` cannot describe.
+pub fn footage_salt_with(project: &effectcraft_project::Project, virtual_id: Option>) -> u64 {
let mut h = Hash128::default();
h.write(RENDER_VERSION.as_bytes());
for (id, it) in &project.items {
if let effectcraft_project::ItemKind::Footage(f) = &it.kind {
h.write_u64(id.0);
hash_debug(&mut h, f);
- footage_stamp(&mut h, f);
+ footage_stamp(&mut h, f, virtual_id);
}
}
let v = h.finish();
@@ -822,6 +836,11 @@ pub fn footage_salt(project: &effectcraft_project::Project) -> u64 {
/// files' size and time). With expressions in play (which can read any comp) the whole project
/// counts. Switches that don't change pixels (Audio, Lock, Shy, Hide Shy Layers) don't count.
pub fn comp_content_key(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId) -> u128 {
+ comp_content_key_with(project, comp, None)
+}
+
+/// [`comp_content_key`] with [`VirtualFileId`] for paths `std::fs::metadata` cannot describe.
+pub fn comp_content_key_with(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId, virtual_id: Option>) -> u128 {
use effectcraft_project::{ItemKind, LayerSource};
let mut h = Hash128::default();
h.write(RENDER_VERSION.as_bytes());
@@ -855,11 +874,11 @@ pub fn comp_content_key(project: &effectcraft_project::Project, comp: effectcraf
k => hash_debug(&mut h, k),
}
if let ItemKind::Footage(f) = &it.kind {
- footage_stamp(&mut h, f);
+ footage_stamp(&mut h, f, virtual_id);
}
hash_debug(&mut h, &it.proxy);
if let Some(px) = &it.proxy {
- footage_stamp(&mut h, &px.footage);
+ footage_stamp(&mut h, &px.footage, virtual_id);
}
}
h.write_u64(comp.0);
@@ -1082,4 +1101,29 @@ mod tests {
assert_eq!(b.get_layer(k).unwrap().img, buf(k as u32, 16, 16).img);
}
}
+
+ /// A path with no native metadata takes its key from the caller's size and content hash (#1253).
+ #[test]
+ fn virtual_file_bytes_change_content_keys() {
+ use effectcraft_project::build;
+ use effectcraft_project::{Comp, Footage, ItemKind, LayerSource, Project};
+ use effectcraft_time::{FrameRate, Tick};
+
+ let mut p = Project::default();
+ let f = Footage { path: "/virtual.mov".into(), width: 16, height: 9, duration: Tick::from_seconds_f64(1.0), has_video: true, ..Default::default() };
+ let fid = p.add_item("virtual.mov", effectcraft_color::Label::None, None, ItemKind::Footage(f));
+ let mut comp = Comp::new(16, 9, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+ comp.layers = vec![build::layer(&mut p, &comp, "clip", LayerSource::Footage { item: fid }, (16, 9), None)];
+ let cid = p.add_item("C", effectcraft_color::Label::None, None, ItemKind::Comp(comp.into()));
+
+ let id = |mark: u64| move |path: &str| (path == "/virtual.mov").then_some((8, mark));
+ let (one, two) = (id(1), id(2));
+ let a = footage_salt_with(&p, Some(&one));
+ let b = footage_salt_with(&p, Some(&two));
+ let ka = comp_content_key_with(&p, cid, Some(&one));
+ let kb = comp_content_key_with(&p, cid, Some(&two));
+ assert_ne!(a, b, "replaced virtual media must not reuse the salt");
+ assert_ne!(ka, kb, "replaced virtual media must not reuse the frame key");
+ assert_eq!(comp_content_key(&p, cid), comp_content_key_with(&p, cid, None));
+ }
}
diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs
index eccaed2f4..73b86e6b6 100644
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@ -1478,10 +1478,11 @@ impl<'a> Renderer<'a> {
let mut nb = (*b).clone();
color::convert(&mut nb.img, &c);
let nb = Arc::new(nb);
- if let (Some(cache), Some(k)) = (self.cache_to_keep(), key) {
- cache.insert(k, nb.clone());
+ // The buffer the cache keeps (another worker's, if it kept one first).
+ match (self.cache_to_keep(), key) {
+ (Some(cache), Some(k)) => cache.insert(k, nb),
+ _ => nb,
}
- nb
}
fn layer_buf_keyed(&self, ctx: &EvalCtx, layer: &Layer) -> Option<(Arc, Option)> {
@@ -1496,9 +1497,11 @@ impl<'a> Renderer<'a> {
return Some((b, key));
}
let flat = Arc::new(styles::Styled { passes: st.passes.iter().map(|(b, m)| ((**b).clone(), *m)).collect(), body: (*st.body).clone() }.flatten());
- if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
- c.insert(k, flat.clone());
- }
+ // The buffer the cache keeps (another worker's, if it kept one first).
+ let flat = match (self.cache_to_keep(), key) {
+ (Some(c), Some(k)) => c.insert(k, flat),
+ _ => flat,
+ };
Some((flat, key))
}
@@ -1527,9 +1530,11 @@ impl<'a> Renderer<'a> {
}
let buf = self.masked_source(ctx, layer)?;
let buf = Arc::new(self.apply_effects_timed(ctx, layer, buf, false, usize::MAX, timing.map(|t| &mut t.effects)));
- if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
- c.insert(k, buf.clone());
- }
+ // The buffer the cache keeps (another worker's, if it kept one first).
+ let buf = match (self.cache_to_keep(), key) {
+ (Some(c), Some(k)) => c.insert(k, buf),
+ _ => buf,
+ };
Some((buf, key))
}
@@ -1552,9 +1557,11 @@ impl<'a> Renderer<'a> {
buf = self.effect_space_stack(ctx, layer, buf, false, effects, None, origin);
}
let buf = Arc::new(buf);
- if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
- c.insert(k, buf.clone());
- }
+ // The buffer the cache keeps (another worker's, if it kept one first).
+ let buf = match (self.cache_to_keep(), key) {
+ (Some(c), Some(k)) => c.insert(k, buf),
+ _ => buf,
+ };
Some(buf)
}
@@ -1582,12 +1589,13 @@ impl<'a> Renderer<'a> {
t.cached = false;
t.effects.push(("layerStyles".into(), t0.elapsed().as_secs_f64() * 1e3));
}
- let body = Arc::new(st.body);
- let passes: Vec<_> = st.passes.into_iter().map(|(b, m)| (Arc::new(b), m)).collect();
+ let mut body = Arc::new(st.body);
+ let mut passes: Vec<_> = st.passes.into_iter().map(|(b, m)| (Arc::new(b), m)).collect();
+ // The buffers the cache keeps (another worker's, if it kept them first).
if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
- c.insert(k, body.clone());
- for (i, (b, _)) in passes.iter().enumerate() {
- c.insert(cache::derive(k, i as u64 + 1), b.clone());
+ body = c.insert(k, body);
+ for (i, (b, _)) in passes.iter_mut().enumerate() {
+ *b = c.insert(cache::derive(k, i as u64 + 1), b.clone());
}
}
Some(StyledLayer { passes, body, content, key, ckey, plain: false })
@@ -2215,9 +2223,11 @@ impl<'a> Renderer<'a> {
let mut foot = self.source(ctx, layer)?;
let _ = masks::apply(ctx, layer, &mut foot, self.mask_blur(ctx, layer));
let foot = Arc::new(foot);
- if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
- c.insert(k, foot.clone());
- }
+ // The buffer the cache keeps (another worker's, if it kept one first).
+ let foot = match (self.cache_to_keep(), key) {
+ (Some(c), Some(k)) => c.insert(k, foot),
+ _ => foot,
+ };
Some(foot)
}
diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs
index 72dd26507..f290e31ca 100644
--- a/crates/render/src/tests.rs
+++ b/crates/render/src/tests.rs
@@ -1010,3 +1010,32 @@ fn a_selected_layer_reading_the_comp_scene_invalidates_its_owner() {
let (a, b) = (particles_x(&here), particles_x(&panned));
assert!(b < a - 20.0, "the blended particles follow the camera: {a} -> {b}");
}
+
+/// #1812: preview workers that render a layer at once end up with one buffer (the one kept
+/// first), so the GPU compositor uploads and packs it once, not once per worker.
+#[test]
+fn workers_rendering_a_layer_at_once_share_one_buffer() {
+ let (mut p, cid, comp) = setup();
+ let mut l = solid(&mut p, &comp, [0.2, 0.5, 0.8], 1600, 1200);
+ add_effect(&mut p, &mut l, "ec.blur.gaussian", [1600.0, 1200.0], &[("blurriness", Value::Scalar(60.0))]);
+ p.comp_mut(cid).unwrap().layers.push(l);
+ let cache = crate::LayerCache::default();
+ let start = std::sync::Barrier::new(8);
+ let bufs: Vec<_> = std::thread::scope(|s| {
+ let hs: Vec<_> = (0..8)
+ .map(|_| {
+ s.spawn(|| {
+ let mut r = crate::Renderer::new(&p, &crate::NoFootage, crate::RenderOpts::default());
+ r.cache = Some(&cache);
+ let c = p.comp(cid).unwrap();
+ let ctx = r.eval_ctx(cid, Tick::ZERO).unwrap();
+ start.wait();
+ r.layer_buf(&ctx, &c.layers[0]).unwrap()
+ })
+ })
+ .collect();
+ hs.into_iter().map(|h| h.join().unwrap()).collect()
+ });
+ assert!(bufs.iter().all(|b| std::sync::Arc::ptr_eq(b, &bufs[0])), "one shared buffer");
+ assert_eq!(cache.stats().entries, 1);
+}
diff --git a/crates/render/src/tests_footage_size.rs b/crates/render/src/tests_footage_size.rs
index 88df726e9..065941d8a 100644
--- a/crates/render/src/tests_footage_size.rs
+++ b/crates/render/src/tests_footage_size.rs
@@ -81,3 +81,28 @@ fn reduced_renders_take_footage_resampled_by_the_source() {
Renderer::new(&p, &sized, RenderOpts { scale: 0.5, ..Default::default() }).comp_frame(cid, Tick::ZERO);
assert!(sized.sizes.unwrap().into_inner().unwrap().is_empty());
}
+
+/// #1812: a still's layer is kept in the layer cache across times (its texture then uploads to
+/// the GPU once, not every frame); a movie's is fetched again at every time.
+#[test]
+fn still_layers_are_cached_across_times_and_movies_are_not() {
+ for (kind, fetches) in [(FootageKind::Still, 1), (FootageKind::Video, 3)] {
+ let (mut p, cid) = project(BitDepth::Bpc8, false);
+ let Some(LayerSource::Footage { item }) = p.comp(cid).map(|c| c.layers[0].source.clone()) else { panic!("footage layer") };
+ if let Some(ItemKind::Footage(f)) = p.item_mut(item).map(|it| &mut it.kind) {
+ f.kind = kind;
+ }
+ let cache = crate::LayerCache::default();
+ let src = Clip { sizes: Some(Mutex::default()) };
+ let opts = RenderOpts { scale: 0.5, ..Default::default() };
+ for t in [0.0, 0.25, 0.5] {
+ let t = Tick::from_seconds_f64(t);
+ let mut r = Renderer::new(&p, &src, opts);
+ r.cache = Some(&cache);
+ let frame = r.comp_frame(cid, t);
+ assert_eq!(frame, Renderer::new(&p, &src, opts).comp_frame(cid, t), "{kind:?} at {t:?}");
+ }
+ // (each uncached render above fetches once more)
+ assert_eq!(src.sizes.unwrap().into_inner().unwrap().len(), fetches + 3, "{kind:?}");
+ }
+}
diff --git a/crates/render/src/tests_mask_blur.rs b/crates/render/src/tests_mask_blur.rs
index 12b88bbba..07bc1e95f 100644
--- a/crates/render/src/tests_mask_blur.rs
+++ b/crates/render/src/tests_mask_blur.rs
@@ -41,6 +41,31 @@ fn alpha_at_25(p: &Project, cid: ItemId, motion_blur: bool) -> f32 {
Renderer::new(p, &NoFootage, RenderOpts { motion_blur, ..Default::default() }).comp_frame(cid, half).get(25, 50)[3]
}
+/// A mask that holds from frame 0 to 2, then moves: frames 1 and 2 have the same mask value, but at
+/// frame 2 the shutter already sees it move. The layer cache must not serve frame 1's layer there.
+#[test]
+fn mask_motion_blur_keys_the_layer_cache_by_time() {
+ let (mut p, cid) = project(true);
+ let rect = |x: f64| Value::Path(ShapePath::rect([x, 50.0], 20.0, 100.0));
+ let l = &mut p.comp_mut(cid).unwrap().layers[0];
+ let Some(Node::Group(m)) = l.props.sub_mut("masks").unwrap().children.first_mut() else { panic!("mask") };
+ m.get_mut("path").unwrap().keys = vec![
+ Keyframe::new(Tick::ZERO, rect(20.0)),
+ Keyframe::new(FrameRate::FPS_30.tick_of(2), rect(20.0)),
+ Keyframe::new(FrameRate::FPS_30.tick_of(3), rect(60.0)),
+ ];
+ let cache = crate::LayerCache::default();
+ let render = |t: Tick, cached: bool| {
+ let mut r = Renderer::new(&p, &NoFootage, RenderOpts { motion_blur: true, ..Default::default() });
+ r.cache = cached.then_some(&cache);
+ r.comp_frame(cid, t)
+ };
+ let (f1, f2) = (FrameRate::FPS_30.tick_of(1), FrameRate::FPS_30.tick_of(2));
+ assert_ne!(render(f1, false), render(f2, false), "the shutter at frame 2 sees the move");
+ render(f1, true);
+ assert_eq!(render(f2, true), render(f2, false));
+}
+
#[test]
fn mask_motion_blur_follows_the_render_and_the_comp() {
let (p, cid) = project(true);
diff --git a/crates/render/src/tests_styles.rs b/crates/render/src/tests_styles.rs
index 147ff1590..b59f009de 100644
--- a/crates/render/src/tests_styles.rs
+++ b/crates/render/src/tests_styles.rs
@@ -475,3 +475,35 @@ fn gradient_glow_uses_gradient() {
let px = img.straight(121, 50);
assert!(px[0] > px[2], "near the edge the glow takes the gradient's start colour {px:?}");
}
+
+/// #1812 (review of #1928): a styled layer rendered by several workers at once shares its body and
+/// style passes, as unstyled layers share their buffer.
+#[test]
+fn workers_styling_a_layer_at_once_share_its_buffers() {
+ let (p, cid) = scene([1.0; 3], None, |p, c, l| {
+ add(p, c, l, "dropShadow");
+ add(p, c, l, "stroke");
+ });
+ let cache = crate::LayerCache::default();
+ let start = std::sync::Barrier::new(8);
+ let styled: Vec<_> = std::thread::scope(|s| {
+ let hs: Vec<_> = (0..8)
+ .map(|_| {
+ s.spawn(|| {
+ let mut r = Renderer::new(&p, &NoFootage, RenderOpts::default());
+ r.cache = Some(&cache);
+ let ctx = r.eval_ctx(cid, Tick::ZERO).unwrap();
+ start.wait();
+ r.styled_layer(&ctx, &p.comp(cid).unwrap().layers[0]).unwrap()
+ })
+ })
+ .collect();
+ hs.into_iter().map(|h| h.join().unwrap()).collect()
+ });
+ let first = &styled[0];
+ assert!(!first.passes.is_empty(), "the drop shadow is a pass");
+ for st in &styled {
+ assert!(std::sync::Arc::ptr_eq(&st.body, &first.body), "one body");
+ assert!(st.passes.iter().zip(&first.passes).all(|(a, b)| std::sync::Arc::ptr_eq(&a.0, &b.0)), "one set of passes");
+ }
+}
diff --git a/crates/render/src/text.rs b/crates/render/src/text.rs
index fbb0feb24..496bc3a60 100644
--- a/crates/render/src/text.rs
+++ b/crates/render/src/text.rs
@@ -12,7 +12,7 @@ use effectcraft_geom::{Mat3, Mat4, Vec3, vec2, vec3};
use effectcraft_keyframe::{Justify, TextDoc, Value};
use effectcraft_path::{BezPath, FillRule, StrokeStyle};
use effectcraft_project::{Layer, PropGroup};
-use effectcraft_raster::Image;
+use effectcraft_raster::{Image, Mask};
use effectcraft_text::path_text::{self, PathMeasure};
use effectcraft_text::selectors::{self, BasedOn, Mode, Range, Shape, Wiggly};
use effectcraft_text::{CharGlyph, TextLayout, char_glyph_style, layout_doc};
@@ -187,6 +187,14 @@ pub fn range_value_of(f: f64, offset: f64, units_index: bool, n: usize) -> f64 {
if units_index { (v * n as f64).round() } else { v * 100.0 }
}
+/// Whether property `uid` of `layer` is a Range Selector's Start, End or Offset while its Units
+/// are Index: the value is then a count of characters (words, lines), not a percentage.
+pub fn in_index_units(layer: &Layer, uid: effectcraft_project::Uid) -> bool {
+ let Some(sel) = layer.props.parent_of(uid).filter(|g| g.match_id == "rangeSelector") else { return false };
+ let is_range_value = sel.props().any(|p| p.uid == uid && matches!(p.match_id.as_str(), "start" | "end" | "offset"));
+ is_range_value && sel.prop("advanced/units").is_some_and(|u| u.value == Value::Enum(1))
+}
+
/// Selection of every glyph by an animator's selectors, per dimension.
pub fn animator_selection(ctx: &EvalCtx, layer: &Layer, anim: &PropGroup, lay: &TextLayout) -> Vec<[f64; 3]> {
let sels: Vec<&PropGroup> = anim.sub("selectors").map(|s| s.groups().filter(|g| g.enabled).collect()).unwrap_or_default();
@@ -479,6 +487,9 @@ pub struct PlacedGlyph {
pub fill: [f32; 4],
pub stroke: [f32; 4],
pub stroke_width: f64,
+ /// Faux Bold (or synthetic bold for a family without a bold face): how far the outline grows
+ /// on every side, in character space (0 when not bold).
+ pub bold: f64,
/// The character's style fills it (Character panel fill on).
pub apply_fill: bool,
/// Index of the character in the text.
@@ -498,8 +509,30 @@ impl PlacedGlyph {
pub fn path(&self) -> BezPath {
effectcraft_path::transform(std::slice::from_ref(&self.local), &self.m2()).remove(0)
}
+ /// [`Self::bold`] in layer space.
+ fn bold_in_layer(&self) -> f64 {
+ self.bold * self.m2().mean_scale()
+ }
+ /// Whether [`Self::bold`] grows the outline as evenly in layer space as in character space:
+ /// no bold, or a matrix that only rotates and scales uniformly.
+ fn bold_is_even(&self) -> bool {
+ let [[a, b, _], [c, d, _], _] = self.m2().0;
+ let n = a * a + b * b + c * c + d * d;
+ self.bold == 0.0 || ((a * a + c * c - b * b - d * d).abs() <= 1e-9 * n && (a * b + c * d).abs() <= 1e-9 * n)
+ }
}
+/// How far a circle of radius `r` reaches along x and along y once mapped by `m`.
+fn axis_reach(m: &Mat3, r: f64) -> [f64; 2] {
+ let [[a, b, _], [c, d, _], _] = m.0;
+ [r * a.hypot(b), r * c.hypot(d)]
+}
+
+/// How far Faux Bold grows a glyph's outline on every side, as a fraction of its size: Inter
+/// Regular grown by this has about the stems of Inter Bold, so synthetic bold stands in for a
+/// missing bold face.
+const FAUX_BOLD_RADIUS: f64 = 0.03;
+
/// Laid-out, animated text of a layer at the context time.
pub struct TextGeom {
pub doc: TextDoc,
@@ -777,6 +810,7 @@ pub fn text_geom(ctx: &EvalCtx, layer: &Layer) -> Option {
fill,
stroke,
stroke_width: (base_stroke_w + x.stroke_width).max(0.0),
+ bold: if g.synth_bold { FAUX_BOLD_RADIUS * g.size } else { 0.0 },
apply_fill: st.apply_fill,
char_index: g.char_index,
rest,
@@ -826,17 +860,41 @@ fn passes(geom: &TextGeom) -> Vec {
v
}
+/// Coverage of the outline grown by `d` on every side (shrunk when `d` is negative): the fill
+/// merged with, or cut by, a round stroke `2|d|` wide, which keeps the edges anti-aliased.
+fn grown_coverage(paths: &[BezPath], mm: &Mat3, w: u32, h: u32, d: f64) -> Mask {
+ let mut cov = effectcraft_path::fill_coverage(paths, mm, w, h, FillRule::NonZero);
+ if d.abs() < 1e-9 {
+ return cov;
+ }
+ let st = StrokeStyle { width: 2.0 * d.abs(), join: effectcraft_path::Join::Round, ..Default::default() };
+ let ring = effectcraft_path::stroke_coverage(paths, &st, mm, w, h);
+ for (c, r) in cov.data.iter_mut().zip(&ring.data) {
+ *c = if d > 0.0 { c.max(*r) } else { c.min(1.0 - r) };
+ }
+ cov
+}
+
/// Rasterize one pass of a glyph — or of a run of glyphs painted alike, as one outline — (paths
/// mapped into target pixels by `m`) into a premultiplied patch over the target rect, blurred
-/// when the character has Blur.
-fn raster_pass(g: &PlacedGlyph, stroke: bool, paths: &[BezPath], m: &Mat3, rect: [i64; 4], blur_px: [f64; 2]) -> Image {
+/// when the character has Blur. `bold` is the glyph's Faux Bold in the paths' space.
+fn raster_pass(g: &PlacedGlyph, stroke: bool, paths: &[BezPath], m: &Mat3, rect: [i64; 4], blur_px: [f64; 2], bold: f64) -> Image {
let (w, h) = ((rect[2] - rect[0]) as u32, (rect[3] - rect[1]) as u32);
let mm = Mat3::translate(vec2(-rect[0] as f64, -rect[1] as f64)) * *m;
- let cov = if stroke {
+ let cov = if stroke && bold > 0.0 {
+ // The stroke of the bold outline: the band between it grown and shrunk by half the width.
+ let half = g.stroke_width / 2.0;
+ let mut outer = grown_coverage(paths, &mm, w, h, bold + half);
+ let inner = grown_coverage(paths, &mm, w, h, bold - half);
+ for (o, i) in outer.data.iter_mut().zip(&inner.data) {
+ *o = o.min(1.0 - i);
+ }
+ outer
+ } else if stroke {
let st = StrokeStyle { width: g.stroke_width, join: effectcraft_path::Join::Round, ..Default::default() };
effectcraft_path::stroke_coverage(paths, &st, &mm, w, h)
} else {
- effectcraft_path::fill_coverage(paths, &mm, w, h, FillRule::NonZero)
+ grown_coverage(paths, &mm, w, h, bold)
};
let col = if stroke { g.stroke } else { g.fill };
let op = (g.xf.opacity / 100.0).clamp(0.0, 1.0) as f32;
@@ -892,10 +950,16 @@ fn runs(geom: &TextGeom) -> Vec<(Vec, bool)> {
if g.xf.opacity <= 0.0 {
continue;
}
+ // A run grows its outline in layer space by one radius, which matches each glyph grown in
+ // its own space only when the bold stays round there.
if geom.blend == BlendMode::Normal
&& solid_fill(g, stroke)
+ && g.bold_is_even()
&& let Some((run, false)) = out.last_mut()
- && run.last().is_some_and(|&p| solid_fill(&geom.glyphs[p], false) && geom.glyphs[p].fill == g.fill)
+ && run.last().is_some_and(|&p| {
+ let q = &geom.glyphs[p];
+ solid_fill(q, false) && q.fill == g.fill && q.bold_is_even() && (q.bold_in_layer() - g.bold_in_layer()).abs() < 1e-6
+ })
{
run.push(gi);
continue;
@@ -917,28 +981,31 @@ fn draw_glyphs(geom: &TextGeom, img: &mut Image, to_px: &Mat3, s: f64, only: Opt
// One glyph is drawn from its own outline; a run from its glyphs' outlines in layer
// space, all wound the same way so overlaps add up instead of cancelling (NonZero).
let local = Cow::Borrowed(std::slice::from_ref(&g.local));
- let (paths, m): (Cow<[BezPath]>, Mat3) = match (only, run.as_slice()) {
- (Some(_), _) => (local, *to_px),
- (None, [_]) => (local, *to_px * g.m2()),
+ let (paths, m, bold): (Cow<[BezPath]>, Mat3, f64) = match (only, run.as_slice()) {
+ (Some(_), _) => (local, *to_px, g.bold),
+ (None, [_]) => (local, *to_px * g.m2(), g.bold),
(None, _) => {
let wound = |p: BezPath| if kurbo::Shape::area(&p) < 0.0 { p.reverse_subpaths() } else { p };
- (Cow::Owned(run.iter().map(|&gi| wound(geom.glyphs[gi].path())).collect()), *to_px)
+ (Cow::Owned(run.iter().map(|&gi| wound(geom.glyphs[gi].path())).collect()), *to_px, g.bold_in_layer())
}
};
let Some(b) = effectcraft_path::bounds(&paths) else { continue };
let blur = [g.xf.blur[0] * s, g.xf.blur[1] * s];
- let pad = g.stroke_width * m.mean_scale() + 2.0 + blur[0].max(blur[1]) * 1.5;
+ // Stroke and bold grow the outline in the paths' space: under a non-uniform `m` they reach
+ // further along one axis than the other.
+ let [px, py] = axis_reach(&m, g.stroke_width + 2.0 * bold);
+ let pad = 2.0 + blur[0].max(blur[1]) * 1.5;
let r = m.map_rect(&effectcraft_geom::Rect::new(b.x0, b.y0, b.x1, b.y1));
let rect = [
- ((r.x0 - pad).floor() as i64).max(0),
- ((r.y0 - pad).floor() as i64).max(0),
- ((r.x1 + pad).ceil() as i64).min(w),
- ((r.y1 + pad).ceil() as i64).min(h),
+ ((r.x0 - px - pad).floor() as i64).max(0),
+ ((r.y0 - py - pad).floor() as i64).max(0),
+ ((r.x1 + px + pad).ceil() as i64).min(w),
+ ((r.y1 + py + pad).ceil() as i64).min(h),
];
if rect[2] <= rect[0] || rect[3] <= rect[1] {
continue;
}
- let patch = raster_pass(g, stroke, &paths, &m, rect, blur);
+ let patch = raster_pass(g, stroke, &paths, &m, rect, blur, bold);
blit(img, &patch, [rect[0], rect[1]], if only.is_some() { BlendMode::Normal } else { geom.blend });
}
}
@@ -950,8 +1017,9 @@ pub fn render(ctx: &EvalCtx, layer: &Layer, s: f64) -> Buf {
let mut bounds: Option = None;
for g in &geom.glyphs {
if let Some(b) = effectcraft_path::bounds(&[g.path()]) {
+ let [bx, by] = axis_reach(&g.m2(), 2.0 * g.bold);
let pad = g.stroke_width + 2.0 + g.xf.blur[0].max(g.xf.blur[1]) * 1.5;
- let b = b.inflate(pad, pad);
+ let b = b.inflate(pad + bx, pad + by);
bounds = Some(bounds.map_or(b, |a| a.union(b)));
}
}
@@ -976,7 +1044,7 @@ pub fn per_char_planes(ctx: &EvalCtx, layer: &Layer, s: f64) -> Vec<(Buf, Mat4)>
continue;
}
let Some(b) = effectcraft_path::bounds(std::slice::from_ref(&g.local)) else { continue };
- let pad = g.stroke_width + 2.0 + g.xf.blur[0].max(g.xf.blur[1]) * 1.5;
+ let pad = g.stroke_width + 2.0 * g.bold + 2.0 + g.xf.blur[0].max(g.xf.blur[1]) * 1.5;
let b = b.inflate(pad, pad);
let w = ((b.width() * s).ceil() as u32 + 4).clamp(1, 4096);
let h = ((b.height() * s).ceil() as u32 + 4).clamp(1, 4096);
diff --git a/crates/render/src/text/tests.rs b/crates/render/src/text/tests.rs
index 020e08517..ea89e37b0 100644
--- a/crates/render/src/text/tests.rs
+++ b/crates/render/src/text/tests.rs
@@ -99,6 +99,24 @@ fn range_based_on_words_and_lines() {
assert_eq!(s, vec![0.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0], "{s:?}");
}
+/// With Units = Index a Range Selector's Start, End and Offset are character counts, not
+/// percentages (#1814); the selector's other values, and other selectors, are unaffected.
+#[test]
+fn index_units_mark_start_end_and_offset() {
+ let (mut p, _cid, comp) = setup(400, 200);
+ let mut l = text_layer(&mut p, &comp, doc("ABCDEFG", 30.0));
+ animator(&mut p, &mut l, &["opacity"], &["range", "wiggly"]);
+ let uid = |l: &Layer, path: &str| l.props.prop(path).unwrap_or_else(|| panic!("no {path}")).uid;
+ let base = "text/animators/#1/selectors/#1";
+ let range_values = ["start", "end", "offset"].map(|k| uid(&l, &format!("{base}/{k}")));
+ assert!(range_values.iter().all(|u| !in_index_units(&l, *u)), "Percentage, the default");
+ set(&mut l, &format!("{base}/advanced/units"), Value::Enum(1));
+ assert!(range_values.iter().all(|u| in_index_units(&l, *u)));
+ assert!(!in_index_units(&l, uid(&l, &format!("{base}/advanced/amount"))), "Amount stays a percentage");
+ assert!(!in_index_units(&l, uid(&l, "text/animators/#1/properties/opacity")));
+ assert!(!in_index_units(&l, uid(&l, "transform/opacity")));
+}
+
#[test]
fn range_start_end_and_offset_are_capped() {
let (mut p, cid, comp) = setup(400, 200);
@@ -524,6 +542,7 @@ fn touching_glyphs_join_without_a_seam() {
fill,
stroke: [0.0; 4],
stroke_width: 0.0,
+ bold: 0.0,
apply_fill: true,
char_index: 0,
rest: [0.0; 2],
@@ -551,6 +570,64 @@ fn touching_glyphs_join_without_a_seam() {
assert!(multiply[3] < 0.9, "{multiply:?}");
}
+/// #1676: Faux Bold, and the synthetic bold of a style the family has no face for, are drawn.
+#[test]
+fn faux_bold_and_synthetic_bold_thicken_the_glyphs() {
+ // Total alpha and the alpha bounding box of a rendered word.
+ let ink = |d: TextDoc| {
+ let (mut p, cid, comp) = setup(400, 120);
+ let mut l = text_layer(&mut p, &comp, TextDoc { text: "Hamburg".into(), size: 60.0, ..d });
+ set(&mut l, "transform/position", Value::Vec3([40.0, 85.0, 0.0]));
+ p.comp_mut(cid).unwrap().layers.push(l);
+ let img = crate::render_frame(&p, cid, Tick::ZERO, 1.0);
+ (img.data.iter().map(|px| px[3]).sum::(), alpha_bbox(&img).unwrap())
+ };
+ let (plain, pb) = ink(TextDoc::default());
+ let (bold, bb) = ink(TextDoc { faux_bold: true, ..Default::default() });
+ assert!(bold > plain * 1.15, "faux bold adds ink: {plain} → {bold}");
+ // 0.03 em = 1.8 px on every side.
+ let grow = (bb[2] - bb[0]) - (pb[2] - pb[0]);
+ assert!((3..=6).contains(&grow), "and widens the word by about 3.6 px: {pb:?} → {bb:?}");
+ // Bundled Inter has no Bold Italic face: the italic face is drawn with synthetic bold.
+ let (italic, _) = ink(TextDoc { style: "Italic".into(), ..Default::default() });
+ let (bold_italic, _) = ink(TextDoc { style: "Bold Italic".into(), ..Default::default() });
+ assert!(bold_italic > italic * 1.15, "Bold Italic is bolder than Italic: {italic} → {bold_italic}");
+ // A stroke follows the bold outline: as wide as before, moved out with it.
+ let stroked = TextDoc { apply_fill: false, apply_stroke: true, stroke: [1.0; 4], stroke_width: 4.0, ..Default::default() };
+ let (ring, rb) = ink(stroked.clone());
+ let (bold_ring, brb) = ink(TextDoc { faux_bold: true, ..stroked });
+ assert!(bold_ring > ring * 0.95 && bold_ring < ring * 1.3, "the stroke keeps its width: {ring} → {bold_ring}");
+ assert!(brb[0] < rb[0] && brb[2] > rb[2], "{rb:?} → {brb:?}");
+}
+
+/// #1676: under a non-uniform character Scale the bold is grown in the character's space, so it
+/// reaches further along the stretched axis; it is neither clipped nor grown evenly in a run.
+#[test]
+fn faux_bold_under_a_non_uniform_scale() {
+ use kurbo::Shape;
+ let glyph = |x0: f64| PlacedGlyph {
+ local: kurbo::Rect::new(x0, 4.0, x0 + 4.0, 16.0).to_path(0.1),
+ m: Mat4::scale(vec3(9.0, 1.0, 1.0)),
+ xf: CharXf::default(),
+ fill: [1.0; 4],
+ stroke: [0.0; 4],
+ stroke_width: 0.0,
+ bold: 2.0,
+ apply_fill: true,
+ char_index: 0,
+ rest: [0.0; 2],
+ };
+ let geom = |glyphs| TextGeom { doc: TextDoc::default(), glyphs, fill_stroke: 0, blend: BlendMode::Normal };
+ assert_eq!(runs(&geom(vec![glyph(2.0), glyph(6.0)])).len(), 2, "bold glyphs stretched unevenly are drawn one by one");
+ // x 6..10 → 54..90, grown by 2 × 9 = 18 → 36..108; y 4..16 grown by 2 → 2..18.
+ let mut img = crate::Image::new(120, 24);
+ draw_glyphs(&geom(vec![glyph(6.0)]), &mut img, &Mat3::IDENTITY, 1.0, None);
+ for (x, y) in [(37, 10), (106, 10), (70, 3)] {
+ assert!(img.get(x, y)[3] > 0.99, "bold ink at ({x}, {y}): {:?}", img.get(x, y));
+ }
+ assert!(img.get(34, 10)[3] < 0.01 && img.get(110, 10)[3] < 0.01 && img.get(70, 0)[3] < 0.01);
+}
+
/// #1011: what dragging a Range Selector bar to fraction `f` of the text writes.
#[test]
fn range_bar_drag_values() {
diff --git a/crates/script/src/prelude.js b/crates/script/src/prelude.js
index 2eeca86bf..c7f071183 100644
--- a/crates/script/src/prelude.js
+++ b/crates/script/src/prelude.js
@@ -869,8 +869,11 @@ Property.prototype.property = function () { return null; };
}
if (info.dims > 1) {
if (!(v instanceof Array)) throw __err("value must be an array of " + info.dims + " numbers");
+ // After Effects rejects an array of the wrong length instead of truncating or broadcasting it
+ // (#1936). Two values for a 3-D property stay legal, as they are in After Effects: z is 0.
+ if (v.length !== info.dims && !(info.dims === 3 && v.length === 2)) throw __err("Array is not of the correct dimension");
var o = [];
- for (var d = 0; d < info.dims; d++) o.push(d < v.length ? __num(v[d]) : (d === 2 ? 0 : __num(v[v.length - 1])));
+ for (var d = 0; d < info.dims; d++) o.push(d < v.length ? __num(v[d]) : 0);
return o;
}
if (v instanceof Array) throw __err("value must be a number, not an array");
@@ -1301,7 +1304,14 @@ AVLayer.prototype.constructor = AVLayer;
}
P.sourcePointToComp = function (p) { return pointIn(this, p, true); };
P.compPointToSource = function (p) { return pointIn(this, p, false); };
- P.replaceSource = function () { throw __err("replaceSource is not supported yet"); };
+ // Replace the layer's source item, keeping every layer property (After Effects'
+ // AVLayer.replaceSource). `fixExpressions` is accepted for compatibility: only AV sources are
+ // replaced, so the property tree and the layer's name stay and expressions keep resolving.
+ P.replaceSource = function (newSource, fixExpressions) {
+ if (!newSource || newSource.__id === undefined) throw __err("replaceSource needs a project item");
+ __call("layer.replaceSource", { comp: this.__comp, layers: [this.__id], item: newSource.__id, fixExpressions: !!fixExpressions });
+ return null;
+ };
P.openInViewer = function () { __call("layer.openLayer", this.__p1()); return null; };
})();
diff --git a/crates/script/src/scriptui.js b/crates/script/src/scriptui.js
index af1e14b5e..52c65efb6 100644
--- a/crates/script/src/scriptui.js
+++ b/crates/script/src/scriptui.js
@@ -840,7 +840,7 @@ function __uiJson(c, inherited) {
o.value = Number(c.value) || 0;
o.min = Number(c.minvalue) || 0;
o.max = Number(c.maxvalue);
- if (!(o.max === o.max)) o.max = 100;
+ if (Number.isNaN(o.max)) o.max = 100;
}
if (c.items) {
o.items = c.items.map(function (it) { return String(it.text); });
diff --git a/crates/script/src/tests.rs b/crates/script/src/tests.rs
index 6f87f7572..9777a0f43 100644
--- a/crates/script/src/tests.rs
+++ b/crates/script/src/tests.rs
@@ -963,6 +963,37 @@ fn footage_proxies_sequences_and_conform_rate() {
let _ = std::fs::remove_dir_all(&dir);
}
+/// #813: `AVLayer.replaceSource` changes the source item and keeps the layer's name, timing and
+/// properties; a folder is not a source.
+#[test]
+fn av_layer_replace_source_keeps_the_layer() {
+ let mut s = session();
+ let o = ok(
+ &mut s,
+ r#"
+ var main = app.project.items.addComp("Main", 100, 100, 1, 5, 25);
+ var layer = main.layers.addSolid([1, 0, 0], "Old", 100, 100, 1);
+ layer.transform.position.setValue([10, 20]);
+ layer.startTime = 1;
+ var nested = app.project.items.addComp("Nested", 200, 100, 1, 3, 25);
+ layer.replaceSource(nested, false);
+ [layer.source.name, layer.source.width, layer.source.height, layer.source instanceof CompItem,
+ layer.name, layer.transform.position.value[0], layer.startTime, main.numLayers]
+ "#,
+ );
+ assert_eq!(o.result, json!(["Nested", 200, 100, true, "Old", 10, 1, 1]));
+ let bad = run_code(
+ &mut s,
+ r#"
+ var main = app.project.items.addComp("Other", 100, 100, 1, 2, 25);
+ var layer = main.layers.addSolid([1, 0, 0], "Layer", 100, 100, 1);
+ layer.replaceSource(app.project.items.addFolder("F"), false);
+ "#,
+ "replace-source.jsx",
+ );
+ assert!(bad.error.as_ref().is_some_and(|e| e.message.contains("folder")), "{bad:?}");
+}
+
/// A flat green footage source, so `sampleImage` on a footage layer has known pixels.
struct Flat;
impl effectcraft_engine::render::FootageSource for Flat {
@@ -1585,3 +1616,41 @@ fn layer_property_resolves_transform_and_source_text_shortcuts() {
let (_, c) = comp_named(&s, "x");
assert_eq!(layer(c, "s").props.prop("transform/opacity").unwrap().value, KV::Scalar(25.0));
}
+
+/// #1936: an array whose length doesn't match the property's dimension is an error in After
+/// Effects, not a value to truncate or broadcast. Two values for a 3-D property stay legal.
+#[test]
+fn set_value_rejects_an_array_of_the_wrong_dimension() {
+ let mut s = session();
+ let o = ok(
+ &mut s,
+ r#"
+ var c = app.project.items.addComp("Dims", 640, 360, 1, 2, 30);
+ var l = c.layers.addSolid([1, 0, 0], "s", 640, 360, 1);
+ var ramp = l.property("ADBE Effect Parade").addProperty("ADBE Ramp").property("ADBE Ramp-0001");
+ function attempt(f) { try { f(); return "no error"; } catch (e) { return e.message; } }
+ var before = "" + ramp.value;
+ var tooMany = attempt(function () { ramp.setValue([1, 2, 3]); });
+ var tooFew = attempt(function () { ramp.setValue([1]); });
+ var untouched = "" + ramp.value;
+ ramp.setValue([7, 8]);
+ var keyed = attempt(function () { ramp.setValueAtTime(0, [1, 2, 3, 4]); });
+ // A 3-D property still takes two values, as it does in After Effects: z stays 0.
+ l.property("Position").setValue([120, 34]);
+ [tooMany, tooFew, untouched === before, "" + ramp.value, keyed, "" + l.property("Position").value]
+ "#,
+ );
+ assert_eq!(
+ o.result,
+ json!([
+ "Array is not of the correct dimension",
+ "Array is not of the correct dimension",
+ true,
+ "7,8",
+ "Array is not of the correct dimension",
+ "120,34,0"
+ ])
+ );
+ let (_, c) = comp_named(&s, "Dims");
+ assert_eq!(layer(c, "s").props.prop("transform/position").unwrap().value, KV::Vec3([120.0, 34.0, 0.0]));
+}
diff --git a/crates/segment/src/pt.rs b/crates/segment/src/pt.rs
index d85ff80ca..35ed57297 100644
--- a/crates/segment/src/pt.rs
+++ b/crates/segment/src/pt.rs
@@ -6,6 +6,15 @@
use std::collections::HashMap;
+const MAX_ARCHIVE_BYTES: usize = 1 << 30;
+const MAX_PICKLE_OPS: usize = 4_000_000;
+const MAX_TENSORS: usize = 1_000_000;
+const MAX_TENSOR_ELEMENTS: usize = 1 << 28;
+const MAX_ENTRY_BYTES: usize = 1 << 30;
+const MAX_PICKLE_NODES: usize = 4_000_000;
+const MAX_TOTAL_ELEMENTS: usize = 1 << 29;
+const MAX_TENSOR_DIMS: usize = 64;
+
/// A tensor read from a checkpoint: its shape and its values as f32 (row-major, contiguous).
#[derive(Clone, Debug, PartialEq)]
pub struct Tensor {
@@ -38,6 +47,9 @@ struct Entry {
/// The entries of a zip archive by name.
fn zip_entries(b: &[u8]) -> Result> {
+ if b.len() > MAX_ARCHIVE_BYTES {
+ return Err("checkpoint exceeds the 1024 MiB archive limit".into());
+ }
// End of central directory: the last `PK\x05\x06` (a comment may follow it).
let eocd =
(0..b.len().saturating_sub(21)).rev().find(|&i| b.get(i..i + 4) == Some(b"PK\x05\x06")).ok_or("not a zip archive (no end of central directory)")?;
@@ -96,6 +108,9 @@ fn read_entry<'a>(b: &'a [u8], e: &Entry) -> Result>
match e.method {
0 => Ok(std::borrow::Cow::Borrowed(raw)),
8 => {
+ if e.size > MAX_ENTRY_BYTES {
+ return Err("zip entry exceeds the size limit".into());
+ }
miniz_oxide::inflate::decompress_to_vec_with_limit(raw, e.size.max(1)).map(std::borrow::Cow::Owned).map_err(|e| format!("bad deflate data: {e:?}"))
}
m => Err(format!("unsupported zip compression {m}")),
@@ -142,7 +157,58 @@ fn int_list(o: &Obj) -> Option> {
}
}
+/// Nodes in `o`, stopping once the count passes `budget`.
+fn nodes(o: &Obj, budget: usize) -> usize {
+ let kids: Vec<&Obj> = match o {
+ Obj::Tuple(v) | Obj::List(v) => v.iter().collect(),
+ Obj::Dict(v) => v.iter().flat_map(|(k, x)| [k, x]).collect(),
+ _ => return 1,
+ };
+ let mut n = 1;
+ for k in kids {
+ if n > budget {
+ break;
+ }
+ n += nodes(k, budget - n);
+ }
+ n
+}
+
+fn tensor_element_count(name: &str, offset: usize, size: &[usize], stride: &[usize], values_len: usize) -> Result {
+ if size.len() != stride.len() || size.len() > MAX_TENSOR_DIMS {
+ return Err(format!("{name}: invalid tensor dimensionality"));
+ }
+ let n = size
+ .iter()
+ .try_fold(1usize, |n, &dim| n.checked_mul(dim))
+ .filter(|n| *n <= MAX_TENSOR_ELEMENTS)
+ .ok_or_else(|| format!("{name}: tensor exceeds the element limit"))?;
+ if n == 0 {
+ return Ok(0);
+ }
+ let mut max_at = offset;
+ for (&dim, &step) in size.iter().zip(stride) {
+ max_at = max_at
+ .checked_add((dim - 1).checked_mul(step).ok_or_else(|| format!("{name}: tensor stride overflow"))?)
+ .ok_or_else(|| format!("{name}: tensor offset overflow"))?;
+ }
+ if max_at >= values_len {
+ return Err(format!("{name}: data out of range"));
+ }
+ Ok(n)
+}
+
/// Run the pickle program and return its result.
+/// A memoized object, charged against the clone budget (memo reuse can otherwise grow trees exponentially).
+fn memo_get(memo: &HashMap, k: u64, cloned: &mut usize) -> Result {
+ let o = memo.get(&k).ok_or("pickle: bad memo")?;
+ *cloned = cloned.saturating_add(nodes(o, MAX_PICKLE_NODES));
+ if *cloned > MAX_PICKLE_NODES {
+ return Err("pickle exceeds the object limit".into());
+ }
+ Ok(o.clone())
+}
+
fn unpickle(p: &[u8]) -> Result {
let mut stack: Vec = Vec::new();
let mut memo: HashMap = HashMap::new();
@@ -166,7 +232,10 @@ fn unpickle(p: &[u8]) -> Result {
*i += n + 1;
Ok(s)
};
+ let mut op_count = 0usize;
+ let mut cloned = 0usize;
loop {
+ op_count = op_count.checked_add(1).filter(|n| *n <= MAX_PICKLE_OPS).ok_or("pickle exceeds the opcode limit")?;
let op = *p.get(i).ok_or("truncated pickle")?;
i += 1;
match op {
@@ -253,11 +322,11 @@ fn unpickle(p: &[u8]) -> Result {
}
b'h' => {
let k = take(&mut i, 1)?[0] as u64;
- stack.push(memo.get(&k).cloned().ok_or("pickle: bad memo")?);
+ stack.push(memo_get(&memo, k, &mut cloned)?);
}
b'j' => {
let s = take(&mut i, 4)?;
- stack.push(memo.get(&(u32::from_le_bytes([s[0], s[1], s[2], s[3]]) as u64)).cloned().ok_or("pickle: bad memo")?);
+ stack.push(memo_get(&memo, u32::from_le_bytes([s[0], s[1], s[2], s[3]]) as u64, &mut cloned)?);
}
b't' => {
let items = pop_mark(&mut stack)?;
@@ -290,9 +359,10 @@ fn unpickle(p: &[u8]) -> Result {
stack.push(match f {
Obj::Global(m, n) if m == "torch._utils" && n == "_rebuild_tensor_v2" => {
match (args.first(), args.get(1), args.get(2).and_then(int_list), args.get(3).and_then(int_list)) {
- (Some(Obj::Storage(dtype, key)), Some(Obj::Int(off)), Some(size), Some(stride)) => {
- Obj::Tensor { dtype: dtype.clone(), key: key.clone(), offset: usize::try_from(*off).unwrap_or(0), size, stride }
- }
+ (Some(Obj::Storage(dtype, key)), Some(Obj::Int(off)), Some(size), Some(stride)) => match usize::try_from(*off) {
+ Ok(offset) => Obj::Tensor { dtype: dtype.clone(), key: key.clone(), offset, size, stride },
+ Err(_) => Obj::Other,
+ },
_ => Obj::Other,
}
}
@@ -337,16 +407,24 @@ fn unpickle(p: &[u8]) -> Result {
}
}
-/// Element bytes and conversion of a storage dtype.
-fn to_f32(dtype: &str, bytes: &[u8]) -> Option> {
+/// Bytes per element of a float storage dtype.
+fn elem_size(dtype: &str) -> Option {
match dtype {
- "FloatStorage" => Some(bytes.as_chunks::<4>().0.iter().map(|c| f32::from_le_bytes([c[0], c[1], c[2], c[3]])).collect()),
- "HalfStorage" => Some(bytes.as_chunks::<2>().0.iter().map(|c| half_to_f32(u16::from_le_bytes([c[0], c[1]]))).collect()),
- "BFloat16Storage" => Some(bytes.as_chunks::<2>().0.iter().map(|c| f32::from_bits((u16::from_le_bytes([c[0], c[1]]) as u32) << 16)).collect()),
+ "FloatStorage" => Some(4),
+ "HalfStorage" | "BFloat16Storage" => Some(2),
_ => None,
}
}
+/// Element `i` of a storage (`i` must be below `bytes.len() / elem_size`).
+fn elem_f32(dtype: &str, bytes: &[u8], i: usize) -> f32 {
+ match dtype {
+ "FloatStorage" => f32::from_le_bytes([bytes[4 * i], bytes[4 * i + 1], bytes[4 * i + 2], bytes[4 * i + 3]]),
+ "HalfStorage" => half_to_f32(u16::from_le_bytes([bytes[2 * i], bytes[2 * i + 1]])),
+ _ => f32::from_bits((u16::from_le_bytes([bytes[2 * i], bytes[2 * i + 1]]) as u32) << 16),
+ }
+}
+
pub(crate) fn half_to_f32(h: u16) -> f32 {
let (s, e, m) = ((h >> 15) as u32, ((h >> 10) & 0x1f) as u32, (h & 0x3ff) as u32);
let bits = match (e, m) {
@@ -382,22 +460,42 @@ pub fn read(bytes: &[u8]) -> Result {
Some((_, Obj::Dict(inner))) => inner.clone(),
_ => dict,
};
+ if dict.len() > MAX_TENSORS {
+ return Err("checkpoint exceeds the tensor count limit".into());
+ }
let mut storages: HashMap> = HashMap::new();
let mut out = Weights::new();
+ let mut total = 0usize;
+ let mut inflated = 0usize;
for (k, v) in dict {
let (Obj::Str(name), Obj::Tensor { dtype, key, offset, size, stride }) = (k, v) else { continue };
if !storages.contains_key(&key) {
let e = entries.get(&format!("{prefix}data/{key}")).ok_or_else(|| format!("missing storage {key}"))?;
+ if e.method == 8 {
+ inflated = inflated.saturating_add(e.size);
+ if inflated > MAX_ENTRY_BYTES {
+ return Err("checkpoint exceeds the decompressed storage limit".into());
+ }
+ }
storages.insert(key.clone(), read_entry(bytes, e)?);
}
- let Some(values) = storages.get(&key).and_then(|b| to_f32(&dtype, b)) else { continue };
- let n: usize = size.iter().product();
- // Gather (any strides) into a contiguous row-major tensor.
- let mut data = Vec::with_capacity(n);
+ let (Some(esz), Some(values)) = (elem_size(&dtype), storages.get(&key)) else { continue };
+ // Check hostile stride math before allocating or indexing the backing storage.
+ let n = tensor_element_count(&name, offset, &size, &stride, values.len() / esz)?;
+ total = total.saturating_add(n);
+ if total > MAX_TOTAL_ELEMENTS {
+ return Err("checkpoint exceeds the total element limit".into());
+ }
+ let mut data = Vec::new();
+ data.try_reserve_exact(n).map_err(|_| format!("{name}: tensor allocation failed"))?;
let mut idx = vec![0usize; size.len()];
for _ in 0..n {
- let at = offset + idx.iter().zip(&stride).map(|(i, s)| i * s).sum::();
- data.push(*values.get(at).ok_or_else(|| format!("{name}: data out of range"))?);
+ let at = idx
+ .iter()
+ .zip(&stride)
+ .try_fold(offset, |at, (i, s)| i.checked_mul(*s).and_then(|v| at.checked_add(v)))
+ .ok_or_else(|| format!("{name}: tensor offset overflow"))?;
+ data.push(elem_f32(&dtype, values, at));
for d in (0..idx.len()).rev() {
idx[d] += 1;
if idx[d] < size[d] {
@@ -490,6 +588,15 @@ mod tests {
assert!(!w.contains_key("n"), "integer tensors are skipped");
}
+ #[test]
+ fn rejects_tensor_shape_overflow_and_invalid_strides() {
+ assert!(tensor_element_count("bad", 0, &[usize::MAX, 2], &[1, 1], 16).is_err());
+ assert!(tensor_element_count("bad", 0, &[2, 2], &[usize::MAX, 1], 16).is_err());
+ assert!(tensor_element_count("bad", 0, &[2, 2], &[1], 16).is_err());
+ assert!(tensor_element_count("bad", usize::MAX, &[2], &[1], 16).is_err());
+ assert_eq!(tensor_element_count("empty", 0, &[0, usize::MAX], &[0, 0], 0), Ok(0));
+ }
+
#[test]
fn damaged_files_are_errors() {
assert!(read(b"not a zip").is_err());
diff --git a/crates/svg/src/raster.rs b/crates/svg/src/raster.rs
index af59e33db..8ccfa58c7 100644
--- a/crates/svg/src/raster.rs
+++ b/crates/svg/src/raster.rs
@@ -20,12 +20,47 @@ pub fn rasterize(doc: &Doc, w: u32, h: u32, scale: f64) -> Image {
/// Rasterise `doc` with `m` mapping document pixels to image pixels.
pub fn rasterize_with(doc: &Doc, w: u32, h: u32, m: Affine) -> Image {
- let mut img = Image::new(w, h);
- draw_group(&doc.root, m, 1.0, &mut img);
+ let mut budget = SurfaceBudget { live_bytes: 0, limit_bytes: MAX_LIVE_SURFACE_BYTES };
+ let Some(mut img) = budget.image(w, h, None) else { return Image::default() };
+ draw_group(&doc.root, m, 1.0, &mut img, &mut budget);
img
}
-fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
+/// Bound the simultaneously live offscreen image surfaces created by nested groups.
+const MAX_LIVE_SURFACE_BYTES: usize = 512 * 1024 * 1024;
+
+struct SurfaceBudget {
+ live_bytes: usize,
+ limit_bytes: usize,
+}
+
+impl SurfaceBudget {
+ fn image(&mut self, width: u32, height: u32, copy: Option<&Image>) -> Option {
+ let pixels = (width as usize).checked_mul(height as usize)?;
+ let bytes = pixels.checked_mul(std::mem::size_of::<[f32; 4]>())?;
+ let new_live = self.live_bytes.checked_add(bytes)?;
+ if new_live > self.limit_bytes {
+ return None;
+ }
+ let mut data = Vec::new();
+ data.try_reserve_exact(pixels).ok()?;
+ data.resize(pixels, [0.0; 4]);
+ if let Some(source) = copy {
+ if source.width != width || source.height != height || source.data.len() != pixels {
+ return None;
+ }
+ data.copy_from_slice(&source.data);
+ }
+ self.live_bytes = new_live;
+ Some(Image { width, height, data })
+ }
+
+ fn release(&mut self, image: &Image) {
+ self.live_bytes = self.live_bytes.saturating_sub(image.data.len().saturating_mul(std::mem::size_of::<[f32; 4]>()));
+ }
+}
+
+fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image, budget: &mut SurfaceBudget) {
let m = m * g.transform;
let o = opacity * g.opacity;
if o <= 0.0 {
@@ -38,7 +73,7 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
|| g.knockout;
if !offscreen {
for c in &g.children {
- draw_node(c, m, o, dst);
+ draw_node(c, m, o, dst, budget);
}
return;
}
@@ -46,12 +81,24 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
// Draw the children on their own (isolated) or over a copy of the backdrop, keep what
// every clip path covers and the soft mask lets through, then composite with the group's
// opacity and blend mode.
- let backdrop = if g.isolated { None } else { Some(dst.clone()) };
+ let backdrop = if g.isolated { None } else { budget.image(dst.width, dst.height, Some(dst)) };
+ if !g.isolated && backdrop.is_none() {
+ return;
+ }
let mut tmp = match &backdrop {
- Some(b) => b.clone(),
- None => Image::new(dst.width, dst.height),
+ Some(b) => match budget.image(dst.width, dst.height, Some(b)) {
+ Some(image) => image,
+ None => {
+ budget.release(b);
+ return;
+ }
+ },
+ None => match budget.image(dst.width, dst.height, None) {
+ Some(image) => image,
+ None => return,
+ },
};
- draw_children(g, m, &mut tmp, backdrop.as_ref());
+ draw_children(g, m, &mut tmp, backdrop.as_ref(), budget);
if let Some(b) = &backdrop {
if only_clip {
// A non-isolated clipping group: the backdrop where the clip excludes the children.
@@ -61,12 +108,24 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
d[i] = d[i] * (1.0 - c) + t[i] * c;
}
});
+ budget.release(&tmp);
+ drop(tmp);
+ if let Some(b) = &backdrop {
+ budget.release(b);
+ }
return;
}
// Remove the backdrop's contribution (ISO 32000-1 §11.4.8): with the group's own
// alpha αg (its children alone), C = Cn + (Cn − C0)·(α0/αg − α0).
- let mut solo = Image::new(dst.width, dst.height);
- draw_children(g, m, &mut solo, None);
+ let Some(mut solo) = budget.image(dst.width, dst.height, None) else {
+ budget.release(&tmp);
+ drop(tmp);
+ if let Some(b) = &backdrop {
+ budget.release(b);
+ }
+ return;
+ };
+ draw_children(g, m, &mut solo, None, budget);
tmp.data.par_iter_mut().zip(b.data.par_iter()).zip(solo.data.par_iter()).for_each(|((t, b0), s)| {
let ag = s[3];
if ag <= 0.0 {
@@ -83,6 +142,8 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
out[3] = ag;
*t = out;
});
+ budget.release(&solo);
+ drop(solo);
}
if !g.clip.is_empty() {
let cov = clip_coverage(g, m, dst.width, dst.height);
@@ -93,8 +154,15 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
});
}
if let Some(sm) = &g.mask {
- let mut mk = Image::new(dst.width, dst.height);
- draw_group(&sm.content, m, 1.0, &mut mk);
+ let Some(mut mk) = budget.image(dst.width, dst.height, None) else {
+ budget.release(&tmp);
+ drop(tmp);
+ if let Some(b) = &backdrop {
+ budget.release(b);
+ }
+ return;
+ };
+ draw_group(&sm.content, m, 1.0, &mut mk, budget);
let bc = sm.backdrop.map(|v| v as f32);
let lum = sm.luminosity;
tmp.data.par_iter_mut().zip(mk.data.par_iter()).for_each(|(p, q)| {
@@ -110,6 +178,8 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
*v *= k;
}
});
+ budget.release(&mk);
+ drop(mk);
}
if g.blend == BlendMode::Normal {
over(dst, &tmp, o as f32);
@@ -123,6 +193,11 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
}
});
}
+ budget.release(&tmp);
+ drop(tmp);
+ if let Some(b) = &backdrop {
+ budget.release(b);
+ }
}
/// The product of a group's clip-path coverages.
@@ -142,19 +217,22 @@ fn clip_coverage(g: &Group, m: Affine, w: u32, h: u32) -> Vec {
/// Draw a group's children into `dst`. Knockout groups composite each child with the
/// group's initial backdrop (`backdrop`, or transparent) instead of with the children below:
/// where the child has shape `f`, `dst = dst·(1 − f) + child + backdrop·(f − αchild)`.
-fn draw_children(g: &Group, m: Affine, dst: &mut Image, backdrop: Option<&Image>) {
+fn draw_children(g: &Group, m: Affine, dst: &mut Image, backdrop: Option<&Image>, budget: &mut SurfaceBudget) {
if !g.knockout {
for c in &g.children {
- draw_node(c, m, 1.0, dst);
+ draw_node(c, m, 1.0, dst, budget);
}
return;
}
for c in &g.children {
- let mut ci = Image::new(dst.width, dst.height);
- draw_node(c, m, 1.0, &mut ci);
+ let Some(mut ci) = budget.image(dst.width, dst.height, None) else { return };
+ draw_node(c, m, 1.0, &mut ci, budget);
// Shape: the child drawn fully opaque (constant opacities to 1).
- let mut si = Image::new(dst.width, dst.height);
- draw_node(&opaque(c), m, 1.0, &mut si);
+ let Some(mut si) = budget.image(dst.width, dst.height, None) else {
+ budget.release(&ci);
+ return;
+ };
+ draw_node(&opaque(c), m, 1.0, &mut si, budget);
let zero = [0.0f32; 4];
dst.data.par_iter_mut().enumerate().for_each(|(i, d)| {
let (cp, f) = (ci.data[i], si.data[i][3].max(ci.data[i][3]));
@@ -166,6 +244,10 @@ fn draw_children(g: &Group, m: Affine, dst: &mut Image, backdrop: Option<&Image>
d[k] = d[k] * (1.0 - f) + cp[k] + b[k] * (f - cp[3]);
}
});
+ budget.release(&ci);
+ budget.release(&si);
+ drop(ci);
+ drop(si);
}
}
@@ -299,14 +381,15 @@ fn set_sat(c: [f32; 3], s: f32) -> [f32; 3] {
c.map(|v| (v - mn) * s / (mx - mn))
}
-fn draw_node(n: &Node, m: Affine, opacity: f64, dst: &mut Image) {
+fn draw_node(n: &Node, m: Affine, opacity: f64, dst: &mut Image, budget: &mut SurfaceBudget) {
match n {
- Node::Group(g) => draw_group(g, m, opacity, dst),
+ Node::Group(g) => draw_group(g, m, opacity, dst, budget),
Node::Shape(s) => {
if s.opacity < 1.0 && s.fill.is_some() && s.stroke.is_some() {
- let mut tmp = Image::new(dst.width, dst.height);
+ let Some(mut tmp) = budget.image(dst.width, dst.height, None) else { return };
draw_shape(s, m, 1.0, &mut tmp);
over(dst, &tmp, (opacity * s.opacity) as f32);
+ budget.release(&tmp);
} else {
draw_shape(s, m, opacity * s.opacity, dst);
}
@@ -514,12 +597,12 @@ pub(crate) fn eval_stops(stops: &[(f64, [f64; 4])], t: f64) -> [f32; 4] {
if t <= first.0 {
return first.1.map(|v| v as f32);
}
- for w in stops.windows(2) {
- let (a, b) = (w[0], w[1]);
- if t <= b.0 {
- let k = if b.0 > a.0 { (t - a.0) / (b.0 - a.0) } else { 1.0 };
- return [0, 1, 2, 3].map(|i| (a.1[i] + (b.1[i] - a.1[i]) * k) as f32);
- }
- }
- stops.last().map_or([0.0; 4], |s| s.1.map(|v| v as f32))
+ // Find the first upper stop (not the last duplicate): equal-offset segments retain the
+ // reference algorithm's exact-boundary behavior, while nearby values are interpolated from
+ // the preceding stop as before.
+ let upper = stops.partition_point(|stop| stop.0 < t);
+ let Some(b) = stops.get(upper) else { return stops.last().map_or([0.0; 4], |s| s.1.map(|v| v as f32)) };
+ let Some(a) = stops.get(upper.saturating_sub(1)) else { return first.1.map(|v| v as f32) };
+ let k = if b.0 > a.0 { (t - a.0) / (b.0 - a.0) } else { 1.0 };
+ [0, 1, 2, 3].map(|i| (a.1[i] + (b.1[i] - a.1[i]) * k) as f32)
}
diff --git a/crates/svg/src/tests.rs b/crates/svg/src/tests.rs
index 93db715c1..ee13a79f6 100644
--- a/crates/svg/src/tests.rs
+++ b/crates/svg/src/tests.rs
@@ -11,6 +11,25 @@ fn near(a: [f32; 4], b: [f32; 4], tol: f32) -> bool {
(0..4).all(|i| (a[i] - b[i]).abs() <= tol)
}
+#[test]
+fn gradient_stop_lookup_handles_duplicate_offsets() {
+ use crate::raster::eval_stops;
+ let stops = [(0.0, [0.0, 0.0, 0.0, 1.0]), (0.5, [1.0, 0.0, 0.0, 1.0]), (0.5, [0.0, 1.0, 0.0, 1.0]), (1.0, [0.0, 0.0, 1.0, 1.0])];
+ assert_eq!(eval_stops(&stops, 0.5), [1.0, 0.0, 0.0, 1.0]);
+ assert!(near(eval_stops(&stops, 0.5001), [0.0, 1.0, 0.0, 1.0], 3e-4));
+ assert_eq!(eval_stops(&stops, 0.75), [0.0, 0.5, 0.5, 1.0]);
+}
+
+#[test]
+fn raster_surface_budget_rejects_oversized_destination_before_allocation() {
+ let doc = parse(br#""#).unwrap();
+ // 16,384² RGBA-f32 pixels exceed the bounded destination-surface budget; no giant
+ // allocation should be attempted and the caller receives an empty image.
+ let img = rasterize(&doc, 16_384, 16_384, 1.0);
+ assert!(img.data.is_empty());
+ assert_eq!((img.width, img.height), (0, 0));
+}
+
#[test]
fn basic_shapes_structure() {
let d = parse(BASIC).unwrap();
diff --git a/crates/text/src/fonts.rs b/crates/text/src/fonts.rs
index aeabf1872..724fc4aaf 100644
--- a/crates/text/src/fonts.rs
+++ b/crates/text/src/fonts.rs
@@ -633,6 +633,8 @@ enum FallbackScript {
/// Sinhala (one family covers them all on Windows; elsewhere each has its own).
Indic,
Thai,
+ /// Georgian: Mkhedruli, Asomtavruli and Nuskhuri, and Mtavruli capitals.
+ Georgian,
Other,
}
@@ -661,6 +663,7 @@ fn script_of(c: char) -> FallbackScript {
0x0590..=0x05FF | 0xFB1D..=0xFB4F => FallbackScript::Hebrew,
0x0900..=0x0DFF | 0xA8E0..=0xA8FF => FallbackScript::Indic,
0x0E00..=0x0E7F => FallbackScript::Thai,
+ 0x10A0..=0x10FF | 0x1C90..=0x1CBF | 0x2D00..=0x2D2F => FallbackScript::Georgian,
_ => FallbackScript::Other,
}
}
@@ -726,6 +729,7 @@ const INDIC_FAMILIES: &[&str] = &[
"Noto Sans Sinhala",
];
const THAI_FAMILIES: &[&str] = &["Leelawadee UI", "Tahoma", "Thonburi", "Noto Sans Thai", "Noto Sans Thai UI", "Loma", "Garuda"];
+const GEORGIAN_FAMILIES: &[&str] = &["Sylfaen", ".SF Georgian", "SF Georgian", "Noto Sans Georgian", "DejaVu Sans"];
/// The CJK locale the host asked fallbacks to prefer, when it has one (see [`set_cjk_locale`]).
static REQUESTED_CJK_LOCALE: RwLock> = RwLock::new(None);
@@ -753,14 +757,48 @@ fn requested_cjk_locale() -> Option {
/// The CJK locale to use: [`set_cjk_locale`] when the host asked for one, otherwise the locale
/// environment (`LANG`, `LC_ALL`, `LC_CTYPE`; `EFFECTCRAFT_CJK_LOCALE` overrides them).
fn active_cjk_locale() -> String {
- requested_cjk_locale().unwrap_or_else(|| {
- ["EFFECTCRAFT_CJK_LOCALE", "LC_ALL", "LC_CTYPE", "LANG"]
- .iter()
- .filter_map(|k| std::env::var(k).ok())
- .map(|v| v.trim().to_ascii_lowercase())
- .find(|v| !v.is_empty() && v != "c" && v != "posix")
- .unwrap_or_default()
- })
+ requested_cjk_locale().unwrap_or_else(environment_cjk_locale)
+}
+
+/// Read the environment independently of another UI's process-wide language request.
+fn environment_cjk_locale() -> String {
+ ["EFFECTCRAFT_CJK_LOCALE", "LC_ALL", "LC_CTYPE", "LANG"]
+ .iter()
+ .filter_map(|k| std::env::var(k).ok())
+ .map(|v| v.trim().to_ascii_lowercase())
+ .find(|v| !v.is_empty() && v != "c" && v != "posix")
+ .unwrap_or_default()
+}
+
+/// The four distinct fallback policies, rather than unbounded user-supplied locale cache keys.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+enum CjkLocale {
+ Japanese,
+ Korean,
+ Simplified,
+ Traditional,
+}
+
+impl CjkLocale {
+ fn from_tag(tag: &str) -> Self {
+ let tag = tag.trim().to_ascii_lowercase();
+ if tag.starts_with("zh") {
+ if asks_traditional_chinese(&tag) { Self::Traditional } else { Self::Simplified }
+ } else if tag.starts_with("ko") {
+ Self::Korean
+ } else {
+ Self::Japanese
+ }
+ }
+
+ fn tag(self) -> &'static str {
+ match self {
+ Self::Japanese => "ja",
+ Self::Korean => "ko",
+ Self::Simplified => "zh-hans",
+ Self::Traditional => "zh-hant",
+ }
+ }
}
/// The CJK language to try first for Han ideographs. Japanese when nothing says otherwise: the
@@ -778,6 +816,7 @@ fn han_order_for(tag: &str) -> [FallbackScript; 3] {
}
/// The order for the locale in force ([`active_cjk_locale`]).
+#[cfg(test)]
fn han_order() -> [FallbackScript; 3] {
han_order_for(&active_cjk_locale())
}
@@ -796,20 +835,16 @@ fn chinese_families_for(tag: &str) -> &'static [&'static str] {
if asks_traditional_chinese(tag) { TRADITIONAL_CHINESE_FAMILIES } else { SIMPLIFIED_CHINESE_FAMILIES }
}
-/// [`chinese_families_for`] for the locale in force ([`active_cjk_locale`]).
-fn chinese_families() -> &'static [&'static str] {
- chinese_families_for(&active_cjk_locale())
-}
-
-fn families_for(s: FallbackScript) -> &'static [&'static str] {
+fn families_for(s: FallbackScript, locale: CjkLocale) -> &'static [&'static str] {
match s {
FallbackScript::Japanese => JAPANESE_FAMILIES,
- FallbackScript::Han => chinese_families(),
+ FallbackScript::Han => chinese_families_for(locale.tag()),
FallbackScript::Korean => KOREAN_FAMILIES,
FallbackScript::Arabic => ARABIC_FAMILIES,
FallbackScript::Hebrew => HEBREW_FAMILIES,
FallbackScript::Indic => INDIC_FAMILIES,
FallbackScript::Thai => THAI_FAMILIES,
+ FallbackScript::Georgian => GEORGIAN_FAMILIES,
FallbackScript::Other => &[],
}
}
@@ -881,9 +916,10 @@ fn fallback_cache() -> &'static RwLock &'static RwLock>>> {
- static CACHE: OnceLock>>>> = OnceLock::new();
+/// The results of [`family_faces`], per script, preferred face and captured language policy.
+/// A lookup that finishes after a language change cannot populate another language's entry.
+fn family_faces_cache() -> &'static RwLock>>> {
+ static CACHE: OnceLock>>>> = OnceLock::new();
CACHE.get_or_init(Default::default)
}
@@ -893,6 +929,27 @@ fn family_faces_cache() -> &'static RwLock FaceId {
+ fallback_with_locale(c, prefer, || CjkLocale::from_tag(&active_cjk_locale()))
+}
+
+/// Choose a fallback for an explicit interface language, independent of concurrent global
+/// language changes. Empty, `c` and `posix` use the OS environment rather than the global request.
+pub fn fallback_for_locale(c: char, prefer: FaceId, tag: &str) -> FaceId {
+ let tag = tag.trim();
+ let locale = || {
+ if tag.is_empty() || tag.eq_ignore_ascii_case("c") || tag.eq_ignore_ascii_case("posix") {
+ CjkLocale::from_tag(&environment_cjk_locale())
+ } else {
+ CjkLocale::from_tag(tag)
+ }
+ };
+ fallback_with_locale(c, prefer, locale)
+}
+
+/// Keep a single language snapshot through the family-order lookup and cache insertion. `locale`
+/// is read only for a script with usual families: reading it takes a lock and may consult the
+/// environment, and layout asks for a fallback for every character.
+fn fallback_with_locale(c: char, prefer: FaceId, locale: impl FnOnce() -> CjkLocale) -> FaceId {
let p = face(prefer);
if p.has_char(c) || c.is_control() {
return prefer;
@@ -913,7 +970,7 @@ pub fn fallback_for(c: char, prefer: FaceId) -> FaceId {
if cfg!(not(target_arch = "wasm32")) && !system_scanned() {
scan_system();
}
- if let Some(&id) = family_faces(script, &p).iter().find(|&&id| face(id).has_char(c)) {
+ if let Some(&id) = family_faces(script, &p, locale()).iter().find(|&&id| face(id).has_char(c)) {
return id;
}
}
@@ -942,23 +999,24 @@ pub fn fallback_for(c: char, prefer: FaceId) -> FaceId {
/// The script-aware part of [`fallback_for`]: the installed faces of the platform's usual families
/// for `script`, in the order they are tried, each in the style of `prefer`. For CJK, the other CJK
/// languages' families follow in the locale's order.
-fn family_faces(script: FallbackScript, prefer: &Face) -> Arc> {
- if let Some(faces) = family_faces_cache().read().unwrap_or_else(|e| e.into_inner()).get(&(script, prefer.id)) {
+fn family_faces(script: FallbackScript, prefer: &Face, locale: CjkLocale) -> Arc> {
+ if let Some(faces) = family_faces_cache().read().unwrap_or_else(|e| e.into_inner()).get(&(script, prefer.id, locale)) {
return faces.clone();
}
let order: Vec = match script {
FallbackScript::Other => vec![],
- FallbackScript::Han => han_order().to_vec(),
+ FallbackScript::Han => han_order_for(locale.tag()).to_vec(),
s if s.is_cjk() => {
let mut v = vec![s];
- v.extend(han_order().iter().copied().filter(|o| *o != s));
+ v.extend(han_order_for(locale.tag()).iter().copied().filter(|o| *o != s));
v
}
s => vec![s],
};
let style = &prefer.info.style;
- let faces: Arc> = Arc::new(order.into_iter().flat_map(families_for).filter_map(|fam| resolve_in(fam, style)).map(|r| r.face).collect());
- family_faces_cache().write().unwrap_or_else(|e| e.into_inner()).insert((script, prefer.id), faces.clone());
+ let faces: Arc> =
+ Arc::new(order.into_iter().flat_map(|s| families_for(s, locale)).filter_map(|fam| resolve_in(fam, style)).map(|r| r.face).collect());
+ family_faces_cache().write().unwrap_or_else(|e| e.into_inner()).insert((script, prefer.id, locale), faces.clone());
faces
}
@@ -975,6 +1033,77 @@ fn system_fallback(c: char, style: &str) -> Option {
mod tests {
use super::*;
+ /// Concurrent language requests must neither choose another context's font nor reuse its
+ /// cached family order. Synthetic fonts in a child process keep this independent of the host
+ /// font installation and of other tests that exercise the process-global database/locale.
+ #[test]
+ #[cfg(not(target_arch = "wasm32"))]
+ fn cjk_requests_keep_their_language_and_cache_entries() {
+ const CHILD: &str = "EFFECTCRAFT_TEST_ISOLATED_CJK";
+ if std::env::var_os(CHILD).is_none() {
+ let output = std::process::Command::new(std::env::current_exe().unwrap())
+ .args(["--exact", "fonts::tests::cjk_requests_keep_their_language_and_cache_entries", "--nocapture"])
+ .env(CHILD, "1")
+ .output()
+ .unwrap();
+ assert!(output.status.success(), "{}\n{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
+ return;
+ }
+ let families = [("ja", "Yu Gothic"), ("zh-hans", "Microsoft YaHei"), ("zh-hant", "Microsoft JhengHei"), ("ko", "Malgun Gothic")];
+ let mut expected = Vec::new();
+ {
+ let mut d = db().write().unwrap();
+ d.scanned = true; // This test process uses only bundled and synthetic fonts.
+ for (language, family) in families {
+ let mut data = test_font(family);
+ let table = data[12..12 + 8 * 16].as_chunks::<16>().0.iter().find(|t| &t[..4] == b"cmap").unwrap();
+ let cmap = u32::from_be_bytes(table[8..12].try_into().unwrap()) as usize + 12;
+ // Map 页 to the fixture's triangle glyph instead of its private-use range.
+ // All four fonts cover the probe, so coverage cannot choose the right language.
+ for (offset, value) in [(16, '页' as u16), (24, '页' as u16), (30, 2u16.wrapping_sub('页' as u16))] {
+ data[cmap + offset..cmap + offset + 2].copy_from_slice(&value.to_be_bytes());
+ }
+ let data = Arc::new(data);
+ let names = read_faces_bytes(&data).into_iter().next().unwrap();
+ let id = push(&mut d, info_from(names, FaceData::Shared(data), "test"));
+ expected.push((language, id));
+ }
+ }
+ let base = resolve("Inter", "Regular").face;
+ for &(_, id) in &expected {
+ assert!(face(id).has_char('页'));
+ }
+ // Force the original interleaving: Chinese starts, then Japanese replaces the global
+ // language before Chinese looks up its probe. The explicit request must still win.
+ set_cjk_locale("zh-hans");
+ set_cjk_locale("ja");
+ assert_eq!(fallback_for('页', base), expected[0].1);
+ assert_eq!(fallback_for_locale('页', base, "zh-hans"), expected[1].1);
+ // Do not clear the cache here: different policies must coexist in the same cache.
+ for _ in 0..3 {
+ for &(language, id) in &expected {
+ assert_eq!(fallback_for_locale('页', base, language), id, "{language}");
+ }
+ }
+ let barrier = Arc::new(std::sync::Barrier::new(expected.len()));
+ let threads: Vec<_> = expected
+ .into_iter()
+ .map(|(language, id)| {
+ let barrier = barrier.clone();
+ std::thread::spawn(move || {
+ barrier.wait();
+ for _ in 0..128 {
+ set_cjk_locale(if language == "ja" { "zh-hans" } else { "ja" });
+ assert_eq!(fallback_for_locale('页', base, language), id, "{language}");
+ }
+ })
+ })
+ .collect();
+ for thread in threads {
+ thread.join().unwrap();
+ }
+ }
+
#[test]
fn extra_font_dirs_come_from_a_path_list() {
assert!(extra_dirs(None).is_empty());
@@ -1122,6 +1251,8 @@ mod tests {
assert_eq!(script_of('क'), FallbackScript::Indic);
assert_eq!(script_of('த'), FallbackScript::Indic);
assert_eq!(script_of('ก'), FallbackScript::Thai);
+ assert_eq!(script_of('ა'), FallbackScript::Georgian);
+ assert_eq!(script_of('\u{1c90}'), FallbackScript::Georgian, "Mtavruli");
assert_eq!(script_of('\u{feff}'), FallbackScript::Other, "the byte order mark is no Arabic letter");
}
@@ -1145,6 +1276,22 @@ mod tests {
}
}
+ /// Native: Mkhedruli in a Latin-only family falls back to a family from the Georgian list,
+ /// ahead of faces already loaded and of the scan order. Skipped where no family from the list
+ /// is installed.
+ #[test]
+ fn georgian_falls_back_to_a_georgian_system_family() {
+ scan_system();
+ let c = 'ა';
+ if !GEORGIAN_FAMILIES.iter().any(|n| resolve_in(n, "Regular").is_some_and(|r| face(r.face).has_char(c))) {
+ eprintln!("no Georgian family from the list is installed; skipping");
+ return;
+ }
+ let f = face(fallback_for(c, resolve("Inter", "Regular").face));
+ assert!(f.has_char(c), "{} lacks it", f.info.family);
+ assert!(GEORGIAN_FAMILIES.iter().any(|n| f.info.family.eq_ignore_ascii_case(n)), "{c} → {}", f.info.family);
+ }
+
/// Native: Japanese text in a Latin-only family falls back to an installed Japanese family
/// (whichever the platform ships) instead of the missing-glyph box, without any layer having
/// loaded a CJK font first. Skipped where no family from the list is installed.
@@ -1302,11 +1449,35 @@ mod tests {
assert!(!TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains(" SC") || f.contains("YaHei") || f.contains("WenQuanYi")));
assert!(TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains("Heiti TC") || f.contains("Hiragino Sans CNS")));
// The arm the fallback itself walks: Han hands over the list the locale's script picked.
- assert_eq!(families_for(FallbackScript::Han), chinese_families_for(&active_cjk_locale()));
+ assert_eq!(families_for(FallbackScript::Han, CjkLocale::from_tag(&active_cjk_locale())), chinese_families_for(&active_cjk_locale()));
// Han text is the only thing these lists serve; the Japanese order does not change.
assert_eq!(han_order_for("ja_JP.UTF-8")[0], FallbackScript::Japanese);
}
+ #[test]
+ fn the_rendered_order_keeps_the_print_face_first() {
+ // A composed frame renders with these lists, so they keep the platform's print order: the
+ // interface prefers the platform's UI faces on its own (see `install_script_fallbacks` in
+ // the ui crate), and an existing project must not render differently because a window's
+ // chrome changed.
+ let pos = |list: &[&str], name: &str| list.iter().position(|f| *f == name).unwrap_or(usize::MAX);
+ assert!(
+ pos(JAPANESE_FAMILIES, "Yu Gothic") < pos(JAPANESE_FAMILIES, "Yu Gothic UI"),
+ "the print face must come before its UI sibling: {JAPANESE_FAMILIES:?}"
+ );
+ for name in ["Meiryo UI", "MS UI Gothic"] {
+ assert!(!JAPANESE_FAMILIES.contains(&name), "{name} belongs to the interface order, not this list");
+ }
+ assert_eq!(SIMPLIFIED_CHINESE_FAMILIES[0], "Microsoft YaHei");
+ assert_eq!(TRADITIONAL_CHINESE_FAMILIES[0], "Microsoft JhengHei");
+ for name in ["Microsoft YaHei UI", "Microsoft JhengHei UI", "PMingLiU"] {
+ assert!(
+ !SIMPLIFIED_CHINESE_FAMILIES.contains(&name) && !TRADITIONAL_CHINESE_FAMILIES.contains(&name),
+ "{name} belongs to the interface order, not these lists"
+ );
+ }
+ }
+
#[test]
fn bundled_ui_fonts_cover_the_ukrainian_alphabet() {
const ALPHABET: &str = "АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя’«»";
diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs
index 2e863d1ae..7ca5bd13a 100644
--- a/crates/text/src/layout.rs
+++ b/crates/text/src/layout.rs
@@ -597,7 +597,15 @@ fn run_at(runs: &[(Range, TextStyle)], b: usize) -> usize {
}
/// Lay out one paragraph (no newlines) whose text starts at byte `base` of the whole string.
-fn paragraph(text: &str, base: usize, runs: &[(Range, TextStyle)], primaries: &[Resolved], para: &ParagraphStyle, width: Option) -> Vec {
+fn paragraph(
+ text: &str,
+ base: usize,
+ runs: &[(Range, TextStyle)],
+ primaries: &[Resolved],
+ variation_ids: &[u32],
+ para: &ParagraphStyle,
+ width: Option,
+) -> Vec {
let rtl_para = para.rtl == Some(true);
let margins_for = |first: bool| -> (f32, f32) {
let fi = if first { para.indent_first } else { 0.0 };
@@ -702,18 +710,26 @@ fn paragraph(text: &str, base: usize, runs: &[(Range, TextStyle)], primar
char_adv[g.cluster.min(text.len())] += g.adv + g.pre;
}
}
- let range_w = |r: Range| -> f32 { char_adv[r].iter().sum() };
- let trailing_ws = |r: &Range| -> (usize, f32) {
- let mut end = r.end;
- let mut w = 0.0;
- for (b, c) in text[r.clone()].char_indices().rev() {
- if !c.is_whitespace() {
- break;
- }
- end = r.start + b;
- w += char_adv[r.start + b];
+ // Prefix widths and the preceding non-whitespace boundary make candidate line widths O(1).
+ // Every-line composition evaluates O(n²) candidate breaks; summing each candidate's bytes
+ // or rescanning its trailing whitespace would otherwise add another factor of text length.
+ let mut prefix_adv = vec![0.0f64; text.len() + 1];
+ for i in 0..text.len() {
+ prefix_adv[i + 1] = prefix_adv[i] + f64::from(char_adv[i]);
+ }
+ let mut previous_non_ws = vec![0usize; text.len() + 1];
+ let mut non_ws_end = 0usize;
+ for (b, c) in text.char_indices() {
+ previous_non_ws[b] = non_ws_end;
+ if !c.is_whitespace() {
+ non_ws_end = b + c.len_utf8();
}
- (end, w)
+ previous_non_ws[b + c.len_utf8()] = non_ws_end;
+ }
+ let range_w = |r: Range| -> f32 { (prefix_adv[r.end] - prefix_adv[r.start]) as f32 };
+ let trailing_ws = |r: &Range| -> (usize, f32) {
+ let end = previous_non_ws[r.end].max(r.start).min(r.end);
+ (end, (prefix_adv[r.end] - prefix_adv[end]) as f32)
};
// Hanging punctuation widths (left, right) of a line's content.
let hang_of = |r: &Range, ce: usize| -> (f32, f32) {
@@ -824,7 +840,10 @@ fn paragraph(text: &str, base: usize, runs: &[(Range, TextStyle)], primar
let mut underline: Option<(f32, f32)> = None;
for run in vruns {
let rtl = levels[run.start].is_rtl();
- let mut idx: Vec = (0..items.len()).filter(|&k| items[k].range.start < run.end && items[k].range.end > run.start).collect();
+ // Items are ordered and disjoint: binary-search both ends of the overlapping slice.
+ let run_limit = items.partition_point(|item| item.range.start < run.end);
+ let run_first = items[..run_limit].partition_point(|item| item.range.end <= run.start);
+ let mut idx: Vec = (run_first..run_limit).collect();
if rtl {
idx.reverse();
}
@@ -845,7 +864,7 @@ fn paragraph(text: &str, base: usize, runs: &[(Range, TextStyle)], primar
h_scale: st.h_scale,
v_scale: st.v_scale,
run: g.run,
- variations: crate::variable::intern(&st.variations),
+ variations: variation_ids[g.run],
});
pen += g.adv;
if space_extra > 0.0 && text[g.cluster..].starts_with(' ') && g.cluster < ce {
@@ -862,18 +881,25 @@ fn paragraph(text: &str, base: usize, runs: &[(Range, TextStyle)], primar
}
}
}
- // caret stops for each char boundary in the line
+ // Caret stops for each char boundary in the line.
let mut carets = Vec::new();
let mut cluster_starts: Vec = extents.keys().copied().collect();
cluster_starts.sort_unstable();
let char_bytes: Vec = text[r.clone()].char_indices().map(|(b, _)| r.start + b).collect();
+ let mut char_index = 0usize;
for (ci, &cs) in cluster_starts.iter().enumerate() {
let (x0, x1, rtl) = extents[&cs];
let next = cluster_starts.get(ci + 1).copied().unwrap_or(r.end);
- let members: Vec = char_bytes.iter().copied().filter(|b| *b >= cs && *b < next).collect();
- let n = members.len().max(1) as f32;
- for (mi, b) in members.iter().enumerate() {
- let f = mi as f32 / n;
+ while char_index < char_bytes.len() && char_bytes[char_index] < cs {
+ char_index += 1;
+ }
+ let begin = char_index;
+ while char_index < char_bytes.len() && char_bytes[char_index] < next {
+ char_index += 1;
+ }
+ let count = (char_index - begin).max(1) as f32;
+ for (mi, b) in char_bytes[begin..char_index].iter().enumerate() {
+ let f = mi as f32 / count;
let x = if rtl { x1 - (x1 - x0) * f } else { x0 + (x1 - x0) * f };
carets.push((base + b, x));
}
@@ -900,7 +926,9 @@ fn paragraph(text: &str, base: usize, runs: &[(Range, TextStyle)], primar
carets.dedup_by_key(|c| c.0);
// Line metrics: the tallest face and the largest leading on the line.
let (mut asc, mut desc, mut adv) = (0.0f32, 0.0f32, 0.0f32);
- let mut seen: Vec = chars.iter().filter(|c| c.0 >= r.start && c.0 < r.end).map(|c| c.6).collect();
+ let char_start = chars.partition_point(|c| c.0 < r.start);
+ let char_end = chars.partition_point(|c| c.0 < r.end);
+ let mut seen: Vec = chars[char_start..char_end].iter().map(|c| c.6).collect();
seen.sort_unstable();
seen.dedup();
if seen.is_empty() {
@@ -945,10 +973,17 @@ pub fn layout_uncached(text: &str, style: &TextStyle, para: &ParagraphStyle) ->
layout_rich_uncached(text, &[(0..text.len(), style.clone())], std::slice::from_ref(para))
}
+/// Maximum input size processed by one layout request. Above this, return an empty layout
+/// retaining the source length, so untrusted text cannot fan out into unbounded shaped data.
+const MAX_LAYOUT_BYTES: usize = 1 << 20;
+
/// Lay out `text` with character style runs (byte ranges covering the text, in order; at least
/// one) and paragraph settings (one per CR/LF/CRLF-separated paragraph; the last repeats). The wrap
/// width is the first paragraph's.
pub fn layout_rich_uncached(text: &str, runs: &[(Range, TextStyle)], paras: &[ParagraphStyle]) -> Layout {
+ if text.len() > MAX_LAYOUT_BYTES || runs.len() > MAX_LAYOUT_BYTES || paras.len() > MAX_LAYOUT_BYTES {
+ return Layout { text_len: text.len(), ..Default::default() };
+ }
let fallback = [(0..text.len(), TextStyle::default())];
let runs = if runs.is_empty() { &fallback[..] } else { runs };
let default_para = ParagraphStyle::default();
@@ -975,11 +1010,29 @@ pub fn layout_rich_uncached(text: &str, runs: &[(Range, TextStyle)], para
} else {
runs
};
+ // A location that cannot be interned would outline at the default; shape there too.
+ let cleared: Vec<(Range, TextStyle)>;
+ let runs = if runs.iter().any(|(_, s)| !s.variations.is_empty() && crate::variable::intern(&s.variations) == 0) {
+ cleared = runs
+ .iter()
+ .map(|(r, s)| {
+ let mut s = s.clone();
+ if crate::variable::intern(&s.variations) == 0 {
+ s.variations.clear();
+ }
+ (r.clone(), s)
+ })
+ .collect();
+ &cleared[..]
+ } else {
+ runs
+ };
+ let variation_ids: Vec = runs.iter().map(|(_, s)| crate::variable::intern(&s.variations)).collect();
let mut lay = Layout { missing_font: primaries.iter().any(|p| p.missing), text_len: text.len(), ..Default::default() };
let mut plines: Vec<(usize, ParaLine)> = Vec::new();
for (pi, span) in paragraph_ranges(text).enumerate() {
let p = text.get(span.bytes.clone()).unwrap_or_default();
- plines.extend(paragraph(p, span.bytes.start, runs, &primaries, para_at(pi), width).into_iter().map(|l| (pi, l)));
+ plines.extend(paragraph(p, span.bytes.start, runs, &primaries, &variation_ids, para_at(pi), width).into_iter().map(|l| (pi, l)));
}
let mut baseline = 0.0f32;
for (i, (pi, pl)) in plines.into_iter().enumerate() {
@@ -1060,6 +1113,9 @@ pub fn layout(text: &str, style: &TextStyle, para: &ParagraphStyle) -> Arc, TextStyle)], paras: &[ParagraphStyle]) -> Arc {
+ if text.len() > MAX_LAYOUT_BYTES || runs.len() > MAX_LAYOUT_BYTES || paras.len() > MAX_LAYOUT_BYTES {
+ return Arc::new(layout_rich_uncached(text, runs, paras));
+ }
let mut h = std::collections::hash_map::DefaultHasher::new();
text.hash(&mut h);
runs.hash(&mut h);
@@ -1415,6 +1471,15 @@ mod tests {
assert!(r.lines[0].x + r.lines[0].width > 401.0, "closing quote hangs right");
}
+ #[test]
+ fn oversized_layout_requests_are_bounded_without_caching() {
+ let text = "a".repeat(MAX_LAYOUT_BYTES + 1);
+ let layout = layout(&text, &TextStyle::default(), &ParagraphStyle::default());
+ assert_eq!(layout.text_len, text.len());
+ assert!(layout.lines.is_empty() && layout.glyphs.is_empty());
+ assert!(layout_rich_uncached("ok", &[], &[]).lines.len() == 1);
+ }
+
#[test]
fn rtl_paragraph_carets_run_right_to_left() {
let text = "\u{5d0}\u{5d1}\u{5d2}";
diff --git a/crates/text/src/sfnt.rs b/crates/text/src/sfnt.rs
index 753bbdd2c..a5e3907ce 100644
--- a/crates/text/src/sfnt.rs
+++ b/crates/text/src/sfnt.rs
@@ -201,13 +201,21 @@ fn native_name(b: &[u8], id: u16) -> Option {
let count = be16(b, 2)? as usize;
let storage = be16(b, 4)? as usize;
for i in 0..count {
- let r = 6 + i * 12;
- let (plat, enc, lang, nid, len, off) =
- (be16(b, r)?, be16(b, r + 2)?, be16(b, r + 4)?, be16(b, r + 6)?, be16(b, r + 8)? as usize, be16(b, r + 10)? as usize);
+ let r = 6usize.checked_add(i.checked_mul(12)?)?;
+ let (plat, enc, lang, nid, len, off) = (
+ be16(b, r)?,
+ be16(b, r.checked_add(2)?)?,
+ be16(b, r.checked_add(4)?)?,
+ be16(b, r.checked_add(6)?)?,
+ be16(b, r.checked_add(8)?)? as usize,
+ be16(b, r.checked_add(10)?)? as usize,
+ );
if nid != id || plat != 3 || !(enc == 1 || enc == 10) || lang == 0x409 {
continue;
}
- let raw = b.get(storage + off..storage + off + len)?;
+ let start = storage.checked_add(off)?;
+ let end = start.checked_add(len)?;
+ let raw = b.get(start..end)?;
let u: Vec = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
let s = String::from_utf16_lossy(&u);
if !s.trim().is_empty() {
@@ -221,32 +229,45 @@ fn native_name(b: &[u8], id: u16) -> Option {
fn name_string(b: &[u8], id: u16) -> Option {
let count = be16(b, 2)? as usize;
let storage = be16(b, 4)? as usize;
- let mut best: Option<(u8, String)> = None;
+ let mut cands: Vec<(u8, u16, u16, &[u8])> = Vec::new();
for i in 0..count {
- let r = 6 + i * 12;
+ let r = 6usize.checked_add(i.checked_mul(12)?)?;
let (plat, enc, lang, nid, len, off) =
(be16(b, r)?, be16(b, r + 2)?, be16(b, r + 4)?, be16(b, r + 6)?, be16(b, r + 8)? as usize, be16(b, r + 10)? as usize);
if nid != id {
continue;
}
- let raw = b.get(storage + off..storage + off + len)?;
- let (rank, s) = match plat {
+ let start = storage.checked_add(off)?;
+ let end = start.checked_add(len)?;
+ let raw = b.get(start..end)?;
+ let rank = match plat {
3 if enc == 1 || enc == 10 => {
- let u: Vec = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
- (if lang == 0x409 { 0 } else { 1 }, String::from_utf16_lossy(&u))
+ if lang == 0x409 {
+ 0
+ } else {
+ 1
+ }
}
- 0 => {
- let u: Vec = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
- (2, String::from_utf16_lossy(&u))
- }
- 1 if enc == 0 => (3, raw.iter().map(|&c| if c < 128 { c as char } else { '?' }).collect()),
+ 0 => 2,
+ 1 if enc == 0 => 3,
_ => continue,
};
- if best.as_ref().is_none_or(|(r0, _)| rank < *r0) {
- best = Some((rank, s));
- }
+ cands.push((rank, plat, enc, raw));
}
- best.map(|(_, s)| s).filter(|s| !s.trim().is_empty())
+ // Best rank first; a blank record falls through to the next. Decoding is lazy, so aliased
+ // records are not decoded once a usable one is found.
+ cands.sort_by_key(|c| c.0);
+ cands.into_iter().find_map(|(_, plat, enc, raw)| {
+ let s = match (plat, enc) {
+ (3, 1 | 10) | (0, _) => {
+ let u: Vec = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
+ String::from_utf16_lossy(&u)
+ }
+ (1, 0) => raw.iter().map(|&c| if c < 128 { c as char } else { '?' }).collect(),
+ _ => return None,
+ };
+ (!s.trim().is_empty()).then_some(s)
+ })
}
/// Synthetic font files for tests: just `name` and `fvar`, enough for the scan and the resolver.
@@ -367,6 +388,28 @@ mod tests {
/// The scan marks a face with an `fvar` table that declares axes as variable, reading only
/// the table directory and the fvar header; a static font, an fvar without axes and a
/// truncated fvar are not.
+ #[test]
+ fn name_table_offsets_are_checked_and_duplicate_records_do_not_repeat_decode() {
+ let valid = names_font("Name Bounds", None);
+ let mut invalid = valid.clone();
+ // name record storage offset near u16::MAX must be rejected rather than overflowing
+ // when combined with its length (the name table starts at byte 28 in this fixture).
+ invalid[28 + 6 + 10] = 0xFF;
+ invalid[28 + 6 + 11] = 0xFF;
+ assert!(read_faces_bytes(&invalid).is_empty());
+
+ // Repeated aliases for one id retain the same selected name and do not change the face.
+ let mut duplicated = valid;
+ let count = u16::from_be_bytes([duplicated[28 + 2], duplicated[28 + 3]]);
+ let first = duplicated[28 + 6..28 + 18].to_vec();
+ for i in 1..count as usize {
+ duplicated[28 + 6 + i * 12..28 + 18 + i * 12].copy_from_slice(&first);
+ }
+ let faces = read_faces_bytes(&duplicated);
+ assert_eq!(faces.len(), 1);
+ assert_eq!((faces[0].family.as_str(), faces[0].style.as_str()), ("Name Bounds", "Regular"));
+ }
+
#[test]
fn detects_variable_faces_from_fvar() {
let v = read_faces_bytes(&names_font("Var Test", Some(Some(1))));
diff --git a/crates/text/src/variable.rs b/crates/text/src/variable.rs
index fc9d7ab42..bf4fde39e 100644
--- a/crates/text/src/variable.rs
+++ b/crates/text/src/variable.rs
@@ -4,6 +4,19 @@
use std::collections::HashMap;
use std::sync::{Arc, Mutex, OnceLock};
+/// Keep process-wide variation storage bounded; id 0 is the safe default location when full.
+const MAX_INTERNED_LOCATIONS: usize = 8192;
+const MAX_AXES_PER_LOCATION: usize = 32;
+const MAX_AXIS_TAG_BYTES: usize = 16;
+
+type CoordKey = Vec<(String, u32)>;
+
+#[derive(Default)]
+struct Table {
+ values: Vec>>,
+ by_coords: HashMap,
+}
+
use kurbo::BezPath;
use skrifa::instance::{LocationRef, Size};
use skrifa::outline::DrawSettings;
@@ -14,15 +27,27 @@ use crate::{CharGlyph, Pen};
/// Intern a set of axis values (0 for none), so `Copy` glyphs can carry them.
pub fn intern(coords: &[(String, f32)]) -> u32 {
- if coords.is_empty() {
+ if coords.is_empty() || coords.len() > MAX_AXES_PER_LOCATION || coords.iter().any(|(tag, v)| tag.len() > MAX_AXIS_TAG_BYTES || !v.is_finite()) {
+ return 0;
+ }
+ // Axis order is not significant. Canonicalize it once so equivalent locations share one key.
+ let mut key: CoordKey = coords.iter().map(|(tag, v)| (tag.clone(), if *v == 0.0 { 0 } else { v.to_bits() })).collect();
+ key.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+ if key.windows(2).any(|w| w[0].0 == w[1].0) {
return 0;
}
let mut t = table().lock().unwrap_or_else(|e| e.into_inner());
- if let Some(i) = t.iter().position(|c| c.as_slice() == coords) {
- return i as u32 + 1;
+ if let Some(id) = t.by_coords.get(&key) {
+ return *id;
}
- t.push(Arc::new(coords.to_vec()));
- t.len() as u32
+ if t.values.len() >= MAX_INTERNED_LOCATIONS {
+ return 0;
+ }
+ let Some(id) = u32::try_from(t.values.len()).ok().and_then(|n| n.checked_add(1)) else { return 0 };
+ let value = Arc::new(key.iter().map(|(tag, bits)| (tag.clone(), f32::from_bits(*bits))).collect());
+ t.values.push(value);
+ t.by_coords.insert(key, id);
+ id
}
/// The axis values of an interned id (empty for 0).
@@ -30,11 +55,11 @@ pub fn coords(id: u32) -> Arc> {
if id == 0 {
return Arc::new(Vec::new());
}
- table().lock().unwrap_or_else(|e| e.into_inner()).get(id as usize - 1).cloned().unwrap_or_default()
+ table().lock().unwrap_or_else(|e| e.into_inner()).values.get(id as usize - 1).cloned().unwrap_or_default()
}
-fn table() -> &'static Mutex>>> {
- static T: OnceLock>>>> = OnceLock::new();
+fn table() -> &'static Mutex {
+ static T: OnceLock> = OnceLock::new();
T.get_or_init(Default::default)
}
@@ -197,6 +222,9 @@ mod tests {
let id = intern(&[("wght".into(), 700.0)]);
assert_eq!(intern(&[("wght".into(), 700.0)]), id);
assert_eq!(coords(id).as_slice(), &[("wght".to_string(), 700.0)]);
+ assert_eq!(intern(&[("wdth".into(), 20.0), ("wght".into(), 700.0)]), intern(&[("wght".into(), 700.0), ("wdth".into(), 20.0)]));
+ assert_eq!(intern(&[("wght".into(), f32::NAN)]), 0);
+ assert_eq!(intern(&vec![("wght".into(), 1.0); MAX_AXES_PER_LOCATION + 1]), 0);
let Some((face, axes)) = find_variable_face() else {
eprintln!("no variable font installed: skipped");
return;
diff --git a/crates/text/tests/it/main.rs b/crates/text/tests/it/main.rs
new file mode 100644
index 000000000..1319b7d5e
--- /dev/null
+++ b/crates/text/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, one binary (each module is a former `tests/.rs`).
+
+mod script_fallback;
+mod system_font_menu;
+mod vertical_punctuation;
diff --git a/crates/text/tests/script_fallback.rs b/crates/text/tests/it/script_fallback.rs
similarity index 100%
rename from crates/text/tests/script_fallback.rs
rename to crates/text/tests/it/script_fallback.rs
diff --git a/crates/text/tests/system_font_menu.rs b/crates/text/tests/it/system_font_menu.rs
similarity index 100%
rename from crates/text/tests/system_font_menu.rs
rename to crates/text/tests/it/system_font_menu.rs
diff --git a/crates/text/tests/vertical_punctuation.rs b/crates/text/tests/it/vertical_punctuation.rs
similarity index 100%
rename from crates/text/tests/vertical_punctuation.rs
rename to crates/text/tests/it/vertical_punctuation.rs
diff --git a/crates/track/src/roto/mod.rs b/crates/track/src/roto/mod.rs
index 4efb43359..305065d2c 100644
--- a/crates/track/src/roto/mod.rs
+++ b/crates/track/src/roto/mod.rs
@@ -224,13 +224,19 @@ pub struct FrameSeg {
impl FrameSeg {
pub fn empty(w: usize, h: usize) -> FrameSeg {
- FrameSeg { w, h, matte: vec![0; w * h], refine: vec![0; w * h], ..Default::default() }
+ let Some(n) = w.checked_mul(h).filter(|n| *n <= rle::MAX_PLANE_BYTES) else {
+ return FrameSeg::default();
+ };
+ FrameSeg { w, h, matte: vec![0; n], refine: vec![0; n], ..Default::default() }
}
pub fn area(&self) -> usize {
self.matte.iter().filter(|v| **v != 0).count()
}
/// Centroid of the matte (pixels), if any.
pub fn centroid(&self) -> Option<[f64; 2]> {
+ if self.w == 0 || self.w.checked_mul(self.h)? > self.matte.len() {
+ return None;
+ }
let (mut sx, mut sy, mut n) = (0.0, 0.0, 0.0);
for (i, v) in self.matte.iter().enumerate() {
if *v != 0 {
@@ -246,8 +252,18 @@ impl FrameSeg {
/// Worker to the page): `ECSG`, width, height (u32 LE), the colour models as JSON (length
/// prefixed), then the matte and the Refine Edge band run-length encoded (u16 LE run, byte).
pub fn to_bytes(&self) -> Vec {
+ let Some(pixels) = self.w.checked_mul(self.h).filter(|n| *n <= rle::MAX_PLANE_BYTES) else {
+ return Vec::new();
+ };
+ if self.matte.len() != pixels || self.refine.len() != pixels || self.w > u32::MAX as usize || self.h > u32::MAX as usize {
+ return Vec::new();
+ }
let models = serde_json::to_vec(&(&self.fg, &self.bg)).unwrap_or_default();
- let mut out = Vec::with_capacity(16 + models.len() + 64);
+ let Some(header_len) = 16usize.checked_add(models.len()) else { return Vec::new() };
+ let mut out = Vec::new();
+ if out.try_reserve(header_len.saturating_add(64)).is_err() {
+ return Vec::new();
+ }
out.extend_from_slice(b"ECSG");
out.extend_from_slice(&(self.w as u32).to_le_bytes());
out.extend_from_slice(&(self.h as u32).to_le_bytes());
@@ -261,6 +277,9 @@ impl FrameSeg {
while i + n < plane.len() && plane[i + n] == v && n < u16::MAX as usize {
n += 1;
}
+ if out.try_reserve(3).is_err() {
+ return Vec::new();
+ }
out.extend_from_slice(&(n as u16).to_le_bytes());
out.push(v);
i += n;
@@ -277,23 +296,40 @@ impl FrameSeg {
let u = |i: usize| u32::from_le_bytes([b[i], b[i + 1], b[i + 2], b[i + 3]]) as usize;
let (w, h, ml) = (u(4), u(8), u(12));
let n = w.checked_mul(h)?;
- let models = b.get(16..16 + ml)?;
+ if n > rle::MAX_PLANE_BYTES || w == 0 || h == 0 {
+ return None;
+ }
+ let models_end = 16usize.checked_add(ml)?;
+ let models = b.get(16..models_end)?;
let (fg, bg): (Gmm, Gmm) = serde_json::from_slice(models).ok()?;
- let mut rest = &b[16 + ml..];
+ let mut rest = b.get(models_end..)?;
+ // Each run covers at most u16::MAX pixels; refuse before reserving a plane the input can't fill.
+ if rest.len() < n.div_ceil(usize::from(u16::MAX)).saturating_mul(6) {
+ return None;
+ }
let mut plane = || -> Option> {
- let mut v = Vec::with_capacity(n);
+ let mut v = Vec::new();
+ v.try_reserve_exact(n).ok()?;
while v.len() < n {
if rest.len() < 3 {
return None;
}
- let run = u16::from_le_bytes([rest[0], rest[1]]) as usize;
- v.resize(v.len() + run, rest[2]);
- rest = &rest[3..];
+ let run = u16::from_le_bytes([*rest.first()?, *rest.get(1)?]) as usize;
+ let next = v.len().checked_add(run)?;
+ if run == 0 || next > n {
+ return None;
+ }
+ let value = *rest.get(2)?;
+ v.resize(next, value);
+ rest = rest.get(3..)?;
}
(v.len() == n).then_some(v)
};
let matte = plane()?;
let refine = plane()?;
+ if !rest.is_empty() {
+ return None;
+ }
Some(FrameSeg { w, h, matte, refine, fg, bg })
}
}
diff --git a/crates/track/src/roto/rle.rs b/crates/track/src/roto/rle.rs
index 308b2689a..914bcad83 100644
--- a/crates/track/src/roto/rle.rs
+++ b/crates/track/src/roto/rle.rs
@@ -17,6 +17,10 @@ pub fn base64_encode(data: &[u8]) -> String {
}
pub fn base64_decode(s: &str) -> Option> {
+ base64_decode_bounded(s, usize::MAX)
+}
+
+fn base64_decode_bounded(s: &str, max_bytes: usize) -> Option> {
let val = |c: u8| -> Option {
Some(match c {
b'A'..=b'Z' => (c - b'A') as u32,
@@ -27,13 +31,25 @@ pub fn base64_decode(s: &str) -> Option> {
_ => return None,
})
};
- let bytes: Vec = s.bytes().filter(|c| !c.is_ascii_whitespace()).collect();
- if !bytes.len().is_multiple_of(4) {
+ let significant = s.bytes().filter(|c| !c.is_ascii_whitespace()).count();
+ let max_encoded = max_bytes.checked_add(2).and_then(|n| n.checked_div(3)).and_then(|n| n.checked_mul(4)).unwrap_or(usize::MAX);
+ if !significant.is_multiple_of(4) || significant > max_encoded {
return None;
}
- let mut out = Vec::with_capacity(bytes.len() / 4 * 3);
+ let mut bytes = Vec::new();
+ bytes.try_reserve_exact(significant).ok()?;
+ bytes.extend(s.bytes().filter(|c| !c.is_ascii_whitespace()));
+ let decoded_len = bytes.len().checked_div(4)?.checked_mul(3)?;
+ if decoded_len > max_bytes.saturating_add(2) {
+ return None;
+ }
+ let mut out = Vec::new();
+ out.try_reserve_exact(decoded_len.min(max_bytes)).ok()?;
for c in bytes.chunks(4) {
let pad = c.iter().rev().take_while(|b| **b == b'=').count();
+ if pad > 2 || c[..4 - pad].contains(&b'=') {
+ return None;
+ }
let mut n = 0u32;
for (i, b) in c.iter().enumerate() {
n |= if *b == b'=' { 0 } else { val(*b)? } << (18 - 6 * i);
@@ -96,36 +112,66 @@ pub fn encode(values: &[u8]) -> String {
base64_encode(&out)
}
-/// Decode [`encode`]'s output (None when malformed).
-pub fn decode(s: &str) -> Option> {
- let data = base64_decode(s)?;
- let mut pos = 0;
- let n = get(&data, &mut pos)? as usize;
- if n > 1 << 30 {
+/// Decode [`encode`]'s output (None when malformed or larger than the caller's validated plane).
+pub fn decode_bounded(s: &str, max_len: usize) -> Option> {
+ let encoded_limit = max_len.saturating_mul(16).saturating_add(128);
+ if s.len() > encoded_limit {
return None;
}
- let mut out = Vec::with_capacity(n);
+ // An alternating byte plane takes at most one value byte and a ten-byte varint per
+ // pixel, plus the declared-length varint.
+ let decoded_limit = max_len.saturating_mul(11).saturating_add(10);
+ let data = base64_decode_bounded(s, decoded_limit)?;
+ let mut pos = 0;
+ let n = usize::try_from(get(&data, &mut pos)?).ok()?;
+ if n > max_len {
+ return None;
+ }
+ let mut out = Vec::new();
+ out.try_reserve_exact(n).ok()?;
while out.len() < n {
let v = *data.get(pos)?;
pos += 1;
- let run = get(&data, &mut pos)? as usize;
- if out.len() + run > n {
+ let run = usize::try_from(get(&data, &mut pos)?).ok()?;
+ let next = out.len().checked_add(run)?;
+ if run == 0 || next > n {
return None;
}
- out.resize(out.len() + run, v);
+ out.resize(next, v);
}
Some(out)
}
+/// Decode [`encode`]'s output, capped at the standard matte-plane limit.
+pub fn decode(s: &str) -> Option> {
+ decode_bounded(s, MAX_PLANE_BYTES)
+}
+
+/// Maximum frozen matte plane size (256 MiB at one byte per pixel).
+pub const MAX_PLANE_BYTES: usize = 256 * 1024 * 1024;
+
#[cfg(test)]
mod tests {
use super::*;
+ #[test]
+ fn refuses_oversized_and_zero_runs_before_expansion() {
+ let mut declared = Vec::new();
+ put(&mut declared, 1024);
+ declared.extend_from_slice(&[255, 0x80, 0x08]); // 1024-byte run
+ assert!(decode_bounded(&base64_encode(&declared), 16).is_none());
+ let mut zero_run = Vec::new();
+ put(&mut zero_run, 1);
+ zero_run.extend_from_slice(&[0, 0]);
+ assert!(decode_bounded(&base64_encode(&zero_run), 16).is_none());
+ assert!(decode_bounded(&"A".repeat(100_000), 16).is_none());
+ }
+
#[test]
fn round_trips() {
for n in [0usize, 1, 2, 3, 4, 5, 100, 1000] {
let v: Vec = (0..n).map(|i| ((i / 7) % 3) as u8 * 100).collect();
- assert_eq!(decode(&encode(&v)).unwrap(), v);
+ assert_eq!(decode(&encode(&v)).unwrap(), v, "RLE n={n}");
let raw: Vec = (0..n).map(|i| (i * 31) as u8).collect();
assert_eq!(base64_decode(&base64_encode(&raw)).unwrap(), raw);
}
diff --git a/crates/track/src/roto/tests.rs b/crates/track/src/roto/tests.rs
index 65d1743f9..3c4645cb2 100644
--- a/crates/track/src/roto/tests.rs
+++ b/crates/track/src/roto/tests.rs
@@ -95,6 +95,21 @@ fn strokes_segment_the_base_frame() {
assert!(bytes.len() < seg.w * seg.h / 4, "{} bytes", bytes.len());
assert!(FrameSeg::from_bytes(&bytes[..bytes.len() - 1]).is_none());
assert!(FrameSeg::from_bytes(b"nope").is_none());
+
+ // Untrusted plane dimensions and run lengths are rejected before allocation/resize.
+ let mut hostile = b"ECSG".to_vec();
+ hostile.extend_from_slice(&u32::MAX.to_le_bytes());
+ hostile.extend_from_slice(&u32::MAX.to_le_bytes());
+ hostile.extend_from_slice(&0u32.to_le_bytes());
+ assert!(FrameSeg::from_bytes(&hostile).is_none());
+ let mut overrun = bytes.clone();
+ let plane_at = 16 + u32::from_le_bytes(bytes[12..16].try_into().unwrap()) as usize;
+ overrun[plane_at..plane_at + 2].copy_from_slice(&u16::MAX.to_le_bytes());
+ assert!(FrameSeg::from_bytes(&overrun).is_none());
+ let mut trailing = bytes.clone();
+ trailing.push(0);
+ assert!(FrameSeg::from_bytes(&trailing).is_none());
+ assert_eq!(FrameSeg::empty(usize::MAX, 2), FrameSeg::default());
}
#[test]
diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml
index be02fef5e..549e3ecbc 100644
--- a/crates/ui-egui/Cargo.toml
+++ b/crates/ui-egui/Cargo.toml
@@ -26,6 +26,7 @@ eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
serde = { workspace = true }
serde_json = { workspace = true }
log = { workspace = true }
+chrono = { workspace = true }
rayon = { workspace = true }
web-time = { workspace = true }
kurbo = { workspace = true }
diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs
index 15493ad79..7fe382a5d 100644
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@ -321,6 +321,26 @@ pub fn handle(app: &mut EffectcraftApp, ctx: &egui::Context, req: &ControlReques
Err(e) => return err(e),
};
let m = modifiers(p);
+ // Validate the complete gesture before mutating the queue; the loopback control
+ // channel is externally reachable and must not amplify tiny requests into huge work.
+ const MAX_PENDING_EVENTS: usize = 4096;
+ const MAX_CLICK_COUNT: u64 = 512;
+ let pending = app.synthetic.len();
+ let gesture_events = if req.method == "ui.click" {
+ let count = p.get("count").and_then(Value::as_u64).unwrap_or(1);
+ if count == 0 || count > MAX_CLICK_COUNT {
+ return err(format!("`count` must be between 1 and {MAX_CLICK_COUNT}"));
+ }
+ let Some(events) = usize::try_from(count).ok().and_then(|n| n.checked_mul(2)).and_then(|n| n.checked_add(3)) else {
+ return err("click event count overflow");
+ };
+ events
+ } else {
+ 3
+ };
+ if pending.checked_add(gesture_events).is_none_or(|n| n > MAX_PENDING_EVENTS) {
+ return err("synthetic input queue is full");
+ }
// egui keeps the modifiers from `ModifiersChanged` (not the ones on a pointer event)
// and the synthetic events arrive one per frame: hold them for the whole gesture.
app.synthetic.push(egui::Event::ModifiersChanged(m));
@@ -348,6 +368,15 @@ pub fn handle(app: &mut EffectcraftApp, ctx: &egui::Context, req: &ControlReques
(Err(e), _) | (_, Err(e)) => return err(e),
};
let steps = p.get("steps").and_then(Value::as_u64).unwrap_or(12).max(2);
+ const MAX_PENDING_EVENTS: usize = 4096;
+ const MAX_DRAG_STEPS: u64 = 2048;
+ if steps > MAX_DRAG_STEPS {
+ return err(format!("`steps` must be at most {MAX_DRAG_STEPS}"));
+ }
+ let Some(gesture_events) = usize::try_from(steps).ok().and_then(|n| n.checked_add(5)) else { return err("drag event count overflow") };
+ if app.synthetic.len().checked_add(gesture_events).is_none_or(|n| n > MAX_PENDING_EVENTS) {
+ return err("synthetic input queue is full");
+ }
let m = modifiers(p);
app.synthetic.push(egui::Event::ModifiersChanged(m));
app.synthetic.push(egui::Event::PointerMoved(a));
diff --git a/crates/ui-egui/src/dock_ui.rs b/crates/ui-egui/src/dock_ui.rs
index fb4a2d2e0..ba9e9e6b9 100644
--- a/crates/ui-egui/src/dock_ui.rs
+++ b/crates/ui-egui/src/dock_ui.rs
@@ -41,8 +41,8 @@ impl EffectcraftApp {
}
let Some(comp) = self.session.active_comp() else { return out };
if let Some(l) = self.session.state.selected_layers.first().and_then(|id| comp.layer(*id)) {
- out.push((PanelKind::EffectControls, format!("Effect Controls {}", l.name)));
- out.push((PanelKind::Properties, format!("Properties: {}", l.name)));
+ out.push((PanelKind::EffectControls, format!("{} {}", crate::i18n::command_label("window.panel", "Effect Controls"), l.name)));
+ out.push((PanelKind::Properties, format!("{}: {}", crate::i18n::command_label("window.panel", "Properties"), l.name)));
}
out
}
@@ -206,7 +206,9 @@ impl EffectcraftApp {
let titles = self.tab_titles();
let decos = self.tab_decos();
let docs = self.tab_docs();
- let title = |p: PanelKind| titles.iter().find(|(k, _)| *k == p).map(|(_, s)| s.clone()).unwrap_or_else(|| crate::i18n::tr(p.title()).to_string());
+ let title = |p: PanelKind| {
+ titles.iter().find(|(k, _)| *k == p).map(|(_, s)| s.clone()).unwrap_or_else(|| crate::i18n::command_label("window.panel", p.title()).to_string())
+ };
let info = dock::TabInfo { title: &title, decos: &decos, docs: &docs };
// Where each group's tabs are (tab drags show where a tab will land between them).
let mut tab_rects: Vec<(String, Vec<(PanelKind, Rect)>)> = vec![];
@@ -570,7 +572,7 @@ impl EffectcraftApp {
}
}
// Ghost of the dragged tab.
- let g = painter.layout_no_wrap(crate::i18n::tr(p.title()).to_string(), crate::theme::Tokens::ui(12.0), Color32::WHITE);
+ let g = painter.layout_no_wrap(crate::i18n::command_label("window.panel", p.title()).to_string(), crate::theme::Tokens::ui(12.0), Color32::WHITE);
let gr = Rect::from_min_size(pos + vec2(12.0, 10.0), g.size() + vec2(16.0, 8.0));
painter.rect_filled(gr, 4.0, t.focus.gamma_multiply(0.85));
painter.galley(gr.min + vec2(8.0, 4.0), g, Color32::WHITE);
diff --git a/crates/ui-egui/src/frames.rs b/crates/ui-egui/src/frames.rs
index 059bc3a03..246e870e4 100644
--- a/crates/ui-egui/src/frames.rs
+++ b/crates/ui-egui/src/frames.rs
@@ -24,7 +24,7 @@
//! them (Info panel, eyedroppers, histograms).
use std::collections::{BTreeSet, HashMap, HashSet, VecDeque};
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::{Arc, Mutex};
use effectcraft_engine::project::{Comp, ItemId, ItemKind, LayerSource, Node, Project, PropGroup};
@@ -152,6 +152,8 @@ struct Cache {
gpu_budget: usize,
/// The playing preview, if any: evictions spare the frames it shows next.
playhead: Option,
+ /// Scale of the frame on screen (the newest urgent request): frames of other scales go first.
+ scale: Option,
}
impl Cache {
@@ -173,8 +175,14 @@ impl Cache {
/// recently shown of the frames it doesn't reach, then the one it reaches last. Plain LRU
/// evicted the frames just ahead of the playhead first (rendered a while ago, not shown yet)
/// to keep the ones just shown, so a preview longer than the cache played into a gap that
- /// prefetch kept refilling while it evicted the next frames (#595).
+ /// prefetch kept refilling while it evicted the next frames (#595). Frames of another scale
+ /// than the one on screen go first (a zoom or resolution change).
fn victim(&self) -> Option {
+ if let Some(s) = self.scale
+ && let Some(i) = self.order.iter().position(|k| k.scale != s)
+ {
+ return Some(i);
+ }
let Some(p) = &self.playhead else { return (!self.order.is_empty()).then_some(0) };
let mut farthest: Option<(i64, usize)> = None;
for (i, k) in self.order.iter().enumerate() {
@@ -186,10 +194,13 @@ impl Cache {
}
farthest.map(|(_, i)| i)
}
- /// Video memory: drop the oldest GPU frames past their own budget.
+ /// Video memory: drop the oldest GPU frames past their own budget, frames of another scale
+ /// than the one on screen first (a zoom or resolution change).
fn evict_gpu(&mut self) {
while self.gpu_bytes > self.gpu_budget {
- let Some(i) = self.order.iter().position(|k| self.map.get(k).is_some_and(FrameImage::is_gpu)) else { break };
+ let is_gpu = |k: &FrameKey| self.map.get(k).is_some_and(FrameImage::is_gpu);
+ let other_scale = self.order.iter().position(|k| Some(k.scale) != self.scale && is_gpu(k));
+ let Some(i) = other_scale.or_else(|| self.order.iter().position(is_gpu)) else { break };
if let Some(old) = self.order.remove(i) {
self.remove(&old);
}
@@ -258,8 +269,10 @@ pub struct RenderSource {
/// ([`Frames::identity`]).
type Identity = (u64, Option>);
-/// Content keys of (project revision, comp), computed once per revision.
-type ContentKeys = Arc>>;
+/// Content keys of (project revision, comp, virtual-file generation). The generation is one
+/// counter bumped when a browser file is replaced, so a lookup stays a map read. Hashing the
+/// new bytes happens only when that generation misses.
+type ContentKeys = Arc>>;
#[cfg(not(target_arch = "wasm32"))]
#[derive(Default)]
@@ -268,16 +281,16 @@ struct ContentKeyJobs {
pending: VecDeque<(Arc, u64, u64)>,
}
-fn content_key(keys: &ContentKeys, project: &Project, revision: u64, comp: u64) -> u128 {
- if let Some(k) = keys.lock().ok().and_then(|m| m.get(&(revision, comp)).copied()) {
+fn content_key(keys: &ContentKeys, project: &Project, revision: u64, comp: u64, epoch: u64, virtual_id: Option>) -> u128 {
+ if let Some(k) = keys.lock().ok().and_then(|m| m.get(&(revision, comp, epoch)).copied()) {
return k;
}
- let k = disk_cache::comp_content_key(project, ItemId(comp));
+ let k = disk_cache::comp_content_key_with(project, ItemId(comp), virtual_id);
if let Ok(mut m) = keys.lock() {
if m.len() > 256 {
m.clear();
}
- m.insert((revision, comp), k);
+ m.insert((revision, comp, epoch), k);
}
k
}
@@ -363,8 +376,15 @@ pub fn opts_hash(o: &RenderOpts) -> u64 {
}
/// Disk key of a viewer frame (render options included: region of interest, draft…).
-fn frame_disk_key(keys: &ContentKeys, project: &Project, key: &FrameKey, opts_hash: u64) -> u128 {
- let content = content_key(keys, project, key.revision, key.comp);
+fn frame_disk_key(
+ keys: &ContentKeys,
+ project: &Project,
+ key: &FrameKey,
+ opts_hash: u64,
+ epoch: u64,
+ virtual_id: Option>,
+) -> u128 {
+ let content = content_key(keys, project, key.revision, key.comp, epoch, virtual_id);
disk_cache::frame_key(content, key.frame, key.scale, key.view ^ opts_hash)
}
@@ -441,6 +461,10 @@ pub struct Frames {
/// Render time of the last viewer (urgent) frame in ms, for the Info panel / perf readout.
pub last_ms: Arc>,
content_keys: ContentKeys,
+ /// Bumped when a virtual file is replaced. Lookups key on it instead of statting footage.
+ virtual_epoch: Arc,
+ /// Size and content hash for paths with no native metadata. Called only on a cache miss.
+ virtual_id: Option Option<(u64, u64)> + Send + Sync>>,
#[cfg(not(target_arch = "wasm32"))]
content_key_jobs: Arc>,
gpu_retired: Arc,
@@ -462,7 +486,7 @@ impl Default for Frames {
#[cfg(not(target_arch = "wasm32"))]
let threads = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(4).clamp(2, 16);
Frames {
- cache: Arc::new(Mutex::new(Cache { map: HashMap::new(), order: VecDeque::new(), bytes: 0, gpu_bytes: 0, budget: 3 << 30, gpu_budget: GPU_BUDGET, playhead: None })),
+ cache: Arc::new(Mutex::new(Cache { map: HashMap::new(), order: VecDeque::new(), bytes: 0, gpu_bytes: 0, budget: 3 << 30, gpu_budget: GPU_BUDGET, playhead: None, scale: None })),
inflight: Arc::new(Mutex::new(HashSet::new())),
queue: Arc::new(Mutex::new(Queue::default())),
#[cfg(not(target_arch = "wasm32"))]
@@ -477,6 +501,8 @@ impl Default for Frames {
ctx: None,
last_ms: Arc::new(Mutex::new(0.0)),
content_keys: Arc::default(),
+ virtual_epoch: Arc::new(AtomicU64::new(0)),
+ virtual_id: None,
#[cfg(not(target_arch = "wasm32"))]
content_key_jobs: Arc::default(),
gpu_retired: Arc::default(),
@@ -758,7 +784,12 @@ impl Frames {
/// Frames of the series of `base` in the disk cache but not in RAM — the blue cache bar.
/// `opts` are the viewer's render options (part of the disk key). Native queries return
/// no blue frames until the content key is ready; hashing never blocks timeline painting.
- pub fn disk_frames(&self, src: &RenderSource, base: &FrameKey, frames: i64, opts: &RenderOpts) -> Vec {
+ pub fn disk_frames(&self, src: &RenderSource, base: &FrameKey, range: std::ops::Range, opts: &RenderOpts) -> Vec {
+ let start = range.start.clamp(0, 100_000);
+ let end = range.end.clamp(0, 100_000);
+ if start >= end {
+ return vec![];
+ }
let remote = self.remote.as_ref().filter(|r| r.disk());
let contains = |k: u128| match (&src.disk, remote) {
(Some(dc), _) => dc.contains(disk_cache::Kind::Frame, k),
@@ -768,9 +799,10 @@ impl Frames {
if src.disk.is_none() && remote.is_none() {
return vec![];
}
+ let epoch = self.virtual_epoch.load(Ordering::Relaxed);
#[cfg(not(target_arch = "wasm32"))]
let content = {
- let known = self.content_keys.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(base.revision, base.comp)).copied();
+ let known = self.content_keys.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(base.revision, base.comp, epoch)).copied();
let Some(content) = known else {
self.request_content_key(src.project.clone(), base.revision, base.comp);
return vec![];
@@ -778,13 +810,10 @@ impl Frames {
content
};
#[cfg(target_arch = "wasm32")]
- let content = content_key(&self.content_keys, &src.project, base.revision, base.comp);
+ let content = content_key(&self.content_keys, &src.project, base.revision, base.comp, epoch, self.virtual_id.as_deref());
let ram: HashSet = self.cached_frames(base).into_iter().collect();
let oh = opts_hash(opts);
- (0..frames.clamp(0, 100_000))
- .filter(|f| !ram.contains(f))
- .filter(|f| contains(disk_cache::frame_key(content, *f, base.scale, base.view ^ oh)))
- .collect()
+ (start..end).filter(|f| !ram.contains(f)).filter(|f| contains(disk_cache::frame_key(content, *f, base.scale, base.view ^ oh))).collect()
}
#[cfg(not(target_arch = "wasm32"))]
@@ -803,6 +832,7 @@ impl Frames {
jobs.running = true;
drop(jobs);
let (jobs, keys, ctx) = (self.content_key_jobs.clone(), self.content_keys.clone(), self.ctx.clone());
+ let (epoch, id) = (self.virtual_epoch.clone(), self.virtual_id.clone());
let work = move || loop {
let next = {
let mut jobs = jobs.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
@@ -813,7 +843,9 @@ impl Frames {
next
};
let Some((project, revision, comp)) = next else { return };
- if std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| content_key(&keys, &project, revision, comp))).is_err() {
+ let epoch = epoch.load(Ordering::Relaxed);
+ let id = id.clone();
+ if std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| content_key(&keys, &project, revision, comp, epoch, id.as_deref()))).is_err() {
log::error!("could not compute a preview disk-cache key; the cache indicator will retry");
}
if let Some(ctx) = &ctx {
@@ -893,7 +925,19 @@ impl Frames {
}
fn request_with(&self, src: &RenderSource, key: FrameKey, comp: ItemId, t: Tick, opts: RenderOpts, urgent: bool) {
- if self.is_cached(&key) {
+ // The frame on screen sets the scale evictions keep: a prefetch or a passive viewer at
+ // another zoom must not evict the active viewer's frames.
+ let cached = self
+ .cache
+ .lock()
+ .map(|mut c| {
+ if urgent {
+ c.scale = Some(key.scale);
+ }
+ c.map.contains_key(&key)
+ })
+ .unwrap_or(false);
+ if cached {
return;
}
let Ok(mut q) = self.queue.lock() else { return };
@@ -964,10 +1008,22 @@ impl Frames {
ctx: self.ctx.clone(),
last: self.last_ms.clone(),
content_keys: self.content_keys.clone(),
+ virtual_epoch: self.virtual_epoch.clone(),
+ virtual_id: self.virtual_id.clone(),
gpu_retired: self.gpu_retired.clone(),
}
}
+ /// Browser file table: `epoch` bumps on each replacement, and `id` is the size and content
+ /// hash used when a content key is rebuilt. Neither runs on a cache hit.
+ pub fn set_virtual_media(&mut self, epoch: Arc, id: Arc Option<(u64, u64)> + Send + Sync>) {
+ self.virtual_epoch = epoch;
+ self.virtual_id = Some(id);
+ if let Ok(mut keys) = self.content_keys.lock() {
+ keys.clear();
+ }
+ }
+
/// Render frames with `remote` from now on (`None`: on this thread again).
pub fn set_remote(&mut self, remote: Option>) {
self.remote = remote;
@@ -1036,7 +1092,8 @@ impl Frames {
let fw = self.worker();
let busy = self.remote_busy.clone();
let t0 = web_time::Instant::now();
- let disk_key = remote.disk().then(|| frame_disk_key(&w.content_keys, &job.src.project, &key, opts_hash(&job.opts)));
+ let epoch = w.virtual_epoch.load(Ordering::Relaxed);
+ let disk_key = remote.disk().then(|| frame_disk_key(&w.content_keys, &job.src.project, &key, opts_hash(&job.opts), epoch, w.virtual_id.as_deref()));
let rj = RemoteJob { project: job.src.project.clone(), revision: key.revision, comp: job.comp, t: job.t, opts: job.opts, disk_key };
remote.start(
rj,
@@ -1093,6 +1150,8 @@ struct Worker {
ctx: Option,
last: Arc>,
content_keys: ContentKeys,
+ virtual_epoch: Arc,
+ virtual_id: Option Option<(u64, u64)> + Send + Sync>>,
gpu_retired: Arc,
}
@@ -1147,7 +1206,12 @@ impl Worker {
job
};
let t0 = web_time::Instant::now();
- let disk = job.src.disk.as_ref().map(|dc| (dc.clone(), frame_disk_key(content_keys, &job.src.project, &job.key, opts_hash(&job.opts))));
+ let epoch = self.virtual_epoch.load(Ordering::Relaxed);
+ let disk = job
+ .src
+ .disk
+ .as_ref()
+ .map(|dc| (dc.clone(), frame_disk_key(content_keys, &job.src.project, &job.key, opts_hash(&job.opts), epoch, self.virtual_id.as_deref())));
let from_disk = disk.as_ref().and_then(|(dc, k)| dc.get_frame(*k));
let disk_hit = from_disk.is_some();
let ci = match from_disk {
@@ -1375,6 +1439,54 @@ impl Queue {
mod tests {
use super::*;
+ struct ProbeDisk {
+ keys: Mutex>,
+ probes: std::sync::atomic::AtomicUsize,
+ }
+
+ impl RemoteFrames for ProbeDisk {
+ fn slots(&self) -> usize {
+ 0
+ }
+
+ fn disk(&self) -> bool {
+ true
+ }
+
+ fn disk_contains(&self, key: u128) -> bool {
+ self.probes.fetch_add(1, Ordering::Relaxed);
+ self.keys.lock().unwrap().contains(&key)
+ }
+
+ fn start(&self, _: RemoteJob, _: RemoteDone) {}
+ }
+
+ fn disk_fixture(stored_frames: &[i64]) -> (Frames, RenderSource, FrameKey, RenderOpts, Arc, u128) {
+ let mut session = effectcraft_engine::Session::default();
+ session.execute("comp.new", serde_json::json!({"width": 32, "height": 18, "duration": 1})).unwrap();
+ let comp = session.active_comp_id().unwrap();
+ let opts = RenderOpts::default();
+ let content = 1234;
+ let mut base = key(1, 0, opts_hash(&opts));
+ base.revision = 7;
+ base.comp = comp.0;
+ let disk = Arc::new(ProbeDisk { keys: Mutex::new(HashSet::new()), probes: 0.into() });
+ disk.keys.lock().unwrap().extend(stored_frames.iter().map(|frame| disk_cache::frame_key(content, *frame, base.scale, base.view ^ opts_hash(&opts))));
+ let mut frames = Frames::default();
+ frames.set_remote(Some(disk.clone()));
+ frames.content_keys.lock().unwrap().insert((base.revision, base.comp, 0), content);
+ let source = RenderSource {
+ project: session.project.clone(),
+ footage: session.footage.clone(),
+ expr: None,
+ layer_cache: Arc::default(),
+ gpu: None,
+ gpu_display: false,
+ disk: None,
+ };
+ (frames, source, base, opts, disk, content)
+ }
+
#[cfg(not(target_arch = "wasm32"))]
#[test]
fn disk_indicator_does_not_hash_on_ui_thread_and_coalesces_edits() {
@@ -1422,20 +1534,65 @@ mod tests {
base.comp = cid.0;
for revision in 1..50 {
base.revision = revision;
- assert!(frames.disk_frames(&src, &base, 30, &opts).is_empty());
+ assert!(frames.disk_frames(&src, &base, 0..30, &opts).is_empty());
}
assert!(frames.content_keys.lock().unwrap().is_empty(), "painting computed a content hash while the worker was blocked");
assert_eq!(frames.content_key_jobs.lock().unwrap().pending.len(), 1);
release.send(()).unwrap();
let until = Instant::now() + Duration::from_secs(3);
- while !frames.content_keys.lock().unwrap().contains_key(&(base.revision, base.comp)) {
+ while !frames.content_keys.lock().unwrap().contains_key(&(base.revision, base.comp, 0)) {
assert!(Instant::now() < until);
std::thread::sleep(Duration::from_millis(1));
}
- assert_eq!(frames.disk_frames(&src, &base, 30, &opts), vec![2], "the blue indicator must return once its key is ready");
+ assert_eq!(frames.disk_frames(&src, &base, 0..30, &opts), vec![2], "the blue indicator must return once its key is ready");
assert_eq!(frames.content_keys.lock().unwrap().len(), 1, "superseded revisions were hashed");
}
+ #[test]
+ fn disk_indicator_range_tracks_live_membership() {
+ let (frames, src, base, opts, disk, _) = disk_fixture(&[10, 12]);
+ assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10, 12]);
+ assert_eq!(disk.probes.load(Ordering::Relaxed), 3);
+
+ disk.keys.lock().unwrap().insert(disk_cache::frame_key(1234, 11, base.scale, base.view ^ opts_hash(&opts)));
+ assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10, 11, 12]);
+
+ insert(&frames, FrameKey { frame: 11, ..base });
+ disk.probes.store(0, Ordering::Relaxed);
+ assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10, 12]);
+ assert_eq!(disk.probes.load(Ordering::Relaxed), 2);
+
+ disk.keys.lock().unwrap().remove(&disk_cache::frame_key(1234, 12, base.scale, base.view ^ opts_hash(&opts)));
+ assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10]);
+
+ let mut revised = base;
+ revised.revision += 1;
+ frames.content_keys.lock().unwrap().insert((revised.revision, revised.comp, 0), 5678);
+ assert!(frames.disk_frames(&src, &revised, 10..13, &opts).is_empty());
+
+ let changed = FrameKey { scale: base.scale + 1, ..base };
+ assert!(frames.disk_frames(&src, &changed, 10..13, &opts).is_empty());
+ let changed = FrameKey { view: base.view + 1, ..base };
+ assert!(frames.disk_frames(&src, &changed, 10..13, &opts).is_empty());
+ assert!(frames.disk_frames(&src, &base, 10..13, &RenderOpts { draft: true, ..opts }).is_empty());
+ }
+
+ #[test]
+ fn disk_indicator_range_is_bounded() {
+ let (frames, src, base, opts, disk, _) = disk_fixture(&[0, 1, 99_999]);
+ assert_eq!(frames.disk_frames(&src, &base, -5..2, &opts), vec![0, 1]);
+ assert_eq!(disk.probes.load(Ordering::Relaxed), 2);
+ disk.probes.store(0, Ordering::Relaxed);
+ assert_eq!(frames.disk_frames(&src, &base, 99_999..i64::MAX, &opts), vec![99_999]);
+ assert_eq!(disk.probes.load(Ordering::Relaxed), 1);
+ disk.probes.store(0, Ordering::Relaxed);
+ assert!(frames.disk_frames(&src, &base, 2..2, &opts).is_empty());
+ // Written as a struct literal: `3..2` trips clippy::reversed_empty_ranges.
+ let reversed = std::ops::Range { start: 3, end: 2 };
+ assert!(frames.disk_frames(&src, &base, reversed, &opts).is_empty());
+ assert_eq!(disk.probes.load(Ordering::Relaxed), 0);
+ }
+
/// Frames larger than the texture limit are averaged down by a whole factor (#201: an
/// 11000×2200 comp at Full resolution against an 8192 limit).
#[test]
@@ -1795,21 +1952,17 @@ mod tests {
assert!(!f.is_cached(&key(1, 13, 0)) && f.is_cached(&key(1, 50, 0)));
}
- /// #595: prefetch renders the frames the preview reaches first, whatever order they were
- /// asked for in (a frame evicted and asked for again waited behind every frame further
- /// ahead); queued frames the preview no longer reaches are dropped and not left in flight.
- #[test]
- fn prefetch_renders_the_frames_the_playhead_reaches_first() {
- struct Idle;
- impl RemoteFrames for Idle {
- fn slots(&self) -> usize {
- 0
- }
- fn start(&self, _: RemoteJob, _: RemoteDone) {}
+ /// A frame source that queues jobs and never renders them: the tests check the queue.
+ struct Idle;
+ impl RemoteFrames for Idle {
+ fn slots(&self) -> usize {
+ 0
}
- let mut f = Frames::default();
- f.set_remote(Some(Arc::new(Idle)));
- let src = RenderSource {
+ fn start(&self, _: RemoteJob, _: RemoteDone) {}
+ }
+
+ fn idle_source() -> RenderSource {
+ RenderSource {
project: Arc::default(),
footage: Arc::new(effectcraft_engine::render::NoFootage),
expr: None,
@@ -1817,7 +1970,17 @@ mod tests {
gpu: None,
gpu_display: false,
disk: None,
- };
+ }
+ }
+
+ /// #595: prefetch renders the frames the preview reaches first, whatever order they were
+ /// asked for in (a frame evicted and asked for again waited behind every frame further
+ /// ahead); queued frames the preview no longer reaches are dropped and not left in flight.
+ #[test]
+ fn prefetch_renders_the_frames_the_playhead_reaches_first() {
+ let mut f = Frames::default();
+ f.set_remote(Some(Arc::new(Idle)));
+ let src = idle_source();
for frame in [40, 30, 20, 5, 12, 11] {
f.request(&src, key(1, frame, 0), ItemId(1), Tick::ZERO, RenderOpts::default());
}
@@ -1834,6 +1997,38 @@ mod tests {
assert_eq!(f.inflight(), 6, "frame 5, behind the playhead, is no longer in flight");
}
+ /// The cache is full. A zoom (or preview-resolution) change left the frames of the old
+ /// size to the plain least-recently-shown order, so the frames of the zoom the viewer is back
+ /// at went before the ones of the abandoned zoom. The other size's frames go first, then the
+ /// order is as before.
+ #[test]
+ fn a_size_change_evicts_frames_of_other_sizes_first() {
+ let mut f = Frames::default();
+ f.set_remote(Some(Arc::new(Idle)));
+ f.set_budget(4 * 16);
+ let at = |frame, scale| FrameKey { scale, ..key(1, frame, 0) };
+ // 100% (frames 0..=1) is cached, then 50% (2..=3): the 100% frames are the oldest.
+ for (frame, scale) in [(0, 1000), (1, 1000), (2, 500), (3, 500)] {
+ insert(&f, at(frame, scale));
+ }
+ // A passive viewer at 50% asks for a frame: that doesn't change which size is kept.
+ f.request(&idle_source(), at(9, 500), ItemId(1), Tick::ZERO, RenderOpts::default());
+ // Back at 100%: the viewer asks for frame 4.
+ f.request_urgent(&idle_source(), at(4, 1000), ItemId(1), Tick::ZERO, RenderOpts::default());
+ f.request(&idle_source(), at(10, 500), ItemId(1), Tick::ZERO, RenderOpts::default());
+ insert(&f, at(4, 1000));
+ assert!(
+ f.is_cached(&at(0, 1000)) && f.is_cached(&at(1, 1000)) && !f.is_cached(&at(2, 500)) && f.is_cached(&at(3, 500)),
+ "the first frame of the old size goes, not the cached ones of the current size"
+ );
+ insert(&f, at(5, 1000));
+ assert!(!f.is_cached(&at(3, 500)), "then the last frame of the old size");
+ assert_eq!(f.cached_frames(&at(0, 1000)), [0, 1, 4, 5]);
+ // No other size left: least recently shown first again.
+ insert(&f, at(6, 1000));
+ assert_eq!(f.cached_frames(&at(0, 1000)), [1, 4, 5, 6]);
+ }
+
#[test]
fn frames_are_keyed_by_content_and_series_are_kept_apart() {
let f = Frames::default();
diff --git a/crates/ui-egui/src/header.rs b/crates/ui-egui/src/header.rs
index fb381cfd3..c1272c41d 100644
--- a/crates/ui-egui/src/header.rs
+++ b/crates/ui-egui/src/header.rs
@@ -259,7 +259,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
if mresp.clicked() {
widgets::open_popup(ui, egui::Id::new("ws-pop"));
}
- let names: Vec = crate::dock::WORKSPACES.iter().map(|s| s.to_string()).collect();
+ let names: Vec = crate::dock::WORKSPACES.iter().map(|s| crate::i18n::command_label("window.workspace", s).to_string()).collect();
if let Some(i) = widgets::popup_menu(
ui,
egui::Id::new("ws-pop"),
@@ -274,7 +274,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
// Small Screen, Standard.
let shown = ["Standard", "Small Screen", "Learn", "Review", "Default"];
for name in shown {
- let g = p.layout_no_wrap(name.to_string(), Tokens::ui(12.0), t.text);
+ let g = p.layout_no_wrap(crate::i18n::command_label("window.workspace", name).to_string(), Tokens::ui(12.0), t.text);
let w = g.size().x + 16.0;
let r = Rect::from_min_max(pos2(rx - w, cy - 13.0), pos2(rx, cy + 13.0));
if r.min.x < x + 120.0 {
@@ -639,9 +639,15 @@ fn puppet_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
r.max.x + 16.0
}
+/// A workspace's drawn name: built-ins read the menu bar's Window ▸ Workspace row; names the user
+/// saved stay verbatim, even when one matches a catalog source such as "Composition".
+fn workspace_label(name: &str) -> &str {
+ if crate::dock::WORKSPACES.contains(&name) { crate::i18n::command_label("window.workspace", name) } else { name }
+}
+
fn ws_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
for w in app.workspace_names() {
- if ui.selectable_label(app.ui.workspace == w, &w).clicked() {
+ if ui.selectable_label(app.ui.workspace == w, workspace_label(&w)).clicked() {
app.set_workspace(&w);
ui.close();
}
@@ -692,6 +698,15 @@ mod tests {
out.textures_delta.clear();
}
+ #[test]
+ fn saved_workspace_names_stay_verbatim() {
+ crate::i18n::set_current("zh-hans");
+ assert_ne!(workspace_label("Default"), "Default");
+ assert_ne!(crate::i18n::tr("Composition"), "Composition");
+ assert_eq!(workspace_label("Composition"), "Composition");
+ crate::i18n::set_current("en");
+ }
+
#[test]
fn long_press_type_keeps_the_tool_until_vertical_is_selected() {
let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs
index 8b8b01b51..51337f2cc 100644
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -10,10 +10,12 @@ pub(crate) mod effects;
/// Translations for the panels, tooltips and dialogs below the menu bar (see the module docs).
mod ui;
use effectcraft_engine::menus::{MenuEntry, MenuNode};
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) use ui::catalog_characters;
pub(crate) use ui::{set_current, tr, tr_args};
/// Every language with a catalog, in the order Settings ▸ General ▸ Language lists them.
-const CATALOG_CODES: [&str; 10] = ["ja", "zh-hans", "zh-hant", "uk", "es", "pt-br", "ru", "fr", "de", "cs"];
+const CATALOG_CODES: [&str; 11] = ["ja", "zh-hans", "zh-hant", "uk", "es", "pt-br", "ru", "fr", "de", "cs", "ka"];
/// The active interface language: the stored preference when it names a catalog, otherwise `en`
/// (English is the source of every label and needs no lookup).
@@ -64,22 +66,64 @@ pub(crate) fn czech(app: &EffectcraftApp) -> bool {
language(app) == "cs"
}
+/// The UI is in Georgian.
+pub(crate) fn georgian(app: &EffectcraftApp) -> bool {
+ language(app) == "ka"
+}
+
/// Settings ▸ General ▸ Language ▸ Match System: the operating system's interface language
/// where EffectCraft has it, else English (#229), as After Effects installs in the system's
-/// language. The browser build stays in English because it has no system-locale probe.
+/// language. The browser build follows the locales its page passes in ([`set_system_locales`]).
fn system_language() -> &'static str {
#[cfg(not(target_arch = "wasm32"))]
{
static LANGUAGE: std::sync::OnceLock<&'static str> = std::sync::OnceLock::new();
LANGUAGE.get_or_init(|| supported(sys_locale::get_locale().as_deref()))
}
- // No system locale in the browser build: English.
#[cfg(target_arch = "wasm32")]
- supported(None)
+ {
+ let (requested, browser) = SYSTEM_LOCALES.get().map(|(r, b)| (r.as_deref(), b.as_slice())).unwrap_or_default();
+ first_supported(requested, browser, web_draws)
+ }
+}
+
+/// The page's `?lang=`, then the browser's preferred languages, most preferred first
+/// (`navigator.languages`), for Match System in the web build.
+static SYSTEM_LOCALES: std::sync::OnceLock<(Option, Vec)> = std::sync::OnceLock::new();
+
+/// Tell Match System the language the page asks for (`?lang=`) and the browser's preferred
+/// languages (the web build has no locale probe of its own). Set before the first frame; only
+/// the first call counts.
+pub fn set_system_locales(requested: Option, browser: Vec) {
+ let _ = SYSTEM_LOCALES.set((requested, browser));
+}
+
+/// `requested` when EffectCraft has a catalog for it, else the first of `browser` it has a
+/// catalog for and `drawable` accepts (English counts), else English: someone who prefers Dutch,
+/// then Czech, gets Czech.
+#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+fn first_supported(requested: Option<&str>, browser: &[String], drawable: impl Fn(&str) -> bool) -> &'static str {
+ let english = |t: &str| t.split(['-', '_']).next().is_some_and(|p| p.eq_ignore_ascii_case("en"));
+ requested
+ .map(|t| (t, true))
+ .into_iter()
+ .chain(browser.iter().map(|t| (t.as_str(), false)))
+ .map(|(t, asked)| (t, asked, supported(Some(t))))
+ .find(|(t, asked, code)| (*code != "en" && (*asked || drawable(code))) || english(t))
+ .map_or("en", |(_, _, code)| code)
+}
+
+/// Whether the web build can draw `language`'s interface. It installs no system fonts and its
+/// bundled faces have no CJK or Georgian glyphs, so Match System skips those browser languages
+/// rather than draw boxes; `?lang=` and a language chosen in Settings still select them.
+#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+fn web_draws(language: &str) -> bool {
+ !matches!(language, "ja" | "zh-hans" | "zh-hant" | "ka")
}
/// The language EffectCraft shows for a BCP 47 locale (`ja-JP` → `ja`, `zh-Hans-CN` → `zh-hans`,
-/// `zh-TW` → `zh-hant`, `uk-UA` → `uk`, `es-ES` → `es`, `pt-BR` → `pt-br`, `cs-CZ` → `cs`).
+/// `zh-TW` → `zh-hant`, `uk-UA` → `uk`, `es-ES` → `es`, `pt-BR` → `pt-br`, `cs-CZ` → `cs`,
+/// `ka-GE` → `ka`).
fn supported(locale: Option<&str>) -> &'static str {
let Some(locale) = locale else { return "en" };
let mut parts = locale.split(['-', '_']);
@@ -90,6 +134,7 @@ fn supported(locale: Option<&str>) -> &'static str {
"uk" => "uk",
"es" => "es",
"cs" => "cs",
+ "ka" => "ka",
// The only Portuguese catalog: Brazil's, also for Portugal rather than English.
"pt" => "pt-br",
"zh" => {
@@ -125,6 +170,13 @@ pub(crate) fn label<'a>(app: &EffectcraftApp, command: &str, source: &'a str) ->
_ => {}
}
}
+ if language == "ka" && matches!(command, "file.revealInFinder" | "layer.revealInFinder") {
+ match source {
+ "Reveal in Explorer" => return "Explorer-ში ჩვენება",
+ "Reveal in File Manager" => return "ფაილების მენეჯერში ჩვენება",
+ _ => {}
+ }
+ }
menu_catalog(language).map_or(source, |catalog| lookup(catalog, command, source))
}
@@ -141,10 +193,28 @@ fn menu_catalog(language: &str) -> Option<&'static [(&'static str, &'static str,
"fr" => FRENCH,
"de" => GERMAN,
"cs" => CZECH,
+ "ka" => GEORGIAN,
_ => return None,
})
}
+/// A command's label drawn outside the menu bar (the dock's tab titles, the workspace bar), in the
+/// language the panels draw in: the menu bar's row for (`command`, `source`), else the panel
+/// catalog's row for `source`, else `source`. `…` also finds a menu bar row written `...`.
+pub(crate) fn command_label<'a>(command: &str, source: &'a str) -> &'a str {
+ let dotted = source.strip_suffix('…').map(|stem| format!("{stem}..."));
+ let row = |key: &str| menu_catalog(ui::current())?.iter().find(|(id, en, _)| *id == command && *en == key).map(|(_, _, translated)| *translated);
+ row(source).or_else(|| row(dotted.as_deref()?)).unwrap_or_else(|| tr(source))
+}
+
+/// A Settings page's title as the menu bar's Settings submenu draws it, without the ellipsis; the
+/// panel catalog's row for pages that have no menu row. The panel catalog's "Type" is the kind
+/// (Camera Settings, the Project panel's column), while the Type page is about text.
+pub(crate) fn settings_page_title(title: &str) -> &str {
+ let menu = menu_catalog(ui::current()).and_then(|c| c.iter().find(|(id, en, _)| *id == "app.settings" && en.strip_suffix("...") == Some(title)));
+ menu.and_then(|(_, _, translated)| translated.strip_suffix("...")).unwrap_or_else(|| tr(title))
+}
+
/// `source` looked up in `catalog` by (command, English label); the source itself when the pair is
/// absent, so computed labels and user names stay verbatim.
fn lookup<'a>(catalog: &[(&str, &str, &'a str)], command: &str, source: &'a str) -> &'a str {
@@ -191,6 +261,8 @@ pub(crate) fn entry(app: &EffectcraftApp, e: &MenuEntry, shown: String) -> Strin
"es" => ("Deshacer", "No se puede deshacer", "Rehacer", "No se puede rehacer"),
"pt-br" => ("Desfazer", "Não há nada para desfazer", "Refazer", "Não há nada para refazer"),
"cs" => ("Zpět", "Není co vrátit", "Znovu", "Není co zopakovat"),
+ // A colon before the history's (untranslated) action name: "დაბრუნება: Comp1".
+ "ka" => ("დაბრუნება:", "დაბრუნება შეუძლებელია", "ხელახლა შესრულება:", "ხელახლა შესრულება შეუძლებელია"),
_ => return shown,
};
match e.command.as_str() {
@@ -300,6 +372,17 @@ pub(crate) fn submenu(app: &EffectcraftApp, source: &str, shown: String) -> Stri
return format!("Atribuir atalho à visualização 3D “{name}”");
}
}
+ "ka" => {
+ if source == "Assign Shortcut to Workspace" {
+ if let Some(name) = shown.strip_prefix("Assign Shortcut to “").and_then(|s| s.strip_suffix("” Workspace")) {
+ return format!("მალსახმობის მინიჭება სამუშაო სივრცისთვის „{name}“");
+ }
+ } else if source == "Assign Shortcut to 3D View"
+ && let Some(name) = shown.strip_prefix("Assign Shortcut to “").and_then(|s| s.strip_suffix('”'))
+ {
+ return format!("მალსახმობის მინიჭება 3D ხედისთვის „{name}“");
+ }
+ }
_ => {}
}
label(app, "", &shown).into()
@@ -6642,6 +6725,641 @@ const CZECH: &[(&str, &str, &str)] = &[
("file.openDemoProject", "Open Demo Project", "Otevřít ukázkový projekt"),
];
+/// Georgian (ka): the same (command, English label) keys as `JAPANESE`, one entry per fixed menu row.
+/// Original translations written from the meaning of the English labels, sharing the terminology of
+/// the other Craft apps' Georgian catalogs (შრე, საკვანძო კადრი, კომპოზიცია, ნიღაბი); commands are
+/// verbal nouns (შენახვა, გახსნა) and Georgian has no capital letters.
+const GEORGIAN: &[(&str, &str, &str)] = &[
+ ("", "EffectCraft", "EffectCraft"),
+ ("app.about", "About EffectCraft...", "EffectCraft-ის შესახებ..."),
+ ("", "Settings...", "პარამეტრები..."),
+ ("app.settings", "General...", "ზოგადი..."),
+ ("app.settings", "Startup & Repair...", "გაშვება და აღდგენა..."),
+ ("app.settings", "Project...", "პროექტი..."),
+ ("app.settings", "Composition...", "კომპოზიცია..."),
+ ("app.settings", "Previews...", "წინასწარი ნახვა..."),
+ ("app.settings", "Appearance...", "იერსახე..."),
+ ("app.settings", "Grids & Guides...", "ბადე და დამხმარე ხაზები..."),
+ ("app.settings", "Labels...", "იარლიყები..."),
+ ("app.settings", "Type...", "ტექსტი..."),
+ ("app.settings", "Import...", "იმპორტი..."),
+ ("app.settings", "Export...", "ექსპორტი..."),
+ ("app.settings", "Audio...", "აუდიო..."),
+ ("app.settings", "Disk...", "დისკი..."),
+ ("app.settings", "Memory & CPU...", "მეხსიერება და CPU..."),
+ ("app.settings", "Video...", "ვიდეო..."),
+ ("app.settings", "3D...", "3D..."),
+ ("app.settings", "Scripting & Expressions...", "სკრიპტები და ექსპრესიები..."),
+ ("app.hide", "Hide EffectCraft", "EffectCraft-ის დამალვა"),
+ ("app.hideOthers", "Hide Others", "სხვების დამალვა"),
+ ("app.showAll", "Show All", "ყველას ჩვენება"),
+ ("app.quit", "Quit EffectCraft", "EffectCraft-იდან გასვლა"),
+ ("", "File", "ფაილი"),
+ ("", "New", "ახალი"),
+ ("file.newProject", "New Project", "ახალი პროექტი"),
+ ("file.newFromTemplate", "New Project from Template...", "ახალი პროექტი შაბლონიდან..."),
+ ("project.newFolder", "New Folder", "ახალი საქაღალდე"),
+ ("file.open", "Open Project...", "პროექტის გახსნა..."),
+ ("", "Open Recent", "ბოლოს გახსნილი ფაილების გახსნა"),
+ ("file.clearRecent", "Clear Recent Projects", "ბოლო პროექტების სიის გასუფთავება"),
+ ("file.close", "Close", "დახურვა"),
+ ("file.closeProject", "Close Project", "პროექტის დახურვა"),
+ ("file.save", "Save", "შენახვა"),
+ ("", "Save As", "შენახვა როგორც"),
+ ("file.saveAs", "Save As...", "შენახვა როგორც..."),
+ ("file.saveCopy", "Save a Copy...", "ასლის შენახვა..."),
+ ("file.saveCopyAsXml", "Save a Copy As XML...", "ასლის შენახვა XML-ად..."),
+ ("templates.saveAs", "Save as Template...", "შაბლონად შენახვა..."),
+ ("file.incrementAndSave", "Increment and Save", "ვერსიის გაზრდით შენახვა"),
+ ("file.revert", "Revert", "წინა ვერსიაზე დაბრუნება"),
+ ("", "Import", "იმპორტი"),
+ ("file.import", "File...", "ფაილი..."),
+ ("file.importMultiple", "Multiple Files...", "რამდენიმე ფაილი..."),
+ ("file.importTimeline", "Adobe Premiere Pro Project...", "Adobe Premiere Pro-ს პროექტი..."),
+ ("file.importProject", "EffectCraft Project...", "EffectCraft-ის პროექტი..."),
+ ("file.importPlaceholder", "Placeholder...", "ჩანაცვლების ობიექტი..."),
+ ("file.importSolid", "Solid...", "სოლიდი..."),
+ ("file.importLottie", "Lottie...", "Lottie..."),
+ ("file.importVanishingPoint", "Vanishing Point (.vpe)...", "Vanishing Point (.vpe)..."),
+ ("essential.importTemplate", "Essential Graphics Template...", "ძირითადი გრაფიკის შაბლონი..."),
+ ("", "Import Recent Footage", "ბოლო ვიდეომასალის იმპორტი"),
+ ("file.clearRecentFootage", "Clear Recent Footage", "ბოლო ვიდეომასალის სიის გასუფთავება"),
+ ("", "Export", "ექსპორტი"),
+ ("renderQueue.add", "Add to Render Queue", "რენდერის რიგში დამატება"),
+ ("file.exportTimeline", "Adobe Premiere Pro Project...", "Adobe Premiere Pro-ს პროექტი..."),
+ ("file.exportLottie", "Lottie JSON...", "Lottie JSON..."),
+ ("essential.exportTemplate", "Essential Graphics Template...", "ძირითადი გრაფიკის შაბლონი..."),
+ ("app.find", "Find", "ძებნა"),
+ ("layer.addItem", "Add Footage to Comp", "ვიდეომასალის კომპოზიციაში დამატება"),
+ ("file.newCompFromSelection", "New Comp from Selection...", "ახალი კომპოზიცია მონიშნულიდან..."),
+ ("", "Dependencies", "დამოკიდებულებები"),
+ ("file.collectFiles", "Collect Files...", "ფაილების შეგროვება..."),
+ ("file.consolidateFootage", "Consolidate All Footage", "მთელი ვიდეომასალის კონსოლიდაცია"),
+ ("file.removeUnusedFootage", "Remove Unused Footage", "გამოუყენებელი ვიდეომასალის წაშლა"),
+ ("file.reduceProject", "Reduce Project", "პროექტის შემცირება"),
+ ("file.findMissing", "Find Missing Effects", "დაკარგული ეფექტების ძებნა"),
+ ("file.findMissing", "Find Missing Fonts", "დაკარგული შრიფტების ძებნა"),
+ ("file.findMissing", "Find Missing Footage", "დაკარგული ვიდეომასალის ძებნა"),
+ ("file.relinkFootage", "Relink Missing Footage...", "დაკარგული ვიდეომასალის ხელახლა დაკავშირება..."),
+ ("file.watchFolder", "Watch Folder...", "საქაღალდეზე თვალყურის დევნება..."),
+ ("", "Scripts", "სკრიპტები"),
+ ("file.installScript", "Install Script File...", "სკრიპტის ფაილის დაყენება..."),
+ ("file.installScriptUIPanel", "Install ScriptUI Panel...", "ScriptUI პანელის დაყენება..."),
+ ("file.runScript", "Run Script File...", "სკრიპტის ფაილის გაშვება..."),
+ ("", "Create Proxy", "პროქსის შექმნა"),
+ ("file.createProxy", "Still...", "სტატიკური კადრი..."),
+ ("file.createProxy", "Movie...", "ვიდეო..."),
+ ("", "Set Proxy", "პროქსის მინიჭება"),
+ ("file.setProxy", "File...", "ფაილი..."),
+ ("file.setProxyNone", "None", "არცერთი"),
+ ("", "Interpret Footage", "ვიდეომასალის ინტერპრეტაცია"),
+ ("file.interpretFootage", "Main...", "ძირითადი..."),
+ ("file.interpretProxy", "Proxy...", "პროქსი..."),
+ ("file.rememberInterpretation", "Remember Interpretation", "ინტერპრეტაციის დამახსოვრება"),
+ ("file.applyInterpretation", "Apply Interpretation", "ინტერპრეტაციის გამოყენება"),
+ ("", "Replace Footage", "ვიდეომასალის ჩანაცვლება"),
+ ("file.replaceFootage", "File...", "ფაილი..."),
+ ("file.replaceWithPlaceholder", "Placeholder...", "ჩანაცვლების ობიექტი..."),
+ ("file.replaceWithSolid", "Solid...", "სოლიდი..."),
+ ("file.replaceWithLayeredComp", "With Layered Comp", "შრეებიანი კომპოზიციით"),
+ ("file.reloadFootage", "Reload Footage", "ვიდეომასალის ხელახლა ჩატვირთვა"),
+ ("file.revealInFinder", "Reveal in Finder", "Finder-ში ჩვენება"),
+ ("file.projectSettings", "Project Settings...", "პროექტის პარამეტრები..."),
+ ("app.quit", "Exit", "გასვლა"),
+ ("", "Edit", "რედაქტირება"),
+ ("edit.undo", "Undo", "დაბრუნება"),
+ ("edit.redo", "Redo", "ხელახლა შესრულება"),
+ ("", "History", "ისტორია"),
+ ("app.commandPalette", "Quick Apply...", "სწრაფი გამოყენება..."),
+ ("edit.cut", "Cut", "ამოჭრა"),
+ ("edit.copy", "Copy", "კოპირება"),
+ ("edit.copyWithPropertyLinks", "Copy with Property Links", "კოპირება თვისებების ბმულებით"),
+ ("edit.copyWithRelativePropertyLinks", "Copy with Relative Property Links", "კოპირება თვისებების ფარდობითი ბმულებით"),
+ ("edit.copyExpressionOnly", "Copy Expression Only", "მხოლოდ ექსპრესიის კოპირება"),
+ ("edit.paste", "Paste", "ჩასმა"),
+ ("edit.pasteReversedKeyframes", "Paste Reversed Keyframes", "საკვანძო კადრების შებრუნებული ჩასმა"),
+ ("edit.pasteTextMatchFormatting", "Paste Text and Match Formatting", "ტექსტის ჩასმა ფორმატის შეთანხმებით"),
+ ("edit.pasteTextFormattingOnly", "Paste Text Formatting Only", "მხოლოდ ტექსტის ფორმატის ჩასმა"),
+ ("edit.clear", "Clear", "გასუფთავება"),
+ ("edit.duplicate", "Duplicate", "დუბლირება"),
+ ("edit.splitLayer", "Split Layer", "შრის დაყოფა"),
+ ("edit.liftWorkArea", "Lift Work Area", "სამუშაო არის აწევა"),
+ ("edit.extractWorkArea", "Extract Work Area", "სამუშაო არის ამოღება"),
+ ("edit.selectAll", "Select All", "ყველაფრის მონიშვნა"),
+ ("edit.deselectAll", "Deselect All", "ყველა მონიშვნის მოხსნა"),
+ ("", "Label", "იარლიყი"),
+ ("edit.selectLabelGroup", "Select Label Group", "იარლიყის ჯგუფის მონიშვნა"),
+ ("edit.label", "None", "არცერთი"),
+ ("edit.label", "Red", "წითელი"),
+ ("edit.label", "Yellow", "ყვითელი"),
+ ("edit.label", "Aqua", "ზღვისფერი"),
+ ("edit.label", "Pink", "ვარდისფერი"),
+ ("edit.label", "Lavender", "ლავანდისფერი"),
+ ("edit.label", "Peach", "ატმისფერი"),
+ ("edit.label", "Sea Foam", "ზღვის ქაფი"),
+ ("edit.label", "Blue", "ლურჯი"),
+ ("edit.label", "Green", "მწვანე"),
+ ("edit.label", "Purple", "იისფერი"),
+ ("edit.label", "Orange", "ნარინჯისფერი"),
+ ("edit.label", "Brown", "ყავისფერი"),
+ ("edit.label", "Fuchsia", "ფუქსია"),
+ ("edit.label", "Cyan", "ცისფერი"),
+ ("edit.label", "Sandstone", "ქვიშაქვა"),
+ ("edit.label", "Dark Green", "მუქი მწვანე"),
+ ("app.settings", "Edit Label Colors...", "იარლიყის ფერების რედაქტირება..."),
+ ("", "Select Keyframe Label Group", "საკვანძო კადრების იარლიყის ჯგუფის მონიშვნა"),
+ ("keys.selectLabelGroup", "On Selected Layers", "მონიშნულ შრეებზე"),
+ ("keys.selectLabelGroup", "On All Layers", "ყველა შრეზე"),
+ ("keys.selectLabelGroup", "Visible Keyframes on Selected Layers", "ხილული საკვანძო კადრები მონიშნულ შრეებზე"),
+ ("keys.selectLabelGroup", "Visible Keyframes on All Layers", "ხილული საკვანძო კადრები ყველა შრეზე"),
+ ("", "Purge", "გაწმენდა"),
+ ("edit.purge", "All Cache...", "მთელი ქეში..."),
+ ("edit.purge", "All Memory & Disk Cache...", "მთელი მეხსიერება და დისკის ქეში..."),
+ ("edit.purge", "All Memory", "მთელი მეხსიერება"),
+ ("edit.purge", "All Disk Cache...", "მთელი დისკის ქეში..."),
+ ("edit.purge", "All 3D Cache...", "მთელი 3D ქეში..."),
+ ("edit.purgeUndo", "Undo", "დაბრუნების ისტორია"),
+ ("edit.purge", "Image Cache Memory", "გამოსახულების ქეშის მეხსიერება"),
+ ("edit.purge", "Snapshot", "მომენტალური ასლი"),
+ ("edit.editOriginal", "Edit Original...", "ორიგინალის რედაქტირება..."),
+ ("", "Templates", "შაბლონები"),
+ ("app.templates", "Render Settings...", "რენდერის პარამეტრები..."),
+ ("app.templates", "Output Module...", "გამოტანის მოდული..."),
+ ("app.keyboardShortcuts", "Keyboard Shortcuts", "კლავიატურის მალსახმობები"),
+ ("", "Preferences", "პარამეტრები"),
+ ("", "Composition", "კომპოზიცია"),
+ ("comp.new", "New Composition...", "ახალი კომპოზიცია..."),
+ ("comp.settings", "Composition Settings...", "კომპოზიციის პარამეტრები..."),
+ ("comp.setPosterTime", "Set Poster Time", "პოსტერის დროის დაყენება"),
+ ("comp.trimToWorkArea", "Trim Comp to Work Area", "კომპოზიციის მოკვეთა სამუშაო არემდე"),
+ ("comp.cropToRegionOfInterest", "Crop Comp to Region of Interest", "კომპოზიციის ჩამოჭრა ინტერესის არემდე"),
+ ("comp.cropToLayerBounds", "Crop Comp to Selected Layer(s) Bounds", "კომპოზიციის ჩამოჭრა მონიშნული შრ(ეებ)ის საზღვრებამდე"),
+ ("render.addOutputModule", "Add Output Module", "გამოტანის მოდულის დამატება"),
+ ("", "Preview", "წინასწარი ნახვა"),
+ ("playback.toggle", "Play Current Preview", "მიმდინარე წინასწარი ნახვის დაკვრა"),
+ ("playback.cacheWhenIdle", "Cache Frames When Idle", "კადრების ქეშირება უქმობისას"),
+ ("playback.audio", "Audio", "აუდიო"),
+ ("", "Save Frame As", "კადრის შენახვა როგორც"),
+ ("comp.saveFrameAs", "File...", "ფაილი..."),
+ ("comp.saveFrameAsPsd", "Photoshop Layers...", "Photoshop-ის შრეები..."),
+ ("comp.saveFrameAsExr", "ProEXR...", "ProEXR..."),
+ ("comp.copyFrame", "Copy Frame to Clipboard", "კადრის კოპირება გაცვლის ბუფერში"),
+ ("render.preRender", "Pre-render...", "წინასწარი რენდერი..."),
+ ("render.saveCurrentPreview", "Save Current Preview...", "მიმდინარე წინასწარი ნახვის შენახვა..."),
+ ("comp.openInEssentialGraphics", "Open in Essential Graphics", "ძირითად გრაფიკაში გახსნა"),
+ ("", "Responsive Design — Time", "რესპონსიული დიზაინი — დრო"),
+ ("comp.responsiveTime", "Create Intro", "შესავლის შექმნა"),
+ ("comp.responsiveTime", "Create Outro", "დასასრულის შექმნა"),
+ ("comp.responsiveTime", "Create Protected Region from Work Area", "დაცული არის შექმნა სამუშაო არიდან"),
+ ("comp.flowchart", "Composition Flowchart", "კომპოზიციის ბლოკ-სქემა"),
+ ("comp.miniFlowchart", "Composition Mini-Flowchart", "კომპოზიციის მინი-ბლოკ-სქემა"),
+ ("", "VR", "VR"),
+ ("comp.vr.createEnvironment", "Create VR Environment...", "VR გარემოს შექმნა..."),
+ ("comp.vr.extractCubemap", "Extract Cubemap...", "კუბური რუკის ამოღება..."),
+ ("", "Layer", "შრე"),
+ ("layer.newText", "Text", "ტექსტი"),
+ ("layer.newSolid", "Solid...", "სოლიდი..."),
+ ("layer.newLight", "Light...", "სინათლე..."),
+ ("layer.newCamera", "Camera...", "კამერა..."),
+ ("layer.newNull", "Null Object", "ნულოვანი ობიექტი"),
+ ("layer.newShape", "Shape Layer", "ფიგურის შრე"),
+ ("layer.newAdjustment", "Adjustment Layer", "კორექციის შრე"),
+ ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "შიგთავსის გათვალისწინებით შევსების შრე..."),
+ ("layer.new3dPrimitive", "Cube", "კუბი"),
+ ("layer.new3dPrimitive", "Sphere", "სფერო"),
+ ("layer.new3dPrimitive", "Plane", "სიბრტყე"),
+ ("layer.new3dPrimitive", "Torus", "ტორი"),
+ ("layer.new3dPrimitive", "Cone", "კონუსი"),
+ ("layer.new3dPrimitive", "Cylinder", "ცილინდრი"),
+ ("layer.settings", "Layer Settings...", "შრის პარამეტრები..."),
+ ("layer.openLayer", "Open Layer", "შრის გახსნა"),
+ ("layer.openSource", "Open Layer Source", "შრის წყაროს გახსნა"),
+ ("layer.revealInFinder", "Reveal in Finder", "Finder-ში ჩვენება"),
+ ("", "Mask", "ნიღაბი"),
+ ("layer.addMask", "New Mask", "ახალი ნიღაბი"),
+ ("layer.mask.shape", "Mask Shape...", "ნიღბის ფორმა..."),
+ ("layer.mask.set", "Mask Feather...", "ნიღბის კიდეების შერბილება..."),
+ ("layer.mask.set", "Mask Opacity...", "ნიღბის გაუმჭვირვალობა..."),
+ ("layer.mask.set", "Mask Expansion...", "ნიღბის გაფართოება..."),
+ ("layer.mask.reset", "Reset Mask", "ნიღბის ჩამოყრა"),
+ ("layer.mask.remove", "Remove Mask", "ნიღბის წაშლა"),
+ ("layer.mask.removeAll", "Remove All Masks", "ყველა ნიღბის წაშლა"),
+ ("track.mask", "Track Mask", "ნიღბის ტრეკინგი"),
+ ("", "Mode", "რეჟიმი"),
+ ("layer.mask.mode", "None", "არცერთი"),
+ ("layer.mask.mode", "Add", "დამატება"),
+ ("layer.mask.mode", "Subtract", "გამოკლება"),
+ ("layer.mask.mode", "Intersect", "გადაკვეთა"),
+ ("layer.mask.mode", "Lighten", "გაღიავება"),
+ ("layer.mask.mode", "Darken", "ჩამუქება"),
+ ("layer.mask.mode", "Difference", "სხვაობა"),
+ ("layer.mask.invert", "Inverted", "შებრუნებული"),
+ ("layer.mask.lock", "Locked", "ჩაკეტილი"),
+ ("", "Motion Blur", "მოძრაობის გაბუნდოვნება"),
+ ("layer.mask.motionBlur", "Same As Layer", "შრის მსგავსად"),
+ ("layer.mask.motionBlur", "On", "ჩართული"),
+ ("layer.mask.motionBlur", "Off", "გამორთული"),
+ ("", "Feather Falloff", "კიდეების შერბილების მილევა"),
+ ("layer.mask.featherFalloff", "Smooth", "გლუვი"),
+ ("layer.mask.featherFalloff", "Linear", "წრფივი"),
+ ("layer.mask.unlockAll", "Unlock All Masks", "ყველა ნიღბის განბლოკვა"),
+ ("layer.mask.lockOthers", "Lock Other Masks", "სხვა ნიღბების ჩაკეტვა"),
+ ("layer.mask.hideLocked", "Hide Locked Masks", "ჩაკეტილი ნიღბების დამალვა"),
+ ("", "Mask and Shape Path", "ნიღაბი და ფიგურის ტრაექტორია"),
+ ("path.rotoBezier", "RotoBezier", "RotoBezier"),
+ ("mask.setClosed", "Closed", "შეკრული"),
+ ("path.convertToBezier", "Convert To Bezier Path", "ბეზიეს ტრაექტორიად გარდაქმნა"),
+ ("path.setFirstVertex", "Set First Vertex", "პირველი წვეროს დაყენება"),
+ ("path.freeTransform", "Free Transform Points", "წერტილების თავისუფალი გარდაქმნა"),
+ ("", "Quality", "ხარისხი"),
+ ("layer.quality", "Best", "საუკეთესო"),
+ ("layer.quality", "Draft", "მონახაზი"),
+ ("layer.quality", "Wireframe", "კარკასი"),
+ ("layer.sampling", "Bilinear", "ბიწრფივი"),
+ ("layer.sampling", "Bicubic", "ბიკუბური"),
+ ("", "Switches", "გადამრთველები"),
+ ("layer.hideOtherVideo", "Hide Other Video", "სხვა ვიდეოს დამალვა"),
+ ("layer.showAllVideo", "Show All Video", "მთელი ვიდეოს ჩვენება"),
+ ("layer.unlockAll", "Unlock All Layers", "ყველა შრის განბლოკვა"),
+ ("layer.expressions", "Enable Expressions", "ექსპრესიების ჩართვა"),
+ ("layer.expressions", "Disable Expressions", "ექსპრესიების გამორთვა"),
+ ("layer.setSwitch", "Shy", "მორცხვი"),
+ ("layer.setSwitch", "Lock", "ჩაკეტვა"),
+ ("layer.setSwitch", "Audio", "აუდიო"),
+ ("layer.setSwitch", "Video", "ვიდეო"),
+ ("layer.setSwitch", "Solo", "სოლო"),
+ ("layer.setSwitch", "Effect", "ეფექტი"),
+ ("layer.setSwitch", "Collapse", "ჩაკეცვა"),
+ ("layer.setSwitch", "Motion Blur", "მოძრაობის გაბუნდოვნება"),
+ ("layer.setSwitch", "Adjustment Layer", "კორექციის შრე"),
+ ("", "Transform", "გარდაქმნა"),
+ ("layer.transform", "Reset", "ჩამოყრა"),
+ ("layer.setTransform", "Anchor Point...", "საყრდენი წერტილი..."),
+ ("layer.setTransform", "Position...", "პოზიცია..."),
+ ("layer.setTransform", "Scale...", "მასშტაბი..."),
+ ("layer.setTransform", "Orientation...", "ორიენტაცია..."),
+ ("layer.setTransform", "Rotation...", "შემობრუნება..."),
+ ("layer.setTransform", "Opacity...", "გაუმჭვირვალობა..."),
+ ("layer.transform", "Flip Horizontal", "ჰორიზონტალურად არეკვლა"),
+ ("layer.transform", "Flip Vertical", "ვერტიკალურად არეკვლა"),
+ ("layer.transform", "Center In View", "ხედის ცენტრში მოთავსება"),
+ ("layer.centerAnchor", "Center Anchor Point in Layer Content", "საყრდენი წერტილის შრის შიგთავსის ცენტრში მოთავსება"),
+ ("layer.transform", "Fit to Comp", "კომპოზიციაში ჩატევა"),
+ ("layer.transform", "Fit to Comp Width", "კომპოზიციის სიგანეში ჩატევა"),
+ ("layer.transform", "Fit to Comp Height", "კომპოზიციის სიმაღლეში ჩატევა"),
+ ("layer.autoOrient", "Auto-Orient...", "ავტოორიენტაცია..."),
+ ("", "Time", "დრო"),
+ ("layer.enableTimeRemap", "Enable Time Remapping", "დროის გადანაწილების ჩართვა"),
+ ("layer.timeReverse", "Time-Reverse Layer", "შრის დროში შებრუნება"),
+ ("layer.timeStretch", "Time Stretch...", "დროში გაწელვა..."),
+ ("layer.freezeFrame", "Freeze Frame", "კადრის გაყინვა"),
+ ("layer.freezeOnLastFrame", "Freeze On Last Frame", "ბოლო კადრზე გაყინვა"),
+ ("layer.alignVideoToData", "Align Video to Data", "ვიდეოს მონაცემებთან სწორება"),
+ ("", "Frame Blending", "კადრების შერევა"),
+ ("layer.frameBlending", "Off", "გამორთული"),
+ ("layer.frameBlending", "Frame Mix", "კადრების ნაზავი"),
+ ("layer.frameBlending", "Pixel Motion", "პიქსელების მოძრაობა"),
+ ("layer.setSwitch", "3D Layer", "3D შრე"),
+ ("layer.setSwitch", "Guide Layer", "დამხმარე შრე"),
+ ("layer.environment", "Environment Layer", "გარემოს შრე"),
+ ("", "Markers", "მარკერები"),
+ ("layer.addMarker", "Add Marker", "მარკერის დამატება"),
+ ("layer.updateMarkersFromSource", "Update Markers From Source", "მარკერების განახლება წყაროდან"),
+ ("layer.markersLock", "Lock Markers", "მარკერების ჩაკეტვა"),
+ ("layer.deleteAllMarkers", "Delete All Markers", "ყველა მარკერის წაშლა"),
+ ("layer.setSwitch", "Preserve Transparency", "გამჭვირვალობის შენარჩუნება"),
+ ("", "Blending Mode", "შერევის რეჟიმი"),
+ ("layer.setBlendMode", "Normal", "ჩვეულებრივი"),
+ ("layer.setBlendMode", "Dissolve", "გაფანტვა"),
+ ("layer.setBlendMode", "Dancing Dissolve", "მოცეკვავე გაფანტვა"),
+ ("layer.setBlendMode", "Darken", "ჩამუქება"),
+ ("layer.setBlendMode", "Multiply", "გამრავლება"),
+ ("layer.setBlendMode", "Color Burn", "ფერით ჩამუქება"),
+ ("layer.setBlendMode", "Classic Color Burn", "კლასიკური ფერით ჩამუქება"),
+ ("layer.setBlendMode", "Linear Burn", "წრფივი ჩამუქება"),
+ ("layer.setBlendMode", "Darker Color", "უფრო მუქი ფერი"),
+ ("layer.setBlendMode", "Add", "დამატება"),
+ ("layer.setBlendMode", "Lighten", "გაღიავება"),
+ ("layer.setBlendMode", "Screen", "ეკრანი"),
+ ("layer.setBlendMode", "Color Dodge", "ფერით გაღიავება"),
+ ("layer.setBlendMode", "Classic Color Dodge", "კლასიკური ფერით გაღიავება"),
+ ("layer.setBlendMode", "Linear Dodge", "წრფივი გაღიავება"),
+ ("layer.setBlendMode", "Lighter Color", "უფრო ღია ფერი"),
+ ("layer.setBlendMode", "Overlay", "გადაფარვა"),
+ ("layer.setBlendMode", "Soft Light", "რბილი სინათლე"),
+ ("layer.setBlendMode", "Hard Light", "მკვეთრი სინათლე"),
+ ("layer.setBlendMode", "Linear Light", "წრფივი სინათლე"),
+ ("layer.setBlendMode", "Vivid Light", "კაშკაშა სინათლე"),
+ ("layer.setBlendMode", "Pin Light", "წერტილოვანი სინათლე"),
+ ("layer.setBlendMode", "Hard Mix", "მკვეთრი შერევა"),
+ ("layer.setBlendMode", "Difference", "სხვაობა"),
+ ("layer.setBlendMode", "Classic Difference", "კლასიკური სხვაობა"),
+ ("layer.setBlendMode", "Exclusion", "გამორიცხვა"),
+ ("layer.setBlendMode", "Subtract", "გამოკლება"),
+ ("layer.setBlendMode", "Divide", "გაყოფა"),
+ ("layer.setBlendMode", "Hue", "ფერის ტონი"),
+ ("layer.setBlendMode", "Saturation", "გაჯერება"),
+ ("layer.setBlendMode", "Color", "ფერი"),
+ ("layer.setBlendMode", "Luminosity", "ნათება"),
+ ("layer.setBlendMode", "Stencil Alpha", "ალფა-ტრაფარეტი"),
+ ("layer.setBlendMode", "Stencil Luma", "ლუმა-ტრაფარეტი"),
+ ("layer.setBlendMode", "Silhouette Alpha", "ალფა-სილუეტი"),
+ ("layer.setBlendMode", "Silhouette Luma", "ლუმა-სილუეტი"),
+ ("layer.setBlendMode", "Alpha Add", "ალფას დამატება"),
+ ("layer.setBlendMode", "Luminescent Premul", "მანათობელი წინასწარ გამრავლებული"),
+ ("layer.setBlendMode", "Next Blending Mode", "შემდეგი შერევის რეჟიმი"),
+ ("layer.setBlendMode", "Previous Blending Mode", "წინა შერევის რეჟიმი"),
+ ("", "Track Matte", "ტრეკ-მატი"),
+ ("layer.trackMatte", "No Track Matte", "ტრეკ-მატის გარეშე"),
+ ("layer.trackMatte", "Alpha Matte", "ალფა-მატი"),
+ ("layer.trackMatte", "Alpha Inverted Matte", "შებრუნებული ალფა-მატი"),
+ ("layer.trackMatte", "Luma Matte", "ლუმა-მატი"),
+ ("layer.trackMatte", "Luma Inverted Matte", "შებრუნებული ლუმა-მატი"),
+ ("layer.trackMatte", "Matte with Layer Above", "მატი ზედა შრით"),
+ ("layer.trackMatte", "Matte with Layer Below", "მატი ქვედა შრით"),
+ ("", "Layer Styles", "შრის სტილები"),
+ ("layer.style.options", "Layer Style Options...", "შრის სტილის პარამეტრები..."),
+ ("layer.style.convertToEditable", "Convert to Editable Styles", "რედაქტირებად სტილებად გარდაქმნა"),
+ ("layer.style.showAll", "Show All", "ყველას ჩვენება"),
+ ("layer.style.removeAll", "Remove All", "ყველას წაშლა"),
+ ("layer.style.dropShadow", "Drop Shadow", "ჩრდილი"),
+ ("layer.style.innerShadow", "Inner Shadow", "შიდა ჩრდილი"),
+ ("layer.style.outerGlow", "Outer Glow", "გარე ნათება"),
+ ("layer.style.innerGlow", "Inner Glow", "შიდა ნათება"),
+ ("layer.style.bevelEmboss", "Bevel and Emboss", "ფასკა და რელიეფი"),
+ ("layer.style.satin", "Satin", "ატლასი"),
+ ("layer.style.colorOverlay", "Color Overlay", "ფერის გადაფარვა"),
+ ("layer.style.gradientOverlay", "Gradient Overlay", "გრადიენტის გადაფარვა"),
+ ("layer.style.stroke", "Stroke", "კონტური"),
+ ("path.groupShapes", "Group Shapes", "ფიგურების დაჯგუფება"),
+ ("path.ungroupShapes", "Ungroup Shapes", "ფიგურების დაჯგუფების მოხსნა"),
+ ("", "Arrange", "დალაგება"),
+ ("layer.arrange", "Bring Layer to Front", "შრის წინა პლანზე გადმოტანა"),
+ ("layer.arrange", "Bring Layer Forward", "შრის წინ გადმოტანა"),
+ ("layer.arrange", "Send Layer Backward", "შრის უკან გადატანა"),
+ ("layer.arrange", "Send Layer to Back", "შრის უკანა პლანზე გადატანა"),
+ ("", "Reveal", "ჩვენება"),
+ ("layer.revealSource", "Reveal Layer Source in Project", "შრის წყაროს ჩვენება პროექტში"),
+ ("comp.flowchart", "Reveal Layer in Project Flowchart", "შრის ჩვენება პროექტის ბლოკ-სქემაში"),
+ ("comp.revealInProject", "Reveal Composition in Project", "კომპოზიციის ჩვენება პროექტში"),
+ ("layer.revealExpressionErrors", "Reveal Expression Errors", "ექსპრესიის შეცდომების ჩვენება"),
+ ("", "Create", "შექმნა"),
+ ("layer.create", "Convert to Editable Text", "რედაქტირებად ტექსტად გარდაქმნა"),
+ ("layer.create", "Create Shapes from Text", "ფიგურების შექმნა ტექსტიდან"),
+ ("layer.create", "Create Masks from Text", "ნიღბების შექმნა ტექსტიდან"),
+ ("layer.create", "Create Shapes from Vector Layer", "ფიგურების შექმნა ვექტორული შრიდან"),
+ ("layer.create", "Create Keyframes from Data", "საკვანძო კადრების შექმნა მონაცემებიდან"),
+ ("layer.create", "Null Controllers for Positional Points", "ნულოვანი მართვის ობიექტები პოზიციის წერტილებისთვის"),
+ ("layer.create", "Null Controllers for Path Points", "ნულოვანი მართვის ობიექტები ტრაექტორიის წერტილებისთვის"),
+ ("layer.create", "Nulls Following Path Points", "ტრაექტორიის წერტილებს მიმყოლი ნულოვანი ობიექტები"),
+ ("layer.create", "Null Tracing Along Path", "ტრაექტორიის გასწვრივ მოძრავი ნულოვანი ობიექტი"),
+ ("layer.create", "Create 3D Layer Instance", "3D შრის ეგზემპლარის შექმნა"),
+ ("", "Camera", "კამერა"),
+ ("camera.fromView", "Create Camera from 3D View", "კამერის შექმნა 3D ხედიდან"),
+ ("camera.stereoRig", "Create Stereo 3D Rig", "სტერეო 3D სისტემის შექმნა"),
+ ("camera.orbitNull", "Create Orbit Null", "ორბიტის ნულოვანი ობიექტის შექმნა"),
+ ("camera.fromModel", "Create Cameras from 3D Model", "კამერების შექმნა 3D მოდელიდან"),
+ ("camera.linkFocusToPoi", "Link Focus Distance to Point of Interest", "ფოკუსური მანძილის მიბმა ინტერესის წერტილზე"),
+ ("camera.linkFocusToLayer", "Link Focus Distance to Layer", "ფოკუსური მანძილის მიბმა შრეზე"),
+ ("camera.setFocusToLayer", "Set Focus Distance to Layer", "ფოკუსური მანძილის დაყენება შრეზე"),
+ ("layer.cameraSettings", "Camera Settings...", "კამერის პარამეტრები..."),
+ ("view.reset3DView", "Reset 3D View", "3D ხედის ჩამოყრა"),
+ ("", "Light", "სინათლე"),
+ ("light.fromModel", "Create Lights from 3D Model", "სინათლის წყაროების შექმნა 3D მოდელიდან"),
+ ("light.controlWithCamera", "Control Light with Camera", "სინათლის მართვა კამერით"),
+ ("light.environmentBackground", "Create Environment Light Background Layer", "გარემოს სინათლის ფონური შრის შექმნა"),
+ ("", "Material", "მასალა"),
+ ("material.revealSource", "Reveal Material Source in Project", "მასალის წყაროს ჩვენება პროექტში"),
+ ("material.reset", "Reset Material", "მასალის ჩამოყრა"),
+ ("material.duplicateAssign", "Duplicate and Assign Material", "მასალის დუბლირება და მინიჭება"),
+ ("layer.autoTrace", "Auto-trace...", "ავტომატური ვექტორიზაცია..."),
+ ("layer.precompose", "Pre-compose...", "კომპოზიციაში მოთავსება..."),
+ ("layer.sceneEditDetection", "Scene Edit Detection...", "სცენების ჭრილების ამოცნობა..."),
+ ("", "Effect", "ეფექტი"),
+ ("window.panel", "Effect Controls", "ეფექტის მართვა"),
+ ("effect.applyLast", "Last Effect", "ბოლო ეფექტი"),
+ ("effect.removeAll", "Remove All", "ყველას წაშლა"),
+ ("effect.manage", "Manage Effects...", "ეფექტების მართვა..."),
+ ("effect.plugins.load", "Load Effect Plug-in...", "ეფექტის პლაგინის ჩატვირთვა..."),
+ ("", "Animation", "ანიმაცია"),
+ ("anim.savePreset", "Save Animation Preset...", "ანიმაციის პრესეტის შენახვა..."),
+ ("anim.applyPreset", "Apply Animation Preset...", "ანიმაციის პრესეტის გამოყენება..."),
+ ("", "Recent Animation Presets", "ბოლო ანიმაციის პრესეტები"),
+ ("anim.clearRecentPresets", "Clear Recent Presets", "ბოლო პრესეტების სიის გასუფთავება"),
+ ("anim.browsePresets", "Browse Presets...", "პრესეტების დათვალიერება..."),
+ ("", "Text Animation Presets", "ტექსტის ანიმაციის პრესეტები"),
+ ("layer.applyTextPreset", "Typewriter", "საბეჭდი მანქანა"),
+ ("layer.applyTextPreset", "Fade Up Characters", "ასოების ამოსვლა გამოჩენით"),
+ ("layer.applyTextPreset", "Bounce In Words", "სიტყვების ხტუნვით შემოსვლა"),
+ ("layer.applyTextPreset", "Tracking In", "ასოების შეკუმშვით შემოსვლა"),
+ ("layer.applyTextPreset", "Scramble", "არევა"),
+ ("layer.applyTextPreset", "Blur In", "გამოჩენა გაბუნდოვნებიდან"),
+ ("layer.applyTextPreset", "Jitter", "კანკალი"),
+ ("layer.applyTextPreset", "Drop In Lines", "სტრიქონების ჩამოვარდნა"),
+ ("anim.addKeyframe", "Add Keyframe", "საკვანძო კადრის დამატება"),
+ ("keys.toggleHold", "Toggle Hold Keyframe", "ფიქსირებული საკვანძო კადრის გადართვა"),
+ ("keys.interpolation", "Keyframe Interpolation...", "საკვანძო კადრის ინტერპოლაცია..."),
+ ("keys.velocity", "Keyframe Velocity...", "საკვანძო კადრის სიჩქარე..."),
+ ("", "Keyframe Assistant", "საკვანძო კადრების ასისტენტი"),
+ ("keys.audioToKeyframes", "Convert Audio to Keyframes", "აუდიოს საკვანძო კადრებად გარდაქმნა"),
+ ("prop.convertExpressionToKeyframes", "Convert Expression to Keyframes", "ექსპრესიის საკვანძო კადრებად გარდაქმნა"),
+ ("keys.easyEase", "Easy Ease", "რბილი შენელება"),
+ ("keys.easyEaseIn", "Easy Ease In", "რბილი შენელება შესვლისას"),
+ ("keys.easyEaseOut", "Easy Ease Out", "რბილი შენელება გამოსვლისას"),
+ ("keys.exponentialScale", "Exponential Scale", "ექსპონენციალური მასშტაბი"),
+ ("keys.rpfCameraImport", "RPF Camera Import", "RPF კამერის იმპორტი"),
+ ("layer.sequence", "Sequence Layers...", "შრეების თანმიმდევრობით განლაგება..."),
+ ("keys.timeReverse", "Time-Reverse Keyframes", "საკვანძო კადრების დროში შებრუნება"),
+ ("", "Animate Text", "ტექსტის ანიმირება"),
+ ("layer.enablePerChar3D", "Enable Per-character 3D", "თითოეული ასოს 3D-ს ჩართვა"),
+ ("layer.addTextAnimator", "Anchor Point", "საყრდენი წერტილი"),
+ ("layer.addTextAnimator", "Position", "პოზიცია"),
+ ("layer.addTextAnimator", "Scale", "მასშტაბი"),
+ ("layer.addTextAnimator", "Skew", "დახრა"),
+ ("layer.addTextAnimator", "Rotation", "შემობრუნება"),
+ ("layer.addTextAnimator", "Opacity", "გაუმჭვირვალობა"),
+ ("layer.addTextAnimator", "All Transform Properties", "გარდაქმნის ყველა თვისება"),
+ ("", "Fill Color", "შევსების ფერი"),
+ ("layer.addTextAnimator", "RGB", "RGB"),
+ ("layer.addTextAnimator", "Hue", "ფერის ტონი"),
+ ("layer.addTextAnimator", "Saturation", "გაჯერება"),
+ ("layer.addTextAnimator", "Brightness", "სიკაშკაშე"),
+ ("", "Stroke Color", "კონტურის ფერი"),
+ ("layer.addTextAnimator", "Stroke Width", "კონტურის სისქე"),
+ ("", "Front", "წინა მხარე"),
+ ("", "Bevel", "წაკვეთა"),
+ ("", "Side", "გვერდითი მხარე"),
+ ("", "Back", "უკანა მხარე"),
+ ("layer.addTextAnimator", "Color", "ფერი"),
+ ("layer.addTextAnimator", "Tracking", "ასოთაშორისი ინტერვალი"),
+ ("layer.addTextAnimator", "Line Anchor", "სტრიქონის საყრდენი"),
+ ("layer.addTextAnimator", "Line Spacing", "სტრიქონთა დაშორება"),
+ ("layer.addTextAnimator", "Character Offset", "ასოს წანაცვლება"),
+ ("layer.addTextAnimator", "Character Value", "ასოს მნიშვნელობა"),
+ ("layer.addTextAnimator", "Blur", "გაბუნდოვნება"),
+ ("text.animatorFontAxes", "Variable Font Axes", "ცვლადი შრიფტის ღერძები"),
+ ("", "Add Text Selector", "ტექსტის სელექტორის დამატება"),
+ ("text.addSelector", "Range", "დიაპაზონი"),
+ ("text.addSelector", "Wiggly", "რხევითი"),
+ ("text.addSelector", "Expression", "ექსპრესია"),
+ ("text.removeAllAnimators", "Remove All Text Animators", "ტექსტის ყველა ანიმატორის წაშლა"),
+ ("prop.setExpression", "Add Expression", "ექსპრესიის დამატება"),
+ ("essential.addProperty", "Add Property to Essential Graphics", "თვისების დამატება ძირითად გრაფიკაში"),
+ ("prop.separateDimensions", "Separate Dimensions", "განზომილებების გაყოფა"),
+ ("track.camera", "Track Camera", "კამერის ტრეკინგი"),
+ ("track.warpStabilizer", "Warp Stabilizer VFX", "Warp Stabilizer VFX"),
+ ("track.motion", "Track Motion", "მოძრაობის ტრეკინგი"),
+ ("track.stabilize", "Stabilize Motion", "მოძრაობის სტაბილიზაცია"),
+ ("track.property", "Track this Property", "ამ თვისების ტრეკინგი"),
+ ("anim.reveal", "Reveal Properties with Keyframes", "საკვანძო კადრების მქონე თვისებების ჩვენება"),
+ ("anim.reveal", "Reveal Properties with Animation", "ანიმაციის მქონე თვისებების ჩვენება"),
+ ("anim.reveal", "Reveal All Modified Properties", "ყველა შეცვლილი თვისების ჩვენება"),
+ ("", "View", "ხედი"),
+ ("view.newViewer", "New Viewer", "ახალი დამთვალიერებელი"),
+ ("view.splitLockedViewer", "Split with New Locked Viewer", "დაყოფა ახალი ჩაკეტილი დამთვალიერებელით"),
+ ("view.zoomIn", "Zoom In", "გადიდება"),
+ ("view.zoomOut", "Zoom Out", "დაპატარავება"),
+ ("", "Resolution", "გარჩევადობა"),
+ ("view.res.full", "Full", "სრული"),
+ ("view.res.half", "Half", "ნახევარი"),
+ ("view.res.third", "Third", "მესამედი"),
+ ("view.res.quarter", "Quarter", "მეოთხედი"),
+ ("view.res.custom", "Custom...", "მორგებული..."),
+ ("view.displayColorManagement", "Use Display Color Management", "ეკრანის ფერთა მართვის გამოყენება"),
+ ("", "Simulate Output", "გამოტანის იმიტაცია"),
+ ("view.simulateOutput", "No Output Simulation", "გამოტანის იმიტაციის გარეშე"),
+ ("view.simulateOutput", "HDTV (Rec. 709)", "HDTV (Rec. 709)"),
+ ("view.simulateOutput", "SDTV NTSC", "SDTV NTSC"),
+ ("view.simulateOutput", "SDTV PAL", "SDTV PAL"),
+ ("view.simulateOutput", "Legacy Macintosh RGB (Gamma 1.8)", "ძველი Macintosh RGB (გამა 1.8)"),
+ ("view.simulateOutput", "Internet Standard RGB (sRGB)", "ინტერნეტის სტანდარტული RGB (sRGB)"),
+ ("view.simulateOutput", "UHDTV (Rec. 2020)", "UHDTV (Rec. 2020)"),
+ ("view.simulateOutput", "Display P3", "Display P3"),
+ ("view.simulateOutput", "Linear (1.0 Gamma)", "წრფივი (გამა 1.0)"),
+ ("view.customRgb", "My Custom RGB...", "ჩემი მორგებული RGB..."),
+ ("view.simulateOutput", "Custom...", "მორგებული..."),
+ ("view.rulers", "Show Rulers", "სახაზავების ჩვენება"),
+ ("", "Panel Background Color", "პანელის ფონის ფერი"),
+ ("view.panelBackground", "Black", "შავი"),
+ ("view.panelBackground", "Dark Gray", "მუქი ნაცრისფერი"),
+ ("view.panelBackground", "Medium Gray (Default)", "საშუალო ნაცრისფერი (ნაგულისხმევი)"),
+ ("view.panelBackground", "Light Gray", "ღია ნაცრისფერი"),
+ ("view.panelBackground", "White", "თეთრი"),
+ ("view.panelBackground", "Custom", "მორგებული"),
+ ("view.panelBackground", "Select Custom Background Color...", "მორგებული ფონის ფერის არჩევა..."),
+ ("view.guides", "Show Guides", "დამხმარე ხაზების ჩვენება"),
+ ("view.snapToGuides", "Snap to Guides", "დამხმარე ხაზებზე მიბმა"),
+ ("view.lockGuides", "Lock Guides", "დამხმარე ხაზების ჩაკეტვა"),
+ ("view.addGuide", "Add Guide...", "დამხმარე ხაზის დამატება..."),
+ ("view.addPercentGuide", "Add Percentage Guide...", "პროცენტული დამხმარე ხაზის დამატება..."),
+ ("view.convertGuides", "Convert Guides to Percentage", "დამხმარე ხაზების პროცენტულად გარდაქმნა"),
+ ("view.convertGuides", "Convert Guides to Pixels", "დამხმარე ხაზების პიქსელებად გარდაქმნა"),
+ ("view.clearGuides", "Clear Guides", "დამხმარე ხაზების გასუფთავება"),
+ ("view.importGuides", "Import Guides...", "დამხმარე ხაზების იმპორტი..."),
+ ("view.exportGuides", "Export Guides...", "დამხმარე ხაზების ექსპორტი..."),
+ ("view.grid", "Show Grid", "ბადის ჩვენება"),
+ ("view.snapToGrid", "Snap to Grid", "ბადეზე მიბმა"),
+ ("view.snapping", "Snapping", "მიბმა"),
+ ("view.options", "View Options...", "ხედის პარამეტრები..."),
+ ("view.layerControls", "Show Layer Controls", "შრის მართვის ელემენტების ჩვენება"),
+ ("", "Switch View Layout", "ხედების განლაგების გადართვა"),
+ ("view.layout", "1 View", "1 ხედი"),
+ ("view.layout", "2 Views", "2 ხედი"),
+ ("view.layout", "4 Views", "4 ხედი"),
+ ("view.shareViewOptions", "Share View Options", "ხედის პარამეტრების გაზიარება"),
+ ("", "Switch 3D View", "3D ხედის გადართვა"),
+ ("view.3d.activeCamera", "Active Camera", "აქტიური კამერა"),
+ ("view.3d.default", "Default", "ნაგულისხმევი"),
+ ("view.3d.front", "Front", "წინიდან"),
+ ("view.3d.left", "Left", "მარცხნიდან"),
+ ("view.3d.top", "Top", "ზემოდან"),
+ ("view.3d.back", "Back", "უკნიდან"),
+ ("view.3d.right", "Right", "მარჯვნიდან"),
+ ("view.3d.bottom", "Bottom", "ქვემოდან"),
+ ("view.3d.custom1", "Custom View 1", "მორგებული ხედი 1"),
+ ("view.3d.custom2", "Custom View 2", "მორგებული ხედი 2"),
+ ("view.3d.custom3", "Custom View 3", "მორგებული ხედი 3"),
+ ("", "Assign Shortcut to 3D View", "მალსახმობის მინიჭება 3D ხედისთვის"),
+ ("view.3d.last", "Switch to Last 3D View", "ბოლო 3D ხედზე გადართვა"),
+ ("view.lookAtSelected", "Look at Selected Layers", "მონიშნული შრეების დათვალიერება"),
+ ("view.lookAtAll", "Look at All Layers", "ყველა შრის დათვალიერება"),
+ ("time.set", "Go to Time...", "დროზე გადასვლა..."),
+ ("view.fullScreen", "Enter Full Screen", "სრულეკრანიან რეჟიმში გადასვლა"),
+ ("", "Window", "ფანჯარა"),
+ ("", "Workspace", "სამუშაო სივრცე"),
+ ("window.workspace", "Default", "ნაგულისხმევი"),
+ ("window.workspace", "Review", "განხილვა"),
+ ("window.workspace", "Learn", "სწავლა"),
+ ("window.workspace", "Small Screen", "პატარა ეკრანი"),
+ ("window.workspace", "Standard", "სტანდარტული"),
+ ("window.workspace", "All Panels", "ყველა პანელი"),
+ ("window.workspace", "Animation", "ანიმაცია"),
+ ("window.workspace", "Color", "ფერი"),
+ ("window.workspace", "Effects", "ეფექტები"),
+ ("window.workspace", "Essential Graphics", "ძირითადი გრაფიკა"),
+ ("window.workspace", "Minimal", "მინიმალური"),
+ ("window.workspace", "Motion Tracking", "მოძრაობის ტრეკინგი"),
+ ("window.workspace", "Paint", "ხატვა"),
+ ("window.workspace", "Text", "ტექსტი"),
+ ("window.workspace", "Undocked Panels", "მოხსნილი პანელები"),
+ ("window.resetWorkspace", "Reset to Saved Layout", "შენახულ განლაგებაზე დაბრუნება"),
+ ("window.saveWorkspace", "Save Changes to this Workspace", "ამ სამუშაო სივრცეში ცვლილებების შენახვა"),
+ ("window.saveWorkspaceAs", "Save as New Workspace...", "ახალ სამუშაო სივრცედ შენახვა..."),
+ ("window.editWorkspaces", "Edit Workspaces...", "სამუშაო სივრცეების რედაქტირება..."),
+ ("", "Assign Shortcut to Workspace", "მალსახმობის მინიჭება სამუშაო სივრცისთვის"),
+ ("window.panel", "Align", "სწორება"),
+ ("window.panel", "Audio", "აუდიო"),
+ ("window.panel", "Brushes", "ფუნჯები"),
+ ("window.panel", "Character", "სიმბოლო"),
+ ("window.panel", "Content-Aware Fill", "შიგთავსის გათვალისწინებით შევსება"),
+ ("window.panel", "Effects & Presets", "ეფექტები და პრესეტები"),
+ ("window.panel", "Essential Graphics", "ძირითადი გრაფიკა"),
+ ("window.panel", "Info", "ინფორმაცია"),
+ ("help.inAppTutorials", "Learn", "სწავლა"),
+ ("window.panel", "Lumetri Scopes", "Lumetri Scopes"),
+ ("window.panel", "Mask Interpolation", "ნიღბის ინტერპოლაცია"),
+ ("window.panel", "Media Browser", "მედიის ბრაუზერი"),
+ ("window.panel", "Metadata", "მეტამონაცემები"),
+ ("window.panel", "Motion Sketch", "მოძრაობის ესკიზი"),
+ ("window.panel", "Paint", "ხატვა"),
+ ("window.panel", "Paragraph", "აბზაცი"),
+ ("window.panel", "Preview", "წინასწარი ნახვა"),
+ ("window.panel", "Progress", "პროგრესი"),
+ ("window.panel", "Properties", "თვისებები"),
+ ("window.panel", "Script Console", "სკრიპტის კონსოლი"),
+ ("window.panel", "Smoother", "დამგლუვებელი"),
+ ("window.panel", "Tools", "ხელსაწყოები"),
+ ("window.panel", "Tracker", "ტრეკერი"),
+ ("window.panel", "Wiggler", "რხევის გენერატორი"),
+ ("window.panel", "Composition", "კომპოზიცია"),
+ ("window.panel", "Flowchart", "ბლოკ-სქემა"),
+ ("window.panel", "Footage", "ვიდეომასალა"),
+ ("window.panel", "Layer", "შრე"),
+ ("window.panel", "Project", "პროექტი"),
+ ("window.panel", "Render Queue", "რენდერის რიგი"),
+ ("window.panel", "Timeline", "დროის ხაზი"),
+ ("window.panel", "Create Nulls From Paths", "ნულოვანი ობიექტების შექმნა ტრაექტორიებიდან"),
+ ("window.panel", "VR Comp Editor", "VR კომპოზიციის რედაქტორი"),
+ ("", "Help", "დახმარება"),
+ ("help.docs", "EffectCraft Help...", "EffectCraft-ის დახმარება..."),
+ ("help.docs", "Scripting Help...", "სკრიპტების დახმარება..."),
+ ("help.docs", "Expression Reference...", "ექსპრესიების ცნობარი..."),
+ ("help.docs", "Effect Reference...", "ეფექტების ცნობარი..."),
+ ("anim.browsePresets", "Animation Presets...", "ანიმაციის პრესეტები..."),
+ ("app.keyboardShortcuts", "Keyboard Shortcuts...", "კლავიატურის მალსახმობები..."),
+ ("help.inAppTutorials", "In-App Tutorials...", "აპის შიგნით გაკვეთილები..."),
+ ("help.onlineTutorials", "Online Tutorials...", "ონლაინ გაკვეთილები..."),
+ ("help.systemReport", "System Compatibility Report...", "სისტემის თავსებადობის ანგარიში..."),
+ ("help.enableLogging", "Enable Logging", "ჟურნალის ჩართვა"),
+ ("help.revealLogFile", "Reveal Logging File", "ჟურნალის ფაილის ჩვენება"),
+ ("help.discord", "Join the ArtCraft Discord...", "შემოუერთდით ArtCraft-ის Discord-ს..."),
+ ("help.reportIssue", "Provide Feedback...", "გამოხმაურების გაგზავნა..."),
+ ("help.website", "ArtCraft Website", "ArtCraft-ის ვებსაიტი"),
+ ("help.appPage", "EffectCraft Home Page", "EffectCraft-ის საწყისი გვერდი"),
+ ("help.github", "EffectCraft on GitHub", "EffectCraft GitHub-ზე"),
+ ("file.openDemoProject", "Open Demo Project", "სადემონსტრაციო პროექტის გახსნა"),
+];
+
#[cfg(test)]
mod tests {
use super::*;
@@ -6649,138 +7367,53 @@ mod tests {
use serde_json::json;
use std::collections::BTreeSet;
+ /// Labels drawn outside the menu bar take the menu bar's row for their command (with `…` for
+ /// `...`), else the panel catalog's row, else stay as they are.
#[test]
- fn czech_translates_menus_without_changing_bindings_or_user_names() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "en"})).unwrap();
- app.session.prefs.push_recent("File.ecproj");
- let en = crate::native_menu::build(&app);
- let state = crate::native_menu::state_key(&app);
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "cs"})).unwrap();
- let cs = crate::native_menu::build(&app);
- assert_eq!(language(&app), "cs");
- assert!(czech(&app));
- assert_eq!(code("cs"), "cs");
- assert_ne!(state, crate::native_menu::state_key(&app));
- let bindings = |menu: &crate::native_menu::NativeMenu| {
- menu.items().into_iter().map(|i| (i.id.clone(), i.command.clone(), i.params.clone(), i.shortcut.clone(), i.enabled, i.checked)).collect::>()
- };
- assert_eq!(bindings(&en), bindings(&cs));
- assert!(cs.items().iter().any(|i| i.command == "comp.new" && i.label == "Nová kompozice..."));
- assert!(cs.items().iter().any(|i| i.command == "layer.newText" && i.label == "Text"));
- assert!(cs.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "Snadné zpomalení"));
- assert!(cs.items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
- for (source, translated) in [
- ("File", "Soubor"),
- ("Edit", "Úpravy"),
- ("Composition", "Kompozice"),
- ("Layer", "Vrstva"),
- ("Effect", "Efekt"),
- ("Animation", "Animace"),
- ("View", "Zobrazení"),
- ("Window", "Okno"),
- ("Help", "Nápověda"),
- ] {
- assert_eq!(label(&app, "", source), translated);
- }
- assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- let panel =
- MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel": "layer"}), shortcut: None, alt_shortcuts: vec![] };
- assert_eq!(entry(&app, &panel, "Layer: File Čeština".into()), "Vrstva: File Čeština");
- assert_eq!(
- submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “File Čeština” Workspace".into()),
- "Přiřadit zkratku pracovnímu prostoru „File Čeština“"
- );
- assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Přiřadit zkratku 3D zobrazení „Top“");
- assert_eq!(submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to Workspace".into()), "Přiřadit zkratku pracovnímu prostoru");
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "en"})).unwrap();
- assert_eq!(crate::native_menu::build(&app), en);
+ fn command_label_reads_the_menu_row_then_the_panel_row() {
+ set_current("zh-hans");
+ assert_eq!(command_label("window.panel", "Project"), lookup(SIMPLIFIED_CHINESE, "window.panel", "Project"));
+ let (command, en, translated) = SIMPLIFIED_CHINESE.iter().find(|(c, en, _)| !c.is_empty() && en.ends_with("...")).expect("a menu row ending in ...");
+ assert_eq!(command_label(command, &format!("{}…", en.trim_end_matches("..."))), *translated);
+ assert_eq!(command_label("no.such.command", "Cancel"), tr("Cancel"));
+ assert_eq!(command_label("window.panel", "Comp 1"), "Comp 1");
+ set_current("en");
+ assert_eq!(command_label("window.panel", "Project"), "Project");
}
#[test]
- fn czech_undo_redo_keeps_history_labels_verbatim() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "cs"})).unwrap();
- let undo = MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
- let redo = MenuEntry { label: "Redo".into(), command: "edit.redo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
- assert_eq!(entry(&app, &undo, "Can't Undo".into()), "Není co vrátit");
- assert_eq!(entry(&app, &redo, "Can't Redo".into()), "Není co zopakovat");
- app.session.history.undo.push(("File Čeština".into(), app.session.project.clone()));
- app.session.history.redo.push(("Text Čeština".into(), app.session.project.clone()));
- assert_eq!(entry(&app, &undo, "Undo File Čeština".into()), "Zpět File Čeština");
- assert_eq!(entry(&app, &redo, "Redo Text Čeština".into()), "Znovu Text Čeština");
+ fn settings_page_titles_read_the_menu_row() {
+ set_current("zh-hans");
+ let menu_row = lookup(SIMPLIFIED_CHINESE, "app.settings", "Type...");
+ assert_eq!(settings_page_title("Type"), menu_row.trim_end_matches("..."));
+ assert_ne!(settings_page_title("Type"), tr("Type"), "the page is about text, the panel row is the kind");
+ assert_eq!(settings_page_title("Roto Brush"), tr("Roto Brush"));
+ set_current("en");
+ assert_eq!(settings_page_title("Type"), "Type");
}
#[test]
- fn german_reveal_labels_follow_the_platform_file_manager() {
- // As `czech_…` and `ukrainian_…` do. Asserted through `label`, not `entry`: `entry`
- // returns the English for German, Russian and French, which have catalogues but are
- // not wired into the menus (see the undo/redo match in `entry` and `supported`).
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "de"})).unwrap();
- for command in ["file.revealInFinder", "layer.revealInFinder"] {
- for (source, translated) in [
- ("Reveal in Finder", "Im Finder anzeigen"),
- ("Reveal in Explorer", "Im Explorer anzeigen"),
- ("Reveal in File Manager", "Im Dateimanager anzeigen"),
- ] {
- assert_eq!(label(&app, command, source), translated, "{command} / {source}");
- // Another command keeps a label that merely looks like one of these.
- assert_eq!(label(&app, "file.openRecent", source), source);
- }
- assert_eq!(label(&app, command, "My file.mp4"), "My file.mp4", "a user's filename is never looked up");
- }
+ fn match_system_takes_the_first_browser_language_with_a_catalog() {
+ let tags = |t: &[&str]| t.iter().map(|s| s.to_string()).collect::>();
+ let any = |_: &str| true;
+ assert_eq!(super::first_supported(None, &tags(&["cs-CZ", "cs", "en"]), any), "cs");
+ assert_eq!(super::first_supported(None, &tags(&["nl-NL", "cs"]), any), "cs");
+ assert_eq!(super::first_supported(None, &tags(&["en-US", "cs"]), any), "en");
+ assert_eq!(super::first_supported(None, &tags(&["nl-NL"]), any), "en");
+ assert_eq!(super::first_supported(None, &tags(&[]), any), "en");
+ assert_eq!(super::first_supported(Some("uk"), &tags(&["cs"]), any), "uk");
+ assert_eq!(super::first_supported(Some("nl"), &tags(&["cs"]), any), "cs");
}
+ /// The web build installs no CJK or Georgian font: Match System passes over those browser
+ /// languages, while `?lang=` still selects them.
#[test]
- fn german_menu_labels_name_what_their_command_does() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "de"})).unwrap();
- // "Ebenenreihenfolge umkehren" reads as reversing the stacking order, not time, and
- // "Formate" are formats, not layer styles (#1443).
- assert_eq!(label(&app, "layer.timeReverse", "Time-Reverse Layer"), "Ebene zeitlich umkehren");
- assert_eq!(label(&app, "keys.timeReverse", "Time-Reverse Keyframes"), "Keyframes zeitlich umkehren");
- assert_eq!(label(&app, "layer.style.convertToEditable", "Convert to Editable Styles"), "In bearbeitbare Stile umwandeln");
- }
-
- #[test]
- fn german_uses_one_word_per_term() {
- let german: Vec<&str> = GERMAN.iter().map(|(_, _, de)| *de).collect();
- let with = |needle: &str| german.iter().filter(|de| de.contains(needle)).copied().collect::>();
- // "Expression" is "Ausdruck", not the English word.
- assert!(with("Expression").is_empty(), "{:?}", with("Expression"));
- // "Track" as a verb is "verfolgen", not "tracken".
- assert!(with("tracken").is_empty(), "{:?}", with("tracken"));
- // "Reveal " is "anzeigen". ("einblenden" stays right for "Show All",
- // "Fade from Blur" and the like, so only the Reveal entries are checked.)
- let reveal: Vec<&str> =
- GERMAN.iter().filter(|(_, en, _)| en.starts_with("Reveal")).map(|(_, _, de)| *de).filter(|de| !de.to_lowercase().contains("anzeigen")).collect();
- assert!(reveal.is_empty(), "{reveal:?}");
- // One spelling of "to the front".
- let vorn: Vec<&str> = german.iter().filter(|de| de.ends_with("nach vorn")).copied().collect();
- assert!(vorn.is_empty(), "{vorn:?}");
- // The terms those entries joined are still the majority ones.
- assert!(with("verfolgen").len() >= 4, "{:?}", with("verfolgen"));
- assert!(with("anzeigen").len() >= 12, "{}", with("anzeigen").len());
- }
-
- #[test]
- fn czech_reveal_labels_follow_the_platform_file_manager() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "cs"})).unwrap();
- for command in ["file.revealInFinder", "layer.revealInFinder"] {
- for (source, translated) in [
- ("Reveal in Finder", "Zobrazit ve Finderu"),
- ("Reveal in Explorer", "Zobrazit v Průzkumníku"),
- ("Reveal in File Manager", "Zobrazit ve správci souborů"),
- ] {
- let e = MenuEntry { label: source.into(), command: command.into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
- assert_eq!(label(&app, command, source), translated);
- assert_eq!(entry(&app, &e, source.into()), translated);
- assert_eq!(label(&app, "file.openRecent", source), source);
- }
- assert_eq!(label(&app, command, "My file.mp4"), "My file.mp4");
- }
+ fn web_match_system_skips_languages_without_a_font() {
+ let tags = |t: &[&str]| t.iter().map(|s| s.to_string()).collect::>();
+ assert_eq!(super::first_supported(None, &tags(&["ja-JP", "zh-CN", "zh-TW", "ka-GE", "cs"]), super::web_draws), "cs");
+ assert_eq!(super::first_supported(None, &tags(&["ka"]), super::web_draws), "en");
+ assert_eq!(super::first_supported(Some("ka"), &tags(&["cs"]), super::web_draws), "ka");
+ assert_eq!(super::first_supported(Some("ja"), &tags(&[]), super::web_draws), "ja");
}
fn keys(nodes: &[MenuNode], out: &mut BTreeSet<(String, String)>) {
@@ -6798,88 +7431,69 @@ mod tests {
}
}
+ /// The fixed menu entries `code` has no row for. `@effects` is the generated plug-in catalog,
+ /// whose effect names come from the effect catalog instead.
+ fn missing_menu_entries(code: &str) -> Vec {
+ let catalog = menu_catalog(code).unwrap_or_default();
+ // A label the tree repeats (one command in two menus) counts once.
+ let mut missing = Vec::new();
+ let mut seen = BTreeSet::new();
+ for line in TREE.lines() {
+ let line = line.trim().trim_start_matches("[mac] ").trim_start_matches("[!mac] ");
+ if line.is_empty() || line == "---" || line.starts_with('@') {
+ continue;
+ }
+ let mut parts = line.split(" | ");
+ let Some(en) = parts.next() else { continue };
+ let command = parts.next().and_then(|p| p.split_whitespace().next()).unwrap_or("");
+ if !catalog.iter().any(|(id, source, _)| *id == command && *source == en) && seen.insert((command, en)) {
+ missing.push(en.to_string());
+ }
+ }
+ missing
+ }
+
+ /// Lists, per language, the interface strings with no translation, which show in English. It
+ /// always passes: a missing translation never blocks a change. `cargo xtask ci` runs it.
#[test]
- fn every_translation_key_exists_in_the_actual_menu_tree() {
+ fn missing_translations_report() {
+ const SHOWN: usize = 12;
+ println!("Missing translations (shown in English):");
+ let mut total = 0;
+ for code in CATALOG_CODES {
+ let catalogs = [("menus", missing_menu_entries(code)), ("panels", ui::missing(code)), ("effects", effects::missing(code))];
+ let count: usize = catalogs.iter().map(|(_, missing)| missing.len()).sum();
+ total += count;
+ println!("{code}: {count}");
+ for (catalog, missing) in &catalogs {
+ if missing.is_empty() {
+ continue;
+ }
+ let shown: Vec<&String> = missing.iter().take(SHOWN).collect();
+ let more = missing.len().saturating_sub(SHOWN);
+ let more = if more > 0 { format!(" … and {more} more") } else { String::new() };
+ println!(" {catalog} ({}): {shown:?}{more}", missing.len());
+ }
+ }
+ println!("total: {total}");
+ }
+
+ #[test]
+ fn menu_catalogs_have_no_stale_or_duplicate_rows() {
let mut actual = BTreeSet::new();
for mac in [false, true] {
keys(&parse(TREE, mac).unwrap(), &mut actual);
}
- let mut japanese_keys = BTreeSet::new();
- let mut chinese_keys = BTreeSet::new();
- let mut traditional_keys = BTreeSet::new();
- let mut ukrainian_keys = BTreeSet::new();
- let mut spanish_keys = BTreeSet::new();
- let mut portuguese_keys = BTreeSet::new();
- let mut russian_keys = BTreeSet::new();
- let mut french_keys = BTreeSet::new();
- let mut german_keys = BTreeSet::new();
- let mut czech_keys = BTreeSet::new();
- for (catalog, unique) in [
- (JAPANESE, &mut japanese_keys),
- (SIMPLIFIED_CHINESE, &mut chinese_keys),
- (TRADITIONAL_CHINESE, &mut traditional_keys),
- (UKRAINIAN, &mut ukrainian_keys),
- (SPANISH, &mut spanish_keys),
- (PORTUGUESE, &mut portuguese_keys),
- (RUSSIAN, &mut russian_keys),
- (FRENCH, &mut french_keys),
- (GERMAN, &mut german_keys),
- (CZECH, &mut czech_keys),
- ] {
+ for code in CATALOG_CODES {
+ let catalog = menu_catalog(code).unwrap();
+ let mut unique = BTreeSet::new();
for (command, en, translated) in catalog {
let key = (command.to_string(), en.to_string());
- assert!(actual.contains(&key), "stale translation: {key:?}");
- assert!(unique.insert(key), "duplicate translation: {command} / {en}");
- assert!(!translated.is_empty());
- }
- // All fixed TREE entries are covered; @effects is a generated plug-in catalog,
- // whose product/effect names are intentionally left as registered.
- for line in TREE.lines() {
- let line = line.trim().trim_start_matches("[mac] ").trim_start_matches("[!mac] ");
- if line.is_empty() || line == "---" || line.starts_with('@') {
- continue;
- }
- let mut parts = line.split(" | ");
- let en = parts.next().unwrap();
- let command = parts.next().and_then(|p| p.split_whitespace().next()).unwrap_or("");
- assert!(unique.contains(&(command.into(), en.into())), "untranslated fixed entry: {line}");
+ assert!(actual.contains(&key), "{code}: stale translation: {key:?}");
+ assert!(unique.insert(key), "{code}: duplicate translation: {command} / {en}");
+ assert!(!translated.is_empty(), "{code}: empty translation: {command} / {en}");
}
}
- // Every translated language covers exactly the same entries.
- assert_eq!(japanese_keys, chinese_keys, "the languages must translate the same entries");
- assert_eq!(chinese_keys, traditional_keys, "the languages must translate the same entries");
- assert_eq!(traditional_keys, spanish_keys, "the languages must translate the same entries");
- assert_eq!(spanish_keys, portuguese_keys, "the languages must translate the same entries");
- assert_eq!(japanese_keys, ukrainian_keys, "the languages must translate the same entries");
- assert_eq!(ukrainian_keys, russian_keys, "the languages must translate the same entries");
- assert_eq!(russian_keys, french_keys, "the languages must translate the same entries");
- assert_eq!(french_keys, german_keys, "the languages must translate the same entries");
- assert_eq!(japanese_keys, czech_keys, "the languages must translate the same entries");
- }
-
- /// Exercise each engine spelling on every host: a macOS-only run must still catch a
- /// Windows/Linux catalog miss, while filenames and unrelated commands stay untouched.
- #[test]
- fn ukrainian_reveal_labels_follow_the_platform_file_manager() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "uk"})).unwrap();
- for command in ["file.revealInFinder", "layer.revealInFinder"] {
- for (source, translated) in [
- ("Reveal in Finder", "Показати у Finder"),
- ("Reveal in Explorer", "Показати у Провіднику"),
- ("Reveal in File Manager", "Показати у файловому менеджері"),
- ] {
- let e =
- MenuEntry { label: source.into(), command: command.into(), params: json!({"item": "My file.mp4"}), shortcut: None, alt_shortcuts: vec![] };
- assert_eq!(label(&app, command, source), translated);
- assert_eq!(entry(&app, &e, source.into()), translated);
- assert_eq!(label(&app, "file.openRecent", source), source);
- }
- assert_eq!(label(&app, command, "My file.mp4"), "My file.mp4");
- }
- app.session.execute("prefs.set", json!({"key": "general.language", "value": "en"})).unwrap();
- assert_eq!(label(&app, "file.revealInFinder", "Reveal in Explorer"), "Reveal in Explorer");
- assert_eq!(label(&app, "layer.revealInFinder", "Reveal in File Manager"), "Reveal in File Manager");
}
#[test]
@@ -6895,18 +7509,8 @@ mod tests {
menu.items().into_iter().map(|i| (i.id.clone(), i.command.clone(), i.params.clone(), i.shortcut.clone(), i.enabled, i.checked)).collect::>()
};
assert_eq!(bindings(&en), bindings(&ja));
+ assert!(ja.items().iter().any(|i| i.command == "comp.new" && i.label == label(&app, "comp.new", "New Composition...")));
assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
- "Layer: File".into()
- ),
- "レイヤー: File"
- );
- assert!(ja.items().iter().any(|i| i.command == "comp.new" && i.label == "新規コンポジション..."));
- assert!(ja.items().iter().any(|i| i.command == "layer.newText" && i.label == "テキスト"));
- assert!(ja.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "イージーイーズ"));
app.session.prefs.push_recent("/tmp/File.ecproj");
assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
app.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();
@@ -6941,6 +7545,9 @@ mod tests {
(Some("cs-CZ"), "cs"),
(Some("cs_CZ.UTF-8"), "cs"),
(Some("CS_cz.UTF-8"), "cs"),
+ (Some("ka"), "ka"),
+ (Some("ka-GE"), "ka"),
+ (Some("ka_GE.UTF-8"), "ka"),
(Some("en-US"), "en"),
(Some("jv-ID"), "en"),
(Some("de-DE"), "en"),
@@ -6974,9 +7581,15 @@ mod tests {
#[test]
fn every_translated_entry_keeps_the_english_shape() {
- for (code, catalog) in
- [("zh-hans", SIMPLIFIED_CHINESE), ("zh-hant", TRADITIONAL_CHINESE), ("uk", UKRAINIAN), ("es", SPANISH), ("pt-br", PORTUGUESE), ("cs", CZECH)]
- {
+ for (code, catalog) in [
+ ("zh-hans", SIMPLIFIED_CHINESE),
+ ("zh-hant", TRADITIONAL_CHINESE),
+ ("uk", UKRAINIAN),
+ ("es", SPANISH),
+ ("pt-br", PORTUGUESE),
+ ("cs", CZECH),
+ ("ka", GEORGIAN),
+ ] {
for (command, en, translated) in catalog {
assert_eq!(en.contains("..."), translated.contains("..."), "{code} {command} / {en}: {translated}");
let brackets = |s: &str| s.chars().filter(|c| *c == '(' || *c == ')').count();
@@ -6986,145 +7599,6 @@ mod tests {
}
}
- #[test]
- fn zh_hans_translates_labels_computed_titles_and_keeps_names_verbatim() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"zh-hans"})).unwrap();
- assert_eq!(language(&app), "zh-hans");
- assert!(simplified(&app));
- assert!(!traditional(&app));
- assert!(!japanese(&app));
- // Fixed menu rows come from the catalog.
- assert_eq!(label(&app, "", "Composition"), "合成");
- assert_eq!(label(&app, "", "Effect"), "效果");
- assert_eq!(label(&app, "comp.new", "New Composition..."), "新建合成...");
- assert_eq!(label(&app, "layer.newText", "Text"), "文本");
- // Untranslated keys and dynamic labels stay verbatim.
- assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
- "Undo Comp1".into()
- ),
- "无可撤销的操作"
- );
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
- "Layer: File".into()
- ),
- "图层: File"
- );
- // The submenu titles that name the current workspace / view.
- assert_eq!(submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()), "为工作区“Default”指定快捷键");
- assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "为 3D 视图“Top”指定快捷键");
- // The menu tree carries the same commands and shortcuts with the Chinese labels.
- let zh = crate::native_menu::build(&app);
- assert!(zh.items().iter().any(|i| i.command == "comp.new" && i.label == "新建合成..."));
- assert!(zh.items().iter().any(|i| i.command == "layer.newText" && i.label == "文本"));
- assert!(zh.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "缓动"));
- // A dynamic filename is never translated.
- app.session.prefs.push_recent("/tmp/File.ecproj");
- assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
- }
-
- #[test]
- fn zh_hant_translates_labels_computed_titles_and_keeps_names_verbatim() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"zh-hant"})).unwrap();
- assert_eq!(language(&app), "zh-hant");
- assert!(traditional(&app));
- assert!(!simplified(&app));
- assert!(!japanese(&app));
- // Fixed menu rows come from the catalog.
- assert_eq!(label(&app, "", "Composition"), "合成");
- assert_eq!(label(&app, "", "Effect"), "效果");
- assert_eq!(label(&app, "comp.new", "New Composition..."), "新增合成...");
- assert_eq!(label(&app, "layer.newText", "Text"), "文字");
- // Untranslated keys and dynamic labels stay verbatim.
- assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
- "Undo Comp1".into()
- ),
- "沒有可復原的操作"
- );
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
- "Layer: File".into()
- ),
- "圖層: File"
- );
- // The submenu titles that name the current workspace / view.
- assert_eq!(submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()), "為工作區“Default”指定快速鍵");
- assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "為 3D 檢視“Top”指定快速鍵");
- // The menu tree carries the same commands and shortcuts with the Traditional labels.
- let zh = crate::native_menu::build(&app);
- assert!(zh.items().iter().any(|i| i.command == "comp.new" && i.label == "新增合成..."));
- assert!(zh.items().iter().any(|i| i.command == "layer.newText" && i.label == "文字"));
- assert!(zh.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "緩動"));
- // A dynamic filename is never translated.
- app.session.prefs.push_recent("/tmp/File.ecproj");
- assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
- }
-
- #[test]
- fn ukrainian_translates_menus_without_changing_bindings_or_user_names() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();
- app.session.prefs.push_recent("/tmp/File.ecproj");
- let en = crate::native_menu::build(&app);
- let state = crate::native_menu::state_key(&app);
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"uk"})).unwrap();
- let uk = crate::native_menu::build(&app);
- assert_eq!(language(&app), "uk");
- assert!(ukrainian(&app));
- assert_ne!(state, crate::native_menu::state_key(&app));
- let bindings = |menu: &crate::native_menu::NativeMenu| {
- menu.items().into_iter().map(|i| (i.id.clone(), i.command.clone(), i.params.clone(), i.shortcut.clone(), i.enabled, i.checked)).collect::>()
- };
- assert_eq!(bindings(&en), bindings(&uk));
- assert!(uk.items().iter().any(|i| i.command == "comp.new" && i.label == "Нова композиція..."));
- assert!(uk.items().iter().any(|i| i.command == "layer.newText" && i.label == "Текст"));
- assert!(uk.items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
- assert_eq!(label(&app, "", "File"), "Файл");
- assert_eq!(label(&app, "", "Light"), "Світло");
- assert_eq!(label(&app, "view.panelBackground", "Black"), "Чорний");
- assert_eq!(label(&app, "layer.addTextAnimator", "Tracking"), "Міжлітерний інтервал");
- assert_eq!(label(&app, "edit.purgeUndo", "Undo"), "Історія скасувань");
- assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- let panel =
- MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] };
- assert_eq!(entry(&app, &panel, "Layer: File".into()), "Шар: File");
- assert_eq!(
- submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “File Україна” Workspace".into()),
- "Призначити скорочення для робочого простору «File Україна»"
- );
- assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Призначити скорочення для вигляду 3D «Top»");
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();
- assert_eq!(crate::native_menu::build(&app), en);
- }
-
- #[test]
- fn ukrainian_undo_redo_keeps_history_labels_verbatim() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"uk"})).unwrap();
- let undo = MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
- let redo = MenuEntry { label: "Redo".into(), command: "edit.redo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
- assert_eq!(entry(&app, &undo, "Can't Undo".into()), "Немає дій для скасування");
- assert_eq!(entry(&app, &redo, "Can't Redo".into()), "Немає дій для повторення");
- app.session.history.undo.push(("File Україна".into(), app.session.project.clone()));
- app.session.history.redo.push(("Text Україна".into(), app.session.project.clone()));
- assert_eq!(entry(&app, &undo, "Undo File Україна".into()), "Скасувати File Україна");
- assert_eq!(entry(&app, &redo, "Redo Text Україна".into()), "Повторити Text Україна");
- }
-
#[test]
fn ukrainian_catalog_matches_the_settings_registry() {
let codes: Vec<_> = effectcraft_engine::prefs::LANGUAGES.iter().map(|(_, code)| *code).filter(|code| !matches!(*code, "system" | "en")).collect();
@@ -7134,92 +7608,6 @@ mod tests {
assert_eq!(code("unknown"), "en");
}
- #[test]
- fn es_translates_labels_computed_titles_and_keeps_names_verbatim() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"es"})).unwrap();
- assert_eq!(language(&app), "es");
- assert!(spanish(&app));
- assert!(!traditional(&app));
- assert!(!simplified(&app));
- assert!(!japanese(&app));
- // Fixed menu rows come from the catalog.
- assert_eq!(label(&app, "", "Composition"), "Composición");
- assert_eq!(label(&app, "", "Effect"), "Efecto");
- assert_eq!(label(&app, "comp.new", "New Composition..."), "Nueva composición...");
- assert_eq!(label(&app, "layer.newText", "Text"), "Texto");
- assert_eq!(label(&app, "layer.setBlendMode", "Color Burn"), "Subexposición de color");
- // Untranslated keys and dynamic labels stay verbatim.
- assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
- "Undo Comp1".into()
- ),
- "No se puede deshacer"
- );
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
- "Layer: File".into()
- ),
- "Capa: File"
- );
- // The submenu titles that name the current workspace / view.
- assert_eq!(
- submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()),
- "Asignar método abreviado al espacio de trabajo “Default”"
- );
- assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Asignar método abreviado a la vista 3D “Top”");
- // The menu tree carries the same commands and shortcuts with the Spanish labels.
- let es = crate::native_menu::build(&app);
- assert!(es.items().iter().any(|i| i.command == "comp.new" && i.label == "Nueva composición..."));
- assert!(es.items().iter().any(|i| i.command == "layer.newText" && i.label == "Texto"));
- assert!(es.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "Suavizado"));
- // A dynamic filename is never translated.
- app.session.prefs.push_recent("/tmp/File.ecproj");
- assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
- }
-
- #[test]
- fn pt_br_translates_labels_computed_titles_and_keeps_names_verbatim() {
- let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
- app.session.execute("prefs.set", json!({"key":"general.language", "value":"pt-br"})).unwrap();
- assert_eq!(language(&app), "pt-br");
- assert!(!japanese(&app));
- // Fixed menu rows come from the catalog.
- assert_eq!(label(&app, "", "Composition"), "Composição");
- assert_eq!(label(&app, "", "Effect"), "Efeito");
- assert_eq!(label(&app, "comp.new", "New Composition..."), "Nova composição...");
- assert_eq!(label(&app, "layer.newText", "Text"), "Texto");
- // Untranslated keys and dynamic labels stay verbatim.
- assert_eq!(label(&app, "unknown.command", "Text"), "Text");
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
- "Undo Comp1".into()
- ),
- "Não há nada para desfazer"
- );
- assert_eq!(
- entry(
- &app,
- &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
- "Layer: File".into()
- ),
- "Camada: File"
- );
- // The submenu titles that name the current workspace / view.
- assert_eq!(
- submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()),
- "Atribuir atalho à área de trabalho “Default”"
- );
- assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Atribuir atalho à visualização 3D “Top”");
- }
-
#[test]
fn general_settings_exposes_the_language_automation_id() {
let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
diff --git a/crates/ui-egui/src/i18n/effects.rs b/crates/ui-egui/src/i18n/effects.rs
index 5c6d09ba5..b41430bed 100644
--- a/crates/ui-egui/src/i18n/effects.rs
+++ b/crates/ui-egui/src/i18n/effects.rs
@@ -14,15 +14,15 @@
//! the id is stable, so a translation never becomes an orphan.
//!
//! Each row repeats the registry's English name so that a rename upstream fails
-//! [`tests::every_effect_has_a_row`] instead of silently pointing a translation at another
-//! effect.
+//! [`tests::every_row_names_a_registry_effect`] instead of silently pointing a translation at
+//! another effect. An effect with no row draws the registry's English name; the
+//! `missing_translations_report` test (run by `cargo xtask ci`) lists those per language.
//!
//! A language decides for itself which names stay English: After Effects' Japanese interface
//! leaves the `CC` series, the `VR` set and the `OCIO` set in English, while its Simplified
//! Chinese one translates them (the `CC` names come from Adobe's Chinese *documentation*, which
//! names 68 of the 69). Repeating the English name is therefore a language-level choice, not a
-//! missing row: [`tests::only_the_brand_names_stay_in_english`] pins *Simplified Chinese's* five
-//! brand names and is deliberately not shared by the other languages.
+//! missing row.
//!
//! The Simplified Chinese names come from the installed After Effects 2026 (26.5.0.89)
//! Simplified Chinese interface, its 21 category folder names included; `Cryptomatte`,
@@ -70,12 +70,14 @@ fn catalog(language: &str) -> Option<&'static Catalog> {
static SIMPLIFIED: Catalog = Catalog { rows: SIMPLIFIED_CHINESE, categories: SIMPLIFIED_CHINESE_CATEGORIES, index: OnceLock::new() };
static TRADITIONAL: Catalog = Catalog { rows: TRADITIONAL_CHINESE, categories: TRADITIONAL_CHINESE_CATEGORIES, index: OnceLock::new() };
static JAPANESE: Catalog = Catalog { rows: JAPANESE_EFFECTS, categories: JAPANESE_CATEGORIES, index: OnceLock::new() };
+ static GEORGIAN_CATALOG: Catalog = Catalog { rows: GEORGIAN, categories: GEORGIAN_CATEGORIES, index: OnceLock::new() };
match language {
"zh-hans" => Some(&SIMPLIFIED),
"zh-hant" => Some(&TRADITIONAL),
// Japanese: the slot the Japanese data point on #821 asked for, so both languages share
// this one catalog instead of inventing a second mechanism.
"ja" => Some(&JAPANESE),
+ "ka" => Some(&GEORGIAN_CATALOG),
_ => None,
}
}
@@ -118,6 +120,19 @@ pub(crate) fn matches(id: &str, english: &str, query: &str) -> bool {
|| catalog(current()).and_then(|c| c.row(id)).is_some_and(|(_, translated)| translated.to_lowercase().contains(query))
}
+/// The registry's effect names and categories `language` has no row for, for the missing-strings
+/// report.
+#[cfg(test)]
+pub(super) fn missing(language: &str) -> Vec {
+ let table = catalog(language);
+ let effects = effectcraft_engine::effects::registry().iter().filter(|spec| table.and_then(|c| c.row(spec.id)).is_none()).map(|spec| spec.name.to_string());
+ let categories = effectcraft_engine::effects::categories()
+ .into_iter()
+ .filter(|source| table.and_then(|c| c.category(source)).is_none())
+ .map(|source| format!("{source} (category)"));
+ effects.chain(categories).collect()
+}
+
/// Simplified Chinese (`zh-hans`): one row per effect in the registry.
const SIMPLIFIED_CHINESE: &[Row] = &[
("ec.3d.channelextract", "3D Channel Extract", "3D 通道提取"),
@@ -490,6 +505,346 @@ const JAPANESE_CATEGORIES: &[(&str, &str)] = &[
("Utility", "ユーティリティ"),
];
+/// Georgian (`ka`): one row per effect, ids from [`SIMPLIFIED_CHINESE`]. Written from the meaning
+/// of the English names, with the terms the Georgian menus and panels use (FilmCraft's Georgian
+/// for the effects the two apps share). The `CC` series and the brand names (`Cryptomatte`,
+/// `EXtractoR`, `IDentifier`, `Key Light`, `Unmult`, `Lumetri Color`) stay in English, as
+/// Adobe's Japanese interface keeps the `CC` series; `VR` and `OCIO` keep their prefix.
+const GEORGIAN: &[Row] = &[
+ ("ec.3d.channelextract", "3D Channel Extract", "3D არხის ამოღება"),
+ ("ec.3d.cryptomatte", "Cryptomatte", "Cryptomatte"),
+ ("ec.3d.depthmatte", "Depth Matte", "სიღრმის მატი"),
+ ("ec.3d.depthoffield", "Depth of Field", "ველის სიღრმე"),
+ ("ec.3d.extractor", "EXtractoR", "EXtractoR"),
+ ("ec.3d.fog3d", "Fog 3D", "3D ნისლი"),
+ ("ec.3d.identifier", "IDentifier", "IDentifier"),
+ ("ec.3d.idmatte", "ID Matte", "ID მატი"),
+ ("ec.audio.backwards", "Backwards", "უკუღმა"),
+ ("ec.audio.basstreble", "Bass & Treble", "ბასი და ტრებლი"),
+ ("ec.audio.compressor", "Compressor", "კომპრესორი"),
+ ("ec.audio.delay", "Delay", "დაყოვნება"),
+ ("ec.audio.distortion", "Distortion", "დამახინჯება"),
+ ("ec.audio.flangechorus", "Flange & Chorus", "ფლენჯერი და ქორუსი"),
+ ("ec.audio.gate", "Gate", "გეიტი"),
+ ("ec.audio.highlowpass", "High-Low Pass", "მაღალი/დაბალი სიხშირეების ფილტრი"),
+ ("ec.audio.modulator", "Modulator", "მოდულატორი"),
+ ("ec.audio.parametriceq", "Parametric EQ", "პარამეტრული ეკვალაიზერი"),
+ ("ec.audio.reverb", "Reverb", "რევერბი"),
+ ("ec.audio.stereomixer", "Stereo Mixer", "სტერეომიქშერი"),
+ ("ec.audio.tone", "Tone", "ტონი"),
+ ("ec.blur.bilateral", "Bilateral Blur", "ბილატერალური გაბუნდოვნება"),
+ ("ec.blur.cameralens", "Camera Lens Blur", "კამერის ობიექტივის გაბუნდოვნება"),
+ ("ec.blur.camerashakedeblur", "Camera-Shake Deblur", "კამერის რყევით გაბუნდოვნების მოცილება"),
+ ("ec.blur.cccross", "CC Cross Blur", "CC Cross Blur"),
+ ("ec.blur.ccradial", "CC Radial Blur", "CC Radial Blur"),
+ ("ec.blur.ccradialfast", "CC Radial Fast Blur", "CC Radial Fast Blur"),
+ ("ec.blur.ccvector", "CC Vector Blur", "CC Vector Blur"),
+ ("ec.blur.channel", "Channel Blur", "არხის გაბუნდოვნება"),
+ ("ec.blur.compound", "Compound Blur", "შედგენილი გაბუნდოვნება"),
+ ("ec.blur.directional", "Directional Blur", "მიმართული გაბუნდოვნება"),
+ ("ec.blur.fastbox", "Fast Box Blur", "სწრაფი ბლოკური გაბუნდოვნება"),
+ ("ec.blur.gaussian", "Gaussian Blur", "გაუსის გაბუნდოვნება"),
+ ("ec.blur.radial", "Radial Blur", "რადიალური გაბუნდოვნება"),
+ ("ec.blur.reduceflicker", "Reduce Interlace Flicker", "ნახევარკადრული ციმციმის შემცირება"),
+ ("ec.blur.sharpen", "Sharpen", "სიმკვეთრე"),
+ ("ec.blur.smart", "Smart Blur", "ჭკვიანი გაბუნდოვნება"),
+ ("ec.blur.unsharp", "Unsharp Mask", "არამკვეთრი ნიღაბი"),
+ ("ec.channel.arithmetic", "Arithmetic", "არითმეტიკა"),
+ ("ec.channel.blend", "Blend", "შერევა"),
+ ("ec.channel.calculations", "Calculations", "გამოთვლები"),
+ ("ec.channel.cccomposite", "CC Composite", "CC Composite"),
+ ("ec.channel.combiner", "Channel Combiner", "არხების გამაერთიანებელი"),
+ ("ec.channel.compoundarithmetic", "Compound Arithmetic", "შედგენილი არითმეტიკა"),
+ ("ec.channel.invert", "Invert", "ინვერსია"),
+ ("ec.channel.minimax", "Minimax", "მინიმაქსი"),
+ ("ec.channel.removecolormatting", "Remove Color Matting", "ფერადი მატინგის მოცილება"),
+ ("ec.channel.setchannels", "Set Channels", "არხების დაყენება"),
+ ("ec.channel.setmatte", "Set Matte", "მატის დაყენება"),
+ ("ec.channel.shiftchannels", "Shift Channels", "არხების გადანაცვლება"),
+ ("ec.channel.solidcomposite", "Solid Composite", "სოლიდთან კომპოზიტი"),
+ ("ec.color.autocolor", "Auto Color", "ავტოფერი"),
+ ("ec.color.autocontrast", "Auto Contrast", "ავტოკონტრასტი"),
+ ("ec.color.autolevels", "Auto Levels", "ავტოდონეები"),
+ ("ec.color.blackwhite", "Black & White", "შავ-თეთრი"),
+ ("ec.color.brightnesscontrast", "Brightness & Contrast", "სიკაშკაშე და კონტრასტი"),
+ ("ec.color.broadcast", "Broadcast Colors", "სამაუწყებლო ფერები"),
+ ("ec.color.cccolorneutralizer", "CC Color Neutralizer", "CC Color Neutralizer"),
+ ("ec.color.cccoloroffset", "CC Color Offset", "CC Color Offset"),
+ ("ec.color.cckernel", "CC Kernel", "CC Kernel"),
+ ("ec.color.cctoner", "CC Toner", "CC Toner"),
+ ("ec.color.changecolor", "Change Color", "ფერის შეცვლა"),
+ ("ec.color.changetocolor", "Change to Color", "ფერად შეცვლა"),
+ ("ec.color.channelmixer", "Channel Mixer", "არხების მიქშერი"),
+ ("ec.color.colorama", "Colorama", "კოლორამა"),
+ ("ec.color.colorbalance", "Color Balance", "ფერთა ბალანსი"),
+ ("ec.color.colorbalancehls", "Color Balance (HLS)", "ფერთა ბალანსი (HLS)"),
+ ("ec.color.colorlink", "Color Link", "ფერის ბმა"),
+ ("ec.color.colorstabilizer", "Color Stabilizer", "ფერის სტაბილიზატორი"),
+ ("ec.color.curves", "Curves", "მრუდები"),
+ ("ec.color.equalize", "Equalize", "გათანაბრება"),
+ ("ec.color.exposure", "Exposure", "ექსპოზიცია"),
+ ("ec.color.gammapedestalgain", "Gamma/Pedestal/Gain", "გამა/საფეხური/გაძლიერება"),
+ ("ec.color.huesaturation", "Hue/Saturation", "ფერის ტონი/გაჯერება"),
+ ("ec.color.leavecolor", "Leave Color", "ფერის დატოვება"),
+ ("ec.color.levels", "Levels", "დონეები"),
+ ("ec.color.levelsic", "Levels (Individual Controls)", "დონეები (ცალკეული მართვა)"),
+ ("ec.color.lumetri", "Lumetri Color", "Lumetri Color"),
+ ("ec.color.ociocdl", "OCIO CDL Transform", "OCIO CDL გარდაქმნა"),
+ ("ec.color.ociocolorspace", "OCIO Color Space Transform", "OCIO ფერთა სივრცის გარდაქმნა"),
+ ("ec.color.ociodisplay", "OCIO Display Transform", "OCIO ეკრანის გარდაქმნა"),
+ ("ec.color.ociofile", "OCIO File Transform", "OCIO ფაილის გარდაქმნა"),
+ ("ec.color.ociolook", "OCIO Look Transform", "OCIO ვიზუალური სტილის გარდაქმნა"),
+ ("ec.color.photofilter", "Photo Filter", "ფოტოფილტრი"),
+ ("ec.color.psarbitrarymap", "PS Arbitrary Map", "PS ნებისმიერი რუკა"),
+ ("ec.color.selectivecolor", "Selective Color", "შერჩევითი ფერი"),
+ ("ec.color.shadowhighlight", "Shadow/Highlight", "ჩრდილები/ღია ტონები"),
+ ("ec.color.tint", "Tint", "ტონირება"),
+ ("ec.color.tritone", "Tritone", "სამტონიანი"),
+ ("ec.color.vibrance", "Vibrance", "სიხალასე"),
+ ("ec.color.videolimiter", "Video Limiter", "ვიდეოლიმიტერი"),
+ ("ec.control.angle", "Angle Control", "კუთხის მართვა"),
+ ("ec.control.checkbox", "Checkbox Control", "მოსანიშნი ველის მართვა"),
+ ("ec.control.color", "Color Control", "ფერის მართვა"),
+ ("ec.control.dropdown", "Dropdown Menu Control", "ჩამოსაშლელი მენიუს მართვა"),
+ ("ec.control.layer", "Layer Control", "შრის მართვა"),
+ ("ec.control.point", "Point Control", "წერტილის მართვა"),
+ ("ec.control.point3d", "3D Point Control", "3D წერტილის მართვა"),
+ ("ec.control.slider", "Slider Control", "სლაიდერის მართვა"),
+ ("ec.control.stereo3d", "Stereo 3D Controls", "სტერეო 3D მართვა"),
+ ("ec.distort.bezierwarp", "Bezier Warp", "ბეზიეს დეფორმაცია"),
+ ("ec.distort.bulge", "Bulge", "გამობერილობა"),
+ ("ec.distort.ccbender", "CC Bender", "CC Bender"),
+ ("ec.distort.ccbendit", "CC Bend It", "CC Bend It"),
+ ("ec.distort.ccblobbylize", "CC Blobbylize", "CC Blobbylize"),
+ ("ec.distort.ccflomotion", "CC Flo Motion", "CC Flo Motion"),
+ ("ec.distort.ccgriddler", "CC Griddler", "CC Griddler"),
+ ("ec.distort.cclens", "CC Lens", "CC Lens"),
+ ("ec.distort.ccpageturn", "CC Page Turn", "CC Page Turn"),
+ ("ec.distort.ccpowerpin", "CC Power Pin", "CC Power Pin"),
+ ("ec.distort.ccripplepulse", "CC Ripple Pulse", "CC Ripple Pulse"),
+ ("ec.distort.ccslant", "CC Slant", "CC Slant"),
+ ("ec.distort.ccsmear", "CC Smear", "CC Smear"),
+ ("ec.distort.ccsplit", "CC Split", "CC Split"),
+ ("ec.distort.ccsplit2", "CC Split 2", "CC Split 2"),
+ ("ec.distort.cctiler", "CC Tiler", "CC Tiler"),
+ ("ec.distort.cornerpin", "Corner Pin", "კუთხეების მიმაგრება"),
+ ("ec.distort.displacementmap", "Displacement Map", "წანაცვლების რუკა"),
+ ("ec.distort.liquify", "Liquify", "გათხევადება"),
+ ("ec.distort.magnify", "Magnify", "გადიდება"),
+ ("ec.distort.meshwarp", "Mesh Warp", "ბადისებრი დეფორმაცია"),
+ ("ec.distort.mirror", "Mirror", "სარკე"),
+ ("ec.distort.offset", "Offset", "წანაცვლება"),
+ ("ec.distort.opticscompensation", "Optics Compensation", "ოპტიკის კომპენსაცია"),
+ ("ec.distort.polar", "Polar Coordinates", "პოლარული კოორდინატები"),
+ ("ec.distort.puppet", "Puppet", "მარიონეტი"),
+ ("ec.distort.reshape", "Reshape", "ფორმის შეცვლა"),
+ ("ec.distort.ripple", "Ripple", "ტალღა"),
+ ("ec.distort.rollingshutterrepair", "Rolling Shutter Repair", "მცოცავი ჩამკეტის გასწორება"),
+ ("ec.distort.smear", "Smear", "გადღაბნა"),
+ ("ec.distort.spherize", "Spherize", "სფერიზება"),
+ ("ec.distort.transform", "Transform", "გარდაქმნა"),
+ ("ec.distort.turbulentdisplace", "Turbulent Displace", "ტურბულენტური წანაცვლება"),
+ ("ec.distort.twirl", "Twirl", "გრიგალი"),
+ ("ec.distort.twirllegacy", "Twirl (Legacy)", "გრიგალი (მოძველებული)"),
+ ("ec.distort.upscale", "Detail-preserving Upscale", "გადიდება დეტალების შენარჩუნებით"),
+ ("ec.distort.warp", "Warp", "დეფორმაცია"),
+ ("ec.distort.warpstabilizer", "Warp Stabilizer", "დეფორმაციის სტაბილიზატორი"),
+ ("ec.distort.wavewarp", "Wave Warp", "ტალღური დეფორმაცია"),
+ ("ec.generate.advancedlightning", "Advanced Lightning", "გაფართოებული ელვა"),
+ ("ec.generate.audiospectrum", "Audio Spectrum", "აუდიოს სპექტრი"),
+ ("ec.generate.audiowaveform", "Audio Waveform", "აუდიოს ტალღის ფორმა"),
+ ("ec.generate.beam", "Beam", "სხივი"),
+ ("ec.generate.ccgluegun", "CC Glue Gun", "CC Glue Gun"),
+ ("ec.generate.cclightburst", "CC Light Burst 2.5", "CC Light Burst 2.5"),
+ ("ec.generate.cclightrays", "CC Light Rays", "CC Light Rays"),
+ ("ec.generate.cclightsweep", "CC Light Sweep", "CC Light Sweep"),
+ ("ec.generate.ccthreads", "CC Threads", "CC Threads"),
+ ("ec.generate.cellpattern", "Cell Pattern", "უჯრედების პატერნი"),
+ ("ec.generate.checkerboard", "Checkerboard", "ჭადრაკის დაფა"),
+ ("ec.generate.circle", "Circle", "წრე"),
+ ("ec.generate.ellipse", "Ellipse", "ელიფსი"),
+ ("ec.generate.eyedropperfill", "Eyedropper Fill", "პიპეტით შევსება"),
+ ("ec.generate.fill", "Fill", "შევსება"),
+ ("ec.generate.fourcolor", "4-Color Gradient", "4-ფერიანი გრადიენტი"),
+ ("ec.generate.fractal", "Fractal", "ფრაქტალი"),
+ ("ec.generate.gradientramp", "Gradient Ramp", "გრადიენტული გადასვლა"),
+ ("ec.generate.grid", "Grid", "ბადე"),
+ ("ec.generate.lensflare", "Lens Flare", "ობიექტივის ანარეკლი"),
+ ("ec.generate.paintbucket", "Paint Bucket", "საღებავის ვედრო"),
+ ("ec.generate.radiowaves", "Radio Waves", "რადიოტალღები"),
+ ("ec.generate.scribble", "Scribble", "ჯღაბნა"),
+ ("ec.generate.stroke", "Stroke", "კონტური"),
+ ("ec.generate.vegas", "Vegas", "ვეგასი"),
+ ("ec.generate.writeon", "Write-on", "თანდათანობითი წერა"),
+ ("ec.key.advancedspill", "Advanced Spill Suppressor", "ფერის გადაღვრის გაფართოებული ჩამხშობი"),
+ ("ec.key.ccsimplewireremoval", "CC Simple Wire Removal", "CC Simple Wire Removal"),
+ ("ec.key.colordifference", "Color Difference Key", "ფერთა სხვაობის გასაღები"),
+ ("ec.key.colorkey", "Color Key", "ფერის გასაღები"),
+ ("ec.key.colorrange", "Color Range", "ფერების დიაპაზონი"),
+ ("ec.key.differencematte", "Difference Matte", "სხვაობის მატი"),
+ ("ec.key.extract", "Extract", "ამოღება"),
+ ("ec.key.innerouter", "Inner/Outer Key", "შიდა/გარე გასაღები"),
+ ("ec.key.keycleaner", "Key Cleaner", "გასაღების გამწმენდი"),
+ ("ec.key.linearcolor", "Linear Color Key", "წრფივი ფერის გასაღები"),
+ ("ec.key.luma", "Luma Key", "სიკაშკაშის გასაღები"),
+ ("ec.key.screen", "Screen Key", "ეკრანის გასაღები"),
+ ("ec.key.spill", "Spill Suppressor", "ფერის გადაღვრის ჩამხშობი"),
+ ("ec.key.unmult", "Unmult", "Unmult"),
+ ("ec.keying.keylight", "Key Light", "Key Light"),
+ ("ec.matte.mattechoker", "Matte Choker", "მატის შემკუმშველი"),
+ ("ec.matte.objectmatte", "Object Matte", "ობიექტის მატი"),
+ ("ec.matte.refinehard", "Refine Hard Matte", "მკვეთრი მატის დახვეწა"),
+ ("ec.matte.refinesoft", "Refine Soft Matte", "რბილი მატის დახვეწა"),
+ ("ec.matte.rotobrush", "Roto Brush & Refine Edge", "როტო-ფუნჯი და კიდის დახვეწა"),
+ ("ec.matte.simplechoker", "Simple Choker", "მარტივი შემკუმშველი"),
+ ("ec.noise.addgrain", "Add Grain", "მარცვლოვნების დამატება"),
+ ("ec.noise.curlnoise", "Curl Noise", "გრიგალური ხმაური"),
+ ("ec.noise.dustscratches", "Dust & Scratches", "მტვერი და ნაკაწრები"),
+ ("ec.noise.fractal", "Fractal Noise", "ფრაქტალური ხმაური"),
+ ("ec.noise.matchgrain", "Match Grain", "მარცვლოვნების მისადაგება"),
+ ("ec.noise.median", "Median", "მედიანა"),
+ ("ec.noise.medianlegacy", "Median (Legacy)", "მედიანა (მოძველებული)"),
+ ("ec.noise.noise", "Noise", "ხმაური"),
+ ("ec.noise.noisealpha", "Noise Alpha", "ალფა-ხმაური"),
+ ("ec.noise.noisehls", "Noise HLS", "HLS ხმაური"),
+ ("ec.noise.noisehlsauto", "Noise HLS Auto", "HLS ხმაური (ავტომატური)"),
+ ("ec.noise.removegrain", "Remove Grain", "მარცვლოვნების მოცილება"),
+ ("ec.noise.turbulent", "Turbulent Noise", "ტურბულენტური ხმაური"),
+ ("ec.obsolete.basic3d", "Basic 3D", "საბაზო 3D"),
+ ("ec.obsolete.basictext", "Basic Text", "საბაზო ტექსტი"),
+ ("ec.obsolete.gaussianlegacy", "Gaussian Blur (Legacy)", "გაუსის გაბუნდოვნება (მოძველებული)"),
+ ("ec.obsolete.lightning", "Lightning", "ელვა"),
+ ("ec.obsolete.mochashape", "Mocha shape", "Mocha-ს ფიგურა"),
+ ("ec.obsolete.pathtext", "Path Text", "ტექსტი ტრაექტორიაზე"),
+ ("ec.paint.paint", "Paint", "ხატვა"),
+ ("ec.perspective.3dglasses", "3D Glasses", "3D სათვალე"),
+ ("ec.perspective.bevelalpha", "Bevel Alpha", "ალფას ფასკა"),
+ ("ec.perspective.beveledges", "Bevel Edges", "კიდეების ფასკა"),
+ ("ec.perspective.cameratracker", "3D Camera Tracker", "3D კამერის ტრეკერი"),
+ ("ec.perspective.cccylinder", "CC Cylinder", "CC Cylinder"),
+ ("ec.perspective.ccenvironment", "CC Environment", "CC Environment"),
+ ("ec.perspective.ccsphere", "CC Sphere", "CC Sphere"),
+ ("ec.perspective.ccspotlight", "CC Spotlight", "CC Spotlight"),
+ ("ec.perspective.dropshadow", "Drop Shadow", "ჩრდილი"),
+ ("ec.perspective.radialshadow", "Radial Shadow", "რადიალური ჩრდილი"),
+ ("ec.sim.carddance", "Card Dance", "მოცეკვავე ბარათები"),
+ ("ec.sim.caustics", "Caustics", "კაუსტიკა"),
+ ("ec.sim.ccballaction", "CC Ball Action", "CC Ball Action"),
+ ("ec.sim.ccbubbles", "CC Bubbles", "CC Bubbles"),
+ ("ec.sim.ccdrizzle", "CC Drizzle", "CC Drizzle"),
+ ("ec.sim.cchair", "CC Hair", "CC Hair"),
+ ("ec.sim.ccmrmercury", "CC Mr. Mercury", "CC Mr. Mercury"),
+ ("ec.sim.ccparticlesystems2", "CC Particle Systems II", "CC Particle Systems II"),
+ ("ec.sim.ccparticleworld", "CC Particle World", "CC Particle World"),
+ ("ec.sim.ccpixelpolly", "CC Pixel Polly", "CC Pixel Polly"),
+ ("ec.sim.ccrainfall", "CC Rainfall", "CC Rainfall"),
+ ("ec.sim.ccscatterize", "CC Scatterize", "CC Scatterize"),
+ ("ec.sim.ccsnowfall", "CC Snowfall", "CC Snowfall"),
+ ("ec.sim.ccstarburst", "CC Star Burst", "CC Star Burst"),
+ ("ec.sim.foam", "Foam", "ქაფი"),
+ ("ec.sim.particleplayground", "Particle Playground", "ნაწილაკების სიმულაცია"),
+ ("ec.sim.shatter", "Shatter", "დამსხვრევა"),
+ ("ec.sim.waveworld", "Wave World", "ტალღების სამყარო"),
+ ("ec.stylize.brushstrokes", "Brush Strokes", "ფუნჯის შტრიხები"),
+ ("ec.stylize.cartoon", "Cartoon", "მულტფილმის სტილი"),
+ ("ec.stylize.ccblockload", "CC Block Load", "CC Block Load"),
+ ("ec.stylize.ccburnfilm", "CC Burn Film", "CC Burn Film"),
+ ("ec.stylize.ccglass", "CC Glass", "CC Glass"),
+ ("ec.stylize.cchextile", "CC HexTile", "CC HexTile"),
+ ("ec.stylize.cckaleida", "CC Kaleida", "CC Kaleida"),
+ ("ec.stylize.ccmrsmoothie", "CC Mr. Smoothie", "CC Mr. Smoothie"),
+ ("ec.stylize.ccplastic", "CC Plastic", "CC Plastic"),
+ ("ec.stylize.ccrepetile", "CC RepeTile", "CC RepeTile"),
+ ("ec.stylize.ccthreshold", "CC Threshold", "CC Threshold"),
+ ("ec.stylize.ccthresholdrgb", "CC Threshold RGB", "CC Threshold RGB"),
+ ("ec.stylize.ccvignette", "CC Vignette", "CC Vignette"),
+ ("ec.stylize.coloremboss", "Color Emboss", "ფერადი რელიეფი"),
+ ("ec.stylize.emboss", "Emboss", "რელიეფი"),
+ ("ec.stylize.findedges", "Find Edges", "კიდეების პოვნა"),
+ ("ec.stylize.glow", "Glow", "ნათება"),
+ ("ec.stylize.mosaic", "Mosaic", "მოზაიკა"),
+ ("ec.stylize.motiontile", "Motion Tile", "მოძრავი ფილები"),
+ ("ec.stylize.posterize", "Posterize", "პოსტერიზაცია"),
+ ("ec.stylize.roughenedges", "Roughen Edges", "კიდეების დაუხეშება"),
+ ("ec.stylize.scatter", "Scatter", "გაბნევა"),
+ ("ec.stylize.strobe", "Strobe Light", "სტრობოსკოპი"),
+ ("ec.stylize.texturize", "Texturize", "ტექსტურირება"),
+ ("ec.stylize.threshold", "Threshold", "ზღვარი"),
+ ("ec.text.numbers", "Numbers", "რიცხვები"),
+ ("ec.text.timecode", "Timecode", "თაიმკოდი"),
+ ("ec.time.ccforcemotionblur", "CC Force Motion Blur", "CC Force Motion Blur"),
+ ("ec.time.ccwidetime", "CC Wide Time", "CC Wide Time"),
+ ("ec.time.echo", "Echo", "ექო"),
+ ("ec.time.pixelmotionblur", "Pixel Motion Blur", "პიქსელების მოძრაობის გაბუნდოვნება"),
+ ("ec.time.posterizetime", "Posterize Time", "დროის პოსტერიზაცია"),
+ ("ec.time.timedifference", "Time Difference", "დროითი სხვაობა"),
+ ("ec.time.timedisplacement", "Time Displacement", "დროითი წანაცვლება"),
+ ("ec.time.timewarp", "Timewarp", "Timewarp"),
+ ("ec.transition.blockdissolve", "Block Dissolve", "ბლოკური გადადნობა"),
+ ("ec.transition.cardwipe", "Card Wipe", "ბარათებით წმენდა"),
+ ("ec.transition.ccglasswipe", "CC Glass Wipe", "CC Glass Wipe"),
+ ("ec.transition.ccgridwipe", "CC Grid Wipe", "CC Grid Wipe"),
+ ("ec.transition.ccimagewipe", "CC Image Wipe", "CC Image Wipe"),
+ ("ec.transition.ccjaws", "CC Jaws", "CC Jaws"),
+ ("ec.transition.cclightwipe", "CC Light Wipe", "CC Light Wipe"),
+ ("ec.transition.cclinesweep", "CC Line Sweep", "CC Line Sweep"),
+ ("ec.transition.ccradialscalewipe", "CC Radial ScaleWipe", "CC Radial ScaleWipe"),
+ ("ec.transition.ccscalewipe", "CC Scale Wipe", "CC Scale Wipe"),
+ ("ec.transition.cctwister", "CC Twister", "CC Twister"),
+ ("ec.transition.ccwarpomatic", "CC WarpoMatic", "CC WarpoMatic"),
+ ("ec.transition.gradientwipe", "Gradient Wipe", "გრადიენტული წმენდა"),
+ ("ec.transition.iriswipe", "Iris Wipe", "დიაფრაგმული წმენდა"),
+ ("ec.transition.linearwipe", "Linear Wipe", "წრფივი წმენდა"),
+ ("ec.transition.radialwipe", "Radial Wipe", "რადიალური წმენდა"),
+ ("ec.transition.venetian", "Venetian Blinds", "ჟალუზი"),
+ ("ec.utility.applylut", "Apply Color LUT", "ფერის LUT-ის გამოყენება"),
+ ("ec.utility.ccoverbrights", "CC Overbrights", "CC Overbrights"),
+ ("ec.utility.cineon", "Cineon Converter", "Cineon-ის გარდამქმნელი"),
+ ("ec.utility.colorprofileconverter", "Color Profile Converter", "ფერის პროფილის გარდამქმნელი"),
+ ("ec.utility.facemeasurements", "Face Measurements", "სახის გაზომვები"),
+ ("ec.utility.facetrackpoints", "Face Track Points", "სახის ტრეკინგის წერტილები"),
+ ("ec.utility.growbounds", "Grow Bounds", "საზღვრების გაზრდა"),
+ ("ec.utility.hdrcompander", "HDR Compander", "HDR კომპანდერი"),
+ ("ec.utility.hdrcompression", "HDR Highlight Compression", "HDR ღია ტონების შეკუმშვა"),
+ ("ec.vr.blur", "VR Blur", "VR გაბუნდოვნება"),
+ ("ec.vr.chromaticaberrations", "VR Chromatic Aberrations", "VR ქრომატული აბერაციები"),
+ ("ec.vr.colorgradients", "VR Color Gradients", "VR ფერადი გრადიენტები"),
+ ("ec.vr.converter", "VR Converter", "VR გარდამქმნელი"),
+ ("ec.vr.denoise", "VR De-Noise", "VR ხმაურის მოცილება"),
+ ("ec.vr.digitalglitch", "VR Digital Glitch", "VR ციფრული ხარვეზი"),
+ ("ec.vr.fractalnoise", "VR Fractal Noise", "VR ფრაქტალური ხმაური"),
+ ("ec.vr.glow", "VR Glow", "VR ნათება"),
+ ("ec.vr.planetosphere", "VR Plane to Sphere", "VR სიბრტყიდან სფეროზე"),
+ ("ec.vr.rotatesphere", "VR Rotate Sphere", "VR სფეროს შემობრუნება"),
+ ("ec.vr.sharpen", "VR Sharpen", "VR სიმკვეთრე"),
+ ("ec.vr.spheretoplane", "VR Sphere to Plane", "VR სფეროდან სიბრტყეზე"),
+];
+
+/// Georgian (`ka`) category labels, keyed by the registry's English category.
+const GEORGIAN_CATEGORIES: &[(&str, &str)] = &[
+ ("3D Channel", "3D არხი"),
+ ("Audio", "აუდიო"),
+ ("Blur & Sharpen", "გაბუნდოვნება და სიმკვეთრე"),
+ ("Channel", "არხი"),
+ ("Color Correction", "ფერის კორექცია"),
+ ("Distort", "დამახინჯება"),
+ ("Expression Controls", "ექსპრესიის მართვა"),
+ ("Generate", "გენერაცია"),
+ ("Immersive Video", "იმერსიული ვიდეო"),
+ ("Keying", "კეიინგი"),
+ ("Matte", "მატი"),
+ ("Noise & Grain", "ხმაური და მარცვლოვნება"),
+ ("Obsolete", "მოძველებული"),
+ ("Paint", "ხატვა"),
+ ("Perspective", "პერსპექტივა"),
+ ("Simulation", "სიმულაცია"),
+ ("Stylize", "სტილიზაცია"),
+ ("Text", "ტექსტი"),
+ ("Time", "დრო"),
+ ("Transition", "გადასვლა"),
+ ("Utility", "დამხმარე"),
+];
+
/// The 21 category folder names the generated Effect menu and Effects & Presets draw, in
/// Simplified Chinese. Read from the installed After Effects 2026 (26.5.0.89) Simplified Chinese
/// interface (the checklist's `07-类别` sheet); two of them are the interface's own wording where
@@ -524,19 +879,17 @@ mod tests {
use crate::i18n::set_current;
use effectcraft_engine::effects;
- /// Every effect in the registry has a row, and that row still carries the registry's English
- /// name. A new effect, a rename or a removal fails here rather than drawing an English name
- /// in a Chinese interface, or attaching a translation to a different effect.
+ /// Every row names an effect in the registry and still carries its English name, so a rename
+ /// or a removal fails here rather than attaching a translation to a different effect.
#[test]
- fn every_effect_has_a_row() {
+ fn every_row_names_a_registry_effect() {
let registry = effects::registry();
- assert_eq!(SIMPLIFIED_CHINESE.len(), registry.len(), "the catalog has {} rows for {} effects", SIMPLIFIED_CHINESE.len(), registry.len());
- for spec in registry {
- let Some((_, english, translated)) = SIMPLIFIED_CHINESE.iter().find(|(id, _, _)| *id == spec.id) else {
- panic!("no catalog row for {} ({})", spec.id, spec.name);
+ for (id, english, translated) in SIMPLIFIED_CHINESE {
+ let Some(spec) = registry.iter().find(|spec| spec.id == *id) else {
+ panic!("{id} ({english}) is not an effect in the registry");
};
- assert_eq!(*english, spec.name, "{}: the catalog says {english:?}, the registry {:?}", spec.id, spec.name);
- assert!(!translated.is_empty(), "{}: empty translation", spec.id);
+ assert_eq!(*english, spec.name, "{id}: the catalog says {english:?}, the registry {:?}", spec.name);
+ assert!(!translated.is_empty(), "{id}: empty translation");
}
}
@@ -550,24 +903,12 @@ mod tests {
assert_eq!(listed, ids.len(), "an effect id is listed twice");
}
- /// The five names Adobe's Simplified Chinese interface leaves in English as brand names, and
- /// the only zh-hans rows that may repeat their English name. Deliberately not shared: another
- /// language keeps different names in English (Japanese leaves the whole `CC`, `VR` and `OCIO`
- /// sets in English), so this is zh-hans's own choice, not an invariant of the tables.
- #[test]
- fn only_the_brand_names_stay_in_english() {
- const BRANDS: [&str; 5] = ["ec.3d.cryptomatte", "ec.3d.extractor", "ec.3d.identifier", "ec.keying.keylight", "ec.key.unmult"];
- for (id, english, translated) in SIMPLIFIED_CHINESE {
- assert_eq!(english == translated, BRANDS.contains(id), "{id}: {english:?} is drawn as {translated:?}");
- }
- }
-
/// The languages that have no rows yet, with the table a translator fills in for each. A new
/// language is added here and to [`catalog`]; the test then guards its rows as they arrive.
const PENDING: &[(&str, &[Row])] = &[("zh-hant", TRADITIONAL_CHINESE)];
/// The languages whose tables are being filled in: guarded like [`PENDING`] row by row.
- const PARTIAL: &[(&str, &[Row])] = &[("ja", JAPANESE_EFFECTS)];
+ const PARTIAL: &[(&str, &[Row])] = &[("ja", JAPANESE_EFFECTS), ("ka", GEORGIAN)];
/// A pending language may lag Simplified Chinese but may not invent ids or disagree about
/// which effect an id names: a translator fills these tables row by row. While they are
@@ -591,16 +932,14 @@ mod tests {
}
}
- /// Every category the registry and its plug-ins report has a Simplified Chinese row, and
- /// every row of every language names a category that exists — else the generated Effect menu
- /// and Effects & Presets would draw a label no folder has.
+ /// Every category row of every language names a category that exists, else the generated
+ /// Effect menu and Effects & Presets would carry a label no folder has.
#[test]
- fn every_category_has_a_row() {
+ fn every_category_row_names_a_category() {
let categories = effects::categories();
- for category in &categories {
- assert!(SIMPLIFIED_CHINESE_CATEGORIES.iter().any(|(english, _)| english == category), "no catalog row for category {category}");
- }
- for (language, rows) in [("zh-hans", SIMPLIFIED_CHINESE_CATEGORIES), ("zh-hant", TRADITIONAL_CHINESE_CATEGORIES), ("ja", JAPANESE_CATEGORIES)] {
+ for (language, rows) in
+ [("zh-hans", SIMPLIFIED_CHINESE_CATEGORIES), ("zh-hant", TRADITIONAL_CHINESE_CATEGORIES), ("ja", JAPANESE_CATEGORIES), ("ka", GEORGIAN_CATEGORIES)]
+ {
for (english, translated) in rows {
assert!(categories.contains(english), "{language} lists {english}, which is not a category");
assert!(!translated.is_empty(), "empty {language} translation for {english}");
@@ -613,48 +952,38 @@ mod tests {
#[test]
fn group_names_keep_the_instance_index_and_user_renames() {
set_current("zh-hans");
- assert_eq!(group("ec.blur.gaussian", "Gaussian Blur"), "高斯模糊");
- assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "高斯模糊 2");
- assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 12"), "高斯模糊 12");
+ let translated = name("ec.blur.gaussian", "Gaussian Blur");
+ assert_eq!(group("ec.blur.gaussian", "Gaussian Blur"), translated);
+ assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), format!("{translated} 2"));
+ assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 12"), format!("{translated} 12"));
assert_eq!(group("ec.blur.gaussian", "My Blur"), "My Blur", "a rename is not a row");
assert_eq!(group("ec.blur.gaussian", "Gaussian Blur X"), "Gaussian Blur X");
assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2x"), "Gaussian Blur 2x");
- assert_eq!(group("ec.blur.gaussian", "高斯模糊"), "高斯模糊", "an already translated name stays");
+ assert_eq!(group("ec.blur.gaussian", &translated), translated, "an already translated name stays");
set_current("en");
}
- /// English, and a language with no catalog or no row for this effect, draws the registry's
- /// name rather than an empty label.
- ///
- /// The pending languages are also checked to still be row-less and to have an arm in
- /// [`catalog`]: an arm with no table would leave a translator's rows dead, and the day a
- /// pending language gets rows this fails so its slot moves out of [`PENDING`], where the
- /// coverage for it lives.
+ /// English, and a language with no catalog or no row for an effect, draws the registry's
+ /// name rather than an empty label; a language with a row draws the row. Every table in
+ /// [`PENDING`] and [`PARTIAL`] has an arm in [`catalog`]: an arm-less table's rows would be dead.
#[test]
fn languages_without_rows_draw_the_registry_name() {
+ for (language, _) in PENDING.iter().chain(PARTIAL) {
+ assert!(catalog(language).is_some(), "{language} has a table but no arm in `catalog`: its rows would be dead");
+ }
+ let tables = PENDING.iter().chain(PARTIAL).copied().chain([("zh-hans", SIMPLIFIED_CHINESE)]);
+ for (language, rows) in [("en", &[][..]), ("uk", &[][..]), ("cs", &[][..])].into_iter().chain(tables) {
+ set_current(language);
+ let expected = rows.iter().find(|(id, _, _)| *id == "ec.blur.gaussian").map_or("Gaussian Blur", |(_, _, translated)| *translated);
+ assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), expected, "{language}");
+ assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), format!("{expected} 2"), "{language}");
+ assert_eq!(name("ec.unknown.effect", "Mystery"), "Mystery", "{language}");
+ assert_eq!(category("Not A Category"), "Not A Category", "{language}");
+ }
for language in ["en", "uk", "cs"] {
set_current(language);
- assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "Gaussian Blur", "{language}");
- assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "Gaussian Blur 2", "{language}");
assert_eq!(category("Blur & Sharpen"), "Blur & Sharpen", "{language}");
}
- for (language, rows) in PENDING {
- assert!(catalog(language).is_some(), "{language} has a table but no arm in `catalog`: its rows would be dead");
- assert!(rows.is_empty(), "{language} has rows now: move it out of PENDING and cover it here");
- set_current(language);
- assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "Gaussian Blur", "{language}");
- assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "Gaussian Blur 2", "{language}");
- assert_eq!(category("Blur & Sharpen"), "Blur & Sharpen", "{language}");
- }
- set_current("zh-hans");
- assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "高斯模糊");
- assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "高斯模糊 2");
- assert_eq!(category("Blur & Sharpen"), "模糊和锐化");
- assert_eq!(name("ec.unknown.effect", "Mystery"), "Mystery");
- assert_eq!(category("Not A Category"), "Not A Category");
- set_current("ja");
- assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "ブラー（ガウス）");
- assert_eq!(name("ec.unknown.effect", "Mystery"), "Mystery", "a row a partial table lacks draws the registry name");
set_current("en");
}
@@ -665,38 +994,10 @@ mod tests {
set_current("zh-hans");
assert!(matches("ec.blur.gaussian", "Gaussian Blur", "blur"));
assert!(matches("ec.blur.gaussian", "Gaussian Blur", "gaussian"));
- assert!(matches("ec.blur.gaussian", "Gaussian Blur", "高斯"));
+ assert!(matches("ec.blur.gaussian", "Gaussian Blur", &name("ec.blur.gaussian", "Gaussian Blur").to_lowercase()));
assert!(!matches("ec.blur.gaussian", "Gaussian Blur", "sharpen"));
set_current("en");
assert!(matches("ec.blur.gaussian", "Gaussian Blur", "blur"));
assert!(!matches("ec.blur.gaussian", "Gaussian Blur", "高斯"));
}
-
- /// The drawing sites ask this catalog instead of the registry's English name (#821). Like the
- /// panel catalog's literal scan this is a heuristic: it pins the expressions that used to draw
- /// the English name, so a revert fails here.
- #[test]
- fn the_drawing_sites_ask_the_catalog() {
- /// A file that must ask the catalog.
- const ASKS: &[(&str, &str, &str)] = &[
- ("i18n.rs", include_str!("../i18n.rs"), "effects::name("),
- ("i18n.rs", include_str!("../i18n.rs"), "effects::category("),
- ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs"), "effects::name("),
- ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs"), "effects::category("),
- ("panels/effect_controls.rs", include_str!("../panels/effect_controls.rs"), "effects::group("),
- ("panels/timeline.rs", include_str!("../panels/timeline.rs"), "effects::group("),
- ];
- /// An expression that drew the registry's English name and must be gone.
- const RAW: &[(&str, &str, &str)] = &[
- ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs"), "pos2(r.min.x + 56.0 + indent, r.center().y), e.name, query, &t)"),
- ("panels/effect_controls.rs", include_str!("../panels/effect_controls.rs"), "Align2::LEFT_CENTER, &g.name,"),
- ("panels/timeline.rs", include_str!("../panels/timeline.rs"), "Align2::LEFT_CENTER, name,"),
- ];
- for (path, source, call) in ASKS {
- assert!(source.contains(call), "{path} does not ask the effect-name catalog (`{call}`)");
- }
- for (path, source, raw) in RAW {
- assert!(!source.contains(raw), "{path} draws the registry's English name again: `{raw}`");
- }
- }
}
diff --git a/crates/ui-egui/src/i18n/ui.rs b/crates/ui-egui/src/i18n/ui.rs
index d8b982dbf..6569dd147 100644
--- a/crates/ui-egui/src/i18n/ui.rs
+++ b/crates/ui-egui/src/i18n/ui.rs
@@ -12,6 +12,9 @@
//! A row that carries values keeps one `{}` per value and is read with [`tr_args`]; the tests below
//! refuse a row whose placeholder count differs from its English source, so a translation can never
//! drop a value, and `tr_args` itself cannot panic.
+//!
+//! A language may lack rows: the English source shows instead, and the `missing_translations_report`
+//! test (run by `cargo xtask ci`) lists what each language lacks.
use std::cell::Cell;
use std::collections::HashMap;
@@ -19,7 +22,7 @@ use std::fmt::Display;
use std::sync::OnceLock;
thread_local! {
- /// The resolved interface language ("en", "ja", "zh-hans", "zh-hant", "uk", "pt-br", "cs", "es"); "en" until the first
+ /// The resolved interface language ("en", "ja", "zh-hans", "zh-hant", "uk", "pt-br", "cs", "es", "ka"); "en" until the first
/// frame sets it.
static CURRENT: Cell<&'static str> = const { Cell::new("en") };
}
@@ -37,6 +40,20 @@ pub(crate) fn current() -> &'static str {
type Index = HashMap<&'static str, &'static str>;
+/// Every language with panel rows, for the tests and the missing-strings report.
+#[cfg(test)]
+const ROWS: &[(&str, &[(&str, &str)])] = &[
+ ("ja", JAPANESE),
+ ("zh-hans", SIMPLIFIED_CHINESE),
+ ("zh-hant", TRADITIONAL_CHINESE),
+ ("uk", UKRAINIAN),
+ ("pt-br", PORTUGUESE),
+ ("cs", CZECH),
+ ("es", SPANISH),
+ ("ka", GEORGIAN),
+ ("ka", GEORGIAN_PANELS),
+];
+
/// The catalog for `language`, indexed by English source (built on first use: panels translate
/// hundreds of strings a frame); `None` for English and any language that has no rows yet.
fn catalog(language: &str) -> Option<&'static Index> {
@@ -47,6 +64,7 @@ fn catalog(language: &str) -> Option<&'static Index> {
static PT_BR: OnceLock = OnceLock::new();
static CS: OnceLock = OnceLock::new();
static ES: OnceLock = OnceLock::new();
+ static KA: OnceLock = OnceLock::new();
let (index, rows) = match language {
"ja" => (&JA, JAPANESE),
"zh-hans" => (&HANS, SIMPLIFIED_CHINESE),
@@ -55,11 +73,69 @@ fn catalog(language: &str) -> Option<&'static Index> {
"pt-br" => (&PT_BR, PORTUGUESE),
"cs" => (&CS, CZECH),
"es" => (&ES, SPANISH),
+ // Georgian also reads its own rows for text the other catalogs don't have yet.
+ "ka" => return Some(KA.get_or_init(|| GEORGIAN.iter().chain(GEORGIAN_PANELS).copied().collect())),
_ => return None,
};
Some(index.get_or_init(|| rows.iter().copied().collect()))
}
+/// The panel strings `language` has no row for, for the missing-strings report: every English
+/// source any catalog lists, in catalog order, then the literals the converted panels pass to `tr`
+/// or `tr_args` that no catalog lists yet.
+#[cfg(test)]
+pub(super) fn missing(language: &str) -> Vec {
+ let table = catalog(language);
+ let rows = ROWS.iter().flat_map(|(_, rows)| rows.iter().map(|(en, _)| en.to_string()));
+ let literals = tests::CONVERTED.iter().flat_map(|(_, src)| tr_literals(src));
+ let mut seen = std::collections::HashSet::new();
+ rows.chain(literals).filter(|en| !table.is_some_and(|c| c.contains_key(en.as_str())) && seen.insert(en.clone())).collect()
+}
+
+/// The string literals `src` passes to `tr(` and `tr_args(`.
+#[cfg(test)]
+fn tr_literals(src: &str) -> Vec {
+ let mut out = Vec::new();
+ for call in ["tr(\"", "tr_args(\""] {
+ for (at, _) in src.match_indices(call) {
+ // `str("` or `attr("` is another call.
+ if src[..at].chars().next_back().is_some_and(|c| c.is_alphanumeric() || c == '_') {
+ continue;
+ }
+ out.extend(string_literal(&src[at + call.len()..]));
+ }
+ }
+ out
+}
+
+/// The text of the string literal `rest` starts inside (just after its opening quote), with the
+/// common escapes resolved; `None` for an escape this doesn't resolve.
+#[cfg(test)]
+fn string_literal(rest: &str) -> Option {
+ let mut out = String::new();
+ let mut chars = rest.chars();
+ while let Some(c) = chars.next() {
+ match c {
+ '"' => return Some(out),
+ '\\' => match chars.next()? {
+ 'n' => out.push('\n'),
+ 't' => out.push('\t'),
+ c @ ('\\' | '"' | '\'') => out.push(c),
+ _ => return None,
+ },
+ c => out.push(c),
+ }
+ }
+ None
+}
+
+/// Characters required by the fixed panel catalog, for system-font coverage selection.
+/// Sorted and deduplicated so fallback registration is deterministic.
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn catalog_characters(language: &str) -> Vec {
+ catalog(language).into_iter().flat_map(|c| c.values()).flat_map(|s| s.chars()).collect::>().into_iter().collect()
+}
+
/// Translate one interface string: the current language's row for `text`, or `text` itself.
pub(crate) fn tr(text: &str) -> &str {
catalog(current()).and_then(|c| c.get(text)).copied().unwrap_or(text)
@@ -85,7 +161,7 @@ pub(crate) fn tr_args(text: &str, args: &[&dyn Display]) -> String {
out
}
-/// Japanese: the same rows, in the same order, as the Chinese catalogs below (the tests keep the two in step).
+/// Japanese: the same rows, in the same order, as the Chinese catalogs below.
const JAPANESE: &[(&str, &str)] = &[
("Appearance Settings…", "外観設定…"),
("Add to favorites", "お気に入りに追加"),
@@ -2638,59 +2714,10 @@ const TRADITIONAL_CHINESE: &[(&str, &str)] = &[
("⌘/Ctrl-drag a pin to record its motion", "⌘/Ctrl 拖曳釘選點可記錄其運動"),
("▣ {}", "▣ {}"),
("⚠ {} is used by:", "⚠ {} 已被以下專案使用："),
- // The same rows as the Simplified catalog (the tests require both lists to match). The
- // Traditional wording is the translator's call and is left as the English source for now.
- ("3D Reference Axes", "3D Reference Axes"),
- ("Affect all layers that use this solid", "Affect all layers that use this solid"),
- ("Choose grid and guide options", "Choose grid and guide options"),
- ("Colorize", "Colorize"),
- ("Custom", "Custom"),
- ("Custom...", "Custom..."),
- ("Fit", "Fit"),
- ("Fit up to 100%", "Fit up to 100%"),
- ("Full", "Full"),
- ("Half", "Half"),
- ("Only this layer uses this solid.", "Only this layer uses this solid."),
- ("Proportional Grid", "Proportional Grid"),
- ("Quarter", "Quarter"),
- ("Region of Interest", "Region of Interest"),
- ("Reset Exposure", "Reset Exposure"),
- ("Show Channel and Color Management Settings", "Show Channel and Color Management Settings"),
- ("Show Snapshot (hold)", "Show Snapshot (hold)"),
- ("Take Snapshot", "Take Snapshot"),
- ("Third", "Third"),
- ("Toggle Mask and Shape Path Visibility", "Toggle Mask and Shape Path Visibility"),
- ("Toggle Transparency Grid", "Toggle Transparency Grid"),
- ("16 bits per channel", "16 bits per channel"),
- ("32 bits per channel (float)", "32 bits per channel (float)"),
- ("8 bits per channel", "8 bits per channel"),
- ("Adaptive Resolution", "Adaptive Resolution"),
- ("Adobe-style built-in", "Adobe-style built-in"),
("Blue", "藍色"),
- ("Current Settings", "Current Settings"),
- ("Disable Per-character 3D", "Disable Per-character 3D"),
- ("Draft", "Draft"),
- ("Enable Per-character 3D", "Enable Per-character 3D"),
- ("Fast Draft", "Fast Draft"),
- ("Fast Previews (Draft 3D, Faster Effects)", "Fast Previews (Draft 3D, Faster Effects)"),
("Green", "綠色"),
- ("Import Image Sequence", "Import Image Sequence"),
- ("Import PDF / Illustrator File", "Import PDF / Illustrator File"),
- ("Import Photoshop File", "Import Photoshop File"),
- ("Interpret Unlabeled Alpha As", "Interpret Unlabeled Alpha As"),
("Join the ArtCraft Discord", "加入 ArtCraft Discord"),
- ("Mercury GPU Acceleration ({})", "Mercury GPU Acceleration ({})"),
- ("Mercury Software Only", "Mercury Software Only"),
- ("OCIO (built-in ACES config)", "OCIO (built-in ACES config)"),
- ("Off (Final Quality)", "Off (Final Quality)"),
- ("OpenGL (compatibility)", "OpenGL (compatibility)"),
- ("Opus Bitrate: {} kbps", "Opus Bitrate: {} kbps"),
- ("RGB Straight", "RGB Straight"),
("Red", "紅色"),
- ("Tone map", "Tone map"),
- ("Use In-Window Menu Bar on macOS", "Use In-Window Menu Bar on macOS"),
- ("Wireframe", "Wireframe"),
- ("sRGB IEC61966-2.1 (default)", "sRGB IEC61966-2.1 (default)"),
// The Home screen (#574).
("New Project", "新增專案"),
("Open Project…", "開啟專案…"),
@@ -5350,18 +5377,977 @@ const SPANISH: &[(&str, &str)] = &[
("Project", "Proyecto"),
];
+/// Georgian (ka): every row of the Chinese catalogs, in the same order (the tests keep them in step).
+const GEORGIAN: &[(&str, &str)] = &[
+ ("Appearance Settings…", "იერსახის პარამეტრები…"),
+ ("Add to favorites", "რჩეულებში დამატება"),
+ ("Remove from favorites", "რჩეულებიდან ამოშლა"),
+ (" OK ", " OK "),
+ (" Delete ", " წაშლა "),
+ (" Open Auto-Save ", " ავტოშენახვის გახსნა "),
+ ("(missing)", "(აკლია)"),
+ ("360 View Orientation", "360° ხედის ორიენტაცია"),
+ ("3:2 Pulldown: {}", "3:2 Pulldown: {}"),
+ (
+ "A clean-room, open-source compositor for motion graphics and visual effects: native on macOS, Windows and Linux, and in the browser. Part of the ArtCraft family of creative apps.",
+ "სუფთა ოთახის მეთოდით შექმნილი, ღია კოდის კომპოზიტორი მოძრავი გრაფიკისა და ვიზუალური ეფექტებისთვის: ნატიურად მუშაობს macOS-ზე, Windows-სა და Linux-ზე, ასევე ბრაუზერში. ArtCraft-ის შემოქმედებითი აპების ოჯახის ნაწილი.",
+ ),
+ ("About EffectCraft", "EffectCraft-ის შესახებ"),
+ ("About...", "პროგრამის შესახებ..."),
+ ("Active", "აქტიური"),
+ ("Active Camera", "აქტიური კამერა"),
+ ("Alpha", "ალფა"),
+ ("Adapt Feature On Every Frame", "მახასიათებლის განახლება ყოველ კადრზე"),
+ ("Adaptive Sample Limit:", "ადაპტური ნიმუშების ზღვარი:"),
+ ("Add Animator", "ანიმატორის დამატება"),
+ ("Add Comment", "კომენტარის დამატება"),
+ ("Add Formatting", "ფორმატირების დამატება"),
+ ("Add Group", "ჯგუფის დამატება"),
+ ("Add Mirror", "სარკის დამატება"),
+ ("Add Selected As", "მონიშნულის დამატება როგორც"),
+ ("Add a comment", "კომენტარის დამატება"),
+ ("Add a shape, fill, stroke or path operation", "ფიგურის, შევსების, კონტურის ან ტრაექტორიის ოპერაციის დამატება"),
+ ("Add to Composition", "კომპოზიციაში დამატება"),
+ ("Add to Favorites", "რჩეულებში დამატება"),
+ ("Add:", "დამატება:"),
+ ("Adjust Exposure (stops)", "ექსპოზიციის კორექცია (საფეხურები)"),
+ ("Adjust composition duration to the time span of the selected layers", "კომპოზიციის ხანგრძლივობის მორგება მონიშნული შრეების დროის შუალედზე"),
+ ("Advanced 3D", "გაფართოებული 3D"),
+ ("Align Layers to:", "შრეების სწორება:"),
+ ("All six face cameras turn together; the scene is not changed.", "სახეების ექვსივე კამერა ერთად ბრუნავს; სცენა არ იცვლება."),
+ ("Anchor:", "მიმაგრება:"),
+ ("Aperture", "დიაფრაგმა"),
+ ("Appearance Mode", "იერსახის რეჟიმი"),
+ ("Appearance Mode: {}", "იერსახის რეჟიმი: {}"),
+ ("Apply Dimensions:", "განზომილებების გამოყენება:"),
+ ("Apply Motion To:", "მოძრაობის გამოყენება:"),
+ ("Arrange", "დალაგება"),
+ ("Assign", "მინიჭება"),
+ ("Auto", "ავტომატური"),
+ ("Auto-saves", "ავტოშენახვები"),
+ ("Back", "უკან"),
+ ("Background Color:", "ფონის ფერი:"),
+ ("Blend Mode:", "შერევის რეჟიმი:"),
+ ("Blending Mode", "შერევის რეჟიმი"),
+ ("Blur", "გაბუნდოვნება"),
+ ("Blur Level", "გაბუნდოვნების დონე"),
+ ("Boundary", "საზღვარი"),
+ ("Browser Storage", "ბრაუზერის მეხსიერება"),
+ ("Browse…", "არჩევა…"),
+ ("Brush Dynamics", "ფუნჯის დინამიკა"),
+ ("Caching frames…", "კადრების ქეშირება…"),
+ ("Cancel", "გაუქმება"),
+ ("Casts Shadows", "ჩრდილს აგდებს"),
+ ("Change Renderer…", "რენდერერის შეცვლა…"),
+ ("Changing a shortcut creates a custom preset; the default stays as it is.", "მალსახმობის შეცვლა ქმნის მორგებულ პრესეტს; ნაგულისხმევი უცვლელი რჩება."),
+ ("Channel", "არხი"),
+ ("Channel:", "არხი:"),
+ ("Chapter:", "თავი:"),
+ ("Choose...", "არჩევა..."),
+ ("Classic 3D", "კლასიკური 3D"),
+ ("Clear", "გასუფთავება"),
+ ("Clear list", "სიის გასუფთავება"),
+ ("Click a key to see its commands.", "დაწკაპეთ კლავიშზე მისი ბრძანებების სანახავად."),
+ (
+ "Click above the bar to add an opacity stop, below it to add a color stop.",
+ "დაწკაპეთ ზოლის ზემოთ გაუმჭვირვალობის გადასვლის წერტილის დასამატებლად, ქვემოთ — ფერის გადასვლის წერტილის დასამატებლად.",
+ ),
+ ("Click adds a point (½ height = no change)", "დაწკაპუნება ამატებს წერტილს (½ სიმაღლე = ცვლილების გარეშე)"),
+ ("Click adds a point; drag one off to remove", "დაწკაპუნება ამატებს წერტილს; მის მოსაშორებლად გადაათრიეთ გარეთ"),
+ ("Click to make this viewer active", "დაწკაპეთ ამ დამთვალიერებელის გასააქტიურებლად"),
+ ("Click to reveal the expression in the timeline", "დაწკაპეთ ექსპრესიის დროის ხაზზე საჩვენებლად"),
+ ("Click to show the active composition here", "დაწკაპეთ აქტიური კომპოზიციის აქ საჩვენებლად"),
+ ("Click, then click in the Composition panel", "დაწკაპეთ, შემდეგ კი დაწკაპეთ კომპოზიციის პანელში"),
+ ("Clone Options", "კლონირების პარამეტრები"),
+ ("Clone Source Overlay:", "კლონირების წყაროს გადაფარვა:"),
+ ("Close", "დახურვა"),
+ ("Close Panel", "პანელის დახურვა"),
+ ("Close tutorial", "გაკვეთილის დახურვა"),
+ ("Color", "ფერი"),
+ ("Color Depth: {}", "ფერის სიღრმე: {}"),
+ ("Color:", "ფერი:"),
+ ("Colour map", "ფერების რუკა"),
+ ("Columns", "სვეტები"),
+ ("Comment:", "კომენტარი:"),
+ ("Community", "საზოგადოება"),
+ ("Composition", "კომპოზიცია"),
+ ("Composition Mini-Flowchart", "კომპოზიციის მინი-ბლოკ-სქემა"),
+ ("Composition Name:", "კომპოზიციის სახელი:"),
+ ("Composition Settings ▸ 3D Renderer", "კომპოზიციის პარამეტრები ▸ 3D რენდერერი"),
+ ("Composition Settings…", "კომპოზიციის პარამეტრები…"),
+ ("Composition marker bin: drag a marker to the time ruler", "კომპოზიციის მარკერების ბინი: გადაათრიეთ მარკერი დროის სახაზავზე"),
+ ("Cone Angle", "კონუსის კუთხე"),
+ ("Cone Feather", "კონუსის კიდეების შერბილება"),
+ ("Constrain Proportions", "პროპორციების შენარჩუნება"),
+ ("Continuous (Lock Outgoing to Incoming)", "უწყვეტი (გამავალის მიბმა შემავალზე)"),
+ ("Cue Point", "მინიშნების წერტილი"),
+ ("Current Render", "მიმდინარე რენდერი"),
+ ("Dark", "ბნელი"),
+ ("Dark Theme", "ბნელი თემა"),
+ ("Darker", "უფრო მუქი"),
+ ("Default Output:", "ნაგულისხმევი გამოტანა:"),
+ ("Default: {}", "ნაგულისხმევი: {}"),
+ ("Defaults", "ნაგულისხმევი"),
+ ("Delete", "წაშლა"),
+ ("Delete Selected Points", "მონიშნული წერტილების წაშლა"),
+ ("Delete selected project items", "პროექტის მონიშნული ელემენტების წაშლა"),
+ ("Delete this template", "ამ შაბლონის წაშლა"),
+ ("Depth of Field", "ველის სიღრმე"),
+ ("Discord", "Discord"),
+ ("Distribute Layers:", "შრეების განაწილება:"),
+ ("Don't Recover", "არ აღადგინო"),
+ ("Don't Save", "არ შეინახო"),
+ ("Double-click a layer to open it in the Layer panel", "ორჯერ დაწკაპეთ შრეზე მის შრის პანელში გასახსნელად"),
+ ("Double-click footage in the Project panel to open it here", "ორჯერ დაწკაპეთ ვიდეომასალაზე პროექტის პანელში მის აქ გასახსნელად"),
+ ("Double-click to edit the comment", "ორჯერ დაწკაპეთ კომენტარის რედაქტირებისთვის"),
+ ("Download", "ჩამოტვირთვა"),
+ (
+ "Drag properties here from the timeline,\nor use Animation > Add Property to Essential Graphics.",
+ "გადმოათრიეთ თვისებები დროის ხაზიდან,\nან გამოიყენეთ ანიმაცია > თვისების დამატება ძირითად გრაფიკაში.",
+ ),
+ ("Drag to change", "გადაათრიეთ შესაცვლელად"),
+ ("Drag to create a guide", "გადაათრიეთ დამხმარე ხაზის შესაქმნელად"),
+ ("Drag to slip the source", "გადაათრიეთ წყაროს გადასაწევად"),
+ ("Drop Frame", "კადრების გამოტოვებით"),
+ ("Duplicate", "დუბლირება"),
+ ("Copy", "კოპირება"),
+ ("Paste", "ჩასმა"),
+ ("Edit Value…", "მნიშვნელობის რედაქტირება…"),
+ ("Remove Expression", "ექსპრესიის მოცილება"),
+ ("Duration:", "ხანგრძლივობა:"),
+ ("Edit Gradient…", "გრადიენტის რედაქტირება…"),
+ ("Edit Target: {}", "რედაქტირების სამიზნე: {}"),
+ ("Edit in the Timeline", "რედაქტირება დროის ხაზზე"),
+ ("EffectCraft didn't quit normally last time.", "EffectCraft ბოლოს ნორმალურად არ დახურულა."),
+ ("Effects", "ეფექტები"),
+ ("Effects & Presets options", "ეფექტებისა და პრესეტების პარამეტრები"),
+ ("Copy Presets Folder Path", "პრესეტების საქაღალდის მისამართის კოპირება"),
+ ("Copy Source Path", "წყაროს მისამართის კოპირება"),
+ ("Effects: {}", "ეფექტები: {}"),
+ ("Empty folder", "ცარიელი საქაღალდე"),
+ ("Enable Depth of Field", "ველის სიღრმის ჩართვა"),
+ ("Enable Expression", "ექსპრესიის ჩართვა"),
+ ("Enhance", "გაუმჯობესება"),
+ ("Essential Properties — {}", "ძირითადი თვისებები — {}"),
+ ("Event", "მოვლენა"),
+ ("Export Template…", "შაბლონის ექსპორტი…"),
+ ("Export...", "ექსპორტი..."),
+ ("Expression Language Menu", "ექსპრესიების ენის მენიუ"),
+ ("Expression pick whip: drag onto a property", "ექსპრესიის ბმის სპირალი: გადაათრიეთ თვისებაზე"),
+ ("Expression:", "ექსპრესია:"),
+ ("Eyedropper: click, then click in the Composition panel", "პიპეტი: დაწკაპეთ, შემდეგ კი დაწკაპეთ კომპოზიციის პანელში"),
+ ("Falloff", "მილევა"),
+ ("Falloff Distance", "მილევის მანძილი"),
+ ("Favorites", "რჩეულები"),
+ ("Field Render: {}", "ნახევარკადრების რენდერი: {}"),
+ ("Figures", "ციფრები"),
+ ("Fill Target", "შევსების სამიზნე"),
+ ("Finished", "დასრულდა"),
+ ("Flowchart: {}", "ბლოკ-სქემა: {}"),
+ ("Focus Distance", "ფოკუსური მანძილი"),
+ ("Follow Feature Rotation and Scale", "მახასიათებლის შემობრუნებისა და მასშტაბის მიდევნება"),
+ ("Footage: {}", "ვიდეომასალა: {}"),
+ ("Format: {}", "ფორმატი: {}"),
+ ("Frame Aspect Ratio: {}", "კადრის თანაფარდობა: {}"),
+ ("Frame Blending: {}", "კადრების შერევა: {}"),
+ ("Frame Rate:", "კადრების სიხშირე:"),
+ ("Frame Render Time {}ms", "კადრის რენდერის დრო {}ms"),
+ ("Frame Target:", "კადრის სამიზნე:"),
+ ("Freeze", "გაყინვა"),
+ ("Grab bag", "სხვადასხვა"),
+ ("Gradient Editor", "გრადიენტის რედაქტორი"),
+ ("Grid", "ბადე"),
+ ("Guide Layer", "დამხმარე შრე"),
+ ("Guide Layers: {}", "დამხმარე შრეები: {}"),
+ ("Guides", "დამხმარე ხაზები"),
+ ("Height:", "სიმაღლე:"),
+ ("Hide This", "ამის დამალვა"),
+ ("Histogram", "ჰისტოგრამა"),
+ ("Hold In Place", "ადგილზე დაფიქსირება"),
+ ("Home", "საწყისი ეკრანი"),
+ ("If Confidence is Below", "თუ სანდოობა ნაკლებია"),
+ ("Import", "იმპორტი"),
+ ("Import and Add to Composition", "იმპორტი და კომპოზიციაში დამატება"),
+ ("Import...", "იმპორტი..."),
+ ("Imported media", "იმპორტირებული მედია"),
+ ("Influence:", "გავლენა:"),
+ ("Install from File…", "ფაილიდან დაყენება…"),
+ ("Intensity", "ინტენსივობა"),
+ ("Inverted", "შებრუნებული"),
+ ("Join the ArtCraft community on Discord", "შემოუერთდით ArtCraft-ის საზოგადოებას Discord-ზე"),
+ ("Key: {}", "გასაღები: {}"),
+ ("LEARN", "სწავლა"),
+ ("Label", "იარლიყი"),
+ ("Label Colors and Names:", "იარლიყების ფერები და სახელები:"),
+ ("Label:", "იარლიყი:"),
+ ("Latest auto-save: {}", "ბოლო ავტოშენახვა: {}"),
+ ("Layer", "შრე"),
+ ("Layer controls", "შრის მართვის ელემენტები"),
+ ("Layer {}", "შრე {}"),
+ ("Layer:", "შრე:"),
+ ("Layer: {}", "შრე: {}"),
+ ("Layer Styles", "შრის სტილები"),
+ ("Learn", "სწავლა"),
+ ("Leave all attributes in \"{}\"", "ყველა ატრიბუტის დატოვება „{}“-ში"),
+ ("Licence: {}", "ლიცენზია: {}"),
+ ("Ligatures", "ლიგატურები"),
+ ("Light", "ღია"),
+ ("Light Theme", "ღია თემა"),
+ ("Light Type", "სინათლის ტიპი"),
+ ("Lighter", "უფრო ღია"),
+ ("Link Selected Property", "მონიშნული თვისების დაკავშირება"),
+ ("Location:", "პოზიცია:"),
+ ("Lock Aspect Ratio to {}", "თანაფარდობის ჩაკეტვა: {}"),
+ ("Lock to Zoom", "მასშტაბზე მიბმა"),
+ ("Locked: {} — {}", "ჩაკეტილი: {} — {}"),
+ ("Log:", "ჟურნალი:"),
+ ("Loop (Trace Path)", "მარყუჟი (ტრაექტორიის გავლა)"),
+ ("MIT OR Apache-2.0 • Fonts: Inter, JetBrains Mono (OFL)", "MIT OR Apache-2.0 • შრიფტები: Inter, JetBrains Mono (OFL)"),
+ ("Magnification ratio popup", "გადიდების კოეფიციენტის მენიუ"),
+ ("Make Comp Size", "კომპოზიციის ზომაზე მორგება"),
+ ("Markers", "მარკერები"),
+ ("Masks", "ნიღბები"),
+ ("Maximize Panel", "პანელის გაშლა"),
+ ("Media Replacement", "მედიის ჩანაცვლება"),
+ ("Mesh:", "ბადე:"),
+ ("Diameter:", "დიამეტრი:"),
+ ("Method Used: {} Average Error: {} pixels", "გამოყენებული მეთოდი: {} საშუალო ცდომილება: {} პიქსელი"),
+ ("Models folder: {}", "მოდელების საქაღალდე: {}"),
+ ("Modifiers:", "მოდიფიკატორები:"),
+ ("More", "მეტი"),
+ ("More ArtCraft apps", "ArtCraft-ის სხვა აპლიკაციები"),
+ ("More tutorials", "მეტი გაკვეთილი"),
+ ("Motion Blur", "მოძრაობის გაბუნდოვნება"),
+ ("Motion Blur: {}", "მოძრაობის გაბუნდოვნება: {}"),
+ ("Motion Sketch: drag to record", "მოძრაობის ესკიზი: გადაათრიეთ ჩასაწერად"),
+ ("Move Down", "ჩამოწევა"),
+ ("Move Up", "აწევა"),
+ ("Move to Project Root", "პროექტის ძირში გადატანა"),
+ ("Name", "სახელი"),
+ ("Name:", "სახელი:"),
+ ("Navigation", "ნავიგაცია"),
+ ("New", "ახალი"),
+ ("New Comp from Selection", "ახალი კომპოზიცია მონიშნულიდან"),
+ ("Replace with Precomposition", "ჩადგმული კომპოზიციით ჩანაცვლება"),
+ ("New Duration:", "ახალი ხანგრძლივობა:"),
+ ("New composition name:", "ახალი კომპოზიციის სახელი:"),
+ ("New from Render Queue item:", "ახალი რენდერის რიგის ელემენტიდან:"),
+ ("New from Template", "შაბლონიდან შექმნა"),
+ ("Next", "შემდეგი"),
+ ("Nice work. Pick another tutorial on the Home screen's Learn tab.", "ყოჩაღ. აირჩიეთ სხვა გაკვეთილი საწყისი ეკრანის „სწავლის“ ჩანართზე."),
+ (
+ "No VR environments yet. Create one with Composition ▸ VR ▸ Create VR Environment…",
+ "VR გარემო ჯერ არ არის. შექმენით: კომპოზიცია ▸ VR ▸ VR გარემოს შექმნა…",
+ ),
+ ("No audio layer selected", "აუდიოშრე არ არის მონიშნული"),
+ ("No background jobs running", "ფონური ამოცანები არ მიმდინარეობს"),
+ ("No composition markers", "კომპოზიციის მარკერები არ არის"),
+ ("No contributor data was built into this copy.", "ამ ასლში მონაწილეების მონაცემები არ არის ჩაშენებული."),
+ (
+ "No device list from this host; the system default output is used.",
+ "ამ ჰოსტიდან მოწყობილობების სია მიუწვდომელია; გამოიყენება სისტემის ნაგულისხმევი გამოტანა.",
+ ),
+ ("No layer selected", "შრე არ არის მონიშნული"),
+ ("No matching effects or presets", "შესაბამისი ეფექტები ან პრესეტები არ მოიძებნა"),
+ ("No matching fonts", "შესაბამისი შრიფტები არ მოიძებნა"),
+ ("Variable fonts only", "მხოლოდ ცვლადი შრიფტები"),
+ ("No model credits were built into this copy.", "ამ ასლში მოდელების მონაცემები არ არის ჩაშენებული."),
+ ("No nested compositions", "ჩადგმული კომპოზიციები არ არის"),
+ ("No shortcut", "მალსახმობის გარეშე"),
+ ("No unlocked layer selected", "განბლოკილი შრე არ არის მონიშნული"),
+ ("No video", "ვიდეოს გარეშე"),
+ ("None", "არცერთი"),
+ ("Not applied: tick it in the list to add it.", "არ არის გამოყენებული: დასამატებლად მონიშნეთ სიაში."),
+ ("Not assigned", "არ არის მინიჭებული"),
+ ("Note: Shadows are only cast from layers with Cast Shadows enabled.", "შენიშვნა: ჩრდილს აგდებს მხოლოდ ის შრე, რომელსაც ჩართული აქვს „ჩრდილს აგდებს“."),
+ ("Notify", "შეტყობინება"),
+ ("OK", "OK"),
+ ("Offset:", "წანაცვლება:"),
+ ("On ({}) stop:", "ჩართვისას ({}) გაჩერება:"),
+ ("One-Node Camera", "ერთკვანძიანი კამერა"),
+ ("Opacity:", "გაუმჭვირვალობა:"),
+ ("Open Composition", "კომპოზიციის გახსნა"),
+ ("used once", "გამოყენებულია ერთხელ"),
+ ("used {} times", "გამოყენებულია {}-ჯერ"),
+ ("Compositions that use this item", "კომპოზიციები, რომლებიც ამ ელემენტს იყენებს"),
+ ("Open Last Saved Project", "ბოლოს შენახული პროექტის გახსნა"),
+ ("Open New Composition", "ახალი კომპოზიციის გახსნა"),
+ ("Open Output", "გამოტანის გახსნა"),
+ ("Open a composition to build Essential Graphics", "გახსენით კომპოზიცია ძირითადი გრაფიკის ასაგებად"),
+ ("Open a composition to see its scopes", "გახსენით კომპოზიცია მისი სკოპების სანახავად"),
+ ("Open a composition to track motion.", "გახსენით კომპოზიცია მოძრაობის ტრეკინგისთვის."),
+ ("Opus Tuning: {}", "Opus-ის მორგება: {}"),
+ ("Original Duration:", "საწყისი ხანგრძლივობა:"),
+ ("Output Cycle: {}", "გამოტანის ციკლი: {}"),
+ ("Output To:", "გამოტანის ადგილი:"),
+ ("Overlay", "გადაფარვა"),
+ ("Parameter Name:", "პარამეტრის სახელი:"),
+ ("Parent pick whip: drag onto a layer", "მშობლის ბმის სპირალი: გადაათრიეთ შრეზე"),
+ ("Pixel Aspect Ratio:", "პიქსელის გვერდების თანაფარდობა:"),
+ ("Playing on Video Preview", "იკვრება ვიდეოს წინასწარ ნახვაზე"),
+ ("Post-Render Action: {}", "რენდერის შემდგომი მოქმედება: {}"),
+ ("Preserve frame rate when nested or in render queue", "კადრების სიხშირის შენარჩუნება ჩადგმისას ან რენდერის რიგში"),
+ ("Preserve resolution when nested", "გარჩევადობის შენარჩუნება ჩადგმისას"),
+ ("Preset", "პრესეტი"),
+ ("Preset:", "პრესეტი:"),
+ ("Presets", "პრესეტები"),
+ ("Previous", "წინა"),
+ ("Primary:", "ძირითადი:"),
+ ("Process Before Match", "დამუშავება შეთანხმებამდე"),
+ ("Profile: {}", "პროფილი: {}"),
+ (
+ "Project color depth: click to cycle 8/16/32 bpc, Alt-click for Project Settings",
+ "პროექტის ფერის სიღრმე: დაწკაპეთ 8/16/32 bpc-ის გადასართავად, Alt-დაწკაპუნება — პროექტის პარამეტრები",
+ ),
+ ("Project: {}", "პროექტი: {}"),
+ ("Projects", "პროექტები"),
+ ("Property pick whip: drag onto a property", "თვისების ბმის სპირალი: გადაათრიეთ თვისებაზე"),
+ ("Protected Region", "დაცული არე"),
+ ("Proxy Use: {}", "პროქსის გამოყენება: {}"),
+ ("Push All to Comp", "ყველაფრის კომპოზიციაში გადატანა"),
+ ("RGB", "RGB"),
+ ("Radius", "რადიუსი"),
+ ("Rate Control: {}", "სიჩქარის კონტროლი: {}"),
+ ("Recent", "ბოლოდროინდელი"),
+ ("Recording", "ჩაწერა"),
+ ("Remove", "წაშლა"),
+ ("Rename", "სახელის შეცვლა"),
+ ("Render: {} ms • UI {} fps{}", "რენდერი: {} ms • UI {} fps{}"),
+ ("Renderer:", "რენდერერი:"),
+ ("Request Persistent Storage", "მუდმივი მეხსიერების მოთხოვნა"),
+ ("Reset", "ჩამოყრა"),
+ ("Reset Labels", "იარლიყების ჩამოყრა"),
+ ("Reset Preset", "პრესეტის ჩამოყრა"),
+ ("Reset to Default", "ნაგულისხმევზე დაბრუნება"),
+ ("Reset to Saved Layout", "შენახულ განლაგებაზე დაბრუნება"),
+ ("Resolution/Down Sample Factor Popup", "გარჩევადობის/დისკრეტიზაციის კოეფიციენტის მენიუ"),
+ ("Restore Panel Size", "პანელის ზომის აღდგენა"),
+ ("Reverse the order", "რიგის შებრუნება"),
+ ("Revert All", "ყველაფრის დაბრუნება"),
+ ("Roman Hanging Punctuation", "ლათინური გამოწეული პუნქტუაცია"),
+ ("Roving:", "მცურავი:"),
+ ("Ruler zero point (drag to move, double-click to reset)", "სახაზავის ნულოვანი წერტილი (გადაათრიეთ გადასაადგილებლად, ორჯერ დაწკაპეთ ჩამოსაყრელად)"),
+ ("Rulers", "სახაზავები"),
+ ("Run", "გაშვება"),
+ ("Sample Format: {}", "ნიმუშის ფორმატი: {}"),
+ ("Samples Per Frame:", "ნიმუშები კადრზე:"),
+ ("Save from #{}", "შენახვა #{}-დან"),
+ ("Saved {}", "შენახულია {}"),
+ ("Script… (⌘/Ctrl+Enter runs)", "სკრიპტი… (⌘/Ctrl+Enter უშვებს)"),
+ ("Search commands or shortcuts", "ბრძანებების ან მალსახმობების ძიება"),
+ ("Select", "მონიშვნა"),
+ ("Select a command to change its shortcut.", "მონიშნეთ ბრძანება მისი მალსახმობის შესაცვლელად."),
+ ("Select a layer to see its effects", "მონიშნეთ შრე მისი ეფექტების სანახავად"),
+ ("Select a layer to see its properties", "მონიშნეთ შრე მისი თვისებების სანახავად"),
+ ("({}) Selected Objects", "({}) მონიშნული ობიექტი"),
+ (
+ "Select a layer with a mask or shape path (or the path property), or Puppet pins.",
+ "მონიშნეთ ნიღბიანი ან ფიგურის ტრაექტორიის მქონე შრე (ან ტრაექტორიის თვისება), ან მარიონეტის სამაგრები.",
+ ),
+ ("Select a text layer", "მონიშნეთ ტექსტური შრე"),
+ ("Select an item in the Project panel", "მონიშნეთ ელემენტი პროექტის პანელში"),
+ ("Select animated properties to show them in the Graph Editor", "მონიშნეთ ანიმირებული თვისებები გრაფიკების რედაქტორში საჩვენებლად"),
+ (
+ "Select the leader pin, then Shift-click the pins that should trail it (hair, cloth, tails)",
+ "მონიშნეთ წამყვანი სამაგრი, შემდეგ Shift-დაწკაპუნებით მონიშნეთ მიმყოლი სამაგრები (თმა, ქსოვილი, კუდები)",
+ ),
+ ("Set Ground Plane and Origin", "მიწის სიბრტყისა და სათავის დაყენება"),
+ ("Set Paint Colors to Black and White (D)", "ხატვის ფერების შავ-თეთრზე დაყენება (D)"),
+ ("Settings", "პარამეტრები"),
+ ("Settings Name:", "პარამეტრების სახელი:"),
+ ("Shadow Darkness", "ჩრდილის სიმუქე"),
+ ("Shadow Diffusion", "ჩრდილის გაბნევა"),
+ ("Shadows", "ჩრდილები"),
+ ("Shape…", "ფორმა…"),
+ ("Show", "ჩვენება"),
+ ("Show Layer Name", "შრის სახელის ჩვენება"),
+ ("Show Source Name", "წყაროს სახელის ჩვენება"),
+ ("Show me", "მაჩვენე"),
+ ("Show:", "ჩვენება:"),
+ ("Shutter Angle:", "ობტურატორის კუთხე:"),
+ ("Shutter Phase:", "ობტურატორის ფაზა:"),
+ ("Size", "ზომა"),
+ ("Skip", "გამოტოვება"),
+ ("Snapping", "მიბმა"),
+ ("Snapping options", "მიბმის პარამეტრები"),
+ ("Snapshot", "მომენტალური ასლი"),
+ ("Solo Supported Properties", "მხარდაჭერილი თვისებების სოლო"),
+ ("Solo Switches: {}", "სოლოს გადამრთველები: {}"),
+ ("Sort", "სორტირება"),
+ ("Spacing:", "ინტერვალი:"),
+ ("Spatial Interpolation:", "სივრცითი ინტერპოლაცია:"),
+ ("Speed:", "სიჩქარე:"),
+ ("Start Timecode:", "საწყისი თაიმკოდი:"),
+ ("Start: {} Duration: {}", "დასაწყისი: {} ხანგრძლივობა: {}"),
+ ("Step {} of {}: {}", "ნაბიჯი {} / {}: {}"),
+ ("Stop", "შეწყვეტა"),
+ ("Stop {} at {}°", "გადასვლის წერტილი {} — {}°"),
+ ("Stored in: {}", "შენახულია: {}"),
+ ("Stretch", "გაწელვა"),
+ ("Stretch Factor:", "გაწელვის კოეფიციენტი:"),
+ ("Stylistic Sets", "სტილისტური ნაკრებები"),
+ ("Subpixel Positioning", "სუბპიქსელური პოზიციონირება"),
+ ("Swap Colors", "ფერების გაცვლა"),
+ ("Swap Paint Colors (X)", "ხატვის ფერების გაცვლა (X)"),
+ ("Sync with System", "სისტემასთან სინქრონიზაცია"),
+ ("System Default", "სისტემის ნაგულისხმევი"),
+ ("Table", "ცხრილი"),
+ ("Template name", "შაბლონის სახელი"),
+ ("Template: {}\n{}", "შაბლონი: {}\n{}"),
+ ("Temporal Interpolation:", "დროითი ინტერპოლაცია:"),
+ ("The Media Browser is not available here (use File ▸ Import)", "მედიის ბრაუზერი აქ მიუწვდომელია (გამოიყენეთ ფაილი ▸ იმპორტი)"),
+ ("The OpenEXR layer shown in red, green, blue and alpha", "OpenEXR შრე წითლად, მწვანედ, ლურჯად და ალფად"),
+ ("The render queue is empty.", "რენდერის რიგი ცარიელია."),
+ (
+ "These adjacent keyframes cannot interpolate because their stop counts differ.",
+ "ამ მეზობელ საკვანძო კადრებს შორის ინტერპოლაცია შეუძლებელია, რადგან მათ გრადიენტის გადასვლის წერტილების განსხვავებული რაოდენობა აქვთ.",
+ ),
+ ("This ScriptUI panel has closed", "ეს ScriptUI პანელი დაიხურა"),
+ ("This change will create a new solid for this layer.", "ეს ცვლილება ამ შრისთვის ახალ სოლიდს შექმნის."),
+ ("Time", "დრო"),
+ ("Time Stretch…", "დროში გაწელვა…"),
+ ("Time:", "დრო:"),
+ ("Time: {}", "დრო: {}"),
+ ("Title/Action Safe", "სათაურისა და მოქმედების უსაფრთხო არე"),
+ ("Title/action safe", "სათაურისა და მოქმედების უსაფრთხო არე"),
+ ("Toggle Switches / Modes", "გადამრთველების / რეჟიმების გადართვა"),
+ ("Track Name:", "ტრეკის სახელი:"),
+ (
+ "Trained models are available in the desktop app; the browser uses the classic engine.",
+ "გაწვრთნილი მოდელები ხელმისაწვდომია დესკტოპის აპში; ბრაუზერი კლასიკურ ძრავს იყენებს.",
+ ),
+ ("Transform", "გარდაქმნა"),
+ ("Transparency grid", "გამჭვირვალობის ბადე"),
+ ("Tutorial complete", "გაკვეთილი დასრულდა"),
+ ("Two-Node Camera", "ორკვანძიანი კამერა"),
+ ("Type", "ტიპი"),
+ ("Type a command or effect…", "აკრიფეთ ბრძანება ან ეფექტი…"),
+ ("URL:", "URL:"),
+ ("Undock Panel", "პანელის მოხსნა"),
+ ("Move Panel to New Window", "პანელის ახალ ფანჯარაში გადატანა"),
+ ("Move Panel to Main Window", "პანელის მთავარ ფანჯარაში გადატანა"),
+ ("Unfreeze", "გაყინვის მოხსნა"),
+ ("Unlink {}", "{}-ის კავშირის გაწყვეტა"),
+ (
+ "Use this option to place the currently selected layers together into a new intermediate composition.",
+ "გამოიყენეთ ეს ვარიანტი მონიშნული შრეების ერთად ახალ შუალედურ კომპოზიციაში მოსათავსებლად.",
+ ),
+ ("VR Environments", "VR გარემოები"),
+ ("Value:", "მნიშვნელობა:"),
+ ("Variable Font Axes", "ცვლადი შრიფტის ღერძები"),
+ ("Video Codec: {}", "ვიდეო კოდეკი: {}"),
+ ("View:", "ხედი:"),
+ ("Welcome to EffectCraft", "მოგესალმებათ EffectCraft"),
+ ("Width:", "სიგანე:"),
+ ("You can undo this.", "ამის დაბრუნება შეგიძლიათ."),
+ ("You can't undo this.", "ამის დაბრუნება შეუძლებელია."),
+ ("Your changes will be lost if you don't save them.", "თუ ცვლილებებს არ შეინახავთ, ისინი დაიკარგება."),
+ ("Zoom", "მასშტაბი"),
+ ("built-in", "ჩაშენებული"),
+ ("frames per second", "კადრი წამში"),
+ ("template name", "შაბლონის სახელი"),
+ ("{} contributors · {} commits", "მონაწილე: {} · კომიტი: {}"),
+ ("{} x {}, {}MB per 8bpc frame", "{} x {}, {}MB 8bpc კადრზე"),
+ ("{} — coming soon", "{} — მალე"),
+ ("{} — double-click to open, {}-click to reveal", "{} — ორჯერ დაწკაპეთ გასახსნელად, {}-დაწკაპუნება საჩვენებლად"),
+ ("⌘/Ctrl-drag a pin to record its motion", "⌘/Ctrl-ით გადაათრიეთ სამაგრი მისი მოძრაობის ჩასაწერად"),
+ ("▣ {}", "▣ {}"),
+ ("⚠ {} is used by:", "⚠ {} გამოიყენება:"),
+ ("3D Reference Axes", "3D საორიენტაციო ღერძები"),
+ ("Affect all layers that use this solid", "ზემოქმედება ყველა შრეზე, რომელიც ამ სოლიდს იყენებს"),
+ ("Choose grid and guide options", "ბადისა და დამხმარე ხაზების პარამეტრების არჩევა"),
+ ("Colorize", "გაფერადება"),
+ ("Custom", "მორგებული"),
+ ("Custom...", "მორგებული..."),
+ ("Fit", "ჩატევა"),
+ ("Fit up to 100%", "ჩატევა 100%-მდე"),
+ ("Full", "სრული"),
+ ("Half", "ნახევარი"),
+ ("Only this layer uses this solid.", "ამ სოლიდს მხოლოდ ეს შრე იყენებს."),
+ ("Proportional Grid", "პროპორციული ბადე"),
+ ("Quarter", "მეოთხედი"),
+ ("Region of Interest", "ინტერესის არე"),
+ ("Reset Exposure", "ექსპოზიციის ჩამოყრა"),
+ ("Show Channel and Color Management Settings", "არხისა და ფერთა მართვის პარამეტრების ჩვენება"),
+ ("Show Snapshot (hold)", "მომენტალური ასლის ჩვენება (დაჭერით)"),
+ ("Take Snapshot", "მომენტალური ასლის გადაღება"),
+ ("Third", "მესამედი"),
+ ("Toggle Mask and Shape Path Visibility", "ნიღბისა და ფიგურის ტრაექტორიის ხილვადობის გადართვა"),
+ ("Toggle Transparency Grid", "გამჭვირვალობის ბადის გადართვა"),
+ ("16 bits per channel", "16 ბიტი არხზე"),
+ ("32 bits per channel (float)", "32 ბიტი არხზე (მცურავი)"),
+ ("8 bits per channel", "8 ბიტი არხზე"),
+ ("Adaptive Resolution", "ადაპტური გარჩევადობა"),
+ ("Adobe-style built-in", "ჩაშენებული, Adobe-ს სტილის"),
+ ("Blue", "ლურჯი"),
+ ("Current Settings", "მიმდინარე პარამეტრები"),
+ ("Disable Per-character 3D", "თითოეული ასოს 3D-ს გამორთვა"),
+ ("Draft", "მონახაზი"),
+ ("Enable Per-character 3D", "თითოეული ასოს 3D-ს ჩართვა"),
+ ("Fast Draft", "სწრაფი მონახაზი"),
+ ("Fast Previews (Draft 3D, Faster Effects)", "სწრაფი წინასწარი ნახვა (3D მონახაზი, უფრო სწრაფი ეფექტები)"),
+ ("Green", "მწვანე"),
+ ("Import Image Sequence", "გამოსახულებების თანმიმდევრობის იმპორტი"),
+ ("Import PDF / Illustrator File", "PDF / Illustrator ფაილის იმპორტი"),
+ ("Import Photoshop File", "Photoshop ფაილის იმპორტი"),
+ ("Interpret Unlabeled Alpha As", "არამონიშნული ალფას ინტერპრეტაცია როგორც"),
+ ("Join the ArtCraft Discord", "შემოუერთდით ArtCraft-ის Discord-ს"),
+ ("Mercury GPU Acceleration ({})", "Mercury GPU აჩქარება ({})"),
+ ("Mercury Software Only", "მხოლოდ Mercury Software"),
+ ("OCIO (built-in ACES config)", "OCIO (ჩაშენებული ACES კონფიგურაცია)"),
+ ("Off (Final Quality)", "გამორთული (საბოლოო ხარისხი)"),
+ ("OpenGL (compatibility)", "OpenGL (თავსებადობა)"),
+ ("Opus Bitrate: {} kbps", "Opus-ის ბიტრეიტი: {} kbps"),
+ ("RGB Straight", "RGB Straight"),
+ ("Red", "წითელი"),
+ ("Tone map", "ტონური რუკა"),
+ ("Use In-Window Menu Bar on macOS", "ფანჯრის შიდა მენიუს ზოლის გამოყენება macOS-ზე"),
+ ("Wireframe", "კარკასი"),
+ ("sRGB IEC61966-2.1 (default)", "sRGB IEC61966-2.1 (ნაგულისხმევი)"),
+ ("New Project", "ახალი პროექტი"),
+ ("Open Project…", "პროექტის გახსნა…"),
+ ("Templates", "შაბლონები"),
+ ("EffectCraft home page", "EffectCraft-ის საწყისი გვერდი"),
+ ("EffectCraft on GitHub", "EffectCraft GitHub-ზე"),
+ ("Motion graphics and visual effects · version {}", "მოძრავი გრაფიკა და ვიზუალური ეფექტები · ვერსია {}"),
+ ("New Composition", "ახალი კომპოზიცია"),
+ ("Open Demo Project", "სადემონსტრაციო პროექტის გახსნა"),
+ ("Import Footage…", "ვიდეომასალის იმპორტი…"),
+ ("Filter recent files", "ბოლო ფაილების გაფილტვრა"),
+ ("NAME", "სახელი"),
+ ("OPENED", "გახსნილია"),
+ ("SIZE", "ზომა"),
+ ("KIND", "სახეობა"),
+ ("Your recent files will show here", "ბოლოდროინდელი ფაილები აქ გამოჩნდება"),
+ ("Create a new project, or open the demo project to look around.", "შექმენით ახალი პროექტი, ან გახსენით სადემონსტრაციო პროექტი გასაცნობად."),
+ ("No recent files match the filter", "ფილტრს ბოლოდროინდელი ფაილები არ შეესაბამება"),
+ ("Try another name or folder.", "სცადეთ სხვა სახელი ან საქაღალდე."),
+ ("Just now", "ახლახან"),
+ ("Yesterday", "გუშინ"),
+ ("{} minute ago", "{} წუთის წინ"),
+ ("{} minutes ago", "{} წუთის წინ"),
+ ("{} hour ago", "{} საათის წინ"),
+ ("{} hours ago", "{} საათის წინ"),
+ ("{} day ago", "{} დღის წინ"),
+ ("{} days ago", "{} დღის წინ"),
+ ("EffectCraft project", "EffectCraft-ის პროექტი"),
+ ("After Effects project", "After Effects-ის პროექტი"),
+ ("Lottie animation", "Lottie ანიმაცია"),
+ ("Project", "პროექტი"),
+ ("General", "ზოგადი"),
+ ("Language", "ენა"),
+ ("Levels of Undo", "დაბრუნების დონეები"),
+ ("Path Point and Handle Size", "ტრაექტორიის წერტილისა და სახელურის ზომა"),
+ ("Recent Projects Shown", "ნაჩვენები ბოლო პროექტები"),
+ ("Options", "პარამეტრები"),
+ ("Show Tool Tips", "მინიშნებების ჩვენება"),
+ ("Create Layers at Composition Start Time", "შრეების შექმნა კომპოზიციის დაწყების დროზე"),
+ ("Switches Affect Nested Comps", "გადამრთველები მოქმედებს ჩადგმულ კომპოზიციებზე"),
+ ("Default Spatial Interpolation to Linear", "ნაგულისხმევი სივრცითი ინტერპოლაცია: წრფივი"),
+ (
+ "Preserve Constant Vertex and Feather Point Count when Editing Masks",
+ "ნიღბების რედაქტირებისას წვეროებისა და შერბილების წერტილების რაოდენობის შენარჩუნება",
+ ),
+ ("Synchronize Time of All Related Items", "ყველა დაკავშირებული ელემენტის დროის სინქრონიზაცია"),
+ ("Expression Pick Whip Writes Compact English", "ექსპრესიის ბმის სპირალი წერს კომპაქტურ ინგლისურს"),
+ ("Create Split Layers Above Original Layer", "დაყოფილი შრეების შექმნა საწყისი შრის ზემოთ"),
+ ("Use System Color Picker", "სისტემის ფერის ამომრჩევის გამოყენება"),
+ (
+ "EffectCraft always uses its own colour picker (the same on every platform and the web).",
+ "EffectCraft ყოველთვის საკუთარ ფერის ამომრჩევს იყენებს (ერთნაირს ყველა პლატფორმაზე და ვებში).",
+ ),
+ ("Startup & Repair", "გაშვება და აღდგენა"),
+ ("Show Home Screen When Launching", "საწყისი ეკრანის ჩვენება გაშვებისას"),
+ ("Show Home Screen When Opening a Project", "საწყისი ეკრანის ჩვენება პროექტის გახსნისას"),
+ ("Offer to Open the Latest Auto-Save After a Crash", "ავარიის შემდეგ ბოლო ავტოშენახვის გახსნის შეთავაზება"),
+ ("Window Graphics", "ფანჯრის გრაფიკა"),
+ ("Automatic", "ავტომატური"),
+ (
+ "Window Graphics applies from the next launch. When the graphics driver stops EffectCraft as its window opens, the next launch switches to OpenGL.",
+ "ფანჯრის გრაფიკა მოქმედებს შემდეგი გაშვებიდან. თუ გრაფიკის დრაივერი EffectCraft-ს ფანჯრის გახსნისას აჩერებს, შემდეგი გაშვება OpenGL-ზე გადაერთვება.",
+ ),
+ ("Repair", "აღდგენა"),
+ ("Reset Settings", "პარამეტრების ჩამოყრა"),
+ ("Reset Keyboard Shortcuts", "კლავიატურის მალსახმობების ჩამოყრა"),
+ ("Empty Disk Cache", "დისკის ქეშის გასუფთავება"),
+ ("New Project Loads Template", "ახალი პროექტი შაბლონს ტვირთავს"),
+ ("Template Project", "შაბლონი პროექტი"),
+ ("Auto-Save", "ავტოშენახვა"),
+ ("Automatically Save Projects", "პროექტების ავტომატური შენახვა"),
+ ("Save Every", "შენახვა ყოველ"),
+ ("Minutes", "წუთში"),
+ ("Maximum Project Versions", "პროექტის ვერსიების მაქსიმალური რაოდენობა"),
+ ("Auto-Save Location", "ავტოშენახვის მდებარეობა"),
+ ("Next to Project", "პროექტის გვერდით"),
+ ("Custom Location", "სხვა მდებარეობა"),
+ ("Save When Starting Render Queue", "შენახვა რენდერის რიგის დაწყებისას"),
+ ("Save Now", "ახლავე შენახვა"),
+ ("Motion Path", "მოძრაობის ტრაექტორია"),
+ ("All Keyframes", "ყველა საკვანძო კადრი"),
+ ("No Motion Path", "მოძრაობის ტრაექტორიის გარეშე"),
+ ("No More Than (Seconds)", "არაუმეტეს (წამი)"),
+ ("No More Than (Keyframes)", "არაუმეტეს (საკვანძო კადრი)"),
+ ("Seconds", "წამი"),
+ ("Keyframes", "საკვანძო კადრები"),
+ ("Display", "ეკრანი"),
+ ("Show Rendering Progress in Info Panel and Flowchart", "რენდერის პროგრესის ჩვენება ინფორმაციის პანელსა და ბლოკ-სქემაში"),
+ ("Hardware Accelerate Composition, Layer and Footage Panels", "კომპოზიციის, შრისა და ვიდეომასალის პანელების აპარატული აჩქარება"),
+ ("Panels are always drawn by the GPU (wgpu).", "პანელებს ყოველთვის GPU ხატავს (wgpu)."),
+ ("Previews", "წინასწარი ნახვა"),
+ ("Adaptive Resolution Limit", "ადაპტური გარჩევადობის ზღვარი"),
+ ("Show Internal Wireframes", "შიდა კარკასების ჩვენება"),
+ ("Cache Frames When Idle", "კადრების ქეშირება უქმობისას"),
+ ("Viewer Zoom Quality", "დამთვალიერებლის მასშტაბირების ხარისხი"),
+ ("Faster", "უფრო სწრაფი"),
+ ("More Accurate", "უფრო ზუსტი"),
+ ("Display Color Space", "ეკრანის ფერთა სივრცე"),
+ ("GPU Information...", "ინფორმაცია GPU-ს შესახებ..."),
+ ("Appearance", "იერსახე"),
+ ("Brightness", "სიკაშკაშე"),
+ ("UI Scale", "ინტერფეისის მასშტაბი"),
+ ("Labels and Colors", "იარლიყები და ფერები"),
+ ("Use Label Color for Layer Handles and Paths", "იარლიყის ფერის გამოყენება შრის სახელურებისა და ტრაექტორიებისთვის"),
+ ("Use Label Color for Related Tabs", "იარლიყის ფერის გამოყენება დაკავშირებული ჩანართებისთვის"),
+ ("Cycle Mask Colors", "ნიღბის ფერების მონაცვლეობა"),
+ ("Use Gradients", "გრადიენტების გამოყენება"),
+ ("Menu Bar", "მენიუს ზოლი"),
+ ("Grids & Guides", "ბადე და დამხმარე ხაზები"),
+ ("Gridline Every", "ბადის ხაზი ყოველ"),
+ ("Subdivisions", "ქვედანაყოფები"),
+ ("Style", "სტილი"),
+ ("Lines", "ხაზები"),
+ ("Dashed Lines", "წყვეტილი ხაზები"),
+ ("Dots", "წერტილები"),
+ ("Horizontal", "ჰორიზონტალური"),
+ ("Vertical", "ვერტიკალური"),
+ ("Safe Margins", "უსაფრთხო ზღვრები"),
+ ("Action-safe", "მოქმედების უსაფრთხო არე"),
+ ("Title-safe", "ტიტრების უსაფრთხო არე"),
+ ("Labels", "იარლიყები"),
+ ("Text Engine", "ტექსტის ძრავა"),
+ ("Latin", "ლათინური"),
+ ("South Asian and Middle Eastern", "სამხრეთაზიური და ახლო აღმოსავლური"),
+ ("Show Font Preview", "შრიფტის წინასწარი ნახვის ჩვენება"),
+ ("Number of Recent Fonts to Display", "საჩვენებელი ბოლო შრიფტების რაოდენობა"),
+ ("Show Font Names in English", "შრიფტების სახელების ინგლისურად ჩვენება"),
+ ("Still Footage", "უძრავი ვიდეომასალა"),
+ ("Length of Composition", "კომპოზიციის სიგრძე"),
+ ("Duration (Seconds)", "ხანგრძლივობა (წამი)"),
+ ("Still Duration", "უძრავი კადრის ხანგრძლივობა"),
+ ("Sequence Footage", "სეკვენციური ვიდეომასალა"),
+ ("Report Missing Frames", "გამოტოვებული კადრების შეტყობინება"),
+ ("Automatically Reload Footage", "ვიდეომასალის ავტომატური ხელახლა ჩატვირთვა"),
+ ("Off", "გამორთული"),
+ ("Non-Sequence Footage", "არასეკვენციური ვიდეომასალა"),
+ ("All Footage", "მთელი ვიდეომასალა"),
+ ("Ask User", "მომხმარებლისთვის კითხვა"),
+ ("Guess", "ვარაუდი"),
+ ("Ignore", "უგულებელყოფა"),
+ ("Straight", "პირდაპირი"),
+ ("Premultiplied", "წინასწარ გამრავლებული"),
+ ("Default Drag Import As", "გადათრევით იმპორტი ნაგულისხმევად როგორც"),
+ ("Footage", "ვიდეომასალა"),
+ ("Composition - Retain Layer Sizes", "კომპოზიცია - შრეების ზომების შენარჩუნებით"),
+ ("Export", "ექსპორტი"),
+ ("Default Output Folder", "ნაგულისხმევი გამოტანის საქაღალდე"),
+ ("Segment Sequences", "სეკვენციების სეგმენტებად დაყოფა"),
+ ("Files per Segment", "ფაილი სეგმენტში"),
+ ("files", "ფაილი"),
+ ("Segment Movie Files", "ვიდეოფაილების სეგმენტებად დაყოფა"),
+ ("Segment Size", "სეგმენტის ზომა"),
+ ("Append Bit Depth to File Name", "ბიტური სიღრმის ფაილის სახელზე დამატება"),
+ ("Audio", "აუდიო"),
+ ("Audio Hardware", "აუდიოაპარატურა"),
+ ("Preview Sample Rate", "წინასწარი ნახვის დისკრეტიზაციის სიხშირე"),
+ ("Audio Output Mapping", "აუდიოს გამოტანის ასახვა"),
+ ("Left", "მარცხენა"),
+ ("Right", "მარჯვენა"),
+ ("channel", "არხი"),
+ ("Disk", "დისკი"),
+ ("Disk Cache", "დისკის ქეში"),
+ ("Enable Disk Cache", "დისკის ქეშის ჩართვა"),
+ ("Maximum Disk Cache Size", "დისკის ქეშის მაქსიმალური ზომა"),
+ ("Disk Cache Folder", "დისკის ქეშის საქაღალდე"),
+ ("Media Cache", "მედიაქეში"),
+ ("Database and Cache Folder", "მონაცემთა ბაზისა და ქეშის საქაღალდე"),
+ ("Conformed Audio Folder", "მისადაგებული აუდიოს საქაღალდე"),
+ ("Memory & CPU", "მეხსიერება და CPU"),
+ ("RAM Reserved for Other Applications", "სხვა აპლიკაციებისთვის დაჯავშნული RAM"),
+ ("Cache Budgets", "ქეშის ლიმიტები"),
+ ("Layer Cache", "შრეების ქეში"),
+ ("Footage Frame Cache", "ვიდეომასალის კადრების ქეში"),
+ ("Preview (RAM) Cache", "წინასწარი ნახვის (RAM) ქეში"),
+ ("Reduce Cache Size When System Is Low on Memory", "ქეშის ზომის შემცირება, როცა სისტემას მეხსიერება აკლია"),
+ ("Video", "ვიდეო"),
+ ("Enable Video Preview Output", "ვიდეოს წინასწარი ნახვის გამოტანის ჩართვა"),
+ ("Video Device", "ვიდეომოწყობილობა"),
+ ("Floating Window", "მცურავი ფანჯარა"),
+ ("Full Screen", "მთელ ეკრანზე"),
+ ("Video Output During Playback", "ვიდეოს გამოტანა დაკვრისას"),
+ ("Mirror on Computer Monitor", "დუბლირება კომპიუტერის მონიტორზე"),
+ ("Disable Video Output When in Background", "ვიდეოს გამოტანის გამორთვა ფონურ რეჟიმში"),
+ ("Default 3D Renderer", "ნაგულისხმევი 3D რენდერერი"),
+ ("Show 3D Reference Axes", "3D საორიენტაციო ღერძების ჩვენება"),
+ ("Extended Viewer", "გაფართოებული დამთვალიერებელი"),
+ ("Realtime Shadows in Draft", "რეალურ დროში ჩრდილები მონახაზში"),
+ ("Scripting & Expressions", "სკრიპტები და ექსპრესიები"),
+ ("Application Scripting", "აპლიკაციის სკრიპტები"),
+ ("Allow Scripts to Write Files and Access Network", "სკრიპტებისთვის ფაილების ჩაწერისა და ქსელთან წვდომის დაშვება"),
+ ("Warn User When Executing Files", "მომხმარებლის გაფრთხილება ფაილების გაშვებისას"),
+ ("Enable JavaScript Debugger", "JavaScript-ის გამმართველის ჩართვა"),
+ ("Expressions Editor", "ექსპრესიების რედაქტორი"),
+ ("Font Size", "შრიფტის ზომა"),
+ ("Syntax Highlighting", "სინტაქსის გამოკვეთა"),
+ ("Line Numbers", "სტრიქონების ნომრები"),
+ ("Auto-complete", "ავტოდასრულება"),
+ ("Bracket Matching", "ფრჩხილების დაწყვილება"),
+ ("Word Wrap", "სიტყვების გადატანა"),
+ ("Show Expression Error Banner", "ექსპრესიის შეცდომის ზოლის ჩვენება"),
+ (
+ "Expressions use the JavaScript engine. Script errors report their file and line in the Script Console; there is no step debugger.",
+ "ექსპრესიები JavaScript-ის ძრავას იყენებს. სკრიპტის შეცდომები ფაილსა და სტრიქონს სკრიპტის კონსოლში აჩვენებს; ნაბიჯ-ნაბიჯ გამმართველი არ არის.",
+ ),
+ ("Roto Brush", "როტო-ფუნჯი"),
+ ("Segmentation Model", "სეგმენტაციის მოდელი"),
+ (
+ "Roto Brush 2.0 and 3.0 use the model chosen here (Version 1.0 always uses the classic engine). Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+ "როტო-ფუნჯი 2.0 და 3.0 აქ არჩეულ მოდელს იყენებს (ვერსია 1.0 ყოველთვის კლასიკურ ძრავას იყენებს). მოდელები ღია კოდისაა, ჩამოიტვირთება მხოლოდ თქვენი მოთხოვნით და მოწმდება გამოქვეყნებული SHA-256-ით.",
+ ),
+ ("Face Tracking", "სახის ტრეკინგი"),
+ ("Face Model", "სახის მოდელი"),
+ (
+ "Face tracking in the Tracker panel (Outline Only and Detailed Features) uses the model chosen here. Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+ "ტრეკერის პანელში სახის ტრეკინგი (მხოლოდ კონტური და დეტალური ნიშნები) აქ არჩეულ მოდელს იყენებს. მოდელები ღია კოდისაა, ჩამოიტვირთება მხოლოდ თქვენი მოთხოვნით და მოწმდება გამოქვეყნებული SHA-256-ით.",
+ ),
+ ("Match System", "სისტემის მიხედვით"),
+ ("Default", "ნაგულისხმევი"),
+ ("Stored, but not used by EffectCraft yet", "შენახულია, მაგრამ EffectCraft ჯერ არ იყენებს"),
+ ("Total Offset", "ჯამური წანაცვლება"),
+ ("Per Layer", "შრიდან შრემდე"),
+ ("Track", "ტრეკინგი"),
+];
+
+/// Georgian rows for interface text no other catalog has yet: strings the panels already send
+/// through [`tr`] (form fields and titles, drop messages, screen-reader names) and the labels of
+/// the Timeline's context menus. Kept apart from [`GEORGIAN`] so that table can keep listing
+/// exactly the Chinese catalogs' sources; the tests hold these to the same rules.
+const GEORGIAN_PANELS: &[(&str, &str)] = &[
+ ("Search project", "პროექტში ძიება"),
+ ("Select an item to see its details", "მონიშნეთ ელემენტი მისი დეტალების სანახავად"),
+ ("Media Duration", "მედიის ხანგრძლივობა"),
+ ("Frame Rate", "კადრების სიხშირე"),
+ ("File Path", "ფაილის მისამართი"),
+ ("Comment", "კომენტარი"),
+ ("A/V Features", "A/V ფუნქციები"),
+ ("Keys", "საკვანძო კადრები"),
+ ("Layer Name", "შრის სახელი"),
+ ("Source Name", "წყაროს სახელი"),
+ ("Switches", "გადამრთველები"),
+ ("Modes", "რეჟიმები"),
+ ("Track Matte", "ტრეკ-მატი"),
+ ("Parent & Link", "მშობელი და ბმა"),
+ ("In", "შესვლა"),
+ ("Out", "გამოსვლა"),
+ ("Duration", "ხანგრძლივობა"),
+ ("Original color: click to go back to it", "საწყისი ფერი: დაწკაპეთ მასზე დასაბრუნებლად"),
+ ("Resize floating panel", "მცურავი პანელის ზომის შეცვლა"),
+ ("Render every n-th pixel", "ყოველი n-ური პიქსელის რენდერი"),
+ ("Color (#rrggbb)", "ფერი (#rrggbb)"),
+ ("Workspace", "სამუშაო სივრცე"),
+ ("Rename to", "ახალი სახელი"),
+ ("Open", "გახსნა"),
+ ("Custom Resolution", "მორგებული გარჩევადობა"),
+ ("Panel Background Color", "პანელის ფონის ფერი"),
+ ("New Workspace", "ახალი სამუშაო სივრცე"),
+ ("Edit Workspaces", "სამუშაო სივრცეების რედაქტირება"),
+ ("A script wants to open a file", "სკრიპტს ფაილის გახსნა სურს"),
+ ("Drop file to import", "ჩააგდეთ ფაილი იმპორტისთვის"),
+ ("Drop {} files to import", "ჩააგდეთ ფაილები იმპორტისთვის: {}"),
+ (
+ "Skipped {} dropped file(s) without a local path. Use File ▸ Import ▸ File…",
+ "გამოტოვებულია ჩაგდებული ფაილი ლოკალური მისამართის გარეშე: {}. გამოიყენეთ ფაილი ▸ იმპორტი ▸ ფაილი…",
+ ),
+ ("Only one project can be opened per drop; skipped {} more", "ერთ ჩაგდებაზე მხოლოდ ერთი პროექტი იხსნება; გამოტოვებულია კიდევ: {}"),
+ ("Cannot open dropped project {}: {}", "ჩაგდებული პროექტის გახსნა შეუძლებელია, {}: {}"),
+ ("Cannot import dropped files: {}", "ჩაგდებული ფაილების იმპორტი შეუძლებელია: {}"),
+ ("A built-in preset has this name", "ამ სახელით ჩაშენებული პრესეტი არსებობს"),
+ ("Replaces your preset with this name", "ჩაანაცვლებს თქვენს პრესეტს ამ სახელით"),
+ ("Save Preset…", "პრესეტის შენახვა…"),
+ ("Delete Preset", "პრესეტის წაშლა"),
+ ("Null Settings", "ნულოვანი ობიექტის პარამეტრები"),
+ ("Click to sample text {}", "დაწკაპეთ ტექსტის ნიმუშის ასაღებად {}"),
+ ("Force alphabetical order", "ანბანური რიგის იძულება"),
+ ("Frame rate (fps)", "კადრების სიხშირე (fps)"),
+ (
+ "Change the frame rate, alpha and start frame later with File ▸ Interpret Footage.",
+ "კადრების სიხშირე, ალფა და საწყისი კადრი მოგვიანებით შეცვალეთ: ფაილი ▸ ვიდეომასალის ინტერპრეტაცია.",
+ ),
+ ("Import Kind", "იმპორტის სახე"),
+ ("Page", "გვერდი"),
+ ("Delay (s)", "დაყოვნება (წმ)"),
+ ("Amount (%)", "რაოდენობა (%)"),
+ ("Cascade (farther pins trail longer)", "კასკადი (შორეული სამაგრები უფრო დიდხანს ჩამორჩება)"),
+ ("Speed (%)", "სიჩქარე (%)"),
+ ("Smoothing", "დაგლუვება"),
+ ("Use Draft Deformation", "მონახაზის დეფორმაციის გამოყენება"),
+ ("Show Mesh", "ბადის ჩვენება"),
+ ("Scale X (%)", "მასშტაბი X (%)"),
+ ("Scale Y (%)", "მასშტაბი Y (%)"),
+ ("Rotation (degrees)", "შემობრუნება (გრადუსი)"),
+ ("Move X", "გადაადგილება X"),
+ ("Move Y", "გადაადგილება Y"),
+ ("Top", "ზემოდან"),
+ ("Width", "სიგანე"),
+ ("Height", "სიმაღლე"),
+ ("Shape", "ფიგურა"),
+ ("Mode", "რეჟიმი"),
+ ("Frame", "კადრი"),
+ ("Orientation", "ორიენტაცია"),
+ ("Position (pixels)", "პოზიცია (პიქსელი)"),
+ ("Position (percent of the composition)", "პოზიცია (კომპოზიციის პროცენტი)"),
+ ("Create", "შექმნა"),
+ ("Use Dimensions From", "ზომების აღება"),
+ ("Still Duration (seconds)", "უძრავი კადრის ხანგრძლივობა (წამი)"),
+ ("Add to Render Queue", "რენდერის რიგში დამატება"),
+ ("Sequence Layers", "შრეების თანმიმდევრობით განლაგება"),
+ ("Overlap", "გადაფარვა"),
+ ("Duration (seconds)", "ხანგრძლივობა (წამი)"),
+ ("Transition", "გადასვლა"),
+ ("Matte color (premultiplied)", "მატის ფერი (წინასწარ გამრავლებული)"),
+ ("Invert Alpha", "ალფას ინვერსია"),
+ ("Assume this frame rate", "ამ კადრების სიხშირის გამოყენება"),
+ ("Separate Fields", "ნახევარკადრების გაყოფა"),
+ ("Pixel Aspect Ratio", "პიქსელის გვერდების თანაფარდობა"),
+ ("Loop (times)", "ციკლი (ჯერ)"),
+ ("Assign Profile", "პროფილის მინიჭება"),
+ ("Preserve RGB", "RGB-ის შენარჩუნება"),
+ ("Interpret As Linear Light", "წრფივ სინათლედ ინტერპრეტაცია"),
+ ("Start Timecode", "საწყისი თაიმკოდი"),
+ ("Override Start", "დასაწყისის ხელით მითითება"),
+ ("Depth", "სიღრმე"),
+ ("Time display style", "დროის ჩვენების სტილი"),
+ ("Color engine", "ფერთა ძრავა"),
+ ("Working space", "სამუშაო სივრცე"),
+ ("Working gamma", "სამუშაო გამა"),
+ ("Linearize working space", "სამუშაო სივრცის წრფივად გარდაქმნა"),
+ ("Blend colors using 1.0 gamma", "ფერების შერევა 1.0 გამით"),
+ ("HDR on SDR displays and outputs", "HDR SDR ეკრანებსა და გამოტანებზე"),
+ ("Output color space", "გამოტანის ფერთა სივრცე"),
+ ("Video rendering and effects", "ვიდეოს რენდერი და ეფექტები"),
+ ("Time Span", "დროის მონაკვეთი"),
+ ("Invert", "ინვერსია"),
+ ("Blur (pixels before auto-trace)", "გაბუნდოვნება (პიქსელი, ვექტორიზაციამდე)"),
+ ("Tolerance (pixels)", "დაშვება (პიქსელი)"),
+ ("Threshold (%)", "ზღვარი (%)"),
+ ("Minimum Area (pixels)", "მინიმალური ფართობი (პიქსელი)"),
+ ("Corner Roundness (%)", "კუთხეების მომრგვალება (%)"),
+ ("Apply To New Layer", "ახალ შრეზე გამოყენება"),
+ ("Action", "მოქმედება"),
+ ("Sensitivity threshold (0–1, lower finds more)", "მგრძნობელობის ზღვარი (0–1, ნაკლები მეტს პოულობს)"),
+ ("Data", "მონაცემები"),
+ ("Time field (empty: automatic)", "დროის ველი (ცარიელი: ავტომატური)"),
+ ("Video start (ISO date-time, hh:mm:ss, timecode; empty: file date)", "ვიდეოს დასაწყისი (ISO თარიღი-დრო, hh:mm:ss, თაიმკოდი; ცარიელი: ფაილის თარიღი)"),
+ ("First sample at (comp seconds)", "პირველი ნიმუში (კომპოზიციის წამი)"),
+ (
+ "Writes Final Cut Pro XML (.xml), which Premiere Pro opens with File ▸ Import. Native .prproj files are not written.",
+ "იწერს Final Cut Pro XML-ს (.xml), რომელსაც Premiere Pro ხსნის ბრძანებით File ▸ Import. მშობლიური .prproj ფაილები არ იწერება.",
+ ),
+ ("File", "ფაილი"),
+ ("Format", "ფორმატი"),
+ ("Pre-render (ProRes 4444)", "წინასწარი რენდერი (ProRes 4444)"),
+ ("Precomps", "ჩადგმული კომპოზიციები"),
+ ("Frame rate", "კადრების სიხშირე"),
+ ("Description", "აღწერა"),
+ ("Category", "კატეგორია"),
+ ("Embed footage files", "ვიდეომასალის ფაილების ჩაშენება"),
+ ("Embed up to (MB)", "ჩაშენება მაქსიმუმ (MB)"),
+ ("Use the sRGB curve (ignore Gamma)", "sRGB მრუდის გამოყენება (გამის უგულებელყოფა)"),
+ ("ICC profile (replaces the numbers)", "ICC პროფილი (ცვლის რიცხვებს)"),
+ ("Rectangle", "მართკუთხედი"),
+ ("Ellipse", "ელიფსი"),
+ ("Orient Along Path", "ორიენტაცია ტრაექტორიის გასწვრივ"),
+ ("Orient Towards Camera", "ორიენტაცია კამერისკენ"),
+ ("Orient Towards Point of Interest", "ორიენტაცია ინტერესის წერტილისკენ"),
+ ("Single Composition", "ერთი კომპოზიცია"),
+ ("Multiple Compositions", "რამდენიმე კომპოზიცია"),
+ ("Dissolve Front Layer", "წინა შრის გადადნობა"),
+ ("Cross Dissolve Front and Back Layers", "წინა და უკანა შრეების ჯვარედინი გადადნობა"),
+ ("Interpret Straight - Unmatted", "პირდაპირად ინტერპრეტაცია - მატის გარეშე"),
+ ("Interpret Premultiplied - Matted With Color", "წინასწარ გამრავლებულად ინტერპრეტაცია - ფერით მატირებული"),
+ ("Upper Field First", "ჯერ ზედა ნახევარკადრი"),
+ ("Lower Field First", "ჯერ ქვედა ნახევარკადრი"),
+ ("Embedded / sRGB", "ჩაშენებული / sRGB"),
+ ("Use Source File Timecode", "წყარო ფაილის თაიმკოდის გამოყენება"),
+ ("Timecode", "თაიმკოდი"),
+ ("Frames", "კადრები"),
+ ("Feet + Frames (35mm)", "ფუტი + კადრი (35 მმ)"),
+ ("Feet + Frames (16mm)", "ფუტი + კადრი (16 მმ)"),
+ ("Clip", "მოჭრა"),
+ ("Compand", "კომპანდირება"),
+ ("Current Frame", "მიმდინარე კადრი"),
+ ("Work Area", "სამუშაო არე"),
+ ("Luminance", "სიკაშკაშე"),
+ ("Create Markers", "მარკერების შექმნა"),
+ ("Split Layers", "შრეების დაყოფა"),
+ ("Split and Precompose", "დაყოფა და კომპოზიციაში მოთავსება"),
+ ("CMX 3600 EDL (.edl, V1 only)", "CMX 3600 EDL (.edl, მხოლოდ V1)"),
+ ("OMF (.omf, audio)", "OMF (.omf, აუდიო)"),
+ ("Layers Premiere can't show (text, shapes, effects…)", "შრეები, რომლებსაც Premiere ვერ აჩვენებს (ტექსტი, ფიგურები, ეფექტები…)"),
+ ("All layers", "ყველა შრე"),
+ ("None (leave them out)", "არცერთი (გამოტოვება)"),
+ ("Nested sequences", "ჩადგმული სეკვენციები"),
+ ("Pre-render", "წინასწარი რენდერი"),
+ ("Puppet Follow-Through", "მარიონეტის ინერციული მოძრაობა"),
+ ("Puppet Record Options", "მარიონეტის ჩაწერის პარამეტრები"),
+ ("Free Transform Points", "წერტილების თავისუფალი გარდაქმნა"),
+ ("Mask Shape", "ნიღბის ფორმა"),
+ ("Auto-Orientation", "ავტოორიენტაცია"),
+ ("Go to Time", "დროზე გადასვლა"),
+ ("Add Guide", "დამხმარე ხაზის დამატება"),
+ ("Add Percentage Guide", "პროცენტული დამხმარე ხაზის დამატება"),
+ ("New Composition from Selection", "ახალი კომპოზიცია მონიშნულიდან"),
+ ("Project Settings", "პროექტის პარამეტრები"),
+ ("Auto-trace", "ავტომატური ვექტორიზაცია"),
+ ("Scene Edit Detection", "სცენების ჭრილების ამოცნობა"),
+ ("Align Video to Data", "ვიდეოს მონაცემებთან სწორება"),
+ ("Export Adobe Premiere Pro Project", "Adobe Premiere Pro-ს პროექტის ექსპორტი"),
+ ("New Placeholder", "ახალი ჩანაცვლების ობიექტი"),
+ ("Solid Settings", "სოლიდის პარამეტრები"),
+ ("Save as Template", "შაბლონად შენახვა"),
+ ("My Custom RGB", "ჩემი მორგებული RGB"),
+ ("Mercury GPU Acceleration (no GPU: software)", "Mercury GPU აჩქარება (GPU არ არის: პროგრამული)"),
+ ("Sort by {}, {}", "დალაგება: {}, {}"),
+ ("Sort by {}", "დალაგება: {}"),
+ ("Label of {}: {}", "{}-ის იარლიყი: {}"),
+ ("Comment of {}: {}", "{}-ის კომენტარი: {}"),
+ ("Project color depth: {}", "პროექტის ფერის სიღრმე: {}"),
+ ("Start (s)", "დასაწყისი (წმ)"),
+ ("Duration (s)", "ხანგრძლივობა (წმ)"),
+ ("Frames per second", "კადრი წამში"),
+ ("Bottom", "ქვემოდან"),
+ ("Bitrate (kbps)", "ბიტრეიტი (kbps)"),
+ ("Frames between key frames (0 = every 2 s)", "კადრები საკვანძო კადრებს შორის (0 = ყოველ 2 წმ-ში)"),
+ ("Click in the Composition panel to sample text {}", "დაწკაპეთ კომპოზიციის პანელში ტექსტის ნიმუშის ასაღებად {}"),
+ ("Video preview off: audio only", "ვიდეოს წინასწარი ნახვა გამორთულია: მხოლოდ აუდიო"),
+ ("Open in Essential Graphics", "ძირითად გრაფიკაში გახსნა"),
+ ("Video preview is off (Preview panel): audio only", "ვიდეოს წინასწარი ნახვა გამორთულია (წინასწარი ნახვის პანელი): მხოლოდ აუდიო"),
+ ("Solid…", "სოლიდი…"),
+];
+
#[cfg(test)]
mod tests {
use super::*;
/// The interface text that has moved into this catalog. Add a panel here when you convert it;
- /// the tests below then keep it translated.
- const CONVERTED: &[(&str, &str)] = &[
+ /// `every_row_is_used_by_a_converted_panel` then looks for its rows' English sources in it.
+ pub(super) const CONVERTED: &[(&str, &str)] = &[
("color_picker.rs", include_str!("../color_picker.rs")),
("credits.rs", include_str!("../credits.rs")),
("dock.rs", include_str!("../dock.rs")),
+ ("dock_ui.rs", include_str!("../dock_ui.rs")),
("header.rs", include_str!("../header.rs")),
("menus.rs", include_str!("../menus.rs")),
+ ("prefs_live.rs", include_str!("../prefs_live.rs")),
("widgets.rs", include_str!("../widgets.rs")),
("panels/anim_tools.rs", include_str!("../panels/anim_tools.rs")),
("panels/camera_tracker_ui.rs", include_str!("../panels/camera_tracker_ui.rs")),
@@ -5413,7 +6399,6 @@ mod tests {
("panels/viewers.rs", include_str!("../panels/viewers.rs")),
// Text the interface draws but does not own: the settings pages and the viewer's channel
// and Fast Previews lists come from the engine as data, so their source strings live here.
- // Both files pass the literal scan below unchanged (they hold no drawn literals).
("engine settings pages", include_str!("../../../engine/src/prefs.rs")),
("engine viewer channels", include_str!("../../../engine/src/viewer.rs")),
("engine viewer commands", include_str!("../../../engine/src/commands/viewer_cmds.rs")),
@@ -5421,80 +6406,30 @@ mod tests {
("engine text animator kinds", include_str!("../../../project/src/build.rs")),
];
- /// Call shapes that hand a string literal straight to the user.
- const CALLS: &[&str] = &[
- ".label(\"",
- ".button(\"",
- ".small(\"",
- ".strong(\"",
- ".heading(\"",
- ".monospace(\"",
- ".on_hover_text(\"",
- ".on_disabled_hover_text(\"",
- ".hint_text(\"",
- ".text(\"",
- ".prefix(\"",
- ".suffix(\"",
- "RichText::new(\"",
- "Label::new(\"",
- "Button::new(\"",
- "Window::new(\"",
- "CollapsingHeader::new(\"",
- ];
-
- /// Literals that stay as they are: a unit or a separator reads the same in every language.
- const UNITS: &[&str] = &[" px", "%", "·", "s", "ms", "°", "fps", " bpc", " mm", " s", " %", " pixels"];
-
fn catalogs() -> Vec<(&'static str, &'static str)> {
- JAPANESE
- .iter()
- .copied()
- .chain(SIMPLIFIED_CHINESE.iter().copied())
- .chain(TRADITIONAL_CHINESE.iter().copied())
- .chain(UKRAINIAN.iter().copied())
- .chain(PORTUGUESE.iter().copied())
- .chain(CZECH.iter().copied())
- .chain(SPANISH.iter().copied())
- .collect()
+ ROWS.iter().flat_map(|(_, rows)| rows.iter().copied()).collect()
}
- #[test]
- fn czech_panels_translate_and_keep_project_content_and_argument_order() {
- set_current("cs");
- assert_eq!(tr("Composition Name:"), "Název kompozice:");
- assert_eq!(tr("Cancel"), "Zrušit");
- assert_eq!(tr("Guide Layer"), "Pomocná vrstva", "the layer context menus' item, as Layer ▸ Guide Layer");
- assert_eq!(tr("my layer.mp4"), "my layer.mp4");
- assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "Použití zástupných souborů: Best");
- assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Krok 1 z 3: Colour");
- assert_eq!(tr_args("Template: {}\n{}", &[&"Title", &"My description"]), "Šablona: Title\nMy description");
- assert_eq!(tr_args("Leave all attributes in \"{}\"", &[&"File Čeština"]), "Ponechat všechny atributy v „File Čeština“");
- assert_eq!(
- tr_args("{} — double-click to open, {}-click to reveal", &[&"File.ecproj", &"Alt"]),
- "File.ecproj — dvojklikem otevřete, kliknutím s Alt zobrazíte umístění"
- );
- assert_eq!(tr_args("Proxy Use: {}", &[]), "Použití zástupných souborů: ");
- set_current("en");
- assert_eq!(tr("Composition Name:"), "Composition Name:");
+ /// `en`'s row in `rows`, else `en`: what `tr` should return without pinning one wording.
+ fn row(rows: &[(&'static str, &'static str)], en: &'static str) -> &'static str {
+ rows.iter().find(|(source, _)| *source == en).map_or(en, |(_, translated)| *translated)
}
/// A row that translates nothing, repeats a source string, or changes the number of values the
/// English source carries is a bug in the catalog itself.
#[test]
fn catalogs_are_unique_and_keep_the_english_shape() {
- let hans: Vec<&str> = SIMPLIFIED_CHINESE.iter().map(|(en, _)| *en).collect();
- let hant: Vec<&str> = TRADITIONAL_CHINESE.iter().map(|(en, _)| *en).collect();
- assert_eq!(hans, hant, "the two Chinese catalogs list different source strings");
- // Japanese, Ukrainian and Czech may lag the Chinese catalogs: a missing row falls back to English.
- for (name, cat) in [("Japanese", JAPANESE), ("Ukrainian", UKRAINIAN), ("Brazilian Portuguese", PORTUGUESE), ("Czech", CZECH), ("Spanish", SPANISH)] {
- let extra: Vec<&str> = cat.iter().map(|(en, _)| *en).filter(|en| !hans.contains(en)).collect();
- assert!(extra.is_empty(), "the {name} catalog lists source strings the Chinese ones don't: {extra:?}");
+ // Grouped by language: a source listed in two tables of one language is still a repeat.
+ let mut by_code: std::collections::BTreeMap<&str, Vec<&str>> = std::collections::BTreeMap::new();
+ for (code, rows) in ROWS {
+ by_code.entry(code).or_default().extend(rows.iter().map(|(en, _)| *en));
+ }
+ for (code, mut sources) in by_code {
+ sources.sort_unstable();
+ let listed = sources.len();
+ sources.dedup();
+ assert_eq!(listed, sources.len(), "{code}: a source string is listed twice");
}
- let mut sorted = hans.clone();
- sorted.sort_unstable();
- let listed = sorted.len();
- sorted.dedup();
- assert_eq!(listed, sorted.len(), "a source string is listed twice");
for (en, translated) in catalogs() {
assert!(!en.is_empty() && !translated.is_empty(), "empty row for {en:?}");
assert!(en.contains("{}") || !en.contains('{'), "{en:?} has a placeholder but no `{{}}`");
@@ -5511,60 +6446,32 @@ mod tests {
set_current("xx"); // a language without rows
assert_eq!(tr("Composition Name:"), "Composition Name:");
set_current("zh-hans");
- assert_eq!(tr("Composition Name:"), "合成名称：");
+ assert_eq!(tr("Composition Name:"), row(SIMPLIFIED_CHINESE, "Composition Name:"));
assert_eq!(tr("my layer.mp4"), "my layer.mp4");
set_current("en");
}
- /// The same language preference used for the menus reaches panels immediately, and formatted
- /// text keeps the caller's values intact even when they contain non-Ukrainian words.
+ /// Georgian also reads its own table, for text the other catalogs don't have yet.
#[test]
- fn ukrainian_panels_translate_and_keep_project_content() {
- set_current("uk");
- assert_eq!(tr("Composition Name:"), "Назва композиції:");
- assert_eq!(tr("Cancel"), "Скасувати");
- assert_eq!(tr("my layer.mp4"), "my layer.mp4");
- assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "Використання проксі: Best");
- assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Крок 1 з 3: Colour");
- assert_eq!(tr_args("Template: {}\n{}", &[&"Title", &"My description"]), "Шаблон: Title\nMy description");
+ fn georgian_reads_its_own_panel_rows() {
+ set_current("ka");
+ for (source, _) in GEORGIAN_PANELS.iter().take(3) {
+ assert_eq!(tr(source), row(GEORGIAN_PANELS, source));
+ }
set_current("en");
- assert_eq!(tr("Composition Name:"), "Composition Name:");
- }
-
- /// Brazilian Portuguese panels translate, fill values in order and keep project content.
- #[test]
- fn brazilian_portuguese_panels_translate_and_keep_project_content() {
- set_current("pt-br");
- assert_eq!(tr("Composition Name:"), "Nome da composição:");
- assert_eq!(tr("Cancel"), "Cancelar");
- assert_eq!(tr("my layer.mp4"), "my layer.mp4");
- assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Etapa 1 de 3: Colour");
- assert_eq!(tr(" OK "), " OK ");
- set_current("en");
- assert_eq!(tr("Cancel"), "Cancel");
- }
-
- /// Spanish panels translate, fill values in order and keep project content.
- #[test]
- fn spanish_panels_translate_and_keep_project_content() {
- set_current("es");
- assert_eq!(tr("Composition Name:"), "Nombre de la composición:");
- assert_eq!(tr("Cancel"), "Cancelar");
- assert_eq!(tr("my layer.mp4"), "my layer.mp4");
- assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Paso 1 de 3: Colour");
- set_current("en");
- assert_eq!(tr("Cancel"), "Cancel");
}
/// Values fill the placeholders in order, and a missing value is dropped instead of panicking.
#[test]
fn tr_args_fills_values_in_order() {
set_current("zh-hans");
- assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "代理使用：Best");
- assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "第 1 步，共 3 步：Colour");
- assert_eq!(tr_args("Proxy Use: {}", &[]), "代理使用：");
+ let template = row(SIMPLIFIED_CHINESE, "Proxy Use: {}");
+ assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), template.replacen("{}", "Best", 1));
+ assert_eq!(tr_args("Proxy Use: {}", &[]), template.replacen("{}", "", 1));
set_current("en");
+ assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Step 1 of 3: Colour");
assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "Proxy Use: Best");
+ assert_eq!(tr_args("Proxy Use: {}", &[]), "Proxy Use: ");
}
/// Japanese reads its own rows: values fill the placeholders in order, and a name that is not a
@@ -5591,10 +6498,10 @@ mod tests {
set_current("en");
}
- /// Every row is asked for by a converted panel: a leftover row means the panel went back to its
- /// English literal. A string a helper draws for the panel (a toolbar tooltip, a popup item, a
- /// checkbox label) is looked up inside that helper, so its English source only appears as a
- /// literal there - `helper_labels_are_translated` keeps those helpers honest.
+ /// Every row is asked for by a converted panel: a leftover row is stale, because the panel's
+ /// English source changed or went away. A string a helper draws for the panel (a toolbar
+ /// tooltip, a popup item, a checkbox label) is looked up inside that helper, so its English
+ /// source only appears as a literal there.
#[test]
fn every_row_is_used_by_a_converted_panel() {
for (en, _) in catalogs() {
@@ -5607,84 +6514,4 @@ mod tests {
);
}
}
-
- /// A label that a helper takes as an argument is drawn by the helper, so the helper has to ask
- /// the catalog: `Checkbox::new` and `RadioButton::new` are not among the scanned call shapes
- /// (the label is their second argument), which let the solid dialog's checkbox ship in English.
- #[test]
- fn helper_labels_are_translated() {
- for (path, source) in CONVERTED {
- for marker in ["Checkbox::new(", "RadioButton::new("] {
- let mut from = 0;
- while let Some(at) = source[from..].find(marker) {
- let at = from + at;
- let rest = &source[at + marker.len()..];
- let line = &rest[..rest.find('\n').unwrap_or(rest.len())];
- if let Some(q) = line.find('"') {
- let before = line[..q].trim_end();
- assert!(before.ends_with("tr("), "{path}: the `{marker}` label `{}` is not in the catalog", &line[q..]);
- }
- from = at + marker.len();
- }
- }
- }
- }
-
- /// The Settings pages come from the engine as data, so the literal scan above cannot see them:
- /// every title, section, label, choice, button, note and unit they draw needs a Chinese row
- /// (#1178). Language names are written in their own language, and a few labels read the same
- /// everywhere.
- #[test]
- fn settings_pages_are_translated() {
- use effectcraft_engine::prefs::{Item, Kind, LANGUAGES, pages};
- const VERBATIM: &[&str] = &["", "3D", "1/2", "1/4", "1/8", "sRGB", "Display P3", "px", "s", "%", "MB", "GB", "Hz", "pt"];
- let mut drawn = Vec::new();
- for page in pages() {
- drawn.push(page.title);
- for item in page.items {
- match item {
- Item::Section(text) | Item::Note(text) | Item::Button { label: text, .. } => drawn.push(text),
- Item::Setting { label, kind, .. } => {
- drawn.push(label);
- match kind {
- Kind::Int(_, _, unit) | Kind::Float(_, _, unit) => drawn.push(unit),
- Kind::Choice(options) => drawn.extend(options.iter().map(|(l, _)| *l)),
- _ => {}
- }
- }
- _ => {}
- }
- }
- }
- drawn.push("Stored, but not used by EffectCraft yet");
- let languages: Vec<&str> = LANGUAGES.iter().map(|(l, _)| *l).filter(|l| *l != "Match System").collect();
- let hans: HashMap<&str, &str> = SIMPLIFIED_CHINESE.iter().copied().collect();
- let mut missing: Vec<&str> = drawn.into_iter().filter(|en| !VERBATIM.contains(en) && !languages.contains(en) && !hans.contains_key(en)).collect();
- missing.sort_unstable();
- missing.dedup();
- assert!(missing.is_empty(), "Settings text with no Simplified Chinese row: {missing:?}");
- }
-
- /// A newly hard-coded interface string fails here instead of shipping in English to every
- /// language. It is a heuristic - it looks at the call shapes the panels use - and it ignores
- /// one-character literals, which are punctuation or a key name rather than a sentence.
- #[test]
- fn converted_panels_have_no_unwrapped_literals() {
- for (path, source) in CONVERTED {
- for (n, line) in source.lines().enumerate() {
- let code = line.split("//").next().unwrap_or(line);
- for call in CALLS {
- let Some(at) = code.find(call) else { continue };
- let rest = &code[at + call.len()..];
- let Some(end) = rest.find('"') else { continue };
- let literal = &rest[..end];
- assert!(
- literal.chars().count() < 2 || UNITS.contains(&literal),
- "{path}:{}: interface text `{literal}` in `{call}` is not in the catalog",
- n + 1
- );
- }
- }
- }
- }
}
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 72016cc53..2762188a0 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -1238,26 +1238,34 @@ impl EffectcraftApp {
}
let step = plan.map_or(1, |p| p.step);
// Never further ahead than the RAM preview holds: those frames would evict the ones the
- // preview shows first, or be evicted before it gets there (#595).
- let window = (ahead * 3).min(self.frames_that_fit(&c, scale) - 1);
- for k in 0..window {
+ // preview shows first, or be evicted before it gets there (#595). The window starts at the
+ // first uncached frame ahead: after a loop or a restart the frames just ahead are cached,
+ // and a window from the playhead left the workers idle until it came near the end of the
+ // cached run. It stays ahead × 3 frames wide: workers spread over the whole preview render
+ // frames with different layers at once (on the GPU, an atlas each: #1812).
+ let fit_ahead = self.frames_that_fit(&c, scale) - 1;
+ let frame = |k: i64| match plan {
+ Some(p) => p.frame_after(cur, k),
+ None => {
+ let f = cur + k;
+ Some(if f > wb { wa + (f - wb - 1).rem_euclid((wb - wa + 1).max(1)) } else { f })
+ }
+ };
+ let cached = self.frames.cached_frames(&series);
+ let uncached = |f: i64| cached.binary_search(&f).is_err();
+ let first = match plan.filter(|_| self.playback.playing) {
+ Some(p) => (0..fit_ahead.min((p.end - p.start) / p.step.max(1) + 1))
+ .map_while(|k| frame(k).map(|f| (k, f)))
+ .find(|&(_, f)| uncached(f))
+ .map_or(0, |(k, _)| k),
+ None => 0,
+ };
+ for k in first..(first + ahead * 3).min(fit_ahead) {
if queued >= ahead as usize || !video {
break;
}
- let f = match plan {
- Some(p) => match p.frame_after(cur, k) {
- Some(f) => f,
- None => break,
- },
- None => {
- let mut f = cur + k;
- if f > wb {
- f = wa + (f - wb - 1).rem_euclid((wb - wa + 1).max(1));
- }
- f
- }
- };
- if !self.frames.is_cached(&FrameKey { frame: f, ..series }) {
+ let Some(f) = frame(k) else { break };
+ if uncached(f) {
self.request_frame(cid, f, scale);
queued += 1;
}
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index 92893dcb6..36a85aef5 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -939,6 +939,18 @@ pub fn frontend(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, p: Valu
}
// View ▸ New Viewer.
"view.newViewer" => json!({"viewer": crate::panels::viewers::new_viewer(app)}),
+ // Reveal Layer Source / Reveal Composition: show the Project panel on the item, opening
+ // its folders and clearing the search so the row is visible.
+ "project.reveal" => {
+ let ids: Vec = p
+ .get("items")
+ .and_then(Value::as_array)
+ .map(|items| items.iter().filter_map(Value::as_u64).map(effectcraft_engine::project::ItemId).collect())
+ .or_else(|| p.get("item").and_then(Value::as_u64).map(|item| vec![effectcraft_engine::project::ItemId(item)]))
+ .unwrap_or_default();
+ crate::panels::project::reveal(app, ctx, &ids);
+ json!({"items": ids.iter().map(|item| item.0).collect::>()})
+ }
// Run by id (control channel, MCP): the Project panel's selection, whatever has focus.
"project.deleteWithoutConfirmation" => crate::panels::delete_items::delete_confirmed(app, ctx, json!({}))?,
// A gradient property's "Edit Gradient…" (the Timeline's value): the Gradient Editor.
diff --git a/crates/ui-egui/src/native_menu.rs b/crates/ui-egui/src/native_menu.rs
index ad30ded58..7d7046ed3 100644
--- a/crates/ui-egui/src/native_menu.rs
+++ b/crates/ui-egui/src/native_menu.rs
@@ -206,6 +206,8 @@ pub fn build(app: &EffectcraftApp) -> NativeMenu {
"Serviços"
} else if crate::i18n::czech(app) {
"Služby"
+ } else if crate::i18n::georgian(app) {
+ "სერვისები"
} else {
"Services"
}
@@ -490,6 +492,27 @@ mod tests {
assert_eq!(translated, ["Služby", "Skrýt EffectCraft", "Skrýt ostatní", "Zobrazit vše"]);
}
+ #[test]
+ fn georgian_translates_macos_predefined_items() {
+ if !cfg!(target_os = "macos") {
+ return;
+ }
+ let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+ app.session.execute("prefs.set", json!({"key": "general.language", "value": "ka"})).unwrap();
+ fn labels(nodes: &[NativeNode], out: &mut Vec) {
+ for node in nodes {
+ match node {
+ NativeNode::Predefined { label, .. } => out.push(label.clone()),
+ NativeNode::Submenu { children, .. } => labels(children, out),
+ _ => {}
+ }
+ }
+ }
+ let mut translated = vec![];
+ labels(&build(&app).menus, &mut translated);
+ assert_eq!(translated, ["სერვისები", "EffectCraft-ის დამალვა", "სხვების დამალვა", "ყველას ჩვენება"]);
+ }
+
#[test]
fn hide_items_are_predefined_on_macos() {
let spec = build(&app());
diff --git a/crates/ui-egui/src/panels/home.rs b/crates/ui-egui/src/panels/home.rs
index 46bbb44fc..269f2f447 100644
--- a/crates/ui-egui/src/panels/home.rs
+++ b/crates/ui-egui/src/panels/home.rs
@@ -67,21 +67,32 @@ pub fn recent_entries(prefs: &effectcraft_engine::prefs::Prefs) -> Vec (i64, chrono::NaiveDateTime) {
+ use chrono::Datelike;
+ let (days, sod) = (secs.div_euclid(86_400), secs.rem_euclid(86_400));
+ let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+ // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+ let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+ let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, 0));
+ match (date, time) {
+ (Some(d), Some(t)) => {
+ let y = i128::from(d.year()) + i128::from(cycles) * 400;
+ (i64::try_from(y).unwrap_or(if y < 0 { i64::MIN } else { i64::MAX }), d.and_time(t))
+ }
+ _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+ }
+}
+
+/// Unix seconds → `YYYY-MM-DD HH:MM` (UTC). Years far outside chrono's own range are preserved
+/// (the old hand-rolled conversion kept them) rather than collapsing to the epoch.
pub fn format_utc(secs: i64) -> String {
- let days = secs.div_euclid(86_400);
- let rem = secs.rem_euclid(86_400);
- // Civil date from days since 1970-01-01 (Howard Hinnant's algorithm).
- let z = days + 719_468;
- let era = z.div_euclid(146_097);
- let doe = z - era * 146_097;
- let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
- let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
- let mp = (5 * doy + 2) / 153;
- let d = doy - (153 * mp + 2) / 5 + 1;
- let m = if mp < 10 { mp + 3 } else { mp - 9 };
- let y = yoe + era * 400 + i64::from(m <= 2);
- format!("{y:04}-{m:02}-{d:02} {:02}:{:02}", rem / 3600, (rem % 3600) / 60)
+ let (y, t) = utc_parts(secs);
+ // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+ format!("{y:04}-{}", t.format("%m-%d %H:%M"))
}
/// How long ago `then` was, as the Home screen's Opened column shows it ("3 hours ago", then the
@@ -95,7 +106,8 @@ pub fn format_ago(now: i64, then: i64) -> String {
3_600..86_400 => plural(d / 3_600, "{} hour ago", "{} hours ago"),
86_400..172_800 => tr("Yesterday").to_string(),
172_800..604_800 => plural(d / 86_400, "{} day ago", "{} days ago"),
- _ => format_utc(then).get(..10).unwrap_or_default().to_string(),
+ // The date part: up to the space, not a fixed 10 bytes, so a year past 9999 stays whole.
+ _ => format_utc(then).split(' ').next().unwrap_or_default().to_string(),
}
}
@@ -510,6 +522,12 @@ mod tests {
assert_eq!(format_utc(0), "1970-01-01 00:00");
assert_eq!(format_utc(1_790_000_000), "2026-09-21 14:13");
assert_eq!(format_utc(951_782_400), "2000-02-29 00:00");
+ // Years far outside chrono's own range are preserved (the old hand-rolled conversion kept
+ // them), including negatives and the i64 extremes, rather than collapsing to the epoch.
+ assert_eq!(format_utc(10_000_000_000_000), "318857-05-20 17:46");
+ assert_eq!(format_utc(-10_000_000_000_000), "-314918-08-13 06:13");
+ assert_eq!(format_utc(i64::MAX), "292277026596-12-04 15:30");
+ assert_eq!(format_utc(i64::MIN), "-292277022657-01-27 08:29");
let img = egui::ColorImage::new([200, 100], vec![Color32::from_rgb(10, 200, 30); 200 * 100]);
let text = encode_thumb(&img);
let back = decode_thumb(&text).unwrap();
@@ -533,20 +551,20 @@ mod tests {
assert_eq!(format_ago(now, now + 100), "Just now");
assert_eq!((format_size(900), format_size(13_000), format_size(3_500_000)), ("900 B".into(), "13 KB".into(), "3.3 MB".into()));
assert_eq!((kind_of("/a/B.ecproj"), kind_of("c.AEP"), kind_of("x")), ("EffectCraft project", "After Effects project", "Project"));
+ // After a week it is the date, whole even for a five-digit year.
+ assert_eq!(format_ago(i64::MAX, 253_402_300_800), "10000-01-01");
}
/// The Home screen's own text goes through the interface catalog (#574): the Opened and Kind
- /// columns read in Chinese, and English stays English.
+ /// columns read in the interface language, and English stays English.
#[test]
fn home_text_follows_the_interface_language() {
let now = 1_790_000_000;
crate::i18n::set_current("zh-hans");
- let zh = (format_ago(now, now - 5), format_ago(now, now - 3 * 3_600), format_ago(now, now - 90_000), kind_of("/a/B.ecproj"));
- crate::i18n::set_current("zh-hant");
- let tw = (format_ago(now, now - 60), kind_of("x"));
+ let shown = (format_ago(now, now - 5), format_ago(now, now - 3 * 3_600), format_ago(now, now - 90_000), kind_of("/a/B.ecproj"));
+ let catalog = (tr("Just now").to_string(), tr_args("{} hours ago", &[&3]), tr("Yesterday").to_string(), tr("EffectCraft project"));
crate::i18n::set_current("en");
- assert_eq!(zh, ("刚刚".into(), "3 小时前".into(), "昨天".into(), "EffectCraft 项目"));
- assert_eq!(tw, ("1 分鐘前".into(), "專案"));
+ assert_eq!(shown, catalog);
assert_eq!(tr("Filter recent files"), "Filter recent files");
}
diff --git a/crates/ui-egui/src/panels/project.rs b/crates/ui-egui/src/panels/project.rs
index 30d18b722..5fdc76959 100644
--- a/crates/ui-egui/src/panels/project.rs
+++ b/crates/ui-egui/src/panels/project.rs
@@ -224,6 +224,11 @@ fn focused_row_id() -> egui::Id {
egui::Id::new("project-focused-row")
}
+/// The item whose selection the panel last scrolled into view.
+fn selection_seen_id() -> egui::Id {
+ egui::Id::new("proj-sel-seen")
+}
+
/// The focused widget is one of the panel's rows, or nothing has keyboard focus: the panel's keys
/// apply. Any other focused widget (a text field, a button reached with Tab) keeps them.
fn keys_reach_rows(app: &EffectcraftApp, ctx: &egui::Context) -> bool {
@@ -347,6 +352,33 @@ pub(crate) fn visible_rows(app: &EffectcraftApp) -> Vec<(ItemId, usize)> {
rows
}
+/// Bring `items` into view: clear the panel's search, open every folder holding them, select
+/// them, and show and focus the Project panel. Used by Reveal Layer Source in Project and
+/// Reveal Composition in Project, so the item is visible even in a large, filtered project.
+pub(crate) fn reveal(app: &mut EffectcraftApp, ctx: &egui::Context, items: &[ItemId]) {
+ let items: Vec