From fd25f74d64c69d636764ea11aa5a809b85e58f69 Mon Sep 17 00:00:00 2001 From: drbrain Date: Fri, 18 Jul 2008 00:46:16 +0000 Subject: Import RDoc r101. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/generator/html/frameless.rb | 795 +++++++++++++++++++++++++++++++ lib/rdoc/generator/html/hefss.rb | 22 +- lib/rdoc/generator/html/html.rb | 168 ++++--- lib/rdoc/generator/html/kilmer.rb | 20 +- lib/rdoc/generator/html/one_page_html.rb | 18 +- 5 files changed, 906 insertions(+), 117 deletions(-) create mode 100644 lib/rdoc/generator/html/frameless.rb (limited to 'lib/rdoc/generator/html') diff --git a/lib/rdoc/generator/html/frameless.rb b/lib/rdoc/generator/html/frameless.rb new file mode 100644 index 0000000000..2af890ce04 --- /dev/null +++ b/lib/rdoc/generator/html/frameless.rb @@ -0,0 +1,795 @@ +require 'rdoc/generator/html' +require 'rdoc/generator/html/one_page_html' + +## +# = CSS2 RDoc HTML template +# +# This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a +# bit more of the appearance of the output to cascading stylesheets than the +# default. It was designed for clean inline code display, and uses DHTMl to +# toggle the visbility of each method's source with each click on the '[source]' +# link. +# +# == Authors +# +# * Michael Granger +# +# Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved. +# +# This work is licensed under the Creative Commons Attribution License. To view +# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or +# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California +# 94305, USA. + +module RDoc::Generator::HTML::FRAMELESS + + FRAMELESS = true + + FONTS = "Verdana,Arial,Helvetica,sans-serif" + + STYLE = <<-EOF +body { + font-family: #{FONTS}; + font-size: 90%; + margin: 0; + margin-left: 40px; + padding: 0; + background: white; +} + +h1, h2, h3, h4 { + margin: 0; + color: #efefef; + background: transparent; +} + +h1 { + font-size: 150%; +} + +h2,h3,h4 { + margin-top: 1em; +} + +:link, :visited { + background: #eef; + color: #039; + text-decoration: none; +} + +:link:hover, :visited:hover { + background: #039; + color: #eef; +} + +/* Override the base stylesheet's Anchor inside a table cell */ +td > :link, td > :visited { + background: transparent; + color: #039; + text-decoration: none; +} + +/* and inside a section title */ +.section-title > :link, .section-title > :visited { + background: transparent; + color: #eee; + text-decoration: none; +} + +/* === Structural elements =================================== */ + +.index { + margin: 0; + margin-left: -40px; + padding: 0; + font-size: 90%; +} + +.index :link, .index :visited { + margin-left: 0.7em; +} + +.index .section-bar { + margin-left: 0px; + padding-left: 0.7em; + background: #ccc; + font-size: small; +} + +#classHeader, #fileHeader { + width: auto; + color: white; + padding: 0.5em 1.5em 0.5em 1.5em; + margin: 0; + margin-left: -40px; + border-bottom: 3px solid #006; +} + +#classHeader :link, #fileHeader :link, +#classHeader :visited, #fileHeader :visited { + background: inherit; + color: white; +} + +#classHeader td, #fileHeader td { + background: inherit; + color: white; +} + +#fileHeader { + background: #057; +} + +#classHeader { + background: #048; +} + +.class-name-in-header { + font-size: 180%; + font-weight: bold; +} + +#bodyContent { + padding: 0 1.5em 0 1.5em; +} + +#description { + padding: 0.5em 1.5em; + background: #efefef; + border: 1px dotted #999; +} + +#description h1, #description h2, #description h3, +#description h4, #description h5, #description h6 { + color: #125; + background: transparent; +} + +#copyright { + color: #333; + background: #efefef; + font: 0.75em sans-serif; + margin-top: 5em; + margin-bottom: 0; + padding: 0.5em 2em; +} + +/* === Classes =================================== */ + +table.header-table { + color: white; + font-size: small; +} + +.type-note { + font-size: small; + color: #dedede; +} + +.xxsection-bar { + background: #eee; + color: #333; + padding: 3px; +} + +.section-bar { + color: #333; + border-bottom: 1px solid #999; + margin-left: -20px; +} + +.section-title { + background: #79a; + color: #eee; + padding: 3px; + margin-top: 2em; + margin-left: -30px; + border: 1px solid #999; +} + +.top-aligned-row { + vertical-align: top +} + +.bottom-aligned-row { + vertical-align: bottom +} + +/* --- Context section classes ----------------------- */ + +.context-row { } + +.context-item-name { + font-family: monospace; + font-weight: bold; + color: black; +} + +.context-item-value { + font-size: small; + color: #448; +} + +.context-item-desc { + color: #333; + padding-left: 2em; +} + +/* --- Method classes -------------------------- */ + +.method-detail { + background: #efefef; + padding: 0; + margin-top: 0.5em; + margin-bottom: 1em; + border: 1px dotted #ccc; +} + +.method-heading { + color: black; + background: #ccc; + border-bottom: 1px solid #666; + padding: 0.2em 0.5em 0 0.5em; +} + +.method-signature { + color: black; + background: inherit; +} + +.method-name { + font-weight: bold; +} + +.method-args { + font-style: italic; +} + +.method-description { + padding: 0 0.5em 0 0.5em; +} + +/* --- Source code sections -------------------- */ + +:link.source-toggle, :visited.source-toggle { + font-size: 90%; +} + +div.method-source-code { + background: #262626; + color: #ffdead; + margin: 1em; + padding: 0.5em; + border: 1px dashed #999; + overflow: hidden; +} + +div.method-source-code pre { + color: #ffdead; + overflow: hidden; +} + +/* --- Ruby keyword styles --------------------- */ + +.standalone-code { + background: #221111; + color: #ffdead; + overflow: hidden; +} + +.ruby-constant { + color: #7fffd4; + background: transparent; +} + +.ruby-keyword { + color: #00ffff; + background: transparent; +} + +.ruby-ivar { + color: #eedd82; + background: transparent; +} + +.ruby-operator { + color: #00ffee; + background: transparent; +} + +.ruby-identifier { + color: #ffdead; + background: transparent; +} + +.ruby-node { + color: #ffa07a; + background: transparent; +} + +.ruby-comment { + color: #b22222; + font-weight: bold; + background: transparent; +} + +.ruby-regexp { + color: #ffa07a; + background: transparent; +} + +.ruby-value { + color: #7fffd4; + background: transparent; +} + +EOF + + ## + # Header template + + XHTML_PREAMBLE = <<-EOF +"?> + + EOF + + HEADER = XHTML_PREAMBLE + <<-EOF + +<%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /><%= values["title"] %><%= values["list_title"] %><%= values["title"] %>" /><%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /> + <%= values["title"] %> + " /> + + " type="text/css" media="screen" /> + + + + +EOF + + ## + # Context content template + + CONTEXT_CONTENT = %{ +} + + ## + # Footer template + + FOOTER = <<-EOF +
+ + + + + + EOF + + ## + # File page header template + + FILE_PAGE = <<-EOF +
+

