@@ -722,29 +722,28 @@ class HtmlGenerator extends Generator {
 		// `skip.text` populates `contentEnd` (raw-text body end) without
 		// materializing text nodes; `</script` stays escaped, so CSP hashes match
 		// the exact bytes the browser sees.
-		const {
-			Field,
-			Flag,
-			NodeType,
-			_attrRawValue,
-			_contentEndOf,
-			_contentStartOf,
-			_endOf,
-			_nameEndOf,
-			_startOf,
-			_valueStartOf
-		} = getHtmlParser();
+		const { Field, Flag, NodeType, Part } = getHtmlParser();
 		const { SourceProcessor } = getHtmlSyntax();
+		/**
+		 * Where an element's content starts; a parser-inserted one has no tag, so
+		 * its content starts where it does.
+		 * @param {import("./syntax-parser").HtmlPath} path the element's path
+		 * @returns {number} the offset
+		 */
+		const contentStart = (path) => {
+			const start = path.startOf(Part.content);
+			return start === -1 ? path.start() : start;
+		};
 		new SourceProcessor()
 			.use({
 				[NodeType.Element]: {
 					enter: (path) => {
 						const name = path.name();
 						if (name === "head") {
-							if (headOpen < 0) headOpen = headEnd = _contentStartOf(path.node);
+							if (headOpen < 0) headOpen = headEnd = contentStart(path);
 							headDepth++;
 						} else if (name === "body") {
-							if (bodyOpen < 0) bodyOpen = bodyEnd = _contentStartOf(path.node);
+							if (bodyOpen < 0) bodyOpen = bodyEnd = contentStart(path);
 							bodyDepth++;
 						}
 					},
@@ -761,7 +760,7 @@ class HtmlGenerator extends Generator {
 							if (bodyDepth > 0) bodyDepth--;
 							return;
 						}
-						const end = _endOf(path.node);
+						const end = path.end();
 						if (headDepth > 0 && end > headEnd) headEnd = end;
 						if (bodyDepth > 0 && end > bodyEnd) bodyEnd = end;
 						if (
@@ -777,8 +776,11 @@ class HtmlGenerator extends Generator {
 						const count = path.fieldCount(Field.attributes);
 						for (let i = 0; i < count; i++) {
 							const attr = path.field(i, Field.attributes);
+							const valueStart = path.startOf(Part.value, attr);
 							attrs[path.name(attr)] =
-								_valueStartOf(attr) === -1 ? true : _attrRawValue(attr);
+								valueStart === -1
+									? true
+									: path.source(valueStart, path.endOf(Part.value, attr));
 						}
 						const isRawText = name === "script" || name === "style";
 						tags.push({
@@ -787,12 +789,12 @@ class HtmlGenerator extends Generator {
 							injectTo: bodyDepth > 0 ? "body" : "head"
 						});
 						spans.push({
-							start: _startOf(path.node),
-							openEnd: _contentStartOf(path.node),
+							start: path.start(),
+							openEnd: path.startOf(Part.content),
 							end,
 							location: bodyDepth > 0 ? "body" : "head",
-							nameEnd: isRawText ? _nameEndOf(path.node) : -1,
-							contentEnd: isRawText ? _contentEndOf(path.node) : -1,
+							nameEnd: isRawText ? path.endOf(Part.name) : -1,
+							contentEnd: isRawText ? path.endOf(Part.content) : -1,
 							selfClosing: path.flag(Flag.selfClosing)
 						});
 						originals.push(snapshotAttrs(attrs));
 
@@ -4930,25 +4930,10 @@ const _closeTagOf = (n) => {
 const _startOf = (n) => (n < 0 ? _attrNameStarts[-n] : _nodeStarts[n]);
 /** @type {(n: HtmlNodeRef) => number} where a node or attribute ends */
 const _endOf = (n) => (n < 0 ? _attrEnd(-n) : _nodeEnds[n]);
-/** @type {(n: HtmlNodeRef) => number} where a tag or attribute name starts (0 for a parser-inserted tag) */
-const _nameStartOf = (n) => {
-	if (n < 0) return _attrNameStarts[-n];
-	return _nodeNameEnds[n] === 0 ? 0 : _nodeStarts[n] + 1;
-};
 /** @type {(n: HtmlNodeRef) => number} where a tag or attribute name ends (0 for a parser-inserted tag) */
 const _nameEndOf = (n) => (n < 0 ? _attrNameEnds[-n] : _nodeNameEnds[n]);
-/** @type {(a: HtmlAttributeRef) => number} where an attribute's value starts (-1 without one) */
-const _valueStartOf = (a) => (a < 0 ? _attrValueStarts[-a] : -1);
-/** @type {(a: HtmlAttributeRef) => number} where an attribute's value ends (-1 without one) */
-const _valueEndOf = (a) =>
-	a < 0 && _attrValueStarts[-a] !== -1 ? _attrValueEnds[-a] : -1;
 /** @type {(n: HtmlNodeRef) => number} where an element's opening tag ends */
 const _contentStartOf = (n) => _nodeTagEnds[n];
-/** @type {(n: HtmlNodeRef) => number} under `skip.text`, where a raw-text element's body ends (`tagEnd` when empty) */
-const _contentEndOf = (n) =>
-	(_S._nodeFlags[n] & FLAG_HAS_TEMPLATE) !== 0
-		? _nodeTagEnds[n]
-		: _nodeContentEnds[n];
 
 /** @type {(n: HtmlNodeRef) => number} how many attributes an element has */
 const _attributeCountOf = (n) => _nodeAttrCounts[n];
@@ -4960,9 +4945,6 @@ const _attributeAt = (i, n) => _nodeAttrStarts[n] + i;
 const _findAttribute = (name, n) =>
 	_findAttr(_nodeAttrStarts[n], _nodeAttrCounts[n], name);
 
-/** @type {(a: number) => string} an attribute's value as written, by its path id */
-const _attrRawValue = (a) => _attrValueOf(-a);
-
 /** @type {(i: number) => string} an attribute's name */
 const _attrNameOf = (i) => _attrNames[i];
 
@@ -5579,7 +5561,7 @@ const internLowerName = (table, input, start, end) => {
 		table.noted[memoSlot] = 1;
 		table.sourceBacked.push(memoSlot);
 	}
-	return (memo[memoSlot] = _asciiLowerCase(input.slice(start, end)));
+	return (memo[memoSlot] = asciiLowercase(input.slice(start, end)));
 };
 
 // Every tag name the tree builder compares against (the sets above already
@@ -8389,7 +8371,7 @@ const handleDoctypeToken = (
 	tok.name =
 		nameStart === -1
 			? ""
-			: _asciiLowerCase(doctypePart(input, nameStart, nameEnd));
+			: asciiLowercase(doctypePart(input, nameStart, nameEnd));
 	tok.publicId =
 		publicStart === -1 ? null : doctypePart(input, publicStart, publicEnd);
 	tok.systemId =
@@ -9977,14 +9959,12 @@ const _minifyStyleAttribute = (raw) => {
 };
 
 /**
- * Trim ASCII whitespace, which is all these grammars skip — `String#trim` also
- * eats NBSP and the other Unicode spaces, which they read as ordinary
- * characters (a leading NBSP makes an integer unparsable, and is a class token
- * of its own).
+ * Infra's strip leading and trailing ASCII whitespace: `String#trim` also eats
+ * NBSP and the other Unicode spaces, which HTML's grammars read as characters.
  * @param {string} value the value
  * @returns {string} the trimmed value
  */
-const _asciiTrim = (value) => {
+const stripAsciiWhitespace = (value) => {
 	let start = 0;
 	let end = value.length;
 	while (start < end && isAsciiWhitespace(value.charCodeAt(start))) start++;
@@ -10000,7 +9980,7 @@ const _asciiTrim = (value) => {
  * @returns {string} the normalized list
  */
 const _normalizeViewport = (raw) =>
-	_asciiTrim(raw)
+	stripAsciiWhitespace(raw)
 		.replace(/[\t\n\f\r ]*([,;=])[\t\n\f\r ]*/g, "$1")
 		.replace(/[\t\n\f\r ]+/g, " ");
 
@@ -10055,8 +10035,10 @@ const _minimalAttributeValue = (value) => {
 const _isRedundantAttribute = (markers, defaults, tagName, name, value) => {
 	// Looked up by what the value says, not how it was spelled — guarded on the
 	// `&` so a value carrying no reference pays nothing.
-	const lowered = _asciiLowerCase(
-		_asciiTrim(value.includes("&") ? decodeEntities(value, true) : value)
+	const lowered = asciiLowercase(
+		stripAsciiWhitespace(
+			value.includes("&") ? decodeEntities(value, true) : value
+		)
 	);
 	// `<script type>`: only a spelling that names JavaScript, which is what the
 	// element already runs. `module` and the empty spelling say something.
@@ -10093,9 +10075,11 @@ const _isRemovableEmptyAttribute = (elementName, name, value) => {
 	if (on === undefined || (on !== null && !on.has(elementName))) return false;
 	// Read decoded: a reference is how a value is spelled, not what it says, and
 	// the tokenizer hands the element the same empty either way. Guarded on the
-	// `&`, and `_asciiTrim` returns the input when there is nothing to trim.
+	// `&`, and `stripAsciiWhitespace` returns the input when there is nothing to trim.
 	return (
-		_asciiTrim(value.includes("&") ? decodeEntities(value, true) : value) === ""
+		stripAsciiWhitespace(
+			value.includes("&") ? decodeEntities(value, true) : value
+		) === ""
 	);
 };
 
@@ -10137,8 +10121,8 @@ const _isCssStyleElement = (path, element) => {
 		// Read the way `_scriptType` reads its own: the value the spec matches is
 		// the one the parser read, so a reference is decoded first.
 		const raw = attribute.value;
-		const value = _asciiLowerCase(
-			_asciiTrim(raw.includes("&") ? decodeEntities(raw, true) : raw)
+		const value = asciiLowercase(
+			stripAsciiWhitespace(raw.includes("&") ? decodeEntities(raw, true) : raw)
 		);
 		return value === "" || value === "text/css";
 	}
@@ -10704,7 +10688,7 @@ const _attributeDataUrl = (tagName, name, value) => {
 	if (elements === undefined || (elements !== null && !elements.has(tagName))) {
 		return null;
 	}
-	const url = _asciiTrim(value);
+	const url = stripAsciiWhitespace(value);
 	// The URL parser drops every tab and newline, so a payload holding one is
 	// not the text the browser reads.
 	if ((url.charCodeAt(0) | 0x20) !== 0x64 || /[\t\n\r]/.test(url)) return null;
@@ -10835,7 +10819,9 @@ const _normalizeTokenList = (raw, isSet, sort) => {
 	}
 	if (!dirty && tokenStart === -1 && length !== 0) dirty = true;
 	if (!dirty && count === 0) return raw;
-	const collapsed = dirty ? _asciiTrim(raw).replace(/[\t\n\f\r ]+/g, " ") : raw;
+	const collapsed = dirty
+		? stripAsciiWhitespace(raw).replace(/[\t\n\f\r ]+/g, " ")
+		: raw;
 	if (dirty && !collapsed.includes(" ")) return collapsed;
 	if (!isSet) return collapsed;
 	// Cutting the list into tokens is the allocation this runs often enough to
@@ -10941,7 +10927,7 @@ const _sortedTokenList = (collapsed) => {
 const _normalizeCommaList = (raw) =>
 	raw
 		.split(",")
-		.map((item) => _asciiTrim(item))
+		.map((item) => stripAsciiWhitespace(item))
 		.join(",");
 
 /**
@@ -10955,7 +10941,7 @@ const _normalizeCommaList = (raw) =>
  * @returns {string} the normalized integer
  */
 const _normalizeInteger = (raw, signed) => {
-	const value = _asciiTrim(raw);
+	const value = stripAsciiWhitespace(raw);
 	if (!(signed ? /^[+-]?\d+$/ : /^\d+$/).test(value)) return raw;
 	const negative = value.charCodeAt(0) === 0x2d;
 	const digits = value.replace(/^[+-]/, "").replace(/^0+(?=\d)/, "");
@@ -10993,7 +10979,7 @@ const _rewriteAttributeValue = (element, name, raw, viewport, enumeratedOn) => {
 			// Case-insensitively, and nothing else: an enumerated attribute names a
 			// keyword, so `type="time "` is not `time` — it is the value no keyword
 			// matches, which puts the input in its default state.
-			const lowered = _asciiLowerCase(raw);
+			const lowered = asciiLowercase(raw);
 			// A value the spec does not enumerate is left exactly as written:
 			// `target` names a browsing context, and `type` on a custom element
 			// means what it says.
@@ -11029,7 +11015,7 @@ const _rewriteAttributeValue = (element, name, raw, viewport, enumeratedOn) => {
 		? URL_ATTRIBUTES.get(name)
 		: undefined;
 	if (urlOn !== undefined && (urlOn === null || urlOn.has(element))) {
-		return _asciiTrim(raw);
+		return stripAsciiWhitespace(raw);
 	}
 	const integerOn = _transforms.normalizeNumericAttributes
 		? INTEGER_ATTRIBUTES.get(name)
@@ -11054,8 +11040,10 @@ const _isViewportMeta = (path) => {
 		if (attribute.name === "name") {
 			const value = attribute.value;
 			return (
-				_asciiLowerCase(
-					_asciiTrim(value.includes("&") ? decodeEntities(value, true) : value)
+				asciiLowercase(
+					stripAsciiWhitespace(
+						value.includes("&") ? decodeEntities(value, true) : value
+					)
 				) === "viewport"
 			);
 		}
@@ -11088,7 +11076,7 @@ const _normalizeSrcset = (raw) => {
 		let descriptor = raw.slice(end, nextStart);
 		const comma = descriptor.indexOf(",");
 		if (comma !== -1) descriptor = descriptor.slice(0, comma);
-		descriptor = _asciiTrim(descriptor).replace(/[\t\n\f\r ]+/g, " ");
+		descriptor = stripAsciiWhitespace(descriptor).replace(/[\t\n\f\r ]+/g, " ");
 		// A descriptor-less URL runs to the next whitespace, so without one it
 		// would swallow the separating comma and the URL behind it.
 		if (i !== 0) out += previousBare ? ", " : ",";
@@ -11099,13 +11087,13 @@ const _normalizeSrcset = (raw) => {
 };
 
 /**
- * ASCII-lowercase a name or a keyword value, which is all HTML folds — a Unicode
- * `toLowerCase` maps characters the parser leaves alone (U+212A onto `k`).
- * Returns the input untouched when there is nothing to fold (the common case).
+ * Infra's ASCII lowercase, which is all HTML folds: `toLowerCase` also maps
+ * characters the parser leaves alone (U+212A onto `k`). Returns the input
+ * itself when there is nothing to fold.
  * @param {string} value source name or value
  * @returns {string} the value as the parser would match it
  */
-const _asciiLowerCase = (value) => {
+const asciiLowercase = (value) => {
 	for (let i = 0; i < value.length; i++) {
 		const c = value.charCodeAt(i);
 		if (c >= 0x41 && c <= 0x5a) {
@@ -11410,7 +11398,7 @@ const _minifyOpenTag = (path, open) => {
 		if (!folds) return open;
 	}
 	const sourceName = open.slice(1, nameEnd);
-	const elementName = html ? _asciiLowerCase(sourceName) : sourceName;
+	const elementName = html ? asciiLowercase(sourceName) : sourceName;
 	let out = `<${elementName}`;
 	const isViewportMeta =
 		html && _nodeStrings[node] === "meta" && _isViewportMeta(path);
@@ -11638,7 +11626,7 @@ const _minifyOpenTag = (path, open) => {
 						_transforms.collapseBooleanAttributes &&
 						(_transforms.collapseBooleanAttributes === "all" ||
 							(presence.length === attributeName.length &&
-								_asciiLowerCase(presence) === attributeName)) &&
+								asciiLowercase(presence) === attributeName)) &&
 						_isBooleanAttribute(elementName, attributeName)))
 			) {
 				out += ` ${attributeName}`;
@@ -11685,7 +11673,7 @@ const _minifyOpenTag = (path, open) => {
 						: rawValue
 					: null;
 
-			if (handler !== null && _asciiTrim(handler) !== "") {
+			if (handler !== null && stripAsciiWhitespace(handler) !== "") {
 				const delimiter = sourceDelimiter;
 				// A foreign `/>` reads back whether this value ends unquoted, which a
 				// deferred answer is not there to decide: the source's quoting stands.
@@ -12086,7 +12074,7 @@ const _elementCloseTag = (path, name, open, innerEmpty, minify) => {
 		) {
 			return `</${name}>`;
 		}
-		return `</${_asciiLowerCase(_closeTagOf(path.node).slice(2, -1)).trim() || name}>`;
+		return `</${asciiLowercase(_closeTagOf(path.node).slice(2, -1)).trim() || name}>`;
 	}
 	const sourceClose = _closeTagOf(path.node);
 	return sourceClose === "" ? `</${name}>` : sourceClose;
@@ -12392,7 +12380,7 @@ const _isHiddenInput = (path, node) => {
 	for (let i = 0, n = _attributeCountOf(node); i < n; i++) {
 		const a = _attributeAt(i, node);
 		if (_attrNameOf(a) === "type") {
-			return _asciiLowerCase(_attrValueOf(a)) === "hidden";
+			return asciiLowercase(_attrValueOf(a)) === "hidden";
 		}
 	}
 	return false;
@@ -12590,7 +12578,7 @@ const _digest = (root) => {
 	let pendingText = "";
 	let pendingDepth = 0;
 	const flushText = () => {
-		const text = _asciiTrim(pendingText);
+		const text = stripAsciiWhitespace(pendingText);
 		pendingText = "";
 		if (text !== "") out.push(`${pendingDepth}\u0001t\u0001${text}`);
 	};
@@ -12672,7 +12660,7 @@ const _digest = (root) => {
 						html &&
 						a.value.length === a.name.length &&
 						_isBooleanAttribute(elementName, a.name) &&
-						_asciiLowerCase(a.value) === a.name
+						asciiLowercase(a.value) === a.name
 							? ""
 							: decodeEntities(a.value, true)
 					}`
@@ -14379,25 +14367,16 @@ module.exports.QUOTE_NONE = QUOTE_NONE;
 module.exports.QUOTE_SINGLE = QUOTE_SINGLE;
 module.exports.SVG_TYPE = SVG_TYPE;
 module.exports._S = _S;
-module.exports._attrRawValue = _attrRawValue;
 module.exports._attributeCountOf = _attributeCountOf;
 module.exports._attributeList = _attributeList;
-module.exports._contentEndOf = _contentEndOf;
-module.exports._contentStartOf = _contentStartOf;
 module.exports._dataOf = _dataOf;
-module.exports._endOf = _endOf;
-module.exports._nameEndOf = _nameEndOf;
-module.exports._nameStartOf = _nameStartOf;
-module.exports._startOf = _startOf;
-module.exports._valueEndOf = _valueEndOf;
-module.exports._valueStartOf = _valueStartOf;
 module.exports._firstChild = _firstChild;
 module.exports._tagNameOf = _tagNameOf;
 module.exports._namespaceOf = _namespaceOf;
 module.exports._nextSibling = _nextSibling;
 module.exports._parentOf = _parentOf;
-module.exports._asciiLowerCase = _asciiLowerCase;
-module.exports._asciiTrim = _asciiTrim;
+module.exports.asciiLowercase = asciiLowercase;
+module.exports.stripAsciiWhitespace = stripAsciiWhitespace;
 module.exports._attributePrints = _attributePrints;
 module.exports._canOmitEndTag = _canOmitEndTag;
 module.exports._canOmitStartTag = _canOmitStartTag;
@@ -14430,8 +14409,6 @@ module.exports._synthesizeOpenTag = _synthesizeOpenTag;
 module.exports._takeRenderedSheet = _takeRenderedSheet;
 module.exports._rendersNow = _rendersNow;
 module.exports._sheetDecides = _sheetDecides;
-module.exports._SHEET_LEADING_AT_RULE_REGEXP = _SHEET_LEADING_AT_RULE_REGEXP;
-module.exports._mergeableStyleAfter = _mergeableStyleAfter;
 module.exports._onlyTextChild = _onlyTextChild;
 module.exports._sheetClosing = _sheetClosing;
 module.exports._styleRunText = _styleRunText;