@airmark/quiver 0.34.0 → 0.35.1

package/README.md

@@ -16,8 +16,8 @@ and aligned to the current Quillmark spec.
 | `daf1206`            | 0.1.0   | DAF Form 1206 — Nomination for Award                                             |
 | `daf4392`            | 0.1.0   | DAF Form 4392 — Pre-Departure Safety Briefing (Page 2)                           |
 | `afmc_moa`           | 0.0.1   | DoD Memorandum of Agreement (DoDI 4000.19)                                       |
-| `classic_resume`     | 0.0.1   | Classic single-page resume                                                       |
-| `cyber_ribbon_chart` | 0.0.1   | 17X Cyber Operations Officer ribbon chart and career vector planner              |
+| `classic_resume`     | 0.1.0   | Classic single-page resume                                                       |
+| `cyber_career_plan`  | 0.1.0   | 17X Cyber Operations Officer career plan: current assignment, vectors and record |
 
 ## Install
 

package/package.json

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

package/quills/classic_resume/{0.0.1 → 0.1.0}/Quill.yaml

@@ -1,6 +1,6 @@
 quill:
   name: classic_resume
-  version: 0.0.1
+  version: 0.1.0
   backend: typst
   description: Classic single-page resume
 
@@ -75,11 +75,11 @@ card_kinds:
         type: plaintext
         inline: true
         default: Summary
-        description: "Printed in uppercase over a rule. An empty title prints no heading, which sets the summary straight under your name."
+        description: "Printed in uppercase over a rule. An empty title prints no heading, so a summary that is the first card sits straight under your name."
 
   experience:
     title: Experience
-    description: "Jobs, most recent first: employer and dates on the first line, role and location on the second, details under them."
+    description: "Jobs, most recent first: employer and dates on the first line, role and location on the second, details under them. Prose written under the card prints under the heading, ahead of the jobs."
     seed:
       jobs:
         - company: Employer
@@ -122,11 +122,11 @@ card_kinds:
               type: richtext
               default: ""
               description: "Set under the entry. Usually a bulleted list, one line each and strongest first; a sentence, *italics* and **bold** set as well, and a heading sets as a bold line. Leave blank for nothing under the entry."
-        description: "One row per job. A row is never split across a page break."
+        description: "One row per job. A row is kept to one page, unless it is taller than a page."
 
   education:
     title: Education
-    description: "Schools, most recent first: school and date on the first line, degree and location on the second."
+    description: "Schools, most recent first: school and date on the first line, degree and location on the second. Prose written under the card prints under the heading, ahead of the schools."
     seed:
       schools:
         - school: School
@@ -162,7 +162,7 @@ card_kinds:
 
   skills:
     title: Skills
-    description: "Skills in labelled groups, filled across the columns and then down."
+    description: "Skills in labelled groups, filled across the columns and then down. Prose written under the card prints under the heading, ahead of the groups."
     seed:
       skills:
         - label: Category
@@ -183,7 +183,7 @@ card_kinds:
             label:
               type: plaintext
               inline: true
-              description: "Set in bold, with its items on the line under it."
+              description: "Set in bold, with its items on the line under it. Leave blank to print the items alone."
             items:
               type: plaintext
               inline: true
@@ -198,7 +198,7 @@ card_kinds:
 
   projects:
     title: Projects
-    description: "Projects: name and link on the first line, details under them."
+    description: "Projects: name and link on the first line, details under them. Prose written under the card prints under the heading, ahead of the projects."
     seed:
       projects:
         - name: Project
@@ -223,13 +223,13 @@ card_kinds:
             link:
               type: string
               default: ""
-              description: "Where to see it, set small and italic at the right as written: github.com/you/project reads better than its https:// form. A web address becomes a live link; anything else, such as 'closed source', prints as written. Leave blank to omit."
+              description: "Where to see it, set small and italic at the right as written: github.com/you/project reads better than its https:// form. A web address, an email address or a phone number becomes a live link; anything else, such as 'closed source', prints as written. Leave blank to omit."
             details: *details
         description: "One row per project."
 
   certifications:
     title: Certifications
-    description: "A list filled across the columns and then down. Retitled, it holds any short items: awards, languages, clearances."
+    description: "A list filled across the columns and then down. Retitled, it holds any short items: awards, languages, clearances. Prose written under the card prints under the heading, ahead of the list."
     seed:
       items:
         - Certification (ABBREVIATION)
@@ -249,7 +249,7 @@ card_kinds:
 
   other:
     title: Other section
