Update ruby-rdoc package to 3.11.

=== 3.11 / 2011/10-17

* Bug fixes
 * Avoid parsing TAGS files included in gems.  Issue #81 by Santiago Pastorino.

=== 3.10 / 2011-10-08

* Major enhancements
 * RDoc HTML output has been improved:
   * The search from Vladimir Kolesnikov Sdoc has been integrated.
     The search index generation is a reusable component through
     RDoc::Generator::JsonIndex
   * The table of contents is now a separate page and now shows links to
     headings and sections inside a page or class.
   * Class pages no longer show the namespace and no longer have file info
     pages.
   * HTML output is HTML 5.
   * Static files can be copied into RDoc using --copy-files
 * RDoc supports additional documentation formats:
   * TomDoc 1.0.0-rc1
   * RD format

   The default markup can be set via the <tt>--markup</tt> option.
   The format of documentation in a particular file can be specified by the
   +:markup:+ directive.  If the +:markup:+ directive is in the first comment
   it is used as the default for the entire file.  For other comments it
   overrides the default markup format.

   The markup format can be set for rake tasks using RDoc::Task#markup
 * RDoc can save and load an options file.
   To create an options file that defaults to using TomDoc markup run:

     rdoc --markup tomdoc --write-options

   This will create a .rdoc_options file.  Check it in to your VCS and
   package it with your gem.  RDoc will automatically load this file and
   combine it with the user's options.

   Some options are not saved.  See RDoc::Options@Saved+Options for full
   details.

* Minor enhancements
 * RDoc autoloads everything.  You only need to require 'rdoc' now.
 * HTML headings now have ids matching their titles.

     = Hello!

   Is rendered as

     <h1 id="label-Hello%21">Hello!</h1>

 * Labels for classes or methods can be linked-to by adding an <tt>@</tt>
   following the class or method reference.  For example,
   <tt>RDoc::Markup@Links</tt>

   See RDoc::Markup@Links for further details.
 * For HTML output RDoc uses +SomeClass.method_name+ and
   +SomeClass#method_name+ for remote methods and attributes and
   +::method_name+ and +#method_name+ for local methods.
 * RDoc makes an effort to syntax-highlight ruby code in verbatim sections.
   See RDoc::Markup@Paragraphs+and+Verbatim
 * Added RDoc::TopLevel#text? and RDoc::Parser::Text to indicate a
   parsed file contains no ruby constructs.
 * Added <tt>rdoc-label</tt> link scheme which allows bidirectional links.
   See RDoc::Markup for details.
 * Added RDoc::Comment which encapsulates comment-handling functionality.
 * Added RDoc::Markup::PreProcess::post_process to allow arbitrary comment
   munging.
 * RDoc::RDoc::current is set for the entire RDoc run.
 * Split rdoc/markup/inline into individual files for its component classes.
 * Moved token stream HTML markup out of RDoc::AnyMethod#markup_code into
   RDoc::TokenStream::to_html
 * "Top" link in section headers is no longer inside the heading element.
 * RDoc avoids printing some warnings unless run with `rdoc --verbose`.  For
   Rails issue #1646.
 * Finishing a paragraph with two or more spaces will result in a line break.
   This feature is experimental and may be modified or removed.

