@airmark/quiver 0.35.6 → 0.35.8

package/quills/usaf_letter/0.1.0/Quill.yaml

@@ -9,171 +9,156 @@ typst:
 
 main:
   description: "Write the letter as plain paragraphs; they aren't numbered. Use a block quote for lines that should stay as written, like an address. You can close with your phone number and email."
-  ui:
-    groups: [addressing, letterhead, classification, additional]
-  fields:
-    letter_from:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      ui:
-        group: addressing
-        compact: true
-      description: "Your rank and full name, then your duty title and mailing address, one per line. Don't put a comma between city and state."
-
-    letter_for:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      ui:
-        group: addressing
-        compact: true
-      description: "The recipient's rank and full name, then their duty title and mailing address, one per line. Don't put a comma between city and state."
-
-    salutation:
-      type: plaintext
-      inline: true
-      ui:
-        group: addressing
-        compact: true
-      description: "The greeting, for example 'Dear Major Smith', with no punctuation after the name."
-
-    date:
-      type: date
-      default: ""
-      ui:
-        group: addressing
-        compact: true
-      description: "The date you sign. Leave blank to add a fillable date field to the PDF instead."
-
-    complimentary_close:
-      type: plaintext
-      inline: true
-      default: Sincerely
-      ui:
-        group: addressing
-        compact: true
-      description: "The closing above your signature. 'Sincerely' suits most letters."
-
-    signature_block:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      ui:
-        group: addressing
-        compact: true
-      description: "Your name in uppercase, grade, and service, for example 'FIRST M. LAST, Col, USAF'. A personal letter leaves out the duty title."
-
-    letterhead_title:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      default:
-        - DEPARTMENT OF THE AIR FORCE
-      ui:
-        group: letterhead
-      description: "The letterhead, in uppercase. Keep the first line unless you work for a joint command or a DoW agency, and add your unit's full name on the lines below it."
-
-    letterhead_seal:
-      type: enum
-      values:
-        - dow
-        - dod
-      default: dow
-      ui:
-        group: letterhead
-        compact: true
-      description: "The seal at the top left of the letterhead: Department of War or Department of Defense."
-
-    letterhead_seal_subtitle:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: letterhead
-        compact: true
-      description: "An optional line in bold capitals under the seal."
-
-    tag_line:
-      type: richtext
-      inline: true
-      default: ""
-      ui:
-        group: letterhead
-        compact: true
-      description: "Your unit's motto, centered at the bottom of every page."
+  sections:
+    addressing:
+      fields:
+        letter_from:
+          type: array
+          items:
+            type: plaintext
+            inline: true
+          ui:
+            compact: true
+          description: "Your rank and full name, then your duty title and mailing address, one per line. Don't put a comma between city and state."
 
-    classification:
-      type: enum
-      values:
-        - UNCLASSIFIED
-        - CUI
-        - CONFIDENTIAL
-        - SECRET
-        - TOP SECRET
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "The classification banner at the top and bottom of every page. Leave blank for an unclassified document."
-      variants:
-        CUI:
-          controlled_by:
+        letter_for:
+          type: array
+          items:
             type: plaintext
             inline: true
-            description: "The office that designated this information as CUI, for example 'SAF/AA'."
-          poc:
+          ui:
+            compact: true
+          description: "The recipient's rank and full name, then their duty title and mailing address, one per line. Don't put a comma between city and state."
+
+        salutation:
+          type: plaintext
+          inline: true
+          ui:
+            compact: true
+          description: "The greeting, for example 'Dear Major Smith', with no punctuation after the name."
+
+        date:
+          type: date
+          default: ""
+          ui:
+            compact: true
+          description: "The date you sign. Leave blank to add a fillable date field to the PDF instead."
+
+        complimentary_close:
+          type: plaintext
+          inline: true
+          default: Sincerely
+          ui:
+            compact: true
+          description: "The closing above your signature. 'Sincerely' suits most letters."
+
+        signature_block:
+          type: array
+          items:
             type: plaintext
             inline: true
