przn 0.2.0 → 0.4.0

data/lib/przn/screenshot_pdf_exporter.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+require 'fileutils'
+
+module Przn
+  # Default PDF export: drives the live renderer, asks the terminal to save
+  # each rendered slide as a one-page vector PDF via OSC 7772 `capture`,
+  # then concatenates the per-slide PDFs into a single multi-page PDF.
+  # Requires Echoes (or any terminal that implements the same capture
+  # command); use `export_pdf_prawn` instead for environments where that's
+  # not possible (CI, headless).
+  def self.export_pdf(file, output, theme: nil)
+    markdown = File.read(file)
+    presentation = Parser.parse(markdown)
+    base_dir = File.dirname(File.expand_path(file))
+    ScreenshotPdfExporter.new(presentation, base_dir: base_dir, theme: theme).export(output)
+    puts "Generated: #{output}"
+  end
+
+  # Renders each slide live to the user's terminal, asks the terminal to save
+  # the current pane as a vector PDF via Echoes' OSC 7772 `capture` command,
+  # then concatenates the per-slide PDFs into a single multi-page PDF.
+  #
+  # Trade-off vs the Prawn-based PdfExporter:
+  #   - Pixel-perfect match with what's on screen (gradients, fonts, OSC 66
+  #     sized text, bullet glyphs, the lot) — but vector, so the result is
+  #     small, sharp at any zoom, and text stays selectable.
+  #   - Requires running inside a terminal that implements OSC 7772 capture
+  #     to a `.pdf` path (i.e. Echoes). Won't work in CI or any terminal that
+  #     doesn't honor the command.
+  #
+  # Echoes-side wire format (independent of przn):
+  #   ESC ] 7772 ; capture ; <absolute_path> BEL
+  #   On receipt, Echoes saves the current pane to the path. The file
+  #   extension picks the format — `.pdf` produces a single-page vector PDF
+  #   by replaying the same drawing pipeline into a CGPDFContext instead of
+  #   the screen's NSGraphicsContext.
+  class ScreenshotPdfExporter
+    OSC = "\e]7772".freeze
+    BEL = "\a".freeze
+
+    POLL_INTERVAL = 0.05  # seconds between file-existence checks
+    CAPTURE_TIMEOUT = 10  # seconds per slide before giving up
+
+    def initialize(presentation, base_dir: '.', theme: nil, terminal: nil)
+      @presentation = presentation
+      @base_dir = base_dir
+      @theme = theme || Theme.default
+      @terminal = terminal || Terminal.new
+      @renderer = Renderer.new(@terminal, base_dir: base_dir, theme: theme)
+    end
+
+    def export(output_path)
+      require 'hexapdf'
+
+      Dir.mktmpdir('przn-capture') do |dir|
+        pdf_paths = capture_all_slides(dir)
+        merge_pdfs(pdf_paths, output_path)
+      end
+    end
+
+    private
+
+    def capture_all_slides(dir)
+      paths = []
+      @terminal.enter_alt_screen
+      @terminal.hide_cursor
+      @presentation.slides.each_with_index do |slide, i|
+        pdf_path = File.join(dir, format('slide-%04d.pdf', i))
+        @renderer.render(slide, current: i, total: @presentation.total)
+        request_capture(pdf_path)
+        wait_for_capture(pdf_path)
+        paths << pdf_path
+      end
+      paths
+    ensure
+      @terminal.write "#{OSC};bg-clear#{BEL}"
+      @terminal.show_cursor
+      @terminal.leave_alt_screen
+      @terminal.flush
+    end
+
+    def request_capture(path)
+      @terminal.write "#{OSC};capture;#{path}#{BEL}"
+      @terminal.flush
+    end
+
+    def wait_for_capture(path)
+      deadline = Time.now + CAPTURE_TIMEOUT
+      until File.exist?(path) && File.size?(path).to_i.positive?
+        if Time.now > deadline
+          raise "Capture timed out for #{path}. " \
+                'Is Echoes running and recent enough to honor OSC 7772 `capture` to a .pdf path?'
+        end
+        sleep POLL_INTERVAL
+      end
+      # Small grace period to ensure the PDF write is fully flushed.
+      sleep POLL_INTERVAL
+    end
+
+    def merge_pdfs(pdf_paths, output_path)
+      raise 'No slides captured' if pdf_paths.empty?
+
+      output = HexaPDF::Document.new
+      pdf_paths.each do |path|
+        src = HexaPDF::Document.open(path)
+        src.pages.each do |page|
+          output.pages << output.import(page)
+        end
+      end
+      output.write(output_path)
+    end
+  end
+end

