Import RDoc 2.2.1 r185

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

13 files changed, 959 insertions, 1614 deletions

diff --git a/lib/rdoc/generator/chm/chm.rb b/lib/rdoc/generator/chm/chm.rb
index 0a17a9e1ea..cceeca5dfc 100644
--- a/lib/rdoc/generator/chm/chm.rb
+++ b/lib/rdoc/generator/chm/chm.rb
@@ -6,6 +6,8 @@ module RDoc::Generator::CHM::CHM
   HTML = RDoc::Generator::HTML::HTML
 
   INDEX = HTML::INDEX
+  
+  STYLE = HTML::STYLE
 
   CLASS_INDEX = HTML::CLASS_INDEX
   CLASS_PAGE = HTML::CLASS_PAGE
diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
index a9e030a896..d136de7b00 100644
--- a/lib/rdoc/generator/html.rb
+++ b/lib/rdoc/generator/html.rb
@@ -68,7 +68,6 @@ class RDoc::Generator::HTML
   def initialize(options) #:not-new:
     @options = options
     load_html_template
-    @main_page_path = nil
   end
 
   ##
@@ -94,6 +93,15 @@ class RDoc::Generator::HTML
   # If the template name contains a slash, use it literally
 
   def load_html_template
+    #
+    # If the template is not a path, first look for it
+    # in rdoc's HTML template directory.  Perhaps this behavior should
+    # be reversed (first try to include the template and, only if that
+    # fails, try to include it in the default template directory).
+    # One danger with reversing the behavior, however, is that
+    # if something like require 'html' could load up an
+    # unrelated file in the standard library or in a gem.
+    #
     template = @options.template
 
     unless template =~ %r{/|\\} then
@@ -101,14 +109,25 @@ class RDoc::Generator::HTML
                            template)
     end
 
-    require template
-
-    @template = self.class.const_get @options.template.upcase
-    @options.template_class = @template
+    begin
+      require template
+
+      @template = self.class.const_get @options.template.upcase
+      @options.template_class = @template
+    rescue LoadError => e
+      #
+      # The template did not exist in the default template directory, so
+      # see if require can find the template elsewhere (in a gem, for
+      # instance).
+      #
+      if(e.message[template] && template != @options.template)
+        template = @options.template
+        retry
+      end
 
-  rescue LoadError
-    $stderr.puts "Could not find HTML template '#{template}'"
-    exit 99
+      $stderr.puts "Could not find HTML template '#{template}': #{e.message}"
+      exit 99
+    end
   end
 
   ##
@@ -146,14 +165,16 @@ class RDoc::Generator::HTML
   end
 
   def build_indices
-    @files, @classes = RDoc::Generator::Context.build_indicies(@toplevels,
-                                                               @options)
+    @files, @classes = RDoc::Generator::Context.build_indices(@toplevels,
+                                                              @options)
   end
 
   ##
   # Generate all the HTML
 
   def generate_html
+    @main_url = main_url
+
     # the individual descriptions for files and classes
     gen_into(@files)
     gen_into(@classes)
@@ -165,23 +186,50 @@ class RDoc::Generator::HTML
     gen_main_index
 
     # this method is defined in the template file
-    write_extra_pages if defined? write_extra_pages
+    values = {
+      'title_suffix' => CGI.escapeHTML("[#{@options.title}]"),
+      'charset'      => @options.charset,
+      'style_url'    => style_url('', @options.css),
+    }
+
+    @template.write_extra_pages(values) if @template.respond_to?(:write_extra_pages)
   end
 
   def gen_into(list)
-    @file_list ||= index_to_links @files
-    @class_list ||= index_to_links @classes
-    @method_list ||= index_to_links RDoc::Generator::Method.all_methods
+    #
+    # The file, class, and method lists technically should be regenerated
+    # for every output file, in order that the relative links be correct
+    # (we are worried here about frameless templates, which need this
+    # information for every generated page).  Doing this is a bit slow,
+    # however.  For a medium-sized gem, this increased rdoc's runtime by
+    # about 5% (using the 'time' command-line utility).  While this is not
+    # necessarily a problem, I do not want to pessimize rdoc for large
+    # projects, however, and so we only regenerate the lists when the
+    # directory of the output file changes, which seems like a reasonable
+    # optimization.
+    #
+    file_list = {}
+    class_list = {}
+    method_list = {}
+    prev_op_dir = nil
 
     list.each do |item|
       next unless item.document_self
 
       op_file = item.path
+      op_dir = File.dirname(op_file)
+
+      if(op_dir != prev_op_dir)
+        file_list = index_to_links op_file, @files
+        class_list = index_to_links op_file, @classes
+        method_list = index_to_links op_file, RDoc::Generator::Method.all_methods
+      end
+      prev_op_dir = op_dir
 
-      FileUtils.mkdir_p File.dirname(op_file)
+      FileUtils.mkdir_p op_dir
 
       open op_file, 'w' do |io|
-        item.write_on io, @file_list, @class_list, @method_list
+        item.write_on io, file_list, class_list, method_list
       end
     end
   end
@@ -211,8 +259,9 @@ class RDoc::Generator::HTML
 
     values = {
       "entries"    => res,
+      'title'      => CGI.escapeHTML("#{title} [#{@options.title}]"),
       'list_title' => CGI.escapeHTML(title),
-      'index_url'  => main_url,
+      'index_url'  => @main_url,
       'charset'    => @options.charset,
       'style_url'  => style_url('', @options.css),
     }
@@ -230,47 +279,55 @@ class RDoc::Generator::HTML
 
   def gen_main_index
     if @template.const_defined? :FRAMELESS then
