@airmark/quiver 0.20.0 → 0.20.2

package/quills/daf4392/0.1.0/packages/daf4392page2_pkg/form.typ

@@ -1,14 +1,148 @@
-// form.typ (generated � do not edit)
+// form.typ (generated — do not edit)
 #import "lib.typ": render-form
 
 #let form(
   debug: false,
-
+  mode_pmv: false,  // checkbox
+  mode_airplane: false,  // checkbox
+  mode_bus: false,  // checkbox
+  mode_train: false,  // checkbox
+  mode_motorcycle: false,  // checkbox
+  mode_other: false,  // checkbox
+  departure_date: "",  // text
+  final_destination: "",  // text
+  itin_date_1: "",  // text
+  itin_departure_point_1: "",  // text
+  itin_arrival_point_1: "",  // text
+  itin_rest_length_1: "",  // text
+  itin_mileage_1: "",  // text
+  itin_date_2: "",  // text
+  itin_departure_point_2: "",  // text
+  itin_arrival_point_2: "",  // text
+  itin_rest_length_2: "",  // text
+  itin_mileage_2: "",  // text
+  itin_date_3: "",  // text
+  itin_departure_point_3: "",  // text
+  itin_arrival_point_3: "",  // text
+  itin_rest_length_3: "",  // text
+  itin_mileage_3: "",  // text
+  itin_date_4: "",  // text
+  itin_departure_point_4: "",  // text
+  itin_arrival_point_4: "",  // text
+  itin_rest_length_4: "",  // text
+  itin_mileage_4: "",  // text
+  itin_date_5: "",  // text
+  itin_departure_point_5: "",  // text
+  itin_arrival_point_5: "",  // text
+  itin_rest_length_5: "",  // text
+  itin_mileage_5: "",  // text
+  itin_date_6: "",  // text
+  itin_departure_point_6: "",  // text
+  itin_arrival_point_6: "",  // text
+  itin_rest_length_6: "",  // text
+  itin_mileage_6: "",  // text
+  itin_date_7: "",  // text
+  itin_departure_point_7: "",  // text
+  itin_arrival_point_7: "",  // text
+  itin_rest_length_7: "",  // text
+  itin_mileage_7: "",  // text
+  itin_date_8: "",  // text
+  itin_departure_point_8: "",  // text
+  itin_arrival_point_8: "",  // text
+  itin_rest_length_8: "",  // text
+  itin_mileage_8: "",  // text
+  itin_date_9: "",  // text
+  itin_departure_point_9: "",  // text
+  itin_arrival_point_9: "",  // text
+  itin_rest_length_9: "",  // text
+  itin_mileage_9: "",  // text
+  itin_date_10: "",  // text
+  itin_departure_point_10: "",  // text
+  itin_arrival_point_10: "",  // text
+  itin_rest_length_10: "",  // text
+  itin_mileage_10: "",  // text
+  dept_flight: "",  // text
+  arrival_flight: "",  // text
+  notes: "",  // text
+  organization: "",  // text
+  briefed_date: "",  // text
+  briefee_name: "",  // text
+  briefee_grade: "",  // text
+  briefer_name: "",  // text
+  briefer_grade: "",  // text
+  emergency_contact: "",  // text
 ) = render-form(
   schema: json("FIELDS.json"),
   backgrounds: ("page1.png",),
   values: (
-,
+    "mode_pmv": mode_pmv,
+    "mode_airplane": mode_airplane,
+    "mode_bus": mode_bus,
+    "mode_train": mode_train,
+    "mode_motorcycle": mode_motorcycle,
+    "mode_other": mode_other,
+    "departure_date": departure_date,
+    "final_destination": final_destination,
+    "itin_date_1": itin_date_1,
+    "itin_departure_point_1": itin_departure_point_1,
+    "itin_arrival_point_1": itin_arrival_point_1,
+    "itin_rest_length_1": itin_rest_length_1,
+    "itin_mileage_1": itin_mileage_1,
+    "itin_date_2": itin_date_2,
+    "itin_departure_point_2": itin_departure_point_2,
+    "itin_arrival_point_2": itin_arrival_point_2,
+    "itin_rest_length_2": itin_rest_length_2,
+    "itin_mileage_2": itin_mileage_2,
+    "itin_date_3": itin_date_3,
+    "itin_departure_point_3": itin_departure_point_3,
+    "itin_arrival_point_3": itin_arrival_point_3,
+    "itin_rest_length_3": itin_rest_length_3,
+    "itin_mileage_3": itin_mileage_3,
+    "itin_date_4": itin_date_4,
+    "itin_departure_point_4": itin_departure_point_4,
+    "itin_arrival_point_4": itin_arrival_point_4,
+    "itin_rest_length_4": itin_rest_length_4,
+    "itin_mileage_4": itin_mileage_4,
+    "itin_date_5": itin_date_5,
+    "itin_departure_point_5": itin_departure_point_5,
+    "itin_arrival_point_5": itin_arrival_point_5,
+    "itin_rest_length_5": itin_rest_length_5,
+    "itin_mileage_5": itin_mileage_5,
+    "itin_date_6": itin_date_6,
+    "itin_departure_point_6": itin_departure_point_6,
+    "itin_arrival_point_6": itin_arrival_point_6,
+    "itin_rest_length_6": itin_rest_length_6,
+    "itin_mileage_6": itin_mileage_6,
+    "itin_date_7": itin_date_7,
+    "itin_departure_point_7": itin_departure_point_7,
+    "itin_arrival_point_7": itin_arrival_point_7,
+    "itin_rest_length_7": itin_rest_length_7,
+    "itin_mileage_7": itin_mileage_7,
+    "itin_date_8": itin_date_8,
+    "itin_departure_point_8": itin_departure_point_8,
+    "itin_arrival_point_8": itin_arrival_point_8,
+    "itin_rest_length_8": itin_rest_length_8,
+    "itin_mileage_8": itin_mileage_8,
+    "itin_date_9": itin_date_9,
+    "itin_departure_point_9": itin_departure_point_9,
+    "itin_arrival_point_9": itin_arrival_point_9,
+    "itin_rest_length_9": itin_rest_length_9,
+    "itin_mileage_9": itin_mileage_9,
+    "itin_date_10": itin_date_10,
+    "itin_departure_point_10": itin_departure_point_10,
+    "itin_arrival_point_10": itin_arrival_point_10,
+    "itin_rest_length_10": itin_rest_length_10,
+    "itin_mileage_10": itin_mileage_10,
+    "dept_flight": dept_flight,
+    "arrival_flight": arrival_flight,
+    "notes": notes,
+    "organization": organization,
+    "briefed_date": briefed_date,
+    "briefee_name": briefee_name,
+    "briefee_grade": briefee_grade,
+    "briefer_name": briefer_name,
+    "briefer_grade": briefer_grade,
+    "emergency_contact": emergency_contact,
   ),
   debug: debug,
 )

