showoff 0.4.2 → 0.6.0

data/README.rdoc

@@ -7,7 +7,7 @@ hatred in my heart for Keynote and yet it is by far the best in the field.
 
 The idea is that you setup your markdown slide files in section subdirectories
 and then startup the showoff server in that directory.  It will read in your
-showoff.json file for which sections go in which order and then will give
+<tt>showoff.json</tt> file for which sections go in which order and then will give
 you a URL to present from.
 
 It can:
@@ -18,7 +18,7 @@ It can:
 * bullets with incremental advancing
 * re-enact command line interactions
 * call up a menu of sections/slides at any time to jump around
-* execute javascript or ruby live and display results
+* execute Javascript, Coffeescript or Ruby live and display results
 * do simple transitions (instant, fade, slide in)
 * show a pre-show slideshow while you wait to start
 
@@ -26,13 +26,14 @@ It might will can:
 
 * show a timer - elapsed / remaining
 * perform simple animations of images moving between keyframes
-* show syncronized, hidden notes on another browser (like an iphone)
+* show synchronized, hidden notes on another browser (like an iphone)
 * show audience questions / comments (twitter or direct)
 * let audience members go back / catch up as you talk
 * let audience members vote on sections (?)
 * broadcast itself on Bonjour
 * let audience members download slides, code samples or other supplementary material
 * let you write on the slide with your mouse, madden-style via canvas
