lib/slideshow.rb in slideshow-0.3 vs lib/slideshow.rb in slideshow-0.3.1

@@ -1,9 +1,9 @@
 require 'optparse'
 require 'erb'
-require 'RedCloth'
-require 'BlueCloth'
+require 'redcloth'
+require 'maruku'
 require 'logger'
 
 
 module Slideshow
 
@@ -89,11 +89,12 @@
   # convert light-weight markup to hypertext
  
   content = File.read( inname )
   
   if known_markdown_extnames.include?( extname )
-    content = BlueCloth.new( content ).to_html
+    content = Maruku.new( content, {:on_error => :raise} ).to_html
+    # content = BlueCloth.new( content ).to_html
   else
     content = RedCloth.new( content ).to_html
   end
   
 
@@ -161,11 +162,13 @@
        }
   end
 
   opt.parse!
 
-  puts "Slide Show (S9) Version: 0.3 on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  puts "Slide Show (S9) Version: 0.3.1 on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 
   ARGV.each { |fn| Slideshow.create_slideshow( fn ) }
 end
 
-end
+end
+
+Slideshow.main if __FILE__ == $0
\ No newline at end of file