@airmark/quiver 0.30.0 → 0.31.0

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,6 +20,10 @@
   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.
@@ -79,7 +83,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

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)[

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

@@ -163,24 +163,32 @@
   }
 }
 
-/// 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.

package/quills/usaf_memo/0.3.0/plate.typ

@@ -1,4 +1,4 @@
-#import "@local/quillmark-helper:0.1.0": data, signature-field
+#import "@local/quillmark-helper:0.1.0": data, form-field, signature-field
 #import "@local/tonguetoquill-usaf-memo:4.0.0": backmatter, frontmatter, indorsement, mainmatter
 
 // The letterhead arrives as one ordered array of lines. Element 0 is the title,
@@ -8,54 +8,64 @@
 // leaves no glyphs and takes no space from the flow, and the seal stands alone.
 #let letterhead_lines = data.letterhead_title
 
+// Body text size, in points. Also the height of one line of the indorsement
+// header, which is what an omitted indorsement date reserves for its fill-in
+// widget (`date-placeholder-slot`, whose slot is `1em` tall and 1in wide).
+#let body_font_size = data.font_size * 1pt
+
 // Frontmatter configuration
 #show: frontmatter.with(
   // Letterhead configuration
   letterhead_title: letterhead_lines.at(0, default: ""),
   letterhead_caption: if letterhead_lines.len() > 1 { letterhead_lines.slice(1) } else { () },
-  letterhead_seal_subtitle: data.at("letterhead_seal_subtitle", default: none),
-  letterhead_seal: image(
-    if data.at("letterhead_seal", default: "dow") == "dod" {
-      "assets/dod_seal.png"
-    } else {
-      "assets/dow_seal.png"
-    }
-  ),
+  letterhead_seal_subtitle: data.letterhead_seal_subtitle,
+  // Enum blank is `""`, not a seal. Omit so the package renders none rather
+  // than treating the blank as DoW.
+  ..if data.letterhead_seal != "" {
+    (letterhead_seal: image(
+      if data.letterhead_seal == "dod" {
+        "assets/dod_seal.png"
+      } else {
+        "assets/dow_seal.png"
+      }
+    ))
+  },
 
   // Date
-  date: data.at("date", default: none),
+  date: data.date,
 
   // Receiver information
   memo_for: data.memo_for,
 
   // Sender information (omitted for Memorandum for Record)
-  ..if data.at("memo_from", default: ()).len() > 0 { (memo_from: data.memo_from) },
+  ..if data.memo_from.len() > 0 { (memo_from: data.memo_from) },
 
   // Subject line
   subject: data.subject,
 
   // Optional references
-  ..if "references" in data { (references: data.references) },
+  ..if data.references.len() > 0 { (references: data.references) },
 
   // Optional footer tag line
-  ..if "tag_line" in data { (footer_tag_line: data.tag_line) },
+  footer_tag_line: data.tag_line,
 
   // Optional classification level
-  ..if "classification" in data { (classification_level: data.classification) },
+  ..if data.classification != "" { (classification_level: data.classification) },
 
-  ..if "dissemination" in data { (dissemination: data.dissemination) },
+  dissemination: data.dissemination,
 
   // CUI designation indicator block fields (DoDM 5200.48)
-  ..if "cui_controlled_by" in data { (cui_controlled_by: data.cui_controlled_by) },
-  ..if "cui_category" in data { (cui_category: data.cui_category) },
-  ..if "cui_limited_dissemination" in data { (cui_limited_dissemination: data.cui_limited_dissemination) },
-  ..if "cui_poc" in data { (cui_poc: data.cui_poc) },
+  cui_controlled_by: data.cui_controlled_by,
+  cui_category: data.cui_category,
+  cui_limited_dissemination: data.cui_limited_dissemination,
+  cui_poc: data.cui_poc,
 
-  // USAF vs DAF memorandum style (date format, body indentation)
-  memo_style: data.at("memo_style", default: "usaf"),
+  // USAF vs DAF memorandum style (date format, body indentation). Blank
+  // falls through to the package's `"usaf"` default.
+  ..if data.memo_style != "" { (memo_style: data.memo_style) },
 
   // Font size
-  font_size: data.at("font_size", default: 12) * 1pt,
+  font_size: body_font_size,
 
   // List recipients in vertical list
   memo_for_cols: 1,
@@ -76,18 +86,18 @@
   signing_field: signature-field("Signature", field: "signature_block"),
 
   // Optional cc
-  ..if "cc" in data { (cc: data.cc) },
+  ..if data.cc.len() > 0 { (cc: data.cc) },
 
   // Optional distribution
-  ..if "distribution" in data { (distribution: data.distribution) },
+  ..if data.distribution.len() > 0 { (distribution: data.distribution) },
 
   // Optional attachments
-  ..if "attachments" in data { (attachments: data.attachments) },
+  ..if data.attachments.len() > 0 { (attachments: data.attachments) },
 )
 
 // Indorsements - iterate through CARDS array and filter by CARD tag
 #for (i, card) in data.at("$cards").enumerate() {
-  if card.at("$kind") == "indorsement" {
+  if card.at("$kind", default: none) == "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
@@ -96,9 +106,9 @@
     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). The signing date is
-    // generally unknown at compile time and filled in by hand, so a blank or
-    // omitted date renders a fill-in line rather than stamping the compile date.
-    let card_date = card.at("date", default: none)
+    // generally unknown at compile time, so a blank or omitted date leaves the
+    // date slot fillable rather than stamping the compile date into it.
+    let card_date = card.date
     let resolved_date = if card_date == none or card_date == "" {
       none
     } else {
@@ -118,9 +128,22 @@
         "Ind_" + str(i) + "_Signature",
         field: card.at("$path") + "signature_block",
       ),
-      format: card.at("format", default: "standard"),
+      ..if card.format != "" { (format: card.format) },
       date: resolved_date,
-      ..if "action" in card { (action: card.action) },
+      // An omitted date becomes an empty AcroForm text box the endorser types
+      // the signing date into, sized to the slot the package reserves for it.
+      // Built only when there is no date to print: a widget over a printed date
+      // would offer an edit that the rendered document does not carry back.
+      ..if resolved_date == none {
+        (date_field: form-field(
+          "Ind_" + str(i) + "_Date",
+          type: "text",
+          width: 1in,
+          height: body_font_size,
+          field: card.at("$path") + "date",
+        ))
+      },
+      ..if card.action != "" { (action: card.action) },
       body_content,
     )
   }