aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-27 03:06:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Package: copies the fonts of the type on a linked PDF or .ai page

Browse Source 
A PDF or .ai page placed linked is a placed document, and File ›
Package listed only the fonts of the document's own type, so the fonts
of the page's type were left out of Fonts/ where an embedded page's
were copied. Package now reads each linked page a document places and
adds the fonts of its type, also when another document placing the same
file copied it first, and also with copyLinks off.
This commit is contained in:
dotCooCoo
2026-10-22 21:52:24 +07:00
committed by bflatastic
parent 22b6f2a89c
commit c4ac0c5df5
3 changed files with 97 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/fonts.rs
+9
View File
@@ -101,6 +101,12 @@ pub(super) fn font_label((family, style, version): &UsedFont) -> String {
/// The fonts (family, style, version) of the type in the layers and symbols of `d`.
pub(super) fn used_fonts(d: &Document) -> BTreeSet<UsedFont> {
art_fonts(d, &[])
}
/// The fonts (family, style, version) of the type in the layers and symbols of `d` and in `art`
/// (art read from a file, its resources in `d`).
pub(super) fn art_fonts(d: &Document, art: &[Node]) -> BTreeSet<UsedFont> {
let mut fonts = BTreeSet::new();
let mut add = |n: &Node| {
if let NodeKind::Text(t) = &n.kind {
@@ -111,6 +117,9 @@ pub(super) fn used_fonts(d: &Document) -> BTreeSet<UsedFont> {
for s in &d.symbols {
s.art.walk(&mut add);
}
for n in art {
n.walk(&mut add);
}
fonts
}
crates/engine/src/cmd/package.rs
+46 -7
View File
@@ -4,7 +4,7 @@
//! report). The packaged document links to the copies (Relink); the open document doesn't change.
//! Without a folder (the web, agents) the same files come back as a zip archive.
use std::collections::{BTreeMap, HashSet};
use std::collections::{BTreeMap, BTreeSet, HashSet};
use std::io::Write;
use std::path::{Path, PathBuf};
@@ -101,6 +101,23 @@ fn safe_asset_name(name: &str) -> String {
if name.is_empty() { "asset".into() } else { name.into() }
}
/// A file placed: (page, bounding, page box) of each placed object showing it.
type PlacedPages = Vec<(u32, bool, vectorcraft_doc::PageBox)>;
/// The fonts of the type on `pages` of the PDF or `.ai` file `name` (`bytes`, found at `path`);
/// none for other files.
fn page_fonts(name: &str, bytes: &[u8], path: &str, pages: &PlacedPages) -> BTreeSet<super::fonts::UsedFont> {
let mut fonts = BTreeSet::new();
if super::place::document::is_pdf(name, bytes) {
for &(page, bounding, page_box) in pages {
if let Ok(a) = super::place::document::document_art(name, bytes, Some(path), page, bounding, page_box, C) {
fonts.extend(super::fonts::art_fonts(&a.doc, &a.nodes));
}
}
}
fonts
}
/// Collect dependencies depth-first so nested VectorCraft files are rewritten before
/// their parents: each parent can record the final hash of the rewritten child.
/// Cycles, excessive nesting, and unreadable children are reported, not fatal.
@@ -180,11 +197,24 @@ impl<'a> Collector<'a> {
// Different linked documents can reuse the same stale absolute path yet
// resolve it to distinct local assets. Keep a mapping per document.
let mut local = BTreeMap::<String, Copied>::new();
// The fonts of the type on the PDF and `.ai` pages placed linked.
let mut placed_fonts = BTreeSet::new();
let mut placed = BTreeMap::<String, PlacedPages>::new();
doc.visit_placed(|_, p| {
let page = (p.link.page.unwrap_or(1), p.bounding, p.page_box);
let pages = placed.entry(p.link.path.clone()).or_default();
if !pages.contains(&page) {
pages.push(page);
}
});
if self.opts.copy_fonts && !self.opts.copy_links && !placed.is_empty() {
for file in super::links::linked_files(doc, Some(source)) {
if let (Some(pages), Some(bytes)) = (placed.get(&file.path), &file.bytes) {
placed_fonts.extend(page_fonts(&file.name, bytes, file.found_path.as_deref().unwrap_or(&file.path), pages));
}
}
}
if self.opts.copy_links {
let mut placed = HashSet::new();
doc.visit_placed(|_, p| {
placed.insert(p.link.path.clone());
});
heading(&mut lines, "LINKED FILES");
for file in super::links::linked_files(doc, Some(source)) {
let found_path = file.found_path.as_deref().unwrap_or(&file.path);
@@ -200,6 +230,10 @@ impl<'a> Collector<'a> {
if by_name {
self.renamed(&mut lines, source, &file.path, &file.name, &existing.name);
}
// Another document may place other pages of a PDF copied already.
if let (Some(pages), Some(bytes)) = (placed.get(&file.path), &file.bytes) {
placed_fonts.extend(page_fonts(&file.name, bytes, found_path, pages));
}
local.insert(file.path.clone(), existing);
continue;
}
@@ -220,13 +254,16 @@ impl<'a> Collector<'a> {
}
// A placed PDF or .ai file is copied as it is, as an image is; the files a .ai file
// read from its editing data links are copied beside it.
let placed_file = placed.contains(&file.path);
let pages = placed.get(&file.path);
let placed_file = pages.is_some();
if placed_file && let Some(mut art) = super::place::document::editing_data(&file.name, &bytes) {
if depth >= vectorcraft_doc::placed_document::MAX_DEPTH {
self.warn(&mut lines, format!("{}: nesting limit reached; copied unchanged without collecting its own links", file.path));
} else {
self.collect(&mut art, found_path, &destination_file, depth + 1, true)?;
}
} else if let Some(pages) = pages {
placed_fonts.extend(page_fonts(&file.name, &bytes, found_path, pages));
}
if placed_file && super::place::document::is_native(&file.name, &bytes) {
if depth >= vectorcraft_doc::placed_document::MAX_DEPTH {
@@ -279,7 +316,9 @@ impl<'a> Collector<'a> {
if self.opts.copy_fonts {
let db = vectorcraft_text::FontDb::global();
heading(&mut lines, "FONTS");
for used in super::fonts::used_fonts(doc) {
let mut used_fonts = super::fonts::used_fonts(doc);
used_fonts.append(&mut placed_fonts);
for used in used_fonts {
let font = super::fonts::font_label(&used);
let (family, style, version) = used;
// Found by any of its names, as the canvas draws it (in the version the type names).
crates/engine/src/tests_package.rs
+42
View File
@@ -429,6 +429,48 @@ fn package_copies_a_linked_pdf_page_as_it_is() {
assert!(s.doc().unwrap().doc.has_placed());
}
#[test]
fn package_copies_the_fonts_of_the_type_on_a_linked_pdf_page() {
let dir = Folder::new("package-placed-pdf-type");
let mut src = session();
run(&mut src, "text.create", json!({"x": 10, "y": 40, "text": "Flyer"}));
let pdf = run(&mut src, "document.serialize", json!({"format": "pdf", "preserveEditing": false}));
let path = dir.file("art/flyer.pdf");
write(&path, &vectorcraft_format::base64_decode(pdf["dataBase64"].as_str().unwrap()).unwrap());
for (link, copy_links, out) in [(false, true, "embedded"), (true, true, "linked"), (true, false, "fonts only")] {
let mut s = session();
let placed = run(&mut s, "file.place", json!({"path": path, "link": link}));
assert_eq!(placed["linked"], link, "{placed}");
save(&mut s, &dir.file("poster.vectorcraft"));
let r = run(&mut s, "file.package", json!({"folder": dir.file(out), "copyLinks": copy_links}));
assert_eq!((r["fonts"].as_u64(), r["skippedFonts"].clone()), (Some(1), json!([])), "{out}: {r}");
assert!(dir.0.join(out).join("poster Folder/Fonts/SourceSans3-Regular.ttf").is_file(), "{out}");
}
}
#[test]
fn package_copies_the_fonts_of_each_page_of_a_pdf_that_two_documents_place() {
let dir = Folder::new("package-placed-pdf-pages");
let mut src = session();
run(&mut src, "text.create", json!({"x": 10, "y": 40, "text": "One"}));
run(&mut src, "artboard.new", json!({"x": 500, "y": 0, "width": 400, "height": 300}));
run(&mut src, "text.create", json!({"x": 510, "y": 40, "text": "Two", "font": "SourceSans3-Semibold"}));
let pdf = run(&mut src, "document.serialize", json!({"format": "pdf", "preserveEditing": false}));
let path = dir.file("art/flyer.pdf");
write(&path, &vectorcraft_format::base64_decode(pdf["dataBase64"].as_str().unwrap()).unwrap());
// The poster places page 1, and a document it places shows page 2.
let mut part = session();
run(&mut part, "file.place", json!({"path": path, "page": 2}));
let part_path = dir.file("art/part.vectorcraft");
save(&mut part, &part_path);
let mut s = session();
run(&mut s, "file.place", json!({"path": path, "page": 1}));
run(&mut s, "file.place", json!({"path": part_path}));
save(&mut s, &dir.file("poster.vectorcraft"));
let r = run(&mut s, "file.package", json!({}));
assert_eq!((r["links"].as_u64(), r["fonts"].as_u64(), r["skippedFonts"].clone()), (Some(2), Some(2), json!([])), "{r}");
}
/// `dir/art/badge.ai`, saved without its PDF part, its art placing each of `pics` (600 × 300 px,
/// with a 2×1 preview) → its path.
fn ai_placing(dir: &Folder, pics: &[&str]) -> String {