panache-cli 3.6.0__tar.gz → 3.6.1__tar.gz

{panache_cli-3.6.0 → panache_cli-3.6.1}/Cargo.lock

@@ -447,9 +447,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
+checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
 
 [[package]]
 name = "email_address"
@@ -1203,7 +1203,7 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "panache"
-version = "3.6.0"
+version = "3.6.1"
 dependencies = [
  "annotate-snippets",
  "assert_cmd",
@@ -1248,7 +1248,7 @@ dependencies = [
 
 [[package]]
 name = "panache-formatter"
-version = "0.21.2"
+version = "0.21.3"
 dependencies = [
  "insta",
  "log",
@@ -1266,7 +1266,7 @@ dependencies = [
 
 [[package]]
 name = "panache-parser"
-version = "0.27.1"
+version = "0.27.2"
 dependencies = [
  "entities",
  "insta",

{panache_cli-3.6.0 → panache_cli-3.6.1}/Cargo.toml

@@ -10,7 +10,7 @@ authors = ["Johan Larsson <johan@jolars.co>"]
 
 [package]
 name = "panache"
-version = "3.6.0"
+version = "3.6.1"
 edition.workspace = true
 rust-version.workspace = true
 # `distill_quarto_schema` is a dev-only vendoring bin (src/bin/); keep bare
@@ -52,8 +52,8 @@ path = "src/main.rs"
 required-features = ["cli"]
 
 [dependencies]
-panache-formatter = { path = "crates/panache-formatter", version = "0.21.2" }
-panache-parser = { path = "crates/panache-parser", version = "0.27.1", features = [
+panache-formatter = { path = "crates/panache-formatter", version = "0.21.3" }
+panache-parser = { path = "crates/panache-parser", version = "0.27.2", features = [
     "serde",
     "schema",
 ] }

{panache_cli-3.6.0 → panache_cli-3.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: panache-cli
-Version: 3.6.0
+Version: 3.6.1
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -67,21 +67,20 @@ Panache is available from several sources:
 ### Install Script
 
 The installer scripts pick the right release artifact for your platform and
-install to a user-local directory by default. They are fetched from the latest
-release and then download the matching Panache CLI release asset. If you prefer,
-download and inspect the script before running it.
+install to a user-local directory by default. They download the matching Panache
+CLI release asset. If you prefer, download and inspect the script before running
+it.
 
 For macOS and Linux:
 
 ```sh
-curl --proto '=https' --tlsv1.2 -LsSf \
-    https://github.com/jolars/panache/releases/latest/download/panache-installer.sh | sh
+curl --proto '=https' --tlsv1.2 -sSf https://panache.bz/install | sh
 ```
 
 For Windows PowerShell:
 
 ```powershell
-powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://github.com/jolars/panache/releases/latest/download/panache-installer.ps1 | iex"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://panache.bz/install.ps1 | iex"
 ```
 
 Set `PANACHE_INSTALL_DIR` to change the destination and `PANACHE_TAG` to pin a
@@ -203,9 +202,14 @@ The list of LSP features supported by Panache includes, among others:
 
 Panache looks for a configuration in:
 
-1. `.panache.toml` or `panache.toml` in current directory or parent directories
-2. `$XDG_CONFIG_HOME/panache/config.toml` (usually
-   `~/.config/panache/config.toml`)
+1. An explicit `--config <path>`
+2. `.panache.toml`, `panache.toml`, or `.config/panache.toml` in the current
+   directory or a parent directory
+3. The user configuration directory:
+   - Linux: `$XDG_CONFIG_HOME/panache/config.toml` or
+     `~/.config/panache/config.toml`
+   - macOS: `~/Library/Application Support/panache/config.toml`
+   - Windows: `%APPDATA%\panache\config.toml`
 
 ### Example
 
@@ -236,8 +240,8 @@ julia = "fatou" # Enable Julia linting
 python = "ruff"
 ```
 
-See [examples/panache.toml](./examples/panache.toml) for a complete
-configuration reference.
+See [the configuration reference](https://panache.bz/guide/configuration) for a
+complete list of configuration options and their defaults.
 
 ## Integrations
 

{panache_cli-3.6.0 → panache_cli-3.6.1}/README.md

@@ -41,21 +41,20 @@ Panache is available from several sources:
 ### Install Script
 
 The installer scripts pick the right release artifact for your platform and
-install to a user-local directory by default. They are fetched from the latest
-release and then download the matching Panache CLI release asset. If you prefer,
-download and inspect the script before running it.
+install to a user-local directory by default. They download the matching Panache
+CLI release asset. If you prefer, download and inspect the script before running
+it.
 
 For macOS and Linux:
 
 ```sh
-curl --proto '=https' --tlsv1.2 -LsSf \
-    https://github.com/jolars/panache/releases/latest/download/panache-installer.sh | sh
+curl --proto '=https' --tlsv1.2 -sSf https://panache.bz/install | sh
 ```
 
 For Windows PowerShell:
 
 ```powershell
-powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://github.com/jolars/panache/releases/latest/download/panache-installer.ps1 | iex"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://panache.bz/install.ps1 | iex"
 ```
 
 Set `PANACHE_INSTALL_DIR` to change the destination and `PANACHE_TAG` to pin a
@@ -177,9 +176,14 @@ The list of LSP features supported by Panache includes, among others:
 
 Panache looks for a configuration in:
 
-1. `.panache.toml` or `panache.toml` in current directory or parent directories
-2. `$XDG_CONFIG_HOME/panache/config.toml` (usually
-   `~/.config/panache/config.toml`)
+1. An explicit `--config <path>`
+2. `.panache.toml`, `panache.toml`, or `.config/panache.toml` in the current
+   directory or a parent directory
+3. The user configuration directory:
+   - Linux: `$XDG_CONFIG_HOME/panache/config.toml` or
+     `~/.config/panache/config.toml`
+   - macOS: `~/Library/Application Support/panache/config.toml`
+   - Windows: `%APPDATA%\panache\config.toml`
 
 ### Example
 
@@ -210,8 +214,8 @@ julia = "fatou" # Enable Julia linting
 python = "ruff"
 ```
 
-See [examples/panache.toml](./examples/panache.toml) for a complete
-configuration reference.
+See [the configuration reference](https://panache.bz/guide/configuration) for a
+complete list of configuration options and their defaults.
 
 ## Integrations
 

{panache_cli-3.6.0 → panache_cli-3.6.1}/crates/panache-formatter/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.21.3](https://github.com/jolars/panache/compare/panache-formatter-v0.21.2...panache-formatter-v0.21.3) (2026-08-20)
+
+### Bug Fixes
+- **formatter:** keep trailing citations with sentences ([`9accb4f`](https://github.com/jolars/panache/commit/9accb4f5e7a7db2960ab5787d4be536a5e4b54fc)), fixes [#505](https://github.com/jolars/panache/issues/505)
+- **formatter:** compose embedded math environments ([`43a3b80`](https://github.com/jolars/panache/commit/43a3b801dd463d9f76f7bf759315d2f54f0b2061))
+- **formatter:** preserve starred math commands ([`8e73a5c`](https://github.com/jolars/panache/commit/8e73a5c2ab642d5268825f1c456b3ddd3b491f9c))
+- **formatter:** escape tildes contextually ([`74d82ad`](https://github.com/jolars/panache/commit/74d82ad309869a79d7b0ce96aed0ad0948ccac10)), fixes [#501](https://github.com/jolars/panache/issues/501)
+
+### Dependencies
+- updated crates/panache-parser to v0.27.2
+
 ## [0.21.2](https://github.com/jolars/panache/compare/panache-formatter-v0.21.1...panache-formatter-v0.21.2) (2026-08-20)
 
 ### Bug Fixes

{panache_cli-3.6.0 → panache_cli-3.6.1}/crates/panache-formatter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "panache-formatter"
-version = "0.21.2"
+version = "0.21.3"
 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.27.1" }
+panache-parser = { path = "../panache-parser", version = "0.27.2" }
 log = { version = "0.4.31", features = ["release_max_level_debug"] }
 rowan = "0.17.0"
 serde = { version = "1.0.228", features = ["derive"], optional = true }

panache_cli-3.6.1/crates/panache-formatter/src/formatter/blockquotes.rs

@@ -0,0 +1,306 @@
+use crate::config::WrapMode;
+use crate::formatter::Formatter;
+use crate::formatter::core::BlockquoteContext;
+use crate::formatter::preserve::{preserve_lines, preserve_lines_unprefixed};
+use crate::formatter::utils::is_block_element;
+use crate::syntax::{SyntaxKind, SyntaxNode};
+
+impl Formatter {
+    pub(super) fn format_block_quote(&mut self, node: &SyntaxNode, indent: usize) {
+        log::trace!("Formatting blockquote");
+        let depth = node
+            .ancestors()
+            .take_while(|ancestor| ancestor.kind() != SyntaxKind::LIST_ITEM)
+            .filter(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_QUOTE)
+            .count()
+            .max(1);
+
+        let base_indent = " ".repeat(indent);
+        let content_prefix = format!("{}{}", base_indent, "> ".repeat(depth)); // includes trailing space
+        let blank_prefix = content_prefix.trim_end().to_string(); // no trailing space
+
+        let wrap_mode = self.config.wrap.clone().unwrap_or(WrapMode::Reflow);
+        let blockquote_children: Vec<_> = node.children().collect();
+        let saved_blockquote_context = self.blockquote_context.clone();
+        self.blockquote_context = Some(BlockquoteContext {
+            in_list_continuation: false,
+        });
+
+        for child in &blockquote_children {
+            match child.kind() {
+                SyntaxKind::BLOCK_QUOTE_MARKER => continue,
+
+                SyntaxKind::PARAGRAPH | SyntaxKind::PLAIN => {
+                    let para_start = self.output.len();
+                    match wrap_mode {
+                        WrapMode::Preserve => {
+                            let escaped = self.config.formatter_extensions.escaped_line_breaks;
+                            for line in preserve_lines_unprefixed(child, escaped) {
+                                if line.is_empty() {
+                                    self.output.push_str(content_prefix.trim_end());
+                                } else {
+                                    self.output.push_str(&content_prefix);
+                                    self.output.push_str(&line);
+                                }
+                                self.output.push('\n');
+                            }
+                        }
+                        WrapMode::Reflow => {
+                            let width = self.config.line_width.saturating_sub(content_prefix.len());
+                            let lines = self.wrapped_lines_for_paragraph(child, width);
+                            for line in lines {
+                                self.output.push_str(&content_prefix);
+                                self.output.push_str(&line);
+                                self.output.push('\n');
+                            }
+                        }
+                        WrapMode::Sentence | WrapMode::Semantic => {
+                            let lines = if matches!(wrap_mode, WrapMode::Semantic) {
+                                self.semantic_lines_for_paragraph(child)
+                            } else {
+                                self.sentence_lines_for_paragraph(child)
+                            };
+                            for line in lines {
+                                self.output.push_str(&content_prefix);
+                                self.output.push_str(&line);
+                                self.output.push('\n');
+                            }
+                        }
+                    }
+                    self.guard_definition_marker_start(para_start, 0);
+                }
+                SyntaxKind::ALERT => {
+                    let marker = child
+                        .children_with_tokens()
+                        .filter_map(|item| item.into_token())
+                        .find(|tok| tok.kind() == SyntaxKind::ALERT_MARKER)
+                        .map(|tok| tok.text().to_string())
+                        .unwrap_or_else(|| "[!NOTE]".to_string());
+
+                    self.output.push_str(&content_prefix);
+                    self.output.push_str(&marker);
+                    self.output.push('\n');
+
+                    for alert_child in child.children() {
+                        match alert_child.kind() {
+                            SyntaxKind::PARAGRAPH => match wrap_mode {
+                                WrapMode::Preserve => {
+                                    let escaped =
+                                        self.config.formatter_extensions.escaped_line_breaks;
+                                    for line in preserve_lines(&alert_child, escaped) {
+                                        if line.is_empty() {
+                                            self.output.push_str(content_prefix.trim_end());
+                                        } else {
+                                            self.output.push_str(&content_prefix);
+                                            self.output.push_str(&line);
+                                        }
+                                        self.output.push('\n');
+                                    }
+                                }
+                                WrapMode::Reflow => {
+                                    let width =
+                                        self.config.line_width.saturating_sub(content_prefix.len());
+                                    for line in
+                                        self.wrapped_lines_for_paragraph(&alert_child, width)
+                                    {
+                                        self.output.push_str(&content_prefix);
+                                        self.output.push_str(&line);
+                                        self.output.push('\n');
+                                    }
+                                }
+                                WrapMode::Sentence | WrapMode::Semantic => {
+                                    let lines = if matches!(wrap_mode, WrapMode::Semantic) {
+                                        self.semantic_lines_for_paragraph(&alert_child)
+                                    } else {
+                                        self.sentence_lines_for_paragraph(&alert_child)
+                                    };
+                                    for line in lines {
+                                        self.output.push_str(&content_prefix);
+                                        self.output.push_str(&line);
+                                        self.output.push('\n');
+                                    }
+                                }
+                            },
+                            SyntaxKind::BLANK_LINE => {
+                                self.output.push_str(&blank_prefix);
+                                self.output.push('\n');
+                            }
+                            _ => {
+                                let rendered = self.render_to_buffer(
+                                    &alert_child,
+                                    indent,
+                                    content_prefix.len(),
+                                );
+                                self.append_blockquote_prefixed_nested_block(
+                                    &rendered,
+                                    &base_indent,
+                                    &content_prefix,
+                                    &blank_prefix,
+                                );
+                            }
+                        }
+                    }
+                }
+                SyntaxKind::BLANK_LINE => {
+                    self.output.push_str(&blank_prefix);
+                    self.output.push('\n');
+                }
+                SyntaxKind::HORIZONTAL_RULE => {
+                    self.output.push_str(&content_prefix);
+                    let available_width =
+                        self.config.line_width.saturating_sub(content_prefix.len());
+                    self.output
+                        .push_str(&self.horizontal_rule_text(available_width));
+                    self.output.push('\n');
+                }
+                SyntaxKind::HEADING => {
+                    let heading_text = self.format_heading(child);
+                    for line in heading_text.lines() {
+                        self.output.push_str(&content_prefix);
+                        self.output.push_str(line);
+                        self.output.push('\n');
+                    }
+                    if let Some(next) = child.next_sibling()
+                        && next.kind() != SyntaxKind::BLANK_LINE
+                        && is_block_element(next.kind())
+                    {
+                        self.output.push_str(&blank_prefix);
+                        self.output.push('\n');
+                    }
+                }
+                SyntaxKind::LIST => {
+                    let list_output = self.render_to_buffer(child, 0, content_prefix.len());
+
+                    let ends_in_list_continuation = self.append_blockquote_prefixed_list_output(
+                        &list_output,
+                        &base_indent,
+                        &content_prefix,
+                        &blank_prefix,
+                    );
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = ends_in_list_continuation;
+                    }
+                }
+                SyntaxKind::CODE_BLOCK => {
+                    let code_block_leading_indent = Self::code_block_leading_indent(child);
+                    let code_output = self.render_to_buffer(child, indent, 0);
+
+                    self.append_blockquote_prefixed_block(
+                        &code_output,
+                        &content_prefix,
+                        &blank_prefix,
+                        Some(&code_block_leading_indent),
+                    );
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = false;
+                    }
+                }
+                SyntaxKind::HTML_BLOCK
+                | SyntaxKind::HTML_BLOCK_RAW
+                | SyntaxKind::HTML_BLOCK_DIV => {
+                    let html_output = self.render_to_buffer(child, indent, 0);
+
+                    self.append_blockquote_prefixed_block(
+                        &html_output,
+                        &content_prefix,
+                        &blank_prefix,
+                        None,
+                    );
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = false;
+                    }
+                }
+                SyntaxKind::TEX_BLOCK => {
+                    let tex_output = self.render_to_buffer(child, indent, 0);
+
+                    self.append_blockquote_prefixed_block(
+                        &tex_output,
+                        &content_prefix,
+                        &blank_prefix,
+                        None,
+                    );
+                }
+                SyntaxKind::PIPE_TABLE
+                | SyntaxKind::GRID_TABLE
+                | SyntaxKind::SIMPLE_TABLE
+                | SyntaxKind::MULTILINE_TABLE => {
+                    let table_output = self.render_to_buffer(child, 0, 0);
+
+                    let min_indent = table_output
+                        .lines()
+                        .filter(|line| !line.trim().is_empty())
+                        .map(|line| line.len() - line.trim_start().len())
+                        .min()
+                        .unwrap_or(0);
+                    let dedented: String = table_output
+                        .lines()
+                        .map(|line| {
+                            if line.trim().is_empty() {
+                                String::new()
+                            } else {
+                                line[min_indent..].to_string()
+                            }
+                        })
+                        .collect::<Vec<_>>()
+                        .join("\n");
+
+                    self.append_blockquote_prefixed_block(
+                        &dedented,
+                        &content_prefix,
+                        &blank_prefix,
+                        None,
+                    );
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = false;
+                    }
+                }
+                SyntaxKind::LINE_BLOCK => {
+                    let line_block_output = self.render_to_buffer(child, 0, 0);
+
+                    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 => {
+                    let def_output = self.render_to_buffer(child, indent, 0);
+
+                    self.append_blockquote_prefixed_block(
+                        &def_output,
+                        &content_prefix,
+                        &blank_prefix,
+                        None,
+                    );
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = false;
+                    }
+                }
+                SyntaxKind::BLOCK_QUOTE => {
+                    self.format_node_sync(child, indent);
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = false;
+                    }
+                }
+                _ => {
+                    let rendered = self.render_to_buffer(child, 0, content_prefix.len());
+
+                    self.append_blockquote_prefixed_nested_block(
+                        &rendered,
+                        &base_indent,
+                        &content_prefix,
+                        &blank_prefix,
+                    );
+                    if let Some(ctx) = self.blockquote_context.as_mut() {
+                        ctx.in_list_continuation = false;
+                    }
+                }
+            }
+        }
+        self.blockquote_context = saved_blockquote_context;
+    }
+}