* lib/rdoc*: Updated to RDoc 4.0 (pre-release)

* bin/rdoc:  ditto
* test/rdoc:  ditto
* NEWS:  Updated with RDoc 4.0 information


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

lib/rdoc/markup/heading.rb

@@ -3,6 +3,35 @@
 
 class RDoc::Markup::Heading < Struct.new :level, :text
 
+  @to_html = nil
+  @to_label = nil
+
+  ##
+  # A singleton RDoc::Markup::ToLabel formatter for headings.
+
+  def self.to_label
+    @to_label ||= RDoc::Markup::ToLabel.new
+  end
+
+  ##
+  # A singleton plain HTML formatter for headings.  Used for creating labels
+  # for the Table of Contents
+
+  def self.to_html
+    return @to_html if @to_html
+
+    markup = RDoc::Markup.new
+    markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
+
+    @to_html = RDoc::Markup::ToHtml.new nil
+
+    def @to_html.handle_special_CROSSREF special
+      special.text.sub(/^\\/, '')
+    end
+
+    @to_html
+  end
+
   ##
   # Calls #accept_heading on +visitor+
 
@@ -10,6 +39,21 @@ class RDoc::Markup::Heading < Struct.new :level, :text
     visitor.accept_heading self
   end
 
+  ##
+  # An HTML-safe anchor reference for this header.
+
+  def aref
+    "label-#{self.class.to_label.convert text.dup}"
+  end
+
+  ##
+  # HTML markup of the text of this label without the surrounding header
+  # element.
+
+  def plain_html
+    self.class.to_html.to_html(text.dup)
+  end
+
   def pretty_print q # :nodoc:
     q.group 2, "[head: #{level} ", ']' do
       q.pp text