@airmark/quiver 0.26.0 → 0.28.0

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -2,10 +2,14 @@ quill:
   name: usaf_memo
   version: 0.2.0
   backend: typst
-  plate_file: plate.typ
   description: U.S. Air Force and Space Force Official Memorandum
 
+typst:
+  plate_file: plate.typ
+
 main:
+  ui:
+    groups: [addressing, letterhead, classification, additional]
   body:
     example: |
       The first paragraph. Top-level paragraphs are auto-numbered; do not add manual numbering.
@@ -20,7 +24,8 @@ main:
         - ORG1/SYMBOL
         - ORG2/SYMBOL
       ui:
-        group: Addressing
+        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:
@@ -34,14 +39,15 @@ main:
         - 123 Street Ave
         - City ST 12345-6789
       ui:
-        group: Addressing
+        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 to enable return correspondence. Omit entirely to produce a Memorandum for Record (no MEMO FROM line)."
 
     subject:
       type: string
       example: Subject of the Memorandum
       ui:
-        group: Addressing
+        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:
@@ -52,14 +58,15 @@ main:
         - "FIRST M. LAST, Rank, USAF"
         - Duty Title
       ui:
-        group: Addressing
+        group: addressing
+        compact: true
       description: "Line 1: Name in UPPERCASE as signed, grade, and service. Line 2: Duty title."
 
     letterhead_title:
       type: string
       default: DEPARTMENT OF THE AIR FORCE
       ui:
-        group: Letterhead
+        group: letterhead
       description: Change only for Joint Commands or DoW agencies.
 
     letterhead_caption:
@@ -69,7 +76,7 @@ main:
       example:
         - HEADQUARTERS [UNIT NAME]
       ui:
-        group: Letterhead
+        group: letterhead
       description: The full organization name of your unit.
 
     letterhead_seal:
@@ -79,7 +86,7 @@ main:
         - dod
       default: dow
       ui:
-        group: Letterhead
+        group: letterhead
         compact: true
       description: Department of War (DoW) or Department of Defense (DoD) seal shown in the letterhead.
 
@@ -87,26 +94,19 @@ main:
       type: string
       default: ""
       ui:
-        group: Letterhead
+        group: letterhead
         compact: true
       description: Bold-caps line below the seal; blank to omit.
 
     tag_line:
-      type: markdown
+      type: richtext
+      inline: true
       default: ""
       ui:
-        group: Letterhead
+        group: letterhead
         compact: true
       description: "Organizational motto at the bottom of the page. Supports Markdown emphasis (e.g. *italics*, **bold**)."
 
-    freedom250:
-      type: boolean
-      default: false
-      ui:
-        group: Letterhead
-        compact: true
-      description: Show the America 250 / Freedom 250 commemorative emblem in the letterhead, mirrored opposite the seal.
-
     classification:
       type: string
       enum:
@@ -118,7 +118,7 @@ main:
         - TOP SECRET
       default: ""
       ui:
-        group: Classification
+        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."
 
@@ -126,7 +126,7 @@ main:
       type: string
       default: ""
       ui:
-        group: Classification
+        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."
 
@@ -134,7 +134,7 @@ main:
       type: string
       default: ""
       ui:
-        group: Classification
+        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."
 
@@ -142,7 +142,7 @@ main:
       type: string
       default: ""
       ui:
-        group: Classification
+        group: classification
         compact: true
       description: "CUI category from the DoD CUI Registry (e.g., 'Privacy/MED', 'CTI', 'PRVCY'). Leave blank to omit."
 
@@ -150,7 +150,7 @@ main:
       type: string
       default: ""
       ui:
-        group: Classification
+        group: classification
         compact: true
       description: "Limited dissemination control shown in the indicator block (e.g., 'FEDONLY', 'NOFORN'). Independent from the banner suffix above."
 
@@ -158,20 +158,21 @@ main:
       type: string
       default: ""
       ui:
-        group: Classification
+        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: markdown
+        type: richtext
+        inline: true
       default: []
       example:
         - "AFMAN 33-326, 25 November 2011, *Preparing Official Communications*"
         - "AFI 33-360, *Publications and Forms Management*"
       ui:
-        group: Additional
+        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:
@@ -182,7 +183,7 @@ main:
       example:
         - Rank and Name, ORG/SYMBOL
       ui:
-        group: Additional
+        group: additional
       description: List office symbols of recipients to receive copies.
 
     distribution:
@@ -194,7 +195,7 @@ main:
         - ORG1/SYMBOL
         - ORG2/SYMBOL
       ui:
-        group: Additional
+        group: additional
       description: Complete list of recipients if 'SEE DISTRIBUTION' is used in the 'Memo For' field.
 
     attachments:
@@ -205,7 +206,7 @@ main:
       example:
         - Attachment description, YYYY MMM DD
       ui:
-        group: Additional
+        group: additional
       description: List attachments in the order they are mentioned in the memo. Briefly describe each; do not use 'as stated' or abbreviations.
 
     memo_style:
@@ -215,7 +216,7 @@ main:
         - daf
       default: usaf
       ui:
-        group: Additional
+        group: additional
         compact: true
       description: "USAF memorandum or DAF headquarters memorandum; DAF changes date format and body paragraph layout per AFH 33-337."
 
@@ -223,15 +224,15 @@ main:
       type: number
       default: 12
       ui:
-        group: Additional
+        group: additional
         compact: true
       description: Body text size in points; decimals allowed (e.g. 11.5).
 
     date:
-      type: datetime
+      type: date
       default: ""
       ui:
-        group: Additional
+        group: additional
         compact: true
       description: YYYY-MM-DD. Leave blank to use today's date.
 
@@ -240,18 +241,21 @@ card_kinds:
     description: Chain of routing endorsements. Each endorsement block adds an official response or forwarding action to the original memo.
     ui:
       title: Routing indorsement
+      groups: [addressing, additional]
     fields:
       from:
         type: string
         example: ORG/SYMBOL
         ui:
-          group: Addressing
+          group: addressing
+          compact: true
         description: Office symbol or Rank Name of the endorsing official.
       for:
         type: string
         example: ORG/SYMBOL
         ui:
-          group: Addressing
+          group: addressing
+          compact: true
         description: Office symbol or organization receiving the endorsed memo.
       signature_block:
         type: array
@@ -261,7 +265,8 @@ card_kinds:
           - "FIRST M. LAST, Rank, USAF"
           - Duty Title
         ui:
-          group: Addressing
+          group: addressing
+          compact: true
         description: "Line 1: Name in UPPERCASE as signed, grade, and service. Line 2: Duty title."
       format:
         type: string
@@ -271,7 +276,7 @@ card_kinds:
           - separate_page
         default: standard
         ui:
-          group: Additional
+          group: additional
           compact: true
         description: "'standard' (formal, same page), 'informal' (less formal routing), or 'separate_page' (begins on a new page)."
       action:
@@ -283,13 +288,13 @@ card_kinds:
           - disapprove
         default: ""
         ui:
-          group: Additional
+          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
+        type: date
         default: ""
         ui:
-          group: Additional
+          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."
+        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/indorsement.typ

@@ -77,33 +77,66 @@
       let indorsement_number = counters.indorsement.get().at(0, default: 1)
       let indorsement_label = format-indorsement-number(indorsement_number)
 
