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

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

@@ -273,7 +273,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1114,7 +1114,7 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "panache"
-version = "3.15.0"
+version = "3.16.0"
 dependencies = [
  "annotate-snippets",
  "assert_cmd",
@@ -1159,7 +1159,7 @@ dependencies = [
 
 [[package]]
 name = "panache-formatter"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "badness-formatter",
  "insta",
@@ -1179,7 +1179,7 @@ dependencies = [
 
 [[package]]
 name = "panache-parser"
-version = "0.32.0"
+version = "0.33.0"
 dependencies = [
  "badness-parser",
  "entities",
@@ -1456,7 +1456,7 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1607,7 +1607,7 @@ checksum = "69dd77f86ec10e72e314f4ddf7c44c8d349e73cdff1aad524ba9668603fb0549"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1641,7 +1641,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1677,7 +1677,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1688,14 +1688,14 @@ checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -1712,7 +1712,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1770,9 +1770,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.16.2"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
+checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b"
 
 [[package]]
 name = "smol_str"
@@ -1824,9 +1824,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "01016da373cd8f7ef12624f796309f5c31ba8d646dd08856c02cd741d823c622"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1881,7 +1881,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
 ]
 
 [[package]]
@@ -1962,9 +1962,9 @@ checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-segmentation"
@@ -1986,9 +1986,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.27.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97277d36b9c3ace13e58fa6e753f8b0bbbf302a18dd193240d70f9e29681059a"
+checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -2077,7 +2077,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.8",
  "wasm-bindgen-shared",
 ]
 

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

@@ -9,7 +9,7 @@ authors = ["Johan Larsson <johan@jolars.co>"]
 
 [package]
 name = "panache"
-version = "3.15.0"
+version = "3.16.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.0", features = [
+panache-formatter = { path = "crates/panache-formatter", version = "0.27.1", features = [
     "serde",
     "schema",
 ] }
-panache-parser = { path = "crates/panache-parser", version = "0.32.0", features = [
+panache-parser = { path = "crates/panache-parser", version = "0.33.0", features = [
     "serde",
     "schema",
 ] }

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

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

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

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.27.1](https://github.com/jolars/panache/compare/panache-formatter-v0.27.0...panache-formatter-v0.27.1) (2026-10-12)
+
+### Dependencies
+
+- updated crates/panache-parser to v0.33.0
+
 ## [0.27.0](https://github.com/jolars/panache/compare/panache-formatter-v0.26.1...panache-formatter-v0.27.0) (2026-10-09)
 
 ### Features

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

@@ -1,6 +1,6 @@
 [package]
 name = "panache-formatter"
-version = "0.27.0"
+version = "0.27.1"
 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.32.0" }
+panache-parser = { path = "../panache-parser", version = "0.33.0" }
 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.15.0 → panache_cli-3.16.0}/crates/panache-parser/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.33.0](https://github.com/jolars/panache/compare/panache-parser-v0.32.0...panache-parser-v0.33.0) (2026-10-12)
+
+### Features
+
+- **lint:** detect malformed citations ([`b8598d1`](https://github.com/jolars/panache/commit/b8598d1d94c886f80bbac8867e1aae1ded404c85))
+
+### Bug Fixes
+
+- **parser:** keep headerless tables separate ([`835e8bb`](https://github.com/jolars/panache/commit/835e8bbd34a94689ab065118e742108c6d552258)), fixes [#557](https://github.com/jolars/panache/issues/557)
+
 ## [0.32.0](https://github.com/jolars/panache/compare/panache-parser-v0.31.1...panache-parser-v0.32.0) (2026-10-09)
 
 ### Features

{panache_cli-3.15.0 → panache_cli-3.16.0}/crates/panache-parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "panache-parser"
-version = "0.32.0"
+version = "0.33.0"
 edition.workspace = true
 rust-version.workspace = true
 readme = "README.md"

{panache_cli-3.15.0 → panache_cli-3.16.0}/crates/panache-parser/src/parser/blocks/tables.rs

@@ -3011,6 +3011,12 @@ fn scan_multiline_table(
             column_sep_pos = pos;
             has_header = pos > start_pos + 1; // Has header if there's content before column sep
             pos += 1;
+            // Pandoc requires the first body row immediately after the header
+            // separator. Otherwise a simple table's footer can become a header
+            // separator and pull later paragraphs into the table.
+            if pos >= lines.len() || window.line(pos).trim().is_empty() {
+                return None;
+            }
             continue;
         }
 

{panache_cli-3.15.0 → panache_cli-3.16.0}/crates/panache-parser/src/syntax/citations.rs

@@ -25,6 +25,22 @@ impl AstNode for Citation {
 }
 
 impl Citation {
+    /// Whether the citation has its own enclosing square brackets.
+    pub fn is_bracketed(&self) -> bool {
+        self.0
+            .first_token()
+            .is_some_and(|token| token.kind() == SyntaxKind::LINK_START)
+    }
+
+    /// Every key marker, including markers whose braced key is empty.
+    pub fn markers(&self) -> impl Iterator<Item = CitationMarker> {
+        self.0
+            .children_with_tokens()
+            .filter_map(|element| element.into_token())
+            .filter(|token| token.kind() == SyntaxKind::CITATION_MARKER)
+            .map(CitationMarker)
+    }
+
     pub fn keys(&self) -> Vec<CitationKey> {
         self.0
             .children_with_tokens()
@@ -39,6 +55,46 @@ impl Citation {
     }
 }
 
+pub struct CitationMarker(SyntaxToken);
+
+impl CitationMarker {
+    /// Range of just the `@` or `-@` marker.
+    pub fn marker_range(&self) -> rowan::TextRange {
+        self.0.text_range()
+    }
+
+    pub fn key(&self) -> Option<CitationKey> {
+        let mut next = self.0.next_sibling_or_token()?.into_token()?;
+        if next.kind() == SyntaxKind::CITATION_BRACE_OPEN {
+            next = next.next_sibling_or_token()?.into_token()?;
+        }
+        (next.kind() == SyntaxKind::CITATION_KEY).then_some(CitationKey(next))
+    }
+
+    /// Range of the marker and its key, including any enclosing braces.
+    pub fn text_range(&self) -> rowan::TextRange {
+        if let Some(key) = self.key() {
+            return key.marked_range();
+        }
+        let mut end = self.0.text_range().end();
+        let next = self
+            .0
+            .next_sibling_or_token()
+            .and_then(|it| it.into_token());
+        if let Some(open) = next
+            && open.kind() == SyntaxKind::CITATION_BRACE_OPEN
+        {
+            end = open.text_range().end();
+            if let Some(close) = open.next_sibling_or_token().and_then(|it| it.into_token())
+                && close.kind() == SyntaxKind::CITATION_BRACE_CLOSE
+            {
+                end = close.text_range().end();
+            }
+        }
+        rowan::TextRange::new(self.0.text_range().start(), end)
+    }
+}
+
 pub struct CitationKey(SyntaxToken);
 
 impl CitationKey {
@@ -122,4 +178,27 @@ mod tests {
     fn marked_range_covers_braced_keys() {
         assert_eq!(marked_spans("A [@{weird key}].\n"), vec!["@{weird key}"]);
     }
+
+    #[test]
+    fn markers_include_empty_keys() {
+        let input = "[@a; -@{}] @{}\n";
+        let citations: Vec<_> = parse(input, None)
+            .descendants()
+            .filter_map(Citation::cast)
+            .collect();
+        assert!(citations[0].is_bracketed());
+        assert!(!citations[1].is_bracketed());
+        let markers: Vec<_> = citations.iter().flat_map(Citation::markers).collect();
+        let spans: Vec<_> = markers
+            .iter()
+            .map(|marker| {
+                let range = marker.text_range();
+                &input[usize::from(range.start())..usize::from(range.end())]
+            })
+            .collect();
+        assert_eq!(spans, ["@a", "-@{}", "@{}"]);
+        assert_eq!(markers[0].key().unwrap().text(), "a");
+        assert!(markers[1].key().is_none());
+        assert_eq!(markers[2].key().unwrap().text(), "");
+    }
 }

{panache_cli-3.15.0 → panache_cli-3.16.0}/crates/panache-parser/src/syntax/links.rs

@@ -528,6 +528,11 @@ impl AstNode for UnresolvedReference {
 }
 
 impl UnresolvedReference {
+    /// The link's bracket text as parsed inline children, excluding images.
+    pub fn text_node(&self) -> Option<LinkText> {
+        support::child(&self.0)
+    }
+
     /// `true` if this is an image-shape reference (`![alt]...`),
     /// `false` for a link-shape reference (`[text]...`). Determined
     /// from the leading byte of the node's source text.

{panache_cli-3.15.0 → panache_cli-3.16.0}/src/cli.rs

@@ -341,6 +341,18 @@ For editor configuration examples, see: https://github.com/jolars/panache#editor
         )]
         files: Vec<PathBuf>,
 
+        /// Rule names to enable instead of the configured defaults
+        #[arg(long, value_delimiter = ',')]
+        select: Option<Vec<String>>,
+
+        /// Additional rule names to enable alongside the configured selection
+        #[arg(long, value_delimiter = ',')]
+        extend_select: Vec<String>,
+
+        /// Rule names to disable, replacing configured ignores
+        #[arg(long, value_delimiter = ',')]
+        ignore: Option<Vec<String>>,
+
         /// Apply auto-fixes
         #[arg(long)]
         #[arg(help = "Automatically fix violations where possible")]

{panache_cli-3.15.0 → panache_cli-3.16.0}/src/config/types.rs

@@ -385,11 +385,19 @@ pub struct ExperimentalConfig {
     pub format_math: Option<bool>,
 }
 
-/// Linter configuration.
-/// Preferred shape is `[lint.rules] rule-name = true/false`.
-/// Legacy `[lint] rule-name = true/false` is still supported (deprecated).
+/// Linter configuration with exact rule-name selection.
 #[derive(Debug, Clone, Serialize, PartialEq, Default)]
+#[serde(rename_all = "kebab-case")]
 pub struct LintConfig {
+    /// Replace the default rule set when supplied, including an empty list.
+    pub select: Option<Vec<String>>,
+    /// Add rules to the defaults or explicit selection.
+    pub extend_select: Vec<String>,
+    /// Disable rules after applying selection and additions.
+    pub ignore: Vec<String>,
+    /// Deprecated boolean overrides, retained for configuration compatibility.
+    // TODO: Remove `[lint.rules]` boolean tables in the next major release on
+    // or after 2027-04-12, at least six months after their deprecation.
     pub rules: HashMap<String, bool>,
     /// Resolved Quarto compatibility target for the `quarto-schema` rule.
     ///
@@ -411,20 +419,57 @@ impl LintConfig {
             .into_iter()
             .map(|(name, enabled)| (Self::normalize_rule_name(&name), enabled))
             .collect();
+        for names in self
+            .select
+            .iter_mut()
+            .chain([&mut self.extend_select, &mut self.ignore])
+        {
+            for name in names {
+                *name = Self::normalize_rule_name(name);
+            }
+        }
         self
     }
 
-    pub fn is_rule_enabled(&self, rule_name: &str) -> bool {
+    fn enabled_with_default(&self, rule_name: &str, default: bool) -> bool {
         let normalized = Self::normalize_rule_name(rule_name);
-        self.rules.get(&normalized).copied().unwrap_or(true)
+        let base = match &self.select {
+            Some(selected) => selected.contains(&normalized),
+            None => self.rules.get(&normalized).copied().unwrap_or(default),
+        };
+        (base || self.extend_select.contains(&normalized)) && !self.ignore.contains(&normalized)
     }
 
-    /// Like `is_rule_enabled`, but the default is `false` when the rule is
-    /// absent from the user's config. Use for opt-in rules whose default
-    /// behavior would generate noise for most users.
+    pub fn is_rule_enabled(&self, rule_name: &str) -> bool {
+        self.enabled_with_default(rule_name, true)
+    }
+
+    /// Check selection for an opt-in rule whose default is off.
     pub fn is_rule_explicitly_enabled(&self, rule_name: &str) -> bool {
-        let normalized = Self::normalize_rule_name(rule_name);
-        self.rules.get(&normalized).copied().unwrap_or(false)
+        self.enabled_with_default(rule_name, false)
+    }
+
+    /// Apply command-line settings before linting or computing cache keys.
+    pub fn apply_overrides(
+        &mut self,
+        select: Option<&[String]>,
+        extend_select: &[String],
+        ignore: Option<&[String]>,
+    ) {
+        let normalize = |names: &[String]| {
+            names
+                .iter()
+                .filter(|name| !name.trim().is_empty())
+                .map(|name| Self::normalize_rule_name(name))
+                .collect::<Vec<_>>()
+        };
+        if let Some(select) = select {
+            self.select = Some(normalize(select));
+        }
+        self.extend_select.extend(normalize(extend_select));
+        if let Some(ignore) = ignore {
+            self.ignore = normalize(ignore);
+        }
     }
 }
 
@@ -434,23 +479,35 @@ impl JsonSchema for LintConfig {
     }
 
     fn json_schema(_generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        // Two accepted shapes:
-        //   [lint.rules] my-rule = true   (preferred)
-        //   [lint] my-rule = true         (legacy, deprecated)
-        // Modelled as an object whose `rules` field is a string→bool map and
-        // whose additionalProperties are also bools (for the legacy shape).
         schemars::json_schema!({
             "type": "object",
             "description": "Linter configuration.",
             "properties": {
+                "select": {
+                    "type": "array",
+                    "items": { "type": "string" },
+                    "description": "Rule names to enable instead of the defaults. An empty list disables the defaults.",
+                },
+                "extend-select": {
+                    "type": "array",
+                    "items": { "type": "string" },
+                    "description": "Additional rule names to enable alongside the defaults or select.",
+                    "default": [],
+                },
+                "ignore": {
+                    "type": "array",
+                    "items": { "type": "string" },
+                    "description": "Rule names to disable, including those in extend-select.",
+                    "default": [],
+                },
                 "rules": {
                     "type": "object",
-                    "description": "Map of lint rule names to enabled/disabled. \
-                                    Preferred over the legacy flat `[lint]` shape.",
+                    "description": "Deprecated boolean overrides for the default rule set.",
+                    "deprecated": true,
                     "additionalProperties": { "type": "boolean" },
                 },
             },
-            "additionalProperties": { "type": "boolean" },
+            "additionalProperties": false,
         })
     }
 }
@@ -461,16 +518,11 @@ impl<'de> Deserialize<'de> for LintConfig {
         D: Deserializer<'de>,
     {
         let value = toml::Value::deserialize(deserializer)?;
-        let mut rules = HashMap::new();
-
-        let mut table = value
+        let table = value
             .as_table()
             .cloned()
             .ok_or_else(|| serde::de::Error::custom("expected [lint] table"))?;
 
-        // `quarto-version` moved to `[compat] quarto`. Catch the old key with a
-        // pointed migration error rather than the generic "use [lint.rules]"
-        // message the legacy bool loop would otherwise emit.
         if table.contains_key("quarto-version") {
             return Err(serde::de::Error::custom(
                 "[lint] quarto-version moved to [compat] quarto; \
@@ -478,34 +530,34 @@ impl<'de> Deserialize<'de> for LintConfig {
             ));
         }
 
-        // Rules live under [lint.rules]. The legacy flat `[lint] rule = true`
-        // shape was removed in 3.0.
-        if let Some(rules_value) = table.remove("rules") {
-            let rules_table = rules_value
-                .as_table()
-                .ok_or_else(|| serde::de::Error::custom("[lint.rules] must be a table"))?;
-            for (name, enabled) in rules_table {
-                let enabled = enabled.as_bool().ok_or_else(|| {
-                    serde::de::Error::custom(format!(
-                        "[lint.rules] entry '{}' must be true or false",
-                        name
-                    ))
-                })?;
-                rules.insert(name.clone(), enabled);
-            }
+        #[derive(Default, Deserialize)]
+        #[serde(default, deny_unknown_fields, rename_all = "kebab-case")]
+        struct Selection {
+            select: Option<Vec<String>>,
+            extend_select: Vec<String>,
+            ignore: Vec<String>,
+            rules: HashMap<String, bool>,
         }
-
-        // Any remaining top-level key is the removed flat shape.
-        if let Some((name, _)) = table.iter().next() {
+        // The flat `[lint] rule = true` shape was already removed in 3.0.
+        if let Some(name) = table.keys().find(|name| {
+            !matches!(
+                name.as_str(),
+                "select" | "extend-select" | "ignore" | "rules"
+            )
+        }) {
             return Err(serde::de::Error::custom(format!(
-                "Unsupported [lint] key '{}'; put rule toggles under [lint.rules]",
+                "Unsupported [lint] key '{}'; use select, extend-select, or ignore",
                 name
             )));
         }
-
+        let selection: Selection = toml::Value::Table(table)
+            .try_into()
+            .map_err(serde::de::Error::custom)?;
         Ok(Self {
-            rules,
-            // Populated later from `[compat] quarto` during finalization.
+            select: selection.select,
+            extend_select: selection.extend_select,
+            ignore: selection.ignore,
+            rules: selection.rules,
             quarto_version: None,
         }
         .normalize())