* Bug fixes
 * Performance of RDoc::RubyLex has been improved.  Ruby Bug #5202 by Ryan
   Melton.
 * Clicking a link in the method description now works.  Issue #61 by Alan
   Hogan.
 * Fixed RDoc::Markup::Parser for CRLF line endings.  Issue #67 by Marvin
   Gülker.
 * Fixed lexing of percent strings like %r{#}.  Issue #68 by eclectic923.
 * The C parser now understands classes defined with
   +rb_struct_define_without_accessor+ (like Range).  Pull Request #73 by Dan
   Bernier
 * Fixed lexing of <code>a b <<-HEREDOC</code>.  Issue #75 by John Mair.
 * Added LEGAL.rdoc with references to licenses in other files.  Issue #78 by
   Dmitry Jemerov.
 * Block parameters are displayed in Darkfish output again.  Issue #76 by
   Andrea Singh.
 * The method parameter coverage report no longer includes parameter default
   values.  Issue #77 by Jake Goulding.
 * The module for an include is not looked up until parsed all the files are
   parsed.  Unless your project includes nonexistent modules this avoids
   worst-case behavior (<tt>O(n!)</tt>) of RDoc::Include#module.

3 files changed, 71 insertions, 16 deletions

diff --git a/devel/ruby-rdoc/PLIST b/devel/ruby-rdoc/PLIST
index 66aa425630d..4dad90d874e 100644
--- a/devel/ruby-rdoc/PLIST
+++ b/devel/ruby-rdoc/PLIST
@@ -1,18 +1,21 @@
-@comment $NetBSD: PLIST,v 1.4 2011/08/25 15:17:59 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/11/13 15:57:22 taca Exp $
 bin/rdoc
 bin/ri
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.autotest
 ${GEM_LIBDIR}/.document
 ${GEM_LIBDIR}/.gemtest
-${GEM_LIBDIR}/History.txt
-${GEM_LIBDIR}/LICENSE.txt
+${GEM_LIBDIR}/History.rdoc
+${GEM_LIBDIR}/LEGAL.rdoc
+${GEM_LIBDIR}/LICENSE.rdoc
 ${GEM_LIBDIR}/Manifest.txt
-${GEM_LIBDIR}/README.txt
-${GEM_LIBDIR}/RI.txt
+${GEM_LIBDIR}/README.rdoc
+${GEM_LIBDIR}/RI.rdoc
 ${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/TODO.rdoc
 ${GEM_LIBDIR}/bin/rdoc
 ${GEM_LIBDIR}/bin/ri
+${GEM_LIBDIR}/lib/gauntlet_rdoc.rb
 ${GEM_LIBDIR}/lib/rdoc.rb
 ${GEM_LIBDIR}/lib/rdoc/alias.rb
 ${GEM_LIBDIR}/lib/rdoc/anon_class.rb
@@ -21,19 +24,33 @@ ${GEM_LIBDIR}/lib/rdoc/attr.rb
 ${GEM_LIBDIR}/lib/rdoc/class_module.rb
 ${GEM_LIBDIR}/lib/rdoc/code_object.rb
 ${GEM_LIBDIR}/lib/rdoc/code_objects.rb
+${GEM_LIBDIR}/lib/rdoc/comment.rb
 ${GEM_LIBDIR}/lib/rdoc/constant.rb
 ${GEM_LIBDIR}/lib/rdoc/context.rb
+${GEM_LIBDIR}/lib/rdoc/context/section.rb
 ${GEM_LIBDIR}/lib/rdoc/cross_reference.rb
 ${GEM_LIBDIR}/lib/rdoc/encoding.rb
 ${GEM_LIBDIR}/lib/rdoc/erbio.rb
-${GEM_LIBDIR}/lib/rdoc/gauntlet.rb
 ${GEM_LIBDIR}/lib/rdoc/generator.rb
 ${GEM_LIBDIR}/lib/rdoc/generator/darkfish.rb
+${GEM_LIBDIR}/lib/rdoc/generator/json_index.rb
 ${GEM_LIBDIR}/lib/rdoc/generator/markup.rb
 ${GEM_LIBDIR}/lib/rdoc/generator/ri.rb
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/.document
-${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/classpage.rhtml
-${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/filepage.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_footer.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_head.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/class.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/add.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/brick.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/brick_link.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/bug.png
@@ -41,6 +58,7 @@ ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/bullet_black.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/date.png
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/delete.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/find.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png
@@ -50,26 +68,35 @@ ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/page_white_text.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/page_white_width.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/plugin.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/ruby.png
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/tag_blue.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/tag_green.png
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/transparent.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/wrench.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/wrench_orange.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/images/zoom.png
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/index.rhtml
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/js/darkfish.js
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/js/jquery.js
-${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/js/quicksearch.js
-${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/js/search.js
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/page.rhtml
 ${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/rdoc.css
+${GEM_LIBDIR}/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
+${GEM_LIBDIR}/lib/rdoc/generator/template/json_index/js/navigation.js
+${GEM_LIBDIR}/lib/rdoc/generator/template/json_index/js/searcher.js
 ${GEM_LIBDIR}/lib/rdoc/ghost_method.rb
 ${GEM_LIBDIR}/lib/rdoc/include.rb
 ${GEM_LIBDIR}/lib/rdoc/known_classes.rb
 ${GEM_LIBDIR}/lib/rdoc/markup.rb
+${GEM_LIBDIR}/lib/rdoc/markup/attr_changer.rb
+${GEM_LIBDIR}/lib/rdoc/markup/attr_span.rb
+${GEM_LIBDIR}/lib/rdoc/markup/attribute.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/attribute_manager.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/blank_line.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/document.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/formatter.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/formatter_test_case.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/heading.rb
+${GEM_LIBDIR}/lib/rdoc/markup/include.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/indented_paragraph.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/inline.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/list.rb
@@ -79,12 +106,16 @@ ${GEM_LIBDIR}/lib/rdoc/markup/parser.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/pre_process.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/raw.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/rule.rb
+${GEM_LIBDIR}/lib/rdoc/markup/special.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/text_formatter_test_case.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_ansi.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_bs.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_html.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_html_crossref.rb
+${GEM_LIBDIR}/lib/rdoc/markup/to_html_snippet.rb
+${GEM_LIBDIR}/lib/rdoc/markup/to_label.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_rdoc.rb
+${GEM_LIBDIR}/lib/rdoc/markup/to_table_of_contents.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_test.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/to_tt_only.rb
 ${GEM_LIBDIR}/lib/rdoc/markup/verbatim.rb
@@ -95,9 +126,15 @@ ${GEM_LIBDIR}/lib/rdoc/normal_module.rb
 ${GEM_LIBDIR}/lib/rdoc/options.rb
 ${GEM_LIBDIR}/lib/rdoc/parser.rb
 ${GEM_LIBDIR}/lib/rdoc/parser/c.rb
+${GEM_LIBDIR}/lib/rdoc/parser/rd.rb
 ${GEM_LIBDIR}/lib/rdoc/parser/ruby.rb
 ${GEM_LIBDIR}/lib/rdoc/parser/ruby_tools.rb
 ${GEM_LIBDIR}/lib/rdoc/parser/simple.rb
+${GEM_LIBDIR}/lib/rdoc/parser/text.rb
+${GEM_LIBDIR}/lib/rdoc/rd.rb
+${GEM_LIBDIR}/lib/rdoc/rd/block_parser.ry
+${GEM_LIBDIR}/lib/rdoc/rd/inline.rb
+${GEM_LIBDIR}/lib/rdoc/rd/inline_parser.ry
 ${GEM_LIBDIR}/lib/rdoc/rdoc.rb
 ${GEM_LIBDIR}/lib/rdoc/require.rb
 ${GEM_LIBDIR}/lib/rdoc/ri.rb
@@ -114,8 +151,10 @@ ${GEM_LIBDIR}/lib/rdoc/stats/normal.rb
 ${GEM_LIBDIR}/lib/rdoc/stats/quiet.rb
 ${GEM_LIBDIR}/lib/rdoc/stats/verbose.rb
 ${GEM_LIBDIR}/lib/rdoc/task.rb
+${GEM_LIBDIR}/lib/rdoc/test_case.rb
 ${GEM_LIBDIR}/lib/rdoc/text.rb
 ${GEM_LIBDIR}/lib/rdoc/token_stream.rb
+${GEM_LIBDIR}/lib/rdoc/tom_doc.rb
 ${GEM_LIBDIR}/lib/rdoc/top_level.rb
 ${GEM_LIBDIR}/test/README
 ${GEM_LIBDIR}/test/binary.dat
@@ -130,18 +169,23 @@ ${GEM_LIBDIR}/test/test_rdoc_any_method.rb
 ${GEM_LIBDIR}/test/test_rdoc_attr.rb
 ${GEM_LIBDIR}/test/test_rdoc_class_module.rb
 ${GEM_LIBDIR}/test/test_rdoc_code_object.rb
+${GEM_LIBDIR}/test/test_rdoc_comment.rb
 ${GEM_LIBDIR}/test/test_rdoc_constant.rb
 ${GEM_LIBDIR}/test/test_rdoc_context.rb
 ${GEM_LIBDIR}/test/test_rdoc_context_section.rb
 ${GEM_LIBDIR}/test/test_rdoc_cross_reference.rb
 ${GEM_LIBDIR}/test/test_rdoc_encoding.rb
 ${GEM_LIBDIR}/test/test_rdoc_generator_darkfish.rb
+${GEM_LIBDIR}/test/test_rdoc_generator_json_index.rb
+${GEM_LIBDIR}/test/test_rdoc_generator_markup.rb
 ${GEM_LIBDIR}/test/test_rdoc_generator_ri.rb
 ${GEM_LIBDIR}/test/test_rdoc_include.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_attribute_manager.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_document.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_formatter.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_heading.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_include.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_indented_paragraph.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_paragraph.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_parser.rb
@@ -151,16 +195,25 @@ ${GEM_LIBDIR}/test/test_rdoc_markup_to_ansi.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_to_bs.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_to_html.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_to_html_crossref.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_to_html_snippet.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_to_label.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_to_rdoc.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_to_table_of_contents.rb
 ${GEM_LIBDIR}/test/test_rdoc_markup_to_tt_only.rb
+${GEM_LIBDIR}/test/test_rdoc_markup_verbatim.rb
 ${GEM_LIBDIR}/test/test_rdoc_method_attr.rb
 ${GEM_LIBDIR}/test/test_rdoc_normal_class.rb
 ${GEM_LIBDIR}/test/test_rdoc_normal_module.rb
 ${GEM_LIBDIR}/test/test_rdoc_options.rb
 ${GEM_LIBDIR}/test/test_rdoc_parser.rb
 ${GEM_LIBDIR}/test/test_rdoc_parser_c.rb
+${GEM_LIBDIR}/test/test_rdoc_parser_rd.rb
 ${GEM_LIBDIR}/test/test_rdoc_parser_ruby.rb
 ${GEM_LIBDIR}/test/test_rdoc_parser_simple.rb
+${GEM_LIBDIR}/test/test_rdoc_rd.rb
+${GEM_LIBDIR}/test/test_rdoc_rd_block_parser.rb
+${GEM_LIBDIR}/test/test_rdoc_rd_inline.rb
+${GEM_LIBDIR}/test/test_rdoc_rd_inline_parser.rb
 ${GEM_LIBDIR}/test/test_rdoc_rdoc.rb
 ${GEM_LIBDIR}/test/test_rdoc_require.rb
 ${GEM_LIBDIR}/test/test_rdoc_ri_driver.rb
@@ -172,6 +225,8 @@ ${GEM_LIBDIR}/test/test_rdoc_single_class.rb
 ${GEM_LIBDIR}/test/test_rdoc_stats.rb
 ${GEM_LIBDIR}/test/test_rdoc_task.rb
 ${GEM_LIBDIR}/test/test_rdoc_text.rb
+${GEM_LIBDIR}/test/test_rdoc_token_stream.rb
+${GEM_LIBDIR}/test/test_rdoc_tom_doc.rb
 ${GEM_LIBDIR}/test/test_rdoc_top_level.rb
 ${GEM_LIBDIR}/test/xref_data.rb
 ${GEM_LIBDIR}/test/xref_test_case.rb
diff --git a/devel/ruby-rdoc/distinfo b/devel/ruby-rdoc/distinfo
index bb85b63abaa..4d03a297c2e 100644
--- a/devel/ruby-rdoc/distinfo
+++ b/devel/ruby-rdoc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2011/09/04 17:04:19 taca Exp $
+$NetBSD: distinfo,v 1.7 2011/11/13 15:57:22 taca Exp $
 
-SHA1 (rdoc-3.9.4.gem) = 610aae8a6f41cb5db777b1c46b8830d85dec28f7
-RMD160 (rdoc-3.9.4.gem) = 25eceba62ff7eed40271fd760a2cfaebea164ee3
-Size (rdoc-3.9.4.gem) = 252928 bytes
+SHA1 (rdoc-3.11.gem) = 4f4cb21b84df4938a11f54c26b064a7e68003a6d
+RMD160 (rdoc-3.11.gem) = c9036f2177da8a5c368653e6bcdbafa405b288c2
+Size (rdoc-3.11.gem) = 311808 bytes
diff --git a/lang/ruby/rdoc.mk b/lang/ruby/rdoc.mk
index 0de78919f65..de2fab72376 100644
--- a/lang/ruby/rdoc.mk
+++ b/lang/ruby/rdoc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rdoc.mk,v 1.8 2011/11/08 15:19:34 taca Exp $
+# $NetBSD: rdoc.mk,v 1.9 2011/11/13 15:57:22 taca Exp $
 
 .if !defined(_RUBY_RDOC_MK)
 _RUBY_RDOC_MK=	# defined
@@ -20,7 +20,7 @@ _RUBY_RDOC_MK=	# defined
 #
 # current rdoc versions.
 #
-RUBY_RDOC_VERSION=	3.9.4
+RUBY_RDOC_VERSION=	3.11
 
 .if !empty(RUBY_RDOC_REQD)