slideshow 0.9.6 → 0.9.7

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 0.9.7 / 2010-07-22
+
+* Added support for reStructedText (using pandoc-ruby gem)
+* Update builtin S6 blank templates (toggle slide counter, debug, etc.)
+* Update SyntaxHighlighter helper
+
 === 0.9.6 / 2010-07-18
 
 * Update builtin S6 blank templates (adding autoplay, custom transitions, custom title selector, and more)

data/Manifest.txt

@@ -7,6 +7,7 @@ config/slideshow.builtin.yml
 config/slideshow.yml
 lib/slideshow.rb
 lib/slideshow/config.rb
+lib/slideshow/fetch.rb
 lib/slideshow/filters/debug_filter.rb
 lib/slideshow/filters/headers_filter.rb
 lib/slideshow/filters/slide_filter.rb
@@ -24,10 +25,12 @@ lib/slideshow/helpers/syntax/sh_helper.rb
 lib/slideshow/helpers/syntax/uv_helper.rb
 lib/slideshow/helpers/table_helper.rb
 lib/slideshow/helpers/text_helper.rb
-lib/slideshow/markdown.rb
+lib/slideshow/manifest.rb
+lib/slideshow/markup/markdown.rb
+lib/slideshow/markup/rest.rb
+lib/slideshow/markup/textile.rb
 lib/slideshow/opts.rb
 lib/slideshow/slide.rb
-lib/slideshow/textile.rb
 templates/s6.txt
 templates/s6.txt.gen
 templates/s6/jquery.js

data/README.rdoc

@@ -26,6 +26,7 @@ Examples:
   slideshow microformats                
   slideshow microformats.textile         # Process slides using Textile
   slideshow microformats.text            # Process slides using Markdown
+  slideshow microformats.rst             # Process slides using reStructuredText (*see Requirements)
 
   slideshow -o slides microformats       # Output slideshow to slides folder
 
@@ -45,9 +46,12 @@ More examles:
 
 * BlueCloth (Markdown Markup) [Optional]
 * RDiscount (Markdown Markup) [Optional]
+* pandoc-ruby (Markdown/reStructuredText Markup) [Optional]
+
 * Coderay (Syntax Highlighting) [Optional]
 * Ultraviolet (Syntax Highlighting) [Optional]
 
+
 == INSTALL:
 
 Just install the gem:

data/config/slideshow.builtin.yml

@@ -26,11 +26,14 @@ filters:
   - dump_content_to_file_debug_text
 
 
-# markup (textile, markdown) config
+# markup (textile, markdown, rest) config
     
 textile:
   extnames: [ .textile, .t ]
   
+rest:  
+  extnames: [ .rst, .rest ]
+    
 markdown:
   extnames: [ .markdown, .m, .mark, .mkdn, .md, .txt, .text ]
 

data/lib/slideshow/config.rb

@@ -57,6 +57,10 @@ class Config
     @hash.fetch( 'user', {} ).fetch( lib, {} ).fetch( 'post-processing', true )
   end
   
+  def known_rest_extnames
+    @hash[ 'builtin' ][ 'rest' ][ 'extnames' ]
+  end
+  
   def known_textile_extnames
     # returns an array of known file extensions e.g.
     # [ '.textile', '.t' ]
@@ -86,7 +90,7 @@ class Config
     # ruby check: is it better self. ?? or more confusing
     #  possible conflict only with write access (e.g. prop=) 
     
-    known_textile_extnames + known_markdown_extnames
+    known_textile_extnames + known_markdown_extnames + known_rest_extnames
   end
   
   def text_filters

data/lib/slideshow/fetch.rb

