Add current and next speaker, if known.

samuel-williams-shopify · samuel-williams-shopify · commit d80417bb22c0 · 2026-04-13T22:28:37.000+12:00
diff --git a/lib/presently/presenter_view.rb b/lib/presently/presenter_view.rb
@@ -101,6 +101,7 @@ def editor_url_for(path, line = 1)
 		# @parameter slide [Slide | Nil] The current slide.
 		def render_timing(builder, slide)
 			progress = (@controller.slide_progress * 100).round(1)
+			next_slide = @controller.next_slide
 			builder.tag(:div, class: "timing", style: "--slide-progress: #{progress}%") do
 				pacing = @controller.pacing
 				pacing_class = case pacing
@@ -153,6 +154,21 @@ def render_timing(builder, slide)
 							builder.text("Slide: #{format_duration(slide.duration)}")
 						end
 					end
+					
+					# Speaker display — only shown when front matter includes a `speaker` key.
+					if (current_speaker = slide&.speaker)
+						builder.tag(:span, class: "speaker-info") do
+							builder.tag(:span, class: "speaker-label"){builder.text("🎤")}
+							builder.text(" #{current_speaker}")
+							
+							# Show upcoming speaker only when they differ from the current one.
+							if (next_speaker = next_slide&.speaker) && next_speaker != current_speaker
+								builder.tag(:span, class: "next-speaker") do
+									builder.text(" → #{next_speaker}")
+								end
+							end
+						end
+					end
 				end
 			end
 		end
diff --git a/lib/presently/slide.rb b/lib/presently/slide.rb
@@ -213,6 +213,12 @@ def transition
 			@front_matter&.fetch("transition", nil)
 		end
 		
+		# The name of the speaker presenting this slide.
+		# @returns [String | Nil] The speaker name from front_matter, or `nil` if not specified.
+		def speaker
+			@front_matter&.fetch("speaker", nil)
+		end
+		
 		# The line range to focus on for code slides.
 		# @returns [Array(Integer, Integer) | Nil] The `[start, end]` line numbers (1-based), or `nil`.
 		def focus
diff --git a/public/_static/index.css b/public/_static/index.css
@@ -675,6 +675,23 @@ html[data-transition="morph"]::view-transition-new(slide-container) {
 	margin-left: auto;
 }
 
