RDoc::Task can now set the comment markup through #markup

Author: drbrain

History.txt

@@ -22,6 +22,8 @@
     it is used as the default for the entire file.  For other comments it
     overrides the default markup format.
 
+    The markup format can be set for rake tasks using RDoc::Task#markup
+
 * Minor enhancements
   * HTML headings now have ids matching their titles.
 

TODO.rdoc

@@ -4,7 +4,6 @@ Some file contains some things that might happen in RDoc, or might not
 
 * Copy static files into doc dir for HTML
 * Add sections to the ToC
-* Add a markup option to RDoc::Task
 
 === RDoc 3.11
 

lib/rdoc/task.rb

@@ -100,6 +100,12 @@ class RDoc::Task < Rake::TaskLib
 
   attr_accessor :name
 
+  ##
+  # Comment markup format.  rdoc, rd and tomdoc are supported.  (default is
+  # 'rdoc')
+
+  attr_accessor :markup
+
   ##
   # Name of directory to receive the html output files. (default is "html")
 
@@ -249,11 +255,12 @@ def define
 
   def option_list
     result = @options.dup
-    result << "-o"      << @rdoc_dir
-    result << "--main"  << main      if main
-    result << "--title" << title     if title
-    result << "-T"      << template  if template
-    result << '-f'      << generator if generator
+    result << "-o"       << @rdoc_dir
+    result << "--main"   << main      if main
+    result << "--markup" << markup    if markup
+    result << "--title"  << title     if title
+    result << "-T"       << template  if template
+    result << '-f'       << generator if generator
     result
   end
 

test/test_rdoc_task.rb

@@ -33,6 +33,14 @@ def test_inline_source
     end
   end
 
+  def test_markup_option
+    rdoc_task = RDoc::Task.new do |rd|
+      rd.markup = "tomdoc"
+    end
+
+    assert_equal %w[-o html --markup tomdoc], rdoc_task.option_list
+  end
+
   def test_tasks_creation
     RDoc::Task.new
     assert Rake::Task[:rdoc]