diff options
| -rw-r--r-- | lib/rdoc/markup/attribute_manager.rb | 17 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_markup_to_html.rb | 5 |
2 files changed, 18 insertions, 4 deletions
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb index 64ef7fd159..2de8a7c9ee 100644 --- a/lib/rdoc/markup/attribute_manager.rb +++ b/lib/rdoc/markup/attribute_manager.rb @@ -140,6 +140,11 @@ class RDoc::Markup::AttributeManager # character def convert_attrs(str, attrs, exclusive = false) + convert_attrs_matching_word_pairs(str, attrs, exclusive) + convert_attrs_word_pair_map(str, attrs, exclusive) + end + + def convert_attrs_matching_word_pairs(str, attrs, exclusive) # first do matching ones tags = @matching_word_pairs.select { |start, bitmap| if exclusive && exclusive?(bitmap) @@ -149,21 +154,25 @@ class RDoc::Markup::AttributeManager else false end - }.keys.join("") + }.keys + return if tags.empty? + all_tags = @matching_word_pairs.keys - re = /(^|\W)([#{tags}])([#\\]?[\w:.\/\[\]-]+?\S?)\2(\W|$)/ + re = /(^|\W|[#{all_tags.join("")}])([#{tags.join("")}])(\2*[#\\]?[\w:.\/\[\]-]+?\S?)\2(?!\2)([#{all_tags.join("")}]|\W|$)/ 1 while str.gsub!(re) { |orig| attr = @matching_word_pairs[$2] - updated = attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr) - if updated + attr_updated = attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr) + if attr_updated $1 + NULL * $2.length + $3 + NULL * $2.length + $4 else $1 + NON_PRINTING_START + $2 + NON_PRINTING_END + $3 + NON_PRINTING_START + $2 + NON_PRINTING_END + $4 end } str.delete!(NON_PRINTING_START + NON_PRINTING_END) + end + def convert_attrs_word_pair_map(str, attrs, exclusive) # then non-matching unless @word_pair_map.empty? then @word_pair_map.each do |regexp, attr| diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb index 6ec52989c7..0b25f462ae 100644 --- a/test/rdoc/test_rdoc_markup_to_html.rb +++ b/test/rdoc/test_rdoc_markup_to_html.rb @@ -710,6 +710,11 @@ EXPECTED assert_equal "\n<p><a href=\":symbol\">aaa</a></p>\n", @to.convert('aaa[:symbol]') end + def test_convert_underscore_adjacent_to_code + assert_equal "\n<p><code>aaa</code>_</p>\n", @to.convert(%q{+aaa+_}) + assert_equal "\n<p>`<code>i386-mswin32_</code><em>MSRTVERSION</em>'</p>\n", @to.convert(%q{`+i386-mswin32_+_MSRTVERSION_'}) + end + def test_gen_url assert_equal '<a href="example">example</a>', @to.gen_url('link:example', 'example') |