@airmark/quiver 0.6.0 → 0.7.0

package/README.md

@@ -17,7 +17,7 @@ and aligned to the current Quillmark spec.
 ## Install
 
 ```bash
-npm install @airmark/quiver @quillmark/quiver@0.5.0 @quillmark/wasm@0.60.0
+npm install @airmark/quiver @quillmark/quiver@0.5.0 @quillmark/wasm@0.66.2
 ```
 
 ## Usage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "main": "./index.js",
@@ -22,11 +22,11 @@
   },
   "peerDependencies": {
     "@quillmark/quiver": ">=0.5.0 <1.0.0",
-    "@quillmark/wasm": ">=0.60.0 <1.0.0"
+    "@quillmark/wasm": ">=0.66.2 <1.0.0"
   },
   "devDependencies": {
     "@quillmark/quiver": "^0.5.0",
-    "@quillmark/wasm": "0.60.0"
+    "@quillmark/wasm": "0.66.2"
   },
   "scripts": {
     "test": "node --test",

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -153,15 +153,16 @@ main:
       description: "USAF memorandum (default) or DAF headquarters memorandum. DAF changes date formatting and body paragraph layout per AFH 33-337."
 
     font_size:
-      title: Font size for the memo text (int pt)
-      type: integer
+      title: Font size for the memo text (pt)
+      type: number
       default: 12
       examples:
         - 12
+        - 11.5
       ui:
         group: Additional
         compact: true
-      description: Font size for the memo text (pt).
+      description: Font size for the memo text (pt). Decimal values (e.g. 11.5) are supported.
 
     date:
       title: Date of memo (YYYY-MM-DD); defaults to today

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/body.typ

@@ -90,7 +90,7 @@
 // - "A single paragraph is not numbered" (§2)
 // - First paragraph flush left, never indented
 // - Indent sub-paragraphs to align with first character of parent paragraph text
-#let render-body(content, auto-numbering: true, memo-style: "usaf") = {
+#let render-body(content, memo-style: "usaf") = {
   let PAR_BUFFER = state("PAR_BUFFER")
   PAR_BUFFER.update(())
   let NEST_DOWN = counter("NEST_DOWN")
@@ -214,6 +214,7 @@
     }
 
     let i = 0
+    let any_emitted = false
     for item in items {
       i += 1
       let kind = item.kind
@@ -253,18 +254,10 @@
           // Continuation block within a multi-block list item:
           // indent to align with preceding numbered paragraph's text, no new number.
           // level-counts still holds the value of the preceding numbered paragraph.
-          if memo-style == "daf" {
-            if nest_level > 0 {
-              format-par(item_content, nest_level, level-counts, indent-fn, continuation: true)
-            } else {
-              item_content
-            }
-          } else if auto-numbering {
-            format-par(item_content, nest_level, level-counts, indent-fn, continuation: true)
-          } else if nest_level > 0 {
-            format-par(item_content, nest_level - 1, level-counts, indent-fn, continuation: true)
-          } else {
+          if memo-style == "daf" and nest_level == 0 {
             item_content
+          } else {
+            format-par(item_content, nest_level, level-counts, indent-fn, continuation: true)
           }
         } else if memo-style == "daf" {
           if nest_level > 0 {
@@ -278,37 +271,28 @@
             level-counts = reset-levels-from(level-counts, 0, max-levels)
             [#h(daf-paragraph.top-first-line-indent)#item_content]
           }
-        } else if auto-numbering {
-          if par_count > 1 {
-            // Apply paragraph numbering per AFH 33-337 §2
-            let par = format-par(item_content, nest_level, level-counts, indent-fn)
-            level-counts.insert(str(nest_level), level-counts.at(str(nest_level)) + 1)
-            level-counts = reset-levels-from(level-counts, nest_level + 1, max-levels)
-            par
-          } else {
-            // AFH 33-337 §2: "A single paragraph is not numbered"
-            item_content
-          }
+        } else if par_count > 1 {
+          // Apply paragraph numbering per AFH 33-337 §2
+          let par = format-par(item_content, nest_level, level-counts, indent-fn)
+          level-counts.insert(str(nest_level), level-counts.at(str(nest_level)) + 1)
+          level-counts = reset-levels-from(level-counts, nest_level + 1, max-levels)
+          par
         } else {
-          // Unnumbered mode: only explicitly nested items (enum/list) get numbered
-          if nest_level > 0 {
-            let effective_level = nest_level - 1
-            let par = format-par(item_content, effective_level, level-counts, indent-fn)
-            level-counts.insert(str(effective_level), level-counts.at(str(effective_level)) + 1)
-            level-counts = reset-levels-from(level-counts, effective_level + 1, max-levels)
-            par
-          } else {
-            // Base-level paragraphs are flush left with no numbering.
-            // Reset all child level counters so subsequent list items restart at 1.
-            level-counts = reset-levels-from(level-counts, 0, max-levels)
-            item_content
-          }
+          // AFH 33-337 §2: "A single paragraph is not numbered"
+          item_content
         }
       }
 
-      // If this is the final item, apply AFH 33-337 §11 rule:
-      // "Avoid dividing a paragraph of less than four lines between two pages"
-      blank-line()
+      // Blank line between paragraphs. The header→body gap (i.e. before
+      // the first emitted paragraph) is the caller's responsibility —
+      // emitting it here would put the v() inside a nested
+      // `context { for … }` block, where it does not combine with the
+      // preceding header section's block-spacing the same way as a
+      // top-level blank-line() call.
+      // AFH 33-337 §11 rule applied below: "Avoid dividing a paragraph of
+      // less than four lines between two pages"
+      if any_emitted { blank-line() }
+      any_emitted = true
       if i == total_count {
         let available_width = page.width - spacing.margin * 2
 

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/config.typ

@@ -9,11 +9,7 @@
 // AFH 33-337 specifies precise spacing requirements throughout Chapter 14
 
 #let spacing = (
-  // Legacy exported field retained for compatibility with downstream imports.
-  // Internal blank-line spacing now uses measured line stride from utils.typ.
-  vertical: 19.05pt,
   line: .5em, // Internal line spacing for readability (`par.leading`; gap between line boxes)
-  line-height: .7em, // Base height of text lines for pagination estimates
   tab: 0.5in, // Tab stop for multi-column recipient alignment
   margin: 1in, // AFH 33-337 §4: "Use 1-inch margins on the left, right and bottom"
 )

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/frontmatter.typ

@@ -25,7 +25,6 @@
   memo_for_cols: 3,
   classification_level: none,
   footer_tag_line: none,
-  auto_numbering: true,
   memo_style: "usaf",
   it,
 ) = {
@@ -107,14 +106,11 @@
   // Since we have a 1-inch top margin, we need (1.75in - margin) vertical space
   v(1.75in - spacing.margin)
 
-  // Measure and cache body line stride once for downstream spacing logic.
+  // Measure and cache body line stride once for body line-count heuristics.
   context {
     let one-line = measure(par(spacing: 0pt)[x]).height
     let line-stride = measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
-    let em-size = measure(box(width: 1em)[]).width
-    let legacy-scaled = spacing.vertical * (em-size / 12pt)
     LINE_STRIDE.update(line-stride)
-    BLANK_LINE_STEP.update(calc.max(line-stride, legacy-scaled))
   }
 
   metadata((
@@ -123,7 +119,6 @@
     original_from: first-or-value(memo_from),
     body_font: body_font,
     font_size: font_size,
-    auto_numbering: auto_numbering,
     memo_style: memo_style,
   ))
 
@@ -133,5 +128,10 @@
   render-subject-section(subject)
   render-references-section(references)
 
+  // AFH 33-337: "Begin text on second line below subject/references".
+  // Emitted here (not inside body.typ) so the v() lands at the same lexical
+  // level as the preceding header sections and combines correctly with their
+  // block spacing.
+  blank-line()
   it
 }

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/indorsement.typ

