Specials inside tt are no longer converted

Author: drbrain

History.txt

@@ -5,6 +5,8 @@
     Travis D. Warlick, Jr.
   * Image paths at HTTPS URLs are now turned into +<img>+ tags.  Pull
     Request #60 by James Mead
+  * Markup defined by RDoc::Markup#add_special inside a <tt><tt></tt> is no
+    longer converted.
 
 === 3.9.2 / 2011-08-11
 

Manifest.txt

@@ -136,6 +136,7 @@ test/test_rdoc_include.rb
 test/test_rdoc_markup.rb
 test/test_rdoc_markup_attribute_manager.rb
 test/test_rdoc_markup_document.rb
+test/test_rdoc_markup_formatter.rb
 test/test_rdoc_markup_indented_paragraph.rb
 test/test_rdoc_markup_paragraph.rb
 test/test_rdoc_markup_parser.rb

lib/rdoc/markup/formatter.rb

@@ -88,7 +88,9 @@ def convert_flow(flow)
   ##
   # Converts added specials.  See RDoc::Markup#add_special
 
-  def convert_special(special)
+  def convert_special special
+    return special.text if in_tt?
+
     handled = false
 
     RDoc::Markup::Attribute.each_name_of special.type do |name|

test/test_rdoc_markup_formatter.rb

@@ -0,0 +1,57 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc'
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
+
+class TestRDocMarkupFormatter < MiniTest::Unit::TestCase
+
+  class ToTest < RDoc::Markup::Formatter
+
+    def initialize markup
+      super
+
+      add_tag :TT, '<tt>', '</tt>'
+    end
+
+    def accept_paragraph paragraph
+      @res << attributes(paragraph.text)
+    end
+
+    def attributes text
+      convert_flow @am.flow text.dup
+    end
+
+    def handle_special_CAPS special
+      "handled #{special.text}"
+    end
+
+    def start_accepting
+      @res = ""
+    end
+
+    def end_accepting
+      @res
+    end
+
+  end
+
+  def setup
+    @markup = RDoc::Markup.new
+    @markup.add_special(/[A-Z]+/, :CAPS)
+
+    @to = ToTest.new @markup
+
+    @caps    = RDoc::Markup::Attribute.bitmap_for :CAPS
+    @special = RDoc::Markup::Attribute.bitmap_for :_SPECIAL_
+    @tt      = RDoc::Markup::Attribute.bitmap_for :TT
+  end
+
+  def test_convert_tt_special
+    converted = @to.convert '<tt>AAA</tt>'
+
+    assert_equal '<tt>AAA</tt>', converted
+  end
+
+end
+