-    description: "A section the kinds above do not name — volunteer work, military service, publications, a competition. Rows take the Experience shape with neutral names."
+    description: "A section the kinds above do not name — volunteer work, military service, publications, a competition. Rows take the Experience shape with neutral names. Prose written under the card prints under the heading, ahead of the rows."
     seed:
       title: Section Title
       entries:

package/quills/classic_resume/{0.0.1 → 0.1.0}/packages/ttq-classic-resume/src/components.typ

@@ -23,18 +23,25 @@
 
 // Shared skeleton of `entry`: a grid of left/right aligned header cells
 // followed by an optional bulleted body, kept together on one page. The gutter
-// keeps a left cell that wraps off the right one.
-#let _entry(cfg, cells, body) = block(
-  above: cfg.leading + cfg.rule-spacing,
-  below: cfg.leading + cfg.entry-spacing,
-  breakable: false,
-  {
+// keeps a left cell that wraps off the right one. An entry taller than a page
+// cannot be kept together, so it breaks where it must rather than running off
+// the foot of one.
+#let _entry(cfg, cells, body) = {
+  let inner = {
     grid(columns: (1fr, auto), column-gutter: 1em, row-gutter: cfg.leading, ..cells)
     if body != none {
       _bulleted(cfg, body)
     }
-  },
-)
+  }
+  block(
+    above: cfg.leading + cfg.rule-spacing,
+    below: cfg.leading + cfg.entry-spacing,
+    layout(region => block(
+      breakable: measure(block(width: region.width, inner)).height > region.height,
+      inner,
+    )),
+  )
+}
 
 // Sets the contacts on as few lines as hold them, a separator between two on
 // one line. A line therefore breaks only between contacts, and never starts or