@@ -41,7 +41,7 @@
   }
 
 
-  let actual_date = if date == none { datetime.today() } else { date }
+  let actual_date = date
   let ind_from = first-or-value(from)
   let ind_for = to
 
@@ -67,7 +67,7 @@
         blank-line()
         grid(
           columns: (auto, 1fr),
-          ind_from, align(right)[#display-date(actual_date, memo-style: memo-style)],
+          ind_from, align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) }],
         )
 
         blank-line()
@@ -79,7 +79,7 @@
         blank-line()
         grid(
           columns: (auto, 1fr),
-          [#indorsement_label, #ind_from], align(right)[#display-date(actual_date, memo-style: memo-style)],
+          [#indorsement_label, #ind_from], align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) }],
         )
 
         blank-line()

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/mainmatter.typ

@@ -18,15 +18,10 @@
 /// of the memorandum. Automatically detects single vs. multiple paragraphs
 /// to comply with AFH 33-337 numbering requirements.
 ///
-/// When `auto_numbering` is false (set in frontmatter), base-level paragraphs
-/// render flush left without numbering. Only explicitly numbered or bulleted
-/// items enter the numbering hierarchy.
-///
 /// - content (content): The body content to render
 /// -> content
 #let mainmatter(it) = context {
   let config = query(metadata).last().value
-  let auto-numbering = config.at("auto_numbering", default: true)
   let memo-style = config.at("memo_style", default: "usaf")
-  render-body(it, auto-numbering: auto-numbering, memo-style: memo-style)
+  render-body(it, memo-style: memo-style)
 }

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/primitives.typ

@@ -142,29 +142,54 @@
 // SIGNATURE BLOCK
 // =============================================================================
 // AFH 33-337 "Signature Block": "Start the signature block on the fifth line below
-// the last line of text and 4.5 inches from the left edge of the page"
+// the last line of text and 4.5 inches from the left edge of the page or three
+// spaces to the right of page center"
 // AFH 33-337 "Do not place the signature element on a continuation page by itself"
+// AFH 33-337 long-name example: "Signature block adjusted to the left" when a
+// long name would otherwise exceed the right margin.
 
 #let render-signature-block(signature-lines, signature-blank-lines: 4) = {
   signature-lines = ensure-array(signature-lines)
-  // AFH 33-337: "The signature block is never on a page by itself"
-  // Note: Perfect enforcement isn't feasible without over-engineering
-  // We use weak: false spacing and breakable: false to discourage orphaning
-  // AFH 33-337: "fifth line below" = 4 blank lines between text and signature block
-  blank-lines(signature-blank-lines, weak: false)
-  block(breakable: false)[
-    #align(left)[
-      // AFH 33-337: "4.5 inches from the left edge of the page"
-      // We use (4.5in - margin) because Typst's pad() is relative to the text area, not page edge
-      #pad(left: 4.5in - spacing.margin)[
-        #text(hyphenate: false)[
-          #for line in signature-lines {
-            par(hanging-indent: 4 * 0.5em, line)
-          }
+  // AFH 33-337: "fifth line below" = 4 blank lines between text and signature block.
+  // breakable: false discourages orphaning the signature block onto a page by itself.
+  blank-lines(signature-blank-lines)
+  // AFH 33-337 allows two equivalent anchors: 4.5in from the left edge, or three
+  // spaces right of page center. On 8.5in stock these coincide (page center =
+  // 4.25in; three TNR-12pt spaces ≈ 0.25in), so we use 4.5in as the canonical
+  // anchor. pad() is relative to the text area, hence (4.5in - margin).
+  let default-pad = 4.5in - spacing.margin
+  context {
+    // Measure each line at its rendered settings to detect long-name overflow.
+    let body-width = page.width - 2 * spacing.margin
+    let widest = 0pt
+    for line in signature-lines {
+      let w = measure(text(hyphenate: false, line)).width
+      if w > widest { widest = w }
+    }
+    // If the widest line would overflow the right margin at the standard
+    // anchor, shift the block left just enough to fit. Clamp at 0 so the
+    // block never crosses the left margin.
+    let available = body-width - default-pad
+    let left-pad = if widest > available {
+      let shifted = body-width - widest
+      if shifted < 0pt { 0pt } else { shifted }
+    } else {
+      default-pad
+    }
+    block(breakable: false)[
+      #align(left)[
+        #pad(left: left-pad)[
+          #text(hyphenate: false)[
+            #for line in signature-lines {
+              // AFH 33-337: "indent the next line to begin under the third character
+              // of the line above" — 2-character indent ≈ 1em in Times New Roman 12pt
+              par(hanging-indent: .5em, line)
+            }
+          ]
         ]
       ]
     ]