<%= values["short_name"] %>

+ + + + + + + + + + + +
Path:<%= values["full_path"] %> +<% if values["cvsurl"] then %> +  (">CVS) +<% end %> +
Last Update:<%= values["dtm_modified"] %>
+
+ EOF + + ## + # Class page header template + + CLASS_PAGE = <<-EOF +
+ + + + + + + + + + + +<% if values["parent"] then %> + + + + +<% end %> +
<%= values["classmod"] %><%= values["full_name"] %>
In: +<% values["infiles"].each do |infiles| %> +<% if infiles["full_path_url"] then %> + "> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + +<% end %> +<% if infiles["cvsurl"] then %> +  (">CVS) +<% end %> +
+<% end %><%# values["infiles"] %> +
Parent: +<% if values["par_url"] then %> + "> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + +<% end %> +
+
+ EOF + + ## + # Method list template + + METHOD_LIST = <<-EOF + +
+<% if values["diagram"] then %> +
+ <%= values["diagram"] %> +
+<% end %> + +<% if values["description"] then %> +
+ <%= values["description"] %> +
+<% end %> + +<% if values["requires"] then %> +
+

Required files

+ +
+<% values["requires"].each do |requires| %> + <%= href requires["aref"], requires["name"] %>   +<% end %><%# values["requires"] %> +
+
+<% end %> + +<% if values["toc"] then %> +
+

