Compose: cross-reference index no longer rebuilds itself (#851)

The cross-reference index composed its destination stories through
the cache. One with a running header asked for the running-header
index, which composed the story holding the cross-reference, which
asked for the cross-reference index again: the stack overflowed and
the app aborted. Destination stories with a running header are now
composed without it, like those with cross-references already were.
This commit is contained in:
noah1400
2026-10-13 23:07:21 +02:00
parent e862e0a613
commit 1bddba0e75
2 changed files with 24 additions and 3 deletions
+5 -3
View File
@@ -19,15 +19,17 @@ pub fn has_xrefs(st: &Story) -> bool {
}
impl XrefIndex {
/// `get` composes a story (normally through the cache). Stories that themselves hold
/// cross-references are composed without resolving them (their anchors' pages hardly move).
/// `get` composes a story (normally through the cache). Stories that hold cross-references or
/// running headers are composed without resolving them (their anchors' pages hardly move):
/// through the cache they would build this index again, directly or by way of the running-header index.
pub fn build(doc: &Document, get: &dyn Fn(StoryId) -> Arc<ComposedStory>) -> XrefIndex {
let mut pages = HashMap::new();
for (sid, st) in &doc.stories {
if st.anchors.is_empty() {
continue;
}
let cs = if has_xrefs(st) { Arc::new(crate::compose_story(doc, *sid, &Default::default())) } else { get(*sid) };
let indexed = has_xrefs(st) || crate::vars::has_running(doc, st);
let cs = if indexed { Arc::new(crate::compose_story(doc, *sid, &Default::default())) } else { get(*sid) };
for a in &st.anchors {
let Some(pos) = st.anchor_pos(a.id) else { continue };
if let Some((page, ..)) = crate::vars::place(doc, &cs, pos) {