@rohal12/spindle 0.57.0 → 0.59.0

package/dist/pkg/story-variables.js

@@ -1,12 +1,39 @@
-//#region src/markup/spindle.peggy
-var LB = String.fromCharCode(123);
-var RB = String.fromCharCode(125);
-var SIGIL_SCOPES$1 = {
+//#region src/markup/tokens.ts
+/** Variable sigils: story ($), temporary (_), local (@), transient (%). */
+var SIGIL_SCOPES = {
 	$: "variable",
 	_: "temporary",
 	"@": "local",
 	"%": "transient"
 };
+Object.fromEntries(Object.entries(SIGIL_SCOPES).map(([sigil, scope]) => [scope, sigil]));
+var SIGIL_CHARS = new Set(Object.keys(SIGIL_SCOPES));
+/** Whether `c` is a variable sigil. */
+function isSigil(c) {
+	return c !== void 0 && SIGIL_CHARS.has(c);
+}
+/** Copy the selectors set in `from` onto `target`, and return it. */
+function withSelectors$1(target, from) {
+	if (from.className) target.className = from.className;
+	if (from.id) target.id = from.id;
+	return target;
+}
+//#endregion
+//#region src/markup/grammar-shared.ts
+/**
+* What the grammar (spindle.peggy) imports from the rest of Spindle, so that
+* it holds no second copy: the generated parser imports this module's
+* default export as `shared` (see scripts/peggy.ts).
+*/
+var grammar_shared_default = {
+	SIGIL_SCOPES,
+	withSelectors: withSelectors$1
+};
+//#endregion
+//#region src/markup/spindle.peggy
+var LB = String.fromCharCode(123);
+var RB = String.fromCharCode(125);
+var { SIGIL_SCOPES: SIGIL_SCOPES$1, withSelectors } = grammar_shared_default;
 var VOID_TAGS = new Set([
 	"area",
 	"base",
@@ -41,34 +68,46 @@ var LINK_SEPARATORS = [
 	["<-", true]
 ];
 var NO_SELECTORS = {};
-function parseLink(inner) {
+/**
+* A link's display text and target, from its text `inner` (at `at` in the
+* input), with where the target is written.
+*/
+function parseLink(inner, at) {
+	/** The trimmed text from `start` to `end` of inner, and where it is. */
+	const part = (start, end) => {
+		const raw = inner.slice(start, end);
+		const value = raw.trim();
+		const from = at + start + (value ? raw.indexOf(value) : 0);
+		return {
+			value,
+			start: from,
+			end: from + value.length
+		};
+	};
 	for (const [separator, targetFirst] of LINK_SEPARATORS) {
 		const idx = inner.indexOf(separator);
 		if (idx === -1) continue;
-		const before = inner.slice(0, idx).trim();
-		const after = inner.slice(idx + separator.length).trim();
-		return targetFirst ? {
-			display: after,
-			target: before
-		} : {
-			display: before,
-			target: after
+		const before = part(0, idx);
+		const after = part(idx + separator.length, inner.length);
+		const [display, target] = targetFirst ? [after, before] : [before, after];
+		return {
+			display: display.value,
+			target: target.value,
+			targetStart: target.start,
+			targetEnd: target.end
 		};
 	}
-	const trimmed = inner.trim();
+	const whole = part(0, inner.length);
 	return {
-		display: trimmed,
-		target: trimmed
+		display: whole.value,
+		target: whole.value,
+		targetStart: whole.start,
+		targetEnd: whole.end
 	};
 }
 function quoteArg(value) {
 	return "\"" + value.replace(/[\\"]/g, "\\$&") + "\"";
 }
-function withSelectors(target, from) {
-	if (from.className) target.className = from.className;
-	if (from.id) target.id = from.id;
-	return target;
-}
 function selectorsOf(parts) {
 	const classes = [];
 	let id = "";
@@ -145,6 +184,8 @@ function tokenOf(x) {
 			type: "link",
 			display: x.display,
 			target: x.target,
+			targetStart: x.targetStart,
+			targetEnd: x.targetEnd,
 			...span
 		}, x);
 		case "variable": return withSelectors({
@@ -288,7 +329,8 @@ function peg$parse(input, options) {
 	const peg$source = options.grammarSource;
 	const peg$startRuleFunctions = {
 		Markup: peg$parseMarkup,
-		Tokens: peg$parseTokens
+		Tokens: peg$parseTokens,
+		SelectorsPrefix: peg$parseSelectorsPrefix
 	};
 	let peg$startRuleFunction = peg$parseMarkup;
 	const peg$c0 = "\\";
@@ -675,8 +717,8 @@ function peg$parse(input, options) {
 	function peg$f48() {
 		return !textMode;
 	}
-	function peg$f49(s, inner) {
-		return withSelectors(lexeme("link", location(), parseLink(inner)), s);
+	function peg$f49(s, at, inner) {
+		return withSelectors(lexeme("link", location(), parseLink(inner, at)), s);
 	}
 	function peg$f50() {
 		return !textMode;
@@ -690,40 +732,46 @@ function peg$parse(input, options) {
 	function peg$f53() {
 		return NO_SELECTORS;
 	}
-	function peg$f54(prefix, name) {
+	function peg$f54(s, end) {
+		return {
+			...s,
+			end
+		};
+	}
+	function peg$f55(prefix, name) {
 		return [prefix, name];
 	}
-	function peg$f55(s, sigil, name) {
+	function peg$f56(s, sigil, name) {
 		return withSelectors(lexeme("variable", location(), {
 			name,
 			scope: SIGIL_SCOPES$1[sigil]
 		}), s);
 	}
-	function peg$f56(s, expression) {
+	function peg$f57(s, expression) {
 		return withSelectors(lexeme("expression", location(), { expression }), s);
 	}
-	function peg$f57() {
+	function peg$f58() {
 		fail("Unclosed " + LB + input.substr(location().end.offset, 1) + "…: no } ends it", location());
 	}
-	function peg$f58(start) {
+	function peg$f59(start) {
 		return skipTo(hooks.closeBrace(input, start, start));
 	}
-	function peg$f59(start) {
+	function peg$f60(start) {
 		return skipEnd - offset();
 	}
-	function peg$f60(start, code) {
+	function peg$f61(start, code) {
 		return code;
 	}
-	function peg$f61(s, start, close, name, nameEnd) {
+	function peg$f62(s, start, close, name, nameEnd) {
 		return skipTo(hooks.closeBrace(input, nameEnd, start));
 	}
-	function peg$f62(s, start, close, name, nameEnd) {
+	function peg$f63(s, start, close, name, nameEnd) {
 		return skipEnd - offset();
 	}
-	function peg$f63(s, start, close, name, nameEnd, args) {
+	function peg$f64(s, start, close, name, nameEnd, args) {
 		return args;
 	}
-	function peg$f64(s, start, close, name, nameEnd, tail) {
+	function peg$f65(s, start, close, name, nameEnd, tail) {
 		const loc = location();
 		const lower = name.toLowerCase();
 		const tag = lexeme("macro", loc, {
@@ -744,19 +792,19 @@ function peg$parse(input, options) {
 		}
 		return tag;
 	}
-	function peg$f65(s) {
+	function peg$f66(s) {
 		fail("A closing tag starts with a letter after " + LB + "/", location());
 	}
-	function peg$f66() {
+	function peg$f67() {
 		return !textMode;
 	}
-	function peg$f67(tag) {
+	function peg$f68(tag) {
 		return VOID_TAGS.has(tag.lower);
 	}
-	function peg$f68(tag) {
+	function peg$f69(tag) {
 		return null;
 	}
-	function peg$f69(tag, list, slash) {
+	function peg$f70(tag, list, slash) {
 		const lower = tag.toLowerCase();
 		return lexeme("html", location(), {
 			tag,
@@ -766,7 +814,7 @@ function peg$parse(input, options) {
 			isSelfClose: !!slash || VOID_TAGS.has(lower)
 		});
 	}
-	function peg$f70(tag, bad) {
+	function peg$f71(tag, bad) {
 		const c = input.charAt(bad);
 		if (!c) fail("Unclosed tag <" + tag + ": no > ends it (write &lt; for a < that starts no tag)", location());
 		const at = {
@@ -784,7 +832,7 @@ function peg$parse(input, options) {
 		};
 		fail("Unexpected " + JSON.stringify(c) + " in the tag <" + tag + ">: expected an attribute, or > to end the tag", at);
 	}
-	function peg$f71(tag) {
+	function peg$f72(tag) {
 		return lexeme("html", location(), {
 			tag,
 			lower: tag.toLowerCase(),
@@ -793,44 +841,44 @@ function peg$parse(input, options) {
 			isSelfClose: false
 		});
 	}
-	function peg$f72(name) {
+	function peg$f73(name) {
 		attrCode = hooks.isCodeAttribute(name);
 		return true;
 	}
-	function peg$f73(name, v) {
+	function peg$f74(name, v) {
 		return v;
 	}
-	function peg$f74(name, value) {
+	function peg$f75(name, value) {
 		return [name, value ?? ""];
 	}
-	function peg$f75(v) {
+	function peg$f76(v) {
 		return v;
 	}
-	function peg$f76(v) {
+	function peg$f77(v) {
 		return v;
 	}
-	function peg$f77(q) {
+	function peg$f78(q) {
 		fail("Unclosed attribute value: the " + q + " here has no closing " + q, location());
 	}
-	function peg$f78() {
+	function peg$f79() {
 		return !attrCode;
 	}
-	function peg$f79(bs) {
+	function peg$f80(bs) {
 		return bs.length % 2 === 1;
 	}
-	function peg$f80() {
+	function peg$f81() {
 		return !attrCode;
 	}
-	function peg$f81(start, nameEnd) {
+	function peg$f82(start, nameEnd) {
 		return skipTo(hooks.closeBrace(input, nameEnd, start));
 	}
-	function peg$f82(start, nameEnd) {
+	function peg$f83(start, nameEnd) {
 		return skipEnd - offset();
 	}
-	function peg$f83() {
+	function peg$f84() {
 		return !attrCode;
 	}
-	function peg$f84() {
+	function peg$f85() {
 		return attrCode;
 	}
 	let peg$currPos = options.peg$currPos | 0;
@@ -1719,7 +1767,7 @@ function peg$parse(input, options) {
 		return s0;
 	}
 	function peg$parseLinkLexeme() {
-		let s0, s1, s2, s3, s4, s5;
+		let s0, s1, s2, s3, s4, s5, s6;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
 		s1 = peg$f48();
@@ -1736,19 +1784,20 @@ function peg$parse(input, options) {
 			if (s2 !== peg$FAILED) {
 				s3 = peg$parseSelectors();
 				if (s3 !== peg$FAILED) {
-					s4 = peg$currPos;
-					s5 = peg$parseLinkText();
-					s4 = input.substring(s4, peg$currPos);
+					s4 = peg$parseHere();
+					s5 = peg$currPos;
+					s6 = peg$parseLinkText();
+					s5 = input.substring(s5, peg$currPos);
 					if (input.substr(peg$currPos, 2) === peg$c5) {
-						s5 = peg$c5;
+						s6 = peg$c5;
 						peg$currPos += 2;
 					} else {
-						s5 = peg$FAILED;
+						s6 = peg$FAILED;
 						if (peg$silentFails === 0) peg$fail(peg$e9);
 					}
-					if (s5 !== peg$FAILED) {
+					if (s6 !== peg$FAILED) {
 						peg$savedPos = s0;
-						s0 = peg$f49(s3, s4);
+						s0 = peg$f49(s3, s4, s5);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -1919,6 +1968,38 @@ function peg$parse(input, options) {
 		}
 		return s0;
 	}
+	function peg$parseSelectorsPrefix() {
+		let s0, s1, s2, s3, s4;
+		s0 = peg$currPos;
+		s1 = peg$parseSelectors();
+		if (s1 !== peg$FAILED) {
+			s2 = peg$parseHere();
+			s3 = [];
+			if (input.length > peg$currPos) {
+				s4 = input.charAt(peg$currPos);
+				peg$currPos++;
+			} else {
+				s4 = peg$FAILED;
+				if (peg$silentFails === 0) peg$fail(peg$e0);
+			}
+			while (s4 !== peg$FAILED) {
+				s3.push(s4);
+				if (input.length > peg$currPos) {
+					s4 = input.charAt(peg$currPos);
+					peg$currPos++;
+				} else {
+					s4 = peg$FAILED;
+					if (peg$silentFails === 0) peg$fail(peg$e0);
+				}
+			}
+			peg$savedPos = s0;
+			s0 = peg$f54(s1, s2);
+		} else {
+			peg$currPos = s0;
+			s0 = peg$FAILED;
+		}
+		return s0;
+	}
 	function peg$parseSelectorPart() {
 		let s0, s1, s2, s3, s4;
 		s0 = peg$currPos;
@@ -1938,7 +2019,7 @@ function peg$parse(input, options) {
 			}
 			s2 = input.substring(s2, peg$currPos);
 			peg$savedPos = s0;
-			s0 = peg$f54(s1, s2);
+			s0 = peg$f55(s1, s2);
 		} else {
 			peg$currPos = s0;
 			s0 = peg$FAILED;
@@ -2063,7 +2144,7 @@ function peg$parse(input, options) {
 					}
 					if (s5 !== peg$FAILED) {
 						peg$savedPos = s0;
-						s0 = peg$f55(s2, s3, s4);
+						s0 = peg$f56(s2, s3, s4);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2117,7 +2198,7 @@ function peg$parse(input, options) {
 							}
 							if (s5 !== peg$FAILED) {
 								peg$savedPos = s0;
-								s0 = peg$f56(s2, s4);
+								s0 = peg$f57(s2, s4);
 							} else {
 								peg$currPos = s0;
 								s0 = peg$FAILED;
@@ -2165,7 +2246,7 @@ function peg$parse(input, options) {
 						} else s3 = peg$FAILED;
 						if (s3 !== peg$FAILED) {
 							peg$savedPos = s0;
-							s0 = peg$f57();
+							s0 = peg$f58();
 						} else {
 							peg$currPos = s0;
 							s0 = peg$FAILED;
@@ -2187,12 +2268,12 @@ function peg$parse(input, options) {
 		s0 = peg$currPos;
 		s1 = peg$parseHere();
 		peg$savedPos = peg$currPos;
-		s2 = peg$f58(s1);
+		s2 = peg$f59(s1);
 		if (s2) s2 = void 0;
 		else s2 = peg$FAILED;
 		if (s2 !== peg$FAILED) {
 			s3 = peg$currPos;
-			s4 = peg$f59(s1);
+			s4 = peg$f60(s1);
 			s5 = peg$currPos;
 			s6 = [];
 			if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -2223,7 +2304,7 @@ function peg$parse(input, options) {
 			else s3 = s4;
 			if (s3 !== peg$FAILED) {
 				peg$savedPos = s0;
-				s0 = peg$f60(s1, s3);
+				s0 = peg$f61(s1, s3);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2261,12 +2342,12 @@ function peg$parse(input, options) {
 					s6 = peg$parseHere();
 					s7 = peg$currPos;
 					peg$savedPos = peg$currPos;
-					s8 = peg$f61(s2, s3, s4, s5, s6);
+					s8 = peg$f62(s2, s3, s4, s5, s6);
 					if (s8) s8 = void 0;
 					else s8 = peg$FAILED;
 					if (s8 !== peg$FAILED) {
 						s9 = peg$currPos;
-						s10 = peg$f62(s2, s3, s4, s5, s6);
+						s10 = peg$f63(s2, s3, s4, s5, s6);
 						s11 = peg$currPos;
 						s12 = [];
 						if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -2305,7 +2386,7 @@ function peg$parse(input, options) {
 							}
 							if (s10 !== peg$FAILED) {
 								peg$savedPos = s7;
-								s7 = peg$f63(s2, s3, s4, s5, s6, s9);
+								s7 = peg$f64(s2, s3, s4, s5, s6, s9);
 							} else {
 								peg$currPos = s7;
 								s7 = peg$FAILED;
@@ -2320,7 +2401,7 @@ function peg$parse(input, options) {
 					}
 					if (s7 === peg$FAILED) s7 = null;
 					peg$savedPos = s0;
-					s0 = peg$f64(s2, s3, s4, s5, s6, s7);
+					s0 = peg$f65(s2, s3, s4, s5, s6, s7);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2354,7 +2435,7 @@ function peg$parse(input, options) {
 					}
 					if (s3 !== peg$FAILED) {
 						peg$savedPos = s0;
-						s0 = peg$f65(s2);
+						s0 = peg$f66(s2);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2411,19 +2492,19 @@ function peg$parse(input, options) {
 		let s0, s1, s2, s3;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
-		s1 = peg$f66();
+		s1 = peg$f67();
 		if (s1) s1 = void 0;
 		else s1 = peg$FAILED;
 		if (s1 !== peg$FAILED) {
 			s2 = peg$parseHtmlClose();
 			if (s2 !== peg$FAILED) {
 				peg$savedPos = peg$currPos;
-				s3 = peg$f67(s2);
+				s3 = peg$f68(s2);
 				if (s3) s3 = void 0;
 				else s3 = peg$FAILED;
 				if (s3 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f68(s2);
+					s0 = peg$f69(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2475,7 +2556,7 @@ function peg$parse(input, options) {
 				}
 				if (s6 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f69(s2, s3, s5);
+					s0 = peg$f70(s2, s3, s5);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2540,7 +2621,7 @@ function peg$parse(input, options) {
 						s5 = peg$parse_();
 						s6 = peg$parseHere();
 						peg$savedPos = s0;
-						s0 = peg$f70(s2, s6);
+						s0 = peg$f71(s2, s6);
 					} else {
 						peg$currPos = s0;
 						s0 = peg$FAILED;
@@ -2579,7 +2660,7 @@ function peg$parse(input, options) {
 				}
 				if (s4 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f71(s2);
+					s0 = peg$f72(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2713,7 +2794,7 @@ function peg$parse(input, options) {
 		else s2 = s3;
 		if (s2 !== peg$FAILED) {
 			peg$savedPos = peg$currPos;
-			s3 = peg$f72(s2);
+			s3 = peg$f73(s2);
 			if (s3) s3 = void 0;
 			else s3 = peg$FAILED;
 			if (s3 !== peg$FAILED) {
@@ -2731,7 +2812,7 @@ function peg$parse(input, options) {
 					s8 = peg$parseAttrValue();
 					if (s8 !== peg$FAILED) {
 						peg$savedPos = s4;
-						s4 = peg$f73(s2, s8);
+						s4 = peg$f74(s2, s8);
 					} else {
 						peg$currPos = s4;
 						s4 = peg$FAILED;
@@ -2742,7 +2823,7 @@ function peg$parse(input, options) {
 				}
 				if (s4 === peg$FAILED) s4 = null;
 				peg$savedPos = s0;
-				s0 = peg$f74(s2, s4);
+				s0 = peg$f75(s2, s4);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2797,7 +2878,7 @@ function peg$parse(input, options) {
 			}
 			if (s3 !== peg$FAILED) {
 				peg$savedPos = s0;
-				s0 = peg$f75(s2);
+				s0 = peg$f76(s2);
 			} else {
 				peg$currPos = s0;
 				s0 = peg$FAILED;
@@ -2849,7 +2930,7 @@ function peg$parse(input, options) {
 				}
 				if (s3 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s0 = peg$f76(s2);
+					s0 = peg$f77(s2);
 				} else {
 					peg$currPos = s0;
 					s0 = peg$FAILED;
@@ -2868,7 +2949,7 @@ function peg$parse(input, options) {
 				}
 				if (s1 !== peg$FAILED) {
 					peg$savedPos = s0;
-					s1 = peg$f77(s1);
+					s1 = peg$f78(s1);
 				}
 				s0 = s1;
 				if (s0 === peg$FAILED) {
@@ -2899,7 +2980,7 @@ function peg$parse(input, options) {
 		let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
 		s0 = peg$currPos;
 		peg$savedPos = peg$currPos;
-		s1 = peg$f78();
+		s1 = peg$f79();
 		if (s1) s1 = void 0;
 		else s1 = peg$FAILED;
 		if (s1 !== peg$FAILED) {
@@ -2928,7 +3009,7 @@ function peg$parse(input, options) {
 			if (s2 !== peg$FAILED) {
 				s3 = peg$currPos;
 				peg$savedPos = peg$currPos;
-				s4 = peg$f79(s2);
+				s4 = peg$f80(s2);
 				if (s4) s4 = void 0;
 				else s4 = peg$FAILED;
 				if (s4 !== peg$FAILED) {
@@ -2967,7 +3048,7 @@ function peg$parse(input, options) {
 		if (s0 === peg$FAILED) {
 			s0 = peg$currPos;
 			peg$savedPos = peg$currPos;
-			s1 = peg$f80();
+			s1 = peg$f81();
 			if (s1) s1 = void 0;
 			else s1 = peg$FAILED;
 			if (s1 !== peg$FAILED) {
@@ -2994,12 +3075,12 @@ function peg$parse(input, options) {
 						if (s6 !== peg$FAILED) {
 							s7 = peg$parseHere();
 							peg$savedPos = peg$currPos;
-							s8 = peg$f81(s4, s7);
+							s8 = peg$f82(s4, s7);
 							if (s8) s8 = void 0;
 							else s8 = peg$FAILED;
 							if (s8 !== peg$FAILED) {
 								s9 = peg$currPos;
-								s10 = peg$f82(s4, s7);
+								s10 = peg$f83(s4, s7);
 								s11 = peg$currPos;
 								s12 = [];
 								if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -3081,7 +3162,7 @@ function peg$parse(input, options) {
 			if (s0 === peg$FAILED) {
 				s0 = peg$currPos;
 				peg$savedPos = peg$currPos;
-				s1 = peg$f83();
+				s1 = peg$f84();
 				if (s1) s1 = void 0;
 				else s1 = peg$FAILED;
 				if (s1 !== peg$FAILED) {
@@ -3172,7 +3253,7 @@ function peg$parse(input, options) {
 				if (s0 === peg$FAILED) {
 					s0 = peg$currPos;
 					peg$savedPos = peg$currPos;
-					s1 = peg$f84();
+					s1 = peg$f85();
 					if (s1) s1 = void 0;
 					else s1 = peg$FAILED;
 					if (s1 !== peg$FAILED) {
@@ -3403,21 +3484,6 @@ function isBlockMacro(name) {
 	return BLOCK_MACROS.has(name);
 }
 //#endregion
-//#region src/markup/tokens.ts
-/** Variable sigils: story ($), temporary (_), local (@), transient (%). */
-var SIGIL_SCOPES = {
-	$: "variable",
-	_: "temporary",
-	"@": "local",
-	"%": "transient"
-};
-Object.fromEntries(Object.entries(SIGIL_SCOPES).map(([sigil, scope]) => [scope, sigil]));
-var SIGIL_CHARS = new Set(Object.keys(SIGIL_SCOPES));
-/** Whether `c` is a variable sigil. */
-function isSigil(c) {
-	return c !== void 0 && SIGIL_CHARS.has(c);
-}
-//#endregion
 //#region node_modules/acorn/dist/acorn.mjs
 var astralIdentifierCodes = [
 	509,
@@ -9239,6 +9305,14 @@ function* tokens(src, start, goal, options = {}) {
 function lexJs(src, handlers, goal = "expression") {
 	return walkTokens(src, 0, handlers, 0, goal, false);
 }
+/**
+* Lex the template literal opening at `start` (a backtick) as `lexJs` does,
+* its interpolations one nesting level deeper. Returns the index just past
+* its closing backtick, or `src.length` if it is unterminated.
+*/
+function lexTemplate(src, start, handlers = {}, nesting = 0) {
+	return walkTokens(src, start, handlers, nesting, "expression", true);
+}
 function walkTokens(src, from, handlers, nesting, goal, oneTemplate) {
 	const comments = [];
 	const onComment = (_block, _text, s, e) => {
@@ -9356,6 +9430,22 @@ function regexEnd(src, start) {
 	return -1;
 }
 /**
+* The value of `src` when it is exactly one `"…"` or `'…'` string literal,
+* as JavaScript reads it (`"\u0048all"` is `Hall`, `"\1"` is U+0001 in
+* the non-strict code passages run), otherwise `null`: other code, or a
+* literal that is not well-formed (`"\u{110000}"`).
+*/
+function stringLiteralValue(src) {
+	if (src[0] !== "\"" && src[0] !== "'") return null;
+	try {
+		const p = tokenizerAt(src, 0, "expression");
+		p.nextToken();
+		return p.type === types$1.string && p.end === src.length ? p.value : null;
+	} catch {
+		return null;
+	}
+}
+/**
 * Scan the `"…"` or `'…'` string literal opening at `start`. `end` is the
 * index just past its closing quote, or `src.length` when it is unterminated
 * (`closed` false). A backslash escapes the character after it, so a quote
@@ -9591,6 +9681,98 @@ function parseMarkup(source, options = {}) {
 function tokenizeMarkup(source, options = {}) {
 	return run(source, "Tokens", options);
 }
+/**
+* The `.class#id` selectors that start `source` at `at`, with the index just
+* past them and the one space that may follow (`end`; `at` if there are
+* none). A selector name may hold `{$name}` interpolations, as in markup.
+*/
+function parseSelectors(source, at = 0) {
+	const found = run(source.slice(at), "SelectorsPrefix", {});
+	return {
+		...found,
+		end: at + found.end
+	};
+}
+/**
+* `tokenizeMarkup` for half-typed markup: the tokens it can read, and every
+* error, instead of throwing at the first. At a malformed tag, the tokens
+* before it are kept, its first character is read as text and tokenizing
+* resumes after it, so what follows is read as if the tag had not been
+* started. Tokens and errors have offsets in `source`; for well-formed
+* markup the tokens are those of `tokenizeMarkup` and there are no errors.
+*/
+function tokenizeMarkupTolerant(source, options = {}) {
+	const tokens = [];
+	const errors = [];
+	const lastBrace = source.lastIndexOf("}");
+	const { closeBrace } = {
+		...defaultHooks,
+		...options.hooks
+	};
+	/** `text` shifted by `base`, tokenized: the tokens or the error. */
+	const attempt = (text, base) => {
+		const hooks = {
+			...options.hooks,
+			closeBrace: (input, codeStart, lenientStart) => base + Math.min(codeStart, lenientStart) > lastBrace ? -1 : closeBrace(input, codeStart, lenientStart)
+		};
+		try {
+			return tokenizeMarkup(text, {
+				...options,
+				hooks
+			}).map((token) => shift(token, base));
+		} catch (error) {
+			if (!(error instanceof MarkupError)) throw error;
+			return error;
+		}
+	};
+	let base = 0;
+	while (base <= source.length) {
+		const rest = source.slice(base);
+		const result = attempt(rest, base);
+		if (Array.isArray(result)) {
+			tokens.push(...result);
+			break;
+		}
+		const at = base + result.offset;
+		const { line, column } = lineColumn(source, at);
+		errors.push(new MarkupError(result.reason, at, line, column));
+		let cut = result.offset;
+		let prefix = attempt(rest.slice(0, cut), base);
+		while (!Array.isArray(prefix)) {
+			cut = prefix.offset;
+			prefix = attempt(rest.slice(0, cut), base);
+		}
+		tokens.push(...prefix);
+		if (cut < rest.length) {
+			const start = base + cut;
+			tokens.push({
+				type: "text",
+				value: rest[cut],
+				start,
+				end: start + 1
+			});
+		}
+		base += cut + 1;
+	}
+	return {
+		tokens,
+		errors
+	};
+}
+/** `token` with its offsets moved `by` on. */
+function shift(token, by) {
+	if (by === 0) return token;
+	const moved = {
+		...token,
+		start: token.start + by,
+		end: token.end + by
+	};
+	if (moved.type === "link") {
+		moved.targetStart += by;
+		moved.targetEnd += by;
+	}
+	return moved;
+}
 //#endregion
 //#region src/utils/parse-delay.ts
 /**
@@ -9618,6 +9800,15 @@ function errorMessage(err, fallback) {
 	return fallback ?? String(err);
 }
 //#endregion
+//#region src/runtime-errors.ts
+/**
+* The error for `name`, a passage name that names no passage, used in the
+* passage `from`.
+*/
+function noPassageError(name, from) {
+	return /* @__PURE__ */ new Error(`No passage named ${JSON.stringify(name)} (in passage ${JSON.stringify(from)})`);
+}
+//#endregion
 //#region src/components/macros/arg-utils.ts
 /**
 * Shared helpers for macros that split or read their raw argument text by
@@ -9720,6 +9911,67 @@ function topLevelIndices(src, isSeparator) {
 	} });
 	return indices;
 }
+/**
+* Split `src` at every depth-0 separator (see `topLevelIndices`). Segments
+* are returned as written, untrimmed, and empty segments are kept, so
+* `n` separators always give `n + 1` segments.
+*/
+function splitTopLevel(src, isSeparator) {
+	const segments = [];
+	let from = 0;
+	for (const i of topLevelIndices(src, isSeparator)) {
+		segments.push(src.slice(from, i));
+		from = i + 1;
+	}
+	segments.push(src.slice(from));
+	return segments;
+}
+/**
+* Check whether a whitespace-delimited token looks like a standalone value
+* (not an operator or partial expression): it starts like a value and does
+* not end with an operator still waiting for its operand.
+*/
+function isStandaloneValue(token) {
+	return startsLikeValue(token) && !endsWithOperator(token);
+}
+function startsLikeValue(token) {
+	const first = token[0];
+	if (first === "\"" || first === "'" || first === "`") return true;
+	if (/^[$_@]\w|^%[A-Za-z_]/.test(token)) return true;
+	if (/\d/.test(first)) return true;
+	if ((first === "-" || first === "+") && token.length > 1 && /\d/.test(token[1])) return true;
+	if (first === "(" || first === "[" || first === "{") return true;
+	if (/^(?:true|false|null|undefined)(?![\w$])/.test(token)) return true;
+	if (first === "!" && token.length > 1 && token[1] !== "=") return true;
+	return false;
+}
+/**
+* Try to split a raw string on whitespace at depth 0 (respecting strings,
+* template literals, parentheses, brackets, and braces). Each resulting token
+* must pass `isStandaloneValue()` or the split is rejected and `null` is
+* returned.
+*/
+function trySplitOnWhitespace(raw) {
+	const args = splitTopLevel(raw, isWhitespace).filter(Boolean);
+	if (args.length < 2) return null;
+	for (const arg of args) if (!isStandaloneValue(arg)) return null;
+	return args;
+}
+/**
+* Split rawArgs by commas, respecting parentheses, brackets, braces, and
+* strings. When no top-level commas are present, also supports adjacent quoted
+* string literals separated by whitespace (e.g. `"Label" "target"`).
+*/
+function splitArgs(raw) {
+	const args = splitTopLevel(raw, (ch) => ch === ",").map((a) => a.trim());
+	const hasComma = args.length > 1;
+	if (args[args.length - 1] === "") args.pop();
+	if (!hasComma && args.length === 1) {
+		const split = trySplitOnWhitespace(args[0]);
+		if (split) return split;
+	}
+	return args;
+}
 //#endregion
 //#region src/components/macros/macro-args.ts
 /**
@@ -9762,11 +10014,13 @@ function readText(src) {
 */
 var MacroArgumentError = class extends Error {
 	constructor(param, src) {
-		super(`The ${param.name} must be a quoted string ("…" or '…'), not ${src}`);
+		super(`The ${param.name} must be a quoted string ("…" or '…'), ${src ? `not ${src}` : "but it has no value"}`);
 		this.name = "MacroArgumentError";
 	}
 };
-function readValue(param, src) {
+/** Read `src`, at `place`, as `param` says. */
+function readValue(param, src, place) {
+	place.spans?.set(param, [place.at, place.at + src.length]);
 	switch (param.type) {
 		case "string": {
 			const value = readWholeQuoted(src);
@@ -9777,7 +10031,7 @@ function readValue(param, src) {
 		case "names": return src.split(",").map((name) => name.trim());
 		case "delay": return parseDelay(src);
 		case "number": return Number(src);
-		case "options": return readOptions(param.parameters ?? [], src);
+		case "options": return readOptions(param.parameters ?? [], src, place);
 		default: return src;
 	}
 }
@@ -9787,6 +10041,7 @@ function unset(param) {
 }
 var WORD_RE = /\w+/y;
 var DIGITS_RE = /\d+/y;
+var WORD_OR_PUNCT_RE = /\S+/y;
 /** Match the sticky regex `re` at `pos`, returning the matched text. */
 function matchAt(re, src, pos) {
 	re.lastIndex = pos;
@@ -9794,10 +10049,12 @@ function matchAt(re, src, pos) {
 }
 /**
 * Read keyword options (`goto "X" priority 5 once`). A keyword takes the
-* quoted string or digit run after it as its value; keywords that aren't
-* declared, and their values, are skipped.
+* quoted string (with or without whitespace before it) or digit run after
+* it as its value; keywords that aren't declared, and their values, are
+* skipped. A keyword of a `string` parameter must be followed by a quoted
+* string.
 */
-function readOptions(params, src) {
+function readOptions(params, src, { at, spans }) {
 	const options = {};
 	let i = 0;
 	while (i < src.length) {
@@ -9810,18 +10067,18 @@ function readOptions(params, src) {
 		let val;
 		let j = i;
 		while (j < src.length && isWhitespace(src[j])) j++;
-		if (j > i) {
-			const quoted = readQuoted(src, j);
-			const digits = quoted ? null : matchAt(DIGITS_RE, src, j);
-			if (quoted) {
-				val = quoted.value;
-				i = quoted.end;
-			} else if (digits) {
-				val = digits;
-				i = j + digits.length;
-			}
+		const quoted = readQuoted(src, j);
+		const digits = quoted || j === i ? null : matchAt(DIGITS_RE, src, j);
+		if (quoted) {
+			val = quoted.value;
+			i = quoted.end;
+		} else if (digits) {
+			val = digits;
+			i = j + digits.length;
 		}
 		const param = params.find((p) => p.name === key);
+		if (param && param.type !== "flag" && val !== void 0) spans?.set(param, [at + j, at + i]);
+		if (param?.type === "string" && !quoted) throw new MacroArgumentError(param, matchAt(WORD_OR_PUNCT_RE, src, j) ?? "");
 		if (param?.type === "flag") options[key] = true;
 		else if (param?.type === "number") options[key] = Number(val ?? 0);
 		else if (param) options[key] = val;
@@ -9831,21 +10088,21 @@ function readOptions(params, src) {
 /** `inline %name` reads a transient variable; `inline % 2` is modulo. */
 var LEADING_OPERATOR_RE = /^(?:[-+*/&|^=<>?:,.]|%(?![A-Za-z_]))/;
 /**
-* The rest of `src` without the flag `word` as its last or first term, or
-* `null` if it has no such flag. Next to a binary operator the word is an
-* operand (`"a" + inline`), not a flag; the closing `/` of a regex literal
-* is not one.
+* Where the rest of `src` is without the flag `word` as its last or first
+* term, or `null` if it has no such flag. Next to a binary operator the
+* word is an operand (`"a" + inline`), not a flag; the closing `/` of a
+* regex literal is not one.
 */
 function takeFlag(src, word) {
 	const spans = terms(src);
 	if (spans.length < 2) return null;
 	if (slice(src, spans[spans.length - 1]) === word) {
-		const rest = src.slice(0, spans[spans.length - 2][1]);
-		if (!endsWithOperator(rest)) return rest;
+		const rest = [0, spans[spans.length - 2][1]];
+		if (!endsWithOperator(slice(src, rest))) return rest;
 	}
 	if (slice(src, spans[0]) === word) {
-		const rest = src.slice(spans[1][0]);
-		if (!LEADING_OPERATOR_RE.test(rest)) return rest;
+		const rest = [spans[1][0], src.length];
+		if (!LEADING_OPERATOR_RE.test(slice(src, rest))) return rest;
 	}
 	return null;
 }
@@ -9873,60 +10130,112 @@ function findSeparator(src, word) {
 	return null;
 }
 var takesRest = (param) => param.type === "expression" || param.type === "statements" || param.type === "passage" || param.type === "text";
-/** Read the parameters of one group from `src` (`null`: no text) into `args`. */
-function readGroup(params, src, args) {
-	let text = src?.trim() ?? "";
+/** The text of `src` without the whitespace around it, and where it is. */
+function trimmed(src, at) {
+	const text = src.trim();
+	return [text, text ? at + src.indexOf(text) : at];
+}
+/**
+* Read the parameters of one group from `src` (`null`: no text), which is
+* at `at` in the raw arguments, into `args`.
+*/
+function readGroup(params, src, args, { at: srcAt, spans }) {
+	let [text, at] = trimmed(src ?? "", srcAt);
 	for (const flag of params.filter((p) => p.type === "flag")) {
 		const rest = src === null ? null : takeFlag(text, flag.name);
 		args[flag.name] = rest !== null;
-		text = rest ?? text;
+		if (rest) [text, at] = trimmed(slice(text, rest), at + rest[0]);
 	}
 	const positional = params.filter((p) => p.type !== "flag");
 	if (positional.length === 0) return;
 	const lastText = positional.findIndex((p, i) => takesRest(p) && !positional.slice(i + 1).some(takesRest));
 	const restIndex = lastText < 0 ? positional.length - 1 : lastText;
-	const read = (param, value) => value === "" ? unset(param) : readValue(param, value);
+	/** Read `param` from the text from `start` to `end`. */
+	const read = (param, [start, end]) => start === end ? unset(param) : readValue(param, text.slice(start, end), {
+		at: at + start,
+		spans
+	});
 	if (positional.length === 1) {
-		args[positional[0].name] = read(positional[0], text);
+		args[positional[0].name] = read(positional[0], [0, text.length]);
 		return;
 	}
-	const spans = terms(text);
+	const parts = terms(text);
 	let from = 0;
-	let to = spans.length;
-	for (const param of positional.slice(0, restIndex)) args[param.name] = from < to ? read(param, slice(text, spans[from++])) : unset(param);
-	const readTrailing = (param, value) => {
+	let to = parts.length;
+	for (const param of positional.slice(0, restIndex)) args[param.name] = from < to ? read(param, parts[from++]) : unset(param);
+	const readTrailing = (param, span) => {
 		try {
-			return read(param, value);
+			return read(param, span);
 		} catch (error) {
 			if (error instanceof MacroArgumentError) return void 0;
 			throw error;
 		}
 	};
 	for (const param of positional.slice(restIndex + 1).reverse()) {
-		const value = from < to && !endsWithOperator(text.slice(0, spans[to - 1][0])) ? readTrailing(param, slice(text, spans[to - 1])) : void 0;
+		const value = from < to && !endsWithOperator(text.slice(0, parts[to - 1][0])) ? readTrailing(param, parts[to - 1]) : void 0;
 		args[param.name] = value ?? unset(param);
 		if (value !== void 0) to--;
+		else spans?.delete(param);
 	}
 	const rest = positional[restIndex];
-	args[rest.name] = from < to ? read(rest, text.slice(spans[from][0], spans[to - 1][1])) : unset(rest);
+	args[rest.name] = from < to ? read(rest, [parts[from][0], parts[to - 1][1]]) : unset(rest);
 }
-/** Read `rawArgs` into the declared `parameters` (see above). */
-function parseMacroArgs(rawArgs, parameters) {
+/**
+* Read `rawArgs` into the declared `parameters` (see above). With `spans`,
+* note there where each argument set was read.
+*/
+function parseMacroArgs(rawArgs, parameters, spans) {
 	const args = {};
-	let rest = rawArgs.trim();
+	let [rest, restAt] = trimmed(rawArgs, 0);
 	let groupStart = 0;
 	parameters.forEach((separator, i) => {
 		if (separator.type !== "separator") return;
 		const at = rest === null ? null : findSeparator(rest, separator.name);
 		args[separator.name] = at !== null;
 		const before = at ? rest.slice(0, at[0]) : rest;
-		readGroup(parameters.slice(groupStart, i), before, args);
+		readGroup(parameters.slice(groupStart, i), before, args, {
+			at: restAt,
+			spans
+		});
 		rest = at ? rest.slice(at[1]) : null;
+		if (at) restAt += at[1];
 		groupStart = i + 1;
 	});
-	readGroup(parameters.slice(groupStart), rest, args);
+	readGroup(parameters.slice(groupStart), rest, args, {
+		at: restAt,
+		spans
+	});
 	return args;
 }
+/**
+* Read a `passage` argument as written (`{goto "Hall"}`, `{goto $room}`): a
+* string literal is the name JavaScript reads from it (`"\u0048all"` is
+* `Hall`), anything else (a literal that is not well-formed too) an
+* expression, whose value is the name when it
+* runs (see evaluatePassageName).
+*/
+function passageTarget(arg) {
+	const expression = arg.trim();
+	const name = stringLiteralValue(expression);
+	return name === null ? {
+		kind: "expression",
+		expression
+	} : {
+		kind: "name",
+		name
+	};
+}
+/**
+* The passage a `passage` argument names (`{goto "Hall"}`, `{goto $room}`):
+* the value of its expression. Throws what evaluating it throws, and if no
+* passage of the story `state` holds has that name, an error naming it and
+* the current passage.
+*/
+function evaluatePassageName(expr, evaluate, { storyData, currentPassage }) {
+	const name = String(evaluate(expr ?? ""));
+	if (storyData && !storyData.passages.has(name)) throw noPassageError(name, currentPassage);
+	return name;
+}
 //#endregion
 //#region src/widgets/widget-def.ts
 /**
@@ -9937,10 +10246,12 @@ function parseMacroArgs(rawArgs, parameters) {
 var WIDGET_PARAMETERS = [{
 	name: "name",
 	type: "text",
+	holds: "text",
 	required: true
 }, {
 	name: "parameters",
-	type: "text"
+	type: "text",
+	holds: "text"
 }];
 /**
 * The widget a {widget} definition's arguments declare: its name and its
@@ -9972,6 +10283,17 @@ function blockWidgetNames(passages) {
 	}
 	return names;
 }
+/** The parameters of the built-in sub-macros that take arguments. */
+var SUB_MACRO_PARAMETERS = new Map([["option", [{
+	name: "value",
+	type: "string",
+	holds: "text",
+	required: true
+}]]]);
+/** The parameters of the built-in sub-macro `name`, if it takes any. */
+function subMacroParameters(name) {
+	return SUB_MACRO_PARAMETERS.get(name.toLowerCase());
+}
 //#endregion
 //#region src/code-check.ts
 /** While a pass runs: the code it parsed so far, by goal and source. */
@@ -10009,21 +10331,59 @@ var CONDITION_MACROS = new Set([
 	"elseif",
 	"case"
 ]);
-/** Code inside the quoted strings of a macro's arguments, by parameter. */
-var CODE_IN_STRINGS = { watch: {
-	condition: "expression",
-	run: "statements"
-} };
-/** The `string` parameters of a macro that name a passage. */
-var PASSAGE_STRINGS = { watch: ["goto", "dialog"] };
 /** Block macros whose body is the name of a passage. */
 var PASSAGE_BODIES = new Set(["dialog"]);
+/**
+* `params` with each `string` and `text` parameter (options too) saying
+* what it holds: what it declares, else `holds`.
+*/
+function withHolds(params, holds) {
+	return params.map((param) => {
+		if (param.parameters) return {
+			...param,
+			parameters: withHolds(param.parameters, holds)
+		};
+		return (param.type === "string" || param.type === "text") && !param.holds ? {
+			...param,
+			holds
+		} : param;
+	});
+}
+/**
+* The declared parameters of `macros`, by name in any case, and of the
+* built-in sub-macros (`{option}`): what the story-start check, reference
+* collection and tooling read arguments by. Each `string` and `text`
+* parameter says what it holds: what it declares, else `markup` for a macro
+* with `interpolate` (which can resolve markup) and `text` for any other.
+*/
+function parameterLookup(macros) {
+	const parameters = new NameMap();
+	for (const { name, parameters: params, interpolate } of macros) if (params) parameters.set(name, withHolds(params, holdsByDefault(interpolate)));
+	return (name) => {
+		let params = parameters.get(name);
+		if (!params) {
+			const sub = subMacroParameters(name);
+			if (sub) parameters.set(name, params = withHolds(sub, "text"));
+		}
+		return params;
+	};
+}
+/** What a `string` or `text` argument holds when its parameter doesn't say. */
+var holdsByDefault = (interpolate) => interpolate ? "markup" : "text";
 /** The goal of the code an argument of this type holds, if it is code. */
 function codeGoal(param) {
 	if (param.type === "expression" || param.type === "passage") return "expression";
 	if (param.type === "statements") return "statements";
 }
 /**
+* What a `string` or `text` argument holds: what its parameter says (see
+* parameterLookup), else markup, which is checked.
+*/
+function stringHolds(param) {
+	if (param.type !== "string" && param.type !== "text") return void 0;
+	return param.holds ?? "markup";
+}
+/**
 * The code and the markup-holding text in `tokens`, the tokens of `src`.
 * `parametersOf` gives the declared parameters of a macro, if it has any.
 */
@@ -10035,7 +10395,9 @@ function* codeAndText(src, tokens, parametersOf) {
 		if (token.type === "link") yield {
 			kind: "passage",
 			name: token.target,
-			offset: locate(src, token.target, token.start),
+			offset: token.targetStart,
+			length: token.targetEnd - token.targetStart,
+			macro: "link",
 			label: src.slice(token.start, token.end)
 		};
 		else if (token.type === "expression") yield {
@@ -10045,32 +10407,35 @@ function* codeAndText(src, tokens, parametersOf) {
 			goal: "expression",
 			label: `{${token.expression}}`
 		};
-		else if (token.type === "html") for (const [name, value] of Object.entries(token.attributes)) {
-			const at = locate(src, value, token.start);
-			if (!isCodeAttribute(name)) {
-				yield {
-					kind: "text",
-					text: value,
-					offset: at,
-					where: `In the ${name} attribute of <${token.tag}>: `
-				};
-				continue;
-			}
-			let from = 0;
-			for (const part of splitSigilTemplate(value)) {
-				if (!("expr" in part)) continue;
-				const k = locate(value, part.expr, from);
-				from = k + part.expr.length;
-				yield {
-					kind: "code",
-					code: part.expr,
-					offset: at + k,
-					goal: "expression",
-					label: `{${part.expr}} in the ${name} attribute of <${token.tag}>`
-				};
+		else if (token.type === "html") {
+			let cursor = token.start;
+			for (const [name, value] of Object.entries(token.attributes)) {
+				const at = locate(src, value, cursor);
+				cursor = at + value.length;
+				if (!isCodeAttribute(name)) {
+					yield {
+						kind: "text",
+						text: value,
+						offset: at,
+						where: `In the ${name} attribute of <${token.tag}>: `
+					};
+					continue;
+				}
+				let from = 0;
+				for (const part of splitSigilTemplate(value)) {
+					if (!("expr" in part)) continue;
+					const k = locate(value, part.expr, from);
+					from = k + part.expr.length;
+					yield {
+						kind: "code",
+						code: part.expr,
+						offset: at + k,
+						goal: "expression",
+						label: `{${part.expr}} in the ${name} attribute of <${token.tag}>`
+					};
+				}
 			}
-		}
-		else if (token.type === "macro" && !token.isClose) {
+		} else if (token.type === "macro" && !token.isClose) {
 			const name = token.name.toLowerCase();
 			if (name === "do") {
 				const close = closeOf(t, name);
@@ -10090,18 +10455,22 @@ function* codeAndText(src, tokens, parametersOf) {
 				const close = closeOf(t, name);
 				const body = tokens.slice(t + 1, close);
 				if (close > t + 1 && body.every((b) => b.type === "text")) {
-					const passage = src.slice(token.end, tokens[close].start).trim().replace(/^["']|["']$/g, "");
+					const text = src.slice(token.end, tokens[close].start);
+					const written = text.trim();
 					yield {
 						kind: "passage",
-						name: passage,
-						offset: locate(src, passage, token.end),
+						name: written.replace(/^["']|["']$/g, ""),
+						offset: token.end + text.indexOf(written),
+						length: written.length,
+						macro: name,
 						label: src.slice(token.start, token.end)
 					};
 				}
 			}
 			if (!args) continue;
 			const label = `{${token.name} ${args}}`;
-			const argsAt = locate(src, args, token.start + 1);
+			const tag = src.slice(token.start, token.end - 1);
+			const argsAt = token.start + tag.trimEnd().length - args.length;
 			if (CONDITION_MACROS.has(name)) {
 				yield {
 					kind: "code",
@@ -10120,8 +10489,9 @@ function* codeAndText(src, tokens, parametersOf) {
 /** The code and text in the arguments `args` (at `offset`) of `macro`. */
 function* argPieces(args, offset, params, macro, label) {
 	let values;
+	const spans = /* @__PURE__ */ new Map();
 	try {
-		values = parseMacroArgs(args, params);
+		values = parseMacroArgs(args, params, spans);
 	} catch (error) {
 		if (!(error instanceof MacroArgumentError)) throw error;
 		yield {
@@ -10132,9 +10502,7 @@ function* argPieces(args, offset, params, macro, label) {
 		};
 		return;
 	}
-	const inStrings = CODE_IN_STRINGS[macro.toLowerCase()] ?? {};
-	const passageStrings = PASSAGE_STRINGS[macro.toLowerCase()] ?? [];
-	let cursor = 0;
+	const name = macro.toLowerCase();
 	/** The pieces of the parameters `list`, with their values in `from`. */
 	function* visit(list, from) {
 		for (const param of list) {
@@ -10143,32 +10511,57 @@ function* argPieces(args, offset, params, macro, label) {
 				yield* visit(param.parameters, value ?? {});
 				continue;
 			}
-			if (typeof value !== "string" || !value.trim()) continue;
-			const at = locate(args, value, cursor);
-			if (at >= cursor) cursor = at + value.length;
-			const goal = codeGoal(param) ?? inStrings[param.name];
+			const span = spans.get(param);
+			if (typeof value !== "string" || !value.trim() || !span) continue;
+			const [start, end] = span;
+			const written = args.slice(start, end);
+			/** The name as written (quotes included), at the argument. */
+			const passage = (passageName) => ({
+				kind: "passage",
+				name: passageName,
+				offset: offset + start,
+				length: end - start,
+				macro: name,
+				label
+			});
+			const goal = codeGoal(param);
+			if (param.type === "passage") {
+				const target = passageTarget(value);
+				if (target.kind === "name") {
+					yield passage(target.name);
+					continue;
+				}
+			}
 			if (goal) {
 				const piece = {
 					kind: "code",
 					code: value,
-					offset: offset + at,
+					offset: offset + start,
 					goal,
 					label
 				};
-				if (param.type === "passage") piece.passage = true;
+				if (param.type === "passage") {
+					piece.passage = true;
+					piece.macro = name;
+				}
 				yield piece;
+				continue;
 			}
-			const name = param.type === "passage" ? readWholeQuoted(value.trim()) : passageStrings.includes(param.name) ? value : null;
-			if (name !== null) yield {
-				kind: "passage",
-				name,
-				offset: offset + at,
-				label
+			const at = offset + start + (value !== written && /^["']/.test(written) ? 1 : 0);
+			const holds = stringHolds(param);
+			if (holds === "expression" || holds === "statements") yield {
+				kind: "code",
+				code: value,
+				offset: at,
+				goal: holds,
+				label,
+				inString: true
 			};
-			if (!goal && (param.type === "text" || param.type === "string")) yield {
+			else if (holds === "passage") yield passage(value);
+			else if (holds === "markup") yield {
 				kind: "text",
 				text: value,
-				offset: offset + at,
+				offset: at,
 				where: `In the ${param.name} of {${macro}}: `
 			};
 		}
@@ -10185,12 +10578,37 @@ function locate(text, part, from) {
 	const anywhere = text.indexOf(part);
 	return anywhere >= 0 ? anywhere : from;
 }
-/** The parameters of the built-in sub-macros that take arguments. */
-var SUB_MACRO_PARAMETERS = { option: [{
-	name: "value",
-	type: "string",
-	required: true
-}] };
+/**
+* The passages the markup `src` (with the `tokens` it tokenizes to) names:
+* `[[…]]` links, the passage argument of `{goto}`, `{include}` and `{link}`
+* (and of macros that declare one), the `goto` and `dialog` actions of
+* `{watch}` (and the `string` and `text` arguments of macros that declare
+* they hold one) and the body of `{dialog}`, in source order. A name written
+* out is a literal; the others are expressions, which name a passage when
+* they run.
+*/
+function collectPassageReferences(src, tokens, parametersOf) {
+	const refs = [];
+	for (const piece of codeAndText(src, tokens, parametersOf)) if (piece.kind === "passage") refs.push({
+		macro: piece.macro,
+		target: {
+			kind: "name",
+			name: piece.name
+		},
+		start: piece.offset,
+		end: piece.offset + piece.length
+	});
+	else if (piece.kind === "code" && piece.passage) refs.push({
+		macro: piece.macro,
+		target: {
+			kind: "expression",
+			expression: piece.code
+		},
+		start: piece.offset,
+		end: piece.offset + piece.code.length
+	});
+	return refs;
+}
 //#endregion
 //#region src/markup/validate.ts
 /**
@@ -10200,8 +10618,15 @@ var SUB_MACRO_PARAMETERS = { option: [{
 * line and column they are at, instead of failing when the passage renders.
 * Tooling runs it too (see src/tooling.ts).
 */
-/** Passages that hold no markup. */
-var NOT_MARKUP = new Set(["StoryVariables", "StoryTransients"]);
+/**
+* Passages that hold no markup: declarations, and the JavaScript function
+* body of SaveTitle.
+*/
+var NOT_MARKUP = new Set([
+	"StoryVariables",
+	"StoryTransients",
+	"SaveTitle"
+]);
 var NOT_MARKUP_TAGS = ["script", "stylesheet"];
 /** Branch macros, which their parent macro renders. */
 var BRANCH_MACROS = new Set([
@@ -10312,7 +10737,7 @@ function validateMarkup(passages, options) {
 			report(passage, base + token.start, `${where}Unknown macro {${token.name}}.${didYouMean(token.name, names, (n) => `{${n}}`)}`);
 		}
 	};
-	const parametersOf = (name) => options.parametersOf?.(name) ?? SUB_MACRO_PARAMETERS[name.toLowerCase()];
+	const parametersOf = options.parametersOf ?? (() => void 0);
 	/**
 	* Check `tokens`, the tokens of `src`, which starts at `base` in the
 	* passage: their macros, the code in them and the markup in their text.
@@ -10358,6 +10783,83 @@ function validateMarkup(passages, options) {
 	for (const [passage, tokens] of parsed) withParseCache(() => checkTokens(passage, passage.content, tokens, 0, ""));
 	return diagnostics;
 }
+new NameMap();
+new NameMap();
+new NameSet();
+/**
+* How a macro argument is read (see components/macros/macro-args.ts). Every
+* declared parameter names one: there is no default.
+* Quoted strings accept `\"`, `\'` and `\\` escapes.
+* - `expression`: code, as written.
+* - `statements`: code run as statements (`{set}`), as written.
+* - `passage`: a passage name: a quoted string or an expression, as written.
+* - `variable`: a variable reference such as `$name` or `"$name"`, as written.
+* - `string`: one quoted string; anything else leaves the argument unset.
+* - `text`: one quoted string, or text with any loose quotes stripped.
+* - `names`: a comma-separated list of names (`@item, @i`).
+* - `delay`: a duration (`2s`, `500ms`, `300`) in milliseconds.
+* - `number`: a number.
+* - `flag`: a keyword, the parameter's name, at the start or end; a boolean.
+* - `separator`: a word (`of`) or `=` separating the parameters before it
+*   from those after it; a boolean.
+* - `options`: keywords, the names of its `parameters`, each followed by a
+*   quoted string or a number unless it is a flag.
+*/
+var PARAMETER_TYPES = [
+	"expression",
+	"statements",
+	"passage",
+	"variable",
+	"string",
+	"text",
+	"names",
+	"delay",
+	"number",
+	"flag",
+	"separator",
+	"options"
+];
+/**
+* What the value of a `string` or `text` argument holds, for the check at
+* story start and for tooling (see code-check.ts):
+* - `markup`: markup the macro renders (`{button}`'s label): its markup
+*   is checked.
+* - `text`: plain text the macro uses as written (`{checkbox}`'s label).
+* - `passage`: a passage name (`{watch}`'s `goto`): the passage must exist.
+* - `expression`, `statements`: code (`{watch}`'s condition and `run`): it
+*   is checked as code, and its variable references against the schema.
+*
+* Without it, the argument of a macro with `interpolate` holds `markup`,
+* any other `text`.
+*/
+var STRING_HOLDS = [
+	"markup",
+	"text",
+	"passage",
+	"expression",
+	"statements"
+];
+/**
+* Throw if a parameter `macro` declares (or an option of one) has no type,
+* or one that isn't a ParameterType: arguments are read by their type, and
+* there is no default. Throw too if it declares what it `holds` wrongly.
+*/
+function checkParameterTypes(macro, parameters) {
+	const holdsFix = `Give a \`string\` or \`text\` parameter one of ${STRING_HOLDS.join(", ")} to hold (see docs/custom-macros.md#what-a-string-holds).`;
+	for (const param of parameters) {
+		const type = param.type;
+		if (!PARAMETER_TYPES.includes(type)) throw parameterError(macro, param, type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`, `Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
+		const holds = param.holds;
+		if (holds !== void 0 && type !== "string" && type !== "text") throw parameterError(macro, param, `is of the type ${type}, which holds what it is`, holdsFix);
+		if (holds !== void 0 && !STRING_HOLDS.includes(holds)) throw parameterError(macro, param, `holds the unknown ${JSON.stringify(holds)}`, holdsFix);
+		if (param.parameters) checkParameterTypes(macro, param.parameters);
+	}
+}
+/** The error for the parameter `param` of `macro`: what is wrong, and the fix. */
+function parameterError(macro, param, problem, fix) {
+	return /* @__PURE__ */ new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. ${fix}`);
+}
+new NameMap();
 //#endregion
 //#region src/utils/namespace.ts
 /** The variable name no namespace can hold. */
@@ -10448,58 +10950,84 @@ function parseStoryVariables(content, sigil = "$") {
 	}
 	return schema;
 }
-new NameMap();
-new NameMap();
-new NameSet();
+//#endregion
+//#region src/components/macros/include-args.ts
 /**
-* How a macro argument is read (see components/macros/macro-args.ts). Every
-* declared parameter names one: there is no default.
-* Quoted strings accept `\"`, `\'` and `\\` escapes.
-* - `expression`: code, as written.
-* - `statements`: code run as statements (`{set}`), as written.
-* - `passage`: a passage name: a quoted string or an expression, as written.
-* - `variable`: a variable reference such as `$name` or `"$name"`, as written.
-* - `string`: one quoted string; anything else leaves the argument unset.
-* - `text`: one quoted string, or text with any loose quotes stripped.
-* - `names`: a comma-separated list of names (`@item, @i`).
-* - `delay`: a duration (`2s`, `500ms`, `300`) in milliseconds.
-* - `number`: a number.
-* - `flag`: a keyword, the parameter's name, at the start or end; a boolean.
-* - `separator`: a word (`of`) or `=` separating the parameters before it
-*   from those after it; a boolean.
-* - `options`: keywords, the names of its `parameters`, each followed by a
-*   quoted string or a number unless it is a flag.
+* The parameters of `{include}`. A standalone `inline` flag only counts
+* outside quotes and brackets, so passage names and expressions containing
+* the word stay intact (#201).
 */
-var PARAMETER_TYPES = [
-	"expression",
-	"statements",
-	"passage",
-	"variable",
-	"string",
-	"text",
-	"names",
-	"delay",
-	"number",
-	"flag",
-	"separator",
-	"options"
-];
+var INCLUDE_PARAMETERS = [{
+	name: "inline",
+	type: "flag"
+}, {
+	name: "passage",
+	type: "passage",
+	required: true
+}];
 /**
-* Throw if a parameter `macro` declares (or an option of one) has no type,
-* or one that isn't a ParameterType: arguments are read by their type, and
-* there is no default.
+* The arguments of `{include}`: whether it has the `inline` flag, as its
+* first or last word, and the passage expression that is left.
 */
-function checkParameterTypes(macro, parameters) {
-	for (const param of parameters) {
-		const type = param.type;
-		if (!PARAMETER_TYPES.includes(type)) {
-			const problem = type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`;
-			throw new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
-		}
-		if (param.parameters) checkParameterTypes(macro, param.parameters);
-	}
+function splitIncludeFlag(rawArgs) {
+	const { inline, passage } = parseMacroArgs(rawArgs, INCLUDE_PARAMETERS);
+	return {
+		inline,
+		passage
+	};
 }
-new NameMap();
+//#endregion
+//#region src/transform.ts
+/**
+* The sigil transform: the story's code with its variable references
+* (`$var`, `_var`, `@var`, `%var`) turned into the namespace lookups the
+* expression engine runs. Pure string-to-string, so tooling can use it
+* (see src/tooling.ts).
+*/
+var TRANSFORM_CACHE_MAX = 500;
+var NAMESPACES = {
+	$: "variables",
+	_: "temporary",
+	"@": "locals",
+	"%": "transient"
+};
+/** Ends with an identifier character. */
+var IDENT_END_RE = /[\p{ID_Continue}$\u200c\u200d]$/u;
+/**
+* Transform expression: $var → variables["var"], _var → temporary["var"],
+* @var → locals["var"], %var → transient["var"].
+* The lexer (`lexJs`) finds the references: only in code (string, template
+* and regex literal text and comments are left untouched), only where an
+* identifier starts (not in `a$b`, nor as the property name in `obj._x`),
+* and `%var` only where an operand is expected, since `%` is also the
+* modulo operator. `goal` tells whether `expr` is an expression or a list of
+* statements, as that decides whether a leading `{` opens an object literal
+* or a block. A reference to a variable named `__proto__` throws a
+* SyntaxError: no namespace can hold one (see utils/namespace.ts).
+*  */
+function transform(expr, goal = "expression") {
+	const key = goal === "statements" ? "s" + expr : "e" + expr;
+	const cached = transformCache.get(key);
+	if (cached !== void 0) return cached;
+	const { refs } = parseCode(expr, goal);
+	let result = "";
+	let at = 0;
+	for (const ref of refs) {
+		const error = variableNameError(ref.name, ref.sigil + ref.name);
+		if (error) throw new SyntaxError(`spindle: ${error}`);
+		result += expr.slice(at, ref.start);
+		if (ref.shorthand) result += `${ref.name}: `;
+		else if (IDENT_END_RE.test(result.slice(-2))) result += " ";
+		result += `${NAMESPACES[ref.sigil]}["${ref.name}"]`;
+		at = ref.end;
+	}
+	result += expr.slice(at);
+	if (transformCache.size >= TRANSFORM_CACHE_MAX) transformCache.delete(transformCache.keys().next().value);
+	transformCache.set(key, result);
+	return result;
+}
+/** Transformed code by goal and source. */
+var transformCache = /* @__PURE__ */ new Map();
 //#endregion
 //#region src/tooling.ts
 /**
@@ -10516,23 +11044,31 @@ new NameMap();
 */
 function validateStoryMarkup(passages, macros, options = {}) {
 	const list = [...passages];
+	const all = [...macros];
 	const known = /* @__PURE__ */ new Set();
-	const parameters = /* @__PURE__ */ new Map();
 	const blocks = new Set(blockWidgetNames(list).map((n) => n.toLowerCase()));
-	for (const macro of macros) {
+	for (const macro of all) {
 		const name = macro.name.toLowerCase();
 		known.add(name);
-		parameters.set(name, macro.parameters);
 		for (const sub of macro.subMacros) known.add(sub.toLowerCase());
 		if (macro.block) blocks.add(name);
 	}
 	return validateMarkup(list, {
 		isKnownMacro: (name) => known.has(name),
 		macroNames: known,
-		parametersOf: (name) => parameters.get(name),
+		parametersOf: parameterLookup(all),
 		isBlockMacro: (name) => blocks.has(name.toLowerCase()) || isBlockMacro(name),
 		checkPassageNames: options.checkPassageNames
 	});
 }
+/**
+* The passages the markup of `source` names (see PassageReference), against
+* the given macros: what the story-start check looks up. Malformed tags are
+* skipped, so it reads half-typed markup.
+*/
+function collectStoryPassageReferences(source, macros) {
+	const { tokens } = tokenizeMarkupTolerant(source);
+	return collectPassageReferences(source, tokens, parameterLookup(macros));
+}
 //#endregion
-export { checkParameterTypes, formatDiagnostic, parseStoryVariables, validateStoryMarkup };
+export { MarkupError, SIGIL_SCOPES, checkParameterTypes, collectStoryPassageReferences, endsWithOperator, evaluatePassageName, findCodeEnd, formatDiagnostic, isSigil, lexJs, lexTemplate, parseSelectors, parseStoryVariables, passageTarget, readQuoted, scanStringLiteral, splitArgs, splitIncludeFlag, splitTopLevel, stripLooseQuotes, tokenizeMarkup, tokenizeMarkupTolerant, transform, unescapeQuoted, validateStoryMarkup };