Fixed problem with \_cat_<b>dog</b>

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

2 files changed, 8 insertions, 16 deletions

diff --git a/lib/rdoc/markup/simple_markup/inline.rb b/lib/rdoc/markup/simple_markup/inline.rb
index 7b476e559d..1e76c201c9 100644
--- a/lib/rdoc/markup/simple_markup/inline.rb
+++ b/lib/rdoc/markup/simple_markup/inline.rb
@@ -97,20 +97,6 @@ module SM
     # be optimistic
     #
 
-=begin
-    ATTR_FLAG  = 001
-    A_START    = 002
-    A_END      = 003
-    A_SPECIAL_START = 005
-    A_SPECIAL_END   = 006
-
-    START_ATTR   = ATTR_FLAG.chr + A_START.chr
-    END_ATTR     = ATTR_FLAG.chr + A_END.chr
-
-    START_SPECIAL = ATTR_FLAG.chr + A_SPECIAL_START.chr
-    END_SPECIAL   = ATTR_FLAG.chr + A_SPECIAL_END.chr
-
-=end
     A_PROTECT  = 004
     PROTECT_ATTR  = A_PROTECT.chr
 
@@ -216,7 +202,7 @@ module SM
     end
 
     def unmask_protected_sequences
-      @str.gsub!(/(.)#{PROTECT_ATTR}/, '\1')
+      @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
     end
 
     def initialize
@@ -257,10 +243,13 @@ module SM
 
     def flow(str)
       @str = str
-      @attrs = AttrSpan.new(str.length)
 
       puts("Before flow, str='#{@str.dump}'") if $DEBUG
       mask_protected_sequences
+ 
+      @attrs = AttrSpan.new(@str.length)
+
+      puts("After protecting, str='#{@str.dump}'") if $DEBUG
       convert_attrs(@str, @attrs)
       convert_html(@str, @attrs)
       convert_specials(str, @attrs)
diff --git a/lib/rdoc/markup/test/TestInline.rb b/lib/rdoc/markup/test/TestInline.rb
index c76f21dce5..a067d4c24c 100644
--- a/lib/rdoc/markup/test/TestInline.rb
+++ b/lib/rdoc/markup/test/TestInline.rb
@@ -141,6 +141,9 @@ class TestInline < Test::Unit::TestCase
                   @am.flow("cat <i>and</i> \\<B>dog</b>"))
     
     assert_equal(["*word* or <b>text</b>"], @am.flow("\\*word* or \\<b>text</b>"))
+
+    assert_equal(["_cat_", @em_on, "dog", @em_off], 
+                  @am.flow("\\_cat_<i>dog</i>"))
   end
 
   def test_adding