From 61920a128a2593f6fb968cfd4928499f0a3e2ed3 Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 23 Aug 2011 23:53:49 +0000 Subject: * lib/rdoc: Update to RDoc 3.9.3. Fixes RDoc with `ruby -Ku`. Allows HTTPS image paths to be turned into tags. Prevents special markup inside from being processed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/markup/formatter.rb | 4 +++- lib/rdoc/markup/to_html.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/rdoc/markup') 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 "" else -- cgit v1.2.3