review 3.2.0 → 5.1.0

data/test/test_indexbuilder.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+require 'review/builder'
+
+require 'review/book'
+
+class MockCompiler
+  def text(s)
+    [:text, s]
+  end
+end
+
+class IndexBuidlerTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @b = IndexBuilder.new
+    chap = ReVIEW::Book::Chapter.new(nil, nil, '-', nil)
+    @b.bind(MockCompiler.new, chap, nil)
+  end
+
+  def test_initialize
+    assert IndexBuilder.new
+  end
+
+  def test_check_id
+    io = StringIO.new
+    @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.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.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.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.check_id('.ABC')
+    assert_match(/deprecated ID: `.ABC` begins from `.`/, io.string)
+  end
+end

data/test/test_latexbuilder.rb

@@ -14,10 +14,10 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       'secnolevel' => 2, # for IDGXMLBuilder, EPUBBuilder
       'toclevel' => 2,
       'stylesheet' => nil, # for EPUBBuilder
-      'image_scale2width' => false,
       'texcommand' => 'uplatex',
-      'review_version' => '3'
+      'review_version' => '4'
     )
+    @config['pdfmaker']['image_scale2width'] = nil
     @book = Book::Base.new
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -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
@@ -247,12 +257,18 @@ EOS
 
   def test_inline_hd_chap
     def @chapter.headline_index
-      items = [Book::HeadlineIndex::Item.new('chap1|test', [1, 1], 'te_st')]
-      Book::HeadlineIndex.new(items, self)
+      item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')
+      idx = Book::HeadlineIndex.new(self)
+      idx.add_item(item)
+      idx
     end
 
     @config['secnolevel'] = 3
     actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test \reviewsecref{「1.1.1 te\\textunderscore{}st」}{sec:1-1-1} test2', actual
+
+    @config['chapterlink'] = nil
+    actual = compile_inline('test @<hd>{chap1|test} test2')
     assert_equal 'test 「1.1.1 te\\textunderscore{}st」 test2', actual
   end
 
@@ -282,21 +298,73 @@ EOS
   end
 
   def test_inline_idx_yomi
+    require 'nkf'
     begin
       require 'MeCab'
-      require 'nkf'
     rescue LoadError
       $stderr.puts 'skip test_inline_idx_yomi (cannot find MeCab)'
       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
@@ -307,7 +375,7 @@ EOS
   end
 
   def test_dlist
-    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
     expected = <<-EOS
 
 \\begin{description}
@@ -315,12 +383,23 @@ EOS
 foo.
 bar.
 \\end{description}
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
+    expected = <<-EOS
+
+\\begin{description}
+\\item[foo] \\mbox{} \\\\
+foo. bar.
+\\end{description}
 EOS
     assert_equal expected, actual
   end
 
   def test_dlist_with_bracket
-    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
     expected = <<-EOS
 
 \\begin{description}
@@ -328,6 +407,17 @@ EOS
 foo.
 bar.
 \\end{description}
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
+    expected = <<-EOS
+
+\\begin{description}
+\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\
+foo. bar.
+\\end{description}
 EOS
     assert_equal expected, actual
   end
