1 files changed, 94 insertions, 49 deletions

diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
index 867715bb1e..b1ac59e5b0 100644
--- a/lib/rdoc/markup/to_rdoc.rb
+++ b/lib/rdoc/markup/to_rdoc.rb
@@ -1,3 +1,4 @@
+require 'rdoc/markup/formatter'
 require 'rdoc/markup/inline'
 
 ##
@@ -5,21 +6,49 @@ require 'rdoc/markup/inline'
 
 class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
 
+  ##
+  # Current indent amount for output in characters
+
   attr_accessor :indent
+
+  ##
+  # Output width in characters
+
+  attr_accessor :width
+
+  ##
+  # Stack of current list indexes for alphabetic and numeric lists
+
   attr_reader :list_index
+
+  ##
+  # Stack of list types
+
   attr_reader :list_type
+
+  ##
+  # Stack of list widths for indentation
+
   attr_reader :list_width
+
+  ##
+  # Prefix for the next list item.  See #use_prefix
+
   attr_reader :prefix
+
+  ##
+  # Output accumulator
+
   attr_reader :res
 
+  ##
+  # Creates a new formatter that will output (mostly) \RDoc markup
+
   def initialize
     super
 
-    @markup.add_special(/\\[^\s]/, :SUPPRESSED_CROSSREF)
-
+    @markup.add_special(/\\\S/, :SUPPRESSED_CROSSREF)
     @width = 78
-    @prefix = ''
-
     init_tags
 
     @headings = {}
@@ -34,7 +63,7 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
   end
 
   ##
-  # Maps attributes to ANSI sequences
+  # Maps attributes to HTML sequences
 
   def init_tags
     add_tag :BOLD, "<b>", "</b>"
@@ -42,10 +71,16 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
     add_tag :EM,   "<em>", "</em>"
   end
 
+  ##
+  # Adds +blank_line+ to the output
+
   def accept_blank_line blank_line
     @res << "\n"
   end
 
+  ##
+  # Adds +heading+ to the output
+
   def accept_heading heading
     use_prefix or @res << ' ' * @indent
     @res << @headings[heading.level][0]
@@ -54,12 +89,18 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
     @res << "\n"
   end
 
+  ##
+  # Finishes consumption of +list+
+
   def accept_list_end list
     @list_index.pop
     @list_type.pop
     @list_width.pop
   end
 
+  ##
+  # Finishes consumption of +list_item+
+
   def accept_list_item_end list_item
     width = case @list_type.last
             when :BULLET then
@@ -76,29 +117,29 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
     @indent -= width
   end
 
+  ##
+  # Prepares the visitor for consuming +list_item+
+
   def accept_list_item_start list_item
-    bullet = case @list_type.last
-             when :BULLET then
-               '*'
-             when :NOTE, :LABEL then
-               attributes(list_item.label) + ":\n"
-             else
-               @list_index.last.to_s + '.'
-             end
-
-    case @list_type.last
+    type = @list_type.last
+
+    case type
     when :NOTE, :LABEL then
+      bullet = attributes(list_item.label) + ":\n"
+      @prefix = ' ' * @indent
       @indent += 2
-      @prefix = bullet + (' ' * @indent)
+      @prefix << bullet + (' ' * @indent)
     else
+      bullet = type == :BULLET ? '*' :  @list_index.last.to_s + '.'
       @prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
-
       width = bullet.length + 1
-
       @indent += width
     end
   end
 
+  ##
+  # Prepares the visitor for consuming +list+
+
   def accept_list_start list
     case list.type
     when :BULLET then
@@ -123,14 +164,23 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
     @list_type << list.type
   end
 
+  ##
+  # Adds +paragraph+ to the output
+
   def accept_paragraph paragraph
     wrap attributes(paragraph.text)
   end
 
+  ##
+  # Adds +raw+ to the output
+
   def accept_raw raw
     @res << raw.parts.join("\n")
   end
 
+  ##
+  # Adds +rule+ to the output
+
   def accept_rule rule
     use_prefix or @res << ' ' * @indent
     @res << '-' * (@width - @indent)
@@ -138,58 +188,46 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
   end
 
   ##
-  # Outputs +verbatim+ flush left and indented 2 columns
+  # Outputs +verbatim+ indented 2 columns
 
   def accept_verbatim verbatim
     indent = ' ' * (@indent + 2)
 
-    lines = []
-    current_line = []
-
-    # split into lines
     verbatim.parts.each do |part|
-      current_line << part
-
-      if part == "\n" then
-        lines << current_line
-        current_line = []
-      end
+      @res << indent unless part == "\n"
+      @res << part
     end
 
-    lines << current_line unless current_line.empty?
-
-    # calculate margin
-    indented = lines.select { |line| line != ["\n"] }
-    margin = indented.map { |line| line.first.length }.min
-
-    # flush left
-    indented.each { |line| line[0][0...margin] = '' }
-
-    # output
-    use_prefix or @res << indent # verbatim is unlikely to have prefix
-    @res << lines.shift.join
-
-    lines.each do |line|
-      @res << indent unless line == ["\n"]
-      @res << line.join
-    end
-
-    @res << "\n"
+    @res << "\n" unless @res =~ /\n\z/
   end
 
+  ##
+  # Applies attribute-specific markup to +text+ using RDoc::AttributeManager
+
   def attributes text
     flow = @am.flow text.dup
     convert_flow flow
   end
 
+  ##
+  # Returns the generated output
+
   def end_accepting
     @res.join
   end
 
+  ##
+  # Removes preceeding \\ from the suppressed crossref +special+
+
   def handle_special_SUPPRESSED_CROSSREF special
-    special.text.sub(/\\/, '')
+    text = special.text
+    text = text.sub('\\', '') unless in_tt?
+    text
   end
 
+  ##
+  # Prepares the visitor for text generation
+
   def start_accepting
     @res = [""]
     @indent = 0
@@ -200,6 +238,10 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
     @list_width = []
   end
 
+  ##
+  # Adds the stored #prefix to the output and clears it.  Lists generate a
+  # prefix for later consumption.
+
   def use_prefix
     prefix = @prefix
     @prefix = nil
@@ -208,6 +250,9 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
     prefix
   end
 
+  ##
+  # Wraps +text+ to #width
+
   def wrap text
     return unless text && !text.empty?