-            description: "Who to contact with questions about this CUI, with phone and email, for example 'Capt J. Smith, DSN 555-1234, john.smith@us.af.mil'."
-          category:
+          ui:
+            compact: true
+          description: "Your name in uppercase, grade, and service, for example 'FIRST M. LAST, Col, USAF'. A personal letter leaves out the duty title."
+    letterhead:
+      fields:
+        letterhead_title:
+          type: array
+          items:
             type: plaintext
             inline: true
-            default: ""
-            description: "The category from the DoD CUI Registry, for example 'CTI' or 'PRVCY'."
-          limited_dissemination:
+          default:
+            - DEPARTMENT OF THE AIR FORCE
+          description: "The letterhead, in uppercase. Keep the first line unless you work for a joint command or a DoW agency, and add your unit's full name on the lines below it."
+
+        letterhead_seal:
+          type: enum
+          values:
+            - dow
+            - dod
+          default: dow
+          ui:
+            compact: true
+          description: "The seal at the top left of the letterhead: Department of War or Department of Defense."
+
+        letterhead_seal_subtitle:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "An optional line in bold capitals under the seal."
+
+        tag_line:
+          type: richtext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "Your unit's motto, centered at the bottom of every page."
+    classification:
+      fields:
+        classification:
+          type: enum
+          values:
+            - UNCLASSIFIED
+            - CUI
+            - CONFIDENTIAL
+            - SECRET
+            - TOP SECRET
+          default: ""
+          ui:
+            compact: true
+          description: "The classification banner at the top and bottom of every page. Leave blank for an unclassified document."
+          variants:
+            CUI:
+              controlled_by:
+                type: plaintext
+                inline: true
+                description: "The office that designated this information as CUI, for example 'SAF/AA'."
+              poc:
+                type: plaintext
+                inline: true
+                description: "Who to contact with questions about this CUI, with phone and email, for example 'Capt J. Smith, DSN 555-1234, john.smith@us.af.mil'."
+              category:
+                type: plaintext
+                inline: true
+                default: ""
+                description: "The category from the DoD CUI Registry, for example 'CTI' or 'PRVCY'."
+              limited_dissemination:
+                type: plaintext
+                inline: true
+                default: ""
+                description: "A dissemination control for the CUI block, for example 'FEDONLY' or 'NOFORN'. To add one to the banner, use Dissemination."
+
+        dissemination:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "A control added to the end of the banner. For example, 'NF' prints as CUI//NF."
+    additional:
+      fields:
+        cc:
+          type: array
+          items:
             type: plaintext
             inline: true
-            default: ""
-            description: "A dissemination control for the CUI block, for example 'FEDONLY' or 'NOFORN'. To add one to the banner, use Dissemination."
+          default: []
+          description: Offices or people receiving a courtesy copy, one per line.
 
-    dissemination:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "A control added to the end of the banner. For example, 'NF' prints as CUI//NF."
-
-    cc:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: Offices or people receiving a courtesy copy, one per line.
-
-    attachments:
-      type: array
-      items:
-        type: richtext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: "Attachments in the order the letter mentions them. Describe each briefly and include its date. Don't write 'as stated'."
-
-    font_size:
-      type: number
-      default: 12
-      ui:
-        group: additional
-        compact: true
-      description: "Body text size in points. The standard is 12."
+        attachments:
+          type: array
+          items:
+            type: richtext
+            inline: true
+          default: []
+          description: "Attachments in the order the letter mentions them. Describe each briefly and include its date. Don't write 'as stated'."
+
+        font_size:
+          type: number
+          default: 12
+          ui:
+            compact: true
+          description: "Body text size in points. The standard is 12."

package/quills/usaf_letter/0.1.0/packages/tonguetoquill-usaf-letter/src/frontmatter.typ

@@ -80,6 +80,12 @@
     none
   }
 
+  let tag-line = if falsey(footer-tag-line) {
+    none
+  } else {
+    align(center, text(fill: LETTERHEAD_COLOR, font: "Spectral SC", size: 15pt)[#footer-tag-line])
+  }
+
   set par(leading: spacing.line, spacing: spacing.line, justify: false)
   set block(above: spacing.line, below: 0em, spacing: 0em)
   set text(font: body-font, size: font-size, fallback: true)
@@ -126,14 +132,11 @@
         )
       }
 