@@ -92,7 +99,7 @@
   if named or contacts.len() > 0 {
     with-config(cfg => block(below: cfg.leading + cfg.header-spacing, {
       if named {
-        heading(level: 1, name)
+        [#heading(level: 1, name) <ttq-classic-resume-name>]
       }
       if contacts.len() > 0 {
         block(
@@ -164,7 +171,7 @@
 ///
 /// Two shapes are accepted and told apart by the first item: a flat array of
 /// content, or an array of `(label: .., text: ..)` dictionaries, which puts
-/// the label in bold above its text.
+/// the label in bold above its text. A `none` or empty label prints no line.
 #let item-grid(items: (), columns: 2) = {
   if items.len() == 0 {
     return
@@ -183,8 +190,10 @@
         + "when the first one is, found " + repr(item),
     )
     block({
-      text(weight: "bold", item.label)
-      linebreak()
+      if item.label not in (none, "", []) {
+        text(weight: "bold", item.label)
+        linebreak()
+      }
       item.text
     })
   } else {

package/quills/classic_resume/{0.0.1 → 0.1.0}/packages/ttq-classic-resume/src/config.typ

@@ -28,10 +28,11 @@
 
   // Resume header. The separator stands between two contacts on one line,
   // never at either end of one, with a word space and this padding on each
-  // side of it.
-  name-size: 18pt,
+  // side of it. Sizes in `em` follow the body size: at 12pt, the name is set
+  // at 18pt and the separator at 7pt.
+  name-size: 1.5em,
   contact-separator: "❖",
-  contact-separator-size: 7pt,
+  contact-separator-size: 7em / 12,
   contact-separator-padding: 0.25em,
 
   // Rule drawn underneath a section header.
@@ -39,8 +40,8 @@
 
   // Square bullet used by lists inside an entry. The negative baseline lifts
   // the square off the baseline so that it lines up with the middle of the
-  // x-height instead of hanging below the line.
-  marker-size: 3.5pt,
+  // x-height instead of hanging below the line. At 12pt the square is 3.5pt.
+  marker-size: 3.5em / 12,
   marker-baseline: -0.07em,
   marker-indent: 0.8em,
 

package/quills/classic_resume/{0.0.1 → 0.1.0}/packages/ttq-classic-resume/src/layout.typ

@@ -5,13 +5,14 @@
 
 // The name at the left and the page count at the right, over every page after
 // the first, so a page read apart from the first still says whose it is. The
-// name is read back off the document's level 1 heading. Small and italic, it
+// name is read back off the heading `resume-header` labels, so a level 1
+// heading written in the body never stands in for it. Small and italic, it
 // reads as a running head: a 0.5in margin leaves no room to set it further off
 // the page.
 #let _continuation-header(cfg) = context {
   if counter(page).get().first() > 1 {
     set text(size: cfg.annotation-size, style: "italic")
-    let names = query(heading.where(level: 1))
+    let names = query(<ttq-classic-resume-name>)
     if names.len() > 0 { names.first().body }
     h(1fr)
     counter(page).display("1 of 1", both: true)

package/quills/classic_resume/{0.0.1 → 0.1.0}/packages/ttq-classic-resume/src/util.typ

@@ -4,8 +4,10 @@
 // A contact line usually holds an email address, a profile link, a phone
 // number and a city. Only the first three are worth turning into a link, and
 // they are distinguishable by shape.
+#let _mailto = regex("^(?i:mailto):\\S+$")
+#let _tel = regex("^(?i:tel):[+(\\d][\\d\\s()./+-]*\\d$")
 #let _email = regex("^[^@\\s]+@[^@\\s]+\\.[^@\\s]+$")
-#let _scheme = regex("^(https?://|www\\.)\\S+$")
+#let _scheme = regex("^(?i:https?://|www\\.)\\S+$")
 #let _domain = regex("^[\\w-]+(\\.[\\w-]+)*\\.[A-Za-z]{2,24}(/\\S*)?$")
 #let _phone = regex("^[+(\\d][\\d\\s()./+-]*\\d$")
 #let _digit = regex("\\d")
@@ -13,7 +15,9 @@
 /// Turns a contact into a link when it looks like an email address, a web
 /// address or a phone number, and returns it unchanged otherwise. A city or a
 /// clearance level is therefore left alone, and so is anything that is already
-/// content, so callers can always pass their own `link(..)` instead.
+/// content, so callers can always pass their own `link(..)` instead. One
+/// already written as a `mailto:`, `tel:` or `http(s)://` link keeps its
+/// target, whatever case its scheme is written in.
 ///
 /// `body` is what prints, the contact itself unless given: a caller holding the
 /// contact as text and as content of its own reads the one and prints the
@@ -22,11 +26,20 @@
   let body = if body == auto { contact } else { body }
   if type(contact) != str {
     body
+  } else if contact.match(_mailto) != none {
+    link("mailto:" + contact.slice(7), body)
+  } else if contact.match(_tel) != none {
+    link("tel:" + contact.slice(4).replace(regex("[^\\d+]"), ""), body)
   } else if contact.match(_email) != none {
     link("mailto:" + contact, body)
   } else if contact.match(_scheme) != none {
-    let href = if contact.starts-with("www.") { "https://" + contact } else { contact }
-    link(href, body)
+    let (scheme, rest) = if lower(contact).starts-with("www.") {
+      ("https://", contact)
+    } else {
+      let split = contact.position("://") + 3
+      (lower(contact.slice(0, split)), contact.slice(split))
+    }
+    link(scheme + rest, body)
   } else if contact.match(_domain) != none {
     link("https://" + contact, body)
   } else if contact.match(_phone) != none and contact.matches(_digit).len() >= 7 {

package/quills/classic_resume/{0.0.1 → 0.1.0}/packages/ttq-classic-resume/typst.toml

@@ -19,8 +19,3 @@ keywords = [
 ]
 categories = ["cv"]
 disciplines = ["business", "computer-science", "engineering", "communication"]
-
-[template]
-path = "template"
-entrypoint = "resume.typ"
-thumbnail = "thumbnail.png"

package/quills/classic_resume/{0.0.1 → 0.1.0}/plate.typ

@@ -37,7 +37,8 @@
 // no content. What prints is the field's ink twin, `printed`, which keeps the
 // click target a value computed with loses.
 #let linked(value, printed) = {
-  if value.trim() == "" { none } else { auto-link(value, body: printed) }
+  let value = value.trim()
+  if value == "" { none } else { auto-link(value, body: printed) }
 }
 
 #show: resume.with(
@@ -53,9 +54,9 @@
   // EB Garamond has no ❖ (U+2756), the package's default separator: it prints
   // only where a second family is installed to lend the glyph, and draws from
   // that family rather than this one. ◆ is the nearest diamond EB Garamond
-  // carries itself, and wants a point less to weigh the same.
+  // carries itself, and wants a point less to weigh the same: 6pt at 12pt.
   contact-separator: "◆",
-  contact-separator-size: 6pt,
+  contact-separator-size: 0.5em,
 )
 
 // The package restyles lists to its square bullet inside an entry only. A
@@ -100,22 +101,28 @@
   body: under-entry(details),
 )
 
+// The rows an author filled in. A row left wholly blank, as a new one is, would
+// print as an empty gap.
+#let filled(rows) = rows.filter(row => row.values().any(value => {
+  or-none(if type(value) == str { value.trim() } else { value }) != none
+}))
+
 // What each declared kind sets under its heading and body. A card of a kind
 // the quill does not declare is warned on and left off the page: its fields
 // are not this quill's to read.
 #let rows = (
   summary: card => none,
-  experience: card => for job in card.jobs {
+  experience: card => for job in filled(card.jobs) {
     dated(job.company, job.dates, job.role, job.location, job.details)
   },
-  education: card => for school in card.schools {
+  education: card => for school in filled(card.schools) {
     dated(school.school, school.dates, school.degree, school.location, school.details)
   },
   skills: card => item-grid(
-    items: card.skills.map(row => (label: trim-inline(row.label), text: trim-inline(row.items))),
+    items: filled(card.skills).map(row => (label: or-none(row.label), text: trim-inline(row.items))),
     columns: calc.max(1, card.columns),
   ),
-  projects: card => for project in card.projects {
+  projects: card => for project in filled(card.projects) {
     entry(
       heading: trim-inline(project.name),
       form: "linked",
@@ -124,10 +131,10 @@
     )
   },
   certifications: card => item-grid(
-    items: card.items.map(trim-inline),
+    items: card.items.map(or-none).filter(item => item != none),
     columns: calc.max(1, card.columns),
   ),
-  other: card => for row in card.entries {
+  other: card => for row in filled(card.entries) {
     dated(row.heading, row.dates, row.subtitle, row.location, row.details)
   },
 )

package/quills/{cyber_ribbon_chart/0.0.1 → cyber_career_plan/0.1.0}/Quill.yaml

@@ -1,8 +1,8 @@
 quill:
-  name: cyber_ribbon_chart
-  version: 0.0.1
+  name: cyber_career_plan
+  version: 0.1.0
   backend: typst
-  description: 17X Cyber Operations Officer ribbon chart and career vector planner
+  description: "17X Cyber Operations Officer career plan: current assignment, vectors and record"
 
 typst:
   plate_file: plate.typ
@@ -112,7 +112,7 @@ main:
       ui:
         group: plan
         compact: true
-      description: "How many years wide the timeline is. Twelve carries a Captain from today past the Lt Col board and is the comfortable reading width. The full milestone ladder runs to YG+17, so widening it toward eighteen brings the SDE looks into view at the cost of narrower columns; any milestone that falls outside the window is counted in a note rather than dropped."
+      description: "How many years wide the timeline is, at most eighteen; a wider window draws at eighteen. Twelve carries a Captain from today past the Lt Col board and is the comfortable reading width. The full milestone ladder runs to YG+17, so widening it toward eighteen brings the SDE looks into view at the cost of narrower columns. A milestone past the window's far end is counted in a note rather than dropped; one before it is history, except a course passed unticked, which is listed as overdue."
 
     move_year:
       type: integer?
@@ -180,7 +180,7 @@ main:
                   type: number
                   default: 2
                   title: Years
-                  description: "Length in years, in halves: 0.5 to 4. The timeline is ruled in half-years, one per VML cycle, so a length is rounded to the nearest half, and one outside that range draws at the nearer end, marked with a dagger. A whole number of years keeps you on the cycle you moved in on; a half switches Summer to Winter or back."
+                  description: "Length in years, in halves: 0.5 to 4. The timeline is ruled in half-years, one per VML cycle, so a length is rounded to the nearest half first, and one that rounds to outside that range draws at the nearer end, marked with a dagger. A whole number of years keeps you on the cycle you moved in on; a half switches Summer to Winter or back."
                 school:
                   type: boolean
                   default: false
@@ -258,11 +258,12 @@ main:
       type: object
       ui:
         group: qualifications
+        layout: flat
       description: "Tick what you hold. The page prints the whole 17X vocabulary and marks these: a rater reads the empty boxes as readily as the filled ones, so what you have not done yet is on the page whether you tick it or not. A ticked course or school also marks its milestone on the timeline done. Written out, a tick is `flight_cc: true`, and a tick with its detail `flight_cc: {detail: UMS Flt/CC}`; an unticked member is left out."
       properties:
         command:
           type: matrix
-          title: Leadership & Command
+          title: Leadership & command
           ui:
             compact: true
           members:
@@ -295,7 +296,7 @@ main:
           properties: *detail
         staff:
           type: matrix
-          title: Staff & Functional
+          title: Staff & functional
           ui:
             compact: true
           members:

package/quills/{cyber_ribbon_chart/0.0.1 → cyber_career_plan/0.1.0}/example.md

@@ -1,5 +1,5 @@
 ~~~
-$quill: cyber_ribbon_chart
+$quill: cyber_career_plan
 name: Capt John A. Snuffy
 afsc: 17S3
 duty_title: Instructor

package/quills/{cyber_ribbon_chart/0.0.1 → cyber_career_plan/0.1.0}/plate.typ

@@ -29,9 +29,10 @@
 #set block(spacing: 0pt)
 #set par(spacing: 0pt)
 
+#let officer = data.at("name", default: "").trim()
 #set document(
-  title: "Ribbon Chart — " + data.name,
-  author: data.name,
+  title: if officer == "" { "Career Plan" } else { "Career Plan — " + officer },
+  author: officer,
 )
 
 // A `plaintext` field lowers to content padded with a space on each side, which
@@ -75,13 +76,19 @@
 #let board-yg = if adjusted { adj-yg } else { comm-yg }
 // A required year not yet filled in arrives as 0. With no start year the window
 // opens on the year group; with neither, as on a new chart, the axis counts
-// from YG+0 and prints no calendar years rather than the years 0 to 11.
+// from YG+0 and prints no calendar years rather than the years 0 to 11. With a
+// start year but no year group there is nothing to count the ladder from, so
+// the axis prints calendar years alone and no milestone is drawn.
 #let start-year = if data.timeline_start_year == 0 { board-yg } else { data.timeline_start_year }
 #let dated = start-year != 0
-#let years = calc.max(1, data.timeline_years)
+#let laddered = board-yg != 0 or not dated
+#let yg-offset(k) = if k < 0 [YG#k] else [YG+#k]
+// Eighteen is the widest the marks hold their columns at, and the schema cannot
+// bound an integer, so a wider window draws at eighteen.
+#let years = calc.clamp(data.timeline_years, 1, 18)
 #let cols = years * 2
 #let last-year = start-year + years - 1
-#let window-end = if dated [#last-year] else [YG+#(last-year - board-yg)]
+#let window-end = if dated [#last-year] else { yg-offset(last-year - board-yg) }
 #let in-window(y) = y >= start-year and y <= last-year
 #let band-height = 0.46in
 // Marks fit their year column: past twelve years they step off the scale.
@@ -124,12 +131,16 @@
 // A course whose year has passed unticked is what a rater most needs to see, so
 // it stands before the window, in the rail, saying when it was due. A passed
 // board is history.
-#let gates = gates.map(g => (..g, overdue: not g.board and not g.done and g.year < start-year))
+#let gates = if laddered {
+  gates.map(g => (..g, overdue: not g.board and not g.done and g.year < start-year))
+} else { () }
 #let looks = ("1st", "2nd", "3rd", "final")
-#let windows = (
-  (yg: 8, name: "IDE", by: ("ide_candidate", "ide_graduate")),
-  (yg: 14, name: "SDE", by: ("sde_candidate", "sde_graduate")),
-).map(w => (..w, done: held(w.by), years: looks.enumerate().map(((k, _)) => board-yg + w.yg + k)))
+#let windows = if laddered {
+  (
+    (yg: 8, name: "IDE", by: ("ide_candidate", "ide_graduate")),
+    (yg: 14, name: "SDE", by: ("sde_candidate", "sde_graduate")),
+  ).map(w => (..w, done: held(w.by), years: looks.enumerate().map(((k, _)) => board-yg + w.yg + k)))
+} else { () }
 #let ahead = (
   gates.filter(g => not g.done and g.year > last-year).len()
     + windows.filter(w => not w.done).map(w => w.years.filter(y => y > last-year).len()).sum(default: 0)
@@ -216,14 +227,18 @@
 #let vectors = data.vectors.enumerate().map(((i, v)) => (
   rank: ranks.at(i, default: "Vector " + str(i + 1)),
   track: or-none(v.track),
-  // A length outside 0.5 to 4 draws at the nearer end under a dagger the
-  // legend explains, since the schema cannot bound a number.
-  placed: lay(v.tours.map(t => (
-    title: trim(t.title),
-    span: calc.clamp(int(calc.round(float(t.years) * 2)), 1, 8),
-    out-of-range: t.years < 0.25 or t.years > 4,
-    school: t.school,
-  ))),
+  // A length is rounded to the half-year first; one that rounds outside 0.5 to
+  // 4 draws at the nearer end under a dagger the legend explains, since the
+  // schema cannot bound a number.
+  placed: lay(v.tours.map(t => {
+    let halves = int(calc.round(float(t.years) * 2))
+    (
+      title: trim(t.title),
+      span: calc.clamp(halves, 1, 8),
+      out-of-range: halves < 1 or halves > 8,
+      school: t.school,
+    )
+  })),
 ))
 
 // The band is ruled to an even height, so a block cannot grow to fit its text:
@@ -259,6 +274,24 @@
   )).flatten().find(s => s != none))
 })
 
+// A vector's label holds to its row the way a block's text does: it steps down
+// the scale until it fits, every word within the rail. One too long at the
+// smallest drops its rank, which the row's place already says, and keeps the
+// whole lines the row holds.
+#let track-label(name, sub) = layout(size => {
+  let (w, h) = (size.width, size.height)
+  let words = plain(name).split(" ").filter(x => x != "")
+  let face(s, body) = text(size: s, weight: 700, body)
+  let typeset(s) = [#face(s, name)#if sub != none [#linebreak()#text(size: micro, fill: mute, sub)]]
+  let fits(s) = words.all(x => measure(face(s, x)).width <= w) and measure(block(width: w, typeset(s))).height <= h
+  let s = (lead, base, small).find(fits)
+  if s != none { return block(width: w, height: h, align(left + horizon, typeset(s))) }
+  let one = measure(face(small, [A])).height
+  let step = measure(face(small, [A#linebreak()A])).height - one
+  let kept = one + calc.floor((h - one) / step) * step + 2pt
+  block(width: w, height: h, align(left + horizon, block(width: w, height: kept, clip: true, face(small, name))))
+})
+
 #let span-label(span) = {
   let years = span / 2
   if calc.rem(span, 2) == 0 { [#int(years) yr] } else { [#years yr] }
@@ -297,7 +330,16 @@
   ("Year group", if board-yg != 0 [#board-yg], if adjusted [adjusted from #comm-yg]),
   ("Date of rank", show-date(data.date_of_rank), none),
   ("Arrived station", show-date(data.date_arrived_station), none),
-  ("Advanced degree", or-none(data.advanced_degree), none),
+  // A degree marked "(in progress)" says so in a note under it, as the year
+  // group's adjustment does, rather than breaking inside the parenthesis.
+  {
+    let degree = or-none(data.advanced_degree)
+    let flat = plain(degree).trim()
+    let mark = "(in progress)"
+    if degree != none and flat.ends-with(mark) and flat.len() > mark.len() {
+      ("Advanced degree", flat.slice(0, -mark.len()).trim(), [in progress])
+    } else { ("Advanced degree", degree, none) }
+  },
 )
 #grid(
   columns: (name-width,) + (1fr,) * facts.len(),
@@ -305,7 +347,7 @@
   row-gutter: 3pt,
   align: (_, y) => if y == 0 { bottom } else { top },
   // Raised clear of the line under it by the depth of its descenders.
-  pad(bottom: 3pt, text(size: display, weight: 800, tracking: -0.3pt, data.name)),
+  pad(bottom: 3pt, text(size: display, weight: 800, tracking: -0.3pt, officer)),
   ..facts.map(((name, ..)) => eyebrow(name)),
   identity,
   ..facts.map(((_, value, note)) => stack(
@@ -325,20 +367,21 @@
 // the axis
 #rows.push(table.cell[])
 #for i in range(years) {
-  let offset = [YG+#(start-year + i - board-yg)]
+  let offset = yg-offset(start-year + i - board-yg)
   rows.push(table.cell(colspan: 2, stroke: (bottom: 0.7pt + ink), inset: (x: 3pt, bottom: 3pt))[
-    #if dated [
+    #if not dated { text(weight: 700, offset) } else if laddered [
       #text(weight: 700)[#(start-year + i)]
       #linebreak()
       #text(size: micro, fill: mute, offset)
-    ] else { text(weight: 700, offset) }
+    ] else { text(weight: 700)[#(start-year + i)] }
   ])
 }
 
 // One row per constraint, under the axis: a bar from today to the end of the
 // last year it holds, ruled under and closed at its end, so it reads as "until
 // here". The band is not ruled by year, so a label too long for its bar runs
-// on past its end, on one line, over nothing.
+// on past its end, on one line, over nothing; one too long for that as well is
+// cut at whichever edge leaves more of it, the bar's end or the page's.
 #for (i, c) in constraints.enumerate() {
   rows.push(if i == 0 { row-label[Constraints] } else { table.cell[] })
   let note = [#text(size: micro, weight: 600)[#c.note]#text(size: micro, fill: mute)[#(" · through " + str(c.through))]]
@@ -348,9 +391,14 @@
       // A bar that runs past the window is left open at its end, since the
       // window's edge is not where it stops.
       let open = c.through > last-year
-      let fits = measure(note).width + 8pt <= size.width
+      let wide = measure(note).width
+      let inside = size.width - 8pt
+      // The half-years right of the bar, less this cell's own inset.
+      let after = (size.width + 2pt) / c.end * (cols - c.end) - 4pt
+      let (dx, room) = if wide <= inside or (wide > after and inside >= after) { (3pt, inside) } else { (size.width + 3pt, after) }
       box(width: 100%, height: 8.5pt, stroke: (bottom: constraint-stroke, right: if open { none } else { constraint-stroke }))
-      place(left + bottom, dx: if fits { 3pt } else { size.width + 3pt }, dy: -2pt, box(width: 10in, note))
+      // Clipped across only: the inset keeps the ascenders and descenders.
+      place(left + bottom, dx: dx, box(width: calc.max(0pt, room), inset: (y: 2pt), clip: true, box(width: 10in, note)))
     })
   ])
   rows += empty(cols - c.end)
@@ -383,11 +431,17 @@
 // The assignment held now, drawn once across every vector row. It reads like a
 // tour block, title over a line of small print, and sheds what its space cannot
 // hold the way one does; with nothing left, the header still names the job. The
-// unit is left to the header throughout.
+// unit is left to the header throughout. A move past the window leaves the
+// block open at the window's edge, as a tour the window cuts is.
 #let current-block = block(
   width: 100%,
   height: 100%,
-  stroke: current-stroke,
+  stroke: (
+    left: current-stroke,
+    top: current-stroke,
+    bottom: current-stroke,
+    right: if move-col > cols { none } else { current-stroke },
+  ),
   inset: (x: 3pt, y: 2pt),
   block-text(
     if duty != none { duty } else { [Current assignment] },
@@ -405,12 +459,11 @@
   if v.track != none { sub.push(v.rank) }
   if beyond.len() > 0 { sub.push([+#beyond.len() past #window-end]) }
 
-  rows.push(table.cell(align: left + horizon, stroke: top-rule, inset: (right: 5pt, y: 3pt))[
-    #text(size: lead, weight: 700)[#if v.track != none { v.track } else { v.rank }]
-    #if sub.len() > 0 [
-      #linebreak()
-      #text(size: micro, fill: mute)[#sub.join[ · ]]
-    ]
+  rows.push(table.cell(stroke: top-rule, inset: (right: 5pt, y: 3pt))[
+    #block(width: 100%, height: 100%, track-label(
+      if v.track != none { v.track } else { [#v.rank] },
+      if sub.len() > 0 { sub.join[ · ] },
+    ))
   ])
 
   if rank == 0 and current-span > 0 {
@@ -520,7 +573,9 @@
 }
 
 // A table, so each rater's column reads down the years. With no Higher Level
-// Reviewer strat on any row, that column goes rather than printing empty.
+// Reviewer strat on any row, that column goes rather than printing empty. The
+// rows are set at the record's size, so the table reads as one of its rows. A
+// year not yet filled in arrives as 0, sorts last and prints a dash.
 #let strats = data.stratifications.sorted(key: s => -s.year)
 #let any-hlr = strats.any(s => not blank(s.hlr))
 #let strat-cell(v) = if blank(v) { dash } else { trim(v) }
@@ -531,9 +586,9 @@
   stroke: none,
   table.header([], eyebrow[Rater], ..if any-hlr { (eyebrow[HLR],) }),
   ..strats.map(s => (
-    text(size: base, weight: 700)[#s.year],
-    text(size: base, strat-cell(s.rater)),
-    ..if any-hlr { (text(size: base, strat-cell(s.hlr)),) },
+    if s.year == 0 { dash } else { text(weight: 700)[#s.year] },
+    strat-cell(s.rater),
+    ..if any-hlr { (strat-cell(s.hlr),) },
   )).flatten(),
 )
 
@@ -584,26 +639,43 @@
   body
 }
 
-// What was typed and two blank lines under it are the minimum, and hold their
-// height: a record too long for the page pushes it onto a second rather than
-// eating the lines a rater writes on.
-#grid(
-  columns: (rail, 1fr),
-  on-ruling(rail-label[Notes]),
-  layout(size => {
-    let notes = if type(typed) != str { on-ruling(typed) } else { [] }
-    let used = calc.round(measure(block(width: size.width, notes)).height / pitch)
-    let n = int(used) + 2
-    block(width: 100%, height: n * pitch, { ruling(n); notes })
-  }),
-)
-#block(width: 100%, height: 1fr, pad(left: rail, layout(size => ruling(calc.floor((size.height - rule-drop) / pitch) + 1))))
-
-#block(above: 10pt, grid(
+// What was typed, on at least the first rule, is the minimum and holds its
+// height; the blank rules under it are whatever the page has left. The notes
+// and the line they are signed on are one unit, so typed notes too long for the
+// page carry the signature with them rather than leaving it alone overleaf.
+//
+// The section is one block sized to the rest of its page, which it reads off a
+// mark left where it starts: the page cannot otherwise tell a block what is left
+// of it, and the mark, being empty, stays put when the block does not fit. Notes
+// too long for what is left make the block taller than that, and it goes to the
+// next page whole.
+#let signature = grid(
   columns: (rail, 1fr),
   rail-label[Discussed with],
   text(size: micro, fill: mute)[
     #box(width: 2.5in, stroke: (bottom: 0.4pt + mute))[]
     #h(12pt) on #box(width: 1.2in, stroke: (bottom: 0.4pt + mute))[]
   ],
-))
+)
+#let signature-gap = 8pt
+#block(height: 0pt)<notes-start>
+#context {
+  let width = 11in - 2 * margin - rail
+  let notes = if type(typed) != str { on-ruling(typed) } else { [] }
+  let used = int(calc.round(measure(block(width: width, notes)).height / pitch))
+  let below = signature-gap + measure(signature).height
+  let room = 8.5in - margin - locate(<notes-start>).position().y
+  // The typed lines need only reach their last rule; the blank rules run on to
+  // the signature's gap.
+  let lines = calc.max(1, used)
+  let need = (lines - 1) * pitch + rule-drop + below
+  let rules = calc.max(lines, int(calc.floor((room - below - rule-drop) / pitch)) + 1)
+  block(breakable: false, width: 100%, height: calc.max(room, need), {
+    grid(
+      columns: (rail, 1fr),
+      on-ruling(rail-label[Notes]),
+      block(width: 100%, { ruling(rules); notes }),
+    )
+    place(bottom + left, signature)
+  })
+}

package/templates/templates.json

@@ -54,12 +54,5 @@
     "description": "Appoint primary and alternate program managers with an appointee table",
     "file": "appointment_letter.md",
     "tags": ["appointment", "additional-duty", "air-force"]
-  },
-  {
-    "id": "deros-extension",
-    "name": "DEROS Extension Request",
-    "description": "Exception to policy DEROS extension request memorandum with commander indorsement",
-    "file": "deros_extension.md",
-    "tags": ["deros", "pcs", "assignments"]
   }
 ]

package/templates/deros_extension.md

@@ -1,40 +0,0 @@
-~~~
-$quill: usaf_memo@0.3
-$kind: main
-letterhead_title:
-  - DEPARTMENT OF THE AIR FORCE
-  - YOUR SQUADRON HERE
-memo_for:
-  - SQ/CC
-  - ORG FSS/FSPD
-  - AFPC ENLISTED DEROS MANAGEMENT
-memo_from:
-  - ORG/SYMBOL
-subject: Exception to Policy DEROS Extension Request (JOHN Q. SMITH, SSN)
-signature_block:
-  - FIRST M. LAST, Rank, USAF
-  - Duty Title
-tag_line: ""
-~~~
-
-I am requesting an extension of my current DEROS from DD MMM YYYY to DD MMM YYYY. Why do you need this DEROS extension? What has caused the delay?
-
-My original DEROS from insert base to insert base is *DD MMM YYYY* with a RNLTD of *DD MMM YYYY*
-
-My personal information is as follows:
-
-- Current DEROS: DD MMM YYYY
-
-- Requested DEROS: DD MMM YYYY
-
-For any questions or concerns you may contact me at *email* or DSN xxx-xxxx
-
-~~~
-$kind: indorsement
-from: ORG/CC
-for: ORG FSS/FSPD
-signature_block:
-  - FIRST M. LAST, Rank, USAF
-  - Commander
-action: undecided
-~~~