diff options
author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-12 12:20:51 +0000 |
---|---|---|
committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-12 12:20:51 +0000 |
commit | 70462a011e4ab3e4d19e4bdd8c17da7631c1b4b5 (patch) | |
tree | e4c9d9932aed19a801e6680bd8ffcfa40bbf8c8c /lib/rdoc/generators | |
parent | 99f94a12159457f8717e4ed852a70f586fe51a8a (diff) |
Allow multiple words in braces before a link
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/generators')
-rw-r--r-- | lib/rdoc/generators/html_generator.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb index 754deb9f77..38c5da5b04 100644 --- a/lib/rdoc/generators/html_generator.rb +++ b/lib/rdoc/generators/html_generator.rb @@ -177,7 +177,8 @@ module Generators def handle_special_TIDYLINK(special) text = special.text - unless text =~ /(\S+)\[(.*?)\]/ +# unless text =~ /(\S+)\[(.*?)\]/ + unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/ return text end label = $1 @@ -218,7 +219,8 @@ module Generators @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK) # and links of the form <text>[<url>] - @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK) + @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK) +# @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK) end unless defined? @html_formatter |