@airmark/quiver 0.30.0 → 0.32.0

package/quills/usaf_memo/0.3.0/Quill.yaml

@@ -112,7 +112,6 @@ main:
     classification:
       type: enum
       values:
-        - ""
         - UNCLASSIFIED
         - CUI
         - CONFIDENTIAL
@@ -123,6 +122,28 @@ main:
         group: classification
         compact: true
       description: "Select the classification marking shown in the header and footer banner. Unclassified documents typically omit this banner entirely — leave blank unless the document is CUI or classified. Mark per DAFI 16-1404 (DoDM 5200.48 for CUI) and applicable DoD guidance."
+      variants:
+        CUI:
+          controlled_by:
+            type: plaintext
+            inline: true
+            example: SAF/AA
+            description: "Office or organization that designated this information as CUI. Required by DoDM 5200.48."
+          poc:
+            type: plaintext
+            inline: true
+            example: "Capt J. Smith, DSN 555-1234, john.smith@us.af.mil"
+            description: "Point of contact for CUI questions. Required by DoDM 5200.48."
+          category:
+            type: plaintext
+            inline: true
+            default: ""
+            description: "CUI category from the DoD CUI Registry (e.g., 'Privacy/MED', 'CTI', 'PRVCY'). Leave blank to omit."
+          limited_dissemination:
+            type: plaintext
+            inline: true
+            default: ""
+            description: "Limited dissemination control shown in the indicator block (e.g., 'FEDONLY', 'NOFORN'). Independent from the banner suffix."
 
     dissemination:
       type: plaintext
@@ -133,42 +154,6 @@ main:
         compact: true
       description: "Banner dissemination suffix appended after double slash (e.g. 'NF' renders as CUI//NF in the header/footer). Leave blank for no suffix."
 
-    cui_controlled_by:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "Office or organization that designated this information as CUI (e.g., 'SAF/AA'). Required by DoDM 5200.48 when classification is CUI."
-
-    cui_category:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "CUI category from the DoD CUI Registry (e.g., 'Privacy/MED', 'CTI', 'PRVCY'). Leave blank to omit."
-
-    cui_limited_dissemination:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "Limited dissemination control shown in the indicator block (e.g., 'FEDONLY', 'NOFORN'). Independent from the banner suffix above."
-
-    cui_poc:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "Point of contact for CUI questions (e.g., 'Capt J. Smith, DSN 555-1234, john.smith@us.af.mil'). Required by DoDM 5200.48 when classification is CUI."
-
     references:
       type: array
       items:
@@ -291,26 +276,22 @@ card_kinds:
         ui:
           group: additional
           compact: true
-        description: "'standard' (formal, same page), 'informal' (less formal routing), or 'separate_page' (begins on a new page)."
+        description: "'standard' (formal, same page), 'informal' (less formal routing), or 'separate_page' (begins on a new page). 'informal' prints no header, so an informal indorsement with an empty body is nothing but a signature block — it has no text of its own to hold it to the page, and can open a page alone. Give it a body or an action, or use 'standard'."
       action:
         type: enum
         values:
-          - ""
           - undecided
           - approve
           - disapprove
-          - undecided_concur
-          - concur
-          - nonconcur
         default: ""
         ui:
           group: additional
           compact: true
-        description: "Decision taken by the endorser, shown as an either/or line with the choice circled. Leave blank to hide the line entirely. Approval authority: 'approve' or 'disapprove' (use 'undecided' to print Approve/Disapprove for the endorser to circle by hand). Coordinating official: 'concur' or 'nonconcur' (use 'undecided_concur' to print Concur/Nonconcur unmarked)."
+        description: "Decision taken by the endorser, shown as an either/or line with the choice underlined and the rejected option struck out. Leave blank to hide the line entirely. The wording is automatic: the last indorsement is the approval authority and reads Approve/Disapprove, while every earlier one is a coordinating official and reads Concur/Nonconcur. Use 'undecided' to print the pair unmarked for the endorser to mark by hand."
       date:
         type: date
         default: ""
         ui:
           group: additional
           compact: true
-        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 render a fill-in line for the endorser to date by hand when signing."
+        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 render a fillable PDF text field for the endorser to type the date into when signing."

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

@@ -308,35 +308,40 @@
       // `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 {
