Merge pull request #877 from kmuto/escape_in_fence

フェンス記法内で@をエスケープ

lib/review/compiler.rb

@@ -508,7 +508,7 @@ def compile_single(syntax, args)
     def replace_fence(str)
       str.gsub(/@<(\w+)>([$|])(.+?)(\2)/) do
         op = $1
-        arg = $3.gsub('\\}') { '\\\\}' }.gsub('}') { '\}' }.sub(/(?:\\)+$/) { |m| '\\\\' * m.size }
+        arg = $3.gsub('@', "\x01").gsub('\\}') { '\\\\}' }.gsub('}') { '\}' }.sub(/(?:\\)+$/) { |m| '\\\\' * m.size }
         "@<#{op}>{#{arg}}"
       end
     end
@@ -522,7 +522,7 @@ def text(str)
         result << compile_inline(words.shift.gsub(/\\\}/, '}').gsub(/\\\\/, '\\'))
         result << @strategy.nofunc_text(words.shift)
       end
-      result
+      result.gsub("\x01", '@')
     rescue => err
       error err.message
     end

test/test_htmlbuilder.rb

@@ -1681,4 +1681,9 @@ def test_inline_comment_for_draft
     actual = compile_inline('test @<comment>{コメント} test2')
     assert_equal %Q(test <span class="draft-comment">コメント</span> test2), actual
   end
+
+  def test_inline_fence
+    actual = compile_inline('test @<code>|@<code>{$サンプル$}|')
+    assert_equal 'test <code class="inline-code tt">@&lt;code&gt;{$サンプル$}</code>', actual
+  end
 end

test/test_latexbuilder.rb

@@ -953,6 +953,11 @@ def test_inline_comment_for_draft
     assert_equal 'test \\pdfcomment{コメント} test2', actual
   end
 
+  def test_inline_fence
+    actual = compile_inline('test @<code>|@<code>{$サンプル$}|')
+    assert_equal 'test \\texttt{@\\textless{}code\\textgreater{}\\{\\textdollar{}サンプル\\textdollar{}\\}}', actual
+  end
+
   def test_appendix_list
     @chapter.instance_eval do
       def on_appendix?