summaryrefslogtreecommitdiffstats
path: root/lib/rdoc
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-24 02:14:18 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-24 02:14:18 +0000
commita0b128231b01e2a0474538542979594eefc7f344 (patch)
tree37477f2b7012df43e2781b0bc2dd0740202703df /lib/rdoc
parent7b47124ca1a292c9d072315c5f8fe213ae0c9637 (diff)
downloadruby-a0b128231b01e2a0474538542979594eefc7f344.tar.gz
ruby-a0b128231b01e2a0474538542979594eefc7f344.tar.xz
ruby-a0b128231b01e2a0474538542979594eefc7f344.zip
Allow templates to be specified outside the RDoc tree
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r--lib/rdoc/generators/html_generator.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index 8db578b93..ca3019f5c 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -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