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/trunk@6008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
dave 2004-03-24 02:14:18 +00:00
parent a43eeaef75
commit 124a20d3d2
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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
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

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

@ -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