package/quills/daf4392/0.1.0/packages/daf4392page2_pkg/lib.typ

@@ -1,6 +1,115 @@
 // Formalizer Engine – rendering engine
 // Renders pixel-perfect PDF form replicas from a PyMuPDF-extracted schema.
 
+/// Global configuration for text rendering.
+/// Adjust these to change the overall form text appearance.
+#let FORM_MAX_TEXT_SIZE = 14pt
+#let FORM_MIN_TEXT_SIZE = 6pt
+#let FORM_MIN_CHARS_PER_LINE = 7
+
+/// Coerce any user-supplied scalar value to a plain string.
+/// Accepts the same types as Typst's built-in str(), plus content –
+/// content is extracted via repr() with its surrounding square brackets stripped.
+/// This lets callers write `[Hello]` (content) instead of `"Hello"` (string).
+#let to-str(value) = {
+  if type(value) == content {
+    let r = repr(value)
+    // repr([hello]) → "[hello]" — strip the outer square brackets
+    if r.starts-with("[") and r.ends-with("]") {
+      r.slice(1, r.len() - 1)
+    } else {
+      r
+    }
+  } else {
+    str(value)
+  }
+}
+
+/// True when a schema field name corresponds to a date overlay.
+#let is-date-field(name) = {
+  name.ends-with("_date") or name.starts-with("itin_date_")
+}
+
+/// Format a date value for display as `DD Mon YYYY`.
+#let format-date(value) = {
+  if value == none {
+    none
+  } else if type(value) == datetime {
+    value.display("[day padding:zero] [month repr:short] [year]")
+  } else if type(value) == str and value == "" {
+    ""
+  } else {
+    str(value)
+  }
+}
+
+/// Should this field shrink text to a single line rather than word-wrap?
+/// True for short/narrow fields with brief content (grades, ranks, dates).
+/// `display` may be a string or content; char-count is skipped for content.
+#let should-shrink-to-fit(display, width, height) = {
+  let aspect = width / height
+  // content has no .len(); treat as "long" so only the dimension conditions apply
+  let char-count = if type(display) == str { display.len() } else { 99 }
+  char-count <= 10 or height < 20pt or aspect > 4.0
+}
+
+/// Render a text-like field with shrink-to-fit and word-wrap fallback.
+#let render-text-field(display, width, height, x-inset, y-inset) = {
+  set par(leading: 0.25em)
+  context {
+    let avail-w = width - 2 * x-inset
+    let avail-h = height - 2 * y-inset
+    let shrink = should-shrink-to-fit(display, width, height)
+
+    let final-size = FORM_MIN_TEXT_SIZE
+    let current = FORM_MAX_TEXT_SIZE
+    let step = 0.5pt
+
+    while current >= FORM_MIN_TEXT_SIZE {
+      let m = if shrink {
+        // Measure as a single line (no width constraint → no wrapping)
+        measure(text(size: current, display))
+      } else {
+        // Measure with wrapping within the available width
+        measure(block(width: avail-w, text(size: current, display)))
+      }
+      let char-m = measure(text(size: current, "0" * FORM_MIN_CHARS_PER_LINE))
+
+      if m.width <= avail-w and m.height <= avail-h and char-m.width <= avail-w {
+        final-size = current
+        break
+      }
+      current = current - step
+    }
+
+    // Fallback: if shrink-to-fit hit min size and still overflows,
+    // re-try with word-wrap enabled as a last resort.
+    if shrink and current < FORM_MIN_TEXT_SIZE {
+      current = FORM_MAX_TEXT_SIZE
+      while current >= FORM_MIN_TEXT_SIZE {
+        let m = measure(block(width: avail-w, text(size: current, display)))
+        let char-m = measure(text(size: current, "0" * FORM_MIN_CHARS_PER_LINE))
+        if m.height <= avail-h and char-m.width <= avail-w {
+          final-size = current
+          break
+        }
+        current = current - step
+      }
+    }
+
+    // Default to vertically centered. Only top-align for tall "text areas".
+    let vert-align = if height >= 40pt { top } else { horizon }
+
+    box(
+      width: width,
+      height: height,
+      clip: true,
+      inset: (x: x-inset, y: y-inset),
+      align(left + vert-align, text(size: final-size, display)),
+    )
+  }
+}
+
 /// Render a single field's content overlay.
 ///
 /// - field-type (str): normalised lowercase type