@@ -0,0 +1,132 @@
+module Slideshow
+  module Fetch
+  
+  def fetch_file( dest, src )
+    logger.debug "fetch( dest: #{dest}, src: #{src})"
+
+    uri = URI.parse( src )
+  
+    # new code: honor proxy env variable HTTP_PROXY
+    proxy = ENV['HTTP_PROXY']
+    proxy = ENV['http_proxy'] if proxy.nil?   # try possible lower/case env variable (for *nix systems) is this necessary??
+    
+    if proxy
+      proxy = URI.parse( proxy )
+      logger.debug "using net http proxy: proxy.host=#{proxy.host}, proxy.port=#{proxy.port}"
+      if proxy.user && proxy.password
+        logger.debug "  using credentials: proxy.user=#{proxy.user}, proxy.password=****"
+      else
+        logger.debug "  using no credentials"
+      end
+    else
+      logger.debug "using direct net http access; no proxy configured"
+      proxy = OpenStruct.new   # all fields return nil (e.g. proxy.host, etc.)
+    end
+  
+    # same as short-cut: http_proxy.get_respone( uri )
+    # use full code for easier changes
+    
+    http_proxy = Net::HTTP::Proxy( proxy.host, proxy.port, proxy.user, proxy.password )
+    http       = http_proxy.new( uri.host, uri.port )
+    request    = Net::HTTP::Get.new( uri.request_uri )
+    response   = http.request( request )  
+  
+    unless response.code == '200'   # note: responsoe.code is a string
+      msg = "#{response.code} #{response.message}" 
+      puts "*** error: #{msg}"
+      return   # todo: throw StandardException?
+    end
+
+    logger.debug "  content_type: #{response.content_type}, content_length: #{response.content_length}"
+  
+    # check for content type; use 'wb' for images
+    if response.content_type =~ /image/
+      logger.debug '  switching to binary'
+      flags = 'wb'
+    else
+      flags = 'w'
+    end
+  
+    File.open( dest, flags ) do |f|
+      f.write( response.body )	
+    end
+  end
+  
+  
+  def fetch_slideshow_templates
+    logger.debug "fetch_uri=#{opts.fetch_uri}"
+    
+    src = opts.fetch_uri
+    
+    ## check for builtin shortcut (assume no / or \) 
+    if src.index( '/' ).nil? && src.index( '\\' ).nil?
+      shortcut = src.clone
+      src = config.map_fetch_shortcut( src )
+      
+      if src.nil?
+        puts "** Error: No mapping found for fetch shortcut '#{shortcut}'."
+        return
+      end
+      puts "  Mapping fetch shortcut '#{shortcut}' to: #{src}"
+    end
+    
+    
+    # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
+    # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
+    uri = URI.parse( src )
+  
+    logger.debug "host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
+  
+    dirname  = File.dirname( uri.path )    
+    basename = File.basename( uri.path, '.*' ) # e.g. fullerscreen     (without extension)
+    filename = File.basename( uri.path )       # e.g. fullerscreen.txt (with extension)
+
+    logger.debug "dirname: #{dirname}"
+    logger.debug "basename: #{basename}, filename: #{filename}"
+
+    dlbase = "http://#{uri.host}:#{uri.port}#{dirname}"
+    pkgpath = File.expand_path( "#{config_dir}/templates/#{basename}" )
+  
+    logger.debug "dlpath: #{dlbase}"
+    logger.debug "pkgpath: #{pkgpath}"
+  
+    FileUtils.makedirs( pkgpath ) unless File.directory? pkgpath 
+   
+    puts "Fetching template package '#{basename}'"
+    puts "  : from '#{dlbase}'"
+    puts "  : saving to '#{pkgpath}'"
+  
+    # download manifest
+    dest = "#{pkgpath}/#{filename}"
+
+    puts "  Downloading manifest '#{filename}'..."
+
+    fetch_file( dest, src )
+
+    manifest = load_manifest_core( dest )
+      
+    # download templates listed in manifest
+    manifest.each do |values|
+      values[1..-1].each do |file|
+      
+        dest = "#{pkgpath}/#{file}"
+
+        # make sure path exists
+        destpath = File.dirname( dest )
+        FileUtils.makedirs( destpath ) unless File.directory? destpath
+    
+        src = "#{dlbase}/#{file}"
+    
+        puts "  Downloading template '#{file}'..."
+        fetch_file( dest, src )
+      end
+    end   
+    puts "Done."  
+  end  
+    
+  end # module  Fetch
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::Fetch
+end    

data/lib/slideshow/filters/slide_filter.rb

@@ -7,7 +7,7 @@ module Slideshow
 # e.g. changes:
 # <h1 id='optional' class='optional'>
 #  to
-# <!-- _S9SLIDE_ -->
+#  html comment -> _S9SLIDE_ (note: rdoc can't handle html comments?) 
 # <h1 id='optional' class='optional'>
 
 def add_slide_directive_before_h1( content )
@@ -33,7 +33,7 @@ end
 # <div id='header'>
 # <h1 id='optional' class='optional'>
 #  to
-# <!-- _S9SLIDE_ -->
+#  html comment -> _S9SLIDE_ 
 # <div id='header'>
 # <h1 id='optional' class='optional'>
 

data/lib/slideshow/gen.rb

@@ -17,45 +17,17 @@ class Gen
     @opts
   end
 
-  attr_reader :markup_type  # :textile, :markdown
+  attr_reader :markup_type  # :textile, :markdown, :rest
   
-  def load_markdown_libs
-    # check for available markdown libs/gems
-    # try to require each lib and remove any not installed
-    @markdown_libs = []
-
-    config.known_markdown_libs.each do |lib|
-      begin
-        require lib
-        @markdown_libs << lib
-      rescue LoadError => ex
-        logger.debug "Markdown library #{lib} not found. Use gem install #{lib} to install."
-      end
-    end
-
-    puts "  Found #{@markdown_libs.length} Markdown libraries: #{@markdown_libs.join(', ')}"
-  end
- 
-  
-  def markdown_to_html( content )
-    # call markdown filter; turn markdown lib name into method_name (mn)
-    # eg. rpeg-markdown =>  rpeg_markdown_to_html
-
-    # lets you use differnt options/converters for a single markdown lib
-    mn = config.markdown_to_html_method( @markdown_libs.first )    
-    
-    puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}' calling '#{mn}'..."
-    
-    send mn, content   # call 1st configured markdown engine e.g. kramdown_to_html( content )
-  end
-
-  # uses configured markup processor (textile,markdown) to generate html
+  # uses configured markup processor (textile,markdown,rest) to generate html
   def text_to_html( content )
     content = case @markup_type
       when :markdown
         markdown_to_html( content )
       when :textile
         textile_to_html( content )
