summaryrefslogtreecommitdiff
path: root/lib/rdoc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rdoc')
-rw-r--r--lib/rdoc/README3
-rw-r--r--lib/rdoc/generators/html_generator.rb6
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/rdoc/README b/lib/rdoc/README
index 6e234e31a5..e13ab87dc8 100644
--- a/lib/rdoc/README
+++ b/lib/rdoc/README
@@ -333,7 +333,8 @@ this margin are formatted verbatim.
Hyperlinks can also be of the form <tt>label</tt>[url], in which
case the label is used in the displayed text, and <tt>url</tt> is
- used as the target.
+ used as the target. If <tt>label</tt> contains multiple words,
+ put it in braces: <em>{multi word label}[</em>url<em>]</em>.
9. Method parameter lists are extracted and displayed with
the method description. If a method calls +yield+, then
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