mdeck 3.2.0 → 3.4.0

package/src/components/numbers.js

@@ -0,0 +1,39 @@
+// Numbers typed on a phone for <numeric>. The answer page has its own copy
+// of parseNumber (src/live/answer/answer.js), as it has no build step.
+
+/** 0.5, 0,5, −3, 1e-3 or 1/2 as a number; null for anything else. */
+export function parseNumber(text) {
+  const plain = String(text ?? '').trim().replace(/\s+/g, '').replace(/−/g, '-').replace(/(\d),(\d)/g, '$1.$2')
+  const parts = plain.match(/^([+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?)(?:\/((?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?))?$/i)
+  if (!parts) return null
+  const value = parts[2] ? Number(parts[1]) / Number(parts[2]) : Number(parts[1])
+  return Number.isFinite(value) ? value : null
+}
+
+/**
+ * The answers grouped by value, most frequent first: [{ value, text, n }].
+ * `text` is how most people typed it (0.5, or 1/2). Values that differ only
+ * in the last digits of a float (1/3 and 0.333333333333) count as one.
+ */
+export function groupNumbers(texts) {
+  const groups = new Map()
+  for (const text of texts) {
+    const value = parseNumber(text)
+    if (value == null) continue
+    const key = Number(value.toPrecision(12))
+    const group = groups.get(key) ?? { value, n: 0, spellings: new Map() }
+    const spelling = String(text).trim()
+    group.n++
+    group.spellings.set(spelling, (group.spellings.get(spelling) ?? 0) + 1)
+    groups.set(key, group)
+  }
+  return [...groups.values()]
+    .map(({ value, n, spellings }) => ({ value, n, text: [...spellings].sort((a, b) => b[1] - a[1])[0][0] }))
+    .sort((a, b) => b.n - a.n || a.value - b.value)
+}
+
+/** Whether `value` is the answer, give or take `tolerance` (0: equal, as far as floats go). */
+export function isRightNumber(value, answer, tolerance = 0) {
+  if (value == null || answer == null) return false
+  return Math.abs(value - answer) <= Math.max(tolerance, 1e-9 * Math.max(1, Math.abs(answer)))
+}

package/src/components/poll.css

@@ -5,23 +5,37 @@
 .poll-bars { display: grid; gap: 20px; }
 .poll-row { display: grid; grid-template-columns: minmax(120px, 28%) 1fr 3ch; gap: 24px; align-items: center; }
 .poll-label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+/* buttons="letters|numbers": the key phones show, before the option. */
+.poll-key { display: inline-grid; place-items: center; min-width: 1.6em; height: 1.6em; margin-right: .5em; padding: 0 .3em; border-radius: .4em; background: color-mix(in srgb, var(--accent, #0d9488) 14%, transparent); color: var(--accent, #0d9488); font-weight: 700; font-size: .8em; vertical-align: .1em; }
+/* A picture as an option: a thumbnail beside its bar. */
+.poll-label:has(img) { white-space: normal; }
+.poll-label img { max-height: 3.2em; max-width: 100%; vertical-align: middle; }
+.poll .poll-several { margin: -20px 0 24px; font-size: var(--fs-small, 24px); color: var(--muted, #666); }
 .poll-track { height: 1.1em; background: color-mix(in srgb, var(--ink, #111) 8%, transparent); border-radius: 6px; overflow: hidden; }
 .poll-fill { display: block; height: 100%; background: var(--accent, #0d9488); border-radius: 6px; transition: width .6s cubic-bezier(.2, .8, .2, 1); }
 .poll-count { text-align: right; font-variant-numeric: tabular-nums; font-weight: 600; }
 .poll .poll-total { display: flex; align-items: center; gap: 14px; margin: 36px 0 0; font-size: var(--fs-small, 24px); color: var(--muted, #666); }
 .poll-dot { width: 12px; height: 12px; border-radius: 50%; background: var(--muted, #999); opacity: .5; }
 .poll-dot.is-live { background: #16a34a; opacity: 1; }
-.poll-reset { margin-left: auto; padding: 4px 14px; border: 1px solid var(--rule, #ccc); border-radius: 6px; background: none; color: inherit; font: inherit; cursor: pointer; }
+.poll-spacer { flex: 1; }
+.poll-reset { padding: 4px 14px; border: 1px solid var(--rule, #ccc); border-radius: 6px; background: none; color: inherit; font: inherit; cursor: pointer; }
 .poll-reset:disabled { opacity: .4; cursor: default; }
 /* The audience sees the results, not the presenter's controls. */
 deck-stage[data-follower] .poll-reset { display: none; }
 /* answer="…": the tick outlines the right answer's row (label, bar, count) in green. */
-.poll-solve { display: grid; place-items: center; width: 44px; height: 44px; margin-left: auto; padding: 0; border: 1px solid var(--rule, #ccc); border-radius: 50%; background: none; color: var(--muted, #666); cursor: pointer; opacity: .55; transition: opacity .2s, background .2s, color .2s; }
-.poll-reset + .poll-solve { margin-left: 0; }
+/* The presenter's controls: close (lock), results (eye), right answer (tick). */
+.poll-control { display: grid; place-items: center; width: 44px; height: 44px; padding: 0; border: 1px solid var(--rule, #ccc); border-radius: 50%; background: none; color: var(--muted, #666); cursor: pointer; opacity: .55; transition: opacity .2s, background .2s, color .2s; }
+.poll-control:hover, .poll-control:focus-visible { opacity: 1; }
+.poll-close.is-on, .poll-results.is-on { opacity: 1; background: var(--muted, #666); border-color: var(--muted, #666); color: #fff; }
+deck-stage[data-follower] .poll-control { display: none; }
+/* Closed: no more answers count. */
+.poll-closed { padding: 2px 12px; border-radius: 999px; background: color-mix(in srgb, var(--ink, #111) 10%, transparent); color: var(--ink, #111); font-weight: 600; }
+/* results="hidden" or the eye off: the presenter's screens show the results faint and hatched, the audience none. */
+.poll.is-results-hidden .poll-fill { opacity: .35; background: repeating-linear-gradient(45deg, var(--accent, #0d9488) 0 8px, transparent 8px 14px); }
+.poll.is-results-hidden .poll-count { opacity: .35; }
+deck-stage[data-follower] .poll.is-results-hidden .poll-fill, deck-stage[data-follower] .poll.is-results-hidden .poll-count { visibility: hidden; }
 .poll-solve svg { width: 24px; height: 24px; }
-.poll-solve:hover, .poll-solve:focus-visible { opacity: 1; }
 .poll-solve.is-on { opacity: 1; background: var(--poll-correct, #16a34a); border-color: var(--poll-correct, #16a34a); color: #fff; }
-deck-stage[data-follower] .poll-solve { display: none; }
 .poll.is-solved .poll-row.is-correct { outline: 4px solid var(--poll-correct, #16a34a); outline-offset: 10px; border-radius: 10px; }
 .poll.is-solved .poll-row.is-correct .poll-label { font-weight: 700; color: var(--poll-correct, #16a34a); }
 .poll-link { font-family: ui-monospace, Menlo, Consolas, monospace; font-size: 20px; color: var(--muted, #555); }
@@ -67,15 +81,21 @@ deck-stage[data-follower] .poll-solve { display: none; }
 .poll-join-slide { display: flex; flex-direction: column; align-items: center; gap: 20px; width: 100%; }
 .poll-join-slide .poll-join { font-size: var(--fs-body, 32px); gap: 16px; padding: 24px 32px; }
 .poll-join-slide .poll-link { font-size: 28px; }
-@media print { .poll-reset, .poll-dot, .poll-solve { display: none; } .poll-fill, .scale-fill, .word { transition: none; animation: none; } .question-cards li { animation: none; } }
+@media print { .poll-reset, .poll-dot, .poll-control { display: none; } .poll-fill, .scale-fill, .word { transition: none; animation: none; } .question-cards li { animation: none; } }
 
 /* A record of the talk (no room server: a PDF, a file sent to readers): the
    question and its options, without counts, the live dot or a join code. */
 .poll.is-static .poll-count, .poll.is-static .scale-count { visibility: hidden; }
+.poll.is-static .poll-close { display: none; }
 .poll .poll-static, .poll-join-slide .poll-static { margin: 36px 0 0; color: var(--muted, #666); font-style: italic; font-size: var(--fs-small, 24px); }
 .poll-join-slide .poll-static { margin: 0; font-size: var(--fs-body, 32px); }
 
 /* On paper the join code and the presenter's controls have no use. */
 @media print {
-  .poll-join, .poll-reset, .poll-solve, .poll-dot { display: none !important; }
+  .poll-join, .poll-reset, .poll-dot, .poll-control { display: none !important; }
 }
+
+/* <numeric>: the most frequent answers; Other for the rest. */
+.poll-row.is-other .poll-label { color: var(--muted, #666); font-style: italic; }
+.poll--numeric .poll-label { font-variant-numeric: tabular-nums; }
+.poll .numeric-answer { margin: 24px 0 0; font-weight: 600; color: var(--poll-correct, #16a34a); }

package/src/core/citations.js

@@ -0,0 +1,108 @@
+import { sourceLines, fenceState } from './source.js'
+
+// Pandoc's citation syntax, shared by the build (which formats the deck's
+// citations with citeproc) and the runtime (which puts the formatted text in
+// place): `[@smith2020]`, `[see @smith2020, p. 12; @doe2019]`, `[-@smith2020]`
+// and narrative `@smith2020` (`Smith (2020)`), optionally `@smith2020 [p. 12]`.
+// A narrative `@key` counts only when `isKey` knows it, so e-mail addresses and
+// handles stay text. Fenced and inline code are left alone.
+
+const KEY = String.raw`[\w][\w:.#$%&+?<>~/-]*`
+// Not a link (`](`, `][ref]`); a footnote may follow (`[@a][^1]`).
+const NOT_LINK = String.raw`(?!\(|\[(?!\^))`
+const BRACKETED = new RegExp(String.raw`\[([^\[\]\n]*?-?@[\w][^\[\]\n]*?)\]${NOT_LINK}`, 'g')
+// The key starts a word: `[info@fhnw.ch]` is an address, not a citation.
+const ITEM = new RegExp(String.raw`^((?:.*?\s)?)(-?)@(${KEY})(.*)$`, 's')
+const NARRATIVE = new RegExp(String.raw`(?<![\w@\[\]\`])@(${KEY})(?:\s\[([^\[\]\n]+)\]${NOT_LINK})?`, 'g')
+
+// Locator terms readers write after a comma, mapped to CSL labels.
+const LOCATORS = [
+  [/^(pp?\.?|pages?|S\.|Seiten?)\s*/i, 'page'],
+  [/^(chaps?\.?|ch\.|chapters?|Kap\.)\s*/i, 'chapter'],
+  [/^(secs?\.?|sections?|§§?)\s*/i, 'section'],
+  [/^(figs?\.?|figures?|Abb\.)\s*/i, 'figure'],
+  [/^(vols?\.?|volumes?|Bd\.)\s*/i, 'volume'],
+  [/^(paras?\.?|paragraphs?|¶¶?)\s*/i, 'paragraph'],
+  [/^(nos?\.?|numbers?|Nr\.)\s*/i, 'issue'],
+  [/^(ll?\.|lines?)\s*/i, 'line'],
+  [/^(eqs?\.?|equations?)\s*/i, 'equation'],
+]
+
+// Keys end before trailing punctuation: `@smith2020.` cites `smith2020`.
+const trimKey = key => key.replace(/[:.#$%&+?<>~/-]+$/, '')
+
+// `, p. 12, emphasis added` → locator `12`, label `page`, suffix `, emphasis added`.
+export function parseLocator(text) {
+  const rest = text.replace(/^\s*,?\s*/, '')
+  if (!rest) return {}
+  for (const [pattern, label] of LOCATORS) {
+    const term = rest.match(pattern)
+    if (!term) continue
+    const value = rest.slice(term[0].length).match(/^[^\s,;]+(?:\s*[-–]\s*[^\s,;]+)?/)
+    if (value) return withSuffix({ label, locator: value[0] }, rest.slice(term[0].length + value[0].length))
+  }
+  const number = rest.match(/^\d[\w]*(?:\s*[-–]\s*\w+)?/)
+  if (number) return withSuffix({ label: 'page', locator: number[0] }, rest.slice(number[0].length))
+  return { suffix: text.trim() }
+}
+
+const withSuffix = (item, suffix) => suffix.trim() ? { ...item, suffix: suffix.trim() } : item
+
+function parseItem(part) {
+  const match = part.match(ITEM)
+  if (!match) return null
+  const id = trimKey(match[3])
+  const after = match[3].slice(id.length) + match[4]
+  const item = { id, ...parseLocator(after) }
+  if (match[1].trim()) item.prefix = match[1].trim()
+  if (match[2]) item.suppressAuthor = true
+  return item
+}
+
+// Ranges of `code` and link targets in a line, which hold no citations.
+function codeSpans(text) {
+  const spans = []
+  const pattern = /(`+)[\s\S]*?\1|\]\([^)\s]*(?:\s[^)]*)?\)/g
+  for (let match; (match = pattern.exec(text));) spans.push([match.index, match.index + match[0].length])
+  return spans
+}
+
+// Every citation in `markdown`, in order: `{ start, end, raw, items, narrative }`.
+// `raw` is the text as written, the key the build's formatted output is filed under.
+export function scanCitations(markdown, { isKey = () => true } = {}) {
+  const found = []
+  let fence = null
+  for (const line of sourceLines(markdown)) {
+    const before = fence
+    fence = fenceState(line.text, fence)
+    if (before || fence || !line.text.includes('@')) continue
+    const code = codeSpans(line.text)
+    const taken = []
+    const free = (start, end) => ![...code, ...taken].some(([a, b]) => start < b && end > a)
+    for (const match of line.text.matchAll(BRACKETED)) {
+      const end = match.index + match[0].length
+      // `[@key]: …` at the start of a line defines a link reference.
+      const definition = line.text[end] === ':' && !line.text.slice(0, match.index).trim()
+      if (line.text[match.index - 1] === '!' || definition || !free(match.index, end)) continue
+      const items = match[1].split(';').map(parseItem)
+      if (items.some(item => !item)) continue
+      taken.push([match.index, end])
+      found.push({ start: line.start + match.index, end: line.start + end, raw: match[0], items, narrative: false })
+    }
+    for (const match of line.text.matchAll(NARRATIVE)) {
+      const id = trimKey(match[1])
+      const keyEnd = match.index + 1 + id.length
+      const end = match[2] != null ? match.index + match[0].length : keyEnd
+      if (!isKey(id) || !free(match.index, end)) continue
+      taken.push([match.index, end])
+      const item = { id, ...(match[2] != null ? parseLocator(match[2]) : {}) }
+      found.push({ start: line.start + match.index, end: line.start + end, raw: line.text.slice(match.index, end), items: [item], narrative: true })
+    }
+  }
+  return found.sort((a, b) => a.start - b.start)
+}
+
+// The cited keys, each once, in order of first citation.
+export function citedKeys(clusters) {
+  return [...new Set(clusters.flatMap(cluster => cluster.items.map(item => item.id)))]
+}

package/src/core/editDeck.js

@@ -4,6 +4,7 @@
 // identical; callers reparse the result.
 import { parseSlides, SLIDE_KEYS, DECK_KEYS } from './parseSlides.js'
 import { applySourceEdits, replaceRegion, normalizeBlock, detectNewline, patchYamlMapping, firstYamlKey } from './source.js'
+import { maskCode } from '../live/roomTag.js'
 
 const REGION_RE = /^[a-z][a-z0-9-]*$/
 
@@ -228,3 +229,45 @@ export function stripNotes(source) {
     .map(block => blockRemoval(deck, block)))
   return edit(deck, edits)
 }
+
+// The live activities, and the code to join them (<qrcode join />): a slide
+// with one of them is left out of shared builds. <qrcode follow /> and other
+// QR codes stay.
+const ACTIVITY_RE = /<(poll|question|wordcloud|scale|numeric)\b/i
+const JOIN_RE = /<qrcode\b[^>]*?\sjoin(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|\{?([^\s/>}]*)\}?))?(?=[\s/>])/i
+const joins = text => { const m = JOIN_RE.exec(text); return !!m && !/^(false|no|off|0)$/i.test(m[1] ?? m[2] ?? m[3] ?? '') }
+export function hasActivity(slide) {
+  return [slide.content ?? '', ...Object.values(slide.regions ?? {}).map(region => region.content ?? '')]
+    .some(text => { const masked = maskCode(text); return ACTIVITY_RE.test(masked) || joins(masked) })
+}
+
+// Removes every slide with a live activity (<poll>, <question>, <wordcloud>,
+// <scale>, <numeric>) for shared builds: a reader cannot vote, and the results belong to
+// the talk. Returns { source, ids, removed }: `ids` maps each kept slide's id
+// to its id afterwards (an automatic `slide-N` moves up), `removed` the ids
+// that are gone, so saved drawings can follow their slides.
+export function stripActivities(source) {
+  const deck = parseSlides(source)
+  const dropped = deck.slides.filter(hasActivity)
+  const same = () => ({ source, ids: Object.fromEntries(deck.slides.map(slide => [slide.id, slide.id])), removed: [] })
+  // A deck of nothing but activities stays as it is rather than becoming empty.
+  if (!dropped.length || dropped.length === deck.slides.length) return same()
+  const ranges = dropped.map(slide => {
+    const bounds = slideBounds(deck, slide.id)
+    const next = deck.slides[deck.slides.indexOf(slide) + 1]
+    return bounds.delimiterStart != null
+      ? { start: bounds.delimiterStart, end: bounds.end }
+      : { start: bounds.start, end: next ? next.source.start : deck.source.length }
+  }).sort((a, b) => a.start - b.start)
+  // Neighbouring slides can share a delimiter: join ranges that touch.
+  const merged = []
+  for (const range of ranges) {
+    const last = merged.at(-1)
+    if (last && range.start <= last.end) last.end = Math.max(last.end, range.end)
+    else merged.push({ ...range })
+  }
+  const next = edit(deck, merged.map(range => ({ ...range, text: '', expected: expectedText(deck, range) })))
+  const after = parseSlides(next).slides
+  const kept = deck.slides.filter(slide => !dropped.includes(slide))
+  return { source: next, ids: Object.fromEntries(kept.map((slide, i) => [slide.id, after[i]?.id ?? slide.id])), removed: dropped.map(slide => slide.id) }
+}

package/src/core/icons.js

@@ -41,6 +41,8 @@ export const ICONS = {
   trash: '<path d="M10 11v6"/><path d="M14 11v6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M3 6h18"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>', // trash-2
   eye: '<path d="M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0"/><circle cx="12" cy="12" r="3"/>', // eye
   'eye-off': '<path d="M10.733 5.076a10.744 10.744 0 0 1 11.205 6.575 1 1 0 0 1 0 .696 10.747 10.747 0 0 1-1.444 2.49"/><path d="M14.084 14.158a3 3 0 0 1-4.242-4.242"/><path d="M17.479 17.499a10.75 10.75 0 0 1-15.417-5.151 1 1 0 0 1 0-.696 10.75 10.75 0 0 1 4.446-5.143"/><path d="m2 2 20 20"/>', // eye-off
+  lock: '<rect width="18" height="11" x="3" y="11" rx="2" ry="2"/><path d="M7 11V7a5 5 0 0 1 10 0v4"/>', // lock
+  'lock-open': '<rect width="18" height="11" x="3" y="11" rx="2" ry="2"/><path d="M7 11V7a5 5 0 0 1 9.9-1"/>', // lock-open
   finger: '<path d="M22 14a8 8 0 0 1-8 8"/><path d="M18 11v-1a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V9a2 2 0 0 0-2-2a2 2 0 0 0-2 2v1"/><path d="M10 9.5V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2v10"/><path d="M18 11a2 2 0 1 1 4 0v3a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/>', // pointer
   pen: '<path d="M13 21h8"/><path d="M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z"/>', // pen-line
   highlighter: '<path d="m9 11-6 6v3h9l3-3"/><path d="m22 12-4.6 4.6a2 2 0 0 1-2.8 0l-5.2-5.2a2 2 0 0 1 0-2.8L14 4"/>', // highlighter

package/src/core/ink.js

@@ -188,6 +188,22 @@ export const inkPaint = color => PEN_PAINT[color] ?? color
 /** Strokes in drawing order: highlighter below the pen, as on paper. */
 export const inkOrder = strokes => [...strokes.filter(s => s.tool === 'highlighter'), ...strokes.filter(s => s.tool !== 'highlighter')]
 
+/**
+ * The end of a straight line from `from` to `to`, turned onto the nearest
+ * multiple of `step` degrees when it lies within `tolerance` of it (0°, 15°,
+ * 30° … by default); its length stays. Further off, the end stays as drawn.
+ */
+export function snapAngle([x0, y0], [x, y], { step = 15, tolerance = 4 } = {}) {
+  const dx = x - x0, dy = y - y0
+  const length = Math.hypot(dx, dy)
+  if (!length) return [x, y]
+  const angle = Math.atan2(dy, dx) * 180 / Math.PI
+  const snapped = Math.round(angle / step) * step
+  if (Math.abs(angle - snapped) > tolerance) return [x, y]
+  const rad = snapped * Math.PI / 180
+  return [Math.round((x0 + Math.cos(rad) * length) * 10) / 10, Math.round((y0 + Math.sin(rad) * length) * 10) / 10]
+}
+
 /** The stroke moved by dx, dy design pixels; the same id, so it replaces the original. */
 export const translateStroke = (stroke, dx, dy) => ({ ...stroke, points: stroke.points.map(([x, y, p]) => [x + dx, y + dy, p]) })
 

package/src/core/labels.js

@@ -35,6 +35,8 @@ export const LABELS = {
     'poll.reset': 'Reset',
     'poll.showAnswer': 'Show the right answer',
     'poll.hideAnswer': 'Hide the right answer',
+    'poll.showResults': 'Show the results',
+    'poll.hideResults': 'Hide the results',
     'poll.live': 'Live',
     'poll.offline': 'Not connected to the server',
     'poll.unreachable': 'Phones cannot reach this computer. Start with {command}, or set {setting}.',
@@ -46,7 +48,29 @@ export const LABELS = {
     'respond.send': 'Send',
     'respond.sent': 'Sent. Thank you!',
     'join.scan': 'Scan to join',
+    'follow.scan': 'Scan to follow the slides',
+    'follow.open': 'Follow the slides',
+    'follow.live': 'Live',
+    'follow.back': 'Back to live',
+    'follow.waiting': 'The talk has not started yet.',
+    'follow.tryHere': 'Try following here',
     'join.static': 'During the talk, phones joined here to answer.',
+    'poll.answeredOf': '{n} of {of} answered',
+    'poll.close': 'Close: later answers do not count',
+    'poll.open': 'Open again',
+    'poll.closed': 'Closed',
+    'poll.several': 'Several answers possible.',
+    'poll.pickSeveral': 'Tap all that apply.',
+    'poll.thanksSeveral': 'Thanks! You chose {choice}. Tap to change.',
+    'respond.closed': 'Closed: no more answers.',
+    'respond.right': 'Right!',
+    'respond.wrong': 'Not quite. The right answer: {answer}',
+    'respond.solution': 'The right answer: {answer}',
+    'numeric.placeholder': 'A number',
+    'numeric.invalid': 'Enter a number, such as 0.5 or 1/2.',
+    'numeric.sent': 'Sent: {value}. Send another to change.',
+    'numeric.other': 'Other',
+    'numeric.right': '{n} right',
     'question.empty': 'Answers appear here.',
     'scale.average': 'Average {n}',
   },
@@ -80,6 +104,8 @@ export const LABELS = {
     'poll.reset': 'Zurücksetzen',
     'poll.showAnswer': 'Richtige Antwort zeigen',
     'poll.hideAnswer': 'Richtige Antwort ausblenden',
+    'poll.showResults': 'Ergebnis zeigen',
+    'poll.hideResults': 'Ergebnis ausblenden',
     'poll.live': 'Live',
     'poll.offline': 'Keine Verbindung zum Server',
     'poll.unreachable': 'Handys erreichen diesen Computer nicht. Mit {command} starten oder {setting} setzen.',
@@ -91,7 +117,29 @@ export const LABELS = {
     'respond.send': 'Senden',
     'respond.sent': 'Gesendet. Danke!',
     'join.scan': 'Scannen und mitmachen',
+    'follow.scan': 'Scannen und Folien mitverfolgen',
+    'follow.open': 'Folien mitverfolgen',
+    'follow.live': 'Live',
+    'follow.back': 'Zur aktuellen Folie',
+    'follow.waiting': 'Der Vortrag hat noch nicht begonnen.',
+    'follow.tryHere': 'Mitverfolgen hier ausprobieren',
     'join.static': 'Im Vortrag haben sich hier die Handys zum Antworten verbunden.',
+    'poll.answeredOf': '{n} von {of} haben geantwortet',
+    'poll.close': 'Schliessen: spätere Antworten zählen nicht',
+    'poll.open': 'Wieder öffnen',
+    'poll.closed': 'Geschlossen',
+    'poll.several': 'Mehrere Antworten möglich.',
+    'poll.pickSeveral': 'Alle zutreffenden antippen.',
+    'poll.thanksSeveral': 'Danke! Gewählt: {choice}. Zum Ändern antippen.',
+    'respond.closed': 'Geschlossen: keine weiteren Antworten.',
+    'respond.right': 'Richtig!',
+    'respond.wrong': 'Leider nicht. Richtig ist: {answer}',
+    'respond.solution': 'Richtig ist: {answer}',
+    'numeric.placeholder': 'Eine Zahl',
+    'numeric.invalid': 'Eine Zahl eingeben, z. B. 0,5 oder 1/2.',
+    'numeric.sent': 'Gesendet: {value}. Zum Ändern eine andere senden.',
+    'numeric.other': 'Andere',
+    'numeric.right': '{n} richtig',
     'question.empty': 'Hier erscheinen die Antworten.',
     'scale.average': 'Durchschnitt {n}',
   },

package/src/core/parseSlides.js

@@ -2,7 +2,7 @@ import yaml from 'js-yaml'
 import { sourceLines, fenceState, scanDirectives, diagnostic } from './source.js'
 export { sourceLines, fenceState } from './source.js'
 
-export const DECK_KEYS = new Set('theme palette appearance params meta width height show lang labels callouts reader components server session'.split(' '))
+export const DECK_KEYS = new Set('theme palette appearance params meta width height show lang labels callouts reader components server session bibliography csl nocite'.split(' '))
 export const SLIDE_KEYS = new Set('layout id title section number part description label image alt overlay eyebrow attribution props'.split(' '))
 
 // Names from before 2.0. They are still recognised, so that an old deck gets a

package/src/core/results.js

@@ -0,0 +1,64 @@
+// The answers given during a talk, kept beside the deck as
+// <deck>.results.json, so they outlast the room server (which forgets them)
+// and show in builds, PDFs and files sent to readers.
+//
+//   { "version": 1, "rooms": { "<room>": { "savedAt": "…", "closed": false,
+//     "answers": [{ "phone": 1, "at": "…", "value": … }] } } }
+//
+// Phones are numbered per room in the order they first answered; their own
+// ids never leave the room server. `answers` are those that counted: once an
+// activity was closed, the ones before.
+
+export const resultsFileFor = deckPath => String(deckPath).replace(/\.md$/i, '') + '.results.json'
+
+const ROOM_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/
+
+/** One room's answers as kept: room messages ({ n, at, from, data }) with numbered phones. */
+export function keptAnswers(messages) {
+  const phones = new Map()
+  return messages.map(message => {
+    const from = message.from ?? `#${message.n}`
+    if (!phones.has(from)) phones.set(from, phones.size + 1)
+    return { phone: phones.get(from), at: message.at ?? null, value: message.data?.value ?? null }
+  })
+}
+
+/** Kept answers as room messages again, for the slides that show them. */
+export const answersAsMessages = answers => answers.map((answer, i) => ({ n: i + 1, at: answer.at, from: `phone-${answer.phone}`, data: { value: answer.value } }))
+
+/** A results file as read, with anything unexpected left out. */
+export function normalizeResults(data) {
+  const rooms = {}
+  for (const [room, entry] of Object.entries(data?.rooms ?? {})) {
+    if (!ROOM_RE.test(room) || !Array.isArray(entry?.answers)) continue
+    rooms[room] = {
+      savedAt: typeof entry.savedAt === 'string' ? entry.savedAt : null,
+      closed: !!entry.closed,
+      answers: entry.answers.filter(answer => answer && Number.isInteger(answer.phone)).map(({ phone, at, value }) => ({ phone, at: typeof at === 'string' ? at : null, value: value ?? null })),
+    }
+  }
+  return { version: 1, rooms }
+}
+
+/** One room's answers in, or (none) out; returns the new results. */
+export function withRoom(results, room, { answers, closed = false, savedAt = new Date().toISOString() }) {
+  if (!ROOM_RE.test(room)) throw Object.assign(new Error('Room names use letters, digits, dots, hyphens and underscores'), { status: 400 })
+  const rooms = { ...results.rooms }
+  if (Array.isArray(answers) && answers.length) rooms[room] = { savedAt, closed: !!closed, answers }
+  else delete rooms[room]
+  return normalizeResults({ rooms })
+}
+
+export const serializeResults = results => JSON.stringify(results, null, 2) + '\n'
+
+const csvCell = value => {
+  const text = value == null ? '' : Array.isArray(value) ? value.join('|') : String(value)
+  return /[",\n\r]/.test(text) ? `"${text.replace(/"/g, '""')}"` : text
+}
+
+/** All answers as CSV: room, phone, time, answer (several picks joined by |). */
+export function resultsCsv(results) {
+  const rows = [['room', 'phone', 'at', 'answer']]
+  for (const [room, entry] of Object.entries(results.rooms)) for (const answer of entry.answers) rows.push([room, answer.phone, answer.at, answer.value])
+  return rows.map(row => row.map(csvCell).join(',')).join('\n') + '\n'
+}

package/src/core/urls.js

@@ -1,4 +1,4 @@
-const VIEWS = new Set(['deck', 'reader', 'presenter', 'audience'])
+const VIEWS = new Set(['deck', 'reader', 'presenter', 'audience', 'follow'])
 const OLD_VIEWS = { d: 'deck', s: 'reader', p: 'presenter', a: 'audience', share: 'reader' }
 
 // Old URLs must be corrected explicitly: guessing a view can expose notes or
@@ -21,7 +21,7 @@ export function validatePageUrl(url) {
   for (const secret of ['serverkey', 'livekey', 'pair']) corrected.searchParams.delete(secret)
   if (replacements.length) return { message: `This URL uses settings from before API 2.0: ${replacements.join(', ')}. Open the updated address below. If you supplied a server key, add it again as ?serverkey=… on your own computer.`, corrected: corrected.href }
   const view = url.searchParams.get('view')
-  if (view !== null && !VIEWS.has(view)) return { message: `Unknown view "${view}". Choose deck, reader, presenter or audience.` }
+  if (view !== null && !VIEWS.has(view)) return { message: `Unknown view "${view}". Choose deck, reader, presenter, audience or follow.` }
   return null
 }
 

package/src/core/validateDeck.js

@@ -38,14 +38,20 @@ export function validateDeck(deck, { layouts = null, themes = null, palettes = n
       else if (typeof value !== 'string') add('invalid-config', `labels.${key} must be text`, deck.configSource?.start)
     }
   }
+  // References: bibliography.js reads the files and reports what it cannot use.
+  if (config.bibliography != null && ![config.bibliography].flat().every(file => typeof file === 'string' && file.trim())) add('invalid-config', 'bibliography must be a file name such as refs.bib, or a list of them', deck.configSource?.start)
+  if (config.csl != null && (typeof config.csl !== 'string' || !config.csl.trim())) add('invalid-config', 'csl must be a style name (apa, vancouver, harvard1) or a .csl file', deck.configSource?.start)
+  if (config.nocite != null && (!Array.isArray(config.nocite) || config.nocite.some(key => typeof key !== 'string'))) add('invalid-config', "nocite must be a list of reference keys, or ['*'] for all", deck.configSource?.start)
   if (config.server != null && (typeof config.server !== 'string' || !/^https?:\/\//.test(config.server))) add('invalid-config', 'server must be an http:// or https:// address', deck.configSource?.start)
   if (isPlainObject(config.session)) {
     for (const key of Object.keys(config.session)) if (!['id', 'code'].includes(key)) add('invalid-config', `session.${key} is not a setting; available: id, code`, deck.configSource?.start, 'warning')
     if (config.session.code != null && !/^\d{4,8}$/.test(String(config.session.code))) add('invalid-config', 'session.code must be 4 to 8 digits', deck.configSource?.start)
   }
   const enums = { organization: ['title', 'all', 'none'], author: ['title', 'all', 'none'], numbers: ['slides', 'all', 'none'], sections: ['all', 'none'] }
+  const switches = ['citations']
   if (isPlainObject(config.show)) {
-    for (const key of Object.keys(config.show)) if (!Object.hasOwn(enums, key)) add('invalid-config', `show.${key} is not a setting; available: ${Object.keys(enums).join(', ')}`, deck.configSource?.start, 'warning')
+    for (const key of Object.keys(config.show)) if (!Object.hasOwn(enums, key) && !switches.includes(key)) add('invalid-config', `show.${key} is not a setting; available: ${[...Object.keys(enums), ...switches].join(', ')}`, deck.configSource?.start, 'warning')
+    for (const key of switches) if (config.show[key] != null && typeof config.show[key] !== 'boolean') add('invalid-config', `show.${key} must be true or false`, deck.configSource?.start)
     for (const [key, values] of Object.entries(enums)) {
       if (config.show[key] != null && !values.includes(config.show[key])) add('invalid-config', `show.${key} must be one of: ${values.join(', ')}`, deck.configSource?.start)
     }

package/src/editor/sampleDeck.js

@@ -6,6 +6,26 @@
 // over hills under a sun, for every layout that shows a picture.
 export const SAMPLE_PICTURE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 500"><rect width="800" height="500" fill="var(--surface, #eef1f4)"/><g stroke="var(--rule, #d5dbe1)" stroke-width="2"><path d="M0 100H800M0 200H800M0 300H800M0 400H800M100 0V500M200 0V500M300 0V500M400 0V500M500 0V500M600 0V500M700 0V500"/></g><circle cx="580" cy="165" r="128" fill="none" stroke="var(--accent, #3d5a73)" stroke-width="4" opacity="0.35"/><circle cx="580" cy="165" r="88" fill="var(--accent, #3d5a73)"/><path d="M0 360C140 292 262 300 384 338S628 424 800 330V500H0Z" fill="var(--accent-2, #c2410c)"/><path d="M0 418C168 366 330 392 470 422S690 474 800 434V500H0Z" fill="var(--accent, #3d5a73)" opacity="0.6"/><polyline points="80,262 170,214 260,236 350,170 440,196" fill="none" stroke="var(--ink, #1b2733)" stroke-width="6" stroke-linecap="round" stroke-linejoin="round"/><g fill="var(--bg, #ffffff)" stroke="var(--ink, #1b2733)" stroke-width="5"><circle cx="80" cy="262" r="10"/><circle cx="170" cy="214" r="10"/><circle cx="260" cy="236" r="10"/><circle cx="350" cy="170" r="10"/><circle cx="440" cy="196" r="10"/></g></svg>'
 
+// The references the sample deck cites. Builds find them in a file beside the
+// deck; the dev and edit servers read them from here where there is none.
+export const SAMPLE_REFERENCES_FILE = 'sample-references.bib'
+export const SAMPLE_REFERENCES = `@article{doe2024,
+  author  = {Doe, Jane and Roe, Richard},
+  title   = {Measuring how slides are read},
+  journal = {Journal of Sample Studies},
+  year    = {2024},
+  volume  = {12},
+  pages   = {1--10}
+}
+
+@book{roe2023,
+  author    = {Roe, Richard},
+  title     = {Quotations and Their Sources},
+  publisher = {Example Press},
+  year      = {2023}
+}
+`
+
 // `picture` is where the slides find the picture: a file beside the deck, or
 // a data URL where there is no such file.
 export function sampleDeck(picture = './picture.svg') {
@@ -15,6 +35,7 @@ meta:
   author: "A. Author"
   organization: "Institute"
   date: "2026-10-06"
+bibliography: ${SAMPLE_REFERENCES_FILE}
 ---
 
 ---
@@ -51,10 +72,10 @@ alt: "Shapes"
 ---
 # Lists, emphasis and code
 
-- A point with *emphasis* and **strong** words
-- A second point with \`inline code\`
-  - A nested point
-  - Another nested point
+1. A step with *emphasis* and **strong** words
+2. A step with \`inline code\` and a [link](https://example.com)
+   - A nested point
+   - Another nested point
 
 \`\`\`js
 const total = values.reduce((sum, value) => sum + value, 0)
@@ -69,7 +90,7 @@ const total = values.reduce((sum, value) => sum + value, 0)
 | Treatment | 5.1 | 0.6 |
 | Follow-up | 5.0 | 0.7 |
 
-The difference is $\\Delta = 0.9$, with a footnote.[^1]
+The difference is $\\Delta = 0.9$ [@doe2024, p. 4], with a footnote.[^1]
 
 [^1]: A source for the claim.
 
@@ -115,9 +136,9 @@ $$
 
 +++
 
-1. First step
-2. Second step
-3. Third step
+> A quotation set apart from the text.
+
+As @roe2023 notes, a quote needs its source.
 :::
 
 ---
@@ -158,6 +179,11 @@ alt: "Shapes"
 overlay: true
 ---
 # A picture that fills the slide.
+
+---
+# References
+
+<bibliography />
 `.replaceAll('./picture.svg', picture)
 }
 

package/src/layouts/layoutApi.jsx

@@ -5,6 +5,7 @@ import { marked, Parser } from 'marked'
 import { registry } from '../runtime/registry'
 import { InkLayer } from '../runtime/ink/InkLayer.jsx'
 import themedSvgs from 'virtual:deck-svgs'
+import { renderCitations, citationsHtml as referencesOf, bibliographyOf } from '../runtime/citations.js'
 
 // ─── Content extraction ────────────────────────────────────────────────────
 
@@ -170,6 +171,12 @@ function SlideFootnotes({ html }) {
   return <div class="slide-footnotes" dangerouslySetInnerHTML={{ __html: html }} />
 }
 
+// The full references of the works this slide cites (show.citations: false hides them).
+function SlideCitations({ html }) {
+  if (!html) return null
+  return <div class="slide-citations" dangerouslySetInnerHTML={{ __html: html }} />
+}
+
 function slideNum(index) {
   return String(index + 1).padStart(2, '0')
 }
@@ -181,10 +188,13 @@ export function prepareSlide(slide) {
     .sort((a, b) => position(a[1]) - position(b[1]))
   let separator = '\u0000mdeck-region\u0000'
   while (entries.some(([, r]) => r.content.includes(separator))) separator += '\u0000'
-  const { processed, footnotesHtml } = preprocessFootnotes(entries.map(([, r]) => r.content).join(separator))
+  const bib = bibliographyOf(slide.deckConfig)
+  const cited = renderCitations(entries.map(([, r]) => r.content).join(separator), bib)
+  const { processed, footnotesHtml } = preprocessFootnotes(cited.markdown)
   const pieces = processed.split(separator)
   const regions = Object.fromEntries(entries.map(([name, region], i) => [name, { ...region, content: pieces[i] }]))
-  return { ...slide, regions, content: regions.body?.content ?? '', footnotesHtml }
+  const citationsHtml = slide.deckConfig?.show?.citations === false ? '' : referencesOf(cited.ids, bib)
+  return { ...slide, regions, content: regions.body?.content ?? '', footnotesHtml, citationsHtml }
 }
 
 export function MarkdownRegion({ region, content, class: className, ...attributes }) {
@@ -194,7 +204,7 @@ export function MarkdownRegion({ region, content, class: className, ...attribute
 }
 
 // Layouts supply body content; every layout receives the same outer frame.
-export function SlideFrame({ meta = {}, props = {}, deckConfig = {}, index = 0, id, manifest, footnotesHtml, children }) {
+export function SlideFrame({ meta = {}, props = {}, deckConfig = {}, index = 0, id, manifest, footnotesHtml, citationsHtml, children }) {
   const layout = manifest.id === 'generic' ? meta.layout : manifest.id
   const frame = manifest.frame ?? 'standard'
   const title = frame === 'title'
@@ -207,6 +217,7 @@ export function SlideFrame({ meta = {}, props = {}, deckConfig = {}, index = 0,
       isTitle={title} right={frame === 'chapter' ? meta.part ?? '' : meta.section ?? ''} />}
     {children}
     <SlideFootnotes html={footnotesHtml} />
+    <SlideCitations html={citationsHtml} />
     {frame !== 'none' && <SlideFooter deckConfig={deckConfig} right={slideNum(index)} isTitle={title} />}
     <InkLayer slideId={id} />
   </section>