-      main = @files.find do |file|
-        @main_page == file.name
-      end
-
-      if main.nil? then
-        main = @classes.find do |klass|
-          main_page == klass.context.full_name
-        end
+      #
+      # If we're using a template without frames, then just redirect
+      # to it from index.html.
+      #
+      # One alternative to this, expanding the main page's template into
+      # index.html, is tricky because the relative URLs will be different
+      # (since index.html is located in at the site's root,
+      # rather than within a files or a classes subdirectory).
+      #
+      open 'index.html', 'w'  do |f|
+        f.puts(%{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">})
+        f.puts(%{<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+                lang="en">})
+        f.puts(%{<head>})
+        f.puts(%{<title>#{CGI.escapeHTML(@options.title)}</title>})
+        f.puts(%{<meta http-equiv="refresh" content="0; url=#{@main_url}" />})
+        f.puts(%{</head>})
+        f.puts(%{<body></body>})
+        f.puts(%{</html>})
       end
     else
       main = RDoc::TemplatePage.new @template::INDEX
-    end
 
-    open 'index.html', 'w'  do |f|
-      style_url = style_url '', @options.css
+      open 'index.html', 'w'  do |f|
+        style_url = style_url '', @options.css
+        
+        classes = @classes.sort.map { |klass| klass.value_hash }
+        
+        values = {
+          'initial_page'  => @main_url,
+          'style_url'     => style_url('', @options.css),
+          'title'         => CGI.escapeHTML(@options.title),
+          'charset'       => @options.charset,
+          'classes'       => classes,
+        }
+        
+        values['inline_source'] = @options.inline_source
 
-      classes = @classes.sort.map { |klass| klass.value_hash }
-
-      values = {
-        'main_page'     => @main_page,
-        'initial_page'  => main_url,
-        'style_url'     => style_url('', @options.css),
-        'title'         => CGI.escapeHTML(@options.title),
-        'charset'       => @options.charset,
-        'classes'       => classes,
-      }
-
-      values['inline_source'] = @options.inline_source
-
-      if main.respond_to? :write_on then
-        main.write_on f, @file_list, @class_list, @method_list, values
-      else
         main.write_html_on f, values
       end
     end
   end
 
-  def index_to_links(collection)
+  def index_to_links(output_path, collection)
     collection.sort.map do |f|
       next unless f.document_self
-      { "href" => f.path, "name" => f.index_name }
+      { "href" => RDoc::Markup::ToHtml.gen_relative_url(output_path, f.path),
+        "name" => f.index_name }
     end.compact
   end
 
@@ -278,32 +335,48 @@ class RDoc::Generator::HTML
   # Returns the url of the main page
 
   def main_url
-    @main_page = @options.main_page
-    @main_page_ref = nil
-
-    if @main_page then
-      @main_page_ref = RDoc::Generator::AllReferences[@main_page]
-
-      if @main_page_ref then
-        @main_page_path = @main_page_ref.path
+    main_page = @options.main_page
+
+    #
+    # If a main page has been specified (--main), then search for it
+    # in the AllReferences array.  This allows either files or classes
+    # to be used for the main page.
+    #
+    if main_page then
+      main_page_ref = RDoc::Generator::AllReferences[main_page]
+
+      if main_page_ref then
+        return main_page_ref.path
       else
-        $stderr.puts "Could not find main page #{@main_page}"
+        $stderr.puts "Could not find main page #{main_page}"
       end
     end
 
-    unless @main_page_path then
-      file = @files.find { |context| context.document_self }
-      @main_page_path = file.path if file
+    #
+    # No main page has been specified, so just use the README.
+    #
+    @files.each do |file|
+      if file.name =~ /^README/ then
+        return file.path
+      end
     end
 
-    unless @main_page_path then
-      $stderr.puts "Couldn't find anything to document"
-      $stderr.puts "Perhaps you've used :stopdoc: in all classes"
-      exit 1
+    #
+    # There's no README (shame! shame!).  Just use the first file
+    # that will be documented.
+    #
+    @files.each do |file|
+      if file.document_self then
+        return file.path
+      end
     end
 
-    @main_page_path
+    #
+    # There are no files to be documented...  Something seems very wrong.
+    #
+    raise RDoc::Error, "Couldn't find anything to document (perhaps :stopdoc: has been used in all classes)!"
   end
+  private :main_url
 
 end
 
@@ -349,12 +422,9 @@ class RDoc::Generator::HTMLInOne < RDoc::Generator::HTML
       'charset' => @options.charset,
       'files'   => gen_into(@files),
       'classes' => gen_into(@classes),
-      'title'        => CGI.escapeHTML(@options.title),
+      'title'   => CGI.escapeHTML(@options.title),
     }
 
-    # this method is defined in the template file
-    write_extra_pages if defined? write_extra_pages
-
     template = RDoc::TemplatePage.new @template::ONE_PAGE
 
     if @options.op_name
@@ -372,26 +442,4 @@ class RDoc::Generator::HTMLInOne < RDoc::Generator::HTML
     end
     res
   end
-
-  def gen_file_index
-    gen_an_index(@files, 'Files')
-  end
-
-  def gen_class_index
-    gen_an_index(@classes, 'Classes')
-  end
-
-  def gen_method_index
-    gen_an_index(RDoc::Generator::Method.all_methods, 'Methods')
-  end
-
-  def gen_an_index(collection, title)
-    return {
-      "entries" => index_to_links(collection),
-      'list_title' => title,
-      'index_url'  => main_url,
-    }
-  end
-
 end
-
diff --git a/lib/rdoc/generator/html/common.rb b/lib/rdoc/generator/html/common.rb
new file mode 100644
index 0000000000..b25f009a72
--- /dev/null
+++ b/lib/rdoc/generator/html/common.rb
@@ -0,0 +1,24 @@
+#
+# The templates require further refactoring.  In particular,
+# * Some kind of HTML generation library should be used.
+#
+# Also, all of the templates require some TLC from a designer.
+#
+# Right now, this file contains some constants that are used by all
+# of the templates.
+#
+module RDoc::Generator::HTML::Common
+  XHTML_STRICT_PREAMBLE = <<-EOF
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+EOF
+
+  XHTML_FRAME_PREAMBLE = <<-EOF
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+EOF
+
+  HTML_ELEMENT = <<-EOF
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+EOF
+end
diff --git a/lib/rdoc/generator/html/frameless.rb b/lib/rdoc/generator/html/frameless.rb
index 2af890ce04..0375fee313 100644
--- a/lib/rdoc/generator/html/frameless.rb
+++ b/lib/rdoc/generator/html/frameless.rb
@@ -1,15 +1,16 @@
-require 'rdoc/generator/html'
-require 'rdoc/generator/html/one_page_html'
+require 'rdoc/generator/html/html'
 
 ##
 # = CSS2 RDoc HTML template
 #
-# This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a
+# This is a template for RDoc that uses XHTML 1.0 Strict and dictates a
 # bit more of the appearance of the output to cascading stylesheets than the
 # default. It was designed for clean inline code display, and uses DHTMl to
 # toggle the visbility of each method's source with each click on the '[source]'
 # link.
 #
+# Frameless basically is the html template without frames.
+#
 # == Authors
 #
 # * Michael Granger <ged@FaerieMUD.org>
@@ -25,692 +26,47 @@ module RDoc::Generator::HTML::FRAMELESS
 
   FRAMELESS = true
 
-  FONTS = "Verdana,Arial,Helvetica,sans-serif"
-
-  STYLE = <<-EOF
-body {
-  font-family: #{FONTS};
-  font-size: 90%;
-  margin: 0;
-  margin-left: 40px;
-  padding: 0;
-  background: white;
-}
-
-h1, h2, h3, h4 {
-  margin: 0;
-  color: #efefef;
-  background: transparent;
-}
-
-h1 {
-  font-size: 150%;
-}
-
-h2,h3,h4 {
-  margin-top: 1em;
-}
-
-:link, :visited {
-  background: #eef;
-  color: #039;
-  text-decoration: none;
-}
-
-:link:hover, :visited:hover {
-  background: #039;
-  color: #eef;
-}
-
-/* Override the base stylesheet's Anchor inside a table cell */
-td > :link, td > :visited {
-  background: transparent;
-  color: #039;
-  text-decoration: none;
-}
-
-/* and inside a section title */
-.section-title > :link, .section-title > :visited {
-  background: transparent;
-  color: #eee;
-  text-decoration: none;
-}
-
-/* === Structural elements =================================== */
-
-.index {
-  margin: 0;
-  margin-left: -40px;
-  padding: 0;
-  font-size: 90%;
-}
-
-.index :link, .index :visited {
-  margin-left: 0.7em;
-}
-
-.index .section-bar {
-  margin-left: 0px;
-  padding-left: 0.7em;
-  background: #ccc;
-  font-size: small;
-}
-
-#classHeader, #fileHeader {
-  width: auto;
-  color: white;
-  padding: 0.5em 1.5em 0.5em 1.5em;
-  margin: 0;
-  margin-left: -40px;
-  border-bottom: 3px solid #006;
-}
-
-#classHeader :link, #fileHeader :link,
-#classHeader :visited, #fileHeader :visited {
-  background: inherit;
-  color: white;
-}
-
-#classHeader td, #fileHeader td {
-  background: inherit;
-  color: white;
-}
-
-#fileHeader {
-  background: #057;
-}
-
-#classHeader {
-  background: #048;
-}
-
-.class-name-in-header {
-  font-size:  180%;
-  font-weight: bold;
-}
-
-#bodyContent {
-  padding: 0 1.5em 0 1.5em;
-}
-
-#description {
-  padding: 0.5em 1.5em;
-  background: #efefef;
-  border: 1px dotted #999;
-}
-
-#description h1, #description h2, #description h3,
-#description h4, #description h5, #description h6 {
-  color: #125;
-  background: transparent;
-}
-
-#copyright {
-  color: #333;
-  background: #efefef;
-  font: 0.75em sans-serif;
-  margin-top: 5em;
-  margin-bottom: 0;
-  padding: 0.5em 2em;
-}
-
-/* === Classes =================================== */
-
-table.header-table {
-  color: white;
-  font-size: small;
-}
-
-.type-note {
-  font-size: small;
-  color: #dedede;
-}
-
-.xxsection-bar {
-  background: #eee;
-  color: #333;
-  padding: 3px;
-}
-
-.section-bar {
-  color: #333;
-  border-bottom: 1px solid #999;
-  margin-left: -20px;
-}
-
-.section-title {
-  background: #79a;
-  color: #eee;
-  padding: 3px;
-  margin-top: 2em;
-  margin-left: -30px;
-  border: 1px solid #999;
-}
-
-.top-aligned-row {
-  vertical-align: top
-}
-
-.bottom-aligned-row {
-  vertical-align: bottom
-}
-
-/* --- Context section classes ----------------------- */
-
-.context-row { }
-
-.context-item-name {
-  font-family: monospace;
-  font-weight: bold;
-  color: black;
-}
-
-.context-item-value {
-  font-size: small;
-  color: #448;
-}
-
-.context-item-desc {
-  color: #333;
-  padding-left: 2em;
-}
-
-/* --- Method classes -------------------------- */
-
-.method-detail {
-  background: #efefef;
-  padding: 0;
-  margin-top: 0.5em;
-  margin-bottom: 1em;
-  border: 1px dotted #ccc;
-}
-
-.method-heading {
-  color: black;
-  background: #ccc;
-  border-bottom: 1px solid #666;
-  padding: 0.2em 0.5em 0 0.5em;
-}
-
-.method-signature {
-  color: black;
-  background: inherit;
-}
-
-.method-name {
-  font-weight: bold;
-}
-
-.method-args {
-  font-style: italic;
-}
+  FONTS = RDoc::Generator::HTML::HTML::FONTS
 
-.method-description {
-  padding: 0 0.5em 0 0.5em;
-}
+  STYLE = RDoc::Generator::HTML::HTML::STYLE
 
-/* --- Source code sections -------------------- */
-
-:link.source-toggle, :visited.source-toggle {
-  font-size: 90%;
-}
-
-div.method-source-code {
-  background: #262626;
-  color: #ffdead;
-  margin: 1em;
-  padding: 0.5em;
-  border: 1px dashed #999;
-  overflow: hidden;
-}
-
-div.method-source-code pre {
-  color: #ffdead;
-  overflow: hidden;
-}
-
-/* --- Ruby keyword styles --------------------- */
-
-.standalone-code {
-  background: #221111;
-  color: #ffdead;
-  overflow: hidden;
-}
-
-.ruby-constant {
-  color: #7fffd4;
-  background: transparent;
-}
-
-.ruby-keyword {
-  color: #00ffff;
-  background: transparent;
-}
-
-.ruby-ivar {
-  color: #eedd82;
-  background: transparent;
-}
-
-.ruby-operator {
-  color: #00ffee;
-  background: transparent;
-}
-
-.ruby-identifier {
-  color: #ffdead;
-  background: transparent;
-}
-
-.ruby-node {
-  color: #ffa07a;
-  background: transparent;
-}
-
-.ruby-comment {
-  color: #b22222;
-  font-weight: bold;
-  background: transparent;
-}
-
-.ruby-regexp {
-  color: #ffa07a;
-  background: transparent;
-}
-
-.ruby-value {
-  color: #7fffd4;
-  background: transparent;
-}
-
-EOF
-
-  ##
-  # Header template
-
-  XHTML_PREAMBLE = <<-EOF
-<?xml version="1.0" encoding="<%= values["charset"] %>"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  EOF
-
-  HEADER = XHTML_PREAMBLE + <<-EOF
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" )
-
-  // ]]>
-  </script>
-
-</head>
-<body>
-EOF
-
-  ##
-  # Context content template
-
-  CONTEXT_CONTENT = %{
-}
-
-  ##
-  # Footer template
+  HEADER = RDoc::Generator::HTML::HTML::HEADER
 
   FOOTER = <<-EOF
   <div id="popupmenu" class="index">
-    <ul>
-    <li class="index-entries section-bar">Classes
+    <br />
+    <h1 class="index-entries section-bar">Files</h1>
       <ul>
-<% values["class_list"].each do |klass| %>
-        <li><a href="<%= klass["href"] %>"><%= klass["name"] %></a>
+<% values["file_list"].each do |file| %>
+        <li><a href="<%= file["href"] %>"><%= file["name"] %></a></li>
 <% end %>
       </ul>
-    </li>
 
-    <li class="index-entries section-bar">Methods
+    <br />
+    <h1 class="index-entries section-bar">Classes</h1>
       <ul>
-<% values["method_list"].each do |file| %>
-        <li><a href="<%= file["href"] %>"><%= file["name"] %></a>
+<% values["class_list"].each do |klass| %>
+        <li><a href="<%= klass["href"] %>"><%= klass["name"] %></a></li>
 <% end %>
       </ul>
-    </li>
 
-    <li class="index-entries section-bar">Files
+    <br />
+    <h1 class="index-entries section-bar">Methods</h1>
       <ul>
-<% values["file_list"].each do |file| %>
-        <li><a href="<%= file["href"] %>"><%= file["name"] %></a>
+<% values["method_list"].each do |method| %>
+        <li><a href="<%= method["href"] %>"><%= method["name"] %></a></li>
 <% end %>
       </ul>
-    </li>
-    </ul>
-  </li>
-
+  </div>
 </body>
 </html>
   EOF
 
