kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Allow templates to be specified outside the RDoc tree

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
dave 2004-03-24 02:14:18 +00:00
parent 6c3676442a
commit 45eeeb1691
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Mar 24 11:11:26 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
Allow non-RDoc templates by putting a slash in the template name
Mon Mar 22 16:19:57 2004 WATANABE Hirofumi <eban@ruby-lang.org> Mon Mar 22 16:19:57 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* ruby.1: add -width option to .Bl for old groff. * ruby.1: add -width option to .Bl for old groff.

2
lib/drb/observer.rb
View file

@ -9,8 +9,10 @@ module DRb
if defined? @observer_peers if defined? @observer_peers
for i in @observer_peers.dup for i in @observer_peers.dup
begin begin
puts "sending update"
i.update(*arg) i.update(*arg)
rescue rescue
p $!
delete_observer(i) delete_observer(i)
end end
end end

10
lib/rdoc/generators/html_generator.rb
View file

@ -1110,11 +1110,15 @@ module Generators
private private
## ##
# Load up the HTML template specified in the options # Load up the HTML template specified in the options.
# If the template name contains a slash, use it literally
# #
def load_html_template def load_html_template
template = File.join("rdoc/generators/template", template = @options.template
@options.generator.key, @options.template) unless template =~ %r{/|\\}
template = File.join("rdoc/generators/template",
@options.generator.key, template)
end
require template require template
extend RDoc::Page extend RDoc::Page
rescue LoadError rescue LoadError