@airmark/quiver 0.35.6 → 0.35.8

package/quills/usaf_memo/0.2.0/plate.typ

@@ -1,17 +1,17 @@
-#import "@local/quillmark-helper:0.1.0": data, signature-field
+#import "@local/quillmark-helper:0.2.0" as qm
 #import "@local/tonguetoquill-usaf-memo:3.0.0": backmatter, frontmatter, indorsement, mainmatter
 
 // Frontmatter configuration
 #show: frontmatter.with(
   // Letterhead configuration
-  letterhead_title: data.letterhead_title,
-  letterhead_caption: data.letterhead_caption,
-  letterhead_seal_subtitle: data.letterhead_seal_subtitle,
+  letterhead_title: qm.data.letterhead_title,
+  letterhead_caption: qm.data.letterhead_caption,
+  letterhead_seal_subtitle: qm.data.letterhead_seal_subtitle,
   // Enum blank is `""`, not a seal. Omit so the package renders none rather
   // than treating the blank as DoW.
-  ..if data.letterhead_seal != "" {
+  ..if qm.data.letterhead_seal != "" {
     (letterhead_seal: image(
-      if data.letterhead_seal == "dod" {
+      if qm.data.letterhead_seal == "dod" {
         "assets/dod_seal.png"
       } else {
         "assets/dow_seal.png"
@@ -20,40 +20,40 @@
   },
 
   // Date
-  date: data.date,
+  date: qm.data.date,
 
   // Receiver information
-  memo_for: data.memo_for,
+  memo_for: qm.data.memo_for,
 
   // Sender information (omitted for Memorandum for Record)
-  ..if data.memo_from.len() > 0 { (memo_from: data.memo_from) },
+  ..if qm.data.memo_from.len() > 0 { (memo_from: qm.data.memo_from) },
 
   // Subject line
-  subject: data.subject,
+  subject: qm.data.subject,
 
   // Optional references
-  ..if data.references.len() > 0 { (references: data.references) },
+  ..if qm.data.references.len() > 0 { (references: qm.data.references) },
 
   // Optional footer tag line
-  footer_tag_line: data.tag_line,
+  footer_tag_line: qm.data.tag_line,
 
   // Optional classification level
-  ..if data.classification != "" { (classification_level: data.classification) },
+  ..if qm.data.classification != "" { (classification_level: qm.data.classification) },
 
-  ..if data.dissemination != "" { (dissemination: data.dissemination) },
+  ..if qm.data.dissemination != "" { (dissemination: qm.data.dissemination) },
 
   // CUI designation indicator block fields (DoDM 5200.48)
-  ..if data.cui_controlled_by != "" { (cui_controlled_by: data.cui_controlled_by) },
-  ..if data.cui_category != "" { (cui_category: data.cui_category) },
-  ..if data.cui_limited_dissemination != "" { (cui_limited_dissemination: data.cui_limited_dissemination) },
-  ..if data.cui_poc != "" { (cui_poc: data.cui_poc) },
+  ..if qm.data.cui_controlled_by != "" { (cui_controlled_by: qm.data.cui_controlled_by) },
+  ..if qm.data.cui_category != "" { (cui_category: qm.data.cui_category) },
+  ..if qm.data.cui_limited_dissemination != "" { (cui_limited_dissemination: qm.data.cui_limited_dissemination) },
+  ..if qm.data.cui_poc != "" { (cui_poc: qm.data.cui_poc) },
 
   // USAF vs DAF memorandum style (date format, body indentation). Blank
   // falls through to the package's `"usaf"` default.
-  ..if data.memo_style != "" { (memo_style: data.memo_style) },
+  ..if qm.data.memo_style != "" { (memo_style: qm.data.memo_style) },
 
   // Font size
-  font_size: data.font_size * 1pt,
+  font_size: qm.data.font_size * 1pt,
 
   // List recipients in vertical list
   memo_for_cols: 1,
@@ -64,27 +64,27 @@
 // auto-numbering), but the rebuilt glyphs keep their spans, which is what
 // the backend reads regions from.
 #mainmatter[
-  #data.at("$body")
+  #qm.data.at("$body")
 ]
 
 // Backmatter
 #backmatter(
   // Signature block
-  signature_block: data.signature_block,
-  signing_field: signature-field("Signature", field: "signature_block"),
+  signature_block: qm.data.signature_block,
+  signing_field: qm.signature-field("Signature", field: "signature_block"),
 
   // Optional cc
-  ..if data.cc.len() > 0 { (cc: data.cc) },
+  ..if qm.data.cc.len() > 0 { (cc: qm.data.cc) },
 
   // Optional distribution
-  ..if data.distribution.len() > 0 { (distribution: data.distribution) },
+  ..if qm.data.distribution.len() > 0 { (distribution: qm.data.distribution) },
 
   // Optional attachments
-  ..if data.attachments.len() > 0 { (attachments: data.attachments) },
+  ..if qm.data.attachments.len() > 0 { (attachments: qm.data.attachments) },
 )
 
 // Indorsements - iterate through CARDS array and filter by CARD tag
-#for (i, card) in data.at("$cards").enumerate() {
+#for (i, card) in qm.data.at("$cards").enumerate() {
   if card.at("$kind", default: none) == "indorsement" {
     // The quillmark helper leaves an unset/whitespace-only markdown body as
     // the empty string `""`; only non-empty bodies are eval'd into content.
@@ -112,7 +112,7 @@
       from: card.at("from", default: ""),
       to: card.at("for", default: ""),
       signature_block: card.signature_block,
-      signing_field: signature-field(
+      signing_field: qm.signature-field(
         "Ind_" + str(i) + "_Signature",
         field: card.at("$path") + "signature_block",
       ),

package/quills/usaf_memo/0.3.0/Quill.yaml

@@ -9,276 +9,250 @@ typst:
 
 main:
   description: "Write the body as plain paragraphs. They're numbered for you, and bullets become lettered subparagraphs. Use a block quote for lines that shouldn't be numbered, like a list of names."
-  ui:
-    groups: [addressing, letterhead, classification, additional]
-  fields:
-    memo_for:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      ui:
-        group: addressing
-        compact: true
-      description: "Each recipient's office symbol, one per line. To address a person, add their rank and name in parentheses, for example 'ORG/SYMBOL (LT COL JANE DOE)'. For a long list, enter 'SEE DISTRIBUTION' and list everyone under Distribution."
+  sections:
+    addressing:
+      fields:
+        memo_for:
+          type: array
+          items:
+            type: plaintext
+            inline: true
+          ui:
+            compact: true
+          description: "Each recipient's office symbol, one per line. To address a person, add their rank and name in parentheses, for example 'ORG/SYMBOL (LT COL JANE DOE)'. For a long list, enter 'SEE DISTRIBUTION' and list everyone under Distribution."
 
-    memo_from:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      default: []
-      ui:
-        group: addressing
-        compact: true
-      description: "Your office symbol. If any recipient is off your installation, add your full mailing address below it. Leave blank for a memorandum for record."
+        memo_from:
+          type: array
+          items:
+            type: plaintext
+            inline: true
+          default: []
+          ui:
+            compact: true
+          description: "Your office symbol. If any recipient is off your installation, add your full mailing address below it. Leave blank for a memorandum for record."
 
-    subject:
-      type: richtext
-      inline: true
-      ui:
-        group: addressing
-      description: "A brief subject in title case. Put any suspense date in parentheses at the end."
+        subject:
+          type: richtext
+          inline: true
+          description: "A brief subject in title case. Put any suspense date in parentheses at the end."
     
-    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."
+        date:
+          type: date
+          default: ""
+          ui:
+            compact: true
+          description: "The date you sign. Leave blank to add a fillable date field to the PDF instead."
       
-    authority_line:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: addressing
-        compact: true
-      description: "Usually blank. When you sign on the commander's behalf or state the headquarters' position, enter 'FOR THE COMMANDER'. It prints above the signature block."
-
-    signature_block:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      ui:
-        group: addressing
-        compact: true
-      description: "Your name in uppercase, grade, and service on the first line, for example 'FIRST M. LAST, Capt, USAF'. Your duty title on the second."
-
-    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."
+        authority_line:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "Usually blank. When you sign on the commander's behalf or state the headquarters' position, enter 'FOR THE COMMANDER'. It prints above the signature block."
 
-    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."
+        signature_block:
+          type: array
+          items:
+            type: plaintext
+            inline: true
+          ui:
+            compact: true
+          description: "Your name in uppercase, grade, and service on the first line, for example 'FIRST M. LAST, Capt, USAF'. Your duty title on the second."
+    letterhead:
+      fields:
+        letterhead_title:
+          type: array
+          items:
+            type: plaintext
+            inline: true
+          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_subtitle:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: letterhead
-        compact: true
-      description: "An optional line in bold capitals under the seal."
+        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."
 
-    tag_line:
-      type: richtext
-      inline: true
-      default: ""
-      ui:
-        group: letterhead
-        compact: true
-      description: "Your unit's motto, centered at the bottom of every page."
+        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:
-      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:
-            type: plaintext
-            inline: true
-            description: "The office that designated this information as CUI, for example 'SAF/AA'."
-          poc:
-            type: plaintext
+      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:
+        references:
+          type: array
+          items:
+            type: richtext
             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:
+          default: []
+          description: "Cite each by organization, type, date, and title. One reference prints after the subject; two or more print as a lettered list."
+
+        cc:
+          type: array
+          items:
             type: plaintext
             inline: true
-            default: ""
-            description: "The category from the DoD CUI Registry, for example 'CTI' or 'PRVCY'."
-          limited_dissemination:
+          default: []
+          description: Offices or people receiving a courtesy copy, one per line.
+
+        distribution:
+          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."
-
-    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."
-
-    references:
-      type: array
-      items:
-        type: richtext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: "Cite each by organization, type, date, and title. One reference prints after the subject; two or more print as a lettered list."
+          default: []
+          description: "Everyone the memo goes to, when Memo For says 'SEE DISTRIBUTION'."
 
-    cc:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: Offices or people receiving a courtesy copy, one per line.
-
-    distribution:
-      type: array
-      items:
-        type: plaintext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: "Everyone the memo goes to, when Memo For says 'SEE DISTRIBUTION'."
-
-    attachments:
-      type: array
-      items:
-        type: richtext
-        inline: true
-      default: []
-      ui:
-        group: additional
-      description: "Attachments in the order the memo mentions them. Describe each briefly and include its date. Don't write 'as stated'."
+        attachments:
+          type: array
+          items:
+            type: richtext
+            inline: true
+          default: []
+          description: "Attachments in the order the memo mentions them. Describe each briefly and include its date. Don't write 'as stated'."
 
-    memo_style:
-      type: enum
-      values:
-        - usaf
-        - daf
-      default: usaf
-      ui:
-        group: additional
-        compact: true
-      description: "USAF for most memos, DAF for headquarters memos. DAF style dates as 'September 15, 2026' and indents paragraphs instead of numbering them."
+        memo_style:
+          type: enum
+          values:
+            - usaf
+            - daf
+          default: usaf
+          ui:
+            compact: true
+          description: "USAF for most memos, DAF for headquarters memos. DAF style dates as 'September 15, 2026' and indents paragraphs instead of numbering them."
 
-    font_size:
-      type: number
-      default: 12
-      ui:
-        group: additional
-        compact: true
-      description: "Body text size in points. The standard is 12."
+        font_size:
+          type: number
+          default: 12
+          ui:
+            compact: true
+          description: "Body text size in points. The standard is 12."
 
 card_kinds:
   indorsement:
     title: Routing indorsement
     description: "A reply to the memo, or a forward to the next office. Indorsements are numbered in order: 1st Ind, 2d Ind, and so on."
-    ui:
-      groups: [addressing, additional]
     seed:
       from: ORG/SYMBOL
       for: ORG/SYMBOL
       signature_block:
         - FIRST M. LAST, Rank, USAF
         - Duty Title
-    fields:
-      from:
-        type: plaintext
-        inline: true
-        ui:
-          group: addressing
-          compact: true
-        description: "The endorser's office symbol."
-      for:
-        type: plaintext
-        inline: true
-        ui:
-          group: addressing
-          compact: true
-        description: "The office the indorsement goes to."
-      date:
-        type: date
-        default: ""
-        ui:
-          group: addressing
-          compact: true
-        description: "The date the endorser signs. Leave blank to add a fillable date field to the PDF instead."
-      authority_line:
-        type: plaintext
-        inline: true
-        default: ""
-        ui:
-          group: addressing
-          compact: true
-        description: "Usually blank. When the endorser signs on the commander's behalf, enter 'FOR THE COMMANDER'."
-      signature_block:
-        type: array
-        items:
-          type: plaintext
-          inline: true
-        ui:
-          group: addressing
-          compact: true
-        description: "The endorser's name in uppercase, grade, and service on the first line, for example 'FIRST M. LAST, Capt, USAF'. Their duty title on the second."
-      format:
-        type: enum
-        values:
-          - standard
-          - informal
-          - separate_page
-        default: standard
-        ui:
-          group: additional
-          compact: true
-        description: "Standard continues on the same page and moves to a new one if it doesn't fit. Separate page always starts a new page. Informal leaves out the header."
-      action:
-        type: enum
-        values:
-          - undecided
-          - approve
-          - disapprove
-        default: ""
-        ui:
-          group: additional
-          compact: true
-        description: "The endorser's decision. The last indorsement prints Approve/Disapprove and earlier ones print Concur/Nonconcur, with the choice underlined. Choose undecided to mark it by hand, or leave blank to omit."
+    sections:
+      addressing:
+        fields:
+          from:
+            type: plaintext
+            inline: true
+            ui:
+              compact: true
+            description: "The endorser's office symbol."
+          for:
+            type: plaintext
+            inline: true
+            ui:
+              compact: true
+            description: "The office the indorsement goes to."
+          date:
+            type: date
+            default: ""
+            ui:
+              compact: true
+            description: "The date the endorser signs. Leave blank to add a fillable date field to the PDF instead."
+          authority_line:
+            type: plaintext
+            inline: true
+            default: ""
+            ui:
+              compact: true
+            description: "Usually blank. When the endorser signs on the commander's behalf, enter 'FOR THE COMMANDER'."
+          signature_block:
+            type: array
+            items:
+              type: plaintext
+              inline: true
+            ui:
+              compact: true
+            description: "The endorser's name in uppercase, grade, and service on the first line, for example 'FIRST M. LAST, Capt, USAF'. Their duty title on the second."
+      additional:
+        fields:
+          format:
+            type: enum
+            values:
+              - standard
+              - informal
+              - separate_page
+            default: standard
+            ui:
+              compact: true
+            description: "Standard continues on the same page and moves to a new one if it doesn't fit. Separate page always starts a new page. Informal leaves out the header."
+          action:
+            type: enum
+            values:
+              - undecided
+              - approve
+              - disapprove
+            default: ""
+            ui:
+              compact: true
+            description: "The endorser's decision. The last indorsement prints Approve/Disapprove and earlier ones print Concur/Nonconcur, with the choice underlined. Choose undecided to mark it by hand, or leave blank to omit."