-      if not falsey(footer-tag-line) {
-        place(
-          bottom + center,
-          dy: -0.625in,
-          align(center)[
-            #text(fill: LETTERHEAD_COLOR, font: "Spectral SC", size: 15pt)[#footer-tag-line]
-          ],
-        )
+      // Page 1's tag line rides the indicator block's float when there is one.
+      if tag-line != none {
+        context if cui-indicator == none or here().page() > 1 {
+          place(bottom + center, dy: -0.625in, tag-line)
+        }
       }
     },
   )
@@ -142,7 +145,8 @@
   // corner, dropped into the 0.5in page-edge band. Emitted as a bottom float so
   // it (1) reserves flow space, raising page 1's effective bottom margin so body
   // text never overlaps it, and (2) stays pinned to page 1 — as the first flow
-  // content it can never be bumped to page 2.
+  // content it can never be bumped to page 2. Page 1's tag line stands above the
+  // block in the same float, since both claim the band.
   if cui-indicator != none {
     context {
       // The box shrink-wraps to its widest line; `set align(left)` keeps the
@@ -154,24 +158,35 @@
         set align(left)
         cui-indicator
       })
-      // Reserve only the part of the block inside the text area (`reserved`):
-      // float a box of that height, then `place` the full block inside it pushed
-      // down by `overhang` so the surplus overflows into the edge band. (A bare
+      let block-height = measure(indicator-box).height
+      let tag-gap = 0.125in
+      let stack-height = if tag-line == none {
+        block-height
+      } else {
+        block-height + tag-gap + measure(tag-line, width: page.width - 2 * spacing.margin).height
+      }
+      // Reserve only the part of the stack inside the text area (`reserved`):
+      // float a box of that height, then `place` the stack inside it pushed down
+      // by `overhang` so the surplus overflows into the edge band. (A bare
       // `box(height: reserved, indicator-box)` overflows *upward* into the body
-      // instead.) The inner `place` adds no size, so the box stays `reserved`
+      // instead.) The inner `place`s add no size, so the box stays `reserved`
       // tall and the block's bottom lands 0.5in from the page edge.
       let overhang = spacing.margin - 0.5in
-      let reserved = measure(indicator-box).height - overhang
+      let reserved = stack-height - overhang
       place(
-        bottom + right,
+        bottom,
         float: true,
-        // Slide the right edge into the page-edge band, 0.5in from the border;
-        // the inner place right-aligns the block to that edge.
-        dx: spacing.margin - 0.5in,
         // Minimum gap to the body's last line; the actual gap is larger when the
         // next paragraph can't fit above the block and breaks to the next page.
         clearance: spacing.line,
-        box(height: reserved, place(bottom + right, dy: overhang, indicator-box)),
+        box(width: 100%, height: reserved, {
+          // Slide the block's right edge into the page-edge band, 0.5in from
+          // the border.
+          place(bottom + right, dx: spacing.margin - 0.5in, dy: overhang, indicator-box)
+          if tag-line != none {
+            place(bottom + center, dy: overhang - block-height - tag-gap, tag-line)
+          }
+        }),
       )
     }
   }

package/quills/usaf_letter/0.1.0/packages/tonguetoquill-usaf-letter/src/mainmatter.typ

@@ -76,7 +76,7 @@
   NESTED.update(n => n + 1)
   context {
     let last = BLOCKS.get() == BLOCKS.final()
-    block(above: par.spacing, sticky: last and keeps-signature(it), it)
+    block(above: par.spacing, below: par.spacing, sticky: last and keeps-signature(it), it)
   }
   NESTED.update(n => n - 1)
 }

package/quills/usaf_letter/0.1.0/packages/tonguetoquill-usaf-letter/src/primitives.typ

@@ -197,7 +197,10 @@
 // spaces to the right of page center"
 // AFH 33-337 "Do not place the signature element on a continuation page by itself"
 // AFH 33-337 long-name example: "Signature block adjusted to the left" when a
