@janga/norna 0.7.9 → 0.7.11

package/examples/feature-demos/theme-presets/site/routes/030-project/route-content.md

@@ -0,0 +1,34 @@
+---
+title: Project
+description: A complete theme preset for project and product websites.
+navigation:
+  label: Project
+---
+
+## Project {#project}
+
+This route uses the complete `project` preset without overrides. It provides a
+compact, neutral presentation for project overviews, feature descriptions and
+practical documentation.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed posuere
+consectetur est at lobortis. Cras mattis consectetur purus sit amet fermentum.
+Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.
+
+### Practical explanations
+
+Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Donec sed odio
+dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget
+lacinia odio sem nec elit.
+
+```norna-image-stack
+- image: grass-puppy.jpg
+  alt: A puppy standing in green grass.
+  caption: Puppy in grass. Photo by Bicanski, CC0, via Pixnio.
+- image: grey-street-dog.jpg
+  alt: A grey dog standing on a paved street.
+  caption: Grey dog on pavement. Photo by Bicanski, CC0, via Pixnio.
+- image: boxer-portrait.jpg
+  alt: A brown boxer-type dog looking at the camera.
+  caption: Brown dog portrait. Photo by Bicanski, CC0, via Pixnio.
+```

package/examples/feature-demos/theme-presets/site/routes/030-project/theme.md

@@ -0,0 +1,3 @@
+---
+preset: project
+---

package/examples/feature-demos/theme-presets/site/routes/040-statement/route-content.md

@@ -0,0 +1,34 @@
+---
+title: Statement
+description: A stronger typography preset for short declarative content.
+navigation:
+  label: Statement
+---
+
+## Statement {#statement}
+
+This route uses the complete `statement` preset without overrides. Its airy
+layout, stronger typography and alternating surfaces suit short, declarative
+content with a more editorial voice.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec id elit non mi
+porta gravida at eget metus. Integer posuere erat a ante venenatis dapibus
+posuere velit aliquet.
+
+### Short emphasis
+
+Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Aenean
+lacinia bibendum nulla sed consectetur. Maecenas sed diam eget risus varius
+blandit sit amet non magna.
+
+```norna-image-stack
+- image: sheepdog-grass.jpg
+  alt: A sheepdog puppy sitting in green grass.
+  caption: Sheepdog puppy in grass. Photo by Bicanski, CC0, via Pixnio.
+- image: sheepdog-wide.jpg
+  alt: A sheepdog puppy lying outdoors.
+  caption: Sheepdog puppy outdoors. Photo by Bicanski, CC0, via Pixnio.
+- image: black-pedigree.jpg
+  alt: A black dog standing in grass.
+  caption: Black pedigree dog portrait. Photo by Bicanski, CC0, via Pixnio.
+```

package/examples/feature-demos/theme-presets/site/routes/040-statement/theme.md

@@ -0,0 +1,3 @@
+---
+preset: statement
+---

package/examples/feature-demos/theme-presets/site/sitewide-content.md

@@ -0,0 +1,14 @@
+---
+navigation:
+  brand: Theme Presets
+footer:
+  copyrightMessage: Dog photos by Bicanski, CC0, via Pixnio.
+  buildInfo:
+    enabled: true
+    text: Built
+    dateTimeFormat:
+      locale: en-GB
+      timeZone: UTC
+      dateStyle: short
+      timeStyle: short
+---

package/examples/feature-demos/theme-presets/site/theme.md

@@ -0,0 +1,3 @@
+---
+preset: project
+---

package/fixtures/basic/site/config.mjs

@@ -19,19 +19,6 @@ export default {
 			gallery: 'Images',
 		},
 	},