+      when :rest
+        rest_to_html( content )
     end
     content
   end
@@ -93,10 +65,12 @@ class Gen
     end
   end
     
+  # todo/fix: move to Config class  
   def cache_dir
     RUBY_PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".slideshow")
   end
 
+  # todo/fix: move to Config class  
   def win32_cache_dir
     unless ENV['HOMEDRIVE'] && ENV['HOMEPATH'] && File.exists?(home = ENV['HOMEDRIVE'] + ENV['HOMEPATH'])
       puts "No HOMEDRIVE or HOMEPATH environment variable.  Set one to save a" +
@@ -107,6 +81,7 @@ class Gen
     end
   end
   
+  # todo/fix: move to Config class    
   def config_dir
     unless @config_dir  # first time? calculate config_dir value to "cache"
       
@@ -123,101 +98,6 @@ class Gen
     @config_dir
   end
 
-  def load_manifest_core( path )
-    manifest = []
-  
-    File.open( path ).readlines.each_with_index do |line,i|
-      case line
-      when /^\s*$/
-        # skip empty lines
-      when /^\s*#.*$/
-        # skip comment lines
-      else
-        logger.debug "line #{i+1}: #{line.strip}"
-        values = line.strip.split( /[ <,+]+/ )
-        
-        # add source for shortcuts (assumes relative path; if not issue warning/error)
-        values << values[0] if values.size == 1
-                
-        manifest << values
-      end      
-    end
-
-    manifest
-  end
-
-  def load_manifest( path )
-        
-    filename = path
- 
-    puts "  Loading template manifest #{filename}..."  
-    manifest = load_manifest_core( filename )
-    
-    # post-processing
-    # normalize all source paths (1..-1) /make full path/add template dir
-
-    templatesdir = File.dirname( path )
-    logger.debug "templatesdir=#{templatesdir}"
-
-    manifest.each do |values|
-      (1..values.size-1).each do |i|
-        values[i] = "#{templatesdir}/#{values[i]}"
-        logger.debug "  path[#{i}]=>#{values[i]}<"
-      end
-    end
-             
-    manifest
-  end
-
-  def find_manifests( patterns )
-    manifests = []
-    
-    patterns.each do |pattern|
-      pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
-      logger.debug "Checking #{pattern}"
-      Dir.glob( pattern ) do |file|
-        logger.debug "  Found manifest: #{file}"
-        manifests << [ File.basename( file ), file ]
-      end    
-    end
-    
-    manifests
-  end
-
-  def installed_generator_manifests
-    # 1) search gem/templates 
-
-    builtin_patterns = [
-      "#{File.dirname( LIB_PATH )}/templates/*.txt.gen"
-    ]
-
-    find_manifests( builtin_patterns )
-  end
-
-  def installed_template_manifests
-    # 1) search ./templates
-    # 2) search config_dir/templates
-    # 3) search gem/templates
-
-    builtin_patterns = [
-      "#{File.dirname( LIB_PATH )}/templates/*.txt"
-    ]
-    config_patterns  = [
-      "#{config_dir}/templates/*.txt",
-      "#{config_dir}/templates/*/*.txt"
-    ]
-    current_patterns = [
-      "templates/*.txt",
-      "templates/*/*.txt"
-    ]
-    
-    patterns = []
-    patterns += current_patterns  unless LIB_PATH == File.expand_path( 'lib' )  # don't include working dir if we test code from repo (don't include slideshow/templates)
-    patterns += config_patterns
-    patterns += builtin_patterns
- 
-    find_manifests( patterns )
-  end
 
   def load_template( path ) 
     puts "  Loading template #{path}..."
@@ -228,22 +108,6 @@ class Gen
     ERB.new( content ).result( the_binding )
   end
 
-  def load_template_old_delete( name, builtin )
-    
-    if opts.has_includes? 
-      opts.includes.each do |path|
-        logger.debug "File.exists? #{path}/#{name}"
-        
-        if File.exists?( "#{path}/#{name}" ) then          
-          puts "Loading custom template #{path}/#{name}..."
-          return File.read( "#{path}/#{name}" )
-        end
-      end       
-    end
-    
-    # fallback load builtin template packaged with gem
-    load_builtin_template( builtin )
-  end
   
   def with_output_path( dest, output_path )
     dest_full = File.expand_path( dest, output_path )