-// long name would otherwise exceed the right margin.
+// long name would otherwise exceed the right margin. Only the name line moves
+// the block; any other line that runs long wraps, its overflow beginning "under
+// the third character of the line above". The handbook gives no measurement,
+// so the indent is the width of the line's own first two characters.
 //
 // A closing line may open the section above the block, and AFH 33-337 gives it
 // one geometry across the two documents that have one: on the second line below
@@ -215,6 +218,17 @@
 /// -> content | none
 #let format-authority-line(value) = if falsey(value) { none } else { upper(value) }
 
+// A signature line arrives as `str` or as content; the indent measures its text.
+#let plain-text(it) = {
+  if type(it) == str { return it }
+  if type(it) != content { return "" }
+  if it.has("text") { return plain-text(it.text) }
+  if it.has("children") { return it.children.map(plain-text).join(default: "") }
+  if it.has("body") { return plain-text(it.body) }
+  if it.has("child") { return plain-text(it.child) }
+  ""
+}
+
 #let render-signature-block(
   signature-lines,
   closing-line: none,
@@ -234,11 +248,11 @@
   // anchor. pad() is relative to the text area, hence (4.5in - margin).
   let default-pad = 4.5in - spacing.margin
   context {
-    // Measure each line at its rendered settings to detect long-name overflow.
-    // The closing line shares the anchor, so it joins the measurement: the
-    // wider of the two decides the shift and they stay aligned.
+    // Measure the name line at its rendered settings to detect long-name
+    // overflow. The closing line shares the anchor, so it joins the
+    // measurement: the wider of the two decides the shift and they stay aligned.
     let body-width = page.width - 2 * spacing.margin
-    let anchored-lines = signature-lines
+    let anchored-lines = signature-lines.slice(0, calc.min(1, signature-lines.len()))
     if closing-line != none { anchored-lines.push(closing-line) }
     let widest = 0pt
     for line in anchored-lines {
@@ -305,9 +319,9 @@
         #pad(left: left-pad)[
           #text(hyphenate: false)[
             #for line in signature-lines {
-              // AFH 33-337: "indent the next line to begin under the third character
-              // of the line above" — 2-character indent ≈ 1em in Times New Roman 12pt
-              par(hanging-indent: .5em, line)
+              let clusters = plain-text(line).clusters()
+              let lead = clusters.slice(0, calc.min(2, clusters.len())).join()
+              par(hanging-indent: measure(lead).width, line)
             }
             // The page the backmatter compares its own against. Must stay
             // inside the unbreakable block: a marker outside one travels with
@@ -393,7 +407,11 @@
 /// - it (content): The table element to style and render
 /// -> content
 #let render-memo-table(it) = {
-  show table.cell.where(y: 0): set text(weight: "bold")
+  // A headless table's first row is a body row, which Typst also numbers 0.
+  show table: t => if t.children.any(c => c.func() == table.header) {
+    show table.cell.where(y: 0): set text(weight: "bold")
+    t
+  } else { t }
   set table(
     stroke: 0.5pt + black,
     inset: (x: 0.5em, y: 0.4em),

package/quills/usaf_letter/0.1.0/plate.typ

@@ -1,6 +1,4 @@
-#import "@local/quillmark-helper:0.1.0": (
-  data, display, form-field, signature-field,
-)
+#import "@local/quillmark-helper:0.2.0" as qm
 #import "@local/tonguetoquill-usaf-letter:0.1.0": (
   backmatter, date-pattern, frontmatter, mainmatter,
 )
@@ -10,10 +8,10 @@
 // the title alone — the package skips a falsey caption. An empty array renders
 // no letterhead text at all, silently: the block is `place`d, so an empty title
 // leaves no glyphs and takes no space from the flow, and the seal stands alone.
-#let letterhead_lines = data.letterhead_title
+#let letterhead_lines = qm.data.letterhead_title
 
 // Body text size, in points. Also the height of a blank date's fill-in widget.
-#let body_font_size = data.font_size * 1pt
+#let body_font_size = qm.data.font_size * 1pt
 
 // A blank date's fill-in slot: an empty AcroForm text box the signer types the
 // date into, set in the body face and flush right, as the printed date would
@@ -27,7 +25,7 @@
 #let date_slot(name, field) = context box(
   width: date_slot_width,
   height: measure[0].height,