-	footer: {
-		copyrightMessage: '(c) Fixture Artist.',
-		buildInfo: {
-			enabled: true,
-			text: 'Built',
-			dateTimeFormat: {
-				locale: 'en-GB',
-				timeZone: 'UTC',
-				dateStyle: 'short',
-				timeStyle: 'short',
-			},
-		},
-	},
 	github: {
 		repo: 'owner/fixture-site',
 		branch: 'main',

package/fixtures/basic/site/sitewide-content.md

@@ -0,0 +1,12 @@
+---
+footer:
+  copyrightMessage: (c) Fixture Artist.
+  buildInfo:
+    enabled: true
+    text: Built
+    dateTimeFormat:
+      locale: en-GB
+      timeZone: UTC
+      dateStyle: short
+      timeStyle: short
+---

package/fixtures/basic/site/theme.md

@@ -6,6 +6,6 @@ gallery:
 typography:
   fontFamily: "Arial, 'Helvetica Neue', Helvetica, sans-serif"
   preset: quiet-gallery
-frame:
-  colors: presentation
+presentation:
+  palette: dark
 ---

package/fixtures/content-model-v2/site/content.md

@@ -2,10 +2,7 @@
 title: Content Model v2 Fixture
 description: Internal fixture for Markdown-authoritative Norna content.
 sections:
-  intro:
-    presentation:
-      typography:
-        preset: statement
+  intro: {}
   timed:
     visible:
       from: "2026-01-01"
@@ -15,7 +12,7 @@ sections:
 ## Intro {#intro}
 
 This fixture validates that Markdown defines sections and that section metadata
-is optional. It also checks [inline styles]{.highlight}.
+is optional. It also checks **inline emphasis**.
 
 ```norna-image-stack
 - image: hero.jpg

package/fixtures/content-model-v2/site/theme.md

@@ -3,7 +3,5 @@ typography:
   preset: text-forward
   rhythm: normal
 presentation:
-  inlineStyles:
-    highlight:
-      color: "#b3261e"
+  palette: dark
 ---

package/package.json

@@ -2,7 +2,7 @@
   "name": "@janga/norna",
   "description": "A command-line publishing workflow for simple static sites.",
   "type": "module",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
@@ -51,22 +51,26 @@
     "config:check": "node bin/norna.mjs config:check",
     "content:check": "node bin/norna.mjs content:check",
     "content:sync": "node bin/norna.mjs content:sync",
+    "theme:export": "node bin/norna.mjs theme:export",
     "typography:presets": "node bin/norna.mjs typography presets",
     "typography:show": "node bin/norna.mjs typography show",
     "site:public": "node bin/norna.mjs site:public",
     "images": "node bin/norna.mjs images",
     "build": "node bin/norna.mjs build",
+    "build:pages": "node scripts/build-pages.mjs",
     "build:local": "node bin/norna.mjs build:local",
     "deploy": "node bin/norna.mjs deploy",
     "deploy:commit": "node bin/norna.mjs deploy:commit",
     "deploy:watch": "node bin/norna.mjs deploy:watch",
     "doctor": "node bin/norna.mjs doctor",
-    "demo:build": "node bin/norna.mjs --site-dir examples/dog-gallery/site build",
-    "test": "npm run test:route-model && npm run test:content-check && npm run test:content-model-v2 && npm run test:site-public && npm run test:cli-discovery && npm run test:engine-commands && npm run test:ci-lockfile && npm run test:temporary-visibility && npm run test:fixture:build && npm run package:check",
+    "demo:build": "node bin/norna.mjs --site-dir examples/feature-demos/media-and-surfaces/site build",
+    "test": "npm run test:route-model && npm run test:content-check && npm run test:content-model-v2 && npm run test:theme-presets && npm run test:site-public && npm run test:cli-discovery && npm run test:engine-commands && npm run test:ci-lockfile && npm run test:temporary-visibility && npm run test:fixture:build && npm run test:examples && npm run package:check",
     "test:fixture:build": "node bin/norna.mjs --site-dir fixtures/basic/site build",
+    "test:examples": "node scripts/test-examples.mjs",
     "test:route-model": "node scripts/test-route-model.mjs",
     "test:content-check": "node scripts/test-content-check.mjs",
     "test:content-model-v2": "node scripts/test-content-model-v2.mjs",
+    "test:theme-presets": "node scripts/test-theme-presets.mjs",
     "test:site-public": "node scripts/test-site-public.mjs",
     "test:cli-discovery": "node scripts/test-cli-discovery.mjs",
     "test:engine-commands": "node scripts/test-engine-commands.mjs",
@@ -85,7 +89,8 @@
   },
   "dependencies": {
     "astro": "^7.1.3",
-    "embla-carousel": "^8.6.0"
+    "embla-carousel": "^8.6.0",
+    "satteri": "^0.9.1"
   },
   "devDependencies": {
     "@playwright/test": "^1.61.1"

package/scripts/build-pages.mjs

@@ -0,0 +1,71 @@
+import { cp, mkdir, mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import documentationConfig from '../site/config.mjs';
+import { getExampleSites } from './lib/example-sites.mjs';
+import { runInherit } from './lib/run-command.mjs';
+
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const cliPath = path.join(root, 'bin', 'norna.mjs');
+const distDirectory = path.join(root, 'dist');
+const temporaryDirectory = await mkdtemp(path.join(tmpdir(), 'norna-pages-'));
+const artifactDirectory = path.join(temporaryDirectory, 'artifact');
+const documentationUrl = new URL(documentationConfig.site.url);
+const documentationBasePath = documentationConfig.site.basePath;
+const examples = await getExampleSites(root);
+let artifactStarted = false;
+
+const buildSite = (siteLabel, env = process.env) => runInherit(
+	process.execPath,
+	[cliPath, ...(siteLabel ? ['--site-dir', siteLabel] : []), 'build'],
+	{ cwd: root, env },
+);
+
+try {
+	console.log('Building documentation site');
+	await buildSite();
+	await cp(distDirectory, artifactDirectory, { recursive: true });
+	artifactStarted = true;
+
+	for (const example of examples) {
+		const relativePublicPath = `examples/${example.category}/${example.name}/`;
+		const basePath = `${documentationBasePath.replace(/\/$/, '')}/${relativePublicPath}`;
+		const siteUrl = new URL(relativePublicPath, documentationUrl).href;
+
+		console.log(`\nBuilding ${example.siteLabel} for ${siteUrl}`);
+		await buildSite(example.siteLabel, {
+			...process.env,
+			NORNA_EXAMPLE_BASE_PATH: basePath,
+			NORNA_EXAMPLE_SITE_URL: siteUrl,
+		});
+
+		const destination = path.join(artifactDirectory, relativePublicPath);
+		await mkdir(path.dirname(destination), { recursive: true });
+		await cp(distDirectory, destination, { recursive: true });
+	}
+} finally {
+	if (artifactStarted) {
+		await rm(distDirectory, { recursive: true, force: true });
+		await cp(artifactDirectory, distDirectory, { recursive: true });
+	}
+	await rm(temporaryDirectory, { recursive: true, force: true });
+}
+
+const documentationExamplesHtml = await readFile(path.join(distDirectory, 'examples', 'index.html'), 'utf8');
+
+for (const example of examples) {
+	const relativePublicPath = `examples/${example.category}/${example.name}/`;
+	const basePath = `${documentationBasePath.replace(/\/$/, '')}/${relativePublicPath}`;
+	const siteUrl = new URL(relativePublicPath, documentationUrl).href;
+	const exampleHtml = await readFile(path.join(distDirectory, relativePublicPath, 'index.html'), 'utf8');
+
+	if (!documentationExamplesHtml.includes(`href="${siteUrl}"`)) {
+		throw new Error(`Documentation is missing the rendered example link ${siteUrl}.`);
+	}
+	if (!exampleHtml.includes(`href="${basePath}`) && !exampleHtml.includes(`src="${basePath}`)) {
+		throw new Error(`Rendered example ${relativePublicPath} does not use its deployment base path ${basePath}.`);
+	}
+}
+
+console.log(`\nok - assembled documentation and ${examples.length} rendered examples in dist/`);

package/scripts/check-config.mjs

@@ -1,4 +1,7 @@
-import { siteConfigLabel } from './lib/site-paths.mjs';
+import { siteConfigLabel, sitePublicLabel } from './lib/site-paths.mjs';
+import { getLogoAssets } from './lib/logo-assets.mjs';
+import { readSitewideConfig } from './lib/sitewide-config.mjs';
+import { readThemeConfig, validateRouteThemeFiles } from './lib/theme-config.mjs';
 
 const formatErrorMessage = (error) => {
 	if (error instanceof SyntaxError) {
@@ -17,10 +20,29 @@ const formatErrorMessage = (error) => {
 
 try {
 	const { projectConfig } = await import('./lib/project-config.mjs');
+	const themeConfig = await readThemeConfig();
+	const sitewideConfig = await readSitewideConfig();
+	await validateRouteThemeFiles();
+	const logoAssets = getLogoAssets();
+
+	if (logoAssets.length > 1) {
+		throw new Error([
+			`Found multiple logo files in ${sitePublicLabel}. Keep exactly one of logo.svg, logo.png, logo.jpg, or logo.jpeg.`,
+			...logoAssets.map(({ filename }) => `- ${sitePublicLabel}/${filename}`),
+		].join('\n'));
+	}
+
+	if (logoAssets.length === 0) {
+		console.warn(`Warning: No logo file found in ${sitePublicLabel}. Norna will use sitewide navigation.brand or the homepage title as the navigation label.`);
+		console.warn(`Add exactly one of ${sitePublicLabel}/logo.svg, logo.png, logo.jpg, or logo.jpeg when the site should have a logo.`);
+	} else if (sitewideConfig.navigation?.brand) {
+		console.warn('Warning: Both sitewide navigation.brand and a logo file are configured. The logo is used; navigation.brand is only the text fallback.');
+	}
 
 	console.log('Config check passed.');
 	console.log(`Site URL: ${projectConfig.site.url}`);
 	console.log(`Base path: ${projectConfig.site.basePath}`);
+	console.log(`Theme preset: ${themeConfig.preset ?? '(none)'}`);
 	console.log(`Page width: ${projectConfig.layout.pageWidth}`);
 	console.log(`Gutter: desktop ${projectConfig.layout.gutter.desktop}, mobile ${projectConfig.layout.gutter.mobile}`);
 	console.log(`Layout density: ${projectConfig.layout.density}`);

package/scripts/export-theme-preset.mjs

@@ -0,0 +1,31 @@
+import { writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import {
+	renderThemePresetReference,
+	themePresetNames,
+} from './lib/theme-presets.mjs';
+import { siteDir, siteThemeLabel } from './lib/site-paths.mjs';
+
+const [presetName, ...extraArgs] = process.argv.slice(2);
+
+if (!presetName || extraArgs.length > 0) {
+	throw new Error(`Usage: norna theme:export <preset>\nAvailable presets: ${themePresetNames.join(', ')}`);
+}
+
+const filename = `orig-${presetName}-theme.md`;
+const outputPath = path.join(siteDir, filename);
+const outputLabel = path.posix.join(path.posix.dirname(siteThemeLabel), filename);
+const source = renderThemePresetReference(presetName, siteThemeLabel);
+
+try {
+	await writeFile(outputPath, source, { encoding: 'utf8', flag: 'wx' });
+} catch (error) {
+	if (error?.code === 'EEXIST') {
+		throw new Error(`${outputLabel} already exists. Norna will not overwrite it.`);
+	}
+
+	throw error;
+}
+
+console.log(`Exported the ${presetName} theme preset to ${outputLabel}.`);
+console.log(`Norna still reads ${siteThemeLabel}; use the exported file as an override reference.`);

package/scripts/init-site.mjs

@@ -133,6 +133,7 @@ const galleryScripts = {
 	'norna:config:check': cliCommand('config:check'),
 	'norna:content:check': cliCommand('content:check'),
 	'norna:sync': cliCommand('content:sync'),
+	'norna:theme:export': cliCommand('theme:export'),
 	'norna:typography:presets': cliCommand('typography presets'),
 	'norna:typography:show': cliCommand('typography show'),
 	'norna:public': cliCommand('site:public'),

package/scripts/lib/example-sites.mjs

@@ -0,0 +1,34 @@
+import { existsSync } from 'node:fs';
+import { readdir } from 'node:fs/promises';
+import path from 'node:path';
+
+export const exampleCategories = ['complete-sites', 'feature-demos'];
+
+export const getExampleSites = async (root) => {
+	const examples = [];
+
+	for (const category of exampleCategories) {
+		const categoryDirectory = path.join(root, 'examples', category);
+		const entries = await readdir(categoryDirectory, { withFileTypes: true });
+
+		for (const entry of entries.filter((candidate) => candidate.isDirectory()).sort((a, b) => a.name.localeCompare(b.name))) {
+			const siteDirectory = path.join(categoryDirectory, entry.name, 'site');
+			if (!existsSync(path.join(siteDirectory, 'content.md'))) {
+				throw new Error(`Example ${path.relative(root, siteDirectory)} is missing content.md.`);
+			}
+
+			examples.push({
+				category,
+				name: entry.name,
+				siteDirectory,
+				siteLabel: path.relative(root, siteDirectory),
+			});
+		}
+	}
+
+	if (examples.length === 0) {
+		throw new Error('No example sites were found.');
+	}
+
+	return examples;
+};

package/scripts/lib/frontmatter-yaml.mjs

@@ -20,9 +20,37 @@ const stripInlineComment = (value) => {
 	return value;
 };
 
+const splitInlineList = (value) => {
+	const entries = [];
+	let entryStart = 0;
+	let quote = null;
+
+	for (let index = 0; index < value.length; index += 1) {
+		const character = value[index];
+		const previous = value[index - 1];
+
+		if ((character === '"' || character === "'") && previous !== '\\') {
+			quote = quote === character ? null : quote ?? character;
+			continue;
+		}
+
+		if (character === ',' && quote === null) {
+			entries.push(value.slice(entryStart, index).trim());
+			entryStart = index + 1;
+		}
+	}
+
+	entries.push(value.slice(entryStart).trim());
+	return entries.filter(Boolean);
+};
+
 const parseScalar = (rawValue) => {
 	const value = stripInlineComment(rawValue.trim());
 
+	if (value.startsWith('[') && value.endsWith(']')) {
+		const listValue = value.slice(1, -1).trim();
+		return listValue ? splitInlineList(listValue).map(parseScalar) : [];
+	}
 	if (value === 'true') return true;
 	if (value === 'false') return false;
 	if (/^-?\d+(?:\.\d+)?$/.test(value)) return Number(value);

package/scripts/lib/logo-assets.mjs

@@ -0,0 +1,35 @@
+import { readdirSync } from 'node:fs';
+import { sitePublicDir, sitePublicLabel } from './site-paths.mjs';
+
+const logoFilePattern = /^logo\.(svg|png|jpe?g)$/i;
+
+export const getLogoAssets = () => {
+	let entries;
+
+	try {
+		entries = readdirSync(sitePublicDir, { withFileTypes: true });
+	} catch (error) {
+		if (error?.code === 'ENOENT') return [];
+		throw error;
+	}
+
+	return entries
+		.filter((entry) => entry.isFile() && logoFilePattern.test(entry.name))
+		.map((entry) => ({
+			filename: entry.name,
+			href: `/${entry.name}`,
+		}));
+};
+
+export const getLogoAsset = () => {
+	const assets = getLogoAssets();
+
+	if (assets.length > 1) {
+		throw new Error([
+			`Found multiple logo files in ${sitePublicLabel}. Keep exactly one of logo.svg, logo.png, logo.jpg, or logo.jpeg.`,
+			...assets.map(({ filename }) => `- ${sitePublicLabel}/${filename}`),
+		].join('\n'));
+	}
+
+	return assets[0] ?? null;
+};

package/scripts/lib/norna-markdown-blocks.mjs

@@ -588,6 +588,172 @@ export const splitNornaMarkdownBlockMarkers = (html, options = {}) => {
 
 const normalizeBlockSource = (source) => source.replace(/\r\n?/g, '\n').trim();
 
+const inlineNoteReferenceRegex = /\{note-ref\}/g;
+const inlineNoteDeclarationRegex = /^\s*\{note:\s*(.*)\}\s*$/;
+const inlineNoteDeclarationStartRegex = /\{note(?:\s*:|\s*\})/;
+
+const maskInlineCodeAndComments = (source) => source.replace(
+	/<!--[\s\S]*?-->|(`+)([\s\S]*?)\1/g,
+	(match) => match.replace(/[^\r\n]/g, ' '),
+);
+
+const countInlineNoteReferences = (line) => Array.from(line.matchAll(inlineNoteReferenceRegex)).length;
+
+const formatInlineNoteError = (message, options, line) => ({
+	blockType: 'inline-note',
+	line,
+	message: failMessage(message, { ...options, line }),
+});
+
+const getInlineNoteErrorMessage = () => 'Write the note on its own line as "{note: Your explanatory text.}".';
+
+/**
+ * Finds the deliberately small inline-note syntax while ignoring fenced and
+ * inline code. Notes are paired by position, so no user-authored IDs are
+ * needed. The caller decides whether diagnostics should be fatal.
+ */
+export const extractInlineNoteDiagnostics = (markdown, options = {}) => {
+	const lines = normalizeLines(markdown);
+	const maskedLines = maskInlineCodeAndComments(maskFencedCodeBlocks(markdown)).split('\n');
+	const notes = [];
+	const errors = [];
+	let paragraph = null;
+	let pendingParagraph = null;
+	let noteJustSeen = false;
+
+	const addError = (message, line) => errors.push(formatInlineNoteError(message, options, line));
+
+	const finishParagraph = () => {
+		if (!paragraph) return;
+		if (paragraph.referenceCount > 0) {
+			pendingParagraph = paragraph;
+		}
+		paragraph = null;
+	};
+
+	const reportMissingNote = () => {
+		if (!pendingParagraph) return;
+		addError(
+			`Paragraph on line ${pendingParagraph.referenceLine} contains "{note-ref}" but has no following "{note: ...}".`,
+			pendingParagraph.referenceLine,
+		);
+		pendingParagraph = null;
+	};
+
+	const attachNote = (noteMatch, lineNumber) => {
+		const text = noteMatch[1].trim();
+		if (!text) {
+			addError(`The note on line ${lineNumber} is empty. ${getInlineNoteErrorMessage()}`, lineNumber);
+			pendingParagraph = null;
+			return;
+		}
+
+		if (/!\[[^\]]*\]\([^)]*\)|<img\b/i.test(text)) {
+			addError('Inline notes cannot contain images. Use a Norna image block with a caption instead.', lineNumber);
+			pendingParagraph = null;
+			return;
+		}
+
+		notes.push({
+			markdown: text,
+			referenceLine: pendingParagraph.referenceLine,
+			noteLine: lineNumber,
+		});
+		pendingParagraph = null;
+		noteJustSeen = true;
+	};
+
+	for (let index = 0; index < lines.length; index += 1) {
+		const line = lines[index] ?? '';
+		const maskedLine = maskedLines[index] ?? line;
+		const lineNumber = (options.lineOffset ?? 0) + index + 1;
+		const fence = getFenceInfo(line);
+
+		if (fence && fence.length >= 3) {
+			finishParagraph();
+			reportMissingNote();
+			let closingIndex = -1;
+			for (let candidateIndex = index + 1; candidateIndex < lines.length; candidateIndex += 1) {
+				if (getFenceCloseInfo(lines[candidateIndex], fence)) {
+					closingIndex = candidateIndex;
+					break;
+				}
+			}
+			index = closingIndex === -1 ? lines.length : closingIndex;
+			noteJustSeen = false;
+			continue;
+		}
+
+		const trimmed = line.trim();
+		const maskedTrimmed = maskedLine.trim();
+		const noteMatch = trimmed.match(inlineNoteDeclarationRegex);
+		const looksLikeNoteDeclaration = inlineNoteDeclarationStartRegex.test(maskedTrimmed);
+		const referenceCount = countInlineNoteReferences(maskedLine);
+		const isHeading = /^#{1,6}(?:\s|$)/.test(trimmed);
+
+		if (!trimmed) {
+			finishParagraph();
+			noteJustSeen = false;
+			continue;
+		}
+
+		if (pendingParagraph) {
+			if (noteMatch) {
+				attachNote(noteMatch, lineNumber);
+				continue;
+			}
+
+			if (looksLikeNoteDeclaration) {
+				addError(`Invalid note syntax on line ${lineNumber}. ${getInlineNoteErrorMessage()}`, lineNumber);
+				pendingParagraph = null;
+			} else {
+				reportMissingNote();
+			}
+		}
+
+		if (noteJustSeen) {
+			addError(`Add a blank line after the note on the previous line before starting more text.`, lineNumber);
+			noteJustSeen = false;
+		}
+
+		if (noteMatch || looksLikeNoteDeclaration) {
+			addError(
+				noteMatch
+					? `A "{note: ...}" requires a preceding paragraph containing "{note-ref}".`
+					: `Invalid note syntax on line ${lineNumber}. ${getInlineNoteErrorMessage()}`,
+				lineNumber,
+			);
+			continue;
+		}
+
+		if (isHeading) {
+			if (referenceCount > 0) {
+				addError('Place "{note-ref}" in a paragraph, not in a heading.', lineNumber);
+			}
+			finishParagraph();
+			reportMissingNote();
+			continue;
+		}
+
+		if (!paragraph) {
+			paragraph = {
+				referenceCount: 0,
+				referenceLine: lineNumber,
+			};
+		}
+
+		paragraph.referenceCount += referenceCount;
+		if (referenceCount > 0 && paragraph.referenceCount > 1) {
+			addError('A paragraph may contain only one "{note-ref}".', lineNumber);
+		}
+	}
+
+	finishParagraph();
+	reportMissingNote();
+
+	return { notes, errors };
+};
+
 export const splitNornaRenderedCodeBlocks = (html, rawBlocks, options = {}) => {
 	const blocks = [];
 	const renderedCodeRegex = /<pre\b[^>]*>\s*<code\b[^>]*>([\s\S]*?)<\/code>\s*<\/pre>/g;