@@ -256,130 +120,7 @@ class Gen
     dest_full
   end
   
-
-  def fetch_file( dest, src )
-    logger.debug "fetch( dest: #{dest}, src: #{src})"
-
-    uri = URI.parse( src )
-  
-    # new code: honor proxy env variable HTTP_PROXY
-    proxy = ENV['HTTP_PROXY']
-    proxy = ENV['http_proxy'] if proxy.nil?   # try possible lower/case env variable (for *nix systems) is this necessary??
-    
-    if proxy
-      proxy = URI.parse( proxy )
-      logger.debug "using net http proxy: proxy.host=#{proxy.host}, proxy.port=#{proxy.port}"
-      if proxy.user && proxy.password
-        logger.debug "  using credentials: proxy.user=#{proxy.user}, proxy.password=****"
-      else
-        logger.debug "  using no credentials"
-      end
-    else
-      logger.debug "using direct net http access; no proxy configured"
-      proxy = OpenStruct.new   # all fields return nil (e.g. proxy.host, etc.)
-    end
-  
-    # same as short-cut: http_proxy.get_respone( uri )
-    # use full code for easier changes
-    
-    http_proxy = Net::HTTP::Proxy( proxy.host, proxy.port, proxy.user, proxy.password )
-    http       = http_proxy.new( uri.host, uri.port )
-    request    = Net::HTTP::Get.new( uri.request_uri )
-    response   = http.request( request )  
-  
-    unless response.code == '200'   # note: responsoe.code is a string
-      msg = "#{response.code} #{response.message}" 
-      puts "*** error: #{msg}"
-      return   # todo: throw StandardException?
-    end
-
-    logger.debug "  content_type: #{response.content_type}, content_length: #{response.content_length}"
-  
-    # check for content type; use 'wb' for images
-    if response.content_type =~ /image/
-      logger.debug '  switching to binary'
-      flags = 'wb'
-    else
-      flags = 'w'
-    end
-  
-    File.open( dest, flags ) do |f|
-      f.write( response.body )	
-    end
-  end
-  
   
-  def fetch_slideshow_templates
-    logger.debug "fetch_uri=#{opts.fetch_uri}"
-    
-    src = opts.fetch_uri
-    
-    ## check for builtin shortcut (assume no / or \) 
-    if src.index( '/' ).nil? && src.index( '\\' ).nil?
-      shortcut = src.clone
-      src = config.map_fetch_shortcut( src )
-      
-      if src.nil?
-        puts "** Error: No mapping found for fetch shortcut '#{shortcut}'."
-        return
-      end
-      puts "  Mapping fetch shortcut '#{shortcut}' to: #{src}"
-    end
-    
-    
-    # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
-    # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
-    uri = URI.parse( src )
-  
-    logger.debug "host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
-  
-    dirname  = File.dirname( uri.path )    
-    basename = File.basename( uri.path, '.*' ) # e.g. fullerscreen     (without extension)
-    filename = File.basename( uri.path )       # e.g. fullerscreen.txt (with extension)
-
-    logger.debug "dirname: #{dirname}"
-    logger.debug "basename: #{basename}, filename: #{filename}"
-
-    dlbase = "http://#{uri.host}:#{uri.port}#{dirname}"
-    pkgpath = File.expand_path( "#{config_dir}/templates/#{basename}" )
-  
-    logger.debug "dlpath: #{dlbase}"
-    logger.debug "pkgpath: #{pkgpath}"
-  
-    FileUtils.makedirs( pkgpath ) unless File.directory? pkgpath 
-   
-    puts "Fetching template package '#{basename}'"
-    puts "  : from '#{dlbase}'"
-    puts "  : saving to '#{pkgpath}'"
-  
-    # download manifest
-    dest = "#{pkgpath}/#{filename}"
-
-    puts "  Downloading manifest '#{filename}'..."
-
-    fetch_file( dest, src )
-
-    manifest = load_manifest_core( dest )
-      
-    # download templates listed in manifest
-    manifest.each do |values|
-      values[1..-1].each do |file|
-      
-        dest = "#{pkgpath}/#{file}"
-
-        # make sure path exists
-        destpath = File.dirname( dest )
-        FileUtils.makedirs( destpath ) unless File.directory? destpath
-    
-        src = "#{dlbase}/#{file}"
-    
-        puts "  Downloading template '#{file}'..."
-        fetch_file( dest, src )
-      end
-    end   
-    puts "Done."  
-  end
-
   def create_slideshow_templates
     
     manifest_name = opts.manifest 
@@ -430,7 +171,7 @@ class Gen
     
     # 1) add slide break  
   
-    if @markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby'
+    if (@markup_type == :markdown && @markdown_libs.first == 'pandoc-ruby') || @markup_type == :rest
       content = add_slide_directive_before_div_h1( content )
     else
       content = add_slide_directive_before_h1( content )
@@ -579,6 +320,8 @@ class Gen
 
   if config.known_markdown_extnames.include?( extname )
     @markup_type = :markdown
