rdoc 2.2.1 → 2.3.0

data/lib/rdoc/generator/html.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 
 require 'rdoc/generator'
 require 'rdoc/markup/to_html'
+require 'rdoc/cache'
 
 ##
 # We're responsible for generating all the HTML files from the object tree
@@ -40,6 +41,8 @@ require 'rdoc/markup/to_html'
 
 class RDoc::Generator::HTML
 
+  RDoc::RDoc.add_generator self
+
   include RDoc::Generator::MarkUp
 
   ##
@@ -79,6 +82,7 @@ class RDoc::Generator::HTML
     @toplevels  = toplevels
     @files      = []
     @classes    = []
+    @template_cache = RDoc::Cache.instance
 
     write_style_sheet
     gen_sub_directories
@@ -89,23 +93,22 @@ class RDoc::Generator::HTML
   private
 
   ##
-  # Load up the HTML template specified in the options.
-  # If the template name contains a slash, use it literally
+  # Load up the HTML template specified in the options.  If the template name
+  # contains a slash, use it literally.
+  #
+  # 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.
 
   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
-      template = File.join('rdoc', 'generator', @options.generator.key,
+      generator_name = @options.generator.name.sub(/^RDoc::Generator::/, '')
+      template = File.join('rdoc', 'generator', generator_name.downcase,
                            template)
     end
 
@@ -115,11 +118,9 @@ class RDoc::Generator::HTML
       @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
@@ -145,7 +146,7 @@ class RDoc::Generator::HTML
 
         if @template.constants.include? :FONTS or
            @template.constants.include? 'FONTS' then
-          values["fonts"] = @template::FONTS
+          values[:fonts] = @template::FONTS
         end
 
         template.write_html_on(f, values)
@@ -166,7 +167,8 @@ class RDoc::Generator::HTML
 
   def build_indices
     @files, @classes = RDoc::Generator::Context.build_indices(@toplevels,
-                                                              @options)
+                                                              @options,
+                                                              @template_cache)
   end
 
   ##
@@ -174,6 +176,9 @@ class RDoc::Generator::HTML
 
   def generate_html
     @main_url = main_url
+    @sorted_files = @files.sort
+    @sorted_classes = @classes.sort
+    @sorted_methods = RDoc::Generator::Method.all_methods.sort
 
     # the individual descriptions for files and classes
     gen_into(@files)
@@ -187,12 +192,13 @@ class RDoc::Generator::HTML
 
     # this method is defined in the template file
     values = {
-      'title_suffix' => CGI.escapeHTML("[#{@options.title}]"),
-      'charset'      => @options.charset,
-      'style_url'    => style_url('', @options.css),
+      :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)
+    @template.write_extra_pages(values) if
+      @template.respond_to?(:write_extra_pages)
   end
 
   def gen_into(list)
@@ -213,16 +219,23 @@ class RDoc::Generator::HTML
     method_list = {}
     prev_op_dir = nil
 
-    list.each do |item|
+    # Extra optimization: sort the list based on item directories, to minimize
+    # the number of times the directory changes. This reduces runtime by about
+    # 8% on RDoc's own sources.
+    sorted_list = list.sort do |a, b|
+      File.dirname(a.path) <=> File.dirname(b.path)
+    end
+
+    sorted_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
+        file_list = index_to_links op_file, @sorted_files
+        class_list = index_to_links op_file, @sorted_classes
+        method_list = index_to_links op_file, @sorted_methods
       end
       prev_op_dir = op_dir
 
@@ -253,17 +266,17 @@ class RDoc::Generator::HTML
     res = []
     collection.sort.each do |f|
       if f.document_self
-        res << { "href" => f.path, "name" => f.index_name }
+        res << { :href => f.path, :name => f.index_name }
       end
     end
 
     values = {
-      "entries"    => res,
-      'title'      => CGI.escapeHTML("#{title} [#{@options.title}]"),
-      'list_title' => CGI.escapeHTML(title),
-      'index_url'  => @main_url,
-      'charset'    => @options.charset,
-      'style_url'  => style_url('', @options.css),
+      :entries    => res,
+      :title      => CGI.escapeHTML("#{title} [#{@options.title}]"),
+      :list_title => CGI.escapeHTML(title),
+      :index_url  => @main_url,
+      :charset    => @options.charset,
+      :style_url  => style_url('', @options.css),
     }
 
     open filename, 'w' do |f|
