review 5.0.0 → 5.1.0

data/test/test_epubmaker_cmd.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 require 'yaml'
 require 'rbconfig'
 
-REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', File.dirname(__FILE__))
+REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', __dir__)
 
 class EPUBMakerCmdTest < Test::Unit::TestCase
   def setup
@@ -12,7 +12,7 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
     @tmpdir2 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('lib', __dir__)
   end
 
   def teardown

data/test/test_helper.rb

@@ -1,4 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
+$LOAD_PATH.unshift(File.realpath('../lib', __dir__))
+
 require 'test/unit'
 require 'fileutils'
 require 'review/yamlloader'
@@ -9,18 +10,18 @@ def touch_file(path)
 end
 
 def assets_dir
-  File.join(File.dirname(__FILE__), 'assets')
+  File.join(__dir__, 'assets')
 end
 
 def prepare_samplebook(srcdir, bookdir, latextemplatedir, configfile)
-  samplebook_dir = File.expand_path("../samples/#{bookdir}/", File.dirname(__FILE__))
+  samplebook_dir = File.expand_path("../samples/#{bookdir}/", __dir__)
   files = Dir.glob(File.join(samplebook_dir, '*'))
   # ignore temporary built files
   files.delete_if { |file| file =~ /.*-(pdf|epub|text)/ || file == 'webroot' }
   FileUtils.cp_r(files, srcdir)
   if latextemplatedir
     # copy from review-jsbook or review-jlreq
-    template_dir = File.expand_path("../templates/latex/#{latextemplatedir}/", File.dirname(__FILE__))
+    template_dir = File.expand_path("../templates/latex/#{latextemplatedir}/", __dir__)
     FileUtils.cp(Dir.glob(File.join(template_dir, '*')), File.join(srcdir, 'sty'))
   end
   loader = ReVIEW::YAMLLoader.new

data/test/test_htmlbuilder.rb

@@ -8,7 +8,6 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def setup
     ReVIEW::I18n.setup
-    @builder = HTMLBuilder.new
     @config = ReVIEW::Configure.values
     @config['secnolevel'] = 2
     @config['stylesheet'] = nil
@@ -16,11 +15,14 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @config['epubmaker'] = {}
     @book = Book::Base.new('.')
     @book.config = @config
+    img_math = ReVIEW::ImgMath.new(@config)
+    @builder = HTMLBuilder.new(img_math: img_math)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
     I18n.setup('ja')
+    @skip_pygments = true # temporary suppress pygments test
   end
 
   def test_xmlns_ops_prefix_epub3
@@ -358,12 +360,26 @@ EOS
     rescue LoadError
       return true
     end
-    @config['mathml'] = true
+    @config['math_format'] = 'mathml'
     actual = compile_inline('@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}')
-    @config['mathml'] = nil
     assert_equal %Q(<span class="equation"><math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mfrac><mrow><mo stretchy='false'>-</mo><mi>b</mi><mo stretchy='false'>&#xb1;</mo><msqrt><mrow><msup><mi>b</mi><mn>2</mn></msup><mo stretchy='false'>-</mo><mn>4</mn><mi>a</mi><mi>c</mi></mrow></msqrt></mrow><mrow><mn>2</mn><mi>a</mi></mrow></mfrac></math></span>), actual
   end
 
+  def test_inline_mathjax
+    @config['math_format'] = 'mathjax'
+    actual = compile_inline('@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}')
+    assert_equal %Q(<span class="equation">\\( \\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a} \\)</span>), actual
+
+    content = <<-EOF
+//texequation{
+\\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a}
+//}
+EOF
+    actual = compile_block(content)
+    expected = %Q(<div class="equation">\n$$\\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a}$$\n</div>\n)
+    assert_equal expected, actual
+  end
+
   def test_inline_img
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
@@ -614,6 +630,20 @@ EOS
 EOS
     assert_equal expected, actual
 
+    actual = compile_block("//image[sampleimg][]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="" />
+<p class="caption">
+図1.1: 
+</p>
+</div>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//image[sampleimg][][]{\n//}\n")
+    assert_equal expected, actual
+
     @config['caption_position']['image'] = 'top'
     actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
     expected = <<-EOS
@@ -730,6 +760,12 @@ EOS
 </div>
 EOS
     assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][]\n")