@@ -364,6 +454,19 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_dt_inline
+    actual = compile_block("//footnote[bar][bar]\n\n : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+
+    expected = <<-EOS
+
+\\begin{description}
+\\item[foo\\protect\\footnotemark{}\\lbrack{}\\rbrack{}\\textless{}\\textgreater{}\\&$\\alpha\\lbrack{}\\rbrack{}$] \\mbox{} \\\\
+
+\\end{description}
+EOS
+    assert_equal expected, actual
+  end
+
   def test_cmd
     actual = compile_block("//cmd{\nfoo\nbar\n\nbuz\n//}\n")
     expected = <<-EOS
@@ -393,6 +496,22 @@ bar
 buz
 \\end{reviewcmd}
 \\end{reviewlistblock}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+\\begin{reviewlistblock}
+\\begin{reviewcmd}
+foo
+bar
+
+buz
+\\end{reviewcmd}
+\\reviewcmdcaption{cap1}
+\\end{reviewlistblock}
 EOS
     assert_equal expected, actual
   end
@@ -468,6 +587,22 @@ bar
 buz
 \\end{reviewemlist}
 \\end{reviewlistblock}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+\\begin{reviewlistblock}
+\\begin{reviewemlist}
+foo
+bar
+
+buz
+\\end{reviewemlist}
+\\reviewemlistcaption{cap1}
+\\end{reviewlistblock}
 EOS
     assert_equal expected, actual
   end
@@ -534,6 +669,22 @@ EOS
  4: buz
 \\end{reviewemlist}
 \\end{reviewlistblock}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+\\begin{reviewlistblock}
+\\begin{reviewemlist}
+ 1: foo
+ 2: bar
+ 3: 
+ 4: buz
+\\end{reviewemlist}
+\\reviewemlistcaption{cap1}
+\\end{reviewlistblock}
 EOS
     assert_equal expected, actual
   end
@@ -550,6 +701,21 @@ bar
 buz
 \\end{reviewlist}
 \\end{reviewlistblock}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//list[id1][cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+\\begin{reviewlistblock}
+\\begin{reviewlist}
+foo
+bar
+
+buz
+\\end{reviewlist}
+\\reviewlistcaption{リスト1.1: cap1}
+\\end{reviewlistblock}
 EOS
     assert_equal expected, actual
   end
@@ -562,6 +728,16 @@ EOS
 \\begin{reviewlistlst}[caption={cap1},language={sql}]
 SELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'
 \\end{reviewlistlst}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    # XXX: caption_position won't work with highlight
+    actual = compile_block("//list[id1][cap1][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    expected = <<-EOS
+\\begin{reviewlistlst}[caption={cap1},language={sql}]
+SELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'
+\\end{reviewlistlst}
 EOS
     assert_equal expected, actual
   end
@@ -594,6 +770,24 @@ EOS
  7: end
 \\end{reviewlist}
 \\end{reviewlistblock}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
+    expected = <<-EOS
+\\begin{reviewlistblock}
+\\begin{reviewlist}
+ 1: class Foo
+ 2:   def foo
+ 3:     bar
+ 4: 
+ 5:     buz
+ 6:   end
+ 7: end
+\\end{reviewlist}
+\\reviewlistcaption{リスト1.1: ruby}
+\\end{reviewlistblock}
 EOS
     assert_equal expected, actual
   end
@@ -631,6 +825,22 @@ class Foo
   end
 end
 \\end{reviewlistnumlst}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    # XXX: caption_position won't work with highlight
+    actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
+    expected = <<-EOS
+\\begin{reviewlistnumlst}[caption={ruby},language={}]
+class Foo
+  def foo
+    bar
+
+    buz
+  end
+end
+\\end{reviewlistnumlst}
 EOS
     assert_equal expected, actual
   end
@@ -665,6 +875,21 @@ bar
 buz
 \\end{reviewsource}
 \\end{reviewlistblock}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+\\begin{reviewlistblock}
+\\begin{reviewsource}
+foo
+bar
+
+buz
+\\end{reviewsource}
+\\reviewsourcecaption{foo/bar/test.rb}
+\\end{reviewlistblock}
 EOS
     assert_equal expected, actual
   end
@@ -693,6 +918,19 @@ EOS
 foo
 bar
 
+buz
+\\end{reviewsourcelst}
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    # XXX: caption_position won't work with highlight
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+\\begin{reviewsourcelst}[title={foo/bar/test.rb},language={}]
+foo
+bar
+
 buz
 \\end{reviewsourcelst}
 EOS
@@ -706,6 +944,18 @@ EOS
 \\begin{quote}
 foobar
 
+buz
+\\end{quote}
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+\\begin{quote}
+foo bar
+
 buz
 \\end{quote}
 EOS
@@ -716,9 +966,11 @@ EOS
     actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS
 \\begin{reviewmemo}[this is \\reviewbold{test}\\textless{}\\&\\textgreater{}\\textunderscore{}]
+
 test1
 
 test\\reviewit{2}
+
 \\end{reviewmemo}
 EOS
     assert_equal expected, actual
@@ -731,6 +983,18 @@ EOS
 \\begin{flushright}
 foobar
 
+buz
+\\end{flushright}
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+\\begin{flushright}
+foo bar
+
 buz
 \\end{flushright}
 EOS
@@ -744,6 +1008,18 @@ EOS
 \\begin{center}
 foobar
 
+buz
+\\end{center}
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+\\begin{center}
+foo bar
+
 buz
 \\end{center}
 EOS
@@ -769,13 +1045,23 @@ bar
 
 foo2
 bar2
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+\\noindent
+foo bar
+
+foo2 bar2
 EOS
     assert_equal expected, actual
   end
 
   def test_image
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -789,11 +1075,50 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    expected = <<-EOS
+\\begin{reviewimage}%%sampleimg
+\\reviewincludegraphics[ ]{./images/chap1-sampleimg.png}
+\\reviewimagecaption{sample photo}
+\\label{image:chap1:sampleimg}
+\\end{reviewimage}
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//image[sampleimg][sample photo][]{\n//}\n")
+    assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = nil
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    expected = <<-EOS
+\\begin{reviewimage}%%sampleimg
+\\reviewimagecaption{sample photo}
+\\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")
+    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
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -807,16 +1132,20 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
+    assert_equal expected, actual
   end
 
   def test_image_with_metric_width
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    @config['image_scale2width'] = true
+    @config['pdfmaker']['image_scale2width'] = true
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
@@ -826,11 +1155,15 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
+    assert_equal expected, actual
   end
 
   def test_image_with_metric2
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -844,16 +1177,20 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
+    assert_equal expected, actual
   end
 
   def test_image_with_metric2_width
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    @config['image_scale2width'] = true
+    @config['pdfmaker']['image_scale2width'] = true
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
@@ -863,11 +1200,15 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
+    assert_equal expected, actual
   end
 
   def test_indepimage
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -880,28 +1221,58 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
-  end
-
-  def test_indepimage_without_caption
-    def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
-      item.instance_eval { @path = './images/chap1-sampleimg.png' }
-      item
-    end
 
-    # FIXME: indepimage's caption should not be with a counter.
-    actual = compile_block("//indepimage[sampleimg]\n")
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    expected = <<-EOS
+\\begin{reviewimage}%%sampleimg
+\\reviewincludegraphics[ ]{./images/chap1-sampleimg.png}
+\\reviewindepimagecaption{図: sample photo}
+\\end{reviewimage}
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][sample photo][]\n")
+    assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = nil
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    expected = <<-EOS
+\\begin{reviewimage}%%sampleimg
+\\reviewindepimagecaption{図: sample photo}
+\\reviewincludegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
+\\end{reviewimage}
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_indepimage_without_caption
+    def @chapter.image(_id)
+      item = Book::Index::Item.new('sampleimg', 1)
+      item.instance_eval { @path = './images/chap1-sampleimg.png' }
+      item
+    end
+
+    # FIXME: indepimage's caption should not be with a counter.
+    actual = compile_block("//indepimage[sampleimg]\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
 \\reviewincludegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
 \\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
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -914,16 +1285,20 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
+    assert_equal expected, actual
   end
 
   def test_indepimage_with_metric_width
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    @config['image_scale2width'] = true
+    @config['pdfmaker']['image_scale2width'] = true
     actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
@@ -932,11 +1307,15 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
+    assert_equal expected, actual
   end
 
   def test_indepimage_with_metric2
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -949,11 +1328,15 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block(%Q(//indepimage[sampleimg][sample photo][scale=1.2, html::class="sample",latex::ignore=params]\n))
+    assert_equal expected, actual
   end
 
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -966,6 +1349,35 @@ EOS
 \\end{reviewimage}
 EOS
     assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//indepimage[sampleimg][][scale=1.2]\n")
+    assert_equal expected, actual
+  end
+
+  def test_indepimage_nofile
+    def @chapter.image(_id)
+      item = Book::Index::Item.new('sample_img_nofile_', 1)
+      item.instance_eval do
+        def path
+          nil
+        end
+      end
+      item
+    end
+
+    io = StringIO.new
+    @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
+
+    actual = compile_block("//indepimage[sample_img_nofile_][sample photo]\n")
+    expected = <<-EOS
+\\begin{reviewdummyimage}
+--[[path = sample\\textunderscore{}img\\textunderscore{}nofile\\textunderscore{} (not exist)]]--
+\\reviewindepimagecaption{図: sample photo}
+\\end{reviewdummyimage}
+EOS
+    assert_equal expected, actual
+    assert_match(/WARN --: :1: image not bound: sample_img_nofile_/, io.string)
   end
 
   def test_table
@@ -990,15 +1402,40 @@ EOS
 ccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline
 \\end{reviewtable}
 \\end{table}
+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
+\\begin{table}%%foo
+\\begin{reviewtable}{|l|l|}
+\\hline
+\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline
+ccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline
+\\end{reviewtable}
+\\reviewtablecaption{FOO}
+\\label{table:chap1:foo}
+\\end{table}
 EOS
     assert_equal expected, actual
   end
 
   def test_empty_table
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n//}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
     assert_equal ':2: error: no rows in the table', e.message
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n------------\n//}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
     assert_equal ':3: error: no rows in the table', e.message
   end
 
@@ -1096,6 +1533,26 @@ ccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline
 \\end{reviewtable}
 \\end{table}
 
+\\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("//emtable[foo]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n//emtable{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+\\begin{table}%%
+\\begin{reviewtable}{|l|l|}
+\\hline
+\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline
+ccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline
+\\end{reviewtable}
+\\reviewtablecaption*{foo}
+\\end{table}
+
 \\begin{reviewtable}{|l|l|}
 \\hline
 \\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline
@@ -1107,7 +1564,7 @@ EOS
 
   def test_imgtable
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample img')
+      item = Book::Index::Item.new('sampleimg', 1, 'sample img')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -1122,13 +1579,127 @@ EOS
 \\reviewincludegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
 \\end{reviewimage}
 \\end{table}
+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")
+
+    expected = <<-EOS
+\\begin{table}[h]%%sampleimg
+\\reviewimgtablecaption{test for imgtable}
+\\label{table:chap1:sampleimg}
+\\begin{reviewimage}%%sampleimg
+\\reviewincludegraphics[ ]{./images/chap1-sampleimg.png}
+\\end{reviewimage}
+\\end{table}
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//imgtable[sampleimg][test for imgtable][]{\n//}\n")
+    assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = nil
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//imgtable[sampleimg][test for imgtable]{\n//}\n")
+
+    expected = <<-EOS
+\\begin{table}[h]%%sampleimg
+\\label{table:chap1:sampleimg}
+\\begin{reviewimage}%%sampleimg
+\\reviewincludegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}
+\\end{reviewimage}
+\\reviewimgtablecaption{test for imgtable}
+\\end{table}
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_imgtable_with_metrics
+    def @chapter.image(_id)
+      item = Book::Index::Item.new('sampleimg', 1, 'sample img')
+      item.instance_eval { @path = './images/chap1-sampleimg.png' }
+      item
+    end
+
+    actual = compile_block("//imgtable[sampleimg][test for imgtable][scale=1.2]{\n//}\n")
+    expected = <<-EOS
+\\begin{table}[h]%%sampleimg
+\\reviewimgtablecaption{test for imgtable}
+\\label{table:chap1:sampleimg}
+\\begin{reviewimage}%%sampleimg
+\\reviewincludegraphics[scale=1.2]{./images/chap1-sampleimg.png}
+\\end{reviewimage}
+\\end{table}
+EOS
+    assert_equal expected, actual
+
+    @book.config['pdfmaker']['use_original_image_size'] = true
+    actual = compile_block("//imgtable[sampleimg][test for imgtable][scale=1.2]{\n//}\n")
+    assert_equal expected, actual
+  end
+
+  def test_table_row_separator
+    src = "//table{\n1\t2\t\t3  4| 5\n------------\na b\tc  d   |e\n//}\n"
+    expected = <<-EOS
+\\begin{reviewtable}{|l|l|l|}
+\\hline
+\\reviewth{1} & \\reviewth{2} & \\reviewth{3  4\\textbar{} 5} \\\\  \\hline
+a b & c  d   \\textbar{}e &  \\\\  \\hline
+\\end{reviewtable}
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'singletab'
+    actual = compile_block(src)
+    expected = <<-EOS
+\\begin{reviewtable}{|l|l|l|l|}
+\\hline
+\\reviewth{1} & \\reviewth{2} & \\reviewth{} & \\reviewth{3  4\\textbar{} 5} \\\\  \\hline
+a b & c  d   \\textbar{}e &  &  \\\\  \\hline
+\\end{reviewtable}
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'spaces'
+    actual = compile_block(src)
+    expected = <<-EOS
+\\begin{reviewtable}{|l|l|l|l|l|}
+\\hline
+\\reviewth{1} & \\reviewth{2} & \\reviewth{3} & \\reviewth{4\\textbar{}} & \\reviewth{5} \\\\  \\hline
+a & b & c & d & \\textbar{}e \\\\  \\hline
+\\end{reviewtable}
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'verticalbar'
+    actual = compile_block(src)
+    expected = <<-EOS
+\\begin{reviewtable}{|l|l|}
+\\hline
+\\reviewth{1	2		3  4} & \\reviewth{5} \\\\  \\hline
+a b	c  d & e \\\\  \\hline
+\\end{reviewtable}
 EOS
     assert_equal expected, actual
   end
 
   def test_bib
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     assert_equal '\\reviewbibref{[1]}{bib:samplebib}', compile_inline('@<bib>{samplebib}')
@@ -1136,7 +1707,7 @@ EOS
 
   def test_bibpaper
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     actual = compile_block("//bibpaper[samplebib][sample bib @<b>{bold}]{\na\nb\n//}\n")
@@ -1146,13 +1717,24 @@ EOS
 
 ab
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//bibpaper[samplebib][sample bib @<b>{bold}]{\na\nb\n//}\n")
+    expected = <<-EOS
+[1] sample bib \\reviewbold{bold}
+\\label{bib:samplebib}
+
+a b
+
 EOS
     assert_equal expected, actual
   end
 
   def test_bibpaper_without_body
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     actual = compile_block("//bibpaper[samplebib][sample bib]\n")
@@ -1284,6 +1866,17 @@ EOS
 \\item BBB
 {-}BB
 \\end{itemize}
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    expected = <<-EOS
+
+\\begin{itemize}
+\\item AAA {-}AA
+\\item BBB {-}BB
+\\end{itemize}
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
@@ -1305,6 +1898,20 @@ EOS
 1\\\\
 {-}BB
 \\end{itemize}
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    expected = <<-EOS
+
+\\begin{itemize}
+\\item AAA\\\\
+ {-}AA
+\\item BBB\\\\
+1\\\\
+ {-}BB
+\\end{itemize}
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
@@ -1397,12 +2004,16 @@ EOS
     actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewnote}
+
 A
 
 B
+
 \\end{reviewnote}
 \\begin{reviewnote}[caption]
+
 A
+
 \\end{reviewnote}
 EOS
     assert_equal expected, actual
@@ -1410,12 +2021,16 @@ EOS
     actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewmemo}
+
 A
 
 B
+
 \\end{reviewmemo}
 \\begin{reviewmemo}[caption]
+
 A
+
 \\end{reviewmemo}
 EOS
     assert_equal expected, actual
@@ -1423,12 +2038,16 @@ EOS
     actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewinfo}
+
 A
 
 B
+
 \\end{reviewinfo}
 \\begin{reviewinfo}[caption]
+
 A
+
 \\end{reviewinfo}
 EOS
     assert_equal expected, actual
@@ -1436,12 +2055,16 @@ EOS
     actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewimportant}
