@airmark/quiver 0.15.0 → 0.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.15.0",
+  "version": "0.18.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@quillmark/quiver": "^0.7.0",
-    "@quillmark/wasm": "0.75.0"
+    "@quillmark/wasm": "^0.78.0"
   },
   "scripts": {
     "test": "node --test quiver.test.js",
@@ -35,6 +35,6 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nibsbin/airmark-quiver"
+    "url": "https://github.com/tonguetoquill/airmark-quiver"
   }
 }

package/quills/af4141/0.1.0/Quill.yaml

@@ -28,7 +28,7 @@ main:
       type: string
       description: Commander's authentication entry on page 1.
 
-card_types:
+leaf_kinds:
   experience:
     description: Each card represents one row in the Record of Experience table. Rows fill page 1 (up to 16 rows) then page 2 (up to 21 rows), for a maximum of 37 rows.
     ui:

package/quills/af4141/0.1.0/example.md

@@ -11,7 +11,7 @@ commanders_auth: ""
 ---
 
 <!-- ═══════════════════════════════════════════════════════════════
-     RECORD OF EXPERIENCE CARDS
+     RECORD OF EXPERIENCE LEAVES
      Each card below becomes one row in the experience table.
      Page 1 holds up to 16 rows; Page 2 holds up to 21 rows (37 max).
 
@@ -29,7 +29,7 @@ commanders_auth: ""
 
 <!-- Example 1: Initial assignment to a unit -->
 ---
-CARD: experience
+KIND: experience
 date: 2025-01-15
 action: "Assigned to 1 ACCS/DOT as Weapons Director"
 written_grade: ""
@@ -41,7 +41,7 @@ auth_or_remarks: "Initial assignment"
 
 <!-- Example 2: Written upgrade evaluation -->
 ---
-CARD: experience
+KIND: experience
 date: 2025-03-15
 action: "Completed written upgrade evaluation for 3-Level"
 written_grade: "3"
@@ -53,7 +53,7 @@ auth_or_remarks: "Per AFMAN 13-1CRCV1"
 
 <!-- Example 3: Positional (live-environment) upgrade / certification -->
 ---
-CARD: experience
+KIND: experience
 date: 2025-06-20
 action: "Certified Mission Ready — positional upgrade"
 written_grade: ""
@@ -65,7 +65,7 @@ auth_or_remarks: "SSgt Jones, T.R."
 
 <!-- Example 4: Combined written + positional upgrade (both columns filled) -->
 ---
-CARD: experience
+KIND: experience
 date: 2025-08-01
 action: "Upgrade evaluation — written and positional"
 written_grade: "4"
@@ -77,7 +77,7 @@ auth_or_remarks: "Verified by unit commander"
 
 <!-- Example 5: PCS departure — no written/positional grade; omit grade dates (or use "") -->
 ---
-CARD: experience
+KIND: experience
 date: 2025-09-01
 action: "PCS to 726 ACS/MOC, Tinker AFB OK"
 written_grade: ""

package/quills/af4141/0.1.0/plate.typ

@@ -35,14 +35,14 @@
 #if "grade" in data { vals.insert("commonforms_text_p1_3", data.grade) }
 #if "commanders_auth" in data { vals.insert("commonforms_text_p1_116", data.commanders_auth) }
 
-// --- Experience table rows from cards ---
+// --- Experience table rows from LEAVES ---
 // The form supports 16 rows on page 1 and 21 rows on page 2 (37 total).
 // Overflow rows are silently ignored.
 #let max-rows = 37
 #{
   let row = 0
