increment citationNodeNum counter

Author: cscheid

crates/quarto-markdown-pandoc/src/pandoc/treesitter.rs

@@ -32,7 +32,7 @@ use crate::pandoc::treesitter_utils::pipe_table::{
     process_pipe_table, process_pipe_table_cell, process_pipe_table_delimiter_cell,
     process_pipe_table_delimiter_row, process_pipe_table_header_or_row,
 };
-use crate::pandoc::treesitter_utils::postprocess::{desugar, merge_strs};
+use crate::pandoc::treesitter_utils::postprocess::{merge_strs, postprocess};
 use crate::pandoc::treesitter_utils::quoted_span::process_quoted_span;
 use crate::pandoc::treesitter_utils::raw_attribute::process_raw_attribute;
 use crate::pandoc::treesitter_utils::raw_specifier::process_raw_specifier;
@@ -714,7 +714,7 @@ pub fn treesitter_to_pandoc<T: Write>(
     let (_, PandocNativeIntermediate::IntermediatePandoc(pandoc)) = result else {
         panic!("Expected Pandoc, got {:?}", result)
     };
-    let result = desugar(pandoc)?;
+    let result = postprocess(pandoc)?;
     let result = merge_strs(result);
     Ok(result)
 }

crates/quarto-markdown-pandoc/src/pandoc/treesitter_utils/postprocess.rs

@@ -194,16 +194,28 @@ pub fn coalesce_abbreviations(inlines: Vec<Inline>) -> (Vec<Inline>, bool) {
     (result, did_coalesce)
 }
 
-/// Apply desugaring transformations to the Pandoc AST
-pub fn desugar(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
+/// Apply post-processing transformations to the Pandoc AST
+pub fn postprocess(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
     let mut errors = Vec::new();
     let raw_reader_format_specifier: Lazy<Regex> =
         Lazy::new(|| Regex::new(r"<(?P<reader>.+)").unwrap());
     let result = {
         // Track seen header IDs to avoid duplicates
         let mut seen_ids: HashMap<String, usize> = HashMap::new();
+        // Track citation count for numbering
+        let mut citation_counter: usize = 0;
 
         let mut filter = Filter::new()
+            .with_cite(|mut cite| {
+                // Increment citation counter for each Cite element
+                citation_counter += 1;
+                // Update all citations in this Cite element with the current counter
+                for citation in &mut cite.citations {
+                    citation.note_num = citation_counter;
+                }
+                // Return Unchanged to allow recursion into cite content while avoiding re-filtering
+                Unchanged(cite)
+            })
             .with_superscript(|mut superscript| {
                 let (content, changed) = trim_inlines(superscript.content);
                 if !changed {
@@ -487,7 +499,7 @@ pub fn desugar(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
             .with_attr(|attr| {
                 // TODO in order to do good error messages here, attr will need source mapping
                 errors.push(format!(
-                    "Found attr in desugar: {:?} - this should have been removed",
+                    "Found attr in postprocess: {:?} - this should have been removed",
                     attr
                 ));
                 FilterResult(vec![], false)

crates/quarto-markdown-pandoc/tests/snapshots/native/015.qmd

@@ -0,0 +1,3 @@
+@cite1 @cite2
+
+[@cite3; @cite4] @cite5

crates/quarto-markdown-pandoc/tests/snapshots/native/015.qmd.snapshot

@@ -0,0 +1 @@
+[ Para [Cite [Citation { citationId = "cite1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0 }] [Str "@cite1"], Space, Cite [Citation { citationId = "cite2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 2, citationHash = 0 }] [Str "@cite2"]], Para [Cite [Citation { citationId = "cite3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 3, citationHash = 0 }, Citation { citationId = "cite4", citationPrefix = [Space], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 3, citationHash = 0 }] [], Space, Cite [Citation { citationId = "cite5", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 4, citationHash = 0 }] [Str "@cite5"]] ]