+    assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][][]\n")
+    assert_equal expected, actual
   end
 
   def test_indepimage_with_metric
@@ -944,6 +980,8 @@ EOS
   end
 
   def test_list_pygments
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -971,6 +1009,8 @@ test&lt;i&gt;2&lt;/i&gt;
   end
 
   def test_list_pygments_lang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -999,6 +1039,8 @@ EOS
   end
 
   def test_list_pygments_nulllang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1191,6 +1233,8 @@ EOS
   end
 
   def test_listnum_pygments_lang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1218,6 +1262,8 @@ EOS
   end
 
   def test_listnum_pygments_lang_linenum
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1246,6 +1292,8 @@ EOS
   end
 
   def test_listnum_pygments_lang_without_lang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1432,6 +1480,8 @@ EOS
   end
 
   def test_emlist_pygments_lang
+    return true if @skip_pygments
+
     begin
       require 'pygments'
     rescue LoadError
@@ -1568,6 +1618,8 @@ EOS
   end
 
   def test_cmd_pygments
+    return true if @skip_pygments
+
     begin
       require 'pygments'
     rescue LoadError
@@ -1614,13 +1666,16 @@ EOS
   def test_texequation
     return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
+
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
                  'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P} q\n//}\n") do |dir, book, _files|
       @book = book
       @book.config = @config
-      @config['imgmath'] = true
+      @config['math_format'] = 'imgmath'
       @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
       location = Location.new(nil, nil)
+      img_math = ReVIEW::ImgMath.new(@config)
+      @builder = HTMLBuilder.new(img_math: img_math)
       @builder.bind(@compiler, @chapter, location)
       FileUtils.mkdir_p(File.join(dir, 'images'))
       expected = <<-EOB
@@ -1644,14 +1699,17 @@ EOS
     # Re:VIEW 3 never fail on defer mode. This test is only for Re:VIEW 2.
     return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
+
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
                  'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P}} q\n//}\n") do |dir, book, _files|
       @book = book
       @book.config = @config
       @config['review_version'] = 2
-      @config['imgmath'] = true
+      @config['math_format'] = 'imgmath'
       @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
       location = Location.new(nil, nil)
+      img_math = ReVIEW::ImgMath.new(@config)
+      @builder = HTMLBuilder.new(img_math: img_math)
       @builder.bind(@compiler, @chapter, location)
       FileUtils.mkdir_p(File.join(dir, 'images'))
       tmpio = $stderr
@@ -2756,7 +2814,7 @@ EOB
       end
       @book.config['words_file'] = File.join(dir, 'words.csv')
       io = StringIO.new
-      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(<p>foo bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ} <b>bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ}</b> [missing word: N]</p>\n), actual
       assert_match(/WARN --: :1: word not bound: N/, io.string)

data/test/test_idgxmlbuilder.rb

@@ -48,6 +48,19 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(<title id="test" aid:pstyle="h3">1.0.1　this is test.</title><?dtp level="3" section="1.0.1　this is test."?>), actual
   end
 
+  def test_headline_secttags
+    @config['structuredxml'] = true
+    actual = compile_block("= HEAD1\n== HEAD1-1\n\n=== HEAD1-1-1\n\n== HEAD1-2\n\n==== HEAD1-2-0-1\n\n===== HEAD1-2-0-1-1\n\n== HEAD1-3\n")
+    expected = '<chapter id="chap:1"><title aid:pstyle="h1">第1章　HEAD1</title><?dtp level="1" section="第1章　HEAD1"?>' +
+               '<sect id="sect:1.1"><title aid:pstyle="h2">1.1　HEAD1-1</title><?dtp level="2" section="1.1　HEAD1-1"?>' +
+               '<sect2 id="sect:1.1.1"><title aid:pstyle="h3">HEAD1-1-1</title><?dtp level="3" section="HEAD1-1-1"?></sect2></sect>' +
+               '<sect id="sect:1.2"><title aid:pstyle="h2">1.2　HEAD1-2</title><?dtp level="2" section="1.2　HEAD1-2"?>' +
+               '<sect3 id="sect:1.2.0.1"><title aid:pstyle="h4">HEAD1-2-0-1</title><?dtp level="4" section="HEAD1-2-0-1"?>' +
+               '<sect4 id="sect:1.2.0.1.1"><title aid:pstyle="h5">HEAD1-2-0-1-1</title><?dtp level="5" section="HEAD1-2-0-1-1"?></sect4></sect3></sect>' +
+               '<sect id="sect:1.3"><title aid:pstyle="h2">1.3　HEAD1-3</title><?dtp level="2" section="1.3　HEAD1-3"?></sect></chapter>'
+    assert_equal expected, actual
+  end
+
   def test_label
     actual = compile_block("//label[label_test]\n")
     assert_equal %Q(<label id='label_test' />), actual