-  for card in data.CARDS {
-    if card.CARD == "experience" {
+  for card in data.LEAVES {
+    if card.KIND == "experience" {
       if row < max-rows {
         for (col, key) in col-keys.enumerate() {
           let value = form-cell(card.at(key, default: none))

package/quills/daf1206/0.1.0/Quill.yaml

@@ -39,7 +39,7 @@ main:
     unit_commander_rank_name_and_telephone:
       type: string
 
-card_types:
+leaf_kinds:
   accomplishments_continued:
     description: Optional. Add this card only when page 2 overflow is required. Use the card body for continued bullets. Rank/name on page 2 matches the main nominee line automatically.
     ui:

package/quills/daf1206/0.1.0/example.md

@@ -16,7 +16,7 @@ Use this main body for page 1 accomplishments.
 - Replace all placeholder values.
 
 ---
-CARD: accomplishments_continued
+KIND: accomplishments_continued
 ---
 
 Use this card body only if page 2 overflow is needed.

package/quills/daf1206/0.1.0/plate.typ

@@ -38,8 +38,8 @@
 }
 
 #let continued-key = "SPECIFIC_ACCOMPLISHMENTS_Use_Performance_Statements_IAW_DAFMAN_362806_Continued"
-#for card in data.CARDS {
-  if card.CARD == "accomplishments_continued" and continued-key not in vals and "BODY" in card {
+#for card in data.LEAVES {
+  if card.KIND == "accomplishments_continued" and continued-key not in vals and "BODY" in card {
     vals.insert(continued-key, card.BODY)
   }
 }

package/quills/daf4392/0.1.0/Quill.yaml

@@ -81,7 +81,7 @@ main:
       type: string
       description: "Put in your Emergency Contact's Phone Number."
 
-card_types:
+leaf_kinds:
   itinerary:
     description: "Each card represents one row in the travel itinerary table. Up to 10 rows are supported."
     ui:

package/quills/daf4392/0.1.0/example.md

@@ -16,7 +16,7 @@ emergency_contact_phone: "999-999-9999"
 ---
 
 ---
-CARD: itinerary
+KIND: itinerary
 date: 2026-03-26
 departure_point: "Biloxi, MS"
 arrival_point: "Fake City, MS"
@@ -25,7 +25,7 @@ mileage: "250"
 ---
 
 ---
-CARD: itinerary
+KIND: itinerary
 date: 2026-03-29
 departure_point: "Fake City, MS"
 arrival_point: "Biloxi, MS"

package/quills/daf4392/0.1.0/plate.typ

@@ -29,14 +29,14 @@
 #tf(40pt, 100pt)[#show-date(data.at("departure_date", default: none))]
 #tf(123pt, 100pt)[#data.at("final_destination", default: "")]
 
-// Itinerary Rows (via CARDS)
+// Itinerary Rows (via LEAVES)
 #{
   let row = 0
   let dy-start = 160pt
   let dy-step = 40pt
-  if "CARDS" in data {
-    for card in data.CARDS {
-      if card.CARD == "itinerary" and row < 10 {
+  if "LEAVES" in data {
+    for card in data.LEAVES {
+      if card.KIND == "itinerary" and row < 10 {
         let dy = dy-start + (row * dy-step)
         tf(80pt, dy)[#show-date(card.at("date", default: none))]
         tf(135pt, dy)[#card.at("departure_point", default: "")]

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -4,7 +4,7 @@ quill:
   backend: typst
   plate_file: plate.typ
   example_file: example.md
-  description: Typesetted USAF Official Memorandum
+  description: U.S. Air Force and Space Force Official Memorandum
 
 main:
   body:
@@ -182,7 +182,7 @@ main:
         compact: true
       description: "Optional marking appended after double slash (e.g. NF with classification CUI renders as CUI//NF). Leave blank to show only the classification with no //."
 
-card_types:
+leaf_kinds:
   indorsement:
     description: Chain of routing endorsements. Each endorsement block adds an official response or forwarding action to the original memo.
     ui:
@@ -225,13 +225,14 @@ card_types:
       action:
         type: string
         enum:
-          - none
+          - ""
           - undecided
           - approve
           - disapprove
+        default: ""
         ui:
           group: Addressing
-        description: "Action taken by the endorser. Use 'none' to hide the Approve/Disapprove line entirely, 'undecided' to display the line with neither option circled, 'approve' or 'disapprove' to circle the selected option."
+        description: "Action taken by the endorser. Leave blank to hide the Approve/Disapprove line entirely, 'undecided' to display the line with neither option circled, 'approve' or 'disapprove' to circle the selected option."
       attachments:
         type: array
         ui:

package/quills/usaf_memo/0.2.0/example.md

@@ -43,7 +43,7 @@ The `usaf_memo` Quill package takes care of all 33-337 formatting details. Focus
 Do not include a complimentary close (e.g. "Respectfully,") in official memorandums.
 
 ---
-CARD: indorsement
+KIND: indorsement
 for: ORG/SYMBOL
 format: standard
 from: ORG/SYMBOL
@@ -53,4 +53,4 @@ signature_block:
   - Duty Title
 ---
 
-This body and the metdata above are an indorsement card. Multiple or no indorsements cards can be used.
+This body and the metdata above are an indorsement card. Multiple or no indorsements leaves can be used.

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

@@ -12,13 +12,14 @@
 #let backmatter(
   signature_block: none,
   signature_blank_lines: 4,
+  signing_field: none,
   attachments: none,
   cc: none,
   distribution: none,
   leading_pagebreak: false,
 ) = {
   // Render backmatter sections without paragraph numbering
-  render-signature-block(signature_block, signature-blank-lines: signature_blank_lines)
+  render-signature-block(signature_block, signature-blank-lines: signature_blank_lines, signing-field: signing_field)
   render-backmatter-sections(
     attachments: attachments,
     cc: cc,

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

@@ -200,7 +200,7 @@
   context {
     let heading_buffer = none
     // Filter out zero-width paragraphs so that an empty body (e.g. empty
-    // string from a CARD with no text) emits nothing and collapses to zero
+    // string from a KIND with no text) emits nothing and collapses to zero
     // vertical space. Tables are always kept regardless of measured width.
     let items = PAR_BUFFER.get().filter(item =>
       item.kind == "table" or measure(item.content).width > 0pt

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

@@ -136,14 +136,14 @@
     LINE_STRIDE.update(line-stride)
   }
 
-  metadata((
+  [#metadata((
     subject: subject,
     original_date: actual_date,
     original_from: first-or-value(memo_from),
     body_font: body_font,
     font_size: font_size,
     memo_style: memo_style,
-  ))
+  )) <usaf-memo-config>]
 
   render-date-section(actual_date, memo-style: memo_style)
   render-for-section(memo_for, memo_for_cols)

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

@@ -18,6 +18,7 @@
   to: none,
   signature_block: none,
   signature_blank_lines: 4,
+  signing_field: none,
   attachments: none,
   cc: none,
   date: none,
@@ -45,7 +46,7 @@
   let ind_from = first-or-value(from)
   let ind_for = to
 
-  // An empty body (e.g. a CARD with only an action selected and no markdown
+  // An empty body (e.g. a KIND with only an action selected and no markdown
   // body) collapses to zero rendered layout via render-body's filter. To
   // make the "empty body takes no layout space" guarantee end-to-end, also
   // suppress the spacing the surrounding code reserves *for* the body:
@@ -57,12 +58,18 @@
   // or whitespace-only; comparing against `[]` reliably detects that.
   let body_empty = content == []
 
+  let effective_action = if action == none or type(action) != str or action.trim() == "" {
+    none
+  } else {
+    action
+  }
+
   if format != "informal" {
     // Step the counter BEFORE the context block to avoid read-then-update loop
     counters.indorsement.step()
 
     context {
-      let config = query(metadata).last().value
+      let config = query(<usaf-memo-config>).first().value
       let memo-style = config.at("memo_style", default: "usaf")
       let original_subject = config.subject
       let original_date = config.original_date
@@ -103,27 +110,24 @@
     }
     // Header→content gap. Skipped when there is neither an action line nor
     // body to follow — render-signature-block supplies its own 4-line gap.
-    if (action != none and action != "none") or not body_empty {
+    if effective_action != none or not body_empty {
       blank-line()
     }
   }
 
   // Show action line only when an action decision is set (not `none`)
-  if action != none and action != "none" {
-    render-action-line(action, trailing-blank-line: not body_empty)
+  if effective_action != none {
+    render-action-line(effective_action, trailing-blank-line: not body_empty)
   }
 
   if not body_empty {
     context {
-      let memo-style = {
-        let items = query(metadata)
-        if items.len() > 0 { items.last().value.at("memo_style", default: "usaf") } else { "usaf" }
-      }
+      let memo-style = query(<usaf-memo-config>).first().value.at("memo_style", default: "usaf")
       render-body(content, memo-style: memo-style)
     }
   }
 
-  render-signature-block(signature_block, signature-blank-lines: signature_blank_lines)
+  render-signature-block(signature_block, signature-blank-lines: signature_blank_lines, signing-field: signing_field)
 
   render-backmatter-sections(attachments: attachments, cc: cc)
 }

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

@@ -21,7 +21,7 @@
 /// - content (content): The body content to render
 /// -> content
 #let mainmatter(it) = context {
-  let config = query(metadata).last().value
+  let config = query(<usaf-memo-config>).first().value
   let memo-style = config.at("memo_style", default: "usaf")
   render-body(it, memo-style: memo-style)
 }

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

@@ -54,16 +54,16 @@
     } else {
       // Isolate seal column from document `font_size`: stack `em` spacing and subtitle
       // must not scale with body text (see frontmatter `set text(size: font_size)`).
-      block(width: 2in)[
+      // Subtitle is wrapped in `box` so it stays on one line and may extend past
+      // the seal's 2in column rather than wrapping.
+      block[
         #set text(9pt, font: font, fill: LETTERHEAD_COLOR, weight: "bold")
-        #align(left)[
-          // Spacing applies between positional stack children only, not one `[…]` body.
-          #stack(
-            spacing: 0.5em,
-            fit-box(width: 2in, height: 1in)[#letterhead-seal],
-            upper(ensure-string(letterhead-seal-subtitle)),
-          )
-        ]
+        // Spacing applies between positional stack children only, not one `[…]` body.
+        #stack(
+          spacing: 0.5em,
+          fit-box(width: 2in, height: 1in)[#letterhead-seal],
+          box(upper(ensure-string(letterhead-seal-subtitle))),
+        )
       ]
     }
     place(
@@ -148,7 +148,7 @@
 // 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) = {
+#let render-signature-block(signature-lines, signature-blank-lines: 4, signing-field: none) = {
   signature-lines = ensure-array(signature-lines)
   // 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.
@@ -177,6 +177,20 @@
       default-pad
     }
     block(breakable: false)[
+      #if signing-field != none {
+        let stride = {
+          let s = LINE_STRIDE.get()
+          if s == none {
+            let one-line = measure(par(spacing: 0pt)[x]).height
+            measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
+          } else { s }
+        }
+        place(
+          dx: left-pad,
+          dy: -(stride * signature-blank-lines),
+          box(width: body-width - left-pad, height: stride * signature-blank-lines, signing-field),
+        )
+      }
       #align(left)[
         #pad(left: left-pad)[
           #text(hyphenate: false)[
@@ -196,16 +210,14 @@
 // ACTION LINE RENDERING
 // =============================================================================
 // Renders the Approve / Disapprove action line for indorsement memos.
-// action: "none" = no action line displayed (hidden), "undecided" = both options
-// rendered plain (no circle), "approve" = Approve circled,
-// "disapprove" = Disapprove circled. The action line is rendered when
-// action is "undecided", "approve", or "disapprove". "none" suppresses
-// the line entirely (handled by the caller).
+// action: "undecided" = both options rendered plain (no circle),
+// "approve" = Approve circled, "disapprove" = Disapprove circled.
+// Empty/none suppression is handled by the caller before this is invoked.
 
 #let render-action-line(action, trailing-blank-line: true) = {
   assert(
-    action in ("none", "undecided", "approve", "disapprove"),
-    message: "action must be \"none\", \"undecided\", \"approve\", or \"disapprove\"",
+    action in ("undecided", "approve", "disapprove"),
+    message: "action must be \"undecided\", \"approve\", or \"disapprove\"",
   )
   // No leading blank-line: the caller (indorsement.typ) already emits the
   // header→content gap once. The action line's `block(sticky: true)`

package/quills/usaf_memo/0.2.0/plate.typ

@@ -1,4 +1,4 @@
-#import "@local/quillmark-helper:0.1.0": data
+#import "@local/quillmark-helper:0.1.0": data, signature-field
 #import "@local/tonguetoquill-usaf-memo:3.0.0": backmatter, frontmatter, indorsement, mainmatter
 
 // Frontmatter configuration
@@ -57,6 +57,7 @@
 #backmatter(
   // Signature block
   signature_block: data.signature_block,
+  signing_field: signature-field("Signature"),
 
   // Optional cc
   ..if "cc" in data { (cc: data.cc) },
@@ -68,9 +69,9 @@
   ..if "attachments" in data { (attachments: data.attachments) },
 )
 
-// Indorsements - iterate through CARDS array and filter by CARD type
-#for card in data.CARDS {
-  if card.CARD == "indorsement" {
+// Indorsements - iterate through LEAVES array and filter by KIND type
+#for (i, card) in data.LEAVES.enumerate() {
+  if card.KIND == "indorsement" {
     // The quillmark helper leaves an unset/whitespace-only markdown body as
     // the empty string `""`; only non-empty bodies are eval'd into content.
     // Pass truly empty content (`[]`) in the empty case so indorsement can
@@ -90,6 +91,7 @@
       from: card.at("from", default: ""),
       to: card.at("for", default: ""),
       signature_block: card.signature_block,
+      signing_field: signature-field("Ind_" + str(i) + "_Signature"),
       ..if "attachments" in card { (attachments: card.attachments) },
       ..if "cc" in card { (cc: card.cc) },
       format: card.at("format", default: "standard"),