+
 A
 
 B
+
 \\end{reviewimportant}
 \\begin{reviewimportant}[caption]
+
 A
+
 \\end{reviewimportant}
 EOS
     assert_equal expected, actual
@@ -1449,12 +2072,16 @@ EOS
     actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewcaution}
+
 A
 
 B
+
 \\end{reviewcaution}
 \\begin{reviewcaution}[caption]
+
 A
+
 \\end{reviewcaution}
 EOS
     assert_equal expected, actual
@@ -1462,12 +2089,16 @@ EOS
     actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewnotice}
+
 A
 
 B
+
 \\end{reviewnotice}
 \\begin{reviewnotice}[caption]
+
 A
+
 \\end{reviewnotice}
 EOS
     assert_equal expected, actual
@@ -1475,12 +2106,16 @@ EOS
     actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewwarning}
+
 A
 
 B
+
 \\end{reviewwarning}
 \\begin{reviewwarning}[caption]
+
 A
+
 \\end{reviewwarning}
 EOS
     assert_equal expected, actual
@@ -1488,28 +2123,184 @@ EOS
     actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewtip}
+
 A
 
 B
+
 \\end{reviewtip}
 \\begin{reviewtip}[caption]
+
 A
+
 \\end{reviewtip}
 EOS
     assert_equal expected, actual
   end
 