+  elsif config.known_rest_extnames.include?( extname )
+    @markup_type = :rest
   else
     @markup_type = :textile
   end
@@ -719,6 +462,7 @@ def run( args )
          puts "  slideshow microformats"
          puts "  slideshow microformats.textile         # Process slides using Textile"
          puts "  slideshow microformats.text            # Process slides using Markdown"
+         puts "  slideshow microformats.rst             # Process slides using reStructuredText"
          puts "  slideshow -o slides microformats       # Output slideshow to slides folder"
          puts
          puts "More examles:"

data/lib/slideshow/helpers/syntax/sh_helper.rb

@@ -19,10 +19,23 @@ def sh_worker( code, opts )
   css_class_opt = opts.fetch( :class, nil ) #  large, small, tiny, etc.
   css_class << " #{css_class_opt}" if css_class_opt   # e.g. use/allow multiple classes -> code small, code large, etc.
    
-  out =  %{<pre class='#{css_class} brush: #{lang} gutter: #{line_numbers ? 'true' : 'false'}'>}
+  out =  %{<div class='#{css_class}'><pre class='brush: #{lang} toolbar: false gutter: #{line_numbers ? 'true' : 'false'}'>}
   out << code_highlighted
-  out << %{</pre>\n}
+  out << %{</pre></div>\n}
     
+  name        = opts.fetch( :name, nil )
+  txmt_value  = opts.fetch( :txmt, headers.code_txmt )
+  txmt        = (txmt_value =~ /true|yes|on/i) ? true : false
+    
+  # add optional href link for textmate
+  if name
+    out << %{<div class="codeurl">}
+    out << %{<a href="txmt://open?url=file://#{File.expand_path(name)}">} if txmt  
+    out << name
+    out << %{</a>} if txmt
+    out << %{</div>\n}
+  end
+          
   return out 
 end  
 

data/lib/slideshow/helpers/text_helper.rb

@@ -13,15 +13,18 @@ def help()
 *Slide Show Keyboard Controls (Help)*
 
 | Action | Key |
-| Go to next slide | Space Bar, Right Arrow, Down Arrow, Page Down |
+| Go to next slide | Space Bar, Right Arrow, Down Arrow, Page Down, Click Heading |
 | Go to previous slide | Left Arrow, Up Arrow, Page Up |
 | Toggle between slideshow and outline view (Ø) | T |
 | Show/hide slide controls (Ø « ») | C, Move mouse to bottom right corner |
+| Zoom in, zoom out, zoom reset (100%)  | Control[@+@]Plus, Control[@+@]Minus, Control[@+@]@0@ |
 EOS
 
  html = <<EOS
 <!-- begin help -->
+<div class='help projection'>
 #{textile_to_html( text )}
+</div>
 <!-- end help -->
 EOS
 

data/lib/slideshow/manifest.rb

@@ -0,0 +1,105 @@
+module Slideshow
+  module Manifest
+  
+  def load_manifest_core( path )
+    manifest = []
+  
+    File.open( path ).readlines.each_with_index do |line,i|
+      case line
+      when /^\s*$/
+        # skip empty lines
+      when /^\s*#.*$/
+        # skip comment lines
+      else
+        logger.debug "line #{i+1}: #{line.strip}"
+        values = line.strip.split( /[ <,+]+/ )
+        
+        # add source for shortcuts (assumes relative path; if not issue warning/error)
+        values << values[0] if values.size == 1
+                
+        manifest << values
+      end      
+    end
+
+    manifest
+  end
+
+  def load_manifest( path )
+        
+    filename = path
+ 
+    puts "  Loading template manifest #{filename}..."  
+    manifest = load_manifest_core( filename )
+    
+    # post-processing
+    # normalize all source paths (1..-1) /make full path/add template dir
+
+    templatesdir = File.dirname( path )
+    logger.debug "templatesdir=#{templatesdir}"
+
+    manifest.each do |values|
+      (1..values.size-1).each do |i|
+        values[i] = "#{templatesdir}/#{values[i]}"
+        logger.debug "  path[#{i}]=>#{values[i]}<"
+      end
+    end
+             
+    manifest
+  end
+
+  def find_manifests( patterns )
+    manifests = []
+    
+    patterns.each do |pattern|
+      pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
+      logger.debug "Checking #{pattern}"
+      Dir.glob( pattern ) do |file|
+        logger.debug "  Found manifest: #{file}"
+        manifests << [ File.basename( file ), file ]
+      end    
+    end
+    
+    manifests
+  end
+  
+  def installed_generator_manifests
+    # 1) search gem/templates 
+
+    builtin_patterns = [
+      "#{File.dirname( LIB_PATH )}/templates/*.txt.gen"
+    ]
+
+    find_manifests( builtin_patterns )
+  end
+
+  def installed_template_manifests
+    # 1) search ./templates
+    # 2) search config_dir/templates
+    # 3) search gem/templates
+
+    builtin_patterns = [
+      "#{File.dirname( LIB_PATH )}/templates/*.txt"
+    ]
+    config_patterns  = [
+      "#{config_dir}/templates/*.txt",
+      "#{config_dir}/templates/*/*.txt"
+    ]
+    current_patterns = [
+      "templates/*.txt",
+      "templates/*/*.txt"
+    ]
+    
+    patterns = []
+    patterns += current_patterns  unless LIB_PATH == File.expand_path( 'lib' )  # don't include working dir if we test code from repo (don't include slideshow/templates)
+    patterns += config_patterns
+    patterns += builtin_patterns
+ 
+    find_manifests( patterns )
+  end
+    
+  end # module  Manifest
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::Manifest
+end

