reladraw 0.23.0 → 0.24.0

package/.claude/skills/reladraw/SKILL.md

@@ -15,7 +15,7 @@ That matters here specifically. You can't see the SVG you produced. With auto-la
 
 ## Check it is installed, and the same version as this skill
 
-This skill teaches reladraw 0.23.0. Once per session, before the first render, run:
+This skill teaches reladraw 0.24.0. Once per session, before the first render, run:
 
 ```
 reladraw --version
@@ -23,7 +23,7 @@ reladraw --version
 
 - **The same:** say nothing.
 - **Older, or `--version` isn't recognized** (it arrived in 0.17.1): the tool is older than this page and will refuse some of what it teaches. Tell the user, and give them `npm install -g reladraw@latest`.
-- **Newer:** this skill is out of date. Tell the user, and give them `reladraw install-skill -g`, which replaces it with the skill that came with their reladraw. Carry on meanwhile; where an error names a replacement spelling, trust the error over this page.
+- **Newer:** this skill is out of date. Tell the user, and give them `reladraw install-skill`, which asks which agents to install for and replaces it with the skill that came with their reladraw. Carry on meanwhile; where an error names a replacement spelling, trust the error over this page.
 
 If `reladraw` isn't installed, `npx reladraw` works without installing, and `npm install -g reladraw` installs it.
 

package/.claude/skills/reladraw/reference/syntax.md

@@ -1,4 +1,4 @@
-# Syntax reference — 0.23.0
+# Syntax reference — 0.24.0
 
 What the language accepts. The changelog at the end lists what changed in each published version; 0.17.0's changes are large, and its entry has a table of every old spelling and what to write instead.
 
@@ -59,7 +59,7 @@ What every statement of a kind has is positional; what is optional is a key. A w
 
 ### Names and words
 
-A name is unique across nodes, points, regions, lines and bundles. It may not contain `:`, which would make it a key, or `;`, which is reserved. A dot means a child: `server.docker` is inside `server`, and the parent must be declared first. Moving a node to another parent is a rename.
+A name is unique across nodes, points, regions, lines and bundles. It may not contain `:`, which would make it a key, `,`, which separates the items of a list, or `;`, which is reserved. A dot means a child: `server.docker` is inside `server`, and the parent must be declared first. Moving a node to another parent is a rename.
 
 Every word the language owns that has more than one part is hyphenated (`from-mark:`, `bottom-left`, `min-height:`, `align-children:`), while a phrase of separate words stays spaced (`left of`, `even with`). A name you choose should look chosen: the examples use underscores (`some_region`). `to_mark:` is refused by name, pointing to `to-mark:`.
 
@@ -1145,9 +1145,9 @@ A thing can have several links, written one after another, each with a name and
 
 ```
 node api "Orders API"
