Import RDoc 3

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/rdoc/markup/to_ansi.rb b/lib/rdoc/markup/to_ansi.rb
index 9a5be8babb..c9f874ea3c 100644
--- a/lib/rdoc/markup/to_ansi.rb
+++ b/lib/rdoc/markup/to_ansi.rb
@@ -1,10 +1,13 @@
-require 'rdoc/markup/inline'
+require 'rdoc/markup/to_rdoc'
 
 ##
 # Outputs RDoc markup with vibrant ANSI color!
 
 class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
 
+  ##
+  # Creates a new ToAnsi visitor that is ready to output vibrant ANSI color!
+
   def initialize
     super
 
@@ -23,12 +26,15 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
     add_tag :EM,   "\e[4m", "\e[m"
   end
 
+  ##
+  # Overrides indent width to ensure output lines up correctly.
+
   def accept_list_item_end list_item
     width = case @list_type.last
             when :BULLET then
               2
             when :NOTE, :LABEL then
-              @res << "\n"
+              @res << "\n" unless res.length == 1
               2
             else
               bullet = @list_index.last.to_s
@@ -39,6 +45,9 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
     @indent -= width
   end
 
+  ##
+  # Adds coloring to note and label list items
+
   def accept_list_item_start list_item
     bullet = case @list_type.last
              when :BULLET then
@@ -62,6 +71,9 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
     end
   end
 
+  ##
+  # Starts accepting with a reset screen
+
   def start_accepting
     super