@@ -305,30 +318,32 @@ class RDoc::Generator::HTML
 
       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,
+          :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
+
+        values[:inline_source] = @options.inline_source
 
         main.write_html_on f, values
       end
     end
   end
 
-  def index_to_links(output_path, collection)
-    collection.sort.map do |f|
+  def index_to_links(output_path, sorted_collection)
+    result = sorted_collection.map do |f|
       next unless f.document_self
-      { "href" => RDoc::Markup::ToHtml.gen_relative_url(output_path, f.path),
-        "name" => f.index_name }
-    end.compact
+      { :href => RDoc::Markup::ToHtml.gen_relative_url(output_path, f.path),
+        :name => f.index_name }
+    end
+    result.compact!
+    result
   end
 
   ##
@@ -356,9 +371,7 @@ class RDoc::Generator::HTML
     # No main page has been specified, so just use the README.
     #
     @files.each do |file|
-      if file.name =~ /^README/ then
-        return file.path
-      end
+      return file.path if file.name =~ /^README/
     end
 
     #
@@ -366,9 +379,7 @@ class RDoc::Generator::HTML
     # that will be documented.
     #
     @files.each do |file|
-      if file.document_self then
-        return file.path
-      end
+      return file.path if file.document_self
     end
 
     #
@@ -419,19 +430,19 @@ class RDoc::Generator::HTMLInOne < RDoc::Generator::HTML
 
   def generate_xml
     values = {
-      'charset' => @options.charset,
-      'files'   => gen_into(@files),
-      'classes' => gen_into(@classes),
-      'title'   => CGI.escapeHTML(@options.title),
+      :charset => @options.charset,
+      :files   => gen_into(@files),
+      :classes => gen_into(@classes),
+      :title   => CGI.escapeHTML(@options.title),
     }
 
     template = RDoc::TemplatePage.new @template::ONE_PAGE
 
-    if @options.op_name
-      opfile = open @options.op_name, 'w'
-    else
-      opfile = $stdout
-    end
+    opfile = if @options.op_name then
+               open @options.op_name, 'w'
+             else
+               $stdout
+             end
     template.write_html_on(opfile, values)
   end
 

data/lib/rdoc/generator/html/html.rb

@@ -338,10 +338,10 @@ EOF
 
   HEADER = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
 <head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+  <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" />
+  <link rel="stylesheet" href="<%= values[:style_url] %>" type="text/css" media="screen" />
   <script type="text/javascript">
   // <![CDATA[
 
@@ -398,19 +398,19 @@ EOF
 
   FILE_PAGE = <<-EOF
   <div id="fileHeader">
-    <h1><%= values["short_name"] %></h1>
+    <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>)
+      <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>
+      <td><%= values[:dtm_modified] %></td>
     </tr>
     </table>
   </div>