+      let ind_date = align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) } else { date-placeholder-line() }]
+
+      // Separate-page header body: restates the original memo's identity (FROM,
+      // date, subject) on its own line, since the indorsement no longer shares a
+      // page with the action document. Rendered as a non-breakable, sticky unit
+      // so it travels to the next page *with* the content it heads rather than
+      // being stranded at the bottom of a page.
+      let separate-page-body = block(breakable: false, sticky: true)[
+        #[#indorsement_label to #original_from, #display-date(original_date, memo-style: memo-style), #original_subject]
+        #blank-line()
+        #grid(columns: (auto, 1fr), ind_from, ind_date)
+        #blank-line()
+        #grid(columns: (auto, auto, 1fr), "MEMORANDUM FOR", "  ", ind_for)
+      ]
+
+      // Standard header: terse "Nth Ind, FROM    date" line, used when the
+      // indorsement stays on the same page as the action document. Same
+      // non-breakable + sticky treatment so the two header lines never split
+      // across a page boundary and never detach from the body/signature below.
+      let standard-header = block(breakable: false, sticky: true)[
+        #blank-line()
+        #grid(columns: (auto, 1fr), [#indorsement_label, #ind_from], ind_date)
+        #blank-line()
+        #grid(columns: (auto, auto, 1fr), "MEMORANDUM FOR", "  ", ind_for)
+      ]
+
       if format == "separate_page" {
+        // Explicit separate-page indorsement always begins on a fresh page.
         pagebreak()
-        [#indorsement_label to #original_from, #display-date(original_date, memo-style: memo-style), #original_subject]
-
-        blank-line()
-        grid(
-          columns: (auto, 1fr),
-          ind_from, align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) }],
-        )
-
-        blank-line()
-        grid(
-          columns: (auto, auto, 1fr),
-          "MEMORANDUM FOR", "  ", ind_for,
-        )
+        separate-page-body
       } else {
-        blank-line()
-        grid(
-          columns: (auto, 1fr),
-          [#indorsement_label, #ind_from], align(right)[#if actual_date != none { display-date(actual_date, memo-style: memo-style) }],
-        )
-
-        blank-line()
-        grid(
-          columns: (auto, auto, 1fr),
-          "MEMORANDUM FOR", "  ", ind_for,
-        )
+        // AFH 33-337: a standard indorsement that no longer fits on the action
+        // document's page moves to a separate page, where it carries the fuller
+        // separate-page identifying header (it has lost its visual link to the
+        // original). Auto-upgrade to that header when the indorsement is pushed
+        // to a new page, rather than printing the terse same-page header at the
+        // top of a continuation page where it no longer makes sense.
+        //
+        // Detection: because the header is a non-breakable, sticky unit, Typst
+        // moves it wholesale to the next page when it would not fit — so a
+        // pushed indorsement lands at the top content margin. If the header's
+        // resolved position is at the top of its page, it was pushed; emit the
+        // separate-page body (no extra pagebreak — we are already at page top).
+        // Otherwise the header flows in place with the standard form.
+        let stride = {
+          let s = LINE_STRIDE.get()
+          if s == none {
+            let one-line = measure(par(spacing: 0pt)[x]).height
+            measure(par(spacing: 0pt)[x#linebreak()x]).height - one-line
+          } else { s }
+        }
+        // here().position().y is the resolved flow position of this header. On a
+        // continuation page the first content sits at the top margin; allow one
+        // line stride of tolerance for baseline/rounding.
+        let pushed-to-new-page = here().position().y <= spacing.margin + stride
+        if pushed-to-new-page {
+          separate-page-body
+        } else {
+          standard-header
+        }
       }
     }
     // Header→content gap. Skipped when there is neither an action line nor

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

@@ -89,10 +89,15 @@
 
 /// Formats a date for the memo heading.
 ///
-/// - String: shown as-is (use for fixed text like placeholders).
-/// - datetime: USAF style `DD Month YYYY`; DAF style `Month DD, YYYY`.
+/// Dispatches on the shape a date field can arrive in:
+/// - str: shown as-is (fixed text like a placeholder).
+/// - datetime: a native Typst datetime (e.g. `datetime.today()`) — USAF style
+///   `DD Month YYYY`, DAF style `Month DD, YYYY`.
+/// - dict: a Quillmark `date`/`datetime` field lowers to a click-to-edit value
+///   object `{ value: datetime, display: closure }`; `display` is a stored closure
+///   over `.display`, so call it through parentheses — a dict has no `.display` method.
 ///
-/// - date (str|datetime): Date to format for display
+/// - date (str | datetime | dict): Date to format for display
 /// - memo-style (str): `"usaf"` or `"daf"`
 /// -> content
 #let display-date(date, memo-style: "usaf") = {
@@ -108,10 +113,34 @@
     } else {
       "[day padding:none] [month repr:long] [year]"
     }
-    date.display(pattern)
+    if type(date) == datetime {
+      date.display(pattern)
+    } else {
+      (date.display)(pattern)
+    }
   }
 }
 
+/// Renders a horizontal rule sized to fit a handwritten date.
+///
+/// Used for indorsements whose signing date is unknown at compile time: the
+/// endorser writes the date on the line by hand when signing. The rule sits at
+/// the baseline with one line of height above it so handwritten text can be
+/// written on the line without colliding with surrounding header text.
+///
+/// - width (length): Length of the fill-in rule; defaults to fit a long date
+///   such as "15 September 2026".
+/// -> content
+#let date-placeholder-line(width: 1in) = box(
+  width: width,
+  height: 1em,
+  // Keep the rule on the line's baseline so it aligns with where the printed
+  // date would sit. The 1em box height reserves the writing space above it.
+  // (A positive baseline shift would drop the rule a full line too low.)
+  baseline: 0pt,
+  stroke: (bottom: 0.5pt + black),
+)
+
 /// Gets the banner color for a classification marking.
 ///
 /// Matches when `level` (trimmed) starts with a known prefix: TOP SECRET, SECRET,

package/quills/usaf_memo/0.2.0/plate.typ

@@ -15,14 +15,6 @@
     }
   ),
 
-  // Optional Freedom 250 emblem, placed opposite the seal
-  ..if data.at("freedom250", default: false) {
-    (
-      letterhead_emblem: image("assets/Freedom250_USAF.png"),
-      letterhead_emblem_height: 0.58in,
-    )
-  },
-
   // Date
   date: data.at("date", default: none),
 
