mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Allow templates to be specified outside the RDoc tree
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:
parent
6c3676442a
commit
45eeeb1691
3 changed files with 14 additions and 3 deletions
|
@ -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>
|
||||
|
||||
* ruby.1: add -width option to .Bl for old groff.
|
||||
|
|
|
@ -9,8 +9,10 @@ module DRb
|
|||
if defined? @observer_peers
|
||||
for i in @observer_peers.dup
|
||||
begin
|
||||
puts "sending update"
|
||||
i.update(*arg)
|
||||
rescue
|
||||
p $!
|
||||
delete_observer(i)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1110,11 +1110,15 @@ module Generators
|
|||
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
|
||||
template = File.join("rdoc/generators/template",
|
||||
@options.generator.key, @options.template)
|
||||
template = @options.template
|
||||
unless template =~ %r{/|\\}
|
||||
template = File.join("rdoc/generators/template",
|
||||
@options.generator.key, template)
|
||||
end
|
||||
require template
|
||||
extend RDoc::Page
|
||||
rescue LoadError
|
||||
|
|
Loading…
Add table
Reference in a new issue