@airmark/quiver 0.25.0 → 0.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -272,6 +272,7 @@ card_kinds:
         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: string
@@ -283,10 +284,12 @@ card_kinds:
         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."
       date:
         type: datetime
         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 use today's date."

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

@@ -65,9 +65,9 @@
   }
   let classification_color = get-classification-level-color(classification_level)
 
-  // Build the CUI designation indicator block (DoDM 5200.48, Table 1).
-  // Rendered in the footer of page 1 only when classification is CUI and at
-  // least one indicator field is provided.
+  // Build the CUI designation indicator block (DoDM 5200.48, Table 1), shown
+  // only for CUI when at least one indicator field is set. Rendered as a
+  // bottom-right page-1 float (see placement below).
   let cui_indicator = if (
     classification_level != none
     and type(classification_level) == str
@@ -75,17 +75,17 @@
   ) {
     let lines = ()
     if cui_controlled_by != none and type(cui_controlled_by) == str and cui_controlled_by.trim() != "" {
-      lines.push([#strong[Controlled By:] #cui_controlled_by.trim()])
+      lines.push([Controlled By: #cui_controlled_by.trim()])
     }
     if cui_category != none and type(cui_category) == str and cui_category.trim() != "" {
-      lines.push([#strong[CUI Category:] #cui_category.trim()])
+      lines.push([CUI Category: #cui_category.trim()])
     }
     let ldc = if cui_limited_dissemination != none and type(cui_limited_dissemination) == str { cui_limited_dissemination.trim() } else { "" }
     if ldc != "" {
-      lines.push([#strong[LDC:] #upper(ldc)])
+      lines.push([LDC: #upper(ldc)])
     }
     if cui_poc != none and type(cui_poc) == str and cui_poc.trim() != "" {
-      lines.push([#strong[POC:] #cui_poc.trim()])
+      lines.push([POC: #cui_poc.trim()])
     }
     if lines.len() > 0 { lines.join(linebreak()) } else { none }
   } else {
@@ -138,25 +138,6 @@
         )
       }
 
-      // DoDM 5200.48 §3: CUI designation indicator block — first page only,
-      // bottom-right corner, above the classification banner.
-      // dy: -0.85in clears the tag line (at -0.625in) and the CUI banner (at -0.375in).
-      // dx: -0.5in pulls it away from the right margin edge for visual breathing room.
-      context if counter(page).get().first() == 1 and cui_indicator != none {
-        place(
-          bottom + right,
-          dy: -0.85in,
-          block(
-            inset: 0pt,
-            {
-              set text(font: DEFAULT_BODY_FONTS, size: 10pt)
-              set par(leading: 0.4em, spacing: 0pt)
-              cui_indicator
-            }
-          )
-        )
-      }
-
       if not falsey(footer_tag_line) {
         place(
           bottom + center,
@@ -169,6 +150,44 @@
     },
   )
 
+  // DoDM 5200.48 §3: CUI designation indicator block — page 1 only, bottom-right
+  // 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.
+  if cui_indicator != none {
+    context {
+      // The box shrink-wraps to its widest line; `set align(left)` keeps the
+      // text flush-left within it, overriding the `align(right)` the placement
+      // below imposes.
+      let indicator_box = box({
+        set text(font: DEFAULT_BODY_FONTS, size: 10pt)
+        set par(leading: 0.4em, spacing: 0pt)
+        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
+      // `box(height: reserved, indicator_box)` overflows *upward* into the body
+      // instead.) The inner `place` adds 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
+      place(
+        bottom + right,
+        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)),
+      )
+    }
+  }
+
   render-letterhead(
     letterhead_title,
     letterhead_caption,