@@ -62,7 +54,10 @@
   memo_for_cols: 1,
 )
 
-// Mainmatter configuration
+// Mainmatter. The body's region needs no recovery step here: the package's
+// render-body rebuilds paragraphs through a state buffer (AFH 33-337
+// auto-numbering), but the rebuilt glyphs keep their spans, which is what
+// the backend reads regions from.
 #mainmatter[
   #data.at("$body")
 ]
@@ -71,7 +66,7 @@
 #backmatter(
   // Signature block
   signature_block: data.signature_block,
-  signing_field: signature-field("Signature"),
+  signing_field: signature-field("Signature", field: "signature_block"),
 
   // Optional cc
   ..if "cc" in data { (cc: data.cc) },
@@ -93,19 +88,29 @@
     let body = card.at("$body", default: "")
     let body_content = if type(body) == str { [] } else { body }
     // Per AFH 33-337 Ch. 14, an indorsement is dated when the endorser signs
-    // it (distinct from the originating memo's date). Default to today when
-    // the card omits or leaves the date blank.
+    // it (distinct from the originating memo's date). The signing date is
+    // generally unknown at compile time and filled in by hand, so a blank or
+    // omitted date renders a fill-in line rather than stamping the compile date.
     let card_date = card.at("date", default: none)
     let resolved_date = if card_date == none or card_date == "" {
-      datetime.today()
+      none
     } else {
       card_date
     }
+    // The card's `$path` prefix composes its canonical schema addresses
+    // (`$cards.indorsement.<n>.…`, per-kind ordinal) — the absolute loop
+    // index `i` is NOT that ordinal once kinds interleave, so it stays a
+    // widget-name suffix only. The card body's region rides its own glyph
+    // spans through the package rebuild, per-card because each card's body
+    // has its own backend-generated eval site.
     indorsement(
       from: card.at("from", default: ""),
       to: card.at("for", default: ""),
       signature_block: card.signature_block,
-      signing_field: signature-field("Ind_" + str(i) + "_Signature"),
+      signing_field: signature-field(
+        "Ind_" + str(i) + "_Signature",
+        field: card.at("$path") + "signature_block",
+      ),
       format: card.at("format", default: "standard"),
       date: resolved_date,
       ..if "action" in card { (action: card.action) },

package/quills/af4141/0.1.0/design/TASK.md

@@ -1,20 +0,0 @@
-I visually mapped out a bunch of fields on the form to the typst field names. The intent is to write a plate and field schema that interfaces with the Typst form and exposes an ergonomic API to the Quill consumer. See [Creating Quills](https://quillmark.readthedocs.io/en/latest/guides/creating-quills/) to learn how to write the field schema. 
-
-Note that the following field names are not authortative; use your discretion to name them ergonomically.
-
-## Admin Fields
-
-Name: `commonforms_text_p1_1`
-Unit: `commonforms_text_p1_2`
-Grade/CCC Level: `commonforms_text_p1_3`
-
-## Record of Experience table fields
-
-Date: `commonforms_text_p1_{4,7,18,...,109}` and `commonforms_text_p2_{1,8,15,...141}`
-Mandatory Actions to be Reported: `commonforms_text_p1_{5,12,19,...,110}` and `commonforms_text_p2_{2,9,16,...,142}`
-written_grade: `commonforms_text_p1_{6,13,...111}` and `commonforms_text_p2_{3,10,...,143}`
-writen_grade_date: `commonforms_text_p1_{7,14,...,112}` and `commonforms_text_p2_{4,11,144}`
-positional_grade: `commonforms_text_p1_{8,15,...,113}` and `commonforms_text_p2_{5,12,...,145}`
-positional_grade_date: `commonforms_text_p1_{9,...,114}` and
-`commonforms_text_p2_{6,...,145}`
-auth_or_remarks: `commonforms_text_p1_{10,...,115}` and `commonforms_text_p2_{7,...,146}`

package/quills/usaf_memo/0.2.0/.quillignore

@@ -1,31 +0,0 @@
-# Example .quillignore for usaf_memo template
-# This demonstrates the .quillignore functionality
-
-# Ignore temporary and backup files
-*.tmp
-*.bak
-*~
-*.swp
-
-# Ignore build artifacts
-target/
-dist/
-build/
-
-# Ignore OS-specific files
-.DS_Store
-Thumbs.db
-desktop.ini
-
-# Ignore version control
-.git/
-.svn/
-
-# Ignore editor files
-.vscode/
-.idea/
-*.sublime-*
-
-# Ignore log files
-*.log
-logs/