From: "Mauricio Fernández" <batsman.geo@...>
Date: 2004-04-20T18:34:01+09:00
Subject: Re: [ANN] Instiki 0.7.0: Flavors of Expression

On Tue, Apr 20, 2004 at 06:59:50AM +0900, David Heinemeier Hansson wrote:
> What's new in Instiki 0.7.0?
> ============================
> 
> Instiki now speaks two additional markup languages: Markdown and RDoc.  
> The default is still Textile, but by choice of the command-line  
> settings, you can get it to speak the flavor of your liking.
> 
> Besides the new languages, 0.7 is the release of the polish. There's a  
> bunch of small tweaks, such as wanted/orphaned page lists, proper RSS  
> feeds, bug fixes, and much, much more.
> 
> Full change list:
> 
> * Added Markdown (BlueCloth 0.2.0b) and RDoc [Mauricio Fern�ndez] as  
> command-line markup choices

diff -r -u5 -N instiki-0.7.0.orig/libraries/rdocsupport.rb instiki-0.7.0/libraries/rdocsupport.rb
--- instiki-0.7.0.orig/libraries/rdocsupport.rb 2004-04-20 11:25:36.000000000 +0200
+++ instiki-0.7.0/libraries/rdocsupport.rb      2004-04-20 11:26:40.000000000 +0200
@@ -1,14 +1,14 @@
 begin
-  case RUBY_VERSION
-    when /(^1\.8\.[2-9])|(^1\.9)/
-      require "rdoc/markup/simple_markup"
-      require 'rdoc/markup/simple_markup/to_html'
-    else
-      require 'markup/simple_markup'
-      require 'markup/simple_markup/to_html'
-    end
+  begin
+    require "rdoc/markup/simple_markup"
+    require 'rdoc/markup/simple_markup/to_html'
+  rescue LoadError
+    # try with an older version
+    require 'markup/simple_markup'
+    require 'markup/simple_markup/to_html'
+  end

 module RDocSupport

 # A simple +rdoc+ markup class which recognizes some additional
 # formatting commands suitable for Wiki use.
@@ -156,6 +156,6 @@

 end

 rescue LoadError
   # RDoc support isn't available
-end
\ No newline at end of file
+end

-- 
Running Debian GNU/Linux Sid (unstable)
batsman dot geo at yahoo dot com

"You, sir, are nothing but a pathetically lame salesdroid!
I fart in your general direction!"
	-- Randseed on #Linux