@@ -10,29 +119,42 @@
 /// - field (dictionary): raw field entry from the schema
 #let render-field(field-type, value, width, height, field) = {
   if field-type == "text" {
-    if value != none and str(value) != "" {
-      context {
-        let default-size = height * 0.6
-        let min-size = 6pt
-        let x-inset = 1.5pt
-        let m = measure(text(size: default-size, str(value)))
-        let scale = calc.min(1.0, (width - 2 * x-inset) / m.width)
-        let final-size = calc.max(min-size, default-size * scale)
-        box(
-          width: width,
-          height: height,
-          clip: true,
-          inset: (x: x-inset),
-          align(left + horizon, text(size: final-size, str(value))),
-        )
+    if value != none {
+      let display = if is-date-field(field.name) { format-date(value) } else { value }
+      // Pass content through directly so styling (bold, italic, …) is preserved;
+      // for plain strings, skip empty values.
+      if type(display) == content {
+        render-text-field(display, width, height, 1.5pt, 1pt)
+      } else if str(display) != "" {
+        render-text-field(str(display), width, height, 1.5pt, 1pt)
       }
     }
   } else if field-type == "checkbox" {
     if value == true {
+      // Drawn as vector strokes rather than a glyph so the mark renders
+      // regardless of whether the active font carries U+2713.
+      let s = calc.min(width, height) * 0.78
+      let t = calc.max(s * 0.16, 1pt)
+      let mark-stroke = (paint: black, thickness: t, cap: "round", join: "round")
       box(
         width: width,
         height: height,
-        align(center + horizon, text(size: height * 0.8, "✓")),
+        align(center + horizon, box(
+          width: s,
+          height: s,
+          {
+            place(line(
+              start: (0.12 * s, 0.52 * s),
+              end: (0.40 * s, 0.80 * s),
+              stroke: mark-stroke,
+            ))
+            place(line(
+              start: (0.40 * s, 0.80 * s),
+              end: (0.88 * s, 0.16 * s),
+              stroke: mark-stroke,
+            ))
+          },
+        )),
       )
     }
   } else if field-type == "radio" {
@@ -47,31 +169,18 @@
       )
     }
   } else if field-type == "combobox" or field-type == "listbox" {
-    let display = if value != none { str(value) } else { "" }
-    // Resolve export value → display label when options are present
+    // Default: render the raw value, preserving content styling if present.
+    // Override with the schema's display label when the export value matches.
+    let display = value
     if field.at("options", default: none) != none and value != none {
       for opt in field.options {
-        if str(opt.at(0)) == str(value) {
+        if str(opt.at(0)) == to-str(value) {
           display = str(opt.at(1))
         }
       }
     }
-    if display != "" {
-      context {
-        let default-size = height * 0.6
-        let min-size = 6pt
-        let x-inset = 2pt
-        let m = measure(text(size: default-size, display))
-        let scale = calc.min(1.0, (width - 2 * x-inset) / m.width)
-        let final-size = calc.max(min-size, default-size * scale)
-        box(
-          width: width,
-          height: height,
-          clip: true,
-          inset: (x: x-inset),
-          align(left + horizon, text(size: final-size, display)),
-        )
-      }
+    if display != none and to-str(display) != "" {
+      render-text-field(display, width, height, 2pt, 1pt)
     }
   }
 }
@@ -86,10 +195,10 @@
   if group-value == none { return false }
   let ev = field.at("export_value", default: none)
   if ev != none {
-    return str(ev) == str(group-value)
+    return str(ev) == to-str(group-value)
   }
   // Fallback: match against the stringified index
-  str(index-in-group) == str(group-value)
+  str(index-in-group) == to-str(group-value)
 }
 
 /// Draw a debug overlay rectangle with a label for a field.

