new syntax for footnote defns in inline and block styles

Author: cscheid

CLAUDE.md

@@ -13,3 +13,4 @@ The main documentation for this repository is located at:
 - When a cd command fails for you, that means you're confused about the current directory. In this situations, ALWAYS run `pwd` before doing anything else.
 - use `jq` instead of `python3 -m json.tool` for pretty-printing. When processing JSON in a shell pipeline, prefer `jq` when possible.
 - Always create a plan. Always work on the plan one item at a time.
+- In the tree-sitter-markdown and tree-sitter-markdown-inline directories, you rebuild the parsers using "tree-sitter generate; tree-sitter build". Make sure the shell is in the correct directory before running those. Every time you change the tree-sitter parsers, rebuild them and run "tree-sitter test". If the tests fail, fix the code. Only change tree-sitter tests you've just added; do not touch any other tests. If you end up getting stuck there, stop and ask for my help.

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

@@ -731,6 +731,17 @@ pub fn topdown_traverse_block(block: Block, filter: &mut Filter) -> Blocks {
                 },
             )]
         }
+        Block::NoteDefinitionFencedBlock(refdef) => {
+            // Process the block content of the fenced reference definition
+            let content = topdown_traverse_blocks(refdef.content, filter);
+            vec![Block::NoteDefinitionFencedBlock(
+                crate::pandoc::block::NoteDefinitionFencedBlock {
+                    id: refdef.id,
+                    content,
+                    source_info: refdef.source_info,
+                },
+            )]
+        }
     }
 }
 

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

@@ -34,6 +34,7 @@ pub enum Block {
     // quarto extensions
     BlockMetadata(MetaBlock),
     NoteDefinitionPara(NoteDefinitionPara),
+    NoteDefinitionFencedBlock(NoteDefinitionFencedBlock),
 }
 
 pub type Blocks = Vec<Block>;
@@ -136,6 +137,13 @@ pub struct NoteDefinitionPara {
     pub source_info: SourceInfo,
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub struct NoteDefinitionFencedBlock {
+    pub id: String,
+    pub content: Blocks,
+    pub source_info: SourceInfo,
+}
+
 impl_source_location!(
     // blocks
     Plain,
@@ -154,7 +162,8 @@ impl_source_location!(
     Div,
     // quarto extensions
     MetaBlock,
-    NoteDefinitionPara
+    NoteDefinitionPara,
+    NoteDefinitionFencedBlock
 );
 
 fn make_block_leftover(node: &tree_sitter::Node, input_bytes: &[u8]) -> Block {

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

@@ -23,6 +23,7 @@ use crate::pandoc::treesitter_utils::language_attribute::process_language_attrib
 use crate::pandoc::treesitter_utils::latex_span::process_latex_span;
 use crate::pandoc::treesitter_utils::link_title::process_link_title;
 use crate::pandoc::treesitter_utils::list_marker::process_list_marker;
+use crate::pandoc::treesitter_utils::note_definition_fenced_block::process_note_definition_fenced_block;
 use crate::pandoc::treesitter_utils::note_definition_para::process_note_definition_para;
 use crate::pandoc::treesitter_utils::note_reference::process_note_reference;
 use crate::pandoc::treesitter_utils::numeric_character_reference::process_numeric_character_reference;
@@ -417,6 +418,7 @@ fn native_visitor<T: Write>(
         "language"
         | "note_reference_id"
         | "ref_id_specifier"
+        | "fenced_div_note_id"
         | "citation_id_suppress_author"
         | "citation_id_author_in_text"
         | "link_destination"
@@ -459,6 +461,7 @@ fn native_visitor<T: Write>(
         "citation" => process_citation(node, node_text, children),
         "note_reference" => process_note_reference(node, children),
         "inline_ref_def" => process_note_definition_para(node, children),
+        "note_definition_fenced_block" => process_note_definition_fenced_block(node, children),
         "shortcode" | "shortcode_escaped" => process_shortcode(node, children),
         "shortcode_keyword_param" => process_shortcode_keyword_param(buf, node, children),
         "shortcode_boolean" => process_shortcode_boolean(node, input_bytes),

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

@@ -23,6 +23,7 @@ pub mod language_attribute;
 pub mod latex_span;
 pub mod link_title;
 pub mod list_marker;
+pub mod note_definition_fenced_block;
 pub mod note_definition_para;
 pub mod note_reference;
 pub mod numeric_character_reference;

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

@@ -0,0 +1,53 @@
+/*
+ * note_definition_fenced_block.rs
+ *
+ * Functions for processing note definition fenced block nodes in the tree-sitter AST.
+ *
+ * Copyright (c) 2025 Posit, PBC
+ */
+
+use crate::pandoc::block::{Block, Blocks, NoteDefinitionFencedBlock};
+use crate::pandoc::location::node_source_info;
+
+use super::pandocnativeintermediate::PandocNativeIntermediate;
+
+pub fn process_note_definition_fenced_block(
+    node: &tree_sitter::Node,
+    children: Vec<(String, PandocNativeIntermediate)>,
+) -> PandocNativeIntermediate {
+    let mut id = String::new();
+    let mut content: Blocks = Vec::new();
+
+    for (node_name, child) in children {
+        if node_name == "fenced_div_note_id" {
+            if let PandocNativeIntermediate::IntermediateBaseText(text, _) = child {
+                // The text includes the ^ prefix, strip it
+                id = text.strip_prefix('^').unwrap_or(&text).to_string();
+            } else {
+                panic!("Expected BaseText in fenced_div_note_id, got {:?}", child);
+            }
+        } else if node_name == "block_continuation" {
+            // This is a marker node, we don't need to do anything with it
+        } else {
+            match child {
+                PandocNativeIntermediate::IntermediateBlock(block) => {
+                    content.push(block);
+                }
+                PandocNativeIntermediate::IntermediateSection(blocks) => {
+                    content.extend(blocks);
+                }
+                _ => {
+                    // Ignore other intermediate nodes
+                }
+            }
+        }
+    }
+
+    PandocNativeIntermediate::IntermediateBlock(Block::NoteDefinitionFencedBlock(
+        NoteDefinitionFencedBlock {
+            id,
+            content,
+            source_info: node_source_info(node),
+        },
+    ))
+}

crates/quarto-markdown-pandoc/src/readers/json.rs

@@ -1078,6 +1078,37 @@ fn read_block(value: &Value) -> Result<Block> {
                 },
             ))
         }
+        "NoteDefinitionFencedBlock" => {
+            let c = obj
+                .get("c")
+                .ok_or_else(|| JsonReadError::MissingField("c".to_string()))?;
+            let arr = c.as_array().ok_or_else(|| {
+                JsonReadError::InvalidType(
+                    "NoteDefinitionFencedBlock content must be array".to_string(),
+                )
+            })?;
+            if arr.len() != 2 {
+                return Err(JsonReadError::InvalidType(
+                    "NoteDefinitionFencedBlock array must have 2 elements".to_string(),
+                ));
+            }
+            let id = arr[0]
+                .as_str()
+                .ok_or_else(|| {
+                    JsonReadError::InvalidType(
+                        "NoteDefinitionFencedBlock id must be string".to_string(),
+                    )
+                })?
+                .to_string();
+            let content = read_blocks(&arr[1])?;
+            Ok(Block::NoteDefinitionFencedBlock(
+                crate::pandoc::block::NoteDefinitionFencedBlock {
+                    id,
+                    content,
+                    source_info: SourceInfo::new(filename, range),
+                },
+            ))
+        }
         _ => Err(JsonReadError::UnsupportedVariant(format!("Block: {}", t))),
     }
 }