+* automatically resize text to fit screen [see Alex's shrink.js]
 
 Some of the nice things are that you can easily version control it, you
 can easily move sections between presentations, and you can rearrange or
@@ -40,21 +41,28 @@ remove sections easily.
 
 = Usage
 
-ShowOff is meant to be run in a ShowOff formatted repository - that means that it has a showoff.json file and a number of sections (subdirectories) with markdown files for the slides you're presenting.
+ShowOff is meant to be run in a ShowOff formatted repository - that means that
+it has a <tt>showoff.json</tt> file and a number of sections (subdirectories) with
+markdown files for the slides you're presenting.
 
     $ gem install showoff
     $ git clone (showoff-repo)
     $ cd (showoff-repo)
     $ showoff serve
 
-If you run 'showoff' in the example subdirectory of ShowOff itself, it will 
+If you run 'showoff' in the example subdirectory of ShowOff itself, it will
 show an example presentation, so you can see what it's like.
 
+You can also run 'showoff serve' inside a section subdirectory. If there is no
+<tt>showoff.json</tt> file then it will make its best guess, creating a presentation
+from all `.md` files in alphabetical order in the given (or current)
+directory.
+
 = Slide Format
 
 You can break your slides up into sections of however many subdirectories deep
 you need.  ShowOff will recursively check all the directories mentioned in
-your showoff.json file for any markdown files (.md).  Each markdown file can
+your <tt>showoff.json</tt> file for any markdown files (.md).  Each markdown file can
 have any number of slides in it, separating each slide with the '!SLIDE'
 keyword and optional slide styles.
 
@@ -77,17 +85,31 @@ the following contents:
 That represents two slides, the first contains just a large title, and the
 second is faded into view showing the title and three bullets that are then
 incrementally shown. In order for ShowOff to see those slides, your
-showoff.json file needs to look something like this:
-
-    [
-      {"section":"one"}
-    ]
+<tt>showoff.json</tt> file needs to look something like this:
+
+    {
+      "name": "Something",
+      "description": "Example Presentation",
+      "sections": [
+        {"section":"one"}
+      ]
+    }
 
 If you have multiple sections in your talk, you can make this json array
 include all the sections you want to show in which order you want to show
 them.
 
-If you want to keep the ability to emit an HTML document from your 
+Instead of a hash, you can use a plain string as an entry in the `sections`
+section of `showoff.json`.
+
+And if that plain string starts with '#' then it is interpreted not as a
+filename, but as markdown. This is used for inserting interstitial slides
+or notes -- for instance, Alex Chaffee's
+[Ruby Notes](http://github.com/alexch/ruby_notes)
+uses it to insert lab instructions between lecture slide sections, which may
+vary from venue to venue.
+
+If you want to keep the ability to emit an HTML document from your
 Markdown source file -- say, for a TextMate preview or a GitHub rendering
 -- you can use angle brackets around the `!SLIDE` keyword and styles, e.g.
 
@@ -106,7 +128,7 @@ Some useful styles for each slide are:
 * incremental - can be used with 'bullets' and 'commandline' styles, will incrementally update elements on arrow key rather than switch slides
 * small - make all slide text 80%
 * smaller - make all slide text 70%
-* execute - on js highlighted code slides, you can click on the code to execute it and display the results on the slide
+* execute - on Javascript, Coffeescript and Ruby highlighted code slides, you can click on the code to execute it and display the results on the slide
 
 Check out the example directory included to see examples of most of these.
 
@@ -147,13 +169,20 @@ The transitions are provided by jQuery Cycle plugin. See http://www.malsup.com/j
 You can manage the presentation with the following keys:
 
 * space, cursor right: next slide
-* cursor left: previous slide
+* shift-space, cursor left: previous slide
 * d: debug mode
-* c: table of contents (vi)
+* c, t: table of contents (vi)
 * f: toggle footer
-* z: toggle help
+* z, ?: toggle help
 * p: toggle preshow
 
+= Showing plain old markdown
+
+If a markdown file has no !SLIDE keywords, then showoff will treat every line
+beginning with a single hash -- i.e. every H1 -- as a new slide in "bullets"
+style. Remember that you can't specify classes or transitions in this mode,
+and as soon as you add one !SLIDE you need them everywhere.
+
 = Preshow
 
 If you want to show a slideshow while you wait to speak, you can run a preshow.  Add a +_preshow+ directory
@@ -166,7 +195,7 @@ audience in the meantime.  Press 'p' again to stop, or wait until the timer runs
 
 To insert custom JavaScript into your presentation you can either place it into
 a file (with extension .js) into the root directory of your presentation or you
-can embed a <script>-element directly into your slides. This JavaScript will be
+can embed a <+script+> element directly into your slides. This JavaScript will be
 executed—as usually—as soon as it is loaded.
 
 If you want to trigger some JavaScript as soon as a certain page is shown or
@@ -222,8 +251,8 @@ The same applies to the *showoff:prev* event, of course.
 = Custom Stylesheets
 
 To insert custom Stylesheets into your presentation you can either place it into
-a file (with extension .css) or into the root directory of your presentation or
-you can embed a <+link+>-element directly into your slides. This stylesheet will
+a file (with extension .css) into the root directory of your presentation or
+you can embed a <+link+> element directly into your slides. This stylesheet will
 be applied as soon as it is loaded.
 
 The content generated by the slide is wrapped with a +div+ with the class .+content+ like this.
@@ -257,14 +286,31 @@ Note that the example above uses CSS3 styling with ::+after+ and the +content+
 = Language highlighting
 
 Showoff uses {shjs}[http://shjs.sourceforge.net/] to highlight code blocks.
-If you begin a code block with three @-signs followed by a 
-{programming language name}[http://shjs.sourceforge.net/doc/documentation.html], 
+If you begin a code block with three @-signs followed by a
+{programming language name}[http://shjs.sourceforge.net/doc/documentation.html],
 that line will be stripped and the rest of the block will become sparkly
 and colorful.
 
     @@@ ruby
     10.times { puts "Whee!" }
 
+= Custom Ruby Files
+
+If you want to have executable Ruby code on your slides you must set the
+environment variable ENV['SHOWOFF_EVAL_RUBY']. This can be done with
+
+    export SHOWOFF_EVAL_RUBY=1
+
+or
+
+    # On Heroku
+    heroku config:add SHOWOFF_EVAL_RUBY=1
+
+
+If you need supporting libraries when you evaluate the code. You can do this by
+putting Ruby files (*.rb) into the root directory of the presentation then they
+will be required when the presentation loads.
+
 = Editor integration
 
 The "add slide" feature can allow you to add the necessary boilerplate from your editor.  If you are using vim, you can
@@ -294,19 +340,24 @@ added where your cursor was.  Binding this to a keybinding can allow you to add
 [<tt>help</tt>] Shows list of commands or help for one command
 [<tt>heroku</tt>] Setup your presentation to serve on Heroku
 [<tt>github</tt>] Setup your presentation to serve on GitHub Pages
-[<tt>serve</tt>] Serves the showoff presentation in the current directory
+[<tt>serve</tt>] Serves the showoff presentation in the current directory (or a given dir)
 [<tt>static</tt>] Generate static version of presentation
 
-=== <tt>add [title]</tt>
+
+== <tt>showoff add [title]</tt>
 
 Add a new slide at the end in a given dir
 
 *Aliases*
 * <tt><b>new</b></tt>
 
-Outputs or creates a new slide.  With -d and -n, a new slide is created in the given dir, numbered to appear as the last slide in that dir (use -u to avoid numbering).  Without those, outputs the slide markdown to stdout (useful for shelling out from your editor). You may also specify a source file to use for a code slide
+Outputs or creates a new slide. With -d and -n, a new slide is created in the given dir, numbered to appear
+as the last slide in that dir (use -u to avoid numbering). Without those, outputs the slide markdown to
+stdout (useful for shelling out from your editor). You may also specify a source file to use for a code
+slide.
+
+=== options for add
 
-==== Options
 These options are specified *after* the command.
 
 [<tt>-d, --dir=dir</tt>] Slide dir (where to put a new slide file)
@@ -314,7 +365,9 @@ These options are specified *after* the command.
 [<tt>-s, --source=path to file</tt>] Include code from the given file as the slide body
 [<tt>-t, --style, --type=valid showoff style/type</tt>] Slide Type/Style <i>( default: <tt>title</tt>)</i>
 [<tt>-u, --nonumber</tt>] Dont number the slide, use the given name verbatim
-=== <tt>create dir_name</tt>
+
+
+== <tt>showoff create dir_name</tt>
 
 Create new showoff presentation
 
@@ -323,57 +376,92 @@ Create new showoff presentation
 
 This command helps start a new showoff presentation by setting up the proper directory structure for you.  It takes the directory name you would like showoff to create for you.
 
-==== Options
+=== options for create
+
 These options are specified *after* the command.
 
 [<tt>-d, --slidedir=arg</tt>] sample slide directory name <i>( default: <tt>one</tt>)</i>
 [<tt>-n, --nosamples</tt>] Dont create sample slides
-=== <tt>help [command]</tt>
+
+
+== <tt>showoff help [command]</tt>
 
 Shows list of commands or help for one command
 
-=== <tt>heroku heroku_name</tt>
+
+== <tt>showoff heroku heroku_name</tt>
 
 Setup your presentation to serve on Heroku
 
 Creates the Gemfile and config.ru file needed to push a showoff pres to heroku.  It will then run heroku create for you to register the new project on heroku and add the remote for you.  Then all you need to do is commit the new created files and run git push heroku to deploy.
 
-=== <tt>github</tt>
+
+== <tt>showoff github</tt>
 
 Generates a static version of your site and puts it in a gh-pages branch for static serving on GitHub.
 
-==== Options
+=== options for github
 These options are specified *after* the command.
 
 [<tt>-f, --force</tt>] force overwrite of existing Gemfile/.gems and config.ru files if they exist
 [<tt>-g, --dotgems</tt>] Use older-style .gems file instead of bundler-style Gemfile
 [<tt>-p, --password=arg</tt>] add password protection to your heroku site
-=== <tt>serve </tt>
 
-Serves the showoff presentation in the current directory
 
+== <tt>showoff serve </tt>
 
+Serves the showoff presentation in the current directory
 
-==== Options
+==== options for serve
 These options are specified *after* the command.
 
+[<tt>-f, --pres_file=arg</tt>] Presentation file <i>(default: <tt>showoff.json</tt>)</i>
 [<tt>-h, --host=arg</tt>] Host or ip to run on <i>( default: <tt>localhost</tt>)</i>
 [<tt>-p, --port=arg</tt>] Port on which to run <i>( default: <tt>9090</tt>)</i>
-=== <tt>static name</tt>
+
+
+== <tt>showoff static name</tt>
 
 Generate static version of presentation
 
-=== PDF
-Append a "/pdf" to the end of your presentation URL, and a PDF will be generated within the browser. For example,
-http://localhost:9090/pdf
+= PDF Output
+
+Showoff can produce a PDF version of your presentation.  To do this, you must install a few things first:
+
+    gem install pdfkit
+
+You'll then need to install a version of wkhtmltopdf available at the {wkhtmltopdf repo}[http://code.google.com/p/wkhtmltopdf/wiki/compilation] (or brew install wkhtmltopdf on a mac) and make sure that +wkhtmltopdf+ is in your path:
 
-=== ZSH completion
+    export $PATH="/location/to/my/wkhtmltopdf/0.9.9:$PATH"
+
+
+
+Then restart showoff, and navigate to <tt>/pdf</tt> (e.g. http://localhost/pdf) of your presentation and a PDF will be generated with the browser.
+
+= Completion
+
+== ZSH completion
 You can complete commands and options in ZSH, by installing a script:
 
     mkdir -p $HOME/.zsh/Completion
     cp script/_showoff $HOME/.zsh/Completion
     echo 'fpath=(~/.zsh/Completion $fpath)' >> $HOME/.zshrc
 
+== <tt>bash</tt> completion
+
+You can complete commands for showoff by putting the following in your <tt>.bashrc</tt> (or whatever
+you use when starting <tt>bash</tt>):
+
+    complete -F get_showoff_commands
+    function get_showoff_commands()
+    {
+        if [ -z $2 ] ; then
+            COMPREPLY=(`showoff help -c`)
+        else
+            COMPREPLY=(`showoff help -c $2`)
+        fi
+    }
+
 = Real World Usage
 
 So far, ShowOff has been used in the following presentations (and many others):
@@ -407,6 +495,12 @@ So far, ShowOff has been used in the following presentations (and many others):
   http://github.com/nono/Presentations/tree/master/20100703_25_promising_projects_in_50_minutes/
 * 11th Libre Software Meeting 2010 - Ruby 1.9, The future of Ruby? - Bruno Michel
   http://github.com/nono/Presentations/tree/master/20100708_RMLL_Ruby_1.9/
+* Lone Star PHP 2011 - Drupal - Chris Christensen
+  https://github.com/christianchristensen/Presentations/tree/master/20110611-lonestarphp-drupal
+* Railsbridge Open Workshops - Sarah Allen, Sarah Mei, and Alex Chaffee
+  http://github.com/alexch/workshop
+* SDRuby Lightning Talk - Readable Regexps - Ian Young
+  https://github.com/iangreenleaf/sdruby-lightningtalk-tregexp
 
 
 If you use it for something, please let me know so I can add it.

data/bin/showoff

@@ -56,19 +56,28 @@ command :heroku do |c|
   end
 end
 
-desc 'Serves the showoff presentation in the current directory'
+desc 'Serves the showoff presentation in the specified (or current) directory'
+arg_name "[pres_dir]"
+default_value "."
 command :serve do |c|
 
+  c.desc 'Show verbose messaging'
+  c.switch :verbose
+
   c.desc 'Port on which to run'
   c.default_value "9090"
   c.flag [:p,:port]
 
   c.desc 'Host or ip to run on'
   c.default_value "localhost"
-  c.flag [:h,:host]
+  c.flag [:h,:host]  
+
+  c.desc 'JSON file used to describe presentation'
+  c.default_value "showoff.json"
+  c.flag [:f, :pres_file]
 
   c.action do |global_options,options,args|
-    ShowOff.run! :host => options[:h], :port => options[:p].to_i
+    ShowOff.run! :host => options[:h], :port => options[:p].to_i, :pres_file => options[:f], :pres_dir => args[0], :verbose => options[:verbose]
   end
 end
 

data/lib/commandline_parser.rb

@@ -0,0 +1,67 @@
+require 'parslet'
+
+# For parsing commandline slide content.
+class CommandlineParser < Parslet::Parser
+
+  rule(:prompt) do
+    str('$') | str('#')
+  end
+
+  rule(:text) do
+    match['[:print:]'].repeat
+  end
+
+  rule(:singleline_input) do
+    (str("\\\n").absent? >> match['[:print:]']).repeat
+  end
+
+  rule(:input) do
+    multiline_input | singleline_input
+  end
+
+  rule(:multiline_input) do
+
+    # some command \
+    # continued \
+    # \
+    # and stop
+    ( singleline_input >> str('\\') >> newline ).repeat(1) >> singleline_input
+  end
+
+  rule(:command) do
+
+    # $ some command
+    # some output
+    ( prompt.as(:prompt) >> space? >> input.as(:input) >> output? ).as(:command)
+  end
+
+  rule(:output) do
+
+    # output
+    prompt.absent? >> text
+  end
+
+  rule(:output?) do
+
+    #
+    # some text
+    # some text
+    #
+    # some text
+    ( newline >> ( ( output >> newline ).repeat >> output.maybe ).as(:output) ).maybe
+  end
+
+  rule(:commands) do
+    command.repeat
+  end
+
+  rule(:newline) do
+    str("\n") | str("\r\n")
+  end
+
+  rule(:space?) do
+    match['[:space:]'].repeat
+  end
+
+  root(:commands)
+end

data/lib/showoff.rb

@@ -3,10 +3,12 @@ require 'sinatra/base'
 require 'json'
 require 'nokogiri'
 require 'fileutils'
+require 'logger'
 
 here = File.expand_path(File.dirname(__FILE__))
 require "#{here}/showoff_utils"
 require "#{here}/princely"
+require "#{here}/commandline_parser"
 
 begin
   require 'RMagick'
@@ -27,38 +29,58 @@ rescue LoadError
   Object.send(:remove_const,:Markdown)
   Markdown = BlueCloth
 end
-require 'pp'
 
 class ShowOff < Sinatra::Application
 
-  Version = VERSION = '0.4.2'
+  Version = VERSION = '0.6.0'
 
   attr_reader :cached_image_size
 
   set :views, File.dirname(__FILE__) + '/../views'
   set :public, File.dirname(__FILE__) + '/../public'
-  set :pres_dir, 'example'
 
   def initialize(app=nil)
     super(app)
-    puts dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    if Dir.pwd == dir
-      options.pres_dir = dir + '/example'
+    @logger = Logger.new(STDOUT)
+    @logger.formatter = proc { |severity,datetime,progname,msg| "#{progname} #{msg}\n" }
+    @logger.level = options.verbose ? Logger::DEBUG : Logger::WARN
+
+    dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    @logger.debug(dir)
+
+    showoff_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    if Dir.pwd == showoff_dir
+      options.pres_dir = "#{showoff_dir}/example"
       @root_path = "."
     else
-      options.pres_dir = Dir.pwd
+      options.pres_dir ||= Dir.pwd
       @root_path = ".."
     end
+    options.pres_dir = File.expand_path(options.pres_dir)
+    if (options.pres_file)
+      puts "Using #{options.pres_file}"
+      ShowOffUtils.presentation_config_file = options.pres_file
+    end
+    puts "Serving presentation from #{options.pres_dir}"
     @cached_image_size = {}
-    puts options.pres_dir
+    @logger.debug options.pres_dir
     @pres_name = options.pres_dir.split('/').pop
+    require_ruby_files
+  end
+
+  def require_ruby_files
+    Dir.glob("#{options.pres_dir}/*.rb").map { |path| require path }
   end
 
   helpers do
     def load_section_files(section)
       section = File.join(options.pres_dir, section)
-      files = Dir.glob("#{section}/**/*").sort
-      pp files
+      files = if File.directory? section
+        Dir.glob("#{section}/**/*").sort
+      else
+        [section]
+      end
+      @logger.debug files
       files
     end
 
@@ -70,34 +92,68 @@ class ShowOff < Sinatra::Application
       Dir.glob("#{options.pres_dir}/*.js").map { |path| File.basename(path) }
     end
 
+
     def preshow_files
       Dir.glob("#{options.pres_dir}/_preshow/*").map { |path| File.basename(path) }.to_json
     end
 
-    def process_markdown(name, content, static=false)
-      slides = content.split(/^<?!SLIDE/)
-      slides.delete('')
+    # todo: move more behavior into this class
+    class Slide
+      attr_reader :classes, :text
+      def initialize classes = ""
+        @classes = ["content"] + classes.strip.chomp('>').split
+        @text = ""
+      end
+      def <<(s)
+        @text << s
+        @text << "\n"
+      end
+      def empty?
+        @text.strip == ""
+      end
+    end
+
+
+    def process_markdown(name, content, static=false, pdf=false)
+
+      # if there are no !SLIDE markers, then make every H1 define a new slide
+      unless content =~ /^\<?!SLIDE/m
+        content = content.gsub(/^# /m, "<!SLIDE>\n# ")
+      end
+
+      # todo: unit test
+      lines = content.split("\n")
+      puts "#{name}: #{lines.length} lines"
+      slides = []
+      slides << (slide = Slide.new)
+      until lines.empty?
+        line = lines.shift
+        if line =~ /^<?!SLIDE(.*)>?/
+          slides << (slide = Slide.new($1))
+        else
+          slide << line
+        end
+      end
+
+      slides.delete_if {|slide| slide.empty? }
+
       final = ''
       if slides.size > 1
         seq = 1
       end
       slides.each do |slide|
         md = ''
-        # extract content classes
-        lines = slide.split("\n")
-        content_classes = lines.shift.strip.chomp('>').split rescue []
-        slide = lines.join("\n")
-        # add content class too
-        content_classes.unshift "content"
+        content_classes = slide.classes
+
         # extract transition, defaulting to none
         transition = 'none'
         content_classes.delete_if { |x| x =~ /^transition=(.+)/ && transition = $1 }
         # extract id, defaulting to none
         id = nil
         content_classes.delete_if { |x| x =~ /^#([\w-]+)/ && id = $1 }
-        puts "id: #{id}" if id
-        puts "classes: #{content_classes.inspect}"
-        puts "transition: #{transition}"
+        @logger.debug "id: #{id}" if id
+        @logger.debug "classes: #{content_classes.inspect}"
+        @logger.debug "transition: #{transition}"
         # create html
         md += "<div"
         md += " id=\"#{id}\"" if id
@@ -108,8 +164,8 @@ class ShowOff < Sinatra::Application
         else
           md += "<div class=\"#{content_classes.join(' ')}\" ref=\"#{name}\">\n"
         end
-        sl = Markdown.new(slide).to_html
-        sl = update_image_paths(name, sl, static)
+        sl = Markdown.new(slide.text).to_html
+        sl = update_image_paths(name, sl, static, pdf)
         md += sl
         md += "</div>\n"
         md += "</div>\n"
@@ -124,14 +180,14 @@ class ShowOff < Sinatra::Application
       markdown.gsub(/<p>\.(.*?) /, '<p class="\1">')
     end
 
-    def update_image_paths(path, slide, static=false)
+    def update_image_paths(path, slide, static=false, pdf=false)
       paths = path.split('/')
       paths.pop
       path = paths.join('/')
       replacement_prefix = static ?
-        %(img src="file://#{options.pres_dir}/#{path}) :
+        ( pdf ? %(img src="file://#{options.pres_dir}/#{path}) : %(img src="./file/#{path}) ) :
         %(img src="/image/#{path})
-      slide.gsub(/img src=\"(.*?)\"/) do |s|
+      slide.gsub(/img src=\"([^\/].*?)\"/) do |s|
         img_path = File.join(path, $1)
         w, h     = get_image_size(img_path)
         src      = %(#{replacement_prefix}/#{$1}")
@@ -146,7 +202,12 @@ class ShowOff < Sinatra::Application
       def get_image_size(path)
         if !cached_image_size.key?(path)
           img = Magick::Image.ping(path).first
-          cached_image_size[path] = [img.columns, img.rows]
+          # don't set a size for svgs so they can expand to fit their container
+          if img.mime_type == 'image/svg+xml'
+            cached_image_size[path] = [nil, nil]
+          else
+            cached_image_size[path] = [img.columns, img.rows]
+          end
         end
         cached_image_size[path]
       end
@@ -157,14 +218,15 @@ class ShowOff < Sinatra::Application
 
     def update_commandline_code(slide)
       html = Nokogiri::XML.parse(slide)
+      parser = CommandlineParser.new
 
       html.css('pre').each do |pre|
         pre.css('code').each do |code|
           out = code.text
           lines = out.split("\n")
-          if lines.first[0, 3] == '@@@'
+          if lines.first.strip[0, 3] == '@@@'
             lang = lines.shift.gsub('@@@', '').strip
-            pre.set_attribute('class', 'sh_' + lang)
+            pre.set_attribute('class', 'sh_' + lang.downcase)
             code.content = lines.join("\n")
           end
         end
@@ -172,38 +234,53 @@ class ShowOff < Sinatra::Application
 
       html.css('.commandline > pre > code').each do |code|
         out = code.text
-        lines = out.split(/^\$(.*?)$/)
-        lines.delete('')
         code.content = ''
-        while(lines.size > 0) do
-          command = lines.shift
-          result = lines.shift
-          c = Nokogiri::XML::Node.new('code', html)
-          c.set_attribute('class', 'command')
-          c.content = '$' + command
-          code << c
-          c = Nokogiri::XML::Node.new('code', html)
-          c.set_attribute('class', 'result')
-          c.content = result
-          code << c
+        tree = parser.parse(out)
+        transform = Parslet::Transform.new do
+          rule(:prompt => simple(:prompt), :input => simple(:input), :output => simple(:output)) do
+            command = Nokogiri::XML::Node.new('code', html)
+            command.set_attribute('class', 'command')
+            command.content = "#{prompt} #{input}"
+            code << command
+
+            # Add newline after the input so that users can
+            # advance faster than the typewriter effect
+            # and still keep inputs on separate lines.
+            code << "\n"
+
+            unless output.to_s.empty?
+
+              result = Nokogiri::XML::Node.new('code', html)
+              result.set_attribute('class', 'result')
+              result.content = output
+              code << result
+            end
+          end
         end
+        transform.apply(tree)
       end
       html.root.to_s
     end
 
-    def get_slides_html(static=false)
-      sections = ShowOffUtils.showoff_sections(options.pres_dir)
+    def get_slides_html(static=false, pdf=false)
+      sections = ShowOffUtils.showoff_sections(options.pres_dir, @logger)
       files = []
       if sections
-        sections.each do |section|
-          files << load_section_files(section)
-        end
-        files = files.flatten
-        files = files.select { |f| f =~ /.md/ }
         data = ''
-        files.each do |f|
-          fname = f.gsub(options.pres_dir + '/', '').gsub('.md', '')
-          data += process_markdown(fname, File.read(f), static)
+        sections.each do |section|
+          if section =~ /^#/
+            name = section.each_line.first.gsub(/^#*/,'').strip
+            data << process_markdown(name, "<!SLIDE subsection>\n" + section, static, pdf)
+          else
+            files = []
+            files << load_section_files(section)
+            files = files.flatten
+            files = files.select { |f| f =~ /.md/ }
+            files.each do |f|
+              fname = f.gsub(options.pres_dir + '/', '').gsub('.md', '')
+              data << process_markdown(fname, File.read(f), static, pdf)
+            end
+          end
         end
       end
       data
@@ -297,7 +374,7 @@ class ShowOff < Sinatra::Application
     end
 
     def pdf(static=true)
-      @slides = get_slides_html(static)
+      @slides = get_slides_html(static, true)
       @no_js = false
       html = erb :onepage
       # TODO make a random filename
@@ -363,9 +440,33 @@ class ShowOff < Sinatra::Application
           FileUtils.makedirs(File.join(file_dir, dir))
           FileUtils.copy(File.join(pres_dir, path), File.join(file_dir, path))
         end
+        # copy images from css too
+        Dir.glob("#{pres_dir}/*.css").each do |css_path|
+          File.open(css_path) do |file|
+            data = file.read
+            data.scan(/url\((.*)\)/).flatten.each do |path|
+              @logger.debug path
+              dir = File.dirname(path)
+              FileUtils.makedirs(File.join(file_dir, dir))
+              FileUtils.copy(File.join(pres_dir, path), File.join(file_dir, path))
+            end
+          end
+        end
       end
     end
 
+   def eval_ruby code
+     eval(code).to_s
+   rescue => e
+     e.message
+   end
+
+  get '/eval_ruby' do
+    return eval_ruby(params[:code]) if ENV['SHOWOFF_EVAL_RUBY']
+
+    return "Ruby Evaluation is off. To turn it on set ENV['SHOWOFF_EVAL_RUBY']"
+  end
+
   get %r{(?:image|file)/(.*)} do
     path = params[:captures].first
     full_path = File.join(options.pres_dir, path)