This commit is related to the patch submitted at http://rubyforge.org/tracker/index.php?func=detail&aid=21182&group_id=627&atid=2474.

Firstly, that patch did not include a fix for the frameless template (not sure
how I missed that one).  This commit does.

Secondly, when that patch was applied, it seemed to create extra spaces
before the comments, which this commit removes.

Author: DesigningPatterns

lib/rdoc/generator/html/frameless.rb

@@ -471,7 +471,7 @@ module RDoc::Generator::HTML::FRAMELESS
           &nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
 <% end %>
           <br />
-<% end # values["infiles"] %>
+<% end %><%# values["infiles"] %>
         </td>
       </tr>
 
@@ -518,7 +518,7 @@ module RDoc::Generator::HTML::FRAMELESS
       <div class="name-list">
 <% values["requires"].each do |requires| %>
         <%= href requires["aref"], requires["name"] %>&nbsp;&nbsp;
-<% end # values["requires"] %>
+<% end %><%# values["requires"] %>
       </div>
     </div>
 <% end %>
@@ -529,7 +529,7 @@ module RDoc::Generator::HTML::FRAMELESS
       <ul>
 <% values["toc"].each do |toc| %>
       <li><a href="#<%= values["href"] %>"><%= values["secname"] %></a></li>
-<% end # values["toc"] %>
+<% end %><%# values["toc"] %>
      </ul>
 <% end %>
    </div>
@@ -541,7 +541,7 @@ module RDoc::Generator::HTML::FRAMELESS
       <div class="name-list">
 <% values["methods"].each do |methods| %>
         <%= href methods["aref"], methods["name"] %>&nbsp;&nbsp;
-<% end # values["methods"] %>
+<% end %><%# values["methods"] %>
       </div>
     </div>
 <% end %>
@@ -557,7 +557,7 @@ module RDoc::Generator::HTML::FRAMELESS
       <div id="includes-list">
 <% values["includes"].each do |includes| %>
         <span class="include-name"><%= href includes["aref"], includes["name"] %></span>
-<% end # values["includes"] %>
+<% end %><%# values["includes"] %>
       </div>
     </div>
 <% end %>
@@ -597,7 +597,7 @@ module RDoc::Generator::HTML::FRAMELESS
           <td class="context-item-desc"><%= constants["desc"] %></td>
 <% end %>
         </tr>
-<% end # values["constants"] %>
+<% end %><%# values["constants"] %>
         </table>
       </div>
     </div>
@@ -621,7 +621,7 @@ module RDoc::Generator::HTML::FRAMELESS
         <td colspan="2" class="context-item-desc"><%= values["desc"] %></td>
       </tr>
 <% end %>
-<% end # values["aliases"] %>
+<% end %><%# values["aliases"] %>
         </table>
       </div>
     </div>
@@ -645,7 +645,7 @@ module RDoc::Generator::HTML::FRAMELESS
 <% end %>
           <td class="context-item-desc"><%= values["a_desc"] %></td>
         </tr>
-<% end # values["attributes"] %>
+<% end %><%# values["attributes"] %>
         </table>
       </div>
     </div>
@@ -700,13 +700,13 @@ module RDoc::Generator::HTML::FRAMELESS
         </div>
       </div>
 
-<% end # method_list["methods"] %>
+<% end %><%# method_list["methods"] %>
 <% end %>
-<% end # sections["method_list"] %>
+<% end %><%# sections["method_list"] %>
 
     </div>
 <% end %>
-<% end # values["sections"] %>
+<% end %><%# values["sections"] %>
   EOF
 
   ##
@@ -761,7 +761,7 @@ module RDoc::Generator::HTML::FRAMELESS
   <div class="index-entries">
 <% values["entries"].each do |entries| %>
     <a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end # values["entries"] %>
+<% end %><%# values["entries"] %>
   </div>
 </div>
 </body>

lib/rdoc/generator/html/hefss.rb

@@ -141,7 +141,7 @@ module RDoc::Generator::HTML::HEFSS
 <div class="name-list">
 <% values["requires"].each do |requires| %>
 <%= href requires["aref"], requires["name"] %>
-<% end %><%#  values["requires"] %>
+<% end %><%# values["requires"] %>
 <% end %>
 </div>
 
