diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/any_method.rb | 6 | ||||
| -rw-r--r-- | lib/rdoc/generator/template/darkfish/rdoc.css | 9 | ||||
| -rw-r--r-- | lib/rdoc/options.rb | 12 |
4 files changed, 21 insertions, 8 deletions
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 |