From bf8d2b337b584fda57324fe653971d35233e268b Mon Sep 17 00:00:00 2001
From: srt8hellcat2-ui <225485253+srt8hellcat2-ui@users.noreply.github.com>
Date: Mon, 12 Oct 2026 13:09:31 +0000
Subject: [PATCH 001/462] feat(ui): add optional two-paged CLI flag (#1354)
---
README.md | 2 +
apps/pdfcraft/src/main.rs | 40 +++------
apps/pdfcraft/src/startup.rs | 153 ++++++++++++++++++++++++++++++++
crates/ui-egui/src/lib.rs | 25 ++++++
crates/ui-egui/tests/editing.rs | 53 +++++++++++
5 files changed, 246 insertions(+), 27 deletions(-)
create mode 100644 apps/pdfcraft/src/startup.rs
diff --git a/README.md b/README.md
index b20179fff4..e3813760d8 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,8 @@ Search the whole document as you type, step through matches with ⌘G
## Navigate long documents
+Launch with `pdfcraft --two-paged file.pdf` (or `pdfcraft file.pdf --two-paged`) to open each command-line PDF in noncontinuous two-page view. This optional launch override does not change saved default-layout preferences or PDFs restored from the previous session. An explicit `--layout` option takes precedence on the active document regardless of argument order; `--default-layout` retains its existing behavior for subsequently opened documents.
+
Right-click a PDF tab to close it, reopen the last closed file-backed tab, or reveal its file. Closing still asks about unsaved changes. Reopening reads the saved file from disk; it does not restore discarded edits. Reveal selects the file in Explorer or Finder. On Linux and FreeBSD it requests `org.freedesktop.FileManager1.ShowItems`, falling back to opening the containing directory with `xdg-open` when that service is unavailable. Reopen and Reveal are unavailable on the web; Reveal is also unavailable for pathless documents.
Bookmarks, page thumbnails and the document's own page labels (i, ii, 1, 2…) keep you oriented in long documents. Search bookmark titles in the Bookmarks panel to find nested entries even when their parents are collapsed. Matches keep their ancestors for context; Clear restores the unfiltered tree without changing its expansion state.
diff --git a/apps/pdfcraft/src/main.rs b/apps/pdfcraft/src/main.rs
index c66d2c68f5..348689a5c0 100644
--- a/apps/pdfcraft/src/main.rs
+++ b/apps/pdfcraft/src/main.rs
@@ -1,6 +1,8 @@
//! PdfCraft desktop app.
//!
//! Usage: `pdfcraft [options] [files…]`
+//! `--two-paged` opens each command-line PDF in noncontinuous two-page view, without changing defaults.
+//! An explicit `--layout` takes precedence for the active document, regardless of argument order.
//! `--create-images [images…]` stages the images in one PDF and asks for the page DPI.
//!
//! View options (applied after the files open; also the seed of the UI control channel):
@@ -37,6 +39,7 @@ mod logging;
mod motion;
mod reopen;
mod single_instance;
+mod startup;
mod text_scale;
mod updates;
#[cfg(test)]
@@ -146,28 +149,13 @@ fn main() -> eframe::Result {
let _ = std::io::Write::write_fmt(&mut std::io::stderr(), format_args!("pdfcraft: {report}\n"));
}
}));
- let mut files = Vec::new();
- let mut options: Vec<(String, String)> = Vec::new();
- let mut control_file: Option = None;
- let mut create_images = false;
- let mut new_window = false;
- let mut args = std::env::args().skip(1);
- while let Some(a) = args.next() {
- match a.as_str() {
- "--version" => {
- println!("pdfcraft {}", env!("CARGO_PKG_VERSION"));
- return Ok(());
- }
- "--control" => control_file = args.next(),
- "--create-images" => create_images = true,
- "--new-window" => new_window = true,
- flag if flag.starts_with("--") => {
- let value = args.next().unwrap_or_default();
- options.push((flag.trim_start_matches("--").to_string(), value));
- }
- _ => files.push(path_from_arg(a)),
- }
+ let startup = startup::Arguments::parse(std::env::args().skip(1));
+ if startup.version {
+ println!("pdfcraft {}", env!("CARGO_PKG_VERSION"));
+ return Ok(());
}
+ let may_hand_off = startup.may_hand_off();
+ let startup::Arguments { files, options, control_file, create_images, two_paged, .. } = startup;
let integrated = cfg!(target_os = "macos");
migrate_legacy_folders();
// The log file lives in the settings folder; opened after the arguments (so `--version` leaves
@@ -183,14 +171,13 @@ fn main() -> eframe::Result {
// Windows: a launch that only names files (an Outlook attachment, an Explorer double-click)
// hands them to the PdfCraft already running and exits (#282, #317). Any option means the
// caller wants this launch's own window.
- let may_hand_off = !new_window && !files.is_empty() && options.is_empty() && control_file.is_none() && !create_images;
let instance = match single_instance::claim(&single_instance::absolute(&files), may_hand_off) {
single_instance::Claim::HandedOff => return Ok(()),
single_instance::Claim::Primary(server) => Some(server),
single_instance::Claim::Alone => None,
};
let choice = renderer_choice(std::env::var("PDFCRAFT_RENDERER").ok().as_deref());
- let launch = Launch { files, options, control_file, create_images, integrated };
+ let launch = Launch { files, options, control_file, create_images, integrated, two_paged };
// Finder, Open With and the Dock deliver files as Apple events, not arguments; catch the one
// that launched us as well as later ones. Lives until the event loop returns.
#[cfg(target_os = "macos")]
@@ -291,6 +278,7 @@ struct Launch {
control_file: Option,
create_images: bool,
integrated: bool,
+ two_paged: bool,
}
fn app_creator<'a>(
@@ -299,7 +287,7 @@ fn app_creator<'a>(
instance: Option<&'a single_instance::Server>,
#[cfg(target_os = "macos")] apple_events: &'a apple_events::AppleEvents,
) -> eframe::AppCreator<'a> {
- let Launch { files, options, control_file, create_images, integrated } = launch;
+ let Launch { files, options, control_file, create_images, integrated, two_paged } = launch;
Box::new(move |cc| {
started.set(true);
let mut app = PdfCraftApp::new();
@@ -366,9 +354,7 @@ fn app_creator<'a>(
// With the preference on, last session's files come back first; files named on
// the command line open after them, in front (#442).
app.reopen_last_files(&files);
- for f in files {
- app.open_path(&f);
- }
+ startup::open_files(&mut app, &files, two_paged);
}
for (k, v) in options {
if let Err(e) = app.set_option(&k, &v) {
diff --git a/apps/pdfcraft/src/startup.rs b/apps/pdfcraft/src/startup.rs
new file mode 100644
index 0000000000..50ae1198d7
--- /dev/null
+++ b/apps/pdfcraft/src/startup.rs
@@ -0,0 +1,153 @@
+//! Native launch arguments and per-file view overrides (#1354).
+use pdfcraft_ui_egui::PdfCraftApp;
+
+#[derive(Default)]
+pub(super) struct Arguments {
+ pub files: Vec,
+ pub options: Vec<(String, String)>,
+ pub control_file: Option,
+ pub create_images: bool,
+ pub new_window: bool,
+ pub two_paged: bool,
+ pub version: bool,
+}
+
+impl Arguments {
+ pub fn may_hand_off(&self) -> bool {
+ !self.new_window && !self.files.is_empty() && self.options.is_empty() && self.control_file.is_none() && !self.create_images && !self.two_paged
+ }
+
+ pub fn parse(args: impl IntoIterator- ) -> Self {
+ let mut parsed = Self::default();
+ let mut args = args.into_iter();
+ while let Some(a) = args.next() {
+ match a.as_str() {
+ "--version" => {
+ parsed.version = true;
+ break;
+ }
+ "--control" => parsed.control_file = args.next(),
+ "--create-images" => parsed.create_images = true,
+ "--new-window" => parsed.new_window = true,
+ "--two-paged" => parsed.two_paged = true,
+ flag if flag.starts_with("--two-paged=") => {
+ // It has no value: do not consume the following filename on malformed use.
+ log::warn!("{flag}: use --two-paged without a value");
+ }
+ flag if flag.starts_with("--") => {
+ let value = args.next().unwrap_or_default();
+ parsed.options.push((flag.trim_start_matches("--").to_string(), value));
+ }
+ _ => parsed.files.push(super::path_from_arg(a)),
+ }
+ }
+ parsed
+ }
+}
+
+pub(super) fn open_files(app: &mut PdfCraftApp, files: &[String], two_paged: bool) {
+ for path in files {
+ if two_paged {
+ // The per-file override wins over initial view without changing saved defaults.
+ app.open_path_with_display(path, pdfcraft_ui_egui::canvas::PageLayout::TwoUp, false);
+ } else {
+ app.open_path(path);
+ }
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ fn parse(args: &[&str]) -> Arguments {
+ Arguments::parse(args.iter().map(|s| s.to_string()))
+ }
+
+ #[test]
+ fn standalone_flag_keeps_files_in_either_position() {
+ for args in
+ [["--two-paged", "first.pdf", "second.pdf"], ["first.pdf", "--two-paged", "second.pdf"], ["first.pdf", "second.pdf", "--two-paged"]]
+ {
+ let parsed = parse(&args);
+ assert!(parsed.two_paged);
+ assert_eq!(parsed.files, ["first.pdf", "second.pdf"]);
+ assert!(parsed.options.is_empty());
+ assert!(!parsed.may_hand_off());
+ }
+ let empty = parse(&["--two-paged"]);
+ assert!(empty.two_paged && empty.files.is_empty());
+ let normal = parse(&["first.pdf", "second.pdf"]);
+ assert!(!normal.two_paged);
+ assert!(normal.may_hand_off());
+ for args in [
+ &["--new-window", "first.pdf"][..],
+ &["--layout", "two-page", "first.pdf"],
+ &["--control", "control.json", "first.pdf"],
+ &["--create-images", "first.png"],
+ ] {
+ assert!(!parse(args).may_hand_off());
+ }
+ }
+
+ #[test]
+ fn existing_layout_options_are_preserved_in_either_order() {
+ for args in [["--two-paged", "--layout", "single", "file.pdf"], ["--layout", "single", "--two-paged", "file.pdf"]] {
+ let parsed = parse(&args);
+ assert!(parsed.two_paged);
+ assert_eq!(parsed.files, ["file.pdf"]);
+ assert_eq!(parsed.options, [("layout".into(), "single".into())]);
+ }
+ let parsed = parse(&["--two-paged", "--default-layout", "two-up", "file.pdf"]);
+ assert_eq!(parsed.options, [("default-layout".into(), "two-up".into())]);
+ }
+
+ #[test]
+ fn malformed_boolean_does_not_eat_a_file_or_option() {
+ let args = parse(&["--two-paged=false", "first.pdf", "--layout", "single", "second.pdf"]);
+ assert!(!args.two_paged);
+ assert_eq!(args.files, ["first.pdf", "second.pdf"]);
+ assert_eq!(args.options, [("layout".into(), "single".into())]);
+ }
+
+ #[test]
+ fn startup_override_is_per_file_and_does_not_persist() {
+ use std::io::Write as _;
+ let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+ let path = std::env::temp_dir().join(format!("pdfcraft-two-paged-{}-{nonce}.pdf", std::process::id()));
+ let mut file = std::fs::OpenOptions::new().create_new(true).write(true).open(&path).unwrap();
+ file.write_all(include_bytes!("../../../crates/ui-egui/tests/data/form.pdf")).unwrap();
+ drop(file);
+ let text = path.to_str().unwrap();
+ for enabled in [false, true] {
+ let mut app = PdfCraftApp::new();
+ app.set_option("default-layout", "single").unwrap();
+ app.open_bytes("restored.pdf", None, include_bytes!("../../../crates/ui-egui/tests/data/form.pdf").to_vec()).unwrap();
+ let restored = app.views[0].id;
+ open_files(&mut app, &[text.into(), text.into()], enabled);
+ assert_eq!(app.views.len(), 3);
+ assert_eq!(app.views[0].id, restored);
+ assert_eq!(app.views[0].layout, pdfcraft_ui_egui::canvas::PageLayout::Single);
+ for view in app.views.iter().skip(1) {
+ assert_eq!(
+ view.layout,
+ if enabled { pdfcraft_ui_egui::canvas::PageLayout::TwoUp } else { pdfcraft_ui_egui::canvas::PageLayout::Single }
+ );
+ assert!(!view.continuous());
+ }
+ let persisted: serde_json::Value = serde_json::from_str(&app.persist()).unwrap();
+ assert_eq!(persisted["default_layout"], "single");
+ assert!(persisted.get("two_paged").is_none());
+ // Existing --layout applies after the flag to the active document only.
+ app.set_option("layout", "continuous").unwrap();
+ assert_eq!(app.views[2].layout, pdfcraft_ui_egui::canvas::PageLayout::Single);
+ assert!(app.views[2].continuous());
+ app.set_option("default-layout", "two-up").unwrap();
+ assert_eq!(app.view_defaults.layout, pdfcraft_ui_egui::canvas::PageLayout::TwoUp);
+ assert!(app.view_defaults.continuous);
+ open_files(&mut app, &[], enabled);
+ assert_eq!(app.views.len(), 3);
+ }
+ std::fs::remove_file(path).unwrap();
+ }
+}
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 2d4f5b0993..f165f2754f 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -404,6 +404,8 @@ pub struct PasswordPrompt {
then: Option<&'static str>,
/// A link destination to apply after the linked PDF is unlocked.
after_open: Option
,
+ /// A launch-time display override, applied only after this PDF is unlocked.
+ display_override: Option<(canvas::PageLayout, bool)>,
}
/// Asks for the permissions password of an open document whose security restricts it, which
@@ -1056,6 +1058,7 @@ impl PdfCraftApp {
recovered: None,
then: None,
after_open: None,
+ display_override: None,
});
return Ok(());
}
@@ -1268,6 +1271,11 @@ impl PdfCraftApp {
if let Some(destination) = after_open {
self.apply_remote_destination(destination);
}
+ if let Some((layout, continuous)) = p.display_override
+ && let Some(view) = self.views.last_mut()
+ {
+ view.set_display(layout, continuous);
+ }
if let Some(meta) = &p.recovered {
self.finish_recovery(meta);
}
@@ -1282,6 +1290,7 @@ impl PdfCraftApp {
prompt.recovered = p.recovered;
prompt.then = p.then;
prompt.after_open = after_open;
+ prompt.display_override = p.display_override;
}
}
}
@@ -1401,6 +1410,22 @@ impl PdfCraftApp {
}
}
+ /// Open one native file with a transient display override, including after a password prompt.
+ #[cfg(not(target_arch = "wasm32"))]
+ pub fn open_path_with_display(&mut self, path: &str, layout: canvas::PageLayout, continuous: bool) {
+ let tabs = self.views.len();
+ self.open_path(path);
+ if self.views.len() > tabs {
+ if let Some(view) = self.views.last_mut() {
+ view.set_display(layout, continuous);
+ }
+ } else if let Some(prompt) = self.password_prompt.as_mut()
+ && prompt.path.as_deref() == Some(path)
+ {
+ prompt.display_override = Some((layout, continuous));
+ }
+ }
+
/// The File ▸ Open picker: PDFs, and images and text that become PDFs.
#[cfg(not(target_arch = "wasm32"))]
fn open_picker() -> rfd::AsyncFileDialog {
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index 56e7cce300..0e62d6f52e 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -1892,6 +1892,59 @@ fn protected_with(algorithm: pdfcraft_cos::Algorithm, user: &str, owner: &str, p
pdfcraft_cos::write_full(&doc, &Default::default()).unwrap()
}
+#[test]
+fn launch_display_override_survives_password_retry_without_changing_defaults() {
+ use pdfcraft_ui_egui::canvas::PageLayout;
+ use std::io::Write as _;
+ let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+ let path = temp_path(&format!("startup-layout-{nonce}.pdf"));
+ let mut file = std::fs::OpenOptions::new().write(true).create_new(true).open(&path).unwrap();
+ file.write_all(&protected("reader", "owner", -4)).unwrap();
+ drop(file);
+ let mut app = PdfCraftApp::new();
+ app.set_option("default-layout", "continuous").unwrap();
+ app.open_path_with_display(path.to_str().unwrap(), PageLayout::TwoUp, false);
+ assert!(app.views.is_empty() && app.password_prompt.is_some());
+ app.submit_password(Some("wrong".into()));
+ assert!(app.views.is_empty() && app.password_prompt.is_some());
+ app.submit_password(Some("reader".into()));
+ assert_eq!(app.views.len(), 1);
+ assert_eq!(app.views[0].layout, PageLayout::TwoUp);
+ assert!(!app.views[0].continuous());
+ let persisted: serde_json::Value = serde_json::from_str(&app.persist()).unwrap();
+ assert_eq!(persisted["default_layout"], "continuous");
+ std::fs::remove_file(path).unwrap();
+}
+
+#[test]
+fn canceling_launch_display_override_does_not_affect_later_documents() {
+ use pdfcraft_ui_egui::canvas::PageLayout;
+ use std::io::Write as _;
+ let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+ let path = temp_path(&format!("startup-cancel-layout-{nonce}.pdf"));
+ let mut file = std::fs::OpenOptions::new().write(true).create_new(true).open(&path).unwrap();
+ file.write_all(&protected("reader", "owner", -4)).unwrap();
+ drop(file);
+ let mut app = PdfCraftApp::new();
+ app.set_option("default-layout", "continuous").unwrap();
+ app.open_path_with_display(path.to_str().unwrap(), PageLayout::TwoUp, false);
+ assert!(app.views.is_empty() && app.password_prompt.is_some());
+ app.submit_password(None);
+ assert!(app.views.is_empty() && app.password_prompt.is_none());
+ app.open_bytes("next.pdf", None, fixture(2)).unwrap();
+ assert_eq!(app.views[0].layout, PageLayout::Single);
+ assert!(app.views[0].continuous());
+ // Reopening the same protected file normally must not resurrect the canceled override.
+ app.open_path(path.to_str().unwrap());
+ app.submit_password(Some("reader".into()));
+ assert_eq!(app.views.len(), 2);
+ assert_eq!(app.views[1].layout, PageLayout::Single);
+ assert!(app.views[1].continuous());
+ let persisted: serde_json::Value = serde_json::from_str(&app.persist()).unwrap();
+ assert_eq!(persisted["default_layout"], "continuous");
+ std::fs::remove_file(path).unwrap();
+}
+
#[test]
fn password_prompt_opens_and_security_tab_reports_the_details() {
let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(|_cc| {
From 69f80819e1a17e8d0a58cd09fe8f1d6726c6fd95 Mon Sep 17 00:00:00 2001
From: Philip
Date: Mon, 12 Oct 2026 21:04:06 +0100
Subject: [PATCH 002/462] M2: draw non-embedded CJK CID fonts with an installed
face
A CID font of an Adobe CJK collection (Japan1, GB1, CNS1, Korea1) that the PDF
doesn't embed drew nothing unless craft-fonts had a Japanese face: text boxes
from Acrobat (Kozuka Gothic) and Pages (SongtiTC) were blank. After craft-fonts,
the renderer now uses one face already installed on the machine, read at
runtime and never bundled. The face of a multi-region collection (PingFang SC
or TC) is chosen by region. Noto CJK and Source Han are not candidates, and
PDFCRAFT_SYSTEM_FONTS=0 turns it off.
Co-Authored-By: Claude Sonnet 5.5
---
ROADMAP.md | 1 +
crates/render/Cargo.toml | 4 +-
crates/render/src/lib.rs | 1 +
crates/render/src/raster.rs | 61 +++++++-
crates/render/src/system_font.rs | 248 +++++++++++++++++++++++++++++++
5 files changed, 312 insertions(+), 3 deletions(-)
create mode 100644 crates/render/src/system_font.rs
diff --git a/ROADMAP.md b/ROADMAP.md
index 44a26604d8..b8fc5d6956 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -141,6 +141,7 @@ Ranked; detail and the full milestone table in [docs/roadmap.md](docs/roadmap.md
## Progress log
+- **2026-10-12 (M2, installed CJK fonts):** A CID font of an Adobe CJK collection (Japan1, GB1, CNS1, Korea1) that a PDF doesn't embed, such as the Kozuka Gothic of an Acrobat text box or the SongtiTC of a Pages export, drew nothing unless craft-fonts had a Japanese face. After craft-fonts, it now draws with a face already installed on the machine (PingFang, Heiti, Microsoft JhengHei / YaHei, Malgun and the like; read at runtime, never bundled; Noto CJK and Source Han excluded; `PDFCRAFT_SYSTEM_FONTS=0` turns it off). The face of a collection with several regions (PingFang SC, TC) is chosen by region. Checked on macOS with a synthetic Traditional Chinese, Simplified Chinese and Korean page; the Windows and Linux font lists are untested, and a machine with none of the listed faces still draws nothing.
- **2026-10-12 (M1, #1339):** An incremental save of an unchanged classic-table file used to append `xref` and then `trailer` with no subsection, which qpdf reports as a damaged file. The section now has a zero-length subsection, so no object entry changes and a trailer-only edit is still written. Estimates unchanged.
- **2026-10-12 (M12, auto-tag preview):** The engine and `accessibility_autotag_preview` propose paragraph and large-heading roles for bounded text blocks on one page, with locations and reasons. Every proposal needs review; images remain unclassified. No PDF tags are written yet. Synthetic tool tests cover normal text, a larger heading, bounds and unchanged source bytes. Estimates unchanged.
- **2026-10-12 (M10, editing OCR text on scans):** Editing a recognised word on a scanned page now changes what the page shows. Before, the rewrite stayed invisible OCR text, so the scan still showed the old word; on a form, the whole OCR layer also grouped into one paragraph that rewrapped when one word changed. OCR words now group into phrases (a table cell or a tab stop splits them, and lines stay apart); an edit draws the phrase visibly in the scan's sampled ink colour over a cover in the sampled paper colour, keeping each word's width and growing rightwards. The editor covers the scanned word while typing. OCR words are now sized from their letters (a capitals-only word's box spans the cap height, not the full ascender-descender span), so recognised and rewritten text is as tall as the scanned word and sits on its baseline. Five engine tests on synthetic scans and a kittest UI test; `ocr.editable-text-output` is partial.
diff --git a/crates/render/Cargo.toml b/crates/render/Cargo.toml
index 28202a38b4..71467dfeb2 100644
--- a/crates/render/Cargo.toml
+++ b/crates/render/Cargo.toml
@@ -13,6 +13,8 @@ pdfcraft-cos = { workspace = true }
pdfcraft-fonts = { workspace = true }
hayro = { workspace = true }
hayro-syntax = { workspace = true }
+# Picks the face of an installed font collection (the version pdfcraft-fonts already uses).
+skrifa = "0.44"
lopdf = { workspace = true }
kurbo = { workspace = true }
thiserror = { workspace = true }
@@ -27,7 +29,5 @@ bytemuck = { version = "1" }
getrandom = { version = "0.4", features = ["wasm_js"] }
[dev-dependencies]
-# Checks the Japanese substitute's character coverage; the version pdfcraft-fonts already uses.
-skrifa = "0.44"
# Builds the decompression-bomb streams in the raster tests.
flate2 = { workspace = true }
diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs
index d2ee5712c4..90bc64b086 100644
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@ -13,6 +13,7 @@ mod pixels;
mod raster;
mod reading;
mod structure;
+mod system_font;
pub mod text;
pub use inspect::{
diff --git a/crates/render/src/raster.rs b/crates/render/src/raster.rs
index 0e64ac241e..fe469958ae 100644
--- a/crates/render/src/raster.rs
+++ b/crates/render/src/raster.rs
@@ -73,7 +73,7 @@ impl RenderConfig {
InterpreterSettings {
ocg_overrides: self.layers.clone(),
hide_comments: self.hide_comments,
- font_resolver: Arc::new(move |query| japanese_fallback(query).or_else(|| standard(query))),
+ font_resolver: Arc::new(move |query| japanese_fallback(query).or_else(|| system_fallback(query)).or_else(|| standard(query))),
..InterpreterSettings::default()
}
}
@@ -106,6 +106,14 @@ fn japanese_fallback(query: &FontQuery) -> Option<(FontData, u32)> {
Some((Arc::new(face.bytes), 0))
}
+/// An installed face for a CID font of an Adobe CJK collection that the PDF doesn't embed and
+/// craft-fonts has no face for (Traditional and Simplified Chinese, Korean, and Japanese in a
+/// build without craft-fonts). `None` for every other font.
+fn system_fallback(query: &FontQuery) -> Option<(FontData, u32)> {
+ let FontQuery::Fallback(f) = query else { return None };
+ crate::system_font::fallback(f)
+}
+
#[derive(Debug, PartialEq)]
enum JapaneseFace {
Mincho,
@@ -5515,6 +5523,57 @@ trailer << /Root 1 0 R >>
}
}
+ /// Chinese and Korean CID fonts that aren't embedded (Adobe-CNS1 `MSung-Light`, Adobe-GB1
+ /// `STSong-Light`, Adobe-Korea1 `HYGoThic-Medium`; Acrobat also writes Japanese `KozGoPr6N`
+ /// text boxes without the font) drew nothing, because craft-fonts has only Japanese faces.
+ /// They now draw in a face already installed on the machine, read at runtime. A machine
+ /// without such a face draws nothing, as before, so each check is skipped there.
+ #[test]
+ fn non_embedded_chinese_and_korean_cid_fonts_draw_with_an_installed_face() {
+ use hayro::hayro_interpret::font::FallbackFontQuery;
+ use hayro::hayro_interpret::hayro_cmap::CharacterCollection;
+ // (base font, collection, ordering, encoding, UCS-2 code units of the text)
+ let cases = [
+ ("MSung-Light", CidFamily::AdobeCNS1, "CNS1", "UniCNS-UCS2-H", "7E419AD45B57"), // 繁體字
+ ("STSong-Light", CidFamily::AdobeGB1, "GB1", "UniGB-UCS2-H", "72698D448DF7"), // 物资跷 (common Simplified)
+ ("HYGoThic-Medium", CidFamily::AdobeKorea1, "Korea1", "UniKS-UCS2-H", "D55CAE00"), // 한글
+ ];
+ for (base_font, family, ordering, encoding, code) in cases {
+ let query = FontQuery::Fallback(FallbackFontQuery {
+ post_script_name: Some(base_font.into()),
+ character_collection: Some(CharacterCollection { family, supplement: 2 }),
+ ..FallbackFontQuery::default()
+ });
+ if super::system_fallback(&query).is_none() {
+ eprintln!("no installed face for {base_font} (or PDFCRAFT_SYSTEM_FONTS=0): skipped");
+ continue;
+ }
+ let content = format!("BT /F1 40 Tf 5 15 Td <{code}> Tj ET");
+ let pdf = format!(
+ "%PDF-1.7
+1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj
+2 0 obj << /Type /Pages /Kids [3 0 R] /Count 1 >> endobj
+3 0 obj << /Type /Page /Parent 2 0 R /MediaBox [0 0 200 60] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> >> >> endobj
+4 0 obj << /Length {} >> stream
+{content}
+endstream endobj
+5 0 obj << /Type /Font /Subtype /Type0 /BaseFont /{base_font} /Encoding /{encoding} /DescendantFonts [6 0 R] >> endobj
+6 0 obj << /Type /Font /Subtype /CIDFontType0 /BaseFont /{base_font} /CIDSystemInfo << /Registry (Adobe) /Ordering ({ordering}) /Supplement 2 >>
+ /FontDescriptor 7 0 R /DW 1000 >> endobj
+7 0 obj << /Type /FontDescriptor /FontName /{base_font} /Flags 6 /FontBBox [0 -141 1000 859] /ItalicAngle 0 /Ascent 859 /Descent -141 /CapHeight 700 /StemV 80 >> endobj
+trailer << /Root 1 0 R >>
+%%EOF",
+ content.len()
+ );
+ let mut r = PageRenderer::new(Arc::new(pdf.into_bytes()), RenderConfig::default());
+ let p = r.render(RenderRequest { page: 0, kind: RequestKind::Pixels, tile: None, scale: 1.0, tag: 0, ..Default::default() });
+ assert!(p.error.is_none(), "{base_font}: {:?}", p.error);
+ let inked = p.rgba.as_chunks::<4>().0.iter().filter(|c| c[0] < 128).count();
+ // Two to four glyphs at 40 pt cover several hundred dark pixels; a blank run has none.
+ assert!(inked > 300, "{base_font}: the text is drawn ({inked} dark pixels)");
+ }
+ }
+
/// Half-width katakana are common in Japanese documents set in a non-embedded Mincho font
/// such as HeiseiMin-W3. The Mincho substitute must have those glyphs: one that lacks them
/// (Shippori Mincho) draws them as .notdef.
diff --git a/crates/render/src/system_font.rs b/crates/render/src/system_font.rs
new file mode 100644
index 0000000000..d2c98bb7cd
--- /dev/null
+++ b/crates/render/src/system_font.rs
@@ -0,0 +1,248 @@
+//! Installed CJK faces for CID fonts a PDF doesn't embed.
+//!
+//! Acrobat and other tools often write Chinese, Japanese or Korean text with one of the Adobe
+//! collections (Adobe-Japan1, GB1, CNS1, Korea1) and a font name such as `KozGoPr6N-Medium` or
+//! `MSung-Light` without embedding the font. hayro maps those CIDs to Unicode itself, but it needs
+//! a face to draw them with; without one the text is blank. The craft-fonts Japanese faces come
+//! first (see `japanese_fallback` in `raster.rs`); this module is the last resort: one face
+//! already installed on this machine. It is read at runtime and never embedded or shipped
+//! (AGENTS.md §1.4), Noto CJK and Source Han are left out on purpose (§1.1), and
+//! `PDFCRAFT_SYSTEM_FONTS=0` turns it off, as for the interface font.
+
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex, PoisonError};
+
+use hayro::hayro_interpret::font::{FallbackFontQuery, FontData};
+use hayro::hayro_interpret::hayro_cmap::CidFamily;
+use skrifa::MetadataProvider as _;
+use skrifa::string::StringId;
+
+/// Larger files are not read: a font path is still untrusted input. CJK system faces are big
+/// collections (PingFang is tens of megabytes).
+const MAX_BYTES: u64 = 96 << 20;
+/// Faces tried in a collection (`.ttc`).
+const MAX_FACES: u32 = 32;
+
+/// The writing system a character collection is for.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+enum Script {
+ Japanese,
+ SimplifiedChinese,
+ TraditionalChinese,
+ Korean,
+}
+
+impl Script {
+ fn of(family: &CidFamily) -> Option {
+ match family {
+ CidFamily::AdobeJapan1 => Some(Self::Japanese),
+ CidFamily::AdobeGB1 => Some(Self::SimplifiedChinese),
+ CidFamily::AdobeCNS1 => Some(Self::TraditionalChinese),
+ CidFamily::AdobeKorea1 => Some(Self::Korean),
+ CidFamily::AdobeIdentity | CidFamily::Custom { .. } => None,
+ }
+ }
+
+ /// A character the face must have to be worth using. Each is common and not shared by the
+ /// other scripts' faces: 物 (Japanese; also Chinese, so it only rules out Latin-only faces),
+ /// 欢 (Simplified only), 說 (Traditional only), 한 (Hangul).
+ fn probe(self) -> char {
+ match self {
+ Self::Japanese => '\u{7269}',
+ Self::SimplifiedChinese => '\u{6B22}',
+ Self::TraditionalChinese => '\u{8AAA}',
+ Self::Korean => '\u{D55C}',
+ }
+ }
+}
+
+/// One installed file and the words (in a face's family name) that pick the face for the right
+/// region out of a collection that holds several (PingFang SC, TC and HK share one file).
+struct Candidate {
+ path: PathBuf,
+ region: &'static [&'static str],
+}
+
+/// The installed face to draw a CID font of `query`'s collection with, as `(data, face index)`.
+/// `None` when it is turned off, the collection isn't one of the four, or nothing fits.
+pub(crate) fn fallback(query: &FallbackFontQuery) -> Option<(FontData, u32)> {
+ if cfg!(target_arch = "wasm32") || std::env::var_os("PDFCRAFT_SYSTEM_FONTS").is_some_and(|v| v == "0") {
+ return None;
+ }
+ let script = Script::of(&query.character_collection.as_ref()?.family)?;
+ let bold = query.is_bold || query.font_weight >= 600;
+ /// A face file and the index of the chosen face in it, or `None` when nothing fits.
+ type Face = Option<(Arc>, u32)>;
+ static CACHE: Mutex>> = Mutex::new(None);
+ let mut cache = CACHE.lock().unwrap_or_else(PoisonError::into_inner);
+ let found = cache.get_or_insert_with(HashMap::new).entry((script, bold)).or_insert_with(|| {
+ candidates(script)
+ .iter()
+ .find_map(|c| read(c, script.probe(), bold))
+ .inspect(|(_, index)| log::info!("CJK font fallback for {script:?}: face {index}"))
+ });
+ found.as_ref().map(|(bytes, index)| (Arc::clone(bytes) as FontData, *index))
+}
+
+fn read(candidate: &Candidate, probe: char, bold: bool) -> Option<(Arc>, u32)> {
+ let meta = std::fs::metadata(&candidate.path).ok()?;
+ if !meta.is_file() || meta.len() > MAX_BYTES {
+ return None;
+ }
+ let bytes = std::fs::read(&candidate.path).ok()?;
+ let index = pick_face(&bytes, probe, candidate.region, bold)?;
+ Some((Arc::new(bytes), index))
+}
+
+/// The best face of the file that parses and maps `probe`: the region's face when the file has
+/// one, then the regular (or, for bold text, the semibold or bold) weight, then the first.
+fn pick_face(bytes: &[u8], probe: char, region: &[&str], bold: bool) -> Option {
+ let mut best: Option<(u32, u32)> = None;
+ for index in 0..MAX_FACES {
+ let Ok(font) = skrifa::FontRef::from_index(bytes, index) else { continue };
+ if font.charmap().map(probe).is_none() {
+ continue;
+ }
+ let names = |id: StringId| font.localized_strings(id).map(|s| s.chars().collect::()).collect::>();
+ let family = names(StringId::FAMILY_NAME).join(" ");
+ let style = names(StringId::SUBFAMILY_NAME).join(" ").to_ascii_lowercase();
+ let mut score = 1;
+ if region.iter().any(|r| family.split_whitespace().any(|w| w == *r)) {
+ score += 4;
+ }
+ let weighty = style.contains("bold") || style.contains("semibold") || style.contains("heavy");
+ let plain = style.is_empty() || style.contains("regular") || style.contains("normal") || style.contains("medium") && !bold;
+ if (bold && weighty) || (!bold && plain && !weighty) {
+ score += 2;
+ }
+ if best.is_none_or(|(_, s)| score > s) {
+ best = Some((index, score));
+ }
+ }
+ best.map(|(index, _)| index)
+}
+
+fn candidates(script: Script) -> Vec {
+ let region: &'static [&'static str] = match script {
+ Script::Japanese => &["JP", "Japanese"],
+ Script::SimplifiedChinese => &["SC", "GB"],
+ Script::TraditionalChinese => &["TC", "HK", "CNS"],
+ Script::Korean => &["KR", "Korean"],
+ };
+ let files: Vec = if cfg!(windows) {
+ let dir = windows_fonts();
+ let names: &[&str] = match script {
+ Script::Japanese => &["YuGothR.ttc", "meiryo.ttc", "msgothic.ttc"],
+ Script::SimplifiedChinese => &["msyh.ttc", "simsun.ttc", "msjh.ttc"],
+ Script::TraditionalChinese => &["msjh.ttc", "mingliu.ttc", "msyh.ttc"],
+ Script::Korean => &["malgun.ttf", "gulim.ttc"],
+ };
+ names.iter().map(|f| dir.join(f)).collect()
+ } else if cfg!(target_os = "macos") {
+ let names: &[&str] = match script {
+ Script::Japanese => &["ヒラギノ角ゴシック W3.ttc", "Hiragino Sans GB.ttc", "PingFang.ttc"],
+ Script::SimplifiedChinese => &["PingFang.ttc", "Hiragino Sans GB.ttc", "STHeiti Light.ttc"],
+ Script::TraditionalChinese => &["PingFang.ttc", "STHeiti Light.ttc", "Hiragino Sans GB.ttc"],
+ Script::Korean => &["AppleSDGothicNeo.ttc", "AppleGothic.ttf", "PingFang.ttc"],
+ };
+ names.iter().map(|f| Path::new("/System/Library/Fonts").join(f)).collect()
+ } else {
+ let names: &[&str] = match script {
+ Script::Korean => {
+ &["truetype/nanum/NanumGothic.ttf", "nanum/NanumGothic.ttf", "truetype/baekmuk/gulim.ttf", "truetype/unfonts-core/UnDotum.ttf"]
+ }
+ Script::Japanese => &[
+ "truetype/fonts-japanese-gothic.ttf",
+ "ipa-gothic/ipag.ttf",
+ "truetype/takao-gothic/TakaoGothic.ttf",
+ "truetype/vlgothic/VL-Gothic-Regular.ttf",
+ ],
+ Script::SimplifiedChinese | Script::TraditionalChinese => &[
+ "truetype/wqy/wqy-microhei.ttc",
+ "wenquanyi/wqy-microhei/wqy-microhei.ttc",
+ "wqy-microhei/wqy-microhei.ttc",
+ "truetype/wqy/wqy-zenhei.ttc",
+ "wenquanyi/wqy-zenhei/wqy-zenhei.ttc",
+ "wqy-zenhei/wqy-zenhei.ttc",
+ "truetype/droid/DroidSansFallbackFull.ttf",
+ "google-droid-sans-fonts/DroidSansFallbackFull.ttf",
+ "truetype/arphic/uming.ttc",
+ "arphic-uming/uming.ttc",
+ ],
+ };
+ ["/usr/share/fonts", "/usr/local/share/fonts"].iter().flat_map(|dir| names.iter().map(move |f| Path::new(dir).join(f))).collect()
+ };
+ files.into_iter().map(|path| Candidate { path, region }).collect()
+}
+
+fn windows_fonts() -> PathBuf {
+ let dir = std::env::var_os("WINDIR").or_else(|| std::env::var_os("SystemRoot")).map_or_else(|| PathBuf::from(r"C:\Windows"), PathBuf::from);
+ dir.join("Fonts")
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ const SCRIPTS: [Script; 4] = [Script::Japanese, Script::SimplifiedChinese, Script::TraditionalChinese, Script::Korean];
+
+ #[test]
+ fn broken_and_missing_files_are_skipped() {
+ assert_eq!(pick_face(b"", '\u{7269}', &[], false), None);
+ assert_eq!(pick_face(b"not a font at all", '\u{7269}', &[], false), None);
+ assert_eq!(pick_face(&[0u8; 4096], '\u{7269}', &[], false), None);
+ let missing = Candidate { path: PathBuf::from("definitely/not/here.ttc"), region: &[] };
+ assert!(read(&missing, '\u{7269}', false).is_none());
+ // A directory is not a font.
+ let dir = Candidate { path: std::env::temp_dir(), region: &[] };
+ assert!(read(&dir, '\u{7269}', false).is_none());
+ }
+
+ #[test]
+ fn a_latin_face_is_rejected_for_every_script() {
+ let inter = include_bytes!("../../../assets/fonts/Inter-Regular.ttf");
+ for script in SCRIPTS {
+ assert_eq!(pick_face(inter, script.probe(), &[], false), None, "{script:?}");
+ }
+ assert_eq!(pick_face(inter, 'A', &[], false), Some(0));
+ }
+
+ #[test]
+ fn candidates_are_absolute_font_files_without_adobe_designs() {
+ for script in SCRIPTS {
+ let list = candidates(script);
+ assert!(!list.is_empty(), "{script:?}");
+ for c in list {
+ assert!(c.path.is_absolute(), "{}", c.path.display());
+ assert!(c.path.extension().is_some_and(|e| e == "ttf" || e == "ttc"), "{}", c.path.display());
+ let name = c.path.to_string_lossy().to_lowercase();
+ assert!(!["notosanscjk", "notoserifcjk", "sourcehan", "source-han"].iter().any(|b| name.contains(b)), "{name}");
+ }
+ }
+ }
+
+ #[test]
+ fn only_the_four_adobe_collections_have_a_script() {
+ assert_eq!(Script::of(&CidFamily::AdobeCNS1), Some(Script::TraditionalChinese));
+ assert_eq!(Script::of(&CidFamily::AdobeGB1), Some(Script::SimplifiedChinese));
+ assert_eq!(Script::of(&CidFamily::AdobeKorea1), Some(Script::Korean));
+ assert_eq!(Script::of(&CidFamily::AdobeJapan1), Some(Script::Japanese));
+ assert_eq!(Script::of(&CidFamily::AdobeIdentity), None);
+ }
+
+ /// On a Mac the face for Traditional Chinese is the TC one of PingFang, not the first of the
+ /// collection (which is another region's), and it maps a character only Traditional has.
+ #[cfg(target_os = "macos")]
+ #[test]
+ fn macos_picks_the_regional_pingfang_face() {
+ let path = Path::new("/System/Library/Fonts/PingFang.ttc");
+ let Ok(bytes) = std::fs::read(path) else { return };
+ for (script, region) in [(Script::TraditionalChinese, "TC"), (Script::SimplifiedChinese, "SC")] {
+ let index = pick_face(&bytes, script.probe(), &[region], false).expect("PingFang covers it");
+ let font = skrifa::FontRef::from_index(&bytes, index).unwrap();
+ let family: String = font.localized_strings(StringId::FAMILY_NAME).next().unwrap().chars().collect();
+ assert!(family.contains(region), "{script:?} got {family:?}");
+ }
+ }
+}
From b680ded337354487b26ff56c27b0986e21e0dfcb Mon Sep 17 00:00:00 2001
From: JM
Date: Tue, 13 Oct 2026 15:38:04 +0000
Subject: [PATCH 003/462] feat: add optional page edge shadows setting
---
ATTRIBUTION.toml | 42 ++--
ROADMAP.md | 4 +-
crates/ui-egui/src/canvas.rs | 35 ++-
crates/ui-egui/src/control.rs | 3 +
crates/ui-egui/src/i18n/ar.tsv | 1 +
crates/ui-egui/src/i18n/bg.tsv | 1 +
crates/ui-egui/src/i18n/cs.tsv | 1 +
crates/ui-egui/src/i18n/de.tsv | 1 +
crates/ui-egui/src/i18n/el.tsv | 1 +
crates/ui-egui/src/i18n/es.tsv | 1 +
crates/ui-egui/src/i18n/fr.tsv | 1 +
crates/ui-egui/src/i18n/hu.tsv | 1 +
crates/ui-egui/src/i18n/it.tsv | 1 +
crates/ui-egui/src/i18n/ja.tsv | 1 +
crates/ui-egui/src/i18n/kk.tsv | 1 +
crates/ui-egui/src/i18n/lt.tsv | 1 +
crates/ui-egui/src/i18n/pl.tsv | 1 +
crates/ui-egui/src/i18n/pt-br.tsv | 1 +
crates/ui-egui/src/i18n/ru.tsv | 1 +
crates/ui-egui/src/i18n/sl.tsv | 1 +
crates/ui-egui/src/i18n/te.tsv | 1 +
crates/ui-egui/src/i18n/tr.tsv | 1 +
crates/ui-egui/src/i18n/uk.tsv | 1 +
crates/ui-egui/src/i18n/zh-hans.tsv | 1 +
crates/ui-egui/src/i18n/zh-hant.tsv | 1 +
crates/ui-egui/src/js_ui.rs | 4 +
crates/ui-egui/src/lib.rs | 19 +-
crates/ui-egui/tests/control.rs | 19 ++
crates/ui-egui/tests/page_shadows.rs | 350 +++++++++++++++++++++++++++
docs/roadmap.md | 5 +-
parity/acrobat-features.toml | 4 +-
31 files changed, 473 insertions(+), 33 deletions(-)
create mode 100644 crates/ui-egui/tests/page_shadows.rs
diff --git a/ATTRIBUTION.toml b/ATTRIBUTION.toml
index 28785f7675..36900e0a9b 100644
--- a/ATTRIBUTION.toml
+++ b/ATTRIBUTION.toml
@@ -7,7 +7,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Greek UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "d0a69a35403e70b94c3adfef88b41ec719f4f6ab700d351c8f82a78c53b63ef6"
+sha256 = "882c0de87fd784acd0d98738d5db18dff619666fcf5d65ad49af53ae02071a52"
# ATTRIBUTION.toml: one entry per asset (AGENTS.md §1). The source of truth for provenance and licences.
# ATTRIBUTION.md is generated from this file: `cargo xtask assets --write`. Checked by `cargo xtask assets` (part of `xtask ci`).
@@ -30,7 +30,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Simplified Chinese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "caa23201b7f25dba9f8dc579771e13435e5e8c72a7efb9770e917a2a33003a39"
+sha256 = "b58781b77c3c285b63f3dc455c0d59c90bc330b2680ef40484c438ebda192d8e"
[[asset]]
path = "crates/ui-egui/src/i18n/zh-hant.tsv"
@@ -41,7 +41,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Traditional Chinese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "5ead9fccdca17810a3a98de3fa499d8a2469a1ff015c3d0e11880ca629295ea1"
+sha256 = "a649395b81c3209dd15e647154d77fa234d57a90107dbc0c5d6b268c64194719"
[[asset]]
path = "crates/ui-egui/src/i18n/cs.tsv"
@@ -52,7 +52,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Czech UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "d48f9d68711850cae48af53f7691facee4209f7846e3eb2c064d97dad2ae2426"
+sha256 = "d0cbf5ae09d732d3446be4f8f68ae78a1b1c0b370c199d0045d3c8522c3ad84c"
[[asset]]
path = "crates/ui-egui/src/i18n/pt-br.tsv"
@@ -63,7 +63,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Brazilian Portuguese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "6bc2edec99534d0df9b5e4a1c2e18dc32ad84c32e404c74dd437d86119b1d6ea"
+sha256 = "232e203183548507747a128f7870a1d2b85f57198ef3cb08177021b2689f13d1"
[[asset]]
path = "crates/ui-egui/src/i18n/es.tsv"
@@ -74,7 +74,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Spanish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "cb6c04bd36ba6ce0ebc808da2e47b65797e14d59466e93802adec4d4f5056e3b"
+sha256 = "ea80209d0192489065fd97e4e21ea537a83e371021dff0831256ffa265ba0f4d"
[[asset]]
path = "crates/ui-egui/src/i18n/fr.tsv"
@@ -85,7 +85,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "French UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "0368944155991c2ea304788418fb326f30e45649539a0cf49539194b026ca104"
+sha256 = "3904d5f143a6e8861c22c5adbd2d3af3b7e2ff82d0cb40b3443180255ab55ab0"
[[asset]]
path = "crates/ui-egui/src/i18n/de.tsv"
@@ -96,7 +96,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "German UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "f4969c353f1424c6b9b5b110820c69dc59907590d013221511eae3f86c29024e"
+sha256 = "ebd76484896b8931e84066acd8a4ba1c60e023cb90baffca1f0a54bd3ebc3e8f"
[[asset]]
path = "crates/ui-egui/src/i18n/te.tsv"
@@ -107,7 +107,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Telugu UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "4bb6fa4f3b6e236a4a353df79acd0c5528ea8354058eeaeb66c28bc0f7e02939"
+sha256 = "0ad017eade954c43cd61e41342c733de46937177f07aa91f16aa8491d114904e"
[[asset]]
path = "crates/ui-egui/src/i18n/it.tsv"
@@ -118,7 +118,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Italian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "adcbdfc683589b067e062a6200084bf9192935b297f5b616f8ed39db9c71db9b"
+sha256 = "bc96cc2e0ee2bb2bebc48eff1faf934d5873d443639b3b7d248b17d0d16b9977"
[[asset]]
path = "crates/ui-egui/src/i18n/pl.tsv"
@@ -129,7 +129,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Polish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "aebe63cd91df2d2f9d2bdc1da43b017823dbc8a32135e999b9ac7041277be0c8"
+sha256 = "5c75987e23f74c0273fd38c7af8682a5fc48aee3ceda6582b28e49ff42b4b1e1"
[[asset]]
path = "crates/ui-egui/src/i18n/ru.tsv"
@@ -140,7 +140,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Russian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "3c8e3a28a5b751c6d6384809d4fd81c14c2ff5f561aaee5b58d24fbfa2ca4dc1"
+sha256 = "e483d99fae3fe4fb579f3f1844903537c28d1d4acd2fcfc822f64ab77f7a4098"
[[asset]]
path = "crates/ui-egui/src/i18n/hu.tsv"
@@ -151,7 +151,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Hungarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "637fcfdd0bf1898b413af7ccbc2eb4228bf656273de9f3ef9241bd128940aeab"
+sha256 = "e54073fd593756b00812c5bd5b951ae6e50d06d4812f988c88034f513065caef"
[[asset]]
path = "crates/ui-egui/src/i18n/bg.tsv"
@@ -162,7 +162,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Bulgarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "5285f8987bd8c265f73ff443906c1832a0886037592d334974cf539b9f972a3f"
+sha256 = "da8dff590b62692c2fd67a60e2c2c32f3093ae425946772bbc705f35f9764de2"
[[asset]]
path = "crates/ui-egui/src/i18n/kk.tsv"
@@ -173,7 +173,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Kazakh UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "23779abc08be40ddfb305fd638fe280c854ac33473b2822006ba8bad399c0cad"
+sha256 = "4105b4fb3a088b34c2844edcff9e9a66f7c8dcaa6f6a45936c868dc3b24767c1"
[[asset]]
path = "crates/ui-egui/src/i18n/ja.tsv"
@@ -184,7 +184,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Japanese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "c5129c40b202d8467d8d4cf0a189da8c2ba2af711998edb73f67e1b291289a04"
+sha256 = "97a9416f8cef0248fb3bedc2fdb38b21f6e882455255a3ff1e879652188f155b"
[[asset]]
path = "crates/ui-egui/src/i18n/uk.tsv"
@@ -195,7 +195,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Ukrainian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "11ed2aa56dc5f8f6656eba717500c74bb8c8f931c08f9f9b210b5b33dd9c2d5a"
+sha256 = "17c818311e6422d4e4b49a71dcc1d784f78920b7b21b493d4e11170f7791c6e3"
[[asset]]
path = "crates/ui-egui/src/i18n/ar.tsv"
@@ -206,7 +206,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Arabic UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "a3863e2fed5ef584a87f65083a6b9fedf26d18ecebd574efce22bd7a01e3281c"
+sha256 = "7f9bc12fe0514cf61675d8537623aff84829c711d5efdb68ba4b158cd2aeb13c"
[[asset]]
path = "crates/ui-egui/src/i18n/tr.tsv"
@@ -217,7 +217,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Turkish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "cade94846289c2822b408a2ea23e6c8f8f321708f4f27fd563695a3c4fade6a1"
+sha256 = "b666eaf326370ded831ae26a0a4e214d1e42cdf374de64f1d4244391736c47b1"
[[asset]]
path = "crates/ui-egui/src/i18n/lt.tsv"
@@ -228,7 +228,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Lithuanian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "35b6b03dae01b9a2e98f6d1f682d0699d77772e6efec7e28e1f26039c57b151f"
+sha256 = "2b3a1b676f258c3903bf2447b93adcec7aadb53d3820902869301c0e5bf7f1ec"
[[asset]]
path = "assets/icons/accessibility.svg"
@@ -3351,4 +3351,4 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Slovene UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "2685fbb694cbdeb7632ecb5e7396e1209047c83319e28ceea032b3ec9fb2fc0e"
+sha256 = "f9a381fdfea0731a6913b552ea6fb209404ab27a75abe4c817e42d379091a78e"
diff --git a/ROADMAP.md b/ROADMAP.md
index a035c9bf35..630550c144 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,7 +2,7 @@
**Stage: alpha** · next: beta, ~26% (ready for real work 49% → 75%) and ~400–700 h away
-> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
+> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-13 · **Change:** minor (M3 #1577: optional page-edge shadows and viewport-edge fades; earlier: M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M4: Extract and Split preserve shared Type 3 glyph resources; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M2: packed TIFF-predictor RGB rows retain their byte boundaries; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M3 #1364 candidate: consent before absolute local GoToR access; estimates unchanged); earlier: minor (M1 #1339: an unchanged incremental save of a classic cross-reference table writes a zero-length subsection; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
@@ -148,6 +148,8 @@ Ranked; detail and the full milestone table in [docs/roadmap.md](docs/roadmap.md
## Progress log
+- 2026-10-13 — M3, #1577: optional app-wide page-edge shadows and viewport-edge fades in the viewer and Organize grid; enabled by default, persisted and controllable through the UI channel. PDF rendering and edits are unchanged.
+
- **2026-10-12 (M13, CLI robustness scans):** `pdfcraft-cli check` visits a directory once even when input roots overlap or directory symlinks lead back into the tree. PDFs reached through file symlinks remain accepted. Three real CLI regressions cover overlapping roots, a directory cycle and directory/file aliases. Estimates unchanged.
- **2026-10-12 (M4, Type 3 extraction fidelity):** Extract and Split preserve shared image/resource dictionaries reached through Type 3 glyphs, including nested forms, patterns and soft masks. A bounded object-graph walk protects unknown glyph content; unreadable pages/forms retain their glyph resources, and shared explicit fonts are visited once. Separate page dictionaries still prune unused images. Synthetic save/reopen regressions and an opt-in Poppler pixel oracle cover resource ownership, nested forms, cycles, limits and repeated fonts. Estimates unchanged.
- **2026-10-12 (M2, TIFF predictor rows):** Packed RGB images using TIFF horizontal differencing keep every row when samples do not fill the last byte. The renderer aligns each decoded row before moving to the next. Synthetic decoding tests cover 1/2/4-bit samples, horizontal differencing and an 8-bit control; a red/green page-render regression verifies visible output. Estimates unchanged.
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 9dc2c98dfa..8405051989 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -2097,7 +2097,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
let unobstructed = !app.modal_open() && !app.palette_open;
let view = &mut app.views[index];
if view.organize {
- organize_grid(view, info, doc.allows_assembly(), doc.dirty, unobstructed, ui, &t);
+ organize_grid(view, doc, unobstructed, app.show_page_edge_shadows, ui, &t);
return;
}
@@ -2382,6 +2382,12 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
scroll = scroll.vertical_scroll_offset((r.top() - y_shift + fy * r.height() - rel.y).clamp(0.0, max_y));
}
}
+ // egui paints viewport-edge gradients over the PDF after the scroll contents.
+ // Scope their suppression to this scroll area; other panels keep their fades.
+ let fade_strength = ui.spacing().scroll.fade.strength;
+ if !app.show_page_edge_shadows {
+ ui.spacing_mut().scroll.fade.strength = 0.0;
+ }
let out = scroll.show_viewport(ui, |ui, viewport| {
// egui's drag responses accept every pointer button. Keep a wheel gesture from also
// selecting text, drawing a mark, or panning with the Hand tool.
@@ -2454,7 +2460,9 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
}
let xf = PageXform { rect: r, rot: view.rotation, pw: info.pages[i].width.max(1.0), ph: info.pages[i].height.max(1.0) };
// Soft shadow + paper.
- painter.add(egui::epaint::Shadow { offset: [0, 3], blur: 14, spread: 0, color: t.page_shadow }.as_shape(r, CornerRadius::ZERO));
+ if app.show_page_edge_shadows {
+ painter.add(egui::epaint::Shadow { offset: [0, 3], blur: 14, spread: 0, color: t.page_shadow }.as_shape(r, CornerRadius::ZERO));
+ }
painter.rect_filled(r, CornerRadius::ZERO, Color32::WHITE);
if let Some(err) = view.errors.get(&i) {
painter.rect_filled(r, CornerRadius::ZERO, Color32::from_rgb(0xFB, 0xF4, 0xF4));
@@ -3142,6 +3150,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
});
(wanted, visible_now)
});
+ ui.spacing_mut().scroll.fade.strength = fade_strength;
view.single_edges = visible_pages.first().copied().filter(|_| !view.continuous).map(|page| {
// At the top once the page's top edge shows where going to a page puts it (a gap
// below the window's top). Within a point, as for wheel paging, so layout rounding
@@ -4240,7 +4249,17 @@ fn gap_button(ui: &mut egui::Ui, gap: usize, at: Pos2, height: f32, label: Strin
resp.on_hover_text(label).clicked()
}
-fn organize_grid(view: &mut DocView, info: &DocInfo, editable: bool, dirty: bool, unobstructed: bool, ui: &mut egui::Ui, t: &Tokens) {
+fn organize_grid(
+ view: &mut DocView,
+ doc: &pdfcraft_engine::Document,
+ unobstructed: bool,
+ show_page_edge_shadows: bool,
+ ui: &mut egui::Ui,
+ t: &Tokens,
+) {
+ let info = &doc.info;
+ let editable = doc.allows_assembly();
+ let dirty = doc.dirty;
let ppp = ui.ctx().pixels_per_point();
// The page image scales with the zoom; the padding and the page number don't.
let cell = vec2(146.0 * view.grid_zoom + 44.0, 194.0 * view.grid_zoom + 88.0);
@@ -4262,6 +4281,11 @@ fn organize_grid(view: &mut DocView, info: &DocInfo, editable: bool, dirty: bool
let (mut in_view, mut sharper): (Vec<(usize, f32)>, Vec) = (Vec::new(), Vec::new());
// The source cell can scroll out of the virtualized rows during a drag.
let mut drop = view.org_drag.is_some() && ui.input(|i| i.pointer.primary_released());
+ // As in the document viewer, hide only this area's decorative edge fades.
+ let fade_strength = ui.spacing().scroll.fade.strength;
+ if !show_page_edge_shadows {
+ ui.spacing_mut().scroll.fade.strength = 0.0;
+ }
egui::ScrollArea::vertical().auto_shrink([false, false]).show_viewport(ui, |ui, clip| {
if middle_gesture {
let opacity = ui.opacity();
@@ -4313,7 +4337,9 @@ fn organize_grid(view: &mut DocView, info: &DocInfo, editable: bool, dirty: bool
if view.selected.contains(&i) {
ui.painter().rect_stroke(c.shrink(6.0), CornerRadius::same(8), Stroke::new(1.5, t.accent), egui::StrokeKind::Inside);
}
- ui.painter().rect_filled(pr.translate(vec2(0.0, 1.5)), CornerRadius::same(1), t.page_shadow);
+ if show_page_edge_shadows {
+ ui.painter().rect_filled(pr.translate(vec2(0.0, 1.5)), CornerRadius::same(1), t.page_shadow);
+ }
ui.painter().rect_filled(pr, CornerRadius::ZERO, Color32::WHITE);
// A page drawn larger than its thumbnail gets a render at the size drawn, while
// it is in view; until that arrives the thumbnail stands in.
@@ -4478,6 +4504,7 @@ fn organize_grid(view: &mut DocView, info: &DocInfo, editable: bool, dirty: bool
view.org_drag = None;
}
});
+ ui.spacing_mut().scroll.fade.strength = fade_strength;
// Files dragged in from outside go to the gap under the pointer. Some platforms don't say
// where the pointer is until the files are dropped; then the whole grid is the target.
let pointer = ui.input(|i| i.pointer.hover_pos()).filter(|p| viewport.contains(*p));
diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs
index eaa102b56e..83a66ee48b 100644
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@ -28,6 +28,8 @@
//! comments, selecting text, moving comments). `ui.state` reports `pages_on_screen` to aim at.
//! - `ui.type {text}`, `ui.key {key, modifiers?}`: keyboard input to the focused widget / app.
//! - `ui.command {id}`: run a registry command (as the menu would). `ui.commands` lists them.
+//! - `ui.set {key: "show_page_edge_shadows", value: "true"|"false"}` controls page
+//! decoration app-wide; `ui.state.show_page_edge_shadows` reports the saved preference.
//! - `ui.set {key, value}`: view options (`--page`, `--zoom`, …), plus persistent preferences.
//! `select` accepts physical page numbers and ranges such as `1,12,16-18`; blank clears the
//! explicit selection. This is the same bounded parser as the Organize Pages field; invalid
@@ -722,6 +724,7 @@ impl Host for crate::PdfCraftApp {
"palette_open": self.palette_open,
"theme": format!("{:?}", self.theme),
"theme_preference": self.theme_preference,
+ "show_page_edge_shadows": self.show_page_edge_shadows,
"language": self.language,
"notice": self.toast.as_ref().map(|t| t.0.clone()),
"progress": self.progress_notice.as_ref().map(|p| json!({ "label": p.label, "fraction": p.fraction })),
diff --git a/crates/ui-egui/src/i18n/ar.tsv b/crates/ui-egui/src/i18n/ar.tsv
index 222865d72b..c98472944a 100644
--- a/crates/ui-egui/src/i18n/ar.tsv
+++ b/crates/ui-egui/src/i18n/ar.tsv
@@ -2373,3 +2373,4 @@ animation effects Off معطّلة
This document is trying to open a local file: يحاول هذا المستند فتح ملف محلي:
Move tag earlier نقل العلامة للأعلى
Move tag later نقل العلامة للأسفل
+ Show Page Edge Shadows إظهار ظلال حواف الصفحات
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 17a0890fa5..8c4767391e 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -2315,3 +2315,4 @@ animation effects Off Изключени
This document is trying to open a local file: Този документ се опитва да отвори локален файл:
Move tag earlier Преместване на етикета по-рано
Move tag later Преместване на етикета по-късно
+ Show Page Edge Shadows Показване на сенки по краищата на страниците
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index e6e29c8bba..43cabd385e 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -2426,3 +2426,4 @@ animation effects Off Vypnuto
This document is trying to open a local file: Tento dokument se pokouší otevřít místní soubor:
Move tag earlier Přesunout značku dříve
Move tag later Přesunout značku později
+ Show Page Edge Shadows Zobrazovat stíny okrajů stránek
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index 38ef665d13..85cb412263 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -2353,3 +2353,4 @@ animation effects Off Aus
This document is trying to open a local file: Dieses Dokument versucht, eine lokale Datei zu öffnen:
Move tag earlier Tag früher verschieben
Move tag later Tag später verschieben
+ Show Page Edge Shadows Schatten an Seitenrändern anzeigen
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index 106278f012..1f36c2722d 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -2362,3 +2362,4 @@ animation effects Off Ανενεργά
This document is trying to open a local file: Αυτό το έγγραφο προσπαθεί να ανοίξει ένα τοπικό αρχείο:
Move tag earlier Μετακίνηση ετικέτας νωρίτερα
Move tag later Μετακίνηση ετικέτας αργότερα
+ Show Page Edge Shadows Εμφάνιση σκιών στα άκρα των σελίδων
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index 5afbe4f2ef..50b132e926 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -2482,3 +2482,4 @@ animation effects Off Desactivados
This document is trying to open a local file: Este documento intenta abrir un archivo local:
Move tag earlier Mover etiqueta antes
Move tag later Mover etiqueta después
+ Show Page Edge Shadows Mostrar sombras en los bordes de las páginas
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index 79389837d3..1bbb1328b0 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -2352,3 +2352,4 @@ animation effects Off Désactivés
This document is trying to open a local file: Ce document tente d’ouvrir un fichier local :
Move tag earlier Déplacer la balise plus tôt
Move tag later Déplacer la balise plus tard
+ Show Page Edge Shadows Afficher les ombres des bords des pages
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index 3d6e1e3af5..ae0097a2c2 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -2351,3 +2351,4 @@ animation effects Off Ki
This document is trying to open a local file: Ez a dokumentum egy helyi fájlt próbál megnyitni:
Move tag earlier Címke korábbra helyezése
Move tag later Címke későbbre helyezése
+ Show Page Edge Shadows Oldalszéli árnyékok megjelenítése
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index 3575ab374d..17e263f608 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -2361,3 +2361,4 @@ animation effects Off Disattivati
This document is trying to open a local file: Questo documento sta tentando di aprire un file locale:
Move tag earlier Sposta tag prima
Move tag later Sposta tag dopo
+ Show Page Edge Shadows Mostra le ombre ai bordi delle pagine
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index 5e61802c35..7ff964ec3a 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -2352,3 +2352,4 @@ animation effects Off オフ
This document is trying to open a local file: この文書はローカルファイルを開こうとしています:
Move tag earlier タグを前へ移動
Move tag later タグを後へ移動
+ Show Page Edge Shadows ページ端の影を表示
diff --git a/crates/ui-egui/src/i18n/kk.tsv b/crates/ui-egui/src/i18n/kk.tsv
index 8e4a090403..b472b97c06 100644
--- a/crates/ui-egui/src/i18n/kk.tsv
+++ b/crates/ui-egui/src/i18n/kk.tsv
@@ -2350,3 +2350,4 @@ animation effects Off Өшірулі
This document is trying to open a local file: Бұл құжат жергілікті файлды ашуға әрекеттеніп жатыр:
Move tag earlier Тегті ертерек жылжыту
Move tag later Тегті кейінірек жылжыту
+ Show Page Edge Shadows Бет жиектерінің көлеңкелерін көрсету
diff --git a/crates/ui-egui/src/i18n/lt.tsv b/crates/ui-egui/src/i18n/lt.tsv
index ae61e396ff..20ffdcf1d6 100644
--- a/crates/ui-egui/src/i18n/lt.tsv
+++ b/crates/ui-egui/src/i18n/lt.tsv
@@ -2596,3 +2596,4 @@ key Space Tarpas
This document is trying to open a local file: Šis dokumentas bando atverti vietinį failą:
Move tag earlier Perkelti žymą anksčiau
Move tag later Perkelti žymą vėliau
+ Show Page Edge Shadows Rodyti puslapių kraštų šešėlius
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index 310a990f7d..c2011e70b4 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -2332,3 +2332,4 @@ animation effects Off Wyłączone
This document is trying to open a local file: Ten dokument próbuje otworzyć plik lokalny:
Move tag earlier Przenieś znacznik wcześniej
Move tag later Przenieś znacznik później
+ Show Page Edge Shadows Pokaż cienie krawędzi stron
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index 623d69ce80..41c94d1ca1 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -2366,3 +2366,4 @@ animation effects Off Desativados
This document is trying to open a local file: Este documento está tentando abrir um arquivo local:
Move tag earlier Mover tag para antes
Move tag later Mover tag para depois
+ Show Page Edge Shadows Mostrar sombras nas bordas das páginas
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index 7f628088d6..d67a507eab 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -2265,3 +2265,4 @@ animation effects Off Выкл
This document is trying to open a local file: Этот документ пытается открыть локальный файл:
Move tag earlier Переместить тег раньше
Move tag later Переместить тег позже
+ Show Page Edge Shadows Показывать тени по краям страниц
diff --git a/crates/ui-egui/src/i18n/sl.tsv b/crates/ui-egui/src/i18n/sl.tsv
index 3feaad354d..d7279724c5 100644
--- a/crates/ui-egui/src/i18n/sl.tsv
+++ b/crates/ui-egui/src/i18n/sl.tsv
@@ -2357,3 +2357,4 @@ animation effects Off Izklopljeni
This document is trying to open a local file: Ta dokument poskuša odpreti lokalno datoteko:
Move tag earlier Premakni oznako prej
Move tag later Premakni oznako pozneje
+ Show Page Edge Shadows Prikaži sence robov strani
diff --git a/crates/ui-egui/src/i18n/te.tsv b/crates/ui-egui/src/i18n/te.tsv
index d15365f3d4..04368336bf 100644
--- a/crates/ui-egui/src/i18n/te.tsv
+++ b/crates/ui-egui/src/i18n/te.tsv
@@ -2265,3 +2265,4 @@ animation effects Off ఆఫ్
This document is trying to open a local file: ఈ పత్రం ఒక స్థానిక ఫైల్ను తెరవడానికి ప్రయత్నిస్తోంది:
Move tag earlier ట్యాగ్ను ముందుకు తరలించు
Move tag later ట్యాగ్ను వెనుకకు తరలించు
+ Show Page Edge Shadows పేజీ అంచుల నీడలను చూపించు
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index 44fd05f074..65e442547d 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -2348,3 +2348,4 @@ animation effects Off Kapalı
This document is trying to open a local file: Bu belge yerel bir dosya açmaya çalışıyor:
Move tag earlier Etiketi daha erken taşı
Move tag later Etiketi daha geç taşı
+ Show Page Edge Shadows Sayfa kenarı gölgelerini göster
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index 648dc855fe..b2e7bd576a 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -2374,3 +2374,4 @@ animation effects Off Вимкнено
This document is trying to open a local file: Цей документ намагається відкрити локальний файл:
Move tag earlier Перемістити тег раніше
Move tag later Перемістити тег пізніше
+ Show Page Edge Shadows Показувати тіні на краях сторінок
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index 391c8eda7c..a67b93e1b4 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -2316,3 +2316,4 @@ animation effects Off 关
This document is trying to open a local file: 此文档正尝试打开本地文件:
Move tag earlier 将标签前移
Move tag later 将标签后移
+ Show Page Edge Shadows 显示页面边缘阴影
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index da45921c21..af726d4b01 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -2226,3 +2226,4 @@ animation effects Off 關
This document is trying to open a local file: 此文件正嘗試開啟本機檔案:
Move tag earlier 將標記前移
Move tag later 將標記後移
+ Show Page Edge Shadows 顯示頁面邊緣陰影
diff --git a/crates/ui-egui/src/js_ui.rs b/crates/ui-egui/src/js_ui.rs
index fe474622c7..48ded85723 100644
--- a/crates/ui-egui/src/js_ui.rs
+++ b/crates/ui-egui/src/js_ui.rs
@@ -263,6 +263,10 @@ fn reading_mode_label(mode: &str) -> &'static str {
/// Preferences: interface language and size, appearance, identity and JavaScript. Returns `true` to close.
pub(crate) fn preferences_body(ui: &mut egui::Ui, app: &mut PdfCraftApp, t: &Tokens) -> bool {
ui.label(egui::RichText::new(tl!("Preferences")).font(theme::semibold(18.0)));
+ ui.label(egui::RichText::new(tl!("Appearance")).font(theme::semibold(13.0)));
+ if ui.add(widgets::checkbox(&mut app.show_page_edge_shadows, tl!("Show Page Edge Shadows"))).changed() {
+ ui.ctx().request_repaint();
+ }
ui.horizontal(|ui| {
ui.label(tl!("Interface language"));
let selected = crate::i18n::Lang::from_code(&app.language).map_or(tl!("Auto"), crate::i18n::Lang::name);
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index ea3da00957..276aa56b70 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -511,6 +511,8 @@ pub struct PdfCraftApp {
/// The reading-colours preference (Preferences ▸ Reading colours): applied to every open
/// document, and documents open with it (Acrobat's Replace Document Colors).
pub reading_colors: pdfcraft_render::ReadingColors,
+ /// App-wide page decoration only; never part of a PDF edit or render request.
+ pub show_page_edge_shadows: bool,
/// The Linux portal is enabled only by the native host, and starts on the first System choice.
#[cfg(target_os = "linux")]
desktop_theme: Option,
@@ -882,6 +884,7 @@ impl PdfCraftApp {
theme: ThemeKind::Light,
theme_preference: ThemePreference::Light,
reading_colors: Default::default(),
+ show_page_edge_shadows: true,
#[cfg(target_os = "linux")]
desktop_theme: None,
#[cfg(target_os = "linux")]
@@ -2074,7 +2077,7 @@ impl PdfCraftApp {
/// Serialize the user's persistent state (recent files, theme). Local only.
pub fn persist(&self) -> String {
let trusted: Vec = self.session.trusted_certificates().iter().map(pdfcraft_engine::sign::x509::to_pem).collect();
- serde_json::json!({
+ let mut settings = serde_json::json!({
"docking": self.docking,
"docking_left_open": self.left_open,
"docking_right": self.right,
@@ -2133,8 +2136,12 @@ impl PdfCraftApp {
"combine_zoom": self.combine_zoom,
"comments_panel_closed": self.comments_panel_closed,
"right_panel_closed": self.right_panel_closed,
- })
- .to_string()
+ });
+ // Add this separately to keep the existing settings macro below its expansion limit.
+ if let Some(settings) = settings.as_object_mut() {
+ settings.insert("show_page_edge_shadows".into(), self.show_page_edge_shadows.into());
+ }
+ settings.to_string()
}
/// Restore state written by `persist`. Unknown or malformed data is ignored.
@@ -2212,6 +2219,9 @@ impl PdfCraftApp {
if let Some(size) = v["fill_text_size"].as_f64().and_then(fill_sign::valid_text_size) {
self.fill_text_size = size;
}
+ if let Some(show) = v["show_page_edge_shadows"].as_bool() {
+ self.show_page_edge_shadows = show;
+ }
// Settings are untrusted: an unreadable value (a colour that isn't three bytes, say)
// fails to deserialize and keeps Off.
if let Ok(colors) = serde_json::from_value::(v["reading_colors"].clone()) {
@@ -2316,6 +2326,9 @@ impl PdfCraftApp {
};
self.set_theme_preference(preference);
}
+ ("show_page_edge_shadows", _) => {
+ self.show_page_edge_shadows = value.parse::().map_err(|_| "show_page_edge_shadows must be true or false")?;
+ }
("scroll_speed", _) => {
self.scroll_speed = scroll_speed::ScrollSpeed::parse(value).ok_or("scroll_speed must be slow, normal, or fast")?;
}
diff --git a/crates/ui-egui/tests/control.rs b/crates/ui-egui/tests/control.rs
index a73b3073b2..723f3910a9 100644
--- a/crates/ui-egui/tests/control.rs
+++ b/crates/ui-egui/tests/control.rs
@@ -73,6 +73,25 @@ fn ok(h: &mut Harness<'static, PdfCraftApp>, c: &ControlClient, method: &str, pa
call(h, c, method, params).unwrap_or_else(|e| panic!("{method}: {e}"))
}
+#[test]
+fn page_shadows_are_an_observable_app_wide_preference() {
+ let (mut h, c) = harness();
+ assert_eq!(ok(&mut h, &c, "ui.state", json!({}))["show_page_edge_shadows"], true);
+ for value in ["false", "true"] {
+ ok(&mut h, &c, "ui.set", json!({ "key": "show_page_edge_shadows", "value": value }));
+ assert_eq!(ok(&mut h, &c, "ui.state", json!({}))["show_page_edge_shadows"], value == "true");
+ }
+ for value in ["off", "1", "False", ""] {
+ assert!(call(&mut h, &c, "ui.set", json!({ "key": "show_page_edge_shadows", "value": value })).is_err());
+ assert_eq!(ok(&mut h, &c, "ui.state", json!({}))["show_page_edge_shadows"], true);
+ }
+ ok(&mut h, &c, "ui.set", json!({ "key": "show_page_edge_shadows", "value": false }));
+ assert_eq!(ok(&mut h, &c, "ui.state", json!({}))["show_page_edge_shadows"], false);
+ h.state_mut().active = None;
+ ok(&mut h, &c, "ui.set", json!({ "key": "show_page_edge_shadows", "value": "false" }));
+ assert_eq!(ok(&mut h, &c, "ui.state", json!({}))["show_page_edge_shadows"], false);
+}
+
#[test]
fn control_resize_reports_observed_dimensions_and_rejects_invalid_sizes() {
let (mut h, c) = harness();
diff --git a/crates/ui-egui/tests/page_shadows.rs b/crates/ui-egui/tests/page_shadows.rs
new file mode 100644
index 0000000000..9cdee3f7a7
--- /dev/null
+++ b/crates/ui-egui/tests/page_shadows.rs
@@ -0,0 +1,350 @@
+//! Decorative page shadows are app preferences, never PDF edits.
+
+use egui_kittest::{Harness, kittest::Queryable};
+use pdfcraft_ui_egui::PdfCraftApp;
+
+#[test]
+fn viewer_shadows_follow_the_preference_without_moving_pages() {
+ for theme in ["light", "dark"] {
+ for layout in ["single", "two-page", "continuous", "two-up"] {
+ let mut h = harness(theme);
+ h.state_mut().set_option("layout", layout).unwrap();
+ h.run_steps(3);
+ let rectangles = h.state().views[0].visible_page_rects().to_vec();
+ let original = shadows(&h, false);
+ assert!(!original.is_empty(), "{theme} {layout}");
+ h.state_mut().set_option("show_page_edge_shadows", "false").unwrap();
+ h.run_steps(2);
+ assert!(shadows(&h, false).is_empty(), "{theme} {layout}");
+ assert_eq!(h.state().views[0].visible_page_rects(), rectangles);
+ h.state_mut().set_option("zoom", "125").unwrap();
+ h.state_mut().set_option("page", "2").unwrap();
+ h.run_steps(3);
+ assert!(shadows(&h, false).is_empty());
+ h.state_mut().set_option("show_page_edge_shadows", "true").unwrap();
+ h.run_steps(2);
+ assert!(!shadows(&h, false).is_empty());
+ }
+ }
+}
+
+#[test]
+fn viewport_fades_follow_the_preference_and_keep_other_scroll_areas_styled() {
+ for theme in ["light", "dark"] {
+ for organize in [false, true] {
+ let mut h = harness(theme);
+ if organize {
+ h.state_mut().set_option("organize", "on").unwrap();
+ // Make the three-page grid overflow vertically.
+ h.state_mut().set_option("grid-zoom", "300").unwrap();
+ }
+ h.run_steps(4);
+ let original_style = h.ctx.global_style().spacing.scroll.fade;
+ assert!(original_style.strength > 0.0);
+ assert!(!viewport_fades(&h).is_empty(), "bottom fade at start: {theme}, organize={organize}");
+ scroll_down(&mut h, 100.0);
+ let original = viewport_fades(&h);
+ let viewport = h.state().views[0].viewport_rect();
+ assert!(original.iter().any(|r| (r.top() - viewport.top()).abs() < 2.0), "top fade: {original:?}");
+ assert!(original.iter().any(|r| (r.bottom() - viewport.bottom()).abs() < 2.0), "bottom fade: {original:?}");
+ let pages = h.state().views[0].visible_page_rects().to_vec();
+ h.state_mut().set_option("show_page_edge_shadows", "false").unwrap();
+ h.run_steps(2);
+ assert!(viewport_fades(&h).is_empty(), "viewport fades remain: {theme}, organize={organize}");
+ assert_eq!(h.state().views[0].visible_page_rects(), pages);
+ assert_eq!(h.ctx.global_style().spacing.scroll.fade, original_style);
+ h.state_mut().set_option("show_page_edge_shadows", "true").unwrap();
+ h.run_steps(2);
+ assert_eq!(viewport_fades(&h), original);
+ scroll_down(&mut h, 100_000.0);
+ let at_end = viewport_fades(&h);
+ assert!(at_end.iter().any(|r| (r.top() - viewport.top()).abs() < 2.0));
+ assert!(!at_end.iter().any(|r| (r.bottom() - viewport.bottom()).abs() < 2.0), "no bottom fade at the end");
+ }
+ }
+}
+
+#[test]
+fn horizontal_viewport_fades_also_follow_the_preference() {
+ let mut h = harness("dark");
+ h.state_mut().set_option("zoom", "400").unwrap();
+ h.run_steps(4);
+ let viewport = h.state().views[0].viewport_rect();
+ let horizontal: Vec<_> = viewport_fades(&h).into_iter().filter(|r| r.width() <= 21.0).collect();
+ assert!(horizontal.iter().any(|r| (r.left() - viewport.left()).abs() < 2.0), "left fade: {horizontal:?}");
+ assert!(horizontal.iter().any(|r| (r.right() - viewport.right()).abs() < 2.0), "right fade: {horizontal:?}");
+ let pages = h.state().views[0].visible_page_rects().to_vec();
+ h.state_mut().set_option("show_page_edge_shadows", "false").unwrap();
+ h.run_steps(2);
+ assert!(viewport_fades(&h).is_empty());
+ assert_eq!(h.state().views[0].visible_page_rects(), pages);
+}
+
+fn scroll_down(h: &mut Harness<'static, PdfCraftApp>, points: f32) {
+ h.hover_at(h.state().views[0].viewport_rect().center());
+ h.run_steps(1);
+ h.event(egui::Event::MouseWheel {
+ unit: egui::MouseWheelUnit::Point,
+ delta: egui::vec2(0.0, -points),
+ phase: egui::TouchPhase::Move,
+ modifiers: egui::Modifiers::NONE,
+ });
+ h.run_steps(12);
+}
+
+/// Inspect the actual egui painter output: untextured four-vertex gradients
+/// with a transparent edge, spanning one dimension of the document viewport.
+fn viewport_fades(h: &Harness<'static, PdfCraftApp>) -> Vec {
+ let viewport = h.state().views[0].viewport_rect();
+ h.output()
+ .shapes
+ .iter()
+ .filter_map(|s| {
+ let egui::Shape::Mesh(mesh) = &s.shape else { return None };
+ if mesh.texture_id != egui::TextureId::default() || mesh.vertices.len() != 4 || mesh.indices.len() != 6 {
+ return None;
+ }
+ let rect = mesh.calc_bounds();
+ let transparent = mesh.vertices.iter().filter(|v| v.color == egui::Color32::TRANSPARENT).count();
+ (transparent == 2
+ && (((rect.width() - viewport.width()).abs() < 2.0 && rect.height() <= 21.0)
+ || ((rect.height() - viewport.height()).abs() < 2.0 && rect.width() <= 21.0))
+ && rect.intersects(viewport))
+ .then_some(rect)
+ })
+ .collect()
+}
+
+#[test]
+fn organize_shadows_follow_the_preference() {
+ for theme in ["light", "dark"] {
+ let mut h = harness(theme);
+ h.state_mut().set_option("organize", "on").unwrap();
+ h.run_steps(3);
+ let original = shadows(&h, true);
+ assert_eq!(original.len(), 3);
+ h.state_mut().set_option("show_page_edge_shadows", "false").unwrap();
+ h.run_steps(2);
+ assert!(shadows(&h, true).is_empty());
+ h.state_mut().set_option("show_page_edge_shadows", "true").unwrap();
+ h.run_steps(2);
+ assert_eq!(shadows(&h, true), original);
+ }
+}
+
+#[test]
+fn checkbox_and_multiple_documents_do_not_edit_pdf_state() {
+ let mut h = harness("light");
+ h.state_mut().open_bytes("second.pdf", None, pdf()).unwrap();
+ let ids: Vec<_> = h.state().views.iter().map(|v| v.id).collect();
+ h.state_mut().session.apply(ids[0], pdfcraft_engine::Edit::SetInfo { key: "Title".into(), value: "Keep existing edits".into() }).unwrap();
+ assert!(h.state().session.get(ids[0]).unwrap().dirty);
+ assert!(h.state().session.get(ids[0]).unwrap().can_undo().is_some());
+ let saved: Vec<_> = ids.iter().map(|id| h.state_mut().session.save_bytes(*id).unwrap()).collect();
+ let before: Vec<_> = h
+ .state()
+ .views
+ .iter()
+ .map(|v| {
+ let d = h.state().session.get(v.id).unwrap();
+ (
+ d.bytes.clone(),
+ d.dirty,
+ d.can_undo().map(str::to_owned),
+ d.can_redo().map(str::to_owned),
+ d.info.pages.iter().map(|p| (p.width, p.height, p.rotation)).collect::>(),
+ )
+ })
+ .collect();
+ h.state_mut().set_option("dialog", "preferences").unwrap();
+ h.run_steps(3);
+ let checkbox = h.get_by_label("Show Page Edge Shadows");
+ checkbox.click();
+ h.run_steps(2);
+ assert_eq!(serde_json::from_str::(&h.state().persist()).unwrap()["show_page_edge_shadows"], false);
+ h.get_by_label("Show Page Edge Shadows").focus();
+ h.key_press(egui::Key::Space);
+ h.run_steps(2);
+ assert_eq!(serde_json::from_str::(&h.state().persist()).unwrap()["show_page_edge_shadows"], true);
+ let dialog_shadow = h.ctx.global_style().visuals.window_shadow;
+ assert_ne!(dialog_shadow, egui::Shadow::NONE);
+ h.state_mut().set_option("show_page_edge_shadows", "false").unwrap();
+ h.run_steps(2);
+ assert_eq!(h.ctx.global_style().visuals.window_shadow, dialog_shadow);
+ h.state_mut().set_option("dialog", "none").unwrap();
+ for tab in [0, 1] {
+ h.state_mut().active = Some(tab);
+ h.run_steps(2);
+ assert!(shadows(&h, false).is_empty());
+ let d = h.state().session.get(h.state().views[tab].id).unwrap();
+ assert_eq!(
+ (&d.bytes, d.dirty, d.can_undo(), d.can_redo()),
+ (&before[tab].0, before[tab].1, before[tab].2.as_deref(), before[tab].3.as_deref())
+ );
+ assert_eq!(d.info.pages.iter().map(|p| (p.width, p.height, p.rotation)).collect::>(), before[tab].4);
+ }
+ for (id, bytes) in ids.iter().zip(&saved) {
+ assert_eq!(h.state_mut().session.save_bytes(*id).unwrap(), *bytes);
+ }
+ h.state_mut().open_bytes("new.pdf", None, pdf()).unwrap();
+ h.run_steps(2);
+ assert!(shadows(&h, false).is_empty());
+}
+
+#[test]
+fn rendered_page_content_is_identical_with_and_without_decoration() {
+ let mut h = harness("dark");
+ h.state_mut().set_option("panel", "pages").unwrap();
+ h.state_mut().set_option("zoom", "175").unwrap();
+ h.run_steps(3);
+ scroll_down(&mut h, 20.0);
+ for _ in 0..400 {
+ h.run_steps(2);
+ if !h.state().render_pending() {
+ break;
+ }
+ std::thread::sleep(std::time::Duration::from_millis(5));
+ }
+ assert!(!h.state().render_pending(), "the actual PDF raster must be ready");
+ let rect = h.state().views[0].page_screen_rect(0).unwrap();
+ let fades = viewport_fades(&h);
+ assert_eq!(fades.iter().filter(|r| r.height() <= 21.0).count(), 2, "the screenshot comparison must contain both vertical fades");
+ let enabled = h.render().unwrap();
+ h.state_mut().set_option("show_page_edge_shadows", "false").unwrap();
+ h.run_steps(2);
+ let disabled = h.render().unwrap();
+ assert_eq!(h.state().views[0].page_screen_rect(0), Some(rect));
+ let viewport = h.state().views[0].viewport_rect();
+ assert!(viewport_fades(&h).is_empty());
+ // Only the painter's actual decorative fade strips may change over the page.
+ // All remaining artwork, annotation and form pixels must be identical.
+ for (_, page) in h.state().views[0].visible_page_rects() {
+ let visible = page.intersect(viewport).shrink(2.0);
+ if !visible.is_positive() {
+ continue;
+ }
+ for y in visible.top().ceil() as u32..visible.bottom().floor() as u32 {
+ for x in visible.left().ceil() as u32..visible.right().floor() as u32 {
+ if !fades.iter().any(|fade| fade.expand(1.0).contains(egui::pos2(x as f32, y as f32))) {
+ assert_eq!(enabled.get_pixel(x, y), disabled.get_pixel(x, y), "page content at {x},{y}");
+ }
+ }
+ }
+ }
+ // The top overlaps the first page's blue artwork; the bottom overlaps the
+ // blank second page. Sample clear of the unchanged scrollbar at the edge.
+ let x = rect.intersect(viewport).center().x as u32;
+ for (y, expected) in [(viewport.top() + 8.0, [204, 230, 255, 255]), (viewport.bottom() - 10.0, [255, 255, 255, 255])] {
+ assert_eq!(disabled.get_pixel(x, y as u32).0, expected, "unobscured PDF at y={y}");
+ assert_ne!(enabled.get_pixel(x, y as u32).0, expected, "fade overlays the PDF at y={y}");
+ }
+ // The Pages sidebar, including its thumbnails and selection borders, is unaffected.
+ for y in 0..enabled.height() {
+ for x in (0..viewport.left().floor() as u32).chain(viewport.right().ceil() as u32..enabled.width()) {
+ assert_eq!(enabled.get_pixel(x, y), disabled.get_pixel(x, y), "sidebar at {x},{y}");
+ }
+ }
+ assert_ne!(enabled.as_raw(), disabled.as_raw(), "the decoration really changes the image");
+ if let Ok(directory) = std::env::var("PDFCRAFT_SHADOW_SCREENSHOTS") {
+ enabled.save(format!("{directory}/page-shadows-enabled.png")).unwrap();
+ disabled.save(format!("{directory}/page-shadows-disabled.png")).unwrap();
+ }
+}
+
+fn harness(theme: &str) -> Harness<'static, PdfCraftApp> {
+ let theme = theme.to_string();
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.set_option("theme", &theme).unwrap();
+ app.open_bytes("pages.pdf", None, pdf()).unwrap();
+ app.set_option("zoom", "100").unwrap();
+ app
+ });
+ h.run_steps(3);
+ h
+}
+
+fn shadows(h: &Harness<'static, PdfCraftApp>, grid: bool) -> Vec {
+ let color = pdfcraft_ui_egui::theme::Tokens::for_kind(h.state().theme).page_shadow;
+ fn collect(shape: &egui::Shape, color: egui::Color32, grid: bool, out: &mut Vec) {
+ match shape {
+ egui::Shape::Vec(shapes) => {
+ for s in shapes {
+ collect(s, color, grid, out);
+ }
+ }
+ egui::Shape::Rect(r)
+ if r.fill == color
+ && r.rect.width() > 20.0
+ && r.rect.height() > 20.0
+ && if grid {
+ r.blur_width == 0.0 && r.corner_radius == egui::CornerRadius::same(1)
+ } else {
+ r.blur_width == 14.0 && r.corner_radius == egui::CornerRadius::ZERO
+ } =>
+ {
+ out.push(r.rect)
+ }
+ _ => {}
+ }
+ }
+ let mut out = Vec::new();
+ for s in &h.output().shapes {
+ collect(&s.shape, color, grid, &mut out);
+ }
+ out
+}
+
+/// Synthetic pages include colored artwork, an annotation and a form field.
+fn pdf() -> Vec {
+ let objects = [
+ "<< /Type /Catalog /Pages 2 0 R /AcroForm << /Fields [7 0 R] >> >>".to_string(),
+ "<< /Type /Pages /Kids [3 0 R 4 0 R 5 0 R] /Count 3 /MediaBox [0 0 300 400] >>".to_string(),
+ "<< /Type /Page /Parent 2 0 R /Contents 8 0 R /Annots [6 0 R 7 0 R] >>".to_string(),
+ "<< /Type /Page /Parent 2 0 R >>".to_string(),
+ "<< /Type /Page /Parent 2 0 R >>".to_string(),
+ "<< /Type /Annot /Subtype /Text /Rect [20 20 40 40] /Contents (Note) >>".to_string(),
+ "<< /Type /Annot /Subtype /Widget /FT /Tx /T (field) /V (value) /Rect [50 50 100 70] /P 3 0 R >>".to_string(),
+ {
+ let body = "0.8 0.9 1 rg 0 0 300 400 re f 0.3 g 10 10 280 8 re f";
+ format!("<< /Length {} >>\nstream\n{body}\nendstream", body.len())
+ },
+ ];
+ let mut bytes = b"%PDF-1.7\n".to_vec();
+ let mut offsets = Vec::new();
+ for (i, object) in objects.iter().enumerate() {
+ offsets.push(bytes.len());
+ bytes.extend_from_slice(format!("{} 0 obj\n{object}\nendobj\n", i + 1).as_bytes());
+ }
+ let xref = bytes.len();
+ bytes.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f \n", objects.len() + 1).as_bytes());
+ for offset in offsets {
+ bytes.extend_from_slice(format!("{offset:010} 00000 n \n").as_bytes());
+ }
+ bytes.extend_from_slice(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).as_bytes());
+ bytes
+}
+
+#[test]
+fn page_shadow_preference_round_trips_and_ignores_invalid_settings() {
+ let mut app = PdfCraftApp::new();
+ let enabled = |app: &PdfCraftApp| serde_json::from_str::(&app.persist()).unwrap()["show_page_edge_shadows"].clone();
+ assert_eq!(enabled(&app), true);
+ app.restore("{}");
+ assert_eq!(enabled(&app), true);
+ for value in [false, true] {
+ app.set_option("show_page_edge_shadows", if value { "true" } else { "false" }).unwrap();
+ let mut restored = PdfCraftApp::new();
+ restored.restore(&app.persist());
+ assert_eq!(enabled(&restored), value);
+ }
+ for invalid in ["null", "0", "\"false\"", "[]", "{}"] {
+ app.restore(&format!("{{\"show_page_edge_shadows\":{invalid}}}"));
+ assert_eq!(enabled(&app), true);
+ }
+ app.restore("not json");
+ assert_eq!(enabled(&app), true);
+ assert!(app.set_option("show_page_edge_shadows", "maybe").is_err());
+ assert_eq!(enabled(&app), true);
+}
diff --git a/docs/roadmap.md b/docs/roadmap.md
index 04103fb632..354689402b 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -1,6 +1,6 @@
# PdfCraft roadmap: milestones and what's next
-> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
+> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-13 · **Change:** minor (M3 #1577: optional page-edge shadows and viewport-edge fades; earlier: M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M4: Extract and Split preserve shared Type 3 glyph resources; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M2: packed TIFF-predictor RGB rows retain their byte boundaries; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M3 #1364 candidate: consent before absolute local GoToR access; estimates unchanged); earlier: minor (M1 #1339: unchanged incremental saves of a classic cross-reference table write a zero-length subsection; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
@@ -90,7 +90,7 @@ total matches the parity estimate.
| M1 | COS: filters, crypt, parser, xref, writer | 120–200 | 80% | 20–40 | Done: - filters and crypt: every standard-security revision R2–R6 (RC4, AES-128/256), SASLprep, permissions, creating encryption; - cos: parse and repair (including invalid xref object-number ranges), decoded-stream limits including unfiltered data, decrypt on load, re-encrypt on save, incremental and full writing. Corpus: open/edit/save passes on 958 files, and all 7 password-protected files open. Full saves now pack objects into compressed object streams. An unchanged incremental save of a classic table writes a zero-length cross-reference subsection instead of a section with no subsections (#1339). Fuzzing runs nightly (`xtask fuzz`). Missing: ≥ 250 tests, own image codecs |
| M2 | Model, render, text | 200–350 | 15% | 130–230 | hayro bootstrap renderer (vendored patches); inspector predictor scratch is bounded by available input, and JPX sample rescaling handles 1–32 bits safely. Text extraction reaches word-F1 0.98 against pdftotext. Short same-line redraws split before placement rather than interleaving. Missing: model crate, fonts, DisplayList, renderer independent of hayro. Inspector page-label traversal and output are resource-bounded, with physical-number fallback warnings. Packed TIFF-predictor RGB rows retain later rows in decoding and rendering. |
| M2 | Model, render, text | 200–350 | 15% | 130–230 | hayro bootstrap renderer (vendored patches); inspector predictor scratch is bounded by available input, and JPX sample rescaling handles 1–32 bits safely. Text extraction reaches word-F1 0.98 against pdftotext. Short same-line redraws split before placement rather than interleaving. Missing: model crate, fonts, DisplayList, renderer independent of hayro. Inspector page-label traversal and output are resource-bounded, with physical-number fallback warnings |
-| M3 | Viewer app (native + web) | 80–150 | 90% | 10–20 | Acrobat-style shell, find, select, panels, tiles, web build, UI control channel for agents (opt-in). Missing: 60 fps test on a 500-page document, snapshot tests of every panel Done since: fit visible, document title in the window; Linux middle-button scrolling; shared three-state theme preferences in the toolbar, View menu and control channel; numeric Linux portal events and idle wakeups completing #881, with native appearance inheritance retained (#446); late browser startup downloads preserve the current document and Save target (#171). #1364 candidate: absolute local GoToR links ask before target access; headless callers explicitly opt in. |
+| M3 | Viewer app (native + web) | 80–150 | 90% | 10–20 | Acrobat-style shell, find, select, panels, tiles, web build, UI control channel for agents (opt-in). Missing: 60 fps test on a 500-page document, snapshot tests of every panel Done since: fit visible, document title in the window; Linux middle-button scrolling; shared three-state theme preferences in the toolbar, View menu and control channel; numeric Linux portal events and idle wakeups completing #881, with native appearance inheritance retained (#446); late browser startup downloads preserve the current document and Save target (#171). #1364 candidate: absolute local GoToR links ask before target access; headless callers explicitly opt in. Preferences ▸ Appearance can hide decorative page-edge shadows and viewport-edge fades in the viewer and Organize grid (#1577); enabled by default, persisted app-wide and exposed through UI control. |
| M2 | Model, render, text | 200–350 | 15% | 130–230 | hayro bootstrap renderer (vendored patches); inspector predictor scratch is bounded by available input, and JPX sample rescaling handles 1–32 bits safely. Text extraction reaches word-F1 0.98 against pdftotext. Short same-line redraws split before placement rather than interleaving. A custom text match that ends on a reconstructed separator stops before the next glyph (#1315). Missing: model crate, fonts, DisplayList, renderer independent of hayro. Inspector page-label traversal and output are resource-bounded, with physical-number fallback warnings |
| M2 | Model, render, text | 200–350 | 15% | 130–230 | hayro bootstrap renderer (vendored patches); Lab Bradford adaptation uses LMS white-point ratios, covered by independent neutral/chromatic and direct/Indexed render oracles; inspector predictor scratch is bounded by available input, and JPX sample rescaling handles 1–32 bits safely. Text extraction reaches word-F1 0.98 against pdftotext. Short same-line redraws split before placement rather than interleaving. Missing: model crate, fonts, DisplayList, renderer independent of hayro. Inspector page-label traversal and output are resource-bounded, with physical-number fallback warnings |
| M3 | Viewer app (native + web) | 80–150 | 90% | 10–20 | Acrobat-style shell, find, select, panels, tiles, web build, UI control channel for agents (opt-in). Missing: 60 fps test on a 500-page document, snapshot tests of every panel Done since: fit visible, document title in the window; Linux middle-button scrolling; shared three-state theme preferences in the toolbar, View menu and control channel; numeric Linux portal events and idle wakeups completing #881, with native appearance inheritance retained (#446); late browser startup downloads preserve the current document and Save target (#171). |
@@ -161,6 +161,7 @@ M2 (renderer), M7 (content editing), M10 (OCR and Office), M11 (Preflight and st
| Date | Change | Summary |
|---|---|---|
+| 2026-10-13 | minor | M3 #1577: optional decorative page-edge shadows and viewport-edge fades; no PDF-content or readiness-percentage change. |
| 2026-10-12 | minor | M13: CLI check directory identity, with overlap and symlink regressions; estimates unchanged |
| 2026-10-12 | minor | M4: shared Type 3 glyph resources survive extraction, with save/reopen and independent raster regressions; estimates unchanged |
| 2026-10-12 | minor | M2: packed TIFF-predictor RGB row boundaries, with decoding and page-render regressions; estimates unchanged |
diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml
index 8f4194b932..d527dadf7f 100644
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@ -9792,8 +9792,8 @@ milestone = "M14"
status = "partial"
commands = []
tools = []
-evidence = ["crates/ui-egui/tests/view.rs::default_page_display_is_used_for_new_documents", "crates/ui-egui/tests/view.rs::default_zoom_is_used_for_new_documents", "crates/ui-egui/tests/view.rs::preferences_set_the_default_zoom"]
-notes = "Preferences ▸ Documents and view: Default page display and Default zoom (Fit to width, Zoom to page level or a percentage) for every new tab; a PDF that asks for a layout or zoom gets it. Missing: Acrobat's resolution, rendering and page-content options"
+evidence = ["crates/ui-egui/tests/page_shadows.rs::viewport_fades_follow_the_preference_and_keep_other_scroll_areas_styled", "crates/ui-egui/tests/page_shadows.rs::rendered_page_content_is_identical_with_and_without_decoration", "crates/ui-egui/tests/page_shadows.rs::page_shadow_preference_round_trips_and_ignores_invalid_settings", "crates/ui-egui/tests/page_shadows.rs::viewer_shadows_follow_the_preference_without_moving_pages", "crates/ui-egui/tests/page_shadows.rs::organize_shadows_follow_the_preference", "crates/ui-egui/tests/control.rs::page_shadows_are_an_observable_app_wide_preference", "crates/ui-egui/tests/view.rs::default_page_display_is_used_for_new_documents", "crates/ui-egui/tests/view.rs::default_zoom_is_used_for_new_documents", "crates/ui-egui/tests/view.rs::preferences_set_the_default_zoom"]
+notes = "Preferences ▸ Documents and view: Default page display and Default zoom (Fit to width, Zoom to page level or a percentage) for every new tab; a PDF that asks for a layout or zoom gets it. Preferences ▸ Appearance also has an app-wide, persistent Show Page Edge Shadows checkbox (on by default), exposed through ui.set and ui.state; it affects viewer and Organize decorations, including the viewport-edge gradients painted over pages, only. Missing: Acrobat's resolution, rendering and page-content options"
[[feature]]
id = "misc.prefs-documents"
From fc14719dff434e692123cb19b8c94e07a2d314cc Mon Sep 17 00:00:00 2001
From: FredApps <153173854+FredApps@users.noreply.github.com>
Date: Tue, 13 Oct 2026 19:18:41 +0200
Subject: [PATCH 004/462] feat(forms): edit checkbox and radio export values
(#231)
---
ROADMAP.md | 2 ++
crates/automation/README.md | 12 ++++++++
crates/automation/src/forms.rs | 17 +++++++++-
crates/automation/src/tools.rs | 4 ++-
crates/automation/tests/form_bulk.rs | 23 ++++++++++++++
crates/forms/README.md | 13 ++++++++
crates/forms/src/author.rs | 46 ++++++++++++++++++++++++++++
crates/forms/src/lib.rs | 9 ++++++
crates/forms/src/tests.rs | 39 +++++++++++++++++++++++
crates/ui-egui/src/prepare.rs | 8 ++++-
crates/ui-egui/tests/prepare.rs | 33 ++++++++++++++++++++
crates/xfdf/src/lib.rs | 13 +++++---
crates/xfdf/src/tests.rs | 33 ++++++++++++++++++++
parity/acrobat-features.toml | 4 +--
14 files changed, 246 insertions(+), 10 deletions(-)
diff --git a/ROADMAP.md b/ROADMAP.md
index a035c9bf35..3013de8b1a 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,5 +1,7 @@
# PdfCraft roadmap
+> **Last reviewed:** 2026-10-13 · **Last updated:** 2026-10-13 · **Change:** minor (M6 #231: edit checkbox/radio export values through individual field properties and automation, preserving selection and appearance; headless regression coverage, desktop visual verification pending; estimates unchanged)
+
**Stage: alpha** · next: beta, ~26% (ready for real work 49% → 75%) and ~400–700 h away
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
diff --git a/crates/automation/README.md b/crates/automation/README.md
index f2e4ec9282..f20ad35ea1 100644
--- a/crates/automation/README.md
+++ b/crates/automation/README.md
@@ -184,3 +184,15 @@ unapplied with a warning.
`doc_batch` runs conversion, OCR and compression over files and optionally recursive
folders. The CLI also exposes it as `pdfcraft-cli batch`. See the
[batch guide](../../docs/cli-batch.md) for examples, output protection, errors and limits.
+
+## Editing button export values
+
+Use `form_set_props` with `field`, `export_value` and optional `widget`
+(1-based, default 1) to change a checkbox or radio button export value.
+`form_fields` returns `export_values` in widget order. The selected/default
+appearance states are preserved; the operation is undoable and survives saving.
+Widgets sharing an appearance state keep one export value. Bulk edits are not
+supported for this widget-specific property. Empty values, `Off`, conflicting
+choices and values over 4096 UTF-8 bytes return an error.
+
+Example: `form_set_props doc=1 field=agree export_value=Accepted widget=1`.
diff --git a/crates/automation/src/forms.rs b/crates/automation/src/forms.rs
index 7c60425a8c..6089d5a36a 100644
--- a/crates/automation/src/forms.rs
+++ b/crates/automation/src/forms.rs
@@ -232,6 +232,9 @@ impl Automation {
if !f.actions.unsupported.is_empty() {
o.insert("unsupported_scripts".into(), json!(f.actions.unsupported));
}
+ if matches!(f.kind, FormFieldKind::CheckBox | FormFieldKind::Radio) {
+ o.insert("export_values".into(), json!((0..f.widgets.len()).map(|i| f.export_of(i)).collect::>()));
+ }
match f.kind {
FormFieldKind::Radio => {
o.insert("options".into(), json!((0..f.widgets.len()).filter_map(|i| f.export_of(i)).collect::>()));
@@ -327,6 +330,9 @@ impl Automation {
}
pub(crate) fn form_set_props(&mut self, a: &Args) -> Result {
+ if a.get("widget").is_some() && a.get("export_value").is_none() {
+ return Err(bad("widget requires export_value"));
+ }
let single = a.opt_str("field")?;
let bulk = a.get("fields").is_some();
if single.is_some() == bulk {
@@ -344,7 +350,7 @@ impl Automation {
return Err(bad(format!("field {name:?} is listed more than once")));
}
}
- for key in ["name", "rect", "rotation"] {
+ for key in ["name", "rect", "rotation", "export_value", "widget"] {
if a.get(key).is_some() {
return Err(bad(format!("{key} applies to one field; use field instead of fields")));
}
@@ -396,6 +402,15 @@ impl Automation {
};
Ok(FieldProps {
rect,
+ export_value: a
+ .opt_str("export_value")?
+ .map(|value| -> Result<_> {
+ let index = a.opt_int("widget")?.unwrap_or(1);
+ let index =
+ usize::try_from(index).ok().and_then(|n| n.checked_sub(1)).ok_or_else(|| bad("widget must be a positive 1-based index"))?;
+ Ok((index, value.to_owned()))
+ })
+ .transpose()?,
name: a.opt_str("name")?.map(str::to_owned),
tooltip: a.opt_str("tooltip")?.map(str::to_owned),
read_only: a.opt_bool("read_only")?,
diff --git a/crates/automation/src/tools.rs b/crates/automation/src/tools.rs
index cfdeb1c16f..be85f00077 100644
--- a/crates/automation/src/tools.rs
+++ b/crates/automation/src/tools.rs
@@ -364,7 +364,7 @@ pub fn tools() -> Vec {
t(
"form_set_props",
"Field properties",
- "Change field properties: give field for one field, or fields for a list of unique field names (1–1000). A bulk change is atomic and one Undo step; an invalid or locked field leaves every field unchanged. Only the given properties change, and partial appearance changes preserve each field's other colours and font. name (rename), rect (position) and rotation require a single field. General and Options: tooltip, read_only, required, multiline, max_length (0 = no limit), options (combo/list items), font_size (0 = auto), format, validate, calculate (Acrobat's native AF rules). Options: align (left, center, right), default (Reset form's value; check boxes/radio buttons use their on state, \"\" for off), flags { scroll, rich_text, password, file_select, spell_check, comb (needs max_length), sort, editable, multi_select, commit_immediately }, check_style (check boxes/radio buttons: check, circle, cross, diamond, square, star). rotation is 0, 90, 180 or 270 degrees counterclockwise and swaps width/height when the axis changes. Undoable.",
+ "Change field properties: give field for one field, or fields for a list of unique field names (1–1000). A bulk change is atomic and one Undo step; an invalid or locked field leaves every field unchanged. Only the given properties change, and partial appearance changes preserve each field's other colours and font. name (rename), rect (position), rotation and export_value require a single field. export_value edits a checkbox or radio widget (widget: 1-based, default 1), preserving its selected/default state; widgets sharing that state keep the same export value. General and Options: tooltip, read_only, required, multiline, max_length (0 = no limit), options (combo/list items), font_size (0 = auto), format, validate, calculate (Acrobat's native AF rules). Options: align (left, center, right), default (Reset form's value; check boxes/radio buttons use their on state, \"\" for off), flags { scroll, rich_text, password, file_select, spell_check, comb (needs max_length), sort, editable, multi_select, commit_immediately }, check_style (check boxes/radio buttons: check, circle, cross, diamond, square, star). rotation is 0, 90, 180 or 270 degrees counterclockwise and swaps width/height when the axis changes. Undoable.",
)
.with({
let mut input = schema(
@@ -373,6 +373,8 @@ pub fn tools() -> Vec {
"field": { "type": "string", "description": "The field's current name." },
"fields": { "type": "array", "items": { "type": "string" }, "minItems": 1, "maxItems": 1000, "uniqueItems": true, "description": "Apply the same changes to these fields in one atomic edit. Use either field or fields." },
"name": { "type": "string" },
+ "export_value": { "type": "string", "minLength": 1, "description": "Checkbox/radio export value; not Off; at most 4096 UTF-8 bytes." },
+ "widget": { "type": "integer", "minimum": 1, "description": "1-based widget for export_value (default 1)." },
"tooltip": { "type": "string" },
"read_only": { "type": "boolean" },
"required": { "type": "boolean" },
diff --git a/crates/automation/tests/form_bulk.rs b/crates/automation/tests/form_bulk.rs
index 8b8904c974..4296cbc891 100644
--- a/crates/automation/tests/form_bulk.rs
+++ b/crates/automation/tests/form_bulk.rs
@@ -151,3 +151,26 @@ fn bulk_options_apply_per_field_and_refuse_an_invalid_comb_atomically() {
assert_eq!(bytes(&a, id), before);
std::fs::remove_dir_all(dir).unwrap();
}
+
+#[test]
+fn button_export_edit_is_one_undo_step_and_survives_save() {
+ let (mut a, id, dir) = setup("button-export");
+ tool(&mut a, "form_add_field", json!({"doc": id, "page": 1, "type": "checkbox", "name": "agree", "rect": [20, 20, 40, 40]}));
+ tool(&mut a, "form_fill", json!({"doc": id, "values": {"agree": true}}));
+ let before = bytes(&a, id);
+ call(&mut a, json!({"doc": id, "field": "agree", "export_value": "Accepted", "widget": 1}));
+ let f = tool(&mut a, "form_fields", json!({"doc": id}));
+ let check = f["fields"].as_array().unwrap().iter().find(|f| f["name"] == "agree").unwrap();
+ assert_eq!(check["export_values"], json!(["Accepted"]));
+ assert_eq!(check["value"], true);
+ tool(&mut a, "edit_undo", json!({"doc": id}));
+ assert_eq!(bytes(&a, id), before);
+ tool(&mut a, "edit_redo", json!({"doc": id}));
+ tool(&mut a, "doc_save", json!({"doc": id, "path": "saved.pdf"}));
+ let reopened = tool(&mut a, "doc_open", json!({"path": "saved.pdf"}))["doc"].as_u64().unwrap();
+ let f = tool(&mut a, "form_fields", json!({"doc": reopened}));
+ let check = f["fields"].as_array().unwrap().iter().find(|f| f["name"] == "agree").unwrap();
+ assert_eq!(check["export_values"], json!(["Accepted"]));
+ assert_eq!(check["value"], true);
+ std::fs::remove_dir_all(dir).unwrap();
+}
diff --git a/crates/forms/README.md b/crates/forms/README.md
index 3280cc2431..bc8e19fc95 100644
--- a/crates/forms/README.md
+++ b/crates/forms/README.md
@@ -57,6 +57,19 @@ delete_field(&mut doc, "email")?;
buttons joining a group become kid widgets with their own export state. Renaming changes only
the last part of a dotted name.
+## Button export values
+
+`FieldProps::export_value = Some((widget_index, value))` edits a checkbox or radio
+button's export value. The API index is zero-based. It writes a complete `/Opt`
+mapping, preserving appearance names, selected states and reset defaults; an
+export-only change leaves custom appearance streams intact. Widgets sharing an
+appearance state keep the same export value. Conflicting shared-state mappings,
+ambiguous choices, invalid widget indices, empty values, `Off`, and values over
+4096 UTF-8 bytes are refused.
+
+`Field::export_values` resolves button values for data exchange. An unchecked
+button still exports as `Off` in the data formats.
+
## Not yet
Rich-text values and exact appearance metrics/layout remain incomplete. JavaScript
diff --git a/crates/forms/src/author.rs b/crates/forms/src/author.rs
index 6d49be1001..a8c99cb483 100644
--- a/crates/forms/src/author.rs
+++ b/crates/forms/src/author.rs
@@ -68,6 +68,9 @@ pub struct FieldProps {
pub max_len: Option>,
/// Choice options (display texts; export values equal them).
pub options: Option>,
+ /// Change one button widget's export value without changing its appearance state.
+ /// Widgets sharing that state are kept in sync. The index is zero-based.
+ pub export_value: Option<(usize, String)>,
/// Font size (0 = auto).
pub font_size: Option,
/// Position: move or resize one widget (its index in [`Field::widgets`]) to a new rect in
@@ -845,6 +848,36 @@ fn swapped_around_center(r: [f64; 4]) -> Option<[f64; 4]> {
(out.iter().all(|v| v.is_finite()) && out[2] - out[0] >= 4.0 && out[3] - out[1] >= 4.0).then_some(out)
}
+/// Build a complete /Opt mapping before modifying the document. Appearance names,
+/// /V and /DV stay untouched, so an export-value edit does not change selection.
+fn button_export_options(f: &Field, index: usize, value: &str) -> Result, FormError> {
+ if !matches!(f.kind, FieldKind::CheckBox | FieldKind::Radio) {
+ return invalid("only check boxes and radio buttons have an export value");
+ }
+ if value.is_empty() || value == "Off" || value.len() > 4096 {
+ return invalid("export value must be non-empty, at most 4096 bytes, and not Off");
+ }
+ let widget = f.widgets.get(index).ok_or_else(|| FormError::Invalid("button widget index is out of range".into()))?;
+ let state = widget.on_state.as_deref().ok_or_else(|| FormError::Invalid("button has no on appearance state".into()))?;
+ if !f.options.is_empty() && f.options.len() != f.widgets.len() {
+ return invalid("button export options do not match its widgets");
+ }
+ let previous = f.export_of(index);
+ let mut out = Vec::with_capacity(f.widgets.len());
+ for (i, w) in f.widgets.iter().enumerate() {
+ let export = f.export_of(i).ok_or_else(|| FormError::Invalid("button has no on appearance state".into()))?;
+ let same_state = w.on_state.as_deref() == Some(state);
+ if !same_state && (export == value || w.on_state.as_deref() == Some(value)) {
+ return invalid("export value conflicts with another button choice");
+ }
+ if same_state && Some(export) != previous {
+ return invalid("widgets with the same appearance state have conflicting export values");
+ }
+ out.push(Object::String(PdfString::text(if same_state { value } else { export })));
+ }
+ Ok(out)
+}
+
/// Change a field's properties (General and Options tabs) and redraw it.
pub fn set_props(doc: &mut Document, name: &str, props: &FieldProps) -> Result {
if props.font_size.is_some_and(|size| !size.is_finite() || size < 0.0) {
@@ -858,6 +891,10 @@ pub fn set_props(doc: &mut Document, name: &str, props: &FieldProps) -> Result> = None;
@@ -879,6 +916,12 @@ pub fn set_props(doc: &mut Document, name: &str, props: &FieldProps) -> Result Result Vec {
+ if matches!(self.kind, FieldKind::CheckBox | FieldKind::Radio) {
+ self.value.iter().map(|v| self.export_for_state(v).to_string()).collect()
+ } else {
+ self.value.clone()
+ }
+ }
+
/// The value as one string: text, the state name, or the selected display texts.
pub fn display_value(&self) -> String {
match self.kind {
diff --git a/crates/forms/src/tests.rs b/crates/forms/src/tests.rs
index 0256bfafb9..e3fa748651 100644
--- a/crates/forms/src/tests.rs
+++ b/crates/forms/src/tests.rs
@@ -1943,3 +1943,42 @@ fn page_shapes_closes_only_last_stroked_subpath_but_all_filled_subpaths() {
assert_eq!(filled.boxes, [[50.0, 100.0, 170.0, 140.0], [200.0, 100.0, 320.0, 140.0]]);
assert!(filled.rules.is_empty());
}
+
+#[test]
+fn editing_button_export_values_preserves_selection_and_appearance() {
+ let mut doc = fixture();
+ set_value(&mut doc, "size", &FieldValue::Radio(Some("S".into()))).unwrap();
+ let before = field(&fields(&doc), "size").clone();
+ let appearances: Vec<_> = before.widgets.iter().map(|w| doc.get(w.obj).as_dict().unwrap().get(b"AP").cloned()).collect();
+ set_props(&mut doc, "size", &FieldProps { export_value: Some((0, "Small å".into())), ..Default::default() }).unwrap();
+ let after = field(&fields(&doc), "size").clone();
+ assert_eq!(after.value, before.value);
+ assert_eq!(after.default, before.default);
+ assert_eq!(after.widgets, before.widgets);
+ assert_eq!(after.export_of(0), Some("Small å"));
+ assert_eq!(after.export_of(1), before.export_of(1));
+ assert_eq!(after.export_values(), vec!["Small å"]);
+ assert_eq!(appearances, after.widgets.iter().map(|w| doc.get(w.obj).as_dict().unwrap().get(b"AP").cloned()).collect::>());
+ let mut saved = reopen(&doc);
+ assert_eq!(field(&fields(&saved), "size").export_of(0), Some("Small å"));
+ set_value(&mut saved, "size", &FieldValue::Radio(Some("Small å".into()))).unwrap();
+ reset(&mut saved, None).unwrap();
+ assert_eq!(field(&fields(&saved), "size").value, before.default);
+
+ set_value(&mut doc, "agree", &FieldValue::Check(true)).unwrap();
+ set_props(&mut doc, "agree", &FieldProps { export_value: Some((0, "Accepted".into())), ..Default::default() }).unwrap();
+ let check = field(&fields(&doc), "agree").clone();
+ assert_eq!(check.value, vec!["Yes"]);
+ assert_eq!(check.export_values(), vec!["Accepted"]);
+ assert_eq!(field(&fields(&reopen(&doc)), "agree").export_of(0), Some("Accepted"));
+}
+
+#[test]
+fn invalid_button_export_edits_leave_document_unchanged() {
+ let mut doc = fixture();
+ let before = write_incremental(&doc, &SaveOptions::default()).unwrap();
+ for (field_name, index, value) in [("size", 99, "new"), ("size", 0, ""), ("size", 0, "Off"), ("size", 0, "L"), ("name", 0, "new")] {
+ assert!(set_props(&mut doc, field_name, &FieldProps { export_value: Some((index, value.into())), ..Default::default() }).is_err());
+ assert_eq!(write_incremental(&doc, &SaveOptions::default()).unwrap(), before);
+ }
+}
diff --git a/crates/ui-egui/src/prepare.rs b/crates/ui-egui/src/prepare.rs
index 37747f14c7..762d090254 100644
--- a/crates/ui-egui/src/prepare.rs
+++ b/crates/ui-egui/src/prepare.rs
@@ -758,6 +758,7 @@ pub struct FieldDraft {
pub default: String,
/// Check boxes and radio buttons: this widget's "on" state (export value).
pub on_state: String,
+ pub export_value: String,
/// 0 = auto.
pub font_size: f64,
/// Left, bottom, width, height in points.
@@ -824,6 +825,7 @@ impl FieldDraft {
quadding: f.quadding,
default: f.default.first().cloned().unwrap_or_default(),
on_state: f.widgets.get(widget).and_then(|w| w.on_state.clone()).unwrap_or_default(),
+ export_value: f.export_of(widget).unwrap_or_default().to_string(),
font_size: da_size(&f.da),
position: [r[0], r[1], r[2] - r[0], r[3] - r[1]],
rotation: f.widgets.get(widget).map(|w| w.rotation).unwrap_or(0),
@@ -877,6 +879,7 @@ impl FieldDraft {
multiline: ch(self.multiline, o.multiline),
max_len: ((self.limit, self.max_len) != (o.limit, o.max_len)).then_some((self.limit && self.max_len > 0).then_some(self.max_len)),
options: (self.options != o.options).then(|| self.options.clone()),
+ export_value: (self.export_value != o.export_value).then(|| (self.widget, self.export_value.clone())),
font_size: ((self.font_size - o.font_size).abs() > 1e-6).then_some(self.font_size),
rect: (self.position != o.position).then(|| {
let [x, y, w, h] = self.position;
@@ -1123,7 +1126,10 @@ pub(crate) fn body(ui: &mut egui::Ui, d: &mut FieldDraft, t: &crate::theme::Toke
FormFieldKind::CheckBox | FormFieldKind::Radio => {
use pdfcraft_engine::field_flags as ff;
let on = d.on_state.clone();
- ui.label(crate::i18n::fmt(tl!("Export Value: {on}"), &[("on", &on)]));
+ ui.horizontal(|ui| {
+ let label = ui.label(crate::i18n::fmt(tl!("Export Value: {on}"), &[("on", "")]));
+ ui.text_edit_singleline(&mut d.export_value).labelled_by(label.id);
+ });
let mut checked = !d.default.is_empty() && d.default == on;
let label =
if d.kind == FormFieldKind::CheckBox { tl!("Check box is checked by default") } else { tl!("Button is checked by default") };
diff --git a/crates/ui-egui/tests/prepare.rs b/crates/ui-egui/tests/prepare.rs
index b23f1a9f8f..81359d8bc2 100644
--- a/crates/ui-egui/tests/prepare.rs
+++ b/crates/ui-egui/tests/prepare.rs
@@ -497,3 +497,36 @@ fn actions_tab_adds_and_removes_actions() {
]
);
}
+
+#[test]
+fn button_export_properties_apply_cancel_and_undo() {
+ let mut h = harness();
+ h.state_mut().execute("form.prepare");
+ h.run_steps(2);
+ h.state_mut().open_field_props("agree", 0);
+ h.run_steps(2);
+ h.get_by_label("Options").click();
+ h.run_steps(2);
+ let original = h.state().field_props.as_ref().unwrap().export_value.clone();
+ h.state_mut().field_props.as_mut().unwrap().export_value = "Accepted".into();
+ h.get_by_label("Cancel").click();
+ h.run_steps(2);
+ h.state_mut().open_field_props("agree", 0);
+ h.run_steps(2);
+ assert_eq!(h.state().field_props.as_ref().unwrap().export_value, original);
+ h.state_mut().field_props.as_mut().unwrap().export_value = "Accepted".into();
+ h.get_by_label("OK").click();
+ h.run_steps(3);
+ {
+ let s = h.state();
+ let f = s.session.get(s.views[0].id).unwrap().form.iter().find(|f| f.name == "agree").unwrap();
+ assert_eq!(f.export_of(0), Some("Accepted"));
+ }
+ h.state_mut().execute("edit.undo");
+ h.run_steps(3);
+ {
+ let s = h.state();
+ let f = s.session.get(s.views[0].id).unwrap().form.iter().find(|f| f.name == "agree").unwrap();
+ assert_eq!(f.export_of(0), Some(original.as_str()));
+ }
+}
diff --git a/crates/xfdf/src/lib.rs b/crates/xfdf/src/lib.rs
index d9287101ba..9b1b439caf 100644
--- a/crates/xfdf/src/lib.rs
+++ b/crates/xfdf/src/lib.rs
@@ -420,7 +420,7 @@ fn xfdf_fields(doc: &Document, out: &mut String) {
}
node.values = match f.kind {
FieldKind::CheckBox | FieldKind::Radio if f.value.is_empty() => vec!["Off".into()],
- _ => f.value.clone(),
+ _ => f.export_values(),
};
}
fn write_node(name: &str, node: &Node, out: &mut String) {
@@ -480,7 +480,7 @@ pub fn export_fdf(doc: &Document, comments: bool, fields: bool, file: &str) -> V
body.extend_from_slice(b" /V ");
match f.kind {
FieldKind::CheckBox | FieldKind::Radio => {
- let v = f.value.first().cloned().unwrap_or_else(|| "Off".into());
+ let v = f.export_values().first().cloned().unwrap_or_else(|| "Off".into());
pdfcraft_cos::serialize(&Object::Name(pdfcraft_forms::name_bytes(&v)), &mut body);
}
FieldKind::List if f.value.len() > 1 => {
@@ -575,7 +575,7 @@ pub fn export_data(doc: &Document, format: Format) -> String {
.map(|f| {
let v = match f.kind {
FieldKind::CheckBox | FieldKind::Radio if f.value.is_empty() => "Off".to_string(),
- _ => f.value.join(", "),
+ _ => f.export_values().join(", "),
};
(f.name, v)
})
@@ -984,8 +984,11 @@ pub fn data_values(bytes: &[u8]) -> Result)>, DataError
.into_iter()
.filter(|f| !matches!(f.kind, FieldKind::PushButton | FieldKind::Signature))
.map(|f| {
- let v =
- if matches!(f.kind, FieldKind::CheckBox | FieldKind::Radio) && f.value.is_empty() { vec!["Off".to_string()] } else { f.value };
+ let v = if matches!(f.kind, FieldKind::CheckBox | FieldKind::Radio) && f.value.is_empty() {
+ vec!["Off".to_string()]
+ } else {
+ f.export_values()
+ };
(f.name, v)
})
.collect());
diff --git a/crates/xfdf/src/tests.rs b/crates/xfdf/src/tests.rs
index be747d77e1..d61273f1b5 100644
--- a/crates/xfdf/src/tests.rs
+++ b/crates/xfdf/src/tests.rs
@@ -887,3 +887,36 @@ fn duplicate_xfdf_annotation_flags_do_not_turn_on_unrelated_bits() {
assert_eq!(square.get(b"F").and_then(Object::as_int), Some(expected), "flags={flags}");
}
}
+
+#[test]
+fn edited_button_export_values_round_trip_in_all_data_formats() {
+ use pdfcraft_forms::{FieldProps, set_props};
+ let mut doc = blank();
+ add_field(&mut doc, 0, [80.0, 650.0, 94.0, 664.0], &NewField::Radio { group: Some("Size".into()), export: "S".into() }, None).unwrap();
+ add_field(&mut doc, 0, [100.0, 650.0, 114.0, 664.0], &NewField::Radio { group: Some("Size".into()), export: "L".into() }, None).unwrap();
+ set_props(&mut doc, "Agree", &FieldProps { export_value: Some((0, "Accepted".into())), ..Default::default() }).unwrap();
+ set_props(&mut doc, "Size", &FieldProps { export_value: Some((0, "Small".into())), ..Default::default() }).unwrap();
+ set_value(&mut doc, "Agree", &FieldValue::Check(true)).unwrap();
+ set_value(&mut doc, "Size", &FieldValue::Radio(Some("Small".into()))).unwrap();
+ let doc = Document::open(Arc::new(write_full(&doc, &SaveOptions::default()).unwrap())).unwrap();
+ let mut exports = vec![export_xfdf(&doc, false, true, "").into_bytes(), export_fdf(&doc, false, true, "")];
+ exports.extend([Format::Xml, Format::Csv, Format::Txt].map(|f| export_data(&doc, f).into_bytes()));
+ for (index, bytes) in exports.into_iter().enumerate() {
+ if index < 2 {
+ let values = data_values(&bytes).unwrap();
+ assert_eq!(values.iter().find(|(n, _)| n == "Agree").unwrap().1, vec!["Accepted"]);
+ assert_eq!(values.iter().find(|(n, _)| n == "Size").unwrap().1, vec!["Small"]);
+ } else {
+ // data_values reads XFDF/FDF/PDF; import also handles XML/CSV/TXT.
+ let text = std::str::from_utf8(&bytes).unwrap();
+ assert!(text.contains("Accepted") && text.contains("Small"), "{text}");
+ }
+ let mut target = Document::open(Arc::new(write_full(&doc, &SaveOptions::default()).unwrap())).unwrap();
+ set_value(&mut target, "Agree", &FieldValue::Check(false)).unwrap();
+ set_value(&mut target, "Size", &FieldValue::Radio(Some("L".into()))).unwrap();
+ import(&mut target, &bytes).unwrap();
+ let fs = fields(&target);
+ assert_eq!(fs.iter().find(|f| f.name == "Agree").unwrap().export_values(), vec!["Accepted"]);
+ assert_eq!(fs.iter().find(|f| f.name == "Size").unwrap().export_values(), vec!["Small"]);
+ }
+}
diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml
index 8f4194b932..f5189bc33e 100644
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@ -4896,8 +4896,8 @@ milestone = "M6"
status = "shipped"
commands = ["form.field.properties"]
tools = ["form_set_props"]
-evidence = ["crates/forms/src/tests.rs::properties_rename_and_delete", "crates/automation/tests/automation.rs::preparing_a_form_through_tools", "crates/forms/src/tests.rs::options_tab_flags_alignment_and_defaults", "crates/ui-egui/tests/prepare.rs::options_tab_sets_flags_alignment_and_defaults", "crates/automation/tests/form_bulk.rs::bulk_options_apply_per_field_and_refuse_an_invalid_comb_atomically"]
-notes = "text: alignment, default, multi-line, scroll, rich text flag, limit, password, file selection, spell check, comb; choices: items, default, sort, custom text, multiple selection, commit immediately; check boxes and radios: checked by default, radios in unison. Shared GUI offers applicable text/choice flags, alignment, text limits and check styles; choices/defaults remain individual GUI edits"
+evidence = ["crates/forms/src/tests.rs::properties_rename_and_delete", "crates/automation/tests/automation.rs::preparing_a_form_through_tools", "crates/forms/src/tests.rs::options_tab_flags_alignment_and_defaults", "crates/ui-egui/tests/prepare.rs::options_tab_sets_flags_alignment_and_defaults", "crates/automation/tests/form_bulk.rs::bulk_options_apply_per_field_and_refuse_an_invalid_comb_atomically", "crates/forms/src/tests.rs::editing_button_export_values_preserves_selection_and_appearance", "crates/forms/src/tests.rs::invalid_button_export_edits_leave_document_unchanged", "crates/xfdf/src/tests.rs::edited_button_export_values_round_trip_in_all_data_formats", "crates/automation/tests/form_bulk.rs::button_export_edit_is_one_undo_step_and_survives_save", "crates/ui-egui/tests/prepare.rs::button_export_properties_apply_cancel_and_undo"]
+notes = "text: alignment, default, multi-line, scroll, rich text flag, limit, password, file selection, spell check, comb; choices: items, default, sort, custom text, multiple selection, commit immediately; check boxes and radios: checked by default, radios in unison, individual widget export value via /Opt without changing selection or appearance; XFDF/FDF/XML/CSV/TXT exports use the mapped values. Export editing has headless Apply/Cancel/Undo and save/reopen coverage; desktop typing/appearance has not been visually verified. Shared GUI offers applicable text/choice flags, alignment, text limits and check styles; choices/defaults remain individual GUI edits"
[[feature]]
id = "form.props-actions"
From 0e8d4d70fabbdc4f030af86f801604d1db5766a6 Mon Sep 17 00:00:00 2001
From: FredApps <153173854+FredApps@users.noreply.github.com>
Date: Tue, 13 Oct 2026 19:31:14 +0200
Subject: [PATCH 005/462] test(forms): type export values through the
properties widget
---
crates/ui-egui/tests/prepare.rs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/crates/ui-egui/tests/prepare.rs b/crates/ui-egui/tests/prepare.rs
index 81359d8bc2..896eeff196 100644
--- a/crates/ui-egui/tests/prepare.rs
+++ b/crates/ui-egui/tests/prepare.rs
@@ -500,6 +500,14 @@ fn actions_tab_adds_and_removes_actions() {
#[test]
fn button_export_properties_apply_cancel_and_undo() {
+ fn retype(h: &mut Harness<'static, PdfCraftApp>, value: &str) {
+ use egui::accesskit::Role;
+ h.get_by_role_and_label(Role::TextInput, "Export Value: ").click();
+ h.run_steps(1);
+ h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::A);
+ h.get_by_role_and_label(Role::TextInput, "Export Value: ").type_text(value);
+ h.run_steps(2);
+ }
let mut h = harness();
h.state_mut().execute("form.prepare");
h.run_steps(2);
@@ -508,13 +516,15 @@ fn button_export_properties_apply_cancel_and_undo() {
h.get_by_label("Options").click();
h.run_steps(2);
let original = h.state().field_props.as_ref().unwrap().export_value.clone();
- h.state_mut().field_props.as_mut().unwrap().export_value = "Accepted".into();
+ retype(&mut h, "Accepted");
h.get_by_label("Cancel").click();
h.run_steps(2);
h.state_mut().open_field_props("agree", 0);
h.run_steps(2);
assert_eq!(h.state().field_props.as_ref().unwrap().export_value, original);
- h.state_mut().field_props.as_mut().unwrap().export_value = "Accepted".into();
+ h.get_by_label("Options").click();
+ h.run_steps(2);
+ retype(&mut h, "Accepted");
h.get_by_label("OK").click();
h.run_steps(3);
{
From 0807cb05c3ce280a41decd78f0829b368f7341f7 Mon Sep 17 00:00:00 2001
From: JM
Date: Tue, 13 Oct 2026 17:35:45 +0000
Subject: [PATCH 006/462] fix(ui): preserve tool commands across document
opening
---
crates/ui-egui/src/lib.rs | 61 ++++++--
crates/ui-egui/src/open_worker_tests.rs | 185 ++++++++++++++++++++++++
crates/ui-egui/tests/commands.rs | 17 ++-
3 files changed, 245 insertions(+), 18 deletions(-)
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index ab87094886..b3ac430ab4 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -1193,11 +1193,15 @@ impl PdfCraftApp {
open_worker::ResultKind::Failed(reason) => {
self.notify_fmt("Couldn't open {name}: {reason}", &[("name", &pending.name), ("reason", &reason)]);
}
- open_worker::ResultKind::Conversion(bytes) => {
- if let Some(Err(error)) = self.open_converted(&pending.name, &bytes) {
- self.notify_fmt("Couldn't open {name}: {e}", &[("name", &pending.name), ("e", &error)]);
+ open_worker::ResultKind::Conversion(bytes) => match self.open_converted(&pending.name, &bytes) {
+ Some(Ok(())) => {
+ if let Some(command) = pending.then {
+ self.execute(command);
+ }
}
- }
+ Some(Err(error)) => self.notify_fmt("Couldn't open {name}: {e}", &[("name", &pending.name), ("e", &error)]),
+ None => {}
+ },
open_worker::ResultKind::Prepared { bytes, result } => match *result {
Ok(prepared) => match self.finish_open(&pending.name, pending.path.clone(), bytes.len(), prepared, pending.activate) {
Ok(id) => {
@@ -1727,6 +1731,13 @@ impl PdfCraftApp {
#[cfg(not(target_arch = "wasm32"))]
pub fn open_path(&mut self, path: &str) {
+ self.open_path_attempt(path);
+ }
+
+ /// Whether this attempt opened a document, created a password prompt, or queued an open.
+ /// Failure can leave an older password prompt intact; it does not belong to this attempt.
+ #[cfg(not(target_arch = "wasm32"))]
+ fn open_path_attempt(&mut self, path: &str) -> bool {
let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_else(|| path.to_string());
// Taken before reading: a build that rewrites the file meanwhile still counts as a change.
let stamp = file_watch::Stamp::at(path);
@@ -1734,20 +1745,26 @@ impl PdfCraftApp {
// deterministic inline startup and test flows. Once live, reading and preparation use
// the bounded worker and commit on the UI thread.
if self.ctx.is_none() || self.run_inline {
- match std::fs::read(path) {
+ return match std::fs::read(path) {
Ok(bytes) => {
let before = self.views.len();
if let Err(error) = self.open_bytes(&name, Some(path.to_string()), bytes) {
self.notify_fmt("Couldn't open {name}: {e}", &[("name", &name), ("e", &error)]);
- } else if self.views.len() > before
- && let Some(doc) = self.views.last().map(|view| view.id)
- {
- self.watch.known_as(doc, stamp);
+ false
+ } else {
+ if self.views.len() > before
+ && let Some(doc) = self.views.last().map(|view| view.id)
+ {
+ self.watch.known_as(doc, stamp);
+ }
+ true
}
}
- Err(error) => self.notify_fmt("Couldn't read {name}: {e}", &[("name", &name), ("e", &error.to_string())]),
- }
- return;
+ Err(error) => {
+ self.notify_fmt("Couldn't read {name}: {e}", &[("name", &name), ("e", &error.to_string())]);
+ false
+ }
+ };
}
self.startup_superseded = true;
if let Err(error) = self.schedule_open(OpenRequest {
@@ -1762,6 +1779,9 @@ impl PdfCraftApp {
then: None,
}) {
self.notify_fmt("Couldn't open {name}: {e}", &[("name", &name), ("e", &error)]);
+ false
+ } else {
+ true
}
}
@@ -2064,12 +2084,21 @@ impl PdfCraftApp {
self.ask_one(pickers::Ask::File(dialog), None, move |app, path| {
let path = path.to_string_lossy().into_owned();
let before = app.views.len();
- app.open_path(&path);
- if let Some(prompt) = app.password_prompt.as_mut().filter(|p| p.path.as_deref() == Some(path.as_str())) {
- // Encrypted: the tool runs once the password is in.
- prompt.then = Some(command);
+ let pending_before = app.pending_opens.len();
+ if !app.open_path_attempt(&path) {
+ return;
+ }
+ if app.ctx.is_some() && !app.run_inline {
+ // UI-thread completion cannot run inside open_path: only its newly queued
+ // request owns this continuation, including through password retries.
+ if let Some(pending) = app.pending_opens.get_mut(pending_before) {
+ pending.then = Some(command);
+ }
} else if app.views.len() > before && app.active.is_some() {
app.execute(command);
+ } else if let Some(prompt) = app.password_prompt.as_mut().filter(|p| p.path.as_deref() == Some(path.as_str())) {
+ // Encrypted: the tool runs once the password is in.
+ prompt.then = Some(command);
}
});
}
diff --git a/crates/ui-egui/src/open_worker_tests.rs b/crates/ui-egui/src/open_worker_tests.rs
index 0e5775feb1..f71c9fbebe 100644
--- a/crates/ui-egui/src/open_worker_tests.rs
+++ b/crates/ui-egui/src/open_worker_tests.rs
@@ -89,6 +89,191 @@ fn open_prepare_keeps_control_and_existing_tabs_live_until_atomic_commit() {
let _ = std::fs::remove_file(path);
}
+#[test]
+fn inline_failed_tool_open_does_not_steal_an_existing_password_prompt() {
+ let mut doc = pdfcraft_cos::Document::open(Arc::new(fixture(2))).unwrap();
+ doc.set_encryption(&pdfcraft_cos::NewEncryption {
+ algorithm: pdfcraft_cos::Algorithm::Aes256,
+ user_password: "reader",
+ owner_password: "owner",
+ permissions: -4,
+ encrypt_metadata: true,
+ seed: [4; 32],
+ })
+ .unwrap();
+ let bytes = pdfcraft_cos::write_full(&doc, &Default::default()).unwrap();
+ let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+ let path = std::env::temp_dir().join(format!("pdfcraft-inline-owner-{}-{nonce}.pdf", std::process::id()));
+ assert!(!path.exists(), "the new opening attempt must fail reading");
+ let mut h = Harness::builder().with_size(egui::vec2(1000.0, 700.0)).build_eframe(|_| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.run_inline = true;
+ app.open_bytes("locked.pdf", Some(path.to_string_lossy().into_owned()), bytes).unwrap();
+ app.pick_override = Some(vec![path.to_string_lossy().into_owned()]);
+ app
+ });
+ h.step();
+ let cached = h.state().password_prompt.as_ref().unwrap().bytes.clone();
+ assert!(h.state().password_prompt.as_ref().unwrap().then.is_none());
+ h.state_mut().run_command("export.text");
+ h.step();
+ assert!(h.state().toast.as_ref().is_some_and(|toast| toast.0.starts_with("Couldn't read")));
+ let prompt = h.state().password_prompt.as_ref().unwrap();
+ assert!(Arc::ptr_eq(&prompt.bytes, &cached), "the older encrypted bytes remain available");
+ assert!(prompt.then.is_none(), "a failed attempt must not attach its tool to the older prompt");
+ h.state_mut().submit_password(Some("wrong".into()));
+ assert!(h.state().password_prompt.as_ref().unwrap().then.is_none());
+ h.state_mut().submit_password(Some("reader".into()));
+ assert_eq!(h.state().views.len(), 1, "the older document can still be unlocked");
+ assert!(h.state().password_prompt.is_none());
+ h.run_steps(2);
+ assert!(h.state().dialog.is_none(), "the failed attempt's tool never runs");
+
+ // Accepting the current attempt must still run ordinary/conversion tools and retain
+ // newly created password continuations through retries or discard them on cancellation.
+ for case in ["plain", "converted", "password", "password-cancel"] {
+ let path = path.with_extension(if case == "converted" { "txt" } else { "pdf" });
+ let bytes = match case {
+ "plain" => fixture(2),
+ "converted" => b"Inline text converted to PDF".to_vec(),
+ _ => cached.as_ref().clone(),
+ };
+ std::fs::write(&path, bytes).unwrap();
+ let mut h = Harness::builder().with_size(egui::vec2(1000.0, 700.0)).build_eframe(|_| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.run_inline = true;
+ app.pick_override = Some(vec![path.to_string_lossy().into_owned()]);
+ app
+ });
+ h.step();
+ let defaults = h.state().persist();
+ h.state_mut().run_command("export.text");
+ h.step();
+ if case.starts_with("password") {
+ assert_eq!(h.state().password_prompt.as_ref().unwrap().then, Some("export.text"));
+ h.state_mut().submit_password(Some("wrong".into()));
+ assert_eq!(h.state().password_prompt.as_ref().unwrap().then, Some("export.text"));
+ h.state_mut().submit_password((case == "password").then(|| "reader".into()));
+ }
+ assert_eq!(h.state().views.len(), usize::from(case != "password-cancel"));
+ assert_eq!(matches!(h.state().dialog, Some(crate::Dialog::Export(_))), case != "password-cancel");
+ assert!(h.state().password_prompt.is_none());
+ assert_eq!(h.state().view_defaults.layout, PdfCraftApp::new().view_defaults.layout);
+ assert_eq!(h.state().view_defaults.continuous, PdfCraftApp::new().view_defaults.continuous);
+ // Persistence includes recent files; compare only the saved display defaults.
+ let before: Value = serde_json::from_str(&defaults).unwrap();
+ let after: Value = serde_json::from_str(&h.state().persist()).unwrap();
+ assert_eq!(before["default_layout"], after["default_layout"]);
+ let _ = std::fs::remove_file(path);
+ }
+}
+
+#[test]
+fn tool_open_continuation_follows_its_worker_and_password_retries() {
+ for case in ["plain", "converted", "invalid-image", "password", "password-cancel", "wrong-password-cancel", "read-failure", "invalid-pdf"] {
+ let extension = match case {
+ "converted" => "txt",
+ "invalid-image" => "png",
+ _ => "pdf",
+ };
+ let path = std::env::temp_dir().join(format!("pdfcraft-tool-worker-{}-{case}.{extension}", std::process::id()));
+ let encrypted = case.contains("password");
+ if case != "read-failure" {
+ let bytes = if encrypted {
+ let mut doc = pdfcraft_cos::Document::open(Arc::new(fixture(2))).unwrap();
+ doc.set_encryption(&pdfcraft_cos::NewEncryption {
+ algorithm: pdfcraft_cos::Algorithm::Aes256,
+ user_password: "reader",
+ owner_password: "owner",
+ permissions: -4,
+ encrypt_metadata: true,
+ seed: [4; 32],
+ })
+ .unwrap();
+ pdfcraft_cos::write_full(&doc, &Default::default()).unwrap()
+ } else if case == "converted" {
+ b"A text file opened as a PDF".to_vec()
+ } else if case == "invalid-image" {
+ b"\x89PNG\r\n\x1a\n".to_vec()
+ } else if case == "invalid-pdf" {
+ b"not a PDF".to_vec()
+ } else {
+ fixture(2)
+ };
+ std::fs::write(&path, bytes).unwrap();
+ }
+ let mut h = Harness::builder().with_size(egui::vec2(1000.0, 700.0)).build_eframe(|_| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.pick_override = Some(vec![path.to_string_lossy().into_owned()]);
+ app
+ });
+ h.step();
+ let (gate, started, release, finished) = open_worker::prepare_gate();
+ h.state_mut().open_prepare_gate = Some(gate);
+ h.state_mut().run_command("export.text");
+ h.step();
+ started.recv_timeout(Duration::from_secs(5)).unwrap();
+ assert_eq!(h.state().pending_opens.len(), 1);
+ assert_eq!(h.state().pending_opens[0].then, Some("export.text"), "{case}: command belongs to the pending request");
+
+ // A different document becoming active must neither run nor inherit the tool.
+ h.state_mut().open_bytes("unrelated.pdf", None, fixture(1)).unwrap();
+ let unrelated = h.state().views[0].id;
+ h.step();
+ assert!(h.state().dialog.is_none());
+ release.send(()).unwrap();
+ finished.recv_timeout(Duration::from_secs(5)).unwrap();
+ h.step();
+
+ if encrypted {
+ assert_eq!(h.state().password_prompt.as_ref().unwrap().then, Some("export.text"));
+ assert!(h.state().dialog.is_none());
+ if case != "password-cancel" {
+ h.state_mut().submit_password(Some("wrong".into()));
+ started.recv_timeout(Duration::from_secs(5)).unwrap();
+ release.send(()).unwrap();
+ finished.recv_timeout(Duration::from_secs(5)).unwrap();
+ h.step();
+ let prompt = h.state().password_prompt.as_ref().unwrap();
+ assert!(prompt.error.is_some());
+ assert_eq!(prompt.then, Some("export.text"));
+ assert!(h.state().dialog.is_none());
+ }
+ if case == "password" {
+ h.state_mut().submit_password(Some("reader".into()));
+ started.recv_timeout(Duration::from_secs(5)).unwrap();
+ release.send(()).unwrap();
+ finished.recv_timeout(Duration::from_secs(5)).unwrap();
+ h.step();
+ } else {
+ h.state_mut().submit_password(None);
+ }
+ }
+ if matches!(case, "plain" | "converted" | "password") {
+ assert_eq!(h.state().views.len(), 2);
+ let app = h.state();
+ let opened = &app.views[app.active.unwrap()];
+ assert_ne!(opened.id, unrelated);
+ assert_eq!(app.session.get(opened.id).unwrap().path.as_deref(), if case == "converted" { None } else { path.to_str() });
+ assert!(matches!(app.dialog, Some(crate::Dialog::Export(_))));
+ // Closing the dialog and processing more frames must not execute it again.
+ h.state_mut().dialog = None;
+ } else {
+ assert_eq!(h.state().views.len(), 1);
+ assert!(h.state().dialog.is_none());
+ }
+ assert!(h.state().pending_opens.is_empty());
+ assert!(h.state().password_prompt.is_none());
+ h.state_mut().open_bytes("later.pdf", None, fixture(1)).unwrap();
+ h.run_steps(2);
+ assert!(h.state().dialog.is_none(), "{case}: continuation cannot run on another open");
+ let _ = std::fs::remove_file(path);
+ }
+}
+
#[test]
fn launch_layout_waits_for_cli_opens_and_preserves_restored_tabs() {
use crate::canvas::PageLayout;
diff --git a/crates/ui-egui/tests/commands.rs b/crates/ui-egui/tests/commands.rs
index 47bbc21a8f..734f35099b 100644
--- a/crates/ui-egui/tests/commands.rs
+++ b/crates/ui-egui/tests/commands.rs
@@ -44,6 +44,15 @@ fn harness() -> Harness<'static, PdfCraftApp> {
h
}
+fn wait_for(h: &mut Harness<'static, PdfCraftApp>, description: &str, ready: impl Fn(&PdfCraftApp) -> bool) {
+ let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
+ while !ready(h.state()) {
+ assert!(std::time::Instant::now() < deadline, "timed out waiting for {description}");
+ h.step();
+ std::thread::yield_now();
+ }
+}
+
/// Commands that open a native file picker can't run headless.
/// (Create ▸ Clipboard reads the system clipboard: tests use `create_from_clip`.)
const PICKERS: &[&str] = &[
@@ -184,7 +193,7 @@ fn a_tool_chosen_with_no_document_asks_for_one_and_runs_on_it() {
h.run_steps(2);
h.state_mut().run_command("export.text");
assert!(h.state().toast.as_ref().is_none_or(|t| t.0 != "Open a document first"));
- h.run_steps(3);
+ wait_for(&mut h, "picked document and export dialog", |app| app.active.is_some() && matches!(app.dialog, Some(Dialog::Export(_))));
assert!(h.state().active.is_some(), "the picked file is open");
assert!(matches!(h.state().dialog, Some(Dialog::Export(_))), "and the tool runs on it: {:?}", h.state().dialog);
// Cancelled: nothing opens and nothing runs.
@@ -287,7 +296,11 @@ fn the_open_recent_menu_lists_files_and_opens_one() {
h.get_by_label("Open Recent ⏵").hover();
h.run_steps(3);
h.get_by_label_contains("recent.pdf").click();
- h.run_steps(4);
+ wait_for(&mut h, "recent document", |app| {
+ app.views.len() == 2
+ && app.active.and_then(|index| app.views.get(index)).and_then(|view| app.session.get(view.id)).and_then(|doc| doc.path.as_deref())
+ == Some(path.as_str())
+ });
let app = h.state();
assert_eq!(app.views.len(), 2, "the recent file opened in a new tab");
let active = app.active.unwrap();
From d3a40f2ac16627055c557c6c69463e3494916430 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 16:26:53 +0530
Subject: [PATCH 007/462] feat: major Acrobat UI parity, crop, and layer fixes
---
crates/automation/src/lib.rs | 13 +
crates/automation/src/tools.rs | 2 +-
crates/automation/tests/automation.rs | 10 +
crates/edit/src/images.rs | 370 +++++++++
crates/edit/src/lib.rs | 2 +-
crates/edit/src/tests.rs | 71 ++
crates/engine/src/lib.rs | 23 +-
crates/engine/src/text_fonts.rs | 31 +-
crates/fonts/src/embedding.rs | 8 +-
crates/ui-egui/src/canvas.rs | 322 +++++++-
crates/ui-egui/src/comments.rs | 3 +
crates/ui-egui/src/content_ui.rs | 104 ++-
crates/ui-egui/src/edit_text_ui.rs | 1021 +++++++++++++++++++++----
crates/ui-egui/src/files.rs | 31 +-
crates/ui-egui/src/js_ui.rs | 7 +
crates/ui-egui/src/lib.rs | 12 +
crates/ui-egui/src/panels.rs | 180 ++++-
crates/ui-egui/tests/comments.rs | 49 ++
crates/ui-egui/tests/editing.rs | 181 +++++
19 files changed, 2208 insertions(+), 232 deletions(-)
diff --git a/crates/automation/src/lib.rs b/crates/automation/src/lib.rs
index 4a34909deb..acda47104d 100644
--- a/crates/automation/src/lib.rs
+++ b/crates/automation/src/lib.rs
@@ -469,6 +469,19 @@ impl Automation {
"flip_horizontal" => ImageEdit::Flip { horizontal: true },
"flip_vertical" => ImageEdit::Flip { horizontal: false },
"delete" => ImageEdit::Delete,
+ "bring_to_front" => ImageEdit::Arrange(pdfcraft_engine::ArrangeOrder::BringToFront),
+ "send_to_back" => ImageEdit::Arrange(pdfcraft_engine::ArrangeOrder::SendToBack),
+ "bring_forward" => ImageEdit::Arrange(pdfcraft_engine::ArrangeOrder::BringForward),
+ "send_backward" => ImageEdit::Arrange(pdfcraft_engine::ArrangeOrder::SendBackward),
+ "remove_crop" => ImageEdit::RemoveCrop,
+ "crop" => {
+ let r: Vec =
+ a.get("rect").and_then(Value::as_array).map(|x| x.iter().filter_map(Value::as_f64).collect()).unwrap_or_default();
+ let r = <[f64; 4]>::try_from(r).map_err(|_| ToolError::InvalidArgs("crop needs rect: 4 numbers".into()))?;
+ let info = &self.doc(&a)?.info.pages[page];
+ let (u0, u1) = (info.view_to_user(r[0] as f32, r[1] as f32), info.view_to_user(r[2] as f32, r[3] as f32));
+ ImageEdit::Crop([u0[0].min(u1[0]) as f64, u0[1].min(u1[1]) as f64, u0[0].max(u1[0]) as f64, u0[1].max(u1[1]) as f64])
+ }
"replace" => {
let path = self.resolve(a.str("path")?, false)?;
let bytes = std::fs::read(&path).map_err(|e| failed(format!("{}: {e}", path.display())))?;
diff --git a/crates/automation/src/tools.rs b/crates/automation/src/tools.rs
index cfdeb1c16f..137cba344b 100644
--- a/crates/automation/src/tools.rs
+++ b/crates/automation/src/tools.rs
@@ -1171,7 +1171,7 @@ pub fn tools() -> Vec {
"doc": doc(),
"page": { "type": "integer", "minimum": 1 },
"image": { "type": "integer", "minimum": 1 },
- "action": { "type": "string", "enum": ["move", "rotate", "flip_horizontal", "flip_vertical", "replace", "delete"] },
+ "action": { "type": "string", "enum": ["move", "rotate", "flip_horizontal", "flip_vertical", "replace", "delete", "bring_to_front", "send_to_back", "bring_forward", "send_backward", "remove_crop", "crop"] },
"rect": { "type": "array", "items": { "type": "number" }, "minItems": 4, "maxItems": 4 },
"quarters": { "type": "integer" },
"path": { "type": "string" },
diff --git a/crates/automation/tests/automation.rs b/crates/automation/tests/automation.rs
index e788d96106..28ce3e9b79 100644
--- a/crates/automation/tests/automation.rs
+++ b/crates/automation/tests/automation.rs
@@ -2264,6 +2264,16 @@ fn editing_page_images_through_tools() {
assert_eq!(moved, json!([5.0, 5.0, 25.0, 35.0]));
ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "rotate" }));
ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "flip_horizontal" }));
+ let r = ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "bring_to_front" }));
+ assert_eq!(r["undo"], "Bring to front");
+ let r = ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "send_to_back" }));
+ assert_eq!(r["undo"], "Send to back");
+ let r = ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "bring_forward" }));
+ assert_eq!(r["undo"], "Bring forward");
+ let r = ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "send_backward" }));
+ assert_eq!(r["undo"], "Send backward");
+ let r = ok(&mut a, "image_edit", json!({ "doc": made, "page": 1, "image": 1, "action": "remove_crop" }));
+ assert_eq!(r["undo"], "Remove crop");
let saved = ok(&mut a, "image_save", json!({ "doc": made, "page": 1, "image": 1, "path": "out/picture" }));
assert_eq!(saved["format"], "png");
assert!(std::fs::read(dir.join("out/picture.png")).unwrap().starts_with(b"\x89PNG"));
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 85ae6b391b..14556c7644 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -367,6 +367,15 @@ pub fn reading_images(doc: &Document, page: usize) -> Result, Edi
Ok(out)
}
+/// The four stacking order arrangements.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ArrangeOrder {
+ BringToFront,
+ SendToBack,
+ BringForward,
+ SendBackward,
+}
+
/// What to do with an image.
#[derive(Clone, Debug, PartialEq)]
pub enum ImageChange {
@@ -375,6 +384,12 @@ pub enum ImageChange {
/// Draw this image XObject instead, in the same place.
Replace(ObjRef),
Delete,
+ /// Change the stacking order.
+ Arrange(ArrangeOrder),
+ /// Remove any private crop on the image.
+ RemoveCrop,
+ /// Crop to a user-space box [x0, y0, x1, y1].
+ Crop([f64; 4]),
}
/// The user-space transform that maps box `from` onto box `to` (move and resize).
@@ -427,6 +442,352 @@ fn clip_matrix(draw: Matrix, cm: Matrix, t: Matrix) -> Option {
Some(outer.then(&t).then(&outer.invert()?))
}
+fn is_entire_page_wrapped(ops: &[Op]) -> bool {
+ if ops.len() < 2 || !ops.first().is_some_and(|o| o.is("q")) || !ops.last().is_some_and(|o| o.is("Q")) {
+ return false;
+ }
+ let mut depth: usize = 0;
+ for (i, op) in ops.iter().enumerate() {
+ if op.is("q") {
+ depth = depth.saturating_add(1);
+ } else if op.is("Q") {
+ depth = depth.saturating_sub(1);
+ if depth == 0 && i < ops.len().saturating_sub(1) {
+ return false;
+ }
+ }
+ }
+ depth == 0
+}
+
+fn content_units(ops: &[Op], scan_start: usize, scan_end: usize) -> Vec> {
+ let mut units = Vec::new();
+ let mut i = scan_start;
+ while i < scan_end {
+ let op = match ops.get(i) {
+ Some(o) => o,
+ None => break,
+ };
+ if op.is("q") {
+ let mut depth: usize = 1;
+ let mut j = i.saturating_add(1);
+ while j < scan_end {
+ if let Some(next) = ops.get(j) {
+ if next.is("q") {
+ depth = depth.saturating_add(1);
+ } else if next.is("Q") {
+ depth = depth.saturating_sub(1);
+ if depth == 0 {
+ j = j.saturating_add(1);
+ break;
+ }
+ }
+ }
+ j = j.saturating_add(1);
+ }
+ units.push(i..j);
+ i = j;
+ } else if op.is("BT") {
+ let mut j = i.saturating_add(1);
+ while j < scan_end {
+ if ops.get(j).is_some_and(|o| o.is("ET")) {
+ j = j.saturating_add(1);
+ break;
+ }
+ j = j.saturating_add(1);
+ }
+ units.push(i..j);
+ i = j;
+ } else if op.is("BI") {
+ let mut j = i.saturating_add(1);
+ while j < scan_end {
+ if ops.get(j).is_some_and(|o| o.is("EI")) {
+ j = j.saturating_add(1);
+ break;
+ }
+ j = j.saturating_add(1);
+ }
+ units.push(i..j);
+ i = j;
+ } else if op.is("Do") || op.is("sh") {
+ units.push(i..i.saturating_add(1));
+ i = i.saturating_add(1);
+ } else {
+ let mut j = i;
+ let mut found_end = false;
+ while j < scan_end {
+ let next = match ops.get(j) {
+ Some(o) => o,
+ None => break,
+ };
+ if matches!(next.op.as_slice(), b"S" | b"s" | b"f" | b"F" | b"f*" | b"B" | b"B*" | b"b" | b"b*" | b"n") {
+ j = j.saturating_add(1);
+ found_end = true;
+ break;
+ } else if j > i && matches!(next.op.as_slice(), b"q" | b"BT" | b"BI" | b"Do" | b"sh") {
+ found_end = true;
+ break;
+ }
+ j = j.saturating_add(1);
+ }
+ let u_end = if found_end { j } else { scan_end };
+ units.push(i..u_end);
+ i = u_end;
+ }
+ }
+ units
+}
+
+/// Change the stacking order of image `index` on `page`.
+pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: ArrangeOrder) -> Result<(), EditError> {
+ let images = page_images(doc, page)?;
+ let img = images.get(index).cloned().ok_or_else(|| EditError::Invalid(format!("page {} has no image {}", page + 1, index + 1)))?;
+ let p = page_of(doc, page)?;
+ let all = streams(doc, &p.dict);
+ let mut offset = 0_usize;
+ for (_, data) in all.iter().take(img.stream) {
+ offset = offset
+ .checked_add(data.len())
+ .and_then(|n| n.checked_add(1))
+ .ok_or_else(|| EditError::Invalid("the image content is too large".into()))?;
+ }
+ let data = all.get(img.stream).ok_or_else(|| EditError::Invalid("the image stream is missing".into()))?;
+ let op = parse(&data.1).ops.get(img.op).cloned().ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let span = offset.checked_add(op.span.start).ok_or_else(|| EditError::Invalid("the image content is too large".into()))?;
+ let pieces = pdfcraft_content::Pieces::join(&all.iter().map(|(_, data)| data.as_slice()).collect::>());
+ let ops = pieces.parse().ops;
+ let target = ops
+ .iter()
+ .position(|op| op.span.start == span && op.is("Do"))
+ .ok_or_else(|| EditError::Invalid("the image operation could not be located".into()))?;
+
+ let is_wrapped = is_entire_page_wrapped(&ops);
+ let (scan_start, scan_end) = if is_wrapped { (1, ops.len().saturating_sub(1)) } else { (0, ops.len()) };
+ let units = content_units(&ops, scan_start, scan_end);
+ let Some(target_idx) = units.iter().position(|u| u.start <= target && target < u.end) else {
+ return Ok(());
+ };
+ if units.len() <= 1 {
+ return Ok(());
+ }
+
+ let (dest_unit, insert_after) = match order {
+ ArrangeOrder::BringToFront => {
+ if target_idx == units.len().saturating_sub(1) {
+ return Ok(());
+ }
+ let Some(u) = units.last() else { return Ok(()) };
+ (u, true)
+ }
+ ArrangeOrder::SendToBack => {
+ if target_idx == 0 {
+ return Ok(());
+ }
+ let Some(u) = units.first() else { return Ok(()) };
+ (u, false)
+ }
+ ArrangeOrder::BringForward => {
+ if target_idx == units.len().saturating_sub(1) {
+ return Ok(());
+ }
+ let Some(u) = units.get(target_idx.saturating_add(1)) else { return Ok(()) };
+ (u, true)
+ }
+ ArrangeOrder::SendBackward => {
+ if target_idx == 0 {
+ return Ok(());
+ }
+ let Some(u) = target_idx.checked_sub(1).and_then(|i| units.get(i)) else { return Ok(()) };
+ (u, false)
+ }
+ };
+
+ let Some(target_unit) = units.get(target_idx) else { return Ok(()) };
+ let (scope_start, scope_end, placement) = image_transform_scope(&ops, target)?.unwrap_or((target, target, Matrix(img.draw_matrix)));
+
+ let unit_ops = if scope_start != scope_end && target_unit.start == scope_start && target_unit.end == scope_end.saturating_add(1) {
+ if placement == Matrix::IDENTITY {
+ ops.get(scope_start..=scope_end).unwrap_or_default().to_vec()
+ } else {
+ let mut out = Vec::new();
+ out.push(Op::new("q", vec![]));
+ out.push(Op::new("cm", placement.0.map(pdfcraft_content::num).to_vec()));
+ if let Some(inner) = ops.get(scope_start.saturating_add(1)..=scope_end) {
+ out.extend_from_slice(inner);
+ }
+ out
+ }
+ } else {
+ vec![
+ Op::new("q", vec![]),
+ Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
+ ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])),
+ Op::new("Q", vec![]),
+ ]
+ };
+
+ let Some(first_op) = ops.get(target_unit.start) else { return Ok(()) };
+ let Some(last_op) = target_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
+ let target_span = first_op.span.start..last_op.span.end;
+
+ let dest_pos = if insert_after {
+ let Some(op) = dest_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
+ op.span.end
+ } else {
+ let Some(op) = ops.get(dest_unit.start) else { return Ok(()) };
+ op.span.start
+ };
+
+ let mut serialized = Vec::new();
+ serialized.push(b'\n');
+ serialized.extend_from_slice(&serialize_ops(&unit_ops));
+ serialized.push(b'\n');
+
+ let mut edits = Vec::new();
+ if dest_pos >= target_span.end {
+ edits.push((target_span, Vec::new()));
+ edits.push((dest_pos..dest_pos, serialized));
+ } else if dest_pos <= target_span.start {
+ edits.push((dest_pos..dest_pos, serialized));
+ edits.push((target_span, Vec::new()));
+ } else {
+ return Ok(());
+ }
+
+ let changed = pieces.splice(edits);
+ let contents = crate::text::rewritten_contents(doc, &all, changed);
+ doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), contents))?;
+ Ok(())
+}
+
+/// Remove any private clipping path / crop on image `index` on `page`.
+pub fn remove_image_crop(doc: &mut Document, page: usize, index: usize) -> Result<(), EditError> {
+ let images = page_images(doc, page)?;
+ let img = images.get(index).cloned().ok_or_else(|| EditError::Invalid(format!("page {} has no image {}", page + 1, index + 1)))?;
+ let p = page_of(doc, page)?;
+ let all = streams(doc, &p.dict);
+ let mut offset = 0_usize;
+ for (_, data) in all.iter().take(img.stream) {
+ offset = offset
+ .checked_add(data.len())
+ .and_then(|n| n.checked_add(1))
+ .ok_or_else(|| EditError::Invalid("the image content is too large".into()))?;
+ }
+ let data = all.get(img.stream).ok_or_else(|| EditError::Invalid("the image stream is missing".into()))?;
+ let op = parse(&data.1).ops.get(img.op).cloned().ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let span = offset.checked_add(op.span.start).ok_or_else(|| EditError::Invalid("the image content is too large".into()))?;
+ let pieces = pdfcraft_content::Pieces::join(&all.iter().map(|(_, data)| data.as_slice()).collect::>());
+ let ops = pieces.parse().ops;
+ let target = ops
+ .iter()
+ .position(|op| op.span.start == span && op.is("Do"))
+ .ok_or_else(|| EditError::Invalid("the image operation could not be located".into()))?;
+ if let Some((at, _)) = exclusive_clip(&ops, target) {
+ let end_idx = at.saturating_add(2);
+ if let (Some(start_op), Some(end_op)) = (ops.get(at), ops.get(end_idx)) {
+ let range = start_op.span.start..end_op.span.end;
+ let changed = pieces.splice([(range, Vec::new())]);
+ let contents = crate::text::rewritten_contents(doc, &all, changed);
+ doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), contents))?;
+ }
+ }
+ Ok(())
+}
+
+/// Crop image `index` on `page` to `crop_rect` in user space `[x0, y0, x1, y1]`.
+pub fn crop_image(doc: &mut Document, page: usize, index: usize, crop_rect: [f64; 4]) -> Result<(), EditError> {
+ if !crop_rect.iter().all(|v| v.is_finite() && v.abs() <= 1e12) {
+ return Err(EditError::Invalid("the crop rectangle coordinates must be finite".into()));
+ }
+ let (x0, y0) = (crop_rect[0].min(crop_rect[2]), crop_rect[1].min(crop_rect[3]));
+ let (w, h) = ((crop_rect[2] - crop_rect[0]).abs(), (crop_rect[3] - crop_rect[1]).abs());
+ if w <= 1e-4 || h <= 1e-4 {
+ return Err(EditError::Invalid("the crop rectangle has zero area".into()));
+ }
+ let images = page_images(doc, page)?;
+ let img = images.get(index).cloned().ok_or_else(|| EditError::Invalid(format!("page {} has no image {}", page + 1, index + 1)))?;
+ let p = page_of(doc, page)?;
+ let all = streams(doc, &p.dict);
+ let mut offset = 0_usize;
+ for (_, data) in all.iter().take(img.stream) {
+ offset = offset
+ .checked_add(data.len())
+ .and_then(|n| n.checked_add(1))
+ .ok_or_else(|| EditError::Invalid("the image content is too large".into()))?;
+ }
+ let data = all.get(img.stream).ok_or_else(|| EditError::Invalid("the image stream is missing".into()))?;
+ let op = parse(&data.1).ops.get(img.op).cloned().ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let span = offset.checked_add(op.span.start).ok_or_else(|| EditError::Invalid("the image content is too large".into()))?;
+ let pieces = pdfcraft_content::Pieces::join(&all.iter().map(|(_, data)| data.as_slice()).collect::>());
+ let ops = pieces.parse().ops;
+ let target = ops
+ .iter()
+ .position(|op| op.span.start == span && op.is("Do"))
+ .ok_or_else(|| EditError::Invalid("the image operation could not be located".into()))?;
+
+ let (range, unit_ops) = if let Some((at, _)) = exclusive_clip(&ops, target) {
+ let op_re = ops.get(at).ok_or_else(|| EditError::Invalid("the crop operation is missing".into()))?;
+ (
+ op_re.span.start..op_re.span.end,
+ vec![Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)])],
+ )
+ } else if target >= 2
+ && ops.get(target - 2).is_some_and(|o| o.is("q"))
+ && ops.get(target - 1).is_some_and(|o| o.is("cm"))
+ && ops.get(target + 1).is_some_and(|o| o.is("Q"))
+ {
+ let q_op = &ops[target - 2];
+ let q_end = &ops[target + 1];
+ (
+ q_op.span.start..q_end.span.end,
+ vec![
+ Op::new("q", vec![]),
+ Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]),
+ Op::new("W", vec![]),
+ Op::new("n", vec![]),
+ ops[target - 1].clone(),
+ ops[target].clone(),
+ Op::new("Q", vec![]),
+ ],
+ )
+ } else if target >= 1 && ops.get(target - 1).is_some_and(|o| o.is("cm")) {
+ let cm_op = &ops[target - 1];
+ let do_op = &ops[target];
+ (
+ cm_op.span.start..do_op.span.end,
+ vec![
+ Op::new("q", vec![]),
+ Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]),
+ Op::new("W", vec![]),
+ Op::new("n", vec![]),
+ ops[target - 1].clone(),
+ ops[target].clone(),
+ Op::new("Q", vec![]),
+ ],
+ )
+ } else {
+ let do_op = &ops[target];
+ (
+ do_op.span.start..do_op.span.end,
+ vec![
+ Op::new("q", vec![]),
+ Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]),
+ Op::new("W", vec![]),
+ Op::new("n", vec![]),
+ Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
+ ops[target].clone(),
+ Op::new("Q", vec![]),
+ ],
+ )
+ };
+
+ let serialized = serialize_ops(&unit_ops);
+ let changed = pieces.splice([(range, serialized)]);
+ let contents = crate::text::rewritten_contents(doc, &all, changed);
+ doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), contents))?;
+ Ok(())
+}
+
/// Change image `index` (from [`page_images`]) on `page`.
pub fn change_image(doc: &mut Document, page: usize, index: usize, change: &ImageChange) -> Result<(), EditError> {
let images = page_images(doc, page)?;
@@ -444,6 +805,15 @@ pub fn change_image(doc: &mut Document, page: usize, index: usize, change: &Imag
ImageChange::Transform(t) => {
return transform_image(doc, &p, &all, &img, *t);
}
+ ImageChange::Arrange(order) => {
+ return arrange_image(doc, page, index, *order);
+ }
+ ImageChange::RemoveCrop => {
+ return remove_image_crop(doc, page, index);
+ }
+ ImageChange::Crop(rect) => {
+ return crop_image(doc, page, index, *rect);
+ }
ImageChange::Replace(r) => {
if img.is_form {
return Err(EditError::Invalid(
diff --git a/crates/edit/src/lib.rs b/crates/edit/src/lib.rs
index d92f284052..59dc804a66 100644
--- a/crates/edit/src/lib.rs
+++ b/crates/edit/src/lib.rs
@@ -623,7 +623,7 @@ pub use objects::{EditableObject, MAX_MOVE_OBJECTS, ObjectKind, ObjectTarget, ed
mod flatten;
pub use flatten::{flatten, flatten_fill_sign};
pub mod images;
-pub use images::{ImageChange, PageImage, change_image, page_images, reading_images, rect_to_rect, turn_about_centre};
+pub use images::{ArrangeOrder, ImageChange, PageImage, arrange_image, change_image, crop_image, page_images, reading_images, rect_to_rect, remove_image_crop, turn_about_centre};
pub mod bidi;
pub mod indic;
pub mod text;
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index fce7d5e101..c3aa428f84 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1672,6 +1672,77 @@ fn page_images_move_turn_replace_and_delete() {
assert!(images::change_image(&mut doc, 0, 0, &images::ImageChange::Delete).is_err());
}
+#[test]
+fn image_arrange_stacking_order_and_remove_crop() {
+ let content = "q 100 0 0 100 100 100 cm /Im0 Do Q BT /F1 12 Tf 72 700 Td (Middle Text) Tj ET q 150 0 0 150 200 200 cm /Im0 Do Q";
+ let mut doc = image_page_with(content);
+ let initial_images = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial_images.len(), 2);
+ assert!(close(initial_images[0].rect, [100.0, 100.0, 200.0, 200.0]));
+ assert!(close(initial_images[1].rect, [200.0, 200.0, 350.0, 350.0]));
+
+ // Boundary case: image 0 is already at the back; SendToBack and SendBackward are no-ops.
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::SendToBack).unwrap();
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::SendBackward).unwrap();
+ let imgs = images::page_images(&doc, 0).unwrap();
+ assert_eq!(imgs.len(), 2);
+ assert!(close(imgs[0].rect, initial_images[0].rect));
+
+ // Bring forward image 0: moves it past the middle text, but it is still behind image 1.
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringForward).unwrap();
+ let doc = reopen(&doc);
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ // Middle text should now precede image 0's Do in the content stream!
+ let text_pos = str_content.find("Middle Text").unwrap();
+ let first_do = str_content.find("/Im0 Do").unwrap();
+ assert!(text_pos < first_do, "text should now precede image 0");
+
+ // Bring to front on image 0: moves it past image 1 to the front!
+ let mut doc = doc;
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let imgs_after_front = images::page_images(&doc, 0).unwrap();
+ assert_eq!(imgs_after_front.len(), 2);
+ // In drawing order, the image that was at [100, 100, 200, 200] is now drawn LAST (index 1)!
+ assert!(close(imgs_after_front[0].rect, [200.0, 200.0, 350.0, 350.0]));
+ assert!(close(imgs_after_front[1].rect, [100.0, 100.0, 200.0, 200.0]));
+
+ // Send to back on the front image (index 1) restores it to the back.
+ let mut doc = doc;
+ images::arrange_image(&mut doc, 0, 1, images::ArrangeOrder::SendToBack).unwrap();
+ let imgs_after_back = images::page_images(&doc, 0).unwrap();
+ assert!(close(imgs_after_back[0].rect, [100.0, 100.0, 200.0, 200.0]));
+ assert!(close(imgs_after_back[1].rect, [200.0, 200.0, 350.0, 350.0]));
+
+ // Test remove crop
+ let cropped_content = "q 100 100 50 50 re W n 200 0 0 100 100 100 cm /Im0 Do Q";
+ let mut doc = image_page_with(cropped_content);
+ let img_before = &images::page_images(&doc, 0).unwrap()[0];
+ assert_ne!(img_before.visible_rect, Some(img_before.rect));
+ images::remove_image_crop(&mut doc, 0, 0).unwrap();
+ let doc = reopen(&doc);
+ let img_after = &images::page_images(&doc, 0).unwrap()[0];
+ assert_eq!(img_after.visible_rect, Some(img_after.rect));
+
+ // Test crop_image
+ let uncropped_content = "q 200 0 0 100 100 100 cm /Im0 Do Q";
+ let mut doc = image_page_with(uncropped_content);
+ let img_before = &images::page_images(&doc, 0).unwrap()[0];
+ assert_eq!(img_before.visible_rect, Some(img_before.rect));
+ images::crop_image(&mut doc, 0, 0, [120.0, 110.0, 250.0, 180.0]).unwrap();
+ let doc = reopen(&doc);
+ let img_cropped = &images::page_images(&doc, 0).unwrap()[0];
+ assert!(close(img_cropped.visible_rect.unwrap(), [120.0, 110.0, 250.0, 180.0]));
+ // And remove_image_crop works on it:
+ let mut doc = doc;
+ images::remove_image_crop(&mut doc, 0, 0).unwrap();
+ let doc = reopen(&doc);
+ let img_restored = &images::page_images(&doc, 0).unwrap()[0];
+ assert_eq!(img_restored.visible_rect, Some(img_restored.rect));
+}
+
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
let mut doc = fixture(); // three pages share resources; pages 0 and 1 also share contents
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index fbe62b2c2a..7a679d4e7b 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -63,7 +63,7 @@ pub use pdfcraft_edit::{BlockStyle, PageImage, RangeStyle, TextBlock, TextLine,
pub use pdfcraft_measure as measure;
pub use pdfcraft_xfa::Report as XfaLayout;
-pub use pdfcraft_edit::{EditableObject, MAX_MOVE_OBJECTS, ObjectKind, ObjectTarget};
+pub use pdfcraft_edit::{ArrangeOrder, EditableObject, MAX_MOVE_OBJECTS, ObjectKind, ObjectTarget};
/// A change to an existing page image.
#[derive(Clone, Debug, PartialEq)]
@@ -81,6 +81,12 @@ pub enum ImageEdit {
bytes: Arc>,
},
Delete,
+ /// Change the stacking order.
+ Arrange(ArrangeOrder),
+ /// Remove any private crop on the image.
+ RemoveCrop,
+ /// Crop to this box (user space).
+ Crop([f64; 4]),
}
pub use pdfcraft_fonts::{MAX_SIGNATURE_CHARS, ScriptOutline, script_missing, script_outline};
@@ -1709,6 +1715,12 @@ pub const EDIT_LABELS: &[&str] = &[
"Flip image",
"Replace image",
"Delete image",
+ "Bring to front",
+ "Send to back",
+ "Bring forward",
+ "Send backward",
+ "Remove crop",
+ "Crop image",
"Add header & footer",
"Update header & footer",
"Add watermark",
@@ -1835,6 +1847,12 @@ impl Edit {
ImageEdit::Flip { .. } => "Flip image",
ImageEdit::Replace { .. } => "Replace image",
ImageEdit::Delete => "Delete image",
+ ImageEdit::Arrange(ArrangeOrder::BringToFront) => "Bring to front",
+ ImageEdit::Arrange(ArrangeOrder::SendToBack) => "Send to back",
+ ImageEdit::Arrange(ArrangeOrder::BringForward) => "Bring forward",
+ ImageEdit::Arrange(ArrangeOrder::SendBackward) => "Send backward",
+ ImageEdit::RemoveCrop => "Remove crop",
+ ImageEdit::Crop(_) => "Crop image",
}),
Edit::AddHeaderFooter { replace: false, .. } => Label::of("Add header & footer"),
Edit::AddHeaderFooter { .. } => Label::of("Update header & footer"),
@@ -2332,6 +2350,9 @@ fn run_edit(doc: &mut pdfcraft_cos::Document, edit: &Edit, cx: &mut EditCtx) ->
pdfcraft_edit::ImageChange::Replace(embed_image(doc, name, bytes)?.0)
}
ImageEdit::Delete => pdfcraft_edit::ImageChange::Delete,
+ ImageEdit::Arrange(order) => pdfcraft_edit::ImageChange::Arrange(*order),
+ ImageEdit::RemoveCrop => pdfcraft_edit::ImageChange::RemoveCrop,
+ ImageEdit::Crop(rect) => pdfcraft_edit::ImageChange::Crop(*rect),
};
pdfcraft_edit::change_image(doc, *page, *index, &c)?;
}
diff --git a/crates/engine/src/text_fonts.rs b/crates/engine/src/text_fonts.rs
index f4945f7563..7c3fc3211e 100644
--- a/crates/engine/src/text_fonts.rs
+++ b/crates/engine/src/text_fonts.rs
@@ -39,10 +39,9 @@ pub fn discover(roots: &[PathBuf]) -> Vec {
let mut pending: Vec<_> = roots.iter().take(16).map(|r| (r.clone(), 0usize)).collect();
let mut files = Vec::new();
let mut entries = 0usize;
- let mut budget = 64u64 << 20;
let mut seen = std::collections::HashSet::new();
while let Some((path, depth)) = pending.pop() {
- if entries >= 4096 || budget == 0 {
+ if entries >= 4096 || files.len() >= 500 {
break;
}
entries += 1;
@@ -56,23 +55,37 @@ pub fn discover(roots: &[PathBuf]) -> Vec {
pending.extend(children.take(remaining).filter_map(Result::ok).map(|p| (p.path(), depth + 1)));
}
} else if meta.is_file() && meta.len() <= (16 << 20) && font_extension(&path) {
- if meta.len() > budget {
- continue;
- }
- budget = budget.saturating_sub(meta.len());
let mut bytes = Vec::new();
let read = std::fs::File::open(&path).and_then(|f| f.take((16 << 20) + 1).read_to_end(&mut bytes));
- if read.is_err() || pdfcraft_fonts::embedding::validate_document_input(&bytes).is_err() {
+ if read.is_err() {
continue;
}
- if let Ok((family, face)) = pdfcraft_fonts::embedding::names(&bytes) {
- files.push(FontFile { path, family, face });
+ if let Ok(bytes) = read.map(|_| bytes) {
+ if pdfcraft_fonts::embedding::validate_document_input(&bytes).is_err() {
+ continue;
+ }
+ if let Ok((family, face)) = pdfcraft_fonts::embedding::names(&bytes) {
+ files.push(FontFile { path, family, face });
+ }
}
}
}
files.sort_by(|a, b| a.face.cmp(&b.face).then(a.path.cmp(&b.path)));
+ files.dedup_by(|a, b| a.face == b.face);
files
}
fn font_extension(path: &Path) -> bool {
path.extension().and_then(|e| e.to_str()).is_some_and(|e| e.eq_ignore_ascii_case("ttf") || e.eq_ignore_ascii_case("otf"))
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_installed_directories() {
+ let dirs = installed_directories();
+ assert!(!dirs.is_empty());
+ }
+}
+
diff --git a/crates/fonts/src/embedding.rs b/crates/fonts/src/embedding.rs
index fbd361e8bf..a392576bf6 100644
--- a/crates/fonts/src/embedding.rs
+++ b/crates/fonts/src/embedding.rs
@@ -58,13 +58,7 @@ pub fn validate_document_input(bytes: &[u8]) -> Result<(), String> {
if attribution.to_ascii_lowercase().contains("adobe") {
return Err("Adobe-authored font assets are excluded by the project's asset policy".into());
}
- let license: String = f.localized_strings(StringId::LICENSE_DESCRIPTION).map(|s| s.to_string()).collect();
- if !["SIL OPEN FONT", "SIL Open Font", "Apache License", "Ubuntu Font Licence", "Bitstream Vera", "MIT License"]
- .iter()
- .any(|l| license.contains(l))
- {
- return Err("select an openly licensed font whose name table declares its licence (OFL, Apache, Ubuntu, Bitstream Vera or MIT)".into());
- }
+ validate(bytes)?;
Ok(())
}
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 9dc2c98dfa..8f21dcdfe2 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -533,6 +533,112 @@ pub enum ViewAction {
CameraNext(&'static str),
}
+/// Default page right-click menu actions (matching Adobe Acrobat).
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum PageMenuAction {
+ RotateCCW(usize),
+ RotateCW(usize),
+ Print,
+ SelectTool,
+ HandTool,
+ MarqueeZoom,
+ AddComment(usize, [f64; 2]),
+ AddBookmark(usize),
+ TakeSnapshot,
+ EditPdf,
+ AddText,
+ AddImage,
+ DeletePage(usize),
+ ExportPdf,
+ Find,
+ DocProperties,
+}
+
+pub(crate) fn default_page_context_menu(
+ ui: &mut egui::Ui,
+ page: usize,
+ at: [f64; 2],
+ action: &mut Option,
+) {
+ // Top horizontal icon bar: Rotate CCW, Print, Select tool, Hand tool, Marquee Zoom
+ ui.horizontal(|ui| {
+ ui.spacing_mut().item_spacing.x = 4.0;
+ if crate::icons::button(ui, "rotate-ccw", 24.0, false, tl!("Rotate Counterclockwise")).clicked() {
+ *action = Some(PageMenuAction::RotateCCW(page));
+ ui.close();
+ }
+ if crate::icons::button(ui, "printer", 24.0, false, tl!("Print")).clicked() {
+ *action = Some(PageMenuAction::Print);
+ ui.close();
+ }
+ if crate::icons::button(ui, "mouse-pointer-2", 24.0, false, tl!("Select Tool")).clicked() {
+ *action = Some(PageMenuAction::SelectTool);
+ ui.close();
+ }
+ if crate::icons::button(ui, "hand", 24.0, false, tl!("Hand Tool")).clicked() {
+ *action = Some(PageMenuAction::HandTool);
+ ui.close();
+ }
+ if crate::icons::button(ui, "zoom-in", 24.0, false, tl!("Marquee Zoom")).clicked() {
+ *action = Some(PageMenuAction::MarqueeZoom);
+ ui.close();
+ }
+ });
+
+ ui.separator();
+
+ if ui.button(tl!("Add comment")).clicked() {
+ *action = Some(PageMenuAction::AddComment(page, at));
+ ui.close();
+ }
+ if ui.button(tl!("Add bookmark")).clicked() {
+ *action = Some(PageMenuAction::AddBookmark(page));
+ ui.close();
+ }
+ if ui.button(tl!("Take a snapshot")).clicked() {
+ *action = Some(PageMenuAction::TakeSnapshot);
+ ui.close();
+ }
+
+ ui.separator();
+
+ if ui.add(egui::Button::new(egui::RichText::new(tl!("Edit this PDF")).strong())).clicked() {
+ *action = Some(PageMenuAction::EditPdf);
+ ui.close();
+ }
+ if ui.button(tl!("Add text")).clicked() {
+ *action = Some(PageMenuAction::AddText);
+ ui.close();
+ }
+ if ui.button(tl!("Add image")).clicked() {
+ *action = Some(PageMenuAction::AddImage);
+ ui.close();
+ }
+ if ui.button(tl!("Delete page")).clicked() {
+ *action = Some(PageMenuAction::DeletePage(page));
+ ui.close();
+ }
+ if ui.button(tl!("Export this PDF")).clicked() {
+ *action = Some(PageMenuAction::ExportPdf);
+ ui.close();
+ }
+
+ ui.separator();
+
+ if ui.button(tl!("Find text or tools")).clicked() {
+ *action = Some(PageMenuAction::Find);
+ ui.close();
+ }
+ if ui.button(tl!("Rotate view clockwise")).clicked() {
+ *action = Some(PageMenuAction::RotateCW(page));
+ ui.close();
+ }
+ if ui.button(tl!("Document properties…")).clicked() {
+ *action = Some(PageMenuAction::DocProperties);
+ ui.close();
+ }
+}
+
impl DocView {
pub fn raster_memory(&self) -> RasterMemory {
RasterMemory {
@@ -1763,13 +1869,22 @@ impl DocView {
/// The hover popup for an annotation. Replies and Fill & Sign marks (typed text, checks, signatures)
/// show none: they are page content being edited, not comments.
-fn annotation_hover_text(a: &pdfcraft_render::Annotation) -> Option {
+/// If `display_author_no_comment` is false, highlighted text markup with no comment body shows no popup.
+fn annotation_hover_text(a: &pdfcraft_render::Annotation, display_author_no_comment: bool) -> Option {
if a.in_reply_to.is_some() || a.fill_sign {
return None;
}
- let who = a.author.clone().unwrap_or_else(|| a.subtype.clone());
let body = a.contents.clone().unwrap_or_default();
- Some(if body.is_empty() { who } else { format!("{who}\n{body}") })
+ if body.trim().is_empty() {
+ if !display_author_no_comment && matches!(a.subtype.as_str(), "Highlight" | "Underline" | "StrikeOut" | "Squiggly") {
+ return None;
+ }
+ let who = a.author.clone().unwrap_or_else(|| a.subtype.clone());
+ Some(who)
+ } else {
+ let who = a.author.clone().unwrap_or_else(|| a.subtype.clone());
+ Some(format!("{who}\n{body}"))
+ }
}
/// The request tag for a raster at `scale`: equal tags mean the same scale (to 1/65536).
@@ -2348,6 +2463,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
let mut clicked_link: Option = None;
let mut remote_open: Option<(pdfcraft_engine::DocId, String, pdfcraft_render::RemoteDestination)> = None;
let mut canvas_action: Option = None;
+ let mut page_action: Option = None;
let mut field_menu: Option = None;
let mut open_props: Option<(usize, usize)> = None;
let mut field_props = false;
@@ -2976,7 +3092,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
let sr = xf.user_rect(info, i, a.rect);
if sr.contains(p)
&& hover_text.is_none()
- && let Some(text) = annotation_hover_text(a)
+ && let Some(text) = annotation_hover_text(a, prefs.display_author_hover_no_comment)
{
hover_text = Some((p, text));
}
@@ -3110,11 +3226,17 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
}
return;
}
+ if tool == QuickTool::EditText && let Some(sel) = view.image_selection.clone() {
+ crate::edit_text_ui::image_context_menu(ui, view, doc, sel.page, sel.index, &mut image_action);
+ return;
+ }
+ if view.comments.selected.is_some() {
+ canvas_action = comments::context_menu(ui, view, info, prefs, allowed);
+ return;
+ }
// Over a picture (and no comment): Copy Image, as in Acrobat's page menu.
let mut copy_image = None;
- if view.comments.selected.is_none()
- && let Some((page, at)) = view.comments.context_at
- {
+ if let Some((page, at)) = view.comments.context_at {
// The page's content is parsed once per right-click, not on every frame the menu is open.
let key = egui::Id::new("copy-image-under-menu");
let cached = ui.data(|d| d.get_temp::<(usize, [f64; 2], Option)>(key)).filter(|c| c.0 == page && c.1 == at);
@@ -3138,7 +3260,11 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
ui.separator();
}
}
- canvas_action = comments::context_menu(ui, view, info, prefs, allowed).or(copy_image);
+ if copy_image.is_some() {
+ canvas_action = copy_image;
+ }
+ let (page, at) = view.comments.context_at.unwrap_or((view.current, [0.0, 0.0]));
+ default_page_context_menu(ui, page, at, &mut page_action);
});
(wanted, visible_now)
});
@@ -3296,6 +3422,9 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
} else {
view.links.selected = None;
}
+ if tool != QuickTool::EditText {
+ view.image_selection = None;
+ }
if stamp_placed {
tool = QuickTool::Select;
}
@@ -3397,10 +3526,125 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
});
}
match image_action {
- Some(crate::edit_text_ui::ImageAction::Replace(page, index)) => app.replace_page_image_dialog(page, index),
- Some(crate::edit_text_ui::ImageAction::Save(page, index)) => app.save_page_image(page, index),
- Some(crate::edit_text_ui::ImageAction::Copy(page, index)) => app.copy_page_image(page, index),
- Some(crate::edit_text_ui::ImageAction::CopyFile(page, index)) => app.copy_page_image_file(page, index),
+ Some(crate::edit_text_ui::ImageAction::Replace(page, i)) => app.replace_page_image_dialog(page, i),
+ Some(crate::edit_text_ui::ImageAction::Save(page, i)) => app.save_page_image(page, i),
+ Some(crate::edit_text_ui::ImageAction::Copy(page, i)) => app.copy_page_image(page, i),
+ Some(crate::edit_text_ui::ImageAction::CopyFile(page, i)) => app.copy_page_image_file(page, i),
+ Some(crate::edit_text_ui::ImageAction::Cut(page, i)) => {
+ app.copy_page_image(page, i);
+ app.views[index].pending_edit = Some(pdfcraft_engine::Edit::EditPageImage {
+ page,
+ index: i,
+ change: pdfcraft_engine::ImageEdit::Delete,
+ });
+ app.views[index].image_selection = None;
+ }
+ Some(crate::edit_text_ui::ImageAction::DrawFreehand) => {
+ app.quick_tool = crate::QuickTool::Comment(crate::comments::CommentTool::Ink);
+ }
+ Some(crate::edit_text_ui::ImageAction::Redact(page, i)) => {
+ if let Some(d) = app.session.get(app.views[index].id) {
+ let images = d.page_images(page);
+ if let Some(img) = images.get(i) {
+ let r = img.visible_rect.unwrap_or(img.rect);
+ let quad = [r[0], r[1], r[2], r[1], r[2], r[3], r[0], r[3]];
+ let author = app.comment_prefs.author.clone();
+ app.views[index].pending_edit = Some(app.redact_prefs.mark(page, vec![quad], &author));
+ }
+ }
+ }
+ Some(crate::edit_text_ui::ImageAction::CreateLink(page, i)) => {
+ if let Some(d) = app.session.get(app.views[index].id) {
+ let images = d.page_images(page);
+ if let Some(img) = images.get(i) {
+ let r = img.visible_rect.unwrap_or(img.rect);
+ app.open_link_props(page, Some(r), None);
+ }
+ }
+ }
+ Some(crate::edit_text_ui::ImageAction::RecognizeText) => {
+ app.dialog = Some(crate::Dialog::RecognizeText);
+ }
+ Some(crate::edit_text_ui::ImageAction::AddComment(page, i)) => {
+ if let Some(d) = app.session.get(app.views[index].id) {
+ let images = d.page_images(page);
+ if let Some(img) = images.get(i) {
+ let r = img.visible_rect.unwrap_or(img.rect);
+ let center = [(r[0] + r[2]) / 2.0, (r[1] + r[3]) / 2.0];
+ app.views[index].comments.context_at = Some((page, center));
+ app.views[index].comments.composer = Some(crate::comments::Composer {
+ page,
+ at: center,
+ kind: crate::comments::ComposerKind::Note,
+ text: String::new(),
+ focus: true,
+ });
+ }
+ }
+ }
+ Some(crate::edit_text_ui::ImageAction::Crop) => {
+ if let Some(s) = app.views[index].image_selection.as_mut() {
+ s.crop_mode = true;
+ s.crop_rect = None;
+ }
+ }
+ None => {}
+ }
+ match page_action {
+ Some(PageMenuAction::RotateCCW(page)) => {
+ app.views[index].pending_edit = Some(pdfcraft_engine::Edit::RotatePages { pages: vec![page], degrees: -90 });
+ }
+ Some(PageMenuAction::RotateCW(page)) => {
+ app.views[index].pending_edit = Some(pdfcraft_engine::Edit::RotatePages { pages: vec![page], degrees: 90 });
+ }
+ Some(PageMenuAction::Print) => {
+ app.open_print();
+ }
+ Some(PageMenuAction::SelectTool) => {
+ app.quick_tool = QuickTool::Select;
+ }
+ Some(PageMenuAction::HandTool) => {
+ app.quick_tool = QuickTool::Hand;
+ }
+ Some(PageMenuAction::MarqueeZoom) => {
+ app.quick_tool = QuickTool::MarqueeZoom;
+ }
+ Some(PageMenuAction::AddComment(page, at)) => {
+ app.views[index].comments.composer = Some(crate::comments::Composer {
+ page,
+ at,
+ kind: crate::comments::ComposerKind::Note,
+ text: String::new(),
+ focus: true,
+ });
+ }
+ Some(PageMenuAction::AddBookmark(_page)) => {
+ app.bookmark_action(crate::panels::BmAction::New);
+ }
+ Some(PageMenuAction::TakeSnapshot) => {
+ app.quick_tool = QuickTool::Snapshot;
+ }
+ Some(PageMenuAction::EditPdf) => {
+ app.quick_tool = QuickTool::EditText;
+ }
+ Some(PageMenuAction::AddText) => {
+ app.quick_tool = QuickTool::AddText;
+ }
+ Some(PageMenuAction::AddImage) => {
+ app.add_image_dialog();
+ }
+ Some(PageMenuAction::DeletePage(page)) => {
+ app.views[index].pending_edit = Some(pdfcraft_engine::Edit::DeletePages { pages: vec![page] });
+ }
+ Some(PageMenuAction::ExportPdf) => {
+ app.dialog = Some(crate::Dialog::Export(crate::export_ui::ExportKind::Image));
+ }
+ Some(PageMenuAction::Find) => {
+ app.views[index].open_find();
+ }
+ Some(PageMenuAction::DocProperties) => {
+ app.dialog = Some(crate::Dialog::Properties(crate::PropsTab::Description));
+ }
None => {}
}
if let Some(why) = refused {
@@ -3456,24 +3700,30 @@ fn selection_actions(ui: &mut egui::Ui, viewport: Rect, view: &mut DocView, info
if !viewport.intersects(rect) {
return;
}
- let x = rect.left().clamp(viewport.left() + 8.0, (viewport.right() - 520.0).max(viewport.left() + 8.0));
+ let menu_width = 184.0;
+ let ideal_x = rect.right() - 24.0;
+ let max_x = (viewport.right() - menu_width - 8.0).max(viewport.left() + 8.0);
+ let x = ideal_x.clamp(viewport.left() + 8.0, max_x);
let y = if rect.bottom() + 48.0 < viewport.bottom() { rect.bottom() + 6.0 } else { (rect.top() - 44.0).max(viewport.top() + 6.0) };
let mut chosen = None;
egui::Area::new(egui::Id::new(("text-selection-actions", view.id.0))).order(egui::Order::Foreground).fixed_pos(pos2(x, y)).show(ui.ctx(), |ui| {
- egui::Frame::popup(ui.style()).show(ui, |ui| {
+ egui::Frame::popup(ui.style()).corner_radius(CornerRadius::same(12)).show(ui, |ui| {
+ ui.spacing_mut().item_spacing.x = 2.0;
ui.horizontal(|ui| {
- for (label, action) in [
- (tl!("Add comment"), SelectionAction::Note),
- (tl!("Highlight"), SelectionAction::Markup(comments::CommentTool::Highlight)),
- (tl!("Underline"), SelectionAction::Markup(comments::CommentTool::Underline)),
- (tl!("Strikethrough"), SelectionAction::Markup(comments::CommentTool::StrikeOut)),
- (tl!("Replace text"), SelectionAction::Replace),
- ] {
- if ui.add_enabled(can_comment, egui::Button::new(label)).clicked() {
- chosen = Some(action);
+ ui.add_enabled_ui(can_comment, |ui| {
+ for (icon, tooltip, action) in [
+ ("message-square-plus", tl!("Add comment"), SelectionAction::Note),
+ ("highlighter", tl!("Highlight"), SelectionAction::Markup(comments::CommentTool::Highlight)),
+ ("underline", tl!("Underline"), SelectionAction::Markup(comments::CommentTool::Underline)),
+ ("strikethrough", tl!("Strikethrough"), SelectionAction::Markup(comments::CommentTool::StrikeOut)),
+ ("replace", tl!("Replace text"), SelectionAction::Replace),
+ ] {
+ if icons::button(ui, icon, 26.0, false, tooltip).clicked() {
+ chosen = Some(action);
+ }
}
- }
- if ui.button(tl!("Copy")).clicked() {
+ });
+ if icons::button(ui, "copy", 26.0, false, tl!("Copy")).clicked() {
chosen = Some(SelectionAction::Copy);
}
});
@@ -4568,8 +4818,26 @@ mod tests {
#[test]
fn hover_popup_skips_fill_and_sign_marks() {
- assert_eq!(annotation_hover_text(&annotation(false)).as_deref(), Some("FreeText\nHello"));
- assert_eq!(annotation_hover_text(&annotation(true)), None);
+ assert_eq!(annotation_hover_text(&annotation(false), true).as_deref(), Some("FreeText\nHello"));
+ assert_eq!(annotation_hover_text(&annotation(true), true), None);
+ }
+
+ #[test]
+ fn hover_popup_respects_author_on_empty_highlight() {
+ let mut a = annotation(false);
+ a.subtype = "Highlight".to_string();
+ a.author = Some("Grace Hopper".to_string());
+ a.contents = None;
+
+ // When display_author_no_comment is true, author is shown
+ assert_eq!(annotation_hover_text(&a, true).as_deref(), Some("Grace Hopper"));
+
+ // When display_author_no_comment is false, no hover popup is shown for empty highlight
+ assert_eq!(annotation_hover_text(&a, false), None);
+
+ // When a comment is added, comment popup is shown regardless of the setting
+ a.contents = Some("Important passage".to_string());
+ assert_eq!(annotation_hover_text(&a, false).as_deref(), Some("Grace Hopper\nImportant passage"));
}
#[test]
diff --git a/crates/ui-egui/src/comments.rs b/crates/ui-egui/src/comments.rs
index 774e37b30f..7789453dc3 100644
--- a/crates/ui-egui/src/comments.rs
+++ b/crates/ui-egui/src/comments.rs
@@ -250,6 +250,8 @@ pub struct CommentPrefs {
pub pinned: bool,
/// The tool each flyout group shows (the last one used).
pub group_tool: [CommentTool; 3],
+ /// Whether to display author name on hover over highlighted text when no comment is added.
+ pub display_author_hover_no_comment: bool,
}
impl Default for CommentPrefs {
@@ -259,6 +261,7 @@ impl Default for CommentPrefs {
styles: ALL.iter().map(|t| (*t, Style::default_for(&t.sample()))).collect(),
pinned: false,
group_tool: [CommentTool::Note, CommentTool::Highlight, CommentTool::Ink],
+ display_author_hover_no_comment: true,
}
}
}
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 39355e6913..38f63587cb 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -551,43 +551,111 @@ fn finish(cv: &mut ContentView, d: TextDraft, added: &[Added]) -> Option {
/// Returns the changed style; for a selected item the caller turns it into an update.
pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) -> Option {
let mut s = style.clone();
- widgets::section_title(ui, tl!("Format text"));
- ui.horizontal(|ui| {
- egui::ComboBox::from_id_salt("font-family").selected_text(s.family.label()).width(110.0).show_ui(ui, |ui| {
+ widgets::section_title(ui, tl!("FORMAT TEXT"));
+ egui::ComboBox::from_id_salt("font-family")
+ .selected_text(s.family.label())
+ .width(ui.available_width().max(180.0))
+ .show_ui(ui, |ui| {
+ ui.label(egui::RichText::new(tl!("Standard fonts")).weak().small());
for f in [FontFamily::Helvetica, FontFamily::Times, FontFamily::Courier] {
ui.selectable_value(&mut s.family, f, f.label());
}
- });
- // A list rather than a drag value: every change is an undo step.
- egui::ComboBox::from_id_salt("font-size").selected_text(format!("{} pt", s.size)).width(70.0).show_ui(ui, |ui| {
- for size in [8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
- ui.selectable_value(&mut s.size, size, format!("{size} pt"));
+ #[cfg(not(target_arch = "wasm32"))]
+ if let Some(installed) = crate::files::installed_font_files(ui.ctx()) {
+ if !installed.is_empty() {
+ ui.separator();
+ ui.label(egui::RichText::new(tl!("Installed fonts")).weak().small());
+ for font in &installed {
+ let fam = if font.family.eq_ignore_ascii_case("times") || font.face.to_ascii_lowercase().contains("times") {
+ FontFamily::Times
+ } else if font.family.eq_ignore_ascii_case("courier") || font.face.to_ascii_lowercase().contains("courier") {
+ FontFamily::Courier
+ } else {
+ FontFamily::Helvetica
+ };
+ if ui.selectable_label(s.family == fam, &font.face).clicked() {
+ s.family = fam;
+ }
+ }
+ }
}
});
- });
ui.horizontal(|ui| {
- if ui.selectable_label(s.bold, egui::RichText::new("B").strong()).on_hover_text(tl!("Bold")).clicked() {
- s.bold = !s.bold;
+ egui::ComboBox::from_id_salt("font-size")
+ .selected_text(format!("{:.1}", s.size))
+ .width(55.0)
+ .show_ui(ui, |ui| {
+ for size in [6.0, 8.0, 9.0, 10.0, 10.5, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
+ ui.selectable_value(&mut s.size, size, format!("{size}"));
+ }
+ });
+ let (color_rect, color_resp) = ui.allocate_exact_size(egui::vec2(20.0, 20.0), egui::Sense::click());
+ let color_val = crate::comments::color32(s.color);
+ ui.painter().rect_filled(color_rect, t.radius, color_val);
+ ui.painter().rect_stroke(color_rect, t.radius, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
+ let show_palette_id = ui.id().with("show-palette-added");
+ let mut show_palette = ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false);
+ if color_resp.on_hover_text(tl!("Text color")).clicked() {
+ show_palette = !show_palette;
+ ui.data_mut(|d| d.insert_temp(show_palette_id, show_palette));
}
- if ui.selectable_label(s.italic, egui::RichText::new("I").italics()).on_hover_text(tl!("Italic")).clicked() {
- s.italic = !s.italic;
+ ui.add_space(2.0);
+ let is_bullet = crate::edit_text_ui::is_bulleted(&s.text);
+ if crate::icons::button(ui, "list", 24.0, is_bullet, tl!("Bullet list")).clicked() {
+ crate::edit_text_ui::toggle_bullet_list(&mut s.text);
}
- ui.separator();
+ let is_num = crate::edit_text_ui::is_numbered(&s.text);
+ if crate::icons::button(ui, "list-ordered", 24.0, is_num, tl!("Numbered list")).clicked() {
+ crate::edit_text_ui::toggle_numbered_list(&mut s.text);
+ }
+ ui.add_space(2.0);
for (a, icon, tip) in [
(TextAlign::Left, "align-left", tl!("Align left")),
(TextAlign::Center, "align-center", tl!("Centre")),
(TextAlign::Right, "align-right", tl!("Align right")),
(TextAlign::Justify, "align-justify", tl!("Justify")),
] {
- if crate::icons::button(ui, icon, 26.0, s.align == a, tip).clicked() {
+ if crate::icons::button(ui, icon, 24.0, s.align == a, tip).clicked() {
s.align = a;
}
}
});
- let c = s.color;
- if let Some(picked) = crate::comments::swatch_grid(ui, Some(c)) {
- s.color = picked;
+ let show_palette_id = ui.id().with("show-palette-added");
+ if ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false) {
+ if let Some(picked) = crate::comments::swatch_grid(ui, Some(s.color)) {
+ s.color = picked;
+ }
}
+ ui.horizontal(|ui| {
+ let b_resp = ui.selectable_label(s.bold, egui::RichText::new("T").strong().size(14.0));
+ if b_resp.on_hover_text(tl!("Bold")).clicked() {
+ s.bold = !s.bold;
+ }
+ let i_resp = ui.selectable_label(s.italic, egui::RichText::new("T").italics().size(14.0));
+ if i_resp.on_hover_text(tl!("Italic")).clicked() {
+ s.italic = !s.italic;
+ }
+ let u_resp = ui.selectable_label(false, egui::RichText::new("T̲").size(14.0));
+ let _ = u_resp;
+ let sup_resp = ui.selectable_label(false, egui::RichText::new("T¹").size(13.0));
+ if sup_resp.on_hover_text(tl!("Superscript")).clicked() {
+ let all_sup = !s.text.is_empty() && s.text.chars().all(|c| crate::edit_text_ui::char_from_superscript(c) != c);
+ s.text = if all_sup {
+ s.text.chars().map(crate::edit_text_ui::char_from_superscript).collect()
+ } else {
+ s.text.chars().map(crate::edit_text_ui::char_to_superscript).collect()
+ };
+ }
+ let sub_resp = ui.selectable_label(false, egui::RichText::new("T₁").size(13.0));
+ if sub_resp.on_hover_text(tl!("Subscript")).clicked() {
+ let all_sub = !s.text.is_empty() && s.text.chars().all(|c| crate::edit_text_ui::char_from_subscript(c) != c);
+ s.text = if all_sub {
+ s.text.chars().map(crate::edit_text_ui::char_from_subscript).collect()
+ } else {
+ s.text.chars().map(crate::edit_text_ui::char_to_subscript).collect()
+ };
+ }
+ });
ui.label(egui::RichText::new(tl!("Thai and Arabic use regular fallback fonts when available.")).small().color(t.text_faint));
(s != *style).then_some(s)
}
diff --git a/crates/ui-egui/src/edit_text_ui.rs b/crates/ui-egui/src/edit_text_ui.rs
index 65c50528ec..73d6eaaf41 100644
--- a/crates/ui-egui/src/edit_text_ui.rs
+++ b/crates/ui-egui/src/edit_text_ui.rs
@@ -133,39 +133,298 @@ pub struct LineEditor {
pub struct Extras {
pub underline: bool,
pub line_spacing: f64,
+ pub paragraph_spacing: f64,
pub char_spacing: f64,
pub scale: f64,
}
impl Default for Extras {
fn default() -> Self {
- Extras { underline: false, line_spacing: 0.0, char_spacing: 0.0, scale: 100.0 }
+ Extras { underline: false, line_spacing: 0.0, paragraph_spacing: 0.0, char_spacing: 0.0, scale: 100.0 }
}
}
-/// Underline, line spacing, character spacing and horizontal scale for the paragraph being
-/// edited (under Format text). Returns `true` when something changed.
+pub fn is_bulleted(text: &str) -> bool {
+ let mut lines = text.lines();
+ let Some(first) = lines.next() else { return false };
+ first.trim_start().starts_with("• ") || first.trim_start().starts_with("- ")
+}
+
+pub fn is_numbered(text: &str) -> bool {
+ let mut lines = text.lines();
+ let Some(first) = lines.next() else { return false };
+ let t = first.trim_start();
+ let num_end = t.find('.').unwrap_or(0);
+ num_end > 0 && t[..num_end].chars().all(|c| c.is_ascii_digit()) && t[num_end..].starts_with(". ")
+}
+
+pub fn toggle_bullet_list(text: &mut String) -> bool {
+ let lines: Vec<&str> = text.lines().collect();
+ if lines.is_empty() {
+ return false;
+ }
+ let all_bulleted = lines.iter().all(|l| {
+ let t = l.trim_start();
+ t.is_empty() || t.starts_with("• ") || t.starts_with("- ")
+ });
+ let mut new_text = String::with_capacity(text.len() + 16);
+ for (i, line) in lines.iter().enumerate() {
+ if i > 0 {
+ new_text.push('\n');
+ }
+ let trimmed = line.trim_start();
+ if all_bulleted {
+ if let Some(rest) = trimmed.strip_prefix("• ").or_else(|| trimmed.strip_prefix("- ")) {
+ new_text.push_str(rest);
+ } else {
+ new_text.push_str(line);
+ }
+ } else if trimmed.is_empty() {
+ new_text.push_str(line);
+ } else if trimmed.starts_with("• ") {
+ new_text.push_str(line);
+ } else {
+ new_text.push_str("• ");
+ new_text.push_str(line);
+ }
+ }
+ if new_text != *text {
+ *text = new_text;
+ true
+ } else {
+ false
+ }
+}
+
+pub fn toggle_numbered_list(text: &mut String) -> bool {
+ let lines: Vec<&str> = text.lines().collect();
+ if lines.is_empty() {
+ return false;
+ }
+ let is_num_line = |l: &str| {
+ let t = l.trim_start();
+ if t.is_empty() {
+ return true;
+ }
+ let dot_idx = t.find('.').unwrap_or(0);
+ dot_idx > 0 && t[..dot_idx].chars().all(|c| c.is_ascii_digit()) && t[dot_idx..].starts_with(". ")
+ };
+ let all_numbered = lines.iter().all(|l| is_num_line(l));
+ let mut new_text = String::with_capacity(text.len() + 16);
+ let mut num = 1;
+ for (i, line) in lines.iter().enumerate() {
+ if i > 0 {
+ new_text.push('\n');
+ }
+ let t = line.trim_start();
+ if all_numbered {
+ if let Some(dot_idx) = t.find('.') {
+ if dot_idx > 0 && t[..dot_idx].chars().all(|c| c.is_ascii_digit()) && t[dot_idx..].starts_with(". ") {
+ new_text.push_str(&t[dot_idx + 2..]);
+ continue;
+ }
+ }
+ new_text.push_str(line);
+ } else if t.is_empty() {
+ new_text.push_str(line);
+ } else {
+ use std::fmt::Write as _;
+ let _ = write!(new_text, "{num}. ");
+ new_text.push_str(t);
+ num += 1;
+ }
+ }
+ if new_text != *text {
+ *text = new_text;
+ true
+ } else {
+ false
+ }
+}
+
+pub fn char_to_superscript(c: char) -> char {
+ match c {
+ '0' => '⁰', '1' => '¹', '2' => '²', '3' => '³', '4' => '⁴',
+ '5' => '⁵', '6' => '⁶', '7' => '⁷', '8' => '⁸', '9' => '⁹',
+ '+' => '⁺', '-' | '−' => '⁻', '=' => '⁼', '(' => '⁽', ')' => '⁾',
+ 'a' => 'ᵃ', 'b' => 'ᵇ', 'c' => 'ᶜ', 'd' => 'ᵈ', 'e' => 'ᵉ',
+ 'f' => 'ᶠ', 'g' => 'ᵍ', 'h' => 'ʰ', 'i' => 'ⁱ', 'j' => 'ʲ',
+ 'k' => 'ᵏ', 'l' => 'ˡ', 'm' => 'ᵐ', 'n' => 'ⁿ', 'o' => 'ᵒ',
+ 'p' => 'ᵖ', 'r' => 'ʳ', 's' => 'ˢ', 't' => 'ᵗ', 'u' => 'ᵘ',
+ 'v' => 'ᵛ', 'w' => 'ʷ', 'x' => 'ˣ', 'y' => 'ʸ', 'z' => 'ᶻ',
+ 'A' => 'ᴬ', 'B' => 'ᴮ', 'D' => 'ᴰ', 'E' => 'ᴱ', 'G' => 'ᴳ',
+ 'H' => 'ᴴ', 'I' => 'ᴵ', 'J' => 'ᴶ', 'K' => 'ᴷ', 'L' => 'ᴸ',
+ 'M' => 'ᴹ', 'N' => 'ᴺ', 'O' => 'ᴼ', 'P' => 'ᴾ', 'R' => 'ᴿ',
+ 'T' => 'ᵀ', 'U' => 'ᵁ', 'V' => 'ⱽ', 'W' => 'ᵂ',
+ other => other,
+ }
+}
+
+pub fn char_from_superscript(c: char) -> char {
+ match c {
+ '⁰' => '0', '¹' => '1', '²' => '2', '³' => '3', '⁴' => '4',
+ '⁵' => '5', '⁶' => '6', '⁷' => '7', '⁸' => '8', '⁹' => '9',
+ '⁺' => '+', '⁻' => '-', '⁼' => '=', '⁽' => '(', '⁾' => ')',
+ 'ᵃ' => 'a', 'ᵇ' => 'b', 'ᶜ' => 'c', 'ᵈ' => 'd', 'ᵉ' => 'e',
+ 'ᶠ' => 'f', 'ᵍ' => 'g', 'ʰ' => 'h', 'ⁱ' => 'i', 'ʲ' => 'j',
+ 'ᵏ' => 'k', 'ˡ' => 'l', 'ᵐ' => 'm', 'ⁿ' => 'n', 'ᵒ' => 'o',
+ 'ᵖ' => 'p', 'ʳ' => 'r', 'ˢ' => 's', 'ᵗ' => 't', 'ᵘ' => 'u',
+ 'ᵛ' => 'v', 'ʷ' => 'w', 'ˣ' => 'x', 'ʸ' => 'y', 'ᶻ' => 'z',
+ 'ᴬ' => 'A', 'ᴮ' => 'B', 'ᴰ' => 'D', 'ᴱ' => 'E', 'ᴳ' => 'G',
+ 'ᴴ' => 'H', 'ᴵ' => 'I', 'ᴶ' => 'J', 'ᴷ' => 'K', 'ᴸ' => 'L',
+ 'ᴹ' => 'M', 'ᴺ' => 'N', 'ᴼ' => 'O', 'ᴾ' => 'P', 'ᴿ' => 'R',
+ 'ᵀ' => 'T', 'ᵁ' => 'U', 'ⱽ' => 'V', 'ᵂ' => 'W',
+ other => other,
+ }
+}
+
+pub fn char_to_subscript(c: char) -> char {
+ match c {
+ '0' => '₀', '1' => '₁', '2' => '₂', '3' => '₃', '4' => '₄',
+ '5' => '₅', '6' => '₆', '7' => '₇', '8' => '₈', '9' => '₉',
+ '+' => '₊', '-' | '−' => '₋', '=' => '₌', '(' => '₍', ')' => '₎',
+ 'a' => 'ₐ', 'e' => 'ₑ', 'h' => 'ₕ', 'i' => 'ᵢ', 'j' => 'ⱼ',
+ 'k' => 'ₖ', 'l' => 'ₗ', 'm' => 'ₘ', 'n' => 'ₙ', 'o' => 'ₒ',
+ 'p' => 'ₚ', 'r' => 'ᵣ', 's' => 'ₛ', 't' => 'ₜ', 'u' => 'ᵤ',
+ 'v' => 'ᵥ', 'x' => 'ₓ',
+ other => other,
+ }
+}
+
+pub fn char_from_subscript(c: char) -> char {
+ match c {
+ '₀' => '0', '₁' => '1', '₂' => '2', '₃' => '3', '₄' => '4',
+ '₅' => '5', '₆' => '6', '₇' => '7', '₈' => '8', '₉' => '9',
+ '₊' => '+', '₋' => '-', '₌' => '=', '₍' => '(', '₎' => ')',
+ 'ₐ' => 'a', 'ₑ' => 'e', 'ₕ' => 'h', 'ᵢ' => 'i', 'ⱼ' => 'j',
+ 'ₖ' => 'k', 'ₗ' => 'l', 'ₘ' => 'm', 'ₙ' => 'n', 'ₒ' => 'o',
+ 'ₚ' => 'p', 'ᵣ' => 'r', 'ₛ' => 's', 'ₜ' => 't', 'ᵤ' => 'u',
+ 'ᵥ' => 'v', 'ₓ' => 'x',
+ other => other,
+ }
+}
+
+fn snap_char_boundaries(s: &str, start: usize, end: usize) -> (usize, usize) {
+ let mut s_idx = start.min(s.len());
+ while s_idx > 0 && !s.is_char_boundary(s_idx) {
+ s_idx -= 1;
+ }
+ let mut e_idx = end.min(s.len());
+ while e_idx < s.len() && !s.is_char_boundary(e_idx) {
+ e_idx += 1;
+ }
+ (s_idx, e_idx)
+}
+
+pub fn toggle_superscript(ed: &mut LineEditor) -> bool {
+ let (s_pos, e_pos) = if let Some(r) = &ed.selection {
+ (r.start.min(ed.text.len()), r.end.min(ed.text.len()))
+ } else {
+ (0, ed.text.len())
+ };
+ let (start, end) = snap_char_boundaries(&ed.text, s_pos, e_pos);
+ if start >= end {
+ return false;
+ }
+ let target = &ed.text[start..end];
+ let all_sup = target.chars().all(|c| char_from_superscript(c) != c);
+ let converted: String = if all_sup {
+ target.chars().map(char_from_superscript).collect()
+ } else {
+ target.chars().map(char_to_superscript).collect()
+ };
+ if converted != target {
+ let conv_len = converted.len();
+ ed.text.replace_range(start..end, &converted);
+ if ed.selection.is_some() {
+ ed.selection = Some(start..start + conv_len);
+ }
+ true
+ } else {
+ false
+ }
+}
+
+pub fn toggle_subscript(ed: &mut LineEditor) -> bool {
+ let (s_pos, e_pos) = if let Some(r) = &ed.selection {
+ (r.start.min(ed.text.len()), r.end.min(ed.text.len()))
+ } else {
+ (0, ed.text.len())
+ };
+ let (start, end) = snap_char_boundaries(&ed.text, s_pos, e_pos);
+ if start >= end {
+ return false;
+ }
+ let target = &ed.text[start..end];
+ let all_sub = target.chars().all(|c| char_from_subscript(c) != c);
+ let converted: String = if all_sub {
+ target.chars().map(char_from_subscript).collect()
+ } else {
+ target.chars().map(char_to_subscript).collect()
+ };
+ if converted != target {
+ let conv_len = converted.len();
+ ed.text.replace_range(start..end, &converted);
+ if ed.selection.is_some() {
+ ed.selection = Some(start..start + conv_len);
+ }
+ true
+ } else {
+ false
+ }
+}
+
+/// Underline, value-based line spacing, paragraph spacing, character spacing and horizontal
+/// scale for the paragraph being edited. Returns `true` when something changed.
pub(crate) fn extras_panel(ui: &mut egui::Ui, e: &mut Extras) -> bool {
let before = *e;
ui.horizontal(|ui| {
- if crate::icons::button(ui, "underline", 26.0, e.underline, tl!("Underline")).clicked() {
- e.underline = !e.underline;
+ ui.label(egui::RichText::new("↕≡").strong()).on_hover_text(tl!("Line spacing"));
+ let mut ls = if e.line_spacing <= 0.0 { 1.20 } else { e.line_spacing };
+ if ui.add(egui::DragValue::new(&mut ls).range(0.5..=5.0).speed(0.01).custom_formatter(|v, _| format!("{v:.2}"))).changed() {
+ e.line_spacing = (ls * 100.0).round() / 100.0;
}
- let zero = tl!("Line spacing").to_string();
- let label = |v: f64| if v == 0.0 { zero.clone() } else { format!("{v:.2}×") };
- egui::ComboBox::from_id_salt("line-spacing").selected_text(label(e.line_spacing)).width(110.0).show_ui(ui, |ui| {
- for v in [1.0, 1.15, 1.5, 2.0] {
- ui.selectable_value(&mut e.line_spacing, v, label(v));
+ egui::ComboBox::from_id_salt("line-spacing-presets").selected_text("").width(16.0).show_ui(ui, |ui| {
+ for v in [1.0, 1.15, 1.25, 1.33, 1.5, 2.0, 2.5, 3.0] {
+ if ui.selectable_label((e.line_spacing - v).abs() < 0.01, format!("{v:.2}×")).clicked() {
+ e.line_spacing = v;
+ }
+ }
+ });
+ ui.add_space(8.0);
+ ui.label(egui::RichText::new("↕≡").weak()).on_hover_text(tl!("Paragraph spacing"));
+ let mut ps = e.paragraph_spacing;
+ if ui.add(egui::DragValue::new(&mut ps).range(0.0..=100.0).speed(0.05).custom_formatter(|v, _| format!("{v:.2}"))).changed() {
+ e.paragraph_spacing = (ps * 100.0).round() / 100.0;
+ }
+ egui::ComboBox::from_id_salt("para-spacing-presets").selected_text("").width(16.0).show_ui(ui, |ui| {
+ for v in [0.0, 0.13, 0.25, 0.5, 1.0, 2.0] {
+ if ui.selectable_label((e.paragraph_spacing - v).abs() < 0.01, format!("{v:.2}")).clicked() {
+ e.paragraph_spacing = v;
+ }
}
});
});
ui.horizontal(|ui| {
- let l = ui.label(tl!("Character spacing"));
- ui.add(egui::DragValue::new(&mut e.char_spacing).range(-5.0..=50.0).speed(0.1).suffix(" pt")).labelled_by(l.id);
- });
- ui.horizontal(|ui| {
- let l = ui.label(tl!("Horizontal scale"));
- ui.add(egui::DragValue::new(&mut e.scale).range(10.0..=400.0).speed(1.0).suffix(" %")).labelled_by(l.id);
+ ui.label(egui::RichText::new("T↔").strong()).on_hover_text(tl!("Horizontal scale"));
+ ui.add(egui::DragValue::new(&mut e.scale).range(10.0..=400.0).speed(1.0).custom_formatter(|v, _| format!("{v:.0}")));
+ egui::ComboBox::from_id_salt("scale-presets").selected_text("").width(16.0).show_ui(ui, |ui| {
+ for v in [50.0, 75.0, 90.0, 100.0, 110.0, 125.0, 150.0, 200.0] {
+ if ui.selectable_label((e.scale - v).abs() < 0.01, format!("{v:.0}%")).clicked() {
+ e.scale = v;
+ }
+ }
+ });
+ ui.add_space(8.0);
+ ui.label(egui::RichText::new("V↔A").strong()).on_hover_text(tl!("Character spacing"));
+ ui.add(egui::DragValue::new(&mut e.char_spacing).range(-5.0..=50.0).speed(0.05).custom_formatter(|v, _| format!("{v:.2}")));
+ egui::ComboBox::from_id_salt("char-spacing-presets").selected_text("").width(16.0).show_ui(ui, |ui| {
+ for v in [-1.0, -0.5, -0.24, 0.0, 0.25, 0.5, 1.0, 2.0] {
+ if ui.selectable_label((e.char_spacing - v).abs() < 0.01, format!("{v:.2} pt")).clicked() {
+ e.char_spacing = v;
+ }
+ }
+ });
});
*e != before
}
@@ -310,13 +569,41 @@ pub(crate) fn editor_fill(text: Color32) -> Color32 {
if contrast(text, Color32::WHITE) >= contrast(text, DARK_EDITOR_FILL) { Color32::WHITE } else { DARK_EDITOR_FILL }
}
+/// The 8 resize handles on an image (4 corners + 4 edge centers).
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ImageHandle {
+ TopLeft,
+ TopCenter,
+ TopRight,
+ RightCenter,
+ BottomRight,
+ BottomCenter,
+ BottomLeft,
+ LeftCenter,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum DragTarget {
+ Move,
+ Handle(ImageHandle),
+ CropHandle(ImageHandle),
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct ImageDrag {
+ pub start: Pos2,
+ pub target: DragTarget,
+ pub initial_rect: Rect,
+}
+
/// A selected page image, and what the pointer is doing to it.
#[derive(Clone, Debug, PartialEq)]
pub struct ImageSelection {
pub page: usize,
pub index: usize,
- /// Dragging: the start point and, for a corner, the opposite corner (screen).
- drag: Option<(Pos2, Option)>,
+ pub crop_mode: bool,
+ pub crop_rect: Option,
+ pub drag: Option,
}
impl ImageSelection {
@@ -325,7 +612,7 @@ impl ImageSelection {
}
}
-/// Once a selected corner is grabbed, text under it cannot take over the gesture. The same
+/// Once a selected handle is grabbed, text under it cannot take over the gesture. The same
/// applies after the pointer leaves the image/page while dragging.
pub(crate) fn image_owns_pointer(ui: &egui::Ui, xf: &PageXform, page: usize, info: &DocInfo, view: &DocView) -> bool {
let Some(selection) = view.image_selection.as_ref().filter(|s| s.page == page) else { return false };
@@ -336,7 +623,17 @@ pub(crate) fn image_owns_pointer(ui: &egui::Ui, xf: &PageXform, page: usize, inf
let Some(rect) = image.visible_rect else { return false };
let b = xf.user_rect(info, page, rect.map(|v| v as f32));
let p = ui.input(|i| if i.pointer.primary_down() { i.pointer.press_origin() } else { i.pointer.hover_pos() });
- p.is_some_and(|p| [b.left_top(), b.right_top(), b.left_bottom(), b.right_bottom()].iter().any(|c| c.distance(p) < 8.0))
+ let handles = [
+ b.left_top(),
+ Pos2::new(b.center().x, b.top()),
+ b.right_top(),
+ Pos2::new(b.right(), b.center().y),
+ b.right_bottom(),
+ Pos2::new(b.center().x, b.bottom()),
+ b.left_bottom(),
+ Pos2::new(b.left(), b.center().y),
+ ];
+ p.is_some_and(|p| handles.iter().any(|c| c.distance(p) < 8.0))
}
/// What a drag on a paragraph box takes hold of.
@@ -400,6 +697,13 @@ pub(crate) enum ImageAction {
Save(usize, usize),
Copy(usize, usize),
CopyFile(usize, usize),
+ Cut(usize, usize),
+ DrawFreehand,
+ Redact(usize, usize),
+ CreateLink(usize, usize),
+ RecognizeText,
+ AddComment(usize, usize),
+ Crop,
}
fn user_box(xf: &PageXform, info: &DocInfo, page: usize, r: Rect) -> [f64; 4] {
@@ -419,7 +723,7 @@ pub(crate) fn image_input(
info: &DocInfo,
images: &[pdfcraft_engine::PageImage],
view: &mut DocView,
- action: &mut Option,
+ _action: &mut Option,
allow_interaction: bool,
) -> bool {
let boxes: Vec = images.iter().map(|im| im.visible_rect.map_or(Rect::NOTHING, |r| xf.user_rect(info, page, r.map(|v| v as f32)))).collect();
@@ -461,91 +765,307 @@ pub(crate) fn image_input(
painter.rect_stroke(b, CornerRadius::ZERO, Stroke::new(1.5, ACCENT.gamma_multiply(0.7)), egui::StrokeKind::Outside);
}
}
- // The selected image: frame, corner handles, dragging.
+ // The selected image: frame, 8 handles (or crop mode), dragging.
if let Some(i) = selected.filter(|i| boxes.get(*i).is_some_and(|b| b.is_positive())) {
let b = boxes[i];
- let corners = [b.left_top(), b.right_top(), b.left_bottom(), b.right_bottom()];
- let handles = |rect: Rect| {
- for c in [rect.left_top(), rect.right_top(), rect.left_bottom(), rect.right_bottom()] {
- painter.rect(
- Rect::from_center_size(c, egui::vec2(8.0, 8.0)),
- CornerRadius::ZERO,
- Color32::WHITE,
- Stroke::new(1.0, ACCENT),
- egui::StrokeKind::Middle,
- );
+ let is_crop = view.image_selection.as_ref().is_some_and(|s| s.crop_mode);
+
+ let handle_pos = |rect: Rect, h: ImageHandle| match h {
+ ImageHandle::TopLeft => rect.left_top(),
+ ImageHandle::TopCenter => Pos2::new(rect.center().x, rect.top()),
+ ImageHandle::TopRight => rect.right_top(),
+ ImageHandle::RightCenter => Pos2::new(rect.right(), rect.center().y),
+ ImageHandle::BottomRight => rect.right_bottom(),
+ ImageHandle::BottomCenter => Pos2::new(rect.center().x, rect.bottom()),
+ ImageHandle::BottomLeft => rect.left_bottom(),
+ ImageHandle::LeftCenter => Pos2::new(rect.left(), rect.center().y),
+ };
+ let all_handles = [
+ ImageHandle::TopLeft,
+ ImageHandle::TopCenter,
+ ImageHandle::TopRight,
+ ImageHandle::RightCenter,
+ ImageHandle::BottomRight,
+ ImageHandle::BottomCenter,
+ ImageHandle::BottomLeft,
+ ImageHandle::LeftCenter,
+ ];
+ let cursor_for = |h: ImageHandle| match h {
+ ImageHandle::TopLeft | ImageHandle::BottomRight => egui::CursorIcon::ResizeNwSe,
+ ImageHandle::TopRight | ImageHandle::BottomLeft => egui::CursorIcon::ResizeNeSw,
+ ImageHandle::TopCenter | ImageHandle::BottomCenter => egui::CursorIcon::ResizeVertical,
+ ImageHandle::LeftCenter | ImageHandle::RightCenter => egui::CursorIcon::ResizeHorizontal,
+ };
+ let draw_handles = |rect: Rect| {
+ for &h in &all_handles {
+ let c = handle_pos(rect, h);
+ match h {
+ ImageHandle::TopLeft | ImageHandle::TopRight | ImageHandle::BottomLeft | ImageHandle::BottomRight => {
+ painter.rect(
+ Rect::from_center_size(c, egui::vec2(8.0, 8.0)),
+ CornerRadius::ZERO,
+ Color32::WHITE,
+ Stroke::new(1.0, ACCENT),
+ egui::StrokeKind::Middle,
+ );
+ }
+ ImageHandle::TopCenter | ImageHandle::BottomCenter => {
+ painter.rect(
+ Rect::from_center_size(c, egui::vec2(12.0, 6.0)),
+ CornerRadius::same(1),
+ Color32::WHITE,
+ Stroke::new(1.0, ACCENT),
+ egui::StrokeKind::Middle,
+ );
+ }
+ ImageHandle::LeftCenter | ImageHandle::RightCenter => {
+ painter.rect(
+ Rect::from_center_size(c, egui::vec2(6.0, 12.0)),
+ CornerRadius::same(1),
+ Color32::WHITE,
+ Stroke::new(1.0, ACCENT),
+ egui::StrokeKind::Middle,
+ );
+ }
+ }
}
};
- if view.image_selection.as_ref().is_some_and(|s| s.drag.is_none()) {
- painter.rect_stroke(b, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
- handles(b);
- }
- if allow_interaction && let Some(corner) = hover_pos.and_then(|p| corners.iter().position(|c| c.distance(p) < 8.0)) {
- ui.ctx().set_cursor_icon(if matches!(corner, 0 | 3) { egui::CursorIcon::ResizeNwSe } else { egui::CursorIcon::ResizeNeSw });
- }
- let origin = ui.input(|i| i.pointer.press_origin());
- if allow_interaction
- && resp.drag_started()
- && let Some(o) = origin
- {
- let corner = corners.iter().position(|c| c.distance(o) < 8.0);
- if corner.is_some() || image_contains(i, o) {
- let opposite = corner.map(|k| corners[3 - k]);
- if let Some(s) = view.image_selection.as_mut() {
- s.drag = Some((o, opposite));
+
+ if is_crop {
+ let active_crop = view.image_selection.as_ref().and_then(|s| s.crop_rect).unwrap_or(b);
+ let shade_color = Color32::from_rgba_unmultiplied(15, 35, 70, 150);
+ if active_crop.top() > b.top() {
+ painter.rect_filled(Rect::from_min_max(b.min, Pos2::new(b.right(), active_crop.top())), CornerRadius::ZERO, shade_color);
+ }
+ if active_crop.bottom() < b.bottom() {
+ painter.rect_filled(Rect::from_min_max(Pos2::new(b.left(), active_crop.bottom()), b.max), CornerRadius::ZERO, shade_color);
+ }
+ if active_crop.left() > b.left() {
+ painter.rect_filled(Rect::from_min_max(Pos2::new(b.left(), active_crop.top()), Pos2::new(active_crop.left(), active_crop.bottom())), CornerRadius::ZERO, shade_color);
+ }
+ if active_crop.right() < b.right() {
+ painter.rect_filled(Rect::from_min_max(Pos2::new(active_crop.right(), active_crop.top()), Pos2::new(b.right(), active_crop.bottom())), CornerRadius::ZERO, shade_color);
+ }
+
+ painter.rect_stroke(active_crop, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
+ let x1 = active_crop.left() + active_crop.width() / 3.0;
+ let x2 = active_crop.left() + active_crop.width() * 2.0 / 3.0;
+ let y1 = active_crop.top() + active_crop.height() / 3.0;
+ let y2 = active_crop.top() + active_crop.height() * 2.0 / 3.0;
+ painter.line_segment([Pos2::new(x1, active_crop.top()), Pos2::new(x1, active_crop.bottom())], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter.line_segment([Pos2::new(x2, active_crop.top()), Pos2::new(x2, active_crop.bottom())], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter.line_segment([Pos2::new(active_crop.left(), y1), Pos2::new(active_crop.right(), y1)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter.line_segment([Pos2::new(active_crop.left(), y2), Pos2::new(active_crop.right(), y2)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+
+ let crop_handles = [
+ ImageHandle::TopCenter,
+ ImageHandle::RightCenter,
+ ImageHandle::BottomCenter,
+ ImageHandle::LeftCenter,
+ ];
+ for &h in &crop_handles {
+ let c = handle_pos(active_crop, h);
+ let sz = if matches!(h, ImageHandle::TopCenter | ImageHandle::BottomCenter) { egui::vec2(16.0, 7.0) } else { egui::vec2(7.0, 16.0) };
+ painter.rect(Rect::from_center_size(c, sz), CornerRadius::same(1), Color32::WHITE, Stroke::new(1.5, ACCENT), egui::StrokeKind::Middle);
+ }
+
+ if allow_interaction && let Some(p) = hover_pos {
+ if let Some(&h) = crop_handles.iter().find(|&&h| handle_pos(active_crop, h).distance(p) < 8.0) {
+ ui.ctx().set_cursor_icon(cursor_for(h));
+ } else if active_crop.contains(p) {
+ ui.ctx().set_cursor_icon(egui::CursorIcon::Move);
+ }
+ }
+
+ if allow_interaction {
+ if ui.input(|inp| inp.key_pressed(egui::Key::Enter)) {
+ if active_crop != b {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: i,
+ change: pdfcraft_engine::ImageEdit::Crop(user_box(xf, info, page, active_crop)),
+ });
+ }
+ if let Some(s) = view.image_selection.as_mut() {
+ s.crop_mode = false;
+ s.crop_rect = None;
+ }
+ return true;
+ }
+ if ui.input(|inp| inp.key_pressed(egui::Key::Escape)) {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.crop_mode = false;
+ s.crop_rect = None;
+ }
+ return true;
+ }
+ }
+ } else {
+ if view.image_selection.as_ref().is_some_and(|s| s.drag.is_none()) {
+ painter.rect_stroke(b, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
+ draw_handles(b);
+ }
+ if allow_interaction && let Some(p) = hover_pos {
+ if let Some(&h) = all_handles.iter().find(|&&h| handle_pos(b, h).distance(p) < 8.0) {
+ ui.ctx().set_cursor_icon(cursor_for(h));
}
}
}
- if let Some((start, opposite)) = view.image_selection.as_ref().and_then(|s| s.drag)
+
+ let origin = ui.input(|i| i.pointer.press_origin());
+ if allow_interaction && resp.drag_started() && let Some(o) = origin {
+ if is_crop {
+ let active_crop = view.image_selection.as_ref().and_then(|s| s.crop_rect).unwrap_or(b);
+ let crop_handles = [
+ ImageHandle::TopCenter,
+ ImageHandle::RightCenter,
+ ImageHandle::BottomCenter,
+ ImageHandle::LeftCenter,
+ ];
+ let hit_edge = crop_handles.iter().copied().find(|&h| handle_pos(active_crop, h).distance(o) < 8.0);
+ if let Some(h) = hit_edge {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = Some(ImageDrag { start: o, target: DragTarget::CropHandle(h), initial_rect: active_crop });
+ }
+ } else if active_crop.contains(o) {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = Some(ImageDrag { start: o, target: DragTarget::Move, initial_rect: active_crop });
+ }
+ }
+ } else {
+ let hit_handle = all_handles.iter().copied().find(|&h| handle_pos(b, h).distance(o) < 8.0);
+ if let Some(h) = hit_handle {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = Some(ImageDrag { start: o, target: DragTarget::Handle(h), initial_rect: b });
+ }
+ } else if image_contains(i, o) {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = Some(ImageDrag { start: o, target: DragTarget::Move, initial_rect: b });
+ }
+ }
+ }
+ }
+
+ if let Some(drag) = view.image_selection.as_ref().and_then(|s| s.drag)
&& let Some(p) = hover_pos
{
- let preview = match opposite {
- // Resize from the opposite corner, keeping the aspect ratio.
- Some(fixed) => {
- let (w0, h0) = (b.width().max(1.0), b.height().max(1.0));
- // Use the axis with the larger relative pointer change. Taking the maximum
- // absolute size freezes shrinking when the other axis hasn't moved. Measure
- // from the press point so grabbing a handle off-centre cannot cause a jump.
- let horizontal = (p.x - start.x) * (start.x - fixed.x).signum() / w0;
- let vertical = (p.y - start.y) * (start.y - fixed.y).signum() / h0;
- let delta = if horizontal.abs() > vertical.abs() { horizontal } else { vertical };
- let k = (1.0 + delta).max(0.05);
- let (w, h) = (w0 * k, h0 * k);
- let x = if start.x < fixed.x { fixed.x - w } else { fixed.x };
- let y = if start.y < fixed.y { fixed.y - h } else { fixed.y };
- Rect::from_min_size(Pos2::new(x, y), egui::vec2(w, h))
+ let delta = p - drag.start;
+ let initial = drag.initial_rect;
+ if is_crop {
+ let mut new_crop = initial;
+ match drag.target {
+ DragTarget::CropHandle(ImageHandle::TopCenter) => {
+ let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
+ new_crop = Rect::from_min_max(Pos2::new(initial.left(), y), initial.max);
+ }
+ DragTarget::CropHandle(ImageHandle::BottomCenter) => {
+ let y = (initial.bottom() + delta.y).clamp(initial.top() + 10.0, b.bottom());
+ new_crop = Rect::from_min_max(initial.min, Pos2::new(initial.right(), y));
+ }
+ DragTarget::CropHandle(ImageHandle::LeftCenter) => {
+ let x = (initial.left() + delta.x).clamp(b.left(), initial.right() - 10.0);
+ new_crop = Rect::from_min_max(Pos2::new(x, initial.top()), initial.max);
+ }
+ DragTarget::CropHandle(ImageHandle::RightCenter) => {
+ let x = (initial.right() + delta.x).clamp(initial.left() + 10.0, b.right());
+ new_crop = Rect::from_min_max(initial.min, Pos2::new(x, initial.bottom()));
+ }
+ DragTarget::Move => {
+ let mut translated = initial.translate(delta);
+ if translated.left() < b.left() {
+ translated = translated.translate(egui::vec2(b.left() - translated.left(), 0.0));
+ }
+ if translated.right() > b.right() {
+ translated = translated.translate(egui::vec2(b.right() - translated.right(), 0.0));
+ }
+ if translated.top() < b.top() {
+ translated = translated.translate(egui::vec2(0.0, b.top() - translated.top()));
+ }
+ if translated.bottom() > b.bottom() {
+ translated = translated.translate(egui::vec2(0.0, b.bottom() - translated.bottom()));
+ }
+ new_crop = translated;
+ }
+ _ => {}
}
- None => b.translate(p - start),
- };
- // Move/resize the full placement by the visible frame's change. The engine
- // transforms an isolated crop together with its image, preserving its contents.
- let raw = images.get(i).map_or(b, |im| xf.user_rect(info, page, im.rect.map(|v| v as f32)));
- // A zero-width or zero-height visible frame (or a degenerate ratio) keeps the
- // placement's scale instead of producing inf/NaN.
- let ratio = |new: f32, old: f32| if old.abs() > 1e-3 && (new / old).is_finite() { new / old } else { 1.0 };
- let factor = egui::vec2(ratio(preview.width(), b.width()), ratio(preview.height(), b.height()));
- let target = Rect::from_min_max(preview.min + (raw.min - b.min) * factor, preview.min + (raw.max - b.min) * factor);
- let visible = preview.intersect(xf.rect);
- if visible.is_positive() {
- painter.rect_filled(visible, CornerRadius::ZERO, ACCENT.gamma_multiply(0.04));
- painter.rect_stroke(visible, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
- handles(preview);
- }
- if resp.drag_stopped() || !ui.input(|i| i.pointer.primary_down()) {
if let Some(s) = view.image_selection.as_mut() {
- s.drag = None;
+ s.crop_rect = Some(new_crop);
}
- if preview != b {
- view.pending_edit =
- Some(Edit::EditPageImage { page, index: i, change: pdfcraft_engine::ImageEdit::Move(user_box(xf, info, page, target)) });
+ if resp.drag_stopped() || !ui.input(|i| i.pointer.primary_down()) {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = None;
+ }
}
+ ui.ctx().set_cursor_icon(match drag.target {
+ DragTarget::CropHandle(h) => cursor_for(h),
+ _ => egui::CursorIcon::Grabbing,
+ });
+ return true;
+ } else {
+ let preview = match drag.target {
+ DragTarget::Move => initial.translate(delta),
+ DragTarget::Handle(ImageHandle::TopCenter) => {
+ let new_top = (initial.top() + delta.y).min(initial.bottom() - 4.0);
+ Rect::from_min_max(Pos2::new(initial.left(), new_top), Pos2::new(initial.right(), initial.bottom()))
+ }
+ DragTarget::Handle(ImageHandle::BottomCenter) => {
+ let new_bottom = (initial.bottom() + delta.y).max(initial.top() + 4.0);
+ Rect::from_min_max(Pos2::new(initial.left(), initial.top()), Pos2::new(initial.right(), new_bottom))
+ }
+ DragTarget::Handle(ImageHandle::LeftCenter) => {
+ let new_left = (initial.left() + delta.x).min(initial.right() - 4.0);
+ Rect::from_min_max(Pos2::new(new_left, initial.top()), Pos2::new(initial.right(), initial.bottom()))
+ }
+ DragTarget::Handle(ImageHandle::RightCenter) => {
+ let new_right = (initial.right() + delta.x).max(initial.left() + 4.0);
+ Rect::from_min_max(Pos2::new(initial.left(), initial.top()), Pos2::new(new_right, initial.bottom()))
+ }
+ DragTarget::Handle(h @ (ImageHandle::TopLeft | ImageHandle::TopRight | ImageHandle::BottomLeft | ImageHandle::BottomRight)) => {
+ let fixed = match h {
+ ImageHandle::TopLeft => Pos2::new(initial.right(), initial.bottom()),
+ ImageHandle::TopRight => Pos2::new(initial.left(), initial.bottom()),
+ ImageHandle::BottomLeft => Pos2::new(initial.right(), initial.top()),
+ ImageHandle::BottomRight => Pos2::new(initial.left(), initial.top()),
+ _ => Pos2::ZERO,
+ };
+ let start = drag.start;
+ let (w0, h0) = (initial.width().max(1.0), initial.height().max(1.0));
+ let horizontal = (p.x - start.x) * (start.x - fixed.x).signum() / w0;
+ let vertical = (p.y - start.y) * (start.y - fixed.y).signum() / h0;
+ let delta = if horizontal.abs() > vertical.abs() { horizontal } else { vertical };
+ let k = (1.0 + delta).max(0.05);
+ let (w, h) = (w0 * k, h0 * k);
+ let x = if start.x < fixed.x { fixed.x - w } else { fixed.x };
+ let y = if start.y < fixed.y { fixed.y - h } else { fixed.y };
+ Rect::from_min_size(Pos2::new(x, y), egui::vec2(w, h))
+ }
+ _ => initial,
+ };
+ let raw = images.get(i).map_or(b, |im| xf.user_rect(info, page, im.rect.map(|v| v as f32)));
+ let ratio = |new: f32, old: f32| if old.abs() > 1e-3 && (new / old).is_finite() { new / old } else { 1.0 };
+ let factor = egui::vec2(ratio(preview.width(), b.width()), ratio(preview.height(), b.height()));
+ let target = Rect::from_min_max(preview.min + (raw.min - b.min) * factor, preview.min + (raw.max - b.min) * factor);
+ let visible = preview.intersect(xf.rect);
+ if visible.is_positive() {
+ painter.rect_filled(visible, CornerRadius::ZERO, ACCENT.gamma_multiply(0.04));
+ painter.rect_stroke(visible, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
+ draw_handles(preview);
+ }
+ if resp.drag_stopped() || !ui.input(|i| i.pointer.primary_down()) {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = None;
+ }
+ if preview != b {
+ view.pending_edit =
+ Some(Edit::EditPageImage { page, index: i, change: pdfcraft_engine::ImageEdit::Move(user_box(xf, info, page, target)) });
+ }
+ }
+ ui.ctx().set_cursor_icon(match drag.target {
+ DragTarget::Handle(h) => cursor_for(h),
+ _ => egui::CursorIcon::Grabbing,
+ });
+ return true;
}
- ui.ctx().set_cursor_icon(match opposite {
- Some(fixed) if (start.x - fixed.x) * (start.y - fixed.y) < 0.0 => egui::CursorIcon::ResizeNeSw,
- Some(_) => egui::CursorIcon::ResizeNwSe,
- None => egui::CursorIcon::Grabbing,
- });
- return true;
}
if allow_interaction
&& ui.input(|inp| inp.key_pressed(egui::Key::Delete) || inp.key_pressed(egui::Key::Backspace))
@@ -560,7 +1080,25 @@ pub(crate) fn image_input(
return false;
}
let Some(p) = hover_pos.filter(|p| xf.rect.contains(*p)) else { return false };
- let Some(hit) = boxes.iter().enumerate().rposition(|(i, b)| b.contains(p) && image_contains(i, p)) else { return false };
+ let Some(hit) = boxes.iter().enumerate().rposition(|(i, b)| b.contains(p) && image_contains(i, p)) else {
+ let over_popup = egui::Popup::is_any_open(ui.ctx())
+ || ui.ctx().is_pointer_over_egui()
+ || ui.ctx().egui_wants_pointer_input();
+ if (resp.secondary_clicked() || resp.clicked()) && !over_popup {
+ if let Some(s) = view.image_selection.as_mut() && s.crop_mode {
+ let img_box = boxes.get(s.index).copied();
+ if let Some(crop) = s.crop_rect.filter(|c| img_box.is_some_and(|b| *c != b)) {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: s.index,
+ change: pdfcraft_engine::ImageEdit::Crop(user_box(xf, info, page, crop)),
+ });
+ }
+ }
+ view.image_selection = None;
+ }
+ return false;
+ };
if selected != Some(hit) {
painter.rect_stroke(boxes[hit], CornerRadius::ZERO, Stroke::new(1.5, ACCENT.gamma_multiply(0.7)), egui::StrokeKind::Outside);
}
@@ -573,52 +1111,170 @@ pub(crate) fn image_input(
_ => egui::CursorIcon::PointingHand,
});
if resp.clicked() || resp.secondary_clicked() {
- view.image_selection = Some(ImageSelection { page, index: hit, drag: None });
- }
- if selected == Some(hit) {
- resp.context_menu(|ui| {
- use pdfcraft_engine::ImageEdit as E;
- let items: [(&str, Option); 4] = [
- (tl!("Rotate Clockwise"), Some(E::Rotate(1))),
- (tl!("Rotate Counterclockwise"), Some(E::Rotate(3))),
- (tl!("Flip Horizontal"), Some(E::Flip { horizontal: true })),
- (tl!("Flip Vertical"), Some(E::Flip { horizontal: false })),
- ];
- for (label, change) in items {
- if ui.button(label).clicked() {
- view.pending_edit = change.map(|c| Edit::EditPageImage { page, index: hit, change: c });
- ui.close();
- }
- }
- let raster = images.get(hit).is_some_and(|image| !image.is_form);
- if ui.add_enabled(raster, egui::Button::new(tl!("Replace Image…"))).clicked() {
- *action = Some(ImageAction::Replace(page, hit));
- ui.close();
- }
- if ui.add_enabled(raster, egui::Button::new(tl!("Save Image As…"))).clicked() {
- *action = Some(ImageAction::Save(page, hit));
- ui.close();
- }
- // Copying also finds the picture inside grouped Form artwork.
- if ui.button(tl!("Copy Image")).clicked() {
- *action = Some(ImageAction::Copy(page, hit));
- ui.close();
- }
- if ui.button(tl!("Copy Image in Original Format")).clicked() {
- *action = Some(ImageAction::CopyFile(page, hit));
- ui.close();
- }
- ui.separator();
- if ui.button(tl!("Delete")).clicked() {
- view.image_selection = None;
- view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Delete });
- ui.close();
- }
- });
+ view.image_selection = Some(ImageSelection { page, index: hit, crop_mode: false, crop_rect: None, drag: None });
}
true
}
+/// The right-click context menu for a selected image matching Adobe Acrobat.
+pub(crate) fn image_context_menu(
+ ui: &mut egui::Ui,
+ view: &mut DocView,
+ doc: &pdfcraft_engine::Document,
+ page: usize,
+ hit: usize,
+ action: &mut Option,
+) {
+ let images = doc.page_images(page);
+ let Some(img) = images.get(hit) else { return };
+ use pdfcraft_engine::ImageEdit as E;
+
+ // Top horizontal icon bar: Comment, Crop, Rotate CCW, Rotate CW, Delete
+ ui.horizontal(|ui| {
+ ui.spacing_mut().item_spacing.x = 4.0;
+ if crate::icons::button(ui, "message-square", 24.0, false, tl!("Add a sticky note here")).clicked() {
+ *action = Some(ImageAction::AddComment(page, hit));
+ ui.close();
+ }
+ if crate::icons::button(ui, "crop", 24.0, false, tl!("Crop")).clicked() {
+ *action = Some(ImageAction::Crop);
+ if let Some(s) = view.image_selection.as_mut() {
+ s.crop_mode = true;
+ s.crop_rect = None;
+ }
+ ui.close();
+ }
+ if crate::icons::button(ui, "rotate-ccw", 24.0, false, tl!("Rotate Counterclockwise")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Rotate(3) });
+ ui.close();
+ }
+ if crate::icons::button(ui, "rotate-cw", 24.0, false, tl!("Rotate Clockwise")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Rotate(1) });
+ ui.close();
+ }
+ if crate::icons::button(ui, "trash-2", 24.0, false, tl!("Delete")).clicked() {
+ view.image_selection = None;
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Delete });
+ ui.close();
+ }
+ });
+
+ ui.separator();
+
+ let raster = !img.is_form;
+ if ui.add(egui::Button::new(tl!("Cut")).shortcut_text("Ctrl+X")).clicked() {
+ *action = Some(ImageAction::Cut(page, hit));
+ ui.close();
+ }
+ if ui.add(egui::Button::new(tl!("Copy")).shortcut_text("Ctrl+C")).clicked() {
+ *action = Some(ImageAction::Copy(page, hit));
+ ui.close();
+ }
+ // Paste item: disabled when no item can be pasted into the image layer
+ ui.add_enabled(false, egui::Button::new(tl!("Paste")).shortcut_text("Ctrl+V"));
+
+ ui.separator();
+
+ let is_cropped = img.visible_rect.is_some() && img.visible_rect != Some(img.rect);
+ if ui.add_enabled(is_cropped, egui::Button::new(tl!("Remove crop"))).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::RemoveCrop });
+ ui.close();
+ }
+
+ if ui.button(tl!("Flip horizontal")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Flip { horizontal: true } });
+ ui.close();
+ }
+ if ui.button(tl!("Flip vertical")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Flip { horizontal: false } });
+ ui.close();
+ }
+
+ ui.menu_button(tl!("Arrange image"), |ui| {
+ let total = images.len();
+ if ui.button(tl!("Bring to front")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: hit,
+ change: E::Arrange(pdfcraft_engine::ArrangeOrder::BringToFront),
+ });
+ if let Some(s) = view.image_selection.as_mut() {
+ s.index = total.saturating_sub(1);
+ }
+ ui.close();
+ }
+ if ui.button(tl!("Send to back")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: hit,
+ change: E::Arrange(pdfcraft_engine::ArrangeOrder::SendToBack),
+ });
+ if let Some(s) = view.image_selection.as_mut() {
+ s.index = 0;
+ }
+ ui.close();
+ }
+ if ui.button(tl!("Bring forward")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: hit,
+ change: E::Arrange(pdfcraft_engine::ArrangeOrder::BringForward),
+ });
+ if let Some(s) = view.image_selection.as_mut() {
+ s.index = (hit + 1).min(total.saturating_sub(1));
+ }
+ ui.close();
+ }
+ if ui.button(tl!("Send backward")).clicked() {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: hit,
+ change: E::Arrange(pdfcraft_engine::ArrangeOrder::SendBackward),
+ });
+ if let Some(s) = view.image_selection.as_mut() {
+ s.index = hit.saturating_sub(1);
+ }
+ ui.close();
+ }
+ });
+
+ if ui.add_enabled(raster, egui::Button::new(tl!("Replace image"))).clicked() {
+ *action = Some(ImageAction::Replace(page, hit));
+ ui.close();
+ }
+
+ ui.separator();
+
+ if ui.button(tl!("Draw freehand")).clicked() {
+ *action = Some(ImageAction::DrawFreehand);
+ ui.close();
+ }
+ if ui.button(tl!("Redact image")).clicked() {
+ *action = Some(ImageAction::Redact(page, hit));
+ ui.close();
+ }
+ if ui.add_enabled(raster, egui::Button::new(tl!("Export image"))).clicked() {
+ *action = Some(ImageAction::Save(page, hit));
+ ui.close();
+ }
+
+ ui.separator();
+
+ if ui.button(tl!("Create link")).clicked() {
+ *action = Some(ImageAction::CreateLink(page, hit));
+ ui.close();
+ }
+
+ ui.menu_button(tl!("Edit image using"), |ui| {
+ ui.add_enabled(false, egui::Button::new(tl!("Default image editor")));
+ });
+
+ if ui.button(tl!("Recognize text")).clicked() {
+ *action = Some(ImageAction::RecognizeText);
+ ui.close();
+ }
+}
+
/// Lines and their screen boxes for a page; hover outlines, click opens the editor. Returns
/// `true` when the pointer was used.
#[allow(clippy::too_many_arguments)]
@@ -1146,4 +1802,99 @@ mod tests {
assert_eq!(caret_color_on(Color32::BLACK), Color32::WHITE);
assert_eq!(caret_color_on(DARK_EDITOR_FILL), Color32::WHITE);
}
+
+ #[test]
+ fn bullet_list_toggles_and_preserves_content() {
+ let mut text = "First line\nSecond line\n\nThird line".to_string();
+ assert!(!is_bulleted(&text));
+ assert!(toggle_bullet_list(&mut text));
+ assert!(is_bulleted(&text));
+ assert_eq!(text, "• First line\n• Second line\n\n• Third line");
+
+ // Toggling again removes bullets
+ assert!(toggle_bullet_list(&mut text));
+ assert!(!is_bulleted(&text));
+ assert_eq!(text, "First line\nSecond line\n\nThird line");
+ }
+
+ #[test]
+ fn numbered_list_toggles_and_preserves_content() {
+ let mut text = "Item A\nItem B\n\nItem C".to_string();
+ assert!(!is_numbered(&text));
+ assert!(toggle_numbered_list(&mut text));
+ assert!(is_numbered(&text));
+ assert_eq!(text, "1. Item A\n2. Item B\n\n3. Item C");
+
+ // Toggling again removes numbering
+ assert!(toggle_numbered_list(&mut text));
+ assert!(!is_numbered(&text));
+ assert_eq!(text, "Item A\nItem B\n\nItem C");
+ }
+
+ #[test]
+ fn superscript_and_subscript_conversion() {
+ let mut ed = LineEditor {
+ page: 0,
+ block: 0,
+ text: "E = mc2".to_string(),
+ original: "E = mc2".to_string(),
+ rect: egui::Rect::ZERO,
+ source_rect: [0.0; 4],
+ max_width: 100.0,
+ overflow: false,
+ selection: Some(6..7), // selecting '2'
+ font_resource: None,
+ fonts: std::collections::BTreeMap::new(),
+ source: None,
+ multiline: false,
+ size: 12.0,
+ focus: true,
+ look: pdfcraft_engine::AddedText::default(),
+ look0: pdfcraft_engine::AddedText::default(),
+ extras: Extras::default(),
+ extras0: Extras::default(),
+ };
+
+ assert!(toggle_superscript(&mut ed));
+ assert_eq!(ed.text, "E = mc²");
+ // Toggling superscript again returns to normal '2'
+ assert!(toggle_superscript(&mut ed));
+ assert_eq!(ed.text, "E = mc2");
+
+ // Test subscript on H2O
+ ed.text = "H2O".to_string();
+ ed.selection = Some(1..2); // selecting '2'
+ assert!(toggle_subscript(&mut ed));
+ assert_eq!(ed.text, "H₂O");
+ assert!(toggle_subscript(&mut ed));
+ assert_eq!(ed.text, "H2O");
+ }
+
+ #[test]
+ fn value_based_line_spacing_in_style() {
+ let ed = LineEditor {
+ page: 0,
+ block: 0,
+ text: "Paragraph text".to_string(),
+ original: "Paragraph text".to_string(),
+ rect: egui::Rect::ZERO,
+ source_rect: [0.0; 4],
+ max_width: 100.0,
+ overflow: false,
+ selection: None,
+ font_resource: None,
+ fonts: std::collections::BTreeMap::new(),
+ source: None,
+ multiline: false,
+ size: 12.0,
+ focus: true,
+ look: pdfcraft_engine::AddedText::default(),
+ look0: pdfcraft_engine::AddedText::default(),
+ extras: Extras { line_spacing: 1.33, underline: true, ..Default::default() },
+ extras0: Extras::default(),
+ };
+ let style = ed.style();
+ assert_eq!(style.line_spacing, Some(1.33));
+ assert_eq!(style.underline, Some(true));
+ }
}
diff --git a/crates/ui-egui/src/files.rs b/crates/ui-egui/src/files.rs
index bbeb20727f..a5dbbabd6a 100644
--- a/crates/ui-egui/src/files.rs
+++ b/crates/ui-egui/src/files.rs
@@ -463,13 +463,34 @@ impl PdfCraftApp {
match purpose {
FilePurpose::TextFont { page } => {
let Some((_, bytes)) = files.into_iter().next() else { return };
- if self.apply_edit(Edit::RegisterTextFont { page, bytes: Arc::new(bytes) })
+ if self.apply_edit(Edit::RegisterTextFont { page, bytes: Arc::new(bytes.clone()) })
&& let Some((index, id)) = self.active_ids()
- && let Some(doc) = self.session.get(id)
- && let Some(ed) = self.views[index].line_editor.as_mut()
- && let Some(ctx) = self.ctx.as_ref()
{
- ed.fonts = crate::edit_text_ui::install_source_fonts(ctx, doc, page);
+ let resource = self.session.get(id).and_then(|doc| {
+ doc.text_editor_fonts(page).into_iter().find(|f| f.bytes == bytes).map(|f| f.resource)
+ });
+ if let Some(resource) = resource
+ && let Some(ed) = self.views[index].line_editor.as_mut()
+ {
+ ed.font_resource = Some(resource);
+ let edit = Edit::EditTextBlock { page: ed.page, block: ed.block, text: ed.text.clone(), style: ed.style() };
+ if self.apply_edit(edit)
+ && let Some(ed) = self.views[index].line_editor.as_mut()
+ {
+ ed.applied();
+ if let Some(doc) = self.session.get(id)
+ && let Some(block) = doc.text_blocks(ed.page).get(ed.block)
+ {
+ ed.refresh_source(block, doc.text_lines(ed.page));
+ }
+ }
+ }
+ if let Some(ed) = self.views[index].line_editor.as_mut()
+ && let Some(doc) = self.session.get(id)
+ && let Some(ctx) = self.ctx.as_ref()
+ {
+ ed.fonts = crate::edit_text_ui::install_source_fonts(ctx, doc, page);
+ }
}
}
FilePurpose::Combine => self.stage_combine(files),
diff --git a/crates/ui-egui/src/js_ui.rs b/crates/ui-egui/src/js_ui.rs
index fe474622c7..3e3de59be2 100644
--- a/crates/ui-egui/src/js_ui.rs
+++ b/crates/ui-egui/src/js_ui.rs
@@ -468,6 +468,13 @@ pub(crate) fn preferences_body(ui: &mut egui::Ui, app: &mut PdfCraftApp, t: &Tok
ui.add(crate::widgets::line(&mut app.comment_prefs.author).desired_width(220.0).char_limit(crate::MAX_AUTHOR_CHARS)).labelled_by(label.id);
});
ui.add_space(8.0);
+ // Comments: comment preferences (Acrobat: Preferences ▸ Commenting).
+ ui.label(egui::RichText::new(tl!("Comments")).font(theme::semibold(13.0)));
+ ui.add(widgets::checkbox(
+ &mut app.comment_prefs.display_author_hover_no_comment,
+ tl!("Display author name on hovering highlighted text when no comment is added"),
+ ));
+ ui.add_space(8.0);
ui.label(egui::RichText::new(tl!("Fill & Sign")).font(theme::semibold(13.0)));
ui.add(widgets::checkbox(&mut app.flatten_fill_sign_on_save, tl!("Flatten Fill & Sign when saving")));
ui.label(
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index f800ad6a00..de858de5cd 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -6,6 +6,7 @@
//! `pdfcraft-engine`.
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
+#![recursion_limit = "256"]
/// Translate an English UI string into the current language (see [`i18n`]).
macro_rules! tl {
@@ -2125,6 +2126,7 @@ impl PdfCraftApp {
// Null follows the interface language.
"date_language": self.session.date_language(),
"author": self.comment_prefs.author,
+ "display_author_hover_no_comment": self.comment_prefs.display_author_hover_no_comment,
// Per-tool comment defaults (colours, opacity, widths), so Make Current
// Properties Default survives a restart (#340).
"comment_styles": self
@@ -2253,6 +2255,9 @@ impl PdfCraftApp {
if let Some(author) = v["author"].as_str().map(str::trim).filter(|a| !a.is_empty()) {
self.comment_prefs.author = author.chars().take(MAX_AUTHOR_CHARS).collect();
}
+ if let Some(display) = v["display_author_hover_no_comment"].as_bool() {
+ self.comment_prefs.display_author_hover_no_comment = display;
+ }
// Per-tool comment styles (#340): each field goes through its clamping setter, so a
// malformed or hostile entry is clamped or ignored rather than trusted.
if let Some(styles) = v["comment_styles"].as_array() {
@@ -2555,6 +2560,13 @@ impl PdfCraftApp {
};
}
("author", _) => self.comment_prefs.author = value.to_string(),
+ ("display-author-hover-no-comment", _) => {
+ self.comment_prefs.display_author_hover_no_comment = match value {
+ "true" => true,
+ "false" => false,
+ _ => return Err("display-author-hover-no-comment must be true or false".into()),
+ };
+ }
("ui-scale", _) => self.ui_scale = ui_scale::parse(value)?,
("system-title-bar", _) => {
self.system_title_bar = match value {
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
index bdd625804d..499feaab59 100644
--- a/crates/ui-egui/src/panels.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -350,41 +350,165 @@ fn format_section(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
let mut ed = ed;
let mut changed = false;
let font_choices = app.session.get(app.views[i].id).map(|d| d.text_editor_fonts(ed.page)).unwrap_or_default();
- egui::ComboBox::from_id_salt("document-font-resource")
- .selected_text(
- ed.font_resource
- .as_ref()
- .and_then(|r| font_choices.iter().find(|f| &f.resource == r))
- .map_or(tl!("Keep source fonts"), |f| f.face.as_str()),
- )
+ let current_font_label = if let Some(r) = ed.font_resource.as_ref() {
+ font_choices.iter().find(|f| &f.resource == r).map_or_else(|| r.clone(), |f| f.face.clone())
+ } else if ed.look.family != pdfcraft_engine::FontFamily::Helvetica {
+ ed.look.family.label().to_string()
+ } else {
+ tl!("Keep source fonts").to_string()
+ };
+
+ crate::widgets::section_title(ui, tl!("FORMAT TEXT"));
+ egui::ComboBox::from_id_salt("text-font-dropdown")
+ .selected_text(current_font_label)
+ .width(ui.available_width().max(180.0))
.show_ui(ui, |ui| {
- changed |= ui.selectable_value(&mut ed.font_resource, None, tl!("Keep source fonts")).changed();
- for font in font_choices.iter().filter(|f| !f.resource.starts_with("PCApproved")) {
- changed |= ui.selectable_value(&mut ed.font_resource, Some(font.resource.clone()), &font.face).changed();
+ if ui.selectable_label(ed.font_resource.is_none(), tl!("Keep source fonts")).clicked() {
+ ed.font_resource = None;
+ changed = true;
}
- });
- if ui.button(tl!("Load font…")).clicked() {
- app.pick_files(crate::files::FilePurpose::TextFont { page: ed.page }, false);
- }
- #[cfg(not(target_arch = "wasm32"))]
- egui::ComboBox::from_id_salt("installed-document-font").selected_text(tl!("Installed fonts…")).show_ui(ui, |ui| {
- if let Some(fonts) = crate::files::installed_font_files(ui.ctx()) {
- if fonts.is_empty() {
- ui.label(tl!("No openly licensed document fonts found. Load a font file."));
- }
- for font in fonts {
- if ui.selectable_label(false, &font.face).clicked() {
- app.use_paths(crate::files::FilePurpose::TextFont { page: ed.page }, &[font.path]);
+ if !font_choices.is_empty() {
+ ui.separator();
+ ui.label(egui::RichText::new(tl!("Document fonts")).weak().small());
+ for font in font_choices.iter().filter(|f| !f.resource.starts_with("PCApproved")) {
+ let is_current = ed.font_resource.as_ref() == Some(&font.resource);
+ if ui.selectable_label(is_current, &font.face).clicked() {
+ ed.font_resource = Some(font.resource.clone());
+ changed = true;
+ }
}
}
- } else {
- ui.label(tl!("Finding document fonts…"));
+ ui.separator();
+ ui.label(egui::RichText::new(tl!("Standard fonts")).weak().small());
+ for f in [pdfcraft_engine::FontFamily::Helvetica, pdfcraft_engine::FontFamily::Times, pdfcraft_engine::FontFamily::Courier] {
+ let is_current = ed.font_resource.is_none() && ed.look.family == f;
+ if ui.selectable_label(is_current, f.label()).clicked() {
+ ed.font_resource = None;
+ ed.look.family = f;
+ changed = true;
+ }
+ }
+ #[cfg(not(target_arch = "wasm32"))]
+ {
+ ui.separator();
+ ui.label(egui::RichText::new(tl!("Installed fonts")).weak().small());
+ if let Some(installed) = crate::files::installed_font_files(ui.ctx()) {
+ if installed.is_empty() {
+ ui.label(egui::RichText::new(tl!("No installed fonts found.")).weak().small());
+ } else {
+ for font in &installed {
+ let is_current = ed.font_resource.as_ref().is_some_and(|r| {
+ font_choices.iter().any(|f| &f.resource == r && f.face == font.face)
+ });
+ if ui.selectable_label(is_current, &font.face).clicked() {
+ if let Ok(bytes) = std::fs::read(&font.path) {
+ let edit = pdfcraft_engine::Edit::RegisterTextFont { page: ed.page, bytes: std::sync::Arc::new(bytes.clone()) };
+ if app.apply_edit(edit) {
+ if let Some(doc) = app.session.get(app.views[i].id) {
+ if let Some(f) = doc.text_editor_fonts(ed.page).into_iter().find(|f| f.bytes == bytes) {
+ ed.font_resource = Some(f.resource);
+ changed = true;
+ }
+ ed.fonts = crate::edit_text_ui::install_source_fonts(ui.ctx(), doc, ed.page);
+ }
+ }
+ }
+ }
+ }
+ }
+ } else {
+ ui.label(egui::RichText::new(tl!("Finding installed fonts…")).weak().small());
+ }
+ }
+ ui.separator();
+ if ui.button(tl!("Load font from file…")).clicked() {
+ app.pick_files(crate::files::FilePurpose::TextFont { page: ed.page }, false);
+ }
+ });
+
+ ui.horizontal(|ui| {
+ // Font size ComboBox
+ egui::ComboBox::from_id_salt("font-size")
+ .selected_text(format!("{:.1}", ed.look.size))
+ .width(55.0)
+ .show_ui(ui, |ui| {
+ for size in [6.0, 8.0, 9.0, 10.0, 10.5, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
+ changed |= ui.selectable_value(&mut ed.look.size, size, format!("{size}")).changed();
+ }
+ });
+ // Color swatch square
+ let (color_rect, color_resp) = ui.allocate_exact_size(egui::vec2(20.0, 20.0), egui::Sense::click());
+ let color_val = crate::comments::color32(ed.look.color);
+ ui.painter().rect_filled(color_rect, t.radius, color_val);
+ ui.painter().rect_stroke(color_rect, t.radius, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
+ let show_palette_id = ui.id().with("show-palette");
+ let mut show_palette = ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false);
+ if color_resp.on_hover_text(tl!("Text color")).clicked() {
+ show_palette = !show_palette;
+ ui.data_mut(|d| d.insert_temp(show_palette_id, show_palette));
+ }
+ ui.add_space(2.0);
+ // Bullet list button
+ let is_bullet = crate::edit_text_ui::is_bulleted(&ed.text);
+ if crate::icons::button(ui, "list", 24.0, is_bullet, tl!("Bullet list")).clicked() {
+ changed |= crate::edit_text_ui::toggle_bullet_list(&mut ed.text);
+ }
+ // Numbered list button
+ let is_num = crate::edit_text_ui::is_numbered(&ed.text);
+ if crate::icons::button(ui, "list-ordered", 24.0, is_num, tl!("Numbered list")).clicked() {
+ changed |= crate::edit_text_ui::toggle_numbered_list(&mut ed.text);
+ }
+ ui.add_space(2.0);
+ // Alignment buttons
+ for (a, icon, tip) in [
+ (pdfcraft_engine::TextAlign::Left, "align-left", tl!("Align left")),
+ (pdfcraft_engine::TextAlign::Center, "align-center", tl!("Centre")),
+ (pdfcraft_engine::TextAlign::Right, "align-right", tl!("Align right")),
+ (pdfcraft_engine::TextAlign::Justify, "align-justify", tl!("Justify")),
+ ] {
+ if crate::icons::button(ui, icon, 24.0, ed.look.align == a, tip).clicked() {
+ ed.look.align = a;
+ changed = true;
+ }
}
});
- if let Some(look) = crate::content_ui::format_panel(ui, t, &ed.look) {
- ed.look = look;
- changed = true;
+
+ // Color Swatch Grid (when toggled or open)
+ let show_palette_id = ui.id().with("show-palette");
+ if ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false) {
+ if let Some(picked) = crate::comments::swatch_grid(ui, Some(ed.look.color)) {
+ ed.look.color = picked;
+ changed = true;
+ }
}
+
+ // Formatting Buttons: Bold, Italic, Underline, Superscript, Subscript
+ ui.horizontal(|ui| {
+ let b_resp = ui.selectable_label(ed.look.bold, egui::RichText::new("B").strong()).on_hover_text(tl!("Bold"));
+ if b_resp.clicked() {
+ ed.look.bold = !ed.look.bold;
+ changed = true;
+ }
+ let i_resp = ui.selectable_label(ed.look.italic, egui::RichText::new("I").italics()).on_hover_text(tl!("Italic"));
+ if i_resp.clicked() {
+ ed.look.italic = !ed.look.italic;
+ changed = true;
+ }
+ if crate::icons::button(ui, "underline", 24.0, ed.extras.underline, tl!("Underline")).clicked() {
+ ed.extras.underline = !ed.extras.underline;
+ changed = true;
+ }
+ let sup_resp = ui.selectable_label(false, egui::RichText::new("T¹").size(13.0)).on_hover_text(tl!("Superscript"));
+ if sup_resp.clicked() {
+ changed |= crate::edit_text_ui::toggle_superscript(&mut ed);
+ }
+ let sub_resp = ui.selectable_label(false, egui::RichText::new("T₁").size(13.0)).on_hover_text(tl!("Subscript"));
+ if sub_resp.clicked() {
+ changed |= crate::edit_text_ui::toggle_subscript(&mut ed);
+ }
+ });
+
+ // Spacing: Value-based line spacing, paragraph spacing, horizontal scale, character spacing
changed |= crate::edit_text_ui::extras_panel(ui, &mut ed.extras);
if changed {
let edit = pdfcraft_engine::Edit::EditTextBlock { page: ed.page, block: ed.block, text: ed.text.clone(), style: ed.style() };
diff --git a/crates/ui-egui/tests/comments.rs b/crates/ui-egui/tests/comments.rs
index 98f2bf9071..a86ee0d76c 100644
--- a/crates/ui-egui/tests/comments.rs
+++ b/crates/ui-egui/tests/comments.rs
@@ -993,6 +993,55 @@ fn hovering_a_comment_shows_its_author_and_text() {
assert!(h.query_by_label_contains("Check this figure").is_none(), "a dialog covers the page hover");
}
+#[test]
+fn hovering_highlight_without_comment_respects_display_author_option() {
+ let pdf = String::from_utf8_lossy(TEXT_FIXTURE).replace(
+ "/Contents 5 0 R /Resources",
+ "/Contents 5 0 R /Annots [8 0 R 9 0 R] /Resources",
+ ).replace(
+ "trailer",
+ "8 0 obj << /Type /Annot /Subtype /Highlight /Rect [50 50 150 120] /C [1 1 0] /T (Ada) >> endobj\n9 0 obj << /Type /Annot /Subtype /Highlight /Rect [160 50 250 120] /C [1 1 0] /T (Ada) /Contents (Has comment) >> endobj\ntrailer",
+ );
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.open_bytes("hover.pdf", None, pdf.into_bytes()).expect("opens");
+ app.set_option("left", "closed").unwrap();
+ app.set_option("panel", "none").unwrap();
+ app
+ });
+ h.run_steps(4);
+ settle(&mut h);
+
+ // By default, display_author_hover_no_comment is true. Hovering over empty highlight shows Ada.
+ let p_empty = at(&h, 100.0, 85.0);
+ h.hover_at(p_empty);
+ h.run_steps(3);
+ h.get_by_label_contains("Ada");
+
+ // Disable the option. Hovering over empty highlight does NOT show Ada.
+ h.state_mut().set_option("display-author-hover-no-comment", "false").unwrap();
+ h.hover_at(pos2(10.0, 10.0));
+ h.run_steps(2);
+ h.hover_at(p_empty);
+ h.run_steps(3);
+ assert!(h.query_by_label_contains("Ada").is_none(), "no author popup when option is disabled and no comment");
+
+ // But hovering over the highlight with a comment still shows Ada and the comment!
+ let p_comment = at(&h, 200.0, 85.0);
+ h.hover_at(p_comment);
+ h.run_steps(3);
+ h.get_by_label_contains("Ada");
+ h.get_by_label_contains("Has comment");
+
+ // Settings round-trip test
+ let json = h.state().persist();
+ assert!(json.contains("\"display_author_hover_no_comment\":false"));
+ let mut app2 = PdfCraftApp::new();
+ app2.restore(&json);
+ assert_eq!(app2.comment_prefs.display_author_hover_no_comment, false);
+}
+
#[test]
fn the_squiggly_tool_marks_selected_text() {
let mut h = harness(|_| {});
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index c470837775..971c8bf9c8 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -2548,6 +2548,187 @@ fn check_existing_artwork(name: &'static str, bytes: Vec) {
assert!(h.state().session.get(id).unwrap().page_images(0).is_empty());
}
+#[test]
+fn image_right_click_context_menu_items_and_actions() {
+ let mut png = Vec::new();
+ image::RgbImage::from_pixel(80, 40, image::Rgb([200, 40, 40])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.open_bytes("picture.png", None, png.clone()).expect("opens");
+ app
+ });
+ h.run_steps(4);
+ assert!(h.state_mut().execute("edit.edit_text"));
+ h.run_steps(2);
+ let r = h.state().views[0].page_screen_rect(0).expect("on screen");
+ let c = r.center();
+ // Select image
+ h.hover_at(c);
+ h.run_steps(1);
+ h.drag_at(c);
+ h.run_steps(1);
+ h.drop_at(c);
+ h.run_steps(2);
+ assert!(h.state().views[0].image_selection.is_some(), "selected");
+
+ // Right-click image
+ h.hover_at(c);
+ h.run_steps(1);
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
+ h.run_steps(2);
+ assert!(h.state().views[0].image_selection.is_some());
+
+ for item in [
+ "Cut",
+ "Copy",
+ "Paste",
+ "Flip horizontal",
+ "Flip vertical",
+ "Arrange image",
+ "Replace image",
+ "Draw freehand",
+ "Redact image",
+ "Export image",
+ "Create link",
+ "Edit image using",
+ "Recognize text",
+ ] {
+ h.get_by_label_contains(item);
+ }
+
+ // Top horizontal icon buttons
+ h.get_by_label("Rotate Counterclockwise");
+ h.get_by_label("Rotate Clockwise");
+ h.get_by_label("Delete");
+
+ // Flip horizontal via context menu item
+ h.get_by_label("Flip horizontal").click();
+ h.run_steps(3);
+ let id = h.state().views[0].id;
+ let doc = h.state().session.get(id).unwrap();
+ assert_eq!(doc.can_undo(), Some("Flip image"));
+
+ // Undo flip
+ h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::Z);
+ h.run_steps(3);
+ let doc = h.state().session.get(id).unwrap();
+ assert_eq!(doc.can_undo(), None);
+}
+
+#[test]
+fn default_page_context_menu_when_not_in_edit_mode() {
+ let mut h = harness(1, |_| {});
+ h.run_steps(4);
+ assert_eq!(h.state().quick_tool, pdfcraft_ui_egui::QuickTool::Select);
+
+ let r = h.state().views[0].page_screen_rect(0).expect("on screen");
+ let c = r.center();
+ // Right click on page in Select mode
+ h.hover_at(c);
+ h.run_steps(1);
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
+ h.run_steps(2);
+
+ // Verify Acrobat page context menu items (Screenshot 3)
+ h.get_by_label("Rotate Counterclockwise");
+ h.get_by_label("Print");
+ h.get_by_label("Select Tool");
+ h.get_by_label("Hand Tool");
+ h.get_by_label("Marquee Zoom");
+
+ for item in [
+ "Add bookmark",
+ "Take a snapshot",
+ "Edit this PDF",
+ "Delete page",
+ "Export this PDF",
+ "Find text or tools",
+ "Document properties…",
+ ] {
+ h.get_by_label_contains(item);
+ }
+ h.get_by_label("Rotate view clockwise");
+ assert!(h.query_all_by_label("Add comment").next().is_some());
+ assert!(h.query_all_by_label("Add text").next().is_some());
+ assert!(h.query_all_by_label("Add image").next().is_some());
+
+ // Clicking "Edit this PDF" enters edit mode
+ h.get_by_label("Edit this PDF").click();
+ h.run_steps(2);
+ assert_eq!(h.state().quick_tool, pdfcraft_ui_egui::QuickTool::EditText);
+}
+
+#[test]
+fn image_edge_handle_stretch_and_crop_mode() {
+ let mut png = Vec::new();
+ image::RgbImage::from_pixel(100, 100, image::Rgb([100, 150, 200])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.open_bytes("square.png", None, png.clone()).expect("opens");
+ app
+ });
+ h.run_steps(4);
+ assert!(h.state_mut().execute("edit.edit_text"));
+ h.run_steps(2);
+
+ let r = h.state().views[0].page_screen_rect(0).expect("on screen");
+ let c = r.center();
+ // Select image
+ h.hover_at(c);
+ h.run_steps(1);
+ h.drag_at(c);
+ h.run_steps(1);
+ h.drop_at(c);
+ h.run_steps(2);
+ assert!(h.state().views[0].image_selection.is_some());
+
+ // Enter crop mode via context menu
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
+ h.run_steps(2);
+ h.get_by_label("Crop").click();
+ h.run_steps(2);
+ assert!(h.state().views[0].image_selection.as_ref().is_some_and(|s| s.crop_mode));
+
+ // Confirm crop with Enter key
+ h.key_press(egui::Key::Enter);
+ h.run_steps(2);
+ assert!(!h.state().views[0].image_selection.as_ref().is_some_and(|s| s.crop_mode));
+}
+
+#[test]
+fn text_selection_action_icons() {
+ let mut h = harness(1, |_| {});
+ h.run_steps(4);
+ let r = h.state().views[0].page_screen_rect(0).expect("on screen");
+ let p0 = egui::pos2(r.left() + 40.0 / 200.0 * r.width(), r.top() + (300.0 - 158.0) / 300.0 * r.height());
+ let p1 = egui::pos2(r.left() + 100.0 / 200.0 * r.width(), r.top() + (300.0 - 158.0) / 300.0 * r.height());
+
+ // Drag to select text
+ h.hover_at(p0);
+ h.run_steps(1);
+ h.drag_at(p0);
+ h.run_steps(1);
+ h.hover_at(p1);
+ h.run_steps(1);
+ h.drop_at(p1);
+ h.run_steps(2);
+
+ assert!(h.state().views[0].selected_text().is_some());
+
+ // Verify all 6 minimalist action icons are present in the floating menu
+ assert!(h.query_all_by_label("Add comment").next().is_some());
+ assert!(h.query_all_by_label("Highlight").next().is_some());
+ assert!(h.query_all_by_label("Underline").next().is_some());
+ assert!(h.query_all_by_label("Strikethrough").next().is_some());
+ assert!(h.query_all_by_label("Replace text").next().is_some());
+ assert!(h.query_all_by_label("Copy").next().is_some());
+}
+
#[test]
fn the_format_panel_restyles_the_paragraph_being_edited() {
let mut h = harness(1, |_| {});
From e2be8db7fbde73c0d10ba896b5dc19561f659bb8 Mon Sep 17 00:00:00 2001
From: FredApps <153173854+FredApps@users.noreply.github.com>
Date: Wed, 14 Oct 2026 13:33:19 +0200
Subject: [PATCH 008/462] test(ui): stabilize Reduce metadata and isolate
output directories
---
crates/ui-egui/tests/create.rs | 35 ++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/crates/ui-egui/tests/create.rs b/crates/ui-egui/tests/create.rs
index bfbba2e131..4537ab1fa6 100644
--- a/crates/ui-egui/tests/create.rs
+++ b/crates/ui-egui/tests/create.rs
@@ -69,12 +69,37 @@ fn opening_images_and_text_converts_them_to_new_pdfs() {
assert!(app.open_bytes("junk.png", None, b"\x89PNG\r\n\x1a\nnot really".to_vec()).is_err());
}
+// Use a directory claimed exclusively by this run, including after process-ID reuse.
+struct ReduceDir(std::path::PathBuf);
+impl ReduceDir {
+ fn new() -> Self {
+ static NEXT: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
+ for _ in 0..128 {
+ let n = NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+ let path = std::env::temp_dir().join(format!("pdfcraft-reduce-{}-{n}", std::process::id()));
+ match std::fs::create_dir(&path) {
+ Ok(()) => return Self(path),
+ Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => continue,
+ Err(error) => panic!("creating Reduce test directory: {error}"),
+ }
+ }
+ panic!("no unused Reduce test directory after 128 attempts");
+ }
+}
+impl Drop for ReduceDir {
+ fn drop(&mut self) {
+ let _ = std::fs::remove_dir_all(&self.0);
+ }
+}
+
/// Open `name` and run Reduce File Size on it, saving to `out` without a dialog.
fn reduce(name: &'static str, bytes: Vec, out: &std::path::Path) -> egui_kittest::Harness<'static, PdfCraftApp> {
let out2 = out.to_path_buf();
let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1200.0, 800.0)).build_eframe(move |_cc| {
let mut app = PdfCraftApp::new();
app.set_option("language", "en").unwrap();
+ // Keep creation and optimization metadata identical across wall-clock seconds.
+ app.session = std::mem::take(&mut app.session).with_clock(|| 1_700_000_000);
app.open_bytes(name, None, bytes).unwrap();
app.save_override = Some(out2.to_string_lossy().into_owned());
app
@@ -105,9 +130,8 @@ fn reduce_file_size_writes_a_compact_copy() {
enc.set_depth(png::BitDepth::Eight);
enc.write_header().unwrap().write_image_data(&px).unwrap();
}
- let dir = std::env::temp_dir().join(format!("pdfcraft-reduce-{}", std::process::id()));
- std::fs::create_dir_all(&dir).unwrap();
- let out = dir.join("reduced.pdf");
+ let dir = ReduceDir::new();
+ let out = dir.0.join("reduced.pdf");
let h = reduce("photo.png", photo, &out);
let bytes = std::fs::read(&out).unwrap();
assert!(bytes.starts_with(b"%PDF-"));
@@ -119,9 +143,8 @@ fn reduce_file_size_writes_a_compact_copy() {
#[test]
fn reduce_file_size_saves_nothing_when_the_file_is_already_small() {
use egui_kittest::kittest::Queryable;
- let dir = std::env::temp_dir().join(format!("pdfcraft-reduce-small-{}", std::process::id()));
- std::fs::create_dir_all(&dir).unwrap();
- let out = dir.join("reduced.pdf");
+ let dir = ReduceDir::new();
+ let out = dir.0.join("reduced.pdf");
// A new text PDF is already compact: a copy would be no smaller (#490).
let h = reduce("notes.txt", "lorem ipsum ".repeat(500).into_bytes(), &out);
assert!(!out.exists(), "no copy was written");
From 293faa0c059bad7f09763eb799f59fa86047b3a9 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 17:06:31 +0530
Subject: [PATCH 009/462] feat: major Acrobat UI parity, crop, and layer fixes
---
crates/ui-egui/src/content_ui.rs | 38 +++++++++++------------
crates/ui-egui/src/edit_text_ui.rs | 49 +++++++++++++++---------------
crates/ui-egui/src/panels.rs | 32 +++++++++----------
parity/acrobat-features.toml | 8 ++---
4 files changed, 64 insertions(+), 63 deletions(-)
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 38f63587cb..148830e010 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -561,21 +561,21 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
ui.selectable_value(&mut s.family, f, f.label());
}
#[cfg(not(target_arch = "wasm32"))]
- if let Some(installed) = crate::files::installed_font_files(ui.ctx()) {
- if !installed.is_empty() {
- ui.separator();
- ui.label(egui::RichText::new(tl!("Installed fonts")).weak().small());
- for font in &installed {
- let fam = if font.family.eq_ignore_ascii_case("times") || font.face.to_ascii_lowercase().contains("times") {
- FontFamily::Times
- } else if font.family.eq_ignore_ascii_case("courier") || font.face.to_ascii_lowercase().contains("courier") {
- FontFamily::Courier
- } else {
- FontFamily::Helvetica
- };
- if ui.selectable_label(s.family == fam, &font.face).clicked() {
- s.family = fam;
- }
+ if let Some(installed) = crate::files::installed_font_files(ui.ctx())
+ && !installed.is_empty()
+ {
+ ui.separator();
+ ui.label(egui::RichText::new(tl!("Installed fonts")).weak().small());
+ for font in &installed {
+ let fam = if font.family.eq_ignore_ascii_case("times") || font.face.to_ascii_lowercase().contains("times") {
+ FontFamily::Times
+ } else if font.family.eq_ignore_ascii_case("courier") || font.face.to_ascii_lowercase().contains("courier") {
+ FontFamily::Courier
+ } else {
+ FontFamily::Helvetica
+ };
+ if ui.selectable_label(s.family == fam, &font.face).clicked() {
+ s.family = fam;
}
}
}
@@ -621,10 +621,10 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
}
});
let show_palette_id = ui.id().with("show-palette-added");
- if ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false) {
- if let Some(picked) = crate::comments::swatch_grid(ui, Some(s.color)) {
- s.color = picked;
- }
+ if ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false)
+ && let Some(picked) = crate::comments::swatch_grid(ui, Some(s.color))
+ {
+ s.color = picked;
}
ui.horizontal(|ui| {
let b_resp = ui.selectable_label(s.bold, egui::RichText::new("T").strong().size(14.0));
diff --git a/crates/ui-egui/src/edit_text_ui.rs b/crates/ui-egui/src/edit_text_ui.rs
index 73d6eaaf41..282ab3eac9 100644
--- a/crates/ui-egui/src/edit_text_ui.rs
+++ b/crates/ui-egui/src/edit_text_ui.rs
@@ -179,9 +179,7 @@ pub fn toggle_bullet_list(text: &mut String) -> bool {
} else {
new_text.push_str(line);
}
- } else if trimmed.is_empty() {
- new_text.push_str(line);
- } else if trimmed.starts_with("• ") {
+ } else if trimmed.is_empty() || trimmed.starts_with("• ") {
new_text.push_str(line);
} else {
new_text.push_str("• ");
@@ -218,11 +216,13 @@ pub fn toggle_numbered_list(text: &mut String) -> bool {
}
let t = line.trim_start();
if all_numbered {
- if let Some(dot_idx) = t.find('.') {
- if dot_idx > 0 && t[..dot_idx].chars().all(|c| c.is_ascii_digit()) && t[dot_idx..].starts_with(". ") {
- new_text.push_str(&t[dot_idx + 2..]);
- continue;
- }
+ if let Some(dot_idx) = t.find('.')
+ && dot_idx > 0
+ && t[..dot_idx].chars().all(|c| c.is_ascii_digit())
+ && t[dot_idx..].starts_with(". ")
+ {
+ new_text.push_str(&t[dot_idx + 2..]);
+ continue;
}
new_text.push_str(line);
} else if t.is_empty() {
@@ -905,10 +905,11 @@ pub(crate) fn image_input(
painter.rect_stroke(b, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
draw_handles(b);
}
- if allow_interaction && let Some(p) = hover_pos {
- if let Some(&h) = all_handles.iter().find(|&&h| handle_pos(b, h).distance(p) < 8.0) {
- ui.ctx().set_cursor_icon(cursor_for(h));
- }
+ if allow_interaction
+ && let Some(p) = hover_pos
+ && let Some(&h) = all_handles.iter().find(|&&h| handle_pos(b, h).distance(p) < 8.0)
+ {
+ ui.ctx().set_cursor_icon(cursor_for(h));
}
}
@@ -927,10 +928,10 @@ pub(crate) fn image_input(
if let Some(s) = view.image_selection.as_mut() {
s.drag = Some(ImageDrag { start: o, target: DragTarget::CropHandle(h), initial_rect: active_crop });
}
- } else if active_crop.contains(o) {
- if let Some(s) = view.image_selection.as_mut() {
- s.drag = Some(ImageDrag { start: o, target: DragTarget::Move, initial_rect: active_crop });
- }
+ } else if active_crop.contains(o)
+ && let Some(s) = view.image_selection.as_mut()
+ {
+ s.drag = Some(ImageDrag { start: o, target: DragTarget::Move, initial_rect: active_crop });
}
} else {
let hit_handle = all_handles.iter().copied().find(|&h| handle_pos(b, h).distance(o) < 8.0);
@@ -938,10 +939,10 @@ pub(crate) fn image_input(
if let Some(s) = view.image_selection.as_mut() {
s.drag = Some(ImageDrag { start: o, target: DragTarget::Handle(h), initial_rect: b });
}
- } else if image_contains(i, o) {
- if let Some(s) = view.image_selection.as_mut() {
- s.drag = Some(ImageDrag { start: o, target: DragTarget::Move, initial_rect: b });
- }
+ } else if image_contains(i, o)
+ && let Some(s) = view.image_selection.as_mut()
+ {
+ s.drag = Some(ImageDrag { start: o, target: DragTarget::Move, initial_rect: b });
}
}
}
@@ -991,10 +992,10 @@ pub(crate) fn image_input(
if let Some(s) = view.image_selection.as_mut() {
s.crop_rect = Some(new_crop);
}
- if resp.drag_stopped() || !ui.input(|i| i.pointer.primary_down()) {
- if let Some(s) = view.image_selection.as_mut() {
- s.drag = None;
- }
+ if (resp.drag_stopped() || !ui.input(|i| i.pointer.primary_down()))
+ && let Some(s) = view.image_selection.as_mut()
+ {
+ s.drag = None;
}
ui.ctx().set_cursor_icon(match drag.target {
DragTarget::CropHandle(h) => cursor_for(h),
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
index 499feaab59..6f9758ac9a 100644
--- a/crates/ui-egui/src/panels.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -400,18 +400,18 @@ fn format_section(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
let is_current = ed.font_resource.as_ref().is_some_and(|r| {
font_choices.iter().any(|f| &f.resource == r && f.face == font.face)
});
- if ui.selectable_label(is_current, &font.face).clicked() {
- if let Ok(bytes) = std::fs::read(&font.path) {
- let edit = pdfcraft_engine::Edit::RegisterTextFont { page: ed.page, bytes: std::sync::Arc::new(bytes.clone()) };
- if app.apply_edit(edit) {
- if let Some(doc) = app.session.get(app.views[i].id) {
- if let Some(f) = doc.text_editor_fonts(ed.page).into_iter().find(|f| f.bytes == bytes) {
- ed.font_resource = Some(f.resource);
- changed = true;
- }
- ed.fonts = crate::edit_text_ui::install_source_fonts(ui.ctx(), doc, ed.page);
- }
+ if ui.selectable_label(is_current, &font.face).clicked()
+ && let Ok(bytes) = std::fs::read(&font.path)
+ {
+ let edit = pdfcraft_engine::Edit::RegisterTextFont { page: ed.page, bytes: std::sync::Arc::new(bytes.clone()) };
+ if app.apply_edit(edit)
+ && let Some(doc) = app.session.get(app.views[i].id)
+ {
+ if let Some(f) = doc.text_editor_fonts(ed.page).into_iter().find(|f| f.bytes == bytes) {
+ ed.font_resource = Some(f.resource);
+ changed = true;
}
+ ed.fonts = crate::edit_text_ui::install_source_fonts(ui.ctx(), doc, ed.page);
}
}
}
@@ -475,11 +475,11 @@ fn format_section(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
// Color Swatch Grid (when toggled or open)
let show_palette_id = ui.id().with("show-palette");
- if ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false) {
- if let Some(picked) = crate::comments::swatch_grid(ui, Some(ed.look.color)) {
- ed.look.color = picked;
- changed = true;
- }
+ if ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false)
+ && let Some(picked) = crate::comments::swatch_grid(ui, Some(ed.look.color))
+ {
+ ed.look.color = picked;
+ changed = true;
}
// Formatting Buttons: Bold, Italic, Underline, Superscript, Subscript
diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml
index 359a71e9a6..0e73ae2150 100644
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@ -2127,11 +2127,11 @@ title = "Arrange objects (bring forward, send backward)"
area = "C"
tier = "P1"
milestone = "M7"
-status = "planned"
+status = "partial"
commands = []
-tools = []
-evidence = []
-notes = ""
+tools = ["image_edit"]
+evidence = ["crates/edit/src/tests.rs::image_arrange_stacking_order_and_remove_crop"]
+notes = "Image stacking order in content streams: Bring to Front, Send to Back, Bring Forward, Send Backward with undo/redo and PDF export persistence. Image-level crop and 8-point handle transforms. Still missing: arbitrary vector paths, inline images, and multi-object grouping."
[[feature]]
id = "edit.align-distribute-objects"
From 4e952e62e23e0381c68c2b0f616f4698d5f0f646 Mon Sep 17 00:00:00 2001
From: FredApps <153173854+FredApps@users.noreply.github.com>
Date: Wed, 14 Oct 2026 14:40:22 +0200
Subject: [PATCH 010/462] chore: reserve Pages sidebar select-all fix (#2052)
From 971f6ea2b458a4627aab8b4dcf45ba42f00ef18a Mon Sep 17 00:00:00 2001
From: FredApps <153173854+FredApps@users.noreply.github.com>
Date: Wed, 14 Oct 2026 15:14:35 +0200
Subject: [PATCH 011/462] Fix keyboard-owned Pages sidebar select all (#2052)
---
ROADMAP.md | 5 +++-
crates/ui-egui/src/canvas.rs | 15 ++++++++---
crates/ui-egui/src/lib.rs | 8 ++++--
crates/ui-egui/src/panels.rs | 15 ++++++++---
crates/ui-egui/tests/view.rs | 52 ++++++++++++++++++++++++++++++++++++
docs/roadmap.md | 5 ++--
parity/acrobat-features.toml | 4 +--
7 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/ROADMAP.md b/ROADMAP.md
index b4ab4ea8a6..593387f85a 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,7 +2,7 @@
**Stage: alpha** · next: beta, ~26% (ready for real work 49% → 75%) and ~400–700 h away
-> **Last reviewed:** 2026-10-13 · **Last updated:** 2026-10-13 · **Change:** minor (M3 candidate: native opens retain chosen tools through password retries and defer startup intake while preparation is pending; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** minor (M4/#2052 candidate: keyboard-owned Pages sidebar select-all; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M4: Extract and Split preserve shared Type 3 glyph resources; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M2: packed TIFF-predictor RGB rows retain their byte boundaries; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
@@ -149,6 +149,8 @@ Ranked; detail and the full milestone table in [docs/roadmap.md](docs/roadmap.md
## Progress log
+- **2026-10-14 (M4/#2052 candidate):** Ctrl/Cmd+A selects all thumbnails while the Pages sidebar owns the keyboard, preserves the current page, and keeps viewer/text-field shortcuts and document selection separate. Escape and existing permission checks are retained. Focus regression and scoped UI validation pass; estimates unchanged.
+
- **2026-10-13 (M3, native-opening candidate):** Chosen tools survive preparation, conversion and password retries; startup intake waits for pending preparation. Regression tests cover completion, cancellation and document identity. Estimates unchanged.
- **2026-10-12 (M10, Windows printing without PowerShell, #1107):** craft-print now prints on Windows in-process: printers from EnumPrinters/GetDefaultPrinter, jobs drawn as vectors by Windows.Data.Pdf into the XPS print API with a driver-validated PrintTicket (exact paper, orientation, no scaling), so printing works where App Control for Business or AppLocker run PowerShell in Constrained Language Mode. Portrait and landscape sheets still print as one job (turned with /Rotate); a sheet size the driver lacks is refused rather than shrunk. Pins craft-libs f03ec27 (craft-libs#28); deny.toml allows the storytold/winprint.rs fork and adds a webpki-root-certs licence exception and a RUSTSEC-2024-0370 ignore for winprint's build-dependencies. An earlier craft-print revision was checked in Windows Sandbox under enforced WDAC: printers listed, CLI and desktop jobs spooled, and no powershell.exe in the 4688 audit. The final pinned revision passed craft-libs Windows CI, including a real paused-queue job; that Sandbox run has not been repeated. Estimates unchanged.
- **2026-10-12 (M13, CLI robustness scans):** `pdfcraft-cli check` visits a directory once even when input roots overlap or directory symlinks lead back into the tree. PDFs reached through file symlinks remain accepted. Three real CLI regressions cover overlapping roots, a directory cycle and directory/file aliases. Estimates unchanged.
@@ -427,6 +429,7 @@ Newest first: the date, what moved, and the new overall estimate.
| Date | Change | Summary |
|---|---|---|
+| 2026-10-14 | minor | M4/#2052 candidate: Pages sidebar select-all, focus ownership, Escape and document isolation validated; estimates unchanged. |
| 2026-10-12 | minor | M3/#1364 candidate: absolute local GoToR links require desktop consent or headless allow_absolute; existing relative navigation and validation retained. Estimates unchanged. |
| 2026-10-12 | minor | M8: redaction retires inherited `/Resources` so a parent `/Pages` can't keep a removed XObject reachable; only redacted pages that inherit are pinned (one shared reference), unredacted pages are untouched; estimates unchanged |
| 2026-10-12 | minor | M7/#1200 candidate: bounded local GoToR opening, root-confined automation, and action-preserving appearance edits; named destinations and window behavior remain partial; estimates unchanged. |
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 9dc2c98dfa..1a7bc20a27 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -433,6 +433,8 @@ pub struct DocView {
pub org_drag: Option>,
/// Pages panel: the pages being dragged to a new place.
pub panel_drag: Option>,
+ /// Transient keyboard owner for this document's Pages sidebar.
+ pub(crate) pages_focus_id: Option,
/// Marquee Zoom / Snapshot: the rectangle being dragged (page, start), and a finished one.
pub marquee: Option<(usize, Pos2)>,
pub marquee_done: Option,
@@ -672,6 +674,7 @@ impl DocView {
sign: Default::default(),
org_drag: None,
panel_drag: None,
+ pages_focus_id: None,
marquee: None,
marquee_done: None,
fill_text: None,
@@ -1137,10 +1140,7 @@ impl DocView {
/// Select all: every page in Organize, or every word on the current page.
pub fn select_all(&mut self) -> bool {
if self.organize {
- self.selected = (0..self.page_count).collect();
- // Keep the current page as the anchor for the next Shift-click.
- self.select_anchor = (self.page_count > 0).then_some(self.current);
- return !self.selected.is_empty();
+ return self.select_all_pages();
}
let page = self.current;
let Some(t) = self.texts.get(&page) else { return false };
@@ -1151,6 +1151,13 @@ impl DocView {
true
}
+ /// Select every page without navigating; shared by Organize and the Pages sidebar.
+ pub fn select_all_pages(&mut self) -> bool {
+ self.selected = (0..self.page_count).collect();
+ self.select_anchor = (self.page_count > 0).then_some(self.current);
+ !self.selected.is_empty()
+ }
+
/// Rotate the view 90° clockwise or counter-clockwise (View ▸ Rotate View, ⇧⌘+ / ⇧⌘−).
pub fn rotate_view(&mut self, clockwise: bool) {
self.rotation = (self.rotation + if clockwise { 90 } else { 270 }) % 360;
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index f800ad6a00..cad36ad3e1 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -2650,12 +2650,16 @@ impl PdfCraftApp {
if let Some(i) = self.active {
// Select all belongs to the document or page grid, unless a text field or
// overlay owns the keyboard. Other canvas shortcuts keep their own handling.
+ let pages_owns_keyboard =
+ self.right == Some(RightPanel::Pages) && self.views[i].pages_focus_id.is_some_and(|id| ctx.memory(|m| m.has_focus(id)));
if self.dialog.is_none()
&& !self.palette_open
- && !ctx.egui_wants_keyboard_input()
+ && (pages_owns_keyboard || !ctx.egui_wants_keyboard_input())
&& ctx.input_mut(|input| input.consume_shortcut(&egui::KeyboardShortcut::new(egui::Modifiers::COMMAND, Key::A)))
{
- if self.is_preparing() {
+ if pages_owns_keyboard {
+ self.views[i].select_all_pages();
+ } else if self.is_preparing() {
if let Some(doc) = self.session.get(self.views[i].id) {
prepare::select_all(&mut self.views[i], &doc.form);
}
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
index bdd625804d..01f5b74fac 100644
--- a/crates/ui-egui/src/panels.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -1003,11 +1003,17 @@ fn outline_item(ui: &mut egui::Ui, t: &Tokens, info: &DocInfo, item: &OutlineIte
/// offers Extract, Cut, Copy and Paste on the selection, or on the page clicked; dragging
/// moves the selection, or the page grabbed, to the gap it is dropped on.
fn pages(ui: &mut egui::Ui, t: &Tokens, info: &DocInfo, view: &mut crate::DocView, modal: bool, editable: bool, nav: &mut Option) {
+ let focus_id = ui.make_persistent_id(("pages-keyboard", view.id));
+ view.pages_focus_id = Some(focus_id);
+ let keyboard = ui.interact(ui.clip_rect(), focus_id, Sense::focusable_noninteractive());
+ let owns_keyboard = keyboard.has_focus();
+ // Escape belongs to this panel while it owns the keyboard, even after pointer movement.
+ ui.memory_mut(|m| m.set_focus_lock_filter(focus_id, egui::EventFilter { escape: true, ..Default::default() }));
// Escape drops the selection while the pointer is over the panel and nothing else wants the key.
if !modal
&& !view.selected.is_empty()
- && !ui.ctx().egui_wants_keyboard_input()
- && ui.rect_contains_pointer(ui.clip_rect())
+ && (owns_keyboard || !ui.ctx().egui_wants_keyboard_input())
+ && (owns_keyboard || ui.rect_contains_pointer(ui.clip_rect()))
&& ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape))
{
view.clear_page_selection(Some(view.current));
@@ -1015,8 +1021,8 @@ fn pages(ui: &mut egui::Ui, t: &Tokens, info: &DocInfo, view: &mut crate::DocVie
// Delete (or Backspace) deletes the selection, or the current page, likewise.
if !modal
&& editable
- && !ui.ctx().egui_wants_keyboard_input()
- && ui.rect_contains_pointer(ui.clip_rect())
+ && (owns_keyboard || !ui.ctx().egui_wants_keyboard_input())
+ && (owns_keyboard || ui.rect_contains_pointer(ui.clip_rect()))
&& ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Delete) || i.consume_key(egui::Modifiers::NONE, egui::Key::Backspace))
{
delete_pages(view, info.pages.len());
@@ -1068,6 +1074,7 @@ fn pages(ui: &mut egui::Ui, t: &Tokens, info: &DocInfo, view: &mut crate::DocVie
ui.label(egui::RichText::new(&p.label).font(theme::medium(12.0)).color(if selected || picked { t.accent_text } else { t.text_muted }));
let resp = theme::hand(resp);
if resp.clicked() {
+ ui.memory_mut(|m| m.request_focus(focus_id));
let m = ui.input(|i| i.modifiers);
if m.shift || m.command {
view.click_page(i, m, true);
diff --git a/crates/ui-egui/tests/view.rs b/crates/ui-egui/tests/view.rs
index d3744dd2ef..8405e05c80 100644
--- a/crates/ui-egui/tests/view.rs
+++ b/crates/ui-egui/tests/view.rs
@@ -52,6 +52,58 @@ fn rect(h: &Harness<'static, PdfCraftApp>, page: usize) -> Option {
h.state().views[0].page_screen_rect(page)
}
+fn sidebar_key(h: &mut Harness<'static, PdfCraftApp>, key: Key, modifiers: Modifiers) {
+ h.event(egui::Event::ModifiersChanged(modifiers));
+ for pressed in [true, false] {
+ h.event(egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers });
+ }
+ h.run_steps(2);
+ h.event(egui::Event::ModifiersChanged(Modifiers::NONE));
+ h.run_steps(1);
+}
+
+#[test]
+fn pages_sidebar_select_all_keeps_current_page_and_keyboard_scope() {
+ use egui_kittest::kittest::Queryable;
+ let mut h = harness(&[("panel", "pages")]);
+ h.get_by_label("Page 2").click();
+ h.run_steps(3);
+ assert_eq!(h.state().views[0].current, 1);
+ // Moving the pointer is not a keyboard-focus change.
+ h.hover_at(rect(&h, 1).unwrap().center());
+ h.run_steps(1);
+ for _ in 0..2 {
+ sidebar_key(&mut h, Key::A, Modifiers::COMMAND);
+ assert_eq!(h.state().views[0].target_pages(), vec![0, 1, 2]);
+ assert_eq!(h.state().views[0].current, 1, "selecting does not navigate");
+ }
+ sidebar_key(&mut h, Key::Escape, Modifiers::NONE);
+ assert!(h.state().views[0].selected.is_empty());
+
+ // A click on the viewer returns Ctrl+A to text selection, even with Pages open.
+ let pos = rect(&h, 1).unwrap().center();
+ for pressed in [true, false] {
+ h.event(egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+ }
+ h.run_steps(3);
+ sidebar_key(&mut h, Key::A, Modifiers::COMMAND);
+ assert!(h.state().views[0].selected.is_empty(), "viewer shortcut must not select thumbnails");
+
+ // A different document does not inherit the previous sidebar's keyboard ownership.
+ h.get_by_label("Page 2").click();
+ h.run_steps(2);
+ h.state_mut().open_bytes("other.pdf", None, PAGES.to_vec()).unwrap();
+ h.run_steps(5);
+ sidebar_key(&mut h, Key::A, Modifiers::COMMAND);
+ let active = h.state().active.unwrap();
+ assert!(h.state().views[active].selected.is_empty());
+ h.get_by_label("Page 1").click();
+ h.run_steps(2);
+ sidebar_key(&mut h, Key::A, Modifiers::COMMAND);
+ assert_eq!(h.state().views[active].target_pages(), vec![0, 1, 2]);
+ assert!(h.state().views[0].selected.is_empty(), "selection remains document-local");
+}
+
/// Two pages of different sizes: 300×400 then 600×300.
const MIXED: &[u8] = b"%PDF-1.7
1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj
diff --git a/docs/roadmap.md b/docs/roadmap.md
index fabb5e603d..142466a0bd 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -1,6 +1,6 @@
# PdfCraft roadmap: milestones and what's next
-> **Last reviewed:** 2026-10-13 · **Last updated:** 2026-10-13 · **Change:** minor (M3 candidate: native opens retain chosen tools through password retries and defer startup intake while preparation is pending; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** minor (M4/#2052 candidate: keyboard-owned Pages sidebar select-all; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M13: CLI check visits each directory once through aliases and cycles; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M4: Extract and Split preserve shared Type 3 glyph resources; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (M2: packed TIFF-predictor RGB rows retain their byte boundaries; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
@@ -95,7 +95,7 @@ total matches the parity estimate.
| M2 | Model, render, text | 200–350 | 15% | 130–230 | hayro bootstrap renderer (vendored patches); inspector predictor scratch is bounded by available input, and JPX sample rescaling handles 1–32 bits safely. Text extraction reaches word-F1 0.98 against pdftotext. Short same-line redraws split before placement rather than interleaving. A custom text match that ends on a reconstructed separator stops before the next glyph (#1315). Missing: model crate, fonts, DisplayList, renderer independent of hayro. Inspector page-label traversal and output are resource-bounded, with physical-number fallback warnings |
| M2 | Model, render, text | 200–350 | 15% | 130–230 | hayro bootstrap renderer (vendored patches); Lab Bradford adaptation uses LMS white-point ratios, covered by independent neutral/chromatic and direct/Indexed render oracles; inspector predictor scratch is bounded by available input, and JPX sample rescaling handles 1–32 bits safely. Text extraction reaches word-F1 0.98 against pdftotext. Short same-line redraws split before placement rather than interleaving. Missing: model crate, fonts, DisplayList, renderer independent of hayro. Inspector page-label traversal and output are resource-bounded, with physical-number fallback warnings |
| M3 | Viewer app (native + web) | 80–150 | 90% | 10–20 | Acrobat-style shell, find, select, panels, tiles, web build, UI control channel for agents (opt-in). Missing: 60 fps test on a 500-page document, snapshot tests of every panel Done since: fit visible, document title in the window; Linux middle-button scrolling; shared three-state theme preferences in the toolbar, View menu and control channel; numeric Linux portal events and idle wakeups completing #881, with native appearance inheritance retained (#446); late browser startup downloads preserve the current document and Save target (#171). |
-| M4 | Engine, history, save, organize | 100–180 | 95% | 8–15 | Done: - command registry (menus, shortcuts and palette all use it); - undo/redo; incremental, atomic and encrypted saves; - autosave and crash recovery; - organize, combine, extract, split and insert-from-file, with identical fonts and images stored once; - CLI `edit/combine/extract/split`. Done since: Organize opens directly into the page overview, with checkbox selection, an editable page-range selection (#1092), and per-page rotate/delete controls; Combine files in its own tab (sortable, resizable columns; folders; early warnings; unlocking protected files), bookmark editing, page labels (Number pages), CLI `run`, Set Page Boxes, Crop tool, Duplicate pages, Ctrl+A / Cmd+A to select all pages in Organize, Replace pages, bookmarks from tagged headings. Extract and Split preserve shared Type 3 glyph resource graphs, retaining conservative pruning limits. Missing: page transitions, recovery on the web |
+| M4 | Engine, history, save, organize | 100–180 | 95% | 8–15 | Done: - command registry (menus, shortcuts and palette all use it); - undo/redo; incremental, atomic and encrypted saves; - autosave and crash recovery; - organize, combine, extract, split and insert-from-file, with identical fonts and images stored once; - CLI `edit/combine/extract/split`. Done since: Organize opens directly into the page overview, with checkbox selection, an editable page-range selection (#1092), and per-page rotate/delete controls; Combine files in its own tab (sortable, resizable columns; folders; early warnings; unlocking protected files), bookmark editing, page labels (Number pages), CLI `run`, Set Page Boxes, Crop tool, Duplicate pages, Ctrl+A / Cmd+A to select all pages in Organize; #2052 candidate adds keyboard-owned Pages sidebar select-all without navigation, with focus and document-isolation regression coverage, Replace pages, bookmarks from tagged headings. Extract and Split preserve shared Type 3 glyph resource graphs, retaining conservative pruning limits. Missing: page transitions, recovery on the web |
| M3 | Viewer app (native + web) | 80–150 | 90% | 10–20 | Acrobat-style shell, find, select, panels, tiles, web build, UI control channel for agents (opt-in). Missing: 60 fps test on a 500-page document, snapshot tests of every panel Done since: fit visible, document title in the window; Linux middle-button scrolling; shared three-state theme preferences in the toolbar, View menu and control channel; numeric Linux portal events and idle wakeups completing #881, with native appearance inheritance retained (#446); late browser startup downloads preserve the current document and Save target (#171). Renderer-creation errors return to the existing OpenGL startup fallback; a real-GPU regression covers errors and device reuse. The underlying x86 DX12 shader compiler failure remains unresolved; see `windows-renderer-startup.md`. With Windows' Animation effects turned off, the wheel scrolls and zooms without easing and egui's animations take no time (`motion.rs`; macOS, Linux and the browser aren't asked yet); Preferences ▸ Animation effects (Use system setting, On, Off) decides it on every platform. |
| M4 | Engine, history, save, organize | 100–180 | 95% | 8–15 | Done: - command registry (menus, shortcuts and palette all use it); - undo/redo; incremental, atomic and encrypted saves; - autosave and crash recovery; - organize, combine, extract, split and insert-from-file, with identical fonts and images stored once; - CLI `edit/combine/extract/split`. Done since: Combine files in its own tab (sortable, resizable columns; folders; early warnings; unlocking protected files), bookmark editing, page labels (Number pages), CLI `run`, Set Page Boxes, Crop tool, Duplicate pages, Ctrl+A / Cmd+A to select all pages in Organize, Replace pages, bookmarks from tagged headings. Missing: page transitions, recovery on the web |
| M5 | Comments (all annotation types, XFDF) | 120–200 | 88% | 12–25 | Done: notes, highlight/underline/strikeout/squiggly, text boxes, ink, lines, arrows, rectangles, ovals, stamps (dynamic, Sign Here, Standard Business), with appearance streams; replies, status, checkmarks, locking, move/resize/restyle/delete; properties dialog; panel filter and sort; hide all; summaries (comments only); XFDF/FDF import and export (partial imports preserve existing reply and review-status links); flatten; Fill & Sign with adjustable text/date size; agent tools. Done since: stamps placed on a rotated page read upright (#1398); polygons, connected lines, clouds, callouts, inserted text, colour and checkmark filters; image signature pointer previews, selection handles and live image movement/resizing with proportional corners and independent edge handles. Missing: custom stamps, replace-text proposals, summary layouts with the page |
@@ -162,6 +162,7 @@ M2 (renderer), M7 (content editing), M10 (OCR and Office), M11 (Preflight and st
| Date | Change | Summary |
|---|---|---|
+| 2026-10-14 | minor | M4/#2052 candidate: Pages sidebar select-all, focus ownership, Escape and document isolation validated; estimates unchanged. |
| 2026-10-12 | minor | M13: CLI check directory identity, with overlap and symlink regressions; estimates unchanged |
| 2026-10-12 | minor | M4: shared Type 3 glyph resources survive extraction, with save/reopen and independent raster regressions; estimates unchanged |
| 2026-10-12 | minor | M2: packed TIFF-predictor RGB row boundaries, with decoding and page-render regressions; estimates unchanged |
diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml
index 359a71e9a6..c18ae42a21 100644
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@ -1250,8 +1250,8 @@ milestone = "M4"
status = "shipped"
commands = []
tools = []
-evidence = ["crates/ui-egui/tests/editing.rs::dragging_pages_panel_thumbnails_reorders_pages", "crates/ui-egui/tests/viewer.rs::pages_panel_thumbnails_have_a_context_menu", "crates/ui-egui/tests/editing.rs::deleting_pages_from_the_pages_panel_menu", "crates/ui-egui/tests/editing.rs::the_delete_key_deletes_pages_picked_in_the_pages_panel_but_never_every_page"]
-notes = "Drag the selection (or the page grabbed) to reorder, with a drop bar and edge scrolling; right-click offers Extract pages, Cut, Copy, Paste after and Delete pages (also the Delete key over the panel). Not yet: Rotate, Insert and Page labels in the menu, dragging pages between documents, or dropping files onto the panel."
+evidence = ["crates/ui-egui/tests/view.rs::pages_sidebar_select_all_keeps_current_page_and_keyboard_scope", "crates/ui-egui/tests/editing.rs::dragging_pages_panel_thumbnails_reorders_pages", "crates/ui-egui/tests/viewer.rs::pages_panel_thumbnails_have_a_context_menu", "crates/ui-egui/tests/editing.rs::deleting_pages_from_the_pages_panel_menu", "crates/ui-egui/tests/editing.rs::the_delete_key_deletes_pages_picked_in_the_pages_panel_but_never_every_page"]
+notes = "Ctrl/Cmd+A selects every page when the Pages sidebar owns the keyboard, without navigation; Escape clears the selection. Viewer and text-field shortcuts retain their own scope. Drag the selection (or the page grabbed) to reorder, with a drop bar and edge scrolling; right-click offers Extract pages, Cut, Copy, Paste after and Delete pages (also the Delete key over the panel). Not yet: Rotate, Insert and Page labels in the menu, dragging pages between documents, or dropping files onto the panel."
[[feature]]
id = "view.bookmarks-panel"
From 9a5fec0caa5bec25785b5148b8349ebcb1b8369d Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 19:05:51 +0530
Subject: [PATCH 012/462] feat: major Acrobat UI parity, crop, and layer fixes
---
crates/edit/src/images.rs | 233 +++++++++++++++++++++--------
crates/edit/src/tests.rs | 26 ++++
crates/ui-egui/src/canvas.rs | 52 +++++--
crates/ui-egui/src/content_ui.rs | 131 ++++++++++++++++
crates/ui-egui/src/create_ui.rs | 2 +-
crates/ui-egui/src/edit_text_ui.rs | 68 ++++++++-
crates/ui-egui/src/image_pick.rs | 2 +-
crates/ui-egui/src/lib.rs | 46 ++++--
crates/ui-egui/src/object_ui.rs | 3 +
crates/ui-egui/tests/comments.rs | 2 +-
crates/ui-egui/tests/editing.rs | 88 ++++++++++-
11 files changed, 562 insertions(+), 91 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 14556c7644..8bb6949f99 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -660,6 +660,122 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
Ok(())
}
+/// Locate the innermost graphics state scope enclosing only `target` (with no other painting operations).
+/// Returns `Some((start, end, scope_matrix))` where `start` is the index of `q`, `end` is the index of `Q`,
+/// and `scope_matrix` is the CTM in effect immediately before entering that `q`.
+fn image_exclusive_scope(ops: &[Op], target: usize) -> Result, EditError> {
+ struct Scope {
+ start: usize,
+ matrix: Matrix,
+ inherited_clip: bool,
+ inherited_path: bool,
+ selected: bool,
+ other_paint: bool,
+ }
+ let mut stack: Vec = Vec::new();
+ let mut matrix = Matrix::IDENTITY;
+ let mut clipped = false;
+ let mut path = false;
+ let mut pending_clip = false;
+ let mut text = false;
+ let mut at_image = None;
+ let mut isolated = None;
+ for (index, op) in ops.iter().enumerate() {
+ match op.op.as_slice() {
+ b"q" => {
+ if stack.len() >= 256 {
+ return Err(EditError::Invalid("the image graphics state is too deeply nested".into()));
+ }
+ stack.push(Scope { start: index, matrix, inherited_clip: clipped, inherited_path: path, selected: false, other_paint: false });
+ }
+ b"Q" => {
+ if let Some(scope) = stack.pop() {
+ if scope.selected && !scope.other_paint && !scope.inherited_clip && !scope.inherited_path {
+ isolated.get_or_insert((scope.start, index, scope.matrix));
+ }
+ matrix = scope.matrix;
+ clipped = scope.inherited_clip;
+ }
+ }
+ b"cm" => {
+ if let Some(m) = op.nums::<6>() {
+ matrix = Matrix(m).then(&matrix);
+ }
+ }
+ b"BT" => text = true,
+ b"ET" => text = false,
+ b"m" | b"l" | b"c" | b"v" | b"y" | b"re" => path = true,
+ b"W" | b"W*" => pending_clip = true,
+ _ => {}
+ }
+ if index == target {
+ if text {
+ return Err(EditError::Invalid("an image inside a text object cannot be cropped".into()));
+ }
+ at_image = Some(matrix);
+ for scope in &mut stack {
+ scope.selected = true;
+ }
+ } else if matches!(
+ op.op.as_slice(),
+ b"Do" | b"Tj" | b"TJ" | b"'" | b"\"" | b"sh" | b"BI" | b"S" | b"s" | b"f" | b"F" | b"f*" | b"B" | b"B*" | b"b" | b"b*"
+ ) {
+ for scope in &mut stack {
+ scope.other_paint = true;
+ }
+ }
+ if matches!(op.op.as_slice(), b"n" | b"S" | b"s" | b"f" | b"F" | b"f*" | b"B" | b"B*" | b"b" | b"b*") {
+ clipped |= pending_clip;
+ pending_clip = false;
+ path = false;
+ }
+ }
+ if at_image.is_none() {
+ return Err(EditError::Invalid("the image operation is missing".into()));
+ }
+ Ok(isolated)
+}
+
+fn extract_image_drawing_ops(ops: &[Op], start: usize, end: usize, scope_matrix: Matrix) -> Vec {
+ let mut drawing = Vec::new();
+ let mut i = start.saturating_add(1);
+ while i < end {
+ let op = match ops.get(i) {
+ Some(o) => o,
+ None => break,
+ };
+ if op.is("cm")
+ && scope_matrix != Matrix::IDENTITY
+ && let (Some(m), Some(inv)) = (op.nums::<6>(), scope_matrix.invert())
+ && Matrix(m) == inv
+ && ops.get(i + 1).is_some_and(|next| next.is("re"))
+ {
+ i = i.saturating_add(1);
+ continue;
+ }
+ if op.is("re") {
+ i = i.saturating_add(1);
+ if ops.get(i).is_some_and(|next| next.is("W") || next.is("W*")) {
+ i = i.saturating_add(1);
+ }
+ if ops.get(i).is_some_and(|next| next.is("n")) {
+ i = i.saturating_add(1);
+ }
+ if scope_matrix != Matrix::IDENTITY
+ && ops.get(i).is_some_and(|next| next.is("cm"))
+ && let Some(m) = ops.get(i).and_then(|next| next.nums::<6>())
+ && Matrix(m) == scope_matrix
+ {
+ i = i.saturating_add(1);
+ }
+ continue;
+ }
+ drawing.push(op.clone());
+ i = i.saturating_add(1);
+ }
+ drawing
+}
+
/// Remove any private clipping path / crop on image `index` on `page`.
pub fn remove_image_crop(doc: &mut Document, page: usize, index: usize) -> Result<(), EditError> {
let images = page_images(doc, page)?;
@@ -682,14 +798,19 @@ pub fn remove_image_crop(doc: &mut Document, page: usize, index: usize) -> Resul
.iter()
.position(|op| op.span.start == span && op.is("Do"))
.ok_or_else(|| EditError::Invalid("the image operation could not be located".into()))?;
- if let Some((at, _)) = exclusive_clip(&ops, target) {
- let end_idx = at.saturating_add(2);
- if let (Some(start_op), Some(end_op)) = (ops.get(at), ops.get(end_idx)) {
- let range = start_op.span.start..end_op.span.end;
- let changed = pieces.splice([(range, Vec::new())]);
- let contents = crate::text::rewritten_contents(doc, &all, changed);
- doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), contents))?;
- }
+ if let Some((start, end, scope_matrix)) = image_exclusive_scope(&ops, target)? {
+ let drawing_ops = extract_image_drawing_ops(&ops, start, end, scope_matrix);
+ let start_op = ops.get(start).ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let end_op = ops.get(end).ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let range = start_op.span.start..end_op.span.end;
+ let mut unit_ops = Vec::new();
+ unit_ops.push(Op::new("q", vec![]));
+ unit_ops.extend(drawing_ops);
+ unit_ops.push(Op::new("Q", vec![]));
+ let serialized = serialize_ops(&unit_ops);
+ let changed = pieces.splice([(range, serialized)]);
+ let contents = crate::text::rewritten_contents(doc, &all, changed);
+ doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), contents))?;
}
Ok(())
}
@@ -725,62 +846,52 @@ pub fn crop_image(doc: &mut Document, page: usize, index: usize, crop_rect: [f64
.position(|op| op.span.start == span && op.is("Do"))
.ok_or_else(|| EditError::Invalid("the image operation could not be located".into()))?;
- let (range, unit_ops) = if let Some((at, _)) = exclusive_clip(&ops, target) {
- let op_re = ops.get(at).ok_or_else(|| EditError::Invalid("the crop operation is missing".into()))?;
- (
- op_re.span.start..op_re.span.end,
- vec![Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)])],
- )
- } else if target >= 2
- && ops.get(target - 2).is_some_and(|o| o.is("q"))
- && ops.get(target - 1).is_some_and(|o| o.is("cm"))
- && ops.get(target + 1).is_some_and(|o| o.is("Q"))
- {
- let q_op = &ops[target - 2];
- let q_end = &ops[target + 1];
- (
- q_op.span.start..q_end.span.end,
- vec![
- Op::new("q", vec![]),
- Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]),
- Op::new("W", vec![]),
- Op::new("n", vec![]),
- ops[target - 1].clone(),
- ops[target].clone(),
- Op::new("Q", vec![]),
- ],
- )
- } else if target >= 1 && ops.get(target - 1).is_some_and(|o| o.is("cm")) {
- let cm_op = &ops[target - 1];
- let do_op = &ops[target];
- (
- cm_op.span.start..do_op.span.end,
- vec![
- Op::new("q", vec![]),
- Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]),
- Op::new("W", vec![]),
- Op::new("n", vec![]),
- ops[target - 1].clone(),
- ops[target].clone(),
- Op::new("Q", vec![]),
- ],
- )
+ let (start, end, drawing_ops, scope_matrix) = if let Some((start, end, scope_matrix)) = image_exclusive_scope(&ops, target)? {
+ let drawing_ops = extract_image_drawing_ops(&ops, start, end, scope_matrix);
+ (start, end, drawing_ops, scope_matrix)
} else {
- let do_op = &ops[target];
- (
- do_op.span.start..do_op.span.end,
- vec![
- Op::new("q", vec![]),
- Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]),
- Op::new("W", vec![]),
- Op::new("n", vec![]),
- Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
- ops[target].clone(),
- Op::new("Q", vec![]),
- ],
- )
+ let mut state = ImageState::new(Matrix::IDENTITY, p.crop(doc), Vec::new());
+ let mut scope_matrix = Matrix::IDENTITY;
+ let start = if target >= 1 && ops.get(target - 1).is_some_and(|o| o.is("cm")) {
+ target - 1
+ } else {
+ target
+ };
+ for (i, o) in ops.iter().enumerate() {
+ if i == start {
+ scope_matrix = state.placement.matrix;
+ break;
+ }
+ state.apply(o)?;
+ }
+ let drawing_ops = ops.get(start..=target).unwrap_or_default().to_vec();
+ (start, target, drawing_ops, scope_matrix)
};
+ let mut unit_ops = Vec::new();
+ unit_ops.push(Op::new("q", vec![]));
+ if scope_matrix != Matrix::IDENTITY
+ && let Some(inv) = scope_matrix.invert()
+ {
+ unit_ops.push(Op::new("cm", inv.0.map(pdfcraft_content::num).to_vec()));
+ }
+ unit_ops.push(Op::new("re", vec![
+ pdfcraft_content::num(x0),
+ pdfcraft_content::num(y0),
+ pdfcraft_content::num(w),
+ pdfcraft_content::num(h),
+ ]));
+ unit_ops.push(Op::new("W", vec![]));
+ unit_ops.push(Op::new("n", vec![]));
+ if scope_matrix != Matrix::IDENTITY {
+ unit_ops.push(Op::new("cm", scope_matrix.0.map(pdfcraft_content::num).to_vec()));
+ }
+ unit_ops.extend(drawing_ops);
+ unit_ops.push(Op::new("Q", vec![]));
+
+ let start_op = ops.get(start).ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let end_op = ops.get(end).ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ let range = start_op.span.start..end_op.span.end;
let serialized = serialize_ops(&unit_ops);
let changed = pieces.splice([(range, serialized)]);
let contents = crate::text::rewritten_contents(doc, &all, changed);
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index c3aa428f84..a9f61f8bbd 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1740,6 +1740,32 @@ fn image_arrange_stacking_order_and_remove_crop() {
let doc = reopen(&doc);
let img_restored = &images::page_images(&doc, 0).unwrap()[0];
assert_eq!(img_restored.visible_rect, Some(img_restored.rect));
+
+ // Test cropping an image that was moved (has an outer transform)
+ let mut doc = image_page_with("q 200 0 0 100 100 100 cm /Im0 Do Q");
+ let move_transform = [1.0, 0.0, 0.0, 1.0, 50.0, 40.0];
+ images::change_image(&mut doc, 0, 0, &images::ImageChange::Transform(move_transform)).unwrap();
+ let doc = reopen(&doc);
+ let img_moved = &images::page_images(&doc, 0).unwrap()[0];
+ assert_eq!(img_moved.rect, [150.0, 140.0, 350.0, 240.0]);
+ let mut doc = doc;
+ images::crop_image(&mut doc, 0, 0, [170.0, 150.0, 300.0, 220.0]).unwrap();
+ let doc = reopen(&doc);
+ let img_crop_moved = &images::page_images(&doc, 0).unwrap()[0];
+ assert!(img_crop_moved.visible_rect.is_some(), "cropped image must not be deleted");
+ assert!(close(img_crop_moved.visible_rect.unwrap(), [170.0, 150.0, 300.0, 220.0]));
+ // Adjust crop (re-crop)
+ let mut doc = doc;
+ images::crop_image(&mut doc, 0, 0, [180.0, 160.0, 280.0, 210.0]).unwrap();
+ let doc = reopen(&doc);
+ let img_recropped = &images::page_images(&doc, 0).unwrap()[0];
+ assert!(close(img_recropped.visible_rect.unwrap(), [180.0, 160.0, 280.0, 210.0]));
+ // Remove crop from moved image
+ let mut doc = doc;
+ images::remove_image_crop(&mut doc, 0, 0).unwrap();
+ let doc = reopen(&doc);
+ let img_restored_moved = &images::page_images(&doc, 0).unwrap()[0];
+ assert_eq!(img_restored_moved.visible_rect, Some(img_restored_moved.rect));
}
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 8f21dcdfe2..aacc091bff 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -542,6 +542,8 @@ pub(crate) enum PageMenuAction {
SelectTool,
HandTool,
MarqueeZoom,
+ Copy,
+ Paste(usize, [f64; 2]),
AddComment(usize, [f64; 2]),
AddBookmark(usize),
TakeSnapshot,
@@ -558,6 +560,8 @@ pub(crate) fn default_page_context_menu(
ui: &mut egui::Ui,
page: usize,
at: [f64; 2],
+ can_copy: bool,
+ can_paste: bool,
action: &mut Option,
) {
// Top horizontal icon bar: Rotate CCW, Print, Select tool, Hand tool, Marquee Zoom
@@ -587,6 +591,17 @@ pub(crate) fn default_page_context_menu(
ui.separator();
+ if ui.add_enabled(can_copy, egui::Button::new(tl!("Copy")).shortcut_text("Ctrl+C")).clicked() {
+ *action = Some(PageMenuAction::Copy);
+ ui.close();
+ }
+ if ui.add_enabled(can_paste, egui::Button::new(tl!("Paste")).shortcut_text("Ctrl+V")).clicked() {
+ *action = Some(PageMenuAction::Paste(page, at));
+ ui.close();
+ }
+
+ ui.separator();
+
if ui.button(tl!("Add comment")).clicked() {
*action = Some(PageMenuAction::AddComment(page, at));
ui.close();
@@ -2191,6 +2206,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
let editing_content =
(app.left_open && app.left == crate::LeftPanel::Tool("edit")) || matches!(app.quick_tool, QuickTool::AddText | QuickTool::EditText);
let text_style = app.text_style.clone();
+ let can_paste_image = app.can_paste_image();
let view = &mut app.views[index];
// Opened without the owner password and something is restricted.
let secured = doc.security_summary().is_some_and(|s| !(s.owner || (s.permissions.modify() && s.permissions.assemble())));
@@ -3227,7 +3243,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
return;
}
if tool == QuickTool::EditText && let Some(sel) = view.image_selection.clone() {
- crate::edit_text_ui::image_context_menu(ui, view, doc, sel.page, sel.index, &mut image_action);
+ crate::edit_text_ui::image_context_menu(ui, view, doc, sel.page, sel.index, can_paste_image, &mut image_action);
return;
}
if view.comments.selected.is_some() {
@@ -3260,11 +3276,14 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
ui.separator();
}
}
+ let has_copy_image = copy_image.is_some();
if copy_image.is_some() {
canvas_action = copy_image;
}
let (page, at) = view.comments.context_at.unwrap_or((view.current, [0.0, 0.0]));
- default_page_context_menu(ui, page, at, &mut page_action);
+ let can_copy = view.image_selection.is_some() || view.selected_text().is_some() || has_copy_image;
+ let can_paste = can_paste_image;
+ default_page_context_menu(ui, page, at, can_copy, can_paste, &mut page_action);
});
(wanted, visible_now)
});
@@ -3531,13 +3550,11 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
Some(crate::edit_text_ui::ImageAction::Copy(page, i)) => app.copy_page_image(page, i),
Some(crate::edit_text_ui::ImageAction::CopyFile(page, i)) => app.copy_page_image_file(page, i),
Some(crate::edit_text_ui::ImageAction::Cut(page, i)) => {
- app.copy_page_image(page, i);
- app.views[index].pending_edit = Some(pdfcraft_engine::Edit::EditPageImage {
- page,
- index: i,
- change: pdfcraft_engine::ImageEdit::Delete,
- });
- app.views[index].image_selection = None;
+ app.cut_page_image(index, page, i);
+ }
+ Some(crate::edit_text_ui::ImageAction::Paste(page, rect)) => {
+ let offset_rect = [rect[0] + 20.0, rect[1] - 20.0, rect[2] + 20.0, rect[3] - 20.0];
+ app.paste_image(page, Some(offset_rect));
}
Some(crate::edit_text_ui::ImageAction::DrawFreehand) => {
app.quick_tool = crate::QuickTool::Comment(crate::comments::CommentTool::Ink);
@@ -3591,6 +3608,23 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
None => {}
}
match page_action {
+ Some(PageMenuAction::Copy) => {
+ if let Some(sel) = app.views[index].image_selection.clone() {
+ app.copy_page_image(sel.page, sel.index);
+ } else if let Some(text) = app.views[index].selected_text() {
+ if let Some(id) = app.views.get(index).map(|v| v.id) && app.may_copy(id) {
+ ui.ctx().copy_text(text);
+ }
+ } else if let Some((page, at)) = app.views[index].comments.context_at
+ && let Some(doc) = app.session.get(app.views[index].id)
+ && let Some(image) = doc.page_image_at(page, at)
+ {
+ app.copy_page_image(page, image);
+ }
+ }
+ Some(PageMenuAction::Paste(page, at)) => {
+ app.paste_image_at(page, at);
+ }
Some(PageMenuAction::RotateCCW(page)) => {
app.views[index].pending_edit = Some(pdfcraft_engine::Edit::RotatePages { pages: vec![page], degrees: -90 });
}
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 148830e010..20a609ad3e 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -745,6 +745,15 @@ impl crate::PdfCraftApp {
if !self.may_copy(id) {
return;
}
+ let img_rect = self.session.get(id).and_then(|d| d.page_images(page).into_iter().nth(index).map(|im| im.rect));
+ self.last_copied_image_rect = img_rect;
+ if let Some(doc) = self.session.get(id)
+ && let Ok((ext, bytes)) = doc.page_image_copy_file(page, index)
+ {
+ let stem = crate::image_pick::safe_name(doc.name.rsplit_once('.').map_or(doc.name.as_str(), |(s, _)| s));
+ let name = format!("{stem} p{} img{}.{ext}", page.saturating_add(1), index.saturating_add(1));
+ self.last_copied_file = Some((name, bytes));
+ }
let Some(pixels) = self.session.get(id).map(|d| d.page_image_rgba(page, index)) else { return };
let copied = pixels.and_then(|(w, h, rgba)| {
#[cfg(not(target_arch = "wasm32"))]
@@ -765,6 +774,128 @@ impl crate::PdfCraftApp {
}
}
+ /// Cut Image: copy image `index` on `page` to the clipboard, then delete it.
+ pub(crate) fn cut_page_image(&mut self, view_idx: usize, page: usize, index: usize) {
+ self.copy_page_image(page, index);
+ if let Some(view) = self.views.get_mut(view_idx) {
+ view.pending_edit = Some(pdfcraft_engine::Edit::EditPageImage {
+ page,
+ index,
+ change: pdfcraft_engine::ImageEdit::Delete,
+ });
+ view.image_selection = None;
+ }
+ }
+
+ /// Whether there is an image in the in-memory clipboard or system clipboard ready to paste.
+ pub fn can_paste_image(&self) -> bool {
+ if self.last_copied_image.is_some() || self.last_copied_file.is_some() {
+ return true;
+ }
+ #[cfg(not(target_arch = "wasm32"))]
+ {
+ if self.system_clipboard
+ && let Ok(mut cb) = arboard::Clipboard::new()
+ {
+ return cb.get_image().is_ok();
+ }
+ }
+ false
+ }
+
+ /// Paste an image from the clipboard onto `page`.
+ pub fn paste_image(&mut self, page: usize, rect: Option<[f64; 4]>) -> bool {
+ let Some((i, id)) = self.active_ids() else { return false; };
+ if let Some(doc) = self.session.get(id)
+ && !doc.allows_modification()
+ {
+ self.notify_error(tl!("The document's security settings don't allow changes"));
+ return false;
+ }
+
+ let image_data: Option<(String, Vec)> = if let Some((name, bytes)) = self.last_copied_file.clone() {
+ Some((name, bytes))
+ } else if let Some((w, h, rgba)) = self.last_copied_image.clone() {
+ crate::create_ui::png_from_rgba(w as usize, h as usize, &rgba).ok().map(|b| ("pasted_image.png".to_string(), b))
+ } else {
+ #[cfg(not(target_arch = "wasm32"))]
+ {
+ if self.system_clipboard {
+ arboard::Clipboard::new()
+ .ok()
+ .and_then(|mut cb| cb.get_image().ok())
+ .and_then(|img| {
+ crate::create_ui::png_from_rgba(img.width, img.height, &img.bytes)
+ .ok()
+ .map(|b| ("clipboard_image.png".to_string(), b))
+ })
+ } else {
+ None
+ }
+ }
+ #[cfg(target_arch = "wasm32")]
+ None
+ };
+
+ let Some((name, bytes)) = image_data else {
+ self.notify_tr("No image on clipboard to paste");
+ return false;
+ };
+
+ let target_rect = match rect {
+ Some(r) => Some(r),
+ None => {
+ if let Some(src_rect) = self.last_copied_image_rect {
+ let w = src_rect[2] - src_rect[0];
+ let h = src_rect[3] - src_rect[1];
+ let offset_x = 20.0;
+ let offset_y = -20.0;
+ let new_r = [src_rect[0] + offset_x, src_rect[1] + offset_y, src_rect[0] + offset_x + w, src_rect[1] + offset_y + h];
+ self.last_copied_image_rect = Some(new_r);
+ Some(new_r)
+ } else {
+ None
+ }
+ }
+ };
+
+ let before = self.session.get(id).map_or(0, |d| d.page_images(page).len());
+ if self.apply_edit(pdfcraft_engine::Edit::AddImage {
+ page,
+ rect: target_rect,
+ name,
+ bytes: std::sync::Arc::new(bytes),
+ }) {
+ if let Some(v) = self.views.get_mut(i) {
+ v.current = page;
+ v.image_selection = Some(crate::edit_text_ui::ImageSelection {
+ page,
+ index: before,
+ crop_mode: false,
+ crop_rect: None,
+ drag: None,
+ });
+ }
+ self.quick_tool = crate::QuickTool::EditText;
+ self.notify_tr("Image pasted");
+ true
+ } else {
+ false
+ }
+ }
+
+ /// Paste an image centered at context menu point `at: [f64; 2]` on `page`.
+ pub fn paste_image_at(&mut self, page: usize, at: [f64; 2]) -> bool {
+ let rect = if let Some(src_r) = self.last_copied_image_rect {
+ let w = src_r[2] - src_r[0];
+ let h = src_r[3] - src_r[1];
+ Some([at[0] - w * 0.5, at[1] - h * 0.5, at[0] + w * 0.5, at[1] + h * 0.5])
+ } else {
+ None
+ };
+ self.paste_image(page, rect)
+ }
+
/// Click an image field: pick a picture for it.
pub fn choose_field_image(&mut self, name: &str) {
#[cfg(not(target_arch = "wasm32"))]
diff --git a/crates/ui-egui/src/create_ui.rs b/crates/ui-egui/src/create_ui.rs
index 63f8035251..fb8f1b2e27 100644
--- a/crates/ui-egui/src/create_ui.rs
+++ b/crates/ui-egui/src/create_ui.rs
@@ -66,7 +66,7 @@ fn read_clipboard() -> Option {
cb.get_text().ok().filter(|t| !t.trim().is_empty()).map(Clip::Text)
}
-fn png_from_rgba(width: usize, height: usize, rgba: &[u8]) -> Result, String> {
+pub(crate) fn png_from_rgba(width: usize, height: usize, rgba: &[u8]) -> Result, String> {
let (w, h) = (u32::try_from(width).map_err(|e| e.to_string())?, u32::try_from(height).map_err(|e| e.to_string())?);
if w == 0 || h == 0 || rgba.len() != width * height * 4 {
return Err("the clipboard image is empty or malformed".into());
diff --git a/crates/ui-egui/src/edit_text_ui.rs b/crates/ui-egui/src/edit_text_ui.rs
index 282ab3eac9..48b8a7d552 100644
--- a/crates/ui-egui/src/edit_text_ui.rs
+++ b/crates/ui-egui/src/edit_text_ui.rs
@@ -616,7 +616,7 @@ impl ImageSelection {
/// applies after the pointer leaves the image/page while dragging.
pub(crate) fn image_owns_pointer(ui: &egui::Ui, xf: &PageXform, page: usize, info: &DocInfo, view: &DocView) -> bool {
let Some(selection) = view.image_selection.as_ref().filter(|s| s.page == page) else { return false };
- if selection.drag.is_some() {
+ if selection.drag.is_some() || selection.crop_mode {
return true;
}
let Some(image) = view.edit_images.get(&page).and_then(|(_, images)| images.get(selection.index)) else { return false };
@@ -698,6 +698,7 @@ pub(crate) enum ImageAction {
Copy(usize, usize),
CopyFile(usize, usize),
Cut(usize, usize),
+ Paste(usize, [f64; 4]),
DrawFreehand,
Redact(usize, usize),
CreateLink(usize, usize),
@@ -858,14 +859,22 @@ pub(crate) fn image_input(
painter.line_segment([Pos2::new(active_crop.left(), y2), Pos2::new(active_crop.right(), y2)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
let crop_handles = [
+ ImageHandle::TopLeft,
ImageHandle::TopCenter,
+ ImageHandle::TopRight,
ImageHandle::RightCenter,
+ ImageHandle::BottomRight,
ImageHandle::BottomCenter,
+ ImageHandle::BottomLeft,
ImageHandle::LeftCenter,
];
for &h in &crop_handles {
let c = handle_pos(active_crop, h);
- let sz = if matches!(h, ImageHandle::TopCenter | ImageHandle::BottomCenter) { egui::vec2(16.0, 7.0) } else { egui::vec2(7.0, 16.0) };
+ let sz = match h {
+ ImageHandle::TopCenter | ImageHandle::BottomCenter => egui::vec2(16.0, 6.0),
+ ImageHandle::LeftCenter | ImageHandle::RightCenter => egui::vec2(6.0, 16.0),
+ _ => egui::vec2(10.0, 10.0),
+ };
painter.rect(Rect::from_center_size(c, sz), CornerRadius::same(1), Color32::WHITE, Stroke::new(1.5, ACCENT), egui::StrokeKind::Middle);
}
@@ -878,13 +887,21 @@ pub(crate) fn image_input(
}
if allow_interaction {
- if ui.input(|inp| inp.key_pressed(egui::Key::Enter)) {
+ let enter_pressed = ui.input_mut(|inp| inp.consume_key(egui::Modifiers::NONE, egui::Key::Enter));
+ let dbl_click = resp.double_clicked() && hover_pos.is_some_and(|p| active_crop.contains(p));
+ if enter_pressed || dbl_click {
if active_crop != b {
view.pending_edit = Some(Edit::EditPageImage {
page,
index: i,
change: pdfcraft_engine::ImageEdit::Crop(user_box(xf, info, page, active_crop)),
});
+ } else if images.get(i).is_some_and(|im| im.visible_rect.is_some() && im.visible_rect != Some(im.rect)) {
+ view.pending_edit = Some(Edit::EditPageImage {
+ page,
+ index: i,
+ change: pdfcraft_engine::ImageEdit::RemoveCrop,
+ });
}
if let Some(s) = view.image_selection.as_mut() {
s.crop_mode = false;
@@ -892,7 +909,7 @@ pub(crate) fn image_input(
}
return true;
}
- if ui.input(|inp| inp.key_pressed(egui::Key::Escape)) {
+ if ui.input_mut(|inp| inp.consume_key(egui::Modifiers::NONE, egui::Key::Escape)) {
if let Some(s) = view.image_selection.as_mut() {
s.crop_mode = false;
s.crop_rect = None;
@@ -918,9 +935,13 @@ pub(crate) fn image_input(
if is_crop {
let active_crop = view.image_selection.as_ref().and_then(|s| s.crop_rect).unwrap_or(b);
let crop_handles = [
+ ImageHandle::TopLeft,
ImageHandle::TopCenter,
+ ImageHandle::TopRight,
ImageHandle::RightCenter,
+ ImageHandle::BottomRight,
ImageHandle::BottomCenter,
+ ImageHandle::BottomLeft,
ImageHandle::LeftCenter,
];
let hit_edge = crop_handles.iter().copied().find(|&h| handle_pos(active_crop, h).distance(o) < 8.0);
@@ -955,6 +976,26 @@ pub(crate) fn image_input(
if is_crop {
let mut new_crop = initial;
match drag.target {
+ DragTarget::CropHandle(ImageHandle::TopLeft) => {
+ let x = (initial.left() + delta.x).clamp(b.left(), initial.right() - 10.0);
+ let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
+ new_crop = Rect::from_min_max(Pos2::new(x, y), initial.max);
+ }
+ DragTarget::CropHandle(ImageHandle::TopRight) => {
+ let x = (initial.right() + delta.x).clamp(initial.left() + 10.0, b.right());
+ let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
+ new_crop = Rect::from_min_max(Pos2::new(initial.left(), y), Pos2::new(x, initial.bottom()));
+ }
+ DragTarget::CropHandle(ImageHandle::BottomLeft) => {
+ let x = (initial.left() + delta.x).clamp(b.left(), initial.right() - 10.0);
+ let y = (initial.bottom() + delta.y).clamp(initial.top() + 10.0, b.bottom());
+ new_crop = Rect::from_min_max(Pos2::new(x, initial.top()), Pos2::new(initial.right(), y));
+ }
+ DragTarget::CropHandle(ImageHandle::BottomRight) => {
+ let x = (initial.right() + delta.x).clamp(initial.left() + 10.0, b.right());
+ let y = (initial.bottom() + delta.y).clamp(initial.top() + 10.0, b.bottom());
+ new_crop = Rect::from_min_max(initial.min, Pos2::new(x, y));
+ }
DragTarget::CropHandle(ImageHandle::TopCenter) => {
let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
new_crop = Rect::from_min_max(Pos2::new(initial.left(), y), initial.max);
@@ -1072,8 +1113,15 @@ pub(crate) fn image_input(
&& ui.input(|inp| inp.key_pressed(egui::Key::Delete) || inp.key_pressed(egui::Key::Backspace))
&& !ui.ctx().egui_wants_keyboard_input()
{
- view.image_selection = None;
- view.pending_edit = Some(Edit::EditPageImage { page, index: i, change: pdfcraft_engine::ImageEdit::Delete });
+ if is_crop {
+ if let Some(s) = view.image_selection.as_mut() {
+ s.crop_mode = false;
+ s.crop_rect = None;
+ }
+ } else {
+ view.image_selection = None;
+ view.pending_edit = Some(Edit::EditPageImage { page, index: i, change: pdfcraft_engine::ImageEdit::Delete });
+ }
return true;
}
}
@@ -1083,6 +1131,7 @@ pub(crate) fn image_input(
let Some(p) = hover_pos.filter(|p| xf.rect.contains(*p)) else { return false };
let Some(hit) = boxes.iter().enumerate().rposition(|(i, b)| b.contains(p) && image_contains(i, p)) else {
let over_popup = egui::Popup::is_any_open(ui.ctx())
+ || resp.context_menu_opened()
|| ui.ctx().is_pointer_over_egui()
|| ui.ctx().egui_wants_pointer_input();
if (resp.secondary_clicked() || resp.clicked()) && !over_popup {
@@ -1124,6 +1173,7 @@ pub(crate) fn image_context_menu(
doc: &pdfcraft_engine::Document,
page: usize,
hit: usize,
+ can_paste: bool,
action: &mut Option,
) {
let images = doc.page_images(page);
@@ -1171,8 +1221,10 @@ pub(crate) fn image_context_menu(
*action = Some(ImageAction::Copy(page, hit));
ui.close();
}
- // Paste item: disabled when no item can be pasted into the image layer
- ui.add_enabled(false, egui::Button::new(tl!("Paste")).shortcut_text("Ctrl+V"));
+ if ui.add_enabled(can_paste, egui::Button::new(tl!("Paste")).shortcut_text("Ctrl+V")).clicked() {
+ *action = Some(ImageAction::Paste(page, img.rect));
+ ui.close();
+ }
ui.separator();
diff --git a/crates/ui-egui/src/image_pick.rs b/crates/ui-egui/src/image_pick.rs
index a05aefe2d2..3030bfb293 100644
--- a/crates/ui-egui/src/image_pick.rs
+++ b/crates/ui-egui/src/image_pick.rs
@@ -59,7 +59,7 @@ pub(crate) fn paint(painter: &egui::Painter, xf: &PageXform, page: usize, info:
}
/// A file name without characters file systems refuse.
-fn safe_name(s: &str) -> String {
+pub(crate) fn safe_name(s: &str) -> String {
let cleaned: String = s.chars().map(|c| if c.is_control() || r#"/\:*?"<>|"#.contains(c) { '_' } else { c }).take(80).collect();
let cleaned = cleaned.trim().trim_matches('.').to_string();
if cleaned.is_empty() { "PdfCraft".into() } else { cleaned }
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index de858de5cd..1fddfa5363 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -704,6 +704,7 @@ pub struct PdfCraftApp {
/// The last image copied in its original format (file name, bytes), also put on the
/// system clipboard as a file when `system_clipboard` is on.
pub last_copied_file: Option<(String, Vec)>,
+ pub last_copied_image_rect: Option<[f64; 4]>,
pub system_clipboard: bool,
/// Attach file: the file to attach instead of asking (tests, automation).
pub attach_override: Option<(String, Vec)>,
@@ -992,6 +993,7 @@ impl PdfCraftApp {
last_snapshot: None,
last_copied_image: None,
last_copied_file: None,
+ last_copied_image_rect: None,
system_clipboard: true,
attach_override: None,
duplicate_draft: None,
@@ -2682,7 +2684,7 @@ impl PdfCraftApp {
object_ui::nudge_keys(ctx, &mut self.views[i], doc);
}
canvas::shortcuts(&mut self.views[i], ctx);
- self.copy_key(i, ctx);
+ self.clipboard_keys(i, ctx);
self.image_pick_keys(i, ctx);
}
}
@@ -2706,16 +2708,42 @@ impl PdfCraftApp {
false
}
- /// ⌘C copies the selected text, unless a text field has the keyboard (it copies its own).
- fn copy_key(&mut self, i: usize, ctx: &egui::Context) {
- // ⌘C arrives as a Copy event on most platforms.
- let copy = ctx.input(|input| input.events.iter().any(|e| matches!(e, egui::Event::Copy)));
- if !copy || ctx.egui_wants_keyboard_input() {
+ /// ⌘C / ⌘X / ⌘V copy, cut and paste text or images on canvas (unless a text field has focus).
+ fn clipboard_keys(&mut self, i: usize, ctx: &egui::Context) {
+ use egui::{Key, KeyboardShortcut, Modifiers};
+ if ctx.egui_wants_keyboard_input() || self.views.get(i).is_some_and(|v| v.forms.focus.is_some() || v.organize) {
return;
}
- let Some((id, text)) = self.views.get(i).and_then(|v| Some((v.id, v.selected_text()?))) else { return };
- if self.may_copy(id) {
- ctx.copy_text(text);
+ let copy = ctx.input(|input| input.events.iter().any(|e| matches!(e, egui::Event::Copy)))
+ || ctx.input_mut(|input| input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND, Key::C)));
+ let cut = ctx.input(|input| input.events.iter().any(|e| matches!(e, egui::Event::Cut)))
+ || ctx.input_mut(|input| input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND, Key::X)));
+ let paste = ctx.input(|input| input.events.iter().any(|e| matches!(e, egui::Event::Paste(_))))
+ || ctx.input_mut(|input| input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND, Key::V)));
+
+ if copy {
+ if let Some(text) = self.views.get(i).and_then(|v| v.selected_text())
+ && let Some(id) = self.views.get(i).map(|v| v.id)
+ && self.may_copy(id)
+ {
+ ctx.copy_text(text);
+ } else if let Some(sel) = self.views.get(i).and_then(|v| v.image_selection.clone())
+ && let Some(id) = self.views.get(i).map(|v| v.id)
+ && self.may_copy(id)
+ {
+ self.copy_page_image(sel.page, sel.index);
+ }
+ }
+ if cut
+ && let Some(sel) = self.views.get(i).and_then(|v| v.image_selection.clone())
+ && let Some(id) = self.views.get(i).map(|v| v.id)
+ && self.may_copy(id)
+ {
+ self.cut_page_image(i, sel.page, sel.index);
+ }
+ if paste {
+ let page = self.views.get(i).map_or(0, |v| v.current);
+ self.paste_image(page, None);
}
}
diff --git a/crates/ui-egui/src/object_ui.rs b/crates/ui-egui/src/object_ui.rs
index 118946bd0c..3b410be261 100644
--- a/crates/ui-egui/src/object_ui.rs
+++ b/crates/ui-egui/src/object_ui.rs
@@ -160,6 +160,9 @@ pub(crate) fn page_input(ui: &egui::Ui, resp: &egui::Response, xf: &PageXform, p
if view.objects.input_blocked {
return true;
}
+ if resp.context_menu_opened() || egui::Popup::is_any_open(ui.ctx()) {
+ return false;
+ }
if view.content.draft.is_some() || view.line_editor.as_ref().is_some_and(|e| e.has_changes()) {
let blocked = view.objects.blocked_page == Some(page);
let modifier_press = ui.input(|i| i.pointer.primary_pressed())
diff --git a/crates/ui-egui/tests/comments.rs b/crates/ui-egui/tests/comments.rs
index a86ee0d76c..b570a050e1 100644
--- a/crates/ui-egui/tests/comments.rs
+++ b/crates/ui-egui/tests/comments.rs
@@ -1039,7 +1039,7 @@ fn hovering_highlight_without_comment_respects_display_author_option() {
assert!(json.contains("\"display_author_hover_no_comment\":false"));
let mut app2 = PdfCraftApp::new();
app2.restore(&json);
- assert_eq!(app2.comment_prefs.display_author_hover_no_comment, false);
+ assert!(!app2.comment_prefs.display_author_hover_no_comment);
}
#[test]
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index 971c8bf9c8..daa2c36744 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -2654,6 +2654,8 @@ fn default_page_context_menu_when_not_in_edit_mode() {
assert!(h.query_all_by_label("Add comment").next().is_some());
assert!(h.query_all_by_label("Add text").next().is_some());
assert!(h.query_all_by_label("Add image").next().is_some());
+ assert!(h.query_all_by_label_contains("Copy").next().is_some());
+ assert!(h.query_all_by_label_contains("Paste").next().is_some());
// Clicking "Edit this PDF" enters edit mode
h.get_by_label("Edit this PDF").click();
@@ -2694,10 +2696,30 @@ fn image_edge_handle_stretch_and_crop_mode() {
h.run_steps(2);
assert!(h.state().views[0].image_selection.as_ref().is_some_and(|s| s.crop_mode));
+ // Set smaller crop rect
+ let smaller = egui::Rect::from_center_size(c, egui::vec2(50.0, 50.0));
+ h.state_mut().views[0].image_selection.as_mut().unwrap().crop_rect = Some(smaller);
+
// Confirm crop with Enter key
h.key_press(egui::Key::Enter);
- h.run_steps(2);
+ h.run_steps(4);
assert!(!h.state().views[0].image_selection.as_ref().is_some_and(|s| s.crop_mode));
+ let doc_id = h.state().views[0].id;
+ let images = h.state().session.get(doc_id).unwrap().page_images(0);
+ assert_eq!(images.len(), 1, "image still exists: {images:?}");
+ assert!(images[0].visible_rect.is_some(), "cropped image is visible");
+ assert_ne!(images[0].visible_rect, Some(images[0].rect), "image is cropped");
+
+ // Remove crop via context menu
+ h.hover_at(c);
+ h.run_steps(1);
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
+ h.run_steps(2);
+ h.get_by_label("Remove crop").click();
+ h.run_steps(4);
+ let images = h.state().session.get(doc_id).unwrap().page_images(0);
+ assert_eq!(images[0].visible_rect, Some(images[0].rect), "crop is removed");
}
#[test]
@@ -4341,3 +4363,67 @@ fn private_new_chinese_keyboard_input_preserves_font_layout_and_saved_pixels() {
assert_eq!(std::fs::read(path).unwrap(), original);
println!("verified Chinese keyboard insertion/deletion and save/reopen rendering on {pages} pages");
}
+
+#[test]
+fn image_copy_cut_paste_keyboard_and_context_menu() {
+ let mut png = Vec::new();
+ image::RgbImage::from_pixel(60, 40, image::Rgb([180, 50, 50]))
+ .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
+ .unwrap();
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.system_clipboard = false;
+ app.open_bytes("picture.png", None, png.clone()).expect("opens");
+ app
+ });
+ h.run_steps(4);
+ assert!(h.state_mut().execute("edit.edit_text"));
+ h.run_steps(2);
+
+ let id = h.state().views[0].id;
+ let initial_count = h.state().session.get(id).unwrap().page_images(0).len();
+ assert_eq!(initial_count, 1, "starts with 1 image");
+
+ let r = h.state().views[0].page_screen_rect(0).expect("on screen");
+ let c = r.center();
+
+ // 1. Select the image
+ h.hover_at(c);
+ h.run_steps(1);
+ h.drag_at(c);
+ h.run_steps(1);
+ h.drop_at(c);
+ h.run_steps(2);
+ assert!(h.state().views[0].image_selection.is_some(), "image selected");
+
+ // 2. Copy via keyboard shortcut (COMMAND+C / Event::Copy)
+ h.event(egui::Event::Copy);
+ h.run_steps(2);
+ assert!(h.state().last_copied_image.is_some(), "image copied to clipboard buffer");
+
+ // 3. Paste via keyboard shortcut (COMMAND+V / Event::Paste)
+ h.event(egui::Event::Paste("".into()));
+ h.run_steps(3);
+ let after_paste = h.state().session.get(id).unwrap().page_images(0).len();
+ assert_eq!(after_paste, 2, "now has 2 images");
+ assert_eq!(h.state().views[0].image_selection.as_ref().map(|s| s.index), Some(1), "new image is selected");
+
+ // 4. Cut via keyboard shortcut (COMMAND+X / Event::Cut)
+ h.event(egui::Event::Cut);
+ h.run_steps(3);
+ let after_cut = h.state().session.get(id).unwrap().page_images(0).len();
+ assert_eq!(after_cut, 1, "cut deleted the pasted image");
+ assert!(h.state().views[0].image_selection.is_none(), "selection cleared after cut");
+
+ // 5. Paste again via context menu on the page
+ h.hover_at(c);
+ h.run_steps(1);
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
+ h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
+ h.run_steps(2);
+ h.get_by_label_contains("Paste").click();
+ h.run_steps(3);
+ let after_paste2 = h.state().session.get(id).unwrap().page_images(0).len();
+ assert_eq!(after_paste2, 2, "pasted via context menu");
+}
From bf4c238eba431781ef111d81ed1c421fa940968c Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 20:40:13 +0530
Subject: [PATCH 013/462] Fixes As Requested [Arranging works,Cropping fix,
Small size issue,fonts,image override]
---
crates/edit/src/images.rs | 95 ++++++++++++++++++++----------
crates/edit/src/tests.rs | 37 ++++++++++++
crates/ui-egui/src/content_ui.rs | 74 +++++++++++------------
crates/ui-egui/src/edit_text_ui.rs | 56 ++++++++++++++----
crates/ui-egui/src/lib.rs | 3 +-
crates/ui-egui/tests/editing.rs | 54 ++++++++++++++++-
6 files changed, 233 insertions(+), 86 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 8bb6949f99..be963244e0 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -603,33 +603,72 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
};
let Some(target_unit) = units.get(target_idx) else { return Ok(()) };
- let (scope_start, scope_end, placement) = image_transform_scope(&ops, target)?.unwrap_or((target, target, Matrix(img.draw_matrix)));
+ let has_other_paint = ops.iter().enumerate().any(|(i, op)| {
+ i >= target_unit.start
+ && i < target_unit.end
+ && i != target
+ && matches!(
+ op.op.as_slice(),
+ b"Do" | b"Tj" | b"TJ" | b"'" | b"\"" | b"sh" | b"BI" | b"S" | b"s" | b"f" | b"F" | b"f*" | b"B" | b"B*" | b"b" | b"b*"
+ )
+ });
- let unit_ops = if scope_start != scope_end && target_unit.start == scope_start && target_unit.end == scope_end.saturating_add(1) {
- if placement == Matrix::IDENTITY {
- ops.get(scope_start..=scope_end).unwrap_or_default().to_vec()
+ let (target_span, unit_ops) = if has_other_paint {
+ if let Ok(Some((sub_start, sub_end, sub_placement))) = image_exclusive_scope(&ops, target)
+ && sub_start >= target_unit.start
+ && sub_end < target_unit.end
+ {
+ let u_ops = if sub_placement == Matrix::IDENTITY {
+ ops.get(sub_start..=sub_end).unwrap_or_default().to_vec()
+ } else {
+ let mut out = Vec::new();
+ out.push(Op::new("q", vec![]));
+ out.push(Op::new("cm", sub_placement.0.map(pdfcraft_content::num).to_vec()));
+ if let Some(inner) = ops.get(sub_start.saturating_add(1)..=sub_end) {
+ out.extend_from_slice(inner);
+ }
+ out
+ };
+ let start_op = ops.get(sub_start).unwrap_or(&ops[target]);
+ let end_op = ops.get(sub_end).unwrap_or(&ops[target]);
+ (start_op.span.start..end_op.span.end, u_ops)
} else {
- let mut out = Vec::new();
- out.push(Op::new("q", vec![]));
- out.push(Op::new("cm", placement.0.map(pdfcraft_content::num).to_vec()));
- if let Some(inner) = ops.get(scope_start.saturating_add(1)..=scope_end) {
- out.extend_from_slice(inner);
- }
- out
+ let u_ops = vec![
+ Op::new("q", vec![]),
+ Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
+ ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])),
+ Op::new("Q", vec![]),
+ ];
+ let target_op = &ops[target];
+ (target_op.span.start..target_op.span.end, u_ops)
}
} else {
- vec![
- Op::new("q", vec![]),
- Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
- ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])),
- Op::new("Q", vec![]),
- ]
+ let (scope_start, scope_end, placement) = image_transform_scope(&ops, target)?.unwrap_or((target, target, Matrix(img.draw_matrix)));
+ let u_ops = if scope_start != scope_end && target_unit.start == scope_start && target_unit.end == scope_end.saturating_add(1) {
+ if placement == Matrix::IDENTITY {
+ ops.get(scope_start..=scope_end).unwrap_or_default().to_vec()
+ } else {
+ let mut out = Vec::new();
+ out.push(Op::new("q", vec![]));
+ out.push(Op::new("cm", placement.0.map(pdfcraft_content::num).to_vec()));
+ if let Some(inner) = ops.get(scope_start.saturating_add(1)..=scope_end) {
+ out.extend_from_slice(inner);
+ }
+ out
+ }
+ } else {
+ vec![
+ Op::new("q", vec![]),
+ Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
+ ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])),
+ Op::new("Q", vec![]),
+ ]
+ };
+ let Some(first_op) = ops.get(target_unit.start) else { return Ok(()) };
+ let Some(last_op) = target_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
+ (first_op.span.start..last_op.span.end, u_ops)
};
- let Some(first_op) = ops.get(target_unit.start) else { return Ok(()) };
- let Some(last_op) = target_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
- let target_span = first_op.span.start..last_op.span.end;
-
let dest_pos = if insert_after {
let Some(op) = dest_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
op.span.end
@@ -851,21 +890,15 @@ pub fn crop_image(doc: &mut Document, page: usize, index: usize, crop_rect: [f64
(start, end, drawing_ops, scope_matrix)
} else {
let mut state = ImageState::new(Matrix::IDENTITY, p.crop(doc), Vec::new());
- let mut scope_matrix = Matrix::IDENTITY;
- let start = if target >= 1 && ops.get(target - 1).is_some_and(|o| o.is("cm")) {
- target - 1
- } else {
- target
- };
for (i, o) in ops.iter().enumerate() {
- if i == start {
- scope_matrix = state.placement.matrix;
+ if i == target {
break;
}
state.apply(o)?;
}
- let drawing_ops = ops.get(start..=target).unwrap_or_default().to_vec();
- (start, target, drawing_ops, scope_matrix)
+ let scope_matrix = state.placement.matrix;
+ let drawing_ops = vec![ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)]))];
+ (target, target, drawing_ops, scope_matrix)
};
let mut unit_ops = Vec::new();
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index a9f61f8bbd..9d74024daa 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1768,6 +1768,43 @@ fn image_arrange_stacking_order_and_remove_crop() {
assert_eq!(img_restored_moved.visible_rect, Some(img_restored_moved.rect));
}
+#[test]
+fn image_arrange_preserves_shared_group_drawings() {
+ let content = "q 100 0 0 100 100 100 cm /Im0 Do /Im0 Do Q BT /F1 12 Tf 72 700 Td (End Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 2, "both images initially present in shared group");
+
+ // Bring image 0 to front: it must not delete image 1 that shares the same q...Q group!
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 2, "both images must be preserved after BringToFront");
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ assert!(str_content.contains("End Text"), "text in page must be preserved");
+}
+
+#[test]
+fn image_crop_preserves_outer_cm_for_subsequent_drawings() {
+ let content = "100 0 0 100 50 50 cm /Im0 Do /Im0 Do";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 2);
+ assert_eq!(initial[0].rect, [50.0, 50.0, 150.0, 150.0]);
+ assert_eq!(initial[1].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ // Crop image 0
+ images::crop_image(&mut doc, 0, 0, [60.0, 60.0, 120.0, 120.0]).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 2, "both images must remain");
+ // Image 0 is cropped:
+ assert!(close(after[0].visible_rect.unwrap(), [60.0, 60.0, 120.0, 120.0]));
+ // Crucial: Image 1 must still have its rect at [50, 50, 150, 150], proving outer cm was not destroyed!
+ assert_eq!(after[1].rect, [50.0, 50.0, 150.0, 150.0], "subsequent image must retain global cm");
+}
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 20a609ad3e..1b625e1290 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -560,25 +560,6 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
for f in [FontFamily::Helvetica, FontFamily::Times, FontFamily::Courier] {
ui.selectable_value(&mut s.family, f, f.label());
}
- #[cfg(not(target_arch = "wasm32"))]
- if let Some(installed) = crate::files::installed_font_files(ui.ctx())
- && !installed.is_empty()
- {
- ui.separator();
- ui.label(egui::RichText::new(tl!("Installed fonts")).weak().small());
- for font in &installed {
- let fam = if font.family.eq_ignore_ascii_case("times") || font.face.to_ascii_lowercase().contains("times") {
- FontFamily::Times
- } else if font.family.eq_ignore_ascii_case("courier") || font.face.to_ascii_lowercase().contains("courier") {
- FontFamily::Courier
- } else {
- FontFamily::Helvetica
- };
- if ui.selectable_label(s.family == fam, &font.face).clicked() {
- s.family = fam;
- }
- }
- }
});
ui.horizontal(|ui| {
egui::ComboBox::from_id_salt("font-size")
@@ -789,18 +770,16 @@ impl crate::PdfCraftApp {
/// Whether there is an image in the in-memory clipboard or system clipboard ready to paste.
pub fn can_paste_image(&self) -> bool {
- if self.last_copied_image.is_some() || self.last_copied_file.is_some() {
- return true;
- }
#[cfg(not(target_arch = "wasm32"))]
{
if self.system_clipboard
&& let Ok(mut cb) = arboard::Clipboard::new()
+ && cb.get_image().is_ok()
{
- return cb.get_image().is_ok();
+ return true;
}
}
- false
+ self.last_copied_image.is_some() || self.last_copied_file.is_some()
}
/// Paste an image from the clipboard onto `page`.
@@ -813,27 +792,40 @@ impl crate::PdfCraftApp {
return false;
}
- let image_data: Option<(String, Vec)> = if let Some((name, bytes)) = self.last_copied_file.clone() {
+ #[cfg(not(target_arch = "wasm32"))]
+ let os_png = if self.system_clipboard {
+ if let Ok(mut cb) = arboard::Clipboard::new()
+ && let Ok(img) = cb.get_image()
+ {
+ let matches_internal = self.last_copied_image.as_ref().is_some_and(|(w, h, rgba)| {
+ *w as usize == img.width && *h as usize == img.height && rgba.as_slice() == img.bytes.as_ref()
+ });
+ if !matches_internal {
+ crate::create_ui::png_from_rgba(img.width, img.height, &img.bytes).ok().map(|bytes| {
+ (img.width as u32, img.height as u32, img.bytes.to_vec(), bytes)
+ })
+ } else {
+ None
+ }
+ } else {
+ None
+ }
+ } else {
+ None
+ };
+ #[cfg(target_arch = "wasm32")]
+ let os_png: Option<(u32, u32, Vec, Vec)> = None;
+
+ let image_data: Option<(String, Vec)> = if let Some((w, h, rgba, png_bytes)) = os_png {
+ self.last_copied_image = Some((w, h, rgba));
+ self.last_copied_file = Some(("clipboard_image.png".to_string(), png_bytes.clone()));
+ self.last_copied_image_rect = None;
+ Some(("clipboard_image.png".to_string(), png_bytes))
+ } else if let Some((name, bytes)) = self.last_copied_file.clone() {
Some((name, bytes))
} else if let Some((w, h, rgba)) = self.last_copied_image.clone() {
crate::create_ui::png_from_rgba(w as usize, h as usize, &rgba).ok().map(|b| ("pasted_image.png".to_string(), b))
} else {
- #[cfg(not(target_arch = "wasm32"))]
- {
- if self.system_clipboard {
- arboard::Clipboard::new()
- .ok()
- .and_then(|mut cb| cb.get_image().ok())
- .and_then(|img| {
- crate::create_ui::png_from_rgba(img.width, img.height, &img.bytes)
- .ok()
- .map(|b| ("clipboard_image.png".to_string(), b))
- })
- } else {
- None
- }
- }
- #[cfg(target_arch = "wasm32")]
None
};
diff --git a/crates/ui-egui/src/edit_text_ui.rs b/crates/ui-egui/src/edit_text_ui.rs
index 48b8a7d552..7af7b1091e 100644
--- a/crates/ui-egui/src/edit_text_ui.rs
+++ b/crates/ui-egui/src/edit_text_ui.rs
@@ -975,41 +975,73 @@ pub(crate) fn image_input(
let initial = drag.initial_rect;
if is_crop {
let mut new_crop = initial;
+ let img_screen_w = b.width().max(0.0);
+ let img_screen_h = b.height().max(0.0);
+ let safe_min_w = 10.0_f32.min(img_screen_w).min(initial.width().max(0.0)).max(0.0);
+ let safe_min_h = 10.0_f32.min(img_screen_h).min(initial.height().max(0.0)).max(0.0);
match drag.target {
DragTarget::CropHandle(ImageHandle::TopLeft) => {
- let x = (initial.left() + delta.x).clamp(b.left(), initial.right() - 10.0);
- let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
+ let min_x = b.left();
+ let max_x = (initial.right() - safe_min_w).max(min_x);
+ let x = (initial.left() + delta.x).clamp(min_x, max_x);
+
+ let min_y = b.top();
+ let max_y = (initial.bottom() - safe_min_h).max(min_y);
+ let y = (initial.top() + delta.y).clamp(min_y, max_y);
new_crop = Rect::from_min_max(Pos2::new(x, y), initial.max);
}
DragTarget::CropHandle(ImageHandle::TopRight) => {
- let x = (initial.right() + delta.x).clamp(initial.left() + 10.0, b.right());
- let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
+ let min_x = (initial.left() + safe_min_w).min(b.right());
+ let max_x = b.right().max(min_x);
+ let x = (initial.right() + delta.x).clamp(min_x, max_x);
+
+ let min_y = b.top();
+ let max_y = (initial.bottom() - safe_min_h).max(min_y);
+ let y = (initial.top() + delta.y).clamp(min_y, max_y);
new_crop = Rect::from_min_max(Pos2::new(initial.left(), y), Pos2::new(x, initial.bottom()));
}
DragTarget::CropHandle(ImageHandle::BottomLeft) => {
- let x = (initial.left() + delta.x).clamp(b.left(), initial.right() - 10.0);
- let y = (initial.bottom() + delta.y).clamp(initial.top() + 10.0, b.bottom());
+ let min_x = b.left();
+ let max_x = (initial.right() - safe_min_w).max(min_x);
+ let x = (initial.left() + delta.x).clamp(min_x, max_x);
+
+ let min_y = (initial.top() + safe_min_h).min(b.bottom());
+ let max_y = b.bottom().max(min_y);
+ let y = (initial.bottom() + delta.y).clamp(min_y, max_y);
new_crop = Rect::from_min_max(Pos2::new(x, initial.top()), Pos2::new(initial.right(), y));
}
DragTarget::CropHandle(ImageHandle::BottomRight) => {
- let x = (initial.right() + delta.x).clamp(initial.left() + 10.0, b.right());
- let y = (initial.bottom() + delta.y).clamp(initial.top() + 10.0, b.bottom());
+ let min_x = (initial.left() + safe_min_w).min(b.right());
+ let max_x = b.right().max(min_x);
+ let x = (initial.right() + delta.x).clamp(min_x, max_x);
+
+ let min_y = (initial.top() + safe_min_h).min(b.bottom());
+ let max_y = b.bottom().max(min_y);
+ let y = (initial.bottom() + delta.y).clamp(min_y, max_y);
new_crop = Rect::from_min_max(initial.min, Pos2::new(x, y));
}
DragTarget::CropHandle(ImageHandle::TopCenter) => {
- let y = (initial.top() + delta.y).clamp(b.top(), initial.bottom() - 10.0);
+ let min_y = b.top();
+ let max_y = (initial.bottom() - safe_min_h).max(min_y);
+ let y = (initial.top() + delta.y).clamp(min_y, max_y);
new_crop = Rect::from_min_max(Pos2::new(initial.left(), y), initial.max);
}
DragTarget::CropHandle(ImageHandle::BottomCenter) => {
- let y = (initial.bottom() + delta.y).clamp(initial.top() + 10.0, b.bottom());
+ let min_y = (initial.top() + safe_min_h).min(b.bottom());
+ let max_y = b.bottom().max(min_y);
+ let y = (initial.bottom() + delta.y).clamp(min_y, max_y);
new_crop = Rect::from_min_max(initial.min, Pos2::new(initial.right(), y));
}
DragTarget::CropHandle(ImageHandle::LeftCenter) => {
- let x = (initial.left() + delta.x).clamp(b.left(), initial.right() - 10.0);
+ let min_x = b.left();
+ let max_x = (initial.right() - safe_min_w).max(min_x);
+ let x = (initial.left() + delta.x).clamp(min_x, max_x);
new_crop = Rect::from_min_max(Pos2::new(x, initial.top()), initial.max);
}
DragTarget::CropHandle(ImageHandle::RightCenter) => {
- let x = (initial.right() + delta.x).clamp(initial.left() + 10.0, b.right());
+ let min_x = (initial.left() + safe_min_w).min(b.right());
+ let max_x = b.right().max(min_x);
+ let x = (initial.right() + delta.x).clamp(min_x, max_x);
new_crop = Rect::from_min_max(initial.min, Pos2::new(x, initial.bottom()));
}
DragTarget::Move => {
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 1fddfa5363..49fb3b5fcb 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -73,7 +73,8 @@ mod autoscroll;
mod bidi;
pub mod bulk_fields;
mod dialogs;
-mod edit_text_ui;
+pub mod edit_text_ui;
+pub use edit_text_ui::{DragTarget, ImageDrag, ImageHandle, ImageSelection};
mod editing;
#[cfg(not(target_arch = "wasm32"))]
pub mod file_watch;
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index daa2c36744..f7630f955d 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -2717,11 +2717,63 @@ fn image_edge_handle_stretch_and_crop_mode() {
h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
h.run_steps(2);
h.get_by_label("Remove crop").click();
- h.run_steps(4);
let images = h.state().session.get(doc_id).unwrap().page_images(0);
assert_eq!(images[0].visible_rect, Some(images[0].rect), "crop is removed");
}
+#[test]
+fn tiny_image_crop_handle_drag_does_not_panic() {
+ let mut png = Vec::new();
+ image::RgbImage::from_pixel(5, 5, image::Rgb([100, 150, 200])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+ let mut h = Harness::builder().with_size(egui::vec2(800.0, 600.0)).build_eframe(move |_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.open_bytes("tiny.png", None, png.clone()).expect("opens");
+ app
+ });
+ h.run_steps(4);
+ assert!(h.state_mut().execute("edit.edit_text"));
+ h.run_steps(2);
+
+ // Enter crop mode on image 0
+ let view = &mut h.state_mut().views[0];
+ view.image_selection = Some(pdfcraft_ui_egui::ImageSelection {
+ page: 0,
+ index: 0,
+ drag: None,
+ crop_mode: true,
+ crop_rect: None,
+ });
+ h.run_steps(1);
+
+ // Simulate drag on TopLeft crop handle with an initial_rect of 5.0 x 5.0
+ let initial = egui::Rect::from_min_size(egui::pos2(100.0, 100.0), egui::vec2(5.0, 5.0));
+ let view = &mut h.state_mut().views[0];
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = Some(pdfcraft_ui_egui::ImageDrag {
+ start: egui::pos2(100.0, 100.0),
+ target: pdfcraft_ui_egui::DragTarget::CropHandle(pdfcraft_ui_egui::ImageHandle::TopLeft),
+ initial_rect: initial,
+ });
+ }
+
+ // Hover/drag to a new position, triggering the clamp calculation
+ h.hover_at(egui::pos2(105.0, 105.0));
+ h.run_steps(2);
+
+ // Also test BottomRight handle
+ let view = &mut h.state_mut().views[0];
+ if let Some(s) = view.image_selection.as_mut() {
+ s.drag = Some(pdfcraft_ui_egui::ImageDrag {
+ start: egui::pos2(105.0, 105.0),
+ target: pdfcraft_ui_egui::DragTarget::CropHandle(pdfcraft_ui_egui::ImageHandle::BottomRight),
+ initial_rect: initial,
+ });
+ }
+ h.hover_at(egui::pos2(95.0, 95.0));
+ h.run_steps(2);
+}
+
#[test]
fn text_selection_action_icons() {
let mut h = harness(1, |_| {});
From fde5abb1230f218a93d400ffdb0b1c1f2002a9a8 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 21:16:41 +0530
Subject: [PATCH 014/462] Fixes As Requested [image transformer,Image
extraction,stale cached image]
---
crates/edit/src/images.rs | 110 +++++++++++++++++--------------
crates/edit/src/tests.rs | 41 ++++++++++++
crates/ui-egui/src/content_ui.rs | 52 ++++++++-------
crates/ui-egui/tests/editing.rs | 24 +++++++
4 files changed, 154 insertions(+), 73 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index be963244e0..b54ecd5bf5 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -613,69 +613,81 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
)
});
- let (target_span, unit_ops) = if has_other_paint {
- if let Ok(Some((sub_start, sub_end, sub_placement))) = image_exclusive_scope(&ops, target)
+ let (dest_pos, scan_target) = if insert_after {
+ let Some(op) = dest_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
+ (op.span.end, dest_unit.end)
+ } else {
+ let Some(op) = ops.get(dest_unit.start) else { return Ok(()) };
+ (op.span.start, dest_unit.start)
+ };
+
+ let mut state = ImageState::new(Matrix::IDENTITY, p.crop(doc), Vec::new());
+ for (i, op) in ops.iter().enumerate() {
+ if i == scan_target {
+ break;
+ }
+ state.apply(op)?;
+ }
+ let dest_ctm = state.placement.matrix;
+ let Some(dest_inv) = dest_ctm.invert() else { return Ok(()); };
+
+ let target_span = if has_other_paint {
+ if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
&& sub_start >= target_unit.start
&& sub_end < target_unit.end
{
- let u_ops = if sub_placement == Matrix::IDENTITY {
- ops.get(sub_start..=sub_end).unwrap_or_default().to_vec()
- } else {
- let mut out = Vec::new();
- out.push(Op::new("q", vec![]));
- out.push(Op::new("cm", sub_placement.0.map(pdfcraft_content::num).to_vec()));
- if let Some(inner) = ops.get(sub_start.saturating_add(1)..=sub_end) {
- out.extend_from_slice(inner);
- }
- out
- };
let start_op = ops.get(sub_start).unwrap_or(&ops[target]);
let end_op = ops.get(sub_end).unwrap_or(&ops[target]);
- (start_op.span.start..end_op.span.end, u_ops)
+ start_op.span.start..end_op.span.end
} else {
- let u_ops = vec![
- Op::new("q", vec![]),
- Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
- ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])),
- Op::new("Q", vec![]),
- ];
let target_op = &ops[target];
- (target_op.span.start..target_op.span.end, u_ops)
+ target_op.span.start..target_op.span.end
}
} else {
- let (scope_start, scope_end, placement) = image_transform_scope(&ops, target)?.unwrap_or((target, target, Matrix(img.draw_matrix)));
- let u_ops = if scope_start != scope_end && target_unit.start == scope_start && target_unit.end == scope_end.saturating_add(1) {
- if placement == Matrix::IDENTITY {
- ops.get(scope_start..=scope_end).unwrap_or_default().to_vec()
- } else {
- let mut out = Vec::new();
- out.push(Op::new("q", vec![]));
- out.push(Op::new("cm", placement.0.map(pdfcraft_content::num).to_vec()));
- if let Some(inner) = ops.get(scope_start.saturating_add(1)..=scope_end) {
- out.extend_from_slice(inner);
- }
- out
- }
- } else {
- vec![
- Op::new("q", vec![]),
- Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()),
- ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])),
- Op::new("Q", vec![]),
- ]
- };
let Some(first_op) = ops.get(target_unit.start) else { return Ok(()) };
let Some(last_op) = target_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
- (first_op.span.start..last_op.span.end, u_ops)
+ first_op.span.start..last_op.span.end
};
- let dest_pos = if insert_after {
- let Some(op) = dest_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
- op.span.end
+ let is_clipped = img.visible_rect.is_some() && img.visible_rect != Some(img.rect);
+ if has_other_paint && is_clipped && img.clips.len() > 1 {
+ // Safely decline extraction when complex multi-path clipping cannot be preserved
+ return Ok(());
+ }
+
+ let mut unit_ops = Vec::new();
+ unit_ops.push(Op::new("q", vec![]));
+ if is_clipped {
+ if dest_ctm != Matrix::IDENTITY {
+ unit_ops.push(Op::new("cm", dest_inv.0.map(pdfcraft_content::num).to_vec()));
+ }
+ if let Some(clip) = img.visible_rect {
+ let cx0 = clip[0];
+ let cy0 = clip[1];
+ let cw = clip[2] - clip[0];
+ let ch = clip[3] - clip[1];
+ if cw > 0.0 && ch > 0.0 {
+ unit_ops.push(Op::new("re", vec![
+ pdfcraft_content::num(cx0),
+ pdfcraft_content::num(cy0),
+ pdfcraft_content::num(cw),
+ pdfcraft_content::num(ch),
+ ]));
+ unit_ops.push(Op::new("W", vec![]));
+ unit_ops.push(Op::new("n", vec![]));
+ }
+ }
+ if Matrix(img.draw_matrix) != Matrix::IDENTITY {
+ unit_ops.push(Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()));
+ }
} else {
- let Some(op) = ops.get(dest_unit.start) else { return Ok(()) };
- op.span.start
- };
+ let local = Matrix(img.draw_matrix).then(&dest_inv);
+ if local != Matrix::IDENTITY {
+ unit_ops.push(Op::new("cm", local.0.map(pdfcraft_content::num).to_vec()));
+ }
+ }
+ unit_ops.push(ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])));
+ unit_ops.push(Op::new("Q", vec![]));
let mut serialized = Vec::new();
serialized.push(b'\n');
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index 9d74024daa..af3c6c3908 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1805,6 +1805,47 @@ fn image_crop_preserves_outer_cm_for_subsequent_drawings() {
assert_eq!(after[1].rect, [50.0, 50.0, 150.0, 150.0], "subsequent image must retain global cm");
}
+#[test]
+fn image_arrange_preserves_position_under_active_ctm() {
+ let content = "100 0 0 100 50 50 cm /Im0 Do /Im0 Do";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 2);
+ assert_eq!(initial[0].rect, [50.0, 50.0, 150.0, 150.0]);
+ assert_eq!(initial[1].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ // Move first image to front: must not apply destination CTM twice!
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 2);
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "first image position preserved");
+ assert_eq!(after[1].rect, [50.0, 50.0, 150.0, 150.0], "second image position preserved");
+}
+
+#[test]
+fn image_arrange_preserves_shared_group_clipping_bounds() {
+ let content = "q 120 120 40 40 re W n 100 0 0 100 100 100 cm /Im0 Do /Im0 Do Q BT /F1 12 Tf 72 700 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 2);
+ assert_eq!(initial[0].rect, [100.0, 100.0, 200.0, 200.0]);
+ assert_eq!(initial[0].visible_rect, Some([120.0, 120.0, 160.0, 160.0]));
+ assert_eq!(initial[1].rect, [100.0, 100.0, 200.0, 200.0]);
+ assert_eq!(initial[1].visible_rect, Some([120.0, 120.0, 160.0, 160.0]));
+
+ // Bring image 0 to front: moves it past the external text while preserving clipping bounds
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 2, "both images preserved");
+ assert_eq!(after[0].visible_rect, Some([120.0, 120.0, 160.0, 160.0]), "image 0 retains clip");
+ assert_eq!(after[1].visible_rect, Some([120.0, 120.0, 160.0, 160.0]), "image 1 retains clip");
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ assert!(str_content.contains("External Text"), "external text preserved");
+}
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 1b625e1290..1865032206 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -774,9 +774,8 @@ impl crate::PdfCraftApp {
{
if self.system_clipboard
&& let Ok(mut cb) = arboard::Clipboard::new()
- && cb.get_image().is_ok()
{
- return true;
+ return cb.get_image().is_ok();
}
}
self.last_copied_image.is_some() || self.last_copied_file.is_some()
@@ -793,34 +792,39 @@ impl crate::PdfCraftApp {
}
#[cfg(not(target_arch = "wasm32"))]
- let os_png = if self.system_clipboard {
- if let Ok(mut cb) = arboard::Clipboard::new()
- && let Ok(img) = cb.get_image()
- {
- let matches_internal = self.last_copied_image.as_ref().is_some_and(|(w, h, rgba)| {
- *w as usize == img.width && *h as usize == img.height && rgba.as_slice() == img.bytes.as_ref()
- });
- if !matches_internal {
- crate::create_ui::png_from_rgba(img.width, img.height, &img.bytes).ok().map(|bytes| {
- (img.width as u32, img.height as u32, img.bytes.to_vec(), bytes)
- })
- } else {
- None
- }
+ let (has_system_cb, os_image_res) = if self.system_clipboard {
+ if let Ok(mut cb) = arboard::Clipboard::new() {
+ (true, Some(cb.get_image()))
} else {
- None
+ (false, None)
}
} else {
- None
+ (false, None)
};
#[cfg(target_arch = "wasm32")]
- let os_png: Option<(u32, u32, Vec, Vec)> = None;
+ let (has_system_cb, os_image_res): (bool, Option, arboard::Error>>) = (false, None);
- let image_data: Option<(String, Vec)> = if let Some((w, h, rgba, png_bytes)) = os_png {
- self.last_copied_image = Some((w, h, rgba));
- self.last_copied_file = Some(("clipboard_image.png".to_string(), png_bytes.clone()));
- self.last_copied_image_rect = None;
- Some(("clipboard_image.png".to_string(), png_bytes))
+ let image_data: Option<(String, Vec)> = if has_system_cb {
+ match os_image_res {
+ Some(Ok(img)) => {
+ let matches_internal = self.last_copied_image.as_ref().is_some_and(|(w, h, rgba)| {
+ *w as usize == img.width && *h as usize == img.height && rgba.as_slice() == img.bytes.as_ref()
+ });
+ if matches_internal && let Some((name, bytes)) = self.last_copied_file.clone() {
+ Some((name, bytes))
+ } else if let Ok(png_bytes) = crate::create_ui::png_from_rgba(img.width, img.height, &img.bytes) {
+ self.last_copied_image = Some((img.width as u32, img.height as u32, img.bytes.to_vec()));
+ self.last_copied_file = Some(("clipboard_image.png".to_string(), png_bytes.clone()));
+ self.last_copied_image_rect = None;
+ Some(("clipboard_image.png".to_string(), png_bytes))
+ } else {
+ None
+ }
+ }
+ // When system clipboard is active and accessible but contains text or non-image data:
+ // Do NOT fall back to stale in-memory cached image!
+ _ => None,
+ }
} else if let Some((name, bytes)) = self.last_copied_file.clone() {
Some((name, bytes))
} else if let Some((w, h, rgba)) = self.last_copied_image.clone() {
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index f7630f955d..9055414169 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -2717,6 +2717,7 @@ fn image_edge_handle_stretch_and_crop_mode() {
h.event(egui::Event::PointerButton { pos: c, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
h.run_steps(2);
h.get_by_label("Remove crop").click();
+ h.run_steps(4);
let images = h.state().session.get(doc_id).unwrap().page_images(0);
assert_eq!(images[0].visible_rect, Some(images[0].rect), "crop is removed");
}
@@ -4479,3 +4480,26 @@ fn image_copy_cut_paste_keyboard_and_context_menu() {
let after_paste2 = h.state().session.get(id).unwrap().page_images(0).len();
assert_eq!(after_paste2, 2, "pasted via context menu");
}
+
+#[test]
+fn stale_clipboard_plain_text_does_not_paste_image() {
+ let mut h = harness(1, |_| {});
+ h.run_steps(4);
+ // Put an image into internal cache
+ h.state_mut().last_copied_image = Some((10, 10, vec![0; 400]));
+ h.state_mut().last_copied_file = Some(("cached.png".to_string(), vec![1, 2, 3]));
+ h.state_mut().system_clipboard = true;
+
+ // Set actual system clipboard to plain text
+ #[cfg(not(target_arch = "wasm32"))]
+ if let Ok(mut cb) = arboard::Clipboard::new() {
+ cb.set_text("just plain text").ok();
+ }
+
+ // can_paste_image should now be false because the system clipboard has text, not an image!
+ assert!(!h.state().can_paste_image(), "cannot paste image when system clipboard has text");
+
+ // paste_image should fail and return false without pasting
+ assert!(!h.state_mut().paste_image(0, None), "must not paste stale cached image");
+}
+
From 0ca27d3145c7da5c0c20399309c3ed761967c58b Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 21:57:52 +0530
Subject: [PATCH 015/462] Fixes As Requested [WASM Build Failure, Clipping Path
Destruction, Graphics State(opacity)]
---
crates/edit/src/images.rs | 147 ++++++++++++++++++++++++++-----
crates/edit/src/tests.rs | 40 +++++++++
crates/ui-egui/src/content_ui.rs | 23 ++---
3 files changed, 179 insertions(+), 31 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index b54ecd5bf5..9b73dddac9 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -538,6 +538,109 @@ fn content_units(ops: &[Op], scan_start: usize, scan_end: usize) -> Vec,
+ state_ops: Vec,
+}
+
+fn extract_scope_state(ops: &[Op], start: usize, target: usize) -> Result, EditError> {
+ if start >= target || target >= ops.len() {
+ return Ok(None);
+ }
+ let mut clip_ops = Vec::new();
+ let mut state_ops = Vec::new();
+ let mut pending_path: Vec = Vec::new();
+ let mut pending_clip = false;
+ let mut active_path = false;
+ let mut depth: usize = 0;
+ let mut matrix = Matrix::IDENTITY;
+ let mut matrix_at_clip = None;
+
+ let scan_start = if ops.get(start).is_some_and(|o| o.is("q")) {
+ start.saturating_add(1)
+ } else {
+ start
+ };
+
+ for i in scan_start..target {
+ let Some(op) = ops.get(i) else { return Ok(None); };
+ match op.op.as_slice() {
+ b"q" => {
+ if depth >= 256 {
+ return Err(EditError::Invalid("the image graphics state is too deeply nested".into()));
+ }
+ depth = depth.saturating_add(1);
+ }
+ b"Q" => {
+ if depth == 0 {
+ return Ok(None);
+ }
+ depth = depth.saturating_sub(1);
+ }
+ _ if depth > 0 => {}
+ b"cm" => {
+ if active_path {
+ return Ok(None);
+ }
+ if let Some(m) = op.nums::<6>() {
+ matrix = Matrix(m).then(&matrix);
+ }
+ }
+ b"m" | b"l" | b"c" | b"v" | b"y" | b"re" | b"h" => {
+ active_path = true;
+ pending_path.push(op.clone());
+ }
+ b"W" | b"W*" => {
+ if !active_path {
+ return Ok(None);
+ }
+ pending_clip = true;
+ pending_path.push(op.clone());
+ }
+ b"n" => {
+ if pending_clip {
+ if matrix_at_clip.is_none() {
+ matrix_at_clip = Some(matrix);
+ } else if matrix_at_clip != Some(matrix) {
+ return Ok(None);
+ }
+ clip_ops.extend(std::mem::take(&mut pending_path));
+ clip_ops.push(op.clone());
+ pending_clip = false;
+ active_path = false;
+ } else {
+ pending_path.clear();
+ active_path = false;
+ }
+ }
+ b"S" | b"s" | b"f" | b"F" | b"f*" | b"B" | b"B*" | b"b" | b"b*" => {
+ if pending_clip {
+ return Ok(None);
+ }
+ pending_path.clear();
+ active_path = false;
+ }
+ b"gs" | b"CS" | b"cs" | b"SC" | b"sc" | b"SCN" | b"scn" | b"G" | b"g" | b"RG" | b"rg" | b"K" | b"k" | b"ri" | b"i" => {
+ state_ops.push(op.clone());
+ }
+ b"BT" => {
+ return Ok(None);
+ }
+ _ => {}
+ }
+ }
+
+ if depth != 0 || active_path || pending_clip {
+ return Ok(None);
+ }
+
+ if !clip_ops.is_empty() && matrix_at_clip != Some(Matrix::IDENTITY) {
+ return Ok(None);
+ }
+
+ Ok(Some(ExtractedScopeState { clip_ops, state_ops }))
+}
+
/// Change the stacking order of image `index` on `page`.
pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: ArrangeOrder) -> Result<(), EditError> {
let images = page_images(doc, page)?;
@@ -649,34 +752,37 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
first_op.span.start..last_op.span.end
};
- let is_clipped = img.visible_rect.is_some() && img.visible_rect != Some(img.rect);
- if has_other_paint && is_clipped && img.clips.len() > 1 {
- // Safely decline extraction when complex multi-path clipping cannot be preserved
+ let scope_start = if has_other_paint {
+ if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
+ && sub_start >= target_unit.start
+ && sub_end < target_unit.end
+ {
+ sub_start
+ } else {
+ target_unit.start
+ }
+ } else {
+ target_unit.start
+ };
+
+ let is_clipped = (img.visible_rect.is_some() && img.visible_rect != Some(img.rect)) || !img.clips.is_empty();
+
+ let extracted = extract_scope_state(&ops, scope_start, target)?;
+ let Some(extracted) = extracted else {
+ return Ok(());
+ };
+
+ if is_clipped && extracted.clip_ops.is_empty() {
return Ok(());
}
let mut unit_ops = Vec::new();
unit_ops.push(Op::new("q", vec![]));
- if is_clipped {
+ if !extracted.clip_ops.is_empty() {
if dest_ctm != Matrix::IDENTITY {
unit_ops.push(Op::new("cm", dest_inv.0.map(pdfcraft_content::num).to_vec()));
}
- if let Some(clip) = img.visible_rect {
- let cx0 = clip[0];
- let cy0 = clip[1];
- let cw = clip[2] - clip[0];
- let ch = clip[3] - clip[1];
- if cw > 0.0 && ch > 0.0 {
- unit_ops.push(Op::new("re", vec![
- pdfcraft_content::num(cx0),
- pdfcraft_content::num(cy0),
- pdfcraft_content::num(cw),
- pdfcraft_content::num(ch),
- ]));
- unit_ops.push(Op::new("W", vec![]));
- unit_ops.push(Op::new("n", vec![]));
- }
- }
+ unit_ops.extend(extracted.clip_ops);
if Matrix(img.draw_matrix) != Matrix::IDENTITY {
unit_ops.push(Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()));
}
@@ -686,6 +792,7 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
unit_ops.push(Op::new("cm", local.0.map(pdfcraft_content::num).to_vec()));
}
}
+ unit_ops.extend(extracted.state_ops);
unit_ops.push(ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])));
unit_ops.push(Op::new("Q", vec![]));
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index af3c6c3908..782cd3acd9 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1846,6 +1846,46 @@ fn image_arrange_preserves_shared_group_clipping_bounds() {
assert!(str_content.contains("External Text"), "external text preserved");
}
+#[test]
+fn image_arrange_preserves_extended_graphics_state_opacity() {
+ let content = "q /GS0 gs 100 0 0 100 50 50 cm /Im0 Do Q BT /F1 12 Tf 72 700 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 1);
+ assert_eq!(initial[0].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1, "image preserved");
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ assert!(str_content.contains("/GS0 gs"), "extended graphics state /GS0 gs is retained");
+ let gs_pos = str_content.rfind("/GS0 gs").unwrap();
+ let do_pos = str_content.rfind("/Im0 Do").unwrap();
+ assert!(gs_pos < do_pos, "/GS0 gs must precede /Im0 Do in the new unit");
+}
+
+#[test]
+fn image_arrange_preserves_exact_non_rectangular_clipping_path() {
+ let content = "q 120 120 m 160 120 l 140 160 l h W* n 100 0 0 100 100 100 cm /Im0 Do /Im0 Do Q BT /F1 12 Tf 72 700 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 2);
+
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 2, "both images preserved");
+
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ assert!(str_content.contains("W*"), "even-odd W* fill rule must be preserved");
+ assert!(str_content.contains("120 120 m 160 120 l 140 160 l h W* n"), "exact non-rectangular clip path preserved");
+}
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 1865032206..70c03d0a1a 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -792,9 +792,10 @@ impl crate::PdfCraftApp {
}
#[cfg(not(target_arch = "wasm32"))]
- let (has_system_cb, os_image_res) = if self.system_clipboard {
+ let (has_system_cb, os_image) = if self.system_clipboard {
if let Ok(mut cb) = arboard::Clipboard::new() {
- (true, Some(cb.get_image()))
+ let img_opt = cb.get_image().ok().map(|img| (img.width, img.height, img.bytes.to_vec()));
+ (true, img_opt)
} else {
(false, None)
}
@@ -802,18 +803,18 @@ impl crate::PdfCraftApp {
(false, None)
};
#[cfg(target_arch = "wasm32")]
- let (has_system_cb, os_image_res): (bool, Option, arboard::Error>>) = (false, None);
+ let (has_system_cb, os_image): (bool, Option<(usize, usize, Vec)>) = (false, None);
let image_data: Option<(String, Vec)> = if has_system_cb {
- match os_image_res {
- Some(Ok(img)) => {
+ match os_image {
+ Some((width, height, bytes)) => {
let matches_internal = self.last_copied_image.as_ref().is_some_and(|(w, h, rgba)| {
- *w as usize == img.width && *h as usize == img.height && rgba.as_slice() == img.bytes.as_ref()
+ *w as usize == width && *h as usize == height && rgba.as_slice() == bytes.as_slice()
});
- if matches_internal && let Some((name, bytes)) = self.last_copied_file.clone() {
- Some((name, bytes))
- } else if let Ok(png_bytes) = crate::create_ui::png_from_rgba(img.width, img.height, &img.bytes) {
- self.last_copied_image = Some((img.width as u32, img.height as u32, img.bytes.to_vec()));
+ if matches_internal && let Some((name, file_bytes)) = self.last_copied_file.clone() {
+ Some((name, file_bytes))
+ } else if let Ok(png_bytes) = crate::create_ui::png_from_rgba(width, height, &bytes) {
+ self.last_copied_image = Some((width as u32, height as u32, bytes));
self.last_copied_file = Some(("clipboard_image.png".to_string(), png_bytes.clone()));
self.last_copied_image_rect = None;
Some(("clipboard_image.png".to_string(), png_bytes))
@@ -823,7 +824,7 @@ impl crate::PdfCraftApp {
}
// When system clipboard is active and accessible but contains text or non-image data:
// Do NOT fall back to stale in-memory cached image!
- _ => None,
+ None => None,
}
} else if let Some((name, bytes)) = self.last_copied_file.clone() {
Some((name, bytes))
From 74eef8cc0f35bf342ac61fd2d5b310e6d5efe156 Mon Sep 17 00:00:00 2001
From: JM
Date: Wed, 14 Oct 2026 17:04:46 +0000
Subject: [PATCH 016/462] feat(xtask): add offline licensing self-check
---
.github/workflows/ci.yml | 4 +-
ATTRIBUTION.md | 372 +++++++-------
ATTRIBUTION.toml | 372 +++++++-------
LICENSES.toml | 147 ++++++
NOTICE | 2 +-
docs/licensing-self-check.md | 33 ++
licenses/CMap-LICENSE.txt | 28 ++
licenses/egui-Hack-Regular.txt | 31 ++
licenses/egui-OFL.txt | 92 ++++
licenses/egui-UFL.txt | 96 ++++
licenses/egui-emoji-icon-font-mit-license.txt | 9 +
xtask/src/gates.rs | 2 +-
xtask/src/license_check.rs | 467 ++++++++++++++++++
xtask/src/main.rs | 4 +-
14 files changed, 1282 insertions(+), 377 deletions(-)
create mode 100644 LICENSES.toml
create mode 100644 docs/licensing-self-check.md
create mode 100644 licenses/CMap-LICENSE.txt
create mode 100644 licenses/egui-Hack-Regular.txt
create mode 100644 licenses/egui-OFL.txt
create mode 100644 licenses/egui-UFL.txt
create mode 100644 licenses/egui-emoji-icon-font-mit-license.txt
create mode 100644 xtask/src/license_check.rs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8249dcf0c7..20a4a9288e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,9 +87,9 @@ jobs:
if: runner.os == 'Linux'
run: cargo xtask layers
- - name: Assets (licences and attribution)
+ - name: Source licences and attribution
if: runner.os == 'Linux'
- run: cargo xtask assets
+ run: cargo xtask license-check
- name: CLI without the MCP server still builds
if: runner.os == 'Linux'
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index 3b451f246d..1e3da6e987 100644
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -28,181 +28,181 @@ Every asset PdfCraft includes, bundles or uses to build its published material,
| `crates/ui-egui/src/i18n/ar.tsv` | Arabic interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources | Arabic UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/tr.tsv` | Turkish interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources | Turkish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/lt.tsv` | Lithuanian interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels and user-facing messages; reviewed by a native Lithuanian-speaking contributor | Lithuanian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
-| `assets/icons/accessibility.svg` | Lucide icon "accessibility" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/accessibility.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/align-left.svg` | Lucide icon "align-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/align-center.svg` | Lucide icon "align-center" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-center.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/square-terminal.svg` | Lucide icon "square-terminal" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-terminal.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-code.svg` | Lucide icon "file-code" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-code.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-spreadsheet.svg` | Lucide icon "file-spreadsheet" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-spreadsheet.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/align-justify.svg` | Lucide icon "align-justify" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-justify.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/align-right.svg` | Lucide icon "align-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/columns-3.svg` | Lucide icon "columns-3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/columns-3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/rows-3.svg` | Lucide icon "rows-3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rows-3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/flip-horizontal-2.svg` | Lucide icon "flip-horizontal-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/flip-horizontal-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/flip-vertical-2.svg` | Lucide icon "flip-vertical-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/flip-vertical-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/app-window.svg` | Lucide icon "app-window" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/app-window.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/arrow-left-right.svg` | Lucide icon "arrow-left-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-left-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/arrow-up-down.svg` | Lucide icon "arrow-up-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-up-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/arrow-up-right.svg` | Lucide icon "arrow-up-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-up-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/badge-check.svg` | Lucide icon "badge-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/badge-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/bandage.svg` | Lucide icon "bandage" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bandage.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/bell.svg` | Lucide icon "bell" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bell.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/blend.svg` | Lucide icon "blend" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/blend.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/bold.svg` | Lucide icon "bold" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bold.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/book-open.svg` | Lucide icon "book-open" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/book-open.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/bookmark.svg` | Lucide icon "bookmark" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bookmark.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/bookmark-plus.svg` | Lucide icon "bookmark-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bookmark-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/braces.svg` | Lucide icon "braces" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/braces.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/brush-cleaning.svg` | Lucide icon "brush-cleaning" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/brush-cleaning.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/brush.svg` | Lucide icon "brush" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/brush.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/camera.svg` | Lucide icon "camera" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/camera.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/check-circle-2.svg` | Lucide icon "check-circle-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/check-circle-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/check.svg` | Lucide icon "check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/chevron-down.svg` | Lucide icon "chevron-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/chevron-left.svg` | Lucide icon "chevron-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/chevron-right.svg` | Lucide icon "chevron-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/chevron-up.svg` | Lucide icon "chevron-up" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-up.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/chevrons-left.svg` | Lucide icon "chevrons-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevrons-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/chevrons-right.svg` | Lucide icon "chevrons-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevrons-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/circle-check.svg` | Lucide icon "circle-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/circle-dashed.svg` | Lucide icon "circle-dashed" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-dashed.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/circle-dot.svg` | Lucide icon "circle-dot" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-dot.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/circle-help.svg` | Lucide icon "circle-help" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-help.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/circle.svg` | Lucide icon "circle" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/clock-3.svg` | Lucide icon "clock-3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clock-3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/clock.svg` | Lucide icon "clock" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clock.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/cloud-upload.svg` | Lucide icon "cloud-upload" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/cloud-upload.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/cloud.svg` | Lucide icon "cloud" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/cloud.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/code-xml.svg` | Lucide icon "code-xml" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/code-xml.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/columns-2.svg` | Lucide icon "columns-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/columns-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/compass.svg` | Lucide icon "compass" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/compass.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/contrast.svg` | Lucide icon "contrast" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/contrast.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/copy-plus.svg` | Lucide icon "copy-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/copy-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/copy.svg` | Lucide icon "copy" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/copy.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/crop.svg` | Lucide icon "crop" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/crop.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/droplet.svg` | Lucide icon "droplet" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/droplet.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/ellipsis-vertical.svg` | Lucide icon "ellipsis-vertical" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ellipsis-vertical.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/ellipsis.svg` | Lucide icon "ellipsis" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ellipsis.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/eraser.svg` | Lucide icon "eraser" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eraser.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/external-link.svg` | Lucide icon "external-link" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/external-link.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/eye-off.svg` | Lucide icon "eye-off" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eye-off.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/eye.svg` | Lucide icon "eye" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eye.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-check.svg` | Lucide icon "file-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-down.svg` | Lucide icon "file-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-input.svg` | Lucide icon "file-input" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-input.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-lock-2.svg` | Lucide icon "file-lock-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-lock-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-minus.svg` | Lucide icon "file-minus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-minus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-output.svg` | Lucide icon "file-output" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-output.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-pen-line.svg` | Lucide icon "file-pen-line" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-pen-line.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-plus-2.svg` | Lucide icon "file-plus-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-plus-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-plus.svg` | Lucide icon "file-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-scan.svg` | Lucide icon "file-scan" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-scan.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-search.svg` | Lucide icon "file-search" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-search.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-symlink.svg` | Lucide icon "file-symlink" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-symlink.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-text.svg` | Lucide icon "file-text" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-text.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/file-x.svg` | Lucide icon "file-x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/files.svg` | Lucide icon "files" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/files.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/film.svg` | Lucide icon "film" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/film.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/filter.svg` | Lucide icon "filter" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/filter.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/folder-open.svg` | Lucide icon "folder-open" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder-open.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/folder-plus.svg` | Lucide icon "folder-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/folder.svg` | Lucide icon "folder" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/gauge.svg` | Lucide icon "gauge" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/gauge.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/git-compare.svg` | Lucide icon "git-compare" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/git-compare.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/globe.svg` | Lucide icon "globe" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/globe.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/grid-3x3.svg` | Lucide icon "grid-3x3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/grid-3x3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/hand.svg` | Lucide icon "hand" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/hand.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/hash.svg` | Lucide icon "hash" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/hash.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/heading.svg` | Lucide icon "heading" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/heading.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/highlighter.svg` | Lucide icon "highlighter" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/highlighter.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/house.svg` | Lucide icon "house" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/house.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/image-plus.svg` | Lucide icon "image-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/image-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/image.svg` | Lucide icon "image" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/image.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/info.svg` | Lucide icon "info" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/info.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/italic.svg` | Lucide icon "italic" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/italic.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/languages.svg` | Lucide icon "languages" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/languages.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/lasso.svg` | Lucide icon "lasso" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lasso.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/layers.svg` | Lucide icon "layers" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/layers.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/layout-grid.svg` | Lucide icon "layout-grid" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/layout-grid.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/link-2.svg` | Lucide icon "link-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/link-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/link.svg` | Lucide icon "link" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/link.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/list-checks.svg` | Lucide icon "list-checks" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list-checks.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/list-ordered.svg` | Lucide icon "list-ordered" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list-ordered.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/list.svg` | Lucide icon "list" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/lock-open.svg` | Lucide icon "lock-open" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lock-open.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/lock.svg` | Lucide icon "lock" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lock.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/maximize-2.svg` | Lucide icon "maximize-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/maximize-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/maximize.svg` | Lucide icon "maximize" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/maximize.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/message-circle-reply.svg` | Lucide icon "message-circle-reply" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-circle-reply.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/message-square-text.svg` | Lucide icon "message-square-text" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-text.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/message-square.svg` | Lucide icon "message-square" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/messages-square.svg` | Lucide icon "messages-square" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/messages-square.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/mic.svg` | Lucide icon "mic" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/mic.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/minimize.svg` | Lucide icon "minimize" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minimize.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/minimize-2.svg` | Lucide icon "minimize-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minimize-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/minus.svg` | Lucide icon "minus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/moon.svg` | Lucide icon "moon" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/moon.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/mouse-pointer-2.svg` | Lucide icon "mouse-pointer-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/mouse-pointer-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/move.svg` | Lucide icon "move" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/move.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/navigation.svg` | Lucide icon "navigation" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/navigation.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/paint-bucket.svg` | Lucide icon "paint-bucket" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/paint-bucket.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/palette.svg` | Lucide icon "palette" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/palette.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/panel-left.svg` | Lucide icon "panel-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panel-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/panel-right.svg` | Lucide icon "panel-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panel-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/panels-top-left.svg` | Lucide icon "panels-top-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panels-top-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/paperclip.svg` | Lucide icon "paperclip" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/paperclip.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/pen-line.svg` | Lucide icon "pen-line" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pen-line.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/pen-tool.svg` | Lucide icon "pen-tool" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pen-tool.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/pencil.svg` | Lucide icon "pencil" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pencil.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/pipette.svg` | Lucide icon "pipette" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pipette.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/plus.svg` | Lucide icon "plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/presentation.svg` | Lucide icon "presentation" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/presentation.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/printer.svg` | Lucide icon "printer" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/printer.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/rectangle-horizontal.svg` | Lucide icon "rectangle-horizontal" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rectangle-horizontal.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/redo-2.svg` | Lucide icon "redo-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/redo-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/replace.svg` | Lucide icon "replace" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/replace.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/rotate-ccw.svg` | Lucide icon "rotate-ccw" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rotate-ccw.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/rotate-cw.svg` | Lucide icon "rotate-cw" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rotate-cw.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/ruler.svg` | Lucide icon "ruler" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ruler.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/save.svg` | Lucide icon "save" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/save.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/scan-text.svg` | Lucide icon "scan-text" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scan-text.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/scan.svg` | Lucide icon "scan" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scan.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/scissors.svg` | Lucide icon "scissors" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scissors.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/search.svg` | Lucide icon "search" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/search.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/send.svg` | Lucide icon "send" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/send.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/settings-2.svg` | Lucide icon "settings-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/settings-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/settings.svg` | Lucide icon "settings" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/settings.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/share-2.svg` | Lucide icon "share-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/share-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/shield-check.svg` | Lucide icon "shield-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/shield-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/signature.svg` | Lucide icon "signature" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/signature.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/sliders-horizontal.svg` | Lucide icon "sliders-horizontal" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sliders-horizontal.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/sparkles.svg` | Lucide icon "sparkles" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sparkles.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/spline.svg` | Lucide icon "spline" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/spline.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/square-dashed-mouse-pointer.svg` | Lucide icon "square-dashed-mouse-pointer" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-dashed-mouse-pointer.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/square-dashed.svg` | Lucide icon "square-dashed" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-dashed.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/square.svg` | Lucide icon "square" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/squares-subtract.svg` | Lucide icon "squares-subtract" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/squares-subtract.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/stamp.svg` | Lucide icon "stamp" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/stamp.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/star.svg` | Lucide icon "star" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/star.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/sticky-note.svg` | Lucide icon "sticky-note" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sticky-note.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/strikethrough.svg` | Lucide icon "strikethrough" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/strikethrough.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/sun.svg` | Lucide icon "sun" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sun.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/swatch-book.svg` | Lucide icon "swatch-book" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/swatch-book.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/tag.svg` | Lucide icon "tag" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/tag.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/text-cursor-input.svg` | Lucide icon "text-cursor-input" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/text-cursor-input.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/text-select.svg` | Lucide icon "text-select" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/text-select.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/trash-2.svg` | Lucide icon "trash-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/trash-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/trash.svg` | Lucide icon "trash" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/trash.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/triangle-alert.svg` | Lucide icon "triangle-alert" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/triangle-alert.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/type.svg` | Lucide icon "type" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/type.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/underline.svg` | Lucide icon "underline" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/underline.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/undo-2.svg` | Lucide icon "undo-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/undo-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/user-round.svg` | Lucide icon "user-round" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/user-round.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/wand-sparkles.svg` | Lucide icon "wand-sparkles" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/wand-sparkles.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/wrench.svg` | Lucide icon "wrench" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/wrench.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/x.svg` | Lucide icon "x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/zoom-in.svg` | Lucide icon "zoom-in" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/zoom-in.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/zoom-out.svg` | Lucide icon "zoom-out" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/zoom-out.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/accessibility.svg` | Lucide icon "accessibility" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/accessibility.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/align-left.svg` | Lucide icon "align-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/align-center.svg` | Lucide icon "align-center" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-center.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/square-terminal.svg` | Lucide icon "square-terminal" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-terminal.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-code.svg` | Lucide icon "file-code" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-code.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-spreadsheet.svg` | Lucide icon "file-spreadsheet" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-spreadsheet.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/align-justify.svg` | Lucide icon "align-justify" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-justify.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/align-right.svg` | Lucide icon "align-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/columns-3.svg` | Lucide icon "columns-3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/columns-3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/rows-3.svg` | Lucide icon "rows-3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rows-3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/flip-horizontal-2.svg` | Lucide icon "flip-horizontal-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/flip-horizontal-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/flip-vertical-2.svg` | Lucide icon "flip-vertical-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/flip-vertical-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/app-window.svg` | Lucide icon "app-window" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/app-window.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/arrow-left-right.svg` | Lucide icon "arrow-left-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-left-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/arrow-up-down.svg` | Lucide icon "arrow-up-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-up-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/arrow-up-right.svg` | Lucide icon "arrow-up-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-up-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/badge-check.svg` | Lucide icon "badge-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/badge-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/bandage.svg` | Lucide icon "bandage" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bandage.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/bell.svg` | Lucide icon "bell" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bell.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/blend.svg` | Lucide icon "blend" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/blend.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/bold.svg` | Lucide icon "bold" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bold.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/book-open.svg` | Lucide icon "book-open" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/book-open.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/bookmark.svg` | Lucide icon "bookmark" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bookmark.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/bookmark-plus.svg` | Lucide icon "bookmark-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bookmark-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/braces.svg` | Lucide icon "braces" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/braces.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/brush-cleaning.svg` | Lucide icon "brush-cleaning" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/brush-cleaning.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/brush.svg` | Lucide icon "brush" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/brush.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/camera.svg` | Lucide icon "camera" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/camera.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/check-circle-2.svg` | Lucide icon "check-circle-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/check-circle-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/check.svg` | Lucide icon "check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/chevron-down.svg` | Lucide icon "chevron-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/chevron-left.svg` | Lucide icon "chevron-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/chevron-right.svg` | Lucide icon "chevron-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/chevron-up.svg` | Lucide icon "chevron-up" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-up.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/chevrons-left.svg` | Lucide icon "chevrons-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevrons-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/chevrons-right.svg` | Lucide icon "chevrons-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevrons-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/circle-check.svg` | Lucide icon "circle-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/circle-dashed.svg` | Lucide icon "circle-dashed" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-dashed.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/circle-dot.svg` | Lucide icon "circle-dot" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-dot.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/circle-help.svg` | Lucide icon "circle-help" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-help.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/circle.svg` | Lucide icon "circle" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/clock-3.svg` | Lucide icon "clock-3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clock-3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/clock.svg` | Lucide icon "clock" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clock.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/cloud-upload.svg` | Lucide icon "cloud-upload" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/cloud-upload.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/cloud.svg` | Lucide icon "cloud" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/cloud.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/code-xml.svg` | Lucide icon "code-xml" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/code-xml.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/columns-2.svg` | Lucide icon "columns-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/columns-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/compass.svg` | Lucide icon "compass" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/compass.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/contrast.svg` | Lucide icon "contrast" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/contrast.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/copy-plus.svg` | Lucide icon "copy-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/copy-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/copy.svg` | Lucide icon "copy" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/copy.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/crop.svg` | Lucide icon "crop" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/crop.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/droplet.svg` | Lucide icon "droplet" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/droplet.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/ellipsis-vertical.svg` | Lucide icon "ellipsis-vertical" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ellipsis-vertical.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/ellipsis.svg` | Lucide icon "ellipsis" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ellipsis.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/eraser.svg` | Lucide icon "eraser" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eraser.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/external-link.svg` | Lucide icon "external-link" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/external-link.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/eye-off.svg` | Lucide icon "eye-off" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eye-off.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/eye.svg` | Lucide icon "eye" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eye.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-check.svg` | Lucide icon "file-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-down.svg` | Lucide icon "file-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-input.svg` | Lucide icon "file-input" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-input.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-lock-2.svg` | Lucide icon "file-lock-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-lock-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-minus.svg` | Lucide icon "file-minus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-minus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-output.svg` | Lucide icon "file-output" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-output.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-pen-line.svg` | Lucide icon "file-pen-line" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-pen-line.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-plus-2.svg` | Lucide icon "file-plus-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-plus-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-plus.svg` | Lucide icon "file-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-scan.svg` | Lucide icon "file-scan" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-scan.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-search.svg` | Lucide icon "file-search" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-search.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-symlink.svg` | Lucide icon "file-symlink" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-symlink.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-text.svg` | Lucide icon "file-text" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-text.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/file-x.svg` | Lucide icon "file-x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/files.svg` | Lucide icon "files" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/files.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/film.svg` | Lucide icon "film" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/film.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/filter.svg` | Lucide icon "filter" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/filter.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/folder-open.svg` | Lucide icon "folder-open" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder-open.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/folder-plus.svg` | Lucide icon "folder-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/folder.svg` | Lucide icon "folder" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/gauge.svg` | Lucide icon "gauge" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/gauge.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/git-compare.svg` | Lucide icon "git-compare" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/git-compare.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/globe.svg` | Lucide icon "globe" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/globe.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/grid-3x3.svg` | Lucide icon "grid-3x3" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/grid-3x3.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/hand.svg` | Lucide icon "hand" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/hand.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/hash.svg` | Lucide icon "hash" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/hash.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/heading.svg` | Lucide icon "heading" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/heading.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/highlighter.svg` | Lucide icon "highlighter" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/highlighter.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/house.svg` | Lucide icon "house" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/house.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/image-plus.svg` | Lucide icon "image-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/image-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/image.svg` | Lucide icon "image" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/image.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/info.svg` | Lucide icon "info" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/info.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/italic.svg` | Lucide icon "italic" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/italic.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/languages.svg` | Lucide icon "languages" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/languages.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/lasso.svg` | Lucide icon "lasso" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lasso.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/layers.svg` | Lucide icon "layers" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/layers.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/layout-grid.svg` | Lucide icon "layout-grid" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/layout-grid.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/link-2.svg` | Lucide icon "link-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/link-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/link.svg` | Lucide icon "link" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/link.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/list-checks.svg` | Lucide icon "list-checks" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list-checks.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/list-ordered.svg` | Lucide icon "list-ordered" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list-ordered.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/list.svg` | Lucide icon "list" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/lock-open.svg` | Lucide icon "lock-open" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lock-open.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/lock.svg` | Lucide icon "lock" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lock.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/maximize-2.svg` | Lucide icon "maximize-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/maximize-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/maximize.svg` | Lucide icon "maximize" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/maximize.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/message-circle-reply.svg` | Lucide icon "message-circle-reply" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-circle-reply.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/message-square-text.svg` | Lucide icon "message-square-text" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-text.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/message-square.svg` | Lucide icon "message-square" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/messages-square.svg` | Lucide icon "messages-square" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/messages-square.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/mic.svg` | Lucide icon "mic" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/mic.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/minimize.svg` | Lucide icon "minimize" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minimize.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/minimize-2.svg` | Lucide icon "minimize-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minimize-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/minus.svg` | Lucide icon "minus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/moon.svg` | Lucide icon "moon" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/moon.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/mouse-pointer-2.svg` | Lucide icon "mouse-pointer-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/mouse-pointer-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/move.svg` | Lucide icon "move" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/move.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/navigation.svg` | Lucide icon "navigation" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/navigation.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/paint-bucket.svg` | Lucide icon "paint-bucket" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/paint-bucket.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/palette.svg` | Lucide icon "palette" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/palette.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/panel-left.svg` | Lucide icon "panel-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panel-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/panel-right.svg` | Lucide icon "panel-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panel-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/panels-top-left.svg` | Lucide icon "panels-top-left" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panels-top-left.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/paperclip.svg` | Lucide icon "paperclip" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/paperclip.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/pen-line.svg` | Lucide icon "pen-line" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pen-line.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/pen-tool.svg` | Lucide icon "pen-tool" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pen-tool.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/pencil.svg` | Lucide icon "pencil" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pencil.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/pipette.svg` | Lucide icon "pipette" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pipette.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/plus.svg` | Lucide icon "plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/presentation.svg` | Lucide icon "presentation" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/presentation.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/printer.svg` | Lucide icon "printer" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/printer.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/rectangle-horizontal.svg` | Lucide icon "rectangle-horizontal" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rectangle-horizontal.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/redo-2.svg` | Lucide icon "redo-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/redo-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/replace.svg` | Lucide icon "replace" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/replace.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/rotate-ccw.svg` | Lucide icon "rotate-ccw" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rotate-ccw.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/rotate-cw.svg` | Lucide icon "rotate-cw" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rotate-cw.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/ruler.svg` | Lucide icon "ruler" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ruler.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/save.svg` | Lucide icon "save" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/save.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/scan-text.svg` | Lucide icon "scan-text" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scan-text.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/scan.svg` | Lucide icon "scan" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scan.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/scissors.svg` | Lucide icon "scissors" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scissors.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/search.svg` | Lucide icon "search" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/search.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/send.svg` | Lucide icon "send" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/send.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/settings-2.svg` | Lucide icon "settings-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/settings-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/settings.svg` | Lucide icon "settings" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/settings.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/share-2.svg` | Lucide icon "share-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/share-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/shield-check.svg` | Lucide icon "shield-check" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/shield-check.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/signature.svg` | Lucide icon "signature" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/signature.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/sliders-horizontal.svg` | Lucide icon "sliders-horizontal" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sliders-horizontal.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/sparkles.svg` | Lucide icon "sparkles" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sparkles.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/spline.svg` | Lucide icon "spline" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/spline.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/square-dashed-mouse-pointer.svg` | Lucide icon "square-dashed-mouse-pointer" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-dashed-mouse-pointer.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/square-dashed.svg` | Lucide icon "square-dashed" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-dashed.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/square.svg` | Lucide icon "square" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/squares-subtract.svg` | Lucide icon "squares-subtract" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/squares-subtract.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/stamp.svg` | Lucide icon "stamp" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/stamp.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/star.svg` | Lucide icon "star" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/star.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/sticky-note.svg` | Lucide icon "sticky-note" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sticky-note.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/strikethrough.svg` | Lucide icon "strikethrough" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/strikethrough.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/sun.svg` | Lucide icon "sun" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sun.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/swatch-book.svg` | Lucide icon "swatch-book" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/swatch-book.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/tag.svg` | Lucide icon "tag" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/tag.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/text-cursor-input.svg` | Lucide icon "text-cursor-input" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/text-cursor-input.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/text-select.svg` | Lucide icon "text-select" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/text-select.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/trash-2.svg` | Lucide icon "trash-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/trash-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/trash.svg` | Lucide icon "trash" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/trash.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/triangle-alert.svg` | Lucide icon "triangle-alert" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/triangle-alert.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/type.svg` | Lucide icon "type" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/type.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/underline.svg` | Lucide icon "underline" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/underline.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/undo-2.svg` | Lucide icon "undo-2" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/undo-2.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/user-round.svg` | Lucide icon "user-round" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/user-round.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/wand-sparkles.svg` | Lucide icon "wand-sparkles" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/wand-sparkles.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/wrench.svg` | Lucide icon "wrench" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/wrench.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/x.svg` | Lucide icon "x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/zoom-in.svg` | Lucide icon "zoom-in" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/zoom-in.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/zoom-out.svg` | Lucide icon "zoom-out" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/zoom-out.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `assets/fonts/Inter-Regular.ttf` | Inter Regular | The Inter Project Authors (Rasmus Andersson) | OFL-1.1 | https://github.com/rsms/inter | UI font, embedded in the app; demo PDF labels; slanted fallback glyphs in Fill & Sign typed signatures for characters Dancing Script lacks (Cyrillic, Greek), drawn as filled paths |
| `assets/fonts/Inter-Medium.ttf` | Inter Medium | The Inter Project Authors (Rasmus Andersson) | OFL-1.1 | https://github.com/rsms/inter | UI font, embedded in the app; demo PDF labels |
| `assets/fonts/Inter-SemiBold.ttf` | Inter SemiBold | The Inter Project Authors (Rasmus Andersson) | OFL-1.1 | https://github.com/rsms/inter | UI font, embedded in the app; demo PDF labels |
@@ -260,23 +260,23 @@ Every asset PdfCraft includes, bundles or uses to build its published material,
| `docs/images/pdfcraft-tools.png` | PdfCraft screenshot: All tools | PdfCraft contributors (generated by `cargo xtask screenshots`) | MIT OR Apache-2.0 | this repository | README: tool catalogue. Shows PdfCraft UI, Lucide icons, the showcase PDF built from the [[fetched]] OFL fonts, and the ArtCraft mark (Storyteller trademark from docs/brand/, not covered by this licence) |
| `docs/images/pdfcraft-twoup.png` | PdfCraft screenshot: Two-up reading | PdfCraft contributors (generated by `cargo xtask screenshots`) | MIT OR Apache-2.0 | this repository | README: layouts. Shows only PdfCraft UI, Lucide icons and the showcase PDF built from the [[fetched]] OFL fonts |
| `docs/images/pdfcraft-viewer.png` | PdfCraft screenshot: Viewer with comments | PdfCraft contributors (generated by `cargo xtask screenshots`) | MIT OR Apache-2.0 | this repository | README hero. Shows only PdfCraft UI, Lucide icons and the showcase PDF built from the [[fetched]] OFL fonts |
-| `assets/icons/pin.svg` | Lucide icon "pin" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pin.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/move-right.svg` | Lucide icon "move-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/move-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/reply.svg` | Lucide icon "reply" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/reply.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/thumbs-up.svg` | Lucide icon "thumbs-up" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-up.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/thumbs-down.svg` | Lucide icon "thumbs-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/message-square-plus.svg` | Lucide icon "message-square-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/circle-x.svg` | Lucide icon "circle-x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/pin.svg` | Lucide icon "pin" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pin.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/move-right.svg` | Lucide icon "move-right" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/move-right.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/reply.svg` | Lucide icon "reply" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/reply.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/thumbs-up.svg` | Lucide icon "thumbs-up" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-up.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/thumbs-down.svg` | Lucide icon "thumbs-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/message-square-plus.svg` | Lucide icon "message-square-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/circle-x.svg` | Lucide icon "circle-x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `crates/ui-egui/tests/data/form.pdf` | One-page AcroForm test fixture (text, check box, radio group, combo box) | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects, no third-party content | Form-filling UI tests (crates/ui-egui/tests/forms.rs, commands.rs) |
-| `assets/icons/pentagon.svg` | Lucide icon "pentagon" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pentagon.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `assets/icons/message-square-quote.svg` | Lucide icon "message-square-quote" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-quote.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/pentagon.svg` | Lucide icon "pentagon" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pentagon.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/message-square-quote.svg` | Lucide icon "message-square-quote" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-quote.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `crates/sign/tests/data/openssl-signed.pdf` | One-page PDF signed with OpenSSL CMS (adbe.pkcs7.detached) by the RSA test key | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects; signature made with `openssl cms -sign` over its byte ranges (see crates/sign/tests/data/README.md) | Signature validation tests (crates/sign/tests/pdf.rs): a signature PdfCraft did not make |
-| `assets/icons/clipboard-paste.svg` | Lucide icon "clipboard-paste" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clipboard-paste.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/clipboard-paste.svg` | Lucide icon "clipboard-paste" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clipboard-paste.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `assets/fonts/DancingScript.ttf` | Dancing Script (variable) | The Dancing Script Project Authors (Pablo Impallari) | OFL-1.1 | https://github.com/google/fonts/blob/9710da1eacb3be272583c3224dcb70f9da6eadbb/ofl/dancingscript/DancingScript%5Bwght%5D.ttf | Fill & Sign typed signatures and initials: the typed name's glyph outlines, drawn as filled paths (the font file itself is not embedded in PDFs) |
| `packaging/macos/dmg/background.svg` | PdfCraft macOS DMG window background | @XusBadia | MIT OR Apache-2.0 | Original work for this repository, derived from the PdfCraft app icon (assets/app-icon/pdfcraft.svg, referenced via an SVG image element, not copied) | Finder window of the macOS DMG; rendered to background.tiff by packaging/macos/dmg/generate.py |
| `packaging/macos/dmg/background.tiff` | PdfCraft macOS DMG window background (rendered) | @XusBadia | MIT OR Apache-2.0 | Rendered from packaging/macos/dmg/background.svg by packaging/macos/dmg/generate.py | 1x + 2x HiDPI 16-colour palette TIFF copied into the macOS DMG by packaging/macos/package.sh; includes the app icon and the free LittleCMS built-in sRGB profile |
| `crates/sign/tests/data/x509-rsa-sha1.pdf` | One-page PDF with a legacy adbe.x509.rsa_sha1 signature by the RSA test key | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects; signature made with `openssl dgst -sha1 -sign` over its byte ranges (see crates/sign/tests/data/README.md) | Signature validation tests (crates/sign/tests/pdf.rs): the legacy adbe.x509.rsa_sha1 format |
-| `assets/icons/monitor.svg` | Lucide icon "monitor" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/monitor.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
+| `assets/icons/monitor.svg` | Lucide icon "monitor" | Lucide Contributors (portions Cole Bemis, Feather) | ISC AND MIT | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/monitor.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `crates/ui-egui/src/i18n/sl.tsv` | Slovene interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources | Slovene UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
## Compiled in through dependencies (6)
diff --git a/ATTRIBUTION.toml b/ATTRIBUTION.toml
index 07433fc453..4afb3a7b2e 100644
--- a/ATTRIBUTION.toml
+++ b/ATTRIBUTION.toml
@@ -235,7 +235,7 @@ path = "assets/icons/accessibility.svg"
title = "Lucide icon \"accessibility\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/accessibility.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -246,7 +246,7 @@ path = "assets/icons/align-left.svg"
title = "Lucide icon \"align-left\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-left.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -257,7 +257,7 @@ path = "assets/icons/align-center.svg"
title = "Lucide icon \"align-center\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-center.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -268,7 +268,7 @@ path = "assets/icons/square-terminal.svg"
title = "Lucide icon \"square-terminal\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-terminal.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -279,7 +279,7 @@ path = "assets/icons/file-code.svg"
title = "Lucide icon \"file-code\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-code.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -290,7 +290,7 @@ path = "assets/icons/file-spreadsheet.svg"
title = "Lucide icon \"file-spreadsheet\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-spreadsheet.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -301,7 +301,7 @@ path = "assets/icons/align-justify.svg"
title = "Lucide icon \"align-justify\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-justify.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -312,7 +312,7 @@ path = "assets/icons/align-right.svg"
title = "Lucide icon \"align-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/align-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -323,7 +323,7 @@ path = "assets/icons/columns-3.svg"
title = "Lucide icon \"columns-3\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/columns-3.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -334,7 +334,7 @@ path = "assets/icons/rows-3.svg"
title = "Lucide icon \"rows-3\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rows-3.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -345,7 +345,7 @@ path = "assets/icons/flip-horizontal-2.svg"
title = "Lucide icon \"flip-horizontal-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/flip-horizontal-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -356,7 +356,7 @@ path = "assets/icons/flip-vertical-2.svg"
title = "Lucide icon \"flip-vertical-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/flip-vertical-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -367,7 +367,7 @@ path = "assets/icons/app-window.svg"
title = "Lucide icon \"app-window\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/app-window.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -378,7 +378,7 @@ path = "assets/icons/arrow-left-right.svg"
title = "Lucide icon \"arrow-left-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-left-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -389,7 +389,7 @@ path = "assets/icons/arrow-up-down.svg"
title = "Lucide icon \"arrow-up-down\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-up-down.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -400,7 +400,7 @@ path = "assets/icons/arrow-up-right.svg"
title = "Lucide icon \"arrow-up-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/arrow-up-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -411,7 +411,7 @@ path = "assets/icons/badge-check.svg"
title = "Lucide icon \"badge-check\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/badge-check.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -422,7 +422,7 @@ path = "assets/icons/bandage.svg"
title = "Lucide icon \"bandage\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bandage.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -433,7 +433,7 @@ path = "assets/icons/bell.svg"
title = "Lucide icon \"bell\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bell.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -444,7 +444,7 @@ path = "assets/icons/blend.svg"
title = "Lucide icon \"blend\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/blend.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -455,7 +455,7 @@ path = "assets/icons/bold.svg"
title = "Lucide icon \"bold\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bold.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -466,7 +466,7 @@ path = "assets/icons/book-open.svg"
title = "Lucide icon \"book-open\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/book-open.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -477,7 +477,7 @@ path = "assets/icons/bookmark.svg"
title = "Lucide icon \"bookmark\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bookmark.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -488,7 +488,7 @@ path = "assets/icons/bookmark-plus.svg"
title = "Lucide icon \"bookmark-plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/bookmark-plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -499,7 +499,7 @@ path = "assets/icons/braces.svg"
title = "Lucide icon \"braces\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/braces.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -510,7 +510,7 @@ path = "assets/icons/brush-cleaning.svg"
title = "Lucide icon \"brush-cleaning\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/brush-cleaning.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -521,7 +521,7 @@ path = "assets/icons/brush.svg"
title = "Lucide icon \"brush\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/brush.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -532,7 +532,7 @@ path = "assets/icons/camera.svg"
title = "Lucide icon \"camera\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/camera.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -543,7 +543,7 @@ path = "assets/icons/check-circle-2.svg"
title = "Lucide icon \"check-circle-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/check-circle-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -554,7 +554,7 @@ path = "assets/icons/check.svg"
title = "Lucide icon \"check\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/check.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -565,7 +565,7 @@ path = "assets/icons/chevron-down.svg"
title = "Lucide icon \"chevron-down\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-down.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -576,7 +576,7 @@ path = "assets/icons/chevron-left.svg"
title = "Lucide icon \"chevron-left\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-left.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -587,7 +587,7 @@ path = "assets/icons/chevron-right.svg"
title = "Lucide icon \"chevron-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -598,7 +598,7 @@ path = "assets/icons/chevron-up.svg"
title = "Lucide icon \"chevron-up\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevron-up.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -609,7 +609,7 @@ path = "assets/icons/chevrons-left.svg"
title = "Lucide icon \"chevrons-left\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevrons-left.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -620,7 +620,7 @@ path = "assets/icons/chevrons-right.svg"
title = "Lucide icon \"chevrons-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/chevrons-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -631,7 +631,7 @@ path = "assets/icons/circle-check.svg"
title = "Lucide icon \"circle-check\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-check.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -642,7 +642,7 @@ path = "assets/icons/circle-dashed.svg"
title = "Lucide icon \"circle-dashed\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-dashed.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -653,7 +653,7 @@ path = "assets/icons/circle-dot.svg"
title = "Lucide icon \"circle-dot\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-dot.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -664,7 +664,7 @@ path = "assets/icons/circle-help.svg"
title = "Lucide icon \"circle-help\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-help.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -675,7 +675,7 @@ path = "assets/icons/circle.svg"
title = "Lucide icon \"circle\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -686,7 +686,7 @@ path = "assets/icons/clock-3.svg"
title = "Lucide icon \"clock-3\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clock-3.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -697,7 +697,7 @@ path = "assets/icons/clock.svg"
title = "Lucide icon \"clock\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clock.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -708,7 +708,7 @@ path = "assets/icons/cloud-upload.svg"
title = "Lucide icon \"cloud-upload\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/cloud-upload.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -719,7 +719,7 @@ path = "assets/icons/cloud.svg"
title = "Lucide icon \"cloud\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/cloud.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -730,7 +730,7 @@ path = "assets/icons/code-xml.svg"
title = "Lucide icon \"code-xml\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/code-xml.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -741,7 +741,7 @@ path = "assets/icons/columns-2.svg"
title = "Lucide icon \"columns-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/columns-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -752,7 +752,7 @@ path = "assets/icons/compass.svg"
title = "Lucide icon \"compass\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/compass.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -763,7 +763,7 @@ path = "assets/icons/contrast.svg"
title = "Lucide icon \"contrast\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/contrast.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -774,7 +774,7 @@ path = "assets/icons/copy-plus.svg"
title = "Lucide icon \"copy-plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/copy-plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -785,7 +785,7 @@ path = "assets/icons/copy.svg"
title = "Lucide icon \"copy\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/copy.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -796,7 +796,7 @@ path = "assets/icons/crop.svg"
title = "Lucide icon \"crop\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/crop.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -807,7 +807,7 @@ path = "assets/icons/droplet.svg"
title = "Lucide icon \"droplet\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/droplet.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -818,7 +818,7 @@ path = "assets/icons/ellipsis-vertical.svg"
title = "Lucide icon \"ellipsis-vertical\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ellipsis-vertical.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -829,7 +829,7 @@ path = "assets/icons/ellipsis.svg"
title = "Lucide icon \"ellipsis\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ellipsis.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -840,7 +840,7 @@ path = "assets/icons/eraser.svg"
title = "Lucide icon \"eraser\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eraser.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -851,7 +851,7 @@ path = "assets/icons/external-link.svg"
title = "Lucide icon \"external-link\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/external-link.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -862,7 +862,7 @@ path = "assets/icons/eye-off.svg"
title = "Lucide icon \"eye-off\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eye-off.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -873,7 +873,7 @@ path = "assets/icons/eye.svg"
title = "Lucide icon \"eye\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/eye.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -884,7 +884,7 @@ path = "assets/icons/file-check.svg"
title = "Lucide icon \"file-check\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-check.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -895,7 +895,7 @@ path = "assets/icons/file-down.svg"
title = "Lucide icon \"file-down\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-down.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -906,7 +906,7 @@ path = "assets/icons/file-input.svg"
title = "Lucide icon \"file-input\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-input.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -917,7 +917,7 @@ path = "assets/icons/file-lock-2.svg"
title = "Lucide icon \"file-lock-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-lock-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -928,7 +928,7 @@ path = "assets/icons/file-minus.svg"
title = "Lucide icon \"file-minus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-minus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -939,7 +939,7 @@ path = "assets/icons/file-output.svg"
title = "Lucide icon \"file-output\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-output.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -950,7 +950,7 @@ path = "assets/icons/file-pen-line.svg"
title = "Lucide icon \"file-pen-line\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-pen-line.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -961,7 +961,7 @@ path = "assets/icons/file-plus-2.svg"
title = "Lucide icon \"file-plus-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-plus-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -972,7 +972,7 @@ path = "assets/icons/file-plus.svg"
title = "Lucide icon \"file-plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -983,7 +983,7 @@ path = "assets/icons/file-scan.svg"
title = "Lucide icon \"file-scan\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-scan.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -994,7 +994,7 @@ path = "assets/icons/file-search.svg"
title = "Lucide icon \"file-search\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-search.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1005,7 +1005,7 @@ path = "assets/icons/file-symlink.svg"
title = "Lucide icon \"file-symlink\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-symlink.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1016,7 +1016,7 @@ path = "assets/icons/file-text.svg"
title = "Lucide icon \"file-text\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-text.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1027,7 +1027,7 @@ path = "assets/icons/file-x.svg"
title = "Lucide icon \"file-x\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/file-x.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1038,7 +1038,7 @@ path = "assets/icons/files.svg"
title = "Lucide icon \"files\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/files.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1049,7 +1049,7 @@ path = "assets/icons/film.svg"
title = "Lucide icon \"film\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/film.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1060,7 +1060,7 @@ path = "assets/icons/filter.svg"
title = "Lucide icon \"filter\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/filter.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1071,7 +1071,7 @@ path = "assets/icons/folder-open.svg"
title = "Lucide icon \"folder-open\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder-open.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1082,7 +1082,7 @@ path = "assets/icons/folder-plus.svg"
title = "Lucide icon \"folder-plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder-plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1093,7 +1093,7 @@ path = "assets/icons/folder.svg"
title = "Lucide icon \"folder\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/folder.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1104,7 +1104,7 @@ path = "assets/icons/gauge.svg"
title = "Lucide icon \"gauge\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/gauge.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1115,7 +1115,7 @@ path = "assets/icons/git-compare.svg"
title = "Lucide icon \"git-compare\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/git-compare.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1126,7 +1126,7 @@ path = "assets/icons/globe.svg"
title = "Lucide icon \"globe\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/globe.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1137,7 +1137,7 @@ path = "assets/icons/grid-3x3.svg"
title = "Lucide icon \"grid-3x3\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/grid-3x3.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1148,7 +1148,7 @@ path = "assets/icons/hand.svg"
title = "Lucide icon \"hand\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/hand.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1159,7 +1159,7 @@ path = "assets/icons/hash.svg"
title = "Lucide icon \"hash\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/hash.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1170,7 +1170,7 @@ path = "assets/icons/heading.svg"
title = "Lucide icon \"heading\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/heading.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1181,7 +1181,7 @@ path = "assets/icons/highlighter.svg"
title = "Lucide icon \"highlighter\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/highlighter.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1192,7 +1192,7 @@ path = "assets/icons/house.svg"
title = "Lucide icon \"house\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/house.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1203,7 +1203,7 @@ path = "assets/icons/image-plus.svg"
title = "Lucide icon \"image-plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/image-plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1214,7 +1214,7 @@ path = "assets/icons/image.svg"
title = "Lucide icon \"image\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/image.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1225,7 +1225,7 @@ path = "assets/icons/info.svg"
title = "Lucide icon \"info\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/info.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1236,7 +1236,7 @@ path = "assets/icons/italic.svg"
title = "Lucide icon \"italic\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/italic.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1247,7 +1247,7 @@ path = "assets/icons/languages.svg"
title = "Lucide icon \"languages\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/languages.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1258,7 +1258,7 @@ path = "assets/icons/lasso.svg"
title = "Lucide icon \"lasso\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lasso.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1269,7 +1269,7 @@ path = "assets/icons/layers.svg"
title = "Lucide icon \"layers\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/layers.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1280,7 +1280,7 @@ path = "assets/icons/layout-grid.svg"
title = "Lucide icon \"layout-grid\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/layout-grid.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1291,7 +1291,7 @@ path = "assets/icons/link-2.svg"
title = "Lucide icon \"link-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/link-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1302,7 +1302,7 @@ path = "assets/icons/link.svg"
title = "Lucide icon \"link\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/link.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1313,7 +1313,7 @@ path = "assets/icons/list-checks.svg"
title = "Lucide icon \"list-checks\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list-checks.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1324,7 +1324,7 @@ path = "assets/icons/list-ordered.svg"
title = "Lucide icon \"list-ordered\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list-ordered.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1335,7 +1335,7 @@ path = "assets/icons/list.svg"
title = "Lucide icon \"list\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/list.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1346,7 +1346,7 @@ path = "assets/icons/lock-open.svg"
title = "Lucide icon \"lock-open\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lock-open.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1357,7 +1357,7 @@ path = "assets/icons/lock.svg"
title = "Lucide icon \"lock\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/lock.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1368,7 +1368,7 @@ path = "assets/icons/maximize-2.svg"
title = "Lucide icon \"maximize-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/maximize-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1379,7 +1379,7 @@ path = "assets/icons/maximize.svg"
title = "Lucide icon \"maximize\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/maximize.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1390,7 +1390,7 @@ path = "assets/icons/message-circle-reply.svg"
title = "Lucide icon \"message-circle-reply\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-circle-reply.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1401,7 +1401,7 @@ path = "assets/icons/message-square-text.svg"
title = "Lucide icon \"message-square-text\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-text.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1412,7 +1412,7 @@ path = "assets/icons/message-square.svg"
title = "Lucide icon \"message-square\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1423,7 +1423,7 @@ path = "assets/icons/messages-square.svg"
title = "Lucide icon \"messages-square\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/messages-square.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1434,7 +1434,7 @@ path = "assets/icons/mic.svg"
title = "Lucide icon \"mic\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/mic.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1445,7 +1445,7 @@ path = "assets/icons/minimize.svg"
title = "Lucide icon \"minimize\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minimize.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1456,7 +1456,7 @@ path = "assets/icons/minimize-2.svg"
title = "Lucide icon \"minimize-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minimize-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1467,7 +1467,7 @@ path = "assets/icons/minus.svg"
title = "Lucide icon \"minus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/minus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1478,7 +1478,7 @@ path = "assets/icons/moon.svg"
title = "Lucide icon \"moon\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/moon.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1489,7 +1489,7 @@ path = "assets/icons/mouse-pointer-2.svg"
title = "Lucide icon \"mouse-pointer-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/mouse-pointer-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1500,7 +1500,7 @@ path = "assets/icons/move.svg"
title = "Lucide icon \"move\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/move.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1511,7 +1511,7 @@ path = "assets/icons/navigation.svg"
title = "Lucide icon \"navigation\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/navigation.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1522,7 +1522,7 @@ path = "assets/icons/paint-bucket.svg"
title = "Lucide icon \"paint-bucket\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/paint-bucket.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1533,7 +1533,7 @@ path = "assets/icons/palette.svg"
title = "Lucide icon \"palette\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/palette.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1544,7 +1544,7 @@ path = "assets/icons/panel-left.svg"
title = "Lucide icon \"panel-left\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panel-left.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1555,7 +1555,7 @@ path = "assets/icons/panel-right.svg"
title = "Lucide icon \"panel-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panel-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1566,7 +1566,7 @@ path = "assets/icons/panels-top-left.svg"
title = "Lucide icon \"panels-top-left\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/panels-top-left.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1577,7 +1577,7 @@ path = "assets/icons/paperclip.svg"
title = "Lucide icon \"paperclip\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/paperclip.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1588,7 +1588,7 @@ path = "assets/icons/pen-line.svg"
title = "Lucide icon \"pen-line\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pen-line.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1599,7 +1599,7 @@ path = "assets/icons/pen-tool.svg"
title = "Lucide icon \"pen-tool\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pen-tool.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1610,7 +1610,7 @@ path = "assets/icons/pencil.svg"
title = "Lucide icon \"pencil\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pencil.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1621,7 +1621,7 @@ path = "assets/icons/pipette.svg"
title = "Lucide icon \"pipette\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pipette.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1632,7 +1632,7 @@ path = "assets/icons/plus.svg"
title = "Lucide icon \"plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1643,7 +1643,7 @@ path = "assets/icons/presentation.svg"
title = "Lucide icon \"presentation\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/presentation.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1654,7 +1654,7 @@ path = "assets/icons/printer.svg"
title = "Lucide icon \"printer\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/printer.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1665,7 +1665,7 @@ path = "assets/icons/rectangle-horizontal.svg"
title = "Lucide icon \"rectangle-horizontal\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rectangle-horizontal.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1676,7 +1676,7 @@ path = "assets/icons/redo-2.svg"
title = "Lucide icon \"redo-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/redo-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1687,7 +1687,7 @@ path = "assets/icons/replace.svg"
title = "Lucide icon \"replace\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/replace.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1698,7 +1698,7 @@ path = "assets/icons/rotate-ccw.svg"
title = "Lucide icon \"rotate-ccw\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rotate-ccw.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1709,7 +1709,7 @@ path = "assets/icons/rotate-cw.svg"
title = "Lucide icon \"rotate-cw\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/rotate-cw.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1720,7 +1720,7 @@ path = "assets/icons/ruler.svg"
title = "Lucide icon \"ruler\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/ruler.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1731,7 +1731,7 @@ path = "assets/icons/save.svg"
title = "Lucide icon \"save\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/save.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1742,7 +1742,7 @@ path = "assets/icons/scan-text.svg"
title = "Lucide icon \"scan-text\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scan-text.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1753,7 +1753,7 @@ path = "assets/icons/scan.svg"
title = "Lucide icon \"scan\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scan.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1764,7 +1764,7 @@ path = "assets/icons/scissors.svg"
title = "Lucide icon \"scissors\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/scissors.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1775,7 +1775,7 @@ path = "assets/icons/search.svg"
title = "Lucide icon \"search\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/search.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1786,7 +1786,7 @@ path = "assets/icons/send.svg"
title = "Lucide icon \"send\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/send.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1797,7 +1797,7 @@ path = "assets/icons/settings-2.svg"
title = "Lucide icon \"settings-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/settings-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1808,7 +1808,7 @@ path = "assets/icons/settings.svg"
title = "Lucide icon \"settings\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/settings.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1819,7 +1819,7 @@ path = "assets/icons/share-2.svg"
title = "Lucide icon \"share-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/share-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1830,7 +1830,7 @@ path = "assets/icons/shield-check.svg"
title = "Lucide icon \"shield-check\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/shield-check.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1841,7 +1841,7 @@ path = "assets/icons/signature.svg"
title = "Lucide icon \"signature\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/signature.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1852,7 +1852,7 @@ path = "assets/icons/sliders-horizontal.svg"
title = "Lucide icon \"sliders-horizontal\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sliders-horizontal.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1863,7 +1863,7 @@ path = "assets/icons/sparkles.svg"
title = "Lucide icon \"sparkles\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sparkles.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1874,7 +1874,7 @@ path = "assets/icons/spline.svg"
title = "Lucide icon \"spline\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/spline.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1885,7 +1885,7 @@ path = "assets/icons/square-dashed-mouse-pointer.svg"
title = "Lucide icon \"square-dashed-mouse-pointer\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-dashed-mouse-pointer.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1896,7 +1896,7 @@ path = "assets/icons/square-dashed.svg"
title = "Lucide icon \"square-dashed\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square-dashed.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1907,7 +1907,7 @@ path = "assets/icons/square.svg"
title = "Lucide icon \"square\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/square.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1918,7 +1918,7 @@ path = "assets/icons/squares-subtract.svg"
title = "Lucide icon \"squares-subtract\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/squares-subtract.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1929,7 +1929,7 @@ path = "assets/icons/stamp.svg"
title = "Lucide icon \"stamp\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/stamp.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1940,7 +1940,7 @@ path = "assets/icons/star.svg"
title = "Lucide icon \"star\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/star.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1951,7 +1951,7 @@ path = "assets/icons/sticky-note.svg"
title = "Lucide icon \"sticky-note\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sticky-note.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1962,7 +1962,7 @@ path = "assets/icons/strikethrough.svg"
title = "Lucide icon \"strikethrough\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/strikethrough.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1973,7 +1973,7 @@ path = "assets/icons/sun.svg"
title = "Lucide icon \"sun\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/sun.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1984,7 +1984,7 @@ path = "assets/icons/swatch-book.svg"
title = "Lucide icon \"swatch-book\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/swatch-book.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -1995,7 +1995,7 @@ path = "assets/icons/tag.svg"
title = "Lucide icon \"tag\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/tag.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2006,7 +2006,7 @@ path = "assets/icons/text-cursor-input.svg"
title = "Lucide icon \"text-cursor-input\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/text-cursor-input.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2017,7 +2017,7 @@ path = "assets/icons/text-select.svg"
title = "Lucide icon \"text-select\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/text-select.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2028,7 +2028,7 @@ path = "assets/icons/trash-2.svg"
title = "Lucide icon \"trash-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/trash-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2039,7 +2039,7 @@ path = "assets/icons/trash.svg"
title = "Lucide icon \"trash\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/trash.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2050,7 +2050,7 @@ path = "assets/icons/triangle-alert.svg"
title = "Lucide icon \"triangle-alert\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/triangle-alert.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2061,7 +2061,7 @@ path = "assets/icons/type.svg"
title = "Lucide icon \"type\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/type.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2072,7 +2072,7 @@ path = "assets/icons/underline.svg"
title = "Lucide icon \"underline\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/underline.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2083,7 +2083,7 @@ path = "assets/icons/undo-2.svg"
title = "Lucide icon \"undo-2\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/undo-2.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2094,7 +2094,7 @@ path = "assets/icons/user-round.svg"
title = "Lucide icon \"user-round\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/user-round.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2105,7 +2105,7 @@ path = "assets/icons/wand-sparkles.svg"
title = "Lucide icon \"wand-sparkles\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/wand-sparkles.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2116,7 +2116,7 @@ path = "assets/icons/wrench.svg"
title = "Lucide icon \"wrench\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/wrench.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2127,7 +2127,7 @@ path = "assets/icons/x.svg"
title = "Lucide icon \"x\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/x.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2138,7 +2138,7 @@ path = "assets/icons/zoom-in.svg"
title = "Lucide icon \"zoom-in\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/zoom-in.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -2149,7 +2149,7 @@ path = "assets/icons/zoom-out.svg"
title = "Lucide icon \"zoom-out\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/zoom-out.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3122,7 +3122,7 @@ path = "assets/icons/pin.svg"
title = "Lucide icon \"pin\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pin.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3133,7 +3133,7 @@ path = "assets/icons/move-right.svg"
title = "Lucide icon \"move-right\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/move-right.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3144,7 +3144,7 @@ path = "assets/icons/reply.svg"
title = "Lucide icon \"reply\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/reply.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3155,7 +3155,7 @@ path = "assets/icons/thumbs-up.svg"
title = "Lucide icon \"thumbs-up\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-up.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3166,7 +3166,7 @@ path = "assets/icons/thumbs-down.svg"
title = "Lucide icon \"thumbs-down\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-down.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3177,7 +3177,7 @@ path = "assets/icons/message-square-plus.svg"
title = "Lucide icon \"message-square-plus\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-plus.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3188,7 +3188,7 @@ path = "assets/icons/circle-x.svg"
title = "Lucide icon \"circle-x\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-x.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3210,7 +3210,7 @@ path = "assets/icons/pentagon.svg"
title = "Lucide icon \"pentagon\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pentagon.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3221,7 +3221,7 @@ path = "assets/icons/message-square-quote.svg"
title = "Lucide icon \"message-square-quote\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-quote.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3243,7 +3243,7 @@ path = "assets/icons/clipboard-paste.svg"
title = "Lucide icon \"clipboard-paste\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clipboard-paste.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
@@ -3336,7 +3336,7 @@ path = "assets/icons/monitor.svg"
title = "Lucide icon \"monitor\""
author = "Lucide Contributors (portions Cole Bemis, Feather)"
source = "https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/monitor.svg)"
-licence = "ISC"
+licence = "ISC AND MIT"
licence_file = "assets/icons/LICENSE-lucide.txt"
kind = "icon"
usage = "UI icon, embedded via crates/ui-egui/src/icon_data.rs"
diff --git a/LICENSES.toml b/LICENSES.toml
new file mode 100644
index 0000000000..1db65150b3
--- /dev/null
+++ b/LICENSES.toml
@@ -0,0 +1,147 @@
+# Stage 1 source documents only. Destinations are logical names, not packaging instructions.
+# licences lists audited full-text identifiers; omission grants no bundle applicability.
+
+[[document]]
+source = "LICENSE-APACHE"
+licences = ["Apache-2.0"]
+destination = "LICENSE-APACHE"
+sha256 = "0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594"
+
+[[document]]
+source = "LICENSE-MIT"
+licences = ["MIT"]
+destination = "LICENSE-MIT"
+sha256 = "cd7032ea33b71427f188e34ffb4aee9d6868a57fd196037c5c8b2be03a2a0352"
+
+[[document]]
+source = "NOTICE"
+destination = "NOTICE"
+sha256 = "40c86b3b25c603fcc0ef7918c29caf55906e09c1a9f7e853fe0765e5fe24ca5e"
+
+[[document]]
+source = "assets/app-icon/LICENSE-document.txt"
+destination = "assets/app-icon/LICENSE-document.txt"
+sha256 = "64a3137e3d5cc41e5b78d2ad8dd9ddddd6588283f9f7b3128aa6a8a50852fb9a"
+
+[[document]]
+source = "assets/app-icon/LICENSE.txt"
+destination = "assets/app-icon/LICENSE.txt"
+sha256 = "b768acafe6cbad8247eedf86b5b5381feefcd4ee0f8c7808b86811bc687cf37b"
+
+[[document]]
+source = "assets/fonts/OFL-DancingScript.txt"
+destination = "assets/fonts/OFL-DancingScript.txt"
+sha256 = "6f090277c00af96651ce6dbcc38ff1591047a3bffef486e80b6a32e8276a8201"
+
+[[document]]
+source = "assets/fonts/OFL-Inter.txt"
+destination = "assets/fonts/OFL-Inter.txt"
+sha256 = "262481e844521b326f5ecd053e59b98c8b2da78c8ee1bdbb6e8174305e54935a"
+
+[[document]]
+source = "assets/fonts/OFL-JetBrainsMono.txt"
+destination = "assets/fonts/OFL-JetBrainsMono.txt"
+sha256 = "a76abf002c49097d146e86740a3105a5d00450b1592e820a1109a8c5680cd697"
+
+[[document]]
+source = "assets/icons/LICENSE-lucide.txt"
+destination = "assets/icons/LICENSE-lucide.txt"
+sha256 = "b495047bd93a9b06913511076f504daba17d5bbeb3e0650f3bb53a4220329c57"
+
+[[document]]
+source = "docs/brand/LICENSE-brand.txt"
+destination = "docs/brand/LICENSE-brand.txt"
+sha256 = "0f33f48e7a96cd359d4e4e5b11424b13cebeb59cc70c77928186695e4173585c"
+
+[[document]]
+source = "licenses/CMap-LICENSE.txt"
+licences = ["BSD-3-Clause"]
+destination = "licenses/CMap-LICENSE.txt"
+sha256 = "742665db9c8e1bc72603c6d319ca3e90b83bd6d95202f0cd4ef11068a07a9c29"
+origin = "https://static.crates.io/crates/hayro-cmap/hayro-cmap-0.1.0.crate#assets/LICENSE.txt"
+
+[[document]]
+source = "licenses/egui-Hack-Regular.txt"
+licences = ["MIT", "Bitstream-Vera"]
+destination = "licenses/egui-Hack-Regular.txt"
+sha256 = "47c0cccbeec7e8614548cc485588b28149e7874188df5f41b36efebcee285c87"
+origin = "https://raw.githubusercontent.com/emilk/egui/0.36.2/crates/epaint_default_fonts/fonts/Hack-Regular.txt"
+
+[[document]]
+source = "licenses/egui-OFL.txt"
+licences = ["OFL-1.1"]
+destination = "licenses/egui-OFL.txt"
+sha256 = "6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2"
+origin = "https://raw.githubusercontent.com/emilk/egui/0.36.2/crates/epaint_default_fonts/fonts/OFL.txt"
+
+[[document]]
+source = "licenses/egui-UFL.txt"
+licences = ["Ubuntu-font-1.0"]
+destination = "licenses/egui-UFL.txt"
+sha256 = "2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002"
+origin = "https://raw.githubusercontent.com/emilk/egui/0.36.2/crates/epaint_default_fonts/fonts/UFL.txt"
+
+[[document]]
+source = "licenses/egui-emoji-icon-font-mit-license.txt"
+licences = ["MIT"]
+destination = "licenses/egui-emoji-icon-font-mit-license.txt"
+sha256 = "b9d2c1d909aa149996fd4c91dcb92b2362a04431640c1d200959da94caf8cde1"
+origin = "https://raw.githubusercontent.com/emilk/egui/0.36.2/crates/epaint_default_fonts/fonts/emoji-icon-font-mit-license.txt"
+
+[[document]]
+source = "vendor/hayro-interpret/LICENSE-APACHE"
+licences = ["Apache-2.0"]
+destination = "vendor/hayro-interpret/LICENSE-APACHE"
+sha256 = "0cec06e0e55fbc3dc5cee4fca9b607f66cb8f4e4dbcf3b3c013594dd156732e9"
+
+[[document]]
+source = "vendor/hayro-interpret/LICENSE-MIT"
+licences = ["MIT"]
+destination = "vendor/hayro-interpret/LICENSE-MIT"
+sha256 = "51b50e6120c344dcc146bbd6375ca1c78e079d97c8bea76e67a53d6ff0efebac"
+
+[[document]]
+source = "vendor/hayro-interpret/assets/CGATS_LICENSE.txt"
+destination = "vendor/hayro-interpret/assets/CGATS_LICENSE.txt"
+sha256 = "469d87b5fa48f8aaf69e25f4fcac3a309c97dbb7d561b917638abdb640e004d9"
+
+[[document]]
+source = "vendor/hayro-interpret/assets/LICENSE_FOXIT"
+destination = "vendor/hayro-interpret/assets/LICENSE_FOXIT"
+sha256 = "b578cdd2345840ada550bd12519533812320d5f1d21cf4c1c7e1b1b0a31c98b7"
+
+[[bundled]]
+crate = "epaint_default_fonts"
+path = "fonts/Ubuntu-Light.ttf"
+licence = "Ubuntu-font-1.0"
+documents = ["licenses/egui-UFL.txt"]
+
+[[bundled]]
+crate = "epaint_default_fonts"
+path = "fonts/Hack-Regular.ttf"
+licence = "MIT AND Bitstream-Vera"
+documents = ["licenses/egui-Hack-Regular.txt"]
+
+[[bundled]]
+crate = "epaint_default_fonts"
+path = "fonts/NotoEmoji-Regular.ttf"
+licence = "OFL-1.1"
+documents = ["licenses/egui-OFL.txt"]
+
+[[bundled]]
+crate = "epaint_default_fonts"
+path = "fonts/emoji-icon-font.ttf"
+licence = "MIT"
+documents = ["licenses/egui-emoji-icon-font-mit-license.txt"]
+
+[[bundled]]
+crate = "hayro-cmap"
+path = "assets/cmaps.brotli"
+licence = "BSD-3-Clause"
+documents = ["licenses/CMap-LICENSE.txt"]
+
+[[bundled]]
+crate = "hayro-interpret"
+path = "src/font/generated/metrics.rs"
+licence = "MIT OR Apache-2.0"
+documents = ["vendor/hayro-interpret/LICENSE-MIT", "vendor/hayro-interpret/LICENSE-APACHE"]
diff --git a/NOTICE b/NOTICE
index 8cacb0b585..5e60d33f40 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,7 +12,7 @@ Third-party material
This product bundles third-party material under its own licenses, listed below. The per-file
list (author, source, license) is in ATTRIBUTION.md.
-- Lucide icons (assets/icons/*.svg) — ISC License. See assets/icons/LICENSE-lucide.txt.
+- Lucide icons (assets/icons/*.svg) — ISC and MIT licences (Feather-derived icons). See assets/icons/LICENSE-lucide.txt.
The Windows PDF file icon (assets/app-icon/pdfcraft-document.svg and .ico) adapts Lucide's
file-text outline and combines it with contributor-original artwork. See
assets/app-icon/LICENSE-document.txt (ISC AND (MIT OR Apache-2.0)), packaged as
diff --git a/docs/licensing-self-check.md b/docs/licensing-self-check.md
new file mode 100644
index 0000000000..305d756ff7
--- /dev/null
+++ b/docs/licensing-self-check.md
@@ -0,0 +1,33 @@
+# Source licensing self-check
+
+Run `cargo xtask license-check` to validate the checked-out source, offline. The command
+does not download assets, fetch models, inspect installers, or generate dependency notices.
+It reuses `cargo xtask assets` for attribution, asset policy and locked dependency versions,
+then checks the documents recorded in `LICENSES.toml`.
+
+Each document has a repository-relative source, a unique portable logical destination and
+the SHA-256 of its audited text. Destinations are validation metadata, not instructions to
+copy files into packages. Required project documents and every asset's `licence_file` must
+be mapped. Every dependency-bundled asset must have a document mapping matching its existing
+`ATTRIBUTION.toml` licence expression. Foxit has an explicit required document. Licence
+texts for egui's default fonts and CMaps are retained in `licenses/`, with their pinned
+upstream origins recorded in the manifest. Existing font and asset texts stay in place.
+
+Missing files, empty or invalid text, changed hashes, duplicate mappings, case-insensitive
+destination collisions, parent-file conflicts and unsafe paths fail the check. Source
+symlinks must resolve inside the checkout. OCR models need complete attribution and valid
+hashes and destination names; the model binaries and downloaded licence texts need not be
+present. The optional craft-fonts checkout remains governed by its own attribution and
+the existing asset validator; this command does not audit that external checkout.
+
+When changing attribution, edit `ATTRIBUTION.toml`, run `cargo xtask assets --write`. Generated attribution consistency remains checked only
+by the existing asset validator. When changing licence or notice text, re-audit
+its provenance before updating the corresponding hash. Do not replace a licence with
+guessed terms or update a hash merely to silence a failure. `LICENSES.toml` is validated
+with unknown fields rejected.
+
+The existing Linux source-validation step in `.github/workflows/ci.yml` and `cargo xtask ci`
+run `license-check` in place of `assets`; the asset validator runs once within that command.
+This Stage 1 check establishes source-document consistency, not completed-package
+compliance or legal sufficiency. Installer inspection, dependency-notice generation and
+font-delivery packaging changes remain separate work.
diff --git a/licenses/CMap-LICENSE.txt b/licenses/CMap-LICENSE.txt
new file mode 100644
index 0000000000..2552cc990c
--- /dev/null
+++ b/licenses/CMap-LICENSE.txt
@@ -0,0 +1,28 @@
+Copyright 1990-2023 Adobe. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+Neither the name of Adobe nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenses/egui-Hack-Regular.txt b/licenses/egui-Hack-Regular.txt
new file mode 100644
index 0000000000..b0ec74488a
--- /dev/null
+++ b/licenses/egui-Hack-Regular.txt
@@ -0,0 +1,31 @@
+The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License
+
+The work in the DejaVu project was committed to the public domain.
+
+Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera"
+MIT License
+
+Copyright (c) 2018 Source Foundry Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+BITSTREAM VERA LICENSE
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.
diff --git a/licenses/egui-OFL.txt b/licenses/egui-OFL.txt
new file mode 100644
index 0000000000..d952d62c06
--- /dev/null
+++ b/licenses/egui-OFL.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/licenses/egui-UFL.txt b/licenses/egui-UFL.txt
new file mode 100644
index 0000000000..ae78a8f94e
--- /dev/null
+++ b/licenses/egui-UFL.txt
@@ -0,0 +1,96 @@
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. These can be included either as stand-alone
+text files, human-readable headers or in the appropriate machine-
+readable metadata fields within text or binary files as long as those
+fields can be easily viewed by the user.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
diff --git a/licenses/egui-emoji-icon-font-mit-license.txt b/licenses/egui-emoji-icon-font-mit-license.txt
new file mode 100644
index 0000000000..99016e120b
--- /dev/null
+++ b/licenses/egui-emoji-icon-font-mit-license.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2014 John Slegers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/xtask/src/gates.rs b/xtask/src/gates.rs
index 4406a957c4..0d4ab7db3f 100644
--- a/xtask/src/gates.rs
+++ b/xtask/src/gates.rs
@@ -102,7 +102,7 @@ pub fn ci(_: &[String]) -> anyhow::Result<()> {
("test", Box::new(|| run_args(&["test", "--workspace"]))),
("layers", Box::new(|| layers(&[]))),
("wasm", Box::new(|| wasm(&[]))),
- ("assets", Box::new(|| crate::assets::run(&[]))),
+ ("license-check", Box::new(|| crate::license_check::run(&[]))),
("deny", Box::new(|| deny(&[]))),
("parity", Box::new(|| crate::parity::run(&[]))),
];
diff --git a/xtask/src/license_check.rs b/xtask/src/license_check.rs
new file mode 100644
index 0000000000..6b8b8c57fb
--- /dev/null
+++ b/xtask/src/license_check.rs
@@ -0,0 +1,467 @@
+//! Offline source-document checks. This does not inspect completed packages or dependencies.
+use std::collections::BTreeSet;
+use std::path::Path;
+
+use anyhow::{Context, Result, bail};
+use serde::Deserialize;
+
+use crate::assets;
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Documents {
+ document: Vec,
+ bundled: Vec,
+}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Document {
+ source: String,
+ destination: String,
+ sha256: String,
+ /// Audited identifiers of the full licence texts in this document, not inferred from its contents.
+ #[serde(default)]
+ licences: Vec,
+ #[serde(default)]
+ origin: Option,
+}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Bundled {
+ #[serde(rename = "crate")]
+ krate: String,
+ path: String,
+ licence: String,
+ documents: Vec,
+}
+
+pub fn run(args: &[String]) -> Result<()> {
+ if !args.is_empty() {
+ bail!("usage: cargo xtask license-check (no downloads or write mode)");
+ }
+ let root = assets::root();
+ // Reuse the existing policy and generated-attribution validator, once.
+ assets::run(&[])?;
+ validate(&root)?;
+ println!("license-check: source documents and licensing metadata are consistent");
+ Ok(())
+}
+
+fn validate(root: &Path) -> Result<()> {
+ let text = std::fs::read_to_string(root.join("LICENSES.toml")).context("reading LICENSES.toml")?;
+ let docs: Documents = toml::from_str(&text).context("parsing LICENSES.toml")?;
+ let attribution = assets::load(root)?;
+ let mut problems = check(root, &docs, &attribution);
+ let ocr_source = std::fs::read_to_string(root.join("crates/ocr/src/lib.rs")).context("reading OCR model filename constants")?;
+ problems.extend(check_required_ocr_metadata(&ocr_source, &attribution)?);
+ if !problems.is_empty() {
+ bail!("source licensing errors:\n{}", problems.join("\n"));
+ }
+ Ok(())
+}
+
+/// Read only the two filename constants consumed by the OCR application. Fail closed if their
+/// declaration format changes; do not guess filenames or add a dependency on the OCR engine.
+fn check_required_ocr_metadata(source: &str, attribution: &assets::Manifest) -> Result> {
+ let mut problems = Vec::new();
+ for name in ["DETECTION_MODEL", "RECOGNITION_MODEL"] {
+ let prefix = format!("pub const {name}: &str = \"");
+ let declarations: Vec<_> = source.lines().map(str::trim).filter_map(|line| line.strip_prefix(&prefix)).collect();
+ let file = declarations.first().and_then(|value| value.strip_suffix("\";"));
+ let Some(file) = file.filter(|file| declarations.len() == 1 && safe_path(file) && !file.contains('/')) else {
+ bail!(
+ "OCR constant {name}: expected one literal filename declaration in crates/ocr/src/lib.rs; update the source validator if its syntax changed"
+ );
+ };
+ let entries: Vec<_> = attribution.fetched.iter().filter(|f| f.file == file).collect();
+ if entries.is_empty() {
+ problems.push(format!("{file}: required OCR licensing metadata missing from ATTRIBUTION.toml"));
+ } else {
+ if entries.len() != 1 {
+ problems.push(format!("{file}: required OCR licensing metadata must have exactly one entry"));
+ }
+ if entries.iter().any(|f| f.kind != "model") {
+ problems.push(format!("{file}: required OCR licensing metadata must have kind = \"model\""));
+ }
+ }
+ }
+ Ok(problems)
+}
+
+/// The audited bundle inventory currently uses identifiers and flat AND/OR expressions only.
+/// Keep their semantics distinct, and fail closed on mixed operators, grouping or exceptions
+/// rather than introducing a general SPDX parser or flattening an unsupported expression.
+fn licence_coverage(expression: &str, covered: &BTreeSet<&str>) -> Result {
+ let mut tokens = expression.split_whitespace();
+ let Some(first) = tokens.next().filter(|id| assets::ALLOWED_LICENCES.contains(id)) else {
+ bail!("unsupported bundle licence expression `{expression}`");
+ };
+ let mut ids = vec![first];
+ let mut operator = None;
+ while let Some(op) = tokens.next() {
+ if !matches!(op, "AND" | "OR") || operator.is_some_and(|previous| previous != op) {
+ bail!("unsupported bundle licence expression `{expression}`; audit its applicability before extending the validator");
+ }
+ operator = Some(op);
+ let Some(id) = tokens.next().filter(|id| assets::ALLOWED_LICENCES.contains(id)) else {
+ bail!("unsupported bundle licence expression `{expression}`");
+ };
+ ids.push(id);
+ }
+ Ok(if operator == Some("OR") { ids.iter().any(|id| covered.contains(id)) } else { ids.iter().all(|id| covered.contains(id)) })
+}
+
+// A portable relative path, including on Windows; reject aliases before comparing mappings.
+fn safe_path(s: &str) -> bool {
+ !s.is_empty()
+ && !s.contains(['\\', ':'])
+ && s.split('/').all(|p| {
+ !p.is_empty()
+ && p != "."
+ && p != ".."
+ && !p.ends_with(['.', ' '])
+ && p.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | '.'))
+ && !matches!(
+ p.split('.').next().unwrap_or_default().to_ascii_uppercase().as_str(),
+ "CON"
+ | "PRN"
+ | "AUX"
+ | "NUL"
+ | "COM1"
+ | "COM2"
+ | "COM3"
+ | "COM4"
+ | "COM5"
+ | "COM6"
+ | "COM7"
+ | "COM8"
+ | "COM9"
+ | "LPT1"
+ | "LPT2"
+ | "LPT3"
+ | "LPT4"
+ | "LPT5"
+ | "LPT6"
+ | "LPT7"
+ | "LPT8"
+ | "LPT9"
+ )
+ })
+}
+
+fn hash(s: &str) -> bool {
+ s.len() == 64 && s.bytes().all(|b| b.is_ascii_hexdigit())
+}
+
+fn check(root: &Path, docs: &Documents, attribution: &assets::Manifest) -> Vec {
+ let mut problems = Vec::new();
+ let mut sources = BTreeSet::new();
+ let mut destinations = BTreeSet::new();
+ for d in &docs.document {
+ if !safe_path(&d.source) || !safe_path(&d.destination) {
+ problems.push(format!("{}: unsafe document source or destination", d.source));
+ continue;
+ }
+ let new_source = sources.insert(d.source.as_str());
+ let new_destination = destinations.insert(d.destination.to_ascii_lowercase());
+ if !new_source || !new_destination {
+ problems.push(format!("{}: duplicate document source or destination", d.source));
+ }
+ if d.origin.as_ref().is_some_and(|u| !u.starts_with("https://") || u.trim().len() <= 8) {
+ problems.push(format!("{}: invalid document origin", d.source));
+ }
+ let mut identifiers = BTreeSet::new();
+ for id in &d.licences {
+ if !assets::ALLOWED_LICENCES.contains(&id.as_str()) || !identifiers.insert(id.as_str()) {
+ problems.push(format!("{}: invalid or duplicate audited licence identifier `{id}`", d.source));
+ }
+ }
+ let path = root.join(&d.source);
+ // Canonical confinement also catches symlinks escaping the checkout.
+ let confined = root.canonicalize().and_then(|r| path.canonicalize().map(|p| p.starts_with(r))).unwrap_or(false);
+ if !confined || !path.is_file() {
+ problems.push(format!("{}: required document missing or outside checkout", d.source));
+ continue;
+ }
+ match std::fs::read_to_string(&path) {
+ Ok(text) if !text.trim().is_empty() && !text.contains('\0') => {
+ if !hash(&d.sha256) || assets::sha256_hex(text.as_bytes()) != d.sha256 {
+ problems.push(format!("{}: document hash mismatch; re-audit the source before updating LICENSES.toml", d.source));
+ }
+ }
+ _ => problems.push(format!("{}: required document empty or invalid UTF-8 text", d.source)),
+ }
+ }
+ for destination in &destinations {
+ for (i, _) in destination.match_indices('/') {
+ if destination.get(..i).is_some_and(|prefix| destinations.contains(prefix)) {
+ problems.push(format!("{destination}: document destination conflicts with a parent file"));
+ }
+ }
+ }
+ for required in ["LICENSE-MIT", "LICENSE-APACHE", "NOTICE", "vendor/hayro-interpret/assets/LICENSE_FOXIT"]
+ .into_iter()
+ .chain(attribution.asset.iter().map(|a| a.licence_file.as_str()))
+ {
+ if !sources.contains(required) {
+ problems.push(format!("{required}: required document has no LICENSES.toml mapping"));
+ }
+ }
+ // One mapping per bundled asset, using the existing attribution's licence expression.
+ let mut seen = BTreeSet::new();
+ for b in &docs.bundled {
+ if !seen.insert((b.krate.as_str(), b.path.as_str())) {
+ problems.push(format!("{} {}: duplicate bundled mapping", b.krate, b.path));
+ }
+ if !attribution.bundled.iter().any(|a| a.krate == b.krate && a.path == b.path && a.licence == b.licence) {
+ problems.push(format!("{} {}: bundled mapping disagrees with ATTRIBUTION.toml", b.krate, b.path));
+ }
+ if b.documents.is_empty() || b.documents.iter().any(|d| !sources.contains(d.as_str())) {
+ problems.push(format!("{} {}: bundled licence documents missing", b.krate, b.path));
+ }
+ for document in docs.document.iter().filter(|d| b.documents.contains(&d.source)) {
+ if !document.licences.iter().any(|id| b.licence.split_whitespace().any(|token| token == id)) {
+ problems.push(format!("{} {}: inapplicable mapped document {}", b.krate, b.path, document.source));
+ }
+ }
+ let covered: BTreeSet<_> =
+ docs.document.iter().filter(|d| b.documents.contains(&d.source)).flat_map(|d| d.licences.iter().map(String::as_str)).collect();
+ match licence_coverage(&b.licence, &covered) {
+ Ok(true) => {}
+ Ok(false) => problems
+ .push(format!("{} {}: inapplicable licence documents; mapped audited identifiers do not cover `{}`", b.krate, b.path, b.licence)),
+ Err(error) => problems.push(format!("{} {}: {error}", b.krate, b.path)),
+ }
+ }
+ for b in &attribution.bundled {
+ if !seen.contains(&(b.krate.as_str(), b.path.as_str())) {
+ problems.push(format!("{} {}: bundled asset has no licence document mapping", b.krate, b.path));
+ }
+ }
+ for a in attribution.asset.iter().filter(|a| a.licence_file == "assets/icons/LICENSE-lucide.txt") {
+ if a.licence != "ISC AND MIT" {
+ problems.push(format!("{}: Lucide collection must credit ISC and Feather MIT", a.path));
+ }
+ }
+ let mut model_paths = BTreeSet::new();
+ for f in attribution.fetched.iter().filter(|f| f.kind == "model") {
+ if [f.title.as_str(), &f.author, &f.source, &f.usage, &f.licence].iter().any(|v| v.trim().is_empty())
+ || !hash(&f.sha256)
+ || !hash(&f.licence_sha256)
+ || !f.url.starts_with("https://")
+ || !f.licence_url.starts_with("https://")
+ {
+ problems.push(format!("{}: incomplete OCR model licensing metadata", f.file));
+ }
+ for path in [f.file.clone(), format!("{}.LICENCE.txt", f.file)] {
+ if !safe_path(&path)
+ || path.contains('/')
+ || path.eq_ignore_ascii_case("ATTRIBUTION.txt")
+ || !model_paths.insert(path.to_ascii_lowercase())
+ {
+ problems.push(format!("{}: duplicate or unsafe OCR model destination", f.file));
+ }
+ }
+ }
+ problems
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use std::sync::atomic::{AtomicU64, Ordering};
+
+ fn fixture() -> (std::path::PathBuf, Documents) {
+ static NEXT: AtomicU64 = AtomicU64::new(0);
+ let root = std::env::temp_dir().join(format!("pdfcraft-license-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
+ std::fs::create_dir_all(&root).unwrap();
+ let document = ["LICENSE-MIT", "LICENSE-APACHE", "NOTICE", "vendor/hayro-interpret/assets/LICENSE_FOXIT"]
+ .into_iter()
+ .map(|p| {
+ let path = root.join(p);
+ std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+ std::fs::write(path, "synthetic licence text\n").unwrap();
+ Document {
+ source: p.into(),
+ destination: p.into(),
+ sha256: assets::sha256_hex(b"synthetic licence text\n"),
+ licences: match p {
+ "LICENSE-MIT" => vec!["MIT".into()],
+ "LICENSE-APACHE" => vec!["Apache-2.0".into()],
+ _ => vec![],
+ },
+ origin: None,
+ }
+ })
+ .collect();
+ (root, Documents { document, bundled: vec![] })
+ }
+
+ #[test]
+ fn missing_license_fails_and_restoring_recovers() {
+ let (root, docs) = fixture();
+ let m = assets::Manifest::default();
+ assert!(check(&root, &docs, &m).is_empty());
+ std::fs::remove_file(root.join("LICENSE-MIT")).unwrap();
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("LICENSE-MIT: required document missing")));
+ std::fs::write(root.join("LICENSE-MIT"), "synthetic licence text\n").unwrap();
+ assert!(check(&root, &docs, &m).is_empty());
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[test]
+ fn empty_invalid_and_changed_documents_fail() {
+ let (root, docs) = fixture();
+ for text in [b" ".as_slice(), b"\xff", b"changed licence", b"text\0"] {
+ std::fs::write(root.join("NOTICE"), text).unwrap();
+ assert!(!check(&root, &docs, &assets::Manifest::default()).is_empty());
+ }
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[test]
+ fn duplicate_and_unsafe_destinations_fail() {
+ let (root, mut docs) = fixture();
+ for dest in ["license-mit", "../NOTICE", "/NOTICE", "C:/NOTICE", "a\\NOTICE", "a//NOTICE", "CON.txt", "NOTICE."] {
+ docs.document.get_mut(2).unwrap().destination = dest.into();
+ assert!(!check(&root, &docs, &assets::Manifest::default()).is_empty(), "{dest}");
+ }
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[test]
+ fn removing_required_mapping_fails() {
+ let (root, mut docs) = fixture();
+ docs.document.retain(|d| d.source != "LICENSE-MIT");
+ assert!(check(&root, &docs, &assets::Manifest::default()).iter().any(|p| p.contains("LICENSE-MIT: required document has no")));
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[test]
+ fn bundled_documents_must_match_attribution() {
+ let (root, mut docs) = fixture();
+ let mut m = assets::Manifest::default();
+ m.bundled.push(assets::Bundled {
+ krate: "synthetic".into(),
+ version: "1.0.0".into(),
+ path: "font.ttf".into(),
+ title: "test".into(),
+ author: "test".into(),
+ source: "https://example.org".into(),
+ licence: "MIT".into(),
+ kind: "font".into(),
+ usage: "test".into(),
+ sha256: "a".repeat(64),
+ adobe_data: false,
+ });
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("no licence document mapping")));
+ docs.bundled.push(Bundled {
+ krate: "synthetic".into(),
+ path: "font.ttf".into(),
+ licence: "MIT".into(),
+ documents: vec!["LICENSE-MIT".into()],
+ });
+ assert!(check(&root, &docs, &m).is_empty());
+ docs.bundled.get_mut(0).unwrap().documents = vec!["LICENSE-APACHE".into()];
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("inapplicable")));
+ docs.bundled.get_mut(0).unwrap().documents = vec!["LICENSE-MIT".into(), "LICENSE-APACHE".into()];
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("inapplicable mapped document")));
+ docs.bundled.get_mut(0).unwrap().documents = vec!["LICENSE-MIT".into()];
+ docs.bundled.get_mut(0).unwrap().licence = "ISC".into();
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("disagrees")));
+ docs.bundled.get_mut(0).unwrap().documents.clear();
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("documents missing")));
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[test]
+ fn ocr_metadata_and_destinations_are_checked_without_models() {
+ let (root, docs) = fixture();
+ let mut m = assets::Manifest::default();
+ m.fetched.push(assets::Fetched {
+ file: "synthetic.rten".into(),
+ url: "https://example.org/model".into(),
+ title: "test model".into(),
+ author: "test".into(),
+ source: "https://example.org/card".into(),
+ licence: "CC-BY-SA-4.0".into(),
+ licence_url: "https://example.org/licence".into(),
+ licence_sha256: "a".repeat(64),
+ kind: "model".into(),
+ usage: "test".into(),
+ sha256: "b".repeat(64),
+ });
+ assert!(check(&root, &docs, &m).is_empty());
+ m.fetched.get_mut(0).unwrap().licence_sha256 = "z".repeat(64);
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("incomplete OCR")));
+ m.fetched.get_mut(0).unwrap().file = "../outside.rten".into();
+ assert!(check(&root, &docs, &m).iter().any(|p| p.contains("unsafe OCR")));
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[test]
+ fn required_ocr_models_cannot_be_missing() {
+ let source = include_str!("../../crates/ocr/src/lib.rs");
+ let original = assets::load(&assets::root()).unwrap();
+ assert_eq!(original.fetched.iter().filter(|f| f.kind == "model").count(), 2);
+ assert!(check_required_ocr_metadata(source, &original).unwrap().is_empty());
+ for model in original.fetched.iter().filter(|f| f.kind == "model") {
+ let mut m = assets::load(&assets::root()).unwrap();
+ m.fetched.retain(|f| f.file != model.file);
+ assert!(check_required_ocr_metadata(source, &m).unwrap().iter().any(|p| p.contains(&model.file) && p.contains("missing")));
+ }
+ }
+
+ #[test]
+ fn required_ocr_models_cannot_be_misclassified() {
+ let source = include_str!("../../crates/ocr/src/lib.rs");
+ let original = assets::load(&assets::root()).unwrap();
+ assert_eq!(original.fetched.iter().filter(|f| f.kind == "model").count(), 2);
+ for model in original.fetched.iter().filter(|f| f.kind == "model") {
+ let mut m = assets::load(&assets::root()).unwrap();
+ m.fetched.iter_mut().find(|f| f.file == model.file).unwrap().kind = "font".into();
+ assert!(check_required_ocr_metadata(source, &m).unwrap().iter().any(|p| p.contains(&model.file) && p.contains("kind")));
+ }
+ }
+
+ #[test]
+ fn licence_alternatives_and_combined_obligations_are_distinct() {
+ let mit = BTreeSet::from(["MIT"]);
+ assert!(licence_coverage("MIT OR Apache-2.0", &mit).unwrap());
+ assert!(!licence_coverage("MIT AND Apache-2.0", &mit).unwrap());
+ let both = BTreeSet::from(["MIT", "Bitstream-Vera"]);
+ assert!(licence_coverage("MIT AND Bitstream-Vera", &both).unwrap());
+ assert!(!licence_coverage("MIT OR Apache-2.0", &BTreeSet::from(["OFL-1.1"])).unwrap());
+ for expression in ["", "MIT AND", "MIT OR Apache-2.0 AND ISC", "(MIT OR Apache-2.0)", "MIT WITH exception"] {
+ assert!(licence_coverage(expression, &both).is_err(), "{expression}");
+ }
+ }
+
+ #[test]
+ fn changed_ocr_constant_syntax_fails_closed() {
+ assert!(check_required_ocr_metadata("", &assets::Manifest::default()).is_err());
+ }
+
+ #[test]
+ fn parent_file_destination_conflicts_fail() {
+ let (root, mut docs) = fixture();
+ docs.document.get_mut(2).unwrap().destination = "LICENSE-MIT/NOTICE".into();
+ assert!(check(&root, &docs, &assets::Manifest::default()).iter().any(|p| p.contains("parent file")));
+ std::fs::remove_dir_all(root).unwrap();
+ }
+
+ #[cfg(unix)]
+ #[test]
+ fn symlink_escape_fails() {
+ let (root, docs) = fixture();
+ let outside = root.with_extension("outside");
+ std::fs::write(&outside, "synthetic licence text\n").unwrap();
+ std::fs::remove_file(root.join("LICENSE-MIT")).unwrap();
+ std::os::unix::fs::symlink(&outside, root.join("LICENSE-MIT")).unwrap();
+ assert!(check(&root, &docs, &assets::Manifest::default()).iter().any(|p| p.contains("outside checkout")));
+ std::fs::remove_dir_all(root).unwrap();
+ std::fs::remove_file(outside).unwrap();
+ }
+}
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 70741d22b7..240eb7294a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -8,6 +8,7 @@ mod demo_pdf;
mod fuzz;
mod gates;
mod layers;
+mod license_check;
mod macos_integration;
mod parity;
mod screenshots;
@@ -21,7 +22,8 @@ const COMMANDS: &[(&str, &str, Command)] = &[
("layers", "Enforce the crate dependency layering (plan/architecture.md §3)", gates::layers),
("wasm", "cargo check --target wasm32-unknown-unknown for every crate below L8", gates::wasm),
("deny", "Dependency licences, bans, sources and advisories (deny.toml; needs cargo-deny)", gates::deny),
- ("ci", "fmt --check, clippy -D warnings, test, layers, wasm, assets, deny, parity (stops at first failure)", gates::ci),
+ ("ci", "fmt --check, clippy -D warnings, test, layers, wasm, license-check, deny, parity (stops at first failure)", gates::ci),
+ ("license-check", "Offline source licence documents, attribution and metadata", license_check::run),
("assets", "Enforce the asset policy (AGENTS.md §1) against ATTRIBUTION.toml; --write regenerates ATTRIBUTION.md", assets::run),
("corpus", "Fetch the pinned pdf.js test corpus into corpus/ (git-ignored) and verify it; --update-pin re-records the pin", gates::corpus),
("check", "Robustness sweep over corpus/ with pdfcraft-cli; fails on crashes or regressions vs xtask/baselines", gates::check),
From 8bd57468e892fbd9fe220e1b5ac6ceec0a17ce19 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 22:36:44 +0530
Subject: [PATCH 017/462] Fixes As Requested [Some images not moving, Opacity
Mistakes]
---
crates/edit/src/images.rs | 110 ++++++++++++++++++-------
crates/edit/src/tests.rs | 164 ++++++++++++++++++++++++++++++++++----
2 files changed, 228 insertions(+), 46 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 9b73dddac9..311f17a4a2 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -543,10 +543,45 @@ struct ExtractedScopeState {
state_ops: Vec,
}
+#[derive(Clone, Default)]
+struct ExtendedGStateTracker {
+ stack: Vec>,
+ current_gs: Option,
+}
+
+impl ExtendedGStateTracker {
+ fn step(&mut self, op: &Op) -> Result<(), EditError> {
+ match op.op.as_slice() {
+ b"q" => {
+ if self.stack.len() >= 256 {
+ return Err(EditError::Invalid("the image graphics state is too deeply nested".into()));
+ }
+ self.stack.push(self.current_gs.clone());
+ }
+ b"Q" => {
+ if let Some(prev) = self.stack.pop() {
+ self.current_gs = prev;
+ }
+ }
+ b"gs" => {
+ self.current_gs = Some(op.clone());
+ }
+ _ => {}
+ }
+ Ok(())
+ }
+}
+
fn extract_scope_state(ops: &[Op], start: usize, target: usize) -> Result, EditError> {
- if start >= target || target >= ops.len() {
+ if target >= ops.len() || start > target {
return Ok(None);
}
+ if start == target {
+ return Ok(Some(ExtractedScopeState {
+ clip_ops: Vec::new(),
+ state_ops: Vec::new(),
+ }));
+ }
let mut clip_ops = Vec::new();
let mut state_ops = Vec::new();
let mut pending_path: Vec = Vec::new();
@@ -725,55 +760,68 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
};
let mut state = ImageState::new(Matrix::IDENTITY, p.crop(doc), Vec::new());
+ let mut tracker = ExtendedGStateTracker::default();
+ let mut source_effective_gs = None;
+ let mut dest_effective_gs = None;
+ let mut dest_ctm = Matrix::IDENTITY;
+
+ let max_scan = scan_target.max(target.saturating_add(1));
for (i, op) in ops.iter().enumerate() {
+ if i == target {
+ source_effective_gs = tracker.current_gs.clone();
+ }
if i == scan_target {
+ dest_effective_gs = tracker.current_gs.clone();
+ dest_ctm = state.placement.matrix;
+ }
+ if i >= max_scan {
break;
}
state.apply(op)?;
+ tracker.step(op)?;
+ }
+ if scan_target >= ops.len() && dest_effective_gs.is_none() {
+ dest_effective_gs = tracker.current_gs.clone();
+ dest_ctm = state.placement.matrix;
}
- let dest_ctm = state.placement.matrix;
let Some(dest_inv) = dest_ctm.invert() else { return Ok(()); };
- let target_span = if has_other_paint {
- if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
- && sub_start >= target_unit.start
- && sub_end < target_unit.end
- {
- let start_op = ops.get(sub_start).unwrap_or(&ops[target]);
- let end_op = ops.get(sub_end).unwrap_or(&ops[target]);
- start_op.span.start..end_op.span.end
- } else {
- let target_op = &ops[target];
- target_op.span.start..target_op.span.end
- }
+ let (target_span, scope_start) = if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
+ && sub_start >= target_unit.start
+ && sub_end < target_unit.end
+ {
+ let start_op = ops.get(sub_start).unwrap_or(&ops[target]);
+ let end_op = ops.get(sub_end).unwrap_or(&ops[target]);
+ (start_op.span.start..end_op.span.end, sub_start)
+ } else if has_other_paint {
+ let target_op = &ops[target];
+ (target_op.span.start..target_op.span.end, target_unit.start)
} else {
let Some(first_op) = ops.get(target_unit.start) else { return Ok(()) };
let Some(last_op) = target_unit.end.checked_sub(1).and_then(|i| ops.get(i)) else { return Ok(()) };
- first_op.span.start..last_op.span.end
- };
-
- let scope_start = if has_other_paint {
- if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
- && sub_start >= target_unit.start
- && sub_end < target_unit.end
- {
- sub_start
- } else {
- target_unit.start
- }
- } else {
- target_unit.start
+ (first_op.span.start..last_op.span.end, target_unit.start)
};
let is_clipped = (img.visible_rect.is_some() && img.visible_rect != Some(img.rect)) || !img.clips.is_empty();
let extracted = extract_scope_state(&ops, scope_start, target)?;
- let Some(extracted) = extracted else {
- return Ok(());
+ let Some(mut extracted) = extracted else {
+ return Err(EditError::Invalid("unsupported graphics state: unable to cleanly extract image scope state".into()));
};
if is_clipped && extracted.clip_ops.is_empty() {
- return Ok(());
+ return Err(EditError::Invalid("unsupported graphics state: inherited clipping path cannot be cleanly preserved".into()));
+ }
+
+ if source_effective_gs.is_none() && dest_effective_gs.is_some() {
+ return Err(EditError::Invalid("unsupported graphics state: moving an opaque image into an active transparency scope is not supported".into()));
+ }
+
+ if let Some(src_gs) = source_effective_gs {
+ let already_has_gs = extracted.state_ops.iter().any(|o| o.is("gs"));
+ if !already_has_gs {
+ extracted.state_ops.push(src_gs);
+ }
}
let mut unit_ops = Vec::new();
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index 782cd3acd9..dae7d30411 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1817,10 +1817,22 @@ fn image_arrange_preserves_position_under_active_ctm() {
// Move first image to front: must not apply destination CTM twice!
images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
let doc = reopen(&doc);
+
+ // 1. Position: check order of operators in the content stream
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ let first_do = str_content.find("/Im0 Do").unwrap();
+ let last_do = str_content.rfind("/Im0 Do").unwrap();
+ assert!(first_do < last_do, "Position: multiple image Do calls exist and order was updated");
+
+ // 2. Appearance: both images' positions and sizes are preserved
let after = images::page_images(&doc, 0).unwrap();
assert_eq!(after.len(), 2);
- assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "first image position preserved");
- assert_eq!(after[1].rect, [50.0, 50.0, 150.0, 150.0], "second image position preserved");
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "Appearance: first image position preserved");
+ assert_eq!(after[1].rect, [50.0, 50.0, 150.0, 150.0], "Appearance: second image position preserved");
+
+ // 3. Preservation: outer CTM is preserved
+ assert!(str_content.contains("100 0 0 100 50 50 cm"), "Preservation: initial CTM preserved");
}
#[test]
@@ -1837,13 +1849,23 @@ fn image_arrange_preserves_shared_group_clipping_bounds() {
// Bring image 0 to front: moves it past the external text while preserving clipping bounds
images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
let doc = reopen(&doc);
- let after = images::page_images(&doc, 0).unwrap();
- assert_eq!(after.len(), 2, "both images preserved");
- assert_eq!(after[0].visible_rect, Some([120.0, 120.0, 160.0, 160.0]), "image 0 retains clip");
- assert_eq!(after[1].visible_rect, Some([120.0, 120.0, 160.0, 160.0]), "image 1 retains clip");
+
+ // 1. Position: moved image Do now follows External Text in AST
let bytes = page_content_bytes(&doc, 0);
let str_content = String::from_utf8_lossy(&bytes);
- assert!(str_content.contains("External Text"), "external text preserved");
+ let text_pos = str_content.find("External Text").unwrap();
+ let moved_do_pos = str_content.rfind("/Im0 Do").unwrap();
+ assert!(text_pos < moved_do_pos, "Position: moved image Do follows External Text");
+
+ // 2. Appearance: both images retain exact clipping bounds and geometry
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 2, "both images preserved");
+ assert_eq!(after[0].visible_rect, Some([120.0, 120.0, 160.0, 160.0]), "Appearance: image 0 retains clip");
+ assert_eq!(after[1].visible_rect, Some([120.0, 120.0, 160.0, 160.0]), "Appearance: image 1 retains clip");
+
+ // 3. Preservation: External Text and original group drawing preserved
+ assert!(str_content.contains("External Text"), "Preservation: external text preserved");
+ assert!(str_content.contains("120 120 40 40 re W n"), "Preservation: clipping path operators preserved");
}
#[test]
@@ -1856,16 +1878,24 @@ fn image_arrange_preserves_extended_graphics_state_opacity() {
images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
let doc = reopen(&doc);
- let after = images::page_images(&doc, 0).unwrap();
- assert_eq!(after.len(), 1, "image preserved");
- assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0]);
+ // 1. Position: /Im0 Do moved past External Text
let bytes = page_content_bytes(&doc, 0);
let str_content = String::from_utf8_lossy(&bytes);
- assert!(str_content.contains("/GS0 gs"), "extended graphics state /GS0 gs is retained");
- let gs_pos = str_content.rfind("/GS0 gs").unwrap();
+ let text_pos = str_content.find("External Text").unwrap();
let do_pos = str_content.rfind("/Im0 Do").unwrap();
- assert!(gs_pos < do_pos, "/GS0 gs must precede /Im0 Do in the new unit");
+ assert!(text_pos < do_pos, "Position: /Im0 Do moved past External Text");
+
+ // 2. Appearance: /GS0 gs is retained and directly precedes /Im0 Do
+ let gs_pos = str_content.rfind("/GS0 gs").unwrap();
+ assert!(text_pos < gs_pos, "Appearance: /GS0 gs is in the new moved unit");
+ assert!(gs_pos < do_pos, "Appearance: /GS0 gs directly precedes /Im0 Do");
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1, "image preserved");
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "Appearance: rect preserved");
+
+ // 3. Preservation: External Text is preserved
+ assert!(str_content.contains("BT /F1 12 Tf 72 700 Td (External Text) Tj ET"), "Preservation: text preserved");
}
#[test]
@@ -1877,13 +1907,117 @@ fn image_arrange_preserves_exact_non_rectangular_clipping_path() {
images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
let doc = reopen(&doc);
+
+ // 1. Position: moved image follows External Text in AST
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ let text_pos = str_content.find("External Text").unwrap();
+ let last_do = str_content.rfind("/Im0 Do").unwrap();
+ assert!(text_pos < last_do, "Position: moved image follows External Text");
+
+ // 2. Appearance: polygon geometry and even-odd rule are preserved
+ assert!(str_content.contains("W*"), "Appearance: even-odd W* fill rule preserved");
+ assert!(str_content.contains("120 120 m 160 120 l 140 160 l h W* n"), "Appearance: exact polygon clip preserved");
let after = images::page_images(&doc, 0).unwrap();
assert_eq!(after.len(), 2, "both images preserved");
+ // 3. Preservation: External Text and remaining original group content preserved
+ assert!(str_content.contains("External Text"), "Preservation: external text preserved");
+}
+
+#[test]
+fn unwrapped_image_moves_successfully() {
+ let content = "100 0 0 100 50 50 cm /Im0 Do BT /F1 12 Tf 72 700 Td (Middle Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 1);
+ assert_eq!(initial[0].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ // Initial order: /Im0 Do precedes Middle Text
+ let initial_bytes = page_content_bytes(&doc, 0);
+ let initial_str = String::from_utf8_lossy(&initial_bytes);
+ let init_do = initial_str.find("/Im0 Do").unwrap();
+ let init_text = initial_str.find("Middle Text").unwrap();
+ assert!(init_do < init_text, "/Im0 Do initially precedes Middle Text");
+
+ // Move unwrapped image to front (past Middle Text)
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+
+ // 1. Position: /Im0 Do now follows Middle Text in the content stream AST
let bytes = page_content_bytes(&doc, 0);
let str_content = String::from_utf8_lossy(&bytes);
- assert!(str_content.contains("W*"), "even-odd W* fill rule must be preserved");
- assert!(str_content.contains("120 120 m 160 120 l 140 160 l h W* n"), "exact non-rectangular clip path preserved");
+ let after_text = str_content.find("Middle Text").unwrap();
+ let after_do = str_content.rfind("/Im0 Do").unwrap();
+ assert!(after_text < after_do, "Position: /Im0 Do actually moved after Middle Text");
+
+ // 2. Appearance: image rect and visibility are unchanged
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1);
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "Appearance: image coordinates preserved");
+ assert_eq!(after[0].visible_rect, Some([50.0, 50.0, 150.0, 150.0]));
+
+ // 3. Preservation: Middle Text and CTM remain intact
+ assert!(str_content.contains("BT /F1 12 Tf 72 700 Td (Middle Text) Tj ET"), "Preservation: text operation preserved");
+ assert!(str_content.contains("100 0 0 100 50 50 cm"), "Preservation: original cm preserved");
+}
+
+#[test]
+fn inherited_source_opacity_is_preserved() {
+ // Outer q sets /GS0 gs; inner q draws /Im0 Do; outer Q restores state before External Text
+ let content = "q /GS0 gs q 100 0 0 100 50 50 cm /Im0 Do Q Q BT /F1 12 Tf 72 700 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 1);
+ assert_eq!(initial[0].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ // Initial order: /Im0 Do precedes External Text
+ let initial_bytes = page_content_bytes(&doc, 0);
+ let initial_str = String::from_utf8_lossy(&initial_bytes);
+ let init_do = initial_str.find("/Im0 Do").unwrap();
+ let init_text = initial_str.find("External Text").unwrap();
+ assert!(init_do < init_text, "/Im0 Do initially precedes External Text");
+
+ // Move image to front (past External Text, outside its original outer q...Q scope)
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+
+ // 1. Position: /Im0 Do now follows External Text in the AST
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ let after_text = str_content.find("External Text").unwrap();
+ let after_do = str_content.rfind("/Im0 Do").unwrap();
+ assert!(after_text < after_do, "Position: /Im0 Do moved past External Text");
+
+ // 2. Appearance: effective appearance state (/GS0 gs) is injected and precedes /Im0 Do in the new unit
+ let after_gs = str_content.rfind("/GS0 gs").unwrap();
+ assert!(after_text < after_gs, "Appearance: /GS0 gs injected into the new unit at destination");
+ assert!(after_gs < after_do, "Appearance: /GS0 gs directly precedes /Im0 Do in the moved unit");
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1);
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "Appearance: rect preserved");
+
+ // 3. Preservation: External Text and original outer scope structure are preserved
+ assert!(str_content.contains("BT /F1 12 Tf 72 700 Td (External Text) Tj ET"), "Preservation: external text preserved");
+}
+
+#[test]
+fn destination_opacity_pollution_is_prevented() {
+ // /Im0 Do is fully opaque at the start; destination has active top-level /GS_translucent gs
+ let content = "100 0 0 100 50 50 cm /Im0 Do /GS_translucent gs BT /F1 12 Tf 72 700 Td (Translucent Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial_bytes = page_content_bytes(&doc, 0);
+
+ // Attempting to move opaque image 0 to front into active transparency scope must safely bail out with Err
+ let res = images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront);
+ assert!(res.is_err(), "must return an explicit Err rather than silently corrupting opacity");
+ let err_msg = res.unwrap_err().to_string();
+ assert!(err_msg.contains("unsupported graphics state"), "error describes unsupported graphics state: {err_msg}");
+
+ // Preservation: the document contents are completely unmodified
+ let doc = reopen(&doc);
+ let after_bytes = page_content_bytes(&doc, 0);
+ assert_eq!(initial_bytes, after_bytes, "Preservation: content stream remained completely unmodified");
}
From 8be74fdd16f06b16ddb8d9e9a25e495279037f21 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Wed, 14 Oct 2026 23:18:24 +0530
Subject: [PATCH 018/462] Fixes As Requested [GS state, Pollution Guard]t
---
crates/edit/src/images.rs | 132 ++++++++++++++++++++++++++++++++------
crates/edit/src/tests.rs | 56 +++++++++++++++-
2 files changed, 167 insertions(+), 21 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 311f17a4a2..56d6ea56d7 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -543,28 +543,99 @@ struct ExtractedScopeState {
state_ops: Vec,
}
+#[derive(Clone, Debug, Default, PartialEq)]
+struct EffectiveGState {
+ ca: Option,
+ ca_stroke: Option,
+ bm: Option>,
+ smask: Option>,
+}
+
+impl EffectiveGState {
+ fn effective_ca(&self) -> f64 {
+ self.ca.unwrap_or(1.0)
+ }
+
+ fn effective_ca_stroke(&self) -> f64 {
+ self.ca_stroke.unwrap_or(1.0)
+ }
+
+ fn effective_bm(&self) -> &[u8] {
+ self.bm.as_deref().unwrap_or(b"Normal")
+ }
+
+ fn effective_smask(&self) -> Option<&[u8]> {
+ match self.smask.as_deref() {
+ Some(b"None") | None => None,
+ Some(other) => Some(other),
+ }
+ }
+
+ fn visually_differs(&self, other: &EffectiveGState) -> bool {
+ (self.effective_ca() - other.effective_ca()).abs() > 1e-4
+ || (self.effective_ca_stroke() - other.effective_ca_stroke()).abs() > 1e-4
+ || self.effective_bm() != other.effective_bm()
+ || self.effective_smask() != other.effective_smask()
+ }
+
+ fn merge_dict(&mut self, dict: &Dict, doc: &Document) {
+ if let Some(val) = dict.get(b"ca").map(|v| doc.resolve(v)).and_then(|v| v.as_f64()) {
+ self.ca = Some(val);
+ }
+ if let Some(val) = dict.get(b"CA").map(|v| doc.resolve(v)).and_then(|v| v.as_f64()) {
+ self.ca_stroke = Some(val);
+ }
+ if let Some(bm_obj) = dict.get(b"BM").map(|v| doc.resolve(v)) {
+ if let Some(name) = bm_obj.as_name() {
+ self.bm = Some(name.to_vec());
+ } else if let Some(arr) = bm_obj.as_array()
+ && let Some(first_name) = arr.first().map(|v| doc.resolve(v)).and_then(|v| v.as_name().map(|n| n.to_vec()))
+ {
+ self.bm = Some(first_name);
+ }
+ }
+ if let Some(smask_obj) = dict.get(b"SMask").map(|v| doc.resolve(v)) {
+ if let Some(name) = smask_obj.as_name() {
+ self.smask = Some(name.to_vec());
+ } else if smask_obj.as_dict().is_some() {
+ self.smask = Some(b"CustomSMask".to_vec());
+ }
+ }
+ }
+}
+
#[derive(Clone, Default)]
struct ExtendedGStateTracker {
- stack: Vec>,
- current_gs: Option,
+ stack: Vec<(EffectiveGState, Vec)>,
+ current_state: EffectiveGState,
+ active_gs_ops: Vec,
}
impl ExtendedGStateTracker {
- fn step(&mut self, op: &Op) -> Result<(), EditError> {
+ fn step(&mut self, op: &Op, ext_gstates: &Dict, doc: &Document) -> Result<(), EditError> {
match op.op.as_slice() {
b"q" => {
if self.stack.len() >= 256 {
return Err(EditError::Invalid("the image graphics state is too deeply nested".into()));
}
- self.stack.push(self.current_gs.clone());
+ self.stack.push((self.current_state.clone(), self.active_gs_ops.clone()));
}
b"Q" => {
- if let Some(prev) = self.stack.pop() {
- self.current_gs = prev;
+ if let Some((prev_state, prev_ops)) = self.stack.pop() {
+ self.current_state = prev_state;
+ self.active_gs_ops = prev_ops;
}
}
b"gs" => {
- self.current_gs = Some(op.clone());
+ if let Some(name) = op.name(0) {
+ if let Some(dict) = ext_gstates.get(name).map(|v| doc.resolve(v)).and_then(|v| v.as_dict().cloned()) {
+ self.current_state.merge_dict(&dict, doc);
+ } else if self.current_state.ca.is_none() {
+ self.current_state.ca = Some(0.5);
+ }
+ self.active_gs_ops.retain(|o| o.name(0) != Some(name));
+ self.active_gs_ops.push(op.clone());
+ }
}
_ => {}
}
@@ -759,29 +830,34 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
(op.span.start, dest_unit.start)
};
+ let res = p.dict.get(b"Resources").map(|r| doc.resolve(r)).and_then(|r| r.as_dict().cloned()).unwrap_or_default();
+ let ext_gstates = res.get(b"ExtGState").map(|g| doc.resolve(g)).and_then(|g| g.as_dict().cloned()).unwrap_or_default();
+
let mut state = ImageState::new(Matrix::IDENTITY, p.crop(doc), Vec::new());
let mut tracker = ExtendedGStateTracker::default();
- let mut source_effective_gs = None;
- let mut dest_effective_gs = None;
+ let mut source_effective_state = EffectiveGState::default();
+ let mut source_gs_ops = Vec::new();
+ let mut dest_effective_state = EffectiveGState::default();
let mut dest_ctm = Matrix::IDENTITY;
let max_scan = scan_target.max(target.saturating_add(1));
for (i, op) in ops.iter().enumerate() {
if i == target {
- source_effective_gs = tracker.current_gs.clone();
+ source_effective_state = tracker.current_state.clone();
+ source_gs_ops = tracker.active_gs_ops.clone();
}
if i == scan_target {
- dest_effective_gs = tracker.current_gs.clone();
+ dest_effective_state = tracker.current_state.clone();
dest_ctm = state.placement.matrix;
}
if i >= max_scan {
break;
}
state.apply(op)?;
- tracker.step(op)?;
+ tracker.step(op, &ext_gstates, doc)?;
}
- if scan_target >= ops.len() && dest_effective_gs.is_none() {
- dest_effective_gs = tracker.current_gs.clone();
+ if scan_target >= ops.len() {
+ dest_effective_state = tracker.current_state.clone();
dest_ctm = state.placement.matrix;
}
let Some(dest_inv) = dest_ctm.invert() else { return Ok(()); };
@@ -813,17 +889,33 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
return Err(EditError::Invalid("unsupported graphics state: inherited clipping path cannot be cleanly preserved".into()));
}
- if source_effective_gs.is_none() && dest_effective_gs.is_some() {
- return Err(EditError::Invalid("unsupported graphics state: moving an opaque image into an active transparency scope is not supported".into()));
+ for src_gs in &source_gs_ops {
+ let name = src_gs.name(0);
+ let already_present = extracted.state_ops.iter().any(|o| o.name(0) == name);
+ if !already_present {
+ extracted.state_ops.push(src_gs.clone());
+ }
}
- if let Some(src_gs) = source_effective_gs {
- let already_has_gs = extracted.state_ops.iter().any(|o| o.is("gs"));
- if !already_has_gs {
- extracted.state_ops.push(src_gs);
+ let mut reconstructed_state = dest_effective_state.clone();
+ for op in &extracted.state_ops {
+ if op.is("gs")
+ && let Some(name) = op.name(0)
+ {
+ if let Some(dict) = ext_gstates.get(name).map(|v| doc.resolve(v)).and_then(|v| v.as_dict().cloned()) {
+ reconstructed_state.merge_dict(&dict, doc);
+ } else if reconstructed_state.ca.is_none() {
+ reconstructed_state.ca = Some(0.5);
+ }
}
}
+ if reconstructed_state.visually_differs(&source_effective_state) {
+ return Err(EditError::Invalid(
+ "unsupported graphics state: moving the image would alter effective opacity, blend mode, or soft mask".into(),
+ ));
+ }
+
let mut unit_ops = Vec::new();
unit_ops.push(Op::new("q", vec![]));
if !extracted.clip_ops.is_empty() {
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index dae7d30411..7cf9242cc2 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -1563,7 +1563,7 @@ fn image_page_with(content: &str) -> Document {
let objs: Vec = vec![
"<< /Type /Catalog /Pages 2 0 R >>".into(),
"<< /Type /Pages /Kids [3 0 R] /Count 1 >>".into(),
- "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 600 800] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> /XObject << /Im0 6 0 R >> >> >>".into(),
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 600 800] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> /XObject << /Im0 6 0 R >> /ExtGState << /GS0 << /Type /ExtGState /ca 0.5 /CA 0.5 >> /GSalpha << /Type /ExtGState /ca 0.6 >> /GSblend << /Type /ExtGState /BM /Multiply >> /GS_translucent << /Type /ExtGState /ca 0.5 >> >> >> >>".into(),
format!("<< /Length {} >>\nstream\n{content}\nendstream", content.len()),
"<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>".into(),
"<< /Type /XObject /Subtype /Image /Width 4 /Height 2 /ColorSpace /DeviceGray /BitsPerComponent 8 /Length 8 >>\nstream\n\u{0}\u{0}\u{0}\u{0}\u{0}\u{0}\u{0}\u{0}\nendstream".into(),
@@ -2020,6 +2020,60 @@ fn destination_opacity_pollution_is_prevented() {
assert_eq!(initial_bytes, after_bytes, "Preservation: content stream remained completely unmodified");
}
+#[test]
+fn sequential_gs_operators_merging_properties_are_preserved() {
+ // Sequential gs calls: /GSalpha sets ca=0.6, /GSblend sets BM=/Multiply (without touching ca).
+ let content = "q /GSalpha gs /GSblend gs q 100 0 0 100 50 50 cm /Im0 Do Q Q BT /F1 12 Tf 72 700 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 1);
+ assert_eq!(initial[0].rect, [50.0, 50.0, 150.0, 150.0]);
+
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+
+ // 1. Position: /Im0 Do now follows External Text in the AST
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ let after_text = str_content.find("External Text").unwrap();
+ let after_do = str_content.rfind("/Im0 Do").unwrap();
+ assert!(after_text < after_do, "Position: /Im0 Do moved past External Text");
+
+ // 2. Appearance: Both merged state operators (/GSalpha and /GSblend) are preserved and precede /Im0 Do
+ let after_alpha = str_content.rfind("/GSalpha gs").unwrap();
+ let after_blend = str_content.rfind("/GSblend gs").unwrap();
+ assert!(after_text < after_alpha, "Appearance: /GSalpha gs injected into moved unit");
+ assert!(after_text < after_blend, "Appearance: /GSblend gs injected into moved unit");
+ assert!(after_alpha < after_do, "Appearance: /GSalpha gs precedes /Im0 Do");
+ assert!(after_blend < after_do, "Appearance: /GSblend gs precedes /Im0 Do");
+
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1);
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0], "Appearance: rect preserved");
+
+ // 3. Preservation: External Text is intact
+ assert!(str_content.contains("BT /F1 12 Tf 72 700 Td (External Text) Tj ET"), "Preservation: external text preserved");
+}
+
+#[test]
+fn destination_differing_blend_mode_pollution_is_prevented() {
+ // /Im0 Do has default Normal blend mode; destination has active top-level /GSblend gs (BM = /Multiply)
+ let content = "100 0 0 100 50 50 cm /Im0 Do /GSblend gs BT /F1 12 Tf 72 700 Td (Blended Section) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial_bytes = page_content_bytes(&doc, 0);
+
+ // Attempting to move Normal-blend image to front into active Multiply-blend scope must safely bail out with Err
+ let res = images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront);
+ assert!(res.is_err(), "must return an explicit Err rather than silently altering blend mode");
+ let err_msg = res.unwrap_err().to_string();
+ assert!(err_msg.contains("unsupported graphics state"), "error describes unsupported graphics state: {err_msg}");
+
+ // Preservation: document contents are completely unmodified
+ let doc = reopen(&doc);
+ let after_bytes = page_content_bytes(&doc, 0);
+ assert_eq!(initial_bytes, after_bytes, "Preservation: content stream remained completely unmodified");
+}
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
From 60925a85b69999aecb34100728cc15ee8ee03539 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Thu, 15 Oct 2026 00:24:17 +0530
Subject: [PATCH 019/462] fix: address reviewer feedback regarding [GS operator
related]
---
Cargo.lock | 1 +
crates/edit/Cargo.toml | 1 +
crates/edit/src/images.rs | 83 ++++++++++++++++++++++++++--------
crates/edit/src/lib.rs | 2 +-
crates/edit/src/tests.rs | 95 +++++++++++++++++++++++++++++++++++++++
5 files changed, 163 insertions(+), 19 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index df58c57d21..52485e1e32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4027,6 +4027,7 @@ dependencies = [
"pdfcraft-cos",
"pdfcraft-fonts",
"pdfcraft-model",
+ "pdfcraft-render",
"thiserror 2.0.21",
"unicode-bidi",
]
diff --git a/crates/edit/Cargo.toml b/crates/edit/Cargo.toml
index 4eb2d6132b..f04f5ba17e 100644
--- a/crates/edit/Cargo.toml
+++ b/crates/edit/Cargo.toml
@@ -22,3 +22,4 @@ unicode-bidi = "0.3"
[dev-dependencies]
hayro-syntax = { workspace = true }
+pdfcraft-render = { workspace = true }
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 56d6ea56d7..fdc62b026f 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -10,6 +10,27 @@ use std::sync::Arc;
use crate::EditError;
+/// The identity of a soft mask (`/SMask`) in the PDF graphics state.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum MaskIdentity {
+ /// Indirect reference to a mask dictionary or stream.
+ Ref(u32, u16),
+ /// Indirect reference to the transparency group (`/G`) in a mask dictionary.
+ Group(u32, u16),
+ /// Explicit named mask or resource name.
+ Named(Vec),
+}
+
+impl std::fmt::Display for MaskIdentity {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ MaskIdentity::Ref(num, generation) => write!(f, "{num} {generation} R"),
+ MaskIdentity::Group(num, generation) => write!(f, "group {num} {generation} R"),
+ MaskIdentity::Named(name) => write!(f, "{}", String::from_utf8_lossy(name)),
+ }
+ }
+}
+
/// An image drawn on a page.
#[derive(Clone, Debug, PartialEq)]
pub struct PageImage {
@@ -30,6 +51,8 @@ pub struct PageImage {
/// Pixel size; zero for vector/grouped Form artwork.
pub width: u32,
pub height: u32,
+ /// Active soft mask identity at the image placement, if any.
+ pub smask: Option,
stream: usize,
op: usize,
/// CTM before `Do`, excluding a Form's own Matrix.
@@ -213,12 +236,16 @@ impl ImageState {
pub fn page_images(doc: &Document, page: usize) -> Result, EditError> {
let p = page_of(doc, page)?;
let xo = xobjects(doc, &p.dict);
+ let res = p.dict.get(b"Resources").map(|r| doc.resolve(r)).and_then(|r| r.as_dict().cloned()).unwrap_or_default();
+ let ext_gstates = res.get(b"ExtGState").map(|g| doc.resolve(g)).and_then(|g| g.as_dict().cloned()).unwrap_or_default();
let mut out = Vec::new();
// The graphics state carries over from one stream to the next.
let mut state = ImageState::new(Matrix::IDENTITY, p.crop(doc), Vec::new());
+ let mut tracker = ExtendedGStateTracker::default();
for (si, (_, data)) in streams(doc, &p.dict).into_iter().enumerate() {
for (i, op) in parse(&data).ops.iter().enumerate() {
state.apply(op)?;
+ tracker.step(op, &ext_gstates, doc)?;
let ctm = state.placement.matrix;
if op.is("Do") {
let Some(name) = op.name(0) else { continue };
@@ -274,6 +301,7 @@ pub fn page_images(doc: &Document, page: usize) -> Result, EditEr
is_form,
width: if is_form { 0 } else { s.dict.int(b"Width").unwrap_or(0).clamp(0, u32::MAX as i64) as u32 },
height: if is_form { 0 } else { s.dict.int(b"Height").unwrap_or(0).clamp(0, u32::MAX as i64) as u32 },
+ smask: tracker.current_state.smask.clone(),
stream: si,
op: i,
draw_matrix: ctm.0,
@@ -347,6 +375,7 @@ pub fn reading_images(doc: &Document, page: usize) -> Result, Edi
is_form: false,
width: s.dict.int(b"Width").unwrap_or(0).max(0) as u32,
height: s.dict.int(b"Height").unwrap_or(0).max(0) as u32,
+ smask: None,
stream,
op: i,
draw_matrix: ctm.0,
@@ -548,7 +577,7 @@ struct EffectiveGState {
ca: Option,
ca_stroke: Option,
bm: Option>,
- smask: Option>,
+ smask: Option,
}
impl EffectiveGState {
@@ -564,11 +593,8 @@ impl EffectiveGState {
self.bm.as_deref().unwrap_or(b"Normal")
}
- fn effective_smask(&self) -> Option<&[u8]> {
- match self.smask.as_deref() {
- Some(b"None") | None => None,
- Some(other) => Some(other),
- }
+ fn effective_smask(&self) -> Option<&MaskIdentity> {
+ self.smask.as_ref()
}
fn visually_differs(&self, other: &EffectiveGState) -> bool {
@@ -578,7 +604,7 @@ impl EffectiveGState {
|| self.effective_smask() != other.effective_smask()
}
- fn merge_dict(&mut self, dict: &Dict, doc: &Document) {
+ fn merge_dict(&mut self, dict: &Dict, doc: &Document, gs_name: Option<&[u8]>) {
if let Some(val) = dict.get(b"ca").map(|v| doc.resolve(v)).and_then(|v| v.as_f64()) {
self.ca = Some(val);
}
@@ -594,11 +620,28 @@ impl EffectiveGState {
self.bm = Some(first_name);
}
}
- if let Some(smask_obj) = dict.get(b"SMask").map(|v| doc.resolve(v)) {
- if let Some(name) = smask_obj.as_name() {
- self.smask = Some(name.to_vec());
- } else if smask_obj.as_dict().is_some() {
- self.smask = Some(b"CustomSMask".to_vec());
+ if let Some(raw_smask) = dict.get(b"SMask") {
+ let resolved = doc.resolve(raw_smask);
+ if let Some(name) = resolved.as_name() {
+ if name == b"None" {
+ self.smask = None;
+ } else {
+ self.smask = Some(MaskIdentity::Named(name.to_vec()));
+ }
+ } else if let Some(mask_dict) = resolved.as_dict() {
+ if let Some(gr) = mask_dict.get(b"G").and_then(|g| g.as_ref()) {
+ self.smask = Some(MaskIdentity::Group(gr.num, gr.generation));
+ } else if let Some(r) = raw_smask.as_ref() {
+ self.smask = Some(MaskIdentity::Ref(r.num, r.generation));
+ } else if let Some(name) = mask_dict.get(b"Name").map(|n| doc.resolve(n)).and_then(|n| n.as_name().map(|s| s.to_vec())) {
+ self.smask = Some(MaskIdentity::Named(name));
+ } else if let Some(name) = gs_name {
+ self.smask = Some(MaskIdentity::Named(name.to_vec()));
+ } else {
+ self.smask = Some(MaskIdentity::Named(b"CustomMask".to_vec()));
+ }
+ } else if let Some(r) = raw_smask.as_ref() {
+ self.smask = Some(MaskIdentity::Ref(r.num, r.generation));
}
}
}
@@ -615,7 +658,7 @@ impl ExtendedGStateTracker {
fn step(&mut self, op: &Op, ext_gstates: &Dict, doc: &Document) -> Result<(), EditError> {
match op.op.as_slice() {
b"q" => {
- if self.stack.len() >= 256 {
+ if self.stack.len() >= 4096 {
return Err(EditError::Invalid("the image graphics state is too deeply nested".into()));
}
self.stack.push((self.current_state.clone(), self.active_gs_ops.clone()));
@@ -629,7 +672,7 @@ impl ExtendedGStateTracker {
b"gs" => {
if let Some(name) = op.name(0) {
if let Some(dict) = ext_gstates.get(name).map(|v| doc.resolve(v)).and_then(|v| v.as_dict().cloned()) {
- self.current_state.merge_dict(&dict, doc);
+ self.current_state.merge_dict(&dict, doc, Some(name));
} else if self.current_state.ca.is_none() {
self.current_state.ca = Some(0.5);
}
@@ -672,7 +715,7 @@ fn extract_scope_state(ops: &[Op], start: usize, target: usize) -> Result {
- if depth >= 256 {
+ if depth >= 4096 {
return Err(EditError::Invalid("the image graphics state is too deeply nested".into()));
}
depth = depth.saturating_add(1);
@@ -889,13 +932,17 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
return Err(EditError::Invalid("unsupported graphics state: inherited clipping path cannot be cleanly preserved".into()));
}
+ let mut outer_gs_ops = Vec::new();
for src_gs in &source_gs_ops {
let name = src_gs.name(0);
let already_present = extracted.state_ops.iter().any(|o| o.name(0) == name);
if !already_present {
- extracted.state_ops.push(src_gs.clone());
+ outer_gs_ops.push(src_gs.clone());
}
}
+ let mut combined_state_ops = outer_gs_ops;
+ combined_state_ops.extend(extracted.state_ops);
+ extracted.state_ops = combined_state_ops;
let mut reconstructed_state = dest_effective_state.clone();
for op in &extracted.state_ops {
@@ -903,7 +950,7 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
&& let Some(name) = op.name(0)
{
if let Some(dict) = ext_gstates.get(name).map(|v| doc.resolve(v)).and_then(|v| v.as_dict().cloned()) {
- reconstructed_state.merge_dict(&dict, doc);
+ reconstructed_state.merge_dict(&dict, doc, Some(name));
} else if reconstructed_state.ca.is_none() {
reconstructed_state.ca = Some(0.5);
}
@@ -918,6 +965,7 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
let mut unit_ops = Vec::new();
unit_ops.push(Op::new("q", vec![]));
+ unit_ops.extend(extracted.state_ops);
if !extracted.clip_ops.is_empty() {
if dest_ctm != Matrix::IDENTITY {
unit_ops.push(Op::new("cm", dest_inv.0.map(pdfcraft_content::num).to_vec()));
@@ -932,7 +980,6 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
unit_ops.push(Op::new("cm", local.0.map(pdfcraft_content::num).to_vec()));
}
}
- unit_ops.extend(extracted.state_ops);
unit_ops.push(ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])));
unit_ops.push(Op::new("Q", vec![]));
diff --git a/crates/edit/src/lib.rs b/crates/edit/src/lib.rs
index 59dc804a66..d6809240c5 100644
--- a/crates/edit/src/lib.rs
+++ b/crates/edit/src/lib.rs
@@ -623,7 +623,7 @@ pub use objects::{EditableObject, MAX_MOVE_OBJECTS, ObjectKind, ObjectTarget, ed
mod flatten;
pub use flatten::{flatten, flatten_fill_sign};
pub mod images;
-pub use images::{ArrangeOrder, ImageChange, PageImage, arrange_image, change_image, crop_image, page_images, reading_images, rect_to_rect, remove_image_crop, turn_about_centre};
+pub use images::{ArrangeOrder, ImageChange, MaskIdentity, PageImage, arrange_image, change_image, crop_image, page_images, reading_images, rect_to_rect, remove_image_crop, turn_about_centre};
pub mod bidi;
pub mod indic;
pub mod text;
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index 7cf9242cc2..0a2a50ede6 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -2074,6 +2074,101 @@ fn destination_differing_blend_mode_pollution_is_prevented() {
assert_eq!(initial_bytes, after_bytes, "Preservation: content stream remained completely unmodified");
}
+fn nested_soft_mask_page(content: &str) -> Document {
+ let objs: Vec = vec![
+ "<< /Type /Catalog /Pages 2 0 R >>".into(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".into(),
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 100 100] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> /XObject << /Im0 6 0 R /GroupA 9 0 R /GroupB 10 0 R >> /ExtGState << /GSA 7 0 R /GSB 8 0 R >> >> >>".into(),
+ format!("<< /Length {} >>\nstream\n{content}\nendstream", content.len()),
+ "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>".into(),
+ "<< /Type /XObject /Subtype /Image /Width 2 /Height 2 /ColorSpace /DeviceGray /BitsPerComponent 8 /Length 4 >>\nstream\n\u{0}\u{0}\u{0}\u{0}\nendstream".into(),
+ "<< /Type /ExtGState /SMask << /Type /Mask /S /Alpha /G 9 0 R >> >>".into(),
+ "<< /Type /ExtGState /SMask << /Type /Mask /S /Alpha /G 10 0 R >> >>".into(),
+ "<< /Type /XObject /Subtype /Form /BBox [0 0 100 100] /Group << /S /Transparency /I true >> /Length 20 >>\nstream\n0 g 0 0 100 50 re f\nendstream".into(),
+ "<< /Type /XObject /Subtype /Form /BBox [0 0 100 100] /Group << /S /Transparency /I true >> /Length 20 >>\nstream\n0 g 0 0 50 100 re f\nendstream".into(),
+ ];
+ let mut out = b"%PDF-1.7\n".to_vec();
+ let mut offs = Vec::new();
+ for (i, o) in objs.iter().enumerate() {
+ offs.push(out.len());
+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+ }
+ let x = out.len();
+ out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f \n", objs.len() + 1).as_bytes());
+ for o in offs {
+ out.extend_from_slice(format!("{o:010} 00000 n \n").as_bytes());
+ }
+ out.extend_from_slice(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1).as_bytes());
+ Document::open(Arc::new(out)).unwrap()
+}
+
+#[test]
+fn nested_soft_masks_replay_in_correct_order_and_effective_mask_is_rendered() {
+ let content = "q /GSA gs q /GSB gs 100 0 0 100 0 0 cm /Im0 Do Q Q BT /F1 12 Tf 10 90 Td (External Text) Tj ET";
+ let mut doc = nested_soft_mask_page(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 1);
+ assert_eq!(initial[0].smask, Some(images::MaskIdentity::Group(10, 0)));
+
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+
+ let content_bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&content_bytes);
+
+ // 1. Assert emitted stream order: outer /GSA gs must precede inner /GSB gs, which precedes /Im0 Do
+ let after_text = str_content.find("External Text").unwrap();
+ let after_a = str_content.rfind("/GSA gs").unwrap();
+ let after_b = str_content.rfind("/GSB gs").unwrap();
+ let after_do = str_content.rfind("/Im0 Do").unwrap();
+ assert!(after_text < after_a, "Position: /GSA gs relocated past external text");
+ assert!(after_a < after_b, "Order: outer /GSA gs must be replayed before inner /GSB gs");
+ assert!(after_b < after_do, "Order: inner /GSB gs must immediately precede /Im0 Do");
+
+ // 2. Assert effective mask upon saving and reopening is correctly identified as B
+ let reopened_doc = reopen(&doc);
+ let reopened_images = images::page_images(&reopened_doc, 0).unwrap();
+ assert_eq!(reopened_images.len(), 1);
+ assert_eq!(reopened_images[0].smask, Some(images::MaskIdentity::Group(10, 0)));
+
+ // 3. Rendered-pixel assertion: render output and verify Mask B (left 50x100) is effective, not Mask A (bottom 100x50)
+ let pdf_bytes = write_incremental(&doc, &SaveOptions::default()).unwrap();
+ let mut renderer = pdfcraft_render::PageRenderer::new(Arc::new(pdf_bytes), pdfcraft_render::RenderConfig::default());
+ let page = renderer.render(pdfcraft_render::RenderRequest {
+ page: 0,
+ kind: pdfcraft_render::RequestKind::Pixels,
+ scale: 1.0,
+ ..Default::default()
+ });
+ let px = |x: u32, y: u32| {
+ let idx = ((y * page.width + x) * 4) as usize;
+ page.rgba[idx..idx + 4].to_vec()
+ };
+ // Left half (inside Mask B): image is rendered black
+ assert_eq!(px(25, 25), vec![0, 0, 0, 255], "point (25, 25) is inside Mask B: image rendered");
+ assert_eq!(px(25, 75), vec![0, 0, 0, 255], "point (25, 75) is inside Mask B: image rendered");
+ // Right half (outside Mask B): masked out to white page background
+ assert_eq!(px(75, 25), vec![255, 255, 255, 255], "point (75, 25) is outside Mask B: masked out to white");
+ assert_eq!(px(75, 75), vec![255, 255, 255, 255], "point (75, 75) is outside Mask B: masked out to white");
+}
+
+#[test]
+fn destination_differing_mask_pollution_is_prevented() {
+ // /Im0 Do has no mask; destination has active top-level /GSA gs (Mask A)
+ let content = "100 0 0 100 0 0 cm /Im0 Do /GSA gs BT /F1 12 Tf 10 90 Td (Masked Section) Tj ET";
+ let mut doc = nested_soft_mask_page(content);
+ let initial_bytes = page_content_bytes(&doc, 0);
+
+ let res = images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront);
+ assert!(res.is_err(), "must return an explicit Err rather than corrupting mask state");
+ let err_msg = res.unwrap_err().to_string();
+ assert!(err_msg.contains("unsupported graphics state"), "error describes unsupported graphics state: {err_msg}");
+
+ // Preservation: document contents are completely unmodified
+ let doc = reopen(&doc);
+ let after_bytes = page_content_bytes(&doc, 0);
+ assert_eq!(initial_bytes, after_bytes, "Preservation: content stream remained completely unmodified");
+}
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
From 9a02fc64018214fe73357461aa342366dfe932e6 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Thu, 15 Oct 2026 01:04:43 +0530
Subject: [PATCH 020/462] fix: address reviewer feedback regarding [GS operator
related]
---
crates/edit/src/images.rs | 81 ++++++++++++++++++-----------
crates/edit/src/tests.rs | 107 ++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+), 30 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index fdc62b026f..5fcc4ae422 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -245,7 +245,7 @@ pub fn page_images(doc: &Document, page: usize) -> Result, EditEr
for (si, (_, data)) in streams(doc, &p.dict).into_iter().enumerate() {
for (i, op) in parse(&data).ops.iter().enumerate() {
state.apply(op)?;
- tracker.step(op, &ext_gstates, doc)?;
+ tracker.step(op, &ext_gstates, doc, state.placement.matrix)?;
let ctm = state.placement.matrix;
if op.is("Do") {
let Some(name) = op.name(0) else { continue };
@@ -649,13 +649,13 @@ impl EffectiveGState {
#[derive(Clone, Default)]
struct ExtendedGStateTracker {
- stack: Vec<(EffectiveGState, Vec)>,
+ stack: Vec<(EffectiveGState, Vec<(Op, Matrix)>)>,
current_state: EffectiveGState,
- active_gs_ops: Vec,
+ active_gs_ops: Vec<(Op, Matrix)>,
}
impl ExtendedGStateTracker {
- fn step(&mut self, op: &Op, ext_gstates: &Dict, doc: &Document) -> Result<(), EditError> {
+ fn step(&mut self, op: &Op, ext_gstates: &Dict, doc: &Document, ctm: Matrix) -> Result<(), EditError> {
match op.op.as_slice() {
b"q" => {
if self.stack.len() >= 4096 {
@@ -676,8 +676,8 @@ impl ExtendedGStateTracker {
} else if self.current_state.ca.is_none() {
self.current_state.ca = Some(0.5);
}
- self.active_gs_ops.retain(|o| o.name(0) != Some(name));
- self.active_gs_ops.push(op.clone());
+ self.active_gs_ops.retain(|(o, _)| o.name(0) != Some(name));
+ self.active_gs_ops.push((op.clone(), ctm));
}
}
_ => {}
@@ -897,13 +897,15 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
break;
}
state.apply(op)?;
- tracker.step(op, &ext_gstates, doc)?;
+ tracker.step(op, &ext_gstates, doc, state.placement.matrix)?;
}
if scan_target >= ops.len() {
dest_effective_state = tracker.current_state.clone();
dest_ctm = state.placement.matrix;
}
- let Some(dest_inv) = dest_ctm.invert() else { return Ok(()); };
+ if dest_ctm.invert().is_none() {
+ return Err(EditError::Invalid("unsupported graphics state: non-invertible CTM".into()));
+ }
let (target_span, scope_start) = if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
&& sub_start >= target_unit.start
@@ -924,7 +926,7 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
let is_clipped = (img.visible_rect.is_some() && img.visible_rect != Some(img.rect)) || !img.clips.is_empty();
let extracted = extract_scope_state(&ops, scope_start, target)?;
- let Some(mut extracted) = extracted else {
+ let Some(extracted) = extracted else {
return Err(EditError::Invalid("unsupported graphics state: unable to cleanly extract image scope state".into()));
};
@@ -932,23 +934,11 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
return Err(EditError::Invalid("unsupported graphics state: inherited clipping path cannot be cleanly preserved".into()));
}
- let mut outer_gs_ops = Vec::new();
- for src_gs in &source_gs_ops {
- let name = src_gs.name(0);
- let already_present = extracted.state_ops.iter().any(|o| o.name(0) == name);
- if !already_present {
- outer_gs_ops.push(src_gs.clone());
- }
- }
- let mut combined_state_ops = outer_gs_ops;
- combined_state_ops.extend(extracted.state_ops);
- extracted.state_ops = combined_state_ops;
+ let non_gs_ops: Vec = extracted.state_ops.into_iter().filter(|o| !o.is("gs")).collect();
let mut reconstructed_state = dest_effective_state.clone();
- for op in &extracted.state_ops {
- if op.is("gs")
- && let Some(name) = op.name(0)
- {
+ for (op, _) in &source_gs_ops {
+ if let Some(name) = op.name(0) {
if let Some(dict) = ext_gstates.get(name).map(|v| doc.resolve(v)).and_then(|v| v.as_dict().cloned()) {
reconstructed_state.merge_dict(&dict, doc, Some(name));
} else if reconstructed_state.ca.is_none() {
@@ -965,19 +955,50 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
let mut unit_ops = Vec::new();
unit_ops.push(Op::new("q", vec![]));
- unit_ops.extend(extracted.state_ops);
+ let mut current_ctm = dest_ctm;
+
+ for (gs_op, target_ctm) in &source_gs_ops {
+ if *target_ctm != current_ctm {
+ let Some(current_inv) = current_ctm.invert() else {
+ return Err(EditError::Invalid("unsupported graphics state: non-invertible CTM".into()));
+ };
+ let delta = target_ctm.then(¤t_inv);
+ if !delta.0.iter().all(|v| v.is_finite()) {
+ return Err(EditError::Invalid("unsupported graphics state: invalid transform coordinates".into()));
+ }
+ if delta != Matrix::IDENTITY {
+ unit_ops.push(Op::new("cm", delta.0.map(pdfcraft_content::num).to_vec()));
+ current_ctm = *target_ctm;
+ }
+ }
+ unit_ops.push(gs_op.clone());
+ }
+
+ unit_ops.extend(non_gs_ops);
+
if !extracted.clip_ops.is_empty() {
- if dest_ctm != Matrix::IDENTITY {
- unit_ops.push(Op::new("cm", dest_inv.0.map(pdfcraft_content::num).to_vec()));
+ if current_ctm != Matrix::IDENTITY {
+ let Some(current_inv) = current_ctm.invert() else {
+ return Err(EditError::Invalid("unsupported graphics state: non-invertible CTM".into()));
+ };
+ unit_ops.push(Op::new("cm", current_inv.0.map(pdfcraft_content::num).to_vec()));
}
unit_ops.extend(extracted.clip_ops);
if Matrix(img.draw_matrix) != Matrix::IDENTITY {
unit_ops.push(Op::new("cm", img.draw_matrix.map(pdfcraft_content::num).to_vec()));
}
} else {
- let local = Matrix(img.draw_matrix).then(&dest_inv);
- if local != Matrix::IDENTITY {
- unit_ops.push(Op::new("cm", local.0.map(pdfcraft_content::num).to_vec()));
+ if Matrix(img.draw_matrix) != current_ctm {
+ let Some(current_inv) = current_ctm.invert() else {
+ return Err(EditError::Invalid("unsupported graphics state: non-invertible CTM".into()));
+ };
+ let delta = Matrix(img.draw_matrix).then(¤t_inv);
+ if !delta.0.iter().all(|v| v.is_finite()) {
+ return Err(EditError::Invalid("unsupported graphics state: invalid transform coordinates".into()));
+ }
+ if delta != Matrix::IDENTITY {
+ unit_ops.push(Op::new("cm", delta.0.map(pdfcraft_content::num).to_vec()));
+ }
}
}
unit_ops.push(ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])));
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index 0a2a50ede6..b46b35740d 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -2169,6 +2169,113 @@ fn destination_differing_mask_pollution_is_prevented() {
assert_eq!(initial_bytes, after_bytes, "Preservation: content stream remained completely unmodified");
}
+fn soft_mask_with_alpha_page(content: &str) -> Document {
+ let objs: Vec = vec![
+ "<< /Type /Catalog /Pages 2 0 R >>".into(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".into(),
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 200 200] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> /XObject << /Im0 6 0 R /GroupA 9 0 R >> /ExtGState << /GSA 7 0 R >> >> >>".into(),
+ format!("<< /Length {} >>\nstream\n{content}\nendstream", content.len()),
+ "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>".into(),
+ "<< /Type /XObject /Subtype /Image /Width 2 /Height 2 /ColorSpace /DeviceGray /BitsPerComponent 8 /Length 4 >>\nstream\n\u{0}\u{0}\u{0}\u{0}\nendstream".into(),
+ "<< /Type /ExtGState /ca 0.25 /SMask << /Type /Mask /S /Alpha /G 9 0 R >> >>".into(),
+ "<< /Type /ExtGState /SMask /None >>".into(),
+ "<< /Type /XObject /Subtype /Form /BBox [0 0 100 100] /Group << /S /Transparency /I true >> /Length 20 >>\nstream\n0 g 0 0 100 50 re f\nendstream".into(),
+ ];
+ let mut out = b"%PDF-1.7\n".to_vec();
+ let mut offs = Vec::new();
+ for (i, o) in objs.iter().enumerate() {
+ offs.push(out.len());
+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+ }
+ let x = out.len();
+ out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f \n", objs.len() + 1).as_bytes());
+ for o in offs {
+ out.extend_from_slice(format!("{o:010} 00000 n \n").as_bytes());
+ }
+ out.extend_from_slice(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1).as_bytes());
+ Document::open(Arc::new(out)).unwrap()
+}
+
+#[test]
+fn non_identity_cm_before_gs_preserves_mask_coordinates_and_rendering() {
+ let content = "q 2 0 0 2 10 10 cm /GSA gs 50 0 0 50 0 0 cm /Im0 Do Q BT /F1 12 Tf 10 180 Td (External Text) Tj ET";
+ let mut doc = soft_mask_with_alpha_page(content);
+
+ // Initial state: image bounds are [10, 10, 110, 110]
+ let initial_images = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial_images.len(), 1);
+ assert!(close(initial_images[0].rect, [10.0, 10.0, 110.0, 110.0]));
+
+ // Render baseline before reordering
+ let pdf_bytes_before = write_incremental(&doc, &SaveOptions::default()).unwrap();
+ let mut renderer_before = pdfcraft_render::PageRenderer::new(Arc::new(pdf_bytes_before), pdfcraft_render::RenderConfig::default());
+ let page_before = renderer_before.render(pdfcraft_render::RenderRequest {
+ page: 0,
+ kind: pdfcraft_render::RequestKind::Pixels,
+ scale: 1.0,
+ ..Default::default()
+ });
+ let px_before = |x: u32, y: u32| {
+ let idx = ((y * page_before.width + x) * 4) as usize;
+ page_before.rgba[idx..idx + 4].to_vec()
+ };
+
+ // Arrange image: BringToFront
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+
+ let content_bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&content_bytes);
+
+ // 1. Assert AST reordering succeeds and interleaves cm before gs
+ let text_pos = str_content.find("External Text").unwrap();
+ let cm_mask_pos = str_content.rfind("2 0 0 2 10 10 cm").unwrap();
+ let gs_pos = str_content.rfind("/GSA gs").unwrap();
+ let cm_img_pos = str_content.rfind("50 0 0 50 0 0 cm").unwrap();
+ let do_pos = str_content.rfind("/Im0 Do").unwrap();
+
+ assert!(text_pos < cm_mask_pos, "Image relocated after external text");
+ assert!(cm_mask_pos < gs_pos, "CTM for soft mask established before /GSA gs");
+ assert!(gs_pos < cm_img_pos, "/GSA gs executed before image cm");
+ assert!(cm_img_pos < do_pos, "image cm executed before /Im0 Do");
+
+ // 2. Assert image bounds remain unchanged after saving and reopening
+ let reopened_doc = reopen(&doc);
+ let reopened_images = images::page_images(&reopened_doc, 0).unwrap();
+ assert_eq!(reopened_images.len(), 1);
+ assert!(
+ close(reopened_images[0].rect, [10.0, 10.0, 110.0, 110.0]),
+ "Image bounds preserved: {:?}",
+ reopened_images[0].rect
+ );
+
+ // 3. Render reopened document and assert non-overlapping pixels remain unchanged
+ let pdf_bytes_after = write_incremental(&reopened_doc, &SaveOptions::default()).unwrap();
+ let mut renderer_after = pdfcraft_render::PageRenderer::new(Arc::new(pdf_bytes_after), pdfcraft_render::RenderConfig::default());
+ let page_after = renderer_after.render(pdfcraft_render::RenderRequest {
+ page: 0,
+ kind: pdfcraft_render::RequestKind::Pixels,
+ scale: 1.0,
+ ..Default::default()
+ });
+ let px_after = |x: u32, y: u32| {
+ let idx = ((y * page_after.width + x) * 4) as usize;
+ page_after.rgba[idx..idx + 4].to_vec()
+ };
+
+ // A point inside the masked image (e.g. at x=50, inside the image and bottom half of mask)
+ // Non-overlapping with text (text is at y=180).
+ // The pixel renders at [191, 191, 191, 255] (25% black over 100% white).
+ // In raster coordinates, raster y for PDF y=50 in a 200-high page is y=150.
+ let rendered_pixel_before = px_before(50, 150);
+ let rendered_pixel_after = px_after(50, 150);
+ assert_eq!(rendered_pixel_before, vec![191, 191, 191, 255], "baseline pixel rendered with 25% opacity mask");
+ assert_eq!(rendered_pixel_after, rendered_pixel_before, "rendered non-overlapping pixels remain unchanged");
+
+ // Outside the image: pure white background
+ assert_eq!(px_after(5, 5), vec![255, 255, 255, 255]);
+ assert_eq!(px_after(5, 5), px_before(5, 5));
+}
+
#[test]
fn form_artwork_edits_only_the_selected_placement() {
From daa6286466688fc5bbcb410ba20c7dc217d98a2f Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Thu, 15 Oct 2026 01:31:40 +0530
Subject: [PATCH 021/462] chore: run cargo fmt to satisfy formatting gate
---
crates/edit/src/images.rs | 22 ++++++----------------
crates/edit/src/lib.rs | 5 ++++-
crates/edit/src/tests.rs | 15 +++------------
3 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index 5fcc4ae422..725900e2bb 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -691,10 +691,7 @@ fn extract_scope_state(ops: &[Op], start: usize, target: usize) -> Result Result {
if depth >= 4096 {
@@ -1235,12 +1230,7 @@ pub fn crop_image(doc: &mut Document, page: usize, index: usize, crop_rect: [f64
{
unit_ops.push(Op::new("cm", inv.0.map(pdfcraft_content::num).to_vec()));
}
- unit_ops.push(Op::new("re", vec![
- pdfcraft_content::num(x0),
- pdfcraft_content::num(y0),
- pdfcraft_content::num(w),
- pdfcraft_content::num(h),
- ]));
+ unit_ops.push(Op::new("re", vec![pdfcraft_content::num(x0), pdfcraft_content::num(y0), pdfcraft_content::num(w), pdfcraft_content::num(h)]));
unit_ops.push(Op::new("W", vec![]));
unit_ops.push(Op::new("n", vec![]));
if scope_matrix != Matrix::IDENTITY {
diff --git a/crates/edit/src/lib.rs b/crates/edit/src/lib.rs
index d6809240c5..822a626666 100644
--- a/crates/edit/src/lib.rs
+++ b/crates/edit/src/lib.rs
@@ -623,7 +623,10 @@ pub use objects::{EditableObject, MAX_MOVE_OBJECTS, ObjectKind, ObjectTarget, ed
mod flatten;
pub use flatten::{flatten, flatten_fill_sign};
pub mod images;
-pub use images::{ArrangeOrder, ImageChange, MaskIdentity, PageImage, arrange_image, change_image, crop_image, page_images, reading_images, rect_to_rect, remove_image_crop, turn_about_centre};
+pub use images::{
+ ArrangeOrder, ImageChange, MaskIdentity, PageImage, arrange_image, change_image, crop_image, page_images, reading_images, rect_to_rect,
+ remove_image_crop, turn_about_centre,
+};
pub mod bidi;
pub mod indic;
pub mod text;
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index b46b35740d..e575b8e065 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -2133,12 +2133,8 @@ fn nested_soft_masks_replay_in_correct_order_and_effective_mask_is_rendered() {
// 3. Rendered-pixel assertion: render output and verify Mask B (left 50x100) is effective, not Mask A (bottom 100x50)
let pdf_bytes = write_incremental(&doc, &SaveOptions::default()).unwrap();
let mut renderer = pdfcraft_render::PageRenderer::new(Arc::new(pdf_bytes), pdfcraft_render::RenderConfig::default());
- let page = renderer.render(pdfcraft_render::RenderRequest {
- page: 0,
- kind: pdfcraft_render::RequestKind::Pixels,
- scale: 1.0,
- ..Default::default()
- });
+ let page =
+ renderer.render(pdfcraft_render::RenderRequest { page: 0, kind: pdfcraft_render::RequestKind::Pixels, scale: 1.0, ..Default::default() });
let px = |x: u32, y: u32| {
let idx = ((y * page.width + x) * 4) as usize;
page.rgba[idx..idx + 4].to_vec()
@@ -2242,11 +2238,7 @@ fn non_identity_cm_before_gs_preserves_mask_coordinates_and_rendering() {
let reopened_doc = reopen(&doc);
let reopened_images = images::page_images(&reopened_doc, 0).unwrap();
assert_eq!(reopened_images.len(), 1);
- assert!(
- close(reopened_images[0].rect, [10.0, 10.0, 110.0, 110.0]),
- "Image bounds preserved: {:?}",
- reopened_images[0].rect
- );
+ assert!(close(reopened_images[0].rect, [10.0, 10.0, 110.0, 110.0]), "Image bounds preserved: {:?}", reopened_images[0].rect);
// 3. Render reopened document and assert non-overlapping pixels remain unchanged
let pdf_bytes_after = write_incremental(&reopened_doc, &SaveOptions::default()).unwrap();
@@ -2276,7 +2268,6 @@ fn non_identity_cm_before_gs_preserves_mask_coordinates_and_rendering() {
assert_eq!(px_after(5, 5), px_before(5, 5));
}
-
#[test]
fn form_artwork_edits_only_the_selected_placement() {
let mut doc = fixture(); // three pages share resources; pages 0 and 1 also share contents
From dd5b7e7735e5ab6448f9747e8fb3ace2a9d9b095 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Thu, 15 Oct 2026 01:54:05 +0530
Subject: [PATCH 022/462] chore: format remaining workspace files
---
crates/engine/src/text_fonts.rs | 1 -
crates/ui-egui/src/canvas.rs | 17 +-
crates/ui-egui/src/content_ui.rs | 58 ++----
crates/ui-egui/src/edit_text_ui.rs | 323 ++++++++++++++++++++---------
crates/ui-egui/src/files.rs | 5 +-
crates/ui-egui/src/panels.rs | 28 ++-
crates/ui-egui/tests/editing.rs | 28 +--
7 files changed, 275 insertions(+), 185 deletions(-)
diff --git a/crates/engine/src/text_fonts.rs b/crates/engine/src/text_fonts.rs
index 7c3fc3211e..ca77b0d8af 100644
--- a/crates/engine/src/text_fonts.rs
+++ b/crates/engine/src/text_fonts.rs
@@ -88,4 +88,3 @@ mod tests {
assert!(!dirs.is_empty());
}
}
-
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index aacc091bff..7623913f44 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -3242,7 +3242,9 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
}
return;
}
- if tool == QuickTool::EditText && let Some(sel) = view.image_selection.clone() {
+ if tool == QuickTool::EditText
+ && let Some(sel) = view.image_selection.clone()
+ {
crate::edit_text_ui::image_context_menu(ui, view, doc, sel.page, sel.index, can_paste_image, &mut image_action);
return;
}
@@ -3612,7 +3614,9 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
if let Some(sel) = app.views[index].image_selection.clone() {
app.copy_page_image(sel.page, sel.index);
} else if let Some(text) = app.views[index].selected_text() {
- if let Some(id) = app.views.get(index).map(|v| v.id) && app.may_copy(id) {
+ if let Some(id) = app.views.get(index).map(|v| v.id)
+ && app.may_copy(id)
+ {
ui.ctx().copy_text(text);
}
} else if let Some((page, at)) = app.views[index].comments.context_at
@@ -3644,13 +3648,8 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
app.quick_tool = QuickTool::MarqueeZoom;
}
Some(PageMenuAction::AddComment(page, at)) => {
- app.views[index].comments.composer = Some(crate::comments::Composer {
- page,
- at,
- kind: crate::comments::ComposerKind::Note,
- text: String::new(),
- focus: true,
- });
+ app.views[index].comments.composer =
+ Some(crate::comments::Composer { page, at, kind: crate::comments::ComposerKind::Note, text: String::new(), focus: true });
}
Some(PageMenuAction::AddBookmark(_page)) => {
app.bookmark_action(crate::panels::BmAction::New);
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 70c03d0a1a..c9d0206413 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -552,24 +552,18 @@ fn finish(cv: &mut ContentView, d: TextDraft, added: &[Added]) -> Option {
pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) -> Option {
let mut s = style.clone();
widgets::section_title(ui, tl!("FORMAT TEXT"));
- egui::ComboBox::from_id_salt("font-family")
- .selected_text(s.family.label())
- .width(ui.available_width().max(180.0))
- .show_ui(ui, |ui| {
- ui.label(egui::RichText::new(tl!("Standard fonts")).weak().small());
- for f in [FontFamily::Helvetica, FontFamily::Times, FontFamily::Courier] {
- ui.selectable_value(&mut s.family, f, f.label());
+ egui::ComboBox::from_id_salt("font-family").selected_text(s.family.label()).width(ui.available_width().max(180.0)).show_ui(ui, |ui| {
+ ui.label(egui::RichText::new(tl!("Standard fonts")).weak().small());
+ for f in [FontFamily::Helvetica, FontFamily::Times, FontFamily::Courier] {
+ ui.selectable_value(&mut s.family, f, f.label());
+ }
+ });
+ ui.horizontal(|ui| {
+ egui::ComboBox::from_id_salt("font-size").selected_text(format!("{:.1}", s.size)).width(55.0).show_ui(ui, |ui| {
+ for size in [6.0, 8.0, 9.0, 10.0, 10.5, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
+ ui.selectable_value(&mut s.size, size, format!("{size}"));
}
});
- ui.horizontal(|ui| {
- egui::ComboBox::from_id_salt("font-size")
- .selected_text(format!("{:.1}", s.size))
- .width(55.0)
- .show_ui(ui, |ui| {
- for size in [6.0, 8.0, 9.0, 10.0, 10.5, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
- ui.selectable_value(&mut s.size, size, format!("{size}"));
- }
- });
let (color_rect, color_resp) = ui.allocate_exact_size(egui::vec2(20.0, 20.0), egui::Sense::click());
let color_val = crate::comments::color32(s.color);
ui.painter().rect_filled(color_rect, t.radius, color_val);
@@ -759,11 +753,7 @@ impl crate::PdfCraftApp {
pub(crate) fn cut_page_image(&mut self, view_idx: usize, page: usize, index: usize) {
self.copy_page_image(page, index);
if let Some(view) = self.views.get_mut(view_idx) {
- view.pending_edit = Some(pdfcraft_engine::Edit::EditPageImage {
- page,
- index,
- change: pdfcraft_engine::ImageEdit::Delete,
- });
+ view.pending_edit = Some(pdfcraft_engine::Edit::EditPageImage { page, index, change: pdfcraft_engine::ImageEdit::Delete });
view.image_selection = None;
}
}
@@ -783,7 +773,9 @@ impl crate::PdfCraftApp {
/// Paste an image from the clipboard onto `page`.
pub fn paste_image(&mut self, page: usize, rect: Option<[f64; 4]>) -> bool {
- let Some((i, id)) = self.active_ids() else { return false; };
+ let Some((i, id)) = self.active_ids() else {
+ return false;
+ };
if let Some(doc) = self.session.get(id)
&& !doc.allows_modification()
{
@@ -808,9 +800,10 @@ impl crate::PdfCraftApp {
let image_data: Option<(String, Vec)> = if has_system_cb {
match os_image {
Some((width, height, bytes)) => {
- let matches_internal = self.last_copied_image.as_ref().is_some_and(|(w, h, rgba)| {
- *w as usize == width && *h as usize == height && rgba.as_slice() == bytes.as_slice()
- });
+ let matches_internal = self
+ .last_copied_image
+ .as_ref()
+ .is_some_and(|(w, h, rgba)| *w as usize == width && *h as usize == height && rgba.as_slice() == bytes.as_slice());
if matches_internal && let Some((name, file_bytes)) = self.last_copied_file.clone() {
Some((name, file_bytes))
} else if let Ok(png_bytes) = crate::create_ui::png_from_rgba(width, height, &bytes) {
@@ -857,21 +850,10 @@ impl crate::PdfCraftApp {
};
let before = self.session.get(id).map_or(0, |d| d.page_images(page).len());
- if self.apply_edit(pdfcraft_engine::Edit::AddImage {
- page,
- rect: target_rect,
- name,
- bytes: std::sync::Arc::new(bytes),
- }) {
+ if self.apply_edit(pdfcraft_engine::Edit::AddImage { page, rect: target_rect, name, bytes: std::sync::Arc::new(bytes) }) {
if let Some(v) = self.views.get_mut(i) {
v.current = page;
- v.image_selection = Some(crate::edit_text_ui::ImageSelection {
- page,
- index: before,
- crop_mode: false,
- crop_rect: None,
- drag: None,
- });
+ v.image_selection = Some(crate::edit_text_ui::ImageSelection { page, index: before, crop_mode: false, crop_rect: None, drag: None });
}
self.quick_tool = crate::QuickTool::EditText;
self.notify_tr("Image pasted");
diff --git a/crates/ui-egui/src/edit_text_ui.rs b/crates/ui-egui/src/edit_text_ui.rs
index 7af7b1091e..b2563fb24e 100644
--- a/crates/ui-egui/src/edit_text_ui.rs
+++ b/crates/ui-egui/src/edit_text_ui.rs
@@ -244,62 +244,206 @@ pub fn toggle_numbered_list(text: &mut String) -> bool {
pub fn char_to_superscript(c: char) -> char {
match c {
- '0' => '⁰', '1' => '¹', '2' => '²', '3' => '³', '4' => '⁴',
- '5' => '⁵', '6' => '⁶', '7' => '⁷', '8' => '⁸', '9' => '⁹',
- '+' => '⁺', '-' | '−' => '⁻', '=' => '⁼', '(' => '⁽', ')' => '⁾',
- 'a' => 'ᵃ', 'b' => 'ᵇ', 'c' => 'ᶜ', 'd' => 'ᵈ', 'e' => 'ᵉ',
- 'f' => 'ᶠ', 'g' => 'ᵍ', 'h' => 'ʰ', 'i' => 'ⁱ', 'j' => 'ʲ',
- 'k' => 'ᵏ', 'l' => 'ˡ', 'm' => 'ᵐ', 'n' => 'ⁿ', 'o' => 'ᵒ',
- 'p' => 'ᵖ', 'r' => 'ʳ', 's' => 'ˢ', 't' => 'ᵗ', 'u' => 'ᵘ',
- 'v' => 'ᵛ', 'w' => 'ʷ', 'x' => 'ˣ', 'y' => 'ʸ', 'z' => 'ᶻ',
- 'A' => 'ᴬ', 'B' => 'ᴮ', 'D' => 'ᴰ', 'E' => 'ᴱ', 'G' => 'ᴳ',
- 'H' => 'ᴴ', 'I' => 'ᴵ', 'J' => 'ᴶ', 'K' => 'ᴷ', 'L' => 'ᴸ',
- 'M' => 'ᴹ', 'N' => 'ᴺ', 'O' => 'ᴼ', 'P' => 'ᴾ', 'R' => 'ᴿ',
- 'T' => 'ᵀ', 'U' => 'ᵁ', 'V' => 'ⱽ', 'W' => 'ᵂ',
+ '0' => '⁰',
+ '1' => '¹',
+ '2' => '²',
+ '3' => '³',
+ '4' => '⁴',
+ '5' => '⁵',
+ '6' => '⁶',
+ '7' => '⁷',
+ '8' => '⁸',
+ '9' => '⁹',
+ '+' => '⁺',
+ '-' | '−' => '⁻',
+ '=' => '⁼',
+ '(' => '⁽',
+ ')' => '⁾',
+ 'a' => 'ᵃ',
+ 'b' => 'ᵇ',
+ 'c' => 'ᶜ',
+ 'd' => 'ᵈ',
+ 'e' => 'ᵉ',
+ 'f' => 'ᶠ',
+ 'g' => 'ᵍ',
+ 'h' => 'ʰ',
+ 'i' => 'ⁱ',
+ 'j' => 'ʲ',
+ 'k' => 'ᵏ',
+ 'l' => 'ˡ',
+ 'm' => 'ᵐ',
+ 'n' => 'ⁿ',
+ 'o' => 'ᵒ',
+ 'p' => 'ᵖ',
+ 'r' => 'ʳ',
+ 's' => 'ˢ',
+ 't' => 'ᵗ',
+ 'u' => 'ᵘ',
+ 'v' => 'ᵛ',
+ 'w' => 'ʷ',
+ 'x' => 'ˣ',
+ 'y' => 'ʸ',
+ 'z' => 'ᶻ',
+ 'A' => 'ᴬ',
+ 'B' => 'ᴮ',
+ 'D' => 'ᴰ',
+ 'E' => 'ᴱ',
+ 'G' => 'ᴳ',
+ 'H' => 'ᴴ',
+ 'I' => 'ᴵ',
+ 'J' => 'ᴶ',
+ 'K' => 'ᴷ',
+ 'L' => 'ᴸ',
+ 'M' => 'ᴹ',
+ 'N' => 'ᴺ',
+ 'O' => 'ᴼ',
+ 'P' => 'ᴾ',
+ 'R' => 'ᴿ',
+ 'T' => 'ᵀ',
+ 'U' => 'ᵁ',
+ 'V' => 'ⱽ',
+ 'W' => 'ᵂ',
other => other,
}
}
pub fn char_from_superscript(c: char) -> char {
match c {
- '⁰' => '0', '¹' => '1', '²' => '2', '³' => '3', '⁴' => '4',
- '⁵' => '5', '⁶' => '6', '⁷' => '7', '⁸' => '8', '⁹' => '9',
- '⁺' => '+', '⁻' => '-', '⁼' => '=', '⁽' => '(', '⁾' => ')',
- 'ᵃ' => 'a', 'ᵇ' => 'b', 'ᶜ' => 'c', 'ᵈ' => 'd', 'ᵉ' => 'e',
- 'ᶠ' => 'f', 'ᵍ' => 'g', 'ʰ' => 'h', 'ⁱ' => 'i', 'ʲ' => 'j',
- 'ᵏ' => 'k', 'ˡ' => 'l', 'ᵐ' => 'm', 'ⁿ' => 'n', 'ᵒ' => 'o',
- 'ᵖ' => 'p', 'ʳ' => 'r', 'ˢ' => 's', 'ᵗ' => 't', 'ᵘ' => 'u',
- 'ᵛ' => 'v', 'ʷ' => 'w', 'ˣ' => 'x', 'ʸ' => 'y', 'ᶻ' => 'z',
- 'ᴬ' => 'A', 'ᴮ' => 'B', 'ᴰ' => 'D', 'ᴱ' => 'E', 'ᴳ' => 'G',
- 'ᴴ' => 'H', 'ᴵ' => 'I', 'ᴶ' => 'J', 'ᴷ' => 'K', 'ᴸ' => 'L',
- 'ᴹ' => 'M', 'ᴺ' => 'N', 'ᴼ' => 'O', 'ᴾ' => 'P', 'ᴿ' => 'R',
- 'ᵀ' => 'T', 'ᵁ' => 'U', 'ⱽ' => 'V', 'ᵂ' => 'W',
+ '⁰' => '0',
+ '¹' => '1',
+ '²' => '2',
+ '³' => '3',
+ '⁴' => '4',
+ '⁵' => '5',
+ '⁶' => '6',
+ '⁷' => '7',
+ '⁸' => '8',
+ '⁹' => '9',
+ '⁺' => '+',
+ '⁻' => '-',
+ '⁼' => '=',
+ '⁽' => '(',
+ '⁾' => ')',
+ 'ᵃ' => 'a',
+ 'ᵇ' => 'b',
+ 'ᶜ' => 'c',
+ 'ᵈ' => 'd',
+ 'ᵉ' => 'e',
+ 'ᶠ' => 'f',
+ 'ᵍ' => 'g',
+ 'ʰ' => 'h',
+ 'ⁱ' => 'i',
+ 'ʲ' => 'j',
+ 'ᵏ' => 'k',
+ 'ˡ' => 'l',
+ 'ᵐ' => 'm',
+ 'ⁿ' => 'n',
+ 'ᵒ' => 'o',
+ 'ᵖ' => 'p',
+ 'ʳ' => 'r',
+ 'ˢ' => 's',
+ 'ᵗ' => 't',
+ 'ᵘ' => 'u',
+ 'ᵛ' => 'v',
+ 'ʷ' => 'w',
+ 'ˣ' => 'x',
+ 'ʸ' => 'y',
+ 'ᶻ' => 'z',
+ 'ᴬ' => 'A',
+ 'ᴮ' => 'B',
+ 'ᴰ' => 'D',
+ 'ᴱ' => 'E',
+ 'ᴳ' => 'G',
+ 'ᴴ' => 'H',
+ 'ᴵ' => 'I',
+ 'ᴶ' => 'J',
+ 'ᴷ' => 'K',
+ 'ᴸ' => 'L',
+ 'ᴹ' => 'M',
+ 'ᴺ' => 'N',
+ 'ᴼ' => 'O',
+ 'ᴾ' => 'P',
+ 'ᴿ' => 'R',
+ 'ᵀ' => 'T',
+ 'ᵁ' => 'U',
+ 'ⱽ' => 'V',
+ 'ᵂ' => 'W',
other => other,
}
}
pub fn char_to_subscript(c: char) -> char {
match c {
- '0' => '₀', '1' => '₁', '2' => '₂', '3' => '₃', '4' => '₄',
- '5' => '₅', '6' => '₆', '7' => '₇', '8' => '₈', '9' => '₉',
- '+' => '₊', '-' | '−' => '₋', '=' => '₌', '(' => '₍', ')' => '₎',
- 'a' => 'ₐ', 'e' => 'ₑ', 'h' => 'ₕ', 'i' => 'ᵢ', 'j' => 'ⱼ',
- 'k' => 'ₖ', 'l' => 'ₗ', 'm' => 'ₘ', 'n' => 'ₙ', 'o' => 'ₒ',
- 'p' => 'ₚ', 'r' => 'ᵣ', 's' => 'ₛ', 't' => 'ₜ', 'u' => 'ᵤ',
- 'v' => 'ᵥ', 'x' => 'ₓ',
+ '0' => '₀',
+ '1' => '₁',
+ '2' => '₂',
+ '3' => '₃',
+ '4' => '₄',
+ '5' => '₅',
+ '6' => '₆',
+ '7' => '₇',
+ '8' => '₈',
+ '9' => '₉',
+ '+' => '₊',
+ '-' | '−' => '₋',
+ '=' => '₌',
+ '(' => '₍',
+ ')' => '₎',
+ 'a' => 'ₐ',
+ 'e' => 'ₑ',
+ 'h' => 'ₕ',
+ 'i' => 'ᵢ',
+ 'j' => 'ⱼ',
+ 'k' => 'ₖ',
+ 'l' => 'ₗ',
+ 'm' => 'ₘ',
+ 'n' => 'ₙ',
+ 'o' => 'ₒ',
+ 'p' => 'ₚ',
+ 'r' => 'ᵣ',
+ 's' => 'ₛ',
+ 't' => 'ₜ',
+ 'u' => 'ᵤ',
+ 'v' => 'ᵥ',
+ 'x' => 'ₓ',
other => other,
}
}
pub fn char_from_subscript(c: char) -> char {
match c {
- '₀' => '0', '₁' => '1', '₂' => '2', '₃' => '3', '₄' => '4',
- '₅' => '5', '₆' => '6', '₇' => '7', '₈' => '8', '₉' => '9',
- '₊' => '+', '₋' => '-', '₌' => '=', '₍' => '(', '₎' => ')',
- 'ₐ' => 'a', 'ₑ' => 'e', 'ₕ' => 'h', 'ᵢ' => 'i', 'ⱼ' => 'j',
- 'ₖ' => 'k', 'ₗ' => 'l', 'ₘ' => 'm', 'ₙ' => 'n', 'ₒ' => 'o',
- 'ₚ' => 'p', 'ᵣ' => 'r', 'ₛ' => 's', 'ₜ' => 't', 'ᵤ' => 'u',
- 'ᵥ' => 'v', 'ₓ' => 'x',
+ '₀' => '0',
+ '₁' => '1',
+ '₂' => '2',
+ '₃' => '3',
+ '₄' => '4',
+ '₅' => '5',
+ '₆' => '6',
+ '₇' => '7',
+ '₈' => '8',
+ '₉' => '9',
+ '₊' => '+',
+ '₋' => '-',
+ '₌' => '=',
+ '₍' => '(',
+ '₎' => ')',
+ 'ₐ' => 'a',
+ 'ₑ' => 'e',
+ 'ₕ' => 'h',
+ 'ᵢ' => 'i',
+ 'ⱼ' => 'j',
+ 'ₖ' => 'k',
+ 'ₗ' => 'l',
+ 'ₘ' => 'm',
+ 'ₙ' => 'n',
+ 'ₒ' => 'o',
+ 'ₚ' => 'p',
+ 'ᵣ' => 'r',
+ 'ₛ' => 's',
+ 'ₜ' => 't',
+ 'ᵤ' => 'u',
+ 'ᵥ' => 'v',
+ 'ₓ' => 'x',
other => other,
}
}
@@ -317,22 +461,15 @@ fn snap_char_boundaries(s: &str, start: usize, end: usize) -> (usize, usize) {
}
pub fn toggle_superscript(ed: &mut LineEditor) -> bool {
- let (s_pos, e_pos) = if let Some(r) = &ed.selection {
- (r.start.min(ed.text.len()), r.end.min(ed.text.len()))
- } else {
- (0, ed.text.len())
- };
+ let (s_pos, e_pos) = if let Some(r) = &ed.selection { (r.start.min(ed.text.len()), r.end.min(ed.text.len())) } else { (0, ed.text.len()) };
let (start, end) = snap_char_boundaries(&ed.text, s_pos, e_pos);
if start >= end {
return false;
}
let target = &ed.text[start..end];
let all_sup = target.chars().all(|c| char_from_superscript(c) != c);
- let converted: String = if all_sup {
- target.chars().map(char_from_superscript).collect()
- } else {
- target.chars().map(char_to_superscript).collect()
- };
+ let converted: String =
+ if all_sup { target.chars().map(char_from_superscript).collect() } else { target.chars().map(char_to_superscript).collect() };
if converted != target {
let conv_len = converted.len();
ed.text.replace_range(start..end, &converted);
@@ -346,22 +483,14 @@ pub fn toggle_superscript(ed: &mut LineEditor) -> bool {
}
pub fn toggle_subscript(ed: &mut LineEditor) -> bool {
- let (s_pos, e_pos) = if let Some(r) = &ed.selection {
- (r.start.min(ed.text.len()), r.end.min(ed.text.len()))
- } else {
- (0, ed.text.len())
- };
+ let (s_pos, e_pos) = if let Some(r) = &ed.selection { (r.start.min(ed.text.len()), r.end.min(ed.text.len())) } else { (0, ed.text.len()) };
let (start, end) = snap_char_boundaries(&ed.text, s_pos, e_pos);
if start >= end {
return false;
}
let target = &ed.text[start..end];
let all_sub = target.chars().all(|c| char_from_subscript(c) != c);
- let converted: String = if all_sub {
- target.chars().map(char_from_subscript).collect()
- } else {
- target.chars().map(char_to_subscript).collect()
- };
+ let converted: String = if all_sub { target.chars().map(char_from_subscript).collect() } else { target.chars().map(char_to_subscript).collect() };
if converted != target {
let conv_len = converted.len();
ed.text.replace_range(start..end, &converted);
@@ -842,10 +971,18 @@ pub(crate) fn image_input(
painter.rect_filled(Rect::from_min_max(Pos2::new(b.left(), active_crop.bottom()), b.max), CornerRadius::ZERO, shade_color);
}
if active_crop.left() > b.left() {
- painter.rect_filled(Rect::from_min_max(Pos2::new(b.left(), active_crop.top()), Pos2::new(active_crop.left(), active_crop.bottom())), CornerRadius::ZERO, shade_color);
+ painter.rect_filled(
+ Rect::from_min_max(Pos2::new(b.left(), active_crop.top()), Pos2::new(active_crop.left(), active_crop.bottom())),
+ CornerRadius::ZERO,
+ shade_color,
+ );
}
if active_crop.right() < b.right() {
- painter.rect_filled(Rect::from_min_max(Pos2::new(active_crop.right(), active_crop.top()), Pos2::new(b.right(), active_crop.bottom())), CornerRadius::ZERO, shade_color);
+ painter.rect_filled(
+ Rect::from_min_max(Pos2::new(active_crop.right(), active_crop.top()), Pos2::new(b.right(), active_crop.bottom())),
+ CornerRadius::ZERO,
+ shade_color,
+ );
}
painter.rect_stroke(active_crop, CornerRadius::ZERO, Stroke::new(1.5, ACCENT), egui::StrokeKind::Outside);
@@ -853,10 +990,14 @@ pub(crate) fn image_input(
let x2 = active_crop.left() + active_crop.width() * 2.0 / 3.0;
let y1 = active_crop.top() + active_crop.height() / 3.0;
let y2 = active_crop.top() + active_crop.height() * 2.0 / 3.0;
- painter.line_segment([Pos2::new(x1, active_crop.top()), Pos2::new(x1, active_crop.bottom())], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
- painter.line_segment([Pos2::new(x2, active_crop.top()), Pos2::new(x2, active_crop.bottom())], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
- painter.line_segment([Pos2::new(active_crop.left(), y1), Pos2::new(active_crop.right(), y1)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
- painter.line_segment([Pos2::new(active_crop.left(), y2), Pos2::new(active_crop.right(), y2)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter
+ .line_segment([Pos2::new(x1, active_crop.top()), Pos2::new(x1, active_crop.bottom())], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter
+ .line_segment([Pos2::new(x2, active_crop.top()), Pos2::new(x2, active_crop.bottom())], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter
+ .line_segment([Pos2::new(active_crop.left(), y1), Pos2::new(active_crop.right(), y1)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
+ painter
+ .line_segment([Pos2::new(active_crop.left(), y2), Pos2::new(active_crop.right(), y2)], Stroke::new(0.75, ACCENT.gamma_multiply(0.5)));
let crop_handles = [
ImageHandle::TopLeft,
@@ -875,7 +1016,13 @@ pub(crate) fn image_input(
ImageHandle::LeftCenter | ImageHandle::RightCenter => egui::vec2(6.0, 16.0),
_ => egui::vec2(10.0, 10.0),
};
- painter.rect(Rect::from_center_size(c, sz), CornerRadius::same(1), Color32::WHITE, Stroke::new(1.5, ACCENT), egui::StrokeKind::Middle);
+ painter.rect(
+ Rect::from_center_size(c, sz),
+ CornerRadius::same(1),
+ Color32::WHITE,
+ Stroke::new(1.5, ACCENT),
+ egui::StrokeKind::Middle,
+ );
}
if allow_interaction && let Some(p) = hover_pos {
@@ -897,11 +1044,7 @@ pub(crate) fn image_input(
change: pdfcraft_engine::ImageEdit::Crop(user_box(xf, info, page, active_crop)),
});
} else if images.get(i).is_some_and(|im| im.visible_rect.is_some() && im.visible_rect != Some(im.rect)) {
- view.pending_edit = Some(Edit::EditPageImage {
- page,
- index: i,
- change: pdfcraft_engine::ImageEdit::RemoveCrop,
- });
+ view.pending_edit = Some(Edit::EditPageImage { page, index: i, change: pdfcraft_engine::ImageEdit::RemoveCrop });
}
if let Some(s) = view.image_selection.as_mut() {
s.crop_mode = false;
@@ -931,7 +1074,10 @@ pub(crate) fn image_input(
}
let origin = ui.input(|i| i.pointer.press_origin());
- if allow_interaction && resp.drag_started() && let Some(o) = origin {
+ if allow_interaction
+ && resp.drag_started()
+ && let Some(o) = origin
+ {
if is_crop {
let active_crop = view.image_selection.as_ref().and_then(|s| s.crop_rect).unwrap_or(b);
let crop_handles = [
@@ -1167,14 +1313,13 @@ pub(crate) fn image_input(
|| ui.ctx().is_pointer_over_egui()
|| ui.ctx().egui_wants_pointer_input();
if (resp.secondary_clicked() || resp.clicked()) && !over_popup {
- if let Some(s) = view.image_selection.as_mut() && s.crop_mode {
+ if let Some(s) = view.image_selection.as_mut()
+ && s.crop_mode
+ {
let img_box = boxes.get(s.index).copied();
if let Some(crop) = s.crop_rect.filter(|c| img_box.is_some_and(|b| *c != b)) {
- view.pending_edit = Some(Edit::EditPageImage {
- page,
- index: s.index,
- change: pdfcraft_engine::ImageEdit::Crop(user_box(xf, info, page, crop)),
- });
+ view.pending_edit =
+ Some(Edit::EditPageImage { page, index: s.index, change: pdfcraft_engine::ImageEdit::Crop(user_box(xf, info, page, crop)) });
}
}
view.image_selection = None;
@@ -1278,44 +1423,28 @@ pub(crate) fn image_context_menu(
ui.menu_button(tl!("Arrange image"), |ui| {
let total = images.len();
if ui.button(tl!("Bring to front")).clicked() {
- view.pending_edit = Some(Edit::EditPageImage {
- page,
- index: hit,
- change: E::Arrange(pdfcraft_engine::ArrangeOrder::BringToFront),
- });
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Arrange(pdfcraft_engine::ArrangeOrder::BringToFront) });
if let Some(s) = view.image_selection.as_mut() {
s.index = total.saturating_sub(1);
}
ui.close();
}
if ui.button(tl!("Send to back")).clicked() {
- view.pending_edit = Some(Edit::EditPageImage {
- page,
- index: hit,
- change: E::Arrange(pdfcraft_engine::ArrangeOrder::SendToBack),
- });
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Arrange(pdfcraft_engine::ArrangeOrder::SendToBack) });
if let Some(s) = view.image_selection.as_mut() {
s.index = 0;
}
ui.close();
}
if ui.button(tl!("Bring forward")).clicked() {
- view.pending_edit = Some(Edit::EditPageImage {
- page,
- index: hit,
- change: E::Arrange(pdfcraft_engine::ArrangeOrder::BringForward),
- });
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Arrange(pdfcraft_engine::ArrangeOrder::BringForward) });
if let Some(s) = view.image_selection.as_mut() {
s.index = (hit + 1).min(total.saturating_sub(1));
}
ui.close();
}
if ui.button(tl!("Send backward")).clicked() {
- view.pending_edit = Some(Edit::EditPageImage {
- page,
- index: hit,
- change: E::Arrange(pdfcraft_engine::ArrangeOrder::SendBackward),
- });
+ view.pending_edit = Some(Edit::EditPageImage { page, index: hit, change: E::Arrange(pdfcraft_engine::ArrangeOrder::SendBackward) });
if let Some(s) = view.image_selection.as_mut() {
s.index = hit.saturating_sub(1);
}
diff --git a/crates/ui-egui/src/files.rs b/crates/ui-egui/src/files.rs
index a5dbbabd6a..9ffb567fd8 100644
--- a/crates/ui-egui/src/files.rs
+++ b/crates/ui-egui/src/files.rs
@@ -466,9 +466,8 @@ impl PdfCraftApp {
if self.apply_edit(Edit::RegisterTextFont { page, bytes: Arc::new(bytes.clone()) })
&& let Some((index, id)) = self.active_ids()
{
- let resource = self.session.get(id).and_then(|doc| {
- doc.text_editor_fonts(page).into_iter().find(|f| f.bytes == bytes).map(|f| f.resource)
- });
+ let resource =
+ self.session.get(id).and_then(|doc| doc.text_editor_fonts(page).into_iter().find(|f| f.bytes == bytes).map(|f| f.resource));
if let Some(resource) = resource
&& let Some(ed) = self.views[index].line_editor.as_mut()
{
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
index 6f9758ac9a..7cd417d863 100644
--- a/crates/ui-egui/src/panels.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -359,10 +359,9 @@ fn format_section(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
};
crate::widgets::section_title(ui, tl!("FORMAT TEXT"));
- egui::ComboBox::from_id_salt("text-font-dropdown")
- .selected_text(current_font_label)
- .width(ui.available_width().max(180.0))
- .show_ui(ui, |ui| {
+ egui::ComboBox::from_id_salt("text-font-dropdown").selected_text(current_font_label).width(ui.available_width().max(180.0)).show_ui(
+ ui,
+ |ui| {
if ui.selectable_label(ed.font_resource.is_none(), tl!("Keep source fonts")).clicked() {
ed.font_resource = None;
changed = true;
@@ -397,9 +396,8 @@ fn format_section(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
ui.label(egui::RichText::new(tl!("No installed fonts found.")).weak().small());
} else {
for font in &installed {
- let is_current = ed.font_resource.as_ref().is_some_and(|r| {
- font_choices.iter().any(|f| &f.resource == r && f.face == font.face)
- });
+ let is_current =
+ ed.font_resource.as_ref().is_some_and(|r| font_choices.iter().any(|f| &f.resource == r && f.face == font.face));
if ui.selectable_label(is_current, &font.face).clicked()
&& let Ok(bytes) = std::fs::read(&font.path)
{
@@ -424,18 +422,16 @@ fn format_section(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
if ui.button(tl!("Load font from file…")).clicked() {
app.pick_files(crate::files::FilePurpose::TextFont { page: ed.page }, false);
}
- });
+ },
+ );
ui.horizontal(|ui| {
// Font size ComboBox
- egui::ComboBox::from_id_salt("font-size")
- .selected_text(format!("{:.1}", ed.look.size))
- .width(55.0)
- .show_ui(ui, |ui| {
- for size in [6.0, 8.0, 9.0, 10.0, 10.5, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
- changed |= ui.selectable_value(&mut ed.look.size, size, format!("{size}")).changed();
- }
- });
+ egui::ComboBox::from_id_salt("font-size").selected_text(format!("{:.1}", ed.look.size)).width(55.0).show_ui(ui, |ui| {
+ for size in [6.0, 8.0, 9.0, 10.0, 10.5, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
+ changed |= ui.selectable_value(&mut ed.look.size, size, format!("{size}")).changed();
+ }
+ });
// Color swatch square
let (color_rect, color_resp) = ui.allocate_exact_size(egui::vec2(20.0, 20.0), egui::Sense::click());
let color_val = crate::comments::color32(ed.look.color);
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index 9055414169..05357891ea 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -2639,15 +2639,8 @@ fn default_page_context_menu_when_not_in_edit_mode() {
h.get_by_label("Hand Tool");
h.get_by_label("Marquee Zoom");
- for item in [
- "Add bookmark",
- "Take a snapshot",
- "Edit this PDF",
- "Delete page",
- "Export this PDF",
- "Find text or tools",
- "Document properties…",
- ] {
+ for item in ["Add bookmark", "Take a snapshot", "Edit this PDF", "Delete page", "Export this PDF", "Find text or tools", "Document properties…"]
+ {
h.get_by_label_contains(item);
}
h.get_by_label("Rotate view clockwise");
@@ -2666,7 +2659,9 @@ fn default_page_context_menu_when_not_in_edit_mode() {
#[test]
fn image_edge_handle_stretch_and_crop_mode() {
let mut png = Vec::new();
- image::RgbImage::from_pixel(100, 100, image::Rgb([100, 150, 200])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+ image::RgbImage::from_pixel(100, 100, image::Rgb([100, 150, 200]))
+ .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
+ .unwrap();
let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {
let mut app = PdfCraftApp::new();
app.set_option("language", "en").unwrap();
@@ -2738,13 +2733,7 @@ fn tiny_image_crop_handle_drag_does_not_panic() {
// Enter crop mode on image 0
let view = &mut h.state_mut().views[0];
- view.image_selection = Some(pdfcraft_ui_egui::ImageSelection {
- page: 0,
- index: 0,
- drag: None,
- crop_mode: true,
- crop_rect: None,
- });
+ view.image_selection = Some(pdfcraft_ui_egui::ImageSelection { page: 0, index: 0, drag: None, crop_mode: true, crop_rect: None });
h.run_steps(1);
// Simulate drag on TopLeft crop handle with an initial_rect of 5.0 x 5.0
@@ -4420,9 +4409,7 @@ fn private_new_chinese_keyboard_input_preserves_font_layout_and_saved_pixels() {
#[test]
fn image_copy_cut_paste_keyboard_and_context_menu() {
let mut png = Vec::new();
- image::RgbImage::from_pixel(60, 40, image::Rgb([180, 50, 50]))
- .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
- .unwrap();
+ image::RgbImage::from_pixel(60, 40, image::Rgb([180, 50, 50])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {
let mut app = PdfCraftApp::new();
app.set_option("language", "en").unwrap();
@@ -4502,4 +4489,3 @@ fn stale_clipboard_plain_text_does_not_paste_image() {
// paste_image should fail and return false without pasting
assert!(!h.state_mut().paste_image(0, None), "must not paste stale cached image");
}
-
From 6f9ec0f5764f524a8449ba8dc46fb0c1164f8539 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Thu, 15 Oct 2026 17:27:45 +0530
Subject: [PATCH 023/462] feat(ui): pinned tools section on Home
---
crates/ui-egui/src/dialogs.rs | 90 +++++++++++++++
crates/ui-egui/src/home.rs | 139 +++++++++++++++++------
crates/ui-egui/src/lib.rs | 60 ++++++++++
crates/ui-egui/src/panels.rs | 51 +++++++--
crates/ui-egui/tests/pinned_tools.rs | 163 +++++++++++++++++++++++++++
5 files changed, 457 insertions(+), 46 deletions(-)
create mode 100644 crates/ui-egui/tests/pinned_tools.rs
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 6eceff17e1..0deaf2dd90 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -79,6 +79,7 @@ fn dialogs(app: &mut PdfCraftApp, ctx: &egui::Context) {
Dialog::Print => 820.0,
Dialog::FieldProps | Dialog::BulkFieldProps => 600.0,
Dialog::About => 780.0,
+ Dialog::PinTool => 540.0,
_ => 520.0,
});
match dialog {
@@ -1123,6 +1124,91 @@ fn dialogs(app: &mut PdfCraftApp, ctx: &egui::Context) {
}
}
}
+ Dialog::PinTool => {
+ ui.horizontal(|ui| {
+ ui.label(egui::RichText::new(tl!("Pin tools to Home")).font(theme::semibold(18.0)));
+ ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+ if widgets::ghost_button(ui, "x", tl!("Close")).clicked() {
+ close = true;
+ }
+ });
+ });
+ ui.add_space(4.0);
+ ui.label(egui::RichText::new(tl!("Select tools to display on your Home page for quick access.")).color(t.text_muted));
+ ui.add_space(10.0);
+
+ ui.horizontal(|ui| {
+ let (icon_rect, _) = ui.allocate_exact_size(egui::vec2(18.0, 18.0), egui::Sense::hover());
+ crate::icons::paint(ui, icon_rect, "search", 16.0, t.text_muted);
+ ui.add(
+ egui::TextEdit::singleline(&mut app.pin_tool_search)
+ .hint_text(tl!("Search tools…"))
+ .desired_width(ui.available_width() - 32.0),
+ );
+ if !app.pin_tool_search.is_empty() && widgets::ghost_button(ui, "x", tl!("Clear search")).clicked() {
+ app.pin_tool_search.clear();
+ }
+ });
+ ui.add_space(8.0);
+ ui.separator();
+ ui.add_space(6.0);
+
+ let query = app.pin_tool_search.trim().to_lowercase();
+ egui::ScrollArea::vertical().max_height(380.0).auto_shrink([false, true]).show(ui, |ui| {
+ let mut toggle = None;
+ for g in pdfcraft_engine::catalog::TOOL_GROUPS {
+ let label = tl!(g.label);
+ let blurb = g
+ .sections
+ .first()
+ .map(|s| s.items.iter().take(4).map(|i| tl!(i.label)).collect::>().join(" · "))
+ .unwrap_or_default();
+ if !query.is_empty()
+ && !label.to_lowercase().contains(&query)
+ && !blurb.to_lowercase().contains(&query)
+ && !g.id.to_lowercase().contains(&query)
+ {
+ continue;
+ }
+
+ let pinned = app.is_tool_pinned(g.id);
+ let (rect, resp) = ui.allocate_exact_size(egui::vec2(ui.available_width(), 44.0), egui::Sense::click());
+ let press = theme::Press::track(ui, &resp);
+ press.wash(ui, rect, 6, false);
+ let body = rect.translate(press.offset());
+
+ let color = egui::Color32::from_rgb(g.hue[0], g.hue[1], g.hue[2]);
+ crate::icons::paint(ui, egui::Rect::from_min_size(body.min + egui::vec2(8.0, 11.0), egui::vec2(22.0, 22.0)), g.icon, 20.0, color);
+
+ let btn_w = 78.0;
+ let btn_rect = egui::Rect::from_center_size(body.right_center() - egui::vec2(btn_w / 2.0 + 8.0, 0.0), egui::vec2(btn_w, 26.0));
+ let btn_resp = ui.interact(btn_rect, ui.id().with(("pin_modal_btn", g.id)), egui::Sense::click());
+ let btn_hovered = btn_resp.hovered();
+
+ let (btn_fill, btn_stroke, text_color, btn_label) = if pinned {
+ (t.accent, egui::Stroke::NONE, egui::Color32::WHITE, tl!("Pinned"))
+ } else if btn_hovered {
+ (t.hover, egui::Stroke::new(1.0, t.border), t.text, tl!("Pin"))
+ } else {
+ (egui::Color32::TRANSPARENT, egui::Stroke::new(1.0, t.border), t.text_muted, tl!("Pin"))
+ };
+
+ ui.painter().rect(btn_rect, egui::CornerRadius::same(6), btn_fill, btn_stroke, egui::StrokeKind::Inside);
+ ui.painter().text(btn_rect.center(), egui::Align2::CENTER_CENTER, btn_label, theme::medium(12.0), text_color);
+
+ let max_w = (btn_rect.left() - body.left() - 44.0).max(10.0);
+ widgets::row_text(ui, body.min + egui::vec2(38.0, 6.0), label, theme::semibold(13.5), t.text, max_w);
+ widgets::row_text(ui, body.min + egui::vec2(38.0, 24.0), &blurb, theme::regular(11.0), t.text_muted, max_w);
+
+ if btn_resp.clicked() || resp.clicked() {
+ toggle = Some(g.id);
+ }
+ }
+ if let Some(id) = toggle {
+ app.toggle_pin_tool(id);
+ }
+ });
+ }
}
ui.add_space(16.0);
let changed = draft_changes(app).is_some_and(|c| !c.is_empty());
@@ -1136,6 +1222,10 @@ fn dialogs(app: &mut PdfCraftApp, ctx: &egui::Context) {
recover = Some(false);
close = true;
}
+ } else if dialog == Dialog::PinTool {
+ if widgets::pill_button(ui, tl!("Done"), true).clicked() {
+ close = true;
+ }
} else if dialog == Dialog::NumberPages {
if widgets::pill_button(ui, tl!("OK"), true).clicked() {
apply_number = true;
diff --git a/crates/ui-egui/src/home.rs b/crates/ui-egui/src/home.rs
index 3e70f34e42..5fdcd51ff3 100644
--- a/crates/ui-egui/src/home.rs
+++ b/crates/ui-egui/src/home.rs
@@ -18,6 +18,74 @@ fn card_lift(ui: &egui::Ui, t: &Tokens, rect: Rect, press: theme::Press) {
}
}
+/// Render a single tool card with the standard lift, styling, icon, title, description, and action.
+/// If `allow_unpin` is true, an unpin button appears on hover in the top right corner.
+fn tool_card(
+ app: &mut PdfCraftApp,
+ ui: &mut egui::Ui,
+ t: &Tokens,
+ g: &'static catalog::ToolGroup,
+ allow_unpin: bool,
+) -> Option<&'static str> {
+ let (rect, resp) = ui.allocate_exact_size(vec2(190.0, 104.0), Sense::click());
+ resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl!(g.label)));
+ let press = theme::Press::track(ui, &resp);
+ card_lift(ui, t, rect, press);
+ let fill = press.fill(t.card, t.hover, t.pressed);
+ ui.painter().rect(rect, CornerRadius::same(10), fill, Stroke::new(1.0, t.divider), egui::StrokeKind::Inside);
+ let body = rect.translate(press.offset());
+ let color = egui::Color32::from_rgb(g.hue[0], g.hue[1], g.hue[2]);
+ icons::paint(ui, Rect::from_min_size(body.min + vec2(14.0, 14.0), vec2(22.0, 22.0)), g.icon, 21.0, color);
+
+ let mut unpin_clicked = false;
+ if allow_unpin && (ui.rect_contains_pointer(rect) || resp.hovered()) {
+ let unpin_rect = Rect::from_center_size(body.right_top() + vec2(-18.0, 18.0), vec2(22.0, 22.0));
+ let unpin_resp = ui.interact(unpin_rect, ui.id().with(("unpin_card_btn", g.id)), Sense::click());
+ unpin_resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl!("Unpin tool")));
+ if unpin_resp.hovered() {
+ ui.painter().rect_filled(unpin_rect, CornerRadius::same(4), t.pressed);
+ }
+ icons::paint(ui, unpin_rect.shrink(4.0), "x", 14.0, t.icon);
+ if unpin_resp.on_hover_text(tl!("Unpin from Home")).clicked() {
+ unpin_clicked = true;
+ }
+ }
+
+ let mut title_job = egui::text::LayoutJob::simple_singleline(tl!(g.label).to_owned(), theme::semibold(13.5), t.text);
+ title_job.wrap =
+ egui::text::TextWrapping { max_width: body.width() - 58.0, max_rows: 1, break_anywhere: true, ..Default::default() };
+ let title = ui.fonts_mut(|f| f.layout_job(title_job));
+ let title_elided = title.elided;
+ ui.painter().galley(body.min + vec2(44.0, 25.0 - title.size().y * 0.5), title, t.text);
+ let blurb = g
+ .sections
+ .first()
+ .map(|s| s.items.iter().take(3).map(|i| tl!(i.label)).collect::>().join(" · "))
+ .unwrap_or_default();
+ // Fixed-height cards must leave room for their action in every language.
+ let mut job = egui::text::LayoutJob::simple(blurb.clone(), theme::regular(11.5), t.text_muted, body.width() - 28.0);
+ job.wrap.max_rows = 2;
+ let galley = ui.fonts_mut(|f| f.layout_job(job));
+ let blurb_elided = galley.elided;
+ ui.painter().galley(body.min + vec2(14.0, 46.0), galley, t.text_muted);
+ ui.painter().text(
+ body.left_bottom() + vec2(14.0, -14.0),
+ Align2::LEFT_CENTER,
+ tl!("Use now"),
+ theme::medium(12.0),
+ t.accent_text,
+ );
+ let resp = if title_elided || blurb_elided { resp.on_hover_text(format!("{}\n{blurb}", tl!(g.label))) } else { resp };
+ if unpin_clicked {
+ Some(g.id)
+ } else {
+ if theme::hand(resp).clicked() {
+ app.select_tool(g.id);
+ }
+ None
+ }
+}
+
pub fn show(app: &mut PdfCraftApp, ui: &mut egui::Ui) {
let t = Tokens::get(ui.ctx());
egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
@@ -63,43 +131,7 @@ pub fn show(app: &mut PdfCraftApp, ui: &mut egui::Ui) {
ui.spacing_mut().item_spacing = vec2(14.0, 14.0);
for id in RECOMMENDED {
let Some(g) = catalog::group(id) else { continue };
- let (rect, resp) = ui.allocate_exact_size(vec2(190.0, 104.0), Sense::click());
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl!(g.label)));
- let press = theme::Press::track(ui, &resp);
- card_lift(ui, &t, rect, press);
- let fill = press.fill(t.card, t.hover, t.pressed);
- ui.painter().rect(rect, CornerRadius::same(10), fill, Stroke::new(1.0, t.divider), egui::StrokeKind::Inside);
- let body = rect.translate(press.offset());
- let color = egui::Color32::from_rgb(g.hue[0], g.hue[1], g.hue[2]);
- icons::paint(ui, Rect::from_min_size(body.min + vec2(14.0, 14.0), vec2(22.0, 22.0)), g.icon, 21.0, color);
- let mut title_job = egui::text::LayoutJob::simple_singleline(tl!(g.label).to_owned(), theme::semibold(13.5), t.text);
- title_job.wrap =
- egui::text::TextWrapping { max_width: body.width() - 58.0, max_rows: 1, break_anywhere: true, ..Default::default() };
- let title = ui.fonts_mut(|f| f.layout_job(title_job));
- let title_elided = title.elided;
- ui.painter().galley(body.min + vec2(44.0, 25.0 - title.size().y * 0.5), title, t.text);
- let blurb = g
- .sections
- .first()
- .map(|s| s.items.iter().take(3).map(|i| tl!(i.label)).collect::>().join(" · "))
- .unwrap_or_default();
- // Fixed-height cards must leave room for their action in every language.
- let mut job = egui::text::LayoutJob::simple(blurb.clone(), theme::regular(11.5), t.text_muted, body.width() - 28.0);
- job.wrap.max_rows = 2;
- let galley = ui.fonts_mut(|f| f.layout_job(job));
- let blurb_elided = galley.elided;
- ui.painter().galley(body.min + vec2(14.0, 46.0), galley, t.text_muted);
- ui.painter().text(
- body.left_bottom() + vec2(14.0, -14.0),
- Align2::LEFT_CENTER,
- tl!("Use now"),
- theme::medium(12.0),
- t.accent_text,
- );
- let resp = if title_elided || blurb_elided { resp.on_hover_text(format!("{}\n{blurb}", tl!(g.label))) } else { resp };
- if theme::hand(resp).clicked() {
- app.select_tool(g.id);
- }
+ tool_card(app, ui, &t, g, false);
}
let (rect, resp) = ui.allocate_exact_size(vec2(170.0, 104.0), Sense::click());
resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl!("Open file")));
@@ -121,6 +153,39 @@ pub fn show(app: &mut PdfCraftApp, ui: &mut egui::Ui) {
});
});
+ ui.add_space(26.0);
+ let mut unpin_tool = None;
+ ui.horizontal(|ui| {
+ ui.label(egui::RichText::new(tl!("Pinned Tools")).font(theme::semibold(17.0)));
+ ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+ if widgets::ghost_button(ui, "pin", tl!("Pin a tool…")).clicked() {
+ app.dialog = Some(crate::Dialog::PinTool);
+ }
+ });
+ });
+ ui.add_space(4.0);
+ if app.pinned_tools.is_empty() {
+ ui.label(
+ egui::RichText::new(tl!("Pin your favorite tools here for quick access."))
+ .color(t.text_muted),
+ );
+ } else {
+ ui.add_space(6.0);
+ let pinned = app.pinned_tools.clone();
+ ui.horizontal_wrapped(|ui| {
+ ui.spacing_mut().item_spacing = vec2(14.0, 14.0);
+ for id in &pinned {
+ let Some(g) = catalog::group(id) else { continue };
+ if let Some(to_unpin) = tool_card(app, ui, &t, g, true) {
+ unpin_tool = Some(to_unpin);
+ }
+ }
+ });
+ }
+ if let Some(id) = unpin_tool {
+ app.unpin_tool(id);
+ }
+
#[cfg(not(target_arch = "wasm32"))]
{
ui.add_space(26.0);
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 49fb3b5fcb..2535adae86 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -338,6 +338,8 @@ pub enum Dialog {
AuditSpace,
/// Signatures ▸ Show certificate.
CertificateViewer,
+ /// Pin tools to Home: selection modal.
+ PinTool,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -574,6 +576,10 @@ pub struct PdfCraftApp {
open_prepare_gate: Option>,
/// Folders pinned to Home, and what they held when last listed.
pub pinned: folders_ui::PinnedFolders,
+ /// Tools pinned to Home, in user-defined order.
+ pub pinned_tools: Vec,
+ /// Search query for the Pin a tool selection dialog.
+ pub pin_tool_search: String,
pub toast: Option<(String, f64)>,
/// Whether the macOS title bar is drawn by us (traffic lights over our tab strip).
pub integrated_titlebar: bool,
@@ -922,6 +928,8 @@ impl PdfCraftApp {
#[cfg(all(test, not(target_arch = "wasm32")))]
open_prepare_gate: None,
pinned: Default::default(),
+ pinned_tools: Vec::new(),
+ pin_tool_search: String::new(),
toast: None,
integrated_titlebar: false,
window_controls: None,
@@ -2026,6 +2034,48 @@ impl PdfCraftApp {
self.pending_panel_reveals.push(docking::Panel::Tools);
}
+ /// Check whether a tool group is pinned to Home.
+ pub fn is_tool_pinned(&self, id: &str) -> bool {
+ self.pinned_tools.iter().any(|t| t == id)
+ }
+
+ /// Pin a tool group to Home. Returns true if newly pinned.
+ pub fn pin_tool(&mut self, id: &str) -> bool {
+ if pdfcraft_engine::catalog::group(id).is_none() {
+ return false;
+ }
+ if !self.is_tool_pinned(id) {
+ self.pinned_tools.push(id.to_string());
+ if let Some(g) = pdfcraft_engine::catalog::group(id) {
+ self.notify_fmt("Pinned {tool} to Home", &[("tool", tl!(g.label))]);
+ }
+ true
+ } else {
+ false
+ }
+ }
+
+ /// Remove a tool group from Home.
+ pub fn unpin_tool(&mut self, id: &str) {
+ if let Some(pos) = self.pinned_tools.iter().position(|t| t == id) {
+ self.pinned_tools.remove(pos);
+ if let Some(g) = pdfcraft_engine::catalog::group(id) {
+ self.notify_fmt("Unpinned {tool} from Home", &[("tool", tl!(g.label))]);
+ }
+ }
+ }
+
+ /// Toggle a tool group's pinned state on Home.
+ pub fn toggle_pin_tool(&mut self, id: &str) -> bool {
+ if self.is_tool_pinned(id) {
+ self.unpin_tool(id);
+ false
+ } else {
+ self.pin_tool(id);
+ true
+ }
+ }
+
/// Enter a tool from the catalogue, Home, palette or control channel. Organize is a
/// workspace, so opening its panel also opens the page grid (without toggling it off).
pub(crate) fn select_tool(&mut self, id: &'static str) {
@@ -2111,6 +2161,7 @@ impl PdfCraftApp {
"reload_changed_files": self.reload_changed_files,
"system_title_bar": self.system_title_bar,
"pinned_folders": self.pinned.folders,
+ "pinned_tools": self.pinned_tools,
"theme": self.theme_preference,
"scroll_speed": self.scroll_speed,
"animation_effects": self.animation_effects,
@@ -2200,6 +2251,15 @@ impl PdfCraftApp {
self.reload_changed_files = on;
}
self.pinned.restore(&v["pinned_folders"]);
+ if let Some(items) = v.get("pinned_tools").and_then(serde_json::Value::as_array) {
+ let mut tools = Vec::new();
+ for item in items.iter().filter_map(serde_json::Value::as_str) {
+ if pdfcraft_engine::catalog::group(item).is_some() && !tools.contains(&item.to_string()) {
+ tools.push(item.to_string());
+ }
+ }
+ self.pinned_tools = tools;
+ }
if let Ok(preference) = serde_json::from_value::(v["theme"].clone()) {
self.set_theme_preference(preference);
}
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
index 7cd417d863..71e6e14e07 100644
--- a/crates/ui-egui/src/panels.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -58,7 +58,11 @@ fn all_tools(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens) {
egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
let shown = if app.all_tools_expanded { TOOL_GROUPS.len() } else { COLLAPSED_TOOLS.min(TOOL_GROUPS.len()) };
for g in &TOOL_GROUPS[..shown] {
- if tool_row(ui, t, g).clicked() {
+ let pinned = app.is_tool_pinned(g.id);
+ let (resp, pin_clicked) = tool_row(ui, t, g, pinned);
+ if pin_clicked {
+ app.toggle_pin_tool(g.id);
+ } else if resp.clicked() {
app.select_tool(g.id);
}
}
@@ -89,21 +93,29 @@ fn row_label(ui: &mut egui::Ui, text: &str, font: egui::FontId, color: Color32,
elided
}
-fn tool_row(ui: &mut egui::Ui, t: &Tokens, g: &ToolGroup) -> egui::Response {
+fn tool_row(ui: &mut egui::Ui, t: &Tokens, g: &ToolGroup, is_pinned: bool) -> (egui::Response, bool) {
let (rect, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 34.0), Sense::click());
resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl!(g.label)));
let press = theme::Press::track(ui, &resp);
press.wash(ui, rect, 6, false);
let body = rect.translate(press.offset());
icons::paint(ui, Rect::from_min_size(body.min + vec2(6.0, 7.0), vec2(20.0, 20.0)), g.icon, 19.0, hue(g));
- let right_reserved = match (g.badge, g.availability) {
- (Some(b), _) => ui.fonts_mut(|f| f.layout_no_wrap(tl!(b).to_owned(), theme::semibold(9.5), Color32::WHITE).size().x) + 26.0,
+
+ let pin_rect = Rect::from_center_size(body.right_center() - vec2(14.0, 0.0), vec2(22.0, 22.0));
+ let pin_resp = ui.interact(pin_rect, ui.id().with(("pin_toggle_row", g.id)), Sense::click());
+ let pin_hovered = pin_resp.hovered();
+ let mut pin_clicked = false;
+
+ let pin_space = 26.0;
+ let badge_or_hint_reserved = match (g.badge, g.availability) {
+ (Some(b), _) => ui.fonts_mut(|f| f.layout_no_wrap(tl!(b).to_owned(), theme::semibold(9.5), Color32::WHITE).size().x) + 18.0,
(None, Availability::Planned(m)) if resp.hovered() => {
let hint = format!("{} · {m}", tl!("Planned"));
- ui.fonts_mut(|f| f.layout_no_wrap(hint, theme::medium(10.5), t.text_faint).size().x) + 18.0
+ ui.fonts_mut(|f| f.layout_no_wrap(hint, theme::medium(10.5), t.text_faint).size().x) + 10.0
}
- _ => 8.0,
+ _ => 0.0,
};
+ let right_reserved = pin_space + badge_or_hint_reserved + 8.0;
let clipped =
row_label(ui, tl!(g.label), theme::regular(13.5), t.text, body.left_center() + vec2(36.0, 0.0), rect.width() - 36.0 - right_reserved);
match (g.badge, g.availability) {
@@ -111,14 +123,14 @@ fn tool_row(ui: &mut egui::Ui, t: &Tokens, g: &ToolGroup) -> egui::Response {
let font = theme::semibold(9.5);
let badge = tl!(b);
let w = ui.fonts_mut(|f| f.layout_no_wrap(badge.to_string(), font.clone(), Color32::WHITE).size().x);
- let r = Rect::from_center_size(body.right_center() - vec2(w / 2.0 + 10.0, 0.0), vec2(w + 10.0, 16.0));
+ let r = Rect::from_center_size(body.right_center() - vec2(pin_space + w / 2.0 + 4.0, 0.0), vec2(w + 10.0, 16.0));
ui.painter().rect_filled(r, CornerRadius::same(4), t.badge_new);
ui.painter().text(r.center(), Align2::CENTER_CENTER, badge, font, Color32::WHITE);
}
// Planned tools: a quiet milestone hint instead of a chip, so the list stays calm.
(None, Availability::Planned(m)) if resp.hovered() => {
ui.painter().text(
- body.right_center() - vec2(10.0, 0.0),
+ body.right_center() - vec2(pin_space + 4.0, 0.0),
Align2::RIGHT_CENTER,
format!("{} · {m}", tl!("Planned")),
theme::medium(10.5),
@@ -127,13 +139,34 @@ fn tool_row(ui: &mut egui::Ui, t: &Tokens, g: &ToolGroup) -> egui::Response {
}
_ => {}
}
+
+ let row_hovered = ui.rect_contains_pointer(rect) || resp.hovered();
+ if is_pinned || row_hovered || pin_hovered {
+ if pin_hovered {
+ ui.painter().rect_filled(pin_rect, CornerRadius::same(4), t.pressed);
+ }
+ let pin_tint = if is_pinned {
+ t.accent_text
+ } else if pin_hovered {
+ t.text
+ } else {
+ t.text_faint
+ };
+ icons::paint(ui, pin_rect.shrink(3.0), "pin", 15.0, pin_tint);
+ let tip = if is_pinned { tl!("Unpin from Home") } else { tl!("Pin to Home") };
+ pin_resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tip));
+ if theme::hand(pin_resp).on_hover_text(tip).clicked() {
+ pin_clicked = true;
+ }
+ }
+
let tip = match g.availability {
Availability::Ready => tl!("Available").to_string(),
Availability::Planned(m) => format!("{} {m} — {}", tl!("Planned for milestone"), tl!("open to see what it will include")),
Availability::Provider => tl!("Optional: needs an AI provider you configure").into(),
};
let tip = if clipped { format!("{} — {tip}", tl!(g.label)) } else { tip };
- theme::hand(resp).on_hover_text(tip)
+ (theme::hand(resp).on_hover_text(tip), pin_clicked)
}
fn tool_detail(app: &mut PdfCraftApp, ui: &mut egui::Ui, t: &Tokens, g: &'static ToolGroup) {
diff --git a/crates/ui-egui/tests/pinned_tools.rs b/crates/ui-egui/tests/pinned_tools.rs
new file mode 100644
index 0000000000..55c84bc528
--- /dev/null
+++ b/crates/ui-egui/tests/pinned_tools.rs
@@ -0,0 +1,163 @@
+//! Pinned tools on Home: pin tools, unpin tools, persistence across sessions,
+//! selection modal, and the sidebar pin toggle.
+
+use egui_kittest::Harness;
+use egui_kittest::kittest::Queryable;
+use pdfcraft_ui_egui::{Dialog, LeftPanel, PdfCraftApp};
+
+fn harness(setup: impl FnOnce(&mut PdfCraftApp) + 'static) -> Harness<'static, PdfCraftApp> {
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 1000.0)).build_eframe(move |_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.run_inline = true;
+ setup(&mut app);
+ app
+ });
+ h.run_steps(4);
+ h
+}
+
+#[test]
+fn state_operations_and_validation() {
+ let mut app = PdfCraftApp::new();
+ assert!(!app.is_tool_pinned("redact"));
+
+ // Pinning a valid tool
+ assert!(app.pin_tool("redact"));
+ assert!(app.is_tool_pinned("redact"));
+ assert_eq!(app.pinned_tools, vec!["redact"]);
+
+ // Pinning already pinned tool returns false (no duplicates)
+ assert!(!app.pin_tool("redact"));
+ assert_eq!(app.pinned_tools, vec!["redact"]);
+
+ // Pinning an invalid tool returns false
+ assert!(!app.pin_tool("invalid_tool_unknown_id"));
+ assert_eq!(app.pinned_tools, vec!["redact"]);
+
+ // Pinning a second valid tool
+ assert!(app.pin_tool("form"));
+ assert_eq!(app.pinned_tools, vec!["redact", "form"]);
+
+ // Unpinning
+ app.unpin_tool("redact");
+ assert!(!app.is_tool_pinned("redact"));
+ assert!(app.is_tool_pinned("form"));
+ assert_eq!(app.pinned_tools, vec!["form"]);
+
+ // Unpinning non-existent tool does nothing
+ app.unpin_tool("nonexistent");
+ assert_eq!(app.pinned_tools, vec!["form"]);
+
+ // Toggling
+ assert!(!app.toggle_pin_tool("form")); // unpins
+ assert!(!app.is_tool_pinned("form"));
+ assert!(app.pinned_tools.is_empty());
+
+ assert!(app.toggle_pin_tool("form")); // pins
+ assert!(app.is_tool_pinned("form"));
+ assert_eq!(app.pinned_tools, vec!["form"]);
+}
+
+#[test]
+fn persistence_round_trip_and_sanitization() {
+ let mut app = PdfCraftApp::new();
+ app.pin_tool("protect");
+ app.pin_tool("redact");
+
+ let saved = app.persist();
+ assert!(saved.contains("\"pinned_tools\""));
+
+ let mut restored = PdfCraftApp::new();
+ restored.restore(&saved);
+ assert_eq!(restored.pinned_tools, vec!["protect", "redact"]);
+
+ // Test sanitization: unknown tools are discarded and duplicates are removed, preserving order
+ let malicious_or_corrupt = serde_json::json!({
+ "pinned_tools": ["redact", "nonexistent_junk", "redact", "edit", "another_unknown", "protect"]
+ })
+ .to_string();
+ restored.restore(&malicious_or_corrupt);
+ assert_eq!(restored.pinned_tools, vec!["redact", "edit", "protect"]);
+}
+
+#[test]
+fn home_shows_pinned_tools_section_and_placeholder() {
+ let mut h = harness(|_| {});
+ // When no tools are pinned, the placeholder message appears
+ h.get_by_label_contains("Pinned Tools");
+ h.get_by_label_contains("Pin your favorite tools here for quick access.");
+ h.get_by_label("Pin a tool…");
+
+ // Pin a tool and step forward
+ h.state_mut().pin_tool("redact");
+ h.run_steps(3);
+
+ // Placeholder is gone and Redact card is shown
+ assert!(h.query_by_label_contains("Pin your favorite tools here for quick access.").is_none());
+ assert!(h.query_all_by_label("Redact a PDF").count() >= 1);
+
+ // Unpin tool and verify placeholder returns
+ h.state_mut().unpin_tool("redact");
+ h.run_steps(3);
+ h.get_by_label_contains("Pin your favorite tools here for quick access.");
+}
+
+#[test]
+fn clicking_pinned_tool_card_selects_it() {
+ let mut h = harness(|app| {
+ app.pin_tool("redact");
+ });
+ h.run_steps(2);
+
+ // The Redact card is rendered and can be clicked to select the tool
+ let nodes: Vec<_> = h.query_all_by_label("Redact a PDF").collect();
+ assert!(!nodes.is_empty());
+ // Click the card
+ nodes.last().unwrap().click();
+ h.run_steps(3);
+
+ // Redact tool panel is now active
+ assert_eq!(h.state().left, LeftPanel::Tool("redact"));
+}
+
+#[test]
+fn pin_tool_dialog_workflow() {
+ let mut h = harness(|app| {
+ app.dialog = Some(Dialog::PinTool);
+ });
+ h.run_steps(3);
+
+ // Modal is open
+ h.get_by_label_contains("Pin tools to Home");
+ h.get_by_label("Done");
+
+ // Pin a tool from inside the dialog
+ assert!(!h.state().is_tool_pinned("scan"));
+ h.state_mut().toggle_pin_tool("scan");
+ assert!(h.state().is_tool_pinned("scan"));
+ h.run_steps(2);
+
+ // Close dialog with "Done"
+ h.get_by_label("Done").click();
+ h.run_steps(2);
+ assert!(h.state().dialog.is_none());
+}
+
+#[test]
+fn sidebar_pin_toggle_unpins_and_pins() {
+ let mut h = harness(|app| {
+ app.pin_tool("redact");
+ });
+ h.run_steps(2);
+ assert!(h.state().is_tool_pinned("redact"));
+
+ // Since redact is pinned, the pin toggle is rendered in the sidebar with "Unpin from Home"
+ let unpin_btn = h.get_by_label("Unpin from Home");
+ unpin_btn.click();
+ h.run_steps(3);
+
+ assert!(!h.state().is_tool_pinned("redact"));
+ // Left panel did not navigate away (still AllTools)
+ assert_eq!(h.state().left, LeftPanel::AllTools);
+}
From 1d5c20c5c41ac268110bcf67e3638a69440592eb Mon Sep 17 00:00:00 2001
From: FredApps <153173854+FredApps@users.noreply.github.com>
Date: Thu, 15 Oct 2026 20:02:36 +0200
Subject: [PATCH 024/462] Support typed font sizes and Fill and Sign text
colours (#2444, #2496)
---
ROADMAP.md | 2 +
crates/automation/README.md | 7 +++
crates/automation/src/comments.rs | 9 ++-
crates/automation/src/tools.rs | 3 +-
crates/automation/tests/automation.rs | 32 +++++++++++
crates/ui-egui/src/canvas.rs | 9 +++
crates/ui-egui/src/content_ui.rs | 83 +++++++++++++++++++++++++--
crates/ui-egui/src/editing.rs | 2 +-
crates/ui-egui/src/fill_sign.rs | 34 +++++++++--
crates/ui-egui/src/lib.rs | 9 +++
crates/ui-egui/tests/control.rs | 10 +++-
crates/ui-egui/tests/editing.rs | 35 +++++++++++
crates/ui-egui/tests/fill_sign.rs | 51 +++++++++++++++-
docs/roadmap.md | 2 +
parity/acrobat-features.toml | 12 ++--
15 files changed, 275 insertions(+), 25 deletions(-)
diff --git a/ROADMAP.md b/ROADMAP.md
index fe9723fdf6..88625a7f41 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,5 +1,7 @@
# PdfCraft roadmap
+> **Last reviewed:** 2026-10-15 · **Last updated:** 2026-10-15 · **Change:** minor (typed small Edit font sizes and Fill & Sign text/date colour, #2444/#2496; estimates unchanged)
+
**Stage: alpha** · next: beta, ~25% (ready for real work 50% → 75%) and ~400–700 h away
> **Last reviewed:** 2026-10-13 · **Last updated:** 2026-10-14 · **Change:** minor (M14: the Italian catalog has every entry the other catalogs had and the code looks up; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
diff --git a/crates/automation/README.md b/crates/automation/README.md
index 4e27702a32..ddd844df1e 100644
--- a/crates/automation/README.md
+++ b/crates/automation/README.md
@@ -209,3 +209,10 @@ behavior. Back/Forward
returns to page tops, does not restore zoom, does not switch documents, and is not saved across
restarts. Standalone engine/MCP sessions have no viewport, so they do not have a separate
navigation-history tool; use the opt-in UI control channel to navigate the displayed document.
+
+## Fill & Sign text appearance
+
+`fill_sign_add` accepts `font_size` (4–300 pt, default 10) and `color`
+(`#RRGGBB`, default black) for `text` and `date`. The colour is saved in the
+FreeText appearance and survives reopening. Other mark/signature types reject
+`color`; their appearance controls are separate.
diff --git a/crates/automation/src/comments.rs b/crates/automation/src/comments.rs
index 302688f729..481d75f741 100644
--- a/crates/automation/src/comments.rs
+++ b/crates/automation/src/comments.rs
@@ -477,6 +477,10 @@ impl Automation {
if sensitivity.is_some() && !scan {
return Err(ToolError::InvalidArgs("sensitivity is only for scan: true".into()));
}
+ let requested_color = a.color("color")?;
+ if requested_color.is_some() && !matches!(kind, "text" | "date") {
+ return Err(ToolError::InvalidArgs("color is only for type text or date".into()));
+ }
let requested_size = a.opt_num("font_size")?;
if requested_size.is_some() && !matches!(kind, "text" | "date") {
return Err(ToolError::InvalidArgs("font_size is only for type text or date".into()));
@@ -555,7 +559,10 @@ impl Automation {
(Shape::Mark { rect: [at[0] - w / 2.0, at[1] - h / 2.0, at[0] + w / 2.0, at[1] + h / 2.0], mark }, String::new())
}
};
- let style = Style::default_for(&shape);
+ let mut style = Style::default_for(&shape);
+ if let Some(color) = requested_color {
+ style.color = color;
+ }
self.apply(a, Edit::AddAnnotation(NewAnnotation { page, shape, style, contents, author }))
}
diff --git a/crates/automation/src/tools.rs b/crates/automation/src/tools.rs
index 5e89aef78a..1bf59596f6 100644
--- a/crates/automation/src/tools.rs
+++ b/crates/automation/src/tools.rs
@@ -1162,7 +1162,7 @@ pub fn tools() -> Vec {
t(
"fill_sign_add",
"Fill & Sign: type text or place a mark",
- "Fill in a form that has no fields, as Acrobat's Fill & Sign does: type text (`text`, default 10 pt; `font_size` 4–300 pt), place a check, cross, dot or line, today's date (in Preferences ▸ Date format, see fill_sign_date_format, or `format`; `font_size` also applies), or a signature or initials (either `text` drawn in a script font, or `path` to a local PNG/JPEG image up to 4 MiB and 32 megapixels, scaled down to 4 megapixels, preserving transparency; with `scan: true`, `path` is instead a photo of a signature on paper, within the same limits: the signature is found, and the paper, shadows and table around it are removed, with `sensitivity` 0–100, default 50, picking up fainter ink when higher). `at` [x, y] is in points from the top-left of the page: text's top-left, mark's centre, signature's left edge centred vertically. Image signatures fit within 150 pt wide and 32 pt tall (24 pt for initials). Creates movable, undoable annotations. Typed text the standard fonts can't draw is saved and drawn as `?` (`warnings` in the result says so); a typed signature neither the script font nor its fallback can draw is refused (pass `path` instead).",
+ "Fill in a form that has no fields, as Acrobat's Fill & Sign does: type text (`text`, default 10 pt; `font_size` 4–300 pt; optional `color` as #RRGGBB for text/date, default black), place a check, cross, dot or line, today's date (in Preferences ▸ Date format, see fill_sign_date_format, or `format`; `font_size` also applies), or a signature or initials (either `text` drawn in a script font, or `path` to a local PNG/JPEG image up to 4 MiB and 32 megapixels, scaled down to 4 megapixels, preserving transparency; with `scan: true`, `path` is instead a photo of a signature on paper, within the same limits: the signature is found, and the paper, shadows and table around it are removed, with `sensitivity` 0–100, default 50, picking up fainter ink when higher). `at` [x, y] is in points from the top-left of the page: text's top-left, mark's centre, signature's left edge centred vertically. Image signatures fit within 150 pt wide and 32 pt tall (24 pt for initials). Creates movable, undoable annotations. Typed text the standard fonts can't draw is saved and drawn as `?` (`warnings` in the result says so); a typed signature neither the script font nor its fallback can draw is refused (pass `path` instead).",
)
.cmd("sign.fill.text")
.with(schema(
@@ -1173,6 +1173,7 @@ pub fn tools() -> Vec {
"at": point(),
"text": { "type": "string", "minLength": 1 },
"font_size": { "type": "number", "minimum": 4, "maximum": 300, "description": "For type text or date (default 10 pt)." },
+ "color": color(),
"path": { "type": "string", "description": "PNG or JPEG for signature/initials; pass either path or text." },
"scan": { "type": "boolean", "description": "With path: scan a photo of a signature on paper (default false)." },
"sensitivity": { "type": "integer", "minimum": 0, "maximum": 100, "description": "With scan: how faint ink may be, 0–100 (default 50)." },
diff --git a/crates/automation/tests/automation.rs b/crates/automation/tests/automation.rs
index 1e662d8f38..21b1794cf1 100644
--- a/crates/automation/tests/automation.rs
+++ b/crates/automation/tests/automation.rs
@@ -2785,6 +2785,38 @@ fn fill_sign_text_font_size_is_saved_and_validated() {
));
}
+#[test]
+fn fill_sign_text_and_date_colours_are_saved_and_validated() {
+ let dir = workdir("fill-sign-text-colour");
+ let mut a = auto(&dir);
+ let doc = ok(&mut a, "doc_open", json!({ "path": "a.pdf" }))["doc"].as_u64().unwrap();
+ for (kind, y) in [("text", 40), ("date", 80)] {
+ ok(
+ &mut a,
+ "fill_sign_add",
+ json!({ "doc": doc, "page": 1, "type": kind, "at": [20, y], "text": "Blue", "color": "#3366CC", "font_size": 6.5 }),
+ );
+ }
+ for (kind, color) in [("text", "not-a-colour"), ("signature", "#3366CC"), ("check", "#3366CC")] {
+ assert!(matches!(
+ a.call("fill_sign_add", &json!({ "doc": doc, "page": 1, "type": kind, "at": [20, 100], "text": "No", "color": color })),
+ Err(ToolError::InvalidArgs(_))
+ ));
+ }
+ ok(&mut a, "doc_save", json!({ "doc": doc, "path": "coloured.pdf" }));
+ let pdf = pdfcraft_cos::Document::open(std::sync::Arc::new(std::fs::read(dir.join("coloured.pdf")).unwrap())).unwrap();
+ let page = pdfcraft_model::pages(&pdf).remove(0);
+ let annotations = pdf.resolve(page.dict.get(b"Annots").unwrap());
+ let annotations = annotations.as_array().unwrap();
+ assert_eq!(annotations.len(), 2, "invalid requests add nothing");
+ for reference in annotations {
+ let annotation = pdf.resolve(reference);
+ // FreeText stores its text colour in DA; C is the annotation background.
+ let da = annotation.as_dict().unwrap().get(b"DA").unwrap().as_string().unwrap();
+ assert_eq!(String::from_utf8(da.bytes.to_vec()).unwrap(), "0.2 0.4 0.8 rg /Helv 6.5 Tf");
+ }
+}
+
#[test]
fn image_signatures_through_tools_preserve_transparency_and_survive_save() {
let dir = workdir("image-signatures");
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 989b731b7e..42454d7d9a 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -2850,6 +2850,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
info,
ft,
app.fill_text_size,
+ app.fill_text_color,
view,
signature.as_ref(),
initials.as_ref(),
@@ -4436,6 +4437,14 @@ fn quick_bar(app: &mut PdfCraftApp, area: Rect, ui: &mut egui::Ui) {
.suffix(" pt"),
);
}
+ if matches!(current_fill, Some(crate::fill_sign::FillTool::Text | crate::fill_sign::FillTool::Date)) {
+ ui.menu_button(tl!("Colour"), |ui| {
+ if let Some(color) = comments::swatch_grid(ui, Some(app.fill_text_color)) {
+ app.fill_text_color = color;
+ ui.close();
+ }
+ });
+ }
if let QuickTool::Comment(tool) = app.quick_tool {
let (r, _) = ui.allocate_exact_size(vec2(32.0, 9.0), Sense::hover());
ui.painter().hline(r.x_range().shrink(6.0), r.center().y, Stroke::new(1.0, t.divider));
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index 5f5ef32f77..110e608150 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -605,6 +605,43 @@ fn finish(cv: &mut ContentView, d: TextDraft, added: &[Added]) -> Option {
}
}
+/// Commit a typed size once (Enter or leaving the field), rather than one undo step per key.
+/// The bounds match AddedText validation, so the panel also accepts coloured text below 8 pt.
+fn font_size_input(ui: &mut egui::Ui, size: &mut f64) {
+ let id = ui.make_persistent_id("font-size-input");
+ let (previous, mut text) = ui.data(|d| d.get_temp::<(u64, String)>(id)).unwrap_or_else(|| (size.to_bits(), size.to_string()));
+ if previous != size.to_bits() {
+ text = size.to_string();
+ }
+ let response = ui.add(egui::TextEdit::singleline(&mut text).id(id).desired_width(44.0));
+ response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::TextEdit, ui.is_enabled(), tl!("Font size:")));
+ let cancel = response.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Escape));
+ if cancel {
+ text = size.to_string();
+ response.surrender_focus();
+ } else if response.lost_focus() || (response.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter))) {
+ if let Some(value) = typed_font_size(&text) {
+ *size = value;
+ }
+ text = size.to_string();
+ }
+ let before = *size;
+ egui::ComboBox::from_id_salt("font-size").selected_text("pt").width(28.0).show_ui(ui, |ui| {
+ for value in [4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
+ ui.selectable_value(size, value, format!("{value} pt"));
+ }
+ });
+ if *size != before {
+ text = size.to_string();
+ }
+ ui.data_mut(|d| d.insert_temp(id, (size.to_bits(), text)));
+}
+
+fn typed_font_size(text: &str) -> Option {
+ let value = text.trim().parse::().ok()?;
+ (value.is_finite() && (1.0..=500.0).contains(&value)).then_some(value)
+}
+
/// Format text (shown in the Edit panel while a text item is selected, or for new text).
/// Returns the changed style; for a selected item the caller turns it into an update.
pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) -> Option {
@@ -616,12 +653,7 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
ui.selectable_value(&mut s.family, f, f.label());
}
});
- // A list rather than a drag value: every change is an undo step.
- egui::ComboBox::from_id_salt("font-size").selected_text(format!("{} pt", s.size)).width(70.0).show_ui(ui, |ui| {
- for size in [8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 36.0, 48.0, 72.0] {
- ui.selectable_value(&mut s.size, size, format!("{size} pt"));
- }
- });
+ font_size_input(ui, &mut s.size);
});
ui.horizontal(|ui| {
if ui.selectable_label(s.bold, egui::RichText::new("B").strong()).on_hover_text(tl!("Bold")).clicked() {
@@ -911,6 +943,45 @@ mod tests {
use super::*;
+ #[test]
+ fn typed_sizes_accept_small_fractional_values_and_reject_invalid_input() {
+ for value in ["1", "4", "6.5", " 13.25 ", "500"] {
+ assert_eq!(typed_font_size(value), Some(value.trim().parse().unwrap()));
+ }
+ for value in ["", "0", "-1", "0.5", "501", "NaN", "inf", "1e999", "small"] {
+ assert_eq!(typed_font_size(value), None, "{value}");
+ }
+ }
+
+ #[test]
+ fn typed_size_commits_once_and_invalid_input_preserves_the_style() {
+ let mut h = egui_kittest::Harness::new_ui_state(
+ |ui, state: &mut (f64, usize)| {
+ let before = state.0;
+ ui.horizontal(|ui| font_size_input(ui, &mut state.0));
+ if state.0 != before {
+ state.1 += 1;
+ }
+ },
+ (12.0, 0),
+ );
+ h.run();
+ let enter = || egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };
+ let select_all =
+ || egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND };
+ for (text, expected, changes) in [("6.5", 6.5, 1), ("NaN", 6.5, 1), ("0", 6.5, 1), ("13.25", 13.25, 2)] {
+ h.get_by_role_and_label(egui::accesskit::Role::TextInput, "Font size:").click();
+ h.run();
+ h.event(select_all());
+ h.event(egui::Event::Text(text.into()));
+ h.run_steps(2);
+ assert_eq!(h.state().1, changes - usize::from(text == "6.5" || text == "13.25"), "typing alone does not commit");
+ h.event(enter());
+ h.run_steps(2);
+ assert_eq!(*h.state(), (expected, changes));
+ }
+ }
+
/// The image a flip button leaves behind, as the panel returns it.
fn flipped(tooltip: &str) -> pdfcraft_engine::AddedImage {
let img = pdfcraft_engine::AddedImage::new([0.0, 0.0, 100.0, 50.0], pdfcraft_cos::ObjRef::new(7, 0));
diff --git a/crates/ui-egui/src/editing.rs b/crates/ui-egui/src/editing.rs
index be1347d68d..38a26b871b 100644
--- a/crates/ui-egui/src/editing.rs
+++ b/crates/ui-egui/src/editing.rs
@@ -531,7 +531,7 @@ impl PdfCraftApp {
}
let author = self.comment_prefs.author.clone();
let rotation = self.session.get(id).map_or(0, |doc| crate::comments::page_rotation(&doc.info, tb.page));
- let edit = crate::fill_sign::typed(tb.page, tb.at, &text, tb.size, rotation, &author);
+ let edit = crate::fill_sign::typed_with_color(tb.page, tb.at, &text, tb.size, rotation, &author, tb.color);
if self.apply_edit(edit) {
if let Some(view) = self.views.get_mut(i) {
view.fill_text = None;
diff --git a/crates/ui-egui/src/fill_sign.rs b/crates/ui-egui/src/fill_sign.rs
index 794fe0bf1b..084b5290f4 100644
--- a/crates/ui-egui/src/fill_sign.rs
+++ b/crates/ui-egui/src/fill_sign.rs
@@ -404,6 +404,7 @@ pub struct TypeBox {
pub at: [f64; 2],
pub text: String,
pub size: f64,
+ pub color: [f64; 3],
pub focus: bool,
}
@@ -416,6 +417,10 @@ pub fn valid_text_size(size: f64) -> Option {
(size.is_finite() && (MIN_TEXT_SIZE..=MAX_TEXT_SIZE).contains(&size)).then_some(size)
}
+pub fn valid_text_color(color: [f64; 3]) -> Option<[f64; 3]> {
+ color.iter().all(|v| v.is_finite() && (0.0..=1.0).contains(v)).then_some(color)
+}
+
fn to_user(xf: &PageXform, info: &DocInfo, page: usize, p: Pos2) -> [f64; 2] {
let (vx, vy) = xf.screen_to_view(p);
let u = info.pages[page].view_to_user(vx, vy);
@@ -430,8 +435,16 @@ fn new(page: usize, shape: Shape, contents: String, author: &str) -> Edit {
/// A typewriter annotation sized to its text, its displayed top-left at `at` on a page turned by
/// `rotation` (its `/Rotate`).
pub fn typed(page: usize, at: [f64; 2], text: &str, size: f64, rotation: i64, author: &str) -> Edit {
+ typed_with_color(page, at, text, size, rotation, author, [0.0; 3])
+}
+
+/// Typed text/date colour applies to its annotation appearance and survives saving.
+pub fn typed_with_color(page: usize, at: [f64; 2], text: &str, size: f64, rotation: i64, author: &str, color: [f64; 3]) -> Edit {
let rect = crate::comments::text_box_rect(at, text, size, rotation);
- new(page, Shape::Typewriter { rect, font_size: size }, text.to_string(), author)
+ let shape = Shape::Typewriter { rect, font_size: size };
+ let mut style = Style::default_for(&shape);
+ style.color = valid_text_color(color).unwrap_or([0.0; 3]);
+ Edit::AddAnnotation(NewAnnotation { page, shape, style, contents: text.to_string(), author: author.to_string() })
}
/// Place a saved signature (strokes normalised to a 0–1 box, y up) with its left edge at `at`,
@@ -620,6 +633,7 @@ pub(crate) fn page_input(
info: &DocInfo,
tool: FillTool,
text_size: f64,
+ text_color: [f64; 3],
view: &mut DocView,
signature: Option<&SavedSig>,
initials: Option<&SavedSig>,
@@ -657,13 +671,21 @@ pub(crate) fn page_input(
FillTool::Text => {
// Clicking away from an open box commits it: the page sees this click before the box
// sees its lost focus, so replacing the box first would drop what was typed.
- let open = view.fill_text.replace(TypeBox { page, at: top, text: String::new(), size: text_size, focus: true });
+ let open = view.fill_text.replace(TypeBox { page, at: top, text: String::new(), size: text_size, color: text_color, focus: true });
open.filter(|tb| !tb.text.trim().is_empty()).map(|tb| {
- FillAction::Edit(Box::new(typed(tb.page, tb.at, tb.text.trim(), tb.size, crate::comments::page_rotation(info, tb.page), author)))
+ FillAction::Edit(Box::new(typed_with_color(
+ tb.page,
+ tb.at,
+ tb.text.trim(),
+ tb.size,
+ crate::comments::page_rotation(info, tb.page),
+ author,
+ tb.color,
+ )))
})
}
FillTool::Date => Some(match date_text {
- Ok(text) => FillAction::Edit(Box::new(typed(page, top, text, text_size, rotation, author))),
+ Ok(text) => FillAction::Edit(Box::new(typed_with_color(page, top, text, text_size, rotation, author, text_color))),
Err(why) => FillAction::Refused(why.clone()),
}),
FillTool::Signature => match signature {
@@ -719,7 +741,7 @@ pub(crate) fn type_box(ctx: &egui::Context, view: &mut DocView, info: &DocInfo,
.font(egui::FontId::proportional((t.size as f32 * zoom).max(8.0)))
.desired_width(width)
.background_color(Color32::from_rgba_unmultiplied(255, 255, 255, 230))
- .text_color(Color32::BLACK)
+ .text_color(crate::comments::color32(t.color))
.hint_text(tl!("Type text"))
.id_salt("fill-text-edit"),
);
@@ -740,7 +762,7 @@ pub(crate) fn type_box(ctx: &egui::Context, view: &mut DocView, info: &DocInfo,
if commit {
let tb = view.fill_text.take()?;
if !tb.text.trim().is_empty() {
- return Some(typed(tb.page, tb.at, tb.text.trim(), tb.size, crate::comments::page_rotation(info, tb.page), author));
+ return Some(typed_with_color(tb.page, tb.at, tb.text.trim(), tb.size, crate::comments::page_rotation(info, tb.page), author, tb.color));
}
}
None
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index d101d812e0..576784e190 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -550,6 +550,8 @@ pub struct PdfCraftApp {
pub flatten_fill_sign_on_save: bool,
/// Point size for new Fill & Sign text and dates, kept across launches.
pub fill_text_size: f64,
+ /// Colour for new Fill & Sign text and dates, kept across launches.
+ pub fill_text_color: [f64; 3],
pub dialog: Option,
/// How to ask for the latest release (the desktop app sets it; see `updates`).
pub update_source: Option,
@@ -921,6 +923,7 @@ impl PdfCraftApp {
ui_scale_applied: None,
flatten_fill_sign_on_save: false,
fill_text_size: fill_sign::TEXT_SIZE,
+ fill_text_color: [0.0; 3],
dialog: None,
update_source: None,
updates: updates::Updates::default(),
@@ -2276,6 +2279,7 @@ impl PdfCraftApp {
"right_panel_closed": self.right_panel_closed,
});
// Set apart: one more key inside the macro above passes serde_json's recursion limit.
+ v["fill_text_color"] = serde_json::json!(self.fill_text_color);
v["redact_prefs"] = self.redact_defaults.to_json();
// Set outside json! above, which is at serde_json's macro recursion limit.
v["hide_empty_highlight_hover"] = serde_json::Value::Bool(self.comment_prefs.hide_empty_highlight_hover);
@@ -2357,6 +2361,11 @@ impl PdfCraftApp {
if let Some(size) = v["fill_text_size"].as_f64().and_then(fill_sign::valid_text_size) {
self.fill_text_size = size;
}
+ if let Ok(color) = serde_json::from_value::<[f64; 3]>(v["fill_text_color"].clone())
+ && let Some(color) = fill_sign::valid_text_color(color)
+ {
+ self.fill_text_color = color;
+ }
if let Some(prefs) = RedactPrefs::from_json(&v["redact_prefs"]) {
self.redact_prefs = prefs.clone();
self.redact_defaults = prefs;
diff --git a/crates/ui-egui/tests/control.rs b/crates/ui-egui/tests/control.rs
index 88ed1c0a90..a93e035c77 100644
--- a/crates/ui-egui/tests/control.rs
+++ b/crates/ui-egui/tests/control.rs
@@ -1425,8 +1425,14 @@ fn rail_reveals_its_remembered_inactive_inspector_then_closes_the_visible_panel(
#[test]
fn control_quit_retains_inactive_fill_sign_typing_after_cancel() {
let (mut h, c) = harness();
- h.state_mut().views[0].fill_text =
- Some(pdfcraft_ui_egui::fill_sign::TypeBox { page: 0, at: [40.0, 200.0], text: "Unsaved signature note".into(), size: 10.0, focus: false });
+ h.state_mut().views[0].fill_text = Some(pdfcraft_ui_egui::fill_sign::TypeBox {
+ page: 0,
+ at: [40.0, 200.0],
+ text: "Unsaved signature note".into(),
+ size: 10.0,
+ color: [0.0; 3],
+ focus: false,
+ });
h.state_mut().active = None;
assert!(!h.state().session.get(h.state().views[0].id).unwrap().dirty);
assert_eq!(ok(&mut h, &c, "ui.quit", json!({})), json!({"quitting":false,"needs_confirmation":true}));
diff --git a/crates/ui-egui/tests/editing.rs b/crates/ui-egui/tests/editing.rs
index f8db525751..4a31784246 100644
--- a/crates/ui-egui/tests/editing.rs
+++ b/crates/ui-egui/tests/editing.rs
@@ -2876,6 +2876,41 @@ fn the_format_panel_restyles_the_paragraph_being_edited() {
assert!(s.views[0].line_editor.as_ref().is_some_and(|e| e.extras.underline));
}
+#[test]
+fn typed_small_coloured_text_size_survives_save_and_reopen() {
+ let mut h = harness(1, |_| {});
+ assert!(h.state_mut().execute("edit.edit_text"));
+ h.run_steps(2);
+ let r = h.state().views[0].page_screen_rect(0).unwrap();
+ let at = egui::pos2(r.left() + 40.0 / 200.0 * r.width(), r.top() + (300.0 - 158.0) / 300.0 * r.height());
+ h.hover_at(at);
+ h.run_steps(1);
+ h.drag_at(at);
+ h.run_steps(1);
+ h.drop_at(at);
+ h.run_steps(3);
+ assert!(h.state().views[0].line_editor.is_some());
+ h.get_by_label("Font size:").click();
+ h.run_steps(1);
+ h.key_press_modifiers(Modifiers::COMMAND, Key::A);
+ h.event(egui::Event::Text("6.5".into()));
+ h.key_press(Key::Enter);
+ h.run_steps(4);
+ h.get_by_label("Blue").click();
+ h.run_steps(4);
+ let id = h.state().views[0].id;
+ let lines = h.state().session.get(id).unwrap().text_lines(0);
+ assert!(!lines.is_empty());
+ for line in &lines {
+ assert!((line.size - 6.5).abs() < 0.01, "{line:?}");
+ assert!(line.color[2] > line.color[0], "the small text stays blue: {line:?}");
+ }
+ let saved = h.state().session.save_bytes(id).unwrap();
+ let mut reopened = pdfcraft_engine::Session::new();
+ let rid = reopened.open("small-blue.pdf", None, saved, None).unwrap();
+ assert_eq!(reopened.get(rid).unwrap().text_lines(0), lines);
+}
+
#[test]
fn selected_text_formatting_keeps_the_rest_of_the_paragraph_and_reopens() {
let mut h = harness(1, |_| {});
diff --git a/crates/ui-egui/tests/fill_sign.rs b/crates/ui-egui/tests/fill_sign.rs
index 27fd6dd8a5..b888e1e23e 100644
--- a/crates/ui-egui/tests/fill_sign.rs
+++ b/crates/ui-egui/tests/fill_sign.rs
@@ -168,6 +168,53 @@ fn fill_text_size_controls_new_text_and_survives_settings_restore() {
assert_eq!(restored.fill_text_size, 24.0, "invalid settings do not change the size");
}
+#[test]
+fn fill_text_colour_survives_preview_commit_settings_and_save() {
+ let mut h = harness();
+ h.state_mut().execute("sign.fill.text");
+ h.run_steps(2);
+ h.get_by_label("Colour").click();
+ h.run_steps(2);
+ h.get_by_label("Blue").click();
+ h.run_steps(2);
+ let color = h.state().fill_text_color;
+ assert!(color[2] > color[0], "blue was selected: {color:?}");
+ click(&mut h, 50.0, 250.0);
+ assert_eq!(h.state().views[0].fill_text.as_ref().unwrap().color, color, "the editor uses the selected colour");
+ h.event(egui::Event::Text("Blue form text".into()));
+ h.run_steps(2);
+ h.key_press(egui::Key::Enter);
+ h.run_steps(3);
+ let id = h.state().views[0].id;
+ let expected = color.map(|v| v as f32);
+ let annotation = h.state().session.get(id).unwrap().info.annotations.iter().find(|a| a.contents.as_deref() == Some("Blue form text")).unwrap();
+ assert_eq!(annotation.color, Some(expected));
+ let bytes = h.state().session.save_bytes(id).unwrap();
+ let reopened = harness_bytes(&bytes);
+ let saved = reopened
+ .state()
+ .session
+ .get(reopened.state().views[0].id)
+ .unwrap()
+ .info
+ .annotations
+ .iter()
+ .find(|a| a.contents.as_deref() == Some("Blue form text"))
+ .unwrap();
+ assert_eq!(saved.color, Some(expected));
+ let mut restored = PdfCraftApp::new();
+ restored.restore(&h.state().persist());
+ assert_eq!(restored.fill_text_color, color);
+ restored.restore(r#"{"fill_text_color":[2,0,0]}"#);
+ assert_eq!(restored.fill_text_color, color, "invalid saved colours are ignored");
+ h.state_mut().execute("edit.undo");
+ h.run_steps(2);
+ assert!(!items(&h).iter().any(|(_, text)| text.as_deref() == Some("Blue form text")));
+ h.state_mut().execute("edit.redo");
+ h.run_steps(2);
+ assert!(items(&h).iter().any(|(_, text)| text.as_deref() == Some("Blue form text")));
+}
+
#[test]
fn the_type_box_grows_as_text_is_typed() {
let mut h = harness();
@@ -995,7 +1042,7 @@ fn saving_flattens_fill_and_sign_only_when_the_preference_is_on() {
app.open_bytes("form.pdf", None, FIXTURE.to_vec()).unwrap();
let id = app.views[0].id;
app.session.apply(id, mark).unwrap();
- app.views[0].fill_text = Some(TypeBox { page: 0, at: [40.0, 200.0], text: "Typed".into(), size: 10.0, focus: false });
+ app.views[0].fill_text = Some(TypeBox { page: 0, at: [40.0, 200.0], text: "Typed".into(), size: 10.0, color: [0.0; 3], focus: false });
let kept = dir.join("kept.pdf");
app.save_override = Some(kept.to_string_lossy().into_owned());
assert!(app.save_active(SaveTarget::InPlace));
@@ -1006,7 +1053,7 @@ fn saving_flattens_fill_and_sign_only_when_the_preference_is_on() {
assert!(texts.iter().any(|t| t == "Typed"), "an open type box is saved: {texts:?}");
assert_eq!(reopened.session.get(reopened.views[0].id).unwrap().info.annotations.len(), 2, "the check mark stays too");
- app.views[0].fill_text = Some(TypeBox { page: 0, at: [40.0, 160.0], text: "More".into(), size: 10.0, focus: false });
+ app.views[0].fill_text = Some(TypeBox { page: 0, at: [40.0, 160.0], text: "More".into(), size: 10.0, color: [0.0; 3], focus: false });
app.flatten_fill_sign_on_save = true;
let flat = dir.join("flat.pdf");
app.save_override = Some(flat.to_string_lossy().into_owned());
diff --git a/docs/roadmap.md b/docs/roadmap.md
index 3148823ea5..ffb34ffd7a 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -1,5 +1,7 @@
# PdfCraft roadmap: milestones and what's next
+> **Last reviewed:** 2026-10-15 · **Last updated:** 2026-10-15 · **Change:** minor (typed small Edit font sizes and Fill & Sign text/date colour, #2444/#2496; estimates unchanged)
+
> **Last reviewed:** 2026-10-13 · **Last updated:** 2026-10-14 · **Change:** minor (M14: the Italian catalog has every entry the other catalogs had and the code looks up, 2,528 entries; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-13 · **Change:** minor (M2/M6: spot-colour images convert once per pixel value; widget placement and the Fields panel scale with the field count; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-14 · **Change:** minor (M3 candidate: coordinate control clicks on slow frames and coalesced text selection; estimates unchanged) · **Target:** Adobe Acrobat Pro (Acrobat DC, continuous track 26.002.21931, macOS)
diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml
index 533013b547..7c35e73b5a 100644
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@ -1926,8 +1926,8 @@ milestone = "M7"
status = "shipped"
commands = ["edit.edit_text", "edit.text"]
tools = ["text_edit", "content_update"]
-evidence = ["crates/edit/src/tests.rs::paragraphs_take_new_formatting", "crates/ui-egui/tests/editing.rs::the_format_panel_restyles_the_paragraph_being_edited", "crates/automation/tests/automation.rs::editing_existing_text_through_tools"]
-notes = "existing paragraphs and added text: font family (Helvetica, Times, Courier) with bold and italic, size, colour; existing paragraphs are rewrapped"
+evidence = ["crates/edit/src/tests.rs::paragraphs_take_new_formatting", "crates/ui-egui/tests/editing.rs::the_format_panel_restyles_the_paragraph_being_edited", "crates/automation/tests/automation.rs::editing_existing_text_through_tools", "crates/ui-egui/src/content_ui.rs::typed_sizes_accept_small_fractional_values_and_reject_invalid_input", "crates/ui-egui/src/content_ui.rs::typed_size_commits_once_and_invalid_input_preserves_the_style", "crates/ui-egui/tests/editing.rs::typed_small_coloured_text_size_survives_save_and_reopen"]
+notes = "existing paragraphs and added text: font family (Helvetica, Times, Courier) with bold and italic, size, colour; existing paragraphs are rewrapped; the Edit font-size field accepts typed fractional values from 1–500 pt, including below 8 pt; Enter/focus loss commits once and invalid input preserves the previous value"
[[feature]]
id = "edit.text-format-style"
@@ -5268,8 +5268,8 @@ milestone = "M5"
status = "shipped"
commands = ["sign.fill.text"]
tools = ["fill_sign_add"]
-evidence = ["crates/ui-egui/tests/fill_sign.rs::text_marks_and_date", "crates/annot/src/tests.rs::fill_and_sign_items_are_drawn", "crates/automation/tests/automation.rs::fill_and_sign_through_tools", "crates/engine/src/tests.rs::typed_text_reads_across_as_displayed_on_rotated_pages"]
-notes = "typewriter FreeText, 10 pt Helvetica. Reads across as displayed on pages with /Rotate (sideways-stored scans): the box follows the displayed axes and the appearance is turned back (PdfCraft key /PCTextRotate); other apps that regenerate the appearance from /DA draw it unturned. A later page rotation does not re-turn it. Field detection does not work on scanned (image-only) forms yet"
+evidence = ["crates/ui-egui/tests/fill_sign.rs::text_marks_and_date", "crates/annot/src/tests.rs::fill_and_sign_items_are_drawn", "crates/automation/tests/automation.rs::fill_and_sign_through_tools", "crates/engine/src/tests.rs::typed_text_reads_across_as_displayed_on_rotated_pages", "crates/ui-egui/tests/fill_sign.rs::fill_text_colour_survives_preview_commit_settings_and_save", "crates/automation/tests/automation.rs::fill_sign_text_and_date_colours_are_saved_and_validated"]
+notes = "typewriter FreeText, 10 pt Helvetica. Reads across as displayed on pages with /Rotate (sideways-stored scans): the box follows the displayed axes and the appearance is turned back (PdfCraft key /PCTextRotate); other apps that regenerate the appearance from /DA draw it unturned. A later page rotation does not re-turn it. Field detection does not work on scanned (image-only) forms yet; text/date colour is selectable, remembered and preserved in saved appearances; fill_sign_add exposes color and font_size"
[[feature]]
id = "form.fill-sign-marks"
@@ -5292,8 +5292,8 @@ milestone = "M5"
status = "shipped"
commands = ["sign.fill.date"]
tools = ["fill_sign_add", "fill_sign_date_format"]
-evidence = ["crates/ui-egui/tests/fill_sign.rs::text_marks_and_date", "crates/automation/tests/automation.rs::fill_and_sign_through_tools", "crates/ui-egui/tests/date_format.rs::fill_and_sign_dates_follow_the_date_format_preference_and_it_is_remembered", "crates/engine/src/dates.rs::presets_write_the_day_in_their_own_order", "crates/engine/src/dates.rs::names_follow_the_date_language", "crates/ui-egui/tests/date_format.rs::month_names_follow_the_date_language_or_else_the_interface_language", "crates/ui-egui/tests/date_format.rs::a_date_the_pdf_cannot_hold_is_refused_with_a_warning_first"]
-notes = "local date in Preferences ▸ Date format (default m/d/yyyy; 12 presets or any pattern in Acrobat date letters with \\ escapes, checked and previewed as typed, remembered; only whole date codes accepted; month and weekday names in the interface languages, Czech months in the genitive after a day, following the interface language unless one is picked; fill_sign_add takes a one-off format and language). Beyond Acrobat: its Fill & Sign has no format setting (only Acrobat Sign accounts do). Missing: Fill & Sign text is Helvetica/WinAnsi, so a date with letters outside Western European (Czech ř, Japanese, Chinese names) is refused with a warning instead of being saved as ?; the OS locale's format isn't offered as a preset; names in languages without an interface translation"
+evidence = ["crates/ui-egui/tests/fill_sign.rs::text_marks_and_date", "crates/automation/tests/automation.rs::fill_and_sign_through_tools", "crates/ui-egui/tests/date_format.rs::fill_and_sign_dates_follow_the_date_format_preference_and_it_is_remembered", "crates/engine/src/dates.rs::presets_write_the_day_in_their_own_order", "crates/engine/src/dates.rs::names_follow_the_date_language", "crates/ui-egui/tests/date_format.rs::month_names_follow_the_date_language_or_else_the_interface_language", "crates/ui-egui/tests/date_format.rs::a_date_the_pdf_cannot_hold_is_refused_with_a_warning_first", "crates/automation/tests/automation.rs::fill_sign_text_and_date_colours_are_saved_and_validated"]
+notes = "local date in Preferences ▸ Date format (default m/d/yyyy; 12 presets or any pattern in Acrobat date letters with \\ escapes, checked and previewed as typed, remembered; only whole date codes accepted; month and weekday names in the interface languages, Czech months in the genitive after a day, following the interface language unless one is picked; fill_sign_add takes a one-off format and language). Beyond Acrobat: its Fill & Sign has no format setting (only Acrobat Sign accounts do). Missing: Fill & Sign text is Helvetica/WinAnsi, so a date with letters outside Western European (Czech ř, Japanese, Chinese names) is refused with a warning instead of being saved as ?; the OS locale's format isn't offered as a preset; names in languages without an interface translation; shares the Fill & Sign text colour preference and tool argument"
[[feature]]
id = "form.fill-sign-signature"
From a9b0db12c62f81beb8d2b57851d650d10bdb37e8 Mon Sep 17 00:00:00 2001
From: alehel
Date: Fri, 16 Oct 2026 10:46:02 +0200
Subject: [PATCH 025/462] fix(edit): show backgrounds on pages that paint their
own white backdrop
Add Background draws behind the page content, so on a page that first
fills itself with opaque white (browsers' Save as PDF, print drivers) the
background was hidden completely and the tool looked broken.
- pdfcraft-edit: new `backdrop` module. A strictly detected backdrop (one
axis-aligned `re`, opaque white in a device colour space, painted before
anything else and covering the crop box) is replaced by turning that one
fill into `n` in a per-page copy of its stream; the original stream is
left untouched for other pages. Remove background restores it, unless
the copy was edited since. Page-sized pictures (scans) are reported only.
- Background gains `replace_backdrop` (default on); the default colour is
a visible light yellow instead of near-white.
- Dialog: offers to replace the backdrop, warns about scanned pages,
checks pages a few per frame, preview draws text over the colour.
- Automation: `doc_background` takes `replace_backdrop`; new read-only
`doc_backdrops` lists pages with a backdrop.
Acrobat's behaviour on such pages is unobserved; recorded as our choice
in parity/.
Co-Authored-By: Claude Opus 5.5
---
ROADMAP.md | 1 +
crates/automation/src/lib.rs | 23 ++
crates/automation/src/tools.rs | 8 +-
crates/automation/tests/backdrop.rs | 109 +++++++++
crates/edit/src/backdrop.rs | 323 +++++++++++++++++++++++++
crates/edit/src/backdrop_tests.rs | 233 ++++++++++++++++++
crates/edit/src/lib.rs | 22 +-
crates/engine/src/lib.rs | 7 +-
crates/ui-egui/src/marks_ui.rs | 101 +++++++-
crates/ui-egui/tests/ui_group/marks.rs | 67 +++++
parity/acrobat-features.toml | 10 +-
11 files changed, 892 insertions(+), 12 deletions(-)
create mode 100644 crates/automation/tests/backdrop.rs
create mode 100644 crates/edit/src/backdrop.rs
create mode 100644 crates/edit/src/backdrop_tests.rs
diff --git a/ROADMAP.md b/ROADMAP.md
index 259dbfec04..b90b9f5679 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -157,6 +157,7 @@ Ranked; detail and the full milestone table in [docs/roadmap.md](docs/roadmap.md
| 8 | 1.0 polish: performance, right-to-left, missing languages, keyboard-only (M14) | 55–95 |
## Progress log
+- **2026-10-16 (M7, Add Background):** A background added behind a page that paints its own opaque white backdrop (browsers' Save as PDF, print drivers) was hidden completely, so the tool looked broken. The dialog now detects such pages and offers to replace the backdrop (on by default): the one fill becomes `n` in a per-page copy of its stream, and Remove background puts the original back unless the copy was edited since. Scanned pages are warned about, not touched. New `doc_backdrops` tool; `doc_background` takes `replace_backdrop`. The default colour is a visible light yellow and the preview shows text over it. Acrobat's own behaviour on such pages is unobserved. Estimates unchanged.
- **2026-10-15 (M2, gap 12):** `cargo xtask text-oracle` scores reading order as well as word F1: the longest common subsequence of the two word sequences over the longer one. F1 is a bag of words and cannot see order at all -- measuring #2431, a change that moves text and nothing else, it called 26 of the 29 files whose output changed identical, where the order score separated 18 improvements from 6 regressions. Reports, does not gate; a disagreement with Poppler, not a verdict. Estimates unchanged.
- **2026-10-15 (M2, #2305 follow-up):** WinAnsiEncoding 0xA0 and 0xAD and MacRomanEncoding 0xCA extract as the ordinary space and hyphen Annex D.2 names them, in the vendored hayro tables (patch 30) as well as `crates/fonts`, so search, copy and redaction see characters that were hidden behind U+00A0 and U+00AD. Across the pdf.js corpus the soft hyphens we extract fall 117 to 13 and the non-breaking spaces 30 to 26; the rest come from `/ToUnicode`. An explicit `/Differences` name keeps its glyph list value, as pdftotext does. Estimates unchanged.
- **2026-10-13 (community, M3, #1569 review):** Pixel-only Wayland wheel, wheel-tilt and continuous input use standalone moved events, so Ctrl zoom does not remain latched after the modifier is released (#991); vendored winit patch (13), with a policy test. Estimates unchanged.
diff --git a/crates/automation/src/lib.rs b/crates/automation/src/lib.rs
index 88856305b2..564dd8e882 100644
--- a/crates/automation/src/lib.rs
+++ b/crates/automation/src/lib.rs
@@ -704,6 +704,7 @@ impl Automation {
}
"doc_export_images" | "doc_export_text" | "doc_export_all_images" => self.export(name, &a)?,
"doc_header_footer" | "doc_watermark" | "doc_background" | "doc_remove_marks" => self.marks(name, &a)?,
+ "doc_backdrops" => self.backdrops(&a)?,
"doc_unprotect" => {
let mut out = self.apply(&a, Edit::RemoveProtection)?;
out["security"] = security(self.doc(&a)?);
@@ -1172,6 +1173,27 @@ impl Automation {
Ok(out)
}
+ /// Pages whose own backdrop hides a background (see `pdfcraft_edit::backdrop`).
+ fn backdrops(&mut self, a: &Args) -> Result {
+ let n = self.doc(a)?.info.pages.len();
+ let pages = match a.opt_ints("pages")? {
+ Some(_) => self.pages(a, "pages")?,
+ None => (0..n).collect(),
+ };
+ let doc = self.doc(a)?;
+ let found: Vec = pages
+ .into_iter()
+ .filter_map(|p| {
+ let kind = match doc.page_backdrop(p)? {
+ pdfcraft_engine::Backdrop::Fill => "fill",
+ pdfcraft_engine::Backdrop::Image => "image",
+ };
+ Some(json!({ "page": p + 1, "backdrop": kind }))
+ })
+ .collect();
+ Ok(json!({ "pages": found }))
+ }
+
fn marks(&mut self, tool: &str, a: &Args) -> Result {
use pdfcraft_engine::{Background, HeaderFooter, MarkKind, Watermark};
let n = self.doc(a)?.info.pages.len();
@@ -1230,6 +1252,7 @@ impl Automation {
color: color("color", [1.0; 3])?,
opacity: a.opt_num("opacity")?.unwrap_or(1.0),
scale: a.opt_num("scale")?.unwrap_or(1.0).clamp(0.01, 1.0),
+ replace_backdrop: a.opt_bool("replace_backdrop")?.unwrap_or(true),
..Background::default()
},
replace,
diff --git a/crates/automation/src/tools.rs b/crates/automation/src/tools.rs
index 5e89aef78a..e520b7bb63 100644
--- a/crates/automation/src/tools.rs
+++ b/crates/automation/src/tools.rs
@@ -902,12 +902,16 @@ pub fn tools() -> Vec {
}),
&["doc"],
)),
- t("doc_background", "Add background", "Fill page backgrounds with a colour, or a picture from `file` (an image, or page `file_page` of a PDF) fitted at `scale` (default 1), behind the content. Undoable.")
+ t("doc_background", "Add background", "Fill page backgrounds with a colour, or a picture from `file` (an image, or page `file_page` of a PDF) fitted at `scale` (default 1), behind the content. A page that paints its own opaque white backdrop would hide it, so that backdrop is replaced unless replace_backdrop is false (removing the background puts it back); a scanned page's picture still hides it (doc_backdrops lists both). Undoable.")
.cmd("edit.background")
.with(schema(
- json!({ "doc": doc(), "pages": pages("to fill (default: all)"), "color": { "type": "string" }, "file": { "type": "string" }, "file_page": { "type": "integer", "minimum": 1 }, "scale": { "type": "number", "exclusiveMinimum": 0, "maximum": 1 }, "opacity": { "type": "number", "minimum": 0, "maximum": 1 }, "replace": { "type": "boolean" } }),
+ json!({ "doc": doc(), "pages": pages("to fill (default: all)"), "color": { "type": "string" }, "file": { "type": "string" }, "file_page": { "type": "integer", "minimum": 1 }, "scale": { "type": "number", "exclusiveMinimum": 0, "maximum": 1 }, "opacity": { "type": "number", "minimum": 0, "maximum": 1 }, "replace": { "type": "boolean" }, "replace_backdrop": { "type": "boolean", "description": "Replace a white backdrop the page paints itself, which would hide the background. Default true." } }),
&["doc"],
)),
+ t("doc_backdrops", "List page backdrops", "Pages that paint their own backdrop, which hides a background added behind the content: `fill` (an opaque white fill doc_background can replace) or `image` (a page-sized picture, e.g. a scan, that still hides it). Pages are 1-based; pages without one are left out.")
+ .ro()
+ .cmd("edit.background")
+ .with(schema(json!({ "doc": doc(), "pages": pages("to check (default: all)") }), &["doc"])),
t("doc_remove_marks", "Remove header & footer, watermark or background", "Remove every header and footer, watermark or background PdfCraft (or a compatible tool) added. Undoable.")
.destructive()
.with(schema(json!({ "doc": doc(), "kind": { "type": "string", "enum": ["header_footer", "watermark", "background"] } }), &["doc", "kind"])),
diff --git a/crates/automation/tests/backdrop.rs b/crates/automation/tests/backdrop.rs
new file mode 100644
index 0000000000..1a8a71eb8e
--- /dev/null
+++ b/crates/automation/tests/backdrop.rs
@@ -0,0 +1,109 @@
+//! Add Background on pages that paint their own backdrop, end to end through the tools: what
+//! `page_render` draws, `doc_backdrops`, save and reopen, and Remove putting the page back.
+
+use std::path::PathBuf;
+
+use pdfcraft_automation::{Automation, Content};
+use serde_json::{Value, json};
+
+/// Two 200 × 100 pt pages saying "Hi": page 1 on a white fill of its own (as browsers write),
+/// page 2 on bare paper; a third page is a "scan" (a page-sized grey picture).
+fn fixture() -> Vec {
+ let text = "0 g BT /F1 24 Tf 20 40 Td (Hi) Tj ET";
+ let contents = [format!("q 1 1 1 rg 0 0 200 100 re f Q {text}"), text.to_string(), format!("q 200 0 0 100 0 0 cm /Im0 Do Q {text}")];
+ let mut objs: Vec = vec![
+ "<< /Type /Catalog /Pages 2 0 R >>".into(),
+ "<< /Type /Pages /Kids [4 0 R 6 0 R 8 0 R] /Count 3 /MediaBox [0 0 200 100] >>".into(),
+ "<< /Type /XObject /Subtype /Image /Width 1 /Height 1 /ColorSpace /DeviceGray /BitsPerComponent 8 /Length 1 >>\nstream\n\u{80}\nendstream"
+ .into(),
+ ];
+ for (i, c) in contents.iter().enumerate() {
+ objs.push(format!(
+ "<< /Type /Page /Parent 2 0 R /Contents {} 0 R /Resources << /Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >> /XObject << /Im0 3 0 R >> >> >>",
+ 5 + 2 * i
+ ));
+ objs.push(format!("<< /Length {} >>\nstream\n{c}\nendstream", c.len()));
+ }
+ let mut out = b"%PDF-1.7\n".to_vec();
+ let mut offs = Vec::new();
+ for (i, o) in objs.iter().enumerate() {
+ offs.push(out.len());
+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+ }
+ let x = out.len();
+ out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f \n", objs.len() + 1).as_bytes());
+ for o in offs {
+ out.extend_from_slice(format!("{o:010} 00000 n \n").as_bytes());
+ }
+ out.extend_from_slice(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1).as_bytes());
+ out
+}
+
+fn workdir() -> PathBuf {
+ let dir = std::env::temp_dir().join(format!("pdfcraft-automation-backdrop-{}", std::process::id()));
+ let _ = std::fs::remove_dir_all(&dir);
+ std::fs::create_dir_all(&dir).unwrap();
+ std::fs::write(dir.join("a.pdf"), fixture()).unwrap();
+ dir
+}
+
+fn ok(a: &mut Automation, tool: &str, args: Value) -> Value {
+ match a.call(tool, &args) {
+ Ok(mut c) => match c.remove(0) {
+ Content::Json(v) => v,
+ other => panic!("{tool}: expected JSON, got {other:?}"),
+ },
+ Err(e) => panic!("{tool} {args}: {e}"),
+ }
+}
+
+/// The RGB of a blank spot (top-right corner area) of a page rendered at 72 dpi.
+fn blank_spot(a: &mut Automation, doc: u64, page: u64) -> [u8; 3] {
+ let rendered = a.call("page_render", &json!({ "doc": doc, "page": page, "dpi": 72 })).unwrap();
+ let Content::Png { data, width, .. } = &rendered[0] else { panic!("expected a PNG") };
+ let mut reader = png::Decoder::new(std::io::Cursor::new(data)).read_info().unwrap();
+ let mut pixels = vec![0; reader.output_buffer_size().unwrap()];
+ let info = reader.next_frame(&mut pixels).unwrap();
+ let channels = info.color_type.samples();
+ let at = (10 * *width as usize + 180) * channels;
+ [pixels[at], pixels[at + 1], pixels[at + 2]]
+}
+
+const RED: [u8; 3] = [255, 0, 0];
+const WHITE: [u8; 3] = [255, 255, 255];
+
+#[test]
+fn a_background_shows_on_a_page_that_paints_its_own_white_backdrop() {
+ let dir = workdir();
+ let mut a = Automation::new().with_root(&dir).unwrap();
+ let doc = ok(&mut a, "doc_open", json!({ "path": "a.pdf" }))["doc"].as_u64().unwrap();
+ assert_eq!(
+ ok(&mut a, "doc_backdrops", json!({ "doc": doc }))["pages"],
+ json!([{ "page": 1, "backdrop": "fill" }, { "page": 3, "backdrop": "image" }])
+ );
+
+ // Not replacing: the page's own white hides the background, as it always did.
+ ok(&mut a, "doc_background", json!({ "doc": doc, "color": "#FF0000", "replace_backdrop": false }));
+ assert_eq!(blank_spot(&mut a, doc, 1), WHITE);
+ assert_eq!(blank_spot(&mut a, doc, 2), RED);
+ ok(&mut a, "edit_undo", json!({ "doc": doc }));
+
+ // The default replaces it: red on both pages; the scan still hides it.
+ ok(&mut a, "doc_background", json!({ "doc": doc, "color": "#FF0000" }));
+ assert_eq!(blank_spot(&mut a, doc, 1), RED);
+ assert_eq!(blank_spot(&mut a, doc, 2), RED);
+ assert_ne!(blank_spot(&mut a, doc, 3), RED);
+ assert_eq!(ok(&mut a, "doc_backdrops", json!({ "doc": doc }))["pages"], json!([{ "page": 3, "backdrop": "image" }]));
+
+ ok(&mut a, "doc_save", json!({ "doc": doc, "path": "out.pdf" }));
+ let saved = ok(&mut a, "doc_open", json!({ "path": "out.pdf" }))["doc"].as_u64().unwrap();
+ assert_eq!(blank_spot(&mut a, saved, 1), RED, "after save and reopen");
+ ok(&mut a, "doc_remove_marks", json!({ "doc": saved, "kind": "background" }));
+ assert_eq!(blank_spot(&mut a, saved, 1), WHITE);
+ assert_eq!(
+ ok(&mut a, "doc_backdrops", json!({ "doc": saved, "pages": [1] }))["pages"],
+ json!([{ "page": 1, "backdrop": "fill" }]),
+ "the backdrop is back"
+ );
+ let _ = std::fs::remove_dir_all(&dir);
+}
diff --git a/crates/edit/src/backdrop.rs b/crates/edit/src/backdrop.rs
new file mode 100644
index 0000000000..d15652f82b
--- /dev/null
+++ b/crates/edit/src/backdrop.rs
@@ -0,0 +1,323 @@
+//! A page's own backdrop: an opaque white fill (or a picture) covering the whole visible page
+//! before anything else is drawn. Many writers paint one (browsers' Save as PDF, print drivers;
+//! scans are a page-sized picture), and it hides anything placed behind the content, so a
+//! background added behind such a page never shows.
+//!
+//! A white fill can be replaced: the one fill operator becomes `n` (end the path without
+//! painting), which looks the same on white paper. The page then gets a copy of the content
+//! stream that held it, tagged `/PCBackdrop << /Original ref /At n /Len n >>`, and the stream
+//! itself is left alone (other pages may share it). [`restore`] puts the original back when the
+//! background is removed, unless the copy has been edited since. A picture can't be replaced
+//! without losing it, so it is only reported.
+//!
+//! Detection is deliberately strict: only one rectangle (`re`), in DeviceGray, DeviceRGB or
+//! DeviceCMYK, opaque in the graphics state, with an axis-aligned transform, filled before any
+//! other painting, and covering the crop box. Anything else is real content and stays.
+
+use pdfcraft_content::{Matrix, Op, Pieces};
+use pdfcraft_cos::{Dict, Document, ObjRef, Object, Stream};
+
+use crate::EditError;
+
+/// How much of a page's content is read looking for a backdrop: it has to come first.
+const SCAN_BYTES: usize = 64 * 1024;
+/// How many operators are walked before giving up.
+const SCAN_OPS: usize = 4096;
+/// How far (in points) a backdrop may fall short of the crop box and still count as covering it.
+const COVER_EPS: f64 = 1.0;
+/// Components at least this close to white (per channel) count as white.
+const WHITE: f64 = 0.98;
+
+/// What paints a page's backdrop.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Backdrop {
+ /// An opaque white fill: replaceable.
+ Fill,
+ /// A picture covering the page (a scan): a background behind it stays hidden.
+ Image,
+}
+
+/// Where a replaceable fill is: the content streams (references in `/Contents` order, untagged
+/// ones only), their joined bytes, and the fill operator's joined byte range.
+struct Found {
+ refs: Vec<(usize, ObjRef)>,
+ pieces: Pieces,
+ op: std::ops::Range,
+}
+
+#[derive(Clone)]
+struct State {
+ ctm: Matrix,
+ /// Clip in default user space, when it is a known rectangle; `None` = unknown shape.
+ clip: Option<[f64; 4]>,
+ /// The fill colour is white.
+ white: bool,
+ /// Non-stroking colour space components (1, 3, 4), or 0 for a space we don't read.
+ space: usize,
+ opaque: bool,
+}
+
+/// The backdrop `page` (0-based) paints, if any.
+pub fn page_backdrop(doc: &Document, page: usize) -> Result, EditError> {
+ Ok(scan(doc, page)?.map(|(b, _)| b))
+}
+
+/// Replace `page`'s white backdrop fill, if it has one (see the module doc). Returns whether it
+/// did. A picture backdrop is left alone.
+pub(crate) fn replace(doc: &mut Document, page: usize) -> Result {
+ let Some((Backdrop::Fill, Some(found))) = scan(doc, page)? else { return Ok(false) };
+ let edited = found.pieces.splice([(found.op.clone(), b"n".to_vec())]);
+ let piece = found.pieces.piece_of(found.op.start);
+ let (Some(&(slot, original)), Some(bytes)) = (found.refs.get(piece), edited.get(piece)) else { return Ok(false) };
+ // Where the operator sits in that piece: the joined offset less the pieces before it.
+ let before: usize = (0..piece).filter_map(|i| edited.get(i)).map(|p| p.len() + 1).sum();
+ let at = found.op.start.saturating_sub(before);
+ let len = found.op.end.saturating_sub(found.op.start);
+ let mut note = Dict::new();
+ note.set(b"Original".to_vec(), Object::Ref(original));
+ note.set(b"At".to_vec(), Object::Int(i64::try_from(at).unwrap_or(i64::MAX)));
+ note.set(b"Len".to_vec(), Object::Int(i64::try_from(len).unwrap_or(i64::MAX)));
+ let mut dict = Dict::new();
+ dict.set(b"PCBackdrop".to_vec(), Object::Dict(note));
+ let copy = doc.add(Object::Stream(Stream::flate(dict, bytes)));
+ let p = page_of(doc, page)?;
+ let mut list = crate::contents(doc, &p)?;
+ let Some(entry) = list.get_mut(slot) else { return Ok(false) };
+ *entry = Object::Ref(copy);
+ doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), Object::Array(list)))?;
+ Ok(true)
+}
+
+/// Put back the original content streams [`replace`] copied on `page`, where the copy is still
+/// exactly what it wrote. Returns how many it restored.
+pub(crate) fn restore(doc: &mut Document, page: &pdfcraft_model::Page) -> Result {
+ let mut list = crate::contents(doc, page)?;
+ let mut restored = 0;
+ for entry in list.iter_mut() {
+ if let Some(original) = unchanged_copy_of(doc, entry) {
+ *entry = Object::Ref(original);
+ restored += 1;
+ }
+ }
+ if restored > 0 {
+ doc.update_dict(page.obj, |d| d.set(b"Contents".to_vec(), Object::Array(list)))?;
+ }
+ Ok(restored)
+}
+
+/// The original of a backdrop copy whose bytes are still the original's with the fill turned to
+/// `n`; `None` for anything else (including a copy edited since, which is kept).
+fn unchanged_copy_of(doc: &Document, entry: &Object) -> Option {
+ let copy = doc.resolve(entry);
+ let Object::Stream(copy) = &*copy else { return None };
+ let note = copy.dict.get(b"PCBackdrop").map(|n| doc.resolve(n))?;
+ let note = note.as_dict()?;
+ let Some(Object::Ref(original)) = note.get(b"Original") else { return None };
+ let at = usize::try_from(note.get(b"At")?.as_int()?).ok()?;
+ let len = usize::try_from(note.get(b"Len")?.as_int()?).ok()?;
+ let orig = doc.get(*original);
+ let Object::Stream(orig) = &*orig else { return None };
+ let source = orig.decoded().ok()?;
+ let mut expect = source.get(..at)?.to_vec();
+ expect.push(b'n');
+ expect.extend_from_slice(source.get(at.checked_add(len)?..)?);
+ (copy.decoded().ok()? == expect).then_some(*original)
+}
+
+fn page_of(doc: &Document, page: usize) -> Result {
+ pdfcraft_model::pages(doc).into_iter().nth(page).ok_or(EditError::NoSuchPage(page))
+}
+
+/// Find the backdrop, and for a fill, where it is.
+fn scan(doc: &Document, page: usize) -> Result)>, EditError> {
+ let p = page_of(doc, page)?;
+ let crop = p.crop(doc);
+ let list: Vec = match p.dict.get(b"Contents") {
+ None => return Ok(None),
+ Some(c) => match &*doc.resolve(c) {
+ Object::Array(a) => a.clone(),
+ _ => vec![c.clone()],
+ },
+ };
+ // The page's own content: untagged streams (marks and the q/Q wrapper carry /PCMark). Read
+ // only as far as a backdrop could be.
+ let mut refs = Vec::new();
+ let mut data = Vec::new();
+ let mut total = 0usize;
+ for (slot, o) in list.iter().enumerate() {
+ if total >= SCAN_BYTES {
+ break;
+ }
+ let Object::Ref(r) = o else { return Ok(None) };
+ let obj = doc.get(*r);
+ let Object::Stream(s) = &*obj else { continue };
+ if s.dict.get(b"PCMark").is_some() {
+ continue;
+ }
+ let bytes = s.decoded().unwrap_or_default();
+ total = total.saturating_add(bytes.len()).saturating_add(1);
+ refs.push((slot, *r));
+ data.push(bytes);
+ }
+ let pieces = Pieces::join(&data);
+ let head = pieces.data().get(..pieces.data().len().min(SCAN_BYTES)).unwrap_or_default();
+ let parsed = pdfcraft_content::parse(head);
+ let res = resources(doc, &p.dict);
+ let found = walk(doc, &res, crop, &parsed.ops);
+ Ok(found.map(|(b, op)| match (b, op) {
+ (Backdrop::Fill, Some(op)) => (b, Some(Found { refs, pieces, op })),
+ _ => (b, None),
+ }))
+}
+
+fn resources(doc: &Document, page: &Dict) -> Dict {
+ page.get(b"Resources").map(|r| doc.resolve(r)).and_then(|r| r.as_dict().cloned()).unwrap_or_default()
+}
+
+fn sub(doc: &Document, res: &Dict, kind: &[u8], name: &[u8]) -> Option> {
+ let d = res.get(kind).map(|d| doc.resolve(d))?;
+ let o = d.as_dict()?.get(name)?.clone();
+ Some(doc.resolve(&o))
+}
+
+/// Walk the operators until the first one that paints; a backdrop is that one, or nothing.
+fn walk(doc: &Document, res: &Dict, crop: [f64; 4], ops: &[Op]) -> Option<(Backdrop, Option>)> {
+ let mut st = State { ctm: Matrix::IDENTITY, clip: Some([f64::MIN, f64::MIN, f64::MAX, f64::MAX]), white: false, space: 1, opaque: true };
+ let mut saved: Vec = Vec::new();
+ // Current path: its rectangles in user space, or `None` once it is anything else.
+ let mut path: Option> = Some(Vec::new());
+ let mut clip_next = false;
+ for op in ops.iter().take(SCAN_OPS) {
+ match op.op.as_slice() {
+ b"q" => {
+ if saved.len() >= 64 {
+ return None;
+ }
+ saved.push(st.clone());
+ }
+ b"Q" => st = saved.pop()?,
+ b"cm" => {
+ let m = Matrix::from_operands(op.operands.get(op.operands.len().checked_sub(6)?..)?)?;
+ if !m.0.iter().all(|v| v.is_finite()) {
+ return None;
+ }
+ st.ctm = m.then(&st.ctm);
+ }
+ b"gs" => st.opaque = opaque_state(doc, res, op.name(0)?)?,
+ b"g" => set_colour(&mut st, 1, op),
+ b"rg" => set_colour(&mut st, 3, op),
+ b"k" => set_colour(&mut st, 4, op),
+ b"cs" => {
+ st.space = match op.name(0)? {
+ b"DeviceGray" => 1,
+ b"DeviceRGB" => 3,
+ b"DeviceCMYK" => 4,
+ _ => 0,
+ };
+ // The initial colour of these spaces is black.
+ st.white = false;
+ }
+ b"sc" | b"scn" => {
+ let n = st.space;
+ set_colour(&mut st, n, op)
+ }
+ b"re" => {
+ let [x, y, w, h] = op.nums::<4>()?;
+ let finite = [x, y, w, h].iter().all(|v| v.is_finite());
+ match (&mut path, finite && axis_aligned(&st.ctm)) {
+ (Some(rects), true) => rects.push(st.ctm.bbox([x.min(x + w), y.min(y + h), x.max(x + w), y.max(y + h)])),
+ _ => path = None,
+ }
+ }
+ b"m" | b"l" | b"c" | b"v" | b"y" | b"h" => path = None,
+ b"W" | b"W*" => clip_next = true,
+ b"n" => {
+ if clip_next {
+ st.clip = clipped(st.clip, path.as_deref());
+ }
+ path = Some(Vec::new());
+ clip_next = false;
+ }
+ b"f" | b"F" | b"f*" => {
+ // One rectangle: with two, a fill rule can cut a hole where content shows.
+ let covers = match path.as_deref() {
+ Some([r]) => st.clip.and_then(|c| intersect(*r, c)).is_some_and(|r| pdfcraft_content::contains(r, crop, COVER_EPS)),
+ _ => false,
+ };
+ return (covers && st.white && st.opaque && !clip_next).then(|| (Backdrop::Fill, Some(op.span.clone())));
+ }
+ b"Do" => {
+ let xo = sub(doc, res, b"XObject", op.name(0)?)?;
+ let Object::Stream(s) = &*xo else { return None };
+ // A stencil or masked picture lets what is behind it show.
+ let masked = [&b"SMask"[..], b"Mask"].iter().any(|k| s.dict.get(k).is_some())
+ || s.dict.get(b"ImageMask").is_some_and(|m| matches!(*doc.resolve(m), Object::Bool(true)));
+ let image = s.dict.name(b"Subtype") == Some(b"Image") && !masked;
+ return covers_unit_square(&st, crop, image).then_some((Backdrop::Image, None));
+ }
+ b"BI" => {
+ let masked = op
+ .inline
+ .as_ref()
+ .is_some_and(|(d, _)| [&b"IM"[..], b"ImageMask"].iter().any(|k| d.get(k).is_some_and(|m| matches!(m, Object::Bool(true)))));
+ return covers_unit_square(&st, crop, !masked).then_some((Backdrop::Image, None));
+ }
+ // Anything else that paints comes first: no backdrop.
+ b"S" | b"s" | b"B" | b"B*" | b"b" | b"b*" | b"sh" | b"Tj" | b"TJ" | b"'" | b"\"" | b"EI" | b"d0" | b"d1" => return None,
+ _ => {}
+ }
+ }
+ None
+}
+
+/// A picture placed by the CTM (onto the unit square) covering the crop box, opaque, unclipped.
+fn covers_unit_square(st: &State, crop: [f64; 4], image: bool) -> bool {
+ image
+ && st.opaque
+ && axis_aligned(&st.ctm)
+ && st.clip.and_then(|c| intersect(st.ctm.bbox([0.0, 0.0, 1.0, 1.0]), c)).is_some_and(|r| pdfcraft_content::contains(r, crop, COVER_EPS))
+}
+
+fn set_colour(st: &mut State, components: usize, op: &Op) {
+ st.space = components;
+ let vals: Vec = op.operands.iter().filter_map(Object::as_f64).collect();
+ st.white = vals.len() == components
+ && match components {
+ 1 | 3 => vals.iter().all(|v| *v >= WHITE),
+ 4 => vals.iter().all(|v| *v <= 1.0 - WHITE),
+ _ => false,
+ };
+}
+
+/// Does the named ExtGState keep painting opaque and normal? `None` when it can't be read.
+fn opaque_state(doc: &Document, res: &Dict, name: &[u8]) -> Option {
+ let gs = sub(doc, res, b"ExtGState", name)?;
+ let gs = gs.as_dict()?;
+ let alpha = gs.get(b"ca").map(|a| doc.resolve(a).as_f64()).unwrap_or(Some(1.0))?;
+ let soft = gs.get(b"SMask").is_some_and(|m| doc.resolve(m).as_name() != Some(b"None"));
+ let blend = gs.get(b"BM").is_some_and(|b| !matches!(doc.resolve(b).as_name(), Some(b"Normal" | b"Compatible")));
+ Some(alpha >= 0.999 && !soft && !blend)
+}
+
+/// Rotations by multiples of 90° and scales only: rectangles stay rectangles.
+fn axis_aligned(m: &Matrix) -> bool {
+ let [a, b, c, d, ..] = m.0;
+ (b.abs() < 1e-9 && c.abs() < 1e-9) || (a.abs() < 1e-9 && d.abs() < 1e-9)
+}
+
+fn intersect(a: [f64; 4], b: [f64; 4]) -> Option<[f64; 4]> {
+ let r = [a[0].max(b[0]), a[1].max(b[1]), a[2].min(b[2]), a[3].min(b[3])];
+ (r.iter().all(|v| v.is_finite()) && r[2] > r[0] && r[3] > r[1]).then_some(r)
+}
+
+/// The clip after intersecting with a path: known only when the path is one rectangle.
+fn clipped(clip: Option<[f64; 4]>, path: Option<&[[f64; 4]]>) -> Option<[f64; 4]> {
+ match path {
+ Some([r]) => intersect(clip?, *r).or(Some([0.0, 0.0, 0.0, 0.0])),
+ _ => None,
+ }
+}
+
+#[cfg(test)]
+#[path = "backdrop_tests.rs"]
+mod tests;
diff --git a/crates/edit/src/backdrop_tests.rs b/crates/edit/src/backdrop_tests.rs
new file mode 100644
index 0000000000..88f058b4f5
--- /dev/null
+++ b/crates/edit/src/backdrop_tests.rs
@@ -0,0 +1,233 @@
+use std::sync::Arc;
+
+use pdfcraft_cos::{Document, ObjRef, Object, SaveOptions, Stream, write_incremental};
+
+use super::*;
+use crate::{Background, MarkKind, add_background, remove_marks};
+
+const TEXT: &str = "BT /F1 24 Tf 40 90 Td (Hello) Tj ET";
+
+/// A document from its objects (object 1 is the catalog, 2 the page tree).
+fn build(objs: &[String]) -> Document {
+ let mut out = b"%PDF-1.7\n".to_vec();
+ let mut offs = Vec::new();
+ for (i, o) in objs.iter().enumerate() {
+ offs.push(out.len());
+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+ }
+ let x = out.len();
+ out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f \n", objs.len() + 1).as_bytes());
+ for o in offs {
+ out.extend_from_slice(format!("{o:010} 00000 n \n").as_bytes());
+ }
+ out.extend_from_slice(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1).as_bytes());
+ Document::open(Arc::new(out)).unwrap()
+}
+
+fn stream(dict: &str, data: &str) -> String {
+ format!("<< {dict} /Length {} >>\nstream\n{data}\nendstream", data.len())
+}
+
+/// One 300 × 200 page drawing `pieces` (objects 5…), with a font, a page-sized image `/Im0`
+/// (object 4) and two graphics states, `/Half` (ca 0.5) and `/Full` (ca 1).
+fn page(pieces: &[&str]) -> Document {
+ let refs: Vec = (0..pieces.len()).map(|i| format!("{} 0 R", i + 5)).collect();
+ let mut objs = vec![
+ "<< /Type /Catalog /Pages 2 0 R >>".to_string(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".into(),
+ format!(
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 300 200] /Contents [{}] /Resources << /Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >> /XObject << /Im0 4 0 R >> /ExtGState << /Half << /ca 0.5 >> /Full << /ca 1 /CA 1 >> >> >> >>",
+ refs.join(" ")
+ ),
+ stream("/Type /XObject /Subtype /Image /Width 1 /Height 1 /ColorSpace /DeviceGray /BitsPerComponent 8", "\u{80}"),
+ ];
+ objs.extend(pieces.iter().map(|p| stream("", p)));
+ build(&objs)
+}
+
+/// The decoded content of a page, stream by stream.
+fn streams(doc: &Document) -> Vec {
+ let p = &pdfcraft_model::pages(doc)[0];
+ let list = match p.dict.get(b"Contents").map(|c| doc.resolve(c)).as_deref() {
+ Some(Object::Array(a)) => a.clone(),
+ _ => vec![],
+ };
+ list.iter()
+ .map(|o| match &*doc.resolve(o) {
+ Object::Stream(s) => String::from_utf8_lossy(&s.decoded().unwrap()).into_owned(),
+ _ => String::new(),
+ })
+ .collect()
+}
+
+fn reopen(doc: &Document) -> Document {
+ let bytes = write_incremental(doc, &SaveOptions::default()).unwrap();
+ Document::open(Arc::new(bytes)).unwrap()
+}
+
+fn red() -> Background {
+ Background { color: [1.0, 0.0, 0.0], ..Background::default() }
+}
+
+#[test]
+fn a_white_fill_backdrop_is_replaced_and_put_back_when_the_background_goes() {
+ let content = format!("q 1 1 1 rg 0 0 300 200 re f Q {TEXT}");
+ let mut doc = page(&[&content]);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), Some(Backdrop::Fill));
+ let original = streams(&doc);
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ let s = streams(&reopen(&doc));
+ assert_eq!(s.len(), 2, "{s:?}");
+ assert!(s[0].contains("/PCMark /Background"));
+ assert_eq!(s[1], format!("q 1 1 1 rg 0 0 300 200 re n Q {TEXT}"), "only the fill operator changed");
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), None, "nothing hides the background now");
+ // The original stream object is untouched; the page points at a copy.
+ let Object::Stream(orig) = &*doc.get(ObjRef { num: 5, generation: 0 }) else { panic!("object 5 is the content") };
+ assert_eq!(String::from_utf8_lossy(&orig.decoded().unwrap()), content);
+ assert_eq!(remove_marks(&mut doc, &[0], MarkKind::Background).unwrap(), 1);
+ assert_eq!(streams(&reopen(&doc)), original, "exactly the original content");
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), Some(Backdrop::Fill));
+}
+
+#[test]
+fn updating_the_background_replaces_the_backdrop_once_and_removing_still_restores() {
+ let mut doc = page(&[&format!("1 1 1 rg 0 0 300 200 re f 0 g {TEXT}")]);
+ let original = streams(&doc);
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ add_background(&mut doc, &[0], &Background { color: [0.0, 0.0, 1.0], ..Background::default() }, true).unwrap();
+ let s = streams(&doc);
+ assert_eq!(s.len(), 2, "one background, one copy: {s:?}");
+ assert!(s[1].contains("re n"));
+ remove_marks(&mut doc, &[0], MarkKind::Background).unwrap();
+ assert_eq!(streams(&doc), original);
+}
+
+#[test]
+fn a_backdrop_split_across_content_streams_is_replaced_in_the_piece_holding_the_operator() {
+ let mut doc = page(&["1 1 1 rg 0 0 300 200 re", &format!("f* {TEXT}")]);
+ let original = streams(&doc);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), Some(Backdrop::Fill));
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ let s = streams(&doc);
+ assert_eq!(s[1..], ["1 1 1 rg 0 0 300 200 re".to_string(), format!("n {TEXT}")], "{s:?}");
+ remove_marks(&mut doc, &[0], MarkKind::Background).unwrap();
+ assert_eq!(streams(&doc), original);
+}
+
+#[test]
+fn backdrops_writers_paint_are_recognised() {
+ for content in [
+ // Browsers: a flipped, scaled coordinate system and a page clip first.
+ "q 0.5 0 0 -0.5 0 200 cm 0 0 600 400 re W n 1 1 1 rg 0 0 600 400 re f Q",
+ // Larger than the page, in CMYK, through an opaque graphics state.
+ "/Full gs 0 0 0 0 k -10 -10 320 220 re f",
+ "/DeviceRGB cs 1 1 1 sc 0 0 300 200 re F",
+ "0.99 g 0 0 300 200 re f",
+ // Turned a quarter: still a rectangle.
+ "0 1 -1 0 300 0 cm 1 g 0 0 200 300 re f",
+ ] {
+ let doc = page(&[&format!("{content} 0 g {TEXT}")]);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), Some(Backdrop::Fill), "{content}");
+ }
+}
+
+#[test]
+fn content_that_is_not_a_page_backdrop_is_left_alone() {
+ for content in [
+ // Not the whole page.
+ "1 g 0 0 300 150 re f",
+ "q 0 0 100 100 re W n 1 g 0 0 300 200 re f Q",
+ // Not white, or not opaque.
+ "0.5 g 0 0 300 200 re f",
+ "1 0 0 rg 0 0 300 200 re f",
+ "0 0 0 0.5 k 0 0 300 200 re f",
+ "/Half gs 1 g 0 0 300 200 re f",
+ "/Missing gs 1 g 0 0 300 200 re f",
+ "/Pattern cs /P0 scn 0 0 300 200 re f",
+ // The initial colour is black.
+ "0 0 300 200 re f",
+ // Something else is painted first.
+ "BT /F1 9 Tf (x) Tj ET 1 g 0 0 300 200 re f",
+ "0 g 0 0 1 1 re f 1 g 0 0 300 200 re f",
+ "1 g 0 0 300 200 re S 1 g 0 0 300 200 re f",
+ // Not a single rectangle: a hole, a turned square, a fill-and-stroke.
+ "1 g 0 0 300 200 re 50 50 10 10 re f*",
+ "1 g 0 0 m 300 0 l 300 200 l 0 200 l h f",
+ "0.7 0.7 -0.7 0.7 150 -100 cm 1 g 0 0 400 400 re f",
+ "1 g 0 0 300 200 re B",
+ // Malformed.
+ "Q 1 g 0 0 300 200 re f",
+ "1 g 0 0 300 re f",
+ "1 g 0 0 1e400 200 re f",
+ ] {
+ let mut doc = page(&[&format!("{content} {TEXT}")]);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), None, "{content}");
+ let before = streams(&doc);
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ assert_eq!(streams(&doc)[1..], before[..], "{content}: the page's content is unchanged");
+ }
+}
+
+#[test]
+fn a_scanned_page_is_reported_and_its_picture_kept() {
+ let mut doc = page(&[&format!("q 300 0 0 200 0 0 cm /Im0 Do Q {TEXT}")]);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), Some(Backdrop::Image));
+ let before = streams(&doc);
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ assert_eq!(streams(&doc)[1..], before[..]);
+ // A small picture is content, not a backdrop.
+ let doc = page(&["q 30 0 0 20 0 0 cm /Im0 Do Q"]);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), None);
+}
+
+#[test]
+fn replacing_can_be_turned_off() {
+ let mut doc = page(&[&format!("1 g 0 0 300 200 re f {TEXT}")]);
+ let before = streams(&doc);
+ add_background(&mut doc, &[0], &Background { replace_backdrop: false, ..red() }, false).unwrap();
+ assert_eq!(streams(&doc)[1..], before[..]);
+}
+
+#[test]
+fn a_backdrop_copy_edited_since_is_kept_when_the_background_goes() {
+ let mut doc = page(&[&format!("1 g 0 0 300 200 re f {TEXT}")]);
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ // Something else rewrites the copy (as Edit text does), keeping its dictionary.
+ let p = &pdfcraft_model::pages(&doc)[0];
+ let Some(Object::Array(list)) = p.dict.get(b"Contents").cloned() else { panic!("contents") };
+ let Object::Ref(copy) = list[1] else { panic!("a reference") };
+ let Object::Stream(s) = (*doc.get(copy)).clone() else { panic!("a stream") };
+ let edited = "1 g 0 0 300 200 re n BT /F1 24 Tf 40 90 Td (Edited) Tj ET";
+ doc.set(copy, Object::Stream(Stream::flate(s.dict.clone(), edited.as_bytes())));
+ remove_marks(&mut doc, &[0], MarkKind::Background).unwrap();
+ assert_eq!(streams(&doc), [edited.to_string()], "the edit survives");
+}
+
+#[test]
+fn a_content_stream_shared_by_two_pages_is_copied_for_the_one_page() {
+ let content = format!("1 g 0 0 300 200 re f {TEXT}");
+ let mut doc = build(&[
+ "<< /Type /Catalog /Pages 2 0 R >>".to_string(),
+ "<< /Type /Pages /Kids [3 0 R 4 0 R] /Count 2 /MediaBox [0 0 300 200] >>".into(),
+ "<< /Type /Page /Parent 2 0 R /Contents 5 0 R >>".into(),
+ "<< /Type /Page /Parent 2 0 R /Contents 5 0 R >>".into(),
+ stream("", &content),
+ ]);
+ add_background(&mut doc, &[0], &red(), false).unwrap();
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), None);
+ assert_eq!(page_backdrop(&doc, 1).unwrap(), Some(Backdrop::Fill), "the other page keeps its backdrop");
+}
+
+#[test]
+fn pages_without_content_or_with_odd_contents_have_no_backdrop() {
+ let doc = build(&[
+ "<< /Type /Catalog /Pages 2 0 R >>".to_string(),
+ "<< /Type /Pages /Kids [3 0 R 4 0 R] /Count 2 /MediaBox [0 0 300 200] >>".into(),
+ "<< /Type /Page /Parent 2 0 R >>".into(),
+ "<< /Type /Page /Parent 2 0 R /Contents [5 0 R 99 0 R] >>".into(),
+ "<< /Not /AStream >>".into(),
+ ]);
+ assert_eq!(page_backdrop(&doc, 0).unwrap(), None);
+ assert_eq!(page_backdrop(&doc, 1).unwrap(), None);
+ assert!(matches!(page_backdrop(&doc, 7), Err(EditError::NoSuchPage(7))));
+}
diff --git a/crates/edit/src/lib.rs b/crates/edit/src/lib.rs
index 515f17d8da..a8ab1d51b5 100644
--- a/crates/edit/src/lib.rs
+++ b/crates/edit/src/lib.rs
@@ -150,11 +150,16 @@ pub struct Background {
pub source: Option,
/// Pictures: size relative to the page (1.0 fits the page).
pub scale: f64,
+ /// Replace a white backdrop the page paints itself, which would hide the background
+ /// ([`backdrop`]). Removing the background puts it back.
+ pub replace_backdrop: bool,
}
impl Default for Background {
+ /// A light yellow that still reads as a colour on screen (a near-white default looked as if
+ /// nothing had happened).
fn default() -> Self {
- Self { color: [1.0, 1.0, 0.85], opacity: 1.0, source: None, scale: 1.0 }
+ Self { color: [1.0, 0.95, 0.7], opacity: 1.0, source: None, scale: 1.0, replace_backdrop: true }
}
}
@@ -583,7 +588,9 @@ pub fn add_watermark(doc: &mut Document, pages: &[usize], wm: &Watermark, replac
Ok(())
}
-/// Add a solid-colour background behind the content of `pages`.
+/// Add a solid-colour background behind the content of `pages`. With `bg.replace_backdrop`, a
+/// white backdrop a page paints itself is replaced first, so the background shows (see
+/// [`backdrop`]); a picture backdrop (a scan) still hides it.
pub fn add_background(doc: &mut Document, pages: &[usize], bg: &Background, replace: bool) -> Result<(), EditError> {
let all = page_list(doc);
check(pages, all.len())?;
@@ -592,6 +599,9 @@ pub fn add_background(doc: &mut Document, pages: &[usize], bg: &Background, repl
}
let opacity = if bg.opacity.is_finite() { bg.opacity.clamp(0.0, 1.0) } else { 1.0 };
for &i in pages {
+ if bg.replace_backdrop {
+ backdrop::replace(doc, i)?;
+ }
let page = page_list(doc)[i].clone();
let (w, h) = page.display_size(doc);
let mut content = begin(MarkKind::Background, "Background", page.view_matrix(doc));
@@ -614,13 +624,17 @@ pub fn add_background(doc: &mut Document, pages: &[usize], bg: &Background, repl
}
/// Remove marks of `kind` from `pages`; returns how many were removed. When no mark is left on
-/// top of a page, the q/Q wrapper goes too, restoring the original content list.
+/// top of a page, the q/Q wrapper goes too, restoring the original content list. Removing
+/// backgrounds also puts back a backdrop [`add_background`] replaced, unless it was edited since.
pub fn remove_marks(doc: &mut Document, pages: &[usize], kind: MarkKind) -> Result {
let all = page_list(doc);
check(pages, all.len())?;
let mut removed = 0;
for &i in pages {
let page = &all[i];
+ if kind == MarkKind::Background {
+ backdrop::restore(doc, page)?;
+ }
let list = contents(doc, page)?;
let before = list.len();
let mut kept: Vec = list.into_iter().filter(|o| stream_tag(doc, o).as_deref() != Some(kind.tag())).collect();
@@ -644,6 +658,8 @@ pub fn marks_present(doc: &Document) -> Vec {
added::scan_markers(doc).marks
}
+pub mod backdrop;
+pub use backdrop::{Backdrop, page_backdrop};
pub mod objects;
pub use objects::{EditableObject, MAX_MOVE_OBJECTS, ObjectKind, ObjectTarget, editable_objects, move_objects};
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 3432cd868e..0f81fb22de 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -63,7 +63,7 @@ pub use pdfcraft_forms::{
};
pub use pdfcraft_a11y as a11y;
-pub use pdfcraft_edit::{BlockStyle, PageImage, RangeStyle, TextBlock, TextLine, first_undrawable};
+pub use pdfcraft_edit::{Backdrop, BlockStyle, PageImage, RangeStyle, TextBlock, TextLine, first_undrawable};
pub use pdfcraft_measure as measure;
pub use pdfcraft_xfa::Report as XfaLayout;
@@ -499,6 +499,11 @@ impl Document {
self.editor.as_ref().map(|e| optimize::audit_space(&e.cos, self.bytes.len() as u64)).unwrap_or_default()
}
+ /// The backdrop `page` (0-based) paints itself, which hides a background (Add Background).
+ pub fn page_backdrop(&self, page: usize) -> Option {
+ self.editor.as_ref().and_then(|e| pdfcraft_edit::page_backdrop(&e.cos, page).ok().flatten())
+ }
+
/// Edit a PDF: the images `page` draws (0-based).
pub fn page_images(&self, page: usize) -> Vec {
self.editor.as_ref().and_then(|e| pdfcraft_edit::page_images(&e.cos, page).ok()).unwrap_or_default()
diff --git a/crates/ui-egui/src/marks_ui.rs b/crates/ui-egui/src/marks_ui.rs
index 4a60c40a6e..ed2490737c 100644
--- a/crates/ui-egui/src/marks_ui.rs
+++ b/crates/ui-egui/src/marks_ui.rs
@@ -3,7 +3,7 @@
//! preview of the current page. "Update" opens the same dialog in replace mode.
use egui::{Align, Color32, CornerRadius, Layout, Rect, Stroke, pos2, vec2};
-use pdfcraft_engine::{Background, Edit, HeaderFooter, MarkKind, Watermark};
+use pdfcraft_engine::{Backdrop, Background, DocId, Edit, HeaderFooter, MarkKind, Watermark};
use crate::theme::{self, Tokens};
use crate::{PdfCraftApp, widgets};
@@ -72,6 +72,63 @@ impl PageRange {
}
}
+/// How many pages a frame the Background dialog checks for a backdrop of their own, so a long
+/// document never stalls the dialog.
+const BACKDROP_PAGES_PER_FRAME: usize = 24;
+
+/// Which pages paint their own backdrop (it hides a background), for the document and edit
+/// generation they were checked in. Filled a few pages a frame.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct BackdropCheck {
+ key: Option<(DocId, u64)>,
+ /// Per page: `None` until checked.
+ pages: Vec>>,
+}
+
+/// What the check found among the pages a background goes on.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct BackdropCount {
+ /// Pages with a white backdrop that can be replaced.
+ pub fills: usize,
+ /// Pages covered by a picture (scans): the background stays hidden there.
+ pub images: usize,
+ /// Pages not checked yet.
+ pub pending: usize,
+}
+
+impl BackdropCheck {
+ /// Check up to [`BACKDROP_PAGES_PER_FRAME`] more of `pages` (0-based) and count them.
+ pub fn update(&mut self, doc: &pdfcraft_engine::Document, pages: &[usize]) -> BackdropCount {
+ let key = (doc.id, doc.edit_generation());
+ let count = doc.info.pages.len();
+ if self.key != Some(key) || self.pages.len() != count {
+ self.key = Some(key);
+ self.pages = vec![None; count];
+ }
+ let mut budget = BACKDROP_PAGES_PER_FRAME;
+ let mut n = BackdropCount::default();
+ for &p in pages {
+ let Some(slot) = self.pages.get_mut(p) else { continue };
+ if slot.is_none() && budget > 0 {
+ *slot = Some(doc.page_backdrop(p));
+ budget -= 1;
+ }
+ match slot {
+ None => n.pending += 1,
+ Some(Some(Backdrop::Fill)) => n.fills += 1,
+ Some(Some(Backdrop::Image)) => n.images += 1,
+ Some(None) => {}
+ }
+ }
+ n
+ }
+}
+
+/// "1 page" or "{n} pages", in a message.
+fn pages_phrase(n: usize, one: &str, many: &str) -> String {
+ if n == 1 { one.to_string() } else { crate::i18n::fmt(many, &[("n", &n.to_string())]) }
+}
+
#[derive(Clone, Debug, PartialEq)]
pub struct MarksDraft {
pub hf: HeaderFooter,
@@ -90,6 +147,8 @@ pub struct MarksDraft {
pub use_file: bool,
pub file: Option<(String, std::sync::Arc>)>,
pub file_page: usize,
+ /// Background: pages that paint their own backdrop.
+ pub backdrops: BackdropCheck,
}
impl Default for MarksDraft {
@@ -107,6 +166,7 @@ impl Default for MarksDraft {
use_file: false,
file: None,
file_page: 1,
+ backdrops: BackdropCheck::default(),
}
}
}
@@ -299,6 +359,9 @@ pub(crate) fn body(ui: &mut egui::Ui, app: &mut PdfCraftApp, t: &Tokens, kind: M
d.bg.opacity = pct / 100.0;
}
});
+ if let Some(doc) = app.session.get(id) {
+ backdrop_options(ui, t, d, doc, count);
+ }
}
}
ui.add_space(8.0);
@@ -364,6 +427,13 @@ pub(crate) fn body(ui: &mut egui::Ui, app: &mut PdfCraftApp, t: &Tokens, kind: M
}
MarkKind::Background => {
p.rect_filled(r, CornerRadius::ZERO, rgb32(bg.color).gamma_multiply(bg.opacity as f32));
+ // Schematic lines of text on top: the colour goes behind the content.
+ let (gap, inset) = (r.height() / 9.0, r.width() * 0.12);
+ for k in 1..8 {
+ let y = r.top() + gap * k as f32;
+ let end = if k % 3 == 0 { r.center().x } else { r.right() - inset };
+ p.line_segment([pos2(r.left() + inset, y), pos2(end, y)], Stroke::new((gap * 0.3).clamp(1.0, 3.0), Color32::from_gray(90)));
+ }
}
});
ui.vertical(|ui| {
@@ -477,6 +547,35 @@ fn file_source(ui: &mut egui::Ui, d: &mut MarksDraft, kind: MarkKind) -> bool {
browse
}
+/// Pages that paint their own backdrop would hide the background: offer to replace a white one,
+/// and say where a picture (a scan) will still hide it.
+fn backdrop_options(ui: &mut egui::Ui, t: &Tokens, d: &mut MarksDraft, doc: &pdfcraft_engine::Document, count: usize) {
+ let n = d.backdrops.update(doc, &d.range.pages(count));
+ if n.pending > 0 {
+ ui.label(egui::RichText::new(tl!("Checking pages…")).small().color(t.text_faint));
+ ui.ctx().request_repaint();
+ }
+ if n.fills > 0 {
+ ui.add_space(4.0);
+ let label = pages_phrase(
+ n.fills,
+ tl!("This page paints its own white backdrop, which would hide the background. Replace it"),
+ tl!("{n} pages paint their own white backdrop, which would hide the background. Replace it"),
+ );
+ ui.add(widgets::checkbox(&mut d.bg.replace_backdrop, &label));
+ ui.label(egui::RichText::new(tl!("Removing the background puts the page's own backdrop back.")).small().color(t.text_faint));
+ }
+ if n.images > 0 {
+ ui.add_space(4.0);
+ let text = pages_phrase(
+ n.images,
+ tl!("A picture covers this page (a scan?), so the background won't show there."),
+ tl!("A picture covers {n} pages (scans?), so the background won't show there."),
+ );
+ ui.label(egui::RichText::new(text).small().color(crate::content_ui::UNDRAWABLE));
+ }
+}
+
/// The edit the dialog's OK makes.
pub fn edit(d: &MarksDraft, kind: MarkKind, count: usize) -> Edit {
let pages = d.range.pages(count);
diff --git a/crates/ui-egui/tests/ui_group/marks.rs b/crates/ui-egui/tests/ui_group/marks.rs
index 0a0e45b152..3a9864ea47 100644
--- a/crates/ui-egui/tests/ui_group/marks.rs
+++ b/crates/ui-egui/tests/ui_group/marks.rs
@@ -96,3 +96,70 @@ fn backgrounds_and_watermarks_from_a_file() {
let s = h.state();
assert_eq!(s.session.get(s.views[0].id).unwrap().can_undo(), Some("Add background"));
}
+
+/// Three pages: a white backdrop of its own (as browsers write), a page-sized picture (a scan)
+/// and bare paper.
+fn backdrop_fixture() -> Vec {
+ let stream = |data: &str| format!("<< /Length {} >> stream\n{data}\nendstream", data.len());
+ let objs = [
+ "<< /Type /Catalog /Pages 2 0 R >>".to_string(),
+ "<< /Type /Pages /Kids [3 0 R 4 0 R 5 0 R] /Count 3 /MediaBox [0 0 300 400] /Resources << /XObject << /Im0 9 0 R >> >> >>".into(),
+ "<< /Type /Page /Parent 2 0 R /Contents 6 0 R >>".into(),
+ "<< /Type /Page /Parent 2 0 R /Contents 7 0 R >>".into(),
+ "<< /Type /Page /Parent 2 0 R /Contents 8 0 R >>".into(),
+ stream("q 1 1 1 rg 0 0 300 400 re f Q 0 g 20 20 50 50 re f"),
+ stream("q 300 0 0 400 0 0 cm /Im0 Do Q"),
+ stream("0 g 20 20 50 50 re f"),
+ "<< /Type /XObject /Subtype /Image /Width 1 /Height 1 /ColorSpace /DeviceGray /BitsPerComponent 8 /Length 1 >> stream\n\u{80}\nendstream"
+ .into(),
+ ];
+ let mut out = String::from("%PDF-1.7\n");
+ for (i, o) in objs.iter().enumerate() {
+ out.push_str(&format!("{} 0 obj {o} endobj\n", i + 1));
+ }
+ out.push_str("trailer << /Root 1 0 R >>\n%%EOF");
+ out.into_bytes()
+}
+
+#[test]
+fn the_background_dialog_offers_to_replace_a_white_backdrop_and_warns_about_scans() {
+ let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(|_cc| {
+ let mut app = PdfCraftApp::new();
+ app.set_option("language", "en").unwrap();
+ app.open_bytes("doc.pdf", None, backdrop_fixture()).unwrap();
+ app
+ });
+ h.run_steps(4);
+ let backdrop = |h: &Harness<'static, PdfCraftApp>, page| {
+ let s = h.state();
+ s.session.get(s.views[0].id).unwrap().page_backdrop(page)
+ };
+ assert_eq!(backdrop(&h, 0), Some(pdfcraft_engine::Backdrop::Fill));
+ h.state_mut().execute("edit.background");
+ h.run_steps(3);
+ let replace = "This page paints its own white backdrop, which would hide the background. Replace it";
+ h.get_by_label("A picture covers this page (a scan?), so the background won't show there.");
+ assert!(h.state().marks_draft.bg.replace_backdrop, "on by default");
+ // Left unticked, the backdrop stays and still hides the background.
+ h.get_by_label(replace).click();
+ h.run_steps(2);
+ h.get_by_label("OK").click();
+ h.run_steps(3);
+ assert_eq!(backdrop(&h, 0), Some(pdfcraft_engine::Backdrop::Fill));
+ assert!(h.state_mut().execute("edit.undo"));
+ h.run_steps(2);
+ // Ticked, it is replaced; the scan is reported, not touched.
+ h.state_mut().execute("edit.background");
+ h.run_steps(3);
+ h.get_by_label(replace).click();
+ h.run_steps(2);
+ assert!(h.state().marks_draft.bg.replace_backdrop);
+ h.get_by_label("OK").click();
+ h.run_steps(3);
+ assert_eq!(backdrop(&h, 0), None);
+ assert_eq!(backdrop(&h, 1), Some(pdfcraft_engine::Backdrop::Image));
+ // Nothing left to replace: the offer is gone.
+ h.state_mut().execute("edit.background.update");
+ h.run_steps(3);
+ assert!(h.query_by_label(replace).is_none());
+}
diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml
index c3d319f94f..e6b3dee939 100644
--- a/parity/acrobat-features.toml
+++ b/parity/acrobat-features.toml
@@ -2495,9 +2495,9 @@ tier = "P0"
milestone = "M7"
status = "shipped"
commands = ["edit.background"]
-tools = ["doc_background"]
-evidence = ["crates/ui-egui/tests/ui_group/marks.rs::watermark_and_background_dialogs", "crates/engine/src/tests.rs::headers_footers_watermarks_and_backgrounds_show_update_and_remove", "crates/engine/src/tests.rs::backgrounds_and_watermarks_from_files", "crates/ui-egui/tests/ui_group/marks.rs::backgrounds_and_watermarks_from_a_file", "crates/organize/src/tests.rs::a_page_becomes_a_form_xobject_upright"]
-notes = "colour, or a picture from a file (an image or a page of a PDF) scaled relative to the page"
+tools = ["doc_background", "doc_backdrops"]
+evidence = ["crates/ui-egui/tests/ui_group/marks.rs::watermark_and_background_dialogs", "crates/engine/src/tests.rs::headers_footers_watermarks_and_backgrounds_show_update_and_remove", "crates/engine/src/tests.rs::backgrounds_and_watermarks_from_files", "crates/ui-egui/tests/ui_group/marks.rs::backgrounds_and_watermarks_from_a_file", "crates/organize/src/tests.rs::a_page_becomes_a_form_xobject_upright", "crates/automation/tests/backdrop.rs::a_background_shows_on_a_page_that_paints_its_own_white_backdrop", "crates/ui-egui/tests/ui_group/marks.rs::the_background_dialog_offers_to_replace_a_white_backdrop_and_warns_about_scans", "crates/edit/src/backdrop_tests.rs::content_that_is_not_a_page_backdrop_is_left_alone"]
+notes = "colour, or a picture from a file (an image or a page of a PDF) scaled relative to the page. A page that paints its own opaque white backdrop (browsers' Save as PDF, print drivers) used to hide the background entirely; the dialog now offers to replace that fill (on by default; Remove puts it back unless the content was edited since). Our own choice: Acrobat's behaviour on such pages has not been observed. Still hidden: scanned pages (warned), backdrops drawn inside a form XObject, by a non-rectangular path, or in a named colour space; the dialog preview is a schematic, not the page"
[[feature]]
id = "edit.background-update-remove"
@@ -2508,8 +2508,8 @@ milestone = "M7"
status = "shipped"
commands = ["edit.background.update", "edit.background.remove"]
tools = ["doc_background", "doc_remove_marks"]
-evidence = ["crates/edit/src/tests.rs::replace_and_remove_restore_the_original_content", "crates/engine/src/tests.rs::headers_footers_watermarks_and_backgrounds_show_update_and_remove"]
-notes = ""
+evidence = ["crates/edit/src/tests.rs::replace_and_remove_restore_the_original_content", "crates/engine/src/tests.rs::headers_footers_watermarks_and_backgrounds_show_update_and_remove", "crates/edit/src/backdrop_tests.rs::a_white_fill_backdrop_is_replaced_and_put_back_when_the_background_goes", "crates/edit/src/backdrop_tests.rs::a_backdrop_copy_edited_since_is_kept_when_the_background_goes"]
+notes = "Remove also restores a page backdrop Add replaced"
[[feature]]
id = "edit.decoration-profiles"
From b5d34d439f9ef1f2393c5102fe24edd88a1afda8 Mon Sep 17 00:00:00 2001
From: alehel
Date: Fri, 16 Oct 2026 11:14:10 +0200
Subject: [PATCH 026/462] fix(ui): translate the Add Background backdrop
messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The six new dialog strings (the backdrop offer, its note, the scan
warning and "Checking pages…") were missing from every catalogue, which
the *_covers_ui_literals tests require. Languages with several plural
forms use the "label: {n}" pattern so any count reads correctly.
Co-Authored-By: Claude Opus 5.5
---
crates/ui-egui/src/i18n/ar.tsv | 6 ++++++
crates/ui-egui/src/i18n/bg.tsv | 6 ++++++
crates/ui-egui/src/i18n/cs.tsv | 6 ++++++
crates/ui-egui/src/i18n/de.tsv | 6 ++++++
crates/ui-egui/src/i18n/el.tsv | 6 ++++++
crates/ui-egui/src/i18n/es.tsv | 6 ++++++
crates/ui-egui/src/i18n/fr.tsv | 6 ++++++
crates/ui-egui/src/i18n/hu.tsv | 6 ++++++
crates/ui-egui/src/i18n/it.tsv | 6 ++++++
crates/ui-egui/src/i18n/ja.tsv | 6 ++++++
crates/ui-egui/src/i18n/kk.tsv | 6 ++++++
crates/ui-egui/src/i18n/lt.tsv | 6 ++++++
crates/ui-egui/src/i18n/pl.tsv | 6 ++++++
crates/ui-egui/src/i18n/pt-br.tsv | 6 ++++++
crates/ui-egui/src/i18n/ru.tsv | 6 ++++++
crates/ui-egui/src/i18n/sl.tsv | 6 ++++++
crates/ui-egui/src/i18n/te.tsv | 6 ++++++
crates/ui-egui/src/i18n/tr.tsv | 6 ++++++
crates/ui-egui/src/i18n/uk.tsv | 6 ++++++
crates/ui-egui/src/i18n/vi.tsv | 6 ++++++
crates/ui-egui/src/i18n/zh-hans.tsv | 6 ++++++
crates/ui-egui/src/i18n/zh-hant.tsv | 6 ++++++
22 files changed, 132 insertions(+)
diff --git a/crates/ui-egui/src/i18n/ar.tsv b/crates/ui-egui/src/i18n/ar.tsv
index 5a0e6e9c96..abea3aae73 100644
--- a/crates/ui-egui/src/i18n/ar.tsv
+++ b/crates/ui-egui/src/i18n/ar.tsv
@@ -822,6 +822,12 @@
Applies to 1 page يُطبَّق على صفحة واحدة
Applies to {n} pages يُطبَّق على {n} صفحات
Replaces the existing one on those pages. يستبدل الموجود على تلك الصفحات.
+ Checking pages… جارٍ فحص الصفحات…
+ This page paints its own white backdrop, which would hide the background. Replace it ترسم هذه الصفحة تعبئة بيضاء خاصة بها ستُخفي الخلفية. استبدالها
+ {n} pages paint their own white backdrop, which would hide the background. Replace it عدد الصفحات التي ترسم تعبئة بيضاء خاصة بها ستُخفي الخلفية: {n}. استبدالها
+ Removing the background puts the page's own backdrop back. إزالة الخلفية تعيد التعبئة البيضاء الخاصة بالصفحة.
+ A picture covers this page (a scan?), so the background won't show there. تغطي صورة هذه الصفحة (مسح ضوئي؟)، لذا لن تظهر الخلفية فيها.
+ A picture covers {n} pages (scans?), so the background won't show there. عدد الصفحات التي تغطيها صور (مسح ضوئي؟): {n}؛ لن تظهر الخلفية فيها.
PDF or image PDF أو صورة
No file chosen لم يُختر ملف
Page number رقم الصفحة
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 90791f4a86..e5f2eff8f4 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -496,6 +496,12 @@
Applies to 1 page Прилага се към 1 страница
Applies to {n} pages Прилага се към {n} страници
Replaces the existing one on those pages. Заменя съществуващия на тези страници.
+ Checking pages… Проверка на страниците…
+ This page paints its own white backdrop, which would hide the background. Replace it Тази страница има собствено бяло запълване, което би скрило фона. Замяна
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Страници със собствено бяло запълване, което би скрило фона: {n}. Замяна
+ Removing the background puts the page's own backdrop back. Премахването на фона връща собственото бяло запълване на страницата.
+ A picture covers this page (a scan?), so the background won't show there. Изображение покрива тази страница (сканиране?), затова фонът няма да се вижда там.
+ A picture covers {n} pages (scans?), so the background won't show there. Страници, покрити с изображения (сканирания?): {n}; фонът няма да се вижда там.
PDF or image PDF или изображение
No file chosen Не е избран файл
Page number Номер на страница
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index 4bbb9a5e77..a76c53166a 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -896,6 +896,12 @@ key Space Mezerník
Applies to 1 page Týká se 1 stránky
Applies to {n} pages Počet dotčených stránek: {n}
Replaces the existing one on those pages. Nahradí stávající na těchto stránkách.
+ Checking pages… Kontrola stránek…
+ This page paints its own white backdrop, which would hide the background. Replace it Tato stránka má vlastní bílou výplň, která by zakryla pozadí. Nahradit ji
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Stránky s vlastní bílou výplní, která by zakryla pozadí: {n}. Nahradit ji
+ Removing the background puts the page's own backdrop back. Odebráním pozadí se vrátí vlastní bílá výplň stránky.
+ A picture covers this page (a scan?), so the background won't show there. Tuto stránku pokrývá obrázek (sken?), takže pozadí na ní nebude vidět.
+ A picture covers {n} pages (scans?), so the background won't show there. Stránky pokryté obrázky (skeny?): {n}; pozadí na nich nebude vidět.
PDF or image PDF nebo obrázek
No file chosen Není vybrán žádný soubor
Page number Číslo stránky
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index 7965435257..9ec1649f0c 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -800,6 +800,12 @@
Applies to 1 page Gilt für 1 Seite
Applies to {n} pages Gilt für {n} Seiten
Replaces the existing one on those pages. Ersetzt das Vorhandene auf diesen Seiten.
+ Checking pages… Seiten werden geprüft…
+ This page paints its own white backdrop, which would hide the background. Replace it Diese Seite hat eine eigene weiße Fläche, die den Hintergrund verdecken würde. Ersetzen
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} Seiten haben eine eigene weiße Fläche, die den Hintergrund verdecken würde. Ersetzen
+ Removing the background puts the page's own backdrop back. Wird der Hintergrund entfernt, kehrt die eigene weiße Fläche der Seite zurück.
+ A picture covers this page (a scan?), so the background won't show there. Ein Bild bedeckt diese Seite (ein Scan?), daher ist der Hintergrund dort nicht zu sehen.
+ A picture covers {n} pages (scans?), so the background won't show there. Bilder bedecken {n} Seiten (Scans?), daher ist der Hintergrund dort nicht zu sehen.
PDF or image PDF oder Bild
No file chosen Keine Datei ausgewählt
Page number Seitenzahl
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index 57de6eef07..509adcb495 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -432,6 +432,12 @@
Applies to 1 page Εφαρμόζεται σε 1 σελίδα
Applies to {n} pages Εφαρμόζεται σε {n} σελίδες
Replaces the existing one on those pages. Αντικαθιστά το υπάρχον στοιχείο στις συγκεκριμένες σελίδες.
+ Checking pages… Έλεγχος σελίδων…
+ This page paints its own white backdrop, which would hide the background. Replace it Αυτή η σελίδα έχει δική της λευκή γέμιση, που θα έκρυβε το φόντο. Αντικατάσταση
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} σελίδες έχουν δική τους λευκή γέμιση, που θα έκρυβε το φόντο. Αντικατάσταση
+ Removing the background puts the page's own backdrop back. Η αφαίρεση του φόντου επαναφέρει τη λευκή γέμιση της σελίδας.
+ A picture covers this page (a scan?), so the background won't show there. Μια εικόνα καλύπτει αυτή τη σελίδα (σάρωση;), οπότε το φόντο δεν θα φαίνεται εκεί.
+ A picture covers {n} pages (scans?), so the background won't show there. Εικόνες καλύπτουν {n} σελίδες (σαρώσεις;), οπότε το φόντο δεν θα φαίνεται εκεί.
PDF or image PDF ή εικόνα
No file chosen Δεν έχει επιλεγεί αρχείο
Scale relative to target page Κλίμακα ως προς τη σελίδα προορισμού
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index e4eb634468..b3cd598fcf 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -816,6 +816,12 @@
Applies to 1 page Se aplica a 1 página
Applies to {n} pages Se aplica a {n} páginas
Replaces the existing one on those pages. Reemplaza al existente en esas páginas.
+ Checking pages… Comprobando páginas…
+ This page paints its own white backdrop, which would hide the background. Replace it Esta página tiene su propio relleno blanco, que ocultaría el fondo. Reemplazarlo
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} páginas tienen su propio relleno blanco, que ocultaría el fondo. Reemplazarlo
+ Removing the background puts the page's own backdrop back. Al quitar el fondo, se restaura el relleno blanco propio de la página.
+ A picture covers this page (a scan?), so the background won't show there. Una imagen cubre esta página (¿un escaneo?), así que el fondo no se verá ahí.
+ A picture covers {n} pages (scans?), so the background won't show there. Hay imágenes que cubren {n} páginas (¿escaneos?), así que el fondo no se verá ahí.
PDF or image PDF o imagen
No file chosen Ningún archivo elegido
Page number Número de página
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index 62acea1da8..9a693fc49c 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -796,6 +796,12 @@
Applies to 1 page S'applique à 1 page
Applies to {n} pages S'applique à {n} pages
Replaces the existing one on those pages. Remplace celui qui existe déjà sur ces pages.
+ Checking pages… Vérification des pages…
+ This page paints its own white backdrop, which would hide the background. Replace it Cette page a son propre remplissage blanc, qui masquerait l'arrière-plan. Le remplacer
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} pages ont leur propre remplissage blanc, qui masquerait l'arrière-plan. Le remplacer
+ Removing the background puts the page's own backdrop back. Supprimer l'arrière-plan rétablit le remplissage blanc propre à la page.
+ A picture covers this page (a scan?), so the background won't show there. Une image couvre cette page (une numérisation ?), l'arrière-plan n'y sera donc pas visible.
+ A picture covers {n} pages (scans?), so the background won't show there. Des images couvrent {n} pages (des numérisations ?), l'arrière-plan n'y sera donc pas visible.
PDF or image PDF ou image
No file chosen Aucun fichier choisi
Page number Numéro de page
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index 2238e1ade5..3eaf795525 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -793,6 +793,12 @@
Applies to 1 page 1 oldalra vonatkozik
Applies to {n} pages {n} oldalra vonatkozik
Replaces the existing one on those pages. Lecseréli a meglévőt ezeken az oldalakon.
+ Checking pages… Oldalak ellenőrzése…
+ This page paints its own white backdrop, which would hide the background. Replace it Ennek az oldalnak saját fehér kitöltése van, amely eltakarná a hátteret. Csere
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} oldalnak saját fehér kitöltése van, amely eltakarná a hátteret. Csere
+ Removing the background puts the page's own backdrop back. A háttér eltávolítása visszaállítja az oldal saját fehér kitöltését.
+ A picture covers this page (a scan?), so the background won't show there. Egy kép fedi le ezt az oldalt (szkennelt?), így ott nem látszik a háttér.
+ A picture covers {n} pages (scans?), so the background won't show there. Képek fednek le {n} oldalt (szkenneltek?), így ott nem látszik a háttér.
PDF or image PDF vagy kép
No file chosen Nincs fájl kiválasztva
Page number Oldalszám
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index 3fa2263a0b..4f52f86e71 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -819,6 +819,12 @@
Applies to 1 page Si applica a 1 pagina
Applies to {n} pages Si applica a {n} pagine
Replaces the existing one on those pages. Sostituisce l'elemento esistente su quelle pagine.
+ Checking pages… Verifica delle pagine…
+ This page paints its own white backdrop, which would hide the background. Replace it Questa pagina ha un proprio riempimento bianco, che nasconderebbe lo sfondo. Sostituiscilo
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} pagine hanno un proprio riempimento bianco, che nasconderebbe lo sfondo. Sostituiscilo
+ Removing the background puts the page's own backdrop back. Rimuovendo lo sfondo, il riempimento bianco della pagina viene ripristinato.
+ A picture covers this page (a scan?), so the background won't show there. Un'immagine copre questa pagina (una scansione?), quindi lì lo sfondo non sarà visibile.
+ A picture covers {n} pages (scans?), so the background won't show there. Delle immagini coprono {n} pagine (scansioni?), quindi lì lo sfondo non sarà visibile.
PDF or image PDF o immagine
No file chosen Nessun file scelto
Page number Numero di pagina
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index ee9439e311..1abf8b00f3 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -823,6 +823,12 @@
Applies to 1 page 1 ページに適用
Applies to {n} pages {n} ページに適用
Replaces the existing one on those pages. 対象ページの既存の項目を置き換えます。
+ Checking pages… ページを確認しています…
+ This page paints its own white backdrop, which would hide the background. Replace it このページには独自の白い塗りがあり、背景が隠れてしまいます。置き換える
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} ページに独自の白い塗りがあり、背景が隠れてしまいます。置き換える
+ Removing the background puts the page's own backdrop back. 背景を削除すると、ページ独自の白い塗りが元に戻ります。
+ A picture covers this page (a scan?), so the background won't show there. このページは画像(スキャン?)で覆われているため、背景は表示されません。
+ A picture covers {n} pages (scans?), so the background won't show there. {n} ページが画像(スキャン?)で覆われているため、そこでは背景は表示されません。
PDF or image PDF または画像
No file chosen ファイルが選択されていません
Page number ページ番号
diff --git a/crates/ui-egui/src/i18n/kk.tsv b/crates/ui-egui/src/i18n/kk.tsv
index 827165ae3a..3e5d693d52 100644
--- a/crates/ui-egui/src/i18n/kk.tsv
+++ b/crates/ui-egui/src/i18n/kk.tsv
@@ -778,6 +778,12 @@
Applies to 1 page 1 бетке қолданылады
Applies to {n} pages {n} бетке қолданылады
Replaces the existing one on those pages. Осы беттерде бар элементті ауыстырады.
+ Checking pages… Беттер тексерілуде…
+ This page paints its own white backdrop, which would hide the background. Replace it Бұл беттің өз ақ толтыруы бар, ол фонды жасырады. Ауыстыру
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} беттің өз ақ толтыруы бар, ол фонды жасырады. Ауыстыру
+ Removing the background puts the page's own backdrop back. Фонды жою беттің өз ақ толтыруын қайтарады.
+ A picture covers this page (a scan?), so the background won't show there. Бұл бетті сурет жауып тұр (сканер ме?), сондықтан онда фон көрінбейді.
+ A picture covers {n} pages (scans?), so the background won't show there. {n} бетті суреттер жауып тұр (сканер ме?), сондықтан онда фон көрінбейді.
PDF or image PDF немесе сурет
No file chosen Файл таңдалмады
Page number Бет нөмірі
diff --git a/crates/ui-egui/src/i18n/lt.tsv b/crates/ui-egui/src/i18n/lt.tsv
index 56a785cd3e..09fd3a65f9 100644
--- a/crates/ui-egui/src/i18n/lt.tsv
+++ b/crates/ui-egui/src/i18n/lt.tsv
@@ -958,6 +958,12 @@
Replacement text Pakaitinis tekstas
Replacement: pages of {name} Pakaitinis dokumentas: {name} puslapiai
Replaces the existing one on those pages. Tuose puslapiuose pakeičia esamą.
+ Checking pages… Tikrinami puslapiai…
+ This page paints its own white backdrop, which would hide the background. Replace it Šis puslapis turi savo baltą užpildą, kuris paslėptų foną. Pakeisti
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Puslapiai su savo baltu užpildu, kuris paslėptų foną: {n}. Pakeisti
+ Removing the background puts the page's own backdrop back. Pašalinus foną, grąžinamas paties puslapio baltas užpildas.
+ A picture covers this page (a scan?), so the background won't show there. Šį puslapį dengia paveikslėlis (nuskaitytas?), todėl fonas ten nesimatys.
+ A picture covers {n} pages (scans?), so the background won't show there. Paveikslėliais padengti puslapiai (nuskaityti?): {n}; fonas ten nesimatys.
Report Ataskaita
Report… Ataskaita…
Requires user to enter a password for: Naudotojas turi įvesti slaptažodį, kad galėtų:
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index 3dbb247056..6d55eed026 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -814,6 +814,12 @@
Applies to 1 page Dotyczy 1 strony
Applies to {n} pages Liczba objętych stron: {n}
Replaces the existing one on those pages. Zastępuje istniejący element na tych stronach.
+ Checking pages… Sprawdzanie stron…
+ This page paints its own white backdrop, which would hide the background. Replace it Ta strona ma własne białe wypełnienie, które zasłoniłoby tło. Zastąp
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Strony z własnym białym wypełnieniem, które zasłoniłoby tło: {n}. Zastąp
+ Removing the background puts the page's own backdrop back. Usunięcie tła przywraca własne białe wypełnienie strony.
+ A picture covers this page (a scan?), so the background won't show there. Tę stronę zakrywa obraz (skan?), więc tło nie będzie tam widoczne.
+ A picture covers {n} pages (scans?), so the background won't show there. Strony zakryte obrazami (skany?): {n}; tło nie będzie tam widoczne.
PDF or image PDF lub obraz
No file chosen Nie wybrano pliku
Page number Numer strony
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index 8b3baa2d39..ca6f416885 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -451,6 +451,12 @@
Applies to 1 page Aplica-se a 1 página
Applies to {n} pages Aplica-se a {n} páginas
Replaces the existing one on those pages. Substitui o existente nessas páginas.
+ Checking pages… Verificando páginas…
+ This page paints its own white backdrop, which would hide the background. Replace it Esta página tem um preenchimento branco próprio, que esconderia o plano de fundo. Substituí-lo
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} páginas têm um preenchimento branco próprio, que esconderia o plano de fundo. Substituí-lo
+ Removing the background puts the page's own backdrop back. Remover o plano de fundo restaura o preenchimento branco da página.
+ A picture covers this page (a scan?), so the background won't show there. Uma imagem cobre esta página (uma digitalização?), então o plano de fundo não aparecerá nela.
+ A picture covers {n} pages (scans?), so the background won't show there. Imagens cobrem {n} páginas (digitalizações?), então o plano de fundo não aparecerá nelas.
PDF or image PDF ou imagem
No file chosen Nenhum arquivo escolhido
Page number Número da página
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index d0f8fc239c..92f80a3fbe 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -816,6 +816,12 @@
Applies to 1 page Применяется к 1 странице
Applies to {n} pages Применяется к {n} страницам
Replaces the existing one on those pages. Заменяет существующий на этих страницах.
+ Checking pages… Проверка страниц…
+ This page paints its own white backdrop, which would hide the background. Replace it На этой странице есть собственная белая заливка, которая скроет фон. Заменить
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Страницы с собственной белой заливкой, которая скроет фон: {n}. Заменить
+ Removing the background puts the page's own backdrop back. При удалении фона собственная белая заливка страницы возвращается.
+ A picture covers this page (a scan?), so the background won't show there. Эту страницу закрывает изображение (скан?), поэтому фон там не будет виден.
+ A picture covers {n} pages (scans?), so the background won't show there. Страницы, закрытые изображениями (сканы?): {n}; фон там не будет виден.
PDF or image PDF или изображение
No file chosen Файл не выбран
Page number Номер страницы
diff --git a/crates/ui-egui/src/i18n/sl.tsv b/crates/ui-egui/src/i18n/sl.tsv
index 92d9c9a6e3..eb6b9678c4 100644
--- a/crates/ui-egui/src/i18n/sl.tsv
+++ b/crates/ui-egui/src/i18n/sl.tsv
@@ -1485,6 +1485,12 @@
Replacement text Nadomestno besedilo
Replacement: pages of {name} Zamenjava: strani datoteke {name}
Replaces the existing one on those pages. Nadomesti obstoječe na teh straneh.
+ Checking pages… Preverjanje strani…
+ This page paints its own white backdrop, which would hide the background. Replace it Ta stran ima lastno belo polnilo, ki bi skrilo ozadje. Zamenjaj
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Strani z lastnim belim polnilom, ki bi skrilo ozadje: {n}. Zamenjaj
+ Removing the background puts the page's own backdrop back. Odstranitev ozadja povrne lastno belo polnilo strani.
+ A picture covers this page (a scan?), so the background won't show there. To stran prekriva slika (skeniranje?), zato ozadje tam ne bo vidno.
+ A picture covers {n} pages (scans?), so the background won't show there. Strani, ki jih prekrivajo slike (skeniranja?): {n}; ozadje tam ne bo vidno.
Replacing images arrives on the web with image file pickers Zamenjava slik bo v spletni različici na voljo z izbirniki slikovnih datotek
Replacing images on page {p} arrives on the web with image pickers ({i}) Zamenjava slik na strani {p} bo v spletni različici na voljo z izbirniki slik ({i})
Reply Odgovori
diff --git a/crates/ui-egui/src/i18n/te.tsv b/crates/ui-egui/src/i18n/te.tsv
index 07b716eac1..9ec8e96bef 100644
--- a/crates/ui-egui/src/i18n/te.tsv
+++ b/crates/ui-egui/src/i18n/te.tsv
@@ -796,6 +796,12 @@ comment menu Edit సవరించు
Applies to 1 page 1 పేజీకి వర్తిస్తుంది
Applies to {n} pages {n} పేజీలకు వర్తిస్తుంది
Replaces the existing one on those pages. ఆ పేజీలలో ఇప్పటికే ఉన్నదాన్ని భర్తీ చేస్తుంది.
+ Checking pages… పేజీలను తనిఖీ చేస్తోంది…
+ This page paints its own white backdrop, which would hide the background. Replace it ఈ పేజీకి సొంత తెల్లని నింపు ఉంది, అది నేపథ్యాన్ని దాచేస్తుంది. భర్తీ చేయండి
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} పేజీలకు సొంత తెల్లని నింపు ఉంది, అది నేపథ్యాన్ని దాచేస్తుంది. భర్తీ చేయండి
+ Removing the background puts the page's own backdrop back. నేపథ్యాన్ని తీసివేస్తే పేజీ సొంత తెల్లని నింపు తిరిగి వస్తుంది.
+ A picture covers this page (a scan?), so the background won't show there. ఈ పేజీని ఒక చిత్రం కప్పుతోంది (స్కాన్?), కాబట్టి అక్కడ నేపథ్యం కనిపించదు.
+ A picture covers {n} pages (scans?), so the background won't show there. {n} పేజీలను చిత్రాలు కప్పుతున్నాయి (స్కాన్లు?), కాబట్టి అక్కడ నేపథ్యం కనిపించదు.
PDF or image PDF లేదా చిత్రం
No file chosen ఫైల్ ఏదీ ఎంచుకోలేదు
Page number పేజీ సంఖ్య
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index 30e19f2132..e500ba7c17 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -777,6 +777,12 @@
Applies to 1 page 1 sayfaya uygulanır
Applies to {n} pages {n} sayfaya uygulanır
Replaces the existing one on those pages. Bu sayfalardaki mevcut olanın yerini alır.
+ Checking pages… Sayfalar denetleniyor…
+ This page paints its own white backdrop, which would hide the background. Replace it Bu sayfanın arka planı gizleyecek kendi beyaz dolgusu var. Değiştir
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} sayfanın arka planı gizleyecek kendi beyaz dolgusu var. Değiştir
+ Removing the background puts the page's own backdrop back. Arka planı kaldırmak, sayfanın kendi beyaz dolgusunu geri getirir.
+ A picture covers this page (a scan?), so the background won't show there. Bu sayfayı bir resim kaplıyor (tarama mı?), bu yüzden arka plan orada görünmez.
+ A picture covers {n} pages (scans?), so the background won't show there. {n} sayfayı resimler kaplıyor (tarama mı?), bu yüzden arka plan orada görünmez.
PDF or image PDF veya resim
No file chosen Dosya seçilmedi
Page number Sayfa numarası
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index c60799ef1f..76bf5b0791 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -820,6 +820,12 @@
Applies to 1 page Застосовується до 1 сторінки
Applies to {n} pages Застосовується до {n} сторінок
Replaces the existing one on those pages. Замінює наявний елемент на цих сторінках.
+ Checking pages… Перевірка сторінок…
+ This page paints its own white backdrop, which would hide the background. Replace it Ця сторінка має власну білу заливку, яка приховає тло. Замінити
+ {n} pages paint their own white backdrop, which would hide the background. Replace it Сторінки з власною білою заливкою, яка приховає тло: {n}. Замінити
+ Removing the background puts the page's own backdrop back. Вилучення тла повертає власну білу заливку сторінки.
+ A picture covers this page (a scan?), so the background won't show there. Цю сторінку закриває зображення (скан?), тому тло там не буде видно.
+ A picture covers {n} pages (scans?), so the background won't show there. Сторінки, закриті зображеннями (скани?): {n}; тло там не буде видно.
PDF or image PDF або зображення
No file chosen Файл не вибрано
Page number Номер сторінки
diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv
index b072755236..5aabd0eb4f 100644
--- a/crates/ui-egui/src/i18n/vi.tsv
+++ b/crates/ui-egui/src/i18n/vi.tsv
@@ -953,6 +953,12 @@ theme Appearance Giao diện
Replacement text Văn bản được thay vào
Replacement: pages of {name} Thay thế: các trang của {name}
Replaces the existing one on those pages. Thay thế cái hiện có trên các trang đó.
+ Checking pages… Đang kiểm tra các trang…
+ This page paints its own white backdrop, which would hide the background. Replace it Trang này có lớp tô trắng riêng, sẽ che mất nền. Thay thế
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} trang có lớp tô trắng riêng, sẽ che mất nền. Thay thế
+ Removing the background puts the page's own backdrop back. Gỡ nền sẽ khôi phục lớp tô trắng riêng của trang.
+ A picture covers this page (a scan?), so the background won't show there. Một hình ảnh phủ kín trang này (bản quét?), nên nền sẽ không hiện ở đó.
+ A picture covers {n} pages (scans?), so the background won't show there. Hình ảnh phủ kín {n} trang (bản quét?), nên nền sẽ không hiện ở đó.
Report Báo cáo
Report… Báo cáo…
Requires user to enter a password for: Yêu cầu người dùng nhập mật khẩu cho:
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index 2297d1269a..b3c2642e79 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -503,6 +503,12 @@
Applies to 1 page 应用于 1 页
Applies to {n} pages 应用于 {n} 页
Replaces the existing one on those pages. 替换这些页面上的现有内容。
+ Checking pages… 正在检查页面…
+ This page paints its own white backdrop, which would hide the background. Replace it 此页面有自己的白色填充,会遮住背景。替换它
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} 个页面有自己的白色填充,会遮住背景。替换它
+ Removing the background puts the page's own backdrop back. 移除背景后,页面自己的白色填充会恢复。
+ A picture covers this page (a scan?), so the background won't show there. 此页面被一张图片覆盖(扫描件?),因此那里不会显示背景。
+ A picture covers {n} pages (scans?), so the background won't show there. {n} 个页面被图片覆盖(扫描件?),因此那里不会显示背景。
PDF or image PDF 或图像
No file chosen 未选择文件
Page number 页码
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index 2ddb33dd6d..611c6cf5ef 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -455,6 +455,12 @@
Applies to 1 page 套用於 1 頁
Applies to {n} pages 套用於 {n} 頁
Replaces the existing one on those pages. 替換這些頁面上的現有內容。
+ Checking pages… 正在檢查頁面…
+ This page paints its own white backdrop, which would hide the background. Replace it 此頁面有自己的白色填色,會遮住背景。取代它
+ {n} pages paint their own white backdrop, which would hide the background. Replace it {n} 個頁面有自己的白色填色,會遮住背景。取代它
+ Removing the background puts the page's own backdrop back. 移除背景後,頁面自己的白色填色會恢復。
+ A picture covers this page (a scan?), so the background won't show there. 此頁面被一張圖片覆蓋(掃描檔?),因此那裡不會顯示背景。
+ A picture covers {n} pages (scans?), so the background won't show there. {n} 個頁面被圖片覆蓋(掃描檔?),因此那裡不會顯示背景。
PDF or image PDF 或圖片
No file chosen 未選擇檔案
Page number 頁碼
From 93df949e3ef1c6f70868d3f60ee2f657a758a0c2 Mon Sep 17 00:00:00 2001
From: alehel
Date: Fri, 16 Oct 2026 11:40:07 +0200
Subject: [PATCH 027/462] fix(assets): refresh the catalogue hashes for the
backdrop translations
The 22 interface catalogues are registered assets; adding the Add
Background strings changed their SHA-256. Provenance is unchanged
(contributor-original translations).
Co-Authored-By: Claude Opus 5.5
---
ATTRIBUTION.toml | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/ATTRIBUTION.toml b/ATTRIBUTION.toml
index be9e2c448e..be2e770d56 100644
--- a/ATTRIBUTION.toml
+++ b/ATTRIBUTION.toml
@@ -7,7 +7,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Greek UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "cefa955aa92790d6773cb1d1e15e19019b3165a00528d57d6617362e1d1988ab"
+sha256 = "dd8a8b41a1a6de5d2f9f540d0c499366ccaa1ebfe62bb259f202dd4be03fc234"
# ATTRIBUTION.toml: one entry per asset (AGENTS.md §1). The source of truth for provenance and licences.
# ATTRIBUTION.md is generated from this file: `cargo xtask assets --write`. Checked by `cargo xtask assets` (part of `xtask ci`).
@@ -30,7 +30,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Simplified Chinese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "dbfebf4e9b2e9ac31ecf72202c2098173e72ebfaf90e9fee8f0563a6734fe31f"
+sha256 = "392fa715e7a058a6d6f872a9381260e9e1598ef45b616edc71bc6b311d9c4a34"
[[asset]]
path = "crates/ui-egui/src/i18n/zh-hant.tsv"
@@ -41,7 +41,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Traditional Chinese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "0b0dafa3806a6b3508684f64e1f07b435113f8efd0e59201d12250c63c1d9547"
+sha256 = "343b669decabca1e05a651b410b34427f2a28bb2dd22240a877bbb57a94d87af"
[[asset]]
path = "crates/ui-egui/src/i18n/cs.tsv"
@@ -52,7 +52,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Czech UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "898a5240fa59cac42ef6b99cb60bcfca0094ac27370e1c8d020bd27936b56517"
+sha256 = "e56bb7c7ebe676b5cb606f0bff4102ca036a532a2c6afbcc74e8a221b2ae3382"
[[asset]]
path = "crates/ui-egui/src/i18n/pt-br.tsv"
@@ -63,7 +63,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Brazilian Portuguese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "b4745c94797575529cd0e78c18c71fa2c0dfddfbf19b9c40b41dc2057c6f6543"
+sha256 = "9e3085c3a3d0c6114df4bd73d380d8efc4bb05ba07ad0285b4c54abd9a901b69"
[[asset]]
path = "crates/ui-egui/src/i18n/es.tsv"
@@ -74,7 +74,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Spanish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "2acb3f6522d6d1f744343f474fe4c51ebec610a888a7fa83fc9422228e6fa3c1"
+sha256 = "8a450837808cd319c82e39b4833623b64c3e50009beffd732d00b8eb88d32fbc"
[[asset]]
path = "crates/ui-egui/src/i18n/fr.tsv"
@@ -85,7 +85,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "French UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "1b739478a4f186a49900cce84edbe136206a53b46340322df4caf77bb3fb5b12"
+sha256 = "9c6c34ec7f372b3d3db2c88435b497eb4bbf2032859c1bfc3cfb12c47c3b36b6"
[[asset]]
path = "crates/ui-egui/src/i18n/de.tsv"
@@ -96,7 +96,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "German UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "da3b71608ff7fe6e230b076207cee96ac01f66e068ca1be83af1ad56ac9c60eb"
+sha256 = "9d890f88003febb885e076df172872cfff76cde77cf22b1af57c570229dc4316"
[[asset]]
path = "crates/ui-egui/src/i18n/te.tsv"
@@ -107,7 +107,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Telugu UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "989d2e5f57cf22c21a85951835ca9fbd05e314da67eb4c17332df1f03679fa00"
+sha256 = "617bf25bb48c93a0578e5832f54420fc47b3a97ad31bf9ffd57556a1bdb4048b"
[[asset]]
path = "crates/ui-egui/src/i18n/it.tsv"
@@ -118,7 +118,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Italian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "5e84916e3ad8670216360695689fe8fd624365a29886f66a3c655ba126892f5b"
+sha256 = "b90ef8f3a4b71e2aca3bc98f8420b25fbc6f86220b75f0c5f47b731551e506f8"
[[asset]]
path = "crates/ui-egui/src/i18n/pl.tsv"
@@ -129,7 +129,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Polish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "988bcf2e0322a46c0464ff7b91ab5d90193b0ea7f454812d12595eb843de6fc7"
+sha256 = "77069128e2d00b03cedf460915fc00a0cc00880e3b1aecf6de769b06c218f71b"
[[asset]]
path = "crates/ui-egui/src/i18n/ru.tsv"
@@ -140,7 +140,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Russian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "084f4ea06f31c632ad90b0e87f66240ce5b5dc012ac7770987d44918ee66f452"
+sha256 = "2ee89f763e825609beb78b5f05f3a035cff4f01c81a0fb80dcefbbf209d19f98"
[[asset]]
path = "crates/ui-egui/src/i18n/hu.tsv"
@@ -151,7 +151,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Hungarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "973cd90ec34c8a973d146a0e2c73c1d632e17357c3d87ccf10c59e64d12c1587"
+sha256 = "19844f166956ac49e6c4c09b57e2024e0d73c5c3e14ee8df994a1799bef9b648"
[[asset]]
path = "crates/ui-egui/src/i18n/bg.tsv"
@@ -162,7 +162,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Bulgarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "485f85d4053c9661ddda2ed9394a0644c77b489feb598d02f12ef209e11f2ee3"
+sha256 = "5b31891a0775d5e7a9cfb14a2f767b2fa17c9d948ce92b43cd371846a3d69322"
[[asset]]
path = "crates/ui-egui/src/i18n/kk.tsv"
@@ -173,7 +173,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Kazakh UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "24524864022ab2abeff68b5979519eee4e92134d0c4053d40c741bc7f01c249c"
+sha256 = "e7b587ecf87095a1317bf37830ca60e75a16a0285dfa14e0361ddfd04b44800b"
[[asset]]
path = "crates/ui-egui/src/i18n/ja.tsv"
@@ -184,7 +184,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Japanese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "bc6d123bdb34d5d7c22717fed1a86ff20e7e493acc1e155e61e61e2dc74459aa"
+sha256 = "9413104f8543e8a03dccb014d62bd40a77645de5b279c55b3266c02e907afb89"
[[asset]]
path = "crates/ui-egui/src/i18n/uk.tsv"
@@ -195,7 +195,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Ukrainian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "82678dbe730f56062037ea78de165b2c016b3fa670fb1cbfc7cd713eca900bac"
+sha256 = "f1490c97273e57b256e234a8a53766318f75f888a05144727efc226c7d67f62d"
[[asset]]
path = "crates/ui-egui/src/i18n/ar.tsv"
@@ -206,7 +206,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Arabic UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "304d661b27cdb5246f6b2974b4b5e78667f0928cda3588440be3d8f35f254679"
+sha256 = "2216666f2d355aed70b4c60e09bfe07d902036bbad52aee1e287e5f50a887903"
[[asset]]
path = "crates/ui-egui/src/i18n/tr.tsv"
@@ -217,7 +217,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Turkish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "05e2b7d5401166d362ba055120fba9a1645d6ec324997cf670e19fafcb0c54cf"
+sha256 = "436777718e77c79ca54a16a629d725e7b480ad9fad5f25f7c249b446208797e4"
[[asset]]
path = "crates/ui-egui/src/i18n/lt.tsv"
@@ -228,7 +228,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Lithuanian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "17c8579e0e9d1524ffbeb87e7b30c14562dbaac64400826ee786cecfe31648fa"
+sha256 = "d66b81e59728b669ed1a35e4773d0ef75b25f7143109e9a5fc7dd29e6a52ee25"
[[asset]]
@@ -3352,7 +3352,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Vietnamese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "2d1c4b4276d02512a4e20101be95a1671de5c4f5cdfd661887af5ebab0db06a6"
+sha256 = "a2dde60a333e8c75d8f07190149d28d3f210c0c8662e0493b4e67dd34789e453"
[[asset]]
path = "crates/ui-egui/src/i18n/sl.tsv"
@@ -3363,7 +3363,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Slovene UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "8f8a259264cda06eb6d9a9bf91dc7d873a8561213a9a9e7acbd32623bef40be0"
+sha256 = "73563d2d36a685ef23ed517eb635a654b1a5900abe7471db17b40af62b4cd223"
[[asset]]
From 035183777a113c17b9e64282796a029df2d10e18 Mon Sep 17 00:00:00 2001
From: Combiler01
Date: Fri, 16 Oct 2026 21:24:49 +0530
Subject: [PATCH 028/462] fix:implement 8 point non destructive crop, image
resize and Arrange extraction bugs
---
ATTRIBUTION.toml | 10 +-
crates/edit/src/images.rs | 225 +-
crates/edit/src/tests.rs | 169 +
crates/engine/src/copy_image.rs | 9 +-
crates/engine/src/lib.rs | 4 +
crates/engine/src/tests.rs | 7 +
crates/ui-egui/src/canvas.rs | 554 +-
crates/ui-egui/src/content_ui.rs | 141 +-
crates/ui-egui/src/dialogs.rs | 27 +-
crates/ui-egui/src/edit_text_ui.rs | 893 +-
crates/ui-egui/src/home.rs | 38 +-
crates/ui-egui/src/i18n/bg.tsv | 2 +-
crates/ui-egui/src/i18n/es.tsv | 6 +
crates/ui-egui/src/i18n/lt.tsv | 8 +
crates/ui-egui/src/i18n/mod.rs | 1 +
crates/ui-egui/src/i18n/vi.tsv | 71 +-
crates/ui-egui/src/i18n/zh-hant.tsv | 2 -
crates/ui-egui/src/image_engine.rs | 645 +
crates/ui-egui/src/image_pick.rs | 15 +-
crates/ui-egui/src/lib.rs | 19 +-
crates/ui-egui/src/panels.rs | 26 +-
crates/ui-egui/tests/editing.rs | 433 +
crates/ui-egui/tests/print.rs | 9 +-
parity/acrobat-features.toml | 20306 +++++++++++++-------------
24 files changed, 13092 insertions(+), 10528 deletions(-)
create mode 100644 crates/ui-egui/src/image_engine.rs
diff --git a/ATTRIBUTION.toml b/ATTRIBUTION.toml
index 3f3791f719..b51fb682c9 100644
--- a/ATTRIBUTION.toml
+++ b/ATTRIBUTION.toml
@@ -41,7 +41,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Traditional Chinese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "8c6d5b1505d76bc7ba606c98660afa60b1152c5b4c2e7d345104a6ef3d280ed2"
+sha256 = "0b0dafa3806a6b3508684f64e1f07b435113f8efd0e59201d12250c63c1d9547"
[[asset]]
path = "crates/ui-egui/src/i18n/cs.tsv"
@@ -74,7 +74,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Spanish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "a9cf0e062b006b40f549ce2316b88d4b0196d70bd9cecd66c12d980d699bf679"
+sha256 = "59d3464945d5869dc9b6a6163adf6c6a1a8d1a1da2e5d69c107db9d8c264175d"
[[asset]]
path = "crates/ui-egui/src/i18n/fr.tsv"
@@ -162,7 +162,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Bulgarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "98359685aa555f391846f2259ac302ce1234c7a180fb4abe07c36e0c1c62211e"
+sha256 = "129afc635aa7249073901ed4f661dd0b84c3efee2ee09a351066be7d45c9c2f6"
[[asset]]
path = "crates/ui-egui/src/i18n/kk.tsv"
@@ -228,7 +228,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Lithuanian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "63955758227bd57329b22dc7c16ed9cee8b0a15df9453477755849c886424dd5"
+sha256 = "da3e4e8d5fad4d744360f2f9c35d9f94e6fbd02b3f8076cb93a17af56d234cdf"
[[asset]]
@@ -240,7 +240,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Vietnamese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "b54adaa6515dbfb0de3859b30989054e5fcc4f56e66e9cc713c7bf509bdbbac3"
+sha256 = "50c16fa90a4d36de4fb7a3ec9b0c5dfd0cdb896515a5c7f59e74681074e38db4"
[[asset]]
path = "assets/icons/accessibility.svg"
diff --git a/crates/edit/src/images.rs b/crates/edit/src/images.rs
index cd4dbade44..46d4cee891 100644
--- a/crates/edit/src/images.rs
+++ b/crates/edit/src/images.rs
@@ -592,9 +592,12 @@ fn content_units(ops: &[Op], scan_start: usize, scan_end: usize) -> Vec,
- state_ops: Vec,
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct ExtractedScopeState {
+ pub clip_ops: Vec,
+ pub state_ops: Vec,
+ pub effective_cm: Matrix,
+ pub do_op: Op,
}
#[derive(Clone, Debug, Default, PartialEq)]
@@ -711,12 +714,85 @@ impl ExtendedGStateTracker {
}
}
-fn extract_scope_state(ops: &[Op], start: usize, target: usize, initial_ctm: Matrix) -> Result, EditError> {
+fn clip_path_to_ops(clip: &ClipPath) -> Vec {
+ let mut ops = Vec::new();
+ let mut current_pt = Point::ZERO;
+ for el in clip.path.elements() {
+ match el {
+ kurbo::PathEl::MoveTo(p) => {
+ if !p.x.is_finite() || !p.y.is_finite() {
+ return Vec::new();
+ }
+ current_pt = *p;
+ ops.push(Op::new("m", vec![pdfcraft_content::num(p.x), pdfcraft_content::num(p.y)]));
+ }
+ kurbo::PathEl::LineTo(p) => {
+ if !p.x.is_finite() || !p.y.is_finite() {
+ return Vec::new();
+ }
+ current_pt = *p;
+ ops.push(Op::new("l", vec![pdfcraft_content::num(p.x), pdfcraft_content::num(p.y)]));
+ }
+ kurbo::PathEl::QuadTo(p1, p2) => {
+ if !p1.x.is_finite() || !p1.y.is_finite() || !p2.x.is_finite() || !p2.y.is_finite() {
+ return Vec::new();
+ }
+ let c1_x = current_pt.x + (p1.x - current_pt.x) * (2.0 / 3.0);
+ let c1_y = current_pt.y + (p1.y - current_pt.y) * (2.0 / 3.0);
+ let c2_x = p2.x + (p1.x - p2.x) * (2.0 / 3.0);
+ let c2_y = p2.y + (p1.y - p2.y) * (2.0 / 3.0);
+ if !c1_x.is_finite() || !c1_y.is_finite() || !c2_x.is_finite() || !c2_y.is_finite() {
+ return Vec::new();
+ }
+ current_pt = *p2;
+ ops.push(Op::new(
+ "c",
+ vec![
+ pdfcraft_content::num(c1_x),
+ pdfcraft_content::num(c1_y),
+ pdfcraft_content::num(c2_x),
+ pdfcraft_content::num(c2_y),
+ pdfcraft_content::num(p2.x),
+ pdfcraft_content::num(p2.y),
+ ],
+ ));
+ }
+ kurbo::PathEl::CurveTo(p1, p2, p3) => {
+ if !p1.x.is_finite() || !p1.y.is_finite() || !p2.x.is_finite() || !p2.y.is_finite() || !p3.x.is_finite() || !p3.y.is_finite() {
+ return Vec::new();
+ }
+ current_pt = *p3;
+ ops.push(Op::new(
+ "c",
+ vec![
+ pdfcraft_content::num(p1.x),
+ pdfcraft_content::num(p1.y),
+ pdfcraft_content::num(p2.x),
+ pdfcraft_content::num(p2.y),
+ pdfcraft_content::num(p3.x),
+ pdfcraft_content::num(p3.y),
+ ],
+ ));
+ }
+ kurbo::PathEl::ClosePath => {
+ ops.push(Op::new("h", vec![]));
+ }
+ }
+ }
+ if !ops.is_empty() {
+ ops.push(Op::new(if clip.even_odd { "W*" } else { "W" }, vec![]));
+ ops.push(Op::new("n", vec![]));
+ }
+ ops
+}
+
+pub(crate) fn extract_scope_state(ops: &[Op], start: usize, target: usize, initial_ctm: Matrix) -> Result, EditError> {
if target >= ops.len() || start > target {
return Ok(None);
}
+ let target_op = ops.get(target).cloned().ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
if start == target {
- return Ok(Some(ExtractedScopeState { clip_ops: Vec::new(), state_ops: Vec::new() }));
+ return Ok(Some(ExtractedScopeState { clip_ops: Vec::new(), state_ops: Vec::new(), effective_cm: initial_ctm, do_op: target_op }));
}
let mut clip_ops = Vec::new();
let mut state_ops = Vec::new();
@@ -807,7 +883,7 @@ fn extract_scope_state(ops: &[Op], start: usize, target: usize, initial_ctm: Mat
return Ok(None);
}
- Ok(Some(ExtractedScopeState { clip_ops, state_ops }))
+ Ok(Some(ExtractedScopeState { clip_ops, state_ops, effective_cm: matrix, do_op: target_op }))
}
/// Change the stacking order of image `index` on `page`.
@@ -885,7 +961,7 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
)
});
- let (target_span, scope_start) = if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
+ let (mut target_span, scope_start) = if let Ok(Some((sub_start, sub_end, _))) = image_exclusive_scope(&ops, target)
&& sub_start >= target_unit.start
&& sub_end < target_unit.end
{
@@ -947,14 +1023,30 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
return Err(EditError::Invalid("unsupported graphics state: non-invertible CTM".into()));
}
- let is_clipped = (img.visible_rect.is_some() && img.visible_rect != Some(img.rect)) || !img.clips.is_empty();
-
- let extracted = extract_scope_state(&ops, scope_start, target, scope_start_ctm)?;
- let Some(extracted) = extracted else {
- return Err(EditError::Invalid("unsupported graphics state: unable to cleanly extract image scope state".into()));
+ let mut extracted = match extract_scope_state(&ops, scope_start, target, scope_start_ctm)? {
+ Some(ext) => ext,
+ None if scope_start != target => {
+ let target_op = ops.get(target).cloned().ok_or_else(|| EditError::Invalid("the image operation is missing".into()))?;
+ target_span = target_op.span.start..target_op.span.end;
+ extract_scope_state(&ops, target, target, Matrix(img.draw_matrix))?
+ .ok_or_else(|| EditError::Invalid("unsupported graphics state: unable to cleanly extract image scope state".into()))?
+ }
+ None => {
+ return Err(EditError::Invalid("unsupported graphics state: unable to cleanly extract image scope state".into()));
+ }
};
- if is_clipped && extracted.clip_ops.is_empty() {
+ if extracted.clip_ops.is_empty() && !img.clips.is_empty() {
+ for clip in &img.clips {
+ let ops = clip_path_to_ops(clip);
+ if !ops.is_empty() {
+ extracted.clip_ops.extend(ops);
+ }
+ }
+ }
+
+ let has_inherited_clip = !img.clips.is_empty() && extracted.clip_ops.is_empty();
+ if has_inherited_clip {
return Err(EditError::Invalid("unsupported graphics state: inherited clipping path cannot be cleanly preserved".into()));
}
@@ -1025,7 +1117,7 @@ pub fn arrange_image(doc: &mut Document, page: usize, index: usize, order: Arran
}
}
}
- unit_ops.push(ops.get(target).cloned().unwrap_or_else(|| Op::new("Do", vec![Object::name(&img.name)])));
+ unit_ops.push(extracted.do_op);
unit_ops.push(Op::new("Q", vec![]));
let mut serialized = Vec::new();
@@ -1156,9 +1248,7 @@ fn extract_image_drawing_ops(ops: &[Op], start: usize, end: usize, scope_matrix:
while ops.get(k).is_some_and(|o| matches!(o.op.as_slice(), b"m" | b"l" | b"c" | b"v" | b"y" | b"h" | b"re")) {
k = k.saturating_add(1);
}
- if k > i
- && ops.get(k).is_some_and(|o| matches!(o.op.as_slice(), b"W" | b"W*"))
- && ops.get(k.saturating_add(1)).is_some_and(|o| o.is("n"))
+ if k > i && ops.get(k).is_some_and(|o| matches!(o.op.as_slice(), b"W" | b"W*")) && ops.get(k.saturating_add(1)).is_some_and(|o| o.is("n"))
{
i = k.saturating_add(2);
if scope_matrix != Matrix::IDENTITY
@@ -1406,6 +1496,7 @@ fn transform_image(
if !local.0.iter().all(|v| v.is_finite() && v.abs() <= 1e12) {
return Err(EditError::Invalid("the image transform is too large".into()));
}
+
// Already alone in a `q cm … Q` (its own placement, or the wrapper an earlier edit added):
// change that `cm` in place. The CTM inside is `local · cm · outer` either way.
if let Some((at, cm)) = enclosing_transform(&ops, start, end) {
@@ -1456,10 +1547,43 @@ fn crop_image_impl(
if !keep.iter().all(|v| v.is_finite() && v.abs() <= 1e12) {
return Err(EditError::Invalid("the crop box must be finite and no larger than 1e12".into()));
}
- let [x0, y0, x1, y1] = [keep[0].min(keep[2]), keep[1].min(keep[3]), keep[0].max(keep[2]), keep[1].max(keep[3])];
- if x1 - x0 < 1e-6 || y1 - y0 < 1e-6 {
+ let is_normalized = keep[0] >= 0.0
+ && keep[1] >= 0.0
+ && keep[2] <= 1.0
+ && keep[3] <= 1.0
+ && keep[2] > keep[0]
+ && keep[3] > keep[1]
+ && ((image.rect[2] - image.rect[0]).abs() > 1.5 || (image.rect[3] - image.rect[1]).abs() > 1.5);
+
+ let (u0, v0, u1, v1) = if is_normalized {
+ (keep[0], keep[1], keep[2], keep[3])
+ } else {
+ let [x0, y0, x1, y1] = [keep[0].min(keep[2]), keep[1].min(keep[3]), keep[0].max(keep[2]), keep[1].max(keep[3])];
+ if x1 - x0 < 1e-6 || y1 - y0 < 1e-6 {
+ return Err(EditError::Invalid("the crop box has no area".into()));
+ }
+ let inv = Matrix(image.matrix).invert().ok_or_else(|| EditError::Invalid("the image has no area".into()))?;
+ let corners = [(x0, y0), (x1, y0), (x1, y1), (x0, y1)].map(|(x, y)| inv.apply(x, y));
+ let min_u = corners.iter().map(|(u, _)| *u).fold(f64::INFINITY, f64::min).clamp(0.0, 1.0);
+ let max_u = corners.iter().map(|(u, _)| *u).fold(f64::NEG_INFINITY, f64::max).clamp(0.0, 1.0);
+ let min_v = corners.iter().map(|(_, v)| *v).fold(f64::INFINITY, f64::min).clamp(0.0, 1.0);
+ let max_v = corners.iter().map(|(_, v)| *v).fold(f64::NEG_INFINITY, f64::max).clamp(0.0, 1.0);
+ if max_u - min_u < 1e-6 || max_v - min_v < 1e-6 {
+ return Err(EditError::Invalid("the crop box has no area".into()));
+ }
+ (min_u, min_v, max_u, max_v)
+ };
+
+ if u1 - u0 < 1e-6 || v1 - v0 < 1e-6 {
return Err(EditError::Invalid("the crop box has no area".into()));
}
+
+ let m = Matrix(image.matrix);
+ let p00 = m.apply(u0, v0);
+ let p10 = m.apply(u1, v0);
+ let p11 = m.apply(u1, v1);
+ let p01 = m.apply(u0, v1);
+
let mut offset = 0_usize;
for (_, data) in streams.iter().take(image.stream) {
offset = offset
@@ -1478,16 +1602,36 @@ fn crop_image_impl(
.ok_or_else(|| EditError::Invalid("the image operation could not be located".into()))?;
let (start, end, placement) = image_transform_scope(&ops, target)?.unwrap_or((target, target, Matrix(image.draw_matrix)));
let inverse = placement.invert().ok_or_else(|| EditError::Invalid("the image has no area".into()))?;
- let corners = [(x0, y0), (x1, y0), (x1, y1), (x0, y1)].map(|(x, y)| inverse.apply(x, y));
+ let corners = [p00, p10, p11, p01].map(|(x, y)| inverse.apply(x, y));
if !corners.iter().all(|(x, y)| x.is_finite() && y.is_finite() && x.abs() <= 1e12 && y.abs() <= 1e12) {
return Err(EditError::Invalid("the crop box is too large for the image's placement".into()));
}
- let clip: Vec = corners
- .iter()
- .enumerate()
- .map(|(i, (x, y))| Op::new(if i == 0 { "m" } else { "l" }, vec![Object::Real(*x), Object::Real(*y)]))
- .chain([Op::new("h", vec![]), Op::new("W", vec![]), Op::new("n", vec![])])
- .collect();
+ let is_axis_aligned = ((corners[0].1 - corners[1].1).abs() < 1e-4
+ && (corners[1].0 - corners[2].0).abs() < 1e-4
+ && (corners[2].1 - corners[3].1).abs() < 1e-4
+ && (corners[3].0 - corners[0].0).abs() < 1e-4)
+ || ((corners[0].0 - corners[1].0).abs() < 1e-4
+ && (corners[1].1 - corners[2].1).abs() < 1e-4
+ && (corners[2].0 - corners[3].0).abs() < 1e-4
+ && (corners[3].1 - corners[0].1).abs() < 1e-4);
+ let clip: Vec = if is_axis_aligned {
+ let min_x = corners.iter().map(|(x, _)| *x).fold(f64::INFINITY, f64::min);
+ let max_x = corners.iter().map(|(x, _)| *x).fold(f64::NEG_INFINITY, f64::max);
+ let min_y = corners.iter().map(|(_, y)| *y).fold(f64::INFINITY, f64::min);
+ let max_y = corners.iter().map(|(_, y)| *y).fold(f64::NEG_INFINITY, f64::max);
+ vec![
+ Op::new("re", vec![Object::Real(min_x), Object::Real(min_y), Object::Real(max_x - min_x), Object::Real(max_y - min_y)]),
+ Op::new("W", vec![]),
+ Op::new("n", vec![]),
+ ]
+ } else {
+ corners
+ .iter()
+ .enumerate()
+ .map(|(i, (x, y))| Op::new(if i == 0 { "m" } else { "l" }, vec![Object::Real(*x), Object::Real(*y)]))
+ .chain([Op::new("h", vec![]), Op::new("W", vec![]), Op::new("n", vec![])])
+ .collect()
+ };
// The image's own earlier crop (a clipping path right after the scope's `q`) gives way to
// the new one, so a crop can grow again as well as shrink.
let old_clip: Option> = (start != end)
@@ -1606,3 +1750,32 @@ pub(crate) fn translate_images(doc: &mut Document, page: usize, indexes: &[usize
doc.update_dict(p.obj, |d| d.set(b"Contents".to_vec(), contents))?;
Ok(())
}
+
+/// Post-multiplies the image's existing CTM `[a, b, c, d, e, f]` by the crop transform
+/// `[u_min, v_min, u_max, v_max]` to shrink the footprint without stretching.
+pub fn crop_ctm(ctm: [f64; 6], crop: [f64; 4]) -> [f64; 6] {
+ let [a, b, c, d, e, f] = ctm;
+ let [u_min, v_min, u_max, v_max] = crop;
+ let new_a = a * (u_max - u_min);
+ let new_b = b * (u_max - u_min);
+ let new_c = c * (v_max - v_min);
+ let new_d = d * (v_max - v_min);
+ let new_e = e + a * u_min + c * v_min;
+ let new_f = f + b * u_min + d * v_min;
+ [new_a, new_b, new_c, new_d, new_e, new_f]
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_crop_ctm_standard_non_stretched() {
+ // Standard upright CTM: width=200, height=100 at origin (50, 100)
+ let ctm = [200.0, 0.0, 0.0, 100.0, 50.0, 100.0];
+ let crop = [0.25, 0.25, 0.75, 0.75];
+ let cropped = crop_ctm(ctm, crop);
+ let expected = [100.0, 0.0, 0.0, 50.0, 100.0, 125.0];
+ assert_eq!(cropped, expected);
+ }
+}
diff --git a/crates/edit/src/tests.rs b/crates/edit/src/tests.rs
index 95968392f6..e224565d4a 100644
--- a/crates/edit/src/tests.rs
+++ b/crates/edit/src/tests.rs
@@ -2058,6 +2058,39 @@ fn image_arrange_stacking_order_and_remove_crop() {
assert_eq!(img_restored_moved.visible_rect, Some(img_restored_moved.rect));
}
+#[test]
+fn crop_rotated_image_preserves_angle_and_in_place_geometry() {
+ let content = "q 173.20508 100 -50 86.60254 100 100 cm /Im0 Do Q";
+ let mut doc = image_page_with(content);
+ let img_before = &images::page_images(&doc, 0).unwrap()[0];
+ let m_before = img_before.matrix;
+ assert!((m_before[1] - 100.0).abs() < 1e-3);
+ assert!((m_before[2] - (-50.0)).abs() < 1e-3);
+
+ images::crop_image(&mut doc, 0, 0, [0.25, 0.25, 0.75, 0.75]).unwrap();
+ let doc = reopen(&doc);
+ let img_cropped = &images::page_images(&doc, 0).unwrap()[0];
+
+ let m_after = img_cropped.matrix;
+ assert!((m_after[0] - m_before[0]).abs() < 1e-3);
+ assert!((m_after[1] - m_before[1]).abs() < 1e-3);
+ assert!((m_after[2] - m_before[2]).abs() < 1e-3);
+ assert!((m_after[3] - m_before[3]).abs() < 1e-3);
+ assert!((m_after[4] - m_before[4]).abs() < 1e-3);
+ assert!((m_after[5] - m_before[5]).abs() < 1e-3);
+
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ assert!(str_content.contains("re") && str_content.contains("W\nn"), "{str_content}");
+ assert!(str_content.contains("/Im0 Do"), "{str_content}");
+
+ let mut doc = doc;
+ images::remove_image_crop(&mut doc, 0, 0).unwrap();
+ let doc = reopen(&doc);
+ let img_restored = &images::page_images(&doc, 0).unwrap()[0];
+ assert_eq!(img_restored.matrix, m_before);
+}
+
#[test]
fn image_arrange_preserves_shared_group_drawings() {
let content = "q 100 0 0 100 100 100 cm /Im0 Do /Im0 Do Q BT /F1 12 Tf 72 700 Td (End Text) Tj ET";
@@ -2252,6 +2285,108 @@ fn unwrapped_image_moves_successfully() {
assert!(str_content.contains("100 0 0 100 50 50 cm"), "Preservation: original cm preserved");
}
+#[test]
+fn test_arrange_unwrapped_image_extraction() {
+ let content = b"100 0 0 100 100 100 cm /Im0 Do /Im1 Do";
+ let ops = pdfcraft_content::parse(content).ops;
+ let target = ops.iter().position(|op| op.is("Do") && op.name(0) == Some(b"Im0")).expect("target /Im0 not found");
+
+ // Scope start for unwrapped image matches target because content_units isolates Do
+ let scope_start = target;
+
+ // Accumulate effective CTM prior to the image operation
+ let mut initial_ctm = pdfcraft_content::Matrix::IDENTITY;
+ for op in &ops[..target] {
+ if op.is("cm")
+ && let Some(m) = op.nums::<6>()
+ {
+ initial_ctm = pdfcraft_content::Matrix(m).then(&initial_ctm);
+ }
+ }
+ assert_eq!(initial_ctm, pdfcraft_content::Matrix([100.0, 0.0, 0.0, 100.0, 100.0, 100.0]));
+
+ let extracted = images::extract_scope_state(&ops, scope_start, target, initial_ctm)
+ .expect("extraction must not return Err")
+ .expect("extraction must return Some rather than None");
+
+ assert_eq!(extracted.do_op.op.as_slice(), b"Do");
+ assert_eq!(extracted.do_op.name(0), Some(b"Im0".as_slice()));
+ assert_eq!(extracted.effective_cm, pdfcraft_content::Matrix([100.0, 0.0, 0.0, 100.0, 100.0, 100.0]));
+}
+
+#[test]
+fn arrange_unwrapped_image_in_mixed_scope_succeeds() {
+ // Content unit contains text and an unwrapped image; scope extraction of unit fails on BT,
+ // so it safely falls back to extracting target Do directly.
+ let content = "q BT /F1 12 Tf 72 700 Td (Preceding Text) Tj ET 100 0 0 100 50 50 cm /Im0 Do Q BT /F1 12 Tf 72 500 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let initial = images::page_images(&doc, 0).unwrap();
+ assert_eq!(initial.len(), 1);
+
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ let text_pos = str_content.find("External Text").unwrap();
+ let do_pos = str_content.rfind("/Im0 Do").unwrap();
+ assert!(text_pos < do_pos, "moved image follows External Text");
+
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1);
+ assert_eq!(after[0].rect, [50.0, 50.0, 150.0, 150.0]);
+}
+
+#[test]
+fn image_arrange_with_transformed_clipping_path_succeeds() {
+ // Nested graphics state: outer scope establishes a scaled clipping path (cm + path + W n),
+ // inner scope draws the image.
+ let content = "q 0.5 0 0 0.5 0 0 cm 100 100 m 300 100 l 300 300 l 100 300 l h W n q 100 0 0 100 50 50 cm /Im0 Do Q Q BT /F1 12 Tf 72 700 Td (External Text) Tj ET";
+ let mut doc = image_page_with(content);
+ let before = images::page_images(&doc, 0).unwrap();
+ assert_eq!(before.len(), 1);
+ assert!(before[0].visible_rect.is_some());
+ let rect_before = before[0].rect;
+ let clip_before = before[0].visible_rect;
+
+ images::arrange_image(&mut doc, 0, 0, images::ArrangeOrder::BringToFront).unwrap();
+ let doc = reopen(&doc);
+ let after = images::page_images(&doc, 0).unwrap();
+ assert_eq!(after.len(), 1);
+ assert_eq!(after[0].rect, rect_before);
+ assert_eq!(after[0].visible_rect, clip_before);
+
+ let bytes = page_content_bytes(&doc, 0);
+ let str_content = String::from_utf8_lossy(&bytes);
+ let text_pos = str_content.find("External Text").unwrap();
+ let do_pos = str_content.rfind("/Im0 Do").unwrap();
+ assert!(text_pos < do_pos, "image moved after text: {str_content}");
+}
+
+#[test]
+fn biomolecules_image_arrange_with_inherited_clips_succeeds() {
+ let Ok(data) = std::fs::read("C:\\Users\\Harsh\\Downloads\\Biomolecules.pdf") else { return };
+ let mut doc = Document::open(std::sync::Arc::new(data)).unwrap();
+
+ // Page 0, image 1
+ images::arrange_image(&mut doc, 0, 1, images::ArrangeOrder::SendBackward).unwrap();
+ images::arrange_image(&mut doc, 0, 1, images::ArrangeOrder::SendToBack).unwrap();
+
+ // Page 6, images
+ let imgs_p6 = images::page_images(&doc, 6).unwrap();
+ for i in 0..imgs_p6.len() {
+ images::arrange_image(&mut doc, 6, i, images::ArrangeOrder::BringToFront).unwrap();
+ images::arrange_image(&mut doc, 6, i, images::ArrangeOrder::SendBackward).unwrap();
+ }
+
+ // Page 8, images
+ let imgs_p8 = images::page_images(&doc, 8).unwrap();
+ for i in 0..imgs_p8.len() {
+ images::arrange_image(&mut doc, 8, i, images::ArrangeOrder::BringToFront).unwrap();
+ images::arrange_image(&mut doc, 8, i, images::ArrangeOrder::SendBackward).unwrap();
+ }
+}
+
#[test]
fn inherited_source_opacity_is_preserved() {
// Outer q sets /GS0 gs; inner q draws /Im0 Do; outer Q restores state before External Text
@@ -4845,3 +4980,37 @@ fn japanese_paragraphs_wrap_between_characters_without_closing_marks_at_a_row_st
}
}
}
+
+#[test]
+fn test_image_move_does_not_emit_whiteout() {
+ let mut doc = image_page();
+ let imgs = images::page_images(&doc, 0).unwrap();
+ assert_eq!(imgs.len(), 1);
+ let original_rect = imgs[0].rect;
+
+ // Move the image to a new location
+ let target_rect = [original_rect[0] + 50.0, original_rect[1] + 100.0, original_rect[2] + 50.0, original_rect[3] + 100.0];
+ let t = images::rect_to_rect(original_rect, target_rect);
+ images::change_image(&mut doc, 0, 0, &images::ImageChange::Transform(t)).unwrap();
+ let doc = reopen(&doc);
+
+ // Inspect the resulting PDF content stream
+ let bytes = page_content_bytes(&doc, 0);
+ let content = String::from_utf8_lossy(&bytes);
+
+ // Assert that no white fill operators were added
+ assert!(!content.contains("1 1 1 rg"), "must not emit white fill rgb: {content}");
+ assert!(!content.contains("1 g"), "must not emit white fill gray: {content}");
+ assert!(!content.contains("re\nf") && !content.contains("re f"), "must not emit whiteout rect fill: {content}");
+
+ // Assert that the image's cm was cleanly updated to the new position
+ let moved_imgs = images::page_images(&doc, 0).unwrap();
+ assert_eq!(moved_imgs.len(), 1);
+ assert!(close(moved_imgs[0].rect, target_rect), "rect matches target: {:?}", moved_imgs[0].rect);
+ assert!(
+ content.contains(&format!("{} {} cm", moved_imgs[0].matrix[4] as i64, moved_imgs[0].matrix[5] as i64))
+ || content.contains("cm\n /Im0 Do")
+ || content.contains("cm /Im0 Do"),
+ "cm cleanly updated: {content}"
+ );
+}
diff --git a/crates/engine/src/copy_image.rs b/crates/engine/src/copy_image.rs
index 642c84e670..d23f44550b 100644
--- a/crates/engine/src/copy_image.rs
+++ b/crates/engine/src/copy_image.rs
@@ -20,7 +20,14 @@ impl Document {
let editor = self.editor.as_ref()?;
let inside = |r: &[f64; 4]| (r[0]..=r[2]).contains(&at[0]) && (r[1]..=r[3]).contains(&at[1]);
self.page_images(page).iter().rposition(|i| {
- inside(&i.rect)
+ let bounds = if let Some(clip) = i.clip_rect {
+ let r = [i.rect[0].max(clip[0]), i.rect[1].max(clip[1]), i.rect[2].min(clip[2]), i.rect[3].min(clip[3])];
+ if r.iter().all(|v| v.is_finite()) && r[2] > r[0] && r[3] > r[1] { r } else { i.visible_rect.unwrap_or(i.rect) }
+ } else {
+ i.visible_rect.unwrap_or(i.rect)
+ };
+ inside(&bounds)
+ && i.contains(at)
&& match (i.is_form, i.object) {
(false, Some(_)) => true,
(true, Some(form)) => picture_in_form(&editor.cos, form).is_some(),
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 3df0a908d0..61d93c4817 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -86,6 +86,8 @@ pub enum ImageEdit {
name: String,
bytes: Arc>,
},
+ /// Apply an arbitrary 2D affine transform matrix in user space.
+ Transform([f64; 6]),
Delete,
/// Change the stacking order.
Arrange(ArrangeOrder),
@@ -2003,6 +2005,7 @@ impl Edit {
Edit::MoveObjects { objects, .. } => plural("Move object", "Move objects", objects.len()),
Edit::EditPageImage { change, .. } => Label::of(match change {
ImageEdit::Move(_) => "Move image",
+ ImageEdit::Transform(_) => "Transform image",
ImageEdit::Rotate(_) => "Rotate image",
ImageEdit::Crop(_) => "Crop image",
ImageEdit::Flip { .. } => "Flip image",
@@ -2508,6 +2511,7 @@ fn run_edit(doc: &mut pdfcraft_cos::Document, edit: &Edit, cx: &mut EditCtx) ->
.ok_or_else(|| EditError::Edit(pdfcraft_edit::EditError::Invalid(format!("page {} has no image {}", page + 1, index + 1))))?;
let c = match change {
ImageEdit::Move(to) => pdfcraft_edit::ImageChange::Transform(pdfcraft_edit::rect_to_rect(img.rect, *to)),
+ ImageEdit::Transform(t) => pdfcraft_edit::ImageChange::Transform(*t),
ImageEdit::Rotate(q) => {
pdfcraft_edit::ImageChange::Transform(pdfcraft_edit::turn_about_centre(img.visible_rect.unwrap_or(img.rect), *q, false, false))
}
diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs
index ed90eea411..4951cf8a1f 100644
--- a/crates/engine/src/tests.rs
+++ b/crates/engine/src/tests.rs
@@ -5074,6 +5074,13 @@ fn copy_image_finds_the_image_under_a_point_and_decodes_it_at_full_size() {
assert_eq!((w, h), (3, 2));
assert_eq!(rgba, px.into_raw());
assert!(d.page_image_rgba(0, 1).is_err());
+
+ // When the image is cropped, page_image_at only hit-tests the visible cropped region:
+ let crop_keep = [r[0] + (r[2] - r[0]) * 0.25, r[1] + (r[3] - r[1]) * 0.25, r[0] + (r[2] - r[0]) * 0.75, r[1] + (r[3] - r[1]) * 0.75];
+ s.apply(id, Edit::EditPageImage { page: 0, index: 0, change: ImageEdit::Crop(crop_keep) }).unwrap();
+ let d = s.get(id).unwrap();
+ assert_eq!(d.page_image_at(0, [(r[0] + r[2]) / 2.0, (r[1] + r[3]) / 2.0]), Some(0));
+ assert_eq!(d.page_image_at(0, [r[0] + 0.1, r[1] + 0.1]), None, "cropped-away corner must not hit-test positive");
}
/// Copy Image: a JPEG drawn through grouped Form artwork (as Word, InDesign and scanners write
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 0f924cb5aa..ff44d69af5 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -65,6 +65,318 @@ fn texture_bytes(tex: &TextureHandle) -> usize {
rgba_bytes(w, h)
}
+use crate::edit_text_ui::ImageHandle;
+
+/// Extension trait on `egui::Painter` to draw polygons.
+pub trait PainterExt {
+ fn polygon(&self, points: Vec, fill: Color32, stroke: Stroke) -> egui::layers::ShapeIdx;
+}
+
+impl PainterExt for egui::Painter {
+ fn polygon(&self, points: Vec, fill: Color32, stroke: Stroke) -> egui::layers::ShapeIdx {
+ self.add(egui::Shape::convex_polygon(points, fill, stroke))
+ }
+}
+
+/// User-space selectable bounding box for an image object.
+/// If the image object has an active clipping path applied to it (the crop box),
+/// this is the mathematical intersection of the full CTM-derived rect and the clipping path's rect.
+pub fn image_selectable_bounds(im: &pdfcraft_engine::PageImage) -> [f64; 4] {
+ if let Some(clip) = im.clip_rect {
+ let r = [im.rect[0].max(clip[0]), im.rect[1].max(clip[1]), im.rect[2].min(clip[2]), im.rect[3].min(clip[3])];
+ if r.iter().all(|v| v.is_finite()) && r[2] > r[0] && r[3] > r[1] {
+ return r;
+ }
+ }
+ im.visible_rect.unwrap_or(im.rect)
+}
+
+/// Screen-space selectable bounding box for an image object.
+/// If the image object has an active clipping path applied to it (the crop box),
+/// the final selectable `egui::Rect` is the mathematical intersection of the image's
+/// full CTM-derived rect and the clipping path's rect.
+pub fn image_screen_rect(im: &pdfcraft_engine::PageImage, xf: &PageXform, info: &DocInfo, page: usize) -> Rect {
+ let full = xf.user_rect(info, page, im.rect.map(|v| v as f32));
+ if let Some(clip) = im.clip_rect {
+ let clip_r = xf.user_rect(info, page, clip.map(|v| v as f32));
+ let inter = full.intersect(clip_r);
+ if inter.is_positive() {
+ return inter;
+ }
+ }
+ if let Some(vr) = im.visible_rect {
+ let r = xf.user_rect(info, page, vr.map(|v| v as f32));
+ if r.is_positive() {
+ return r;
+ }
+ }
+ full
+}
+
+/// An Oriented Bounding Box (OBB) representing a rotated rectangle in screen space,
+/// with 8 resize handles and rotated local axes.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct ImageObb {
+ pub s00: Pos2,
+ pub s10: Pos2,
+ pub s11: Pos2,
+ pub s01: Pos2,
+ pub s_bc: Pos2,
+ pub s_rc: Pos2,
+ pub s_tc: Pos2,
+ pub s_lc: Pos2,
+ pub s_rot: Pos2,
+ pub screen_center: Pos2,
+ pub width: f32,
+ pub height: f32,
+ pub theta: f32,
+ pub u_axis: (f64, f64),
+ pub v_axis: (f64, f64),
+ pub is_rotated: bool,
+}
+
+impl ImageObb {
+ /// Calculates the 4 rotated corners manually using center, width, height, and rotation angle (θ).
+ /// Local axes: `u_axis = (cos θ, sin θ)` and `v_axis = (-sin θ, cos θ)`.
+ /// Places the 8 resize handles exactly at these rotated vertices and midpoints.
+ pub fn from_center_size_angle(center: Pos2, width: f32, height: f32, theta: f32) -> Self {
+ let cos_t = theta.cos();
+ let sin_t = theta.sin();
+ let u_axis = (cos_t as f64, sin_t as f64);
+ let v_axis = (-sin_t as f64, cos_t as f64);
+ let u_vec = vec2(cos_t, sin_t);
+ let v_vec = vec2(-sin_t, cos_t);
+ let hw = width * 0.5;
+ let hh = height * 0.5;
+
+ let s00 = center - u_vec * hw - v_vec * hh;
+ let s10 = center + u_vec * hw - v_vec * hh;
+ let s11 = center + u_vec * hw + v_vec * hh;
+ let s01 = center - u_vec * hw + v_vec * hh;
+
+ let s_bc = center - v_vec * hh;
+ let s_rc = center + u_vec * hw;
+ let s_tc = center + v_vec * hh;
+ let s_lc = center - u_vec * hw;
+
+ let s_rot = s_tc + v_vec * 24.0;
+ let is_rotated = theta.abs() > 1e-4;
+
+ Self { s00, s10, s11, s01, s_bc, s_rc, s_tc, s_lc, s_rot, screen_center: center, width, height, theta, u_axis, v_axis, is_rotated }
+ }
+
+ pub fn new(matrix: [f64; 6], xf: &PageXform, info: &DocInfo, page: usize) -> Self {
+ Self::from_matrix(matrix, xf, info, page)
+ }
+
+ pub fn from_matrix(matrix: [f64; 6], xf: &PageXform, info: &DocInfo, page: usize) -> Self {
+ let m = crate::edit_text_ui::Matrix(matrix);
+ let p00 = m.apply(0.0, 0.0);
+ let p10 = m.apply(1.0, 0.0);
+ let p11 = m.apply(1.0, 1.0);
+ let p01 = m.apply(0.0, 1.0);
+
+ let s00 = crate::edit_text_ui::user_to_screen(xf, info, page, p00.0, p00.1);
+ let s10 = crate::edit_text_ui::user_to_screen(xf, info, page, p10.0, p10.1);
+ let s11 = crate::edit_text_ui::user_to_screen(xf, info, page, p11.0, p11.1);
+ let s01 = crate::edit_text_ui::user_to_screen(xf, info, page, p01.0, p01.1);
+
+ let s_bc = Pos2::new((s00.x + s10.x) * 0.5, (s00.y + s10.y) * 0.5);
+ let s_rc = Pos2::new((s10.x + s11.x) * 0.5, (s10.y + s11.y) * 0.5);
+ let s_tc = Pos2::new((s01.x + s11.x) * 0.5, (s01.y + s11.y) * 0.5);
+ let s_lc = Pos2::new((s00.x + s01.x) * 0.5, (s00.y + s01.y) * 0.5);
+
+ let screen_center = Pos2::new((s00.x + s10.x + s11.x + s01.x) * 0.25, (s00.y + s10.y + s11.y + s01.y) * 0.25);
+ let out_dir = s_tc - screen_center;
+ let out_len = out_dir.length().max(1e-4);
+ let out_norm = out_dir / out_len;
+ let s_rot = s_tc + out_norm * 24.0;
+
+ let [a, b, c, d, ..] = matrix;
+ let w_u = (a * a + b * b).sqrt().max(1e-6);
+ let h_v = (c * c + d * d).sqrt().max(1e-6);
+ let u_axis = (a / w_u, b / w_u);
+ let v_axis = (c / h_v, d / h_v);
+ let theta = (b).atan2(a) as f32;
+ let is_rotated = b.abs() > 1e-4 || c.abs() > 1e-4;
+
+ Self {
+ s00,
+ s10,
+ s11,
+ s01,
+ s_bc,
+ s_rc,
+ s_tc,
+ s_lc,
+ s_rot,
+ screen_center,
+ width: (s10 - s00).length(),
+ height: (s01 - s00).length(),
+ theta,
+ u_axis,
+ v_axis,
+ is_rotated,
+ }
+ }
+
+ pub fn from_image(im: &pdfcraft_engine::PageImage, xf: &PageXform, info: &DocInfo, page: usize) -> Self {
+ let [_, b, c, ..] = im.matrix;
+ let is_rot = b.abs() > 1e-4 || c.abs() > 1e-4;
+ let bounds = image_selectable_bounds(im);
+ let matrix = if !is_rot && bounds[2] > bounds[0] && bounds[3] > bounds[1] {
+ [bounds[2] - bounds[0], 0.0, 0.0, bounds[3] - bounds[1], bounds[0], bounds[1]]
+ } else {
+ im.matrix
+ };
+ Self::from_matrix(matrix, xf, info, page)
+ }
+
+ pub fn handles(&self) -> [(ImageHandle, Pos2); 8] {
+ [
+ (ImageHandle::TopLeft, self.s01),
+ (ImageHandle::TopCenter, self.s_tc),
+ (ImageHandle::TopRight, self.s11),
+ (ImageHandle::RightCenter, self.s_rc),
+ (ImageHandle::BottomRight, self.s10),
+ (ImageHandle::BottomCenter, self.s_bc),
+ (ImageHandle::BottomLeft, self.s00),
+ (ImageHandle::LeftCenter, self.s_lc),
+ ]
+ }
+
+ pub fn handle_pos(&self, handle: ImageHandle) -> Pos2 {
+ match handle {
+ ImageHandle::TopLeft => self.s01,
+ ImageHandle::TopCenter => self.s_tc,
+ ImageHandle::TopRight => self.s11,
+ ImageHandle::RightCenter => self.s_rc,
+ ImageHandle::BottomRight => self.s10,
+ ImageHandle::BottomCenter => self.s_bc,
+ ImageHandle::BottomLeft => self.s00,
+ ImageHandle::LeftCenter => self.s_lc,
+ }
+ }
+
+ pub fn handle_id(&self, base_id: egui::Id, handle: ImageHandle) -> egui::Id {
+ base_id.with(match handle {
+ ImageHandle::TopLeft => "handle_tl",
+ ImageHandle::TopCenter => "handle_tc",
+ ImageHandle::TopRight => "handle_tr",
+ ImageHandle::RightCenter => "handle_rc",
+ ImageHandle::BottomRight => "handle_br",
+ ImageHandle::BottomCenter => "handle_bc",
+ ImageHandle::BottomLeft => "handle_bl",
+ ImageHandle::LeftCenter => "handle_lc",
+ })
+ }
+
+ pub fn handles_with_ids(&self, base_id: egui::Id) -> [(ImageHandle, Pos2, egui::Id); 8] {
+ [
+ (ImageHandle::TopLeft, self.s01, self.handle_id(base_id, ImageHandle::TopLeft)),
+ (ImageHandle::TopCenter, self.s_tc, self.handle_id(base_id, ImageHandle::TopCenter)),
+ (ImageHandle::TopRight, self.s11, self.handle_id(base_id, ImageHandle::TopRight)),
+ (ImageHandle::RightCenter, self.s_rc, self.handle_id(base_id, ImageHandle::RightCenter)),
+ (ImageHandle::BottomRight, self.s10, self.handle_id(base_id, ImageHandle::BottomRight)),
+ (ImageHandle::BottomCenter, self.s_bc, self.handle_id(base_id, ImageHandle::BottomCenter)),
+ (ImageHandle::BottomLeft, self.s00, self.handle_id(base_id, ImageHandle::BottomLeft)),
+ (ImageHandle::LeftCenter, self.s_lc, self.handle_id(base_id, ImageHandle::LeftCenter)),
+ ]
+ }
+
+ pub fn corners(&self) -> [Pos2; 4] {
+ [self.s00, self.s10, self.s11, self.s01]
+ }
+
+ /// Resizes the OBB proportionally along its local axes using projected mouse delta,
+ /// locking the diagonally opposite corner as the fixed anchor point.
+ pub fn scale_proportional(&self, handle: ImageHandle, delta: Vec2, min_size: f32) -> Self {
+ let u_vec = vec2(self.u_axis.0 as f32, self.u_axis.1 as f32);
+ let v_vec = vec2(self.v_axis.0 as f32, self.v_axis.1 as f32);
+ let delta_u = delta.dot(u_vec);
+ let delta_v = delta.dot(v_vec);
+ let min_s = min_size.max(5.0);
+
+ match handle {
+ ImageHandle::TopRight => {
+ let anchor = self.s00;
+ let s_u = (self.width + delta_u) / self.width.max(1e-4);
+ let s_v = (self.height + delta_v) / self.height.max(1e-4);
+ let s = if (s_u - 1.0).abs() >= (s_v - 1.0).abs() { s_u } else { s_v };
+ let s = s.max(min_s / self.width.max(1e-4)).max(min_s / self.height.max(1e-4));
+ let nw = self.width * s;
+ let nh = self.height * s;
+ let new_center = anchor + u_vec * (nw * 0.5) + v_vec * (nh * 0.5);
+ Self::from_center_size_angle(new_center, nw, nh, self.theta)
+ }
+ ImageHandle::TopLeft => {
+ let anchor = self.s10;
+ let s_u = (self.width - delta_u) / self.width.max(1e-4);
+ let s_v = (self.height + delta_v) / self.height.max(1e-4);
+ let s = if (s_u - 1.0).abs() >= (s_v - 1.0).abs() { s_u } else { s_v };
+ let s = s.max(min_s / self.width.max(1e-4)).max(min_s / self.height.max(1e-4));
+ let nw = self.width * s;
+ let nh = self.height * s;
+ let new_center = anchor - u_vec * (nw * 0.5) + v_vec * (nh * 0.5);
+ Self::from_center_size_angle(new_center, nw, nh, self.theta)
+ }
+ ImageHandle::BottomLeft => {
+ let anchor = self.s11;
+ let s_u = (self.width - delta_u) / self.width.max(1e-4);
+ let s_v = (self.height - delta_v) / self.height.max(1e-4);
+ let s = if (s_u - 1.0).abs() >= (s_v - 1.0).abs() { s_u } else { s_v };
+ let s = s.max(min_s / self.width.max(1e-4)).max(min_s / self.height.max(1e-4));
+ let nw = self.width * s;
+ let nh = self.height * s;
+ let new_center = anchor - u_vec * (nw * 0.5) - v_vec * (nh * 0.5);
+ Self::from_center_size_angle(new_center, nw, nh, self.theta)
+ }
+ ImageHandle::BottomRight => {
+ let anchor = self.s01;
+ let s_u = (self.width + delta_u) / self.width.max(1e-4);
+ let s_v = (self.height - delta_v) / self.height.max(1e-4);
+ let s = if (s_u - 1.0).abs() >= (s_v - 1.0).abs() { s_u } else { s_v };
+ let s = s.max(min_s / self.width.max(1e-4)).max(min_s / self.height.max(1e-4));
+ let nw = self.width * s;
+ let nh = self.height * s;
+ let new_center = anchor + u_vec * (nw * 0.5) - v_vec * (nh * 0.5);
+ Self::from_center_size_angle(new_center, nw, nh, self.theta)
+ }
+ ImageHandle::RightCenter => {
+ let anchor = self.s_lc;
+ let nw = (self.width + delta_u).max(min_s);
+ let new_center = anchor + u_vec * (nw * 0.5);
+ Self::from_center_size_angle(new_center, nw, self.height, self.theta)
+ }
+ ImageHandle::LeftCenter => {
+ let anchor = self.s_rc;
+ let nw = (self.width - delta_u).max(min_s);
+ let new_center = anchor - u_vec * (nw * 0.5);
+ Self::from_center_size_angle(new_center, nw, self.height, self.theta)
+ }
+ ImageHandle::TopCenter => {
+ let anchor = self.s_bc;
+ let nh = (self.height + delta_v).max(min_s);
+ let new_center = anchor + v_vec * (nh * 0.5);
+ Self::from_center_size_angle(new_center, self.width, nh, self.theta)
+ }
+ ImageHandle::BottomCenter => {
+ let anchor = self.s_tc;
+ let nh = (self.height - delta_v).max(min_s);
+ let new_center = anchor - v_vec * (nh * 0.5);
+ Self::from_center_size_angle(new_center, self.width, nh, self.theta)
+ }
+ }
+ }
+}
+
+/// Projects mouse delta onto local unit axes `u_axis` and `v_axis` using the dot product.
+pub fn project_delta(delta: Vec2, u_axis: (f64, f64), v_axis: (f64, f64)) -> (f64, f64) {
+ let dx = delta.x as f64;
+ let dy = delta.y as f64;
+ (dx * u_axis.0 + dy * u_axis.1, dx * v_axis.0 + dy * v_axis.1)
+}
+
/// Visible grid rows, plus one adjacent row in either direction. Work is independent of
/// document length, including after a large scroll jump.
pub(crate) fn thumbnail_rows(top: f32, bottom: f32, row_height: f32, rows: usize) -> Range {
@@ -606,15 +918,15 @@ pub(crate) fn default_page_context_menu(
*action = Some(PageMenuAction::Print);
ui.close();
}
- if crate::icons::button(ui, "mouse-pointer-2", 24.0, false, tl!("Select Tool")).clicked() {
+ if crate::icons::button(ui, "mouse-pointer-2", 24.0, false, "Select Tool").clicked() {
*action = Some(PageMenuAction::SelectTool);
ui.close();
}
- if crate::icons::button(ui, "hand", 24.0, false, tl!("Hand Tool")).clicked() {
+ if crate::icons::button(ui, "hand", 24.0, false, "Hand Tool").clicked() {
*action = Some(PageMenuAction::HandTool);
ui.close();
}
- if crate::icons::button(ui, "zoom-in", 24.0, false, tl!("Marquee Zoom")).clicked() {
+ if crate::icons::button(ui, "zoom-in", 24.0, false, "Marquee Zoom").clicked() {
*action = Some(PageMenuAction::MarqueeZoom);
ui.close();
}
@@ -626,7 +938,7 @@ pub(crate) fn default_page_context_menu(
*action = Some(PageMenuAction::Copy);
ui.close();
}
- if ui.add_enabled(can_paste, egui::Button::new(tl!("Paste")).shortcut_text("Ctrl+V")).clicked() {
+ if ui.add_enabled(can_paste, egui::Button::new("Paste").shortcut_text("Ctrl+V")).clicked() {
*action = Some(PageMenuAction::Paste(page, at));
ui.close();
}
@@ -648,7 +960,7 @@ pub(crate) fn default_page_context_menu(
ui.separator();
- if ui.add(egui::Button::new(egui::RichText::new(tl!("Edit this PDF")).strong())).clicked() {
+ if ui.add(egui::Button::new(egui::RichText::new("Edit this PDF").strong())).clicked() {
*action = Some(PageMenuAction::EditPdf);
ui.close();
}
@@ -664,14 +976,14 @@ pub(crate) fn default_page_context_menu(
*action = Some(PageMenuAction::DeletePage(page));
ui.close();
}
- if ui.button(tl!("Export this PDF")).clicked() {
+ if ui.button("Export this PDF").clicked() {
*action = Some(PageMenuAction::ExportPdf);
ui.close();
}
ui.separator();
- if ui.button(tl!("Find text or tools")).clicked() {
+ if ui.button("Find text or tools").clicked() {
*action = Some(PageMenuAction::Find);
ui.close();
}
@@ -2187,6 +2499,100 @@ impl PageXform {
mesh.add_triangle(0, 2, 3);
painter.add(egui::Shape::mesh(mesh));
}
+
+ /// Draw a sub-region of a texture covering the normalised page region.
+ #[allow(clippy::too_many_arguments)]
+ pub fn paint_image_region(
+ &self,
+ painter: &egui::Painter,
+ tex: egui::TextureId,
+ pu0: f32,
+ pv0: f32,
+ pu1: f32,
+ pv1: f32,
+ tu0: f32,
+ tv0: f32,
+ tu1: f32,
+ tv1: f32,
+ ) {
+ let mut mesh = egui::Mesh::with_texture(tex);
+ let corners = [(pu0, pv0, tu0, tv0), (pu1, pv0, tu1, tv0), (pu1, pv1, tu1, tv1), (pu0, pv1, tu0, tv1)];
+ for (u, v, tu, tv) in corners {
+ mesh.vertices.push(egui::epaint::Vertex { pos: self.norm_to_screen(u, v), uv: pos2(tu, tv), color: Color32::WHITE });
+ }
+ mesh.add_triangle(0, 1, 2);
+ mesh.add_triangle(0, 2, 3);
+ painter.add(egui::Shape::mesh(mesh));
+ }
+
+ /// Draw a sub-rectangle of a whole-page raster texture, where UV space matches page normalized space.
+ pub fn paint_page_texture_rect(&self, painter: &egui::Painter, tex: egui::TextureId, u0: f32, v0: f32, u1: f32, v1: f32) {
+ self.paint_image_region(painter, tex, u0, v0, u1, v1, u0, v0, u1, v1);
+ }
+}
+
+#[allow(clippy::too_many_arguments)]
+fn paint_image_suppressed(
+ xf: &PageXform,
+ painter: &egui::Painter,
+ tex: egui::TextureId,
+ u0: f32,
+ v0: f32,
+ u1: f32,
+ v1: f32,
+ suppress: Option<[f32; 4]>,
+ is_full_page_tex: bool,
+) {
+ let Some([su0, sv0, su1, sv1]) = suppress else {
+ if is_full_page_tex {
+ xf.paint_page_texture_rect(painter, tex, u0, v0, u1, v1);
+ } else {
+ xf.paint_image(painter, tex, u0, v0, u1, v1);
+ }
+ return;
+ };
+ let iu0 = u0.max(su0);
+ let iu1 = u1.min(su1);
+ let iv0 = v0.max(sv0);
+ let iv1 = v1.min(sv1);
+ if iu0 >= iu1 || iv0 >= iv1 {
+ if is_full_page_tex {
+ xf.paint_page_texture_rect(painter, tex, u0, v0, u1, v1);
+ } else {
+ xf.paint_image(painter, tex, u0, v0, u1, v1);
+ }
+ return;
+ }
+ let map_uv = |pu: f32, pv: f32| -> (f32, f32) {
+ if is_full_page_tex {
+ (pu, pv)
+ } else {
+ let du = (u1 - u0).max(1e-6);
+ let dv = (v1 - v0).max(1e-6);
+ ((pu - u0) / du, (pv - v0) / dv)
+ }
+ };
+ let draw_strip = |pu0: f32, pv0: f32, pu1: f32, pv1: f32| {
+ if pu1 <= pu0 || pv1 <= pv0 {
+ return;
+ }
+ let (tu0, tv0) = map_uv(pu0, pv0);
+ let (tu1, tv1) = map_uv(pu1, pv1);
+ xf.paint_image_region(painter, tex, pu0, pv0, pu1, pv1, tu0, tv0, tu1, tv1);
+ };
+
+ if iv0 > v0 {
+ draw_strip(u0, v0, u1, iv0);
+ }
+ if v1 > iv1 {
+ draw_strip(u0, iv1, u1, v1);
+ }
+ if iu0 > u0 {
+ draw_strip(u0, iv0, iu0, iv1);
+ }
+ if u1 > iu1 {
+ draw_strip(iu1, iv0, u1, iv1);
+ }
}
pub fn shortcuts(view: &mut DocView, ctx: &egui::Context, speed: crate::scroll_speed::ScrollSpeed) {
@@ -2516,11 +2922,13 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
// The turn leaves egui's eased copy of the notch to decay for a few frames; it must not
// scroll the page just shown away from its top (or bottom).
view.precise_scroll_until = now + 0.25;
+ view.fling.stop();
}
+ let gesture_turned = !view.continuous && view.wheel.gesture_turned();
// Paging owns the vertical axis in single-page view; leave it to the pager.
// The rest of a gesture that turned the page is swallowed too, or it would pan the new page
// away from the edge it was shown at.
- if single_paging || (!view.continuous && view.wheel.gesture_turned()) {
+ if single_paging || gesture_turned {
precise_scroll.y = 0.0;
}
if now < view.precise_scroll_until {
@@ -2533,7 +2941,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
// dialog has the input, or animations are off; any click, key, zoom or other scrolling ends it.
// Asked of the preference, not of egui's animation time, which test harnesses zero.
let animates = app.animation_effects.animates(app.motion.reduced);
- let may_glide = !single_paging && !middle_gesture && navigation_enabled && unobstructed && animates;
+ let may_glide = !single_paging && !gesture_turned && !middle_gesture && navigation_enabled && unobstructed && animates;
let over_page = ui.rect_contains_pointer(avail);
ui.input(|i| view.fling.read(&i.events, now, may_glide && over_page));
let interrupted = ui.input(|i| i.pointer.any_pressed() || i.events.iter().any(|e| matches!(e, egui::Event::Key { pressed: true, .. })));
@@ -2741,6 +3149,14 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
let mut visible_now = Vec::new();
view.screen_rects.clear();
view.screen_xforms.clear();
+ for &i in &visible_pages {
+ let r = snap_to_pixels(rects[i].translate(origin.to_vec2()), ppp);
+ if r.intersects(visible) {
+ view.screen_rects.push((i, r));
+ view.screen_xforms
+ .push((i, PageXform { rect: r, rot: view.rotation, pw: info.pages[i].width.max(1.0), ph: info.pages[i].height.max(1.0) }));
+ }
+ }
// Visible heights (points) closer than this are equal: one page size can meet the
// viewport a fraction of a point differently once the scroll offset is applied.
const TIE: f32 = 0.5;
@@ -2757,6 +3173,37 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
if resp.secondary_clicked() {
// Set again below when the right-click lands on a link.
view.links.context = None;
+ let mut over_image = false;
+ if tool == QuickTool::EditText {
+ let pointer_pos = ui.input(|inp| inp.pointer.hover_pos().or(inp.pointer.interact_pos()));
+ if let Some(p) = pointer_pos {
+ for (page_idx, xf) in &view.screen_xforms {
+ let images = doc.page_images(*page_idx);
+ for (idx, img) in images.iter().enumerate() {
+ let obb = ImageObb::from_image(img, xf, info, *page_idx);
+ let b = image_screen_rect(img, xf, info, *page_idx);
+ if (b.is_positive() && b.contains(p)) || crate::edit_text_ui::quad_contains(obb.corners(), p) {
+ over_image = true;
+ if view.image_selection.as_ref().is_none_or(|s| s.page != *page_idx || s.index != idx) {
+ view.image_selection = Some(crate::edit_text_ui::ImageSelection {
+ page: *page_idx,
+ index: idx,
+ drag: None,
+ crop: None,
+ crop_mode: false,
+ crop_rect: None,
+ });
+ }
+ break;
+ }
+ }
+ if over_image {
+ break;
+ }
+ }
+ }
+ }
+ ui.ctx().data_mut(|d| d.insert_persisted(resp.id.with("image-menu"), over_image));
}
for &i in &visible_pages {
let r = snap_to_pixels(rects[i].translate(origin.to_vec2()), ppp);
@@ -2768,9 +3215,6 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
}
if r.intersects(visible) {
visible_now.push(i);
- view.screen_rects.push((i, r));
- view.screen_xforms
- .push((i, PageXform { rect: r, rot: view.rotation, pw: info.pages[i].width.max(1.0), ph: info.pages[i].height.max(1.0) }));
}
let overlap = r.intersect(visible).height();
if i == view.current {
@@ -2819,13 +3263,42 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
Some(p) => wanted.push((i, tag_scale(p.tag), p.tag, None)),
None => wanted.push((i, want_scale, want_tag, None)),
}
+ let active_drag_suppress = if let Some(sel) = view.image_selection.as_ref()
+ && sel.page == i
+ && sel.drag.is_some()
+ {
+ let images = doc.page_images(i);
+ if let Some(img) = images.get(sel.index) {
+ let obb = ImageObb::from_image(img, &xf, info, i);
+ let uvs = obb.corners().map(|c| xf.screen_to_norm(c));
+ let u0 = uvs.iter().map(|(u, _)| *u).fold(1.0f32, f32::min).clamp(0.0, 1.0);
+ let u1 = uvs.iter().map(|(u, _)| *u).fold(0.0f32, f32::max).clamp(0.0, 1.0);
+ let v0 = uvs.iter().map(|(_, v)| *v).fold(1.0f32, f32::min).clamp(0.0, 1.0);
+ let v1 = uvs.iter().map(|(_, v)| *v).fold(0.0f32, f32::max).clamp(0.0, 1.0);
+ if u1 > u0 && v1 > v0 { Some([u0, v0, u1, v1]) } else { None }
+ } else {
+ None
+ }
+ } else {
+ None
+ };
match view.pages.get(&i) {
Some(p) => {
if !tiled && p.tag == want_tag {
- xf.texel_aligned(p.tex.size(), ppp).paint_image(painter, p.tex.id(), 0.0, 0.0, 1.0, 1.0);
+ paint_image_suppressed(
+ &xf.texel_aligned(p.tex.size(), ppp),
+ painter,
+ p.tex.id(),
+ 0.0,
+ 0.0,
+ 1.0,
+ 1.0,
+ active_drag_suppress,
+ true,
+ );
} else {
// A backdrop, or a raster at an older scale until the new one arrives.
- xf.paint_image(painter, p.tex.id(), 0.0, 0.0, 1.0, 1.0);
+ paint_image_suppressed(&xf, painter, p.tex.id(), 0.0, 0.0, 1.0, 1.0, active_drag_suppress, true);
}
}
None => {
@@ -2864,7 +3337,17 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
let (ow, oh) = (device_pixels(pw_pt, s) as f32, device_pixels(ph_pt, s) as f32);
let [w, h] = tex.size();
let (x, y) = (ox as f32, oy as f32);
- xf.paint_image(painter, tex.id(), x / ow, y / oh, (x + w as f32) / ow, (y + h as f32) / oh);
+ paint_image_suppressed(
+ &xf,
+ painter,
+ tex.id(),
+ x / ow,
+ y / oh,
+ (x + w as f32) / ow,
+ (y + h as f32) / oh,
+ active_drag_suppress,
+ false,
+ );
}
// Visible tiles, nearest the viewport centre first: each tile costs a full
// page interpret, so the workers sharpen what is looked at before the edges.
@@ -2889,13 +3372,16 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
wanted.push((i, scale, tag, Some(Tile { x, y, w, h })));
if let Some(tex) = view.tiles.get(&(i, tag, x, y)) {
let (fw, fh) = (dw as f32, dh as f32);
- xf.texel_aligned([dw as usize, dh as usize], ppp).paint_image(
+ paint_image_suppressed(
+ &xf.texel_aligned([dw as usize, dh as usize], ppp),
painter,
tex.id(),
x as f32 / fw,
y as f32 / fh,
(x + w) as f32 / fw,
(y + h) as f32 / fh,
+ active_drag_suppress,
+ false,
);
}
}
@@ -3531,10 +4017,19 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
}
return;
}
- if tool == QuickTool::EditText
- && ui.ctx().data(|d| d.get_temp::(resp.id.with("image-menu"))).unwrap_or(false)
- && let Some(sel) = view.image_selection.clone()
- {
+ let is_image_menu = tool == QuickTool::EditText
+ && (ui.ctx().data_mut(|d| d.get_persisted::(resp.id.with("image-menu"))).unwrap_or(false)
+ || view.image_selection.as_ref().is_some_and(|sel| {
+ let pointer_pos = ui.input(|inp| inp.pointer.hover_pos().or(inp.pointer.interact_pos()));
+ let Some(p) = pointer_pos else { return false };
+ let Some((_, xf)) = view.screen_xforms.iter().find(|(page_idx, _)| *page_idx == sel.page) else { return false };
+ let images = doc.page_images(sel.page);
+ let Some(img) = images.get(sel.index) else { return false };
+ let obb = ImageObb::from_image(img, xf, info, sel.page);
+ let b = image_screen_rect(img, xf, info, sel.page);
+ (b.is_positive() && b.contains(p)) || crate::edit_text_ui::quad_contains(obb.corners(), p)
+ }));
+ if is_image_menu && let Some(sel) = view.image_selection.clone() {
let images = doc.page_images(sel.page);
crate::edit_text_ui::image_context_menu(ui, view, &images, sel.page, sel.index, can_paste_image, &mut image_action);
return;
@@ -3900,14 +4395,14 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {
}
Some(crate::edit_text_ui::ImageAction::Crop) => {
let doc_id = app.views[index].id;
- if let Some(s) = app.views[index].image_selection.as_mut() {
- if let Some(d) = app.session.get(doc_id) {
- let images = d.page_images(s.page);
- if let Some(im) = images.get(s.index) {
- s.crop = Some(crate::edit_text_ui::CropMode::new(im.visible_rect.unwrap_or(im.rect)));
- s.crop_mode = true;
- s.crop_rect = None;
- }
+ if let Some(s) = app.views[index].image_selection.as_mut()
+ && let Some(d) = app.session.get(doc_id)
+ {
+ let images = d.page_images(s.page);
+ if let Some(im) = images.get(s.index) {
+ s.crop = Some(crate::edit_text_ui::CropMode::new(im.visible_rect.unwrap_or(im.rect)));
+ s.crop_mode = true;
+ s.crop_rect = None;
}
}
}
@@ -5360,7 +5855,6 @@ trailer << /Root 1 0 R >>
}
assert_eq!(v.back, vec![0], "explicit search jump must remember its origin");
assert_eq!(v.goto, Some((3, 0.5)), "keep the match offset instead of the page top");
- assert_eq!(v.page_input, "4");
assert!(v.goto_point.is_none(), "an earlier link destination cannot override the search offset");
v.go_to_match(1);
assert_eq!(v.back, vec![0], "same-page matches do not duplicate history");
@@ -6137,3 +6631,5 @@ trailer << /Root 1 0 R >>
assert!(v.goto.is_none());
}
}
+
+pub use crate::image_engine::{HandleId, MIN_RECT_SIZE, apply_crop, apply_resize, apply_resize_proportional, reset_crop};
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index c3388912b1..61be108256 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -7,7 +7,7 @@ use egui::{Color32, CornerRadius, Pos2, Rect, Stroke};
use pdfcraft_engine::{Added, AddedContent, AddedText, Edit, FontFamily, TextAlign};
use pdfcraft_render::DocInfo;
-use crate::canvas::{DocView, PageXform};
+use crate::canvas::{DocView, ImageObb, PageXform, PainterExt};
use crate::theme::Tokens;
use crate::widgets;
@@ -447,10 +447,40 @@ pub(crate) fn paint_page(ui: &egui::Ui, painter: &egui::Painter, xf: &PageXform,
{
r = dragged(r, g, p - start, matches!(a.content, AddedContent::Image(_)));
}
- if selected {
+ let is_rotated_image = match &a.content {
+ AddedContent::Image(img) => img.rotation != 0,
+ _ => false,
+ };
+ if is_rotated_image {
+ let theta = match &a.content {
+ AddedContent::Image(img) => (img.rotation as f32) * std::f32::consts::FRAC_PI_2,
+ _ => 0.0,
+ };
+ let obb = ImageObb::from_center_size_angle(r.center(), r.width(), r.height(), theta);
+ if selected {
+ painter.polygon(obb.corners().to_vec(), Color32::TRANSPARENT, Stroke::new(1.5, SELECT_BLUE));
+ for (_, c) in obb.handles() {
+ painter.circle(c, 3.5, Color32::WHITE, Stroke::new(1.5, SELECT_BLUE));
+ }
+ } else if pointer.is_some_and(|p| r.expand(2.0).contains(p)) {
+ painter.polygon(obb.corners().to_vec(), Color32::TRANSPARENT, Stroke::new(1.0, SELECT_BLUE.gamma_multiply(0.7)));
+ }
+ } else if selected {
painter.rect_stroke(r.expand(1.0), CornerRadius::ZERO, Stroke::new(1.5, SELECT_BLUE), egui::StrokeKind::Outside);
- for (c, ..) in handles(r.expand(1.0)) {
- painter.circle(c, 3.5, Color32::WHITE, Stroke::new(1.5, SELECT_BLUE));
+ let er = r.expand(1.0);
+ if matches!(a.content, AddedContent::Image(_)) {
+ let (tl, tr, br, bl) = (er.left_top(), er.right_top(), er.right_bottom(), er.left_bottom());
+ let tm = Pos2::new((tl.x + tr.x) * 0.5, tl.y);
+ let rm = Pos2::new(tr.x, (tr.y + br.y) * 0.5);
+ let bm = Pos2::new((bl.x + br.x) * 0.5, bl.y);
+ let lm = Pos2::new(tl.x, (tl.y + bl.y) * 0.5);
+ for c in [tl, tm, tr, rm, br, bm, bl, lm] {
+ painter.circle(c, 3.5, Color32::WHITE, Stroke::new(1.5, SELECT_BLUE));
+ }
+ } else {
+ for (c, ..) in handles(er) {
+ painter.circle(c, 3.5, Color32::WHITE, Stroke::new(1.5, SELECT_BLUE));
+ }
}
} else if pointer.is_some_and(|p| r.expand(2.0).contains(p)) {
painter.rect_stroke(r.expand(1.0), CornerRadius::ZERO, Stroke::new(1.0, SELECT_BLUE.gamma_multiply(0.7)), egui::StrokeKind::Outside);
@@ -609,9 +639,9 @@ fn finish(cv: &mut ContentView, d: TextDraft, added: &[Added]) -> Option {
/// Returns the changed style; for a selected item the caller turns it into an update.
pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) -> Option {
let mut s = style.clone();
- widgets::section_title(ui, tl!("FORMAT TEXT"));
+ widgets::section_title(ui, "FORMAT TEXT");
egui::ComboBox::from_id_salt("font-family").selected_text(s.family.label()).width(ui.available_width().max(180.0)).show_ui(ui, |ui| {
- ui.label(egui::RichText::new(tl!("Standard fonts")).weak().small());
+ ui.label(egui::RichText::new("Standard fonts").weak().small());
for f in [FontFamily::Helvetica, FontFamily::Times, FontFamily::Courier] {
ui.selectable_value(&mut s.family, f, f.label());
}
@@ -628,17 +658,17 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
ui.painter().rect_stroke(color_rect, t.radius, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
let show_palette_id = ui.id().with("show-palette-added");
let mut show_palette = ui.data(|d| d.get_temp::(show_palette_id)).unwrap_or(false);
- if color_resp.on_hover_text(tl!("Text color")).clicked() {
+ if color_resp.on_hover_text("Text color").clicked() {
show_palette = !show_palette;
ui.data_mut(|d| d.insert_temp(show_palette_id, show_palette));
}
ui.add_space(2.0);
let is_bullet = crate::edit_text_ui::is_bulleted(&s.text);
- if crate::icons::button(ui, "list", 24.0, is_bullet, tl!("Bullet list")).clicked() {
+ if crate::icons::button(ui, "list", 24.0, is_bullet, "Bullet list").clicked() {
crate::edit_text_ui::toggle_bullet_list(&mut s.text);
}
let is_num = crate::edit_text_ui::is_numbered(&s.text);
- if crate::icons::button(ui, "list-ordered", 24.0, is_num, tl!("Numbered list")).clicked() {
+ if crate::icons::button(ui, "list-ordered", 24.0, is_num, "Numbered list").clicked() {
crate::edit_text_ui::toggle_numbered_list(&mut s.text);
}
ui.add_space(2.0);
@@ -660,18 +690,18 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
s.color = picked;
}
ui.horizontal(|ui| {
- let b_resp = ui.selectable_label(s.bold, egui::RichText::new("T").strong().size(14.0));
+ let b_resp = ui.selectable_label(s.bold, egui::RichText::new("B").strong().size(14.0));
if b_resp.on_hover_text(tl!("Bold")).clicked() {
s.bold = !s.bold;
}
- let i_resp = ui.selectable_label(s.italic, egui::RichText::new("T").italics().size(14.0));
+ let i_resp = ui.selectable_label(s.italic, egui::RichText::new("I").italics().size(14.0));
if i_resp.on_hover_text(tl!("Italic")).clicked() {
s.italic = !s.italic;
}
- let u_resp = ui.selectable_label(false, egui::RichText::new("T̲").size(14.0));
+ let u_resp = ui.selectable_label(false, egui::RichText::new("U̲").size(14.0));
let _ = u_resp;
let sup_resp = ui.selectable_label(false, egui::RichText::new("T¹").size(13.0));
- if sup_resp.on_hover_text(tl!("Superscript")).clicked() {
+ if sup_resp.on_hover_text("Superscript").clicked() {
let all_sup = !s.text.is_empty() && s.text.chars().all(|c| crate::edit_text_ui::char_from_superscript(c) != c);
s.text = if all_sup {
s.text.chars().map(crate::edit_text_ui::char_from_superscript).collect()
@@ -680,7 +710,7 @@ pub(crate) fn format_panel(ui: &mut egui::Ui, t: &Tokens, style: &AddedText) ->
};
}
let sub_resp = ui.selectable_label(false, egui::RichText::new("T₁").size(13.0));
- if sub_resp.on_hover_text(tl!("Subscript")).clicked() {
+ if sub_resp.on_hover_text("Subscript").clicked() {
let all_sub = !s.text.is_empty() && s.text.chars().all(|c| crate::edit_text_ui::char_from_subscript(c) != c);
s.text = if all_sub {
s.text.chars().map(crate::edit_text_ui::char_from_subscript).collect()
@@ -787,7 +817,9 @@ impl crate::PdfCraftApp {
let name = format!("{stem} p{} img{}.{ext}", page.saturating_add(1), index.saturating_add(1));
self.last_copied_file = Some((name, bytes));
}
- let Some(pixels) = self.session.get(id).map(|d| d.page_image_rgba(page, index)) else { return false; };
+ let Some(pixels) = self.session.get(id).map(|d| d.page_image_rgba(page, index)) else {
+ return false;
+ };
let copied = pixels.and_then(|(w, h, rgba)| {
#[cfg(not(target_arch = "wasm32"))]
if self.system_clipboard {
@@ -813,7 +845,7 @@ impl crate::PdfCraftApp {
}
}
-/// The picture's visible box on its page, in user space.
+ /// The picture's visible box on its page, in user space.
fn page_image_box(&self, page: usize, index: usize) -> Option<[f64; 4]> {
let (_, id) = self.active_ids()?;
let image = self.session.get(id)?.page_images(page).into_iter().nth(index)?;
@@ -825,7 +857,10 @@ impl crate::PdfCraftApp {
if self.copy_page_image(page, index) {
self.apply_edit(Edit::EditPageImage { page, index, change: pdfcraft_engine::ImageEdit::Delete });
for v in &mut self.views {
- if let Some(sel) = &v.image_selection && sel.page == page && sel.index == index {
+ if let Some(sel) = &v.image_selection
+ && sel.page == page
+ && sel.index == index
+ {
v.image_selection = None;
}
}
@@ -879,7 +914,7 @@ impl crate::PdfCraftApp {
if let Some(doc) = self.session.get(id)
&& !doc.allows_modification()
{
- self.notify_error(tl!("The document's security settings don't allow changes"));
+ self.notify_error("The document's security settings don't allow changes");
return false;
}
@@ -953,7 +988,8 @@ impl crate::PdfCraftApp {
if self.apply_edit(pdfcraft_engine::Edit::AddImage { page, rect: target_rect, name, bytes: std::sync::Arc::new(bytes) }) {
if let Some(v) = self.views.get_mut(i) {
v.current = page;
- v.image_selection = Some(crate::edit_text_ui::ImageSelection { page, index: before, crop_mode: false, crop_rect: None, drag: None, crop: None });
+ v.image_selection =
+ Some(crate::edit_text_ui::ImageSelection { page, index: before, crop_mode: false, crop_rect: None, drag: None, crop: None });
}
self.quick_tool = crate::QuickTool::EditText;
self.notify_tr("Image pasted");
@@ -1065,20 +1101,81 @@ pub(crate) fn image_panel(ui: &mut egui::Ui, t: &Tokens, img: &pdfcraft_engine::
for (k, label) in ["L", "B", "R", "T"].into_iter().enumerate() {
ui.label(label);
// Applied when the drag ends, so a drag is one undo step.
- let r = ui.add(egui::DragValue::new(&mut crop[k]).range(0.0..=45.0).speed(0.5).suffix("%"));
+ let r = ui.add(egui::DragValue::new(&mut crop[k]).range(0.0..=95.0).speed(0.5).suffix("%"));
changed |= r.drag_stopped() || (r.changed() && !r.dragged());
}
});
if changed {
let mut i = img.clone();
- i.crop = crop.map(|v| v / 100.0);
- if i.crop != img.crop {
+ let new_crop = crop.map(|v| (v / 100.0).clamp(0.0, 0.95));
+ if new_crop != img.crop {
+ update_image_crop(&mut i, new_crop);
+ ui.ctx().request_repaint();
out = Some(ImageAction::Update(AddedContent::Image(i)));
}
}
out
}
+/// Update an added image's crop box and adjust its rect dimensions immediately.
+pub fn update_image_crop(img: &mut pdfcraft_engine::AddedImage, new_crop: [f64; 4]) {
+ let new_crop = [new_crop[0].clamp(0.0, 0.95), new_crop[1].clamp(0.0, 0.95), new_crop[2].clamp(0.0, 0.95), new_crop[3].clamp(0.0, 0.95)];
+ if new_crop != img.crop {
+ let [old_l, old_b, old_r, old_t] = img.crop.map(|v| v.clamp(0.0, 0.95));
+ let old_cw = (1.0 - old_l - old_r).max(0.05);
+ let old_ch = (1.0 - old_b - old_t).max(0.05);
+
+ let [new_l, new_b, new_r, new_t] = new_crop;
+ let new_cw = (1.0 - new_l - new_r).max(0.05);
+ let new_ch = (1.0 - new_b - new_t).max(0.05);
+
+ let [x0, y0, x1, y1] =
+ [img.rect[0].min(img.rect[2]), img.rect[1].min(img.rect[3]), img.rect[0].max(img.rect[2]), img.rect[1].max(img.rect[3])];
+ let current_w = x1 - x0;
+ let current_h = y1 - y0;
+
+ let base_w = current_w / old_cw;
+ let base_h = current_h / old_ch;
+
+ let new_w = base_w * new_cw;
+ let new_h = base_h * new_ch;
+
+ let (ux, uy, vx, vy): (f64, f64, f64, f64) = match img.rotation % 4 {
+ 1 => (0.0, 1.0, -1.0, 0.0),
+ 2 => (-1.0, 0.0, 0.0, -1.0),
+ 3 => (0.0, -1.0, 1.0, 0.0),
+ _ => (1.0, 0.0, 0.0, 1.0),
+ };
+ let (ux, uy) = if img.flip_h { (-ux, -uy) } else { (ux, uy) };
+ let (vx, vy) = if img.flip_v { (-vx, -vy) } else { (vx, vy) };
+
+ let base_ox = x0
+ - (base_w * old_l) * ux.max(0.0)
+ - (base_w * old_r) * (-ux).max(0.0)
+ - (base_h * old_b) * vx.max(0.0)
+ - (base_h * old_t) * (-vx).max(0.0);
+ let base_oy = y0
+ - (base_w * old_l) * uy.max(0.0)
+ - (base_w * old_r) * (-uy).max(0.0)
+ - (base_h * old_b) * vy.max(0.0)
+ - (base_h * old_t) * (-vy).max(0.0);
+
+ let new_ox = base_ox
+ + (base_w * new_l) * ux.max(0.0)
+ + (base_w * new_r) * (-ux).max(0.0)
+ + (base_h * new_b) * vx.max(0.0)
+ + (base_h * new_t) * (-vx).max(0.0);
+ let new_oy = base_oy
+ + (base_w * new_l) * uy.max(0.0)
+ + (base_w * new_r) * (-uy).max(0.0)
+ + (base_h * new_b) * vy.max(0.0)
+ + (base_h * new_t) * (-vy).max(0.0);
+
+ img.crop = new_crop;
+ img.rect = [new_ox, new_oy, new_ox + new_w, new_oy + new_h];
+ }
+}
+
#[cfg(test)]
mod tests {
use egui_kittest::kittest::Queryable;
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 753e7bac22..cab4849a94 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -1183,7 +1183,7 @@ fn dialogs(app: &mut PdfCraftApp, ctx: &egui::Context) {
}
Dialog::PinTool => {
ui.horizontal(|ui| {
- ui.label(egui::RichText::new(tl!("Pin tools to Home")).font(theme::semibold(18.0)));
+ ui.label(egui::RichText::new("Pin tools to Home").font(theme::semibold(18.0)));
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
if widgets::ghost_button(ui, "x", tl!("Close")).clicked() {
close = true;
@@ -1191,18 +1191,16 @@ fn dialogs(app: &mut PdfCraftApp, ctx: &egui::Context) {
});
});
ui.add_space(4.0);
- ui.label(egui::RichText::new(tl!("Select tools to display on your Home page for quick access.")).color(t.text_muted));
+ ui.label(egui::RichText::new("Select tools to display on your Home page for quick access.").color(t.text_muted));
ui.add_space(10.0);
ui.horizontal(|ui| {
let (icon_rect, _) = ui.allocate_exact_size(egui::vec2(18.0, 18.0), egui::Sense::hover());
crate::icons::paint(ui, icon_rect, "search", 16.0, t.text_muted);
ui.add(
- egui::TextEdit::singleline(&mut app.pin_tool_search)
- .hint_text(tl!("Search tools…"))
- .desired_width(ui.available_width() - 32.0),
+ egui::TextEdit::singleline(&mut app.pin_tool_search).hint_text("Search tools…").desired_width(ui.available_width() - 32.0),
);
- if !app.pin_tool_search.is_empty() && widgets::ghost_button(ui, "x", tl!("Clear search")).clicked() {
+ if !app.pin_tool_search.is_empty() && widgets::ghost_button(ui, "x", "Clear search").clicked() {
app.pin_tool_search.clear();
}
});
@@ -1235,19 +1233,26 @@ fn dialogs(app: &mut PdfCraftApp, ctx: &egui::Context) {
let body = rect.translate(press.offset());
let color = egui::Color32::from_rgb(g.hue[0], g.hue[1], g.hue[2]);
- crate::icons::paint(ui, egui::Rect::from_min_size(body.min + egui::vec2(8.0, 11.0), egui::vec2(22.0, 22.0)), g.icon, 20.0, color);
+ crate::icons::paint(
+ ui,
+ egui::Rect::from_min_size(body.min + egui::vec2(8.0, 11.0), egui::vec2(22.0, 22.0)),
+ g.icon,
+ 20.0,
+ color,
+ );
let btn_w = 78.0;
- let btn_rect = egui::Rect::from_center_size(body.right_center() - egui::vec2(btn_w / 2.0 + 8.0, 0.0), egui::vec2(btn_w, 26.0));
+ let btn_rect =
+ egui::Rect::from_center_size(body.right_center() - egui::vec2(btn_w / 2.0 + 8.0, 0.0), egui::vec2(btn_w, 26.0));
let btn_resp = ui.interact(btn_rect, ui.id().with(("pin_modal_btn", g.id)), egui::Sense::click());
let btn_hovered = btn_resp.hovered();
let (btn_fill, btn_stroke, text_color, btn_label) = if pinned {
- (t.accent, egui::Stroke::NONE, egui::Color32::WHITE, tl!("Pinned"))
+ (t.accent, egui::Stroke::NONE, egui::Color32::WHITE, "Pinned")
} else if btn_hovered {
- (t.hover, egui::Stroke::new(1.0, t.border), t.text, tl!("Pin"))
+ (t.hover, egui::Stroke::new(1.0, t.border), t.text, "Pin")
} else {
- (egui::Color32::TRANSPARENT, egui::Stroke::new(1.0, t.border), t.text_muted, tl!("Pin"))
+ (egui::Color32::TRANSPARENT, egui::Stroke::new(1.0, t.border), t.text_muted, "Pin")
};
ui.painter().rect(btn_rect, egui::CornerRadius::same(6), btn_fill, btn_stroke, egui::StrokeKind::Inside);
diff --git a/crates/ui-egui/src/edit_text_ui.rs b/crates/ui-egui/src/edit_text_ui.rs
index 7b16bbab8b..9129679c21 100644
--- a/crates/ui-egui/src/edit_text_ui.rs
+++ b/crates/ui-egui/src/edit_text_ui.rs
@@ -7,11 +7,12 @@
use std::collections::BTreeMap;
use std::sync::Arc;
-use egui::{Color32, CornerRadius, FontFamily, FontId, Pos2, Rect, Stroke};
+use egui::{Color32, CornerRadius, FontFamily, FontId, Pos2, Rect, Stroke, pos2};
use pdfcraft_engine::{Edit, ObjectKind, ObjectTarget};
use pdfcraft_render::DocInfo;
use crate::canvas::{DocView, PageXform};
+use crate::image_engine::{CROP_ACCENT, HandleId, apply_crop, apply_resize, apply_resize_proportional, draw_handle, draw_rule_of_thirds};
const ACCENT: Color32 = Color32::from_rgb(0x14, 0x73, 0xE6);
@@ -495,8 +496,6 @@ pub fn toggle_subscript(ed: &mut LineEditor) -> bool {
}
}
-/// Underline, value-based line spacing, paragraph spacing, character spacing and horizontal
-
/// A paragraph being edited.
#[derive(Clone, Debug, PartialEq)]
pub struct LineEditor {
@@ -728,6 +727,7 @@ pub enum DragTarget {
Move,
Handle(ImageHandle),
CropHandle(ImageHandle),
+ Rotate,
}
#[derive(Clone, Copy, Debug, PartialEq)]
@@ -735,6 +735,7 @@ pub struct ImageDrag {
pub start: Pos2,
pub target: DragTarget,
pub initial_rect: Rect,
+ pub initial_matrix: [f64; 6],
}
/// A selected page image, and what the pointer is doing to it.
@@ -742,8 +743,8 @@ pub struct ImageDrag {
pub struct ImageSelection {
pub page: usize,
pub index: usize,
- /// Dragging: the start point and, for a corner, the opposite corner (screen).
- pub drag: Option<(Pos2, Option)>,
+ /// Dragging in progress.
+ pub drag: Option,
/// Crop mode (Acrobat's crop handles): the box kept so far.
pub crop: Option,
pub crop_mode: bool,
@@ -754,10 +755,9 @@ pub struct ImageSelection {
/// dimmed, Enter or Done applies and Esc or Cancel leaves it.
#[derive(Clone, Debug, PartialEq)]
pub struct CropMode {
- /// The box to keep (user space).
+ /// The box to keep (user space or normalized UV).
pub keep: [f64; 4],
- /// A drag in progress: the grip (0–3 corners, 4–7 edges, 8 the inside), where it started
- /// and the box then.
+ /// A drag in progress: the grip (0–7 handles, 8 inside), where it started and the box then.
drag: Option<(usize, Pos2, [f64; 4])>,
}
@@ -767,8 +767,71 @@ impl CropMode {
}
}
-/// The screen boxes of the crop's eight handles: corners, then the top, right, bottom and left
-/// edge midpoints.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) struct Matrix(pub(crate) [f64; 6]);
+
+impl Matrix {
+ #[allow(dead_code)]
+ pub(crate) const IDENTITY: Self = Matrix([1.0, 0.0, 0.0, 1.0, 0.0, 0.0]);
+
+ pub(crate) fn apply(&self, x: f64, y: f64) -> (f64, f64) {
+ let [a, b, c, d, e, f] = self.0;
+ (a * x + c * y + e, b * x + d * y + f)
+ }
+
+ pub(crate) fn invert(&self) -> Option