@tonguetoquill/collection 0.12.1 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonguetoquill/collection",
-  "version": "0.12.1",
+  "version": "0.13.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nibsbin/tonguetoquill-collection.git"

package/quills/daf1206/0.1.0/Quill.yaml

@@ -13,7 +13,7 @@ main:
     award:
       title: Award
       type: string
-    category:
+    category_if_applicable:
       title: Category (If Applicable)
       type: string
     award_period:
@@ -25,25 +25,28 @@ main:
     majcom_fldcom_foa_or_dru:
       title: MAJCOM/FLDCOM/FOA/DRU
       type: string
-    dafscduty_title:
+    dafsc_duty_title:
       title: DAFSC/Duty Title
       type: string
-    nominees_telephone:
+    nominees_telephone_dsn_commercial:
       title: Nominee's Telephone (DSN/Commercial)
       type: string
-    unitoffice_symbol:
+    unit_office_symbol_street_address_base_state_zip:
       title: Unit/Office Symbol/Street Address/Base/State/Zip Code
       type: string
-    unit_commander:
-      title: Rank/Name of Unit Commander & Telephone
+    unit_commander_rank_name_and_telephone:
+      title: Rank/Name of Unit Commander & Telephone (DSN/Commercial)
       type: string
     accomplishments:
       title: Specific Accomplishments (Page 1)
-      type: string
+      type: markdown
       ui:
         multiline: true
-    accomplishments_continued:
-      title: Specific Accomplishments (Continued - Page 2)
+    rankname_of_nominee_page_2:
+      title: Rank/Name of Nominee (Page 2 — optional; defaults to Page 1)
       type: string
+    accomplishments_continued:
+      title: Specific Accomplishments (Continued — Page 2)
+      type: markdown
       ui:
         multiline: true

package/quills/daf1206/0.1.0/example.md

@@ -1,8 +1,8 @@
 ---
 QUILL: daf1206@0.1.0
 award: "AIR AND SPACE ACHIEVEMENT MEDAL"
-category: "asdfasdfasdf"
-award_period: "1 Jan 24 - 31 Dec 24 asdfasdfasdf"
+category: "Terrestrial"
+award_period: "1 Jan 24 - 31 Dec 24"
 rankname_of_nominee: "SSgt Doe, John A."
 majcom_fldcom_foa_or_dru: "ACC"
 dafscduty_title: "1D7X1 / Cyber Operator"

package/quills/daf1206/0.1.0/packages/typst-daf1206/form.typ

@@ -17,7 +17,7 @@
   SPECIFIC_ACCOMPLISHMENTS_Use_Performance_Statements_IAW_DAFMAN_362806_Continued: "",  // text
 ) = render-form(
   schema: json("FIELDS.json"),
-  backgrounds: ("page1.png", "page2.png",),
+  backgrounds: ("page1.svg", "page2.svg",),
   values: (
     "AWARD": AWARD,
     "CATEGORY If Applicable": CATEGORY_If_Applicable,

package/quills/daf1206/0.1.0/packages/typst-daf1206/lib.typ

@@ -3,21 +3,41 @@
 
 /// Global configuration for text rendering.
 /// Adjust these to change the overall form text appearance.
-#let FORM_MAX_TEXT_SIZE = 11pt
-#let FORM_MIN_TEXT_SIZE = 5pt
+#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)
+  }
+}
+
 /// 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
-  let char-count = display.len()
+  // 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.5em)
+  set par(leading: 0.25em)
   context {
     let avail-w = width - 2 * x-inset
     let avail-h = height - 2 * y-inset
@@ -81,8 +101,14 @@
 /// - 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) != "" {
-      render-text-field(str(value), width, height, 1.5pt, 1pt)
+    if value != none {
+      // Pass content through directly so styling (bold, italic, …) is preserved;
+      // for plain strings, skip empty values.
+      if type(value) == content {
+        render-text-field(value, width, height, 1.5pt, 1pt)
+      } else if str(value) != "" {
+        render-text-field(str(value), width, height, 1.5pt, 1pt)
+      }
     }
   } else if field-type == "checkbox" {
     if value == true {
@@ -104,16 +130,17 @@
       )
     }
   } 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 != "" {
+    if display != none and to-str(display) != "" {
       render-text-field(display, width, height, 2pt, 1pt)
     }
   }
@@ -129,10 +156,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.