slideshow 2.2.0 → 2.3.0

data/Manifest.txt

@@ -31,10 +31,10 @@ lib/slideshow/helpers/step_helper.rb
 lib/slideshow/helpers/syntax/coderay_helper.rb
 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/manifest_helpers.rb
 lib/slideshow/markup/markdown.rb
+lib/slideshow/markup/mediawiki.rb
 lib/slideshow/markup/rest.rb
 lib/slideshow/markup/textile.rb
 lib/slideshow/plugin_helpers.rb

data/Rakefile

@@ -17,9 +17,10 @@ Hoe.spec 'slideshow' do
     ['textutils','>= 0.2.0'],
     ['pakman','>= 0.4.0'],
     ['activesupport', '>= 3.2.6'],
-    ['RedCloth','>= 4.2.9'],
     ['logutils','>= 0.6.0'],
     ['gli', '>= 2.5.6']
+    ## ['wikicloth', '>= 0.8.0']  make it a soft dependency   # mediawiki markup engine
+    ## ['RedCloth','>= 4.2.9']    make it a soft dependency   # textile markup engine
   ]
 
   # switch extension to .markdown for gihub formatting
@@ -29,6 +30,23 @@ Hoe.spec 'slideshow' do
   self.post_install_message =<<EOS
 ******************************************************************************
 
+Tip: Try some new template packs. Example:
+
+  $ slideshow install impress.js
+  
+  or
+  
+  $ slideshow install deck.js
+  
+  and use like
+  
+  $ slideshow build welcome.text -t impress.js
+  
+  or
+  
+  $ slideshow build welcome.text -t deck.js
+
+
 Questions? Comments? Send them along to the mailing list.
 https://groups.google.com/group/webslideshow
 

data/config/slideshow.index.yml

@@ -1,18 +1,16 @@
-###############################
-# copy from -> https://github.com/slideshow-s9/update/blob/master/index.yml
-#
-#  issue
-#    slideshow update
-#  to update index
-
+###########################################################################################
+# Slide Show (S9) Update Index for Template Packs, Quick Starter Samples 'n' Plugins
 
-##############################################################
-# Slide Show (S9) Update Index for Template Packs 'n' Plugins
+# find the latest version online at
+#  - https://github.com/slideshow-s9/update
+#
+#  use  $ slideshow update     -- for automatic update e.g. download the latest slideshow.index.yml file
 
 
 #############
-# shortcuts for fetching template packs (w/ optional quick starter templates) 
-#   map shortcut to URI
+# shortcuts for fetching template packs (w/ optional quick starter samples) 
+#   maps shortcut to URI
+
 
 s6blank: https://raw.github.com/slideshow-s9/slideshow-s6-blank/master/s6blank.txt
 
@@ -43,7 +41,21 @@ impress.js:
 shower: https://raw.github.com/slideshow-s9/slideshow-shower/master/shower.txt
 
 
-##################
-# plugins
+##############
+# Plugins
 
 analytics: https://raw.github.com/slideshow-s9/analytics/master/analytics.txt.plugin
+
+tables: https://raw.github.com/slideshow-s9/tables/master/tables.txt.plugin
+
+snippets: https://raw.github.com/slideshow-s9/snippets/master/snippets.txt.plugin
+
+plugins:
+- https://raw.github.com/slideshow-s9/analytics/master/analytics.txt.plugin
+- https://raw.github.com/slideshow-s9/tables/master/tables.txt.plugin
+- https://raw.github.com/slideshow-s9/snippets/master/snippets.txt.plugin
+
+#############################
+# Quick Starter Stamples
+
+formatting: https://raw.github.com/slideshow-s9/formatting/master/formatting.txt.quick

data/config/slideshow.yml

@@ -70,4 +70,7 @@ textile:
 rest:
   extnames: [ .rst, .rest ]
 
+mediawiki:
+  extnames: [ .wiki, .mediawiki, .mw ]
+
 # NB: markdown now configured in markdown.yml (using markdown gem)

data/lib/slideshow/cli/commands/gen.rb

@@ -29,15 +29,17 @@ class Gen     ## todo: rename command to build
   attr_reader :opts, :config, :headers
   attr_reader :session      # give helpers/plugins a session-like hash
 
