drbrain	2011-08-12 03:44:10 +0900 (Fri, 12 Aug 2011)

  New Revision: 32937

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32937

  Log:
    * backport r32935 from trunk
    
    * lib/rdoc:  Import RDoc 3.9.2.  Fixes TIDYLINK for HTML output.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rdoc/markup/to_html.rb
    branches/ruby_1_9_3/lib/rdoc.rb
    branches/ruby_1_9_3/test/rdoc/test_rdoc_markup_to_html_crossref.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32936)
+++ ruby_1_9_3/ChangeLog	(revision 32937)
@@ -1,3 +1,9 @@
+Fri Aug 12 03:24:35 2011  Eric Hodel  <drbrain@s...>
+
+	* backport r32935 from trunk
+
+	* lib/rdoc:  Import RDoc 3.9.2.  Fixes TIDYLINK for HTML output.
+
 Tue Aug  2 22:04:46 2011  NARUSE, Yui  <naruse@r...>
 
 	* backport r32815 from trunk.
Index: ruby_1_9_3/lib/rdoc.rb
===================================================================
--- ruby_1_9_3/lib/rdoc.rb	(revision 32936)
+++ ruby_1_9_3/lib/rdoc.rb	(revision 32937)
@@ -104,7 +104,7 @@
   ##
   # RDoc version you are using
 
-  VERSION = '3.9.1'
+  VERSION = '3.9.2'
 
   ##
   # Method visibilities
Index: ruby_1_9_3/lib/rdoc/markup/to_html.rb
===================================================================
--- ruby_1_9_3/lib/rdoc/markup/to_html.rb	(revision 32936)
+++ ruby_1_9_3/lib/rdoc/markup/to_html.rb	(revision 32937)
@@ -74,7 +74,7 @@
     @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
Index: ruby_1_9_3/test/rdoc/test_rdoc_markup_to_html_crossref.rb
===================================================================
--- ruby_1_9_3/test/rdoc/test_rdoc_markup_to_html_crossref.rb	(revision 32936)
+++ ruby_1_9_3/test/rdoc/test_rdoc_markup_to_html_crossref.rb	(revision 32937)
@@ -25,6 +25,12 @@
     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')

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/