package/quills/daf4392/0.1.0/plate.typ

@@ -1,86 +1,63 @@
 #import "@local/quillmark-helper:0.1.0": data
+#import "@local/daf4392page2-pkg:0.1.0": form
 
-// `type: date` fields arrive as Typst `datetime`; overlay text must be plain strings.
-#let show-date(v) = {
-  if v == none { "" }
-  else if type(v) == datetime { v.display("[month padding:none]/[day padding:none]/[year]") }
-  else { str(v) }
-}
-
-#set page(width: 8.5in, height: 11in, margin: 0in)
-#set text(font: "Arimo", size: 10pt)
+#set text(font: "Arimo")
 
-// Background
-#place(image("assets/page1.png", width: 100%, height: 100%))
+// Map snake_case Quill `data` keys to generated `form.typ` parameter names.
+#let vals = (:)
 
-#let tf(dx, dy, content) = place(dx: dx, dy: dy, content)
-#let check(dx, dy, is_checked) = if is_checked { place(dx: dx, dy: dy, text(weight: "bold", size: 12pt)[✓]) }
-
-// Mode of Transportation
+// Mode of Transportation — enum string drives one of six checkboxes.
 #let mode = data.at("transportation_mode", default: "")
-#check(40pt, 67pt, mode == "pmv")
-#check(173pt, 67pt, mode == "airplane")
-#check(243pt, 67pt, mode == "bus")
-#check(286pt, 67pt, mode == "train")
-#check(336pt, 67pt, mode == "motorcycle")
-#check(411pt, 67pt, mode == "other")
+#if mode != "" { vals.insert("mode_" + mode, true) }
 
