quillmark 0.4.0__tar.gz → 0.4.1__tar.gz

{quillmark-0.4.0 → quillmark-0.4.1}/Cargo.lock

@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "acroform"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fafbc2591efb1ba97758fa18f7fc870a0a2b98b26b062999c36a920634a605a"
+checksum = "de7f2f94dd867d55d799a2bae63e4bdce7ea6e1d40ea9e7ba1c07d977942b44d"
 dependencies = [
  "lopdf",
 ]
@@ -2043,7 +2043,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "acroform",
  "anyhow",
@@ -2060,7 +2060,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-acroform"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "acroform",
  "minijinja",
@@ -2073,7 +2073,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-core"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "anyhow",
  "glob",
@@ -2088,7 +2088,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-fixtures"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "quillmark",
  "quillmark-typst",
@@ -2096,7 +2096,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-fuzz"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "proptest",
  "quillmark-core",
@@ -2105,7 +2105,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-python"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -2116,7 +2116,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-typst"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "anyhow",
  "dirs",
@@ -2138,7 +2138,7 @@ dependencies = [
 
 [[package]]
 name = "quillmark-wasm"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "console_error_panic_hook",
  "getrandom 0.3.4",

{quillmark-0.4.0 → quillmark-0.4.1}/Cargo.toml

@@ -11,10 +11,11 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 include = ["src/**", "Cargo.toml", "README*", "LICENSE*"]
 readme = "README.md"
+license = "Apache-2.0"
 
 [workspace.dependencies]
 # Core dependencies
@@ -43,13 +44,13 @@ typst-svg = "0.13.1"
 dirs = "6.0"
 
 # AcroForm backend dependencies
-acroform = "0.1.2"
+acroform = "0.1.3"
 
 # Intra-project dependencies
-quillmark-core = { version = "0.4.0", path = "quillmark-core" }
-quillmark-typst = { version = "0.4.0", path = "quillmark-typst", default-features = false }
-quillmark-acroform = { version = "0.4.0", path = "quillmark-acroform" }
-quillmark = { version = "0.4.0", path = "quillmark", default-features = false }
+quillmark-core = { version = "0.4.1", path = "quillmark-core" }
+quillmark-typst = { version = "0.4.1", path = "quillmark-typst", default-features = false }
+quillmark-acroform = { version = "0.4.1", path = "quillmark-acroform" }
+quillmark = { version = "0.4.1", path = "quillmark", default-features = false }
 
 # Test and dev dependencies
 tempfile = "~3.23"

{quillmark-0.4.0 → quillmark-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quillmark
-Version: 0.4.0
+Version: 0.4.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 include.workspace = true
 readme = "README.md"
 description = "Quillmark engine API"
-license = "Apache-2.0"
+license.workspace = true
 documentation = "https://docs.rs/quillmark"
 homepage = "https://github.com/nibsbin/quillmark"
 repository = "https://github.com/nibsbin/quillmark"

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-acroform/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 include.workspace = true
 readme = "README.md"
 description = "AcroForm backend for Quillmark"
-license = "Apache-2.0"
+license.workspace = true
 documentation = "https://docs.rs/quillmark-acroform"
 homepage = "https://github.com/nibsbin/quillmark"
 repository = "https://github.com/nibsbin/quillmark"

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-core/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 include.workspace = true
 readme = "README.md"
 description = "Core types and functionality for Quillmark"
-license = "Apache-2.0"
+license.workspace = true
 documentation = "https://docs.rs/quillmark-core"
 homepage = "https://github.com/nibsbin/quillmark"
 repository = "https://github.com/nibsbin/quillmark"

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-core/src/parse.rs

@@ -191,7 +191,15 @@ fn find_metadata_blocks(
             let abs_pos = pos + delimiter_pos;
             let content_start = abs_pos + delimiter_len; // After "---\n" or "---\r\n"
 
-            // Check if opening --- is followed by a blank line (horizontal rule, not metadata)
+            // Check if this --- is a horizontal rule (blank lines above AND below)
+            let preceded_by_blank = if abs_pos > 0 {
+                // Check if there's a blank line before the ---
+                let before = &markdown[..abs_pos];
+                before.ends_with("\n\n") || before.ends_with("\r\n\r\n")
+            } else {
+                false
+            };
+
             let followed_by_blank = if content_start < markdown.len() {
                 markdown[content_start..].starts_with('\n')
                     || markdown[content_start..].starts_with("\r\n")
@@ -199,13 +207,23 @@ fn find_metadata_blocks(
                 false
             };
 
-            if followed_by_blank {
+            // Horizontal rule: blank lines both above and below
+            if preceded_by_blank && followed_by_blank {
                 // This is a horizontal rule in the body, skip it
                 pos = abs_pos + 3; // Skip past "---"
                 continue;
             }
 
-            // Found potential metadata block opening
+            // Check if followed by non-blank line (or if we're at document start)
+            // This starts a metadata block
+            if followed_by_blank {
+                // --- followed by blank line but NOT preceded by blank line
+                // This is NOT a metadata block opening, skip it
+                pos = abs_pos + 3;
+                continue;
+            }
+
+            // Found potential metadata block opening (followed by non-blank line)
             // Look for closing "\n---\n" or "\r\n---\r\n" etc., OR "\n---" / "\r\n---" at end of document
             let rest = &markdown[content_start..];
 
@@ -252,18 +270,6 @@ fn find_metadata_blocks(
                     .into());
                 }
 
-                // Check if the block is contiguous (no blank lines in the YAML content)
-                if content.contains("\n\n") || content.contains("\r\n\r\n") {
-                    // Not a contiguous block
-                    if abs_pos == 0 {
-                        // Started at beginning but has blank lines - this is an error
-                        return Err("Frontmatter started but not closed with ---".into());
-                    }
-                    // Otherwise treat as horizontal rule in body
-                    pos = abs_pos + 3;
-                    continue;
-                }
-
                 // Parse YAML content to check for reserved keys (QUILL, SCOPE)
                 // First, try to parse as YAML
                 let (tag, quill_name, yaml_content) = if !content.is_empty() {
@@ -1314,6 +1320,141 @@ SCOPE: items
             .to_string()
             .contains("Cannot specify both QUILL and SCOPE"));
     }
+
+    #[test]
+    fn test_blank_lines_in_frontmatter() {
+        // New parsing standard: blank lines are allowed within YAML blocks
+        let markdown = r#"---
+title: Test Document
+author: Test Author
+
+description: This has a blank line above it
+tags:
+  - one
+  - two
+---
+
+# Hello World
+
+This is the body."#;
+
+        let doc = decompose(markdown).unwrap();
+
+        assert_eq!(doc.body(), Some("\n# Hello World\n\nThis is the body."));
+        assert_eq!(
+            doc.get_field("title").unwrap().as_str().unwrap(),
+            "Test Document"
+        );
+        assert_eq!(
+            doc.get_field("author").unwrap().as_str().unwrap(),
+            "Test Author"
+        );
+        assert_eq!(
+            doc.get_field("description").unwrap().as_str().unwrap(),
+            "This has a blank line above it"
+        );
+
+        let tags = doc.get_field("tags").unwrap().as_sequence().unwrap();
+        assert_eq!(tags.len(), 2);
+    }
+
+    #[test]
+    fn test_blank_lines_in_scope_blocks() {
+        // Blank lines should be allowed in SCOPE blocks too
+        let markdown = r#"---
+SCOPE: items
+name: Item 1
+
+price: 19.99
+
+tags:
+  - electronics
+  - gadgets
+---
+
+Body of item 1."#;
+
+        let doc = decompose(markdown).unwrap();
+
+        let items = doc.get_field("items").unwrap().as_sequence().unwrap();
+        assert_eq!(items.len(), 1);
+
+        let item = items[0].as_object().unwrap();
+        assert_eq!(item.get("name").unwrap().as_str().unwrap(), "Item 1");
+        assert_eq!(item.get("price").unwrap().as_f64().unwrap(), 19.99);
+
+        let tags = item.get("tags").unwrap().as_array().unwrap();
+        assert_eq!(tags.len(), 2);
+    }
+
+    #[test]
+    fn test_horizontal_rule_with_blank_lines_above_and_below() {
+        // Horizontal rule: blank lines both above AND below the ---
+        let markdown = r#"---
+title: Test
+---
+
+First paragraph.
+
+---
+
+Second paragraph."#;
+
+        let doc = decompose(markdown).unwrap();
+
+        assert_eq!(doc.get_field("title").unwrap().as_str().unwrap(), "Test");
+
+        // The body should contain the horizontal rule (---) as part of the content
+        let body = doc.body().unwrap();
+        assert!(body.contains("First paragraph."));
+        assert!(body.contains("---"));
+        assert!(body.contains("Second paragraph."));
+    }
+
+    #[test]
+    fn test_horizontal_rule_not_preceded_by_blank() {
+        // --- not preceded by blank line but followed by blank line is NOT a horizontal rule
+        // It's also NOT a valid metadata block opening (since it's followed by blank)
+        let markdown = r#"---
+title: Test
+---
+
+First paragraph.
+---
+
+Second paragraph."#;
+
+        let doc = decompose(markdown).unwrap();
+
+        let body = doc.body().unwrap();
+        // The second --- should be in the body as text (not a horizontal rule since no blank above)
+        assert!(body.contains("---"));
+    }
+
+    #[test]
+    fn test_multiple_blank_lines_in_yaml() {
+        // Multiple blank lines should also be allowed
+        let markdown = r#"---
+title: Test
+
+
+author: John Doe
+
+
+version: 1.0
+---
+
+Body content."#;
+
+        let doc = decompose(markdown).unwrap();
+
+        assert_eq!(doc.get_field("title").unwrap().as_str().unwrap(), "Test");
+        assert_eq!(
+            doc.get_field("author").unwrap().as_str().unwrap(),
+            "John Doe"
+        );
+        assert_eq!(doc.get_field("version").unwrap().as_f64().unwrap(), 1.0);
+    }
 }
 #[cfg(test)]
 mod demo_file_test {

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-fixtures/Cargo.toml

@@ -3,7 +3,7 @@ name = "quillmark-fixtures"
 version.workspace = true
 edition.workspace = true
 description = "Test fixtures and utilities for Quillmark"
-license = "MIT"
+license.workspace = true
 publish = false  # Don't publish test fixtures to crates.io
 readme = "README.md"
 

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-fixtures/resources/extended_metadata_demo.md

@@ -55,7 +55,7 @@ Ideal for content-heavy sites where each item needs its own metadata (price, cat
 ## Technical Details
 
 - **Tag pattern**: `[a-z_][a-z0-9_]*`
-- **Contiguity**: No blank lines within metadata blocks
-- **Horizontal rules**: Preceded by blank line = horizontal rule
+- **Blank lines**: Allowed within metadata blocks
+- **Horizontal rules**: `---` with blank lines both above and below
 - **Reserved names**: Cannot use `body` as tag directive
 - **Collections**: Same tag name creates array of objects

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-fixtures/resources/usaf_form_8/usaf_form_8.md

@@ -83,7 +83,12 @@ comments:
   #exceptionally_qualified:
 examiner_remarks:
   mission_description: Delivering packages to all points in the universe.
-  discrepancies: "Fry, we need to talk about your performance. Again. Your delivery times are consistently late - and I mean *consistently*. Every single package arrives after the guaranteed delivery window, which means I have to spend half my day apologizing to angry customers while you stand there with that vacant expression asking if we can stop for pizza. This isn't a joyride through the galaxy. This is a business, and you're single-handedly destroying our reputation one tardy delivery at a time.\n\nAnd while we're on the subject, you smell like burning hair. I don't know what you're doing in your spare time, and honestly I don't want to know, but it's affecting the whole crew. Bender actually complained about a smell, Fry. *Bender*. A robot who stores week-old sandwiches in his chest cavity said you're making the ship uninhabitable. Whatever you're burning, stop burning it. Or at least shower afterwards.\n\nLook, I'm sure you did your best, which is to say you failed miserably. I've tried to be patient. I've tried to work with your... limitations. But at this point, maybe you should stick to the one thing you're good at - nothing. Actually, scratch that. You're not even good at nothing. You somehow manage to make nothing worse just by being near it."
+  discrepancies: |
+    Fry, we need to talk about your performance. Again. Your delivery times are consistently late - and I mean *consistently*. Every single package arrives after the guaranteed delivery window, which means I have to spend half my day apologizing to angry customers while you stand there with that vacant expression asking if we can stop for pizza. This isn't a joyride through the galaxy. This is a business, and you're single-handedly destroying our reputation one tardy delivery at a time.
+    
+    And while we're on the subject, you smell like burning hair. I don't know what you're doing in your spare time, and honestly I don't want to know, but it's affecting the whole crew. Bender actually complained about a smell, Fry. *Bender*. A robot who stores week-old sandwiches in his chest cavity said you're making the ship uninhabitable. Whatever you're burning, stop burning it. Or at least shower afterwards.
+    
+    Look, I'm sure you did your best, which is to say you failed miserably. I've tried to be patient. I've tried to work with your... limitations. But at this point, maybe you should stick to the one thing you're good at - nothing. Actually, scratch that. You're not even good at nothing. You somehow manage to make nothing worse just by being near it.
   addi_training: You need to learn how to not be you
   addi_comments: None
 reviewing_remarks: None

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-python/Cargo.toml

@@ -3,7 +3,7 @@ name = "quillmark-python"
 version.workspace = true
 edition.workspace = true
 description = "Python bindings for Quillmark"
-license = "Apache-2.0"
+license.workspace = true
 publish = false
 readme = "README.md"
 

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-typst/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 include.workspace = true
 readme = "README.md"
 description = "Typst backend for Quillmark"
-license = "Apache-2.0"
+license.workspace = true
 documentation = "https://docs.rs/quillmark-typst"
 homepage = "https://github.com/nibsbin/quillmark"
 repository = "https://github.com/nibsbin/quillmark"

{quillmark-0.4.0 → quillmark-0.4.1}/quillmark-typst/src/filters.rs

@@ -107,8 +107,6 @@ pub fn date_filter(_state: &State, mut value: Value, kwargs: Kwargs) -> Result<V
             // Use js-sys to get the current UTC date string on wasm targets.
             // We format as YYYY-MM-DD to match Iso8601::DEFAULT parsing expectations.
             use js_sys::Date;
-            use wasm_bindgen::JsValue;
-
             let d = Date::new_0();
             let year = d.get_utc_full_year() as i32;
             let month = (d.get_utc_month() as u8).saturating_add(1);