talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Populate citation reference properties.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-09 14:17:37 -04:00
parent 1ecc3ecf9d
commit c077d34933
3 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/compare/diff.rs
View File

@@ -3347,14 +3347,45 @@ fn compare_footnote_reference<'b, 's>(
}
fn compare_citation<'b, 's>(
_source: &'s str,
source: &'s str,
emacs: &'b Token<'s>,
rust: &'b Citation<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
let this_status = DiffStatus::Good;
let message = None;
let mut child_status = Vec::new();
let mut this_status = DiffStatus::Good;
let mut message = None;
// TODO: Compare :style :prefix :suffix
compare_children(
source,
emacs,
&rust.children,
&mut child_status,
&mut this_status,
&mut message,
)?;
if let Some((new_status, new_message)) = compare_properties!(
emacs,
rust,
(
EmacsField::Required(":style"),
|r| r.style,
compare_property_quoted_string
),
(
EmacsField::Required(":prefix"),
|r| r.prefix,
compare_property_unquoted_atom
),
(
EmacsField::Required(":suffix"),
|r| r.suffix,
compare_property_unquoted_atom
)
)? {
this_status = new_status;
message = new_message;
}
Ok(DiffResult {
status: this_status,
@@ -3375,7 +3406,30 @@ fn compare_citation_reference<'b, 's>(
let this_status = DiffStatus::Good;
let message = None;
// TODO: Compare :key :prefix :suffix
assert_no_children(emacs, &mut this_status, &mut message)?;
if let Some((new_status, new_message)) = compare_properties!(
emacs,
rust,
(
EmacsField::Required(":key"),
|r| Some(r.key),
compare_property_quoted_string
),
(
EmacsField::Required(":prefix"),
|r| r.prefix,
compare_property_unquoted_atom
),
(
EmacsField::Required(":suffix"),
|r| r.suffix,
compare_property_unquoted_atom
)
)? {
this_status = new_status;
message = new_message;
}
Ok(DiffResult {
status: this_status,