@airmark/quiver 0.10.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -244,12 +244,13 @@ card_types:
         title: Action Decision
         type: string
         enum:
+          - none
           - undecided
           - approve
           - disapprove
         ui:
           group: Addressing
-        description: "Action taken by the endorser. Use 'undecided' to display the Approve/Disapprove line with neither option circled, 'approve' or 'disapprove' to circle the selected option."
+        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."
       attachments:
         title: Attachments for this endorsement
         type: array
@@ -263,8 +264,8 @@ card_types:
           group: Additional
         description: List of office symbols to receive copies of this endorsement.
       date:
-        title: Date of endorsement (YYYY-MM-DD)
+        title: Date of endorsement (YYYY-MM-DD); defaults to today
         type: date
         ui:
           group: Additional
-        description: Date of the endorsement. Leave blank to omit.
+        description: "YYYY-MM-DD. Date the endorser signs/forwards the memo (per AFH 33-337 Ch. 14, this is distinct from the originating memo's date). Leave blank to use today's date."

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

@@ -19,7 +19,7 @@
 // =============================================================================
 // AFH 33-337 §5: "Use 12 point Times New Roman font for text"
 
-#let DEFAULT_LETTERHEAD_FONTS = ("NimbusRomNo9L", "times new roman")
+#let DEFAULT_LETTERHEAD_FONTS = ("Copperplate CC", "NimbusRomNo9L", "times new roman")
 #let DEFAULT_BODY_FONTS = ("NimbusRomNo9L", "times new roman")  // AFH 33-337 §5: Times New Roman required
 #let LETTERHEAD_COLOR = rgb("#204093")  // Faded USAF blue for letterhead
 

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

@@ -45,6 +45,18 @@
   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
+  // 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:
+  // the header→body gap (when no action is present) and the action→body
+  // trailing gap. Without this, an empty body still leaves an extra
+  // blank-line stride above the signature, pushing it off the AFH 33-337
+  // "fifth line below the last line of text" anchor.
+  // The plate calls indorsement with `[]` when the markdown body is empty
+  // or whitespace-only; comparing against `[]` reliably detects that.
+  let body_empty = content == []
+
   if format != "informal" {
     // Step the counter BEFORE the context block to avoid read-then-update loop
     counters.indorsement.step()
@@ -89,20 +101,26 @@
         )
       }
     }
-    blank-line()
+    // 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 {
+      blank-line()
+    }
   }
 
   // Show action line only when an action decision is set (not `none`)
-  if action != none {
-    render-action-line(action)
+  if action != none and action != "none" {
+    render-action-line(action, trailing-blank-line: 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" }
+  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" }
+      }
+      render-body(content, memo-style: memo-style)
     }
-    render-body(content, memo-style: memo-style)
   }
 
   render-signature-block(signature_block, signature-blank-lines: signature_blank_lines)

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

@@ -199,9 +199,10 @@
 // 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".
+// action is "undecided", "approve", or "disapprove". "none" suppresses
+// the line entirely (handled by the caller).
 
-#let render-action-line(action) = {
+#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\"",
@@ -230,10 +231,13 @@
   // using the same sticky-block pattern that body.typ applies to the last
   // paragraph, per AFH 33-337 §11 orphan-prevention rules.
   block(sticky: true)[#approve-text / #disapprove-text]
-  // Trailing blank-line so the body's first paragraph (or signature block,
-  // when the body is empty) sits one line below the action line, mirroring
-  // the gap above it.
-  blank-line()
+  // Trailing blank-line places the body's first paragraph one line below
+  // the action, mirroring the gap above it. Suppressed when the body is
+  // empty so the signature block's own 4-line gap lands on AFH 33-337's
+  // "fifth line below the last line of text" anchor.
+  if trailing-blank-line {
+    blank-line()
+  }
 }
 
 // =============================================================================

package/quills/usaf_memo/0.2.0/plate.typ

@@ -71,6 +71,21 @@
 // Indorsements - iterate through CARDS array and filter by CARD type
 #for card in data.CARDS {
   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.
+    // Pass truly empty content (`[]`) in the empty case so indorsement can
+    // collapse the body's surrounding spacing.
+    let body = card.at("BODY", default: "")
+    let body_content = if type(body) == str { [] } else { body }
+    // Per AFH 33-337 Ch. 14, an indorsement is dated when the endorser signs
+    // it (distinct from the originating memo's date). Default to today when
+    // the card omits or leaves the date blank.
+    let card_date = card.at("date", default: none)
+    let resolved_date = if card_date == none or card_date == "" {
+      datetime.today()
+    } else {
+      card_date
+    }
     indorsement(
       from: card.at("from", default: ""),
       to: card.at("for", default: ""),
@@ -78,10 +93,9 @@
       ..if "attachments" in card { (attachments: card.attachments) },
       ..if "cc" in card { (cc: card.cc) },
       format: card.at("format", default: "standard"),
-      ..if "date" in card { (date: card.date) },
+      date: resolved_date,
       ..if "action" in card { (action: card.action) },
-    )[
-      #card.BODY
-    ]
+      body_content,
+    )
   }
 }