-  ]
+  }
 }
 
 // =============================================================================

package/quills/usaf_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/utils.typ

@@ -14,46 +14,37 @@
 
 #import "config.typ": CLASSIFICATION_COLORS, counters, paragraph-config, spacing
 
-// Shared measured line-stride cache used by blank-line spacing and body
-// line-count heuristics. Value is a `length` set once in `frontmatter`.
+// Shared measured line-stride cache used by body line-count heuristics.
+// Value is a `length` set once in `frontmatter`.
 #let LINE_STRIDE = state("LINE_STRIDE")
-// Shared blank-line step cache used by structural spacing.
-#let BLANK_LINE_STEP = state("BLANK_LINE_STEP")
 
 /// Creates vertical spacing equivalent to multiple blank lines.
 ///
-/// Each step matches one row of the body paragraph line grid.
+/// Adds `count` wrapped-line strides on top of the natural inter-paragraph
+/// gap, so a blank line occupies exactly the same vertical space as a line
+/// produced by natural paragraph wrapping. The stride is measured from
+/// `LINE_STRIDE` (cached in `frontmatter`) and falls back to an inline
+/// measurement when the cache is unset.
 ///
 /// - count (int): Number of blank lines to create
-/// - weak (bool): Whether spacing can be compressed at page breaks
 /// -> content
-#let blank-lines(count, weak: true) = {
-  if count == 0 {
-    v(0em, weak: weak)
-  } else {
-    context {
-      let measured-stride = {
-        let one-line = measure(par(spacing: 0pt)[x]).height
-        measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
-      }
-      // Scale legacy visual step with current font size:
-      // 19.05pt was tuned for 12pt body text.
-      let em-size = measure(box(width: 1em)[]).width
-      let legacy-scaled = spacing.vertical * (em-size / 12pt)
-      let fallback-step = calc.max(measured-stride, legacy-scaled)
-      let cached-step = BLANK_LINE_STEP.get()
-      let step = if cached-step != none { cached-step } else { fallback-step }
-      v(step * count, weak: weak)
+#let blank-lines(count) = {
+  if count <= 0 { return }
+  context {
+    let stride = LINE_STRIDE.get()
+    if stride == none {
+      let one-line = measure(par(spacing: 0pt)[x]).height
+      stride = measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
     }
+    v(stride * count)
   }
 }
 
 /// Creates vertical spacing equivalent to one blank line.
 /// Convenience function for single line spacing.
 ///
-/// - weak (bool): Whether spacing can be compressed at page breaks
 /// -> content
-#let blank-line(weak: true) = blank-lines(1, weak: weak)
+#let blank-line() = blank-lines(1)
 
 // =============================================================================
 // GENERAL UTILITY FUNCTIONS