panache-cli 3.2.0__tar.gz → 3.3.0__tar.gz

{panache_cli-3.2.0 → panache_cli-3.3.0}/Cargo.lock

@@ -189,28 +189,19 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "clap"
-version = "4.6.5"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301b56658598e48f3648647ac6fc887be7e7108eddfa4e9b63fcf3ec58c0cadf"
+checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca"
 dependencies = [
  "clap_builder",
  "clap_derive",
 ]
 
-[[package]]
-name = "clap-markdown"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a2617956a06d4885b490697b5307ebb09fec10b088afc18c81762d848c2339"
-dependencies = [
- "clap",
-]
-
 [[package]]
 name = "clap_builder"
-version = "4.6.5"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94a65403d1a1bd28f7dc68eb8506e8874808ee5eecb59298de588e2e1407a078"
+checksum = "7b48fea5a88e9ae728a2dcbedbfc0e730f7d60da42e1cb049a83c9fb8b789889"
 dependencies = [
  "anstream",
  "anstyle",
@@ -220,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.6.8"
+version = "4.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f84a88507dbd05c695f2cb5e8558e747179134005e9893882dec964190ed89"
+checksum = "3be2ad0423bdbbb0e25bc89add796f3559706d4a95e1bc98e4d9662a957b6a19"
 dependencies = [
  "clap",
 ]
@@ -247,14 +238,23 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "clap_mangen"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82842b45bf9f6a3be090dd860095ac30728042c08e0d6261ca7259b5d850f07"
+checksum = "c630ddc90572b3d9abd3f887f0007b4e048faf5c5a59ae607f8ac1c5e3790873"
 dependencies = [
  "clap",
  "roff",
 ]
 
+[[package]]
+name = "clapdown"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68bcefa13c36a119d957224c65214f792139033a34f8157297ac2a7fff5a343a"
+dependencies = [
+ "clap",
+]
+
 [[package]]
 name = "colorchoice"
 version = "1.0.5"
@@ -927,9 +927,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.49.5"
+version = "0.49.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da60094fc1968bbd091e2cfa004415cb7b19e25e592376e66a64aa832bb6039"
+checksum = "7e17384278234b10419a63c93fc85695ac9fc2da0833e3c59167f9986499590c"
 dependencies = [
  "ahash",
  "bytecount",
@@ -956,18 +956,18 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.49.5"
+version = "0.49.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36539f34ef9e5da418433fbbf7294522d8f930ecf6a540ccd1ec6481c9ff9056"
+checksum = "ac634e339e73bf9629f6fb207f7b064d872253ae3b3f5c6e0ce8fd762b16e40f"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.49.5"
+version = "0.49.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bc513dfee68c6fe29498451df95a32951ea227801b476f4a1f236433986c891"
+checksum = "92b8e258eb4515a3fc912a9c46e3987040dc07280592280097ea2085527870b8"
 dependencies = [
  "ahash",
  "bytecount",
@@ -1057,6 +1057,15 @@ version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "micromap"
 version = "0.3.0"
@@ -1193,14 +1202,14 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "panache"
-version = "3.2.0"
+version = "3.3.0"
 dependencies = [
  "annotate-snippets",
  "assert_cmd",
  "clap",
- "clap-markdown",
  "clap_complete",
  "clap_mangen",
+ "clapdown",
  "crossbeam-channel",
  "dirs",
  "emojis",
@@ -1220,7 +1229,7 @@ dependencies = [
  "predicates",
  "rayon",
  "regex",
- "rowan",
+ "rowan 0.17.0",
  "salsa",
  "schemars",
  "serde",
@@ -1237,14 +1246,14 @@ dependencies = [
 
 [[package]]
 name = "panache-formatter"
-version = "0.20.4"
+version = "0.20.5"
 dependencies = [
  "insta",
  "log",
  "panache-parser",
  "pretty_yaml",
  "pulldown-latex",
- "rowan",
+ "rowan 0.17.0",
  "schemars",
  "serde",
  "serde_json",
@@ -1255,13 +1264,13 @@ dependencies = [
 
 [[package]]
 name = "panache-parser"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "entities",
  "insta",
  "log",
  "memchr",
- "rowan",
+ "rowan 0.17.0",
  "schemars",
  "serde",
  "serde_json",
@@ -1398,7 +1407,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f5db2b0044c0dae209c173c6049f210c9449092b07304c9c8b8d555c606e93e"
 dependencies = [
- "rowan",
+ "rowan 0.16.1",
  "tiny_pretty",
  "yaml_parser",
 ]
@@ -1504,9 +1513,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.49.5"
+version = "0.49.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05915176d843da9ec5c925e5e2631be9aa61b27430acfdd562e79cae8f559725"
+checksum = "42902112f88a27e9afd5683e2ba31956fed2a5d43395f166dd26775ae9c0dedb"
 dependencies = [
  "ahash",
  "fluent-uri 0.4.1",
@@ -1566,6 +1575,19 @@ dependencies = [
  "text-size",
 ]
 
+[[package]]
+name = "rowan"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14b574c58582fa59fa43a2feb6608b8744184659f08a2e0117e4b8224d95ed61"
+dependencies = [
+ "countme",
+ "hashbrown 0.14.5",
+ "memoffset",
+ "rustc-hash 1.1.0",
+ "text-size",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -2240,7 +2262,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71ebb04c72edf699612d543f6c421142527b85ac180156017fa26be49dc0762f"
 dependencies = [
- "rowan",
+ "rowan 0.16.1",
  "winnow 0.7.15",
 ]
 
@@ -2269,18 +2291,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.55"
+version = "0.8.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb"
+checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.55"
+version = "0.8.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb"
+checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1"
 dependencies = [
  "proc-macro2",
  "quote",

{panache_cli-3.2.0 → panache_cli-3.3.0}/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Johan Larsson <johan@jolars.co>"]
 
 [package]
 name = "panache"
-version = "3.2.0"
+version = "3.3.0"
 edition.workspace = true
 # `distill_quarto_schema` is a dev-only vendoring bin (src/bin/); keep bare
 # `cargo run` resolving to the CLI for tooling like the pre-commit format hook.
@@ -48,8 +48,8 @@ path = "src/main.rs"
 required-features = ["cli"]
 
 [dependencies]
-panache-formatter = { path = "crates/panache-formatter", version = "0.20.4" }
-panache-parser = { path = "crates/panache-parser", version = "0.24.0", features = [
+panache-formatter = { path = "crates/panache-formatter", version = "0.20.5" }
+panache-parser = { path = "crates/panache-parser", version = "0.25.0", features = [
     "serde",
     "schema",
 ] }
@@ -68,7 +68,7 @@ lsp-types = { version = "0.97.0", optional = true }
 num_cpus = { version = "1.17.0", optional = true }
 percent-encoding = { version = "2.3.2", optional = true }
 regex = "1.12.2"
-rowan = "0.16.1"
+rowan = "0.17.0"
 salsa = "0.28.0"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.150"
@@ -106,7 +106,7 @@ lsp = [
 clap = { version = "4.6.1", features = ["derive", "env"] }
 clap_complete = "4.6.0"
 clap_mangen = "0.3.0"
-clap-markdown = "0.1.5"
+clapdown = "0.2.0"
 flate2 = "1.1.9"
 
 [package.metadata.deb]

{panache_cli-3.2.0 → panache_cli-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: panache-cli
-Version: 3.2.0
+Version: 3.3.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{panache_cli-3.2.0 → panache_cli-3.3.0}/build.rs

@@ -69,24 +69,22 @@ fn generate_cli_markdown() -> Result<()> {
         return Ok(());
     }
 
-    let opts = clap_markdown::MarkdownOptions::default()
-        .show_footer(false)
-        .show_table_of_contents(false);
-
-    // Generate markdown documentation
-    let markdown = clap_markdown::help_markdown_command_custom(&cmd, &opts);
-
-    // // Build the complete document with frontmatter
-    let mut document = String::new();
-    document.push_str("---\n");
-    document.push_str("title: CLI Reference\n");
-    document.push_str("description: >\n  Comprehensive reference for the Panache CLI, including all commands, options,\n  and usage examples.\n");
-    document.push_str("---\n\n");
-    document.push_str(&markdown);
-
-    // Write the document
+    // The Pandoc flavor emits the YAML metadata block itself (and drops the
+    // root command's duplicate `h1` in favor of the metadata title).
+    let options = clapdown::Options::new()
+        .flavor(clapdown::Flavor::Pandoc)
+        .title("CLI Reference")
+        .metadata_field(
+            "description",
+            "Comprehensive reference for the Panache CLI, including all commands, \
+             options, and usage examples.",
+        )
+        .footer(false)
+        .table_of_contents(false);
+    let markdown = clapdown::render(&cmd, &options);
+
     let output_path = docs_dir.join("cli.qmd");
-    fs::write(&output_path, &document)?;
+    fs::write(&output_path, &markdown)?;
     println!("Generated CLI markdown: {:?}", output_path);
 
     Ok(())

{panache_cli-3.2.0 → panache_cli-3.3.0}/crates/panache-formatter/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.20.5](https://github.com/jolars/panache/compare/panache-formatter-v0.20.4...panache-formatter-v0.20.5) (2026-08-07)
+
+### Bug Fixes
+- strip a fenced block's own indent from its payload ([`290e3ab`](https://github.com/jolars/panache/commit/290e3abb1f04dbad29451c3abe70aa6a6f8738e0))
+- **formatter:** drop a quoted fence's container indent ([`a7d4d4c`](https://github.com/jolars/panache/commit/a7d4d4c490d1d79a7772134a0ea3273855daaef6))
+- **parser:** open a line block on a list-marker line ([`5f55d89`](https://github.com/jolars/panache/commit/5f55d89ab91d29ebfa41a9facf6fb469ed05e1ed))
+- **parser:** fold a lazy line into its line block ([`7d732b9`](https://github.com/jolars/panache/commit/7d732b91ab4cecb48d6868edb73d78c0b7b6bf5c))
+- **formatter:** keep a line block inside its blockquote ([`8bdf53c`](https://github.com/jolars/panache/commit/8bdf53cbed1f296c3e978cbfeb87903facb5b560))
+- **formatter:** indent a line block inside a list item ([`35db18a`](https://github.com/jolars/panache/commit/35db18a5e8e2d135355355524057b2cd0e2ed1cc))
+
+### Dependencies
+- updated crates/panache-parser to v0.25.0
+
 ## [0.20.4](https://github.com/jolars/panache/compare/panache-formatter-v0.20.3...panache-formatter-v0.20.4) (2026-08-05)
 
 ### Bug Fixes

{panache_cli-3.2.0 → panache_cli-3.3.0}/crates/panache-formatter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "panache-formatter"
-version = "0.20.4"
+version = "0.20.5"
 edition.workspace = true
 include = [
     "/src/**/*",
@@ -18,9 +18,9 @@ keywords = ["quarto", "pandoc", "markdown", "formatter"]
 categories = ["text-processing"]
 
 [dependencies]
-panache-parser = { path = "../panache-parser", version = "0.24.0" }
+panache-parser = { path = "../panache-parser", version = "0.25.0" }
 log = { version = "0.4.31", features = ["release_max_level_debug"] }
-rowan = "0.16.1"
+rowan = "0.17.0"
 serde = { version = "1.0.228", features = ["derive"], optional = true }
 schemars = { version = "1.2.1", optional = true }
 unicode-width = "0.2.2"

{panache_cli-3.2.0 → panache_cli-3.3.0}/crates/panache-formatter/src/formatter/code_blocks.rs

@@ -157,6 +157,17 @@ fn expand_tabs_with_width(text: &str, tab_width: usize) -> String {
 }
 
 fn strip_indent_columns(indent: &str, columns: usize) -> String {
+    strip_indent_columns_budget(indent, columns).0.to_string()
+}
+
+/// Peel up to `columns` columns of leading indentation off `indent`, returning
+/// the tail and the columns left unspent.
+///
+/// The leftover matters because a code line's strippable indent can be split
+/// across two tokens: the emitter peels a container prefix into `WHITESPACE`
+/// but leaves the opening fence's own indent inside the line's `TEXT`, so a
+/// budget that outlives the `WHITESPACE` still has work to do.
+fn strip_indent_columns_budget(indent: &str, columns: usize) -> (&str, usize) {
     let mut remaining = columns;
     let mut idx = 0;
     for (i, ch) in indent.char_indices() {
@@ -165,7 +176,7 @@ fn strip_indent_columns(indent: &str, columns: usize) -> String {
         }
         match ch {
             ' ' => {
-                remaining = remaining.saturating_sub(1);
+                remaining -= 1;
                 idx = i + 1;
             }
             '\t' => {
@@ -175,7 +186,17 @@ fn strip_indent_columns(indent: &str, columns: usize) -> String {
             _ => break,
         }
     }
-    indent[idx..].to_string()
+    (&indent[idx..], remaining)
+}
+
+/// Spend a leftover indent budget against a code line's own leading spaces.
+///
+/// Spaces only: a tab is worth four columns at a four-column stop but fewer
+/// mid-stop, and dropping one for a smaller budget would delete code bytes the
+/// formatter has no way to put back. Leaving it is the lossless direction.
+fn strip_leading_spaces_budget(text: &str, columns: usize) -> &str {
+    let n = text.chars().take(columns).take_while(|&c| c == ' ').count();
+    &text[n..]
 }
 
 fn indent_columns(indent: &str) -> usize {
@@ -190,6 +211,25 @@ fn indent_columns(indent: &str) -> usize {
     cols
 }
 
+/// A fenced code block whose immediate container is a blockquote — the one
+/// place a line-start `WHITESPACE` inside `CODE_CONTENT` can be dropped
+/// token-wise rather than by column.
+///
+/// The parser re-emits each continuation line's container prefix inside
+/// `CODE_CONTENT` for losslessness. Inside a blockquote that prefix is either a
+/// marker's padding or pandoc's lazy-line gobble, both of which the emitter
+/// reproduces exactly, so the whole token is container syntax. Everywhere else
+/// the token boundary is not column-exact once tabs are involved (a `:\t`
+/// definition marker at content column 4 peels `"\t\t"`, eight columns), so the
+/// indent has to come off by column via [`strip_indent_columns`] instead.
+///
+/// Mirrors `fenced_in_blockquote` in the pandoc-native projector
+/// (`panache_parser::to_pandoc_ast`); the two must agree on what a code block's
+/// payload is.
+fn fenced_in_blockquote(node: &SyntaxNode, has_fence: bool) -> bool {
+    has_fence && node.parent().map(|p| p.kind()) == Some(SyntaxKind::BLOCK_QUOTE)
+}
+
 fn extract_code_block_parts(node: &SyntaxNode) -> (Option<SyntaxNode>, Option<String>, String) {
     let mut info_node: Option<SyntaxNode> = None;
     let mut language: Option<String> = None;
@@ -197,12 +237,22 @@ fn extract_code_block_parts(node: &SyntaxNode) -> (Option<SyntaxNode>, Option<St
     let mut has_fence = false;
     let mut fence_indent = String::new();
     let mut fence_indent_cols = 0usize;
+    let drop_container_indent = fenced_in_blockquote(
+        node,
+        node.children()
+            .any(|child| child.kind() == SyntaxKind::CODE_FENCE_OPEN),
+    );
 
     for child in node.children_with_tokens() {
         match child {
             NodeOrToken::Token(t) => {
                 if t.kind() == SyntaxKind::WHITESPACE && !has_fence {
-                    fence_indent = t.text().to_string();
+                    // The pre-fence run is whatever host indent the parser left
+                    // in the block followed by the fence's own indent (a list
+                    // item at content column 2 whose fence is indented one
+                    // further emits `"  "` then `" "`). Both come off the
+                    // payload, so accumulate rather than overwrite.
+                    fence_indent.push_str(t.text());
                 }
             }
             NodeOrToken::Node(n) => match n.kind() {
@@ -241,7 +291,14 @@ fn extract_code_block_parts(node: &SyntaxNode) -> (Option<SyntaxNode>, Option<St
                                     saw_blockquote_marker = true;
                                 }
                                 SyntaxKind::WHITESPACE if at_line_start => {
-                                    if saw_blockquote_marker {
+                                    if drop_container_indent {
+                                        // Whole token is container syntax — see
+                                        // `fenced_in_blockquote`. Covers a lazy
+                                        // line gobbled into the quote, whose
+                                        // indent arrives with no marker of its
+                                        // own to hang the strip off.
+                                        saw_blockquote_marker = false;
+                                    } else if saw_blockquote_marker {
                                         let ws = t.text();
                                         if let Some(stripped) = ws.strip_prefix(' ') {
                                             line_indent.push_str(stripped);
@@ -258,15 +315,24 @@ fn extract_code_block_parts(node: &SyntaxNode) -> (Option<SyntaxNode>, Option<St
                                     if at_line_start && t.text().is_empty() {
                                         continue;
                                     }
+                                    let mut text = t.text();
                                     if at_line_start {
-                                        line_content.push_str(&strip_indent_columns(
+                                        let (kept, budget) = strip_indent_columns_budget(
                                             &line_indent,
                                             base_indent_cols,
-                                        ));
+                                        );
+                                        // Only once the prefix token is fully
+                                        // spent does the rest of the budget
+                                        // reach the fence indent still sitting
+                                        // in this line's own text.
+                                        if kept.is_empty() && budget > 0 {
+                                            text = strip_leading_spaces_budget(text, budget);
+                                        }
+                                        line_content.push_str(kept);
                                         line_indent.clear();
                                         at_line_start = false;
                                     }
-                                    line_content.push_str(t.text());
+                                    line_content.push_str(text);
                                 }
                                 SyntaxKind::NEWLINE => {
                                     saw_blockquote_marker = false;

{panache_cli-3.2.0 → panache_cli-3.3.0}/crates/panache-formatter/src/formatter/core.rs

@@ -458,8 +458,12 @@ impl Formatter {
                 self.output.push_str(content_prefix);
                 if let Some(indent) = leading_indent
                     && !indent.is_empty()
-                    && !line.starts_with([' ', '\t'])
                 {
+                    // Uniformly, including lines that already start indented.
+                    // For a code block this indent is the opening fence's, and
+                    // the payload is rendered relative to the fence — re-adding
+                    // it to the fence lines alone would shift the payload two
+                    // columns down the fence and lose them on the next parse.
                     self.output.push_str(indent);
                 }
                 self.output.push_str(line);
@@ -1567,6 +1571,31 @@ impl Formatter {
                                 ctx.in_list_continuation = false;
                             }
                         }
+                        SyntaxKind::LINE_BLOCK => {
+                            // Format the line block to a temp buffer, then
+                            // re-emit each line behind the blockquote prefix.
+                            // Without this the lines escape the quote (dropping
+                            // the `>` prefix), which reparses as a top-level
+                            // line block -- a losslessness break, and inside a
+                            // list item an idempotency break as well.
+                            // `content_prefix` already carries `base_indent`,
+                            // so format at indent 0 to avoid double-indenting.
+                            let saved_output = self.output.clone();
+                            self.output.clear();
+                            self.format_node_sync(child, 0);
+                            let line_block_output = self.output.clone();
+                            self.output = saved_output;
+
+                            self.append_blockquote_prefixed_block(
+                                &line_block_output,
+                                &content_prefix,
+                                &blank_prefix,
+                                None,
+                            );
+                            if let Some(ctx) = self.blockquote_context.as_mut() {
+                                ctx.in_list_continuation = false;
+                            }
+                        }
                         SyntaxKind::DEFINITION_LIST => {
                             // Format the definition list to a temp buffer, then
                             // re-emit each line behind the blockquote prefix so
@@ -1962,6 +1991,12 @@ impl Formatter {
                     self.output.push('\n');
                 }
 
+                // Every emitted line needs the container indent. Dropping it
+                // lets a line block nested in a list item escape to column 0,
+                // where it reparses as a top-level line block that swallows
+                // the following line -- an idempotency break.
+                let line_indent = " ".repeat(indent);
+
                 // Format each line preserving line breaks and leading spaces.
                 // Walk LINE_BLOCK_LINE children-with-tokens so we can skip
                 // leading container-prefix tokens (WHITESPACE,
@@ -1970,11 +2005,19 @@ impl Formatter {
                 // outer LIST_ITEM / BLOCK_QUOTE walkers re-emit those
                 // prefixes; if we left them in `content` they'd appear
                 // twice in the output.
+                // A LINE_BLOCK_LINE without a LINE_BLOCK_MARKER is a
+                // continuation of the line above (`| a` + `  b` is the single
+                // line `a b`). Re-emitting it with its own `| ` would split
+                // one line into two, so fold it in — as pandoc's own writer
+                // does. Collect the rendered lines first so the fold is a
+                // plain append instead of surgery on `self.output`.
+                let mut rendered: Vec<String> = Vec::new();
                 for child in node.children() {
                     if child.kind() != SyntaxKind::LINE_BLOCK_LINE {
                         continue;
                     }
                     let mut content = String::new();
+                    let mut has_marker = false;
                     let mut past_prefix = false;
                     for elem in child.children_with_tokens() {
                         let kind = elem.kind();
@@ -1988,7 +2031,10 @@ impl Formatter {
                         }
                         past_prefix = true;
                         match kind {
-                            SyntaxKind::LINE_BLOCK_MARKER => continue,
+                            SyntaxKind::LINE_BLOCK_MARKER => {
+                                has_marker = true;
+                                continue;
+                            }
                             SyntaxKind::NEWLINE => break,
                             _ => match &elem {
                                 NodeOrToken::Token(t) => content.push_str(t.text()),
@@ -1996,14 +2042,32 @@ impl Formatter {
                             },
                         }
                     }
-                    let content_trimmed = content.trim();
-                    if content_trimmed.is_empty() {
+                    match rendered.last_mut() {
+                        Some(previous) if !has_marker => {
+                            let continuation = content.trim();
+                            if !continuation.is_empty() {
+                                if !previous.is_empty() {
+                                    previous.push(' ');
+                                }
+                                previous.push_str(continuation);
+                            }
+                        }
+                        // Leading spaces after the marker are significant
+                        // (pandoc renders them as non-breaking spaces), so
+                        // only the trailing side is trimmed.
+                        _ => rendered.push(content.trim_end().to_string()),
+                    }
+                }
+
+                for line in &rendered {
+                    self.output.push_str(&line_indent);
+                    if line.trim().is_empty() {
                         // Empty line block line - just output "|"
                         self.output.push('|');
                     } else {
                         // Normal line - output "| " followed by content
                         self.output.push_str("| ");
-                        self.output.push_str(content.trim_end());
+                        self.output.push_str(line);
                     }
                     self.output.push('\n');
                 }