[ruby/rdoc] Convert single quotes in character entity references

As well as double quotes. ruby/rdoc#824 (comment) ruby/rdoc@09002bdab5
ruby · Sep 11, 2021 · c5c0f5c · c5c0f5c
1 parent 30b4da2
commit c5c0f5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
@@ -240,7 +240,7 @@ def to_html text
       when s.scan(/''/) then # tick double quote
         html << encoded[:close_dquote]
         after_word = nil
-      when s.scan(/'/) then # single quote
+      when s.scan(/&#39;|'/) then # single quote
         if insquotes
           html << encoded[:close_squote]
           insquotes = false

diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb
@@ -485,6 +485,13 @@ def test_to_html_apostrophe
     assert_equal '‘a’ ‘', to_html("'a' '")
   end
 
+  def test_to_html_apostrophe_entity
+    assert_equal '‘a', to_html("&#39;a")
+    assert_equal 'a’', to_html("a&#39;")
+
+    assert_equal '‘a’ ‘', to_html("&#39;a&#39; &#39;")
+  end
+
   def test_to_html_backslash
     assert_equal 'S', to_html('\\S')
   end