diff --git a/.cspell.json b/.cspell.json
index 97c15bb81..690c2cc65 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -22,7 +22,8 @@
 		"tikzcd",
 		"Unif",
 		"Vect",
-		"Xmark"
+		"Xmark",
+		"allowbreak"
 	],
 	"words": [
 		"abelian",
diff --git a/content/Grp_total_explicit_proof.md b/content/Grp_total_explicit_proof.md
index 110c8f14f..f8b0633f2 100644
--- a/content/Grp_total_explicit_proof.md
+++ b/content/Grp_total_explicit_proof.md
@@ -25,7 +25,7 @@ We first need to define a natural transformation
 $$\eta_T : T \to \Hom({-}, L(T)).$$
 For each group $H$ we define the function $\eta_T(H) : T(H) \to \Hom(H, L(T))$ by sending $x \in T(H)$ to the map
 $$H \to L(T), \quad h \mapsto e(T(\widetilde{h})(x)),$$
-where $\widetilde{h} : \IZ \to H$ denotes the homomorphism mapping $1 \mapsto h$, so that $T(\widetilde{h}) : T(H) \to T(\IZ)$. To see that this defines a group homomorphism from $H$ to $L(T)$, for $h,h' \in H$ we define the homomorphism $[h,h'] : \IZ * \IZ' \to H$ by $[h,h'] \circ \iota_1 = \widetilde{h}$ and $[h,h'] \circ \iota_2 = \widetilde{h'}$. Note that $[h,h'] \circ \mu = \widetilde{hh'}$. Hence,
+where $\widetilde{h} : \IZ \to H$ denotes the homomorphism mapping $1 \mapsto h$, so that $T(\widetilde{h}) : T(H) \to T(\IZ)$. To see that this defines a group homomorphism from $H$ to $L(T)$, for $h,h' \in H$ we define the homomorphism $[h,h'] : \IZ * \IZ' \to H$ by $[h,h'] \circ \iota_1 = \widetilde{h}$ and $[h,h'] \circ \iota_2 = \widetilde{h'}$. Note that $[h,h'] \circ \mu = \widetilde{hh'}$. Hence,
 
 $$
 \begin{align*}
diff --git a/src/lib/server/formulas.ts b/src/lib/server/formulas.ts
index af5d8d057..afb9ab8db 100644
--- a/src/lib/server/formulas.ts
+++ b/src/lib/server/formulas.ts
@@ -7,25 +7,196 @@ const MACROS = YAML.parse(
 	fs.readFileSync(path.resolve('database', 'data', 'macros.yaml'), 'utf8')
 ) as Record<string, string>
 
-export const MATH_REGEX = /\$\$(.*?)\$\$|\$(.*?)\$/gs
+// The third group is the punctuation directly after an inline formula
+// (see append_suffix). It does not include ], which would break the syntax
+// of Markdown links.
+export const MATH_REGEX = /\$\$(.*?)\$\$|\$(.*?)\$([.,;:)-]*)/gs
 
