From 1383c1eb2d2debd90225b1552aba01a51c508a52 Mon Sep 17 00:00:00 2001 From: ocean Date: Fri, 13 Jan 2006 10:27:52 +0000 Subject: * lib/rdoc/diagram.rb: - properly quote bare element attributes - terminates dangling elements (e.g. ,
, , etc) - converts "CVS" to the more HTML-friendly acronym element - adds missing type attributes to style elements based on Paul Duncan's patch [ruby-core:7028] * lib/rdoc/generators/html_generator.rb: ditto. * lib/rdoc/generators/template/html/hefss.rb: ditto. * lib/rdoc/generators/template/html/html.rb: ditto. * lib/rdoc/generators/template/html/kilmer.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/diagram.rb | 6 ++-- lib/rdoc/generators/html_generator.rb | 2 +- lib/rdoc/generators/template/html/hefss.rb | 52 +++++++++++++-------------- lib/rdoc/generators/template/html/html.rb | 6 ++-- lib/rdoc/generators/template/html/kilmer.rb | 48 ++++++++++++------------- lib/rdoc/generators/template/html/old_html.rb | 6 ++-- 6 files changed, 60 insertions(+), 60 deletions(-) (limited to 'lib/rdoc') diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb index 62e2f2e164..9ae9dd6794 100644 --- a/lib/rdoc/diagram.rb +++ b/lib/rdoc/diagram.rb @@ -320,13 +320,13 @@ module RDoc xs, ys = [$1.to_i, $3.to_i], [$2.to_i, $4.to_i] url, area_name = $5, $6 - res << %{ #{area_name}\n} + res << %{ #{area_name}\n} end res << "\n" # map_file = src.sub(/.dot/, '.map') # system("dot -Timap #{src} -o #{map_file}") - res << %{#{name}} + res << %{#{name}} return res end end diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb index d263a14784..be79226c8e 100644 --- a/lib/rdoc/generators/html_generator.rb +++ b/lib/rdoc/generators/html_generator.rb @@ -153,7 +153,7 @@ module Generators if (type == "http" || type == "link") && url =~ /\.(gif|png|jpg|jpeg|bmp)$/ - "" + "" else "#{text.sub(%r{^#{type}:/*}, '')}" end diff --git a/lib/rdoc/generators/template/html/hefss.rb b/lib/rdoc/generators/template/html/hefss.rb index ff4f557b71..e68ca85823 100644 --- a/lib/rdoc/generators/template/html/hefss.rb +++ b/lib/rdoc/generators/template/html/hefss.rb @@ -114,7 +114,7 @@ BODY = %{ %title% - +