@airmark/quiver 0.32.0 → 0.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {
@@ -16,9 +16,9 @@
     "node": ">=24"
   },
   "devDependencies": {
-    "@quillmark/quiver": "0.24.0",
-    "@quillmark/wasm": "^0.108.1",
-    "quillkit": "0.5.1"
+    "@quillmark/quiver": "0.27.0",
+    "@quillmark/wasm": "^0.110.0",
+    "quillkit": "0.5.4"
   },
   "scripts": {
     "test": "quillkit test",

package/quills/usaf_memo/0.3.0/Quill.yaml

@@ -15,6 +15,11 @@ main:
       The first paragraph. Top-level paragraphs are auto-numbered; do not add manual numbering.
 
       - Nested bullets are automatically lettered.
+
+      Lines that take no number, letter, or bullet — a roster of names, an address — go in a block quote, typeset as written. End a line with a backslash to break it.
+
+      > FIRST M. LAST, Maj, USAF\
+      > SECOND N. LAST, Capt, USAF
   fields:
     memo_for:
       type: array
@@ -46,13 +51,21 @@ main:
       description: "If recipients are on the same installation, use only the office symbol. For recipients on other installations, include the full mailing address to enable return correspondence. Omit entirely to produce a Memorandum for Record (no MEMO FROM line)."
 
     subject:
-      type: plaintext
+      type: richtext
       inline: true
       example: Subject of the Memorandum
       ui:
         group: addressing
-      description: Be brief and clear. Capitalize the first letter of each word except articles, prepositions, and conjunctions. Include suspense dates in parentheses if applicable.
-
+      description: "Be brief and clear. Capitalize the first letter of each word except articles, prepositions, and conjunctions. Include suspense dates in parentheses if applicable. Italicize publication titles with *asterisks* (standard Markdown emphasis), as in the References field."
+    
+    date:
+      type: date
+      default: ""
+      ui:
+        group: addressing
+        compact: true
+      description: YYYY-MM-DD. Leave blank to use today's date.
+      
     signature_block:
       type: array
       items:
@@ -195,14 +208,14 @@ main:
     attachments:
       type: array
       items:
-        type: plaintext
+        type: richtext
         inline: true
       default: []
       example:
         - Attachment description, YYYY MMM DD
       ui:
         group: additional
-      description: List attachments in the order they are mentioned in the memo. Briefly describe each; do not use 'as stated' or abbreviations.
+      description: "List attachments in the order they are mentioned in the memo. Briefly describe each; do not use 'as stated' or abbreviations. Italicize publication titles with *asterisks* (standard Markdown emphasis), as in the References field."
 
     memo_style:
       type: enum
@@ -223,14 +236,6 @@ main:
         compact: true
       description: Body text size in points; decimals allowed (e.g. 11.5).
 
-    date:
-      type: date
-      default: ""
-      ui:
-        group: additional
-        compact: true
-      description: YYYY-MM-DD. Leave blank to use today's date.
-
 card_kinds:
   indorsement:
     description: Chain of routing endorsements. Each endorsement block adds an official response or forwarding action to the original memo.
@@ -254,6 +259,13 @@ card_kinds:
           group: addressing
           compact: true
         description: Office symbol or organization receiving the endorsed memo.
+      date:
+        type: date
+        default: ""
+        ui:
+          group: addressing
+          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 fillable PDF text field for the endorser to type the date into when signing."
       signature_block:
         type: array
         items:
@@ -288,10 +300,3 @@ card_kinds:
           group: additional
           compact: true
         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 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

@@ -60,6 +60,25 @@
   level-counts
 }
 