@@ -156,10 +156,10 @@ module RDoc::Generator::HTML::HEFSS
 <div class="name-list">
 <% method_list["methods"].each do |methods| %>
 <a href="<%= methods["codeurl"] %>" target="source"><%= methods["name"] %></a>
-<% end %><%#  values["methods"] %>
+<% end %><%# values["methods"] %>
 </div>
 <% end %>
-<% end %><%#  values["method_list"] %>
+<% end %><%# values["method_list"] %>
 <% end %>
 
 <% if sections["attributes"] then %>
@@ -178,10 +178,10 @@ module RDoc::Generator::HTML::HEFSS
        <td class="attr-name"><%= attributes["name"] %></td>
        <td><%= attributes["a_desc"] %></td>
      </tr>
-<% end %><%#  values["attributes"] %>
+<% end %><%# values["attributes"] %>
 </table>
 <% end %>
-<% end %><%#  values["sections"] %>
+<% end %><%# values["sections"] %>
 <% end %>
 
 <% if values["classlist"] then %>
@@ -237,7 +237,7 @@ module RDoc::Generator::HTML::HEFSS
 <% if infiles["cvsurl"] then %>
 &nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
 <% end %>
-<% end %><%#  values["infiles"] %>
+<% end %><%# values["infiles"] %>
       </td>
      </tr>
 <% if values["parent"] then %>
@@ -266,7 +266,7 @@ module RDoc::Generator::HTML::HEFSS
 <div class="name-list">
 <% values["includes"].each do |includes| %>
     <span class="method-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%#  values["includes"] %>
+<% end %><%# values["includes"] %>
 </div>
 <% end %>
 
@@ -293,11 +293,11 @@ module RDoc::Generator::HTML::HEFSS
 <%= method_list["m_desc"] %>
 </div>
 <% end %>
-<% end %><%#  method_list["methods"] %>
+<% end %><%# method_list["methods"] %>
 <% end %>
-<% end %><%#  sections["method_list"] %>
+<% end %><%# sections["method_list"] %>
 <% end %>
-<% end %><%#  values["sections"] %>
+<% end %><%# values["sections"] %>
 <% end %>
   EOF
 
@@ -365,7 +365,7 @@ module RDoc::Generator::HTML::HEFSS
 <div class="banner"><%= values["list_title"] %></div>
 <% values["entries"].each do |entries| %>
 <a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%#  values["entries"] %>
+<% end %><%# values["entries"] %>
 </body></html>
   EOF
 

lib/rdoc/generator/html/html.rb

@@ -361,7 +361,7 @@ module RDoc::Generator::HTML::HTML
         &nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
 <% end %>
         <br />
-<% end %><%#  values["infiles"] %>
+<% end %><%# values["infiles"] %>
             </td>
         </tr>
 
@@ -408,7 +408,7 @@ module RDoc::Generator::HTML::HTML
       <div class="name-list">
 <% values["requires"].each do |requires| %>
         <%= href requires["aref"], requires["name"] %>&nbsp;&nbsp;
-<% end %><%#  values["requires"] %>
+<% end %><%# values["requires"] %>
       </div>
     </div>
 <% end
@@ -445,7 +445,7 @@ module RDoc::Generator::HTML::HTML
       <div id="includes-list">
 <% values["includes"].each do |includes| %>
         <span class="include-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%#  values["includes"] %>
+<% end %><%# values["includes"] %>
       </div>
     </div>
 <% end

lib/rdoc/generator/html/kilmer.rb

@@ -119,7 +119,7 @@ module RDoc::Generator::HTML::KILMER
 <div class="name-list">
 <% values["requires"].each do |requires| %>
 <%= href requires["aref"], requires["name"] %>
-<% end %><%#  values["requires"] %>
+<% end %><%# values["requires"] %>
 <% end %>
 </div>
 
@@ -130,7 +130,7 @@ module RDoc::Generator::HTML::KILMER
 <div class="name-list">
 <% values["methods"].each do |methods| %>
 <%= href methods["aref"], methods["name"] %>,
-<% end %><%#  values["methods"] %>
+<% end %><%# values["methods"] %>
 </div>
 <% end %>
 
@@ -162,7 +162,7 @@ module RDoc::Generator::HTML::KILMER
        <td class="attr-name"><%= attributes["name"] %></td>
        <td><%= attributes["a_desc"] %></td>
      </tr>
