From e2efe8e81dc7e9fce40b024df6a20bbf4b830350 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 28 Dec 2010 22:08:56 +0000
Subject: Import RDoc 3.1

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/generator/darkfish.rb                       |  5 +++++
 lib/rdoc/generator/ri.rb                             |  5 +++++
 lib/rdoc/generator/template/darkfish/classpage.rhtml | 14 ++++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'lib/rdoc/generator')

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index e5a6e57424..57873468e4 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -63,6 +63,11 @@ class RDoc::Generator::Darkfish
 
   VERSION = '2'
 
+  ##
+  # Description of this generator
+
+  DESCRIPTION = 'HTML generator, written by Michael Granger'
+
   ##
   # Initialize a few instance variables before we start
 
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
index fb52997e89..e02805e40f 100644
--- a/lib/rdoc/generator/ri.rb
+++ b/lib/rdoc/generator/ri.rb
@@ -8,6 +8,11 @@ class RDoc::Generator::RI
 
   RDoc::RDoc.add_generator self
 
+  ##
+  # Description of this generator
+
+  DESCRIPTION = 'creates ri data files'
+
   ##
   # Set up a new ri generator
 
diff --git a/lib/rdoc/generator/template/darkfish/classpage.rhtml b/lib/rdoc/generator/template/darkfish/classpage.rhtml
index 72b86ec6a7..7d0cad0eed 100644
--- a/lib/rdoc/generator/template/darkfish/classpage.rhtml
+++ b/lib/rdoc/generator/template/darkfish/classpage.rhtml
@@ -134,7 +134,7 @@
       <% end %>
 
       <div id="classindex-section" class="section project-section">
-        <h3 class="section-header">Class Index
+        <h3 class="section-header">Class/Module Index
           <span class="search-toggle"><img src="<%= rel_prefix %>/images/find.png"
             height="16" width="16" alt="[+]"
             title="show/hide quicksearch" /></span></h3>
@@ -225,16 +225,22 @@
       <div id="<%= method.html_name %>-method" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
         <a name="<%= h method.aref %>"></a>
 
-        <div class="method-heading">
         <% if method.call_seq %>
-          <span class="method-callseq"><%= method.call_seq.strip.gsub(/->/, '&rarr;').gsub( /^\w.+\./m, '') %></span>
+        <% method.call_seq.strip.split("\n").each_with_index do |call_seq, i| %>
+        <div class="method-heading">
+          <span class="method-callseq"><%= call_seq.strip.gsub(/->/, '&rarr;').gsub( /^\w.+\./m, '') %></span>
+          <% if i == 0 %>
           <span class="method-click-advice">click to toggle source</span>
+          <% end %>
+        </div>
+        <% end %>
         <% else %>
+        <div class="method-heading">
           <span class="method-name"><%= h method.name %></span><span
             class="method-args"><%= method.params %></span>
           <span class="method-click-advice">click to toggle source</span>
-        <% end %>
         </div>
+        <% end %>
 
         <div class="method-description">
           <% if method.comment %>
-- 
cgit v1.2.3