-  url: "https://app.datadoghq.com/…" (name: "Datadog", icon: "D" (fill: #632ca6, text: white))
+  url: "https://docs.example.com/orders" (name: "Docs", icon: "D" (fill: #3a6ea5, text: white))
        "https://github.com/…" (name: "GitHub", icon: gh)
-       "https://app.shortcut.com/…" (name: "Shortcut")
+       "https://wiki.example.com/orders" (name: "Wiki")
 ```
 
 - **`name:`** is what a reader is shown, in quotes. A link with none shows its site, such as `github.com`.
@@ -1203,7 +1203,7 @@ reladraw check diagram.reladraw
 | `--no-checks` | print no findings; errors still print |
 | `-v`, `--version` | print the version |
 
-`reladraw install-skill` installs the agent skill that came with this version of reladraw, by running `npx skills add` on it with `--copy`. What follows it goes to `skills`: `-g` to install for every project, `-a claude-code` for one agent.
+`reladraw install-skill` installs the agent skill that came with this version of reladraw, for every project, by running `npx skills add` on it with `--copy`. `--claude` installs it in `~/.claude/skills`, `--agents` in `~/.agents/skills` (Codex and others), and both may be given; with neither, it asks, or, with no terminal to ask in, refuses and names them. For any other agent it prints the `skills` command to run.
 
 The output is a standalone SVG: every picture is drawn into it as path data, never from a font or a linked file. A web page can draw a diagram in place with `<reladraw-diagram>`; see "In a web page" in the README.
 
@@ -1338,9 +1338,18 @@ Designed and absent from the code.
 
 Pre-1.0, so the minor number is where a breaking change goes. Every removal is refused by name with the replacement quoted, rather than dropped in silence: an older file stops with an error saying what to write instead.
 
+**0.24.0**
+
+- **`reladraw install-skill` installs for Claude Code, the `~/.agents` folder, or both, and asks which.** It used to pass everything on to `skills`, which, given no agent, put a copy in the folder of every agent it knows, more than fifty of them, and in the current project unless `-g` was written. It now always installs for every project, in the places `--claude` and `--agents` name; `-a` and the other `skills` options are refused with the `skills` command that does the same, and `-g` is still accepted.
+
+**0.23.1**
+
+- **`reladraw format` no longer fails on a comment between a placement and its bracket**, such as `right of a`, then `// why wide`, then `(gap: wide)` on lines of their own. It stopped with "Cannot read properties of undefined"; it now keeps the comment where it was. Reported in #22.
+- **A comma in a name is refused by name.** `node a,b` has been refused since 0.19.0, but the message said "a text is quoted — write "b" rather than b"; it now says a name may not contain a comma, because a comma separates the items of a list. Reported in #23.
+
 **0.23.0**
 
-- **A box or a line can have several links**, each with a name and a badge: `url: "https://github.com/…" (name: "GitHub", icon: "GH")  "https://app.datadoghq.com/…" (name: "Datadog")`. In an SVG a click follows the first and the tooltip lists them all. See [Destinations](#destinations).
+- **A box or a line can have several links**, each with a name and a badge: `url: "https://github.com/…" (name: "GitHub", icon: "GH")  "https://docs.example.com/…" (name: "Docs")`. In an SVG a click follows the first and the tooltip lists them all. See [Destinations](#destinations).
 - **A click on the page selects a box or a line.** The page made with `render --page` lights what feeds it in green and what it feeds in red, and a panel beside the drawing lists its links and the boxes at either end. A click no longer follows a link on the page; the panel does. See [A page for looking at a diagram](#a-page-for-looking-at-a-diagram).
 - **A line with no text can have a link.** It used to be refused as too thin to click; an unseen wider copy of the line now takes the click.
 - **A letter icon**: `icon gh  letters: "GH"  fill: #24292f  text: white` is a few letters in a circle, usable anywhere an icon is. See [Your own icons](#your-own-icons).
@@ -1386,6 +1395,7 @@ Pre-1.0, so the minor number is where a breaking change goes. Every removal is r
 
 - **`reladraw format`** lays a file out again: each statement on one line, neighboring statements with the same keyword lined up in columns, comments kept beside what they are about. No word is respelled, and the result is checked to draw what the original did. `--check` fails on a file that would change, and `.reladraw-format` holds a project's settings; `reladraw format --init` writes one with every setting explained. `reladraw format -` reads standard input and prints the result, for editors. A long statement can wrap past a width (`wrap-at`) or go one clause to a line (`clause-per-line-at`), and `clause-order` puts placements and keys in a chosen order. The playground has a Format button (Shift+Alt+F, undone with Ctrl+Z) and a panel for its settings, which can copy them as a `.reladraw-format`. Spacing inside a clause is evened out too: `gap:tight` becomes `gap: tight`, `( gap: tight )` becomes `(gap: tight)`. Prompted by #14, where a long statement was hard to read in a plain editor.
 - **A comma may touch the next word or stand apart from both.** `(corners: rounded,path: square)` used to be refused with "`corners` has no value", and `(at: start , above edge)` was refused in a text's bracket; both now read as `rounded, path:` and `start, above` do.
+- Breaking, and missing from this list when 0.19.0 shipped: a name may no longer contain `,`. `node a,b` used to declare a node called `a,b`; the comma now ends the name, so the file is refused. Added after the fact, from #23.
 - **The playground opens and saves `.reladraw` files**, with Open… and Save… above the source. Save suggests the name of the file last opened or saved; Chrome and Edge ask where to put it, other browsers save it with the downloads. Opening a file over edits that haven't been saved to one asks first.
 - **The playground's error message can be copied**, with a Copy button beside it or by selecting it. Only the underlined line number jumps to the line now; a click anywhere on the message used to, which took a selection away.
 - **The playground no longer fails on some diagrams with 0.18.0's shapes**, which stopped with "insidePolygon is not defined". The command line was unaffected.

package/README.md

@@ -77,22 +77,24 @@ Each `<reladraw-diagram>` is replaced by its SVG. Indent the source however suit
 To install a skill to let your agent know how to use reladraw:
 
 ```
-reladraw install-skill -g
+reladraw install-skill
 ```
 
-That installs the skill that came with your copy of reladraw, so it teaches what your reladraw accepts, for every agent you use (Claude Code, Codex, Cursor, Copilot and others), each in its own skills directory. It hands the work to [skills](https://www.npmjs.com/package/skills), and passes on whatever you write after `install-skill`. Leave off `-g` to install it into the current project only. To install it for just one agent, name it with `-a`:
+That installs the skill that came with your copy of reladraw, so it teaches what your reladraw accepts, for every project. It asks where: `~/.claude/skills` for Claude Code, `~/.agents/skills` for Codex and the other agents that read it, or both. To say so without being asked, as when an agent runs it, write `--claude`, `--agents`, or both:
 
 ```
-reladraw install-skill -g -a claude-code
+reladraw install-skill --claude --agents
 ```
 
+For any other agent, it prints the [skills](https://www.npmjs.com/package/skills) command that installs this same skill there.
+
 The skill is a copy, so after upgrading reladraw, run the command again to bring the skill up to date with it.
 
 To install the skill from the main branch instead, which can run ahead of the release on npm, run `npx skills add reladraw/reladraw -g`.
 
 ## Status
 
-Version 0.23.0. Early stage, but works. The parser, layout engine, and SVG renderer are written in TypeScript, with zero runtime dependencies. There is a command-line tool that turns a .reladraw text file into an SVG, and an element that does the same inside a web page.
+Version 0.24.0. Early stage, but works. The parser, layout engine, and SVG renderer are written in TypeScript, with zero runtime dependencies. There is a command-line tool that turns a .reladraw text file into an SVG, and an element that does the same inside a web page.
 
 ## License
 

package/SYNTAX.md

@@ -1,4 +1,4 @@
-# Syntax reference — 0.23.0
+# Syntax reference — 0.24.0
 
 What the language accepts. The changelog at the end lists what changed in each published version; 0.17.0's changes are large, and its entry has a table of every old spelling and what to write instead.
 
@@ -59,7 +59,7 @@ What every statement of a kind has is positional; what is optional is a key. A w
 
 ### Names and words
 
-A name is unique across nodes, points, regions, lines and bundles. It may not contain `:`, which would make it a key, or `;`, which is reserved. A dot means a child: `server.docker` is inside `server`, and the parent must be declared first. Moving a node to another parent is a rename.
+A name is unique across nodes, points, regions, lines and bundles. It may not contain `:`, which would make it a key, `,`, which separates the items of a list, or `;`, which is reserved. A dot means a child: `server.docker` is inside `server`, and the parent must be declared first. Moving a node to another parent is a rename.
 
 Every word the language owns that has more than one part is hyphenated (`from-mark:`, `bottom-left`, `min-height:`, `align-children:`), while a phrase of separate words stays spaced (`left of`, `even with`). A name you choose should look chosen: the examples use underscores (`some_region`). `to_mark:` is refused by name, pointing to `to-mark:`.
 
@@ -1145,9 +1145,9 @@ A thing can have several links, written one after another, each with a name and
 
 ```
 node api "Orders API"
-  url: "https://app.datadoghq.com/…" (name: "Datadog", icon: "D" (fill: #632ca6, text: white))
+  url: "https://docs.example.com/orders" (name: "Docs", icon: "D" (fill: #3a6ea5, text: white))
        "https://github.com/…" (name: "GitHub", icon: gh)
-       "https://app.shortcut.com/…" (name: "Shortcut")
+       "https://wiki.example.com/orders" (name: "Wiki")
 ```
 
 - **`name:`** is what a reader is shown, in quotes. A link with none shows its site, such as `github.com`.
@@ -1203,7 +1203,7 @@ reladraw check diagram.reladraw
 | `--no-checks` | print no findings; errors still print |
 | `-v`, `--version` | print the version |
 
-`reladraw install-skill` installs the agent skill that came with this version of reladraw, by running `npx skills add` on it with `--copy`. What follows it goes to `skills`: `-g` to install for every project, `-a claude-code` for one agent.
+`reladraw install-skill` installs the agent skill that came with this version of reladraw, for every project, by running `npx skills add` on it with `--copy`. `--claude` installs it in `~/.claude/skills`, `--agents` in `~/.agents/skills` (Codex and others), and both may be given; with neither, it asks, or, with no terminal to ask in, refuses and names them. For any other agent it prints the `skills` command to run.
 
 The output is a standalone SVG: every picture is drawn into it as path data, never from a font or a linked file. A web page can draw a diagram in place with `<reladraw-diagram>`; see "In a web page" in the README.
 
@@ -1338,9 +1338,18 @@ Designed and absent from the code.
 
 Pre-1.0, so the minor number is where a breaking change goes. Every removal is refused by name with the replacement quoted, rather than dropped in silence: an older file stops with an error saying what to write instead.
 
+**0.24.0**
+
+- **`reladraw install-skill` installs for Claude Code, the `~/.agents` folder, or both, and asks which.** It used to pass everything on to `skills`, which, given no agent, put a copy in the folder of every agent it knows, more than fifty of them, and in the current project unless `-g` was written. It now always installs for every project, in the places `--claude` and `--agents` name; `-a` and the other `skills` options are refused with the `skills` command that does the same, and `-g` is still accepted.
+
+**0.23.1**
+
+- **`reladraw format` no longer fails on a comment between a placement and its bracket**, such as `right of a`, then `// why wide`, then `(gap: wide)` on lines of their own. It stopped with "Cannot read properties of undefined"; it now keeps the comment where it was. Reported in #22.
+- **A comma in a name is refused by name.** `node a,b` has been refused since 0.19.0, but the message said "a text is quoted — write "b" rather than b"; it now says a name may not contain a comma, because a comma separates the items of a list. Reported in #23.
+
 **0.23.0**
 
-- **A box or a line can have several links**, each with a name and a badge: `url: "https://github.com/…" (name: "GitHub", icon: "GH")  "https://app.datadoghq.com/…" (name: "Datadog")`. In an SVG a click follows the first and the tooltip lists them all. See [Destinations](#destinations).
+- **A box or a line can have several links**, each with a name and a badge: `url: "https://github.com/…" (name: "GitHub", icon: "GH")  "https://docs.example.com/…" (name: "Docs")`. In an SVG a click follows the first and the tooltip lists them all. See [Destinations](#destinations).
 - **A click on the page selects a box or a line.** The page made with `render --page` lights what feeds it in green and what it feeds in red, and a panel beside the drawing lists its links and the boxes at either end. A click no longer follows a link on the page; the panel does. See [A page for looking at a diagram](#a-page-for-looking-at-a-diagram).
 - **A line with no text can have a link.** It used to be refused as too thin to click; an unseen wider copy of the line now takes the click.
 - **A letter icon**: `icon gh  letters: "GH"  fill: #24292f  text: white` is a few letters in a circle, usable anywhere an icon is. See [Your own icons](#your-own-icons).
@@ -1386,6 +1395,7 @@ Pre-1.0, so the minor number is where a breaking change goes. Every removal is r
 
 - **`reladraw format`** lays a file out again: each statement on one line, neighboring statements with the same keyword lined up in columns, comments kept beside what they are about. No word is respelled, and the result is checked to draw what the original did. `--check` fails on a file that would change, and `.reladraw-format` holds a project's settings; `reladraw format --init` writes one with every setting explained. `reladraw format -` reads standard input and prints the result, for editors. A long statement can wrap past a width (`wrap-at`) or go one clause to a line (`clause-per-line-at`), and `clause-order` puts placements and keys in a chosen order. The playground has a Format button (Shift+Alt+F, undone with Ctrl+Z) and a panel for its settings, which can copy them as a `.reladraw-format`. Spacing inside a clause is evened out too: `gap:tight` becomes `gap: tight`, `( gap: tight )` becomes `(gap: tight)`. Prompted by #14, where a long statement was hard to read in a plain editor.
 - **A comma may touch the next word or stand apart from both.** `(corners: rounded,path: square)` used to be refused with "`corners` has no value", and `(at: start , above edge)` was refused in a text's bracket; both now read as `rounded, path:` and `start, above` do.
+- Breaking, and missing from this list when 0.19.0 shipped: a name may no longer contain `,`. `node a,b` used to declare a node called `a,b`; the comma now ends the name, so the file is refused. Added after the fact, from #23.
 - **The playground opens and saves `.reladraw` files**, with Open… and Save… above the source. Save suggests the name of the file last opened or saved; Chrome and Edge ask where to put it, other browsers save it with the downloads. Opening a file over edits that haven't been saved to one asks first.
 - **The playground's error message can be copied**, with a Copy button beside it or by selecting it. Only the underlined line number jumps to the line now; a click anywhere on the message used to, which took a selection away.
 - **The playground no longer fails on some diagrams with 0.18.0's shapes**, which stopped with "insidePolygon is not defined". The command line was unaffected.

package/dist/cli.js

@@ -19,7 +19,7 @@ const USAGE = `reladraw — draw a diagram from stated placement
   reladraw format <input.reladraw>... [--check]
   reladraw format - [--check]
   reladraw format --init
-  reladraw install-skill [skills options]
+  reladraw install-skill [--claude] [--agents]
 
   render      draw the diagram to an SVG, and print any findings: places
               where the picture, drawn as written, may not read as meant.
@@ -37,9 +37,10 @@ const USAGE = `reladraw — draw a diagram from stated placement
               default with what it does.
   install-skill
               install the agent skill that came with this version of
-              reladraw, so it teaches what this tool accepts. It runs
-              npx skills add with --copy, and passes on what follows:
-              -g for every project, -a claude-code for one agent.
+              reladraw, so it teaches what this tool accepts, for every
+              project: --claude in ~/.claude/skills, --agents in
+              ~/.agents/skills (Codex and others), or both. With neither,
+              it asks.
 
   -o, --out   where render writes the SVG. Defaults to the input path with
               its extension replaced by .svg. Use - for standard output.
@@ -62,17 +63,113 @@ const USAGE = `reladraw — draw a diagram from stated placement
 const COMMANDS = ['render', 'check', 'format', 'install-skill'];
 // The version of skills this was tried with, so a change there can't break it.
 const SKILLS_PACKAGE = 'skills@1.7.6';
+// The two places the skill is installed, each picked by its flag. skills
+// knows a folder by an agent that reads it: ~/.agents/skills is its "codex",
+// and other agents read it too. Left to itself, skills installs for every
+// agent it knows of, more than fifty, so the agents are always named.
+const SKILL_TARGETS = [
+    { flag: '--claude', agent: 'claude-code', label: 'Claude Code', dir: '~/.claude/skills' },
+    { flag: '--agents', agent: 'codex', label: 'Codex and others', dir: '~/.agents/skills' },
+];
+function ownVersion() {
+    // package.json ships beside dist/, so the number is the installed one.
+    return JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
+}
+// For any other agent, or a single project, skills is run by hand on this
+// install's skill, so it still matches this reladraw.
+function skillsCommand(skills, agent = '<agent>') {
+    const path = /\s/.test(skills) ? JSON.stringify(skills) : skills;
+    return `npx ${SKILLS_PACKAGE} add ${path} --copy -g -a ${agent}`;
+}
+const NAME_THE_TARGETS = SKILL_TARGETS.map((t) => `${t.flag} (${t.dir}, for ${t.label})`).join(', ') + ', or both';
+// In a terminal, a bare install-skill asks; otherwise, as when an agent runs
+// it, the flags must say, because there is no one to ask.
+async function askTargets(skills) {
+    const { createInterface } = await import('node:readline/promises');
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const closed = new Promise((done) => rl.once('close', () => done(undefined)));
+    const both = SKILL_TARGETS.length + 1;
+    process.stdout.write(`Install the reladraw ${ownVersion()} skill for which agents?\n` +
+        SKILL_TARGETS.map((t, i) => `  ${i + 1}  ${t.label.padEnd(17)} ${t.dir}\n`).join('') +
+        `  ${both}  both\n  ${both + 1}  another agent\n`);
+    try {
+        for (;;) {
+            const answer = await Promise.race([rl.question(`Choose [${both}]: `), closed]);
+            if (answer === undefined) {
+                process.stdout.write('\n');
+                return undefined;
+            }
+            const n = Number(answer.trim() || both);
+            if (n >= 1 && n <= SKILL_TARGETS.length)
+                return [SKILL_TARGETS[n - 1].agent];
+            if (n === both)
+                return SKILL_TARGETS.map((t) => t.agent);
+            if (n === both + 1)
+                return 'other';
+            process.stdout.write(`Type a number from 1 to ${both + 1}.\n`);
+        }
+    }
+    finally {
+        rl.close();
+    }
+}
 // The skill ships in the package beside dist/, as the one in the repository.
-// skills does the work of knowing where each agent keeps its skills; --copy
-// because an npx run leaves the package in a cache, where a link would break.
-function installSkill(args) {
+// skills does the work of copying it in; --copy because an npx run leaves the
+// package in a cache, where a link would break.
+async function installSkill(args) {
     const skills = fileURLToPath(new URL('../.claude/skills/', import.meta.url));
     if (!existsSync(skills)) {
         process.stderr.write(`reladraw: the skill isn't in this install of reladraw (looked in ${skills})\n`);
         return 1;
     }
+    let agents = [];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        const target = SKILL_TARGETS.find((t) => t.flag === arg);
+        if (target) {
+            if (!agents.includes(target.agent))
+                agents.push(target.agent);
+        }
+        else if (arg === '-g' || arg === '--global') {
+            // Always global now; skills from before 0.24 tell the user to write -g.
+        }
+        else if (arg === '-h' || arg === '--help') {
+            process.stdout.write(`reladraw install-skill [--claude] [--agents]\n\n` +
+                `Installs the skill that came with reladraw ${ownVersion()}, for every project:\n` +
+                SKILL_TARGETS.map((t) => `  ${t.flag.padEnd(9)} ${t.dir}, for ${t.label}\n`).join('') +
+                `With neither, it asks. For another agent, run:\n  ${skillsCommand(skills)}\n`);
+            return 0;
+        }
+        else if (arg === '-a' || arg === '--agent') {
+            const agent = args[i + 1];
+            process.stderr.write(`reladraw: install-skill takes ${NAME_THE_TARGETS}, not -a. ` +
+                `For ${agent ? `the agent ${agent}` : 'another agent'}, run:\n  ${skillsCommand(skills, agent)}\n`);
+            return 1;
+        }
+        else {
+            process.stderr.write(`reladraw: install-skill doesn't take ${arg}; it takes ${NAME_THE_TARGETS}. ` +
+                `For another agent, run:\n  ${skillsCommand(skills)}\n`);
+            return 1;
+        }
+    }
+    if (agents.length === 0) {
+        if (!process.stdin.isTTY || !process.stdout.isTTY) {
+            process.stderr.write(`reladraw: say which agents to install the skill for: ${NAME_THE_TARGETS}. ` +
+                `For another agent, run:\n  ${skillsCommand(skills)}\n`);
+            return 1;
+        }
+        const picked = await askTargets(skills);
+        if (picked === undefined)
+            return 1;
+        if (picked === 'other') {
+            process.stdout.write(`For another agent, run this, with its name from skills' list:\n  ${skillsCommand(skills)}\n`);
+            return 0;
+        }
+        agents = picked;
+    }
     const windows = process.platform === 'win32';
-    const command = [SKILLS_PACKAGE, 'add', skills, '--copy', ...args];
+    // -y because the choice is already made; skills would otherwise ask again.
+    const command = [SKILLS_PACKAGE, 'add', skills, '--copy', '-g', '-y', '-a', ...agents];
     // On Windows npx is a .cmd, which Node runs only through a shell.
     const result = spawnSync(windows ? 'npx.cmd' : 'npx', windows ? command.map((a) => `"${a}"`) : command, {
         stdio: 'inherit',
@@ -85,7 +182,7 @@ function installSkill(args) {
     return result.status ?? 1;
 }
 async function main(argv) {
-    // Everything after install-skill is for skills, -h and -v included.
+    // install-skill reads its own flags, -h included.
     if (argv[0] === 'install-skill')
         return installSkill(argv.slice(1));
     if (argv.length === 0 || argv.includes('-h') || argv.includes('--help')) {
@@ -93,9 +190,7 @@ async function main(argv) {
         return argv.length === 0 ? 1 : 0;
     }
     if (argv.includes('-v') || argv.includes('--version')) {
-        // package.json ships beside dist/, so the number is the installed one.
-        const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
-        process.stdout.write(`${pkg.version}\n`);
+        process.stdout.write(`${ownVersion()}\n`);
         return 0;
     }
     const verb = argv[0];
@@ -420,7 +515,7 @@ function nearestSettings(folder, found) {
 // The exit code is set, not exited with: process.exit ends the process at
 // once, and a write to a pipe that hasn't drained yet is lost, which cut
 // `format -` and `render -o -` off at 64 KB. Node exits on its own once the
-// output is written. `./dev.sh pipe` checks it.
+// output is written.
 main(process.argv.slice(2)).then((code) => {
     process.exitCode = code;
 }, (error) => {

package/dist/constants.d.ts

@@ -93,7 +93,7 @@ export declare const DEFAULT_FONT_SIZE = 14;
  * `small` is sampled rather than chosen. In
  * `examples/reference/arch.png` the box and container texts run 25
  * pixels baseline to baseline and every annotation runs 21, which is this
- * ratio; `./dev.sh textrows` is how that was read off. `large` is the same step
+ * ratio. `large` is the same step
  * taken the other way, so the scale is symmetric about the document size.
  */
 export declare const TEXT_SIZES: Record<string, number>;

package/dist/constants.js

@@ -111,7 +111,7 @@ export const DEFAULT_FONT_SIZE = 14;
  * `small` is sampled rather than chosen. In
  * `examples/reference/arch.png` the box and container texts run 25
  * pixels baseline to baseline and every annotation runs 21, which is this
- * ratio; `./dev.sh textrows` is how that was read off. `large` is the same step
+ * ratio. `large` is the same step
  * taken the other way, so the scale is symmetric about the document size.
  */
 export const TEXT_SIZES = {

package/dist/format.js

@@ -216,9 +216,11 @@ function clauseRuns(tokens, starts) {
     let inKey = false;
     for (const entry of tokens) {
         const { token } = entry;
-        const opens = depth === 0 &&
-            token.text !== '(' &&
-            (starts.has(token) || (token.quoted && !inKey) || runs.length === 0);
+        // A continued line can begin with a bracket, the one that belongs to a
+        // placement on the line before (a comment may sit between them), so the
+        // first token always opens a run, bracket or not.
+        const opens = runs.length === 0 ||
+            (depth === 0 && token.text !== '(' && (starts.has(token) || (token.quoted && !inKey)));
         if (opens) {
             runs.push([entry]);
             inKey = isAttrKey(token);

package/dist/parser.js

@@ -1231,7 +1231,7 @@ function takeTitlePlacements(tokens, open, subject, line) {
  * is the text.
  */
 function parseNode(head, line) {
-    const name = requireName(head[1], 'node', line);
+    const name = requireName(head[1], 'node', line, head[2]);
     const written = head[2];
     const textToken = written?.quoted ? written : undefined;
     // A bare word here is a text somebody forgot to quote far more often than
@@ -1727,7 +1727,7 @@ function parseGuide(head, line) {
  * between two boxes, which copies of one line share.
  */
 function parseBundle(head, line) {
-    const name = requireName(head[1], 'bundle', line);
+    const name = requireName(head[1], 'bundle', line, head[2]);
     const subject = `bundle "${name}"`;
     const attrs = {};
     let via;
@@ -1838,7 +1838,7 @@ function parseBundle(head, line) {
 }
 /** `point funnel  between c2 and api at 2/3` */
 function parsePoint(head, line) {
-    const name = requireName(head[1], 'point', line);
+    const name = requireName(head[1], 'point', line, head[2]);
     const subject = `point "${name}"`;
     const marked = readMarkText(head, 'point', subject, line);
     head = marked.tokens;
@@ -1857,7 +1857,7 @@ function parsePoint(head, line) {
 }
 /** `region r  c bottom-left to d top-right`, or `region r  between a and b (span: both)` */
 function parseRegion(head, line) {
-    const name = requireName(head[1], 'region', line);
+    const name = requireName(head[1], 'region', line, head[2]);
     const subject = `region "${name}"`;
     const marked = readMarkText(head, 'region', subject, line);
     head = marked.tokens;
@@ -1904,7 +1904,7 @@ function refuseKeys(attrs, keys, subject, what, line) {
 }
 /** `style <name> <attributes>` */
 function parseStyle(head, line) {
-    const name = requireName(head[1], 'style', line);
+    const name = requireName(head[1], 'style', line, head[2]);
     const attrs = attrsOnly(head, 2, line, `style "${name}"`);
     if (Object.keys(attrs).length === 0) {
         throw new SourceError(`style "${name}" sets nothing`, line);
@@ -1960,7 +1960,7 @@ function readLetterIcon(head, start, name, line) {
  * resolved, since only the caller knows whether files can be read at all.
  */
 function parseIcon(head, line) {
-    const name = requireName(head[1], 'icon', line);
+    const name = requireName(head[1], 'icon', line, head[2]);
     const picture = head[2];
     if (picture !== undefined && isAttrKey(picture) && picture.text === 'letters:') {
         return { kind: 'icon', name, source: '', pasted: false, letters: readLetterIcon(head, 2, name, line), line };
@@ -2089,11 +2089,18 @@ function defaultRefusal(kind, key) {
     }
     return `which a default does not set — ${takes}`;
 }
-function requireName(token, keyword, line) {
+function requireName(token, keyword, line, next) {
     if (!token || token.quoted) {
         throw new SourceError(`${keyword} needs a name`, line);
     }
     refuseNameMark(token, `${keyword} "${token.joined ?? token.text}"`, line);
+    // A comma separates the items of a list (0.19.0), so `node a,b` reads as
+    // the name `a` and a stray `b`. Say so, rather than whatever `b` turns into.
+    if (token.text.endsWith(',')) {
+        const touching = next && !next.quoted && next.start !== undefined && next.start === token.end;
+        const written = touching ? `${token.text}${next.text}` : token.text;
+        throw new SourceError(`${keyword} "${written}": a name may not contain ",", because a comma separates the items of a list`, line);
+    }
     return token.text;
 }
 /**

package/dist/search.d.ts

@@ -0,0 +1,104 @@
+/**
+ * Finding a line's way through the open space between boxes.
+ *
+ * Every box is a wall. A line may turn only where two tracks cross, and the
+ * tracks are few: a line a little way out from each side of each wall, one
+ * down the middle of each gap between walls, and the lines through the two
+ * ends. That is the whole of the open space a right-angled line ever needs,
+ * reduced to a grid of a few hundred points for a diagram of ordinary size.
+ *
+ * The line leaves its start heading straight out and arrives at its end heading
+ * straight in, with a straight stretch at each end at least `stub` long, so an
+ * arrowhead always lands on a straight piece. Between those two stretches it
+ * takes the cheapest way through the grid, where cost is length plus a charge
+ * for every turn and for every line already placed that it crosses. On a
+ * right-angled grid many ways tie on length — a staircase is exactly as long as
+ * one bend — and the turn charge breaks those ties toward the fewest bends,
+ * which is the line a person would draw. What still ties after that goes over
+ * the top rather than under, and round the right rather than the left.
+ *
+ * A way through a box is not a losing option here. It is not a way at all.
+ */
+export interface SearchPoint {
+    x: number;
+    y: number;
+}
+/** A box the line may not enter, as its extent. Touching its border is allowed. */
+export interface SearchWall {
+    minX: number;
+    minY: number;
+    maxX: number;
+    maxY: number;
+}
+/** One end of the line: a point on a box's side, and the unit direction out of it. */
+export interface SearchEnd {
+    x: number;
+    y: number;
+    dx: number;
+    dy: number;
+}
+export interface SearchOptions {
+    /** How far the line runs straight out of each end before it may turn. */
+    stub: number;
+    /** How far outside a wall a track runs beside it, where there is room. */
+    clear: number;
+    /** What a turn costs, in the same units as length. */
+    turn: number;
+    /**
+     * Walls the stretches at the two ends may pass through: the line's own boxes,
+     * which it has to cross the margin of to leave, and any box holding an end.
+     */
+    ownStart: SearchWall[];
+    ownEnd: SearchWall[];
+    /**
+     * Lines already placed. A line may cross one but not run along it within
+     * `lane` of it; tracks are added a lane either side of each, so a later line
+     * sharing a stretch takes the next lane out.
+     */
+    taken: SearchPoint[][];
+    lane: number;
+    /**
+     * For each line in `taken`, for each of its stretches, half the depth across
+     * it of a text riding there, and 0 where none does. A line running beside a
+     * stretch carrying a text keeps clear of the text, not just of the line.
+     */
+    takenHalves?: number[][];
+    /**
+     * A gap the line must pass through: somewhere it crosses the line at `at`
+     * on the `run` axis, travelling along `run`, at a level between `lo` and `hi`.
+     */
+    gate?: SearchGate;
+    /**
+     * Half the depth of this line's own text, which rides in the gate: inside it,
+     * the line keeps that much further from the lines beside it.
+     */
+    ownHalf?: number;
+    /**
+     * How far the line may go at all: the diagram with room round it. A wall
+     * reaching past this — a clause's fence, which runs to the edge of the page —
+     * cannot be gone round at its far end.
+     */
+    bounds?: SearchWall;
+    /**
+     * A cost the line is no use at unless it comes in under: the cheapest way
+     * already found between another pair of sides. The search gives up as soon
+     * as it cannot.
+     */
+    limit?: number;
+}
+/** A gap a line must pass through. See `SearchOptions.gate`. */
+export interface SearchGate {
+    run: 'x' | 'y';
+    at: number;
+    lo: number;
+    hi: number;
+}
+export interface SearchResult {
+    points: SearchPoint[];
+    cost: number;
+}
+/**
+ * The cheapest right-angled line from `start` to `end` that enters no wall, or
+ * undefined when there is none.
+ */
+export declare function searchRoute(start: SearchEnd, end: SearchEnd, walls: SearchWall[], options: SearchOptions): SearchResult | undefined;

package/dist/search.js

@@ -0,0 +1,490 @@
+/**
+ * Finding a line's way through the open space between boxes.
+ *
+ * Every box is a wall. A line may turn only where two tracks cross, and the
+ * tracks are few: a line a little way out from each side of each wall, one
+ * down the middle of each gap between walls, and the lines through the two
+ * ends. That is the whole of the open space a right-angled line ever needs,
+ * reduced to a grid of a few hundred points for a diagram of ordinary size.
+ *
+ * The line leaves its start heading straight out and arrives at its end heading
+ * straight in, with a straight stretch at each end at least `stub` long, so an
+ * arrowhead always lands on a straight piece. Between those two stretches it
+ * takes the cheapest way through the grid, where cost is length plus a charge
+ * for every turn and for every line already placed that it crosses. On a
+ * right-angled grid many ways tie on length — a staircase is exactly as long as
+ * one bend — and the turn charge breaks those ties toward the fewest bends,
+ * which is the line a person would draw. What still ties after that goes over
+ * the top rather than under, and round the right rather than the left.
+ *
+ * A way through a box is not a losing option here. It is not a way at all.
+ */
+/**
+ * The cheapest right-angled line from `start` to `end` that enters no wall, or
+ * undefined when there is none.
+ */
+export function searchRoute(start, end, walls, options) {
+    const { clear, turn } = options;
+    // The stretches at the ends are fixed. Each crosses its own box's margin and
+    // runs `stub` further, or, where another box is closer than that, stops in
+    // the middle of the gap between the two margins: a node placed a `tight` gap
+    // away still leaves room to get out.
+    const others = (own) => walls.filter((wall) => !own.includes(wall));
+    const reach = (from, own) => {
+        const exit = Math.max(0, ...own.map((wall) => depth(from, wall)));
+        const wanted = Math.max(options.stub, exit + 1);
+        const hit = Math.min(Infinity, ...others(own).map((wall) => distanceTo(from, wall, wanted)));
+        const length = hit >= wanted ? wanted : (exit + hit) / 2;
+        if (length <= exit)
+            return undefined;
+        return { x: snap(from.x + from.dx * length), y: snap(from.y + from.dy * length) };
+    };
+    const out = reach(start, options.ownStart);
+    const back = reach(end, options.ownEnd);
+    if (!out || !back)
+        return undefined;
+    if (inside(out, walls) || inside(back, walls))
+        return undefined;
+    // No way between the two is shorter than straight across and straight down.
+    const limit = options.limit ?? Infinity;
+    if (Math.abs(back.x - out.x) + Math.abs(back.y - out.y) - 1e-6 >= limit)
+        return undefined;
+    const bounds = options.bounds;
+    const gate = options.gate;
+    // How far a stretch keeps from a placed one beside it: a lane, or clear of
+    // the text either of them carries there.
+    const halves = options.takenHalves ?? [];
+    const ownHalf = options.ownHalf ?? 0;
+    const inGate = (a, b) => {
+        if (!gate)
+            return false;
+        const along = gate.run === 'x' ? Math.abs(a.y - b.y) < 0.5 : Math.abs(a.x - b.x) < 0.5;
+        const level = gate.run === 'x' ? a.y : a.x;
+        return along && level > gate.lo && level < gate.hi;
+    };
+    const spacing = (line, stretch, own) => Math.max(options.lane, (halves[line]?.[stretch] ?? 0) + own);
+    const gateTracks = (axis) => !gate ? [] : axis === gate.run ? [gate.at] : [(gate.lo + gate.hi) / 2];
+    const xs = tracks(walls, 'x', clear, [out.x, back.x, ...gateTracks('x')], options.taken, spacing, ownHalf)
+        .filter((x) => !bounds || (x >= bounds.minX && x <= bounds.maxX) || x === out.x || x === back.x);
+    const ys = tracks(walls, 'y', clear, [out.y, back.y, ...gateTracks('y')], options.taken, spacing, ownHalf)
+        .filter((y) => !bounds || (y >= bounds.minY && y <= bounds.maxY) || y === out.y || y === back.y);
+    const ix = new Map(xs.map((x, index) => [x, index]));
+    const iy = new Map(ys.map((y, index) => [y, index]));
+    const width = xs.length;
+    const height = ys.length;
+    const steps = stepTable(xs, ys, walls, clear, options.taken, spacing, ownHalf, (a, b) => (inGate(a, b) ? ownHalf : 0));
+    const open = (i, j) => steps.open[j * width + i] === 1;
+    // Four headings: 0 right, 1 down, 2 left, 3 up.
+    const STEP = [
+        [1, 0],
+        [0, 1],
+        [-1, 0],
+        [0, -1],
+    ];
+    const heading = (dx, dy) => (dx > 0 ? 0 : dy > 0 ? 1 : dx < 0 ? 2 : 3);
+    const first = heading(start.dx, start.dy);
+    // The last stretch travels into the end, against the way its side faces.
+    const last = heading(-end.dx, -end.dy);
+    const si = ix.get(out.x);
+    const sj = iy.get(out.y);
+    const ti = ix.get(back.x);
+    const tj = iy.get(back.y);
+    // Cost is compared first on length and turns, then on a tie-break that
+    // prefers a stretch higher up the page, or further right, so that of two
+    // ways round that are exactly as long the line goes over the top. A state
+    // also records whether the line has passed its gate yet; it may only finish
+    // once it has.
+    const size = width * height * 8;
+    const cost = new Float64Array(size).fill(Infinity);
+    const tie = new Float64Array(size).fill(Infinity);
+    const from = new Int32Array(size).fill(-1);
+    const state = (i, j, h, p) => ((j * width + i) * 4 + h) * 2 + p;
+    const done = gate ? 1 : 0;
+    // The search reaches out toward the end first: a state waits by what it has
+    // cost so far plus the least the rest could cost, straight across and
+    // straight down to the end. It does not settle each state once, since a
+    // way just as long can arrive later with a better tie-break; it keeps on
+    // until nothing waiting could come in as cheap as the end already has, and
+    // what it finds is exactly what searching every direction alike would.
+    // Until the line has passed its gate, that is by way of the gate.
+    const toGo = (current) => {
+        const cell = (current - (current % 8)) / 8;
+        const i = cell % width;
+        const point = { x: xs[i], y: ys[(cell - i) / width] };
+        return leastLength(point, back, current % 2 === 1 ? undefined : gate);
+    };
+    const heap = new MinHeap();
+    const begin = state(si, sj, first, 0);
+    const goal = state(ti, tj, last, done);
+    cost[begin] = 0;
+    tie[begin] = 0;
+    heap.push(begin, toGo(begin), 0);
+    while (heap.size > 0) {
+        const [current, f, t] = heap.pop();
+        const c = cost[current];
+        const due = c + toGo(current);
+        if (f > due || (f === due && t > tie[current]))
+            continue;
+        // Everything still waiting costs at least this much.
+        if (f >= limit || f > cost[goal] + 1e-9)
+            break;
+        const p = current % 2;
+        const rest = (current - p) / 2;
+        const h = rest % 4;
+        const cell = (rest - h) / 4;
+        const i = cell % width;
+        const j = (cell - i) / width;
+        if (current === goal)
+            continue;
+        for (let next = 0; next < 4; next += 1) {
+            // A line never doubles straight back on itself.
+            if ((next + 2) % 4 === h)
+                continue;
+            if (next !== h) {
+                // Turning on the spot costs a turn and moves nowhere.
+                relax(current, state(i, j, next, p), c + turn, t);
+                continue;
+            }
+            const ni = i + STEP[next][0];
+            const nj = j + STEP[next][1];
+            if (ni < 0 || nj < 0 || ni >= width || nj >= height || !open(ni, nj))
+                continue;
+            // A step is filed under the point it starts from on its way right or down.
+            const axis = next % 2;
+            const key = next < 2 ? j * width + i : nj * width + ni;
+            if (steps.closed[axis][key] === 1)
+                continue;
+            const a = { x: xs[i], y: ys[j] };
+            const b = { x: xs[ni], y: ys[nj] };
+            // Passing the gate: a stretch through it, reaching the line at `at`.
+            const through = inGate(a, b) &&
+                Math.min(gate.run === 'x' ? a.x : a.y, gate.run === 'x' ? b.x : b.y) <= gate.at + 0.01 &&
+                Math.max(gate.run === 'x' ? a.x : a.y, gate.run === 'x' ? b.x : b.y) >= gate.at - 0.01;
+            const np = p === 1 || through ? 1 : 0;
+            // Running closer to a wall than `clear` counts double: the line may pass
+            // a narrow gap, but where there is room it keeps its distance. Crossing a
+            // line already placed costs what a turn does, so of two ways much the
+            // same length the one that crosses nothing wins.
+            const length = Math.abs(b.x - a.x) + Math.abs(b.y - a.y) + steps.crowd[axis][key] +
+                turn * steps.cross[axis][key];
+            // Higher up for a stretch across, further right for one down: a smaller
+            // tie-break is preferred, so the across level counts as it is and the
+            // down level counts negated.
+            const lean = next % 2 === 0 ? a.y * length : -a.x * length;
+            relax(current, state(ni, nj, next, np), c + length, t + lean);
+        }
+    }
+    if (!(cost[goal] < limit))
+        return undefined;
+    function relax(previous, next, c, t) {
+        if (c < cost[next] - 1e-9 || (Math.abs(c - cost[next]) <= 1e-9 && t < tie[next])) {
+            cost[next] = c;
+            tie[next] = t;
+            from[next] = previous;
+            heap.push(next, c + toGo(next), t);
+        }
+    }
+    const path = [];
+    for (let at = goal; at >= 0; at = from[at]) {
+        const rest = (at - (at % 2)) / 2;
+        const cell = (rest - (rest % 4)) / 4;
+        const i = cell % width;
+        const j = (cell - i) / width;
+        const point = { x: xs[i], y: ys[j] };
+        const previous = path[path.length - 1];
+        if (!previous || previous.x !== point.x || previous.y !== point.y)
+            path.push(point);
+    }
+    path.reverse();
+    return { points: straightRuns([start, ...path, end]), cost: cost[goal] };
+}
+/**
+ * The shortest a right-angled line from `a` to `b` could be: straight across
+ * and straight down, or with a gate, across to its line at `at` and to a
+ * level within it on the way.
+ */
+function leastLength(a, b, gate) {
+    if (!gate)
+        return Math.abs(a.x - b.x) + Math.abs(a.y - b.y);
+    const [u, v, bu, bv] = gate.run === 'x' ? [a.x, a.y, b.x, b.y] : [a.y, a.x, b.y, b.x];
+    const off = Math.max(0, gate.lo - Math.max(v, bv), Math.min(v, bv) - gate.hi);
+    return Math.abs(u - gate.at) + Math.abs(gate.at - bu) + Math.abs(v - bv) + 2 * off;
+}
+/**
+ * The tracks on one axis: beside each wall at `clear` where that is open,
+ * down the middle of every gap between walls, through the ends, and a lane
+ * either side of each line already placed — a wider one where a text rides,
+ * and wider again by `own` for this line's own text.
+ */
+function tracks(walls, axis, clear, ends, taken, spacing, own) {
+    const lo = (wall) => (axis === 'x' ? wall.minX : wall.minY);
+    const hi = (wall) => (axis === 'x' ? wall.maxX : wall.maxY);
+    // The other axis, to tell a real gap — two walls facing each other across
+    // it — from two edges that merely happen to lie near each other on this one.
+    const olo = (wall) => (axis === 'x' ? wall.minY : wall.minX);
+    const ohi = (wall) => (axis === 'x' ? wall.maxY : wall.maxX);
+    const found = new Set(ends);
+    for (const wall of walls) {
+        found.add(lo(wall) - clear);
+        found.add(hi(wall) + clear);
+    }
+    for (const a of walls) {
+        for (const b of walls) {
+            if (hi(a) < lo(b) && olo(a) < ohi(b) && olo(b) < ohi(a))
+                found.add((hi(a) + lo(b)) / 2);
+        }
+    }
+    taken.forEach((line, which) => {
+        for (let index = 0; index + 1 < line.length; index += 1) {
+            const [a, b] = [line[index], line[index + 1]];
+            // A stretch across sits at a level on y; one down, at a level on x.
+            const across = Math.abs(a.y - b.y) < 0.5;
+            if ((axis === 'y') !== across)
+                continue;
+            // A lane either side of a placed line. One that runs close beside a box
+            // is paid for as crowding, like any other track.
+            const level = axis === 'y' ? a.y : a.x;
+            for (const by of new Set([spacing(which, index, 0), spacing(which, index, own)])) {
+                found.add(level - by);
+                found.add(level + by);
+            }
+        }
+    });
+    return [...new Set([...found].map(snap))].sort((p, q) => p - q);
+}
+/** Coordinates to a hundredth, so a track and the end it runs through compare equal. */
+function snap(value) {
+    return Math.round(value * 100) / 100;
+}
+/** How far along its heading an end runs before it leaves a wall it starts inside; 0 if it is outside. */
+function depth(from, wall) {
+    if (!(from.x >= wall.minX && from.x <= wall.maxX && from.y >= wall.minY && from.y <= wall.maxY))
+        return 0;
+    if (from.dx > 0)
+        return wall.maxX - from.x;
+    if (from.dx < 0)
+        return from.x - wall.minX;
+    if (from.dy > 0)
+        return wall.maxY - from.y;
+    return from.y - wall.minY;
+}
+/**
+ * How far along its heading an end runs before it meets a wall it is outside
+ * of, looking no further than `limit`; Infinity if it meets none.
+ */
+function distanceTo(from, wall, limit) {
+    const tip = { x: from.x + from.dx * limit, y: from.y + from.dy * limit };
+    if (!blocked(from, tip, [wall]))
+        return Infinity;
+    if (from.dx > 0)
+        return wall.minX - from.x;
+    if (from.dx < 0)
+        return from.x - wall.maxX;
+    if (from.dy > 0)
+        return wall.minY - from.y;
+    return from.y - wall.maxY;
+}
+/** Whether a point lies strictly inside any wall. */
+function inside(point, walls) {
+    return walls.some((wall) => point.x > wall.minX && point.x < wall.maxX && point.y > wall.minY && point.y < wall.maxY);
+}
+/** Whether a level or upright stretch passes through the inside of any wall. */
+function blocked(a, b, walls) {
+    return walls.some((wall) => blocks(a, b, wall));
+}
+/** Whether a level or upright stretch passes through the inside of one wall. */
+function blocks(a, b, wall) {
+    const minX = Math.min(a.x, b.x);
+    const maxX = Math.max(a.x, b.x);
+    const minY = Math.min(a.y, b.y);
+    const maxY = Math.max(a.y, b.y);
+    if (minY === maxY)
+        return minY > wall.minY && minY < wall.maxY && maxX > wall.minX && minX < wall.maxX;
+    return minX > wall.minX && minX < wall.maxX && maxY > wall.minY && minY < wall.maxY;
+}
+/**
+ * Every single step through the grid — from a point to its neighbor on the
+ * right, or the one below — and what it costs beyond its length: whether it is
+ * closed, by a wall or by running along a placed line; how far it runs close
+ * beside a wall; how many placed lines it crosses. The search takes each step
+ * many times over, once for each heading it arrives with, so these are worked
+ * out here once, and each wall and each placed stretch is tested only against
+ * the steps that lie near it. A step is filed at the index of the point it
+ * starts from: `[0]` the step right, `[1]` the step down.
+ */
+function stepTable(xs, ys, walls, clear, taken, spacing, widest, ownAt) {
+    const width = xs.length;
+    const height = ys.length;
+    const cells = width * height;
+    const open = new Uint8Array(cells).fill(1);
+    const closed = [new Uint8Array(cells), new Uint8Array(cells)];
+    const crowd = [new Float64Array(cells), new Float64Array(cells)];
+    const cross = [new Int32Array(cells), new Int32Array(cells)];
+    // The indices of the tracks lying within `lo`..`hi`, with one to spare either
+    // side: a range to test exactly, never a test itself.
+    const near = (values, lo, hi) => [Math.max(0, firstAtLeast(values, lo) - 1), Math.min(values.length - 1, firstAtLeast(values, hi) + 1)];
+    const each = ([i0, i1], [j0, j1], visit) => {
+        for (let j = j0; j <= j1; j += 1) {
+            for (let i = i0; i <= i1; i += 1) {
+                const a = { x: xs[i], y: ys[j] };
+                if (i + 1 < width)
+                    visit(0, a, { x: xs[i + 1], y: ys[j] }, j * width + i);
+                if (j + 1 < height)
+                    visit(1, a, { x: xs[i], y: ys[j + 1] }, j * width + i);
+            }
+        }
+    };
+    for (const wall of walls) {
+        const [i0, i1] = near(xs, wall.minX, wall.maxX);
+        const [j0, j1] = near(ys, wall.minY, wall.maxY);
+        for (let j = j0; j <= j1; j += 1) {
+            for (let i = i0; i <= i1; i += 1) {
+                const x = xs[i];
+                const y = ys[j];
+                if (x > wall.minX && x < wall.maxX && y > wall.minY && y < wall.maxY)
+                    open[j * width + i] = 0;
+            }
+        }
+        each([i0, i1], [j0, j1], (axis, a, b, key) => {
+            if (blocks(a, b, wall))
+                closed[axis][key] = 1;
+        });
+        each(near(xs, wall.minX - clear, wall.maxX + clear), near(ys, wall.minY - clear, wall.maxY + clear), (axis, a, b, key) => {
+            crowd[axis][key] = Math.max(crowd[axis][key], crowding(a, b, wall, clear));
+        });
+    }
+    taken.forEach((line, which) => {
+        for (let index = 0; index + 1 < line.length; index += 1) {
+            const [p, q] = [line[index], line[index + 1]];
+            const reach = spacing(which, index, widest);
+            const xr = near(xs, Math.min(p.x, q.x) - reach, Math.max(p.x, q.x) + reach);
+            const yr = near(ys, Math.min(p.y, q.y) - reach, Math.max(p.y, q.y) + reach);
+            each(xr, yr, (axis, a, b, key) => {
+                if (runsAlong(a, b, p, q, spacing(which, index, ownAt(a, b))))
+                    closed[axis][key] = 1;
+                if (crosses(a, b, p, q))
+                    cross[axis][key] = cross[axis][key] + 1;
+            });
+        }
+    });
+    return { open, closed, crowd, cross };
+}
+/** The index of the first of the sorted values at least `value`, or their count if none is. */
+function firstAtLeast(values, value) {
+    let lo = 0;
+    let hi = values.length;
+    while (lo < hi) {
+        const mid = (lo + hi) >> 1;
+        if (values[mid] < value)
+            lo = mid + 1;
+        else
+            hi = mid;
+    }
+    return lo;
+}
+/** How much of a stretch runs within `clear` of one wall's side, alongside it; 0 if none does. */
+function crowding(a, b, wall, clear) {
+    const across = Math.abs(a.y - b.y) < 0.5;
+    const level = across ? a.y : a.x;
+    const from = across ? Math.min(a.x, b.x) : Math.min(a.y, b.y);
+    const to = across ? Math.max(a.x, b.x) : Math.max(a.y, b.y);
+    const [lo, hi] = across ? [wall.minY, wall.maxY] : [wall.minX, wall.maxX];
+    const [alo, ahi] = across ? [wall.minX, wall.maxX] : [wall.minY, wall.maxY];
+    const near = (level > lo - clear + 0.01 && level <= lo) || (level >= hi && level < hi + clear - 0.01);
+    return near ? Math.max(0, Math.min(to, ahi) - Math.max(from, alo)) : 0;
+}
+/**
+ * Whether a stretch runs along one stretch of a placed line, for any distance,
+ * closer than `spacing`: a lane, or clear of a text either carries.
+ */
+function runsAlong(a, b, p, q, spacing) {
+    const across = Math.abs(a.y - b.y) < 0.5;
+    if ((Math.abs(p.y - q.y) < 0.5) !== across)
+        return false;
+    const level = across ? a.y : a.x;
+    const other = across ? p.y : p.x;
+    if (Math.abs(other - level) >= spacing - 0.5)
+        return false;
+    const lo = across ? Math.min(a.x, b.x) : Math.min(a.y, b.y);
+    const hi = across ? Math.max(a.x, b.x) : Math.max(a.y, b.y);
+    const pLo = across ? Math.min(p.x, q.x) : Math.min(p.y, q.y);
+    const pHi = across ? Math.max(p.x, q.x) : Math.max(p.y, q.y);
+    return Math.min(hi, pHi) - Math.max(lo, pLo) > 0.5;
+}
+/** Whether a stretch crosses one stretch of a placed line square on, touching neither end of either. */
+function crosses(a, b, p, q) {
+    const across = Math.abs(a.y - b.y) < 0.5;
+    if ((Math.abs(p.y - q.y) < 0.5) === across)
+        return false;
+    const level = across ? a.y : a.x;
+    const lo = across ? Math.min(a.x, b.x) : Math.min(a.y, b.y);
+    const hi = across ? Math.max(a.x, b.x) : Math.max(a.y, b.y);
+    const at = across ? p.x : p.y;
+    const pLo = across ? Math.min(p.y, q.y) : Math.min(p.x, q.x);
+    const pHi = across ? Math.max(p.y, q.y) : Math.max(p.x, q.x);
+    return at > lo + 0.5 && at < hi - 0.5 && level > pLo + 0.5 && level < pHi - 0.5;
+}
+/** The points with every one dropped that sits on a straight run between its neighbors. */
+function straightRuns(points) {
+    const kept = [];
+    for (const point of points) {
+        const previous = kept[kept.length - 1];
+        if (previous && Math.abs(previous.x - point.x) < 0.01 && Math.abs(previous.y - point.y) < 0.01)
+            continue;
+        kept.push(point);
+        while (kept.length >= 3) {
+            const [a, b, c] = kept.slice(-3);
+            const level = Math.abs(a.y - b.y) < 0.01 && Math.abs(b.y - c.y) < 0.01;
+            const upright = Math.abs(a.x - b.x) < 0.01 && Math.abs(b.x - c.x) < 0.01;
+            if (!level && !upright)
+                break;
+            kept.splice(kept.length - 2, 1);
+        }
+    }
+    return kept;
+}
+/** A binary heap of states, cheapest first, ties broken by the second cost. */
+class MinHeap {
+    items = [];
+    get size() {
+        return this.items.length;
+    }
+    push(state, cost, tie) {
+        const items = this.items;
+        items.push([state, cost, tie]);
+        let at = items.length - 1;
+        while (at > 0) {
+            const parent = (at - 1) >> 1;
+            if (!before(items[at], items[parent]))
+                break;
+            [items[at], items[parent]] = [items[parent], items[at]];
+            at = parent;
+        }
+    }
+    pop() {
+        const items = this.items;
+        const top = items[0];
+        const tail = items.pop();
+        if (items.length > 0) {
+            items[0] = tail;
+            let at = 0;
+            for (;;) {
+                const left = at * 2 + 1;
+                const right = left + 1;
+                let best = at;
+                if (left < items.length && before(items[left], items[best]))
+                    best = left;
+                if (right < items.length && before(items[right], items[best]))
+                    best = right;
+                if (best === at)
+                    break;
+                [items[at], items[best]] = [items[best], items[at]];
+                at = best;
+            }
+        }
+        return top;
+    }
+}
+function before(p, q) {
+    return p[1] < q[1] - 1e-9 || (Math.abs(p[1] - q[1]) <= 1e-9 && p[2] < q[2]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reladraw",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "A diagram language where you say where things go.",
   "type": "module",
   "bin": {
@@ -35,7 +35,6 @@
   "scripts": {
     "build": "tsc && tsc -p tsconfig.element.json",
     "prepublishOnly": "npm run build",
-    "preversion": "./dev.sh check-version \"$npm_new_version\"",
     "dev": "tsc --watch",
     "example": "npm run build && node dist/cli.js render examples/arch.reladraw -o examples/out/arch.svg"
   },