Contents

+ +<% end %> +
+ +<% if values["methods"] then %> +
+

Methods

+ +
+<% values["methods"].each do |methods| %> + <%= href methods["aref"], methods["name"] %>   +<% end %><%# values["methods"] %> +
+
+<% end %> + +
+ + + +<% if values["includes"] then %> +
+

Included Modules

+ +
+<% values["includes"].each do |includes| %> + <%= href includes["aref"], includes["name"] %> +<% end %><%# values["includes"] %> +
+
+<% end %> + +<% values["sections"].each do |sections| %> +
+<% if sections["sectitle"] then %> +

"><%= sections["sectitle"] %>

+<% if sections["seccomment"] then %> +
+ <%= sections["seccomment"] %> +
+<% end %> +<% end %> + +<% if values["classlist"] then %> +
+

Classes and Modules

+ + <%= values["classlist"] %> +
+<% end %> + +<% if values["constants"] then %> +
+

Constants

+ +
+ +<% values["constants"].each do |constants| %> + + + + +<% if values["desc"] then %> + + +<% end %> + +<% end %><%# values["constants"] %> +
<%= constants["name"] %>=<%= constants["value"] %> <%= constants["desc"] %>
+
+
+<% end %> + +<% if values["aliases"] then %> +
+

External Aliases

+ +
+ +<% values["aliases"].each do |aliases| $stderr.puts({ :aliases => aliases }.inspect) %> + + + + + +<% if values["desc"] then %> + + + + +<% end %> +<% end %><%# values["aliases"] %> +
<%= values["old_name"] %>-><%= values["new_name"] %>
 <%= values["desc"] %>
+
+
+<% end %> + + +<% if values["attributes"] then %> +
+

Attributes

+ +
+ +<% values["attributes"].each do |attributes| $stderr.puts({ :attributes => attributes }.inspect) %> + + +<% if values["rw"] then %> + +<% end %> +<% unless values["rw"] then %> + +<% end %> + + +<% end %><%# values["attributes"] %> +
<%= values["name"] %> [<%= values["rw"] %>]   <%= values["a_desc"] %>
+
+
+<% end %> + + +<% if sections["method_list"] then %> +
+<% sections["method_list"].each do |method_list| %> +<% if method_list["methods"] then %> +

<%= method_list["type"] %> <%= method_list["category"] %> methods

+ +<% method_list["methods"].each do |methods| %> +
" class="method-detail"> + "> + +
+<% if methods["codeurl"] then %> + " target="Code" class="method-signature" + onclick="popupCode('<%= methods["codeurl"] %>');return false;"> +<% end %> +<% if methods["sourcecode"] then %> + " class="method-signature"> +<% end %> +<% if methods["callseq"] then %> + <%= methods["callseq"] %> +<% end %> +<% unless methods["callseq"] then %> + <%= methods["name"] %><%= methods["params"] %> +<% end %> +<% if methods["codeurl"] then %> + +<% end %> +<% if methods["sourcecode"] then %> + +<% end %> +
+ +
+<% if methods["m_desc"] then %> + <%= methods["m_desc"] %> +<% end %> +<% if methods["sourcecode"] then %> +

