panache-cli 3.17.0__tar.gz → 3.17.2__tar.gz

{panache_cli-3.17.0 → panache_cli-3.17.2}/Cargo.lock

@@ -39,9 +39,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "annotate-snippets"
-version = "0.12.16"
+version = "0.12.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f211a51805bc641f3ad5b7664c77d2547af685cc33b4cd8d31964027a46f13f1"
+checksum = "b2a5b0a5ab8561c603f16c3b78c24a386b1f70e7fc1b1b1e8c15738828e4a176"
 dependencies = [
  "anstyle",
  "memchr",
@@ -121,9 +121,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "badness-formatter"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b174164ae9bb3abaa0115a64ecb11a54cdee5c93c9104c1cdf2c5da282039d76"
+checksum = "0165f729bcb3de3e5b19936829abb6e32204d5762ed93a2c131e65c3c9495810"
 dependencies = [
  "badness-parser",
  "rowan 0.17.0",
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "badness-parser"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b45795e07c88249e867c1f2dd84ca0d5d78062753fb5fa75c8eb1ece8e202b"
+checksum = "75b997df78399ddfa09f747bbe52f8e1c8afc374e3fc95540cd312632b939744"
 dependencies = [
  "phf 0.14.0",
  "phf_codegen",
@@ -294,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "clapdown"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68bcefa13c36a119d957224c65214f792139033a34f8157297ac2a7fff5a343a"
+checksum = "d8f2a42d22b905f09c7e696e2f46a17e4aa956c8d8b8cd09806137fd99c8544c"
 dependencies = [
  "clap",
 ]
@@ -326,9 +326,9 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
@@ -497,9 +497,9 @@ dependencies = [
 
 [[package]]
 name = "emojis"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1514ced566c94991ed9563258ecf61e311fd773bf0a3f20606830386bf66e3"
+checksum = "589871e639330783bc20ad89d32ac1b049e02c273d96c907ca27478c8bc674a2"
 dependencies = [
  "phf 0.13.1",
 ]
@@ -850,9 +850,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.58.6"
+version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f622c574a29fb3034a0a90645afee194dfedc75fc124228801b6e77041075bd1"
+checksum = "65de752665c4a06528af6759955eecf60ba73ae7442d35349963a09c8031cd71"
 dependencies = [
  "ahash",
  "bytecount",
@@ -878,23 +878,24 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.58.6"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a968fffd387b2ab005bf00c1851f5d26e90df05b6f7ad609ed0d620033cca5e7"
+checksum = "107aeb6ff14b8deb5610096a8ce5c554ec89806b521147eaeb3cae05b07edb7a"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.58.6"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39b7670345e5ce87371339d13705dbb9276b7e3e934bbe1efa2c6734a1f65a96"
+checksum = "e281d6b177bb4834f2ffd6f92aa0443cffe29c996b251c8d94eb6f456186feba"
 dependencies = [
  "ahash",
  "bytecount",
  "fraction",
  "getrandom 0.3.4",
+ "memchr",
  "num-cmp",
  "num-traits",
  "serde_json",
@@ -903,9 +904,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.190"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libredox"
@@ -1114,7 +1115,7 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "panache"
-version = "3.17.0"
+version = "3.17.2"
 dependencies = [
  "annotate-snippets",
  "assert_cmd",
@@ -1147,7 +1148,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "similar 3.2.0",
+ "similar 3.2.1",
  "similar-asserts",
  "tempfile",
  "toml",
@@ -1159,7 +1160,7 @@ dependencies = [
 
 [[package]]
 name = "panache-formatter"
-version = "0.28.0"
+version = "0.28.2"
 dependencies = [
  "badness-formatter",
  "insta",
@@ -1179,7 +1180,7 @@ dependencies = [
 
 [[package]]
 name = "panache-parser"
-version = "0.34.0"
+version = "0.34.2"
 dependencies = [
  "badness-parser",
  "entities",
@@ -1461,9 +1462,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.58.6"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558f3855529c0a7e78a48e409fa653456e55f1b167eab4109c16a255b7727e3f"
+checksum = "f42818036d3b37cda6bd4c494543158a36e431cb717015ef7c93acc6ba214d3b"
 dependencies = [
  "ahash",
  "fluent-uri 0.4.1",
@@ -1738,9 +1739,9 @@ checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
 
 [[package]]
 name = "similar"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f66ca1f7aca2474dc10c942eb22feffc897735f54cd1db90138c2fddb490987"
+checksum = "d2f8bec09ae8fae0f4f265a4559a9334be3929d8504e9b536df0a41302bd1733"
 dependencies = [
  "bstr",
  "unicode-segmentation",
@@ -1753,7 +1754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "997e6ca38e97437973fc9f7f50a50d1274cacd874341a4960fea90067291038c"
 dependencies = [
  "console",
- "similar 3.2.0",
+ "similar 3.2.1",
 ]
 
 [[package]]
@@ -1770,15 +1771,15 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.16.3"
+version = "1.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
 
 [[package]]
 name = "smol_str"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+checksum = "eeb7109d23f319619d4cc0de5464613c8b7b1a09db2774a58101459cf6be2f10"
 dependencies = [
  "borsh",
  "serde_core",
@@ -1986,9 +1987,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.28.0"
+version = "1.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606"
+checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",

{panache_cli-3.17.0 → panache_cli-3.17.2}/Cargo.toml

@@ -9,7 +9,7 @@ authors = ["Johan Larsson <johan@jolars.co>"]
 
 [package]
 name = "panache"
-version = "3.17.0"
+version = "3.17.2"
 edition.workspace = true
 rust-version.workspace = true
 # `distill_quarto_schema` is a dev-only vendoring bin (src/bin/); keep bare
@@ -55,11 +55,11 @@ path = "src/main.rs"
 required-features = ["cli"]
 
 [dependencies]
-panache-formatter = { path = "crates/panache-formatter", version = "0.28.0", features = [
+panache-formatter = { path = "crates/panache-formatter", version = "0.28.2", features = [
     "serde",
     "schema",
 ] }
-panache-parser = { path = "crates/panache-parser", version = "0.34.0", features = [
+panache-parser = { path = "crates/panache-parser", version = "0.34.2", features = [
     "serde",
     "schema",
 ] }
@@ -95,7 +95,7 @@ similar-asserts = "2.0.0"
 insta = { version = "1.47.2", features = ["json"] }
 assert_cmd = "2.2.2"
 predicates = "3.1.4"
-jsonschema = { version = "0.58.5", default-features = false }
+jsonschema = { version = "0.60.1", default-features = false }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 rayon = "1.10.0"
@@ -117,7 +117,7 @@ lsp = [
 clap = { version = "4.6.1", features = ["derive", "env"] }
 clap_complete = "4.6.0"
 clap_mangen = "0.3.0"
-clapdown = "0.2.0"
+clapdown = "0.3.0"
 flate2 = "1.1.9"
 
 [package.metadata.deb]

{panache_cli-3.17.0 → panache_cli-3.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: panache-cli
-Version: 3.17.0
+Version: 3.17.2
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -37,6 +37,7 @@ Code](https://vsmarketplacebadges.dev/version-short/jolars.panache.svg?logo=vsix
 version](https://badge.fury.io/py/panache-cli.svg?icon=si%3Apython)](https://badge.fury.io/py/panache-cli)
 [![npm
 version](https://badge.fury.io/js/@panache-cli%2Fpanache.svg?icon=si%3Anpm)](https://badge.fury.io/js/@panache-cli%2Fpanache)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.18608442-blue)](https://doi.org/10.5281/zenodo.18608442)
 
 Panache is a language server, formatter, and linter for Quarto and other
 Markdown flavors, built in Rust with a lossless CST parser and support for
@@ -337,3 +338,12 @@ documentation, well-structured code, and testing infrastructure provided by
 Pandoc. We also owe significant debt to the rust-analyzer project, on which
 Panache is heavily inspired.
 
+## Citation
+
+If you use Panache in your research, please cite the release you used. Select
+that release in the [Zenodo archive](https://doi.org/10.5281/zenodo.18608442)
+and export its citation. To cite Panache generally, use the concept DOI
+`10.5281/zenodo.18608442`.
+
+Machine-readable metadata is available in [CITATION.cff](CITATION.cff).
+

{panache_cli-3.17.0 → panache_cli-3.17.2}/README.md

@@ -11,6 +11,7 @@ Code](https://vsmarketplacebadges.dev/version-short/jolars.panache.svg?logo=vsix
 version](https://badge.fury.io/py/panache-cli.svg?icon=si%3Apython)](https://badge.fury.io/py/panache-cli)
 [![npm
 version](https://badge.fury.io/js/@panache-cli%2Fpanache.svg?icon=si%3Anpm)](https://badge.fury.io/js/@panache-cli%2Fpanache)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.18608442-blue)](https://doi.org/10.5281/zenodo.18608442)
 
 Panache is a language server, formatter, and linter for Quarto and other
 Markdown flavors, built in Rust with a lossless CST parser and support for
@@ -310,3 +311,12 @@ The development of Panache has simplified considerably thanks to the extensive
 documentation, well-structured code, and testing infrastructure provided by
 Pandoc. We also owe significant debt to the rust-analyzer project, on which
 Panache is heavily inspired.
+
+## Citation
+
+If you use Panache in your research, please cite the release you used. Select
+that release in the [Zenodo archive](https://doi.org/10.5281/zenodo.18608442)
+and export its citation. To cite Panache generally, use the concept DOI
+`10.5281/zenodo.18608442`.
+
+Machine-readable metadata is available in [CITATION.cff](CITATION.cff).

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-formatter/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.28.2](https://github.com/jolars/panache/compare/panache-formatter-v0.28.1...panache-formatter-v0.28.2) (2026-10-30)
+
+### Dependencies
+
+- updated crates/panache-parser to v0.34.2
+
+## [0.28.1](https://github.com/jolars/panache/compare/panache-formatter-v0.28.0...panache-formatter-v0.28.1) (2026-10-26)
+
+### Bug Fixes
+
+- **parser:** expose IDs in raw CommonMark HTML ([`b076c95`](https://github.com/jolars/panache/commit/b076c955aa49d1a4ff9bb32cbc132e83d57b9a04))
+
+### Dependencies
+
+- updated crates/panache-parser to v0.34.1
+
 ## [0.28.0](https://github.com/jolars/panache/compare/panache-formatter-v0.27.1...panache-formatter-v0.28.0) (2026-10-16)
 
 ### Features

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-formatter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "panache-formatter"
-version = "0.28.0"
+version = "0.28.2"
 edition.workspace = true
 rust-version.workspace = true
 include = [
@@ -19,7 +19,7 @@ keywords = ["quarto", "pandoc", "markdown", "formatter"]
 categories = ["text-processing"]
 
 [dependencies]
-panache-parser = { path = "../panache-parser", version = "0.34.0" }
+panache-parser = { path = "../panache-parser", version = "0.34.2" }
 log = { version = "0.4.31", features = ["release_max_level_debug"] }
 rowan = "0.17.0"
 serde = { version = "1.0.228", features = ["derive"], optional = true }
@@ -32,7 +32,7 @@ serde = ["dep:serde", "panache-parser/serde"]
 schema = ["serde", "dep:schemars", "panache-parser/schema"]
 
 [dev-dependencies]
-badness-formatter = "=0.10.2"
+badness-formatter = "=0.11.0"
 serde_json = "1.0.150"
 insta = { version = "1.47.2", features = ["json"] }
 # TEMPORARY: cross-validation oracle only (tests/yaml_cross_validation.rs).

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-formatter/src/formatter/raw.rs

@@ -48,6 +48,15 @@ impl Formatter {
             after_marker = false;
             text.push_str(token.text());
         }
+        // A prefix-only final line still belongs to the raw block without a
+        // source newline; the enclosing container must emit that blank line.
+        if text.ends_with('\n')
+            && node
+                .last_token()
+                .is_some_and(|token| token.kind() == SyntaxKind::LINE_PREFIX)
+        {
+            text.push('\n');
+        }
         let starts_on_marker_line = node
             .first_token()
             .and_then(|token| token.prev_token())

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-parser/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.34.2](https://github.com/jolars/panache/compare/panache-parser-v0.34.1...panache-parser-v0.34.2) (2026-10-30)
+
+### Bug Fixes
+
+- **lint:** validate custom cross-reference targets ([`f4f3a1d`](https://github.com/jolars/panache/commit/f4f3a1db60ec5ee2d537c72c60668426d696ecd9)), closes [#591](https://github.com/jolars/panache/issues/591)
+- **parser:** capture narrative citation suffixes ([`3b50e47`](https://github.com/jolars/panache/commit/3b50e47a2ccbae75974ab1926a24825b4c4f1c18)), fixes [#590](https://github.com/jolars/panache/issues/590)
+
+## [0.34.1](https://github.com/jolars/panache/compare/panache-parser-v0.34.0...panache-parser-v0.34.1) (2026-10-26)
+
+### Bug Fixes
+
+- **parser:** reject trailing div attribute blocks ([`8f88555`](https://github.com/jolars/panache/commit/8f88555b61cc4edaaf2e2a8a74a6267953f47600)), refs [#584](https://github.com/jolars/panache/issues/584)
+- **linter:** preserve html context and raw labels ([`1655cf0`](https://github.com/jolars/panache/commit/1655cf067c19b7dd4f8e6f8dde080e3e03275a63))
+- **parser:** expose IDs in raw CommonMark HTML ([`b076c95`](https://github.com/jolars/panache/commit/b076c955aa49d1a4ff9bb32cbc132e83d57b9a04))
+
 ## [0.34.0](https://github.com/jolars/panache/compare/panache-parser-v0.33.0...panache-parser-v0.34.0) (2026-10-16)
 
 ### Features

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "panache-parser"
-version = "0.34.0"
+version = "0.34.2"
 edition.workspace = true
 rust-version.workspace = true
 readme = "README.md"
@@ -44,6 +44,6 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.150"
 
 [dev-dependencies]
-badness-parser = "=0.11.1"
+badness-parser = "=0.11.2"
 insta = "1.47.2"
 toml = "1.1.2"

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-parser/src/pandoc_ast.rs

@@ -3542,9 +3542,6 @@ fn inlines_from(parent: &SyntaxNode) -> Vec<Inline> {
             NodeOrToken::Node(n) if n.kind() == SyntaxKind::LATEX_COMMAND => {
                 emit_latex_command_with_absorb(&n, &mut iter, &mut out);
             }
-            NodeOrToken::Node(n) if n.kind() == SyntaxKind::CITATION => {
-                emit_citation_with_absorb(&n, &mut iter, &mut out);
-            }
             NodeOrToken::Node(n) => push_inline_node(&n, &mut out),
         }
     }
@@ -3554,62 +3551,6 @@ fn inlines_from(parent: &SyntaxNode) -> Vec<Inline> {
     out
 }
 
-/// Pandoc absorbs `@key [locator]` into a single AuthorInText `Cite` with
-/// the bracketed text becoming the citation's suffix. The parser emits two
-/// separate nodes: `CITATION` (bare `@key`, no surrounding brackets) and an
-/// adjacent `LINK` whose bracketed text has no destination. When the
-/// CITATION is bare and we can verify both the next siblings (a single
-/// `TEXT` whitespace token followed by a `LINK` node lacking
-/// `LINK_DEST_START`), consume both and absorb the link's text as suffix.
-fn emit_citation_with_absorb<I>(
-    node: &SyntaxNode,
-    iter: &mut std::iter::Peekable<I>,
-    out: &mut Vec<Inline>,
-) where
-    I: Iterator<Item = rowan::SyntaxElement<crate::syntax::PanacheLanguage>>,
-{
-    let bracketed = node
-        .children_with_tokens()
-        .filter_map(|el| el.into_token())
-        .any(|t| t.kind() == SyntaxKind::LINK_START);
-    if bracketed {
-        render_citation_inline(node, out, None);
-        return;
-    }
-    let next_sibling_pair = node.next_sibling_or_token().and_then(|el1| {
-        let t = el1.as_token().cloned()?;
-        if t.kind() != SyntaxKind::TEXT || !t.text().starts_with(' ') {
-            return None;
-        }
-        let space_text = t.text().to_string();
-        let link_el = t.next_sibling_or_token()?;
-        let link = link_el.as_node().cloned()?;
-        if link.kind() != SyntaxKind::LINK && link.kind() != SyntaxKind::UNRESOLVED_REFERENCE {
-            return None;
-        }
-        let has_dest = link
-            .children_with_tokens()
-            .filter_map(|el| el.into_token())
-            .any(|tok| tok.kind() == SyntaxKind::LINK_DEST_START);
-        if has_dest {
-            return None;
-        }
-        let link_text = link
-            .children()
-            .find(|c| c.kind() == SyntaxKind::LINK_TEXT)
-            .map(|tt| tt.text().to_string())
-            .unwrap_or_default();
-        Some((space_text, link_text))
-    });
-    if let Some((_space_text, locator_text)) = next_sibling_pair {
-        iter.next();
-        iter.next();
-        render_citation_inline(node, out, Some(&locator_text));
-    } else {
-        render_citation_inline(node, out, None);
-    }
-}
-
 /// Pandoc's tex inline reader absorbs trailing horizontal whitespace into the
 /// raw command when (and only when) the command is `\letters` with no brace
 /// arguments — `\foo bar` becomes `RawInline tex "\\foo "` + `Str "bar"`,
@@ -3656,7 +3597,7 @@ fn push_inline_node(node: &SyntaxNode, out: &mut Vec<Inline>) {
     match node.kind() {
         SyntaxKind::LINK => render_link_inline(node, out),
         SyntaxKind::IMAGE_LINK => render_image_inline(node, out),
-        SyntaxKind::CITATION => render_citation_inline(node, out, None),
+        SyntaxKind::CITATION => render_citation_inline(node, out),
         SyntaxKind::UNRESOLVED_REFERENCE => render_unresolved_reference_inline(node, out),
         _ => out.push(inline_from_node(node)),
     }
@@ -3755,14 +3696,9 @@ fn render_unresolved_reference_inline(node: &SyntaxNode, out: &mut Vec<Inline>)
 /// `Str "N"` (just the digits — surrounding parens come from adjacent
 /// source bytes which our coalesce pass merges back in). Otherwise we
 /// project the CITATION node as a proper `Cite [Citation, ...] [Inline,
-/// ...]` per pandoc's citation reader. `extra_suffix_text` carries an
-/// absorbed `[locator]` (pandoc absorbs `@key [locator]` into the Cite as
-/// the citation's suffix); the literal text reflects the absorbed bytes.
-fn render_citation_inline(
-    node: &SyntaxNode,
-    out: &mut Vec<Inline>,
-    extra_suffix_text: Option<&str>,
-) {
+/// ...]` per pandoc's citation reader, including any narrative suffix
+/// captured in the citation node.
+fn render_citation_inline(node: &SyntaxNode, out: &mut Vec<Inline>) {
     let first_key = node
         .children_with_tokens()
         .filter_map(|el| el.into_token())
@@ -3784,13 +3720,15 @@ fn render_citation_inline(
     let mut builders: Vec<CitationBuilder> = Vec::new();
     let mut current: Option<CitationBuilder> = None;
     let mut pending_prefix = String::new();
+    let mut in_brackets = bracketed;
     for el in node.children_with_tokens() {
         let token = match el {
             NodeOrToken::Token(t) => t,
             _ => continue,
         };
         match token.kind() {
-            SyntaxKind::LINK_START | SyntaxKind::LINK_DEST => {}
+            SyntaxKind::LINK_START | SyntaxKind::LINK_DEST | SyntaxKind::CITATION_SUFFIX_END => {}
+            SyntaxKind::CITATION_SUFFIX_START => in_brackets = true,
             SyntaxKind::CITATION_BRACE_OPEN | SyntaxKind::CITATION_BRACE_CLOSE => {}
             SyntaxKind::CITATION_MARKER => {
                 if let Some(c) = current.take() {
@@ -3798,7 +3736,7 @@ fn render_citation_inline(
                 }
                 let mode = if token.text() == "-@" {
                     CitationMode::SuppressAuthor
-                } else if bracketed {
+                } else if in_brackets {
                     CitationMode::NormalCitation
                 } else {
                     CitationMode::AuthorInText
@@ -3832,15 +3770,6 @@ fn render_citation_inline(
         builders.push(c);
     }
 
-    if let Some(extra) = extra_suffix_text
-        && let Some(last) = builders.last_mut()
-    {
-        if !last.suffix_raw.is_empty() && !extra.starts_with(' ') {
-            last.suffix_raw.push(' ');
-        }
-        last.suffix_raw.push_str(extra);
-    }
-
     let note_offset: u32 = node.text_range().start().into();
     let note_num = REFS_CTX
         .with(|c| {
@@ -3856,12 +3785,19 @@ fn render_citation_inline(
         .map(|b| b.into_citation(note_num))
         .collect();
 
-    let mut literal = node.text().to_string();
-    if let Some(extra) = extra_suffix_text {
-        literal.push(' ');
-        literal.push('[');
-        literal.push_str(extra);
-        literal.push(']');
+    let mut literal = String::new();
+    for token in node.children_with_tokens().filter_map(|el| el.into_token()) {
+        match token.kind() {
+            SyntaxKind::LINE_PREFIX => {}
+            SyntaxKind::CITATION_SUFFIX_START => {
+                if !literal.ends_with(char::is_whitespace) {
+                    literal.push(' ');
+                }
+                literal.push('[');
+            }
+            SyntaxKind::CITATION_MARKER if !bracketed && literal.is_empty() => literal.push('@'),
+            _ => literal.push_str(token.text()),
+        }
     }
     let text_inlines = literal_inlines(&literal);
 
@@ -5492,6 +5428,23 @@ mod tests {
         serde_json::from_str(&s).expect("to_pandoc_json must emit valid JSON")
     }
 
+    #[test]
+    fn narrative_citation_projects_suffix_and_preserves_the_following_reference() {
+        let output = parse_to_json("@a\n[p. 4; @b] and [missing]");
+        let inlines = &output["blocks"][0]["c"];
+        let citations = &inlines[0]["c"][0];
+        assert_eq!(citations[0]["citationId"], "a");
+        assert_eq!(citations[0]["citationMode"]["t"], "AuthorInText");
+        assert_eq!(
+            citations[0]["citationSuffix"],
+            json!([{"t": "Str", "c": "p.\u{a0}4"}])
+        );
+        assert_eq!(citations[1]["citationId"], "b");
+        assert_eq!(citations[1]["citationMode"]["t"], "NormalCitation");
+        assert_eq!(inlines[0]["c"][1][1]["t"], "SoftBreak");
+        assert_eq!(inlines[4], json!({"t": "Str", "c": "[missing]"}));
+    }
+
     fn pandoc_options() -> crate::options::ParserOptions {
         flavor_options(crate::options::Flavor::Pandoc)
     }

{panache_cli-3.17.0 → panache_cli-3.17.2}/crates/panache-parser/src/parser/block_dispatcher.rs

@@ -2208,15 +2208,7 @@ impl BlockParser for FencedDivOpenParser {
 
             emit_div_info_node(builder, &div_fence.attributes);
 
-            let after_attrs = if div_fence.attributes.starts_with('{') {
-                if let Some(close_idx) = content_after_space.find('}') {
-                    &content_after_space[close_idx + 1..]
-                } else {
-                    ""
-                }
-            } else {
-                &content_after_space[div_fence.attributes.len()..]
-            };
+            let after_attrs = &content_after_space[div_fence.attributes.len()..];
 
             if !after_attrs.is_empty() {
                 let suffix_trimmed = after_attrs.trim_start();