data/lib/slideshow/{markdown.rb → markup/markdown.rb}

@@ -49,6 +49,42 @@ module Slideshow
   def kramdown_to_html( content )
     Kramdown::Document.new( content ).to_html
   end
+  
+  
+  ### code for managing multiple markdown libs
+  
+  def load_markdown_libs
+    # check for available markdown libs/gems
+    # try to require each lib and remove any not installed
+    @markdown_libs = []
+
+    config.known_markdown_libs.each do |lib|
+      begin
+        require lib
+        @markdown_libs << lib
+      rescue LoadError => ex
+        logger.debug "Markdown library #{lib} not found. Use gem install #{lib} to install."
+      end
+    end
+
+    puts "  Found #{@markdown_libs.length} Markdown libraries: #{@markdown_libs.join(', ')}"
+  end
+ 
+  
+  def markdown_to_html( content )
+    # call markdown filter; turn markdown lib name into method_name (mn)
+    # eg. rpeg-markdown =>  rpeg_markdown_to_html
+
+    # lets you use differnt options/converters for a single markdown lib
+    mn = config.markdown_to_html_method( @markdown_libs.first )    
+    
+    puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library '#{@markdown_libs.first}' calling '#{mn}'..."
+    
+    send mn, content   # call 1st configured markdown engine e.g. kramdown_to_html( content )
+  end
+  
+  
+  
 
 end   # module MarkdownEngines
 end # module Slideshow

data/lib/slideshow/markup/rest.rb

@@ -0,0 +1,17 @@
+require 'pandoc-ruby'
+
+module Slideshow
+  module RestEngines  # reStructuredText
+
+  def rest_to_html( content )
+    puts "  Converting reStructuredText (#{content.length} bytes) to HTML..."
+
+    content = PandocRuby.new( content, :from => :rst, :to => :html ).convert
+  end
+    
+end   # module RestEngines
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::RestEngines
+end  

data/lib/slideshow.rb

@@ -25,9 +25,12 @@ require 'kramdown'  # default markdown library
 require 'slideshow/opts'
 require 'slideshow/config'
 require 'slideshow/gen'
+require 'slideshow/manifest'
+require 'slideshow/fetch'
 require 'slideshow/slide'
-require 'slideshow/textile'
-require 'slideshow/markdown'
+
+require 'slideshow/markup/textile'
+require 'slideshow/markup/markdown'
 
 # load built-in (required) helpers/plugins
 require 'slideshow/helpers/text_helper'
@@ -51,7 +54,7 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 
   # version string for generator meta tag (includes ruby version)
   def Slideshow.generator
@@ -73,7 +76,7 @@ module Slideshow
 
 end # module Slideshow
 
-# load built-in (optional) helpers/plugins
+# load built-in (optional) helpers/plugins/engines
 #   If a helper fails to load, simply ingnore it
 #   If you want to use it install missing required gems e.g.:
 #     gem install coderay
@@ -81,6 +84,7 @@ end # module Slideshow
 BUILTIN_OPT_HELPERS = [
   'slideshow/helpers/syntax/uv_helper.rb',
   'slideshow/helpers/syntax/coderay_helper.rb',
+  'slideshow/markup/rest.rb',
 ]
 
 BUILTIN_OPT_HELPERS.each do |helper| 

data/templates/s6/jquery.slideshow.js