data/lib/przn/slide.rb

@@ -7,5 +7,30 @@ module Przn
     def initialize(blocks)
       @blocks = blocks.freeze
     end
+
+    # Aggregate every `{::note}` / `<note>` segment in the slide's text-bearing
+    # fields. The presenter view renders these in its side panel; the audience
+    # renderer strips them from the rendered output.
+    def notes
+      out = []
+      blocks.each do |b|
+        texts = []
+        texts << b[:content] if b[:content].is_a?(String)
+        texts << b[:term]    if b[:term].is_a?(String)
+        texts << b[:definition] if b[:definition].is_a?(String)
+        if b[:items].is_a?(Array)
+          b[:items].each { |it| texts << it[:text] if it.is_a?(Hash) && it[:text].is_a?(String) }
+        end
+        if b[:rows].is_a?(Array)
+          (Array(b[:header]) + b[:rows].flatten).each { |c| texts << c if c.is_a?(String) }
+        end
+        texts.each do |text|
+          Parser.parse_inline(text).each do |seg|
+            out << seg[1] if seg[0] == :note && seg[1] && !seg[1].empty?
+          end
+        end
+      end
+      out
+    end
   end
 end

data/lib/przn/theme.rb

@@ -6,7 +6,7 @@ module Przn
   class Theme
     DEFAULT_PATH = File.expand_path('../../../default_theme.yml', __FILE__)
 
-    attr_reader :colors, :font, :bullet, :bullet_size, :bg, :heading_face
+    attr_reader :colors, :font, :bullet, :background, :title, :rabbit
 
     def self.load(path)
       raise ArgumentError, "Theme file not found: #{path}" unless File.exist?(path)
@@ -16,27 +16,64 @@ module Przn
       merged = {
         colors: defaults[:colors].merge(overrides[:colors] || {}),
         font: defaults[:font].merge(overrides[:font] || {}),
-        bullet: overrides[:bullet] || defaults[:bullet],
-        bullet_size: overrides[:bullet_size] || defaults[:bullet_size],
-        bg: defaults[:bg].merge(overrides[:bg] || {}),
-        heading_face: overrides[:heading_face] || defaults[:heading_face],
+        bullet: defaults[:bullet].merge(overrides[:bullet] || {}),
+        background: defaults[:background].merge(overrides[:background] || {}),
+        title: defaults[:title].merge(overrides[:title] || {}),
+        # `rabbit` is opt-in: absent → nil → renderer uses the plain N/M footer.
+        # Present (even as an empty block) → hash → renderer uses the runner bar.
+        rabbit: defaults[:rabbit] || overrides[:rabbit] ?
+          (defaults[:rabbit] || {}).merge(overrides[:rabbit] || {}) :
+          nil
       }
       new(merged)
     end
 
