panache-cli 3.17.1__tar.gz → 3.18.0__tar.gz

{panache_cli-3.17.1 → panache_cli-3.18.0}/Cargo.lock

@@ -121,9 +121,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "badness-formatter"
-version = "0.10.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b174164ae9bb3abaa0115a64ecb11a54cdee5c93c9104c1cdf2c5da282039d76"
+checksum = "bc7954f6b8f0fb0571f4a7a933288e2c92a80309298d6b0686b68e3102c3a2dc"
 dependencies = [
  "badness-parser",
  "rowan 0.17.0",
@@ -131,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "badness-parser"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b45795e07c88249e867c1f2dd84ca0d5d78062753fb5fa75c8eb1ece8e202b"
+checksum = "59890aa9f05b632ce68b2cf5d1efaba0726a9e3afc76ea2df8a7c1aab5fec8b1"
 dependencies = [
  "phf 0.14.0",
  "phf_codegen",
@@ -294,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "clapdown"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68bcefa13c36a119d957224c65214f792139033a34f8157297ac2a7fff5a343a"
+checksum = "b247c825c52bf1a125ed92810ee82340e304938d4162683c4c4af2fe5e205748"
 dependencies = [
  "clap",
 ]
@@ -557,9 +557,9 @@ dependencies = [
 
 [[package]]
 name = "fancy-regex"
-version = "0.19.2"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d301f5bf187b3c295fce6468d3875037a0bccc5f6b151c63cac2f85babf21912"
+checksum = "7b32c6266c2b14b0db7aa3409d3ee3f0ddda3b1d0279c4ba24fbec18af81d90e"
 dependencies = [
  "bit-set",
  "regex-automata",
@@ -574,9 +574,9 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "flate2"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
+checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -679,9 +679,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988"
+checksum = "f98b0d85522dc0a824cfebbc9594ff4a9b289c568bea0370319dfbdf20ccdd2d"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -736,9 +736,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "ignore"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f"
+checksum = "484be5657551d7868d67587df967fb4fcbe9d266a761cc855aaa148fda0b3cc7"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -850,9 +850,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.59.0"
+version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b320ad34c177093d21622edc9215bb608294c2333ff296672c0c8265a5ee60c"
+checksum = "e1324c9bebe052584e96e7c80d2f9cf2d86e1a6d83d621a46932c5636996be18"
 dependencies = [
  "ahash",
  "bytecount",
@@ -878,23 +878,24 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.59.0"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1472f7be79026f79e01a9b172263311e829d7c210d57b39cb57037abc0ce0500"
+checksum = "84cdf272371326ec8db8ce2608a52635d8edeeaf0189604e2ad627327b79e6db"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.59.0"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7550a7a84787e715ead0b47e01fa8c6bb7c3413630f91a8f2094c06c2078a"
+checksum = "e5e4a7f3b3c19c9cd2aa37937e1704229a0bcb1b446308a148574d56ace0c6ba"
 dependencies = [
  "ahash",
  "bytecount",
  "fraction",
  "getrandom 0.3.4",
+ "memchr",
  "num-cmp",
  "num-traits",
  "serde_json",
@@ -933,9 +934,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
+checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c"
 
 [[package]]
 name = "lsp-server"
@@ -1114,7 +1115,7 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "panache"
-version = "3.17.1"
+version = "3.18.0"
 dependencies = [
  "annotate-snippets",
  "assert_cmd",
@@ -1159,7 +1160,7 @@ dependencies = [
 
 [[package]]
 name = "panache-formatter"
-version = "0.28.1"
+version = "0.29.0"
 dependencies = [
  "badness-formatter",
  "insta",
@@ -1179,7 +1180,7 @@ dependencies = [
 
 [[package]]
 name = "panache-parser"
-version = "0.34.1"
+version = "0.35.0"
 dependencies = [
  "badness-parser",
  "entities",
@@ -1461,9 +1462,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.59.0"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473f4dcca28ead7ee0f8e5b5d0bbae2549f4fc4c958fb20af328961b6c174be3"
+checksum = "eba9bfd41f0d7d8fbf9c7ed23b788a3f97e9f5d9419be812ff7e08b8dc6b14ec"
 dependencies = [
  "ahash",
  "fluent-uri 0.4.1",
@@ -1717,9 +1718,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"
+checksum = "9c187e0a369471c550af028cba56d4f4fa2a489ad28151ae95a4d340a2a8b782"
 dependencies = [
  "serde_core",
 ]
@@ -1770,9 +1771,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.16.4"
+version = "1.16.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
+checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46"
 
 [[package]]
 name = "smol_str"
@@ -1892,9 +1893,9 @@ checksum = "650d82e943da333637be9f1567d33d605e76810a26464edfd7ae74f7ef181e95"
 
 [[package]]
 name = "toml"
-version = "1.1.8+spec-1.1.0"
+version = "1.2.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"
+checksum = "d5755c51863cdac711f1956baf8eb9588e060755f7d3c4c979e70ea1e1f32cd7"
 dependencies = [
  "indexmap",
  "serde_core",
@@ -1907,9 +1908,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
+checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49"
 dependencies = [
  "serde_core",
 ]
@@ -1925,9 +1926,9 @@ dependencies = [
 
 [[package]]
 name = "toml_writer"
-version = "1.1.3+spec-1.1.0"
+version = "1.2.0+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"
+checksum = "009dbb7700f11c55ef83aebbe4c0e9cf1f1ac0844bd8d6f00dc38f302026e13a"
 
 [[package]]
 name = "tracing"
@@ -1974,9 +1975,9 @@ checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557"
 
 [[package]]
 name = "utf8parse"
@@ -1986,9 +1987,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.29.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
+checksum = "4a06f08a856b009bc7bbaf7d3e79808595d032dd19074c0c2ef26e49e03e6bdc"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",

{panache_cli-3.17.1 → panache_cli-3.18.0}/Cargo.toml

@@ -9,7 +9,7 @@ authors = ["Johan Larsson <johan@jolars.co>"]
 
 [package]
 name = "panache"
-version = "3.17.1"
+version = "3.18.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.28.1", features = [
+panache-formatter = { path = "crates/panache-formatter", version = "0.29.0", features = [
     "serde",
     "schema",
 ] }
-panache-parser = { path = "crates/panache-parser", version = "0.34.1", features = [
+panache-parser = { path = "crates/panache-parser", version = "0.35.0", 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.59.0", default-features = false }
+jsonschema = { version = "0.61.0", 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.1"
 flate2 = "1.1.9"
 
 [package.metadata.deb]

{panache_cli-3.17.1 → panache_cli-3.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: panache-cli
-Version: 3.17.1
+Version: 3.18.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -26,17 +26,15 @@ Project-URL: Repository, https://github.com/jolars/panache
 
 # Panache <img src='https://raw.githubusercontent.com/jolars/panache/refs/heads/main/images/logo.png' align="right" width="139" />
 
-[![Build and
-Test](https://github.com/jolars/panache/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/jolars/panache/actions/workflows/build-and-test.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/jolars/panache/build-and-test.yml?branch=main&label=CI)](https://github.com/jolars/panache/actions/workflows/build-and-test.yml)
 [![Crates.io](https://img.shields.io/crates/v/panache.svg?logo=rust)](https://crates.io/crates/panache)
 [![Open
 VSX](https://img.shields.io/open-vsx/v/jolars/panache?logo=vsix)](https://open-vsx.org/extension/jolars/panache)
 [![VS
 Code](https://vsmarketplacebadges.dev/version-short/jolars.panache.svg?logo=vsix)](https://marketplace.visualstudio.com/items?itemName=jolars.panache)
-[![PyPI
-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)
+[![PyPi](https://img.shields.io/pypi/v/panache-cli?logo=python&label=PyPi)](https://badge.fury.io/py/panache-cli)
+[![npm](https://img.shields.io/npm/v/@panache-cli/panache?logo=npm&label=npm)](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 +335,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.1 → panache_cli-3.18.0}/README.md

@@ -1,16 +1,14 @@
 # Panache <img src='https://raw.githubusercontent.com/jolars/panache/refs/heads/main/images/logo.png' align="right" width="139" />
 
-[![Build and
-Test](https://github.com/jolars/panache/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/jolars/panache/actions/workflows/build-and-test.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/jolars/panache/build-and-test.yml?branch=main&label=CI)](https://github.com/jolars/panache/actions/workflows/build-and-test.yml)
 [![Crates.io](https://img.shields.io/crates/v/panache.svg?logo=rust)](https://crates.io/crates/panache)
 [![Open
 VSX](https://img.shields.io/open-vsx/v/jolars/panache?logo=vsix)](https://open-vsx.org/extension/jolars/panache)
 [![VS
 Code](https://vsmarketplacebadges.dev/version-short/jolars.panache.svg?logo=vsix)](https://marketplace.visualstudio.com/items?itemName=jolars.panache)
-[![PyPI
-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)
+[![PyPi](https://img.shields.io/pypi/v/panache-cli?logo=python&label=PyPi)](https://badge.fury.io/py/panache-cli)
+[![npm](https://img.shields.io/npm/v/@panache-cli/panache?logo=npm&label=npm)](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 +308,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.1 → panache_cli-3.18.0}/build.rs

@@ -1,6 +1,7 @@
 use clap::CommandFactory;
 use clap_complete::{Shell, generate_to};
 use clap_mangen::Man;
+use clap_mangen::roff::{Roff, roman};
 use std::env;
 use std::fs;
 use std::io::Result;
@@ -352,6 +353,38 @@ fn format_see_also(refs: &[String]) -> String {
     format!(".SH \"SEE ALSO\"\n{}\n", formatted.join(", "))
 }
 
+fn render_man_directives(help: &str) -> Result<String> {
+    let (title, body) = help.split_once("\n\n").unwrap_or((help, ""));
+    let mut roff = Roff::default();
+    let title = title.trim_end_matches(':').to_ascii_uppercase();
+    roff.control("SH", [title.as_str()]);
+
+    // The shared help uses indented Markdown examples, which need no-fill mode
+    // in man pages to preserve the spacing the directives are meant to protect.
+    for paragraph in body.split("\n\n") {
+        roff.control("PP", []);
+        let is_example = paragraph.lines().all(|line| line.starts_with("    "));
+        if is_example {
+            roff.control("RS", ["4"]);
+            roff.control("nf", []);
+        }
+        for line in paragraph.lines() {
+            let line = if is_example { &line[4..] } else { line };
+            roff.text([roman(line)]);
+        }
+        if is_example {
+            roff.control("fi", []);
+            roff.control("RE", []);
+        }
+    }
+
+    let mut buffer = Vec::new();
+    roff.to_writer(&mut buffer)?;
+    Ok(String::from_utf8_lossy(&buffer)
+        .trim_start_matches(Roff::default().render().as_str())
+        .to_owned())
+}
+
 fn generate_man_pages() -> Result<()> {
     // Create man directory if it doesn't exist
     let out_dir = PathBuf::from("target/man");
@@ -387,8 +420,22 @@ fn generate_man_pages() -> Result<()> {
         let mut buffer = Vec::new();
         man.render(&mut buffer)?;
 
+        let mut content = String::from_utf8_lossy(&buffer).into_owned();
+        if matches!(subcommand_name, "format" | "lint")
+            && let Some(help) = subcommand.get_after_long_help()
+        {
+            let mut extra = Vec::new();
+            man.render_extra_section(&mut extra)?;
+            // Standalone section renders include the preamble from the full page.
+            content = content.replacen(
+                String::from_utf8_lossy(&extra)
+                    .trim_start_matches(Roff::default().render().as_str()),
+                &render_man_directives(&help.to_string())?,
+                1,
+            );
+        }
+
         // Post-process: fix NAME, SYNOPSIS, and nested subcommand references
-        let content = String::from_utf8_lossy(&buffer);
         let fixed_content = content
             .replace(
                 &format!("{} \\-", subcommand_name),
@@ -399,8 +446,8 @@ fn generate_man_pages() -> Result<()> {
                 &format!("\\fBpanache {}\\fR", subcommand_name),
             )
             .replace(
-                &format!("{}\\-", subcommand_name),
-                &format!("panache\\-{}\\-", subcommand_name),
+                &format!("\n{}\\-", subcommand_name),
+                &format!("\npanache\\-{}\\-", subcommand_name),
             );
 
         // SEE ALSO: panache(1) plus sibling subcommand pages

{panache_cli-3.17.1 → panache_cli-3.18.0}/crates/panache-formatter/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.29.0](https://github.com/jolars/panache/compare/panache-formatter-v0.28.2...panache-formatter-v0.29.0) (2026-11-11)
+
+### Features
+
+- **cli:** add inspect command ([`1545ef4`](https://github.com/jolars/panache/commit/1545ef4f77e299104c504434170a3fa556579e4d)), closes [#601](https://github.com/jolars/panache/issues/601)
+- **formatter:** preserve punctuation by default ([`ca09ecc`](https://github.com/jolars/panache/commit/ca09ecc46f86a56554d345b3abe3a61b75fe28dd)), ref [#605](https://github.com/jolars/panache/issues/605) and [#607](https://github.com/jolars/panache/issues/607)
+- **formatter:** add smart punctuation modes ([`38c161e`](https://github.com/jolars/panache/commit/38c161ee428a27813bfcd7bc7c8530f49c3540df)), closes [#605](https://github.com/jolars/panache/issues/605), ref [#607](https://github.com/jolars/panache/issues/607)
+
+### Bug Fixes
+
+- don’t apply `smart` transform to raw/code inline (#610) ([`15502cc`](https://github.com/jolars/panache/commit/15502ccd2f3339c7de218de8875016d2fd75429a))
+- **formatter:** preserve list block separators ([`fd9dbf4`](https://github.com/jolars/panache/commit/fd9dbf4c945296f4e38af94ae0e0d301d679092b)), fixes [#602](https://github.com/jolars/panache/issues/602)
+- **formatter:** trim excess pipe table padding ([`d77e076`](https://github.com/jolars/panache/commit/d77e076b58f5a90e574e82366ebede92b137e4f3)), fixes [#599](https://github.com/jolars/panache/issues/599)
+- **formatter:** keep `et al.` together ([`a5bb5e1`](https://github.com/jolars/panache/commit/a5bb5e11301bb373a2034f3ec3362dd258e50b42)), closes [#593](https://github.com/jolars/panache/issues/593)
+
+### Dependencies
+
+- updated crates/panache-parser to v0.35.0
+
+## [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

{panache_cli-3.17.1 → panache_cli-3.18.0}/crates/panache-formatter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "panache-formatter"
-version = "0.28.1"
+version = "0.29.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.34.1" }
+panache-parser = { path = "../panache-parser", version = "0.35.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.2"
+badness-formatter = "=0.12.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.1 → panache_cli-3.18.0}/crates/panache-formatter/src/config.rs

@@ -110,6 +110,28 @@ pub enum HorizontalRuleStyle {
     Compact,
 }
 
+/// Source spelling of punctuation in prose.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "lowercase"))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub enum SmartPunctuation {
+    /// Leave punctuation as written.
+    #[default]
+    Preserve,
+    /// Write straight quotes with `smart` or `smart-quotes`, and `--`, `---`,
+    /// and `...` with `smart`. Preserve punctuation otherwise.
+    Ascii,
+    /// Write English curly quotes, en/em dashes, and `…`.
+    Unicode,
+}
+
+impl SmartPunctuation {
+    pub fn for_flavor(_flavor: Flavor) -> Self {
+        Self::default()
+    }
+}
+
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "serde", serde(rename_all = "lowercase"))]
@@ -187,8 +209,8 @@ impl FormatterExtensions {
 
 /// See [`known_extensions!`](panache_parser::Extensions) for the parser-side
 /// twin. The formatter extension surface is a small subset; the macro keeps
-/// the runtime setter, the public name list, and the JSON Schema generator in
-/// lockstep.
+/// the runtime setter, public name list, state iterator, and JSON Schema
+/// generator in lockstep.
 macro_rules! known_formatter_extensions {
     ( $( $kebab:literal => $field:ident ),* $(,)? ) => {
         impl FormatterExtensions {
@@ -196,6 +218,11 @@ macro_rules! known_formatter_extensions {
             /// affect formatter behavior (a subset of the parser names).
             pub const KNOWN_NAMES: &'static [&'static str] = &[ $($kebab),* ];
 
+            /// Canonical names and current states of all formatter extensions.
+            pub fn states(&self) -> impl Iterator<Item = (&'static str, bool)> {
+                [$(($kebab, self.$field)),*].into_iter()
+            }
+
             /// True if `name` matches a known formatter extension. Only
             /// kebab-case is accepted; snake_case aliases were removed in 3.0.
             pub fn is_known_name(name: &str) -> bool {
@@ -251,6 +278,10 @@ pub struct Config {
     /// How horizontal rules are rendered: expanded to the line width
     /// (default) or as a compact `---`.
     pub horizontal_rule_style: HorizontalRuleStyle,
+    /// Source spelling of punctuation. Defaults to preservation. ASCII
+    /// normalization requires the corresponding `smart` or `smart-quotes`
+    /// renderer extension.
+    pub smart_punctuation: SmartPunctuation,
     /// Document-language fallback used by sentence wrapping when the document
     /// has no YAML `lang:`. Normalized lowercase code (e.g. `de`, `pt-br`).
     pub lang: Option<String>,
@@ -288,6 +319,7 @@ impl Default for Config {
             wrap: Some(WrapMode::Reflow),
             blank_lines: BlankLines::Collapse,
             horizontal_rule_style: HorizontalRuleStyle::default(),
+            smart_punctuation: SmartPunctuation::for_flavor(flavor),
             lang: None,
             no_break_abbreviations: std::collections::BTreeMap::new(),
             formatters: HashMap::new(), // Opt-in: empty by default
@@ -323,6 +355,11 @@ pub struct ConfigBuilder {
 }
 
 impl ConfigBuilder {
+    pub fn smart_punctuation(mut self, mode: SmartPunctuation) -> Self {
+        self.config.smart_punctuation = mode;
+        self
+    }
+
     pub fn math(mut self, mode: MathMode) -> Self {
         self.config.math = mode;
         self
@@ -419,6 +456,11 @@ mod schema_tests {
         assert_wire_values::<BlankLines>(&["preserve", "collapse"]);
     }
 
+    #[test]
+    fn smart_punctuation_values_are_lowercase() {
+        assert_wire_values::<SmartPunctuation>(&["preserve", "ascii", "unicode"]);
+    }
+
     #[test]
     fn horizontal_rule_style_values_are_kebab_case() {
         assert_wire_values::<HorizontalRuleStyle>(&["line-width", "compact"]);