1 files changed, 22 insertions, 23 deletions
diff --git a/lib/rdoc/generators/template/chm/chm.rb b/lib/rdoc/generators/template/chm/chm.rb
index 4a89c26520..1932023416 100644
--- a/lib/rdoc/generators/template/chm/chm.rb
+++ b/lib/rdoc/generators/template/chm/chm.rb
@@ -1,5 +1,4 @@
-module RDoc
-module Page
+module RDoc::Page
 
 require "rdoc/generators/template/html/html"
 
@@ -13,17 +12,17 @@ HPP_FILE = %{
 [OPTIONS]
 Auto Index = Yes
 Compatibility=1.1 or later
-Compiled file=%opname%.chm
+Compiled file=<%= values["opname"] %>.chm
 Contents file=contents.hhc
 Full-text search=Yes
 Index file=index.hhk
 Language=0x409 English(United States)
-Title=%title%
+Title=<%= values["title"] %>
 
 [FILES]
-START:all_html_files
-%html_file_name%
-END:all_html_files
+<% values["all_html_files"].each do |all_html_files| %>
+<%= all_html_files["html_file_name"] %>
+<% end # values["all_html_files"] %>
 }
 
 CONTENTS = %{
@@ -39,28 +38,27 @@ CONTENTS = %{
 	<param name="ImageType" value="Folder">
 </OBJECT>
 <UL>
-START:contents
+<% values["contents"].each do |contents| %>
 	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="%c_name%">
-		<param name="Local" value="%ref%">
+		<param name="Name" value="<%= contents["c_name"] %>">
+		<param name="Local" value="<%= contents["ref"] %>">
 		</OBJECT>
-IF:methods
+<% if contents["methods"] then %>
 <ul>
-START:methods
+<% contents["methods"].each do |methods| %>
 	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="%name%">
-		<param name="Local" value="%aref%">
+		<param name="Name" value="<%= methods["name"] %>">
+		<param name="Local" value="<%= methods["aref"] %>">
 		</OBJECT>
-END:methods
+<% end # contents["methods"] %>
 </ul>
-ENDIF:methods
+<% end %>
         </LI>
-END:contents
+<% end # values["contents"] %>
 </UL>
 </BODY></HTML>
 }
 
-
 CHM_INDEX  = %{
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <HTML>
@@ -74,14 +72,15 @@ CHM_INDEX  = %{
 	<param name="ImageType" value="Folder">
 </OBJECT>
 <UL>
-START:index
+<% values["index"].each do |index| %>
 	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="%name%">
-		<param name="Local" value="%aref%">
+		<param name="Name" value="<%= index["name"] %>">
+		<param name="Local" value="<%= index["aref"] %>">
 		</OBJECT>
-END:index
+<% end # values["index"] %>
 </UL>
 </BODY></HTML>
 }
+
 end
-end
+