* lib/rdoc/code_objects.rb: Make some attributes accessible for reuse.

	* lib/rdoc/generator/html.rb: Pull out ContextUser classes and related
	  methods for reuse.
	* lib/rdoc/generator.rb: Move ContextUser classes to
	  RDoc::Generator::Context for reuse.
	* lib/rdoc/rdoc.rb: Make RDoc::RDoc initialization a little easier.
	* lib/rdoc/options.rb: Make RDoc::Options easier to use without
	  parsing an ARGV.
	* lib/rdoc/markup/to_*.rb: Subclass RDoc::Markup::Formatter.
	* lib/rdoc/markup/formatter.rb: Add RDoc::Markup::Formatter to make
	  RDoc markup conversion easier.
	* lib/rdoc/markup/fragments.rb: Make RDoc::Markup::ListItem easier to
	  test.
	* lib/rdoc/markup/to_html_hyperlink.rb: Pulled out of the HTML
	  generator for easier reusability.
	* lib/rdoc/markup.rb: Fix bug with labeled lists containing bullet
	  lists.
	* lib/rdoc/generators/html/html.rb: Fix Constant display.


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

1 files changed, 13 insertions, 7 deletions

diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index 0238d5ae67..da42312ff5 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -1,22 +1,25 @@
+require 'rdoc/markup/formatter'
 require 'rdoc/markup/fragments'
 require 'rdoc/markup/inline'
 
 require 'cgi'
 
-class RDoc::Markup::ToHtml
+class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
 
   LIST_TYPE_TO_HTML = {
-    :BULLET =>  [ "<ul>", "</ul>" ],
-    :NUMBER =>  [ "<ol>", "</ol>" ],
-    :UPPERALPHA =>  [ "<ol>", "</ol>" ],
-    :LOWERALPHA =>  [ "<ol>", "</ol>" ],
-    :LABELED => [ "<dl>", "</dl>" ],
-    :NOTE    => [ "<table>", "</table>" ],
+    :BULLET =>     %w[<ul> </ul>],
+    :NUMBER =>     %w[<ol> </ol>],
+    :UPPERALPHA => %w[<ol> </ol>],
+    :LOWERALPHA => %w[<ol> </ol>],
+    :LABELED =>    %w[<dl> </dl>],
+    :NOTE    =>    %w[<table> </table>],
   }
 
   InlineTag = Struct.new(:bit, :on, :off)
 
   def initialize
+    super
+
     init_tags
   end
 
@@ -94,8 +97,11 @@ class RDoc::Markup::ToHtml
     if tag = @in_list_entry.last
       @res << annotate(tag) << "\n"
     end
+
     @res << list_item_start(am, fragment)
+
     @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
+
     @in_list_entry[-1] = list_end_for(fragment.type)
   end