-  ##
-  # File page header template
-
-  FILE_PAGE = <<-EOF
-  <div id="fileHeader">
-    <h1><%= values["short_name"] %></h1>
-
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td><%= values["full_path"] %>
-<% if values["cvsurl"] then %>
-        &nbsp;(<a href="<%= values["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-      </td>
-    </tr>
-
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td><%= values["dtm_modified"] %></td>
-    </tr>
-    </table>
-  </div>
-  EOF
-
-  ##
-  # Class page header template
-
-  CLASS_PAGE = <<-EOF
-    <div id="classHeader">
-      <table class="header-table">
-      <tr class="top-aligned-row">
-        <td><strong><%= values["classmod"] %></strong></td>
-        <td class="class-name-in-header"><%= values["full_name"] %></td>
-      </tr>
-
-      <tr class="top-aligned-row">
-        <td><strong>In:</strong></td>
-        <td>
-<% values["infiles"].each do |infiles| %>
-<% if infiles["full_path_url"] then %>
-          <a href="<%= infiles["full_path_url"] %>">
-<% end %>
-            <%= infiles["full_path"] %>
-<% if infiles["full_path_url"] then %>
-          </a>
-<% end %>
-<% if infiles["cvsurl"] then %>
-          &nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-          <br />
-<% end %><%# values["infiles"] %>
-        </td>
-      </tr>
-
-<% if values["parent"] then %>
-      <tr class="top-aligned-row">
-        <td><strong>Parent:</strong></td>
-        <td>
-<% if values["par_url"] then %>
-          <a href="<%= values["par_url"] %>">
-<% end %>
-            <%= values["parent"] %>
-<% if values["par_url"] then %>
-          </a>
-<% end %>
-        </td>
-      </tr>
-<% end %>
-    </table>
-  </div>
-  EOF
-
-  ##
-  # Method list template
-
-  METHOD_LIST = <<-EOF
-
-  <div id="contextContent">
-<% if values["diagram"] then %>
-    <div id="diagram">
-      <%= values["diagram"] %>
-    </div>
-<% end %>
-
-<% if values["description"] then %>
-    <div id="description">
-      <%= values["description"] %>
-    </div>
-<% end %>
-
-<% if values["requires"] then %>
-    <div id="requires-list">
-      <h3 class="section-bar">Required files</h3>
-
-      <div class="name-list">
-<% values["requires"].each do |requires| %>
-        <%= href requires["aref"], requires["name"] %>&nbsp;&nbsp;
-<% end %><%# values["requires"] %>
-      </div>
-    </div>
-<% end %>
-
-<% if values["toc"] then %>
-    <div id="contents-list">
-      <h3 class="section-bar">Contents</h3>
-      <ul>
-<% values["toc"].each do |toc| %>
-      <li><a href="#<%= values["href"] %>"><%= values["secname"] %></a></li>
-<% end %><%# values["toc"] %>
-     </ul>
-<% end %>
-   </div>
-
-<% if values["methods"] then %>
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
+  FILE_PAGE = RDoc::Generator::HTML::HTML::FILE_PAGE
 
-      <div class="name-list">
-<% values["methods"].each do |methods| %>
-        <%= href methods["aref"], methods["name"] %>&nbsp;&nbsp;
-<% end %><%# values["methods"] %>
-      </div>
-    </div>
-<% end %>
+  CLASS_PAGE = RDoc::Generator::HTML::HTML::CLASS_PAGE
 
-  </div>
-
-
-    <!-- if includes -->
-<% if values["includes"] then %>
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-<% values["includes"].each do |includes| %>
-        <span class="include-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%# values["includes"] %>
-      </div>
-    </div>
-<% end %>
-
-<% values["sections"].each do |sections| %>
-    <div id="section">
-<% if sections["sectitle"] then %>
-      <h2 class="section-title"><a name="<%= sections["secsequence"] %>"><%= sections["sectitle"] %></a></h2>
-<% if sections["seccomment"] then %>
-      <div class="section-comment">
-        <%= sections["seccomment"] %>
-      </div>
-<% end %>
-<% end %>
-
-<% if values["classlist"] then %>
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      <%= values["classlist"] %>
-    </div>
-<% end %>
-
-<% if values["constants"] then %>
-    <div id="constants-list">
-      <h3 class="section-bar">Constants</h3>
-
-      <div class="name-list">
-        <table summary="Constants">
-<% values["constants"].each do |constants| %>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name"><%= constants["name"] %></td>
-          <td>=</td>
-          <td class="context-item-value"><%= constants["value"] %></td>
-<% if values["desc"] then %>
-          <td width="3em">&nbsp;</td>
-          <td class="context-item-desc"><%= constants["desc"] %></td>
-<% end %>
-        </tr>
-<% end %><%# values["constants"] %>
-        </table>
-      </div>
-    </div>
-<% end %>
-
-<% if values["aliases"] then %>
-    <div id="aliases-list">
-      <h3 class="section-bar">External Aliases</h3>
-
-      <div class="name-list">
-                        <table summary="aliases">
-<% values["aliases"].each do |aliases| $stderr.puts({ :aliases => aliases }.inspect) %>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name"><%= values["old_name"] %></td>
-          <td>-&gt;</td>
-          <td class="context-item-value"><%= values["new_name"] %></td>
-        </tr>
-<% if values["desc"] then %>
-      <tr class="top-aligned-row context-row">
-        <td>&nbsp;</td>
-        <td colspan="2" class="context-item-desc"><%= values["desc"] %></td>
-      </tr>
-<% end %>
-<% end %><%# values["aliases"] %>
-        </table>
-      </div>
-    </div>
-<% end %>
-
-
-<% if values["attributes"] then %>
-    <div id="attribute-list">
-      <h3 class="section-bar">Attributes</h3>
-
-      <div class="name-list">
-        <table>
-<% values["attributes"].each do |attributes| $stderr.puts({ :attributes => attributes }.inspect) %>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name"><%= values["name"] %></td>
-<% if values["rw"] then %>
-          <td class="context-item-value">&nbsp;[<%= values["rw"] %>]&nbsp;</td>
-<% end %>
-<% unless values["rw"] then %>
-          <td class="context-item-value">&nbsp;&nbsp;</td>
-<% end %>
-          <td class="context-item-desc"><%= values["a_desc"] %></td>
-        </tr>
-<% end %><%# values["attributes"] %>
-        </table>
-      </div>
-    </div>
-<% end %>
-
-    <!-- if method_list -->
-<% if sections["method_list"] then %>
-    <div id="methods">
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-      <h3 class="section-bar"><%= method_list["type"] %> <%= method_list["category"] %> methods</h3>
-
-<% method_list["methods"].each do |methods| %>
-      <div id="method-<%= methods["aref"] %>" class="method-detail">
-        <a name="<%= methods["aref"] %>"></a>
-
-        <div class="method-heading">
-<% if methods["codeurl"] then %>
-          <a href="<%= methods["codeurl"] %>" target="Code" class="method-signature"
-            onclick="popupCode('<%= methods["codeurl"] %>');return false;">
-<% end %>
-<% if methods["sourcecode"] then %>
-          <a href="#<%= methods["aref"] %>" class="method-signature">
-<% end %>
-<% if methods["callseq"] then %>
-          <span class="method-name"><%= methods["callseq"] %></span>
-<% end %>
-<% unless methods["callseq"] then %>
-          <span class="method-name"><%= methods["name"] %></span><span class="method-args"><%= methods["params"] %></span>
-<% end %>
-<% if methods["codeurl"] then %>
-          </a>
-<% end %>
-<% if methods["sourcecode"] then %>
-          </a>
-<% end %>
-        </div>
-
-        <div class="method-description">
-<% if methods["m_desc"] then %>
-          <%= methods["m_desc"] %>
-<% end %>
-<% if methods["sourcecode"] then %>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('<%= methods["aref"] %>-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="<%= methods["aref"] %>-source">
-<pre>
-<%= methods["sourcecode"] %>
-</pre>
-          </div>
-<% end %>
-        </div>
-      </div>
-
-<% end %><%# method_list["methods"] %>
-<% end %>
-<% end %><%# sections["method_list"] %>
-
-    </div>
-<% end %>
-<% end %><%# values["sections"] %>
-  EOF
-
-  ##
-  # Body template
+  METHOD_LIST = RDoc::Generator::HTML::HTML::METHOD_LIST
 
   BODY = HEADER + %{
 
@@ -724,72 +80,13 @@ EOF
 
 } + FOOTER
 
-  ##
-  # Source code template
-
-  SRC_PAGE = XHTML_PREAMBLE + <<-EOF
-<html>
-<head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-</head>
-<body class="standalone-code">
-  <pre><%= values["code"] %></pre>
-</body>
-</html>
-  EOF
-
-  ##
-  # Index file templates
-
-  FR_INDEX_BODY = %{
-<%= template_include %>
-}
+  SRC_PAGE = RDoc::Generator::HTML::HTML::SRC_PAGE
 
-  FILE_INDEX = XHTML_PREAMBLE + <<-EOF
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title><%= values["list_title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" />
-  <base target="docwin" />
-</head>
-<body>
-<div class="index">
-  <h1 class="section-bar"><%= values["list_title"] %></h1>
-  <div class="index-entries">
-<% values["entries"].each do |entries| %>
-    <a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%# values["entries"] %>
-  </div>
-</div>
-</body>
-</html>
-  EOF
+  FR_INDEX_BODY = RDoc::Generator::HTML::HTML::FR_INDEX_BODY
 
-  CLASS_INDEX = FILE_INDEX
-  METHOD_INDEX = FILE_INDEX
+  FILE_INDEX = RDoc::Generator::HTML::HTML::FILE_INDEX
 
-  INDEX = <<-EOF
-<?xml version="1.0" encoding="<%= values["charset"] %>"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-</head>
-<frameset rows="20%, 80%">
-  <frameset cols="45%,55%">
-    <frame src="fr_class_index.html"  name="Classes" />
-    <frame src="fr_method_index.html" name="Methods" />
-  </frameset>
-  <frame src="<%= values["initial_page"] %>" name="docwin" />
-</frameset>
-</html>
-  EOF
+  CLASS_INDEX = RDoc::Generator::HTML::HTML::CLASS_INDEX
 
+  METHOD_INDEX = RDoc::Generator::HTML::HTML::METHOD_INDEX
 end
-
diff --git a/lib/rdoc/generator/html/hefss.rb b/lib/rdoc/generator/html/hefss.rb
index e186a40384..540c23d869 100644
--- a/lib/rdoc/generator/html/hefss.rb
+++ b/lib/rdoc/generator/html/hefss.rb
@@ -1,16 +1,16 @@
 require 'rdoc/generator/html'
-require 'rdoc/generator/html/html'
+require 'rdoc/generator/html/kilmerfactory'
 
 module RDoc::Generator::HTML::HEFSS
 
   FONTS = "Verdana, Arial, Helvetica, sans-serif"
 
-STYLE = <<-EOF
-body,p { font-family: Verdana, Arial, Helvetica, sans-serif;
+  CENTRAL_STYLE = <<-EOF
+body,p { font-family: <%= values["fonts"] %>;
        color: #000040; background: #BBBBBB;
 }
 
-td { font-family: Verdana, Arial, Helvetica, sans-serif;
+td { font-family: <%= values["fonts"] %>;
        color: #000040;
 }
 
@@ -21,16 +21,20 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 
 .big-title-font { color: white;
-                  font-family: Verdana, Arial, Helvetica, sans-serif;
+                  font-family: <%= values["fonts"] %>;
                   font-size: large;
                   height: 50px}
 
 .small-title-font { color: purple;
-                    font-family: Verdana, Arial, Helvetica, sans-serif;
+                    font-family: <%= values["fonts"] %>;
                     font-size: small; }
 
 .aqua { color: purple }
 
+#diagram img {
+  border: 0;
+}
+
 .method-name, attr-name {
       font-family: monospace; font-weight: bold;
 }
@@ -75,241 +79,6 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #0000AA;
 }
 
-.column-title {
-  font-size: medium;
-  font-weight: bold;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-  color: #3333CC;
-  }
-
-.variable-name {
-  font-family: monospace;
-  font-size: medium;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-  color: #0000AA;
-}
-
-.row-name {
-  font-size: medium;
-  font-weight: medium;
-  font-family: monospace;
-  text_decoration: none;
-  padding: 3px 3px 3px 20px;
-}
-
-.paramsig {
-   font-size: small;
-}
-
-.srcbut { float: right }
-
-  EOF
-
-  BODY = <<-EOF
-<html><head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-  <script type="text/javascript" language="JavaScript">
-  <!--
-  function popCode(url) {
-    parent.frames.source.location = url
-  }
-  //-->
-  </script>
-</head>
-<body bgcolor="#BBBBBB">
-
-<%= template_include %>  <!-- banner header -->
-
-<% if values["diagram"] then %>
-<table width="100%"><tr><td align="center">
-<%= values["diagram"] %>
-</td></tr></table>
-<% end %>
-
-<% if values["description"] then %>
-<div class="description"><%= values["description"] %></div>
-<% end %>
-
-<% if values["requires"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
-<div class="name-list">
-<% values["requires"].each do |requires| %>
-<%= href requires["aref"], requires["name"] %>
-<% end %><%# values["requires"] %>
-<% end %>
-</div>
-
-<% if values["sections"] then %>
-<% values["sections"].each do |sections| %>
-<% if sections["method_list"] then %>
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Subroutines and Functions</td></tr>
-</table><br />
-<div class="name-list">
-<% method_list["methods"].each do |methods| %>
-<a href="<%= methods["codeurl"] %>" target="source"><%= methods["name"] %></a>
-<% end %><%# values["methods"] %>
-</div>
-<% end %>
-<% end %><%# values["method_list"] %>
-<% end %>
-
-<% if sections["attributes"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Arguments</td></tr>
-</table><br />
-<table cellspacing="5">
-<% sections["attributes"].each do |attributes| %>
-     <tr valign="top">
-<% if attributes["rw"] then %>
-       <td align="center" class="attr-rw">&nbsp;[<%= attributes["rw"] %>]&nbsp;</td>
-<% end %>
-<% unless attributes["rw"] then %>
-       <td></td>
-<% end %>
-       <td class="attr-name"><%= attributes["name"] %></td>
-       <td><%= attributes["a_desc"] %></td>
-     </tr>
-<% end %><%# values["attributes"] %>
-</table>
-<% end %>
-<% end %><%# values["sections"] %>
-<% end %>
-
-<% if values["classlist"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Modules</td></tr>
-</table><br />
-<%= values["classlist"] %><br />
-<% end %>
-
-  <%= template_include %>  <!-- method descriptions -->
-
-</body>
-</html>
-  EOF
-
-  FILE_PAGE = <<-EOF
-<table width="100%">
- <tr class="title-row">
- <td><table width="100%"><tr>
-   <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font><%= values["short_name"] %></td>
-   <td align="right"><table cellspacing="0" cellpadding="2">
-         <tr>
-           <td  class="small-title-font">Path:</td>
-           <td class="small-title-font"><%= values["full_path"] %>
-<% if values["cvsurl"] then %>
-				&nbsp;(<a href="<%= values["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-           </td>
-         </tr>
-         <tr>
-           <td class="small-title-font">Modified:</td>
-           <td class="small-title-font"><%= values["dtm_modified"] %></td>
-         </tr>
-        </table>
-    </td></tr></table></td>
-  </tr>
-</table><br />
-  EOF
-
-  CLASS_PAGE = <<-EOF
-<table width="100%" border="0" cellspacing="0">
- <tr class="title-row">
- <td class="big-title-font">
-   <font size="-3"><b><%= values["classmod"] %></b><br /></font><%= values["full_name"] %>
- </td>
- <td align="right">
-   <table cellspacing="0" cellpadding="2">
-     <tr valign="top">
-      <td class="small-title-font">In:</td>
-      <td class="small-title-font">
-<% values["infiles"].each do |infiles| %>
-<%= href infiles["full_path_url"], infiles["full_path"] %>
-<% if infiles["cvsurl"] then %>
-&nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-<% end %><%# values["infiles"] %>
-      </td>
-     </tr>
-<% if values["parent"] then %>
-     <tr>
-      <td class="small-title-font">Parent:</td>
-      <td class="small-title-font">
-<% if values["par_url"] then %>
-        <a href="<%= values["par_url"] %>" class="cyan">
-<% end %>
-<%= values["parent"] %>
-<% if values["par_url"] then %>
-         </a>
-<% end %>
-      </td>
-     </tr>
-<% end %>
-   </table>
-  </td>
-  </tr>
-</table><br />
-  EOF
-
-  METHOD_LIST = <<-EOF
-<% if values["includes"] then %>
-<div class="tablesubsubtitle">Uses</div><br />
-<div class="name-list">
-<% values["includes"].each do |includes| %>
-    <span class="method-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%# values["includes"] %>
-</div>
-<% end %>
-
-<% if values["sections"] then %>
-<% values["sections"].each do |sections| %>
-<% if sections["method_list"] then %>
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle"><%= method_list["type"] %> <%= method_list["category"] %> methods</td></tr>
-</table>
-<% method_list["methods"].each do |methods| %>
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr><td class="methodtitle">
-<a name="<%= methods["aref"] %>">
-<b><%= methods["name"] %></b><%= methods["params"] %>
-<% if methods["codeurl"] then %>
-<a href="<%= methods["codeurl"] %>" target="source" class="srclink">src</a>
-<% end %>
-</a></td></tr>
-</table>
-<% if method_list["m_desc"] then %>
-<div class="description">
-<%= method_list["m_desc"] %>
-</div>
-<% end %>
-<% end %><%# method_list["methods"] %>
-<% end %>
-<% end %><%# sections["method_list"] %>
-<% end %>
-<% end %><%# values["sections"] %>
-<% end %>
-  EOF
-
-  SRC_PAGE = <<-EOF
-<html>
-<head><title><%= values["title"] %></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-<style type="text/css">
-  .kw { color: #3333FF; font-weight: bold }
-  .cmt { color: green; font-style: italic }
-  .str { color: #662222; font-style: italic }
-  .re  { color: #662222; }
 .ruby-comment    { color: green; font-style: italic }
 .ruby-constant   { color: #4433aa; font-weight: bold; }
 .ruby-identifier { color: #222222;  }
@@ -319,35 +88,23 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif;
 .ruby-operator   { color: #111111;  }
 .ruby-regexp     { color: #662222; }
 .ruby-value      { color: #662222; font-style: italic }
-</style>
-</head>
-<body bgcolor="#BBBBBB">
-<pre><%= values["code"] %></pre>
-</body>
-</html>
+
+.srcbut { float: right }
   EOF
 
-  FR_INDEX_BODY = %{
-<%= template_include %>
+  INDEX_STYLE = <<-EOF
+body {
+  background-color: #bbbbbb;
+  font-family: #{FONTS};
+  font-size: 11px;
+  font-style: normal;
+  line-height: 14px;
+  color: #000040;
 }
 
-  FILE_INDEX = <<-EOF
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-<style type="text/css">
-<!--
-  body {
-background-color: #bbbbbb;
-     font-family: #{FONTS};
-       font-size: 11px;
-      font-style: normal;
-     line-height: 14px;
-           color: #000040;
-  }
 div.banner {
   background: #bbbbcc;
-  color:      white;
+  color: white;
   padding: 1;
   margin: 0;
   font-size: 90%;
@@ -356,59 +113,38 @@ div.banner {
   text-align: center;
   width: 100%;
 }
+EOF
 
--->
-</style>
-<base target="docwin">
-</head>
-<body>
-<div class="banner"><%= values["list_title"] %></div>
-<% values["entries"].each do |entries| %>
-<a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%# values["entries"] %>
-</body></html>
-  EOF
+  FACTORY = RDoc::Generator::HTML::
+    KilmerFactory.new(:central_css => CENTRAL_STYLE,
+                      :index_css => INDEX_STYLE,
+                      :method_list_heading => "Subroutines and Functions",
+                      :class_and_module_list_heading => "Classes and Modules",
+                      :attribute_list_heading => "Arguments")
 
-  CLASS_INDEX = FILE_INDEX
-  METHOD_INDEX = FILE_INDEX
+  STYLE = FACTORY.get_STYLE()
 
-  INDEX = <<-EOF
-<html>
-<head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-</head>
+  METHOD_LIST = FACTORY.get_METHOD_LIST()
+  
+  BODY = FACTORY.get_BODY()
+  
+  FILE_PAGE = FACTORY.get_FILE_PAGE()
 
-<frameset cols="20%,*">
-    <frameset rows="15%,35%,50%">
-        <frame src="fr_file_index.html"   title="Files" name="Files">
-        <frame src="fr_class_index.html"  name="Modules">
-        <frame src="fr_method_index.html" name="Subroutines and Functions">
-    </frameset>
-    <frameset rows="80%,20%">
-      <frame  src="<%= values["initial_page"] %>" name="docwin">
-      <frame  src="blank.html" name="source">
-    </frameset>
-    <noframes>
-          <body bgcolor="#BBBBBB">
-            Click <a href="html/index.html">here</a> for a non-frames
-            version of this page.
-          </body>
-    </noframes>
-</frameset>
+  CLASS_PAGE = FACTORY.get_CLASS_PAGE()
 
-</html>
-  EOF
+  SRC_PAGE = FACTORY.get_SRC_PAGE()
 
-  # Blank page to use as a target
-  BLANK = %{
-<html><body bgcolor="#BBBBBB"></body></html>
-}
+  FR_INDEX_BODY = FACTORY.get_FR_INDEX_BODY()
 
-  def write_extra_pages
-    template = TemplatePage.new(BLANK)
-    File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
-  end
+  FILE_INDEX = FACTORY.get_FILE_INDEX()
 
-end
+  CLASS_INDEX = FACTORY.get_CLASS_INDEX()
+
+  METHOD_INDEX = FACTORY.get_METHOD_INDEX()
 
+  INDEX = FACTORY.get_INDEX()
+
+  def self.write_extra_pages(values)
+    FACTORY.write_extra_pages(values)
+  end
+end
diff --git a/lib/rdoc/generator/html/html.rb b/lib/rdoc/generator/html/html.rb
index 1ab90c6264..823d8056e7 100644
--- a/lib/rdoc/generator/html/html.rb
+++ b/lib/rdoc/generator/html/html.rb
@@ -1,15 +1,17 @@
 require 'rdoc/generator/html'
-require 'rdoc/generator/html/one_page_html'
+require 'rdoc/generator/html/common'
 
 ##
 # = CSS2 RDoc HTML template
 #
-# This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a
+# This is a template for RDoc that uses XHTML 1.0 Strict and dictates a
 # bit more of the appearance of the output to cascading stylesheets than the
 # default. It was designed for clean inline code display, and uses DHTMl to
 # toggle the visibility of each method's source with each click on the
 # '[source]' link.
 #
+# This template *also* forms the basis of the frameless template.
+# 
 # == Authors
 #
 # * Michael Granger <ged@FaerieMUD.org>
@@ -23,34 +25,54 @@ require 'rdoc/generator/html/one_page_html'
 
 module RDoc::Generator::HTML::HTML
 
+  include RDoc::Generator::HTML::Common
+
   FONTS = "Verdana,Arial,Helvetica,sans-serif"
 
   STYLE = <<-EOF
 body {
-    font-family: Verdana,Arial,Helvetica,sans-serif;
-    font-size:   90%;
-    margin: 0;
-    margin-left: 40px;
-    padding: 0;
-    background: white;
+  font-family: #{FONTS};
+  font-size: 90%;
+  margin: 0;
+  margin-left: 40px;
+  padding: 0;
+  background: white;
+  color: black;
+}
+
+h1, h2, h3, h4 {
+  margin: 0;
+  background: transparent;
+}
+
+h1 {
+  font-size: 150%;
 }
 
-h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
-h1 { font-size: 150%; }
-h2,h3,h4 { margin-top: 1em; }
+h2,h3,h4 {
+  margin-top: 1em;
+}
 
-a { background: #eef; color: #039; text-decoration: none; }
-a:hover { background: #039; color: #eef; }
+:link, :visited {
+  background: #eef;
+  color: #039;
+  text-decoration: none;
+}
+
+:link:hover, :visited:hover {
+  background: #039;
+  color: #eef;
+}
 
 /* Override the base stylesheet's Anchor inside a table cell */
-td > a {
+td > :link, td > :visited {
   background: transparent;
   color: #039;
   text-decoration: none;
 }
 
 /* and inside a section title */
-.section-title > a {
+.section-title > :link, .section-title > :visited {
   background: transparent;
   color: #eee;
   text-decoration: none;
@@ -58,181 +80,255 @@ td > a {
 
 /* === Structural elements =================================== */
 
-div#index {
-    margin: 0;
-    margin-left: -40px;
-    padding: 0;
-    font-size: 90%;
+.index {
+  margin: 0;
+  margin-left: -40px;
+  padding: 0;
+  font-size: 90%;
 }
 
-
-div#index a {
-    margin-left: 0.7em;
+.index :link, .index :visited {
+  margin-left: 0.7em;
 }
 
-div#index .section-bar {
-   margin-left: 0px;
-   padding-left: 0.7em;
-   background: #ccc;
-   font-size: small;
+.index .section-bar {
+  margin-left: 0px;
+  padding-left: 0.7em;
+  background: #ccc;
+  font-size: small;
 }
 
-
-div#classHeader, div#fileHeader {
-    width: auto;
-    color: white;
-    padding: 0.5em 1.5em 0.5em 1.5em;
-    margin: 0;
-    margin-left: -40px;
-    border-bottom: 3px solid #006;
+#classHeader, #fileHeader {
+  width: auto;
+  color: white;
+  padding: 0.5em 1.5em 0.5em 1.5em;
+  margin: 0;
+  margin-left: -40px;
+  border-bottom: 3px solid #006;
 }
 
-div#classHeader a, div#fileHeader a {
-    background: inherit;
-    color: white;
+#classHeader :link, #fileHeader :link,
+#classHeader :visited, #fileHeader :visited {
+  background: inherit;
+  color: white;
 }
 
-div#classHeader td, div#fileHeader td {
-    background: inherit;
-    color: white;
+#classHeader td, #fileHeader td {
+  background: inherit;
+  color: white;
 }
 
-
-div#fileHeader {
-    background: #057;
+#fileHeader {
+  background: #057;
 }
 
-div#classHeader {
-    background: #048;
+#classHeader {
+  background: #048;
 }
 
-
 .class-name-in-header {
   font-size:  180%;
   font-weight: bold;
 }
 
-
-div#bodyContent {
-    padding: 0 1.5em 0 1.5em;
+#bodyContent {
+  padding: 0 1.5em 0 1.5em;
 }
 
-div#description {
-    padding: 0.5em 1.5em;
-    background: #efefef;
-    border: 1px dotted #999;
+#description {
+  padding: 0.5em 1.5em;
+  background: #efefef;
+  border: 1px dotted #999;
 }
 
-div#description h1,h2,h3,h4,h5,h6 {
-    color: #125;;
-    background: transparent;
+#description h1, #description h2, #description h3,
+#description h4, #description h5, #description h6 {
+  color: #125;
+  background: transparent;
 }
 
-div#validator-badges {
-    text-align: center;
+#validator-badges {
+  text-align: center;
 }
-div#validator-badges img { border: 0; }
 
-div#copyright {
-    color: #333;
-    background: #efefef;
-    font: 0.75em sans-serif;
-    margin-top: 5em;
-    margin-bottom: 0;
-    padding: 0.5em 2em;
+#validator-badges img {
+  border: 0;
 }
 
+#copyright {
+  color: #333;
+  background: #efefef;
+  font: 0.75em sans-serif;
+  margin-top: 5em;
+  margin-bottom: 0;
+  padding: 0.5em 2em;
+}
 
 /* === Classes =================================== */
 
 table.header-table {
-    color: white;
-    font-size: small;
+  color: white;
+  font-size: small;
 }
 
 .type-note {
-    font-size: small;
-    color: #DEDEDE;
+  font-size: small;
+  color: #dedede;
 }
 
-.xxsection-bar {
-    background: #eee;
-    color: #333;
-    padding: 3px;
+.section-bar {
+  color: #333;
+  border-bottom: 1px solid #999;
+  margin-left: -20px;
 }
 
-.section-bar {
-   color: #333;
-   border-bottom: 1px solid #999;
-    margin-left: -20px;
+.section-title {
+  background: #79a;
+  color: #eee;
+  padding: 3px;
+  margin-top: 2em;
+  margin-left: -30px;
+  border: 1px solid #999;
 }
 
+.top-aligned-row {
+  vertical-align: top
+}
 
-.section-title {
-    background: #79a;
-    color: #eee;
-    padding: 3px;
-    margin-top: 2em;
-    margin-left: -30px;
-    border: 1px solid #999;
+.bottom-aligned-row {
+  vertical-align: bottom
 }
 
-.top-aligned-row {  vertical-align: top }
-.bottom-aligned-row { vertical-align: bottom }
+#diagram img {
+  border: 0;
+}
 
 /* --- Context section classes ----------------------- */
 
 .context-row { }
-.context-item-name { font-family: monospace; font-weight: bold; color: black; }
-.context-item-value { font-size: small; color: #448; }
-.context-item-desc { color: #333; padding-left: 2em; }
+
+.context-item-name {
+  font-family: monospace;
+  font-weight: bold;
+  color: black;
+}
+
+.context-item-value {
+  font-size: small;
+  color: #448;
+}
+
+.context-item-desc {
+  color: #333;
+  padding-left: 2em;
+}
 
 /* --- Method classes -------------------------- */
+
 .method-detail {
-    background: #efefef;
-    padding: 0;
-    margin-top: 0.5em;
-    margin-bottom: 1em;
-    border: 1px dotted #ccc;
+  background: #efefef;
+  padding: 0;
+  margin-top: 0.5em;
+  margin-bottom: 1em;
+  border: 1px dotted #ccc;
 }
+
 .method-heading {
   color: black;
   background: #ccc;
   border-bottom: 1px solid #666;
   padding: 0.2em 0.5em 0 0.5em;
 }
-.method-signature { color: black; background: inherit; }
-.method-name { font-weight: bold; }
-.method-args { font-style: italic; }
-.method-description { padding: 0 0.5em 0 0.5em; }
+
+.method-signature {
+  color: black;
+  background: inherit;
+}
+
+.method-name {
+  font-weight: bold;
+}
+
+.method-args {
+  font-style: italic;
+}
+
+.method-description {
+  padding: 0 0.5em 0 0.5em;
+}
 
 /* --- Source code sections -------------------- */
 
-a.source-toggle { font-size: 90%; }
+:link.source-toggle, :visited.source-toggle {
+  font-size: 90%;
+}
+
 div.method-source-code {
-    background: #262626;
-    color: #ffdead;
-    margin: 1em;
-    padding: 0.5em;
-    border: 1px dashed #999;
-    overflow: hidden;
+  background: #262626;
+  color: #ffdead;
+  margin: 1em;
+  padding: 0.5em;
+  border: 1px dashed #999;
+  overflow: auto;
 }
 
-div.method-source-code pre { color: #ffdead; overflow: hidden; }
+div.method-source-code pre {
+  color: #ffdead;
+}
 
 /* --- Ruby keyword styles --------------------- */
 
-.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
-
-.ruby-constant  { color: #7fffd4; background: transparent; }
-.ruby-keyword { color: #00ffff; background: transparent; }
-.ruby-ivar    { color: #eedd82; background: transparent; }
-.ruby-operator  { color: #00ffee; background: transparent; }
-.ruby-identifier { color: #ffdead; background: transparent; }
-.ruby-node    { color: #ffa07a; background: transparent; }
-.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
-.ruby-regexp  { color: #ffa07a; background: transparent; }
-.ruby-value   { color: #7fffd4; background: transparent; }
+.standalone-code {
+  background: #221111;
+  color: #ffdead;
+  overflow: auto;
+}
+
+.ruby-constant {
+  color: #7fffd4;
+  background: transparent;
+}
+
+.ruby-keyword {
+  color: #00ffff;
+  background: transparent;
+}
+
+.ruby-ivar {
+  color: #eedd82;
+  background: transparent;
+}
+
+.ruby-operator {
+  color: #00ffee;
+  background: transparent;
+}
+
+.ruby-identifier {
+  color: #ffdead;
+  background: transparent;
+}
+
+.ruby-node {
+  color: #ffa07a;
+  background: transparent;
+}
+
+.ruby-comment {
+  color: #b22222;
+  font-weight: bold;
+  background: transparent;
+}
+
+.ruby-regexp {
+  color: #ffa07a;
+  background: transparent;
+}
+
+.ruby-value {
+  color: #7fffd4;
+  background: transparent;
+}
 EOF
 
 
@@ -240,15 +336,7 @@ EOF
 ### H E A D E R   T E M P L A T E
 #####################################################################
 
-  XHTML_PREAMBLE = <<-EOF
-<?xml version="1.0" encoding="<%= values["charset"] %>"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  EOF
-
-  HEADER = XHTML_PREAMBLE + <<-EOF
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  HEADER = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
 <head>
   <title><%= values["title"] %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
@@ -281,7 +369,7 @@ EOF
   }
 
   // Make codeblocks hidden by default
-  document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" )
+  document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }<\\/style>" )
 
   // ]]>
   </script>
@@ -291,13 +379,6 @@ EOF
 EOF
 
 #####################################################################
-### C O N T E X T   C O N T E N T   T E M P L A T E
-#####################################################################
-
-  CONTEXT_CONTENT = %{
-}
-
-#####################################################################
 ### F O O T E R   T E M P L A T E
 #####################################################################
 
@@ -480,8 +561,8 @@ EOF
           <td class="context-item-name"><%= constants["name"] %></td>
           <td>=</td>
           <td class="context-item-value"><%= constants["value"] %></td>
-<%       if sections["desc"] then %>
-          <td width="3em">&nbsp;</td>
+<%       if constants["desc"] then %>
+          <td>&nbsp;</td>
           <td class="context-item-desc"><%= constants["desc"] %></td>
 <%       end %>
         </tr>
@@ -616,8 +697,7 @@ EOF
 ### S O U R C E   C O D E   T E M P L A T E
 #####################################################################
 
-  SRC_PAGE = XHTML_PREAMBLE + <<-EOF
-<html>
+  SRC_PAGE = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
 <head>
   <title><%= values["title"] %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
@@ -634,25 +714,22 @@ EOF
 ### I N D E X   F I L E   T E M P L A T E S
 #####################################################################
 
-  FR_INDEX_BODY = %{
-<%= template_include %>
-}
+  FR_INDEX_BODY = %{<%= template_include %>}
 
-  FILE_INDEX = XHTML_PREAMBLE + <<-EOF
+  FILE_INDEX = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
 <!--
 
-    <%= values["list_title"] %>
+    <%= values["title"] %>
 
   -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title><%= values["list_title"] %></title>
+  <title><%= values["title"] %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
   <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" />
   <base target="docwin" />
 </head>
 <body>
-<div id="index">
+<div class="index">
   <h1 class="section-bar"><%= values["list_title"] %></h1>
   <div id="index-entries">
 <% values["entries"].each do |entries| %>
@@ -667,18 +744,12 @@ EOF
   CLASS_INDEX = FILE_INDEX
   METHOD_INDEX = FILE_INDEX
 
-  INDEX = <<-EOF
-<?xml version="1.0" encoding="<%= values["charset"] %>"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-
+  INDEX = XHTML_FRAME_PREAMBLE + HTML_ELEMENT + <<-EOF
 <!--
 
     <%= values["title"] %>
 
   -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title><%= values["title"] %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
diff --git a/lib/rdoc/generator/html/kilmer.rb b/lib/rdoc/generator/html/kilmer.rb
index 6479abaf8b..4c5a9ee8b0 100644
--- a/lib/rdoc/generator/html/kilmer.rb
+++ b/lib/rdoc/generator/html/kilmer.rb
@@ -1,10 +1,11 @@
 require 'rdoc/generator/html'
+require 'rdoc/generator/html/kilmerfactory'
 
 module RDoc::Generator::HTML::KILMER
 
   FONTS = "Verdana, Arial, Helvetica, sans-serif"
 
-  STYLE = <<-EOF
+  CENTRAL_STYLE = <<-EOF
 body,td,p { font-family: <%= values["fonts"] %>;
        color: #000040;
 }
@@ -30,6 +31,10 @@ body,td,p { font-family: <%= values["fonts"] %>;
 
 .aqua { color: black }
 
+#diagram img {
+  border: 0;
+}
+
 .method-name, .attr-name {
       font-family: font-family: <%= values["fonts"] %>;
       font-weight: bold;
@@ -67,7 +72,7 @@ body,td,p { font-family: <%= values["fonts"] %>;
   font-weight: bold;
   text-decoration: none;
   color: #000033;
-  background-color: white;
+  background: #ccc;
 }
 
 .srclink {
@@ -78,232 +83,8 @@ body,td,p { font-family: <%= values["fonts"] %>;
   background-color: white;
 }
 
-.paramsig {
-   font-size: small;
-}
-
 .srcbut { float: right }
-  EOF
-
-  BODY = <<-EOF
-<html><head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-  <script type="text/javascript" language="JavaScript">
-  <!--
-  function popCode(url) {
-    parent.frames.source.location = url
-  }
-  //-->
-  </script>
-</head>
-<body bgcolor="white">
-
-<%= template_include %>  <!-- banner header -->
-
-<% if values["diagram"] then %>
-<table width="100%"><tr><td align="center">
-<%= values["diagram"] %>
-</td></tr></table>
-<% end %>
-
-<% if values["description"] then %>
-<div class="description"><%= values["description"] %></div>
-<% end %>
-
-<% if values["requires"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
-<div class="name-list">
-<% values["requires"].each do |requires| %>
-<%= href requires["aref"], requires["name"] %>
-<% end %><%# values["requires"] %>
-<% end %>
-</div>
-
-<% if values["methods"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Methods</td></tr>
-</table><br />
-<div class="name-list">
-<% values["methods"].each do |methods| %>
-<%= href methods["aref"], methods["name"] %>,
-<% end %><%# values["methods"] %>
-</div>
-<% end %>
-
-
-<% values["sections"].each do |sections| %>
-    <div id="section">
-<% if sections["sectitle"] then %>
-      <h2 class="section-title"><a name="<%= sections["secsequence"] %>"><%= sections["sectitle"] %></a></h2>
-<% if sections["seccomment"] then %>
-      <div class="section-comment">
-        <%= sections["seccomment"] %>
-      </div>
-<% end %>
-<% end %>
-
-<% if sections["attributes"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Attributes</td></tr>
-</table><br />
-<table cellspacing="5">
-<% sections["attributes"].each do |attributes| %>
-     <tr valign="top">
-<% if attributes["rw"] then %>
-       <td align="center" class="attr-rw">&nbsp;[<%= attributes["rw"] %>]&nbsp;</td>
-<% end %>
-<% unless attributes["rw"] then %>
-       <td></td>
-<% end %>
-       <td class="attr-name"><%= attributes["name"] %></td>
-       <td><%= attributes["a_desc"] %></td>
-     </tr>
-<% end %><%# sections["attributes"] %>
-</table>
-<% end %>
-
-<% if sections["classlist"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Classes and Modules</td></tr>
-</table><br />
-<%= sections["classlist"] %><br />
-<% end %>
-
-  <%= template_include %>  <!-- method descriptions -->
-
-<% end %><%# values["sections"] %>
-
-</body>
-</html>
-  EOF
-
-  FILE_PAGE = <<-EOF
-<table width="100%">
- <tr class="title-row">
- <td><table width="100%"><tr>
-   <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font><%= values["short_name"] %></td>
-   <td align="right"><table cellspacing="0" cellpadding="2">
-         <tr>
-           <td  class="small-title-font">Path:</td>
-           <td class="small-title-font"><%= values["full_path"] %>
-<% if values["cvsurl"] then %>
-				&nbsp;(<a href="<%= values["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-           </td>
-         </tr>
-         <tr>
-           <td class="small-title-font">Modified:</td>
-           <td class="small-title-font"><%= values["dtm_modified"] %></td>
-         </tr>
-        </table>
-    </td></tr></table></td>
-  </tr>
-</table><br />
-  EOF
-
-  CLASS_PAGE = <<-EOF
-<table width="100%" border="0" cellspacing="0">
- <tr class="title-row">
- <td class="big-title-font">
-   <font size="-3"><b><%= values["classmod"] %></b><br /></font><%= values["full_name"] %>
- </td>
- <td align="right">
-   <table cellspacing="0" cellpadding="2">
-     <tr valign="top">
-      <td class="small-title-font">In:</td>
-      <td class="small-title-font">
-<% values["infiles"].each do |infiles| %>
-<%= href infiles["full_path_url"], infiles["full_path"] %>
-<% if infiles["cvsurl"] then %>
-&nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-<% end %><%# values["infiles"] %>
-      </td>
-     </tr>
-<% if values["parent"] then %>
-     <tr>
-      <td class="small-title-font">Parent:</td>
-      <td class="small-title-font">
-<% if values["par_url"] then %>
-        <a href="<%= values["par_url"] %>" class="cyan">
-<% end %>
-<%= values["parent"] %>
-<% if values["par_url"] then %>
-         </a>
-<% end %>
-      </td>
-     </tr>
-<% end %>
-   </table>
-  </td>
-  </tr>
-</table><br />
-  EOF
 
-  METHOD_LIST = <<-EOF
-<% if values["includes"] then %>
-<div class="tablesubsubtitle">Included modules</div><br />
-<div class="name-list">
-<% values["includes"].each do |includes| %>
-    <span class="method-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%# values["includes"] %>
-</div>
-<% end %>
-
-<% if values["method_list"] then %>
-<% values["method_list"].each do |method_list| $stderr.puts({ :method_list => method_list }.inspect) %>
-<% if values["methods"] then %>
-<table cellpadding=5 width="100%">
-<tr><td class="tablesubtitle"><%= values["type"] %> <%= values["category"] %> methods</td></tr>
-</table>
-<% values["methods"].each do |methods| $stderr.puts({ :methods => methods }.inspect) %>
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr><td class="methodtitle">
-<a name="<%= values["aref"] %>">
-<% if values["callseq"] then %>
-<b><%= values["callseq"] %></b>
-<% end %>
-<% unless values["callseq"] then %>
- <b><%= values["name"] %></b><%= values["params"] %>
-<% end %>
-<% if values["codeurl"] then %>
-<a href="<%= values["codeurl"] %>" target="source" class="srclink">src</a>
-<% end %>
-</a></td></tr>
-</table>
-<% if values["m_desc"] then %>
-<div class="description">
-<%= values["m_desc"] %>
-</div>
-<% end %>
-<% if values["aka"] then %>
-<div class="aka">
-This method is also aliased as
-<% values["aka"].each do |aka| $stderr.puts({ :aka => aka }.inspect) %>
-<a href="<%= values["aref"] %>"><%= values["name"] %></a>
-<% end %><%# values["aka"] %>
-</div>
-<% end %>
-<% if values["sourcecode"] then %>
-<pre class="source">
-<%= values["sourcecode"] %>
-</pre>
-<% end %>
-<% end %><%# values["methods"] %>
-<% end %>
-<% end %><%# values["method_list"] %>
-<% end %>
-  EOF
-
-  SRC_PAGE = <<-EOF
-<html>
-<head><title><%= values["title"] %></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-<style type="text/css">
 .ruby-comment    { color: green; font-style: italic }
 .ruby-constant   { color: #4433aa; font-weight: bold; }
 .ruby-identifier { color: #222222;  }
@@ -313,28 +94,9 @@ This method is also aliased as
 .ruby-operator   { color: #111111;  }
 .ruby-regexp     { color: #662222; }
 .ruby-value      { color: #662222; font-style: italic }
-  .kw { color: #3333FF; font-weight: bold }
-  .cmt { color: green; font-style: italic }
-  .str { color: #662222; font-style: italic }
-  .re  { color: #662222; }
-</style>
-</head>
-<body bgcolor="white">
-<pre><%= values["code"] %></pre>
-</body>
-</html>
   EOF
 
-  FR_INDEX_BODY = %{
-<%= template_include %>
-}
-
-  FILE_INDEX = <<-EOF
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-<style>
-<!--
+  INDEX_STYLE = <<-EOF
 body {
   background-color: #ddddff;
   font-family: #{FONTS};
@@ -355,64 +117,35 @@ div.banner {
   text-align: center;
   width: 100%;
 }
+EOF
 
--->
-</style>
-<base target="docwin">
-</head>
-<body>
-<div class="banner"><%= values["list_title"] %></div>
-<% values["entries"].each do |entries| %>
-<a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%# values["entries"] %>
-</body></html>
-  EOF
+  FACTORY = RDoc::Generator::HTML::
+    KilmerFactory.new(:central_css => CENTRAL_STYLE,
+                      :index_css => INDEX_STYLE)
 
-  CLASS_INDEX = FILE_INDEX
-  METHOD_INDEX = FILE_INDEX
+  STYLE = FACTORY.get_STYLE()
 
-  INDEX = <<-EOF
-<html>
-<head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>">
-</head>
+  METHOD_LIST = FACTORY.get_METHOD_LIST()
+  
+  BODY = FACTORY.get_BODY()
+  
+  FILE_PAGE = FACTORY.get_FILE_PAGE()
 
-<frameset cols="20%,*">
-    <frameset rows="15%,35%,50%">
-        <frame src="fr_file_index.html"   title="Files" name="Files">
-        <frame src="fr_class_index.html"  name="Classes">
-        <frame src="fr_method_index.html" name="Methods">
-    </frameset>
-<% if values["inline_source"] then %>
-      <frame  src="<%= values["initial_page"] %>" name="docwin">
-<% end %>
-<% unless values["inline_source"] then %>
-    <frameset rows="80%,20%">
-      <frame  src="<%= values["initial_page"] %>" name="docwin">
-      <frame  src="blank.html" name="source">
-    </frameset>
-<% end %>
-    <noframes>
-          <body bgcolor="white">
-            Click <a href="html/index.html">here</a> for a non-frames
-            version of this page.
-          </body>
-    </noframes>
-</frameset>
+  CLASS_PAGE = FACTORY.get_CLASS_PAGE()
 
-</html>
-  EOF
+  SRC_PAGE = FACTORY.get_SRC_PAGE()
 
-  # A blank page to use as a target
-  BLANK = %{
-<html><body bgcolor="white"></body></html>
-}
+  FR_INDEX_BODY = FACTORY.get_FR_INDEX_BODY()
 
-  def write_extra_pages
-    template = TemplatePage.new(BLANK)
-    File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
-  end
+  FILE_INDEX = FACTORY.get_FILE_INDEX()
 
-end
+  CLASS_INDEX = FACTORY.get_CLASS_INDEX()
 
+  METHOD_INDEX = FACTORY.get_METHOD_INDEX()
+
+  INDEX = FACTORY.get_INDEX()
+
+  def self.write_extra_pages(values)
+    FACTORY.write_extra_pages(values)
+  end
+end
diff --git a/lib/rdoc/generator/html/kilmerfactory.rb b/lib/rdoc/generator/html/kilmerfactory.rb
new file mode 100644
index 0000000000..ef6f3f3b4d
--- /dev/null
+++ b/lib/rdoc/generator/html/kilmerfactory.rb
@@ -0,0 +1,427 @@
+require 'rdoc/generator/html'
+require 'rdoc/generator/html/common'
+
+#
+# This class generates Kilmer-style templates.  Right now,
+# rdoc is shipped with two such templates:
+# * kilmer
+# * hefss
+#
+# Kilmer-style templates use frames.  The left side of the page has
+# three frames stacked on top of each other: one lists
+# files, one lists classes, and one lists methods.  If source code
+# is not inlined, an additional frame runs across the bottom of
+# the page and will be used to display method source code.
+# The central (and largest frame) display class and file
+# pages.
+#
+# The constructor of this class accepts a Hash containing stylistic
+# attributes.  Then, a get_BLAH instance method of this class returns a
+# value for the template's BLAH constant.  get_BODY, for instance, returns
+# the value of the template's BODY constant.
+#
+class RDoc::Generator::HTML::KilmerFactory
+
+  include RDoc::Generator::HTML::Common
+
+  #
+  # The contents of the stylesheet that should be used for the
+  # central frame (for the class and file pages).
+  #
+  # This must be specified in the Hash passed to the constructor.
+  #
+  attr_reader :central_css
+
+  #
+  # The contents of the stylesheet that should be used for the
+  # index pages.
+  #
+  # This must be specified in the Hash passed to the constructor.
+  #
+  attr_reader :index_css
+
+  #
+  # The heading that should be displayed before listing methods.
+  #
+  # If not supplied, this defaults to "Methods".
+  #
+  attr_reader :method_list_heading
+
+  #
+  # The heading that should be displayed before listing classes and
+  # modules.
+  #
+  # If not supplied, this defaults to "Classes and Modules".
+  #
+  attr_reader :class_and_module_list_heading
+
+  #
+  # The heading that should be displayed before listing attributes.
+  #
+  # If not supplied, this defaults to "Attributes".
+  #
+  attr_reader :attribute_list_heading
+  
+  # 
+  # ====Description:
+  # This method constructs a KilmerFactory instance, which
+  # can be used to build Kilmer-style template classes.
+  # The +style_attributes+ argument is a Hash that contains the
+  # values of the classes attributes (Symbols mapped to Strings).
+  #
+  # ====Parameters:
+  # [style_attributes]
+  #      A Hash describing the appearance of the Kilmer-style.
+  # 
+  def initialize(style_attributes)
+    @central_css = style_attributes[:central_css]
+    if(!@central_css)
+      raise ArgumentError, "did not specify a value for :central_css"
+    end
+
+    @index_css = style_attributes[:index_css]
+    if(!@index_css)
+      raise ArgumentError, "did not specify a value for :index_css"
+    end
+
+    @method_list_heading = style_attributes[:method_list_heading]
+    if(!@method_list_heading)
+      @method_list_heading = "Methods"
+    end
+
+    @class_and_module_list_heading = style_attributes[:class_and_module_list_heading]
+    if(!@class_and_module_list_heading)
+      @class_and_module_list_heading = "Classes and Modules"
+    end
+
+    @attribute_list_heading = style_attributes[:attribute_list_heading]
+    if(!@attribute_list_heading)
+      @attribute_list_heading = "Attributes"
+    end
+  end
+
+  def get_STYLE
+    return @central_css
+  end
+  
+  def get_METHOD_LIST
+    return %{
+<% if values["diagram"] then %>
+<div id="diagram">
+<table width="100%"><tr><td align="center">
+<%= values["diagram"] %>
+</td></tr></table>
+</div>
+<% end %>
+
+<% if values["description"] then %>
+<div class="description"><%= values["description"] %></div>
+<% end %>
+
+<% if values["requires"] then %>
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table><br />
+<div class="name-list">
+<% values["requires"].each do |requires| %>
+<%= href requires["aref"], requires["name"] %>
+<% end %><%# values["requires"] %>
+</div>
+<% end %>
+
+<% if values["methods"] then %>
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">#{@method_list_heading}</td></tr>
+</table><br />
+<div class="name-list">
+<% values["methods"].each do |methods| %>
+<%= href methods["aref"], methods["name"] %>,
+<% end %><%# values["methods"] %>
+</div>
+<% end %>
+
+<% if values["includes"] then %>
+<div class="tablesubsubtitle">Included modules</div><br />
+<div class="name-list">
+<% values["includes"].each do |includes| %>
+    <span class="method-name"><%= href includes["aref"], includes["name"] %></span>
+<% end %><%# values["includes"] %>
+</div>
+<% end %>
+
+<% values["sections"].each do |sections| %>
+    <div id="section">
+<% if sections["sectitle"] then %>
+      <h2 class="section-title"><a name="<%= sections["secsequence"] %>"><%= sections["sectitle"] %></a></h2>
+<% if sections["seccomment"] then %>
+      <div class="section-comment">
+        <%= sections["seccomment"] %>
+      </div>
+<% end %>
+<% end %>
+<% if sections["attributes"] then %>
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">#{@attribute_list_heading}</td></tr>
+</table><br />
+<table cellspacing="5">
+<% sections["attributes"].each do |attributes| %>
+     <tr valign="top">
+<% if attributes["rw"] then %>
+       <td align="center" class="attr-rw">&nbsp;[<%= attributes["rw"] %>]&nbsp;</td>
+<% end %>
+<% unless attributes["rw"] then %>
+       <td></td>
+<% end %>
+       <td class="attr-name"><%= attributes["name"] %></td>
+       <td><%= attributes["a_desc"] %></td>
+     </tr>
+<% end %><%# sections["attributes"] %>
+</table>
+<% end %>
+
+<% if sections["classlist"] then %>
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">#{@class_and_module_list_heading}</td></tr>
+</table><br />
+<%= sections["classlist"] %><br />
+<% end %>
+
+<% if sections["method_list"] then %>
+<% sections["method_list"].each do |method_list| %>
+<% if method_list["methods"] then %>
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle"><%= method_list["type"] %> <%= method_list["category"] %> methods</td></tr>
+</table>
+<% method_list["methods"].each do |methods| %>
+<table width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="<%= methods["aref"] %>">
+<% if methods["callseq"] then %>
+<b><%= methods["callseq"] %></b>
+<% end %>
+<% unless methods["callseq"] then %>
+ <b><%= methods["name"] %></b><%= methods["params"] %>
+<% end %>
+</a>
+<% if methods["codeurl"] then %>
+<a href="<%= methods["codeurl"] %>" target="source" class="srclink">src</a>
+<% end %>
+</td></tr>
+</table>
+<% if methods["m_desc"] then %>
+<div class="description">
+<%= methods["m_desc"] %>
+</div>
+<% end %>
+<% if methods["aka"] then %>
+<div class="aka">
+This method is also aliased as
+<% methods["aka"].each do |aka| %>
+<a href="<%= methods["aref"] %>"><%= methods["name"] %></a>
+<% end %><%# methods["aka"] %>
+</div>
+<% end %>
+<% if methods["sourcecode"] then %>
+<pre class="source">
+<%= methods["sourcecode"] %>
+</pre>
+<% end %>
+<% end %><%# method_list["methods"] %>
+<% end %>
+<% end %><%# sections["method_list"] %>
+<% end %>
+
+<% end %><%# values["sections"] %>
+</div>
+}
+  end
+
+  def get_BODY
+    return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
+<head>
+  <title><%= values["title"] %></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
+  <script type="text/javascript">
+  <!--
+  function popCode(url) {
+    parent.frames.source.location = url
+  }
+  //-->
+  </script>
+</head>
+<body>
+<div class="bodyContent">
+<%= template_include %>  <!-- banner header -->
+
+#{get_METHOD_LIST()}
+</div>
+</body>
+</html>
+}
+  end
+
+def get_FILE_PAGE
+  return %{
+<table width="100%">
+ <tr class="title-row">
+ <td><table width="100%"><tr>
+   <td class="big-title-font" colspan="2">File<br /><%= values["short_name"] %></td>
+   <td align="right"><table cellspacing="0" cellpadding="2">
+         <tr>
+           <td class="small-title-font">Path:</td>
+           <td class="small-title-font"><%= values["full_path"] %>
+<% if values["cvsurl"] then %>
+				&nbsp;(<a href="<%= values["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+<% end %>
+           </td>
+         </tr>
+         <tr>
+           <td class="small-title-font">Modified:</td>
+           <td class="small-title-font"><%= values["dtm_modified"] %></td>
+         </tr>
+        </table>
+    </td></tr></table></td>
+  </tr>
+</table><br />
+}
+end
+
+def get_CLASS_PAGE
+  return %{
+<table width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+   <%= values["classmod"] %><br /><%= values["full_name"] %>
+ </td>
+ <td align="right">
+   <table cellspacing="0" cellpadding="2">
+     <tr valign="top">
+      <td class="small-title-font">In:</td>
+      <td class="small-title-font">
+<% values["infiles"].each do |infiles| %>
+<%= href infiles["full_path_url"], infiles["full_path"] %>
+<% if infiles["cvsurl"] then %>
+&nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+<% end %>
+<% end %><%# values["infiles"] %>
+      </td>
+     </tr>
+<% if values["parent"] then %>
+     <tr>
+      <td class="small-title-font">Parent:</td>
+      <td class="small-title-font">
+<% if values["par_url"] then %>
+        <a href="<%= values["par_url"] %>" class="cyan">
+<% end %>
+<%= values["parent"] %>
+<% if values["par_url"] then %>
+         </a>
+<% end %>
+      </td>
+     </tr>
+<% end %>
+   </table>
+  </td>
+  </tr>
+</table><br />
+}
+end
+
+def get_SRC_PAGE
+  return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
+<head><title><%= values["title"] %></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+<link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
+</head>
+<body>
+<pre><%= values["code"] %></pre>
+</body>
+</html>
+}
+end
+
+def get_FR_INDEX_BODY
+  return %{<%= template_include %>}
+end
+
+def get_FILE_INDEX
+  return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
+<head>
+<title><%= values["title"] %></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+<style type="text/css">
+<!--
+#{@index_css}
+-->
+</style>
+<base target="docwin" />
+</head>
+<body>
+<div class="index">
+<div class="banner"><%= values["list_title"] %></div>
+<% values["entries"].each do |entries| %>
+<a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
+<% end %><%# values["entries"] %>
+</div>
+</body></html>
+}
+end
+
+def get_CLASS_INDEX
+  return get_FILE_INDEX
+end
+
+def get_METHOD_INDEX
+  return get_FILE_INDEX
+end
+
+def get_INDEX
+  return XHTML_FRAME_PREAMBLE + HTML_ELEMENT + %{
+<head>
+  <title><%= values["title"] %></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+</head>
+
+<frameset cols="20%,*">
+    <frameset rows="15%,35%,50%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+<% if values["inline_source"] then %>
+      <frame  src="<%= values["initial_page"] %>" name="docwin" />
+<% end %>
+<% unless values["inline_source"] then %>
+    <frameset rows="80%,20%">
+      <frame  src="<%= values["initial_page"] %>" name="docwin" />
+      <frame  src="blank.html" name="source" />
+    </frameset>
+<% end %>
+</frameset>
+
+</html>
+}
+end
+
+def get_BLANK
+  # This will be displayed in the source code frame before
+  # any source code has been selected.
+  return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
+<head>
+  <title>Source Code Frame <%= values["title_suffix"] %></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+  <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
+</head>
+<body>
+</body>
+</html>
+}
+end
+
+def write_extra_pages(values)
+  template = RDoc::TemplatePage.new(get_BLANK())
+  File.open("blank.html", "w") { |f| template.write_html_on(f, values) }
+end
+
+end
diff --git a/lib/rdoc/generator/html/one_page_html.rb b/lib/rdoc/generator/html/one_page_html.rb
index c4dd95529d..51ae32351a 100644
--- a/lib/rdoc/generator/html/one_page_html.rb
+++ b/lib/rdoc/generator/html/one_page_html.rb
@@ -1,7 +1,10 @@
 require 'rdoc/generator/html'
+require 'rdoc/generator/html/common'
 
 module RDoc::Generator::HTML::ONE_PAGE_HTML
 
+  include RDoc::Generator::HTML::Common
+
   CONTENTS_XML = <<-EOF
 <% if defined? classes and classes["description"] then %>
 <%= classes["description"] %>
@@ -76,16 +79,14 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 <% end %>
   EOF
 
-  ONE_PAGE = %{
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+  ONE_PAGE = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
 <head>
   <title><%= values["title"] %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
 </head>
 <body>
 <% values["files"].each do |files| %>
-<h2>File: <%= files["short_name"] %></h2>
+<h2>File: <a name="<%= files["href"] %>"><%= files["short_name"] %></a></h2>
 <table>
   <tr><td>Path:</td><td><%= files["full_path"] %></td></tr>
   <tr><td>Modified:</td><td><%= files["dtm_modified"] %></td></tr>
@@ -97,7 +98,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 <h2>Classes</h2>
 <% values["classes"].each do |classes| %>
 <% if classes["parent"] then %>
-<h3><%= classes["classmod"] %> <%= classes["full_name"] %> &lt; <%= href classes["par_url"], classes["parent"] %></h3>
+<h3><%= classes["classmod"] %> <a name="<%= classes["href"] %>"><%= classes["full_name"] %></a> &lt; <%= href classes["par_url"], classes["parent"] %></h3>
 <% end %>
 <% unless classes["parent"] then %>
 <h3><%= classes["classmod"] %> <%= classes["full_name"] %></h3>
diff --git a/lib/rdoc/generator/texinfo.rb b/lib/rdoc/generator/texinfo.rb
index 0b79820228..70db875af9 100644
--- a/lib/rdoc/generator/texinfo.rb
+++ b/lib/rdoc/generator/texinfo.rb
@@ -3,13 +3,10 @@ require 'rdoc/generator'
 require 'rdoc/markup/to_texinfo'
 
 module RDoc
-  RDoc::GENERATORS['texinfo'] = RDoc::Generator.new("rdoc/generator/texinfo",
-                                                    :Texinfo,
-                                                    'texinfo')
   module Generator
     # This generates Texinfo files for viewing with GNU Info or Emacs
     # from RDoc extracted from Ruby source files.
-    class Texinfo
+    class TEXINFO
       # What should the .info file be named by default?
       DEFAULT_INFO_FILENAME = 'rdoc.info'
 
@@ -26,8 +23,8 @@ module RDoc
       # Generate the +texinfo+ files
       def generate(toplevels)
         @toplevels = toplevels
-        @files, @classes = ::RDoc::Generator::Context.build_indicies(@toplevels,
-                                                                     @options)
+        @files, @classes = ::RDoc::Generator::Context.build_indices(@toplevels,
+                                                                    @options)
 
         (@files + @classes).each { |x| x.value_hash }
 
diff --git a/lib/rdoc/generator/texinfo/class.texinfo.erb b/lib/rdoc/generator/texinfo/class.texinfo.erb
index 07f17eaef2..74ecc59f7d 100644
--- a/lib/rdoc/generator/texinfo/class.texinfo.erb
+++ b/lib/rdoc/generator/texinfo/class.texinfo.erb
@@ -38,7 +38,7 @@ Methods
 <%       (method_list["methods"] || []).uniq.each do |method| %>
 <%=        TexinfoTemplate.new(@v.merge({'method' => method, 'list' => method_list}),
                                'method.texinfo.erb').render %><% end %>
-<%     end # section["method_list"] %>
-<%   end %>
+<%       end %>
+<%     end # if section["method_list"] %>
 <% end # @v['class']["sections"] %>
 <% end %>
diff --git a/lib/rdoc/generator/xml.rb b/lib/rdoc/generator/xml.rb
index 3335f2ce7c..0d4c5a7ea1 100644
--- a/lib/rdoc/generator/xml.rb
+++ b/lib/rdoc/generator/xml.rb
@@ -34,15 +34,15 @@ class RDoc::Generator::XML < RDoc::Generator::HTML
   ##
   # Generate:
   #
-  # * a list of HtmlFile objects for each TopLevel object.
-  # * a list of HtmlClass objects for each first level
+  # * a list of File objects for each TopLevel object.
+  # * a list of Class objects for each first level
   #   class or module in the TopLevel objects
   # * a complete list of all hyperlinkable terms (file,
   #   class, module, and method names)
 
   def build_indices
     @info.each do |toplevel|
-      @files << RDoc::Generator::HtmlFile.new(toplevel, @options, RDoc::Generator::FILE_DIR)
+      @files << RDoc::Generator::File.new(toplevel, @options, RDoc::Generator::FILE_DIR)
     end
 
     RDoc::TopLevel.all_classes_and_modules.each do |cls|
@@ -51,7 +51,7 @@ class RDoc::Generator::XML < RDoc::Generator::HTML
   end
 
   def build_class_list(from, html_file, class_dir)
-    @classes << RDoc::Generator::HtmlClass.new(from, html_file, class_dir, @options)
+    @classes << RDoc::Generator::Class.new(from, html_file, class_dir, @options)
     from.each_classmodule do |mod|
       build_class_list(mod, html_file, class_dir)
     end
@@ -68,9 +68,6 @@ class RDoc::Generator::XML < RDoc::Generator::HTML
       'classes' => gen_into(@classes)
     }
 
-    # this method is defined in the template file
-    write_extra_pages if defined? write_extra_pages
-
     template = RDoc::TemplatePage.new @template::ONE_PAGE
 
     if @options.op_name
diff --git a/lib/rdoc/generator/xml/xml.rb b/lib/rdoc/generator/xml/xml.rb
index ffb1329c4e..4b54e7350f 100644
--- a/lib/rdoc/generator/xml/xml.rb
+++ b/lib/rdoc/generator/xml/xml.rb
@@ -17,11 +17,23 @@ module RDoc::Generator::XML::XML
                         href="<%= requires["aref"] %>"
 <% end %>
          />
-<% end # files["requires"] %>
+<% end %><%# files["requires"] %>
       </required-file-list>
 <% end %>
 <% if defined? classes and classes["sections"] then %>
 <% classes["sections"].each do |sections| %>
+<% if sections["constants"] then %>
+      <constant-list>
+<% sections["constants"].each do |constant| %>
+        <constant name="<%= constant["name"] %>">
+<% if constant["value"] then %>
+          <value><%= constant["value"] %></value>
+<% end %>
+          <description><%= constant["a_desc"] %></description>
+        </constant>
+<% end %><%# sections["constants"] %>
+      </constant-list>
+<% end %>
 <% if sections["attributes"] then %>
       <attribute-list>
 <% sections["attributes"].each do |attributes| %>
@@ -31,7 +43,7 @@ module RDoc::Generator::XML::XML
 <% end %>
           <description><%= attributes["a_desc"] %></description>
         </attribute>
-<% end # sections["attributes"] %>
+<% end %><%# sections["attributes"] %>
       </attribute-list>
 <% end %>
 <% if sections["method_list"] then %>
@@ -52,12 +64,12 @@ module RDoc::Generator::XML::XML
           </source-code-listing>
 <% end %>
         </method>
-<% end # method_list["methods"] %>
+<% end %><%# method_list["methods"] %>
 <% end %>
-<% end # sections["method_list"] %>
+<% end %><%# sections["method_list"] %>
       </method-list>
 <% end %>
-<% end # classes["sections"] %>
+<% end %><%# classes["sections"] %>
 <% end %>
 <% if defined? classes and classes["includes"] then %>
       <included-module-list>
@@ -67,7 +79,7 @@ module RDoc::Generator::XML::XML
                          href="<%= includes["aref"] %>"
 <% end %>
         />
-<% end # classes["includes"] %>
+<% end %><%# classes["includes"] %>
       </included-module-list>
 <% end %>
     </contents>
@@ -84,7 +96,7 @@ module RDoc::Generator::XML::XML
     </file-info>
 } + CONTENTS_XML + %{
   </file>
-<% end # values["files"] %>
+<% end %><%# values["files"] %>
 </file-list>
 <class-module-list>
 <% values["classes"].each do |classes| %>
@@ -94,7 +106,7 @@ module RDoc::Generator::XML::XML
       <infiles>
 <% classes["infiles"].each do |infiles|  %>
         <infile><%= href infiles["full_path_url"], infiles["full_path"] %></infile>
-<% end # classes["infiles"] %>
+<% end %><%# classes["infiles"] %>
       </infiles>
 <% end %>
 <% if classes["parent"] then %>
@@ -103,7 +115,7 @@ module RDoc::Generator::XML::XML
     </classmod-info>
 } + CONTENTS_XML + %{
   </<%= classes["classmod"] %>>
-<% end # values["classes"] %>
+<% end %><%# values["classes"] %>
 </class-module-list>
 </rdoc>
 }