-  place(horizon + left, form-field(
+  place(horizon + left, qm.form-field(
     name,
     type: "text",
     width: date_slot_width,
@@ -42,10 +40,10 @@
 #show: frontmatter.with(
   letterhead-title: letterhead_lines.at(0, default: ""),
   letterhead-caption: if letterhead_lines.len() > 1 { letterhead_lines.slice(1) } else { () },
-  letterhead-seal-subtitle: data.letterhead_seal_subtitle,
+  letterhead-seal-subtitle: qm.data.letterhead_seal_subtitle,
   // A letter has no seal-less state, so the blank takes the default, DoW.
   letterhead-seal: image(
-    if data.letterhead_seal == "dod" {
+    if qm.data.letterhead_seal == "dod" {
       "assets/dod_seal.png"
     } else {
       "assets/dow_seal.png"
@@ -54,7 +52,7 @@
 
   // Date. `data.date` is the native `datetime` and would render identically,
   // 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
+  // `qm.ink` places the field's *content* projection instead: the glyphs are
   // born in the generated helper, so the letter's date stays click-to-edit
   // however deep the package formats it.
   //
@@ -63,33 +61,33 @@
   // than stamped with the compile date. Passing it as the date also keeps it
   // from `frontmatter`'s own `datetime.today()` fallback.
   date: {
-    let authored = display("date", date-pattern())
+    let authored = qm.ink(qm.data, "date", date-pattern())
     if authored != none { authored } else { date_slot("Date", "date") }
   },
 
-  letter-from: data.letter_from,
-  letter-for: data.letter_for,
-  salutation: data.salutation,
+  letter-from: qm.data.letter_from,
+  letter-for: qm.data.letter_for,
+  salutation: qm.data.salutation,
 
-  footer-tag-line: data.tag_line,
+  footer-tag-line: qm.data.tag_line,
 
   // The blank reads as no banner, which is what the package's own
   // `classification-level: none` default means.
-  classification-level: data.classification.value,
+  classification-level: qm.data.classification.value,
 
-  dissemination: data.dissemination,
+  dissemination: qm.data.dissemination,
 
   // CUI designation indicator block fields (DoDM 5200.48). `classification`
   // declares a `CUI` variant, so these four exist only where the discriminant
   // reads CUI, and the branch is what makes reading them total: inside it every
   // declared field of that world is present, outside it none is. The package's
   // own `cui_*: none` defaults cover the worlds that omit them.
-  ..if data.classification.value == "CUI" {
+  ..if qm.data.classification.value == "CUI" {
     (
-      cui-controlled-by: data.classification.controlled_by,
-      cui-category: data.classification.category,
-      cui-limited-dissemination: data.classification.limited_dissemination,
-      cui-poc: data.classification.poc,
+      cui-controlled-by: qm.data.classification.controlled_by,
+      cui-category: qm.data.classification.category,
+      cui-limited-dissemination: qm.data.classification.limited_dissemination,
+      cui-poc: qm.data.classification.poc,
     )
   },
 
@@ -98,24 +96,24 @@
 
 // An empty body reaches the plate as `""`, and `mainmatter` would still set a
 // blank paragraph for it, dropping the close two lines too far.
-#if data.at("$body") != "" {
-  mainmatter[#data.at("$body")]
+#if qm.data.at("$body") != "" {
+  mainmatter[#qm.data.at("$body")]
 }
 
 #backmatter(
-  complimentary-close: data.complimentary_close,
-  signature-block: data.signature_block,
+  complimentary-close: qm.data.complimentary_close,
+  signature-block: qm.data.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 complimentary close without moving the block off the fifth
   // line.
-  signing-field: signature-field(
+  signing-field: qm.signature-field(
     "Signature",
     field: "signature_block",
     height: body_font_size * 2.5,
   ),
 
-  ..if data.attachments.len() > 0 { (attachments: data.attachments) },
+  ..if qm.data.attachments.len() > 0 { (attachments: qm.data.attachments) },
 
-  ..if data.cc.len() > 0 { (cc: data.cc) },
+  ..if qm.data.cc.len() > 0 { (cc: qm.data.cc) },
 )