mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-16 07:42:39 +00:00
xfa: avoid rescanning prototype-only child lists
This commit is contained in:
1 parent
d80d64fb97
commit
5410dc1cfc
2 files changed
+36
-1
No files matched your search
+23
-1
@@ -75,6 +75,7 @@ pub(crate) fn expand(template: Node) -> (Option<String>, Vec<String>) {
|
|||||||
search: MAX_SEARCH,
|
search: MAX_SEARCH,
|
||||||
work: MAX_WORK,
|
work: MAX_WORK,
|
||||||
active: HashMap::new(),
|
active: HashMap::new(),
|
||||||
|
non_rendering_children: HashSet::new(),
|
||||||
missing: false,
|
missing: false,
|
||||||
external: false,
|
external: false,
|
||||||
looped: false,
|
looped: false,
|
||||||
@@ -126,6 +127,9 @@ struct Writer<'a> {
|
|||||||
work: usize,
|
work: usize,
|
||||||
/// The elements being written around the current one: inheriting from one is a loop.
|
/// The elements being written around the current one: inheriting from one is a loop.
|
||||||
active: HashMap<NodeId, u32>,
|
active: HashMap<NodeId, u32>,
|
||||||
|
/// Nodes whose direct children are all omitted prototype definitions (or absent).
|
||||||
|
/// The DOM is immutable; remembering these avoids repeated no-output child walks.
|
||||||
|
non_rendering_children: HashSet<NodeId>,
|
||||||
missing: bool,
|
missing: bool,
|
||||||
external: bool,
|
external: bool,
|
||||||
looped: bool,
|
looped: bool,
|
||||||
@@ -465,7 +469,25 @@ impl<'a> Writer<'a> {
|
|||||||
self.out.push('>');
|
self.out.push('>');
|
||||||
// Rich text is taken whole from the nearest layer that has any.
|
// Rich text is taken whole from the nearest layer that has any.
|
||||||
let cut = if tag == "exData" { layers.iter().position(|l| has_content(l, true)).map_or(layers.len(), |i| i + 1) } else { layers.len() };
|
let cut = if tag == "exData" { layers.iter().position(|l| has_content(l, true)).map_or(layers.len(), |i| i + 1) } else { layers.len() };
|
||||||
let merged = layers.get(..cut).unwrap_or(&layers);
|
// Do this only after charging every original child and selecting the rich-text
|
||||||
|
// layer boundary. Omitting a proto-only layer from child traversal must never
|
||||||
|
// reduce its work charge or change which exData layer wins.
|
||||||
|
let merged: Vec<_> = layers
|
||||||
|
.get(..cut)
|
||||||
|
.unwrap_or(&layers)
|
||||||
|
.iter()
|
||||||
|
.copied()
|
||||||
|
.filter(|layer| {
|
||||||
|
if self.non_rendering_children.contains(&layer.id()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if layer.children().all(|child| child.is_element() && child.tag_name().name() == "proto") {
|
||||||
|
self.non_rendering_children.insert(layer.id());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
true
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
// Data content: the nearest layer's that has any (empty content overrides nothing).
|
// Data content: the nearest layer's that has any (empty content overrides nothing).
|
||||||
let text_layer = merged.iter().position(|l| has_content(l, false)).unwrap_or(0);
|
let text_layer = merged.iter().position(|l| has_content(l, false)).unwrap_or(0);
|
||||||
let chosen = if matches!(tag, "ui" | "value") {
|
let chosen = if matches!(tag, "ui" | "value") {
|
||||||
|
|||||||
@@ -399,3 +399,16 @@ fn a_som_expression_past_its_length_limit_is_not_followed() {
|
|||||||
assert_eq!(field(&t, "long").common.h, None);
|
assert_eq!(field(&t, "long").common.h, None);
|
||||||
assert!(close(field(&t, "short").common.h, 2.0 * MM));
|
assert!(close(field(&t, "short").common.h, 2.0 * MM));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn proto_only_child_cache_keeps_attributes_text_and_rich_text_boundary() {
|
||||||
|
let xml = form(r#"<field id="P" w="1mm"><proto/></field>"#, r##"<field name="first" use="#P"/><field name="second" use="#P"/>"##);
|
||||||
|
let (t, warnings) = parse(&xml).unwrap();
|
||||||
|
assert!(warnings.is_empty(), "{warnings:?}");
|
||||||
|
assert_eq!(field(&t, "first").common.w, field(&t, "second").common.w);
|
||||||
|
assert!(field(&t, "first").common.w.is_some());
|
||||||
|
let text = expanded(r##"<template><value id="P">kept<proto/></value><value use="#P"/></template>"##);
|
||||||
|
assert!(text.matches("kept").count() >= 2, "{text}");
|
||||||
|
let rich = expanded(r##"<template><exData id="P">hidden</exData><exData use="#P"><proto/></exData></template>"##);
|
||||||
|
assert_eq!(rich.matches("hidden").count(), 1, "nearest nonempty exData still wins: {rich}");
|
||||||
|
}
|
||||||
Reference in new issue
Block a user