@airmark/quiver 0.7.0 → 0.10.0

package/README.md

@@ -17,20 +17,31 @@ and aligned to the current Quillmark spec.
 ## Install
 
 ```bash
-npm install @airmark/quiver @quillmark/quiver@0.5.0 @quillmark/wasm@0.66.2
+npm install @airmark/quiver @quillmark/quiver@^0.6.0 @quillmark/wasm
 ```
 
+This package ships only the Source Quiver assets (`Quiver.yaml` + `quills/`)
+and exposes no JavaScript API. All loading is performed by `@quillmark/quiver`,
+either from the on-disk package directory or from a packed archive fetched
+over HTTP.
+
 ## Usage
 
-### Load via the convenience helper
+### Load from the exported directory
+
+Resolve the package's `Quiver.yaml` via `import.meta.resolve` and hand it to
+`@quillmark/quiver`:
 
 ```ts
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
 import { Quillmark, Document } from '@quillmark/wasm';
-import { loadAirmarkQuiver } from '@airmark/quiver';
+import { Quiver } from '@quillmark/quiver/node';
 
-const engine = new Quillmark();
-const quiver = await loadAirmarkQuiver();
+const quiverYaml = fileURLToPath(import.meta.resolve('@airmark/quiver/Quiver.yaml'));
+const quiver = await Quiver.fromDir(path.dirname(quiverYaml));
 
+const engine = new Quillmark();
 const doc = Document.fromMarkdown(`---
 QUILL: usaf_memo@0.2
 memo_for: ["ORG/SYMBOL"]