-  attr_reader :markup_type  # :textile, :markdown, :rest
-  
-  # uses configured markup processor (textile,markdown,rest) to generate html
+  attr_reader :markup_type  # :textile, :markdown, :mediawiki, :rest
+
+  # uses configured markup processor (textile,markdown,rest,mediawiki) 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 :mediawiki
+        mediawiki_to_html( content )
       when :rest
         rest_to_html( content )
     end
@@ -49,10 +51,13 @@ class Gen     ## todo: rename command to build
     #   thus, to avoid runs - use guard_block (add a leading newline to avoid getting include in block that goes before)
     
     # todo/fix: remove wrap_markup; replace w/ guard_text
-    #   why: text might be css, js, not just html      
+    #   why: text might be css, js, not just html
+    
+    ## todo: add print depreciation warning
+    
     wrap_markup( text )
   end
-   
+
   def guard_block( text )
     if markup_type == :textile
       # saveguard with notextile wrapper etc./no further processing needed
@@ -61,6 +66,8 @@ class Gen     ## todo: rename command to build
     elsif markup_type == :markdown
       # wrap in newlines to avoid runons
       "\n\n#{text}\n\n"
+    elsif markup_type == :mediawiki
+      "\n\n<nowiki>\n#{text}\n</nowiki>\n"
     else
       text
     end
@@ -81,23 +88,6 @@ class Gen     ## todo: rename command to build
   end
 
 
-  ## fix:/todo: check if these get called
-  ##   from helpers
-  ##  fix: cleanup and remove
-
-  def load_template( path )
-    puts "*** depreceated api - load_template() - use Pakman gem api"
-    puts "  Loading template #{path}..."
-    return File.read( path )
-  end
-  
-  def render_template( content, the_binding )
-    puts "*** depreceated api - render_template() - use Pakman gem api"
-    ERB.new( content ).result( the_binding )
-  end
-
-
-
   # move into a filter??
   def post_processing_slides( content )
     
@@ -252,6 +242,8 @@ class Gen     ## todo: rename command to build
     @markup_type = :textile
   elsif config.known_rest_extnames.include?( extname )
     @markup_type = :rest
+  elsif config.known_mediawiki_extnames.include?( extname )
+    @markup_type = :mediawiki
   else  # default/fallback use markdown
     @markup_type = :markdown
   end

data/lib/slideshow/config.rb

@@ -175,6 +175,10 @@ class Config
     @props.fetch_from_section( 'textile', 'extnames', [] )
   end
 
+  def known_mediawiki_extnames
+    @props.fetch_from_section( 'mediawiki', 'extnames', [] )
+  end
+
   def known_markdown_extnames
     ## delegate config to Markdown gem for now
     ## todo/fix: how to pass on setting to Markdown gem??
@@ -192,7 +196,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_rest_extnames
+    known_textile_extnames + known_markdown_extnames + known_mediawiki_extnames + known_rest_extnames
   end
   
   def text_filters

data/lib/slideshow/helpers/text_helper.rb

@@ -6,31 +6,6 @@ def s9_include( name, opts = {} )
   content = File.read( name )
 end
 
