DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Endnotes: saturate the remaining numbering sites at u32::MAX
Brandon Thomas5fca302ff6e0
diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rsindex a3fac1eab..48fb2d90e 100644--- a/crates/compose/src/lib.rs+++ b/crates/compose/src/lib.rs@@ -1017,9 +1017,9 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C};if !story.endnotes.is_empty() {// Endnote reference numbers continue through the document.- let first = doc.endnote_start(story.id) + story.text[..prange.start].matches(designcraft_doc::ENDNOTE_REF).count() as u32;+ let first = doc.endnote_start(story.id).saturating_add(story.text[..prange.start].matches(designcraft_doc::ENDNOTE_REF).count() as u32);for (k, (i, _)) in story.text[prange.clone()].match_indices(designcraft_doc::ENDNOTE_REF).enumerate() {- sub.notes.insert(prange.start + i, doc.endnote_options.label(first + k as u32));+ sub.notes.insert(prange.start + i, doc.endnote_options.label(first.saturating_add(k as u32)));}}if !story.objects.is_empty() {diff --git a/crates/doc/src/endnotes.rs b/crates/doc/src/endnotes.rsindex 0d54d2379..b15bb745c 100644--- a/crates/doc/src/endnotes.rs+++ b/crates/doc/src/endnotes.rs@@ -173,7 +173,7 @@ impl crate::Document {let at = out.len();out.insert_with(at, ¬e.text.text[r].replace('\n', " "), f.clone());}- n += 1;+ n = n.saturating_add(1);}}outdiff --git a/crates/engine/src/cmd/endnotes.rs b/crates/engine/src/cmd/endnotes.rsindex 7bcae744b..fb3bf64ce 100644--- a/crates/engine/src/cmd/endnotes.rs+++ b/crates/engine/src/cmd/endnotes.rs@@ -50,7 +50,7 @@ pub fn specs() -> Vec<CommandSpec> {for st in d.stories.values().filter(|st| !st.endnotes.is_empty()) {let first = d.endnote_start(st.id);for (k, n) in st.endnotes.iter().enumerate() {- out.push(json!({"story": st.id.0, "id": n.id, "number": first + k as u32, "text": n.text.text}));+ out.push(json!({"story": st.id.0, "id": n.id, "number": first.saturating_add(k as u32), "text": n.text.text}));}}out.sort_by_key(|v| v["number"].as_u64());