@@ -45,14 +56,11 @@ const quill = await quiver.getQuill(doc.quillRef, { engine });
 const { artifacts } = quill.render(doc, { format: 'pdf' });
 ```
 
-### Load from the exported directory
+### Load a packed Quiver via HTTP
 
-```ts
-import { Quiver } from '@quillmark/quiver/node';
-import { QUIVER_DIR } from '@airmark/quiver';
-
-const quiver = await Quiver.fromDir(QUIVER_DIR);
-```
+Publish a packed Quiver archive (e.g. as a CDN or GitHub release asset) and
+load it in the browser or any fetch-capable runtime through `@quillmark/quiver`.
+See the upstream `@quillmark/quiver` docs for the packed-format and HTTP API.
 
 ## Layout
 

package/package.json

@@ -1,31 +1,22 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.7.0",
+  "version": "0.10.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
-  "main": "./index.js",
-  "types": "./index.d.ts",
   "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "import": "./index.js"
-    }
+    "./Quiver.yaml": "./Quiver.yaml",
+    "./quills/*": "./quills/*",
+    "./package.json": "./package.json"
   },
   "files": [
     "quills",
-    "Quiver.yaml",
-    "index.js",
-    "index.d.ts"
+    "Quiver.yaml"
   ],
   "engines": {
     "node": ">=18"
   },
-  "peerDependencies": {
-    "@quillmark/quiver": ">=0.5.0 <1.0.0",
-    "@quillmark/wasm": ">=0.66.2 <1.0.0"
-  },
   "devDependencies": {
-    "@quillmark/quiver": "^0.5.0",
+    "@quillmark/quiver": "^0.6.0",
     "@quillmark/wasm": "0.66.2"
   },
   "scripts": {

package/quills/usaf_memo/0.2.0/Quill.yaml

@@ -175,13 +175,27 @@ main:
     classification:
       title: Classification level of the memo that displays in the banner
       type: string
-      default: ""
-      examples:
+      enum:
+        - ""
+        - UNCLASSIFIED
+        - CUI
         - CONFIDENTIAL
+        - SECRET
+        - TOP SECRET
+      default: ""
+      ui:
+        group: Additional
+        compact: true
+      description: "Select the classification marking displayed in the header/footer banner. Banner colors follow DoD/CAPCO marking guidance (UNCLASSIFIED green, CUI/CONFIDENTIAL black, SECRET red, TOP SECRET orange). Follow AFI 31-401 and applicable DoD guidance. Leave blank to omit the banner."
+
+    dissemination:
+      title: Dissemination control marking (portion after //)
+      type: string
+      default: ""
       ui:
         group: Additional
         compact: true
-      description: Follow AFI 31-401 and applicable DoD guidance for classification markings. Leave blank for unclassified.
+      description: "Optional marking appended after double slash (e.g. NF with classification CUI renders as CUI//NF). Leave blank to show only the classification with no //."
     
 card_types:
   indorsement:

package/quills/usaf_memo/0.2.0/example.md

@@ -30,7 +30,7 @@ signature_block:
   - FIRST M. LAST, Rank, USAF
   - Duty Title
 tag_line: Aim High
-classification: SECRET//FICTIONAL 
+classification: UNCLASSIFIED
 ---
 
 The `usaf_memo` Quill package takes care of all 33-337 formatting details. Focus on the content.
@@ -53,4 +53,4 @@ signature_block:
   - Duty Title
 ---
 
-This body and the metdata above are an indorsement card. Multiple or no indorsements cards can be used.
+This body and the metdata above are an indorsement card. Multiple or no indorsements cards can be used.

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

@@ -199,9 +199,15 @@
   //   item.kind       — "par", "heading", "table", or "continuation"
   context {
     let heading_buffer = none
+    // Filter out zero-width paragraphs so that an empty body (e.g. empty
+    // string from a CARD with no text) emits nothing and collapses to zero
+    // vertical space. Tables are always kept regardless of measured width.
+    let items = PAR_BUFFER.get().filter(item =>
+      item.kind == "table" or measure(item.content).width > 0pt
+    )
+    if items.len() == 0 { return }
     // Only top-level paragraphs count for AFH 33-337 §2 numbering purposes
-    let par_count = PAR_BUFFER.get().filter(item => item.kind == "par").len()
-    let items = PAR_BUFFER.get()
+    let par_count = items.filter(item => item.kind == "par").len()
     let total_count = items.len()
 
     // Track paragraph numbers per level manually to avoid nested-context
@@ -319,7 +325,15 @@
           block(breakable: true)[#final_par]
         }
       } else {
-        final_par
+        // Wrap every non-last emission in a plain block so the document-wide
+        // `set block(above: spacing.line)` rule contributes the same 0.5em
+        // gap above every paragraph, including the first (matching the
+        // single-paragraph case which always passes through the
+        // `i == total_count` branch) and middle paragraphs (so the gap
+        // between the 1st and 2nd doesn't shrink relative to the gap
+        // between the 2nd-to-last and last). Bare emission would skip
+        // `block.above` entirely and visibly compress the spacing.
+        block[#final_par]
       }
     }
   }

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

@@ -59,11 +59,17 @@
 // AFH 33-337 §3: "Follow AFI 31-401, Information Security Program Management,
 // applicable executive orders and DoD guidance for the necessary markings on
 // classified correspondence."
-// Color values follow DoD standard classification marking colors
-// Source: https://security.stackexchange.com/questions/161829
+// Color values follow DoD/CAPCO standard classification marking colors:
+//   - TOP SECRET: orange  (#FF671F)
+//   - SECRET: red         (#C8102E)
+//   - CONFIDENTIAL: black (per project style guide)
+//   - CUI: black          (DoDM 5200.48; per project style guide)
+//   - UNCLASSIFIED: green (#007A33)
 
 #let CLASSIFICATION_COLORS = (
-  "UNCLASSIFIED": rgb(0, 122, 51), // Forest green (#007A33)
-  "SECRET": rgb(200, 16, 46), // Crimson red (#C8102E)
-  "TOP SECRET": rgb(255, 103, 31), // Burnt orange (#FF671F)
+  "TOP SECRET": rgb(255, 103, 31),
+  "SECRET": rgb(200, 16, 46),
+  "CONFIDENTIAL": rgb(0, 0, 0),
+  "CUI": rgb(0, 0, 0),
+  "UNCLASSIFIED": rgb(0, 122, 51),
 )

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

@@ -24,6 +24,7 @@
   font_size: 12pt,
   memo_for_cols: 3,
   classification_level: none,
+  dissemination: none,
   footer_tag_line: none,
   memo_style: "usaf",
   it,
@@ -37,6 +38,26 @@
   )
 
   let actual_date = if date == none { datetime.today() } else { date }
+
+  let classification_marking = if classification_level == none or type(classification_level) != str {
+    none
+  } else {
+    let base = classification_level.trim()
+    if base == "" {
+      none
+    } else {
+      let disp = if dissemination == none or type(dissemination) != str {
+        ""
+      } else {
+        dissemination.trim()
+      }
+      if disp != "" {
+        base + "//" + upper(disp)
+      } else {
+        base
+      }
+    }
+  }
   let classification_color = get-classification-level-color(classification_level)
 
   // Document-wide typography settings (inlined from configure())
@@ -67,20 +88,22 @@
         )
       }
 
-      if classification_level != none {
+      if classification_marking != none {
         place(
           top + center,
           dy: 0.375in,
-          text(12pt, font: DEFAULT_BODY_FONTS, fill: classification_color)[#strong(classification_level)],
+          text(12pt, font: DEFAULT_BODY_FONTS, fill: classification_color)[#strong(classification_marking)],
         )
       }
     },
     footer: {
-      place(
-        bottom + center,
-        dy: -.375in,
-        text(12pt, font: DEFAULT_BODY_FONTS, fill: classification_color)[#strong(classification_level)],
-      )
+      if classification_marking != none {
+        place(
+          bottom + center,
+          dy: -.375in,
+          text(12pt, font: DEFAULT_BODY_FONTS, fill: classification_color)[#strong(classification_marking)],
+        )
+      }
 
       if not falsey(footer_tag_line) {
         place(

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

@@ -206,7 +206,10 @@
     action in ("none", "undecided", "approve", "disapprove"),
     message: "action must be \"none\", \"undecided\", \"approve\", or \"disapprove\"",
   )
-  blank-line()
+  // No leading blank-line: the caller (indorsement.typ) already emits the
+  // header→content gap once. The action line's `block(sticky: true)`
+  // additionally inherits `block.above: spacing.line` so the visual gap
+  // above matches the gap above a body's first paragraph.
   // Circle the selected option using a box with rounded corners
   // Use baseline parameter to maintain vertical text alignment
   let approve-text = if action == "approve" {
@@ -227,6 +230,10 @@
   // using the same sticky-block pattern that body.typ applies to the last
   // paragraph, per AFH 33-337 §11 orphan-prevention rules.
   block(sticky: true)[#approve-text / #disapprove-text]
+  // Trailing blank-line so the body's first paragraph (or signature block,
+  // when the body is empty) sits one line below the action line, mirroring
+  // the gap above it.
+  blank-line()
 }
 
 // =============================================================================

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

@@ -114,8 +114,8 @@
 
 /// Gets the banner color for a classification marking.
 ///
-/// Matches when `level` (trimmed) starts with a known prefix: TOP SECRET, SECRET, or UNCLASSIFIED.
-/// Otherwise returns black.
+/// Matches when `level` (trimmed) starts with a known prefix: TOP SECRET, SECRET,
+/// CONFIDENTIAL, CUI, or UNCLASSIFIED. Otherwise returns black.
 ///
 /// - level (str): Marking string shown in header/footer
 /// -> color
@@ -124,8 +124,8 @@
     return rgb(0, 0, 0)
   }
   let s = level.trim()
-  // "TOP SECRET" before "SECRET" so the full phrase matches first.
-  let level-order = ("TOP SECRET", "SECRET", "UNCLASSIFIED")
+  // Longest-prefix-first so e.g. "TOP SECRET" wins over "SECRET".
+  let level-order = ("TOP SECRET", "SECRET", "CONFIDENTIAL", "CUI", "UNCLASSIFIED")
   for base-level in level-order {
     if s.starts-with(base-level) {
       return CLASSIFICATION_COLORS.at(base-level)

package/quills/usaf_memo/0.2.0/plate.typ

@@ -36,6 +36,8 @@
   // Optional classification level
   ..if "classification" in data { (classification_level: data.classification) },
 
+  ..if "dissemination" in data { (dissemination: data.dissemination) },
+
   // USAF vs DAF memorandum style (date format, body indentation)
   memo_style: data.at("memo_style", default: "usaf"),
 

package/index.d.ts

@@ -1,16 +0,0 @@
-import type { Quiver } from '@quillmark/quiver/node';
-
-/**
- * Absolute path to the root of this Source Quiver (contains `Quiver.yaml`).
- */
-export declare const QUIVER_DIR: string;
-
-/**
- * Absolute path to the `quills/` directory inside this Quiver.
- */
-export declare const QUILLS_DIR: string;
-
-/**
- * Convenience loader that resolves this Source Quiver through `@quillmark/quiver/node`.
- */
-export declare function loadAirmarkQuiver(): Promise<Quiver>;

package/index.js

@@ -1,28 +0,0 @@
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-/**
- * Absolute path to the root of this Source Quiver (contains `Quiver.yaml`).
- */
-export const QUIVER_DIR = __dirname;
-
-/**
- * Absolute path to the `quills/` directory inside this Quiver.
- */
-export const QUILLS_DIR = path.join(__dirname, 'quills');
-
-/**
- * Convenience loader that resolves this Source Quiver through `@quillmark/quiver/node`.
- *
- * ```ts
- * import { loadAirmarkQuiver } from '@airmark/quiver';
- * const quiver = await loadAirmarkQuiver();
- * ```
- */
-export async function loadAirmarkQuiver() {
-  const { Quiver } = await import('@quillmark/quiver/node');
-  return Quiver.fromDir(QUIVER_DIR);
-}