-def help()
-  puts "  Adding HTML for Slide Show help instructions..."
-    
-  text = <<EOS
-*Slide Show Keyboard Controls (Help)*
-
-| Action | Key |
-| 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 (&#216;) | T |
-| Show/hide slide controls (&#216; &laquo; &raquo;) | 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
-
- guard_block( html )  
-end
-
 
 # Usage example:
 #  <%= code 'code/file.rb#section', :lang => 'ruby', :class => 'small' %>

data/lib/slideshow/markup/mediawiki.rb

@@ -0,0 +1,38 @@
+module Slideshow
+  module MediawikiEngines
+
+
+  def setup_mediawiki_engine
+    return if @mediawiki_engine_setup
+    logger.debug 'require wikicloth  -- load mediawiki library'
+    require 'wikicloth'          # default mediawiki library
+    @mediawiki_engine_setup = true
+  rescue LoadError
+    puts "You're missing a library required for Mediawiki to Hypertext conversion. Please run:"
+    puts "   $ gem install wikicloth"
+    #  check: raise exception instead of exit e.g
+    #  raise FatalException.new( 'Missing library dependency: wikicloth' )
+    exit 1
+  end
+
+
+  def mediawiki_to_html( content )
+    
+    setup_mediawiki_engine()
+    
+    puts "  Converting Mediawiki-text (#{content.length} bytes) to HTML..."
+
+    # NB: turn off table_of_contents (TOC) auto-generation with __NOTOC__
+    # NB: turn off adding of edit section/markers for headings (noedit:true)
+
+    wiki = WikiCloth::Parser.new( data: "__NOTOC__\n"+content, params: {} )
+
+    content = wiki.to_html( noedit: true )
+  end
+
+  end  # module MediawikiEngines
+end # module Slideshow
+
+class Slideshow::Gen
+  include Slideshow::MediawikiEngines
+end

data/lib/slideshow/markup/textile.rb

@@ -24,7 +24,24 @@ module Slideshow
   end 
 
 
-  def textile_to_html( content )    
+  def setup_textile_engine
+    return if @textile_engine_setup
+    logger.debug 'require redcloth  -- load textile library'
+    require 'redcloth'          # default textile library
+    @textile_engine_setup = true
+  rescue LoadError
+    puts "You're missing a library required for Textile to Hypertext conversion. Please run:"
+    puts "   $ gem install RedCloth"
+    #  check: raise exception instead of exit e.g
+    #  raise FatalException.new( 'Missing library dependency: RedCloth' )
+    exit 1
+  end
+
+
+  def textile_to_html( content )
+    
+    setup_textile_engine()   # optinal lib; extra; load only textile lib if used (soft dependency)
+    
     puts "  Converting Textile-text (#{content.length} bytes) to HTML..."
     
     # JRuby workaround for RedCloth 4 multi-byte character bug

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/lib/slideshow.rb

@@ -25,7 +25,6 @@ require 'active_support/all'
 
 require 'logutils'       # logger utils library
 
-require 'redcloth'          # default textile library
 require 'markdown'          # default markdown library
 require 'fetcher'           # fetch docs and blogs via http, https, etc.
 
@@ -58,13 +57,14 @@ require 'slideshow/cli/commands/plugins'
 require 'slideshow/cli/commands/quick'
 
 
-require 'slideshow/markup/textile'
 require 'slideshow/markup/markdown'
+require 'slideshow/markup/mediawiki'
+require 'slideshow/markup/textile'
+
 
 # load built-in (required) helpers/plugins
 require 'slideshow/helpers/text_helper'
 require 'slideshow/helpers/capture_helper'
-require 'slideshow/helpers/table_helper'
 require 'slideshow/helpers/step_helper'
 require 'slideshow/helpers/background_helper'
 require 'slideshow/helpers/source_helper'

metadata

@@ -1,215 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slideshow
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.3.0
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: props
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &88039630 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: markdown
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *88039630
+- !ruby/object:Gem::Dependency
+  name: markdown
+  requirement: &88039410 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: textutils
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *88039410
+- !ruby/object:Gem::Dependency
+  name: textutils
+  requirement: &88039190 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pakman
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *88039190
+- !ruby/object:Gem::Dependency
+  name: pakman
+  requirement: &88038970 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *88038970
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &88038760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.2.6
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 4
-        - 2
-        - 9
-        version: 4.2.9
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *88038760
+- !ruby/object:Gem::Dependency
   name: logutils
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &88038540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: gli
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *88038540
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: &88038320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 5
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *88038320
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &88038100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *88038100
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &88037880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        version: "3.3"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id010
-description: |-
-  The Slide Show (S9) Ruby gem lets you create slide shows and author slides in plain text
-  using a wiki-style markup language that's easy-to-write and easy-to-read.
-  The Slide Show (S9) project also collects and welcomes themes and ships
-  "out-of-the-gem" with built-in support for "loss-free" gradient vector graphics themes.
-  
-  ~~~
-  SYNOPSIS
-      slideshow [global options] command [command options] [arguments...]
-  
-  VERSION
-      2.0.0
-  
-  GLOBAL OPTIONS
-      -c, --config=PATH - Configuration Path (default: ~/.slideshow)
-      --verbose         - (Debug) Show debug messages
-      --version         - Show version
-  
-  COMMANDS
-      build, b           - Build slideshow
-      install, i         - Install template pack
-      list, ls, l        - List installed template packs
-      new, n             - Generate quick starter sample
-      about, a           - (Debug) Show more version info
-      help               - Shows a list of commands or help for one command
-  ~~~
+  prerelease: false
+  version_requirements: *88037880
+description: ! "The Slide Show (S9) Ruby gem lets you create slide shows and author
+  slides in plain text\r\nusing a wiki-style markup language that's easy-to-write
+  and easy-to-read.\r\nThe Slide Show (S9) project also collects and welcomes themes
+  and ships\r\n\"out-of-the-gem\" with built-in support for \"loss-free\" gradient
+  vector graphics themes.\r\n\r\n~~~\r\nSYNOPSIS\r\n    slideshow [global options]
+  command [command options] [arguments...]\r\n\r\nVERSION\r\n    2.0.0\r\n\r\nGLOBAL
+  OPTIONS\r\n    -c, --config=PATH - Configuration Path (default: ~/.slideshow)\r\n
+  \   --verbose         - (Debug) Show debug messages\r\n    --version         - Show
+  version\r\n\r\nCOMMANDS\r\n    build, b           - Build slideshow\r\n    install,
+  i         - Install template pack\r\n    list, ls, l        - List installed template
+  packs\r\n    new, n             - Generate quick starter sample\r\n    about, a
+  \          - (Debug) Show more version info\r\n    help               - Shows a
+  list of commands or help for one command\r\n~~~"
 email: webslideshow@googlegroups.com
-executables: 
+executables:
 - slideshow
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - templates/s6.txt
-files: 
+files:
 - History.markdown
 - Manifest.txt
 - README.markdown
@@ -243,10 +164,10 @@ files:
 - lib/slideshow/helpers/syntax/coderay_helper.rb
 - 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/manifest_helpers.rb
 - lib/slideshow/markup/markdown.rb
+- lib/slideshow/markup/mediawiki.rb
 - lib/slideshow/markup/rest.rb
 - lib/slideshow/markup/textile.rb
 - lib/slideshow/plugin_helpers.rb
@@ -267,44 +188,32 @@ files:
 - templates/welcome.txt.quick
 homepage: http://slideshow-s9.github.io
 licenses: []
-
-post_install_message: |
-  ******************************************************************************
-  
-  Questions? Comments? Send them along to the mailing list.
-  https://groups.google.com/group/webslideshow
-  
-  ******************************************************************************
-
-rdoc_options: 
+post_install_message: ! "******************************************************************************\n\nTip:
+  Try some new template packs. Example:\n\n  $ slideshow install impress.js\n  \n
+  \ or\n  \n  $ slideshow install deck.js\n  \n  and use like\n  \n  $ slideshow build
+  welcome.text -t impress.js\n  \n  or\n  \n  $ slideshow build welcome.text -t deck.js\n\n\nQuestions?
+  Comments? Send them along to the mailing list.\nhttps://groups.google.com/group/webslideshow\n\n******************************************************************************\n"
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: slideshow
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and Keynote in Ruby
 test_files: []
-

data/lib/slideshow/helpers/table_helper.rb

@@ -1,63 +0,0 @@
-module Slideshow
-  module TableHelper
-
-# todo: add center, plus generic col helper
-
-  
-def left( opts={}, &blk )
-   
-  width = opts.fetch( :width, "50%" )
-  clazz = opts.fetch( :class, nil )
-   
-  puts "  Adding HTML for left column (using table layout)..."
-    
-  text = capture_erb(&blk)
-      
-  before  = "<!-- begin left #{opts.inspect} -->\n"
-  before << "<div class='#{clazz}'>\n"  if clazz  
-  before << "<table width='100%'><tr><td width='#{width}' markdown='block' style='vertical-align: top;'>\n"
-    
-  after   = "</td>\n"  
-  after  << "<!-- end left -->\n"
-
-  html  = ""
-  html << guard_block( before )
-  html << text
-  html << guard_block( after )
-
-  concat_erb( html, blk.binding )
-  return
-end
-  
-def right( opts={}, &blk )
-
-  width = opts.fetch( :width, "50%" )
-  clazz = opts.fetch( :class, nil )
-   
-  puts "  Adding HTML for right column (using table layout)..."
-    
-  text = capture_erb(&blk)
-    
-  before  = "<!-- begin right #{opts.inspect} -->\n" 
-  before << "<td width='#{width}' markdown='block' style='vertical-align: top;'>\n"  
-    
-  after   = "</td></tr></table>\n"
-  after  << "</div>\n"  if clazz    
-  after  << "<!-- end right -->\n"
-
-  html  = ""
-  html << guard_block( before )
-  html << text
-  html << guard_block( after )
-      
-  concat_erb( html, blk.binding )
-  return
-end
-  
-  
-end # module TableHelper
-end # module Slideshow
-
-class Slideshow::Gen
-  include Slideshow::TableHelper
-end