mdeck 2.3.0

package/src/runtime/markedSetup.js

@@ -0,0 +1,147 @@
+import { marked } from 'marked'
+import markedKatex from 'marked-katex-extension'
+import 'katex/dist/katex.min.css'
+import '../components/callout.css'
+import '../components/columns.css'
+import { scanDirectives, sourceLines, fenceState } from '../core/source.js'
+import { CALLOUT_LABELS, labelSetFor } from '../core/labels.js'
+
+function readDirective(src, name) {
+  if (!/^:::\s*[\w-]+/.test(src)) return null
+  const node = scanDirectives(src).nodes[0]
+  if (!node || node.end == null || (name && node.name !== name)) return null
+  return { ...node, raw: src.slice(0, node.end), body: src.slice(node.bodyStart, node.bodyEnd) }
+}
+
+function splitColumns(src) {
+  const columns = []
+  let start = 0, depth = 0, fence = null
+  for (const line of sourceLines(src)) {
+    const before = fence
+    fence = fenceState(line.text, fence)
+    if (before || fence) continue
+    if (/^:::\s*[\w-]+/.test(line.text)) depth++
+    else if (/^:::\s*$/.test(line.text)) depth--
+    if (!depth && /^\+\+\+[ \t]*$/.test(line.text)) {
+      columns.push(src.slice(start, line.start))
+      start = line.end
+    }
+  }
+  columns.push(src.slice(start))
+  return columns
+}
+
+function escapeHtml(text) {
+  return String(text).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;')
+}
+
+marked.use(markedKatex({ throwOnError: false, output: 'html' }))
+
+// marked.use() prepends via unshift, so last-registered = highest priority.
+// Register callout first (lowest priority) so columns and steps match before it.
+
+let calloutLabels = CALLOUT_LABELS.en
+
+// Ein Deck waehlt mit `lang` einen Satz Standardbeschriftungen und kann mit
+// `callouts` einzelne davon ueberschreiben. Ohne Angabe bleibt es bei
+// Englisch, damit bestehende Decks unveraendert aussehen. Ein Titel hinter
+// dem Typ (`::: tip Eigener Titel`) sticht beides.
+export function setCalloutLabels({ lang, callouts } = {}) {
+  // A regional code such as de-CH uses its language's titles.
+  const base = CALLOUT_LABELS[labelSetFor(lang)]
+  calloutLabels = { ...base, ...(callouts ?? {}) }
+}
+
+marked.use({
+  extensions: [{
+    name: 'callout',
+    level: 'block',
+    start(src) { return src.match(/^:::/m)?.index },
+    tokenizer(src) {
+      const m = readDirective(src)
+      if (!m) return
+      const token = { type: 'callout', raw: m.raw, calloutType: m.name.toLowerCase(), title: m.argument, tokens: [] }
+      this.lexer.blockTokens(m.body, token.tokens)
+      return token
+    },
+    renderer(token) {
+      const title = token.title || calloutLabels[token.calloutType] || token.calloutType
+      return `<div class="callout callout-${token.calloutType}"><div class="callout-title">${escapeHtml(title)}</div>${this.parser.parse(token.tokens)}</div>\n`
+    },
+  }],
+})
+
+marked.use({
+  extensions: [{
+    name: 'columns',
+    level: 'block',
+    start(src) { return src.match(/^:::columns\b/m)?.index },
+    tokenizer(src) {
+      const m = readDirective(src, 'columns')
+      if (!m) return
+      const colSrcs = splitColumns(m.body)
+      const token = { type: 'columns', raw: m.raw, columns: [] }
+      for (const colSrc of colSrcs) {
+        const colTokens = []
+        this.lexer.blockTokens(colSrc.trim(), colTokens)
+        token.columns.push(colTokens)
+      }
+      return token
+    },
+    renderer(token) {
+      const cols = token.columns
+        .map(colTokens => `<div class="column">${this.parser.parse(colTokens)}</div>`)
+        .join('\n')
+      return `<div class="columns">\n${cols}\n</div>\n`
+    },
+  }],
+})
+
+marked.use({
+  extensions: [{
+    name: 'steps',
+    level: 'block',
+    start(src) { return src.match(/^:::steps\b/m)?.index },
+    tokenizer(src) {
+      const m = readDirective(src, 'steps')
+      if (!m) return
+      const token = { type: 'steps', raw: m.raw, tokens: [] }
+      this.lexer.blockTokens(m.body, token.tokens)
+      return token
+    },
+    renderer(token) {
+      let counter = 0
+      const links = token.tokens.links || {}
+      const parts = []
+      for (const t of token.tokens) {
+        if (t.type === 'space') continue
+        if (t.type === 'list') {
+          const tag = t.ordered ? 'ol' : 'ul'
+          const items = t.items.map(item => {
+            const body = this.parser.parse(Object.assign([...item.tokens], { links }))
+            return `<li data-step="${counter++}">${body}</li>`
+          })
+          parts.push(`<${tag}>${items.join('')}</${tag}>`)
+        } else {
+          const html = this.parser.parse(Object.assign([t], { links }))
+          parts.push(`<div data-step="${counter++}">${html}</div>`)
+        }
+      }
+      return `<div class="steps-container">\n${parts.join('\n')}\n</div>\n`
+    },
+  }],
+})
+
+marked.use({
+  renderer: {
+    code({ text: code, lang: infoString }) {
+      const [lang = 'text', ...flags] = (infoString || '').split(/\s+/).filter(Boolean)
+      const attrs = flags.map(f => `${f}=""`).join(' ')
+      const encoded = (code || '')
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+      return `<codeblock lang="${lang}"${attrs ? ' ' + attrs : ''}>${encoded}</codeblock>`
+    },
+  },
+})