-source');return false;">[Source]

+
-source"> +
+<%= methods["sourcecode"] %>
+
+
+<% end %> +
+
+ +<% end %><%# method_list["methods"] %> +<% end %> +<% end %><%# sections["method_list"] %> + +
+<% end %> +<% end %><%# values["sections"] %> + EOF + + ## + # Body template + + BODY = HEADER + %{ + +<%= template_include %> + +
+ +} + METHOD_LIST + %{ + +
+ +} + FOOTER + + ## + # Source code template + + SRC_PAGE = XHTML_PREAMBLE + <<-EOF + +<%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /><%= values["title"] %><%= values["list_title"] %><%= values["title"] %>" /><%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /> + <%= values["title"] %> + " /> + " type="text/css" media="screen" /> + + + 
<%= values["code"] %>
+ + + EOF + + ## + # Index file templates + + FR_INDEX_BODY = %{ +<%= template_include %> +} + + FILE_INDEX = XHTML_PREAMBLE + <<-EOF + +<%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /><%= values["title"] %><%= values["list_title"] %><%= values["title"] %>" /><%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /> + <%= values["list_title"] %> + " /> + " type="text/css" /> + + + +
+

<%= values["list_title"] %>

+
+<% values["entries"].each do |entries| %> + "><%= entries["name"] %>
+<% end %><%# values["entries"] %> +
+
+ + + EOF + + CLASS_INDEX = FILE_INDEX + METHOD_INDEX = FILE_INDEX + + INDEX = <<-EOF +"?> + + +<%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /><%= values["title"] %><%= values["list_title"] %><%= values["title"] %>" /><%= klass["name"] %>"><%= file["name"] %>"><%= file["name"] %><%= values["short_name"] %>">CVS"> +<% end %> + <%= infiles["full_path"] %> +<% if infiles["full_path_url"] then %> + ">CVS"> +<% end %> + <%= values["parent"] %> +<% if values["par_url"] then %> + Required filesContents"><%= values["secname"] %>MethodsIncluded Modules<%= href includes["aref"], includes["name"] %>">"><<%= sections["sectitle"] %>%= sections["sectitle"] %>Classes and ModulesConstantsExternal AliasesAttributes<%= method_list["type"] %> <%= method_list["category"] %> methods">" target="Code" class="method-signature" +..." /> + <%= values["title"] %> + " /> + + + + + + + " name="docwin" /> + + + EOF + +end + diff --git a/lib/rdoc/generator/html/hefss.rb b/lib/rdoc/generator/html/hefss.rb index 294d5b62f6..e186a40384 100644 --- a/lib/rdoc/generator/html/hefss.rb +++ b/lib/rdoc/generator/html/hefss.rb @@ -141,7 +141,7 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif;
<% values["requires"].each do |requires| %> <%= href requires["aref"], requires["name"] %> -<% end # values["requires"] %> +<% end %><%# values["requires"] %> <% end %>
@@ -156,10 +156,10 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif;
<% method_list["methods"].each do |methods| %> " target="source"><%= methods["name"] %> -<% end # values["methods"] %> +<% end %><%# values["methods"] %>
<% end %> -<% end # values["method_list"] %> +<% end %><%# values["method_list"] %> <% end %> <% if sections["attributes"] then %> @@ -178,10 +178,10 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; <%= attributes["name"] %> <%= attributes["a_desc"] %> -<% end # values["attributes"] %> +<% end %><%# values["attributes"] %> <% end %> -<% end # values["sections"] %> +<% end %><%# values["sections"] %> <% end %> <% if values["classlist"] then %> @@ -237,7 +237,7 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; <% if infiles["cvsurl"] then %>  (">CVS) <% end %> -<% end # values["infiles"] %> +<% end %><%# values["infiles"] %> <% if values["parent"] then %> @@ -266,7 +266,7 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif;
<% values["includes"].each do |includes| %> <%= href includes["aref"], includes["name"] %> -<% end # values["includes"] %> +<% end %><%# values["includes"] %>
<% end %> @@ -293,11 +293,11 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; <%= method_list["m_desc"] %>
<% 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 @@ div.banner { <% values["entries"].each do |entries| %> "><%= entries["name"] %>
-<% end # values["entries"] %> +<% end %><%# values["entries"] %> EOF diff --git a/lib/rdoc/generator/html/html.rb b/lib/rdoc/generator/html/html.rb index 63c83ee5fd..1ab90c6264 100644 --- a/lib/rdoc/generator/html/html.rb +++ b/lib/rdoc/generator/html/html.rb @@ -7,8 +7,8 @@ require 'rdoc/generator/html/one_page_html' # This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a # bit more of the appearance of the output to cascading stylesheets than the # default. It was designed for clean inline code display, and uses DHTMl to -# toggle the visibility of each method's source with each click on the '[source]' -# link. +# toggle the visibility of each method's source with each click on the +# '[source]' link. # # == Authors # @@ -16,10 +16,10 @@ require 'rdoc/generator/html/one_page_html' # # Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved. # -# This work is licensed under the Creative Commons Attribution License. To view -# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or -# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California -# 94305, USA. +# This work is licensed under the Creative Commons Attribution License. To +# view a copy of this license, visit +# http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative +# Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. module RDoc::Generator::HTML::HTML @@ -361,7 +361,7 @@ EOF  (">CVS) <% end %>
-<% end # values["infiles"] %> +<% end %><%# values["infiles"] %> @@ -388,39 +388,38 @@ EOF ##################################################################### METHOD_LIST = <<-EOF -
<% if values["diagram"] then %>
<%= values["diagram"] %>
-<% end %> +<% end -<% if values["description"] then %> + if values["description"] then %>
<%= values["description"] %>
-<% end %> +<% end -<% if values["requires"] then %> + if values["requires"] then %>

Required files

<% values["requires"].each do |requires| %> <%= href requires["aref"], requires["name"] %>   -<% end # values["requires"] %> +<% end %><%# values["requires"] %>
-<% end %> +<% end -<% if values["toc"] then %> + if values["toc"] then %>

Contents

<% end %>
@@ -430,16 +429,14 @@ EOF

Methods

-<% values["methods"].each do |methods| %> +<% values["methods"].each do |methods| %> <%= href methods["aref"], methods["name"] %>   -<% end # values["methods"] %> +<% end %><%# values["methods"] %>
<% end %> -
- <% if values["includes"] then %>
@@ -448,140 +445,137 @@ EOF
<% values["includes"].each do |includes| %> <%= href includes["aref"], includes["name"] %> -<% end # values["includes"] %> +<% end %><%# values["includes"] %>
-<% end %> +<% end -<% values["sections"].each do |sections| %> + values["sections"].each do |sections| %>
-<% if sections["sectitle"] then %> +<% if sections["sectitle"] then %>

"><%= sections["sectitle"] %>

-<% if sections["seccomment"] then %> +<% if sections["seccomment"] then %>
<%= sections["seccomment"] %>
-<% end %> -<% end %> +<% end + end -<% if values["classlist"] then %> + if sections["classlist"] then %>

Classes and Modules

- <%= values["classlist"] %> + <%= sections["classlist"] %>
-<% end %> +<% end -<% if values["constants"] then %> + if sections["constants"] then %>

Constants

-<% values["constants"].each do |constants| %> +<% sections["constants"].each do |constants| %> -<% if values["desc"] then %> +<% if sections["desc"] then %> -<% end %> +<% end %> -<% end # values["constants"] %> +<% end %><%# sections["constants"] %>
<%= constants["name"] %> = <%= constants["value"] %>  <%= constants["desc"] %>
-<% end %> +<% end -<% if values["aliases"] then %> + if sections["aliases"] then %>

External Aliases

- -<% values["aliases"].each do |aliases| $stderr.puts({ :aliases => aliases }.inspect) %> +
+<% sections["aliases"].each do |aliases| %> - + - + -<% if values["desc"] then %> +<% if aliases["desc"] then %> - + -<% end %> -<% end # values["aliases"] %> +<% end + end %><%# sections["aliases"] %>
<%= values["old_name"] %><%= aliases["old_name"] %> -><%= values["new_name"] %><%= aliases["new_name"] %>
 <%= values["desc"] %><%= aliases["desc"] %>
-<% end %> - +<% end %> -<% if values["attributes"] then %> +<% if sections["attributes"] then %>

Attributes

-<% values["attributes"].each do |attributes| $stderr.puts({ :attributes => attributes }.inspect) %> +<% sections["attributes"].each do |attribute| %> - -<% if values["rw"] then %> - -<% end %> -<% unless values["rw"] then %> + +<% if attribute["rw"] then %> + +<% end + unless attribute["rw"] then %> -<% end %> - +<% end %> + -<% end # values["attributes"] %> +<% end %><%# sections["attributes"] %>
<%= values["name"] %> [<%= values["rw"] %>] <%= attribute["name"] %> [<%= attribute["rw"] %>]   <%= values["a_desc"] %><%= attribute["a_desc"] %>
-<% end %> - - +<% end %> -<% if sections["method_list"] then %> +<% if sections["method_list"] then %>
-<% sections["method_list"].each do |method_list| %> -<% if method_list["methods"] then %> +<% sections["method_list"].each do |method_list| + if method_list["methods"] then %>

<%= method_list["type"] %> <%= method_list["category"] %> methods

-<% method_list["methods"].each do |methods| %> +<% method_list["methods"].each do |methods| %>
" class="method-detail"> ">
-<% if methods["codeurl"] then %> +<% if methods["codeurl"] then %> " target="Code" class="method-signature" onclick="popupCode('<%= methods["codeurl"] %>');return false;"> -<% end %> -<% if methods["sourcecode"] then %> +<% end + if methods["sourcecode"] then %> " class="method-signature"> -<% end %> -<% if methods["callseq"] then %> +<% end + if methods["callseq"] then %> <%= methods["callseq"] %> -<% end %> -<% unless methods["callseq"] then %> +<% end + unless methods["callseq"] then %> <%= methods["name"] %><%= methods["params"] %> -<% end %> -<% if methods["codeurl"] then %> +<% end + if methods["codeurl"] then %> -<% end %> -<% if methods["sourcecode"] then %> +<% end + if methods["sourcecode"] then %> -<% end %> +<% end %>
-<% if methods["m_desc"] then %> +<% if methods["m_desc"] then %> <%= methods["m_desc"] %> -<% end %> -<% if methods["sourcecode"] then %> +<% end + if methods["sourcecode"] then %>

-source');return false;">[Source]

-source"> @@ -589,17 +583,17 @@ EOF <%= methods["sourcecode"] %>
-<% end %> +<% end %>
-<% end # method_list["methods"] %> -<% end %> -<% end # sections["method_list"] %> +<% end %><%# method_list["methods"] %><% + end + end %><%# sections["method_list"] %>
-<% end %> -<% end # values["sections"] %> +<% end %> +<% end %><%# values["sections"] %> EOF ##################################################################### @@ -663,7 +657,7 @@ EOF
<% values["entries"].each do |entries| %> "><%= entries["name"] %>
-<% end # values["entries"] %> +<% end %><%# values["entries"] %>
diff --git a/lib/rdoc/generator/html/kilmer.rb b/lib/rdoc/generator/html/kilmer.rb index b6c9c4e339..6479abaf8b 100644 --- a/lib/rdoc/generator/html/kilmer.rb +++ b/lib/rdoc/generator/html/kilmer.rb @@ -119,7 +119,7 @@ body,td,p { font-family: <%= values["fonts"] %>;
<% values["requires"].each do |requires| %> <%= href requires["aref"], requires["name"] %> -<% end # values["requires"] %> +<% end %><%# values["requires"] %> <% end %>
@@ -130,7 +130,7 @@ body,td,p { font-family: <%= values["fonts"] %>;
<% values["methods"].each do |methods| %> <%= href methods["aref"], methods["name"] %>, -<% end # values["methods"] %> +<% end %><%# values["methods"] %>
<% end %> @@ -162,7 +162,7 @@ body,td,p { font-family: <%= values["fonts"] %>; <%= attributes["name"] %> <%= attributes["a_desc"] %> -<% end # sections["attributes"] %> +<% end %><%# sections["attributes"] %> <% end %> @@ -175,7 +175,7 @@ body,td,p { font-family: <%= values["fonts"] %>; <%= template_include %> -<% end # values["sections"] %> +<% end %><%# values["sections"] %> @@ -221,7 +221,7 @@ body,td,p { font-family: <%= values["fonts"] %>; <% if infiles["cvsurl"] then %>  (">CVS) <% end %> -<% end # values["infiles"] %> +<% end %><%# values["infiles"] %> <% if values["parent"] then %> @@ -250,7 +250,7 @@ body,td,p { font-family: <%= values["fonts"] %>;
<% values["includes"].each do |includes| %> <%= href includes["aref"], includes["name"] %> -<% end # values["includes"] %> +<% end %><%# values["includes"] %>
<% end %> @@ -285,7 +285,7 @@ body,td,p { font-family: <%= values["fonts"] %>; This method is also aliased as <% values["aka"].each do |aka| $stderr.puts({ :aka => aka }.inspect) %> "><%= values["name"] %> -<% end # values["aka"] %> +<% end %><%# values["aka"] %> <% end %> <% if values["sourcecode"] then %> @@ -293,9 +293,9 @@ This method is also aliased as <%= values["sourcecode"] %> <% end %> -<% end # values["methods"] %> +<% end %><%# values["methods"] %> <% end %> -<% end # values["method_list"] %> +<% end %><%# values["method_list"] %> <% end %> EOF @@ -364,7 +364,7 @@ div.banner { <% values["entries"].each do |entries| %> "><%= entries["name"] %>
-<% end # values["entries"] %> +<% end %><%# values["entries"] %> EOF diff --git a/lib/rdoc/generator/html/one_page_html.rb b/lib/rdoc/generator/html/one_page_html.rb index 885d0dcf6b..c4dd95529d 100644 --- a/lib/rdoc/generator/html/one_page_html.rb +++ b/lib/rdoc/generator/html/one_page_html.rb @@ -17,7 +17,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML <% unless requires["aref"] then %>
  • <%= requires["name"] %>
    • <% end %> -<% end # files["requires"] %> +<% end %><%# files["requires"] %> <% end %> @@ -31,7 +31,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML <% unless includes["aref"] then %>
  • <%= includes["name"] %>
    • <% end %> -<% end # classes["includes"] %> +<% end %><%# classes["includes"] %> <% end %> @@ -42,7 +42,7 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML <% sections["attributes"].each do |attributes| %> -<% end # sections["attributes"] %> +<% end %><%# sections["attributes"] %>
    <%= attributes["name"] %><%= attributes["rw"] %><%= attributes["a_desc"] %>
    <% end %> @@ -68,11 +68,11 @@ module RDoc::Generator::HTML::ONE_PAGE_HTML <%= methods["sourcecode"] %> <% 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 Modified:<%= files["dtm_modified"] %> } + CONTENTS_XML + %{ -<% end # values["files"] %> +<% end %><%# values["files"] %> <% if values["classes"] then %>

    Classes

    @@ -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 %> -- cgit v1.2.3