@airmark/quiver 0.35.6 → 0.35.8

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -9,260 +9,230 @@ typst:
 
 main:
   description: Top-level body paragraphs are numbered and nested bullets lettered automatically; do not number them by hand.
-  ui:
-    groups: [addressing, letterhead, classification, additional]
-  fields:
-    memo_for:
-      type: array
-      items:
-        type: string
-      ui:
-        group: addressing
-        compact: true
-      description: "Organization/office symbol in UPPERCASE. To address a specific person, add their rank and name in parentheses (e.g., 'ORG/SYMBOL (LT COL JANE DOE)'). For many recipients, enter 'SEE DISTRIBUTION' and list them in the Distribution field."
-
-    memo_from:
-      type: array
-      items:
-        type: string
-      default: []
-      ui:
-        group: addressing
-        compact: true
-      description: "If recipients are on the same installation, use only the office symbol. For recipients on other installations, include the full mailing address, one line each, ending 'City ST 12345-6789', to enable return correspondence. Omit entirely to produce a Memorandum for Record (no MEMO FROM line)."
-
-    subject:
-      type: string
-      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.
-
-    signature_block:
-      type: array
-      items:
-        type: string
-      ui:
-        group: addressing
-        compact: true
-      description: "Line 1: Name in UPPERCASE as signed, grade, and service, as in 'FIRST M. LAST, Capt, USAF'. Line 2: Duty title."
-
-    letterhead_title:
-      type: string
-      default: DEPARTMENT OF THE AIR FORCE
-      ui:
-        group: letterhead
-      description: Change only for Joint Commands or DoW agencies.
-
-    letterhead_caption:
-      type: array
-      items:
-        type: string
-      ui:
-        group: letterhead
-      description: The full organization name of your unit, as in HEADQUARTERS 123D EXAMPLE WING.
-
-    letterhead_seal:
-      type: enum
-      values:
-        - dow
-        - dod
-      default: dow
-      ui:
-        group: letterhead
-        compact: true
-      description: Department of War (DoW) or Department of Defense (DoD) seal shown in the letterhead.
-
-    letterhead_seal_subtitle:
-      type: string
-      default: ""
-      ui:
-        group: letterhead
-        compact: true
-      description: Bold-caps line below the seal; blank to omit.
-
-    tag_line:
-      type: richtext
-      inline: true
-      default: ""
-      ui:
-        group: letterhead
-        compact: true
-      description: "Organizational motto at the bottom of the page. Supports Markdown emphasis (e.g. *italics*, **bold**)."
-
+  sections:
+    addressing:
+      fields:
+        memo_for:
+          type: array
+          items:
+            type: string
+          ui:
+            compact: true
+          description: "Organization/office symbol in UPPERCASE. To address a specific person, add their rank and name in parentheses (e.g., 'ORG/SYMBOL (LT COL JANE DOE)'). For many recipients, enter 'SEE DISTRIBUTION' and list them in the Distribution field."
+
+        memo_from:
+          type: array
+          items:
+            type: string
+          default: []
+          ui:
+            compact: true
+          description: "If recipients are on the same installation, use only the office symbol. For recipients on other installations, include the full mailing address, one line each, ending 'City ST 12345-6789', to enable return correspondence. Omit entirely to produce a Memorandum for Record (no MEMO FROM line)."
+
+        subject:
+          type: string
+          description: Be brief and clear. Capitalize the first letter of each word except articles, prepositions, and conjunctions. Include suspense dates in parentheses if applicable.
+
+        signature_block:
+          type: array
+          items:
+            type: string
+          ui:
+            compact: true
+          description: "Line 1: Name in UPPERCASE as signed, grade, and service, as in 'FIRST M. LAST, Capt, USAF'. Line 2: Duty title."
+    letterhead:
+      fields:
+        letterhead_title:
+          type: string
+          default: DEPARTMENT OF THE AIR FORCE
+          description: Change only for Joint Commands or DoW agencies.
+
+        letterhead_caption:
+          type: array
+          items:
+            type: string
+          description: The full organization name of your unit, as in HEADQUARTERS 123D EXAMPLE WING.
+
+        letterhead_seal:
+          type: enum
+          values:
+            - dow
+            - dod
+          default: dow
+          ui:
+            compact: true
+          description: Department of War (DoW) or Department of Defense (DoD) seal shown in the letterhead.
+
+        letterhead_seal_subtitle:
+          type: string
+          default: ""
+          ui:
+            compact: true
+          description: Bold-caps line below the seal; blank to omit.
+
+        tag_line:
+          type: richtext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "Organizational motto at the bottom of the page. Supports Markdown emphasis (e.g. *italics*, **bold**)."
     classification:
-      type: enum
-      values:
-        - UNCLASSIFIED
-        - CUI
-        - CONFIDENTIAL
-        - SECRET
-        - TOP SECRET
-      default: ""
-      ui:
-        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."
-
-    dissemination:
-      type: string
-      default: ""
-      ui:
-        group: classification
-        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: string
-      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: string
-      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: string
-      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: string
-      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:
-        type: richtext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: "References, auto-lettered (a), (b), (c) per AFH 33-337. Cite each by organization, type, date, and title; italicize publication titles with *asterisks* (standard Markdown emphasis)."
-
-    cc:
-      type: array
-      items:
-        type: string
-      default: []
-      ui:
-        group: additional
-      description: List office symbols of recipients to receive copies; for a person, 'Rank and Name, ORG/SYMBOL'.
-
-    distribution:
-      type: array
-      items:
-        type: string
-      default: []
-      ui:
-        group: additional
-      description: Complete list of recipients if 'SEE DISTRIBUTION' is used in the 'Memo For' field.
+      fields:
+        classification:
+          type: enum
+          values:
+            - UNCLASSIFIED
+            - CUI
+            - CONFIDENTIAL
+            - SECRET
+            - TOP SECRET
+          default: ""
+          ui:
+            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."
+
+        dissemination:
+          type: string
+          default: ""
+          ui:
+            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."
 
-    attachments:
-      type: array
-      items:
-        type: string
-      default: []
-      ui:
-        group: additional
-      description: List attachments in the order they are mentioned in the memo. Briefly describe each and give its date; do not use 'as stated' or abbreviations.
+        cui_controlled_by:
+          type: string
+          default: ""
+          ui:
+            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."
 
-    memo_style:
-      type: enum
-      values:
-        - usaf
-        - daf
-      default: usaf
-      ui:
-        group: additional
-        compact: true
-      description: "USAF memorandum or DAF headquarters memorandum; DAF changes date format and body paragraph layout per AFH 33-337."
+        cui_category:
+          type: string
+          default: ""
+          ui:
+            compact: true
+          description: "CUI category from the DoD CUI Registry (e.g., 'Privacy/MED', 'CTI', 'PRVCY'). Leave blank to omit."
 
-    font_size:
-      type: number
-      default: 12
-      ui:
-        group: additional
-        compact: true
-      description: Body text size in points; decimals allowed (e.g. 11.5).
+        cui_limited_dissemination:
+          type: string
+          default: ""
+          ui:
+            compact: true
+          description: "Limited dissemination control shown in the indicator block (e.g., 'FEDONLY', 'NOFORN'). Independent from the banner suffix above."
 
-    date:
-      type: date
-      default: ""
-      ui:
-        group: additional
-        compact: true
-      description: YYYY-MM-DD. Leave blank to use today's date.
+        cui_poc:
+          type: string
+          default: ""
+          ui:
+            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."
+    additional:
+      fields:
+        references:
+          type: array
+          items:
+            type: richtext
+            inline: true
+          default: []
+          description: "References, auto-lettered (a), (b), (c) per AFH 33-337. Cite each by organization, type, date, and title; italicize publication titles with *asterisks* (standard Markdown emphasis)."
+
+        cc:
+          type: array
+          items:
+            type: string
+          default: []
+          description: List office symbols of recipients to receive copies; for a person, 'Rank and Name, ORG/SYMBOL'.
+
+        distribution:
+          type: array
+          items:
+            type: string
+          default: []
+          description: Complete list of recipients if 'SEE DISTRIBUTION' is used in the 'Memo For' field.
+
+        attachments:
+          type: array
+          items:
+            type: string
+          default: []
+          description: List attachments in the order they are mentioned in the memo. Briefly describe each and give its date; do not use 'as stated' or abbreviations.
+
+        memo_style:
+          type: enum
+          values:
+            - usaf
+            - daf
+          default: usaf
+          ui:
+            compact: true
+          description: "USAF memorandum or DAF headquarters memorandum; DAF changes date format and body paragraph layout per AFH 33-337."
+
+        font_size:
+          type: number
+          default: 12
+          ui:
+            compact: true
+          description: Body text size in points; decimals allowed (e.g. 11.5).
+
+        date:
+          type: date
+          default: ""
+          ui:
+            compact: true
+          description: YYYY-MM-DD. Leave blank to use today's date.
 
 card_kinds:
   indorsement:
     title: Routing indorsement
     description: Chain of routing endorsements. Each endorsement block adds an official response or forwarding action to the original memo.