+const HTML_START = '<span class="katex-html" aria-hidden="true">'
+
+const SPAN_TAG_REGEX = /<span(?: class="([^"]*)")?[^>]*>|<\/span>/g
+
+type Chunk = {
+	markup: string
+	is_base: boolean
+	is_break_point: boolean
+}
+
+/**
+ * Renders a formula with KaTeX. The optional suffix is punctuation that
+ * directly follows an inline formula in the text, such as a period.
+ */
 export function render_formula(
 	formula: string,
-	options: { displayMode: boolean } = { displayMode: false }
+	options: { displayMode: boolean } = { displayMode: false },
+	suffix = ''
 ): string {
-	return katex.renderToString(formula, {
+	const html = katex.renderToString(formula, {
 		throwOnError: true,
 		macros: MACROS,
 		...options
 	})
+
+	const html_start = html.indexOf(HTML_START)
+	if (html_start === -1) return html + suffix
+
+	const start = html_start + HTML_START.length
+
+	// the unbreakable pieces of the formula (.katex-base), each marked as to
+	// whether a line break after it is preferred, and the index where they end
+	const { chunks, end } = parse_chunks(html, start)
+
+	let head = html.slice(0, start)
+
+	if (suffix) {
+		append_suffix(chunks, suffix)
+		// .katex-html is hidden from screen readers, which read the MathML instead
+		head = head.replace('</math>', `</math>${suffix}`)
+	}
+
+	// replace the content of .katex-html
+	return head + group_chunks(chunks) + html.slice(end)
 }
 
 export function render_formulas(txt: string): string {
-	return txt.replace(MATH_REGEX, (_, display_formula, inline_formula) => {
+	return txt.replace(MATH_REGEX, (_, display_formula, inline_formula, suffix) => {
 		if (display_formula !== undefined) {
 			return render_formula(display_formula, { displayMode: true })
 		}
 
-		return render_formula(inline_formula, { displayMode: false })
+		return render_formula(inline_formula, { displayMode: false }, suffix)
 	})
 }
+
+/**
+ * When a formula does not fit into one line, this makes the line break
+ * happen after a relation (such as =, ⊆, →) rather than after a binary
+ * operator (such as +, ×, ∘).
+ * For example, `a + b = c + d` may break into `a + b =` and `c + d`, but
+ * not into `a +` and `b = c + d`, unless `a + b =` alone is wider than the
+ * line. An explicit `\allowbreak` counts like a relation. This applies to
+ * inline and display formulas.
+ *
+ * Takes the chunks of the HTML output of KaTeX and returns their markup
+ * with the chunks between two relations wrapped into `.formula-group`
+ * elements.
+ */
+function group_chunks(chunks: Chunk[]): string {
+	// without a break point before the last chunk, all chunks would form a
+	// single group, which is pointless since .katex is an inline block anyway
+	const has_inner_break_point = chunks
+		.slice(0, -1)
+		.some((chunk) => chunk.is_break_point)
+	if (!has_inner_break_point) return chunks.map((chunk) => chunk.markup).join('')
+
+	// KaTeX ends a chunk after each relation and binary operator and allows
+	// a line break between any two chunks. We wrap the chunks between two
+	// break points into a .formula-group, which is an inline block (see
+	// app.css), so that a line break inside a group only happens when the
+	// group does not fit into a line on its own.
+	const parts: string[] = []
+	let group: string[] = []
+
+	const close_group = () => {
+		// a single chunk is unbreakable anyway
+		if (group.length <= 1) {
+			parts.push(...group)
+		} else {
+			parts.push(`<span class="formula-group">${group.join('')}</span>`)
+		}
+		group = []
+	}
+
+	for (const chunk of chunks) {
+		// other children, such as line breaks and equation tags, stay as they are
+		if (!chunk.is_base) {
+			close_group()
+			parts.push(chunk.markup)
+			continue
+		}
+
+		group.push(chunk.markup)
+		if (chunk.is_break_point) close_group()
+	}
+
+	close_group()
+
+	return parts.join('')
+}
+
+/**
+ * Browsers allow a line break between an inline block, such as .katex, and
+ * the next character. So punctuation directly after a formula may start a
+ * new line, which always happens when the formula is wider than the line.
+ * To prevent this, the punctuation is moved into the last chunk of the
+ * formula, which is unbreakable. Its font is adjusted in app.css.
+ */
+function append_suffix(chunks: Chunk[], suffix: string) {
+	const markup = `<span class="formula-suffix">${suffix}</span>`
+	const last_chunk = chunks.at(-1)
+
+	if (last_chunk?.is_base) {
+		const closing_tag = '</span>'
+		last_chunk.markup =
+			last_chunk.markup.slice(0, -closing_tag.length) + markup + closing_tag
+	} else {
+		chunks.push({ markup, is_base: false, is_break_point: false })
+	}
+}
+
+/**
+ * Splits the HTML output of KaTeX, which begins at the given index, into
+ * its chunks and determines after which of them a line break is preferred.
+ * Also returns the index where the HTML output ends.
+ */
+function parse_chunks(html: string, start: number): { chunks: Chunk[]; end: number } {
+	const chunks: Chunk[] = []
+	let depth = 0
+	let chunk_start = start
+	let is_base = false
+	let last_classes: string[] = []
+	let has_allowbreak = false
+
+	// the chunks and their children are spans, so the span tags
+	// (with their depth) suffice to find them
+	for (const match of html.slice(start).matchAll(SPAN_TAG_REGEX)) {
+		const index = start + match.index
+
+		if (match[0] === '</span>') {
+			// a closing tag at depth 0 closes .katex-html itself
+			if (depth === 0) return { chunks, end: index }
+
+			depth--
+
+			// the chunk is complete. It is a break point if its last child
+			// (ignoring spaces) is a relation or if it contains an explicit
+			// \allowbreak.
+			if (depth === 0) {
+				chunks.push({
+					markup: html.slice(chunk_start, index + match[0].length),
+					is_base,
+					is_break_point: has_allowbreak || last_classes.includes('mrel')
+				})
+			}
+		} else {
+			const classes = match[1]?.split(' ') ?? []
+
+			// a new chunk begins
+			if (depth === 0) {
+				chunk_start = index
+				is_base = classes.includes('katex-base')
+				last_classes = []
+				has_allowbreak = false
+			}
+			// a child of the current chunk
+			else if (depth === 1) {
+				if (classes.includes('allowbreak')) has_allowbreak = true
+				if (!classes.includes('mspace')) last_classes = classes
+			}
+
+			depth++
+		}
+	}
+
+	throw new Error(`Unexpected HTML output of KaTeX: ${html}`)
+}
diff --git a/src/lib/server/markdown.ts b/src/lib/server/markdown.ts
index ba6457ac3..3d85f63ba 100644
--- a/src/lib/server/markdown.ts
+++ b/src/lib/server/markdown.ts
@@ -130,19 +130,21 @@ md.block.ruler.before(
 
 /**
  * Replaces the math formulas in a markdown text with placeholders and
- * returns a dictionary with the rendered formulas.
+ * returns a dictionary with the rendered formulas. The placeholder of an
+ * inline formula also replaces the punctuation directly after it, which
+ * is rendered with the formula.
  */
 function preprocess_math(content: string) {
 	const formulas: Record<string, string> = {}
 
 	const with_placeholders = content.replace(
 		MATH_REGEX,
-		(_, display_formula, inline_formula) => {
+		(_, display_formula, inline_formula, suffix) => {
 			const placeholder = `@@MATH-${Object.keys(formulas).length}@@`
 
 			formulas[placeholder] =
 				display_formula === undefined
-					? render_formula(inline_formula, { displayMode: false })
+					? render_formula(inline_formula, { displayMode: false }, suffix)
 					: render_formula(display_formula, { displayMode: true })
 
 			return placeholder
diff --git a/src/routes/app.css b/src/routes/app.css
index 9029b6344..91b2aac60 100644
--- a/src/routes/app.css
+++ b/src/routes/app.css
@@ -318,12 +318,39 @@ label {
 }
 
 /* cf. https://katex.org/docs/issues */
+
+/* allow line breaks in display formulas (KaTeX sets nowrap) */
 .katex-display > .katex {
 	white-space: normal;
 }
-.katex-display > .katex > .katex-html > .katex-base {
+
+/* add space between the lines of a broken display formula */
+.katex-display > .katex > .katex-html > .katex-base,
+.katex-display .formula-group > .katex-base {
 	margin: 0.25em 0;
 }
+
+/* compensate by reducing the space around display formulas (KaTeX uses 1em) */
 .katex-display {
 	margin: 0.5em 0;
 }
+
+/* keep formulas and groups of formulas (see formulas.ts) on one line if possible */
+.katex,
+.formula-group {
+	display: inline-block;
+}
+
+/* punctuation after an inline formula (see formulas.ts), in the font of the text */
+.formula-suffix {
+	font-family: var(--text-font);
+	font-size: calc(1em / 1.21); /* undo the font size of .katex */
+}
+
+:is(i, em) .formula-suffix {
+	font-style: italic;
+}
+
+:is(h1, h2, h3) .formula-suffix {
+	font-family: var(--mono-font);
+}