+        // AFH 33-337 "Signature Block": "Do not place the signature element on a
+        // continuation page by itself." The signature block that follows has no
+        // keep-with-previous of its own — Typst has no such property — so the
+        // anchor comes from this side: a sticky last element is carried onto the
+        // next page along with the signature instead of breaking away from it.
+        //
+        // Bounded, because a sticky block does not *split* at a page boundary,
+        // it relocates whole; applied to a half-page block that turns an
+        // ordinary mid-paragraph break into a wholesale jump. A third of the
+        // text block covers what a memorandum actually ends on — a closing
+        // paragraph, a short table — while leaving the long block to be divided
+        // by the break as before, which leaves its own tail on the continuation
+        // page for the signature to sit under.
+        //
+        // The budget is a fixed fraction rather than the space actually left
+        // below this element, which is the question one would rather ask. A
+        // position-dependent test cannot be answered honestly here: on the first
+        // layout pass `here()` resolves against an empty introspector and reports
+        // the top of the page, so every element measures as fitting and
+        // relocates — and from the top of its new page the same test agrees, so
+        // the wrong answer is a fixed point that later passes never revisit.
+        //
+        // (The superseded rule was sticky under four lines, reading §11 — "avoid
+        // dividing a paragraph of less than four lines between two pages" — as
+        // if it governed the signature. It does not; it governs how a paragraph
+        // may be divided. All the four-line gate did was leave every body ending
+        // in a longer paragraph, or in a table, free to strand its signature.)
         let available_width = page.width - spacing.margin * 2
-
-        // Use the shared measured line stride used by blank-line spacing.
-        let line_height = {
-          let cached = LINE_STRIDE.get()
-          if cached != none {
-            cached
-          } else {
-            let one-line = measure(par(spacing: 0pt)[x]).height
-            measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
-          }
-        }
-        // Calculate last item's height
-        let par_height = measure(final_par, width: available_width).height
-
-        let estimated_lines = calc.ceil(par_height / line_height)
-
-        if estimated_lines < 4 {
-          // Short content (< 4 lines): make sticky to keep with signature
-          block(sticky: true)[#final_par]
-        } else {
-          // Longer content (≥ 4 lines): use default breaking behavior
-          block(breakable: true)[#final_par]
-        }
+        let relocation_budget = (page.height - spacing.margin * 2) / 3
+        let element_height = measure(final_par, width: available_width).height
+        block(sticky: element_height <= relocation_budget)[#final_par]
       } else {
         // Wrap every non-last emission in a plain block so the document-wide
         // `set block(above: spacing.line)` rule contributes the same 0.5em

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

@@ -20,14 +20,22 @@
   signature_blank_lines: 4,
   signing_field: none,
   date: none,
+  // Fill-in widget for an omitted `date`, anchored in the date slot of the
+  // indorsement header (see `date-placeholder-slot`). `none` leaves the slot
+  // blank.
+  date_field: none,
   // Format of indorsement: "standard" (same page), "informal" (no header), or "separate_page" (starts on new page)
   format: "standard",
   // Decision action. `none` (default) displays no action line at all.
-  // Approval authority pair: "approve" or "disapprove" circles the selected
-  // option; "undecided" displays the pair with neither circled.
-  // Coordination pair: "concur" or "nonconcur" circles the selected option;
-  // "undecided_concur" displays the pair with neither circled.
+  // "approve" or "disapprove" underlines the selected option and strikes the
+  // other; "undecided" displays the pair with neither marked.
   action: none,
+  // Role this indorsement plays in the coordination chain, which selects the
+  // wording of the action line: the approval authority (the last indorsement
+  // in the chain) Approves / Disapproves, every coordinating official before
+  // it Concurs / Nonconcurs. The caller owns this because only it can see
+  // whether further indorsements follow.
+  approval_authority: false,
   content,
 ) = {
   // Validate format parameter
@@ -79,7 +87,7 @@
       let indorsement_number = counters.indorsement.get().at(0, default: 1)
       let indorsement_label = format-indorsement-number(indorsement_number)
 
-      let ind_date = align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) } else { date-placeholder-line() }]
+      let ind_date = align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) } else { date-placeholder-slot(date_field) }]
 
       // Separate-page header body: restates the original memo's identity (FROM,
       // date, subject) on its own line, since the indorsement no longer shares a
@@ -156,7 +164,11 @@
 
   // Show action line only when an action decision is set (not `none`)
   if effective_action != none {
-    render-action-line(effective_action, trailing-blank-line: not body_empty)
+    render-action-line(
+      effective_action,
+      approval-authority: approval_authority,
+      trailing-blank-line: not body_empty,
+    )
   }
 
   if not body_empty {

package/quills/usaf_memo/0.3.0/packages/tonguetoquill-usaf-memo/src/lib.typ

@@ -55,3 +55,4 @@
 #import "mainmatter.typ": mainmatter
 #import "backmatter.typ": backmatter
 #import "indorsement.typ": indorsement
+#import "utils.typ": date-pattern

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

@@ -224,9 +224,6 @@
 
 #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.
-  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
@@ -240,6 +237,13 @@
       let w = measure(text(hyphenate: false, line)).width
       if w > widest { widest = w }
     }
