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

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

@@ -121,9 +121,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "badness-formatter"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3124da73e1d99986961f6e5ac369ff1bcc65a86f3f2de9f770011976b2160f9e"
+checksum = "b174164ae9bb3abaa0115a64ecb11a54cdee5c93c9104c1cdf2c5da282039d76"
 dependencies = [
  "badness-parser",
  "rowan 0.17.0",
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "badness-parser"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9818b1f73c3f4e17ef49d85f4ea26e143beefda5b6c524139ece958d5b5a1f67"
+checksum = "32b45795e07c88249e867c1f2dd84ca0d5d78062753fb5fa75c8eb1ece8e202b"
 dependencies = [
  "phf 0.14.0",
  "phf_codegen",
@@ -273,7 +273,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -418,9 +418,9 @@ checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06"
 
 [[package]]
 name = "defmt"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
+checksum = "e4a0795ac740cb54d7b3775c9c17345f6aaecf884c01733b39d6017738e0e3e1"
 dependencies = [
  "bitflags 1.3.2",
  "defmt-macros",
@@ -428,21 +428,21 @@ dependencies = [
 
 [[package]]
 name = "defmt-macros"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
+checksum = "840bb056bd99c495c9188198a258ab787c79f306d864db3e6e8451442d6d8366"
 dependencies = [
  "defmt-parser",
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "defmt-parser"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
+checksum = "71958f69fb2de856c5dd51ac9377e986ca1aa5919f931bf5395a807277f889a0"
 dependencies = [
  "thiserror",
 ]
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "errno"
@@ -1114,7 +1114,7 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "panache"
-version = "3.16.0"
+version = "3.17.0"
 dependencies = [
  "annotate-snippets",
  "assert_cmd",
@@ -1159,7 +1159,7 @@ dependencies = [
 
 [[package]]
 name = "panache-formatter"
-version = "0.27.1"
+version = "0.28.0"
 dependencies = [
  "badness-formatter",
  "insta",
@@ -1179,7 +1179,7 @@ dependencies = [
 
 [[package]]
 name = "panache-parser"
-version = "0.33.0"
+version = "0.34.0"
 dependencies = [
  "badness-parser",
  "entities",
@@ -1456,7 +1456,7 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1607,7 +1607,7 @@ checksum = "69dd77f86ec10e72e314f4ddf7c44c8d349e73cdff1aad524ba9668603fb0549"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1621,9 +1621,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a"
+checksum = "ab508826f74a77ca9d5aba6ff19b522583ee3eaf28a19384ff3d0e5835fadf6e"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -1634,14 +1634,14 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98c67716b46af2f0b8cf752abc930f6f9aecfbf671ecfb531db8a31dbe4e2ba"
+checksum = "e1c3a92094fa7d61aa124645844facb6b554dfc797136d0f5fd1f890e2bffc69"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1677,7 +1677,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1688,7 +1688,7 @@ checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1712,7 +1712,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1824,9 +1824,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.8"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01016da373cd8f7ef12624f796309f5c31ba8d646dd08856c02cd741d823c622"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1881,7 +1881,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -2077,7 +2077,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.8",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -2110,9 +2110,9 @@ dependencies = [
 
 [[package]]
 name = "wincode"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d4abae4bfc30e59d97d3ea4924e5c5e7fede946390bffbd52c076c081b87a6c"
+checksum = "063b5affe63fb4e584a33101d8808f01f2348b4f533db6223bf27263a0fdb9e9"
 dependencies = [
  "pastey",
  "proc-macro2",
@@ -2181,18 +2181,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.62"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86502bf56ac7c77571a32e2647bb2a15894565e981fb2a48d7bde2d91c965a9d"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.62"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5457206954b06561e2608c7e19cf58b1926586d999c246eebe4502f7e2039d1a"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
 dependencies = [
  "proc-macro2",
  "quote",

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

@@ -9,7 +9,7 @@ authors = ["Johan Larsson <johan@jolars.co>"]
 
 [package]
 name = "panache"
-version = "3.16.0"
+version = "3.17.0"
 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.27.1", features = [
+panache-formatter = { path = "crates/panache-formatter", version = "0.28.0", features = [
     "serde",
     "schema",
 ] }
-panache-parser = { path = "crates/panache-parser", version = "0.33.0", features = [
+panache-parser = { path = "crates/panache-parser", version = "0.34.0", features = [
     "serde",
     "schema",
 ] }

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

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

{panache_cli-3.16.0 → panache_cli-3.17.0}/build.rs

@@ -140,14 +140,14 @@ fn extract_field_list(block: &str, field: &str) -> Option<Vec<String>> {
     let marker_slice = format!("{field}: &[");
     if let Some(start) = block.find(&marker_slice) {
         let after = &block[start + marker_slice.len()..];
-        let end = after.find("],")?;
+        let end = after.find(']')?;
         return Some(extract_quoted_strings(&after[..end]));
     }
 
     let marker_vec = format!("{field}: vec![");
     let start = block.find(&marker_vec)?;
     let after = &block[start + marker_vec.len()..];
-    let end = after.find("],")?;
+    let end = after.find(']')?;
     Some(extract_quoted_strings(&after[..end]))
 }
 

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

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.28.0](https://github.com/jolars/panache/compare/panache-formatter-v0.27.1...panache-formatter-v0.28.0) (2026-10-16)
+
+### Features
+
+- add Hugo flavor and syntax preservation (#570) ([`7247d79`](https://github.com/jolars/panache/commit/7247d79e8b78f74404fc1f258d89bcf5fe382f91)), closes [#558](https://github.com/jolars/panache/issues/558)
+
+### Bug Fixes
+
+- preserve definition bodies when formatting ([`4e95495`](https://github.com/jolars/panache/commit/4e95495554b9b832279b117562bbbdb9c9e2f463)), fixes [#576](https://github.com/jolars/panache/issues/576)
+- **formatter:** normalize unnumbered headings ([`4fe2f30`](https://github.com/jolars/panache/commit/4fe2f308b5e3d8a8c0e7571228ff1465172f748a)), closes [#463](https://github.com/jolars/panache/issues/463)
+- **parser:** start HTML blocks after list markers ([`598fd82`](https://github.com/jolars/panache/commit/598fd82deaa627a1a9a76694a8900a2b2e0f736d)), fixes [#559](https://github.com/jolars/panache/issues/559)
+- **parser:** require paragraph context for lazy list lines ([`a39a6e7`](https://github.com/jolars/panache/commit/a39a6e7d10437c69421b67cd0e276ff52bf89afe)), fixes [#561](https://github.com/jolars/panache/issues/561)
+- **parser:** retain blocks after empty list markers ([`f6d117b`](https://github.com/jolars/panache/commit/f6d117becbf668b6ce4ee1f92643068d64300094)), fixes [#560](https://github.com/jolars/panache/issues/560)
+- **parser:** detect HTML blocks at a nested list item's content column (#566) ([`d271057`](https://github.com/jolars/panache/commit/d27105781a8d103a2383ab5e09661435531cf0df))
+
+### Dependencies
+
+- updated crates/panache-parser to v0.34.0
+
 ## [0.27.1](https://github.com/jolars/panache/compare/panache-formatter-v0.27.0...panache-formatter-v0.27.1) (2026-10-12)
 
 ### Dependencies

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

@@ -1,6 +1,6 @@
 [package]
 name = "panache-formatter"
-version = "0.27.1"
+version = "0.28.0"
 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.33.0" }
+panache-parser = { path = "../panache-parser", version = "0.34.0" }
 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.0"
+badness-formatter = "=0.10.2"
 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.16.0 → panache_cli-3.17.0}/crates/panache-formatter/src/formatter/blockquotes.rs

@@ -154,7 +154,7 @@ impl Formatter {
                     self.output.push('\n');
                 }
                 SyntaxKind::HEADING => {
-                    let heading_text = self.format_heading(child);
+                    let heading_text = self.format_heading(child, 0);
                     for line in heading_text.lines() {
                         self.output.push_str(&content_prefix);
                         self.output.push_str(line);
@@ -210,6 +210,16 @@ impl Formatter {
                         ctx.in_list_continuation = false;
                     }
                 }
+                SyntaxKind::HUGO_SHORTCODE_BLOCK => {
+                    let rendered = crate::syntax::text_without_line_prefixes(child);
+                    for line in rendered.split_inclusive('\n') {
+                        self.output.push_str(&content_prefix);
+                        self.output.push_str(line);
+                    }
+                    if !self.output.ends_with('\n') {
+                        self.output.push('\n');
+                    }
+                }
                 SyntaxKind::TEX_BLOCK => {
                     let tex_output = self.render_to_buffer(child, indent, 0);
 

{panache_cli-3.16.0 → panache_cli-3.17.0}/crates/panache-formatter/src/formatter/blocks.rs

@@ -1,5 +1,5 @@
 use crate::config::WrapMode;
-use crate::formatter::preserve::preserve_lines_normalized;
+use crate::formatter::preserve::{preserve_lines_normalized, preserve_lines_unprefixed_normalized};
 use crate::formatter::smart::normalize_smart_punctuation;
 use crate::formatter::utils::is_block_element;
 use crate::formatter::{Formatter, paragraphs};
@@ -217,20 +217,29 @@ impl Formatter {
             && !self.output.ends_with(":   ");
         match wrap_mode {
             WrapMode::Preserve => {
-                for (i, line) in preserve_lines_normalized(node, &self.config)
-                    .iter()
-                    .enumerate()
-                {
+                let in_definition = self.output.ends_with(":   ");
+                let lines = if in_definition {
+                    // The normalized marker sets a new content column, so
+                    // rebuild container indentation around opaque payloads.
+                    preserve_lines_unprefixed_normalized(node, &self.config)
+                } else {
+                    preserve_lines_normalized(node, &self.config)
+                };
+                for (i, line) in lines.iter().enumerate() {
                     if needs_indent {
                         self.output.push_str(&" ".repeat(indent));
                     } else if i > 0 {
                         self.output.push('\n');
+                        if in_definition {
+                            self.output.push_str(&" ".repeat(indent));
+                        }
                     }
-                    self.output.push_str(if needs_indent {
-                        paragraphs::trim_prose_indent(node, line)
-                    } else {
-                        line
-                    });
+                    self.output
+                        .push_str(if needs_indent || (in_definition && i > 0) {
+                            paragraphs::trim_prose_indent(node, line)
+                        } else {
+                            line
+                        });
                     if needs_indent {
                         self.output.push('\n');
                     }

{panache_cli-3.16.0 → panache_cli-3.17.0}/crates/panache-formatter/src/formatter/containers.rs

@@ -1,7 +1,7 @@
 use crate::config::WrapMode;
 use crate::formatter::Formatter;
 use crate::formatter::paragraphs::trim_prose_indent;
-use crate::formatter::preserve::preserve_lines_normalized;
+use crate::formatter::preserve::preserve_lines_unprefixed_normalized;
 use crate::syntax::{SyntaxKind, SyntaxNode};
 use rowan::NodeOrToken;
 
@@ -64,10 +64,12 @@ impl Formatter {
                     let para_start = self.output.len();
                     let available_width = self.config.line_width.saturating_sub(child_indent);
                     let lines = match wrap_mode {
-                        WrapMode::Preserve => preserve_lines_normalized(child, &self.config)
-                            .iter()
-                            .map(|line| trim_prose_indent(child, line).to_string())
-                            .collect(),
+                        WrapMode::Preserve => {
+                            preserve_lines_unprefixed_normalized(child, &self.config)
+                                .iter()
+                                .map(|line| trim_prose_indent(child, line).to_string())
+                                .collect()
+                        }
                         WrapMode::Reflow => {
                             self.wrapped_lines_for_paragraph(child, available_width)
                         }
@@ -142,7 +144,9 @@ impl Formatter {
                     let rest_width = self.config.line_width.saturating_sub(child_indent);
                     let widths = [first_width, rest_width];
                     let lines = match wrap_mode {
-                        WrapMode::Preserve => preserve_lines_normalized(child, &self.config),
+                        WrapMode::Preserve => {
+                            preserve_lines_unprefixed_normalized(child, &self.config)
+                        }
                         WrapMode::Reflow => {
                             self.wrapped_lines_for_paragraph_with_widths(child, &widths)
                         }
@@ -180,7 +184,7 @@ impl Formatter {
                     let available_width = self.config.line_width.saturating_sub(child_indent);
                     match wrap_mode {
                         WrapMode::Preserve => {
-                            for line in preserve_lines_normalized(child, &self.config) {
+                            for line in preserve_lines_unprefixed_normalized(child, &self.config) {
                                 self.output.push_str(&" ".repeat(child_indent));
                                 self.output.push_str(trim_prose_indent(child, &line));
                                 self.output.push('\n');

{panache_cli-3.16.0 → panache_cli-3.17.0}/crates/panache-formatter/src/formatter/core.rs

@@ -1,6 +1,8 @@
 use crate::config::{Config, HorizontalRuleStyle, WrapMode};
 use crate::directives::DirectiveTracker;
-use crate::syntax::{ExampleListMarker, SyntaxKind, SyntaxNode};
+use crate::syntax::{
+    AstNode, Definition, ExampleListMarker, ListItem, SyntaxKind, SyntaxNode, TomlMetadata,
+};
 use panache_parser::parser::blocks::definition_lists::try_parse_definition_marker;
 use panache_parser::parser::blocks::headings::try_parse_atx_heading;
 use panache_parser::parser::blocks::horizontal_rules::try_parse_horizontal_rule;
@@ -63,6 +65,18 @@ impl Formatter {
     }
     pub fn format(mut self, node: &SyntaxNode) -> String {
         self.format_node_sync(node, 0);
+        if node.kind() == SyntaxKind::DOCUMENT {
+            // An unfinished opaque block owns the document's final whitespace.
+            let preserve_ending = node
+                .children()
+                .last()
+                .and_then(TomlMetadata::cast)
+                .is_some_and(|metadata| !metadata.is_closed());
+            if !preserve_ending {
+                self.output.truncate(self.output.trim_end().len());
+                self.output.push('\n');
+            }
+        }
         self.output
     }
 
@@ -143,8 +157,13 @@ impl Formatter {
         )
     }
 
-    pub(super) fn format_heading(&self, node: &SyntaxNode) -> String {
-        headings::format_heading(node, &self.config)
+    pub(super) fn format_heading(&self, node: &SyntaxNode, continuation_indent: usize) -> String {
+        let heading = headings::format_heading(node, &self.config);
+        if continuation_indent == 0 || !heading.contains('\n') {
+            heading
+        } else {
+            heading.replace('\n', &format!("\n{}", " ".repeat(continuation_indent)))
+        }
     }
 
     pub(super) fn contains_latex_command(&self, node: &SyntaxNode) -> bool {
@@ -409,7 +428,7 @@ impl Formatter {
         let indent_str = " ".repeat(indent);
 
         let strip_content_columns = (!is_fenced)
-            .then(|| Self::container_content_offset(node))
+            .then(|| self.container_content_offset(node))
             .filter(|cols| *cols > 0);
         self.format_container_code_block(
             node,
@@ -434,13 +453,13 @@ impl Formatter {
     /// `list_item_content_offset` in the pandoc-native projector
     /// (`panache_parser::to_pandoc_ast`); the two must agree on what a code
     /// block's payload is.
-    pub(super) fn container_content_offset(node: &SyntaxNode) -> usize {
+    pub(super) fn container_content_offset(&self, node: &SyntaxNode) -> usize {
         let Some(parent) = node.parent() else {
             return 0;
         };
         match parent.kind() {
             SyntaxKind::DEFINITION => {
-                Self::marker_content_offset(&parent, SyntaxKind::DEFINITION_MARKER)
+                self.marker_content_offset(&parent, SyntaxKind::DEFINITION_MARKER)
             }
             SyntaxKind::LIST_ITEM => {
                 let parent_ws = match parent.prev_sibling_or_token() {
@@ -449,28 +468,41 @@ impl Formatter {
                     }
                     _ => 0,
                 };
-                parent_ws + Self::marker_content_offset(&parent, SyntaxKind::LIST_MARKER)
+                parent_ws + self.marker_content_offset(&parent, SyntaxKind::LIST_MARKER)
             }
             _ => 0,
         }
     }
 
-    fn marker_content_offset(container: &SyntaxNode, marker: SyntaxKind) -> usize {
+    fn marker_content_offset(&self, container: &SyntaxNode, marker: SyntaxKind) -> usize {
         let mut col = 0usize;
         let mut saw_marker = false;
+        let mut marker_end_col = 0usize;
         for el in container.children_with_tokens() {
             match el {
                 NodeOrToken::Token(t) if t.kind() == marker => {
                     col = Self::advance_col(col, t.text());
+                    marker_end_col = col;
                     saw_marker = true;
                 }
                 NodeOrToken::Token(t) if t.kind() == SyntaxKind::WHITESPACE => {
                     col = Self::advance_col(col, t.text());
-                    if saw_marker {
-                        return col;
+                }
+                el if saw_marker => {
+                    let first_token = match el {
+                        NodeOrToken::Token(t) => Some(t),
+                        NodeOrToken::Node(n) => n.first_token(),
+                    };
+                    // Empty CommonMark markers have one logical space of
+                    // padding even when their source padding differs.
+                    if marker == SyntaxKind::LIST_MARKER
+                        && self.config.dialect() == panache_parser::Dialect::CommonMark
+                        && first_token.is_some_and(|t| t.kind() == SyntaxKind::NEWLINE)
+                    {
+                        return marker_end_col + 1;
                     }
+                    return col;
                 }
-                _ if saw_marker => return col,
                 _ => {}
             }
         }
@@ -587,17 +619,13 @@ impl Formatter {
             let trimmed_line = line.trim_start();
             let starts_with_list_marker = Self::starts_with_list_marker(trimmed_line)
                 && !tables::is_partial_grid_separator(trimmed_line);
-            if trimmed_line.is_empty() {
+            // Rendered blank lines are empty. Whitespace in nonempty lines
+            // can belong to an opaque payload and must survive re-prefixing.
+            if line.is_empty() {
                 self.output.push_str(blank_prefix);
                 in_list_item_continuation = false;
             } else if line.starts_with("> ") {
                 let trimmed_rest = line.trim_start_matches("> ").trim_start();
-                if trimmed_rest.is_empty() {
-                    self.output.push_str(blank_prefix);
-                    in_list_item_continuation = false;
-                    self.output.push('\n');
-                    continue;
-                }
                 self.output.push_str(base_indent);
                 self.output.push_str(line);
                 in_list_item_continuation = Self::starts_with_list_marker(trimmed_rest)
@@ -799,7 +827,18 @@ impl Formatter {
             SyntaxKind::FOOTNOTE_DEFINITION => self.format_footnote_definition(node, indent),
 
             SyntaxKind::HTML_BLOCK | SyntaxKind::HTML_BLOCK_RAW | SyntaxKind::HTML_BLOCK_DIV => {
-                self.format_html_block(node)
+                // Continuation HTML must move with its container's content
+                // column so it cannot detach the blocks that follow it.
+                let continues_container = node.parent().is_some_and(|parent| {
+                    ListItem::can_cast(parent.kind()) || Definition::can_cast(parent.kind())
+                }) && node
+                    .first_token()
+                    .and_then(|token| token.prev_token())
+                    .is_some_and(|prev| prev.text().ends_with('\n'));
+                let reindent = continues_container
+                    .then(|| (self.container_content_offset(node), indent))
+                    .filter(|(from, to)| from != to);
+                self.format_html_block_reindented(node, reindent)
             }
             SyntaxKind::COMMENT => self.format_comment(node),
             SyntaxKind::LATEX_COMMAND => self.format_latex_command(node),
@@ -872,7 +911,22 @@ impl Formatter {
             SyntaxKind::MYST_TARGET
             | SyntaxKind::MYST_COMMENT
             | SyntaxKind::MYST_BLOCK_BREAK
-            | SyntaxKind::SVELTE_BLOCK => self.format_raw_block(node),
+            | SyntaxKind::SVELTE_BLOCK
+            | SyntaxKind::TOML_METADATA => self.format_raw_block(node),
+
+            SyntaxKind::HUGO_SHORTCODE_BLOCK => {
+                let text = crate::syntax::text_without_line_prefixes(node);
+                for line in text.split_inclusive('\n') {
+                    if indent > 0 && (self.output.is_empty() || self.output.ends_with('\n')) {
+                        self.output.push_str(&" ".repeat(indent));
+                    }
+                    self.output.push_str(line);
+                }
+                if !self.output.ends_with('\n') {
+                    self.output.push('\n');
+                }
+                self.consecutive_blank_lines = 0;
+            }
 
             _ => {
                 self.output.push_str(&node.text().to_string());
@@ -884,11 +938,9 @@ impl Formatter {
 /// Rewrite a Pandoc `{...}` attribute block in canonical form: id first, then
 /// classes in source order, then key/value pairs with quoted values.
 ///
-/// Components are rendered from their *source* slices rather than from derived
-/// semantics, so a bare `-` (pandoc's shorthand for `.unnumbered`) survives as
-/// `-` instead of being expanded — the shorthand is the preferred spelling in
-/// non-English documents, and expanding it would rewrite the author's source.
-pub(super) fn normalize_attribute_text(attr_text: &str) -> String {
+/// Expand bare `-` components only for headings in Pandoc-derived flavors;
+/// other dialects can treat them as literal text rather than a class.
+pub(super) fn normalize_attribute_text(attr_text: &str, expand_unnumbered: bool) -> String {
     let Some(inner) = attr_text
         .strip_prefix('{')
         .and_then(|s| s.strip_suffix('}'))
@@ -905,6 +957,7 @@ pub(super) fn normalize_attribute_text(attr_text: &str) -> String {
     for comp in &spans.components {
         match comp {
             AttrComponent::Id(r) => id = inner[r.clone()].to_string(),
+            AttrComponent::Unnumbered(_) if expand_unnumbered => classes.push(".unnumbered"),
             AttrComponent::Class(r) | AttrComponent::Unnumbered(r) => {
                 classes.push(&inner[r.clone()])
             }