+/// The horizontal offset at which a paragraph's *text* sits: its indent plus
+/// the width of the number label that precedes it.
+///
+/// This is where a later block of the same paragraph — a continuation, a block
+/// quote — lines up, so the two callers share one measurement rather than each
+/// spelling it. A top-level paragraph carries no indent and its label is the
+/// left margin itself, so the offset is zero.
+///
+/// - level (int): Nesting level (0-based)
+/// - level-counts (dictionary): Current counter values per level
+/// - indent-fn (function): `(level, level-counts) -> length`
+/// -> length
+#let paragraph-text-offset(level, level-counts, indent-fn) = {
+  if level <= 0 { return 0pt }
+  let current-value = level-counts.at(str(level), default: 1)
+  let number-text = numbering(get-paragraph-numbering-format(level), current-value)
+  indent-fn(level, level-counts) + measure([#number-text#"  "]).width
+}
+
 /// Formats a paragraph (or continuation) with a given indent strategy.
 ///
 /// - body (content): Paragraph content
@@ -69,12 +88,13 @@
 /// - continuation (bool): If true, adds number-label width to alignment
 /// -> content
 #let format-par(body, level, level-counts, indent-fn, continuation: false) = {
-  let indent-width = indent-fn(level, level-counts)
   if continuation {
-    let current-value = level-counts.at(str(level), default: 1)
-    let number-text = numbering(get-paragraph-numbering-format(level), current-value)
-    [#h(indent-width + measure([#number-text#"  "]).width)#body]
+    // Offset the first line only, which is how the numbered paragraph this
+    // block continues is set: its own wrapped lines return to the left margin
+    // too, so the two read as one paragraph.
+    [#h(paragraph-text-offset(level, level-counts, indent-fn))#body]
   } else {
+    let indent-width = indent-fn(level, level-counts)
     let current-value = level-counts.at(str(level), default: 1)
     let number-text = numbering(get-paragraph-numbering-format(level), current-value)
     [#h(indent-width)#number-text#"  "#body]
@@ -145,6 +165,38 @@
       })
       t
     }
+    // Collect block quotes — captured as-is, with paragraph processing kept
+    // out of them. AFH 33-337 numbers paragraphs and letters subparagraphs, and
+    // a body sometimes has to hold lines that are neither: a roster of names, a
+    // quoted passage, an address. The block quote is where an author says so —
+    // its content is emitted verbatim, so nothing inside it takes a number, a
+    // letter, or a bullet.
+    //
+    // Returning `none` rather than the quote is what makes that true: the
+    // quote's own paragraphs are never laid out here, so the `show par` above
+    // never sees them and cannot number them. The buffered body is emitted in
+    // the second pass, where these show rules are out of scope. Typst's own
+    // block-quote framing (padding, attribution) is dropped with the element;
+    // what reaches the page is the author's lines and nothing else.
+    //
+    // The nesting level rides along so a quote inside a list item lines up with
+    // that item's text (see the emission below). @quillmark/wasm 0.109.0 is
+    // what makes that level trustworthy: before it, a container inside a list
+    // item opened at column 0 and terminated the list, so a quote's siblings
+    // came back as top-level paragraphs (#123). It now nests, and this quill
+    // stopped declining the construct with it.
+    show quote.where(block: true): q => context {
+      let nest_level = NEST_DOWN.get().at(0) - NEST_UP.get().at(0)
+      PAR_BUFFER.update(pars => {
+        pars.push((
+          content: q.body,
+          nest_level: nest_level,
+          kind: "quote",
+        ))
+        pars
+      })
+      none
+    }
     {
       show heading: h => {
         IS_HEADING.update(true)
@@ -194,9 +246,9 @@
   // Second pass: consume par buffer
   //
   // PAR_BUFFER item dictionary layout:
-  //   item.content    — the paragraph body or table element
+  //   item.content    — the paragraph body, table element, or block-quote body
   //   item.nest_level — nesting depth (−1 for tables)
-  //   item.kind       — "par", "heading", "table", or "continuation"
+  //   item.kind       — "par", "heading", "table", "continuation", or "quote"
   context {
     let heading_buffer = none
     let heading_level = 0
@@ -230,13 +282,15 @@
       // 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.
+      // a table (nest_level −1, so the level test alone excludes it), a block
+      // quote (verbatim: a heading prepended to it would be ink the author did
+      // not put inside the quote), 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 {
         let runs_in = (
-          kind != "heading"
+          kind not in ("heading", "quote")
             and item.nest_level == heading_level
             and (heading_level == 0 or kind == "continuation")
         )
@@ -269,6 +323,35 @@
       let final_par = {
         if kind == "table" {
           render-memo-table(item_content)
+        } else if kind == "quote" {
+          // A block quote is the body's unlabeled block: no number, no letter,
+          // no bullet — the author's lines as written. It is placed, not
+          // processed, which is what lets a memorandum carry a roster of names,
+          // an address, or a quoted passage without AFH 33-337 numbering
+          // claiming the first line of it.
+          //
+          // Two things are imposed, and both serve that reading.
+          //
+          // Where the block starts: at the offset where the text of the
+          // paragraph it sits in starts, so a quote inside a subparagraph hangs
+          // under that subparagraph's text instead of falling back to the left
+          // margin. `pad` shifts the whole block, where a continuation takes a
+          // first-line `h(..)`: a quote is kept for its line structure, and
+          // lines that wrapped back to the margin would read as a block other
+          // than the one authored. Top level offsets by 0pt — flush at the
+          // margin, where an unnumbered line belongs.
+          //
+          // How its own paragraphs are spaced: `par.leading` and `par.spacing`
+          // are both half an em in a memorandum, so a paragraph break inside
+          // the quote would land on the page as an ordinary line break and read
+          // as one block where the author wrote two. A blank line — what the
+          // body puts between its own paragraphs — keeps that break visible.
+          let quoted = {
+            set par(spacing: spacing.line + line-stride())
+            item_content
+          }
+          let offset = paragraph-text-offset(nest_level, level-counts, indent-fn)
+          if offset == 0pt { quoted } else { pad(left: offset, quoted) }
         } else if kind == "continuation" {
           // Continuation block within a multi-block list item:
           // indent to align with preceding numbered paragraph's text, no new number.

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

@@ -264,23 +264,33 @@
       // 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 {
         // 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.
+        // actually written — so it is placed over the gap. It is placed BEFORE
+        // the gap is emitted: `place` anchors at the current flow position, so
+        // placing it after `v(gap)` anchors the box at the first name line and
+        // paints it down over the printed signature block. Anchored here it
+        // still travels with the block onto whatever page the block lands on,
+        // since the gap is inside the unbreakable block rather than ahead of
+        // it.
+        //
+        // The widget keeps its own size (the helper's default is 50pt tall and
+        // it positions itself, so an `align` around it does nothing) and is
+        // offset to the BOTTOM of the gap: it always ends where the printed
+        // name begins, and whatever the gap has beyond the widget's height
+        // stays clear between the body text and the widget's frame.
+        let widget-height = {
+          let h = measure(signing-field).height
+          if h > 0pt { h } else { 50pt }
+        }
+        let drop = gap - widget-height - 3pt
         place(
           dx: left-pad,
-          dy: 0pt,
-          box(width: body-width - left-pad, height: gap, signing-field),
+          dy: if drop > 0pt { drop } else { 0pt },
+          box(width: body-width - left-pad, height: widget-height, signing-field),
         )
       }
+      #v(gap)
       #align(left)[
         #pad(left: left-pad)[
           #text(hyphenate: false)[

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

@@ -18,26 +18,33 @@
 // Value is a `length` set once in `frontmatter`.
 #let LINE_STRIDE = state("LINE_STRIDE")
 
+/// The height one wrapped line of body text occupies.
+///
+/// Read from `LINE_STRIDE` (cached in `frontmatter`), falling back to an inline
+/// measurement when the cache is unset. Reads state, so callers must already be
+/// in a `context`.
+///
+/// -> length
+#let line-stride() = {
+  let stride = LINE_STRIDE.get()
+  if stride == none {
+    let one-line = measure(par(spacing: 0pt)[x]).height
+    stride = measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
+  }
+  stride
+}
+
 /// Creates vertical spacing equivalent to multiple blank lines.
 ///
 /// Adds `count` wrapped-line strides on top of the natural inter-paragraph
 /// gap, so a blank line occupies exactly the same vertical space as a line
-/// produced by natural paragraph wrapping. The stride is measured from
-/// `LINE_STRIDE` (cached in `frontmatter`) and falls back to an inline
-/// measurement when the cache is unset.
+/// produced by natural paragraph wrapping.
 ///
 /// - count (int): Number of blank lines to create
 /// -> content
 #let blank-lines(count) = {
   if count <= 0 { return }
-  context {
-    let stride = LINE_STRIDE.get()
-    if stride == none {
-      let one-line = measure(par(spacing: 0pt)[x]).height
-      stride = measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
-    }
-    v(stride * count)
-  }
+  context { v(line-stride() * count) }
 }
 
 /// Creates vertical spacing equivalent to one blank line.

package/quills/usaf_memo/0.3.0/plate.typ

@@ -1,4 +1,6 @@
-#import "@local/quillmark-helper:0.1.0": data, display, form-field, signature-field
+#import "@local/quillmark-helper:0.1.0": (
+  data, display, field-region, form-field, signature-field,
+)
 #import "@local/tonguetoquill-usaf-memo:4.0.0": (
   backmatter, date-pattern, frontmatter, indorsement, mainmatter,
 )
@@ -41,9 +43,24 @@
   // but its ink would be born inside the package and carry no schema address.
   // `display` places the field's *content* projection instead: the glyphs are
   // born in the generated helper, so the memo date stays click-to-edit however
-  // deep the package formats it. A blank date yields `none`, which is what
-  // `frontmatter`'s `datetime.today()` fallback keys on.
-  date: display("date", date-pattern(memo-style: memo_style)),
+  // deep the package formats it.
+  //
+  // A blank date means today's, and the plate stamps it rather than falling
+  // through to `frontmatter`'s own `datetime.today()`: package-born ink carries
+  // no address, so the one date a memo never types would be the one date a
+  // preview cannot click. `field-region` claims that ink for the field instead.
+  //
+  // The stamp is markup, not the bare `str` `.display()` returns: a `str` off a
+  // function call carries no source position, and ink with none is unclaimable.
+  date: {
+    let pattern = date-pattern(memo-style: memo_style)
+    let authored = display("date", pattern)
+    if authored != none {
+      authored
+    } else {
+      field-region("date", [#datetime.today().display(pattern)])
+    }
+  },
 
   // Receiver information
   memo_for: data.memo_for,
@@ -102,7 +119,14 @@
 #backmatter(
   // Signature block
   signature_block: data.signature_block,
-  signing_field: signature-field("Signature", field: "signature_block"),
+  // The widget sits at the bottom of AFH 33-337's four blank lines and is
+  // sized to two and a half of them, so the line and a half above it stays
+  // clear of the body text without moving the block off the fifth line.
+  signing_field: signature-field(
+    "Signature",
+    field: "signature_block",
+    height: body_font_size * 2.5,
+  ),
 
   // Optional cc
   ..if data.cc.len() > 0 { (cc: data.cc) },
@@ -167,6 +191,7 @@
       signing_field: signature-field(
         "Ind_" + str(i) + "_Signature",
         field: card.at("$path") + "signature_block",
+        height: body_font_size * 2.5,
       ),
       ..if card.format != "" { (format: card.format) },
       date: resolved_date,