talexander
/
natter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Order the footnotes based on when they start processing rather than when they finish. 

This has the benefit of making the output order make sense when footnote definitions reference footnote references but I mostly did it to match the behavior of upstream org-mode.
This commit is contained in:
Tom Alexander 2023-10-29 22:11:24 -04:00
parent 0ae492f8d3
commit ff03140007
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/intermediate/registry.rs
View File

@ -82,13 +82,21 @@ pub(crate) async fn get_footnote_reference_id<'orig, 'parse>(
}
Ok(existing_id)
} else {
let contents = convert_reference_contents(registry.clone(), definition).await?;
let pos = {
let existing_id = {
let mut registry = registry.lock().unwrap();
registry.footnote_ids.push((label, contents));
registry.footnote_ids.push((label, Vec::new()));
registry.footnote_ids.len() - 1
};
Ok(pos)
let contents = convert_reference_contents(registry.clone(), definition).await?;
{
let mut registry = registry.lock().unwrap();
let entry = registry
.footnote_ids
.get_mut(existing_id)
.expect("If-statement proves this to be Some.");
entry.1 = contents;
}
Ok(existing_id)
}
}
@ -163,9 +171,20 @@ pub(crate) async fn promote_footnote_definition<'orig, 'parse>(
definition
};
if let Some(elements) = definition {
let existing_id = {
let mut registry = registry.lock().unwrap();
registry.footnote_ids.push((Some(label), Vec::new()));
registry.footnote_ids.len() - 1
};
let contents = convert_definition_contents(registry.clone(), elements).await?;
let mut registry = registry.lock().unwrap();
registry.footnote_ids.push((Some(label), contents));
{
let mut registry = registry.lock().unwrap();
let entry = registry
.footnote_ids
.get_mut(existing_id)
.expect("If-statement proves this to be Some.");
entry.1 = contents;
}
}
Ok(())
}