From a7df5ace7e13760c9c175a6de3273bffb50346d4 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Apr 2010 03:10:03 +0000
Subject: [PATCH] Update to RDoc 2.5.5

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                                     |  5 +++++
 NEWS                                          |  2 +-
 lib/rdoc.rb                                   |  2 +-
 lib/rdoc/any_method.rb                        |  6 +++---
 lib/rdoc/generator/template/darkfish/rdoc.css |  9 ++++++++-
 lib/rdoc/options.rb                           | 12 +++++++++---
 test/rdoc/test_rdoc_options.rb                |  8 +++++---
 7 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53ece47fa2..d5733fb4e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 21 11:53:47 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 2.5.5.  Fixes bugs in ri, Darkfish and
+	  rdoc option handling.
+
 Wed Apr 21 11:31:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_yylex): abandoned EXPR_VCALL.
diff --git a/NEWS b/NEWS
index a3651a5a98..10a4d9157a 100644
--- a/NEWS
+++ b/NEWS
@@ -211,7 +211,7 @@ with all sufficient information, see the ChangeLog file.
 
 * RDoc
 
-  * Updated to RDoc 2.5.3
+  * Updated to RDoc 2.5.5
 
 * logger
 
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index da4fb72782..600cd92e0f 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -383,7 +383,7 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '2.5.4'
+  VERSION = '2.5.5'
 
   ##
   # Name of the dotfile that contains the description of files to be processed
diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb
index db59403e22..d93e673215 100644
--- a/lib/rdoc/any_method.rb
+++ b/lib/rdoc/any_method.rb
@@ -173,6 +173,7 @@ class RDoc::AnyMethod < RDoc::CodeObject
     @dont_rename_initialize = nil
     @is_alias_for           = nil
     @token_stream           = nil
+    @aliases                = []
 
     @name         = array[1]
     @full_name    = array[2]
@@ -181,7 +182,6 @@ class RDoc::AnyMethod < RDoc::CodeObject
     @comment      = array[5]
     @call_seq     = array[6]
     @block_params = array[7]
-    @aliases      = array[8]
     @params       = array[9]
 
     @parent_name = if @full_name =~ /#/ then
@@ -192,8 +192,8 @@ class RDoc::AnyMethod < RDoc::CodeObject
                      name.join '::'
                    end
 
-    array[8].each do |old_name, new_name, comment|
-      add_alias RDoc::Alias.new(nil, old_name, new_name, comment)
+    array[8].each do |new_name, comment|
+      add_alias RDoc::Alias.new(nil, @name, new_name, comment)
     end
   end
 
diff --git a/lib/rdoc/generator/template/darkfish/rdoc.css b/lib/rdoc/generator/template/darkfish/rdoc.css
index 2af2a1782f..49052f4c8d 100644
--- a/lib/rdoc/generator/template/darkfish/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/rdoc.css
@@ -270,8 +270,12 @@ ul.link-list .type {
 	margin: 1em 0.4em;
 }
 
+#description li p {
+  margin: 0;
+}
+
 #description ul {
-	margin-left: 2em;
+	margin-left: 1.5em;
 }
 #description ul li {
 	line-height: 1.4em;
@@ -401,6 +405,9 @@ ul.link-list .type {
 #documentation .method-description p + p {
 	margin-bottom: 0.5em;
 }
+#documentation .method-description ul {
+  margin-left: 1.5em;
+}
 
 #documentation .attribute-method-heading {
 	background: url(images/tag_green.png) no-repeat left bottom;
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index f67241bc03..45b69186f9 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -350,13 +350,14 @@ Usage: #{opt.program_name} [options] [names...]
     end
 
     argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
+    ignored = []
 
     begin
       opts.parse! argv
     rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
-      if ignore_invalid and not quiet then
-        $stderr.puts e
-        $stderr.puts '(invalid options are ignored)'
+      if ignore_invalid then
+        ignored << e.args.join(' ')
+        retry
       else
         $stderr.puts opts
         $stderr.puts
@@ -365,6 +366,11 @@ Usage: #{opt.program_name} [options] [names...]
       end
     end
 
+    if ignored and not quiet then
+      $stderr.puts "invalid options: #{ignored.join ', '}"
+      $stderr.puts '(invalid options are ignored)'
+    end
+
     @op_dir ||= 'doc'
     @files = argv.dup
 
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
index 00d2b87b8d..a3b1876bf3 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/test_rdoc_options.rb
@@ -14,16 +14,18 @@ class TestRDocOptions < MiniTest::Unit::TestCase
     end
 
     refute_match %r%^Usage: %, err
-    assert_match %r%^invalid option: --bogus%, err
+    assert_match %r%^invalid options: --bogus%, err
   end
 
   def test_parse_ignore_invalid_default
     out, err = capture_io do
-      @options.parse %w[--bogus]
+      @options.parse %w[--bogus --main BLAH]
     end
 
     refute_match %r%^Usage: %, err
-    assert_match %r%^invalid option: --bogus%, err
+    assert_match %r%^invalid options: --bogus%, err
+
+    assert_equal 'BLAH', @options.main_page
   end
 
   def test_parse_ignore_invalid_no