bin/marutest in maruku-0.5.3 vs bin/marutest in maruku-0.5.4

@@ -1,16 +1,29 @@
 #!/usr/bin/env ruby
 
 require 'maruku'
+require 'maruku/textile2'
 
+$marutest_language = :markdown
+
 #MARKER = "\n***EOF***\n"
 SPLIT = %r{\n\*\*\*[^\*]+\*\*\*\n}m
 
 def marker(x)
 	"\n*** Output of #{x} ***\n"
 end
 
+def write_lines(i, j, lines, prefix, i_star)
+	i = [i, 0].max
+	j = [j, lines.size-1].min
+	for a in i..j
+		l = lines[a].gsub(/\t/,'  ')
+		puts( ("%s %3d" % [prefix, a]) + 
+			(a==i_star ? " -->" : "    ")+lines[a])
+	end
+end
+
 # a = expected   b = found 
 def equals(a, b)
 	a = a.split("\n")
 	b = b.split("\n")
 	
@@ -18,19 +31,10 @@
 		la = a[i]
 		lb = b[i]
 		if la != lb
 			puts "\n"
 			
-			def write_lines(i, j, lines, prefix, i_star)
-				i = [i, 0].max
-				j = [j, lines.size-1].min
-				for a in i..j
-					l = lines[a].gsub(/\t/,'  ')
-					puts ("%s %3d" % [prefix, a]) + 
-						(a==i_star ? " -->" : "    ")+lines[a]
-				end
-			end
 			
 			write_lines(i-3, i+3, a, "expected", i )
 			write_lines(i-3, i+3, b, "   found", i )
 			return false
 		end
@@ -72,10 +76,15 @@
 	failed = []
 	relaxed = []
 	crashed = []
 	actual = {}
 	
-	doc = Maruku.new(markdown, params)
+	doc = 
+		if $marutest_language == :markdown
+			Maruku.new(markdown, params)
+		else
+			MaRuKu.textile2(markdown, params)
+		end
 
 	for s in TOTEST
 		begin
 			if s==:to_html
 				actual[s] = doc.to_html