diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-21 18:35:14 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-21 18:35:14 +0000 |
commit | cd9e9c6debcf893ea5fa70e42dc1875afaf0066f (patch) | |
tree | 5921615c87529d73ed017b58ee1ce57ef6861cfc /lib/rdoc/generator.rb | |
parent | c62db0676bbb8051dac4f462240962e044db6cd4 (diff) | |
download | ruby-cd9e9c6debcf893ea5fa70e42dc1875afaf0066f.tar.gz |
Update to RDoc 2.1.0 r112
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/generator.rb')
-rw-r--r-- | lib/rdoc/generator.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb index 00a5ad45db..fbc08c4e20 100644 --- a/lib/rdoc/generator.rb +++ b/lib/rdoc/generator.rb @@ -489,7 +489,7 @@ module RDoc::Generator @html_file = html_file @html_class = self - @is_module = context.is_module? + @is_module = context.module? @values = {} context.viewer = self @@ -619,16 +619,16 @@ module RDoc::Generator @values["title"] = "#{@values['classmod']}: #{h_name}" c = @context - c = c.parent while c and !c.diagram - if c && c.diagram + c = c.parent while c and not c.diagram + + if c and c.diagram then @values["diagram"] = diagram_reference(c.diagram) end @values["full_name"] = h_name - parent_class = @context.superclass - - if parent_class + if not @context.module? and @context.superclass then + parent_class = @context.superclass @values["parent"] = CGI.escapeHTML(parent_class) if parent_name |