+    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 }
+    }
     // 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.
@@ -251,18 +255,30 @@
       default-pad
     }
     block(breakable: false)[
+      #let gap = stride * signature-blank-lines
+      // AFH 33-337: "fifth line below the last line of text" = four blank lines
+      // between the text and the signature block. Carried INSIDE the
+      // unbreakable block rather than emitted ahead of it, which keeps the gap
+      // and the block one indivisible unit. The total space above the block is
+      // identical either way — `block.above` still contributes the same 0.5em —
+      // but a gap left outside can be consumed at the foot of one page while
+      // the block starts at the top margin of the next, which is also what put
+      // the signing field off the page (see below).
+      #v(gap)
       #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 }
-        }
+        // The signing field covers those blank lines — where a signature is
+        // actually written — so it is placed over the gap. With the gap inside
+        // the block that is a downward offset from the block's own origin, and
+        // the field therefore travels with the block onto whatever page it
+        // lands on. The superseded form placed it at a NEGATIVE dy, reaching
+        // above the block into space that belongs to the previous page: when
+        // the block started at the top margin, the field was painted into the
+        // header band over the page number and the classification banner, or
+        // off the sheet entirely.
         place(
           dx: left-pad,
-          dy: -(stride * signature-blank-lines),
-          box(width: body-width - left-pad, height: stride * signature-blank-lines, signing-field),
+          dy: 0pt,
+          box(width: body-width - left-pad, height: gap, signing-field),
         )
       }
       #align(left)[
@@ -290,37 +306,46 @@
 // plays in a coordination chain: coordinating officials Concur / Nonconcur,
 // while the final approval authority Approves / Disapproves.
 //
-// Each pair also has an "undecided" form that renders both options plain, for
-// printing a memo the endorser circles by hand when signing.
+// Which pair prints is not the endorser's to choose — it follows from the
+// role, so the caller supplies the role via `approval-authority` and the same
+// three `action` values (affirm, reject, or leave open) carry over both pairs.
+//
+// The "undecided" form renders both options plain, for printing a memo the
+// endorser marks by hand when signing.
 //
 // Empty/none suppression is handled by the caller before this is invoked.
 
-// Maps each `action` value to the option pair it renders and the index of the
-// selected option within that pair (`none` selects neither).
-#let ACTION_FORMS = (
-  "undecided": (("Approve", "Disapprove"), none),
-  "approve": (("Approve", "Disapprove"), 0),
-  "disapprove": (("Approve", "Disapprove"), 1),
-  "undecided_concur": (("Concur", "Nonconcur"), none),
-  "concur": (("Concur", "Nonconcur"), 0),
-  "nonconcur": (("Concur", "Nonconcur"), 1),
+// The option pair for each role, ordered (affirmative, negative).
+#let APPROVAL_OPTIONS = ("Approve", "Disapprove")
+#let COORDINATION_OPTIONS = ("Concur", "Nonconcur")
+
+// Maps each `action` value to the index of the option it selects within
+// whichever pair is rendered (`none` selects neither).
+#let ACTION_SELECTIONS = (
+  "undecided": none,
+  "approve": 0,
+  "disapprove": 1,
 )
 
-#let render-action-line(action, trailing-blank-line: true) = {
+#let render-action-line(action, approval-authority: false, trailing-blank-line: true) = {
   assert(
-    action in ACTION_FORMS,
-    message: "action must be one of " + ACTION_FORMS.keys().map(k => "\"" + k + "\"").join(", "),
+    action in ACTION_SELECTIONS,
+    message: "action must be one of " + ACTION_SELECTIONS.keys().map(k => "\"" + k + "\"").join(", "),
   )
-  let (options, selected) = ACTION_FORMS.at(action)
-  // Circle the selected option using a box with rounded corners; strike the
-  // one it was chosen over. When neither is selected both render plain.
-  // Use baseline parameter to maintain vertical text alignment.
+  let options = if approval-authority { APPROVAL_OPTIONS } else { COORDINATION_OPTIONS }
+  let selected = ACTION_SELECTIONS.at(action)
+  // Underline the selected option; strike the one it was chosen over. When
+  // neither is selected both render plain. An underline keeps the option on
+  // the line's own baseline — the box it replaces had to be nudged with
+  // `baseline` to sit straight — and reads as a mark made on the page, where a
+  // ruled rectangle in a PDF carrying real AcroForm widgets reads as one more
+  // fillable field.
   let render-option(index) = {
     let option = options.at(index)
     if selected == none {
       option
     } else if selected == index {
-      box(stroke: 0.5pt + black, radius: 2pt, inset: 2pt, baseline: 2pt)[#option]
+      underline(option)
     } else {
       strike(option)
     }

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

@@ -129,17 +129,24 @@
   ]
 }
 