crates/quarto-markdown-pandoc/src/writers/json.rs

@@ -312,6 +312,11 @@ fn write_block(block: &Block) -> Value {
             "c": [refdef.id, write_inlines(&refdef.content)],
             "l": write_location(refdef),
         }),
+        Block::NoteDefinitionFencedBlock(refdef) => json!({
+            "t": "NoteDefinitionFencedBlock",
+            "c": [refdef.id, write_blocks(&refdef.content)],
+            "l": write_location(refdef),
+        }),
     }
 }
 

crates/quarto-markdown-pandoc/src/writers/qmd.rs

@@ -565,6 +565,22 @@ fn write_inlinerefdef(
     Ok(())
 }
 
+fn write_fenced_note_definition(
+    refdef: &crate::pandoc::block::NoteDefinitionFencedBlock,
+    buf: &mut dyn std::io::Write,
+) -> std::io::Result<()> {
+    writeln!(buf, "::: ^{}", refdef.id)?;
+    for (i, block) in refdef.content.iter().enumerate() {
+        if i > 0 {
+            // Add a blank line between blocks
+            writeln!(buf)?;
+        }
+        write_block(block, buf)?;
+    }
+    writeln!(buf, ":::")?;
+    Ok(())
+}
+
 fn write_table(table: &Table, buf: &mut dyn std::io::Write) -> std::io::Result<()> {
     // Collect all rows (header + body rows)
     let mut all_rows = Vec::new();
@@ -1120,6 +1136,9 @@ fn write_block(block: &crate::pandoc::Block, buf: &mut dyn std::io::Write) -> st
         Block::NoteDefinitionPara(refdef) => {
             write_inlinerefdef(refdef, buf)?;
         }
+        Block::NoteDefinitionFencedBlock(refdef) => {
+            write_fenced_note_definition(refdef, buf)?;
+        }
     }
     Ok(())
 }

crates/quarto-markdown-pandoc/tests/roundtrip_tests/qmd-json-qmd/note_definition_fenced_block_multipara.qmd

@@ -0,0 +1,9 @@
+# Note Definition Fenced Block - Multiple Paragraphs
+
+::: ^my-note
+First paragraph in the note.
+
+Second paragraph in the note.
+
+Third paragraph in the note.
+:::