package/src/runtime/reader.css

@@ -0,0 +1,59 @@
+.reader-view { position: fixed; inset: 0; display: grid; grid-template-rows: 48px 1fr; background: #101010; color: #e6e6e6; font: 14px/1.5 system-ui, -apple-system, "Segoe UI", sans-serif; }
+.reader-view * { box-sizing: border-box; }
+/* Theme stylesheets style the document; the chrome must not inherit them. */
+.reader-top, .reader-nav, .reader-bottom, .reader-toast, .reader-page-caption, .reader-page-notes,
+.reader-top *, .reader-nav *, .reader-bottom *, .reader-toast *, .reader-page-caption * { font-family: system-ui, -apple-system, "Segoe UI", sans-serif; font-size: 14px; font-weight: 400; line-height: 1.5; letter-spacing: normal; text-transform: none; color: #e6e6e6; margin: 0; padding: 0; background: none; border: 0; }
+.reader-top { display: flex; align-items: center; gap: 10px; padding: 0 14px !important; border-bottom: 1px solid #262626; background: #171717; min-width: 0; }
+.reader-top h1 { font-size: 15px; font-weight: 600; margin: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: #fff; }
+.reader-top .reader-meta { color: #a8a8a8; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.reader-top .reader-spacer { flex: 1; }
+.reader-top .reader-count { color: #b8b8b8; font-variant-numeric: tabular-nums; white-space: nowrap; }
+.reader-btn { appearance: none; display: inline-flex; align-items: center; gap: 6px; padding: 6px 11px !important; border-radius: 6px; border: 1px solid #3a3a3a !important; background: #222 !important; color: #e6e6e6; cursor: pointer; font: inherit; text-decoration: none; white-space: nowrap; }
+.reader-btn:hover { border-color: #5a5a5a; color: #fff; }
+.reader-btn:disabled { opacity: 0.45; cursor: default; }
+.reader-btn:disabled:hover { border-color: #3a3a3a; color: #e6e6e6; }
+.reader-icon { flex: 0 0 auto; opacity: 0.85; }
+.reader-btn.is-active .reader-icon { opacity: 1; }
+.reader-btn.is-active { background: #2a2a2a !important; border-color: #6a6a6a !important; }
+.reader-main { display: grid; grid-template-columns: 260px minmax(0, 1fr); min-height: 0; }
+.reader-nav { overflow: auto; border-right: 1px solid #262626 !important; padding: 8px !important; }
+.reader-nav ol { list-style: none; margin: 0; padding: 0; }
+.reader-nav li { display: grid; grid-template-columns: 28px minmax(0, 1fr); gap: 8px; padding: 7px 8px !important; border-radius: 6px; cursor: pointer; color: #d6d6d6; align-items: baseline; }
+.reader-nav li:hover { background: #1e1e1e; }
+.reader-nav li.is-current { background: #23384f; color: #fff; }
+.reader-nav li.is-chapter { margin-top: 8px; color: #fff; font-weight: 600; }
+.reader-nav li .reader-num { color: #8a8a8a; font-variant-numeric: tabular-nums; font-size: 12px; }
+.reader-nav li .reader-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.reader-nav li .reader-part { display: block; font-size: 11px; font-weight: 400; color: #9a9a9a; text-transform: uppercase; letter-spacing: 0.06em; }
+.reader-content { display: flex; flex-direction: column; min-height: 0; min-width: 0; background: #0b0b0b; }
+.reader-stage-wrap { flex: 1; position: relative; min-height: 0; }
+.reader-stage-wrap deck-stage { position: absolute !important; inset: 0 !important; width: 100%; height: 100%; }
+.reader-bottom { display: flex; align-items: center; gap: 8px; padding: 8px 14px !important; border-top: 1px solid #262626; background: #171717; }
+.reader-bottom .reader-spacer { flex: 1; }
+.reader-read { flex: 1; overflow: auto; padding: 24px; display: flex; flex-direction: column; gap: 28px; align-items: center; }
+.reader-page { width: min(100%, 1400px); }
+.reader-page-frame { position: relative; width: 100%; overflow: hidden; box-shadow: 0 6px 30px rgba(0,0,0,0.5); border-radius: 4px; background: #000; }
+.reader-page-scale { position: absolute; top: 0; left: 0; transform-origin: top left; }
+.reader-page-scale > section.slide { width: 100%; height: 100%; }
+.reader-read [data-step] { opacity: 1 !important; }
+.reader-page-notes { margin: 10px 4px 0 !important; padding: 12px 16px !important; border-left: 3px solid #3d6094 !important; background: #161a20 !important; color: #d0d8e4; border-radius: 0 6px 6px 0; }
+.reader-page-notes p { margin: 0 0 6px; }
+.reader-page-caption { margin: 6px 4px 0; color: #9a9a9a; font-size: 12px; display: flex; gap: 8px; }
+.reader-page-caption b { color: #d0d0d0; font-weight: 500; }
+.reader-toast { position: fixed; bottom: 60px; left: 50%; transform: translateX(-50%); background: #27436a !important; color: #fff; padding: 8px 14px !important; border-radius: 6px; }
+.reader-nav-toggle { display: none; }
+@media (max-width: 820px) {
+  .reader-main { grid-template-columns: 1fr; }
+  .reader-nav { display: none; position: fixed; top: 48px; bottom: 0; left: 0; width: min(85vw, 320px); background: #141414; z-index: 4; box-shadow: 0 0 40px rgba(0,0,0,0.7); }
+  .reader-nav.is-open { display: block; }
+  .reader-nav-toggle { display: inline-flex; }
+  .reader-top .reader-meta, .reader-top .label-text { display: none; }
+  .reader-read { padding: 10px; }
+}
+@media print {
+  .reader-top, .reader-nav, .reader-bottom, .reader-toast { display: none !important; }
+  .reader-view, .reader-main, .reader-content, .reader-stage-wrap { position: static !important; display: block !important; background: none !important; }
+}
+.reader-entry { position: fixed; left: 14px; bottom: 14px; z-index: 50; padding: 6px 10px; border-radius: 6px; background: rgba(20,20,20,0.7); color: #fff; font: 13px system-ui, sans-serif; text-decoration: none; opacity: 0.25; transition: opacity 200ms; }
+.reader-entry:hover { opacity: 1; }
+@media print { .reader-entry { display: none !important; } }

package/src/runtime/registry.jsx

@@ -0,0 +1,26 @@
+import CodeBlock from '../components/CodeBlock.jsx'
+import QrCodeTag from '../components/QrCodeTag.jsx'
+import VideoPlayer from '../components/VideoPlayer.jsx'
+import Poll from '../components/Poll.jsx'
+import Question from '../components/Question.jsx'
+import WordCloud from '../components/WordCloud.jsx'
+import Scale from '../components/Scale.jsx'
+import deckComponents from 'virtual:deck-components'
+
+// Maps lowercase HTML tag names to Preact components.
+// Add framework-wide components here and use them in slides.md as <tagname ...>.
+//
+// A deck can also ship its own components in a `components/` folder next to its
+// .md file — those are picked up automatically and merged in below, so a widget
+// that only one deck needs never becomes part of every other deck's bundle.
+// Deck-local components win on a name collision.
+export const registry = {
+  codeblock: CodeBlock,
+  qrcode: QrCodeTag,
+  videoplayer: VideoPlayer,
+  poll: Poll,
+  question: Question,
+  wordcloud: WordCloud,
+  scale: Scale,
+  ...deckComponents,
+}

package/src/runtime/syncOrder.js

@@ -0,0 +1,32 @@
+// Orders the positions windows of one talk send each other (presenter view
+// ↔ audience windows). Messages can arrive late, after the receiver has
+// already moved on; a position that is older than the receiver's own last
+// change must not take it back. Every change carries a counter (a Lamport
+// clock): a window ignores what is older than what it has. Two changes made
+// at the same moment on both sides carry the same counter; then the window
+// with the larger id wins on both sides, so they end up on the same slide.
+const randomId = () => Array.from(crypto.getRandomValues(new Uint8Array(8)), b => b.toString(16).padStart(2, '0')).join('')
+
+export function createOrder(id = randomId()) {
+  let latest = { seq: 0, from: id }
+  return {
+    id,
+    /** The stamp for a change made in this window. */
+    stamp() { latest = { seq: latest.seq + 1, from: id }; return { ...latest } },
+    /** This window's position as it is, for a window that just opened: taken unless it moved on. */
+    current() { return { ...latest, initial: true } },
+    /** Whether a position from another window is newer than this one's; it is then this window's too. */
+    accept(stamp) {
+      // A sender without stamps (an older page) is followed as before.
+      if (!Number.isInteger(stamp?.seq)) return true
+      if (stamp.seq < latest.seq) return false
+      // Before anyone has navigated, a new window takes the presenter's
+      // initial position regardless of its own id. Once navigation starts,
+      // replies and forwarded positions obey the same ordering as changes.
+      const opening = latest.seq === 0 && stamp.initial
+      if (stamp.seq === latest.seq && !opening && !(String(stamp.from) > latest.from)) return false
+      latest = { seq: stamp.seq, from: String(stamp.from) }
+      return true
+    },
+  }
+}

package/src/runtime/themeLoader.js

@@ -0,0 +1,68 @@
+import baseCSS from '../../assets/base.css?inline'
+import { themes, palettes } from 'virtual:mdeck-extensions'
+import { buildAppearance } from '../extensions/appearance.js'
+
+const SELF_CONTAINED = typeof __MDECK_SELF_CONTAINED__ !== 'undefined'
+  && __MDECK_SELF_CONTAINED__
+
+export const THEME_NAMES = Object.keys(themes)
+export const THEME_METAS = Object.fromEntries(Object.entries(themes).map(([id, theme]) => [id, theme.manifest]))
+export const PALETTES = Object.fromEntries(Object.entries(palettes).map(([id, palette]) => [id, palette.manifest]))
+
+// The editor previews unsaved themes and palettes by handing their manifests
+// (and, for themes, stylesheet text) to the runtime instead of the built
+// module. Overrides win over registered extensions of the same id.
+let overrides = { themes: {}, palettes: {} }
+export function setExtensionOverrides(next = {}) {
+  overrides = { themes: next.themes ?? {}, palettes: next.palettes ?? {} }
+}
+function themeEntry(id) {
+  const override = overrides.themes[id]
+  if (override) return { manifest: override.manifest ?? override, load: () => typeof override.styles === 'string' ? Promise.resolve(override.styles) : themes[id]?.load() ?? Promise.resolve('') }
+  return themes[id]
+}
+// Every palette, with the editor's unsaved ones in place of the registered.
+const allPalettes = () => ({ ...PALETTES, ...Object.fromEntries(Object.entries(overrides.palettes).map(([id, palette]) => [id, palette.manifest ?? palette])) })
+
+function upsertStyle(id, textContent) {
+  let el = document.getElementById(id)
+  if (!el) {
+    el = document.createElement('style')
+    el.id = id
+    document.head.appendChild(el)
+  }
+  el.textContent = textContent
+}
+
+function syncThemeFonts(urls) {
+  for (const existing of [...document.querySelectorAll('link[data-deck-theme-font]')]) {
+    existing.remove()
+  }
+  for (const fontUrl of urls ?? []) {
+    const link = document.createElement('link')
+    link.rel = 'stylesheet'
+    link.href = fontUrl
+    link.setAttribute('data-deck-theme-font', '1')
+    document.head.appendChild(link)
+  }
+}
+
+export async function loadTheme({ theme = 'neue', palette, appearance, params = {}, meta = {} } = {}) {
+  const entry = themeEntry(theme)
+  if (!entry) throw new Error(`Unknown theme: "${theme}". Available: ${THEME_NAMES.join(', ')}`)
+
+  const styles = await entry.load()
+  const look = buildAppearance({
+    theme: entry.manifest, palettes: allPalettes(), palette, appearance,
+    params, meta, offline: SELF_CONTAINED,
+  })
+  for (const warning of look.warnings) console.warn(warning)
+
+  // Token defaults come from the manifest; the stylesheet only holds rules.
+  upsertStyle('deck-theme', [baseCSS, look.themeCss, styles].join('\n'))
+  // Offline-ready builds deliberately use the declared system-font fallbacks.
+  syncThemeFonts(look.fonts)
+  // The palette's colours, between the theme's tokens and the deck's params.
+  upsertStyle('deck-palette', look.paletteCss)
+  upsertStyle('deck-overrides', look.overridesCss)
+}