reladraw 0.2.0 → 0.4.0

package/dist/resolve.js

@@ -1,9 +1,10 @@
-import { ALL_ATTR_KEYS, ATTR_KEYS, COLOR_KEYS, COLOR_PARTS, describePlacement, } from './ast.js';
-import { ARROW_LENGTH, CHILD_GAP, DECK_STEP, DEFAULT_FONT_SIZE, DEFAULT_MARGIN, GAPS, HEADER_GAP, ICON_GAP, ICON_LINES, LABEL_CLEARANCE, PAD, SEPARATION_GAP, fontSizeFor, labelExtent, labelStyleFor, } from './constants.js';
+import { ALL_ATTR_KEYS, ATTR_KEYS, PART_SIDES, COLOR_KEYS, COLOR_PARTS, CONTENT_ALIGNMENTS, CONTENT_WIDTHS, describePlacement, nameTarget, } from './ast.js';
+import { ARROW_LENGTH, CHILD_GAP, DECK_STEP, DEFAULT_FONT_SIZE, DEFAULT_MARGIN, GAPS, HEADER_GAP, ICON_GAP, ICON_LINES, TEXT_CLEARANCE, PAD, SEPARATION_GAP, fontSizeFor, leafTop, textExtent, textStyleFor, widestLine, } from './constants.js';
 import { fix, reachability, tightest } from './constrain.js';
 import { SourceError } from './errors.js';
-import { iconFor, shapeFor } from './icons.js';
-import { monospaceMeasurer, splitLines } from './measure.js';
+import { bodyFor } from './icons.js';
+import { monospaceMeasurer } from './measure.js';
+import { markupStyles, parseMarkup, plain, splitRuns, wrapLine } from './text.js';
 /**
  * Turn a parsed document into solved geometry.
  *
@@ -23,21 +24,21 @@ export function resolve(doc, options = {}) {
     const styles = collectStyles(doc.statements);
     checkStyleKeys(doc.statements);
     const { nodes, byName, roots } = buildTree(doc.statements, styles);
-    applyDecks(doc.statements, byName);
-    // Links are resolved to nodes before anything is sized, because a labeled
-    // link claims room in the gap it crosses and so has to be in hand while the
+    // Edges are resolved to nodes before anything is sized, because a labeled
+    // edge claims room in the gap it crosses and so has to be in hand while the
     // gaps are being worked out. Nothing here reads geometry.
-    const links = buildLinks(doc.statements, byName, styles);
+    const edges = buildEdges(doc.statements, byName, styles);
     const local = new Map();
     for (const root of roots)
-        sizeNode(root, links, measurer, fontSize, local);
-    placeRoots(roots, byName, links, measurer, fontSize, local);
+        sizeNode(root, edges, measurer, fontSize, local);
+    placeRoots(roots, byName, edges, measurer, fontSize, local);
     normalize(nodes, margin);
     const extent = bounds(nodes);
     return {
         nodes,
         roots,
-        links,
+        edges,
+        markup: markupColors(nodes, edges, styles),
         diagram: collectDiagram(doc.statements),
         width: Math.ceil(extent.maxX + margin),
         height: Math.ceil(extent.maxY + margin),
@@ -73,34 +74,65 @@ function buildTree(statements, styles) {
     const nodes = [];
     const byName = new Map();
     const roots = [];
+    /** Each badge child's name, and the node whose `badge:` it was written out from. */
+    const badges = new Map();
     for (const stmt of statements) {
-        if (stmt.kind !== 'box' && stmt.kind !== 'note')
+        if (stmt.kind !== 'node')
             continue;
         if (byName.has(stmt.name)) {
+            const owner = badges.get(stmt.name);
+            if (owner !== undefined) {
+                throw new SourceError(`"${stmt.name}" is the child that "${owner}"'s badge: is written out as. Drop badge: from ` +
+                    `"${owner}" and write the icon here yourself, or give this node another name`, stmt.line);
+            }
             throw new SourceError(`"${stmt.name}" is declared twice`, stmt.line);
         }
+        const appearance = appearanceOf(stmt.attrs, styles, stmt.line);
+        const body = bodyFor(stmt.attrs, appearance, stmt.line);
+        const kind = KIND_OF_BODY[body.kind];
+        // A node with no text of its own is labelled with its name, because the
+        // first lines anybody types are `node a` and `node b right of a` and they
+        // mean the boxes to read "a" and "b". A node drawn as a *picture* is the
+        // exception: a picture usually is the statement, and the default would
+        // caption a row of cubes a, b, db1, c, db2. `""` then says what writing
+        // nothing says, which is only true here — on a box it carries information.
+        const text = body.kind === 'icon' && !stmt.statedText ? '' : stmt.text;
+        // A style has no string of its own, so it says what it has to say about a
+        // text through `text: (…)`, which arrives here under dotted keys. What the
+        // node wrote in its own brackets wins, key by key, exactly as its own
+        // attributes win over the style's.
+        const textAttrs = { ...bracketOf('text', appearance), ...stmt.textAttrs };
         const node = {
             name: stmt.name,
-            kind: stmt.kind,
-            text: stmt.text,
-            lines: linesFor(stmt.text, stmt.attrs, stmt.line),
+            kind,
+            body,
+            text,
+            lines: linesFor(text, textAttrs, `"${stmt.name}"`, stmt.line),
             children: [],
             x: 0,
             y: 0,
             width: 0,
             height: 0,
             inset: 0,
-            deckLabels: [],
+            deckTexts: [],
             headerHeight: 0,
-            label: stmt.kind === 'box' ? stmt.label : {},
+            reach: { left: 0, top: 0, right: 0, bottom: 0 },
+            banded: false,
+            textBox: { x: 0, y: 0, width: 0, height: 0 },
+            textSide: 'left',
+            textAttrs,
             attrs: stmt.attrs,
-            appearance: appearanceOf(stmt.attrs, styles, stmt.line),
+            appearance,
             placements: stmt.placements,
             line: stmt.line,
         };
-        const kind = kindOf(node);
         checkAttrs(kind, node.name, stmt.attrs, stmt.line);
         checkStyleUse(kind, node.name, stmt.attrs, styles, stmt.line);
+        // `deck:` holds one text per copy, joined on a line break the source cannot
+        // contain. Like a badge, only a box has an outline to repeat.
+        const deck = appearance['deck'];
+        if (deck !== undefined && body.kind === 'shape')
+            node.deckTexts = deck.split('\n');
         const cut = stmt.name.lastIndexOf('.');
         if (cut === -1) {
             roots.push(node);
@@ -116,16 +148,90 @@ function buildTree(statements, styles) {
         }
         nodes.push(node);
         byName.set(stmt.name, node);
+        // `badge: X` is a shorthand, and this is its expansion:
+        //   node <self>.badge  icon: X  right of <self> text
+        // set at the parent's text size, so the picture is two of the parent's
+        // lines tall. Read from the merged appearance, so a style carrying a badge
+        // gives one to every box wearing it. Only a box has a text to be beside;
+        // the other kinds refuse the word in `checkAttrs`, and a style's is unused.
+        const named = appearance['badge'];
+        if (named !== undefined && body.kind === 'shape') {
+            const badge = badgeChild(node, named);
+            badges.set(badge.name, node.name);
+            node.children.push(badge);
+            nodes.push(badge);
+            byName.set(badge.name, badge);
+        }
     }
     return { nodes, byName, roots };
 }
+/** The child `badge:` writes out, as `buildTree` describes. */
+function badgeChild(parent, named) {
+    const icon = { icon: named };
+    const size = parent.textAttrs['size'];
+    return {
+        name: `${parent.name}.badge`,
+        kind: 'icon',
+        body: bodyFor(icon, icon, parent.line),
+        text: '',
+        lines: linesFor('', {}, `"${parent.name}.badge"`, parent.line),
+        children: [],
+        parent,
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0,
+        inset: 0,
+        deckTexts: [],
+        headerHeight: 0,
+        reach: { left: 0, top: 0, right: 0, bottom: 0 },
+        banded: false,
+        textBox: { x: 0, y: 0, width: 0, height: 0 },
+        textSide: 'center',
+        textAttrs: size === undefined ? {} : { size },
+        attrs: icon,
+        appearance: icon,
+        placements: [
+            {
+                kind: 'offset',
+                direction: 'right',
+                targets: [{ name: parent.name, part: 'text' }],
+                line: parent.line,
+            },
+        ],
+        line: parent.line,
+    };
+}
+/**
+ * "a node", "an edge". Only the kind words are ever passed here and only `edge`
+ * begins with a vowel, but writing `a ${word}` produced "a edge" the day the
+ * keyword changed, so the article follows the word rather than being assumed.
+ */
+function article(word) {
+    return `${/^[aeiou]/.test(word) ? 'an' : 'a'} ${word}`;
+}
+/** The same phrase opening a sentence. */
+function capital(phrase) {
+    return phrase.charAt(0).toUpperCase() + phrase.slice(1);
+}
+/** Which kind a body makes the node. */
+const KIND_OF_BODY = {
+    shape: 'shape',
+    icon: 'icon',
+    none: 'none',
+};
 /** How each kind reads in an error, and what it is actually made of. */
