@airmark/quiver 0.28.0 → 0.29.0

package/README.md

@@ -9,7 +9,8 @@ and aligned to the current Quillmark spec.
 
 | Quill        | Version | Description                                                                       |
 |--------------|---------|-----------------------------------------------------------------------------------|
-| `usaf_memo`  | 0.2.0   | USAF / DAF Official Memorandum (AFH 33-337)                                       |
+| `usaf_memo`  | 0.3.0   | USAF / DAF Official Memorandum (AFH 33-337)                                       |
+| `usaf_memo`  | 0.2.0   | Previous release, retained so documents pinned to `@0.2` keep resolving           |
 | `af4141`     | 0.1.0   | AF Form 4141 — Individual's Record of Duties and Experience (Ground Environment)  |
 | `daf1206`    | 0.1.0   | DAF Form 1206 — Nomination for Award                                              |
 | `daf4392`    | 0.1.0   | DAF Form 4392 — Pre-Departure Safety Briefing (Page 2)                            |
@@ -46,7 +47,7 @@ const quiver = await fromDir(root);
 const engine = new Engine();
 
 const doc = Document.fromMarkdown(`~~~
-$quill: usaf_memo@0.2
+$quill: usaf_memo@0.3
 $kind: main
 memo_for: ["ORG/SYMBOL"]
 memo_from: ["ORG/SYMBOL", "Organization Name", "123 Street Ave", "City ST 12345-6789"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {
@@ -17,8 +17,8 @@
   },
   "devDependencies": {
     "@quillmark/quiver": "0.21.0",
-    "@quillmark/wasm": "^0.103.0",
-    "quillkit": "0.2.0"
+    "@quillmark/wasm": "^0.104.0",
+    "quillkit": "0.2.2"
   },
   "scripts": {
     "test": "quillkit test",

package/quills/daf4392/0.1.0/Quill.yaml

@@ -12,8 +12,8 @@ main:
     enabled: false
   fields:
     transportation_mode:
-      type: string
-      enum: [pmv, airplane, bus, train, motorcycle, other]
+      type: enum
+      values: [pmv, airplane, bus, train, motorcycle, other]
       default: pmv
       description: "Matches the check box."
 

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -80,8 +80,8 @@ main:
       description: The full organization name of your unit.
 
     letterhead_seal:
-      type: string
-      enum:
+      type: enum
+      values:
         - dow
         - dod
       default: dow
@@ -108,8 +108,8 @@ main:
       description: "Organizational motto at the bottom of the page. Supports Markdown emphasis (e.g. *italics*, **bold**)."
 
     classification:
-      type: string
-      enum:
+      type: enum
+      values:
         - ""
         - UNCLASSIFIED
         - CUI
@@ -210,8 +210,8 @@ main:
       description: List attachments in the order they are mentioned in the memo. Briefly describe each; do not use 'as stated' or abbreviations.
 
     memo_style:
-      type: string
-      enum:
+      type: enum
+      values:
         - usaf
         - daf
       default: usaf
@@ -269,8 +269,8 @@ card_kinds:
           compact: true
         description: "Line 1: Name in UPPERCASE as signed, grade, and service. Line 2: Duty title."
       format:
-        type: string
-        enum:
+        type: enum
+        values:
           - standard
           - informal
           - separate_page
@@ -280,17 +280,20 @@ card_kinds:
           compact: true
         description: "'standard' (formal, same page), 'informal' (less formal routing), or 'separate_page' (begins on a new page)."
       action:
-        type: string
-        enum:
+        type: enum
+        values:
           - ""
           - undecided
           - approve
           - disapprove
+          - undecided_concur
+          - concur
+          - nonconcur
         default: ""
         ui:
           group: additional
           compact: true
-        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."
+        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)."
       date:
         type: date
         default: ""

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

@@ -199,6 +199,7 @@
   //   item.kind       — "par", "heading", "table", or "continuation"
   context {
     let heading_buffer = none
+    let heading_level = 0
     // Filter out zero-width paragraphs so that an empty body (e.g. empty
     // string from a KIND with no text) emits nothing and collapses to zero
     // vertical space. Tables are always kept regardless of measured width.
@@ -226,24 +227,36 @@
       let kind = item.kind
       let item_content = item.content
 
-      // Buffer headings for prepend to the next rendered element
-      if kind == "heading" {
-        heading_buffer = item_content
-        continue
-      }
-
-      // Prepend buffered heading to the next non-heading element
+      // A buffered heading runs into this element only when the two belong to
+      // the same item: a later block of this list item ("continuation"), or,
+      // at top level, the next paragraph. The first block of the *next* item,
+      // a table (nest_level −1, so the level test alone excludes it), and
+      // another heading all fail the test, and each would otherwise carry the
+      // heading's text somewhere it was not authored. Those emit the heading
+      // on its own line, the treatment a heading before a table takes.
       if heading_buffer != none {
-        if kind == "table" {
-          // Tables cannot have inline text prepended; emit heading as
-          // a standalone bold line above the table
-          blank-line()
-          strong[#heading_buffer.]
-          heading_buffer = none
-        } else {
+        let runs_in = (
+          kind != "heading"
+            and item.nest_level == heading_level
+            and (heading_level == 0 or kind == "continuation")
+        )
+        if runs_in {
           item_content = [#strong[#heading_buffer.] #item_content]
-          heading_buffer = none
+        } else {
+          if any_emitted { blank-line() }
+          strong[#heading_buffer.]
+          any_emitted = true
         }
+        heading_buffer = none
+      }
+
+      // Buffer this heading for the next element to run into. The level it was
+      // captured at rides along: the run-in test needs it, and the buffer is
+      // read one iteration later, by which time `item` is the *next* element.
+      if kind == "heading" {
+        heading_buffer = item_content
+        heading_level = item.nest_level
+        continue
       }
 
       // Format based on element kind
@@ -336,6 +349,15 @@
         block[#final_par]
       }
     }
+
+    // A heading with nothing after it never ran into anything, and the buffer
+    // dies with the loop unless it is drained here. Sticky for the same reason
+    // the last item is: a standalone heading is one line, so it keeps with the
+    // signature block rather than opening a page alone.
+    if heading_buffer != none {
+      if any_emitted { blank-line() }
+      block(sticky: true)[#strong[#heading_buffer.]]
+    }
   }
 }
 

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

@@ -221,13 +221,12 @@
   render-date-section(actual_date, memo-style: memo_style)
   render-for-section(memo_for, memo_for_cols)
   if not falsey(memo_from) { render-from-section(memo_from) }
-  let single-ref = if type(references) == array and references.len() == 1 {
-    references.at(0)
-  } else {
-    none
-  }
+  // Blank entries are dropped first so a stub `- ` left under `references:`
+  // cannot pass as the lone reference and render an empty `()` after the subject.
+  let refs = compact-references(references)
+  let single-ref = if refs.len() == 1 { refs.at(0) } else { none }
   render-subject-section(subject, inline-reference: single-ref)
-  render-references-section(references)
+  render-references-section(refs)
 
   // AFH 33-337: "Begin text on second line below subject/references".
   // Emitted here (not inside body.typ) so the v() lands at the same lexical

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

@@ -22,9 +22,11 @@
   date: none,
   // Format of indorsement: "standard" (same page), "informal" (no header), or "separate_page" (starts on new page)
   format: "standard",
-  // Approval action: none (default, no action line displayed), "undecided", "approve", or "disapprove".
-  // When set to "undecided", the action line is displayed with neither option circled.
-  // When set to "approve" or "disapprove", the action line is displayed with the selected option circled.
+  // 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.
   action: none,
   content,
 ) = {

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

@@ -39,23 +39,36 @@
   let band-top = -band-height / 2 // puts the band center at dy 0
   let band-center = band-top + band-height / 2
 
+  // The centered title/caption is placed content (not width-constrained), so a
+  // long caption would otherwise render on one line and run underneath the seal.
+  // Bound the caption to the width that stays clear of the seal on both sides
+  // and auto-shrink it to fit: the seal reaches `band-height - corner-overhang`
+  // into the text area, so reserving that plus a gutter on each side keeps the
+  // centered caption from touching the seal. `layout` resolves the text-area
+  // width so the bound tracks the page/margins.
+  let caption-gutter = 0.25in
+  let caption-clear = (band-height - corner-overhang) + caption-gutter
   place(
     dy: 0.625in - spacing.margin,
     box(
       width: 100%,
       fill: none,
       stroke: none,
-      [
-        #place(
-          center + top,
-          align(center)[
-            #set text(12pt, font: font, fill: LETTERHEAD_COLOR, weight: "bold")
-            #title\
-            #v(1pt)
-            #text(10.5pt)[#caption]
-          ],
-        )
-      ],
+      layout(size => place(
+        center + top,
+        align(center)[
+          #set text(12pt, font: font, fill: LETTERHEAD_COLOR, weight: "bold")
+          #title\
+          #v(1pt)
+          #if not falsey(caption) {
+            fit-to-width(
+              size.width - 2 * caption-clear,
+              alignment: center,
+              box(text(10.5pt)[#caption]),
+            )
+          }
+        ],
+      )),
     ),
   )
 
@@ -145,11 +158,32 @@
   )
 }
 
+/// Whether a `references` entry carries no citation text.
+///
+/// Blank entries reach the template routinely: a template author leaves a
+/// stub `- ` under `references:` for the user to fill in, and the quillmark
+/// helper hands back `""` for an unset or whitespace-only markdown field.
+/// Such an entry must not count as a reference — otherwise a lone blank one
+/// satisfies the "exactly one reference" test below and renders as an empty
+/// `()` after the subject.
+///
+/// - entry (any): A single `references` element
+/// -> bool
+#let blank-reference(entry) = falsey(entry) or entry == []
+
+/// Drops `references` entries that carry no citation text and normalizes the
+/// result to an array, so blank placeholder entries neither render on their
+/// own nor affect the inline-vs-block decision.
+///
+/// - references (array | none): Raw reference entries
+/// -> array
+#let compact-references(references) = ensure-array(references).filter(entry => not blank-reference(entry))
+
 // AFH 33-337 "SUBJECT:": "In all uppercase letters place 'SUBJECT:', flush with the
 // left margin, on the second line below the last line of the FROM element"
 #let render-subject-section(subject-text, inline-reference: none) = {
   blank-line()
-  let content = if inline-reference != none {
+  let content = if not blank-reference(inline-reference) {
     [#subject-text (#box(inline-reference))]
   } else {
     [#subject-text]
@@ -163,7 +197,8 @@
 // AFH 33-337: only render References block for two or more references.
 // A single reference is rendered inline after the SUBJECT text instead.
 #let render-references-section(references) = {
-  if type(references) == array and references.len() >= 2 {
+  let references = compact-references(references)
+  if references.len() >= 2 {
     blank-line()
     grid(
       columns: (auto, auto, 1fr),
@@ -245,40 +280,57 @@
 // =============================================================================
 // ACTION LINE RENDERING
 // =============================================================================
-// Renders the Approve / Disapprove action line for indorsement memos.
-// action: "undecided" = both options rendered plain (no circle),
-// "approve" = Approve circled, "disapprove" = Disapprove circled.
+// Renders the decision line for indorsement memos — an "either / or" pair
+// where the endorser's choice is circled and the rejected option struck out.
+//
+// Two option pairs are supported, reflecting the two roles an indorsement
+// 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.
+//
 // 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),
+)
+
 #let render-action-line(action, trailing-blank-line: true) = {
   assert(
-    action in ("undecided", "approve", "disapprove"),
-    message: "action must be \"undecided\", \"approve\", or \"disapprove\"",
+    action in ACTION_FORMS,
+    message: "action must be one of " + ACTION_FORMS.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 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]
+    } else {
+      strike(option)
+    }
+  }
   // No leading blank-line: the caller (indorsement.typ) already emits the
   // header→content gap once. The action line's `block(sticky: true)`
   // additionally inherits `block.above: spacing.line` so the visual gap
   // above matches the gap above a body's first paragraph.
-  // Circle the selected option using a box with rounded corners
-  // Use baseline parameter to maintain vertical text alignment
-  let approve-text = if action == "approve" {
-    box(stroke: 0.5pt + black, radius: 2pt, inset: 2pt, baseline: 2pt)[Approve]
-  } else if action == "disapprove" {
-    strike[Approve]
-  } else {
-    [Approve]
-  }
-  let disapprove-text = if action == "disapprove" {
-    box(stroke: 0.5pt + black, radius: 2pt, inset: 2pt, baseline: 2pt)[Disapprove]
-  } else if action == "approve" {
-    strike[Disapprove]
-  } else {
-    [Disapprove]
-  }
+  //
   // Keep the action line with the following content (body or signature block)
   // 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]
+  block(sticky: true)[#render-option(0) / #render-option(1)]
   // 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

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

@@ -87,6 +87,36 @@
   ]
 }
 
+/// Shrinks content to fit within a maximum width, never enlarging it.
+///
+/// Measures `body` at its current font size and scales it down uniformly only
+/// when it is wider than `width`; content that already fits keeps its set size
+/// (the scale is capped at 100%). Unlike `fit-box`, height flows naturally and
+/// small content is never scaled up. Used for the letterhead caption (unit
+/// designation): a long name is shrunk to the width that clears the seal rather
+/// than running underneath it. Pass a non-wrapping `box` as `body` so the
+/// measured width is the single-line width and the result stays on one line.
+///
+/// Empty content measures 0pt wide and has no scale to compute, so it is returned
+/// as-is rather than divided by; a non-positive `width` likewise admits no scale
+/// that fits, so the body is left at its set size instead of being flipped or
+/// collapsed.
+///
+/// - width (length): Maximum width the content may occupy
+/// - alignment (alignment): Horizontal placement within the reserved width
+/// - body (content): Content to fit (typically a non-wrapping `box`)
+/// -> content
+#let fit-to-width(width, alignment: left, body) = context {
+  let s = measure(body)
+  if s.width <= 0pt or width <= 0pt { return body }
+  let f = calc.min(1, width / s.width) * 100% // ratio, capped so it only shrinks
+  box(width: width)[
+    #align(alignment)[
+      #scale(f, reflow: true)[#body]
+    ]
+  ]
+}
+
 /// Formats a date for the memo heading.
 ///
 /// Dispatches on the shape a date field can arrive in:
@@ -275,7 +305,10 @@
   if value == none {
     ""
   } else if type(value) == array {
-    value.join(separator)
+    // `().join(sep)` is `none`, not `""` — coerce so an empty array keeps the
+    // documented contract and stays `falsey` for callers that test the result.
+    let joined = value.join(separator)
+    if joined == none { "" } else { joined }
   } else {
     str(value)
   }