-  def test_inline_raw0
-    assert_equal 'normal', compile_inline('@<raw>{normal}')
-  end
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+//#{type}[#{type}1]{
 
-  def test_inline_raw1
-    assert_equal 'body', compile_inline('@<raw>{|latex|body}')
-  end
+//}
 
-  def test_inline_raw2
-    assert_equal 'body', compile_inline('@<raw>{|html, latex|body}')
-  end
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+\\begin{review#{type}}[#{type}1]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}2]
+\\end{review#{type}}
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}[#{type}2]{
+
+//}
+
+//#{type}[#{type}3]{
+
+//}
+
+//#{type}[#{type}4]{
+
+//}
+
+//#{type}[#{type}5]{
+
+//}
+
+//#{type}[#{type}6]{
+
+//}
+EOS
+
+      expected = <<-EOS
+\\begin{review#{type}}[#{type}2]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}3]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}4]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}5]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}6]
+\\end{review#{type}}
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      expected = <<-EOS
+\\begin{review#{type}}
+
+\\begin{itemize}
+\\item A
+\\end{itemize}
+
+\\begin{enumerate}
+\\item B
+\\end{enumerate}
+
+\\end{review#{type}}
+\\begin{review#{type}}[OMITEND1]
+
+\\begin{reviewlistblock}
+\\begin{reviewemlist}
+LIST
+\\end{reviewemlist}
+\\end{reviewlistblock}
+
+\\end{review#{type}}
+\\begin{review#{type}}[OMITEND2]
+\\end{review#{type}}
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//note{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_inline_raw0
+    assert_equal 'normal', compile_inline('@<raw>{normal}')
+  end
+
+  def test_inline_raw1
+    assert_equal 'body', compile_inline('@<raw>{|latex|body}')
+  end
+
+  def test_inline_raw2
+    assert_equal 'body', compile_inline('@<raw>{|html, latex|body}')
+  end
 
   def test_inline_raw3
     assert_equal '', compile_inline('@<raw>{|idgxml, html|body}')
@@ -1530,24 +2321,24 @@ EOS
 
   def test_inline_imgref
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample photo')
+      item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = "\n\\reviewimageref{1.1}{image:chap1:sampleimg}「sample photo」\n"
     assert_equal expected, actual
   end
 
   def test_inline_imgref2
     def @chapter.image(_id)
-      item = Book::NumberlessImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = "\n\\reviewimageref{1.1}{image:chap1:sampleimg}\n"
     assert_equal expected, actual
   end
@@ -1624,30 +2415,30 @@ 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
 
 foo bar"\\reviewbackslash{}\\textless{}\\textgreater{}\\textunderscore{}@\\textless{}b\\textgreater{}\\{BAZ\\} \\reviewbold{bar"\\reviewbackslash{}\\textless{}\\textgreater{}\\textunderscore{}@\\textless{}b\\textgreater{}\\{BAZ\\}} [missing word: N]
 EOS
       assert_equal expected, actual
-      assert_match(/WARN -- : :1: word not bound: N/, io.string)
+      assert_match(/WARN --: :1: word not bound: N/, io.string)
     end
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<img>{n}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
     assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<fn>{n}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
     assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<hd>{n}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
     assert_equal ':1: error: unknown headline: n', e.message
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
       assert_equal ":1: error: unknown #{name}: n", e.message
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
       assert_equal ':1: error: key not found: "n"', e.message
     end
   end
@@ -1714,7 +2505,7 @@ EOS
     end
 
     def @chapter.image(_id)
-      item = Book::NumberlessImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -1775,5 +2566,344 @@ e=mc^2
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+    expected = <<-EOS
+
+\\reviewequationref{1.1}
+
+\\begin{reviewequationblock}
+\\begin{equation*}
+e=mc^2
+\\end{equation*}
+\\reviewequationcaption{式1.1: The Equivalence of Mass \\reviewit{and} Energy}
+\\end{reviewequationblock}
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_error_close1
+    src = <<-EOS
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+  end
+
+  def test_nest_error_close2
+    src = <<-EOS
+ * foo
+
+//beginchild
+
+ 1. foo
+
+//beginchild
+
+ : foo
+
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+  end
+
+  def test_nest_error_close3
+    src = <<-EOS
+ * foo
+
+//beginchild
+
+ 1. foo
+
+//beginchild
+
+ : foo
+
+//beginchild
+
+//endchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+  end
+
+  def test_nest_ul
+    src = <<-EOS
+ * UL1
+
+//beginchild
+
+ 1. UL1-OL1
+ 2. UL1-OL2
+
+ * UL1-UL1
+ * UL1-UL2
+
+ : UL1-DL1
+	UL1-DD1
+ : UL1-DL2
+	UL1-DD2
+
+//endchild
+
+ * UL2
+
+//beginchild
+
+UL2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS
+
+\\begin{itemize}
+\\item UL1
+
+
+\\begin{enumerate}
+\\item UL1{-}OL1
+\\item UL1{-}OL2
+\\end{enumerate}
+
+\\begin{itemize}
+\\item UL1{-}UL1
+\\item UL1{-}UL2
+\\end{itemize}
+
+\\begin{description}
+\\item[UL1{-}DL1] \\mbox{} \\\\
+UL1{-}DD1
+\\item[UL1{-}DL2] \\mbox{} \\\\
+UL1{-}DD2
+\\end{description}
+
+
+\\item UL2
+
+
+UL2{-}PARA
+
+\\end{itemize}
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_ol
+    src = <<-EOS
+ 1. OL1
+
+//beginchild
+
+ 1. OL1-OL1
+ 2. OL1-OL2
+
+ * OL1-UL1
+ * OL1-UL2
+
+ : OL1-DL1
+	OL1-DD1
+ : OL1-DL2
+	OL1-DD2
+
+//endchild
+
+ 2. OL2
+
+//beginchild
+
+OL2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS
+
+\\begin{enumerate}
+\\item OL1
+
+
+\\begin{enumerate}
+\\item OL1{-}OL1
+\\item OL1{-}OL2
+\\end{enumerate}
+
+\\begin{itemize}
+\\item OL1{-}UL1
+\\item OL1{-}UL2
+\\end{itemize}
+
+\\begin{description}
+\\item[OL1{-}DL1] \\mbox{} \\\\
+OL1{-}DD1
+\\item[OL1{-}DL2] \\mbox{} \\\\
+OL1{-}DD2
+\\end{description}
+
+
+\\item OL2
+
+
+OL2{-}PARA
+
+\\end{enumerate}
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_dl
+    src = <<-EOS
+ : DL1
+
+//beginchild
+
+ 1. DL1-OL1
+ 2. DL1-OL2
+
+ * DL1-UL1
+ * DL1-UL2
+
+ : DL1-DL1
+	DL1-DD1
+ : DL1-DL2
+	DL1-DD2
+
+//endchild
+
+ : DL2
+	DD2
+
+//beginchild
+
+ * DD2-UL1
+ * DD2-UL2
+
+DD2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS
+
+\\begin{description}
+\\item[DL1] \\mbox{} \\\\
+
+
+
+\\begin{enumerate}
+\\item DL1{-}OL1
+\\item DL1{-}OL2
+\\end{enumerate}
+
+\\begin{itemize}
+\\item DL1{-}UL1
+\\item DL1{-}UL2
+\\end{itemize}
+
+\\begin{description}
+\\item[DL1{-}DL1] \\mbox{} \\\\
+DL1{-}DD1
+\\item[DL1{-}DL2] \\mbox{} \\\\
+DL1{-}DD2
+\\end{description}
+
+
+\\item[DL2] \\mbox{} \\\\
+DD2
+
+
+\\begin{itemize}
+\\item DD2{-}UL1
+\\item DD2{-}UL2
+\\end{itemize}
+
+DD2{-}PARA
+
+\\end{description}
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_multi
+    src = <<-EOS
+ 1. OL1
+
+//beginchild
+
+ 1. OL1-OL1
+
+//beginchild
+
+ * OL1-OL1-UL1
+
+OL1-OL1-PARA
+
+//endchild
+
+ 2. OL1-OL2
+
+ * OL1-UL1
+
+//beginchild
+
+ : OL1-UL1-DL1
+	OL1-UL1-DD1
+
+OL1-UL1-PARA
+
+//endchild
+
+ * OL1-UL2
+
+//endchild
+EOS
+    expected = <<-EOS
+
+\\begin{enumerate}
+\\item OL1
+
+
+\\begin{enumerate}
+\\item OL1{-}OL1
+
+
+\\begin{itemize}
+\\item OL1{-}OL1{-}UL1
+\\end{itemize}
+
+OL1{-}OL1{-}PARA
+
+
+\\item OL1{-}OL2
+\\end{enumerate}
+
+\\begin{itemize}
+\\item OL1{-}UL1
+
+
+\\begin{description}
+\\item[OL1{-}UL1{-}DL1] \\mbox{} \\\\
+OL1{-}UL1{-}DD1
+\\end{description}
+
+OL1{-}UL1{-}PARA
+
+
+\\item OL1{-}UL2
+\\end{itemize}
+
+\\end{enumerate}
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 end