@airmark/quiver 0.15.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.15.0",
+  "version": "0.16.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.77.0"
   },
   "scripts": {
     "test": "node --test quiver.test.js",

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:
@@ -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/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/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,
@@ -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) },
@@ -69,7 +70,7 @@
 )
 
 // Indorsements - iterate through CARDS array and filter by CARD type
-#for card in data.CARDS {
+#for (i, card) in data.CARDS.enumerate() {
   if card.CARD == "indorsement" {
     // The quillmark helper leaves an unset/whitespace-only markdown body as
     // the empty string `""`; only non-empty bodies are eval'd into content.
@@ -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"),