data/test/test_idgxmlmaker_cmd.rb

@@ -5,14 +5,14 @@ require 'yaml'
 require 'rbconfig'
 require 'open3'
 
-REVIEW_IDGXMLMAKER = File.expand_path('../bin/review-idgxmlmaker', File.dirname(__FILE__))
+REVIEW_IDGXMLMAKER = File.expand_path('../bin/review-idgxmlmaker', __dir__)
 
 class IDGXMLMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('../lib', __dir__)
   end
 
   def teardown
@@ -29,7 +29,11 @@ class IDGXMLMakerCmdTest < Test::Unit::TestCase
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
       Dir.chdir(@tmpdir1) do
         _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_IDGXMLMAKER} #{option} #{configfile}")
-        assert_equal '', e
+        if defined?(ReVIEW::TTYLogger)
+          assert_match(/SUCCESS/, e)
+        else
+          assert_equal '', e
+        end
         assert s.success?
       end
       assert File.exist?(File.join(@tmpdir1, targetfile))

data/test/test_img_math.rb

@@ -0,0 +1,111 @@
+require 'test_helper'
+require 'review/htmlbuilder'
+require 'review/img_math'
+require 'mini_magick'
+
+class ImgMathTest < Test::Unit::TestCase
+  def setup
+    @config = ReVIEW::Configure.values
+    @tmpdir = Dir.mktmpdir
+    @config.merge!(
+      'math_format' => 'imgmath',
+      'texcommand' => 'uplatex',
+      'imagedir' => @tmpdir
+    )
+    @config['imgmath_options']['fontsize'] = 24
+    @img_math = ReVIEW::ImgMath.new(@config)
+  end
+
+  def teardown
+    @img_math.cleanup_mathimg
+    FileUtils.rm_rf(@tmpdir)
+  end
+
+  def test_defer_math_image_pathname
+    str1 = '$A > B \\gg C$'
+    key1 = Digest::SHA256.hexdigest(str1)
+    img_path1 = @img_math.defer_math_image(str1, key1)
+
+    assert_equal "_gen_#{key1}.png", File.basename(img_path1)
+  end
+
+  def test_defer_math_image
+    unless support_latex_in_tests?
+      $stderr.puts 'skip test_defer_math_image'
+      return true
+    end
+
+    str1 = '$\\sum_{i=1}^nf_n(x) \\in \\mathbb{R}$'
+    key1 = Digest::SHA256.hexdigest(str1)
+    img_path1 = @img_math.defer_math_image(str1, key1)
+    str2 = '$\\sum_{i=1}^nf_n(X) \\in \\mathbb{R}$'
+    key2 = Digest::SHA256.hexdigest(str2)
+    img_path2 = @img_math.defer_math_image(str2, key2)
+    @img_math.make_math_images
+
+    assert File.exist?(img_path1)
+    assert File.exist?(img_path2)
+
+    val1 = compare_images(img_path1, File.join(assets_dir, 'img_math/img1.png'))
+    assert_equal 0, val1
+
+    val2 = compare_images(img_path2, File.join(assets_dir, 'img_math/img2.png'))
+    assert_equal 0, val2
+
+    val3 = compare_images(img_path1, img_path2)
+    assert val3 > 100
+  end
+
+  def test_make_math_image_pathname
+    unless support_latex_in_tests?
+      $stderr.puts 'skip test_make_math_image_pathname'
+      return true
+    end
+
+    str1 = '$A > B \\gg C$'
+    key1 = Digest::SHA256.hexdigest(str1)
+    img_path1 = @img_math.make_math_image(str1, key1)
+
+    assert_equal "_gen_#{key1}.png", File.basename(img_path1)
+  end
+
+  def test_make_math_image
+    unless support_latex_in_tests?
+      $stderr.puts 'skip test_make_math_image'
+      return true
+    end
+    str1 = '$A > B \\gg C$'
+    key1 = Digest::SHA256.hexdigest(str1)
+    img_path1 = @img_math.make_math_image(str1, key1)
+
+    assert File.exist?(img_path1)
+
+    val1 = compare_images(img_path1, File.join(assets_dir, 'img_math/img3.png'))
+    assert val1 < 10
+  end
+
+  private
+
+  def compare_images(image1, image2)
+    compare = MiniMagick::Tool::Compare.new(whiny: false)
+    compare << '-fuzz'
+    compare << '10%'
+    compare.metric('AE')
+    compare << image1
+    compare << image2
+    compare << File.join(@tmpdir, 'diff.jpg')
+
+    compare.call do |_, dist, _|
+      return dist.to_i
+    end
+  end
+
+  def support_latex_in_tests?
+    begin
+      `uplatex -v`
+      true
+    rescue
+      false
+    end
+  end
+end

