rdoc 6.3.4.1 → 8.0.0

data/lib/rdoc/markup/to_tt_only.rb

@@ -15,40 +15,31 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
 
   attr_reader :res
 
-  ##
-  # Creates a new tt-only formatter.
-
-  def initialize markup = nil
-    super nil, markup
-
-    add_tag :TT, nil, nil
-  end
-
   ##
   # Adds tts from +block_quote+ to the output
 
-  def accept_block_quote block_quote
+  def accept_block_quote(block_quote)
     tt_sections block_quote.text
   end
 
   ##
   # Pops the list type for +list+ from #list_type
 
-  def accept_list_end list
+  def accept_list_end(list)
     @list_type.pop
   end
 
   ##
   # Pushes the list type for +list+ onto #list_type
 
-  def accept_list_start list
+  def accept_list_start(list)
     @list_type << list.type
   end
 
   ##
   # Prepares the visitor for consuming +list_item+
 
-  def accept_list_item_start list_item
+  def accept_list_item_start(list_item)
     case @list_type.last
     when :NOTE, :LABEL then
       Array(list_item.label).map do |label|
@@ -60,7 +51,7 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
   ##
   # Adds +paragraph+ to the output
 
-  def accept_paragraph paragraph
+  def accept_paragraph(paragraph)
     tt_sections(paragraph.text)
   end
 
@@ -68,7 +59,7 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
   # Does nothing to +markup_item+ because it doesn't have any user-built
   # content
 
-  def do_nothing markup_item
+  def do_nothing(markup_item)
   end
 
   alias accept_blank_line    do_nothing # :nodoc:
@@ -81,23 +72,19 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
   ##
   # Extracts tt sections from +text+
 
-  def tt_sections text
-    flow = @am.flow text.dup
-
-    flow.each do |item|
-      case item
-      when String then
-        @res << item if in_tt?
-      when RDoc::Markup::AttrChanger then
-        off_tags res, item
-        on_tags res, item
-      when RDoc::Markup::RegexpHandling then
-        @res << convert_regexp_handling(item) if in_tt? # TODO can this happen?
+  def tt_sections(text)
+    parsed = RDoc::Markup::InlineParser.new(text).parse
+    traverse = -> node {
+      next if String === node
+      if node[:type] == :TT
+        res << nil
+        res << node[:children][0] || ''
+        res << nil
       else
-        raise "Unknown flow element: #{item.inspect}"
+        node[:children].each(&traverse)
       end
-    end
-
+    }
+    parsed.each(&traverse)
     res
   end
 
@@ -118,4 +105,3 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
   end
 
 end
-

data/lib/rdoc/markup/verbatim.rb

@@ -9,20 +9,20 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
 
   attr_accessor :format
 
-  def initialize *parts # :nodoc:
+  def initialize(*parts) # :nodoc:
     super
 
     @format = nil
   end
 
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     super and @format == other.format
   end
 
   ##
   # Calls #accept_verbatim on +visitor+
 
-  def accept visitor
+  def accept(visitor)
     visitor.accept_verbatim self
   end
 
@@ -50,7 +50,7 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
     @parts = parts
   end
 
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     self.class.name =~ /.*::(\w{1,4})/i
 
     q.group 2, "[#{$1.downcase}: ", ']' do
@@ -70,7 +70,7 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
 
   def ruby?
     @format ||= nil # TODO for older ri data, switch the tree to marshal_dump
-    @format == :ruby
+    @format == :ruby || @format == :rb
   end
 
   ##
@@ -81,4 +81,3 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
   end
 
 end
-