+    # Convert a human-friendly duration string to seconds.
+    #   "30m"     -> 1800
+    #   "1h30m"   -> 5400
+    #   "1h2m3s"  -> 3723
+    #   "45"      -> 45  (bare integers are seconds)
+    #   45        -> 45  (already a number)
+    #   nil / ""  -> nil
+    #   "garbage" -> nil
+    def self.parse_duration(input)
+      return nil if input.nil?
+      return input.to_i if input.is_a?(Numeric)
+
+      s = input.to_s.strip
+      return nil if s.empty?
+      return s.to_i if s =~ /\A\d+\z/
+
+      m = s.match(/\A(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?\z/)
+      return nil unless m && m[0] != ''
+      h, mi, se = m[1].to_i, m[2].to_i, m[3].to_i
+      h * 3600 + mi * 60 + se
+    end
+
     def self.default
       new(load_yaml(DEFAULT_PATH))
     end
 
+    # Look for a sibling `theme.yml` next to the given file and load it if
+    # present, so a deck can ship its theme alongside the markdown without
+    # the user having to pass `--theme` explicitly. Returns nil if no file
+    # is found.
+    def self.auto_discover(near:)
+      candidate = File.join(File.dirname(File.expand_path(near)), 'theme.yml')
+      File.exist?(candidate) ? load(candidate) : nil
+    end
+
     def self.load_yaml(path)
       data = YAML.safe_load_file(path, symbolize_names: true) || {}
       {
         colors: data[:colors] || {},
         font: data[:font] || {},
-        bullet: data[:bullet],
-        bullet_size: data[:bullet_size],
-        bg: (data[:bg] || {}).compact,
-        heading_face: data[:heading_face],
+        bullet: (data[:bullet] || {}).compact,
+        background: (data[:background] || {}).compact,
+        title: (data[:title] || {}).compact,
+        # nil when the `rabbit:` key isn't in the YAML at all (opt-in feature);
+        # empty hash when it's present but childless.
+        rabbit: data.key?(:rabbit) ? (data[:rabbit] || {}).compact : nil
       }
     end
     private_class_method :load_yaml
@@ -45,9 +82,9 @@ module Przn
       @colors = config[:colors]
       @font = config[:font]
       @bullet = config[:bullet]
-      @bullet_size = config[:bullet_size]
-      @bg = config[:bg]
-      @heading_face = config[:heading_face]
+      @background = config[:background]
+      @title = config[:title]
+      @rabbit = config[:rabbit]
     end
   end
 end

data/lib/przn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Przn
-  VERSION = "0.2.0"
+  VERSION = '0.4.0'
 end

data/lib/przn.rb

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
-require_relative "przn/version"
-require_relative "przn/kitty_text"
-require_relative "przn/image_util"
-require_relative "przn/slide"
-require_relative "przn/parser"
-require_relative "przn/presentation"
-require_relative "przn/terminal"
-require_relative "przn/renderer"
-require_relative "przn/controller"
-require_relative "przn/pdf_exporter"
-require_relative "przn/theme"
+require 'tmpdir'
+require 'securerandom'
+
+require_relative 'przn/version'
+require_relative 'przn/kitty_text'
+require_relative 'przn/image_util'
+require_relative 'przn/parser'
+require_relative 'przn/slide'
+require_relative 'przn/presentation'
+require_relative 'przn/terminal'
+require_relative 'przn/renderer'
+require_relative 'przn/presenter_renderer'
+require_relative 'przn/audience_link'
+require_relative 'przn/echoes_client'
+require_relative 'przn/controller'
+require_relative 'przn/screenshot_pdf_exporter'
+require_relative 'przn/theme'
 
 module Przn
   class Error < StandardError; end
@@ -25,11 +31,72 @@ module Przn
     Controller.new(presentation, terminal, renderer)
   end
 
-  def self.export_pdf(file, output, theme: nil)
+  # Audience-side entry: opens the file, listens on `socket`, and renders
+  # whatever slide the presenter sends a `goto` for. Notes are stripped.
+  # Spawned by Echoes when the presenter requests an extended-display window.
+  def self.audience(file, socket:, theme: nil)
     markdown = File.read(file)
     presentation = Parser.parse(markdown)
+    terminal = Terminal.new
+    base_dir = File.dirname(File.expand_path(file))
+    renderer = Renderer.new(terminal, base_dir: base_dir, theme: theme, mode: :audience)
+
+    terminal.enter_alt_screen
+    terminal.hide_cursor
+    begin
+      render = ->(idx, started_at) {
+        presentation.go_to(idx)
+        renderer.render(presentation.current_slide,
+                        current: presentation.current,
+                        total: presentation.total,
+                        started_at: started_at)
+      }
+      render.call(0, nil)
+      AudienceLink.serve(socket) do |msg|
+        next unless msg[:type] == "goto" && msg[:index].is_a?(Integer)
+        started_at = msg[:started_at] ? Time.at(msg[:started_at]) : nil
+        render.call(msg[:index], started_at)
+      end
+    ensure
+      terminal.write "\e]7772;bg-clear\a"
+      terminal.show_cursor
+      terminal.leave_alt_screen
+    end
+  end
+
+  # Presenter-side entry: detects a second display via Echoes, spawns the
+  # audience window on it, connects to the spawned process over a Unix
+  # socket, and returns a Controller wired up to drive both sides.
+  # Falls back to today's mirror-mode (`start`) when only one display is
+  # attached or Echoes is not the host terminal.
+  def self.present(file, theme: nil, theme_path: nil)
+    info = EchoesClient.display_info
+    if info.nil? || info.size < 2
+      warn "przn: extended-display unavailable (no secondary display detected), falling back to mirror mode"
+      return start(file, theme: theme)
+    end
+
+    socket_path = File.join(Dir.tmpdir, "przn-#{Process.pid}-#{SecureRandom.hex(4)}.sock")
+    audience_argv = [File.expand_path($PROGRAM_NAME), '--audience', '--socket', socket_path]
+    audience_argv += ['--theme', theme_path] if theme_path
+    audience_argv << File.expand_path(file)
+    EchoesClient.open_window(display: info.last[:index], argv: audience_argv)
+
+    deadline = Time.now + 5
+    sleep 0.1 until File.exist?(socket_path) || Time.now > deadline
+    unless File.exist?(socket_path)
+      warn "przn: audience window did not come up within 5s, falling back to mirror mode"
+      return start(file, theme: theme)
+    end
+
+    link = AudienceLink.connect(socket_path)
+    link.gets # discard the {"type":"ready"} handshake
+
+    markdown = File.read(file)
+    presentation = Parser.parse(markdown)
+    terminal = Terminal.new
     base_dir = File.dirname(File.expand_path(file))
-    PdfExporter.new(presentation, base_dir: base_dir, theme: theme).export(output)
-    puts "Generated: #{output}"
+    renderer = PresenterRenderer.new(terminal, presentation: presentation, base_dir: base_dir, theme: theme)
+    Controller.new(presentation, terminal, renderer, audience_link: link)
   end
 end

data/sample/sample.md

@@ -40,6 +40,14 @@ This is **bold**, this is *italic*, and this is `inline code`.
 
 normal and {::tag name="red"}red text{:/tag} mixed
 
+# Image (PNG)
+
+![](doge.png){:relative_height="70"}
+
+# Image (JPG)
+
+![](doge.jpg){:relative_height="70"}
+
 # Thank You!
 
 That's all! Enjoy!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: przn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
   - Akira Matsuda
@@ -25,6 +25,22 @@ dependencies:
           - ">="
           - !ruby/object:Gem::Version
             version: "0"
+  - !ruby/object:Gem::Dependency
+    name: hexapdf
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: "0"
 description: A terminal-based presentation tool that renders Markdown slides with Kitty text sizing protocol support for beautifully scaled headers
 email:
   - ronnie@dio.jp
@@ -39,17 +55,23 @@ files:
   - default_theme.yml
   - exe/przn
   - lib/przn.rb
+  - lib/przn/audience_link.rb
   - lib/przn/controller.rb
+  - lib/przn/echoes_client.rb
   - lib/przn/image_util.rb
   - lib/przn/kitty_text.rb
   - lib/przn/parser.rb
-  - lib/przn/pdf_exporter.rb
+  - lib/przn/prawn_pdf_exporter.rb
   - lib/przn/presentation.rb
+  - lib/przn/presenter_renderer.rb
   - lib/przn/renderer.rb
+  - lib/przn/screenshot_pdf_exporter.rb
   - lib/przn/slide.rb
   - lib/przn/terminal.rb
   - lib/przn/theme.rb
   - lib/przn/version.rb
+  - sample/doge.jpg
+  - sample/doge.png
   - sample/sample.md
   - sig/przn.rbs
 homepage: "https://github.com/amatsuda/przn"