summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-12 12:20:51 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-12 12:20:51 +0000
commit67eb47394242cbe98f169a127dbdaad762b2f182 (patch)
tree5e58aea30c1b4d31e8b908a4fff738c913cf6630
parentc868c85dc49df33d7297d5b9261147d9bcdf9866 (diff)
Allow multiple words in braces before a link
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/README3
-rw-r--r--lib/rdoc/generators/html_generator.rb6
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c279d008f5..450bd86432 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-12 Dave Thomas <dave@pragprog.com>
+
+ * html_generator.rb: Support hyperlinks of the form {any text}[xxx]
+ as well as stuff[xxx]
+
Sat Jul 10 09:30:24 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
* test/soap/marshal/test_struct.rb: use qualified build-tin class name
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