+.timing-info .speaker-info {
+	display: flex;
+	align-items: center;
+	gap: 0.25rem;
+	font-size: 0.9rem;
+	background: rgba(255, 255, 255, 0.08);
+	border: 1px solid rgba(255, 255, 255, 0.12);
+	border-radius: 6px;
+	padding: 0.2rem 0.6rem;
+	white-space: nowrap;
+}
+
+.timing-info .next-speaker {
+	opacity: 0.6;
+	font-style: italic;
+}
+
 /* Notes */
 .notes {
 	background: var(--surface);
diff --git a/releases.md b/releases.md
@@ -1,5 +1,9 @@
 # Releases
 
+## Unreleased
+
+  - Add optional `speaker` front matter key to slides. When present, the current speaker's name is shown in the timing bar. If the next slide has a different speaker, a handoff indicator (e.g. `→ Next Speaker`) is shown alongside, giving presenters an at-a-glance cue for tag-team talks.
+
 ## v0.4.0
 
   - Add `bake presently:slides:notes` task to extract all presenter notes into a single Markdown document, with each slide's file path as a heading. Useful for reviewing or sharing speaker notes outside of the presentation.
diff --git a/slides/010-welcome.md b/slides/010-welcome.md
@@ -2,6 +2,7 @@
 template: title
 duration: 30
 marker: Welcome
+speaker: Samuel
 ---
 
 # Title
diff --git a/slides/020-statement.md b/slides/020-statement.md
@@ -2,6 +2,7 @@
 template: statement
 duration: 30
 transition: morph
+speaker: Samuel
 ---
 
 <div style="view-transition-name: welcome-title">The best way to predict the future is to create it.</div>
diff --git a/slides/030-overview.md b/slides/030-overview.md
@@ -2,6 +2,7 @@
 template: default
 duration: 20
 transition: morph
+speaker: Samuel
 ---
 
 - Real-time synchronization between display and presenter
diff --git a/slides/031-overview.md b/slides/031-overview.md
@@ -2,6 +2,7 @@
 template: default
 duration: 20
 transition: morph
+speaker: Samuel
 ---
 
 - Real-time synchronization between display and presenter
diff --git a/slides/032-overview.md b/slides/032-overview.md
@@ -2,6 +2,7 @@
 template: default
 duration: 20
 transition: morph
+speaker: Samuel
 ---
 
 - Real-time synchronization between display and presenter
diff --git a/slides/033-overview.md b/slides/033-overview.md
@@ -2,6 +2,7 @@
 template: default
 duration: 20
 transition: morph
+speaker: Samuel
 ---
 
 - Real-time synchronization between display and presenter
diff --git a/slides/034-overview.md b/slides/034-overview.md
@@ -2,6 +2,7 @@
 template: default
 duration: 20
 transition: morph
+speaker: Samuel
 ---
 
 - Real-time synchronization between display and presenter
diff --git a/slides/035-overview.md b/slides/035-overview.md
@@ -2,6 +2,7 @@
 template: default
 duration: 20
 transition: morph
+speaker: Samuel
 ---
 
 - Real-time synchronization between display and presenter
diff --git a/slides/040-code-example.md b/slides/040-code-example.md
@@ -4,6 +4,7 @@ duration: 60
 focus: 2-10
 title: Initialization
 marker: Code Walkthrough
+speaker: Samuel
 ---
 
 ```ruby
diff --git a/slides/050-code-navigation.md b/slides/050-code-navigation.md
@@ -3,6 +3,7 @@ template: code
 duration: 60
 focus: 20-36
 title: Navigation
+speaker: Samuel
 ---
 
 ```ruby
diff --git a/slides/060-architecture.md b/slides/060-architecture.md
@@ -3,6 +3,7 @@ template: default
 duration: 90
 marker: Architecture
 transition: fade
+speaker: Samuel
 ---
 
 ```mermaid
diff --git a/slides/070-section.md b/slides/070-section.md
@@ -3,6 +3,7 @@ template: section
 duration: 15
 transition: slide-left
 marker: Demo
+speaker: Samuel
 ---
 
 # Heading
diff --git a/slides/080-thanks.md b/slides/080-thanks.md
@@ -2,6 +2,7 @@
 template: title
 duration: 30
 marker: Thanks
+speaker: Samuel
 ---
 
 # Title
diff --git a/test/presently/presentation_controller.rb b/test/presently/presentation_controller.rb
@@ -104,6 +104,13 @@
 			controller.go_to(3)
 			expect(controller.pacing).to be == :ahead
 		end
+		
+		it "returns behind when elapsed exceeds the current slide window" do
+			# Start, then fast-forward elapsed past the end of the first slide.
+			controller.clock.start!
+			controller.clock.reset!(controller.current_slide.duration + 1)
+			expect(controller.pacing).to be == :behind
+		end
 	end
 	
 	with "#slide_progress" do
@@ -135,6 +142,22 @@
 		end
 	end
 	
+	with "#remove_listener" do
+		it "stops notifying a removed listener" do
+			call_count = 0
+			listener = Object.new
+			listener.define_singleton_method(:slide_changed!){call_count += 1}
+			controller.add_listener(listener)
+			
+			controller.advance!
+			expect(call_count).to be == 1
+			
+			controller.remove_listener(listener)
+			controller.advance!
+			expect(call_count).to be == 1
+		end
+	end
+	
 	with "#reload!" do
 		it "reloads slides and notifies listeners" do
 			notified = false
diff --git a/test/presently/slide.rb b/test/presently/slide.rb
@@ -23,6 +23,30 @@
 		end
 	end
 	
+	with "#title" do
+		it "uses filename when not set in front_matter" do
+			expect(slide.title).to be == "010-welcome"
+		end
+	end
+	
+	with "#marker" do
+		it "reads marker from front_matter" do
+			expect(slide.marker).to be == "Welcome"
+		end
+	end
+	
+	with "#skip?" do
+		it "returns false when not set" do
+			expect(slide.skip?).to be == false
+		end
+	end
+	
+	with "#speaker" do
+		it "reads speaker from front_matter" do
+			expect(slide.speaker).to be == "Samuel"
+		end
+	end
+	
 	with "#content" do
 		it "parses headings into named sections" do
 			expect(slide.content).to have_keys("title", "subtitle")
@@ -69,6 +93,26 @@
 			expect(slide.notes).to be_nil
 		end
 		
+		it "has no speaker" do
+			expect(slide.speaker).to be_nil
+		end
+		
+		it "has no marker" do
+			expect(slide.marker).to be_nil
+		end
+		
+		it "has no transition" do
+			expect(slide.transition).to be_nil
+		end
+		
+		it "has no focus" do
+			expect(slide.focus).to be_nil
+		end
+		
+		it "uses filename as title" do
+			expect(slide.title).to be == "test"
+		end
+		
 		it "puts content in body section" do
 			expect(slide.content).to have_keys("body")
 			expect(slide.content["body"].to_html).to be(:include?, "Just some content")
@@ -94,4 +138,59 @@
 			expect(slide.notes.to_commonmark).to be(:include?, "These are notes")
 		end
 	end
+	
+	with "a slide with a javascript script block in notes" do
+		let(:dir) {Dir.mktmpdir}
+		let(:path) {File.join(dir, "test.md")}
+		
+		before do
+			File.write(path, "Content\n\n---\n\nSome notes\n\n```javascript\nconsole.log('hello')\n```\n")
+		end
+		
+		after do
+			FileUtils.remove_entry(dir)
+		end
+		
+		let(:slide) {Presently::Slide.load(path)}
+		
+		it "extracts the script" do
+			expect(slide.script).to be(:include?, "console.log")
+		end
+		
+		it "removes the script block from notes" do
+			expect(slide.notes.to_commonmark).to be(:include?, "Some notes")
+			expect(slide.notes.to_commonmark).not.to be(:include?, "console.log")
+		end
+	end
+	
+	with "a slide with transition and focus front_matter" do
+		let(:dir) {Dir.mktmpdir}
+		let(:path) {File.join(dir, "test.md")}
+		
+		before do
+			File.write(path, "---\ntransition: fade\nfocus: 3-7\nskip: true\nspeaker: Alice\n---\nContent\n")
+		end
+		
+		after do
+			FileUtils.remove_entry(dir)
+		end
+		
+		let(:slide) {Presently::Slide.load(path)}
+		
+		it "reads transition" do
+			expect(slide.transition).to be == "fade"
+		end
+		
+		it "reads focus as a two-element array" do
+			expect(slide.focus).to be == [3, 7]
+		end
+		
+		it "reads skip" do
+			expect(slide.skip?).to be == true
+		end
+		
+		it "reads speaker" do
+			expect(slide.speaker).to be == "Alice"
+		end
+	end
 end