@@ -17,6 +17,16 @@ Slideshow.transition = function( $from, $to ) {
  * inspired by Karl Swedberg's Scroll Up Headline Reader jQuery Tutorial[1]
  * [1] http://docs.jquery.com/Tutorials:Scroll_Up_Headline_Reader
  */
+
+function transitionSlideUpSlideDown( $from, $to ) {
+   $from.slideUp( 500, function() { $to.slideDown( 1000 ); } );
+}
+	
+function transitionFadeOutFadeIn( $from, $to ) {
+	 $from.fadeOut( 500 );
+   $to.fadeIn( 500 );			
+}
+
 function transitionScrollUp( $from, $to ) {   
   var cheight = $from.outerHeight();
 
@@ -78,11 +88,7 @@ Slideshow.init = function( options ) {
    
   function updateCurrentSlideCounter()
   { 
-      $( '#currentSlide' ).html( '<a id="plink" href="">'
-         + '<span id="csHere">' + settings.snum + '<\/span> '
-         + '<span id="csSep">\/<\/span> ' 
-         + '<span id="csTotal">' + settings.smax + '<\/span>'
-         + '<\/a>' );
+      $( '#currentSlide' ).html( settings.snum + '/' + settings.smax );
   }
   
   function updateJumpList()
@@ -92,8 +98,6 @@ Slideshow.init = function( options ) {
   
   function updatePermaLink()
   {
-      $('#plink').get(0).href = window.location.pathname + '#slide' + settings.snum;
-      
       // todo: unify hash marks??; use #1 for div ids instead of #slide1? 
       window.location.hash = '#'+settings.snum;
   }
@@ -229,6 +233,13 @@ function toggle()
    
    function createControls()
    {	  
+     // todo: make layout into an id (not class?)
+     //  do we need or allow more than one element?
+     
+  
+     // if no div.layout exists, create one
+     if( $( '.layout' ).length == 0 )
+        $( "<div class='layout'></div>").appendTo( 'body' );
   
      $( '.layout' )
 	    .append( "<div id='controls'>" )
@@ -254,7 +265,13 @@ function toggle()
       updateCurrentSlideCounter();
       updatePermaLink(); 
    }
-      
+  
+  function toggleSlideNumber()
+  {
+     // toggle slide number/counter
+     $( '#currentSlide' ).toggle();
+  }
+  
   function toggleFooter()
   {
      $( '#footer').toggle(); 
@@ -268,7 +285,7 @@ function toggle()
 		key.which = key.keyCode;
 	}
 	if (key.which == 84) {
-		toggle();
+		toggle();  // toggle between project and screen css media mode 
 		return;
 	}
 	if( settings.isProjection ) {
@@ -303,7 +320,7 @@ function toggle()
 				goTo(settings.smax);
 				break;   
 			case 67: // c
-				showHide('c');
+				showHide('c');  // toggle controls (navlinks,navlist)
 				break;
       case 65: //a
 			case 80: //p
@@ -312,6 +329,12 @@ function toggle()
 				break;
       case 70: //f
         toggleFooter();
+        break;
+      case 78: // n
+        toggleSlideNumber();
+        break;
+      case 68: // d
+        toggleDebug();
         break;
 		}
 	}
@@ -336,6 +359,33 @@ function autoplay()
 	   }
 }
 
+function toggleDebug()
+{
+   settings.debug = !settings.debug;
+   doDebug();
+}
+
+function doDebug()
+{
+   // fix/todo: save background into oldbackground
+   //  so we can restore later 
+   
+   if( settings.debug == true )
+   {
+      $( '#header' ).css( 'background', '#FCC' );
+      $( '#footer' ).css( 'background', '#CCF' );
+      $( '#controls' ).css( 'background', '#BBD' );
+      $( '#currentSlide' ).css( 'background', '#FFC' ); 
+   }
+   else
+   {
+      $( '#header' ).css( 'background', 'transparent' );
+      $( '#footer' ).css( 'background', 'transparent' );
+      $( '#controls' ).css( 'background', 'transparent' );
+      $( '#currentSlide' ).css( 'background', 'transparent' );       
+   }
+}
+
 	 
 function toggleAutoplay()
 {
@@ -452,14 +502,10 @@ function addSlideIds() {
      toggle();
    else if( settings.mode == 'autoplay' )
      toggleAutoplay();
-     
+  
+  
    if( settings.debug == true )
-   {
-      $( '#header' ).css( 'background', '#FCC' );
-      $( '#footer' ).css( 'background', '#CCF' );
-      $( '#controls' ).css( 'background', '#BBD' );
-      $( '#currentSlide' ).css( 'background', '#FFC' ); 
-   }
+     doDebug();
                 
    document.onkeyup = keys;
 

data/templates/s6/print.css

@@ -1 +1 @@
-/*********************************
 * CSS @media print rules (not projection or screen)
 */
 * Make sure all slides are visible (to make them all appear in prin)
 */
         display: block !important;
       }
 * Extra styling for first slide (title slide)
 */
     border-bottom: 1px dotted silver;
   }
 * Turn on print-specific stuff/classes
 */
 * Turn off online (screen/projection)-specific stuff/classes
 */
 * The following rule keeps the layout stuff out of print.
 * Remove at your own risk!
 */
+/*********************************
 * CSS @media print rules (not projection or screen)
 */
 * Make sure all slides are visible (to make them all appear in prin)
 */
         display: block !important;
       }
 * Extra styling for first slide (title slide)
 */
     border-bottom: 1px dotted silver;
   }
 * Turn on print-specific stuff/classes
 */
 * Turn off online (screen/projection)-specific stuff/classes
 */
 * The following rule keeps the layout stuff out of print.
 * Remove at your own risk!
 */