+/// The date pattern a memo style prints, per AFH 33-337. Exported so a caller
+/// that pre-formats the date matches this package instead of restating it.
+///
+/// - memo-style (str): `"usaf"` or `"daf"`
+/// -> str
+#let date-pattern(memo-style: "usaf") = if memo-style == "daf" {
+  "[month repr:long] [day padding:none], [year]"
+} else {
+  "[day padding:none] [month repr:long] [year]"
+}
+
 /// Formats a date for the memo heading.
 ///
-/// Dispatches on the shape a date field can arrive in:
-/// - str: shown as-is (fixed text like a placeholder).
-/// - datetime: a native Typst datetime (e.g. `datetime.today()`) — USAF style
-///   `DD Month YYYY`, DAF style `Month DD, YYYY`.
-/// - dict: a Quillmark `date`/`datetime` field lowers to a click-to-edit value
-///   object `{ value: datetime, display: closure }`; `display` is a stored closure
-///   over `.display`, so call it through parentheses — a dict has no `.display` method.
+/// - str, content: shown as-is (a fixed placeholder, or ink the caller already
+///   formatted through [`date-pattern`]).
+/// - datetime: USAF style `DD Month YYYY`; DAF style `Month DD, YYYY`.
 ///
-/// - date (str | datetime | dict): Date to format for display
+/// - date (str | content | datetime): Date to format for display
 /// - memo-style (str): `"usaf"` or `"daf"`
 /// -> content
 #let display-date(date, memo-style: "usaf") = {
@@ -147,40 +154,41 @@
     memo-style in ("usaf", "daf"),
     message: "memo-style for display-date must be \"usaf\" or \"daf\"",
   )
-  if type(date) == str {
+  // A caller that pre-formatted — to keep a click-to-edit region the package
+  // cannot mint itself — passes the finished ink through untouched.
+  if type(date) in (str, content) {
     date
   } else {
-    let pattern = if memo-style == "daf" {
-      "[month repr:long] [day padding:none], [year]"
-    } else {
-      "[day padding:none] [month repr:long] [year]"
-    }
-    if type(date) == datetime {
-      date.display(pattern)
-    } else {
-      (date.display)(pattern)
-    }
+    date.display(date-pattern(memo-style: memo-style))
   }
 }
 
-/// Renders a horizontal rule sized to fit a handwritten date.
-///
-/// Used for indorsements whose signing date is unknown at compile time: the
-/// endorser writes the date on the line by hand when signing. The rule sits at
-/// the baseline with one line of height above it so handwritten text can be
-/// written on the line without colliding with surrounding header text.
-///
-/// - width (length): Length of the fill-in rule; defaults to fit a long date
-///   such as "15 September 2026".
+/// Reserves the space a date occupies, for a date unknown at compile time.
+///
+/// Used for indorsements whose signing date is not known when the memo is
+/// rendered: the endorser supplies it after the fact. The reserved box is one
+/// line tall and sits on the baseline, so the slot lines up with where a
+/// printed date would sit and takes exactly the space one would take.
+///
+/// `field` is the caller's fill-in widget — the Quillmark helper's
+/// `form-field(.., type: "text")`, which lowers to a fillable AcroForm text box
+/// in PDF output. It is anchored at the slot's top-left corner, the corner the
+/// widget's own rectangle grows right and down from, so a widget declared at
+/// this slot's dimensions covers it exactly. `none` (a caller with no widget to
+/// give, e.g. the package used outside Quillmark) leaves the slot blank.
+///
+/// - field (content | none): Fill-in widget to anchor in the slot
+/// - width (length): Width of the slot; defaults to fit a long date such as
+///   "15 September 2026".
 /// -> content
-#let date-placeholder-line(width: 1in) = box(
+#let date-placeholder-slot(field, width: 1in) = box(
   width: width,
   height: 1em,
-  // Keep the rule on the line's baseline so it aligns with where the printed
-  // date would sit. The 1em box height reserves the writing space above it.
-  // (A positive baseline shift would drop the rule a full line too low.)
+  // Keep the slot's bottom edge on the line's baseline, where the printed date
+  // would sit; the 1em height then reserves the line above it.
+  // (A positive baseline shift would drop the box a full line too low.)
   baseline: 0pt,
-  stroke: (bottom: 0.5pt + black),
+  if field != none { place(top + left, field) },
 )
 
 /// Gets the banner color for a classification marking.