-    ui:
-      groups: [addressing, additional]
-    fields:
-      from:
-        type: string
-        ui:
-          group: addressing
-          compact: true
-        description: Office symbol or Rank Name of the endorsing official.
-      for:
-        type: string
-        ui:
-          group: addressing
-          compact: true
-        description: Office symbol or organization receiving the endorsed memo.
-      signature_block:
-        type: array
-        items:
-          type: string
-        ui:
-          group: addressing
-          compact: true
-        description: "Line 1: Name in UPPERCASE as signed, grade, and service, as in 'FIRST M. LAST, Capt, USAF'. Line 2: Duty title."
-      format:
-        type: enum
-        values:
-          - standard
-          - informal
-          - separate_page
-        default: standard
-        ui:
-          group: additional
-          compact: true
-        description: "'standard' (formal, same page), 'informal' (less formal routing), or 'separate_page' (begins on a new page)."
-      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)."
-      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."
+    sections:
+      addressing:
+        fields:
+          from:
+            type: string
+            ui:
+              compact: true
+            description: Office symbol or Rank Name of the endorsing official.
+          for:
+            type: string
+            ui:
+              compact: true
+            description: Office symbol or organization receiving the endorsed memo.
+          signature_block:
+            type: array
+            items:
+              type: string
+            ui:
+              compact: true
+            description: "Line 1: Name in UPPERCASE as signed, grade, and service, as in 'FIRST M. LAST, Capt, USAF'. Line 2: Duty title."
+      additional:
+        fields:
+          format:
+            type: enum
+            values:
+              - standard
+              - informal
+              - separate_page
+            default: standard
+            ui:
+              compact: true
+            description: "'standard' (formal, same page), 'informal' (less formal routing), or 'separate_page' (begins on a new page)."
+          action:
+            type: enum
+            values:
+              - undecided
+              - approve
+              - disapprove
+              - undecided_concur
+              - concur
+              - nonconcur
+            default: ""
+            ui:
+              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)."
+          date:
+            type: date
+            default: ""
+            ui:
+              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."

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

@@ -145,6 +145,20 @@
       })
       t
     }
+    // A `qm-table` wrapper's `align` places its table from outside it, so the
+    // placement is buffered with the table, and the emission spans the text
+    // width for it to place the table across.
+    show align: a => if a.body.func() == table {
+      PAR_BUFFER.update(pars => {
+        pars.push((
+          content: a,
+          nest_level: -1,
+          kind: "table",
+        ))
+        pars
+      })
+      none
+    } else { a }
     {
       show heading: h => {
         IS_HEADING.update(true)
@@ -268,7 +282,7 @@
       }
       let final_par = {
         if kind == "table" {
-          render-memo-table(item_content)
+          block(width: 100%, render-memo-table(item_content))
         } 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.2.0/packages/tonguetoquill-usaf-memo/src/frontmatter.typ

@@ -92,6 +92,12 @@
     none
   }
 
+  let tag_line = if falsey(footer_tag_line) {
+    none
+  } else {
+    align(center, text(fill: LETTERHEAD_COLOR, font: "cinzel", size: 15pt)[#footer_tag_line])
+  }
+
   // Document-wide typography settings (inlined from configure())
   set par(leading: spacing.line, spacing: spacing.line, justify: false)
   set block(above: spacing.line, below: 0em, spacing: 0em)
@@ -138,14 +144,11 @@
         )
       }
 
-      if not falsey(footer_tag_line) {
-        place(
-          bottom + center,
-          dy: -0.625in,
-          align(center)[
-            #text(fill: LETTERHEAD_COLOR, font: "cinzel", 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)
+        }
       }
     },
   )
@@ -154,7 +157,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
@@ -166,24 +170,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_memo/0.2.0/packages/tonguetoquill-usaf-memo/src/primitives.typ

@@ -358,7 +358,11 @@
 #let render-memo-table(it) = {
   // AFH 33-337 does not specify table formatting, so we follow the general
   // aesthetic principles of the standard: bold headers for clarity.
-  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),