data/templates/s6/screen.css

@@ -15,6 +15,8 @@
 
 .layout * { display: none; }
 
+.projection { display: none; }
+
 /*************
  * make toggle button visible and reposition to upper right corner *
  * note: toogle button is nested inside #controls > #navLinks > #toogle

data/templates/slides.html.erb

@@ -8,9 +8,9 @@
 <meta name="author"    content="<%= @headers['author']%>" >
 
 <!-- S6 style sheet links -->
-<link rel="stylesheet" href="<%= "#{@name}.css" %>" type="text/css" media="projection" id="styleProjection">
-<link rel="stylesheet" href="s6/screen.css"         type="text/css" media="screen"     id="styleScreen">
-<link rel="stylesheet" href="s6/print.css"          type="text/css" media="print">
+<link rel="stylesheet" href="<%= "#{@name}.css" %>" media="projection" id="styleProjection">
+<link rel="stylesheet" href="s6/screen.css"         media="screen"     id="styleScreen">
+<link rel="stylesheet" href="s6/print.css"          media="print">
 
 <!-- S6 JS -->
 <script src="s6/jquery.js"></script>
@@ -47,6 +47,4 @@
 
 </div><!-- presentation -->
 </body>
-</html>
-
-   
+</html>

data/templates/style.css.erb

@@ -1,35 +1,91 @@
 @import url(s6/projection.css); /* required to make the slide show run at all */
      
-html, body { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; }
+body { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; }
 
 a:link, a:visited { color: black; }
 
-h1 { font-size: 30pt;  }
-h2 { font-size: 28pt;  }
+.slide h1 { font-size: 30pt;  }
+
+.slide h1 {  text-align: center; }
+
+.slide h1.fullscreen { position: absolute;
+                       top: 40%;
+                       width: 100%; }
+
+/* lets you create slides with no heading (because heading is hidden but gets included in toc) */
+.slide h1.hidden     { display: none; }
+
+
+.slide h2 { font-size: 28pt;  }
+
 h3 { font-size: 25pt;  }
+
+/* todo: add special formating for .cover slide
+   lets you use h1(cover). for title/cover slide (a la S5 slide0) but more generic (not bound to 1st slide)
+*/
+
+.cover h1 { /* tbd */ }
+.cover h2 { /* tbd */ }
+
+/* todo: add special formating for h1, h2 in footer */
+
+#footer h1 { /* tbd */ }
+#footer h2 { /* tbd */ }
+
+
 p, li, dt, dd, td, th { font-size: 18pt; }
 
+ul { list-style-type: square; }    
+
+/**********************************/
+/* general text-alignment classes */
+
+.left   { text-align: left; }
+.center { text-align: center; }
+.right  { text-align: right;  }
+
+/**********************************/
+/* general font-size classes      */
+
+.small { font-size: 97%; }
+
+.x-small,
+.smaller { font-size: 88%; }
+
+.xx-small,
+.smallest,
+.tiny      { font-size: 82%; }
+
+
+
 pre { font-size: 16pt;  }
-pre.small { font-size: 12pt; }
 
-pre.code { 
+.code { 
         background-color: azure;
         padding: 5px;
       }
+     
+.footnote a:first-of-type  { text-decoration: none; }
 
-div.code {
-        background-color: azure;
-        padding: 5px;
-}
 
-ul { list-style-type: square; }    
+p.small  { font-size: 97%; }
 
-.center { text-align: center; }
+p.x-small,
+p.smaller,  
+p.footnote { font-size: 88%; }
 
-/*** style rules for steps ****/     
+p.xx-small,
+p.smallest,
+p.tiny     { font-size: 82%; }
 
-.stepcurrent { color: black; }
+
+.help p,
+.help td  { font-size: 88%; }
+
+ 
 .step { color: silver; }
 /* or hide next steps e.g.  .step { visibility: hidden; } */
+.stepcurrent { color: black; }
+
 
 <%= content_for :css %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - config/slideshow.yml
 - lib/slideshow.rb
 - lib/slideshow/config.rb
+- lib/slideshow/fetch.rb
 - lib/slideshow/filters/debug_filter.rb
 - lib/slideshow/filters/headers_filter.rb
 - lib/slideshow/filters/slide_filter.rb
@@ -122,10 +123,12 @@ files:
 - lib/slideshow/helpers/syntax/uv_helper.rb
 - lib/slideshow/helpers/table_helper.rb
 - lib/slideshow/helpers/text_helper.rb
-- lib/slideshow/markdown.rb
+- lib/slideshow/manifest.rb
+- lib/slideshow/markup/markdown.rb
+- lib/slideshow/markup/rest.rb
+- lib/slideshow/markup/textile.rb
 - lib/slideshow/opts.rb
 - lib/slideshow/slide.rb
-- lib/slideshow/textile.rb
 - templates/s6.txt
 - templates/s6.txt.gen
 - templates/s6/jquery.js