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 | 619173ccd4310ec2735be798aa1d12d1f05dae06 (patch) | |
tree | 5e58aea30c1b4d31e8b908a4fff738c913cf6630 /lib/rdoc/generators | |
parent | c6eb1c44a6ba0f944ddd7ceafa5c75dae6ea5b1e (diff) | |
download | ruby-619173ccd4310ec2735be798aa1d12d1f05dae06.tar.gz ruby-619173ccd4310ec2735be798aa1d12d1f05dae06.tar.xz ruby-619173ccd4310ec2735be798aa1d12d1f05dae06.zip |
Allow multiple words in braces before a link
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@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 754deb9f7..38c5da5b0 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 |