-<% end %><%#  sections["attributes"] %>
+<% end %><%# sections["attributes"] %>
 </table>
 <% end %>
 
@@ -175,7 +175,7 @@ module RDoc::Generator::HTML::KILMER
 
   <%= template_include %>  <!-- method descriptions -->
 
-<% end %><%#  values["sections"] %>
+<% end %><%# values["sections"] %>
 
 </body>
 </html>
@@ -221,7 +221,7 @@ module RDoc::Generator::HTML::KILMER
 <% if infiles["cvsurl"] then %>
 &nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
 <% end %>
-<% end %><%#  values["infiles"] %>
+<% end %><%# values["infiles"] %>
       </td>
      </tr>
 <% if values["parent"] then %>
@@ -250,7 +250,7 @@ module RDoc::Generator::HTML::KILMER
 <div class="name-list">
 <% values["includes"].each do |includes| %>
     <span class="method-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%#  values["includes"] %>
+<% end %><%# values["includes"] %>
 </div>
 <% end %>
 
@@ -285,17 +285,17 @@ module RDoc::Generator::HTML::KILMER
 This method is also aliased as
 <% values["aka"].each do |aka| $stderr.puts({ :aka => aka }.inspect) %>
 <a href="<%= values["aref"] %>"><%= values["name"] %></a>
-<% end %><%#  values["aka"] %>
+<% end %><%# values["aka"] %>
 </div>
 <% end %>
 <% if values["sourcecode"] then %>
 <pre class="source">
 <%= values["sourcecode"] %>
 </pre>
 <% end %>
-<% end %><%#  values["methods"] %>
+<% end %><%# values["methods"] %>
 <% end %>
-<% end %><%#  values["method_list"] %>
+<% end %><%# values["method_list"] %>
 <% end %>
   EOF
 
@@ -364,7 +364,7 @@ module RDoc::Generator::HTML::KILMER
 <div class="banner"><%= values["list_title"] %></div>
 <% values["entries"].each do |entries| %>
 <a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%#  values["entries"] %>
+<% end %><%# values["entries"] %>
 </body></html>
   EOF
 

lib/rdoc/generator/html/one_page_html.rb

@@ -17,7 +17,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 <% unless requires["aref"] then %>
 <li><%= requires["name"] %></li>
 <% end %>
-<% end %><%#  files["requires"] %>
+<% end %><%# files["requires"] %>
 </ul>
 <% end %>
 
@@ -31,7 +31,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 <% unless includes["aref"] then %>
 <li><%= includes["name"] %></li>
 <% end %>
-<% end %><%#  classes["includes"] %>
+<% end %><%# classes["includes"] %>
 </ul>
 <% end %>
 
@@ -42,7 +42,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 <table>
 <% sections["attributes"].each do |attributes| %>
 <tr><td><%= attributes["name"] %></td><td><%= attributes["rw"] %></td><td><%= attributes["a_desc"] %></td></tr>
-<% end %><%#  sections["attributes"] %>
+<% end %><%# sections["attributes"] %>
 </table>
 <% end %>
 
@@ -68,11 +68,11 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 <%= methods["sourcecode"] %>
 </pre></blockquote>
 <% end %>
-<% end %><%#  method_list["methods"] %>
+<% end %><%# method_list["methods"] %>
 <% end %>
-<% end %><%#  sections["method_list"] %>
+<% end %><%# sections["method_list"] %>
 <% end %>
-<% end %><%#  classes["sections"] %>
+<% end %><%# classes["sections"] %>
 <% end %>
   EOF
 
@@ -91,7 +91,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
   <tr><td>Modified:</td><td><%= files["dtm_modified"] %></td></tr>
 </table>
 } + CONTENTS_XML + %{
-<% end %><%#  values["files"] %>
+<% end %><%# values["files"] %>
 
 <% if values["classes"] then %>
 <h2>Classes</h2>
@@ -107,11 +107,11 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML
 (in files
 <% classes["infiles"].each do |infiles| %>
 <%= href infiles["full_path_url"], infiles["full_path"] %>
-<% end %><%#  classes["infiles"] %>
+<% end %><%# classes["infiles"] %>
 )
 <% end %>
 } + CONTENTS_XML + %{
-<% end %><%#  values["classes"] %>
+<% end %><%# values["classes"] %>
 <% end %>
 </body>
 </html>