summaryrefslogtreecommitdiff
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
commit124a20d3d2f469a7836029eb5bfa083f66683bd0 (patch)
tree37477f2b7012df43e2781b0bc2dd0740202703df
parenta43eeaef7529f979eb17276cd04bd87fabb25968 (diff)
Allow templates to be specified outside the RDoc tree
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/rdoc/generators/html_generator.rb10
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 00b2b13d04..bbba6104d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
+
Wed Mar 24 10:05:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/tempfile.rb (Tempfile::_close): should not clear @tmpname
@@ -91,6 +96,7 @@ Sat Mar 20 21:21:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/extmk.rb: rm -rf $extout, not extout.
+>>>>>>> 1.3082
Sat Mar 20 15:25:36 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index 8db578b934..ca3019f5cc 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