-// Fields
-#tf(40pt, 100pt)[#show-date(data.at("departure_date", default: none))]
-#tf(123pt, 100pt)[#data.at("final_destination", default: "")]
+// Header row
+#if "departure_date" in data { vals.insert("departure_date", data.departure_date) }
+#if "final_destination" in data { vals.insert("final_destination", data.final_destination) }
 
-// Itinerary Rows (via CARDS)
+// Proposed Travel Itinerary — one card per row, up to 10 rows.
+#let itin-cols = ("date", "departure_point", "arrival_point", "rest_length", "mileage")
 #{
   let row = 0
-  let dy-start = 160pt
-  let dy-step = 40pt
-  if "CARDS" in data {
-    for card in data.CARDS {
-      if card.CARD == "itinerary" and row < 10 {
-        let dy = dy-start + (row * dy-step)
-        tf(80pt, dy)[#show-date(card.at("date", default: none))]
-        tf(135pt, dy)[#card.at("departure_point", default: "")]
-        tf(295pt, dy)[#card.at("arrival_point", default: "")]
-        tf(450pt, dy)[#card.at("rest_length", default: "")]
-        tf(515pt, dy)[#card.at("mileage", default: "")]
-        row = row + 1
+  for card in data.at("CARDS", default: ()) {
+    if card.CARD == "itinerary" and row < 10 {
+      let n = str(row + 1)
+      for col in itin-cols {
+        let v = card.at(col, default: none)
+        let display = if col == "date" { v } else if v == none { "" } else { str(v) }
+        if display != none and display != "" { vals.insert("itin_" + col + "_" + n, display) }
       }
+      row = row + 1
     }
   }
 }
 
-// Flight Info
+// Flight info — bold label prefixes a tentative/confirmed flight number.
 #{
-  let d-flight = str(data.at("dept_flight_num", default: ""))
-  if d-flight != "" { tf(350pt, 545pt)[#text(weight: "bold")[Dept Flight:] #d-flight] }
-  
-  let a-flight = str(data.at("arrival_flight_num", default: ""))
-  if a-flight != "" { tf(450pt, 545pt)[#text(weight: "bold")[Arr Flight:] #a-flight] }
+  let d = str(data.at("dept_flight_num", default: ""))
+  if d != "" { vals.insert("dept_flight", [#text(weight: "bold")[Dept Flight:] #d]) }
+  let a = str(data.at("arrival_flight_num", default: ""))
+  if a != "" { vals.insert("arrival_flight", [#text(weight: "bold")[Arr Flight:] #a]) }
 }
 
 // Notes
-#tf(40pt, 565pt)[#block(width: 530pt)[#data.at("notes", default: "")]]
+#if "notes" in data { vals.insert("notes", data.notes) }
 
 // Acknowledgements
-#tf(40pt, 620pt)[#data.at("organization", default: "")]
-#tf(500pt, 620pt)[#show-date(data.at("briefed_date", default: none))]
-
-#tf(40pt, 650pt)[#data.at("briefee_name", default: "")]
-#tf(270pt, 650pt)[#data.at("briefee_grade", default: "")]
-
-#tf(40pt, 680pt)[#data.at("briefer_name", default: "")]
-#tf(270pt, 680pt)[#data.at("briefer_grade", default: "")]
-
-// Emergency Contact
+#if "organization" in data { vals.insert("organization", data.organization) }
+#if "briefed_date" in data { vals.insert("briefed_date", data.briefed_date) }
+#if "briefee_name" in data { vals.insert("briefee_name", data.briefee_name) }
+#if "briefee_grade" in data { vals.insert("briefee_grade", data.briefee_grade) }
+#if "briefer_name" in data { vals.insert("briefer_name", data.briefer_name) }
+#if "briefer_grade" in data { vals.insert("briefer_grade", data.briefer_grade) }
+
+// Emergency contact — bold label prefixes a "name: phone" pair.
 #{
-  let emergency_name = str(data.at("emergency_contact_name", default: ""))
-  let emergency_phone = str(data.at("emergency_contact_phone", default: ""))
-  let emergency_contact = if emergency_name != "" and emergency_phone != "" {
-    emergency_name + ": " + emergency_phone
-  } else if emergency_name != "" {
-    emergency_name
-  } else {
-    emergency_phone
+  let en = str(data.at("emergency_contact_name", default: ""))
+  let ep = str(data.at("emergency_contact_phone", default: ""))
+  let contact = if en != "" and ep != "" { en + ": " + ep } else if en != "" { en } else { ep }
+  if contact != "" {
+    vals.insert("emergency_contact", [#text(weight: "bold")[EMERGENCY CONTACT:] #contact])
   }
-  tf(40pt, 700pt)[#text(size: 10pt, weight: "bold")[EMERGENCY CONTACT:] #text(size: 10pt)[#emergency_contact]]
 }
+
+#form(..vals)

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -91,8 +91,16 @@ main:
       default: ""
       ui:
         group: Letterhead
+        compact: true
       description: Organizational motto at the bottom of the page.
 
+    freedom250:
+      type: boolean
+      ui:
+        group: Letterhead
+        compact: true
+      description: Show the America 250 / Freedom 250 commemorative emblem in the letterhead, mirrored opposite the seal.
+
     references:
       type: array
       default: []

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

@@ -19,6 +19,7 @@
   letterhead_caption: "[YOUR SQUADRON/UNIT NAME]",
   letterhead_seal: none,
   letterhead_seal_subtitle: none, // optional line under seal (9pt bold caps); ignored if no seal
+  letterhead_emblem: none, // optional image placed opposite the seal (right side)
   letterhead_font: DEFAULT_LETTERHEAD_FONTS,
   body_font: DEFAULT_BODY_FONTS,
   font_size: 12pt,
@@ -122,6 +123,7 @@
     letterhead_font,
     letterhead-seal: letterhead_seal,
     letterhead-seal-subtitle: letterhead_seal_subtitle,
+    letterhead-emblem: letterhead_emblem,
   )
 
   // AFH 33-337 "Date": "Place the date 1 inch from the right edge, 1.75 inches from the top"

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

@@ -20,6 +20,7 @@
   font,
   letterhead-seal: none,
   letterhead-seal-subtitle: none,
+  letterhead-emblem: none, // optional image placed opposite the seal (right side)
 ) = {
   font = ensure-array(font)
   title = ensure-string(title)
@@ -73,6 +74,17 @@
       seal-body,
     )
   }
+
+  if letterhead-emblem != none {
+    place(
+      right + top,
+      dx: 0.5in,
+      dy: -.5in,
+      block[
+        #fit-box(width: 2in, height: 1in, alignment: right + horizon)[#letterhead-emblem]
+      ],
+    )
+  }
 }
 
 // =============================================================================

package/quills/usaf_memo/0.2.0/plate.typ

@@ -15,6 +15,11 @@
     }
   ),
 
+  // Optional Freedom 250 emblem, placed opposite the seal
+  ..if data.at("freedom250", default: true) {
+    (letterhead_emblem: image("assets/freedom250.png"))
+  },
+
   // Date
   date: data.at("date", default: none),