data/test/test_indexbuilder.rb

@@ -24,28 +24,28 @@ class IndexBuidlerTest < Test::Unit::TestCase
 
   def test_check_id
     io = StringIO.new
-    @b.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @b.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @b.check_id('ABC')
     assert_match('', io.string)
 
     %w(# % \\ { } [ ] ~ / $ ' " | * ? & < > `).each do |c|
       io = StringIO.new
-      @b.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      @b.instance_eval { @logger = ReVIEW::Logger.new(io) }
       @b.check_id("id#{c}")
       assert_match(/deprecated ID: `#{Regexp.escape(c)}` in `id#{Regexp.escape(c)}`/, io.string)
     end
     io = StringIO.new
-    @b.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @b.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @b.check_id('A B C#')
     assert_match(/deprecated ID: ` ` in `A B C#`/, io.string)
 
     io = StringIO.new
-    @b.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @b.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @b.check_id("A\tB")
     assert_match(/deprecated ID: `\t` in `A\tB`/, io.string)
 
     io = StringIO.new
-    @b.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @b.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @b.check_id('.ABC')
     assert_match(/deprecated ID: `.ABC` begins from `.`/, io.string)
   end

data/test/test_latexbuilder.rb

@@ -197,6 +197,16 @@ EOS
     assert_equal 'abc\\reviewunderline{def}ghi', actual
   end
 
+  def test_inline_ins
+    actual = compile_inline('abc@<ins>{def}ghi')
+    assert_equal 'abc\\reviewinsert{def}ghi', actual
+  end
+
+  def test_inline_del
+    actual = compile_inline('abc@<del>{def}ghi')
+    assert_equal 'abc\\reviewstrike{def}ghi', actual
+  end
+
   def test_inline_bou
     actual = compile_inline('傍点の@<bou>{テスト}です。')
     assert_equal '傍点の\\reviewbou{テスト}です。', actual
@@ -296,13 +306,65 @@ EOS
       return true
     end
     tmpdir = Dir.mktmpdir
-    File.write(File.join(tmpdir, 'sample.dic'), "強運\tはーどらっく\n")
+    File.write(File.join(tmpdir, 'sample.dic'), "強運\tはーどらっく\nmain（ブロック）\tmain{|}\n")
     @book.config['pdfmaker']['makeindex'] = true
     @book.config['pdfmaker']['makeindex_dic'] = "#{tmpdir}/sample.dic"
     @builder.setup_index
     actual = compile_inline('@<hidx>{漢字}@<hidx>{強運}@<hidx>{項目@1<<>>項目@2}')
-    FileUtils.remove_entry_secure(tmpdir)
     assert_equal %Q(\\index{かんじ@漢字}\\index{はーどらっく@強運}\\index{こうもく"@1@項目"@1!こうもく"@2@項目"@2}), actual
+    actual = compile_inline('@<hidx>{main（ブロック）}@<hidx>{あいうえお{\}}')
+    FileUtils.remove_entry_secure(tmpdir)
+    assert_equal %Q(\\index{main｛｜｝@main（ブロック）}\\index{あいうえお｛｝@あいうえお\\reviewleftcurlybrace{}\\reviewrightcurlybrace{}}), actual
+  end
+
+  def test_inline_idx_escape
+    # as is
+    %w[a あ ' ( ) = ` + ; * : , . ? /].each do |c|
+      actual = @builder.index(c)
+      assert_equal %Q(\\index{#{c}}), actual
+    end
+    actual = @builder.index('[')
+    assert_equal %Q(\\index{[}), actual
+    actual = @builder.index(']')
+    assert_equal %Q(\\index{]}), actual
+
+    # escape display string by "
+    %w[! " @].each do |c|
+      actual = @builder.index(c)
+      assert_equal %Q(\\index{"#{c}@"#{c}}), actual
+    end
+
+    # escape display string by \
+    %w[# % &].each do |c|
+      actual = @builder.index(c)
+      assert_equal %Q(\\index{#{c}@\\#{c}}), actual
+    end
+
+    # escape display string by macro
+    actual = @builder.index('$')
+    assert_equal %Q(\\index{$@\\textdollar{}}), actual
+    actual = @builder.index('-')
+    assert_equal %Q(\\index{-@{-}}), actual
+    actual = @builder.index('~')
+    assert_equal %Q(\\index{~@\\textasciitilde{}}), actual
+    actual = @builder.index('^')
+    assert_equal %Q(\\index{^@\\textasciicircum{}}), actual
+    actual = @builder.index('\\')
+    assert_equal %Q(\\index{\\@\\reviewbackslash{}}), actual
+    actual = @builder.index('<')
+    assert_equal %Q(\\index{<@\\textless{}}), actual
+    actual = @builder.index('>')
+    assert_equal %Q(\\index{>@\\textgreater{}}), actual
+    actual = @builder.index('_')
+    assert_equal %Q(\\index{_@\\textunderscore{}}), actual
+
+    # escape both sort key and display string
+    actual = @builder.index('{')
+    assert_equal %Q(\\index{｛@\\reviewleftcurlybrace{}}), actual
+    actual = @builder.index('|')
+    assert_equal %Q(\\index{｜@\\textbar{}}), actual
+    actual = @builder.index('}')
+    assert_equal %Q(\\index{｝@\\reviewrightcurlybrace{}}), actual
   end
 
   def test_jis_x_0201_kana
@@ -1039,6 +1101,19 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    actual = compile_block("//image[sampleimg][]{\n//}\n")
+    expected = <<-EOS
+\\begin{reviewimage}%%sampleimg
+\\reviewimagecaption{}
+\\label{image:chap1:sampleimg}
+\\reviewincludegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
+\\end{reviewimage}
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//image[sampleimg][][]{\n//}\n")
+    assert_equal expected, actual
   end
 
   def test_image_with_metric
@@ -1187,6 +1262,12 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][]\n")
+    assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][][]\n")
+    assert_equal expected, actual
   end
 
   def test_indepimage_with_metric
@@ -1286,7 +1367,7 @@ EOS
     end
 
     io = StringIO.new
-    @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
 
     actual = compile_block("//indepimage[sample_img_nofile_][sample photo]\n")
     expected = <<-EOS
@@ -1324,6 +1405,16 @@ ccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline
 EOS
     assert_equal expected, actual
 
+    actual = compile_block("//table[foo][]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+\\begin{reviewtable}{|l|l|}
+\\hline
+\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline
+ccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline
+\\end{reviewtable}
+EOS
+    assert_equal expected, actual
+
     @config['caption_position']['table'] = 'bottom'
     actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
     expected = <<-EOS
@@ -1491,6 +1582,18 @@ EOS
 EOS
     assert_equal expected, actual
 
+    actual = compile_block("//imgtable[sampleimg][]{\n//}\n")
+    expected = <<-EOS
+\\label{table:chap1:sampleimg}
+\\begin{reviewimage}%%sampleimg
+\\reviewincludegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
+\\end{reviewimage}
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//imgtable[sampleimg][][]{\n//}\n")
+    assert_equal expected, actual
+
     @book.config['pdfmaker']['use_original_image_size'] = true
     actual = compile_block("//imgtable[sampleimg][test for imgtable]{\n//}\n")
 
@@ -2312,7 +2415,7 @@ EOB
       @book.config['words_file'] = File.join(dir, 'words.csv')
 
       io = StringIO.new
-      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       expected = <<-EOS