diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 18:31:49 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 18:31:49 +0000 |
commit | 73f0448e983659f863dcacc25beb054ea676e0fb (patch) | |
tree | a6121950d602fa3ae52c0a26a434ba4af899f268 | |
parent | 8f97a2c53745f97055c38f41dd1e3dd96e64b300 (diff) | |
download | ruby-73f0448e983659f863dcacc25beb054ea676e0fb.tar.gz |
* lib/rdoc: Import RDoc 3.9.2. Fixes TIDYLINK for HTML output.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/rdoc.rb | 2 | ||||
-rw-r--r-- | lib/rdoc/markup/to_html.rb | 2 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_markup_to_html_crossref.rb | 6 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Aug 12 03:24:35 2011 Eric Hodel <drbrain@segment7.net> + + * lib/rdoc: Import RDoc 3.9.2. Fixes TIDYLINK for HTML output. + Thu Aug 11 15:37:42 2011 Hiroshi Nakamura <nahi@ruby-lang.org> * variable.c (autoload_delete): An autoload entry is still in a diff --git a/lib/rdoc.rb b/lib/rdoc.rb index 86c194f8ba..ddae96f53e 100644 --- a/lib/rdoc.rb +++ b/lib/rdoc.rb @@ -104,7 +104,7 @@ module RDoc ## # RDoc version you are using - VERSION = '3.9.1' + VERSION = '3.9.2' ## # Method visibilities diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index f87aabad6f..ca6522352d 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -74,7 +74,7 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter @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+?\])/, :TIDYLINK) init_tags end diff --git a/test/rdoc/test_rdoc_markup_to_html_crossref.rb b/test/rdoc/test_rdoc_markup_to_html_crossref.rb index 2c566f0140..4f122512ac 100644 --- a/test/rdoc/test_rdoc_markup_to_html_crossref.rb +++ b/test/rdoc/test_rdoc_markup_to_html_crossref.rb @@ -25,6 +25,12 @@ class TestRDocMarkupToHtmlCrossref < XrefTestCase assert_equal "\n<p><a href=\"C1.html\">C1</a></p>\n", result end + def test_convert_TIDYLINK_rdoc_ref + result = @to.convert '{foo}[rdoc-ref:C1]' + + assert_equal "\n<p><a href=\"C1.html\">foo</a></p>\n", result + end + def test_gen_url assert_equal '<a href="C1.html">Some class</a>', @to.gen_url('rdoc-ref:C1', 'Some class') |