@@ -424,37 +424,37 @@ 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>
+          <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"] %>">
+<% 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 %>
+                <%= 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>)
+<% if infiles[:cvsurl] then %>
+        &nbsp;(<a href="<%= infiles[:cvsurl] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
 <% end %>
         <br />
-<% end %><%# values["infiles"] %>
+<% end %><%# values[:infiles] %>
             </td>
         </tr>
 
-<% if values["parent"] then %>
+<% 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"] %>">
+<% if values[:par_url] then %>
+                <a href="<%= values[:par_url] %>">
 <% end %>
-                <%= values["parent"] %>
-<% if values["par_url"] then %>
+                <%= values[:parent] %>
+<% if values[:par_url] then %>
                </a>
 <% end %>
             </td>
@@ -470,211 +470,211 @@ EOF
 
   METHOD_LIST = <<-EOF
   <div id="contextContent">
-<% if values["diagram"] then %>
+<% if values[:diagram] then %>
     <div id="diagram">
-      <%= values["diagram"] %>
+      <%= values[:diagram] %>
     </div>
 <% end
 
-   if values["description"] then %>
+   if values[:description] then %>
     <div id="description">
-      <%= values["description"] %>
+      <%= values[:description] %>
     </div>
 <% end
 
-   if values["requires"] then %>
+   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"] %>
+<% values[:requires].each do |requires| %>
+        <%= href requires[:aref], requires[:name] %>&nbsp;&nbsp;
+<% end %><%# values[:requires] %>
       </div>
     </div>
 <% end
 
-   if values["toc"] then %>
+   if values[:toc] then %>
     <div id="contents-list">
       <h3 class="section-bar">Contents</h3>
       <ul>
-<% values["toc"].each do |toc| %>
-      <li><a href="#<%= toc["href"] %>"><%= toc["secname"] %></a></li>
-<% end %><%# values["toc"] %>
+<% values[:toc].each do |toc| %>
+      <li><a href="#<%= toc[:href] %>"><%= toc[:secname] %></a></li>
+<% end %><%# values[:toc] %>
      </ul>
 <% end %>
    </div>
 
-<% if values["methods"] then %>
+<% if values[:methods] then %>
     <div id="method-list">
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-<%   values["methods"].each do |methods| %>
-        <%= href methods["aref"], methods["name"] %>&nbsp;&nbsp;
-<%   end %><%# values["methods"] %>
+<%   values[:methods].each do |methods| %>
+        <%= href methods[:aref], methods[:name] %>&nbsp;&nbsp;
+<%   end %><%# values[:methods] %>
       </div>
     </div>
 <% end %>
   </div>
 
     <!-- if includes -->
-<% if values["includes"] then %>
+<% 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"] %>
+<% 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| %>
+   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 %>
+<%   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"] %>
+        <%= sections[:seccomment] %>
       </div>
 <%     end
      end
 
-     if sections["classlist"] then %>
+     if sections[:classlist] then %>
     <div id="class-list">
       <h3 class="section-bar">Classes and Modules</h3>
 
-      <%= sections["classlist"] %>
+      <%= sections[:classlist] %>
     </div>
 <%   end
 
-     if sections["constants"] then %>
+     if sections[:constants] then %>
     <div id="constants-list">
       <h3 class="section-bar">Constants</h3>
 
       <div class="name-list">
         <table summary="Constants">
-<%     sections["constants"].each do |constants| %>
+<%     sections[:constants].each do |constants| %>
         <tr class="top-aligned-row context-row">
-          <td class="context-item-name"><%= constants["name"] %></td>
+          <td class="context-item-name"><%= constants[:name] %></td>
           <td>=</td>
-          <td class="context-item-value"><%= constants["value"] %></td>
-<%       if constants["desc"] then %>
+          <td class="context-item-value"><%= constants[:value] %></td>
+<%       if constants[:desc] then %>
           <td>&nbsp;</td>
-          <td class="context-item-desc"><%= constants["desc"] %></td>
+          <td class="context-item-desc"><%= constants[:desc] %></td>
 <%       end %>
         </tr>
-<%     end %><%# sections["constants"] %>
+<%     end %><%# sections[:constants] %>
         </table>
       </div>
     </div>
 <%   end
 
-     if sections["aliases"] then %>
+     if sections[:aliases] then %>
     <div id="aliases-list">
       <h3 class="section-bar">External Aliases</h3>
 
       <div class="name-list">
       <table summary="aliases">
-<%     sections["aliases"].each do |aliases| %>
+<%     sections[:aliases].each do |aliases| %>
         <tr class="top-aligned-row context-row">
-          <td class="context-item-name"><%= aliases["old_name"] %></td>
+          <td class="context-item-name"><%= aliases[:old_name] %></td>
           <td>-&gt;</td>
-          <td class="context-item-value"><%= aliases["new_name"] %></td>
+          <td class="context-item-value"><%= aliases[:new_name] %></td>
         </tr>
-<%       if aliases["desc"] then %>
+<%       if aliases[:desc] then %>
       <tr class="top-aligned-row context-row">
         <td>&nbsp;</td>
-        <td colspan="2" class="context-item-desc"><%= aliases["desc"] %></td>
+        <td colspan="2" class="context-item-desc"><%= aliases[:desc] %></td>
       </tr>
 <%       end
-       end %><%# sections["aliases"] %>
+       end %><%# sections[:aliases] %>
         </table>
       </div>
     </div>
 <%   end %>
 
-<%   if sections["attributes"] then %>
+<%   if sections[:attributes] then %>
     <div id="attribute-list">
       <h3 class="section-bar">Attributes</h3>
 
       <div class="name-list">
         <table>
-<%     sections["attributes"].each do |attribute| %>
+<%     sections[:attributes].each do |attribute| %>
         <tr class="top-aligned-row context-row">
-          <td class="context-item-name"><%= attribute["name"] %></td>
-<%       if attribute["rw"] then %>
-          <td class="context-item-value">&nbsp;[<%= attribute["rw"] %>]&nbsp;</td>
+          <td class="context-item-name"><%= attribute[:name] %></td>
+<%       if attribute[:rw] then %>
+          <td class="context-item-value">&nbsp;[<%= attribute[:rw] %>]&nbsp;</td>
 <%       end
-         unless attribute["rw"] then %>
+         unless attribute[:rw] then %>
           <td class="context-item-value">&nbsp;&nbsp;</td>
 <%       end %>
-          <td class="context-item-desc"><%= attribute["a_desc"] %></td>
+          <td class="context-item-desc"><%= attribute[:a_desc] %></td>
         </tr>
-<%     end %><%# sections["attributes"] %>
+<%     end %><%# sections[:attributes] %>
         </table>
       </div>
     </div>
 <%   end %>
 
     <!-- if method_list -->
-<%   if sections["method_list"] then %>
+<%   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>
+<%     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>
+<%         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;">
+<%           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">
+             if methods[:sourcecode] then %>
+          <a href="#<%= methods[:aref] %>" class="method-signature">
 <%           end
-             if methods["callseq"] then %>
-          <span class="method-name"><%= methods["callseq"] %></span>
+             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>
+             unless methods[:callseq] then %>
+          <span class="method-name"><%= methods[:name] %></span><span class="method-args"><%= methods[:params] %></span>
 <%           end
-             if methods["codeurl"] then %>
+             if methods[:codeurl] then %>
           </a>
 <%           end
-             if methods["sourcecode"] then %>
+             if methods[:sourcecode] then %>
           </a>
 <%           end %>
         </div>
 
         <div class="method-description">
-<%           if methods["m_desc"] then %>
-          <%= methods["m_desc"] %>
+<%           if methods[:m_desc] then %>
+          <%= methods[:m_desc] %>
 <%           end
-               if methods["sourcecode"] then %>
+               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">
+            onclick="toggleCode('<%= methods[:aref] %>-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="<%= methods[:aref] %>-source">
 <pre>
-<%= methods["sourcecode"] %>
+<%= methods[:sourcecode] %>
 </pre>
           </div>
 <%           end %>
         </div>
       </div>
 
-<%         end %><%# method_list["methods"] %><%
+<%         end %><%# method_list[:methods] %><%
          end
-       end %><%# sections["method_list"] %>
+       end %><%# sections[:method_list] %>
 
     </div>
 <%   end %>
-<% end %><%# values["sections"] %>
+<% end %><%# values[:sections] %>
   EOF
 
 #####################################################################
@@ -699,12 +699,12 @@ EOF
 
   SRC_PAGE = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
 <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" />
+  <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>
+  <pre><%= values[:code] %></pre>
 </body>
 </html>
   EOF
@@ -719,22 +719,22 @@ EOF
   FILE_INDEX = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
 <!--
 
-    <%= values["title"] %>
+    <%= values[:title] %>
 
   -->
 <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" />
+  <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 class="index">
-  <h1 class="section-bar"><%= values["list_title"] %></h1>
+  <h1 class="section-bar"><%= values[:list_title] %></h1>
   <div id="index-entries">
-<% values["entries"].each do |entries| %>
-    <a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%#  values["entries"] %>
+<% values[:entries].each do |entries| %>
+    <a href="<%= entries[:href] %>"><%= entries[:name] %></a><br />
+<% end %><%#  values[:entries] %>
   </div>
 </div>
 </body>
@@ -747,12 +747,12 @@ EOF
   INDEX = XHTML_FRAME_PREAMBLE + HTML_ELEMENT + <<-EOF
 <!--
 
-    <%= values["title"] %>
+    <%= values[:title] %>
 
   -->
 <head>
-  <title><%= values["title"] %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
+  <title><%= values[:title] %></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=<%= values[:charset] %>" />
 </head>
 <frameset rows="20%, 80%">
     <frameset cols="25%,35%,45%">
@@ -760,7 +760,7 @@ EOF
         <frame src="fr_class_index.html"  name="Classes" />
         <frame src="fr_method_index.html" name="Methods" />
     </frameset>
-    <frame src="<%= values["initial_page"] %>" name="docwin" />
+    <frame src="<%= values[:initial_page] %>" name="docwin" />
 </frameset>
 </html>
   EOF