diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-23 23:53:49 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-23 23:53:49 +0000 |
commit | 61920a128a2593f6fb968cfd4928499f0a3e2ed3 (patch) | |
tree | 603eb46008483ed97100d616b7f785bd86a14337 /lib/rdoc/markup | |
parent | cede48fd403ddb0631fafc49392350bb889c38ab (diff) | |
download | ruby-61920a128a2593f6fb968cfd4928499f0a3e2ed3.tar.gz |
* lib/rdoc: Update to RDoc 3.9.3. Fixes RDoc with `ruby -Ku`. Allows
HTTPS image paths to be turned into <img> tags. Prevents special
markup inside <tt> from being processed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/markup')
-rw-r--r-- | lib/rdoc/markup/formatter.rb | 4 | ||||
-rw-r--r-- | lib/rdoc/markup/to_html.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb index bf904bba68..f42b3fc6ea 100644 --- a/lib/rdoc/markup/formatter.rb +++ b/lib/rdoc/markup/formatter.rb @@ -88,7 +88,9 @@ class RDoc::Markup::Formatter ## # Converts added specials. See RDoc::Markup#add_special - def convert_special(special) + def convert_special special + return special.text if in_tt? + handled = false RDoc::Markup::Attribute.each_name_of special.type do |name| diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index ca6522352d..bd5fdb493e 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -254,7 +254,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter end end - if (type == "http" or type == "link") and + if (type == "http" or type == "https" or type == "link") and url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then "<img src=\"#{url}\" />" else |