-const KIND_WORD = { box: 'box', note: 'note', glyph: 'glyph body', link: 'link' };
+const KIND_WORD = {
+    shape: 'node',
+    icon: 'node drawn as a picture',
+    none: 'node with no body',
+    edge: 'edge',
+};
 const KIND_PARTS = {
-    box: 'a fill, a border and text',
-    note: 'bare text and nothing else',
-    glyph: 'a picture and the text under it',
-    link: 'a line and its label',
+    shape: 'a fill, a border and text',
+    icon: 'a picture and the text under it',
+    none: 'text and nothing else',
+    edge: 'a line and its text',
 };
 /**
  * An attribute is refused on a kind that has no use for it — the same rule as
@@ -136,7 +242,7 @@ const KIND_PARTS = {
  * What is checked is what the author wrote *on this statement*, not what a
  * style contributed. A style is a bundle meant to be shared across kinds — the
  * benchmark's `synced` carries a fill and a border for the green boxes and a
- * line for the four links joining them — so a key it carries that this kind has
+ * line for the four edges joining them — so a key it carries that this kind has
  * no part for is simply unused, and is not a mistake anybody made here. That is
  * forced rather than chosen: checking the merged appearance would refuse the
  * benchmark's own central idiom four times over. `checkStyleUse` is what keeps
@@ -146,13 +252,19 @@ function checkAttrs(kind, name, attrs, line) {
     const allowed = ATTR_KEYS[kind];
     // In the author's own order, so the error names the first offending word as
     // it is read rather than the first in some list of ours.
-    for (const [key, value] of Object.entries(attrs)) {
+    for (const [written, value] of Object.entries(attrs)) {
+        const key = topKey(written);
         if (allowed.includes(key))
             continue;
+        // Quoted back the way it was written. A bracketed value arrives one dotted
+        // key at a time, and `contents: match` is not a line anybody could look for.
+        // A deck's texts are stored joined on a line break; quote them back as written.
+        const shown = key === 'deck' ? value.split('\n').map((text) => `"${text}"`).join(' ') : value;
+        const wrote = written === key ? `${key}: ${shown}` : `${key}: (${written.slice(key.length + 1)}: ${shown})`;
         if (!ALL_ATTR_KEYS.includes(key)) {
             // Nothing anywhere in the language answers to this word, so the only
             // remedy is the vocabulary itself.
-            throw new SourceError(`"${name}" has ${key}: ${value}, which is not an attribute. A ${KIND_WORD[kind]} takes ${allowed.join(', ')}`, line);
+            throw new SourceError(`"${name}" has ${wrote}, which is not an attribute. ${capital(article(KIND_WORD[kind]))} takes ${allowed.join(', ')}`, line);
         }
         // A real word in the wrong place, and the two sorts of word want different
         // explanations. A color names a *part*, so saying what the kind is made of
@@ -160,15 +272,15 @@ function checkAttrs(kind, name, attrs, line) {
         // list of parts it does have: `line:` on a box is a different mistake from
         // `border:` on a note, and one hint cannot serve both.
         if (COLOR_KEYS.includes(key)) {
-            const parts = COLOR_PARTS[kind].map((part) => `\`${part}:\``).join(', ');
-            throw new SourceError(`"${name}" is a ${KIND_WORD[kind]} and has ${key}: ${value}. A ${KIND_WORD[kind]} is ${KIND_PARTS[kind]}, so it has no ${key} — it takes ${parts}`, line);
+            const parts = COLOR_PARTS[kind].map((part) => `\`${part}\``).join(', ');
+            throw new SourceError(`"${name}" is ${article(KIND_WORD[kind])} and has ${wrote}. ${capital(article(KIND_WORD[kind]))} is ${KIND_PARTS[kind]}, so it has no ${key} — it takes ${parts}`, line);
         }
         // Anything else names no part, so what the kind is made of explains
         // nothing. What does explain it is where the word *does* belong, which is
         // also the more useful thing to be told: the author has usually written a
         // real statement about the wrong half of the diagram.
-        throw new SourceError(`"${name}" is a ${KIND_WORD[kind]} and has ${key}: ${value}. \`${key}:\` belongs to ` +
-            `${listKinds(belongTo(key))} — a ${KIND_WORD[kind]} takes ${allowed.join(', ')}`, line);
+        throw new SourceError(`"${name}" is ${article(KIND_WORD[kind])} and has ${wrote}. \`${key}:\` belongs to ` +
+            `${listKinds(belongTo(key))} — ${article(KIND_WORD[kind])} takes ${allowed.join(', ')}`, line);
     }
 }
 /**
@@ -182,23 +294,25 @@ function checkAttrs(kind, name, attrs, line) {
  * construction — that hole is left open, because nobody writes one by accident.
  */
 function checkStyleUse(kind, name, attrs, styles, line) {
-    const named = attrs['style'];
-    if (named === undefined)
-        return;
-    const base = styles.get(named);
-    if (base === undefined)
-        return; // `appearanceOf` reports the missing style.
-    // A style naming another style is the one way to carry nothing at all: the
-    // parser already refuses one with no attributes, and `appearanceOf` does not
-    // recurse, so the name would sit there doing nothing.
-    const carried = Object.keys(base).filter((key) => key !== 'style');
-    if (carried.length === 0) {
-        throw new SourceError(`style "${named}" carries nothing but a style name`, line);
+    // Each style in a list is checked on its own: one that gives this thing
+    // nothing is a name written on the wrong sort of thing, whatever its
+    // neighbours in the list carry.
+    for (const named of styleNames(attrs)) {
+        const base = styles.get(named);
+        if (base === undefined)
+            continue; // `appearanceOf` reports the missing style.
+        // A style naming another style is the one way to carry nothing at all: the
+        // parser already refuses one with no attributes, and `appearanceOf` does not
+        // recurse, so the name would sit there doing nothing.
+        const carried = [...new Set(Object.keys(base).map(topKey))].filter((key) => key !== 'style');
+        if (carried.length === 0) {
+            throw new SourceError(`style "${named}" carries nothing but a style name`, line);
+        }
+        if (carried.some((key) => ATTR_KEYS[kind].includes(key)))
+            continue;
+        throw new SourceError(`style "${named}" gives "${name}" nothing. It carries ${carried.join(' and ')}; ` +
+            `${article(KIND_WORD[kind])} is ${KIND_PARTS[kind]}`, line);
     }
-    if (carried.some((key) => ATTR_KEYS[kind].includes(key)))
-        return;
-    throw new SourceError(`style "${named}" gives "${name}" nothing. It carries ${carried.join(' and ')}; ` +
-        `a ${KIND_WORD[kind]} is ${KIND_PARTS[kind]}`, line);
 }
 /**
  * A style is a bundle spanning kinds, so its keys cannot be checked against any
@@ -211,65 +325,76 @@ function checkStyleKeys(statements) {
         if (stmt.kind !== 'style')
             continue;
         for (const [key, value] of Object.entries(stmt.attrs)) {
-            if (ALL_ATTR_KEYS.includes(key))
+            if (ALL_ATTR_KEYS.includes(topKey(key)))
                 continue;
             throw new SourceError(`style "${stmt.name}" has ${key}: ${value}, which is not an attribute. ` +
                 `The attributes are ${ALL_ATTR_KEYS.join(', ')}`, stmt.line);
         }
     }
 }
+/**
+ * The attribute a key belongs to. A bracketed value arrives under dotted keys —
+ * `text: (color: muted)` is stored as `text.color` — so that a style merges into
+ * a node exactly the way every other attribute does; every check above asks
+ * about the part, which is the half before the dot.
+ */
+function topKey(key) {
+    const dot = key.indexOf('.');
+    return dot === -1 ? key : key.slice(0, dot);
+}
 /** Which kinds understand an attribute, in the order the table declares them. */
 function belongTo(key) {
     return Object.keys(ATTR_KEYS).filter((kind) => ATTR_KEYS[kind].includes(key));
 }
-/** "a link", "a box or a glyph body", "a box, a note or a glyph body". */
+/** "an edge", "a node or a glyph body", "a node, a note or a glyph body". */
 function listKinds(kinds) {
-    const words = kinds.map((kind) => `a ${KIND_WORD[kind]}`);
+    const words = kinds.map((kind) => article(KIND_WORD[kind]));
     if (words.length <= 1)
         return words[0] ?? 'nothing';
     return `${words.slice(0, -1).join(', ')} or ${words[words.length - 1]}`;
 }
-/** Which of the four kinds a node is, which its `shape:` may decide. */
-function kindOf(node) {
-    if (node.kind === 'note')
-        return 'note';
-    return shapeFor(node.appearance, node.line).body !== undefined ? 'glyph' : 'box';
-}
-function appearanceOf(attrs, styles, line) {
+/** The styles a `style:` names, in the order written. The parser joins them on a space. */
+function styleNames(attrs) {
     const named = attrs['style'];
-    if (named === undefined)
-        return { ...attrs };
-    const base = styles.get(named);
-    if (!base)
-        throw new SourceError(`no style named "${named}"`, line);
-    return { ...base, ...attrs };
+    return named === undefined ? [] : named.split(' ');
 }
-function applyDecks(statements, byName) {
-    for (const stmt of statements) {
-        if (stmt.kind !== 'deck')
-            continue;
-        const node = byName.get(stmt.name);
-        if (!node)
-            throw new SourceError(`deck names "${stmt.name}", which does not exist`, stmt.line);
-        node.deckLabels = stmt.labels;
+/**
+ * The styles in the order written, a later one winning where two set the same
+ * key, and then the statement's own words over all of them — a word written on
+ * the line was meant for this thing, wherever `style:` sits.
+ */
+function appearanceOf(attrs, styles, line) {
+    const merged = {};
+    for (const named of styleNames(attrs)) {
+        const base = styles.get(named);
+        if (!base)
+            throw new SourceError(`no style named "${named}"`, line);
+        Object.assign(merged, base);
     }
+    return { ...merged, ...attrs };
 }
-function buildLinks(statements, byName, styles) {
-    const links = [];
+function buildEdges(statements, byName, styles) {
+    const edges = [];
     for (const stmt of statements) {
-        if (stmt.kind !== 'link')
+        if (stmt.kind !== 'edge')
             continue;
         const from = byName.get(stmt.from);
         const to = byName.get(stmt.to);
         if (!from)
-            throw new SourceError(`link from "${stmt.from}", which does not exist`, stmt.line);
+            throw new SourceError(`edge from "${stmt.from}", which does not exist`, stmt.line);
         if (!to)
-            throw new SourceError(`link to "${stmt.to}", which does not exist`, stmt.line);
+            throw new SourceError(`edge to "${stmt.to}", which does not exist`, stmt.line);
         const between = stmt.between && {
-            nodes: stmt.between.targets.map((name) => {
+            nodes: stmt.between.targets.map(({ name, part }) => {
+                if (part !== undefined) {
+                    // A passage is the gap between two boxes, and a side or a point has
+                    // no gap on either hand. Refused by name rather than dropped.
+                    throw new SourceError(`edge passes between "${name} ${part}", and a passage runs between two whole boxes ` +
+                        `— drop "${part}"`, stmt.line);
+                }
                 const node = byName.get(name);
                 if (!node) {
-                    throw new SourceError(`link passes between "${name}", which does not exist`, stmt.line);
+                    throw new SourceError(`edge passes between "${name}", which does not exist`, stmt.line);
                 }
                 return node;
             }),
@@ -277,101 +402,169 @@ function buildLinks(statements, byName, styles) {
         };
         const appearance = appearanceOf(stmt.attrs, styles, stmt.line);
         const what = `${stmt.from} -> ${stmt.to}`;
-        checkAttrs('link', what, stmt.attrs, stmt.line);
-        checkStyleUse('link', what, stmt.attrs, styles, stmt.line);
-        links.push({
+        checkAttrs('edge', what, stmt.attrs, stmt.line);
+        checkStyleUse('edge', what, stmt.attrs, styles, stmt.line);
+        if (stmt.attrs['url'] !== undefined && stmt.text === undefined) {
+            // Wrapping the line works, and `LINE_WIDTH` is 1.5 — a destination that
+            // technically has a target and practically has none. That is the silent
+            // defect shape the language refuses everywhere else, so it is refused
+            // here rather than shipped and explained.
+            throw new SourceError(`edge ${what} has a url and no text. A destination needs something to click, and a line ` +
+                'is too thin to be it — give the edge a text, or put the url on one of the nodes', stmt.line);
+        }
+        const textAttrs = { ...bracketOf('text', appearance), ...stmt.textAttrs };
+        edges.push({
             from,
             to,
             both: stmt.both,
-            ...(stmt.label !== undefined ? { label: stmt.label } : {}),
+            textAttrs,
+            ...(stmt.text !== undefined
+                ? { text: stmt.text, lines: linesFor(stmt.text, textAttrs, `edge ${what}`, stmt.line) }
+                : {}),
             ...(between ? { between } : {}),
             attrs: stmt.attrs,
             appearance,
             line: stmt.line,
         });
     }
-    return links;
+    return edges;
 }
 /**
  * Give a node a width and height, sizing its children first. Also records each
  * child's offset within this node, which pass three turns into absolute
  * coordinates once this node itself is placed.
  */
-function sizeNode(node, links, measurer, fontSize, local) {
+function sizeNode(node, edges, measurer, fontSize, local) {
     for (const child of node.children)
-        sizeNode(child, links, measurer, fontSize, local);
+        sizeNode(child, edges, measurer, fontSize, local);
     // Text is measured at the size it will be drawn at — the size lives in
     // `constants.ts` precisely so the resolver reserving the room and the
     // renderer filling it cannot disagree about how much room there is.
-    const textSize = fontSizeFor(node.kind, node.appearance, fontSize, node.line);
+    const textSize = fontSizeFor(node.kind, node.textAttrs, fontSize, node.line);
     const lineHeight = measurer.lineHeight(textSize);
     // A node with empty text takes no room for it. This is what makes an
     // invisible grouping container size to exactly its contents.
-    const hasLabel = node.lines.some((line) => line.length > 0);
-    const labelWidth = hasLabel ? widestLine(node.lines, measurer, textSize) : 0;
-    const labelHeight = hasLabel ? node.lines.length * lineHeight : 0;
-    if (node.kind === 'note') {
-        // A note is bare text, so it gets no padding and takes no children.
-        node.width = labelWidth;
-        node.height = labelHeight;
+    const hasText = node.lines.some((line) => plain(line).length > 0);
+    const textWidth = hasText ? widestLine(node.lines, measurer, textSize) : 0;
+    const textHeight = hasText ? node.lines.length * lineHeight : 0;
+    const glyphSide = ICON_LINES * lineHeight;
+    if (node.body.kind === 'none') {
+        // No body, so the node is its text: no padding, no outline, no children.
+        if (node.children.length > 0) {
+            throw new SourceError(`"${node.name}" has shape: none and has children. With no body there is no box for ` +
+                'anything to go inside', node.line);
+        }
+        node.width = textWidth;
+        node.height = textHeight;
+        node.textBox = textBoxIn({ x: 0, y: 0, width: node.width, height: node.height }, (node.textSide = textStyleFor(node.textAttrs, node.line, 'start', 'center').side), textWidth, textHeight);
         return;
     }
-    const shape = shapeFor(node.appearance, node.line);
-    const glyphSide = ICON_LINES * lineHeight;
-    if (shape.body !== undefined) {
-        // Drawn as a glyph, so there is no box to pad and the node's size is the
-        // picture's. A label goes under it rather than inside it, which is the
+    if (node.body.kind === 'icon') {
+        // Drawn as a picture, so there is no box to pad and the node's size is the
+        // picture's. A text goes under it rather than inside it, which is the
         // arrangement that makes a row of these read as captioned things.
         if (node.children.length > 0) {
-            throw new SourceError(`"${node.name}" is drawn as a glyph and has children. A glyph is not a box, so nothing can go inside it`, node.line);
+            throw new SourceError(`"${node.name}" is drawn as a picture and has children. A picture is not a box, so nothing can go inside it`, node.line);
         }
-        node.width = Math.max(glyphSide, labelWidth);
-        node.height = glyphSide + (hasLabel ? ICON_GAP + labelHeight : 0);
+        node.width = Math.max(glyphSide, textWidth);
+        node.height = glyphSide + (hasText ? ICON_GAP + textHeight : 0);
+        // The caption is under the picture and nowhere else, so only the
+        // horizontal half of `at` reaches it.
+        node.textBox = textBoxIn({ x: 0, y: glyphSide + ICON_GAP, width: node.width, height: textHeight }, (node.textSide = textStyleFor(node.textAttrs, node.line, 'middle', 'center').side), textWidth, textHeight);
         return;
     }
-    // An icon takes a column of its own on the right of whatever the box holds,
-    // so the label never runs underneath it and the box grows to fit both. That
-    // is why an icon is not a renderer-only concern: it is content taking room,
-    // like a label, and not appearance like `fill:`.
-    const icon = iconFor(node.appearance, node.line);
-    const iconSide = icon === undefined ? 0 : glyphSide;
-    const iconRoom = icon === undefined ? 0 : iconSide + (hasLabel ? ICON_GAP : 0);
+    // Read before the split, so a misspelt word is refused on a childless node
+    // too. The *absence* of children makes the setting inert, which stays silent;
+    // a value the language does not have is wrong wherever it is written.
+    const contents = contentsStyleFor(node);
     if (node.children.length === 0) {
-        // A band only exists because contents have to sit clear of it, and a leaf
-        // has none, so `at` has no end to name. `align` is a different question and
-        // is allowed: a label of several lines has lines of unequal length in any
-        // box, and ranging them left rather than centering them is a real thing to
-        // want. It was refused here too until 2026-09-09, purely because the two
-        // words arrive in the same brackets.
-        if (node.label['at'] !== undefined) {
-            throw new SourceError(`"${node.name}" holds nothing and its label carries at: ${node.label['at']}. ` +
-                `A label sits at one end of a box so its contents can have the other; with no contents there is no band for it to sit at either end of`, node.line);
-        }
-        node.width = labelWidth + iconRoom + PAD * 2;
-        node.height = Math.max(labelHeight, iconSide) + PAD * 2;
+        // `at` is read on a leaf too, and is inert wherever the box is exactly the
+        // size of what it holds — which is every leaf, since a leaf is sized from
+        // its own text. It bites once the box is sized by something else: a
+        // `widths:` that widens it, or a child placed beside the text. Inert-but-
+        // legal stays silent here, the same treatment `align` gets on a leaf with
+        // one line.
+        const style = textStyleFor(node.textAttrs, node.line, 'middle', 'center');
+        node.width = textWidth + PAD * 2;
+        node.height = textHeight + PAD * 2;
+        node.textBox = textBoxIn({
+            x: PAD,
+            y: leafTop(style.end, 0, node.height, textHeight),
+            width: node.width - PAD * 2,
+            height: textHeight,
+        }, (node.textSide = style.side), textWidth, textHeight);
+    }
+    else if (framedChildren(node).size > 0) {
+        // Something is placed against this node's own frame or text, so where its
+        // text sits and how big it is come out of one solve with its children.
+        const own = { textWidth, textHeight, contents };
+        const lay = (width) => {
+            layoutFramed(node, own, edges, measurer, fontSize, local, width - node.deckTexts.length * DECK_STEP);
+            applyDeck(node, local);
+        };
+        lay(0);
+        relayout.set(node, lay);
+        return;
     }
     else {
-        applyAlign(node);
-        const content = layoutChildren(node, links, measurer, fontSize, local);
-        const band = Math.max(labelHeight, iconSide);
-        // `headerHeight` is the band the label and icon take, whichever end of the
-        // box that band is at. Only the contents' offset depends on the side.
-        node.headerHeight = hasLabel || icon !== undefined ? band + HEADER_GAP : 0;
-        node.width = Math.max(labelWidth + iconRoom, content.width) + PAD * 2;
+        if (contents.widths === 'match')
+            matchWidths(node.children);
+        let content = layoutChildren(node.children, edges, measurer, fontSize, local);
+        if (contents.widths === 'fill') {
+            // The band is the wider of the title and the contents, so filling it
+            // needs the contents measured first. Where they already set the width
+            // this is `match` exactly; where the title wins it is the answer `match`
+            // could not give.
+            const band = Math.max(textWidth, content.width);
+            for (const child of node.children)
+                widenTo(child, band);
+            content = layoutChildren(node.children, edges, measurer, fontSize, local);
+            checkOneColumn(node, node.children, local);
+        }
+        // `headerHeight` is the band the text takes, whichever end of the box that
+        // band is at. Only the contents' offset depends on the side.
+        node.headerHeight = hasText ? textHeight + HEADER_GAP : 0;
+        node.width = Math.max(textWidth, content.width) + PAD * 2;
         node.height = node.headerHeight + content.height + PAD * 2;
-        const above = labelStyleFor(node.label, node.line).at === 'top' ? node.headerHeight : 0;
+        const style = textStyleFor(node.textAttrs, node.line);
+        if (style.end === 'center')
+            throw bandInMiddle(node, style.at);
+        const above = style.end === 'top' ? node.headerHeight : 0;
+        // The text has a band at one end of the box, and the contents have the
+        // other.
+        node.textBox = textBoxIn({
+            x: PAD,
+            y: style.end === 'top' ? PAD : node.height - PAD - textHeight,
+            width: node.width - PAD * 2,
+            height: textHeight,
+        }, (node.textSide = style.side), textWidth, textHeight);
+        // Where the title is wider than the contents, the slack is all on the right
+        // — every member sits at the smallest position its constraints allow and
+        // nothing pushes it along. `align` is what says where the block goes in it.
+        const slack = node.width - PAD * 2 - content.width;
+        const shift = contents.align === 'left' ? 0 : contents.align === 'center' ? slack / 2 : slack;
         for (const child of node.children) {
             const offset = local.get(child);
-            offset.x += PAD;
+            offset.x += PAD + shift;
             offset.y += PAD + above;
         }
+        node.banded = true;
     }
-    if (node.deckLabels.length > 0) {
-        // The copies sit behind and above-left, so the whole node grows by the
-        // depth of the stack and its own face moves down and right by the same.
-        node.inset = node.deckLabels.length * DECK_STEP;
+    applyDeck(node, local);
+}
+/**
+ * Make room for a deck's copies, once the node's own face has been sized.
+ *
+ * The copies sit behind and above-left, so the whole node grows by the depth
+ * of the stack and its own face moves down and right by the same.
+ */
+function applyDeck(node, local) {
+    if (node.deckTexts.length > 0) {
+        node.inset = node.deckTexts.length * DECK_STEP;
         node.width += node.inset;
         node.height += node.inset;
+        node.textBox.x += node.inset;
+        node.textBox.y += node.inset;
         for (const child of node.children) {
             const offset = local.get(child);
             offset.x += node.inset;
@@ -380,20 +573,85 @@ function sizeNode(node, links, measurer, fontSize, local) {
     }
 }
 /**
- * `align: widths` widens every direct child to the widest one's natural
- * width, before layoutChildren sizes and positions anything from those
- * widths. A container's own children are already sized by this point.
+ * Where a block of text ends up in the room it was given: the *ink* box, which
+ * is what `hub text` names as a placement target and what the renderer draws.
+ *
+ * Only the horizontal is decided here. The vertical is settled by whoever
+ * knows which end of the box the text sits at, which differs between a leaf, a
+ * container's band and a caption under a picture, and arrives as `room.y`.
  */
-function applyAlign(node) {
-    const value = node.attrs['align'];
-    if (value === undefined)
+function textBoxIn(room, side, inkWidth, inkHeight) {
+    const x = side === 'left'
+        ? room.x
+        : side === 'right'
+            ? room.x + room.width - inkWidth
+            : room.x + (room.width - inkWidth) / 2;
+    return { x, y: room.y, width: inkWidth, height: inkHeight };
+}
+function contentsStyleFor(node) {
+    const written = bracketOf('contents', node.appearance);
+    const widths = written['widths'] ?? 'natural';
+    const align = written['align'] ?? 'left';
+    if (!CONTENT_WIDTHS.includes(widths)) {
+        throw new SourceError(`"${node.name}" has contents: (widths: ${widths}), which is not one of ${CONTENT_WIDTHS.join(', ')}`, node.line);
+    }
+    if (!CONTENT_ALIGNMENTS.includes(align)) {
+        throw new SourceError(`"${node.name}" has contents: (align: ${align}), which is not one of ${CONTENT_ALIGNMENTS.join(', ')}`, node.line);
+    }
+    return { widths, align };
+}
+/**
+ * `widths: match` widens every direct child to the widest one's natural width,
+ * before layoutChildren sizes and positions anything from those widths. A
+ * container's own children are already sized by this point.
+ */
+function matchWidths(children) {
+    const maxWidth = Math.max(...children.map((child) => child.width));
+    for (const child of children)
+        widenTo(child, maxWidth);
+}
+/**
+ * `widths: fill` makes every child as wide as the band, which only holds for
+ * a single column: two children set to the band's width and not one above the
+ * other make the contents wider than the band, the band grows with them, and
+ * no child is the width it was asked to be. Every child of a column starts at
+ * the same x once they are all one width, so a child that does not is the
+ * proof, and the pair is named rather than drawn wrong.
+ */
+function checkOneColumn(node, children, local) {
+    const [first, ...rest] = children;
+    if (!first)
+        return;
+    const off = rest.find((child) => Math.abs(local.get(child).x - local.get(first).x) > 0.5);
+    if (!off)
+        return;
+    throw new SourceError(`"${node.name}" has contents: (widths: fill), which makes every child the full width of the box, ` +
+        `and that only works in a single column — "${first.name}" and "${off.name}" are not one above the other. ` +
+        'Put them in one column, or use contents: (widths: match) to make them one width without filling the box', node.line);
+}
+/**
+ * Make a node wider than it was sized, carrying its text with it.
+ *
+ * `widths: match` and `widths: fill` both set a child's width after that child
+ * was sized from its own contents, and the text's box was worked out against
+ * the old one. A left-ranged text stays where it is; a centered or right-ranged
+ * one moves by its share of the difference.
+ */
+function widenTo(node, width) {
+    // A node with something placed against its own frame is laid out by a
+    // solve, and a wider frame is one more thing that solve has to hold: the
+    // things against its right edge move, and a centered text re-centers.
+    const again = relayout.get(node);
+    if (again) {
+        again(width);
         return;
-    if (value !== 'widths') {
-        throw new SourceError(`"${node.name}" has align: ${value}, which is not one of widths`, node.line);
     }
-    const maxWidth = Math.max(...node.children.map((child) => child.width));
-    for (const child of node.children)
-        child.width = maxWidth;
+    const grew = width - node.width;
+    node.width = width;
+    if (node.textSide === 'center')
+        node.textBox.x += grew / 2;
+    else if (node.textSide === 'right')
+        node.textBox.x += grew;
 }
 /**
  * Position a container's children relative to each other. Children that make
@@ -401,15 +659,15 @@ function applyAlign(node) {
  * siblings they name, by the same constraint pass that positions top-level
  * nodes. A placement may only name a sibling — containment scopes the group.
  */
-function layoutChildren(parent, links, measurer, fontSize, local) {
-    const siblings = new Map(parent.children.map((child) => [child.name, child]));
+function layoutChildren(children, edges, measurer, fontSize, local) {
+    const siblings = new Map(children.map((child) => [child.name, child]));
     // Children that say nothing keep the written order, down the page and flush
     // left. Written as constraints rather than a cursor so a placed sibling can
     // push them along like anything else.
     const stack = [];
     const alignment = [];
-    const quiet = parent.children.filter((child) => child.placements.length === 0);
-    const indexOf = new Map(parent.children.map((child, index) => [child, index]));
+    const quiet = children.filter((child) => child.placements.length === 0);
+    const indexOf = new Map(children.map((child, index) => [child, index]));
     quiet.forEach((child, position) => {
         const previous = quiet[position - 1];
         if (!previous)
@@ -419,35 +677,38 @@ function layoutChildren(parent, links, measurer, fontSize, local) {
         stack.push({ from: before, to: after, weight: previous.height + CHILD_GAP });
         alignment.push(...fix(before, after, 0));
     });
-    const positions = positionGroup(parent.children, (placement, owner) => placement.targets.map((name) => {
+    const positions = positionGroup(children, (placement, owner) => placement.targets.map(({ name, part }) => {
         const target = siblings.get(name);
         if (!target) {
-            throw new SourceError(`"${owner.name}" is placed against "${name}", which is not one of its siblings`, placement.line);
+            throw new SourceError(`"${owner.name}" is placed against "${name}", which is not one of its siblings or its parent`, placement.line);
         }
-        return {
+        return partOf({
             name,
             node: target,
             index: indexOf.get(target),
             offset: { x: 0, y: 0 },
             width: target.width,
             height: target.height,
-        };
-    }), { x: alignment, y: stack }, corridorsIn(links, (node) => liftTo(node, indexOf, local), measurer, fontSize));
-    for (const child of parent.children)
+        }, part, owner, placement.line);
+    }), { x: alignment, y: stack }, corridorsIn(edges, (node) => liftTo(node, indexOf, local), measurer, fontSize));
+    for (const child of children)
         local.set(child, positions.get(child));
-    return extentOf(parent.children, local);
+    return extentOf(children, local);
 }
 function extentOf(children, local) {
     let minX = Infinity;
     let minY = Infinity;
     let maxX = -Infinity;
     let maxY = -Infinity;
+    // What a child has placed outside itself is still part of it, so the block
+    // holding the child holds that too.
     for (const child of children) {
         const offset = local.get(child);
-        minX = Math.min(minX, offset.x);
-        minY = Math.min(minY, offset.y);
-        maxX = Math.max(maxX, offset.x + child.width);
-        maxY = Math.max(maxY, offset.y + child.height);
+        const { reach } = child;
+        minX = Math.min(minX, offset.x - reach.left);
+        minY = Math.min(minY, offset.y - reach.top);
+        maxX = Math.max(maxX, offset.x + child.width + reach.right);
+        maxY = Math.max(maxY, offset.y + child.height + reach.bottom);
     }
     for (const child of children) {
         const offset = local.get(child);
@@ -456,8 +717,443 @@ function extentOf(children, local) {
     }
     return { width: maxX - minX, height: maxY - minY };
 }
+/** How to lay a framed node out again at a given width, which is what `widenTo` needs. */
+const relayout = new WeakMap();
+/**
+ * The children placed against their parent — its frame, a part of it, or its
+ * text — together with any child placed against one of those, and so on.
+ *
+ * These hang off the frame. The rest hang off the default position under the
+ * text, which is the contents stack as it always was. Nothing sorts a child
+ * into one or the other; it is read off what each placement names.
+ */
+function framedChildren(parent) {
+    const framed = new Set();
+    const byName = new Map(parent.children.map((child) => [child.name, child]));
+    let grew = true;
+    while (grew) {
+        grew = false;
+        for (const child of parent.children) {
+            if (framed.has(child))
+                continue;
+            const names = child.placements.flatMap((placement) => placement.targets.map((target) => target.name));
+            const hangs = names.some((name) => {
+                if (name === parent.name)
+                    return true;
+                const sibling = byName.get(name);
+                return sibling !== undefined && framed.has(sibling);
+            });
+            if (hangs) {
+                framed.add(child);
+                grew = true;
+            }
+        }
+    }
+    return framed;
+}
+/**
+ * The sides of its parent's frame a child is not held inside by the padding.
+ *
+ * Every child is held a padding in from the frame on all four sides, which is
+ * how a box grows to hold what is in it. A child placed against a side is
+ * held by that placement instead — tucked a gap in with `inside`, straddling
+ * it with `on`, beyond it with `outside` — and holding it by the padding as
+ * well would contradict the placement whenever the gap is the smaller.
+ *
+ * `overlap: allow` on a child is "do not grow for me": it lies over whatever
+ * is there, and the frame is not held open around it at all.
+ */
+function freeSides(child, parent) {
+    if (allowsOverlap(child))
+        return new Set(PART_SIDES);
+    const free = new Set();
+    const across = (direction) => [
+        ...(/left|right/.test(direction) ? ['left', 'right'] : []),
+        ...(/above|below/.test(direction) ? ['top', 'bottom'] : []),
+    ];
+    for (const placement of child.placements) {
+        for (const target of placement.targets) {
+            if (target.name !== parent.name || target.part === 'text')
+                continue;
+            if (placement.kind === 'offset' && placement.written !== 'inside') {
+                // Beyond the frame, so it neither holds the frame open nor is held in
+                // by it — on either axis. Held on the other one, a note taller than
+                // its parent's text would stretch the parent to fit a thing outside it.
+                for (const side of PART_SIDES)
+                    free.add(side);
+                continue;
+            }
+            const words = (target.part ?? '').split('-');
+            for (const side of PART_SIDES)
+                if (words.includes(side))
+                    free.add(side);
+            if (placement.kind === 'align' && placement.side !== 'center')
+                free.add(placement.side);
+        }
+    }
+    return free;
+}
+/**
+ * The parent's frame as a target, narrowed to the part that was named.
+ *
+ * The frame is two members of the child system, its top-left corner and its
+ * bottom-right, so a part of it is read off those two per axis: `right` is
+ * across at the bottom-right corner and spans both down, `top-center` spans
+ * both across and is down at the top-left. A part that spans comes as its two
+ * ends, and a placement against two targets already means the region that
+ * bounds them.
+ */
+function frameTargets(parent, part, first, last) {
+    const words = (part ?? '').split('-');
+    const pick = (near, far) => words.includes(near) ? [first] : words.includes(far) ? [last] : [first, last];
+    const xs = pick('left', 'right');
+    const ys = pick('top', 'bottom');
+    const name = part === undefined ? parent.name : `${parent.name} ${part}`;
+    const point = (x, y) => ({
+        name,
+        node: parent,
+        index: x,
+        byAxis: { x, y },
+        frame: true,
+        offset: { x: 0, y: 0 },
+        width: 0,
+        height: 0,
+    });
+    const start = point(xs[0], ys[0]);
+    const end = point(xs[xs.length - 1], ys[ys.length - 1]);
+    return xs.length === 1 && ys.length === 1 ? [start] : [start, end];
+}
+/**
+ * A stand-in member for something of the parent's own that takes room among
+ * its children: its text, its badge, the block of its contents, a corner of
+ * its frame. Named after the parent so an error about it reads in the
+ * author's words — `"hub text" and "star" overlap`.
+ */
+function stand(of, what, width, height) {
+    return {
+        ...of,
+        name: `${of.name} ${what}`,
+        parent: undefined,
+        children: [],
+        placements: [],
+        attrs: {},
+        appearance: {},
+        deckTexts: [],
+        reach: NO_REACH,
+        x: 0,
+        y: 0,
+        width,
+        height,
+    };
+}
+function bandInMiddle(node, at) {
+    // A container's band is at one end precisely so its contents can have the
+    // other, so the three positions that name neither end have nothing to mean
+    // here. Refused rather than rounded to an end, for the reason every other
+    // word in the language is: a value that quietly becomes a different value
+    // looks like the tool being broken.
+    return new SourceError(`"${node.name}" holds things and its text is at: ${at}. A container's text sits at ` +
+        'the top or the bottom so its contents can have the other end, so name a position on ' +
+        'one of those edges', node.line);
+}
+/**
+ * Lay out a node that has something placed against its own frame or text.
+ *
+ * One solve holds everything: the children placed against the frame, the
+ * block of ordinary contents solved as it always was, the node's text and
+ * badge, and the frame's two corners. Every one of them is held a padding in
+ * from the frame, so the frame is the smallest box that holds them all, which
+ * is what a node's size has always been. A part of the frame is then just a
+ * target like any other.
+ *
+ * The band falls out rather than being decided. It exists because the
+ * contents stack below the text; where every child hangs off the frame
+ * instead, nothing is below the text, there is no band, and the node reads as
+ * a leaf — its text centered, and whatever is beside the text centered with
+ * it as one group.
+ */
+function layoutFramed(node, own, edges, measurer, fontSize, local, minWidth) {
+    const { textWidth, textHeight, contents } = own;
+    const hasText = textWidth > 0;
+    const framed = framedChildren(node);
+    const stacked = node.children.filter((child) => !framed.has(child));
+    const placed = node.children.filter((child) => framed.has(child));
+    const banded = stacked.length > 0;
+    const style = banded
+        ? textStyleFor(node.textAttrs, node.line)
+        : textStyleFor(node.textAttrs, node.line, 'middle', 'center');
+    if (banded && style.end === 'center')
+        throw bandInMiddle(node, style.at);
+    // The children placed against this node's text. With it they make the
+    // text's row: the contents stack past all of them, and they range and
+    // center with the text as one group.
+    const againstText = (placement) => placement.targets.some((target) => target.name === node.name && target.part === 'text');
+    const withText = placed.filter((child) => child.placements.some(againstText));
+    let block = { width: 0, height: 0 };
+    if (banded) {
+        if (contents.widths === 'match')
+            matchWidths(stacked);
+        block = layoutChildren(stacked, edges, measurer, fontSize, local);
+        if (contents.widths === 'fill') {
+            // The row is the text and whatever stands beside it, each at its gap.
+            let row = textWidth;
+            for (const child of withText) {
+                const beside = child.placements.find((placement) => placement.kind === 'offset' && /left|right/.test(placement.direction) && againstText(placement));
+                if (beside)
+                    row += child.width + (hasText ? gapFor(child, beside, node) : 0);
+            }
+            const across = Math.max(row, block.width);
+            for (const child of stacked)
+                widenTo(child, across);
+            block = layoutChildren(stacked, edges, measurer, fontSize, local);
+            checkOneColumn(node, stacked, local);
+        }
+    }
+    const members = [...placed];
+    const add = (member) => members.push(member) - 1;
+    const K = banded ? add(stand(node, 'contents', block.width, block.height)) : -1;
+    // An empty text is still somewhere, so a thing placed against it has a
+    // place to be: it is a point where the text would have been, and it takes
+    // no room — including the gap beside it, which `Target.empty` drops.
+    const T = hasText || withText.length > 0 ? add(stand(node, 'text', textWidth, textHeight)) : -1;
+    const TL = add(stand(node, 'frame', 0, 0));
+    const BR = add(stand(node, 'frame', 0, 0));
+    const x = [];
+    const y = [];
+    const hold = (index, free) => {
+        const { width, height, reach } = members[index];
+        if (!free.has('left'))
+            x.push({ from: TL, to: index, weight: PAD + reach.left });
+        if (!free.has('right'))
+            x.push({ from: index, to: BR, weight: width + reach.right + PAD });
+        if (!free.has('top'))
+            y.push({ from: TL, to: index, weight: PAD + reach.top });
+        if (!free.has('bottom'))
+            y.push({ from: index, to: BR, weight: height + reach.bottom + PAD });
+    };
+    placed.forEach((child, index) => hold(index, freeSides(child, node)));
+    for (const index of [K, T])
+        if (index >= 0)
+            hold(index, new Set());
+    if (minWidth > 0)
+        x.push({ from: TL, to: BR, weight: minWidth });
+    // The text's row, as members: the text and everything placed against it.
+    const row = [...(T >= 0 ? [T] : []), ...withText.map((child) => placed.indexOf(child))];
+    if (banded) {
+        // The text's row is at one end, the contents the other.
+        for (const index of row) {
+            const { height, reach } = members[index];
+            if (style.end === 'top')
+                y.push({ from: index, to: K, weight: height + reach.bottom + HEADER_GAP });
+            else
+                y.push({ from: K, to: index, weight: block.height + HEADER_GAP + reach.top });
+        }
+    }
+    const siblings = new Map(node.children.map((child) => [child.name, child]));
+    const indexOf = new Map(members.map((member, index) => [member, index]));
+    const locate = (placement, owner) => placement.targets.flatMap(({ name, part }) => {
+        if (name === node.name) {
+            if (part !== 'text')
+                return frameTargets(node, part, TL, BR);
+            const text = { x: 0, y: 0 };
+            return [
+                {
+                    name: `${name} text`,
+                    node,
+                    index: T,
+                    offset: text,
+                    width: textWidth,
+                    height: textHeight,
+                    ...(hasText ? {} : { empty: true }),
+                },
+            ];
+        }
+        const sibling = siblings.get(name);
+        if (!sibling) {
+            throw new SourceError(`"${owner.name}" is placed against "${name}", which is not one of its siblings or its parent`, placement.line);
+        }
+        // A child of the contents is reached through the block that holds it,
+        // at the offset the contents solve already gave it.
+        const inBlock = !framed.has(sibling);
+        const target = {
+            name,
+            node: sibling,
+            index: inBlock ? K : indexOf.get(sibling),
+            offset: inBlock ? { ...local.get(sibling) } : { x: 0, y: 0 },
+            width: sibling.width,
+            height: sibling.height,
+        };
+        return [partOf(target, part, owner, placement.line)];
+    });
+    // Which way a child against a side stands from the rest of the box: across
+    // for a left or right side or corner, down for the top or bottom.
+    const facing = new Map();
+    placed.forEach((child, index) => {
+        for (const placement of child.placements) {
+            for (const target of placement.targets) {
+                if (target.name !== node.name || target.part === undefined || target.part === 'text')
+                    continue;
+                const words = target.part.split('-');
+                if (words.includes('left') || words.includes('right'))
+                    facing.set(index, 'x');
+                else if (words.includes('top') || words.includes('bottom'))
+                    facing.set(index, 'y');
+            }
+        }
+    });
+    const across = (i, j) => facing.get(i) ?? facing.get(j);
+    // An edge end inside this node, as a member of this solve: a framed child
+    // or something inside one, or something in the contents, reached through
+    // the block at the offset the contents solve gave it. An end outside the
+    // node is none of this solve's business.
+    const endOf = (end) => {
+        let member = end;
+        const offset = { x: 0, y: 0 };
+        while (member.parent !== node) {
+            const step = local.get(member);
+            if (!step || !member.parent)
+                return undefined;
+            offset.x += step.x;
+            offset.y += step.y;
+            member = member.parent;
+        }
+        const inBlock = !framed.has(member);
+        if (inBlock) {
+            const step = local.get(member);
+            offset.x += step.x;
+            offset.y += step.y;
+        }
+        return {
+            name: end.name,
+            node: end,
+            index: inBlock ? K : indexOf.get(member),
+            offset,
+            width: end.width,
+            height: end.height,
+        };
+    };
+    // Two ends both in the contents come out as one member and are skipped:
+    // the contents solve already made room for that edge's text.
+    const corridors = corridorsIn(edges, endOf, measurer, fontSize);
+    const solve = (pins) => 
+    // Everything here is inside one box, so a collision separates by the step
+    // the contents stack by, not by the gap kept between strangers.
+    positionGroup(members, locate, { x: [...x, ...pins.x], y: [...y, ...pins.y] }, corridors, across, CHILD_GAP);
+    let solved = solve({ x: [], y: [] });
+    // Where a text is centered or ranged right, where it goes depends on how
+    // wide the frame came out, which depends on everything else. So it is
+    // measured off the first solve and pinned, the move `settle` makes.
+    const at = (index) => solved.get(members[index]);
+    const inner = (axis) => ({
+        start: at(TL)[axis] + PAD,
+        size: at(BR)[axis] - at(TL)[axis] - PAD * 2,
+    });
+    const pins = { x: [], y: [] };
+    const pin = (axis, index, to) => {
+        if (to - at(index)[axis] <= 1e-9)
+            return;
+        pins[axis].push(...fix(TL, index, to - at(TL)[axis]));
+    };
+    // The text and the things placed against it range and center as a group,
+    // which is the fan rule's sentence again: several things against one target
+    // are balanced on it together.
+    const extent = (axis) => {
+        let start = Infinity;
+        let end = -Infinity;
+        for (const index of row) {
+            const size = axis === 'x' ? members[index].width : members[index].height;
+            start = Math.min(start, at(index)[axis]);
+            end = Math.max(end, at(index)[axis] + size);
+        }
+        return { start, end };
+    };
+    if (banded) {
+        if (T >= 0 && style.side !== 'left') {
+            const { start, end } = extent('x');
+            pin('x', T, at(T).x + (alignedAt(style.side, inner('x'), end - start) - start));
+        }
+        if (contents.align !== 'left')
+            pin('x', K, alignedAt(contents.align, inner('x'), block.width));
+    }
+    else if (T >= 0) {
+        const sides = { x: style.side, y: style.end };
+        // The text and its group range in the room their own row (across) or
+        // column (down) leaves them — between whatever sits beside, above or below
+        // them — not in the whole box. Ranged against the whole width, a
+        // right-ranged title runs into a child in the top-right corner, pushes it
+        // out and grows the box; centered on the whole height, a title with things
+        // placed below it and more in the bottom corners drops into the middle.
+        const room = (axis) => {
+            const cross = axis === 'x' ? 'y' : 'x';
+            const whole = inner(axis);
+            const along = extent(axis);
+            const beside = extent(cross);
+            const size = (member, on) => (on === 'x' ? member.width : member.height);
+            let start = whole.start;
+            let end = whole.start + whole.size;
+            members.forEach((member, index) => {
+                if (row.includes(index) || index === TL || index === BR)
+                    return;
+                const c0 = at(index)[cross];
+                if (c0 + size(member, cross) <= beside.start || c0 >= beside.end)
+                    return;
+                const a0 = at(index)[axis];
+                if (a0 + size(member, axis) <= along.start)
+                    start = Math.max(start, a0 + size(member, axis) + CHILD_GAP);
+                else if (a0 >= along.end)
+                    end = Math.min(end, a0 - CHILD_GAP);
+            });
+            return { start, size: end - start };
+        };
+        for (const axis of AXES) {
+            if (sides[axis] === 'left' || sides[axis] === 'top')
+                continue;
+            const { start, end } = extent(axis);
+            const want = alignedAt(sides[axis], room(axis), end - start);
+            pin(axis, T, at(T)[axis] + (want - start));
+        }
+    }
+    if (pins.x.length > 0 || pins.y.length > 0)
+        solved = solve(pins);
+    const origin = at(TL);
+    const corner = at(BR);
+    node.inset = 0;
+    node.width = corner.x - origin.x;
+    node.height = corner.y - origin.y;
+    node.banded = banded;
+    node.headerHeight = banded && hasText ? textHeight + HEADER_GAP : 0;
+    node.textSide = style.side;
+    const relative = (index, width, height) => ({
+        x: at(index).x - origin.x,
+        y: at(index).y - origin.y,
+        width,
+        height,
+    });
+    node.textBox = T >= 0 ? relative(T, textWidth, textHeight) : { x: 0, y: 0, width: 0, height: 0 };
+    const reach = { left: 0, top: 0, right: 0, bottom: 0 };
+    for (const child of placed) {
+        const position = solved.get(child);
+        const offset = { x: position.x - origin.x, y: position.y - origin.y };
+        local.set(child, offset);
+        // Whatever sticks out past the frame — a child placed outside it, or
+        // something one of the children placed outside itself.
+        reach.left = Math.max(reach.left, child.reach.left - offset.x);
+        reach.top = Math.max(reach.top, child.reach.top - offset.y);
+        reach.right = Math.max(reach.right, offset.x + child.width + child.reach.right - node.width);
+        reach.bottom = Math.max(reach.bottom, offset.y + child.height + child.reach.bottom - node.height);
+    }
+    node.reach = reach;
+    if (banded) {
+        const shift = relative(K, 0, 0);
+        for (const child of stacked) {
+            const offset = local.get(child);
+            offset.x += shift.x;
+            offset.y += shift.y;
+        }
+    }
+}
 // --- pass three: solve for positions -----------------------------------------
-function placeRoots(roots, byName, links, measurer, fontSize, local) {
+function placeRoots(roots, byName, edges, measurer, fontSize, local) {
     const anchors = roots.filter((root) => root.placements.length === 0);
     if (anchors.length === 0) {
         throw new SourceError('every node is placed relative to another, so nothing anchors the diagram', 1);
@@ -470,7 +1166,7 @@ function placeRoots(roots, byName, links, measurer, fontSize, local) {
     // A placement may name something nested — `right of server.docker` places a top-level
     // node against a box inside another. Sizes and offsets within a container are
     // already settled, so a nested target is its root's position plus a constant.
-    const positions = positionGroup(roots, (placement, owner) => placement.targets.map((name) => {
+    const positions = positionGroup(roots, (placement, owner) => placement.targets.map(({ name, part }) => {
         const target = byName.get(name);
         if (!target) {
             throw new SourceError(`"${owner.name}" is placed against "${name}", which does not exist`, placement.line);
@@ -483,15 +1179,15 @@ function placeRoots(roots, byName, links, measurer, fontSize, local) {
             offset.y += step.y;
             root = root.parent;
         }
-        return {
+        return partOf({
             name,
             node: target,
             index: indexOf.get(root),
             offset,
             width: target.width,
             height: target.height,
-        };
-    }), { x: [], y: [] }, corridorsIn(links, (node) => liftTo(node, indexOf, local), measurer, fontSize));
+        }, part, owner, placement.line);
+    }), { x: [], y: [] }, corridorsIn(edges, (node) => liftTo(node, indexOf, local), measurer, fontSize));
     for (const root of roots) {
         const position = positions.get(root);
         root.x = position.x;
@@ -509,12 +1205,17 @@ function spreadToChildren(node, local) {
     }
 }
 const AXES = ['x', 'y'];
+const NO_REACH = { left: 0, top: 0, right: 0, bottom: 0 };
 const AXIS_WORD = { x: 'horizontally', y: 'vertically' };
+/** Which member a target's position on this axis is measured from. */
+function memberOn(target, axis) {
+    return target.byAxis ? target.byAxis[axis] : target.index;
+}
 /**
  * Where a node sits within the group being solved: which member holds it, and
- * where inside that member. A link may name anything at any depth, so its ends
+ * where inside that member. An edge may name anything at any depth, so its ends
  * are lifted to the members of whichever group is being solved — and a node
- * outside that group has no answer, which is how a link is sorted into the one
+ * outside that group has no answer, which is how an edge is sorted into the one
  * group where its two ends are different members.
  */
 function liftTo(node, indexOf, local) {
@@ -537,28 +1238,28 @@ function liftTo(node, indexOf, local) {
         height: node.height,
     };
 }
-/** The labeled links whose two ends are different members of this group. */
-function corridorsIn(links, locate, measurer, fontSize) {
+/** The edges with text whose two ends are different members of this group. */
+function corridorsIn(edges, locate, measurer, fontSize) {
     const corridors = [];
-    for (const link of links) {
-        // An unlabeled link asks for nothing: every gap holds an arrowhead. And a
-        // link told to pass between two named things carries its label in *that*
+    for (const edge of edges) {
+        // An edge with no text asks for nothing: every gap holds an arrowhead. And a
+        // edge told to pass between two named things carries its text in *that*
         // corridor rather than in the gap between its own ends, so widening this one
-        // would make room where the label never goes.
-        if (link.label === undefined || link.between)
+        // would make room where the text never goes.
+        if (edge.text === undefined || edge.between)
             continue;
-        const from = locate(link.from);
-        const to = locate(link.to);
+        const from = locate(edge.from);
+        const to = locate(edge.to);
         if (!from || !to || from.index === to.index)
             continue;
-        // The clearance is doubled because the label is drawn at the *midpoint* of
+        // The clearance is doubled because the text is drawn at the *midpoint* of
         // the line, so the room it needs is symmetric about that point whatever sits
         // at either end. The arrowhead is charged on both sides for the same reason:
         // it covers `ARROW_LENGTH` of the line it arrives on, and reserving that at
         // one end only would move the midpoint rather than lengthen the run.
-        const extent = (axis) => labelExtent(link.label, link.appearance, axis, measurer, fontSize, link.line) +
-            (LABEL_CLEARANCE + ARROW_LENGTH) * 2;
-        corridors.push({ link, from, to, need: { x: extent('x'), y: extent('y') } });
+        const extent = (axis) => textExtent(edge.lines, edge.textAttrs, axis, measurer, fontSize, edge.line) +
+            (TEXT_CLEARANCE + ARROW_LENGTH) * 2;
+        corridors.push({ edge, from, to, need: { x: extent('x'), y: extent('y') } });
     }
     return corridors;
 }
@@ -574,10 +1275,23 @@ function corridorsIn(links, locate, measurer, fontSize) {
  * hold whatever is put in it and closes again when that is removed. No number
  * anywhere has to be guessed, and nothing is ever tried and rejected.
  */
-function positionGroup(members, locate, extra, corridors = []) {
+function positionGroup(members, locate, extra, corridors = [], across, clearance = SEPARATION_GAP) {
     const constraints = { x: [...extra.x], y: [...extra.y] };
     const indexOf = new Map(members.map((member, index) => [member, index]));
     const pending = [];
+    /** Pairs an overlay put on top of each other, which is the point of it. */
+    const overlaid = [];
+    // Several nodes saying the identical thing are one list, running down the
+    // page in the order they were written. The first carries the placement for
+    // the whole list; each of the rest hangs a fixed step below the one before,
+    // and places itself across as it said.
+    const fans = fansIn(members);
+    for (const fan of fans.values()) {
+        for (let at = 1; at < fan.members.length; at += 1) {
+            const previous = fan.members[at - 1];
+            constraints.y.push(...fix(indexOf.get(previous), indexOf.get(fan.members[at]), previous.height + CHILD_GAP));
+        }
+    }
     for (const node of members) {
         // Checked here as well as in `gapFor`, so a misspelt node-wide gap is caught
         // on a node whose placements all name their own or are alignments — and on
@@ -586,13 +1300,23 @@ function positionGroup(members, locate, extra, corridors = []) {
         if (node.placements.length === 0)
             continue;
         const me = indexOf.get(node);
-        const size = { x: node.width, y: node.height };
+        const fan = fans.get(node);
+        // A later member of a fan has its vertical from the list, so its own
+        // placements speak only across; the first speaks for the whole list.
+        const follows = fan !== undefined && fan.members[0] !== node;
+        const size = { x: node.width, y: fan ? fan.height : node.height };
         const located = node.placements.map((placement) => ({ placement, targets: locate(placement, node) }));
+        const speaks = (axis) => !(follows && axis === 'y');
         const spokenFor = { x: false, y: false };
         for (const { placement } of located) {
             if (placement.kind === 'align') {
                 spokenFor[placement.axis] = true;
             }
+            else if (placement.kind === 'on') {
+                // An overlay names a point of a box, so it settles both axes at once.
+                spokenFor.x = true;
+                spokenFor.y = true;
+            }
             else {
                 if (/left|right/.test(placement.direction))
                     spokenFor.x = true;
@@ -603,20 +1327,40 @@ function positionGroup(members, locate, extra, corridors = []) {
         // Aligning to several targets means aligning to the box that just bounds
         // them. That box is a constant only while its members hold still relative
         // to one another; otherwise the alignment waits for the first solution.
-        const alignOn = (axis, edge, targets, placement) => {
-            const anchor = sharedMember(targets);
+        const alignOn = (axis, side, targets, placement) => {
+            if (!speaks(axis))
+                return;
+            const anchor = sharedMember(targets, axis);
             if (anchor === undefined) {
-                pending.push({ node, me, axis, edge, targets, placement });
+                pending.push({ node, me, axis, side, targets, placement, own: size[axis] });
                 return;
             }
             const span = spanOf(targets, axis, () => 0);
-            constraints[axis].push(...fix(anchor, me, alignedAt(edge, span, size[axis]), placement));
+            constraints[axis].push(...fix(anchor, me, alignedAt(side, span, size[axis]), placement));
         };
         for (const { placement, targets } of located) {
             if (placement.kind === 'align') {
-                alignOn(placement.axis, placement.edge, targets, placement);
+                alignOn(placement.axis, placement.side, targets, placement);
                 continue;
             }
+            if (placement.kind === 'on') {
+                // The node's center at the part's center, on both axes. That is the
+                // ordinary center alignment the language already has on one axis, said
+                // twice — which is why `on` needs nothing of its own in the solver.
+                // A side of a parent's frame comes as its two ends, so centering on
+                // the part is centering on everything it came as.
+                overlaid.push([me, targets[0].index]);
+                for (const axis of AXES)
+                    alignOn(axis, 'center', targets, placement);
+                continue;
+            }
+            // Saying `inside` is the author stating the overlap, so there is
+            // nothing for the separation pass to report. `outside` is clear of the
+            // box by construction and needs no exemption.
+            if (placement.written === 'inside') {
+                for (const target of targets)
+                    overlaid.push([me, target.index]);
+            }
             // One constraint per target, so the node clears the furthest of them.
             // Taking that maximum is what longest paths already does, which is why a
             // direction against a whole region needs nothing added to the solver.
@@ -626,39 +1370,35 @@ function positionGroup(members, locate, extra, corridors = []) {
             // default. That is what lets a node wedged between two things sit tight
             // against one of them and wide of the other.
             for (const target of targets) {
-                const gap = gapFor(node, placement, target.node);
+                const gap = target.empty ? 0 : gapFor(node, placement, target.node);
+                // Tucked inside the frame of the box that holds it, a child is *at*
+                // that edge rather than at least so far from it: the frame is also
+                // held open around every child, which is a pull the other way, and
+                // without this the child would sit wherever that left it.
+                const exact = target.frame === true && placement.written === 'inside';
+                const push = (axis, from, to, weight) => {
+                    if (!speaks(axis))
+                        return;
+                    constraints[axis].push({ from, to, weight, placement });
+                    if (exact)
+                        constraints[axis].push({ from: to, to: from, weight: -weight, placement });
+                };
+                const x = memberOn(target, 'x');
+                const y = memberOn(target, 'y');
+                // The gap is between what each has placed outside itself, not only
+                // their boxes: a note beside a box is part of it.
+                const theirs = target.reach ?? NO_REACH;
+                const mine = node.reach;
                 if (direction.includes('right')) {
-                    constraints.x.push({
-                        from: target.index,
-                        to: me,
-                        weight: target.offset.x + target.width + gap,
-                        placement,
-                    });
-                }
-                if (direction.includes('left')) {
-                    constraints.x.push({
-                        from: me,
-                        to: target.index,
-                        weight: node.width + gap - target.offset.x,
-                        placement,
-                    });
+                    push('x', x, me, target.offset.x + target.width + theirs.right + gap + mine.left);
                 }
+                if (direction.includes('left'))
+                    push('x', me, x, size.x + mine.right + gap + theirs.left - target.offset.x);
                 if (direction.includes('below')) {
-                    constraints.y.push({
-                        from: target.index,
-                        to: me,
-                        weight: target.offset.y + target.height + gap,
-                        placement,
-                    });
-                }
-                if (direction.includes('above')) {
-                    constraints.y.push({
-                        from: me,
-                        to: target.index,
-                        weight: node.height + gap - target.offset.y,
-                        placement,
-                    });
+                    push('y', y, me, target.offset.y + target.height + theirs.bottom + gap + mine.top);
                 }
+                if (direction.includes('above'))
+                    push('y', me, y, size.y + mine.bottom + gap + theirs.top - target.offset.y);
             }
         }
         // An axis nobody spoke to falls back to the center line of whatever the
@@ -667,14 +1407,14 @@ function positionGroup(members, locate, extra, corridors = []) {
         // so that is refused rather than guessed — but two targets named by one
         // placement are a single region, and centering on it is unambiguous.
         for (const axis of AXES) {
-            if (spokenFor[axis])
+            if (spokenFor[axis] || !speaks(axis))
                 continue;
             const offers = located.filter((entry) => entry.placement.kind === 'offset');
             const first = offers[0];
             if (!first) {
                 throw new SourceError(`"${node.name}" says nothing about where it sits ${AXIS_WORD[axis]}`, node.placements[0].line);
             }
-            const named = (entry) => entry.placement.targets.join('\u0000');
+            const named = (entry) => entry.placement.targets.map(nameTarget).join('\u0000');
             const other = offers.find((entry) => named(entry) !== named(first));
             if (other) {
                 throw new SourceError(`"${node.name}" does not say where it sits ${AXIS_WORD[axis]}: ` +
@@ -693,21 +1433,78 @@ function positionGroup(members, locate, extra, corridors = []) {
             solved[axis] = outcome.positions;
         }
     };
-    solveAll();
-    room(corridors, constraints, solved, solveAll);
-    settle(pending, members, constraints, solved, solveAll);
-    snug(members, constraints, solved, solveAll);
-    separate(members, constraints, solved, solveAll);
+    // An edge's text is given room only once everything is where it goes: a
+    // box still waiting to be centered, or still on top of another, is not yet
+    // where it will be, and room judged against it goes in the wrong gap. Room
+    // can move things in turn, so the centering and pulling-in are measured
+    // again from what the file said, and the texts looked at again, until a
+    // look adds nothing. What was placed, separated or widened stays.
+    //
+    // It stops: each text can be given room once across and once down, room
+    // is never taken back, and a look that gives none ends it.
+    const lasting = { x: [...constraints.x], y: [...constraints.y] };
+    const made = new Set();
+    const keep = (step) => {
+        const before = { x: constraints.x.length, y: constraints.y.length };
+        const changed = step();
+        for (const axis of AXES)
+            lasting[axis].push(...constraints[axis].slice(before[axis]));
+        return changed === true;
+    };
+    for (;;) {
+        constraints.x = [...lasting.x];
+        constraints.y = [...lasting.y];
+        solveAll();
+        settle(pending, members, constraints, solved, solveAll);
+        snug(members, constraints, solved, solveAll);
+        keep(() => separate(members, constraints, solved, solveAll, overlaid, across, clearance));
+        if (!keep(() => room(corridors, constraints, solved, solveAll, made)))
+            break;
+    }
     confirm(pending, solved);
     return new Map(members.map((member, index) => [
         member,
         { x: solved.x[index], y: solved.y[index] },
     ]));
 }
-/** The member every target belongs to, or nothing if they are spread across several. */
-function sharedMember(targets) {
-    const first = targets[0].index;
-    return targets.every((target) => target.index === first) ? first : undefined;
+/** The member every target belongs to on this axis, or nothing if they are spread across several. */
+function sharedMember(targets, axis) {
+    const first = memberOn(targets[0], axis);
+    return targets.every((target) => memberOn(target, axis) === first) ? first : undefined;
+}
+/**
+ * The fans in a group: two or more members whose placements say the identical
+ * thing, each member mapped to the one fan it is in.
+ *
+ * `b right of a`, `c right of a` and `d right of a` otherwise put three boxes
+ * on one spot, and what they mean is "a points at three things" — the three
+ * balanced against `a`, which no chain of placements can say. The same holds
+ * of a part: three children `inside parent right` are a column against that
+ * edge. The list runs down the page whatever the direction, including at a
+ * corner, where it stacks into the corner and grows down.
+ *
+ * A node saying `overlap: allow` has asked for the literal pile, and gets it.
+ */
+function fansIn(members) {
+    const bySaying = new Map();
+    for (const node of members) {
+        if (node.placements.length === 0 || allowsOverlap(node))
+            continue;
+        const saying = node.placements.map(describePlacement).join('\n');
+        const list = bySaying.get(saying) ?? [];
+        list.push(node);
+        bySaying.set(saying, list);
+    }
+    const fans = new Map();
+    for (const list of bySaying.values()) {
+        if (list.length < 2)
+            continue;
+        const height = list.reduce((sum, node) => sum + node.height, 0) + CHILD_GAP * (list.length - 1);
+        const fan = { members: list, height };
+        for (const node of list)
+            fans.set(node, fan);
+    }
+    return fans;
 }
 /** The stretch of one axis that just covers every target. */
 function spanOf(targets, axis, base) {
@@ -720,40 +1517,91 @@ function spanOf(targets, axis, base) {
     }
     return { start, size: end - start };
 }
-/** Where a node of this size sits so that the named edge of it meets the span's. */
-function alignedAt(edge, span, own) {
-    if (edge === 'center')
+/**
+ * Narrow a target to the part of it the placement named — its text, one of its
+ * four sides, or one of its nine points.
+ *
+ * A side comes back as a segment of zero thickness and a point as a rectangle
+ * of no size at all, which is the whole of what a part is to the solver: an
+ * extent, exactly as a whole box is, just a thinner one. Everything else — the
+ * direction, the gap, the alignment on the axis nobody spoke to — then works
+ * on it unchanged, which is why a part target needed nothing added to the
+ * constraint system.
+ *
+ * Each position is read as two independent halves, one per axis, which is why
+ * nine words need no table of nine entries: `top-right` is "right" across and
+ * "top" down, `top-center` is "top" down and centered across.
+ */
+function partOf(target, part, owner, line) {
+    // The whole node is what it has placed outside itself too; a part of it is
+    // just that part.
+    if (part === undefined)
+        return { ...target, reach: target.node.reach };
+    const box = { ...target, offset: { ...target.offset } };
+    if (part === 'text') {
+        const text = target.node.textBox;
+        if (text.width === 0 && text.height === 0) {
+            throw new SourceError(`"${owner.name}" is placed against "${target.name} text", and "${target.name}" has no text`, line);
+        }
+        box.offset.x += text.x;
+        box.offset.y += text.y;
+        box.width = text.width;
+        box.height = text.height;
+        return box;
+    }
+    const words = part.split('-');
+    const isSide = PART_SIDES.includes(part);
+    const narrow = (axis, near, far) => {
+        const size = axis === 'x' ? box.width : box.height;
+        const named = words.includes(near) ? 0 : words.includes(far) ? size : undefined;
+        // A *side* leaves the axis it does not name alone: `right` is the whole
+        // right edge, top to bottom, where `right-center` is the one point on it.
+        if (named === undefined && isSide)
+            return;
+        box.offset[axis] += named ?? size / 2;
+        if (axis === 'x')
+            box.width = 0;
+        else
+            box.height = 0;
+    };
+    narrow('x', 'left', 'right');
+    narrow('y', 'top', 'bottom');
+    return box;
+}
+/** Where a node of this size sits so that the named side of it meets the span's. */
+function alignedAt(side, span, own) {
+    if (side === 'center')
         return span.start + (span.size - own) / 2;
-    if (edge === 'top' || edge === 'left')
+    if (side === 'top' || side === 'left')
         return span.start;
     return span.start + span.size - own;
 }
 /**
- * Widen a corridor to hold the label of the link crossing it.
+ * Widen a corridor to hold the text of the edge crossing it.
  *
- * This is the one place a link reaches the constraint system, and it is the same
- * measure-then-constrain move `settle` makes rather than links joining the graph
- * outright: the first solution says which gap each label actually falls in, and
+ * This is the one place an edge reaches the constraint system, and it is the same
+ * measure-then-constrain move `settle` makes rather than edges joining the graph
+ * outright: the first solution says which gap each text actually falls in, and
  * from there the room it needs is an ordinary minimum distance like any other.
  * Nothing is nudged and no layout is repaired — a constraint the file already
  * implied is derived and the whole system is solved again.
  *
  * Which gap that is, is derived and never chosen. A pair clear of each other on
- * exactly one axis has exactly one corridor between them, and the label is in
+ * exactly one axis has exactly one corridor between them, and the text is in
  * it. A pair clear on *both* axes sits corner to corner, so the line runs
  * diagonally through open space and there is no corridor to widen; a pair clear
  * on neither overlaps, which is the separation pass's business and not this
  * one's. Both are left alone, which is why this only ever moves boxes that a
- * label is genuinely wedged between.
+ * text is genuinely wedged between.
  *
  * A gap being a minimum does the rest. Where the corridor is already wide enough
  * — because the author said `gap: wide`, or because something else is in there
- * — the constraint is slack and nothing moves; delete the label and the corridor
+ * — the constraint is slack and nothing moves; delete the text and the corridor
  * closes back to whatever the file asked for.
  */
-function room(corridors, constraints, solved, solveAll) {
+function room(corridors, constraints, solved, solveAll, made) {
     let added = false;
-    for (const { from, to, need } of corridors) {
+    for (const [index, { from, to, need }] of corridors.entries()) {
         const clear = (axis) => {
             const at = (end) => solved[axis][end.index] + end.offset[axis];
             const size = (end) => (axis === 'x' ? end.width : end.height);
@@ -767,6 +1615,11 @@ function room(corridors, constraints, solved, solveAll) {
         if (open.length !== 1)
             continue;
         const axis = open[0];
+        // Given already, and a minimum stays met: asking again would widen
+        // nothing and only keep the caller looking.
+        if (made.has(`${index}:${axis}`))
+            continue;
+        made.add(`${index}:${axis}`);
         const { before, after } = clear(axis);
         constraints[axis].push({
             from: before.index,
@@ -780,6 +1633,7 @@ function room(corridors, constraints, solved, solveAll) {
     }
     if (added)
         solveAll();
+    return added;
 }
 /**
  * Fix the alignments that had to wait, by measuring what they align to.
@@ -805,16 +1659,19 @@ function settle(pending, members, constraints, solved, solveAll) {
         const reach = reachability(members.length, constraints[axis]);
         for (const entry of here) {
             for (const target of entry.targets) {
-                if (target.index !== entry.me && !reach[entry.me][target.index])
+                if (target.frame)
+                    continue;
+                const at = memberOn(target, axis);
+                if (at !== entry.me && !reach[entry.me][at])
                     continue;
                 throw new SourceError(`"${entry.node.name}" is ${describePlacement(entry.placement)}, but "${target.name}" ` +
                     `is placed ${AXIS_WORD[axis]} against "${entry.node.name}" in turn, so there is no ` +
                     `arrangement where each waits for the other`, entry.placement.line);
             }
-            const span = spanOf(entry.targets, axis, (target) => solved[axis][target.index]);
-            const own = axis === 'x' ? entry.node.width : entry.node.height;
-            const anchor = entry.targets[0].index;
-            constraints[axis].push(...fix(anchor, entry.me, alignedAt(entry.edge, span, own) - solved[axis][anchor], entry.placement));
+            const span = spanOf(entry.targets, axis, (target) => solved[axis][memberOn(target, axis)]);
+            const own = entry.own ?? (axis === 'x' ? entry.node.width : entry.node.height);
+            const anchor = memberOn(entry.targets[0], axis);
+            constraints[axis].push(...fix(anchor, entry.me, alignedAt(entry.side, span, own) - solved[axis][anchor], entry.placement));
         }
     }
     solveAll();
@@ -831,9 +1688,9 @@ function settle(pending, members, constraints, solved, solveAll) {
 function confirm(pending, solved) {
     for (const entry of pending) {
         const { axis } = entry;
-        const span = spanOf(entry.targets, axis, (target) => solved[axis][target.index]);
-        const own = axis === 'x' ? entry.node.width : entry.node.height;
-        if (Math.abs(alignedAt(entry.edge, span, own) - solved[axis][entry.me]) <= 0.5)
+        const span = spanOf(entry.targets, axis, (target) => solved[axis][memberOn(target, axis)]);
+        const own = entry.own ?? (axis === 'x' ? entry.node.width : entry.node.height);
+        if (Math.abs(alignedAt(entry.side, span, own) - solved[axis][entry.me]) <= 0.5)
             continue;
         throw new SourceError(`"${entry.node.name}" cannot be ${describePlacement(entry.placement)}: keeping boxes off ` +
             `each other moved them apart after that region was measured`, entry.placement.line);
@@ -928,21 +1785,31 @@ function snug(members, constraints, solved, solveAll) {
  * Members here are always siblings, or the roots of the diagram, so no member
  * ever contains another and containment needs no exemption of its own.
  */
-function separate(members, constraints, solved, solveAll) {
+function separate(members, constraints, solved, solveAll, overlaid = [], across, clearance = SEPARATION_GAP) {
     const eligible = members.map(allowsOverlap).map((allowed) => !allowed);
     if (eligible.filter(Boolean).length < 2)
         return;
+    // An overlay and the box it is on overlap by construction, so that one pair
+    // is exempt while both remain ordinary boxes to everything else. This is a
+    // pair exemption rather than `overlap: allow` on the node for exactly that
+    // reason: a badge sitting on its box says nothing about the box next door.
+    const stamped = new Set(overlaid.map(([a, b]) => pairKey(a, b)));
     // Adding only, so the number of separations is bounded; the cap is a
     // backstop against a bug rather than an expected outcome.
     for (let round = 0; round < members.length * members.length + 1; round += 1) {
         let reach;
         let added = false;
-        for (let i = 0; i < members.length; i += 1) {
+        // One separation per round, then solve again: a pair that collided only
+        // because another pair had not yet been moved apart is not a collision,
+        // and separating it anyway leaves an ordering that later moves drag along.
+        scan: for (let i = 0; i < members.length; i += 1) {
             if (!eligible[i])
                 continue;
             for (let j = i + 1; j < members.length; j += 1) {
                 if (!eligible[j])
                     continue;
+                if (stamped.has(pairKey(i, j)))
+                    continue;
                 const over = overlapOf(members, solved, i, j);
                 if (!over)
                     continue;
@@ -953,14 +1820,22 @@ function separate(members, constraints, solved, solveAll) {
                     if (order)
                         orders[axis] = order;
                 }
-                const axis = pickAxis(orders, over);
+                // A child against a side of its parent's frame has said which way it
+                // stands from the rest of the box — `inside p right` is beside it —
+                // so where that way is open, it is the way, and the smaller overlap
+                // is not asked.
+                const named = across?.(i, j);
+                const axis = named !== undefined && orders[named] ? named : pickAxis(orders, over);
                 if (!axis)
                     throw unordered(members[i], members[j]);
                 const { before, after } = orders[axis];
                 const span = axis === 'x' ? members[before].width : members[before].height;
-                constraints[axis].push({ from: before, to: after, weight: span + SEPARATION_GAP });
+                const [near, far] = axis === 'x' ? ['left', 'right'] : ['top', 'bottom'];
+                const past = members[before].reach[far] + members[after].reach[near];
+                constraints[axis].push({ from: before, to: after, weight: span + past + clearance });
                 reach = undefined;
                 added = true;
+                break scan;
             }
         }
         if (!added)
@@ -968,13 +1843,16 @@ function separate(members, constraints, solved, solveAll) {
         solveAll();
     }
 }
+function pairKey(a, b) {
+    return a < b ? `${a}:${b}` : `${b}:${a}`;
+}
 /** How far two members share space on each axis, or nothing if they are clear of each other. */
 function overlapOf(members, solved, i, j) {
     const shared = (axis) => {
-        const size = (index) => (axis === 'x' ? members[index].width : members[index].height);
-        const startI = solved[axis][i];
-        const startJ = solved[axis][j];
-        return Math.min(startI + size(i), startJ + size(j)) - Math.max(startI, startJ);
+        const [near, far] = axis === 'x' ? ['left', 'right'] : ['top', 'bottom'];
+        const start = (index) => solved[axis][index] - members[index].reach[near];
+        const end = (index) => solved[axis][index] + (axis === 'x' ? members[index].width : members[index].height) + members[index].reach[far];
+        return Math.min(end(i), end(j)) - Math.max(start(i), start(j));
     };
     const x = shared('x');
     const y = shared('y');
@@ -1037,8 +1915,26 @@ function noRoom(contradiction, axis, members) {
 function gapFor(node, placement, target) {
     if (placement.gap !== undefined)
         return namedGap(node, placement.gap, placement.line);
+    // Against the box that holds it, a child is spaced as that box spaces what it
+    // holds: tucked in by the padding, and deaf to the box's own `gap:`, which
+    // says how that box stands off its neighbours and not how it holds things.
+    const own = target.children.includes(node);
+    if (own && placement.written === 'inside')
+        return PAD;
+    // Beside or below the text of the box holding it, as the contents sit below
+    // a title: a band said by placing things below the text is the band the
+    // contents would have made.
+    if (own && placement.targets.some((each) => each.name === target.name && each.part === 'text'))
+        return CHILD_GAP;
+    // An `inside` placement is an inset rather than a standoff, and the two want
+    // different defaults: "beside that box" reads as room to breathe, "tucked in
+    // that corner" reads as close to it. A node-wide `gap:`, which says how this
+    // node stands off its *neighbours*, has no business setting an inset either
+    // — so `inside` takes `tight` and stops there unless the placement says.
+    if (placement.written === 'inside')
+        return namedGap(node, 'tight', placement.line);
     const mine = node.attrs['gap'];
-    const theirs = target.attrs['gap'];
+    const theirs = own ? undefined : target.attrs['gap'];
     // Only a gap somebody actually wrote down counts. Reading an absent one as the
     // default would make it a floor rather than a fallback, and every `gap: tight`
     // placed against a silent node would quietly widen back to normal.
@@ -1051,59 +1947,92 @@ function gapFor(node, placement, target) {
         return namedGap(node, undefined, node.line);
     return Math.max(...stated);
 }
+/**
+ * A gap is one of the named steps or a plain number of pixels. The names are
+ * the default because retuning `tight` moves every tight gap together, but a
+ * number is no less relative: it is still a minimum distance from the target,
+ * and nothing unrelated moving can make it wrong.
+ */
 function namedGap(node, named, line) {
     const gap = GAPS[named ?? 'normal'];
-    if (gap === undefined) {
-        const known = Object.keys(GAPS).join(', ');
-        throw new SourceError(`"${node.name}" asks for gap: ${named}, which is not one of ${known}`, line);
-    }
-    return gap;
+    if (gap !== undefined)
+        return gap;
+    if (named !== undefined && /^\d+(\.\d+)?$/.test(named))
+        return Number(named);
+    const known = Object.keys(GAPS).join(', ');
+    const unit = named?.match(/^(\d+(?:\.\d+)?)px$/);
+    const hint = unit
+        ? `; write "gap: ${unit[1]}", a gap's number is already in pixels`
+        : named?.startsWith('-')
+            ? '; a gap is a distance and cannot be negative, and "overlap: allow" is what lets two boxes meet'
+            : '';
+    throw new SourceError(`"${node.name}" asks for gap: ${named}, which is not one of ${known} or a number of pixels${hint}`, line);
 }
 // --- shared helpers ----------------------------------------------------------
-function widestLine(lines, measurer, fontSize) {
-    return lines.reduce((widest, line) => {
-        const { width } = measurer.measure(line, fontSize);
-        return Math.max(widest, width);
-    }, 0);
+/** The keys a bracketed attribute contributed, with its prefix taken off. */
+function bracketOf(key, attrs) {
+    const found = {};
+    for (const [written, value] of Object.entries(attrs)) {
+        if (written.startsWith(`${key}.`))
+            found[written.slice(key.length + 1)] = value;
+    }
+    return found;
 }
 /**
- * Split a label into the lines that get drawn. `/` always breaks a line. A
- * `width` attribute additionally folds each of those at word boundaries, which
- * is what stops a long note running across the whole diagram.
+ * Every style the markup in this file names, resolved to the color it lends.
  *
- * The width is a character count rather than a distance. It says how much text
+ * A style is the only thing markup may name — never a color — so that a marked
+ * word borrows a meaning the file already has instead of restating a value that
+ * goes stale the day the thing it means is recolored. Both ways that can fail
+ * are refused by name: a style nobody declared, and one that says nothing about
+ * text and so would lend nothing.
+ */
+function markupColors(nodes, edges, styles) {
+    const colors = {};
+    const used = [
+        ...nodes.map((node) => ({ lines: node.lines, what: `"${node.name}"`, line: node.line })),
+        ...edges.flatMap((edge) => edge.lines ? [{ lines: edge.lines, what: `edge ${edge.from.name} -> ${edge.to.name}`, line: edge.line }] : []),
+    ];
+    for (const { lines, what, line } of used) {
+        for (const name of markupStyles(lines)) {
+            const style = styles.get(name);
+            if (style === undefined) {
+                throw new SourceError(`${what}: its text marks [${name}], and there is no style called "${name}"`, line);
+            }
+            const color = style['text.color'];
+            if (color === undefined) {
+                throw new SourceError(`${what}: its text marks [${name}], and style "${name}" says nothing about text — ` +
+                    `write \`style ${name}  text: (color: …)\``, line);
+            }
+            colors[name] = color;
+        }
+    }
+    return colors;
+}
+/**
+ * Split a text into the lines that get drawn. ` / ` always breaks a line, and
+ * `(wrap: n)` additionally folds each of those at word boundaries, which is
+ * what stops a long note running across the whole diagram.
+ *
+ * The wrap is a character count rather than a distance. It says how much text
  * fits on a line, not where anything sits, so it stays a property of the text
  * and never becomes a coordinate in disguise.
+ *
+ * Markup is read off first, so everything downstream works in runs: a break or
+ * a fold inside a marked-up stretch carries the mark onto both lines, which is
+ * what makes markup general where the `subtext:` slice it replaced could only
+ * ever reach the tail of a text.
  */
-function linesFor(text, attrs, line) {
-    const stated = attrs['wrap'];
+function linesFor(text, textAttrs, subject, line) {
+    const lines = splitRuns(parseMarkup(text, subject, line));
+    const stated = textAttrs['wrap'];
     if (stated === undefined)
-        return splitLines(text);
+        return lines;
     const columns = Number(stated);
     if (!Number.isInteger(columns) || columns < 1) {
         throw new SourceError(`wrap must be a whole number of characters, not "${stated}"`, line);
     }
-    return splitLines(text).flatMap((part) => wrap(part, columns));
-}
-/** Fold one line onto several at word boundaries, never exceeding `columns`. */
-function wrap(text, columns) {
-    const lines = [];
-    let current = '';
-    for (const word of text.split(/\s+/).filter(Boolean)) {
-        if (current.length === 0) {
-            current = word;
-        }
-        else if (current.length + 1 + word.length <= columns) {
-            current += ` ${word}`;
-        }
-        else {
-            lines.push(current);
-            current = word;
-        }
-    }
-    if (current.length > 0)
-        lines.push(current);
-    return lines.length > 0 ? lines : [''];
+    return lines.flatMap((part) => wrapLine(part, columns));
 }
 function bounds(nodes) {
     let minX = Infinity;