Use ERB instead of custom template language for RDoc.

Remove old_html template.

Convert all templates to ERB.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/rdoc/generators/chm_generator.rb b/lib/rdoc/generators/chm_generator.rb
index b4a5167a5c..c3272c9af3 100644
--- a/lib/rdoc/generators/chm_generator.rb
+++ b/lib/rdoc/generators/chm_generator.rb
@@ -27,8 +27,6 @@ class RDoc::Generators::CHMGenerator < RDoc::Generators::HTMLGenerator
       "\n\nYou can download a copy for free from:\n\n" <<
       "    http://msdn.microsoft.com/library/default.asp?" <<
       "url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp\n\n"
-
-    exit 99
   end
 
   ##
@@ -54,7 +52,7 @@ class RDoc::Generators::CHMGenerator < RDoc::Generators::HTMLGenerator
   # files that go to make up the help.
 
   def create_project_file
-    template = TemplatePage.new(RDoc::Page::HPP_FILE)
+    template = RDoc::TemplatePage.new RDoc::Page::HPP_FILE
     values = { "title" => @options.title, "opname" => @op_name }
     files = []
     @files.each do |f|
@@ -92,13 +90,13 @@ class RDoc::Generators::CHMGenerator < RDoc::Generators::HTMLGenerator
     end
 
     values = { "contents" => contents }
-    template = TemplatePage.new(RDoc::Page::CONTENTS)
+    template = RDoc::TemplatePage.new RDoc::Page::CONTENTS
     File.open("contents.hhc", "w") do |f|
       template.write_html_on(f, values)
     end
 
     values = { "index" => index }
-    template = TemplatePage.new(RDoc::Page::CHM_INDEX)
+    template = RDoc::TemplatePage.new RDoc::Page::CHM_INDEX
     File.open("index.hhk", "w") do |f|
       template.write_html_on(f, values)
     end